From 5a843b13427e3d884f6779abb3af55efd67fc3c7 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 14 Dec 2017 11:03:59 -0800
Subject: [PATCH 001/569] adding support for filters to get old properties

---
 libraries/entities/src/EntityEditFilters.cpp  | 11 ++++--
 libraries/entities/src/EntityEditFilters.h    |  2 +-
 libraries/entities/src/EntityTree.cpp         |  2 +-
 .../entity_edit_filters/postition-example.js  | 36 +++++++++++++++++++
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 scripts/tutorials/entity_edit_filters/postition-example.js

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 550c8f17c4..09c165e9cb 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -42,7 +42,7 @@ QList<EntityItemID> EntityEditFilters::getZonesByPosition(glm::vec3& position) {
 }
 
 bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut, bool& wasChanged, 
-        EntityTree::FilterType filterType, EntityItemID& itemID) {
+        EntityTree::FilterType filterType, EntityItemID& itemID, EntityItemPointer& existingEntity) {
     
     // get the ids of all the zones (plus the global entity edit filter) that the position
     // lies within
@@ -68,9 +68,15 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
             propertiesIn.setDesiredProperties(oldProperties);
 
             auto in = QJsonValue::fromVariant(inputValues.toVariant()); // grab json copy now, because the inputValues might be side effected by the filter.
+
+            // get the current properties for then entity and include them for the filter call
+            auto currentProperties = existingEntity ? existingEntity->getProperties() : EntityItemProperties();
+            QScriptValue currentValues = currentProperties.copyToScriptValue(filterData.engine, false, true, true);
+
             QScriptValueList args;
             args << inputValues;
             args << filterType;
+            args << currentValues;
 
             QScriptValue result = filterData.filterFn.call(_nullObjectForFilter, args);
             if (filterData.uncaughtExceptions()) {
@@ -182,8 +188,8 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName
 void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
     qDebug() << "script request completed for entity " << entityID;
     auto scriptRequest = qobject_cast<ResourceRequest*>(sender());
-    const QString urlString = scriptRequest->getUrl().toString();
     if (scriptRequest && scriptRequest->getResult() == ResourceRequest::Success) {
+        const QString urlString = scriptRequest->getUrl().toString();
         auto scriptContents = scriptRequest->getData();
         qInfo() << "Downloaded script:" << scriptContents;
         QScriptProgram program(scriptContents, urlString);
@@ -227,6 +233,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
             }
         } 
     } else if (scriptRequest) {
+        const QString urlString = scriptRequest->getUrl().toString();
         qCritical() << "Failed to download script at" << urlString;
         // See HTTPResourceRequest::onRequestFinished for interpretation of codes. For example, a 404 is code 6 and 403 is 3. A timeout is 2. Go figure.
         qCritical() << "ResourceRequest error was" << scriptRequest->getResult();
diff --git a/libraries/entities/src/EntityEditFilters.h b/libraries/entities/src/EntityEditFilters.h
index 6aeb347603..f25c3c092e 100644
--- a/libraries/entities/src/EntityEditFilters.h
+++ b/libraries/entities/src/EntityEditFilters.h
@@ -43,7 +43,7 @@ public:
     void removeFilter(EntityItemID entityID);
 
     bool filter(glm::vec3& position, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut, bool& wasChanged, 
-                EntityTree::FilterType filterType, EntityItemID& entityID);
+                EntityTree::FilterType filterType, EntityItemID& entityID, EntityItemPointer& existingEntity);
 
 signals:
     void filterAdded(EntityItemID id, bool success);
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index e62399ce95..aa7215f53f 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1099,7 +1099,7 @@ bool EntityTree::filterProperties(EntityItemPointer& existingEntity, EntityItemP
     if (entityEditFilters) {
         auto position = existingEntity ? existingEntity->getWorldPosition() : propertiesIn.getPosition();
         auto entityID = existingEntity ? existingEntity->getEntityItemID() : EntityItemID();
-        accepted = entityEditFilters->filter(position, propertiesIn, propertiesOut, wasChanged, filterType, entityID);
+        accepted = entityEditFilters->filter(position, propertiesIn, propertiesOut, wasChanged, filterType, entityID, existingEntity);
     }
 
     return accepted;
diff --git a/scripts/tutorials/entity_edit_filters/postition-example.js b/scripts/tutorials/entity_edit_filters/postition-example.js
new file mode 100644
index 0000000000..00f7391809
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/postition-example.js
@@ -0,0 +1,36 @@
+function filter(properties, type, originalProperties) {    
+	
+	/* Clamp position changes.*/
+	var maxChange = 5;
+    function sign(val) {
+        if (val > 0) {
+            return 1;
+        } else if (val < 0) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+    function clamp(val, min, max) {
+        if (val > max) {
+            val = max;
+        } else if (val < min) {
+            val = min;
+        }
+        return val;
+    }
+
+
+    if (properties.position) {
+        /* Random near-zero value used as "zero" to prevent two sequential updates from being
+        exactly the same (which would cause them to be ignored) */
+        var nearZero = 0.0001 * Math.random() + 0.001;
+        var maxFudgeChange = (maxChange + nearZero);
+        properties.position.x = clamp(properties.position.x, originalProperties.position.x - maxFudgeChange, originalProperties.position.x + maxFudgeChange);
+        properties.position.y = clamp(properties.position.y, originalProperties.position.y - maxFudgeChange, originalProperties.position.y + maxFudgeChange);
+        properties.position.z = clamp(properties.position.z, originalProperties.position.z - maxFudgeChange, originalProperties.position.z + maxFudgeChange);
+    }
+
+    return properties;
+}
\ No newline at end of file

From 17288386aeddbad5ce953087903a744e23d08105 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 14 Dec 2017 12:20:03 -0800
Subject: [PATCH 002/569] implement support for zone properties in filters

---
 libraries/entities/src/EntityEditFilters.cpp  | 25 +++++++++++++++++++
 .../keep-in-zone-example.js                   | 24 ++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 scripts/tutorials/entity_edit_filters/keep-in-zone-example.js

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 09c165e9cb..13be7ebc7d 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -73,12 +73,37 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
             auto currentProperties = existingEntity ? existingEntity->getProperties() : EntityItemProperties();
             QScriptValue currentValues = currentProperties.copyToScriptValue(filterData.engine, false, true, true);
 
+            // get the zone properties
+            auto zoneEntity = _tree->findEntityByEntityItemID(id);
+            auto zoneProperties = zoneEntity ? zoneEntity->getProperties() : EntityItemProperties();
+            QScriptValue zoneValues = zoneProperties.copyToScriptValue(filterData.engine, false, true, true);
+
+            if (zoneEntity) {
+                bool success = true;
+                AABox aaBox = zoneEntity->getAABox(success);
+
+                if (success) {
+                    QScriptValue boundingBox = filterData.engine->newObject();
+                    QScriptValue bottomRightNear = vec3toScriptValue(filterData.engine, aaBox.getCorner());
+                    QScriptValue topFarLeft = vec3toScriptValue(filterData.engine, aaBox.calcTopFarLeft());
+                    QScriptValue center = vec3toScriptValue(filterData.engine, aaBox.calcCenter());
+                    QScriptValue boundingBoxDimensions = vec3toScriptValue(filterData.engine, aaBox.getDimensions());
+                    boundingBox.setProperty("brn", bottomRightNear);
+                    boundingBox.setProperty("tfl", topFarLeft);
+                    boundingBox.setProperty("center", center);
+                    boundingBox.setProperty("dimensions", boundingBoxDimensions);
+                    zoneValues.setProperty("boundingBox", boundingBox);
+                }
+            }
+
             QScriptValueList args;
             args << inputValues;
             args << filterType;
             args << currentValues;
+            args << zoneValues;
 
             QScriptValue result = filterData.filterFn.call(_nullObjectForFilter, args);
+
             if (filterData.uncaughtExceptions()) {
                 return false;
             }
diff --git a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
new file mode 100644
index 0000000000..13355129f5
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
@@ -0,0 +1,24 @@
+function filter(properties, type, originalProperties, zoneProperties) {    
+
+    var nearZero = 0.0001 * Math.random() + 0.001;
+
+	/* Clamp position changes to bounding box of zone.*/
+    function clamp(val, min, max) {
+        /* Random near-zero value used as "zero" to prevent two sequential updates from being
+        exactly the same (which would cause them to be ignored) */
+        if (val > max) {
+            val = max - nearZero;
+        } else if (val < min) {
+            val = min + nearZero;
+        }
+        return val;
+    }
+
+    if (properties.position) {
+        properties.position.x = clamp(properties.position.x, zoneProperties.boundingBox.brn.x, zoneProperties.boundingBox.tfl.x);
+        properties.position.y = clamp(properties.position.y, zoneProperties.boundingBox.brn.y, zoneProperties.boundingBox.tfl.y);
+        properties.position.z = clamp(properties.position.z, zoneProperties.boundingBox.brn.z, zoneProperties.boundingBox.tfl.z);
+    }
+
+    return properties;
+}
\ No newline at end of file

From 32d05bc163c16303ef5625e65df73f756228080d Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Tue, 19 Dec 2017 07:34:56 -0800
Subject: [PATCH 003/569] CR feedback

---
 scripts/tutorials/entity_edit_filters/keep-in-zone-example.js   | 2 +-
 .../{postition-example.js => position-example.js}               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename scripts/tutorials/entity_edit_filters/{postition-example.js => position-example.js} (99%)

diff --git a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
index 13355129f5..9013edda96 100644
--- a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
+++ b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
@@ -21,4 +21,4 @@ function filter(properties, type, originalProperties, zoneProperties) {
     }
 
     return properties;
-}
\ No newline at end of file
+}
diff --git a/scripts/tutorials/entity_edit_filters/postition-example.js b/scripts/tutorials/entity_edit_filters/position-example.js
similarity index 99%
rename from scripts/tutorials/entity_edit_filters/postition-example.js
rename to scripts/tutorials/entity_edit_filters/position-example.js
index 00f7391809..5f17f04542 100644
--- a/scripts/tutorials/entity_edit_filters/postition-example.js
+++ b/scripts/tutorials/entity_edit_filters/position-example.js
@@ -33,4 +33,4 @@ function filter(properties, type, originalProperties) {
     }
 
     return properties;
-}
\ No newline at end of file
+}

From c3801fee7e5093405a460be2b5df19f9625baa4b Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 27 Dec 2017 11:58:00 -0800
Subject: [PATCH 004/569] ka

---
 libraries/fbx/src/OBJReader.cpp | 20 +++++++++++++-------
 libraries/fbx/src/OBJReader.h   |  4 +++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 315c6a86d2..bd4158bcad 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -256,7 +256,13 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             default:
                 materials[matName] = currentMaterial;
                 #ifdef WANT_DEBUG
-                qCDebug(modelformat) << "OBJ Reader Last material shininess:" << currentMaterial.shininess << " opacity:" << currentMaterial.opacity << " diffuse color:" << currentMaterial.diffuseColor << " specular color:" << currentMaterial.specularColor << " diffuse texture:" << currentMaterial.diffuseTextureFilename << " specular texture:" << currentMaterial.specularTextureFilename;
+                qCDebug(modelformat) << "OBJ Reader Last material shininess:" << currentMaterial.shininess << " opacity:" << 
+                                     currentMaterial.opacity << " diffuse color:" << currentMaterial.diffuseColor << 
+                                     " specular color:" << currentMaterial.specularColor << " emissive color:" << 
+                                     currentMaterial.emissiveColor << " diffuse texture:" << 
+                                     currentMaterial.diffuseTextureFilename << " specular texture:" << 
+                                     currentMaterial.specularTextureFilename << " emissive texture:" << 
+                                     currentMaterial.emissiveTextureFilename;
                 #endif
                 return;
         }
@@ -277,14 +283,12 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if ((token == "d") || (token == "Tr")) {
             currentMaterial.opacity = tokenizer.getFloat();
         } else if (token == "Ka") {
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();
-            #endif
+            currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Kd") {
             currentMaterial.diffuseColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Kd") || (token == "map_Ks")) {
+        } else if ((token == "map_Ka") || (token == "map_Kd") || (token == "map_Ks")) {
             QByteArray filename = QUrl(tokenizer.getLineAsDatum()).fileName().toUtf8();
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
@@ -292,7 +296,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 #endif
                 break;
             }
-            if (token == "map_Kd") {
+            if (token == "map_Ka") {
+                currentMaterial.emissiveTextureFilename = filename;
+            } else if (token == "map_Kd") {
                 currentMaterial.diffuseTextureFilename = filename;
             } else if( token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
@@ -725,7 +731,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         }
         geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor,
                                                      objMaterial.specularColor,
-                                                     glm::vec3(0.0f),
+                                                     objMaterial.emissiveColor,
                                                      objMaterial.shininess,
                                                      objMaterial.opacity);
         FBXMaterial& fbxMaterial = geometry.materials[materialID];
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 45e3f79480..e25cd7c5e9 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -56,11 +56,13 @@ public:
     float opacity;
     glm::vec3 diffuseColor;
     glm::vec3 specularColor;
+    glm::vec3 emissiveColor;
     QByteArray diffuseTextureFilename;
     QByteArray specularTextureFilename;
+    QByteArray emissiveTextureFilename;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.9f) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.

From 5e45ee456c610733a5b598780aab45573dd7cf73 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 27 Dec 2017 16:55:45 -0800
Subject: [PATCH 005/569] more ka

---
 interface/resources/qml/js/Utils.jsc | Bin 6596 -> 6516 bytes
 libraries/fbx/src/OBJReader.cpp      |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
index ab20e996b9469915ac6a89901da175143e6b5024..8da68e4e192018ee2b4f3d835ec91f36f0161eca 100644
GIT binary patch
delta 522
zcmX?N{KZJ8u*@VmC9xz?kb!}Lk&~5STcM<00wV*14l4u0rhn_zD^;ej?k>4g!mi%G
zd85u0My4%nlMgYvF+C98%*ABHq-@E+z>vm}$&ka4%3#Hy4~8yaRtiHBLn1>mL-yoY
zme9>xSavcq8f?zvxX;LFu-T8xhB-~cvzy7I+abZT(?w;5Z?~9lcMw!410*y7MW_HI
z)PW*Y0TOCJ7HVi<U|{g<Y*DHB|NlQ!V)6%G2_J~L4HKZ!83<{x8yaRnB@)mj7C<E;
zAQFzpoeU<2@Ew#`!veC%MP-J^4hASl^We|>FnI&N2cysApZo@sr}K+4E}OiT-<xR{
z^W<Or`lc|YAM8O&PkiDRxcP}c;$E5uf87Ni!xtdq7JT9t`26z3Kd|dTmPt*{=TP4K
zT%drF(O`0fP@*{0!5~{f8bE;rQn&enPy!<p1H)u(kq#yU-pT%4%9C%1STGuF78HHS
j2olNXP@XI=&d+GDSzr7cBdY-~0|Ue4Mjo-r4w5YZzM!b{

delta 604
zcmexjbi`Pvu*@VmC9xz?kb!}Lfs>VC&A*2iV;C72bXXY}mb_f{tI)LMb*EnX9J{G=
zWjE?fVPxWFpL~eXjmbb{GZ&K)lcEI!149}^CPNNGDuWe+J{UTKS<Vdk3@Hq$ljB)J
zH*aFu&CF=AIgjH$BcsJ;KQ0^QGy~6WCXa511kX+vl^MR>V!qu$P@xQv&;%5r0+3J#
zickeer~z51p@D&c!LzePrQ-kp|4@m^A9y8vAm%nqfJ$c|q`_`zm;seYK$lnmm56{y
zI39Phm>j})kdv7eWRZ)?jLG}?J(xDJOx`D`JXuG8Z}JL$VaC6c_wai&DZm7I_&)Iq
z-167~3SS0>5B8H41jOnE9)IGGd+4!a)=UuiXrJc6pLZgSU+*D*n>GUj15EV<2e8B^
z{<xbkp$`zXpZFs#zFhkM|Nk@({<<4JhA%+QS@4Np;L}TfBm)>2Kn8s9?FPGD3MA9~
zMq$_Fat`Uu69ftv87(F=3MGm|!vW+*kU5~R2l;h#rBDLn<OjmdOcuP8{kfDUcZgUp
qT5LWj@{$oGlFy+$`MelEqs8X?V&529EqECi7$!IJh)w<=(E<Pk1jkGO

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index bd4158bcad..0395173c68 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -277,7 +277,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader Starting new material definition " << matName;
             #endif
+            //currentMaterial.emissiveTextureFilename = "";
             currentMaterial.diffuseTextureFilename = "";
+            //currentMaterial.specularTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if ((token == "d") || (token == "Tr")) {
@@ -745,6 +747,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.specularTextureFilename.isEmpty()) {
             fbxMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
         }
+        if (!objMaterial.emissiveTextureFilename.isEmpty()) {
+            fbxMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
+        }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
         modelMaterial->setAlbedo(fbxMaterial.diffuseColor);

From 38d2266d28bef0d418525acf251d6d76e201708c Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 27 Dec 2017 17:14:45 -0800
Subject: [PATCH 006/569] Tr

---
 libraries/fbx/src/OBJReader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 0395173c68..de60efbc1d 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -282,8 +282,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             //currentMaterial.specularTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
-        } else if ((token == "d") || (token == "Tr")) {
+        } else if (token == "d") {
             currentMaterial.opacity = tokenizer.getFloat();
+        } else if (token == "Tr") {
+            currentMaterial.opacity = 1.0f - tokenizer.getFloat();
         } else if (token == "Ka") {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Kd") {

From 188e476f2f203bc5e832fb18afd9192a759ef260 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 28 Dec 2017 13:57:12 -0800
Subject: [PATCH 007/569] temp obj import fixes

---
 libraries/fbx/src/OBJReader.cpp      | 24 ++++++++++++++++++++++--
 libraries/render-utils/src/Model.cpp |  2 +-
 libraries/shared/src/Transform.cpp   |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index de60efbc1d..51e7c3cafb 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -467,14 +467,34 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
                 //   vertex-index/texture-index
                 //   vertex-index/texture-index/surface-normal-index
                 QByteArray token = tokenizer.getDatum();
-                if (!isdigit(token[0])) { // Tokenizer treats line endings as whitespace. Non-digit indicates done;
+                auto firstChar = token[0];
+                // Tokenizer treats line endings as whitespace. Non-digit and non-negative sign indicates done;
+                if (!isdigit(firstChar) && firstChar != '-') {
                     tokenizer.pushBackToken(OBJTokenizer::DATUM_TOKEN);
                     break;
                 }
                 QList<QByteArray> parts = token.split('/');
                 assert(parts.count() >= 1);
                 assert(parts.count() <= 3);
-                const QByteArray noData {};
+                // If indices are negative relative indices then adjust them to absolute indices based on current vector sizes
+                // Also add 1 to each index as 1 will be subtracted later on from each index in OBJFace::add
+                int part0 = parts[0].toInt();
+                if (part0 < 0) {
+                    parts[0].setNum(vertices.size() - abs(part0) + 1);
+                }
+                if (parts.count() > 1) {
+                    int part1 = parts[1].toInt();
+                    if (part1 < 0) {
+                        parts[1].setNum(textureUVs.size() - abs(part1) + 1);
+                    }
+                    if (parts.count() > 2) {
+                        int part2 = parts[2].toInt();
+                        if (part2 < 0) {
+                            parts[2].setNum(normals.size() - abs(part2) + 1);
+                        }
+                    }
+                }
+                const QByteArray noData{};
                 face.add(parts[0], (parts.count() > 1) ? parts[1] : noData, (parts.count() > 2) ? parts[2] : noData,
                          vertices, vertexColors);
                 face.groupName = currentGroup;
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 7717ceda6f..fd9f753a75 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -163,7 +163,7 @@ void Model::setScale(const glm::vec3& scale) {
     _scaledToFit = false;
 }
 
-const float SCALE_CHANGE_EPSILON = 0.001f;
+const float SCALE_CHANGE_EPSILON = 0.0000001f;
 
 void Model::setScaleInternal(const glm::vec3& scale) {
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
diff --git a/libraries/shared/src/Transform.cpp b/libraries/shared/src/Transform.cpp
index 3e29c38add..eeb726ba72 100644
--- a/libraries/shared/src/Transform.cpp
+++ b/libraries/shared/src/Transform.cpp
@@ -19,7 +19,7 @@
 #include "shared/JSONHelpers.h"
 
 void Transform::evalRotationScale(Quat& rotation, Vec3& scale, const Mat3& rotationScaleMatrix) {
-    const float ACCURACY_THREASHOLD = 0.00001f;
+    const float ACCURACY_THREASHOLD = 0.000001f;
 
     // Following technique taken from:
     // http://callumhay.blogspot.com/2010/10/decomposing-affine-transforms.html

From dee06e72f6c627da15e97dc1c67ac8873b5cab94 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 28 Dec 2017 16:08:53 -0800
Subject: [PATCH 008/569] ke is the new ka

---
 libraries/fbx/src/OBJReader.cpp | 18 +++++++++++-------
 libraries/fbx/src/OBJReader.h   |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 51e7c3cafb..07d445fb3e 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -277,9 +277,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader Starting new material definition " << matName;
             #endif
-            //currentMaterial.emissiveTextureFilename = "";
             currentMaterial.diffuseTextureFilename = "";
-            //currentMaterial.specularTextureFilename = "";
+            currentMaterial.emissiveTextureFilename = "";
+            currentMaterial.specularTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "d") {
@@ -287,12 +287,16 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Tr") {
             currentMaterial.opacity = 1.0f - tokenizer.getFloat();
         } else if (token == "Ka") {
-            currentMaterial.emissiveColor = tokenizer.getVec3();
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();
+            #endif
         } else if (token == "Kd") {
             currentMaterial.diffuseColor = tokenizer.getVec3();
+        } else if (token == "Ke") {
+            currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Ka") || (token == "map_Kd") || (token == "map_Ks")) {
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks")) {
             QByteArray filename = QUrl(tokenizer.getLineAsDatum()).fileName().toUtf8();
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
@@ -300,10 +304,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 #endif
                 break;
             }
-            if (token == "map_Ka") {
-                currentMaterial.emissiveTextureFilename = filename;
-            } else if (token == "map_Kd") {
+            if (token == "map_Kd") {
                 currentMaterial.diffuseTextureFilename = filename;
+            } else if (token == "map_Ke") {
+                currentMaterial.emissiveTextureFilename = filename;
             } else if( token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
             }
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index e25cd7c5e9..f0852c9c22 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -62,7 +62,7 @@ public:
     QByteArray emissiveTextureFilename;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.9f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.

From a855916eb89c1ef3b8d744e2ef9b7f477715f29d Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 28 Dec 2017 16:39:02 -0800
Subject: [PATCH 009/569] fix relative paths

---
 libraries/fbx/src/OBJReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 07d445fb3e..3b4eed6746 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -297,7 +297,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
         } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks")) {
-            QByteArray filename = QUrl(tokenizer.getLineAsDatum()).fileName().toUtf8();
+            QByteArray filename = QString(tokenizer.getLineAsDatum()).toUtf8();
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
                 qCDebug(modelformat) << "OBJ Reader WARNING: currently ignoring tga texture " << filename << " in " << _url;

From cee6bd270079125729dd9748665e4714efb0f32f Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 28 Dec 2017 17:20:16 -0800
Subject: [PATCH 010/569] ignore Ni

---
 libraries/fbx/src/OBJReader.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 3b4eed6746..d6955a6945 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -282,6 +282,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.specularTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
+        } else if (token == "Ni") {
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ni " << tokenizer.getFloat();
+            #endif
         } else if (token == "d") {
             currentMaterial.opacity = tokenizer.getFloat();
         } else if (token == "Tr") {

From 7531a2ef3b9e134e2000ed79c507bed7b1acafca Mon Sep 17 00:00:00 2001
From: unknown <davidback3@gmail.com>
Date: Fri, 29 Dec 2017 18:00:07 -0800
Subject: [PATCH 011/569] map_bump wip

---
 interface/resources/qml/js/Utils.jsc | Bin 6516 -> 6548 bytes
 libraries/fbx/src/OBJReader.cpp      |  15 ++++++++++++---
 libraries/fbx/src/OBJReader.h        |   1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
index 8da68e4e192018ee2b4f3d835ec91f36f0161eca..0e4b04d46e53fb0fdea77cfc8b85627fa9276aad 100644
GIT binary patch
delta 180
zcmW;8JqrPG9KiAK@A_XIoALs@0CnO@Nl`9F7A%U(LtQK$x|L+t^_Lf5mJ%uN!D2Uf
z0Y)2x(r5X+)0<3k95~&cH}hhEL`*t~b<h!TO=x|W-9@c@*q-;F!fta9lPjr($EJa$
zqtcM4_M|CAeU+*~Tt|&d?55zM;HBWJz&YKGp=3+I0G|<ka@c>R|LRQXGhvF2i${P@
W51R@;Gu>8oK_AsT%v-0F>BfHt$1Yz0

delta 155
zcmbPY{KZJ8u*@VmC9xz?kb!}Lk&~5STcM<00wV*14l4u0rhn_zD^;ej?k>4g!mi%G
zd7@4Wqrt?D;Y<(MCv!1|F&>zl$QaJ3FnK4VKhp!@$y`j^1h=p-FdSiFV7S7<!0?2H
zfk9^TMW$><WlIJIhBSsuh8%`e1}g@AFmwU4QW%mL5*d;ivL_d_gib!gQnNXL)kOpV
DdBiDO

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index d6955a6945..73c0f07fa6 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -262,7 +262,8 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                                      currentMaterial.emissiveColor << " diffuse texture:" << 
                                      currentMaterial.diffuseTextureFilename << " specular texture:" << 
                                      currentMaterial.specularTextureFilename << " emissive texture:" << 
-                                     currentMaterial.emissiveTextureFilename;
+                                     currentMaterial.emissiveTextureFilename << " bump texture:" <<
+                                     currentMaterial.bumpTextureFilename;
                 #endif
                 return;
         }
@@ -280,6 +281,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.diffuseTextureFilename = "";
             currentMaterial.emissiveTextureFilename = "";
             currentMaterial.specularTextureFilename = "";
+            currentMaterial.bumpTextureFilename = "";
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "Ni") {
@@ -300,8 +302,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks")) {
-            QByteArray filename = QString(tokenizer.getLineAsDatum()).toUtf8();
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump")) {
+            QByteArray textureLine = QString(tokenizer.getLineAsDatum()).toUtf8();
+            QByteArray filename = textureLine; // TODO: parse texture options and filename from line
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
                 qCDebug(modelformat) << "OBJ Reader WARNING: currently ignoring tga texture " << filename << " in " << _url;
@@ -314,6 +317,8 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 currentMaterial.emissiveTextureFilename = filename;
             } else if( token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
+            } else if (token == "map_bump") {
+                currentMaterial.bumpTextureFilename = filename;
             }
         }
     }
@@ -780,6 +785,10 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.emissiveTextureFilename.isEmpty()) {
             fbxMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
         }
+        if (!objMaterial.bumpTextureFilename.isEmpty()) {
+            fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
+            fbxMaterial.normalTexture.isBumpmap = true;
+        }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
         modelMaterial->setAlbedo(fbxMaterial.diffuseColor);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index f0852c9c22..d0bbd539e9 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -60,6 +60,7 @@ public:
     QByteArray diffuseTextureFilename;
     QByteArray specularTextureFilename;
     QByteArray emissiveTextureFilename;
+    QByteArray bumpTextureFilename;
     bool used { false };
     bool userSpecifiesUV { false };
     OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}

From a44e00142dfb867e960596397689e7c3f617210c Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 2 Jan 2018 15:41:14 -0800
Subject: [PATCH 012/569] texture line parse wip

---
 libraries/fbx/src/OBJReader.cpp | 31 ++++++++++++++++++++++++++++---
 libraries/fbx/src/OBJReader.h   |  7 +++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 73c0f07fa6..d5eeec51d0 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -303,8 +303,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
         } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump")) {
-            QByteArray textureLine = QString(tokenizer.getLineAsDatum()).toUtf8();
-            QByteArray filename = textureLine; // TODO: parse texture options and filename from line
+            const QByteArray textureLine = tokenizer.getLineAsDatum();
+            QByteArray filename;
+            OBJMaterialTextureOptions textureOptions;
+            parseTextureLine(textureLine, filename, textureOptions);
             if (filename.endsWith(".tga")) {
                 #ifdef WANT_DEBUG
                 qCDebug(modelformat) << "OBJ Reader WARNING: currently ignoring tga texture " << filename << " in " << _url;
@@ -315,13 +317,36 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 currentMaterial.diffuseTextureFilename = filename;
             } else if (token == "map_Ke") {
                 currentMaterial.emissiveTextureFilename = filename;
-            } else if( token == "map_Ks" ) {
+            } else if (token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
             } else if (token == "map_bump") {
                 currentMaterial.bumpTextureFilename = filename;
             }
         }
     }
+} 
+
+void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions) {
+    QString parser = textureLine;
+    while (parser.length() > 0) {
+        if (parser.startsWith("-bm")) {
+            parser.remove(0, 4);
+            int multiplierEnd = parser.indexOf(' ');
+            if (multiplierEnd < 0) {
+                multiplierEnd = parser.length();
+            }
+            QString multiplier = parser.left(multiplierEnd);
+            textureOptions.bumpMultiplier = std::stof(multiplier.toStdString());
+            parser.remove(0, multiplier.length() + 1);
+        } else {
+            int fileEnd = parser.indexOf(' ');
+            if (fileEnd < 0) {
+                fileEnd = parser.length();
+            }
+            filename = parser.left(fileEnd).toUtf8();
+            parser.remove(0, filename.length() + 1);
+        }
+    }
 }
 
 std::tuple<bool, QByteArray> requestData(QUrl& url) {
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index d0bbd539e9..2c1db7ccf7 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -66,6 +66,12 @@ public:
     OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}
 };
 
+class OBJMaterialTextureOptions {
+public:
+    float bumpMultiplier;
+    OBJMaterialTextureOptions() : bumpMultiplier(1.0f) {}
+};
+
 class OBJReader: public QObject { // QObject so we can make network requests.
     Q_OBJECT
 public:
@@ -87,6 +93,7 @@ private:
     bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
+    void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
     bool isValidTexture(const QByteArray &filename); // true if the file exists. TODO?: check content-type header and that it is a supported format.
 
     int _partCounter { 0 };

From 88b034aa78ddb3be7c95190bf6bf38742609b616 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 2 Jan 2018 16:35:43 -0800
Subject: [PATCH 013/569] bump multiplier

---
 libraries/fbx/src/FBX.h         | 2 ++
 libraries/fbx/src/OBJReader.cpp | 8 ++++++--
 libraries/fbx/src/OBJReader.h   | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 7d3328a2dd..70344512ca 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -178,6 +178,8 @@ public:
     float emissiveIntensity{ 1.0f };
     float ambientFactor{ 1.0f };
 
+    float bumpMultiplier{ 1.0f };
+
     QString materialID;
     QString name;
     QString shadingModel;
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index d5eeec51d0..6127b454b8 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -302,7 +302,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump")) {
+        } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump")) {
             const QByteArray textureLine = tokenizer.getLineAsDatum();
             QByteArray filename;
             OBJMaterialTextureOptions textureOptions;
@@ -319,8 +319,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 currentMaterial.emissiveTextureFilename = filename;
             } else if (token == "map_Ks" ) {
                 currentMaterial.specularTextureFilename = filename;
-            } else if (token == "map_bump") {
+            } else if ((token == "map_bump") || (token == "bump")) {
                 currentMaterial.bumpTextureFilename = filename;
+                currentMaterial.bumpMultiplier = textureOptions.bumpMultiplier;
             }
         }
     }
@@ -338,6 +339,8 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             QString multiplier = parser.left(multiplierEnd);
             textureOptions.bumpMultiplier = std::stof(multiplier.toStdString());
             parser.remove(0, multiplier.length() + 1);
+        } else if (parser[0] == '-') {
+            // TO DO
         } else {
             int fileEnd = parser.indexOf(' ');
             if (fileEnd < 0) {
@@ -813,6 +816,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.bumpTextureFilename.isEmpty()) {
             fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
             fbxMaterial.normalTexture.isBumpmap = true;
+            fbxMaterial.bumpMultiplier = objMaterial.bumpMultiplier;
         }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 2c1db7ccf7..ab2fd2fd78 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -61,9 +61,10 @@ public:
     QByteArray specularTextureFilename;
     QByteArray emissiveTextureFilename;
     QByteArray bumpTextureFilename;
+    float bumpMultiplier;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), bumpMultiplier(1.0f) {}
 };
 
 class OBJMaterialTextureOptions {

From dfb9d9ce6b3d82bc404f4683c6638dd11023477b Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 3 Jan 2018 13:58:27 -0800
Subject: [PATCH 014/569] illum model wip

---
 libraries/fbx/src/OBJReader.cpp | 53 ++++++++++++++++++++++++++++-----
 libraries/fbx/src/OBJReader.h   |  1 +
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 6127b454b8..1e31371178 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -256,12 +256,12 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             default:
                 materials[matName] = currentMaterial;
                 #ifdef WANT_DEBUG
-                qCDebug(modelformat) << "OBJ Reader Last material shininess:" << currentMaterial.shininess << " opacity:" << 
-                                     currentMaterial.opacity << " diffuse color:" << currentMaterial.diffuseColor << 
-                                     " specular color:" << currentMaterial.specularColor << " emissive color:" << 
-                                     currentMaterial.emissiveColor << " diffuse texture:" << 
-                                     currentMaterial.diffuseTextureFilename << " specular texture:" << 
-                                     currentMaterial.specularTextureFilename << " emissive texture:" << 
+                qCDebug(modelformat) << "OBJ Reader Last material illumination model:" << currentMaterial.illuminationModel <<
+                                     " shininess:" << currentMaterial.shininess << " opacity:" << currentMaterial.opacity <<
+                                     " diffuse color:" << currentMaterial.diffuseColor << " specular color:" << 
+                                     currentMaterial.specularColor << " emissive color:" << currentMaterial.emissiveColor << 
+                                     " diffuse texture:" << currentMaterial.diffuseTextureFilename << " specular texture:" <<
+                                     currentMaterial.specularTextureFilename << " emissive texture:" <<
                                      currentMaterial.emissiveTextureFilename << " bump texture:" <<
                                      currentMaterial.bumpTextureFilename;
                 #endif
@@ -302,6 +302,8 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
+        } else if (token == "illum") {
+            currentMaterial.illuminationModel = tokenizer.getFloat();
         } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump")) {
             const QByteArray textureLine = tokenizer.getLineAsDatum();
             QByteArray filename;
@@ -824,8 +826,45 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
         modelMaterial->setRoughness(model::Material::shininessToRoughness(fbxMaterial.shininess));
 
+        // Illumination model reference http://paulbourke.net/dataformats/mtl/ 
+        switch (objMaterial.illuminationModel) {
+            case 0: // Color on and Ambient off
+                fbxMaterial.ambientFactor = 0.0f;
+                break;
+            case 1: // Color on and Ambient on
+                fbxMaterial.ambientFactor = 1.0f;
+                break;
+            case 2: // Highlight on
+                fbxMaterial.specularFactor = 1.0f;
+                break;
+            case 3: // Reflection on and Ray trace on
+                break;
+            case 4: // Transparency: Glass on and Reflection: Ray trace on
+                fbxMaterial.opacity = 0.0f;
+                break;
+            case 5: // Reflection: Fresnel on and Ray trace on
+                modelMaterial->setFresnel(glm::vec3(1.0f));
+                break;
+            case 6: // Transparency: Refraction on and Reflection: Fresnel off and Ray trace on
+                fbxMaterial.opacity = 0.0f;
+                modelMaterial->setFresnel(glm::vec3(0.0f));
+                break;
+            case 7: // Transparency: Refraction on and Reflection: Fresnel on and Ray trace on
+                fbxMaterial.opacity = 0.0f;
+                modelMaterial->setFresnel(glm::vec3(1.0f));
+                break;
+            case 8: // Reflection on and Ray trace off
+                break;
+            case 9: // Transparency: Glass on and Reflection: Ray trace off
+                fbxMaterial.opacity = 0.0f;
+                break;
+            case 10: // Casts shadows onto invisible surfaces
+                // Do nothing?
+                break;
+        }
+
         if (fbxMaterial.opacity <= 0.0f) {
-            modelMaterial->setOpacity(1.0f);
+            modelMaterial->setOpacity(0.0f); // previous was 1.0f?
         } else {
             modelMaterial->setOpacity(fbxMaterial.opacity);
         }
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index ab2fd2fd78..eb7376c64f 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -62,6 +62,7 @@ public:
     QByteArray emissiveTextureFilename;
     QByteArray bumpTextureFilename;
     float bumpMultiplier;
+    int illuminationModel;
     bool used { false };
     bool userSpecifiesUV { false };
     OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), bumpMultiplier(1.0f) {}

From cbaba8688171d3530859f659038a4131afd604d1 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 3 Jan 2018 15:50:24 -0800
Subject: [PATCH 015/569] more texture options

---
 interface/resources/qml/js/Utils.jsc | Bin 6548 -> 6516 bytes
 libraries/fbx/src/OBJReader.cpp      | 131 +++++++++++++++++++++++----
 libraries/fbx/src/OBJReader.h        |  18 ++--
 3 files changed, 121 insertions(+), 28 deletions(-)

diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
index 0e4b04d46e53fb0fdea77cfc8b85627fa9276aad..8da68e4e192018ee2b4f3d835ec91f36f0161eca 100644
GIT binary patch
delta 155
zcmbPY{KZJ8u*@VmC9xz?kb!}Lk&~5STcM<00wV*14l4u0rhn_zD^;ej?k>4g!mi%G
zd7@4Wqrt?D;Y<(MCv!1|F&>zl$QaJ3FnK4VKhp!@$y`j^1h=p-FdSiFV7S7<!0?2H
zfk9^TMW$><WlIJIhBSsuh8%`e1}g@AFmwU4QW%mL5*d;ivL_d_gib!gQnNXL)kOpV
DdBiDO

delta 180
zcmW;8JqrPG9KiAK@A_XIoALs@0CnO@Nl`9F7A%U(LtQK$x|L+t^_Lf5mJ%uN!D2Uf
z0Y)2x(r5X+)0<3k95~&cH}hhEL`*t~b<h!TO=x|W-9@c@*q-;F!fta9lPjr($EJa$
zqtcM4_M|CAeU+*~Tt|&d?55zM;HBWJz&YKGp=3+I0G|<ka@c>R|LRQXGhvF2i${P@
W51R@;Gu>8oK_AsT%v-0F>BfHt$1Yz0

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 1e31371178..2e4fff700c 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -323,33 +323,124 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
                 currentMaterial.specularTextureFilename = filename;
             } else if ((token == "map_bump") || (token == "bump")) {
                 currentMaterial.bumpTextureFilename = filename;
-                currentMaterial.bumpMultiplier = textureOptions.bumpMultiplier;
+                currentMaterial.bumpTextureOptions = textureOptions;
             }
         }
     }
 } 
 
+bool OBJReader::parseTextureLineFloat(QString& parser, float& result) {
+    if (parser.length() == 0) {
+        return false;
+    }
+    auto firstChar = parser[0];
+    if ((firstChar < '0' || firstChar > '9') && firstChar != '-') {
+        return false;
+    }
+    int floatEnd = parser.indexOf(' ');
+    if (floatEnd < 0) {
+        floatEnd = parser.length();
+    }
+    QString floatStr = parser.left(floatEnd);
+    try
+    {
+        result = std::stof(floatStr.toStdString());
+        parser.remove(0, floatStr.length() + 1);
+        return true;
+    }
+    catch (const std::exception& /*e*/)
+    {
+        return false;
+    }
+}
+
+bool OBJReader::parseTextureLineString(QString& parser, QByteArray& result) {
+    if (parser.length() == 0) {
+        return false;
+    }
+    int stringEnd = parser.indexOf(' ');
+    if (stringEnd < 0) {
+        stringEnd = parser.length();
+    }
+    result = parser.left(stringEnd).toUtf8();
+    parser.remove(0, result.length() + 1);
+    return true;
+}
+
 void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions) {
+    // Texture options reference http://paulbourke.net/dataformats/mtl/
+    // and https://wikivisually.com/wiki/Material_Template_Library
     QString parser = textureLine;
     while (parser.length() > 0) {
-        if (parser.startsWith("-bm")) {
-            parser.remove(0, 4);
-            int multiplierEnd = parser.indexOf(' ');
-            if (multiplierEnd < 0) {
-                multiplierEnd = parser.length();
-            }
-            QString multiplier = parser.left(multiplierEnd);
-            textureOptions.bumpMultiplier = std::stof(multiplier.toStdString());
-            parser.remove(0, multiplier.length() + 1);
-        } else if (parser[0] == '-') {
-            // TO DO
-        } else {
-            int fileEnd = parser.indexOf(' ');
-            if (fileEnd < 0) {
-                fileEnd = parser.length();
-            }
-            filename = parser.left(fileEnd).toUtf8();
-            parser.remove(0, filename.length() + 1);
+        if (parser.startsWith("-blendu") || parser.startsWith("-blendv")) {
+            parser.remove(0, 11); // remove through "-blendu on " or "-blendu off"
+            if (parser[0] == ' ') // extra character for space after off
+                parser.remove(0, 1);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -blendu/-blendv";
+            #endif
+        } else if (parser.startsWith("-bm")) {
+            parser.remove(0, 4); // remove through "-bm "
+            parseTextureLineFloat(parser, textureOptions.bumpMultiplier);
+        } else if (parser.startsWith("-boost")) {
+            parser.remove(0, 7); // remove through "-boost "
+            float ignore;
+            parseTextureLineFloat(parser, ignore);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -boost";
+            #endif
+        } else if (parser.startsWith("-cc")) {
+            parser.remove(0, 7); // remove through "-cc on " or "-cc off"
+            if (parser[0] == ' ') // extra character for space after off
+                parser.remove(0, 1);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -cc";
+            #endif
+        } else if (parser.startsWith("-clamp")) {
+            parser.remove(0, 10); // remove through "-clamp on " or "-clamp off"
+            if (parser[0] == ' ') // extra character for space after off
+                parser.remove(0, 1);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -clamp";
+            #endif
+        } else if (parser.startsWith("-imfchan")) {
+            parser.remove(0, 11); // remove through "-imfchan X "
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -imfchan";
+            #endif
+        } else if (parser.startsWith("-mm")) {
+            parser.remove(0, 4); // remove through "-mm "
+            float ignore;
+            parseTextureLineFloat(parser, ignore);
+            parseTextureLineFloat(parser, ignore);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -mm";
+            #endif
+        } else if (parser.startsWith("-o") || parser.startsWith("-s") || parser.startsWith("-t")) {
+            parser.remove(0, 3); // remove through "-o "
+            float ignore;
+            parseTextureLineFloat(parser, ignore);
+            parseTextureLineFloat(parser, ignore);
+            parseTextureLineFloat(parser, ignore);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -o/-s/-t";
+            #endif
+        } else if (parser.startsWith("-texres")) {
+            parser.remove(0, 8); // remove through "-texres "
+            float ignore;
+            parseTextureLineFloat(parser, ignore);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -texres";
+            #endif
+        } else if (parser.startsWith("-type")) {
+            parser.remove(0, 6); // remove through "-type "
+            QByteArray ignore;
+            parseTextureLineString(parser, ignore);
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -type";
+            #endif
+        } else { // assume filename
+            parseTextureLineString(parser, filename);
         }
     }
 }
@@ -818,7 +909,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         if (!objMaterial.bumpTextureFilename.isEmpty()) {
             fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
             fbxMaterial.normalTexture.isBumpmap = true;
-            fbxMaterial.bumpMultiplier = objMaterial.bumpMultiplier;
+            fbxMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
         }
 
         modelMaterial->setEmissive(fbxMaterial.emissiveColor);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index eb7376c64f..a4582d6ef4 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -48,6 +48,12 @@ private:
     void addFrom(const OBJFace* face, int index);
 };
 
+class OBJMaterialTextureOptions {
+public:
+    float bumpMultiplier;
+    OBJMaterialTextureOptions() : bumpMultiplier(1.0f) {}
+}
+;
 // Materials and references to material names can come in any order, and different mesh parts can refer to the same material.
 // Therefore it would get pretty hacky to try to use FBXMeshPart to store these as we traverse the files.
 class OBJMaterial {
@@ -61,17 +67,11 @@ public:
     QByteArray specularTextureFilename;
     QByteArray emissiveTextureFilename;
     QByteArray bumpTextureFilename;
-    float bumpMultiplier;
+    OBJMaterialTextureOptions bumpTextureOptions;
     int illuminationModel;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), bumpMultiplier(1.0f) {}
-};
-
-class OBJMaterialTextureOptions {
-public:
-    float bumpMultiplier;
-    OBJMaterialTextureOptions() : bumpMultiplier(1.0f) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), illuminationModel(0) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.
@@ -95,6 +95,8 @@ private:
     bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
+    bool parseTextureLineFloat(QString& parser, float& result);
+    bool parseTextureLineString(QString& parser, QByteArray& result);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
     bool isValidTexture(const QByteArray &filename); // true if the file exists. TODO?: check content-type header and that it is a supported format.
 

From e9f30549f487604fb8f5384770f7da7269de19b8 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 3 Jan 2018 18:20:07 -0800
Subject: [PATCH 016/569] ignore Tf, disable illum test

---
 libraries/fbx/src/OBJReader.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 2e4fff700c..ca69ccb64d 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -292,6 +292,12 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.opacity = tokenizer.getFloat();
         } else if (token == "Tr") {
             currentMaterial.opacity = 1.0f - tokenizer.getFloat();
+        } else if (token == "illum") {
+            currentMaterial.illuminationModel = tokenizer.getFloat();
+        } else if (token == "Tf") {
+            #ifdef WANT_DEBUG
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Tf " << tokenizer.getVec3();
+            #endif
         } else if (token == "Ka") {
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();
@@ -302,8 +308,6 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
             currentMaterial.emissiveColor = tokenizer.getVec3();
         } else if (token == "Ks") {
             currentMaterial.specularColor = tokenizer.getVec3();
-        } else if (token == "illum") {
-            currentMaterial.illuminationModel = tokenizer.getFloat();
         } else if ((token == "map_Kd") || (token == "map_Ke") || (token == "map_Ks") || (token == "map_bump") || (token == "bump")) {
             const QByteArray textureLine = tokenizer.getLineAsDatum();
             QByteArray filename;
@@ -917,6 +921,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
         modelMaterial->setRoughness(model::Material::shininessToRoughness(fbxMaterial.shininess));
 
+        /*
         // Illumination model reference http://paulbourke.net/dataformats/mtl/ 
         switch (objMaterial.illuminationModel) {
             case 0: // Color on and Ambient off
@@ -953,12 +958,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 // Do nothing?
                 break;
         }
+        */
 
-        if (fbxMaterial.opacity <= 0.0f) {
-            modelMaterial->setOpacity(0.0f); // previous was 1.0f?
-        } else {
-            modelMaterial->setOpacity(fbxMaterial.opacity);
-        }
+        modelMaterial->setOpacity(fbxMaterial.opacity);
     }
 
     return geometryPtr;

From 2c5a433ea1f695cf6a3cb46d1f46e7cc55565b31 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 4 Jan 2018 12:56:57 -0800
Subject: [PATCH 017/569] fix datum reset with comment token

---
 libraries/fbx/src/OBJReader.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index ca69ccb64d..d4cb5de497 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -70,6 +70,7 @@ int OBJTokenizer::nextToken(bool allowSpaceChar /*= false*/) {
         }
         switch (ch) {
             case '#': {
+                _datum = "";
                 _comment = _device->readLine(); // stash comment for a future call to getComment
                 return COMMENT_TOKEN;
             }

From fcac489efb92c9da28742e6ed80a465a530cb1a1 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 4 Jan 2018 16:39:44 -0800
Subject: [PATCH 018/569] illum mode adjustments, small tweaks

---
 libraries/fbx/src/FBX.h         |  2 +-
 libraries/fbx/src/OBJReader.cpp | 72 +++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 70344512ca..c1842dbee4 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -178,7 +178,7 @@ public:
     float emissiveIntensity{ 1.0f };
     float ambientFactor{ 1.0f };
 
-    float bumpMultiplier{ 1.0f };
+    float bumpMultiplier{ 1.0f }; // TODO: to be implemented
 
     QString materialID;
     QString name;
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index d4cb5de497..8fc683b0d5 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -286,8 +286,9 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "Ni") {
+            float ignore = tokenizer.getFloat();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Ni " << tokenizer.getFloat();
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ni " << ignore;
             #endif
         } else if (token == "d") {
             currentMaterial.opacity = tokenizer.getFloat();
@@ -296,12 +297,14 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "illum") {
             currentMaterial.illuminationModel = tokenizer.getFloat();
         } else if (token == "Tf") {
+            glm::vec3 ignore = tokenizer.getVec3();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Tf " << tokenizer.getVec3();
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Tf " << ignore;
             #endif
         } else if (token == "Ka") {
+            glm::vec3 ignore = tokenizer.getVec3();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << ignore;
             #endif
         } else if (token == "Kd") {
             currentMaterial.diffuseColor = tokenizer.getVec3();
@@ -379,8 +382,9 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
     while (parser.length() > 0) {
         if (parser.startsWith("-blendu") || parser.startsWith("-blendv")) {
             parser.remove(0, 11); // remove through "-blendu on " or "-blendu off"
-            if (parser[0] == ' ') // extra character for space after off
+            if (parser[0] == ' ') { // extra character for space after off
                 parser.remove(0, 1);
+            }
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -blendu/-blendv";
             #endif
@@ -396,15 +400,17 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             #endif
         } else if (parser.startsWith("-cc")) {
             parser.remove(0, 7); // remove through "-cc on " or "-cc off"
-            if (parser[0] == ' ') // extra character for space after off
+            if (parser[0] == ' ') { // extra character for space after off
                 parser.remove(0, 1);
+            }
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -cc";
             #endif
         } else if (parser.startsWith("-clamp")) {
             parser.remove(0, 10); // remove through "-clamp on " or "-clamp off"
-            if (parser[0] == ' ') // extra character for space after off
+            if (parser[0] == ' ') { // extra character for space after off
                 parser.remove(0, 1);
+            }
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -clamp";
             #endif
@@ -922,44 +928,76 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
         modelMaterial->setRoughness(model::Material::shininessToRoughness(fbxMaterial.shininess));
 
-        /*
+        bool applyTransparency = false;
+        bool applyShininess = false;
+        bool applyRoughness = false;
+        bool applyNonMetallic = false;
+        bool fresnelOn = false;
+        bool fresnelOff = false;
+
         // Illumination model reference http://paulbourke.net/dataformats/mtl/ 
         switch (objMaterial.illuminationModel) {
             case 0: // Color on and Ambient off
-                fbxMaterial.ambientFactor = 0.0f;
+                // We don't support ambient - do nothing?
                 break;
             case 1: // Color on and Ambient on
-                fbxMaterial.ambientFactor = 1.0f;
+                // We don't support ambient - do nothing?
                 break;
             case 2: // Highlight on
                 fbxMaterial.specularFactor = 1.0f;
                 break;
             case 3: // Reflection on and Ray trace on
+                applyShininess = true;
                 break;
             case 4: // Transparency: Glass on and Reflection: Ray trace on
-                fbxMaterial.opacity = 0.0f;
+                applyTransparency = true;
+                applyShininess = true;
                 break;
             case 5: // Reflection: Fresnel on and Ray trace on
-                modelMaterial->setFresnel(glm::vec3(1.0f));
+                applyShininess = true;
+                fresnelOn = true;
                 break;
             case 6: // Transparency: Refraction on and Reflection: Fresnel off and Ray trace on
-                fbxMaterial.opacity = 0.0f;
-                modelMaterial->setFresnel(glm::vec3(0.0f));
+                applyTransparency = true;
+                applyNonMetallic = true;
+                applyShininess = true;
+                fresnelOff = true;
                 break;
             case 7: // Transparency: Refraction on and Reflection: Fresnel on and Ray trace on
-                fbxMaterial.opacity = 0.0f;
-                modelMaterial->setFresnel(glm::vec3(1.0f));
+                applyTransparency = true;
+                applyNonMetallic = true;
+                applyShininess = true;
+                fresnelOn = true;
                 break;
             case 8: // Reflection on and Ray trace off
+                applyShininess = true;
                 break;
             case 9: // Transparency: Glass on and Reflection: Ray trace off
-                fbxMaterial.opacity = 0.0f;
+                applyTransparency = true;
+                applyNonMetallic = true;
+                applyRoughness = true;
                 break;
             case 10: // Casts shadows onto invisible surfaces
                 // Do nothing?
                 break;
+        }      
+
+        if (applyTransparency && fbxMaterial.opacity <= 0.1f) {
+            fbxMaterial.opacity = 0.1f;
+        }
+        if (applyShininess) {
+            modelMaterial->setRoughness(0.25f);
+        } else if (applyRoughness) {
+            modelMaterial->setRoughness(1.0f);
+        }
+        if (applyNonMetallic) {
+            modelMaterial->setMetallic(0.0f);
+        }
+        if (fresnelOn) {
+            modelMaterial->setFresnel(glm::vec3(1.0f));
+        } else if (fresnelOff) {
+            modelMaterial->setFresnel(glm::vec3(0.0f));
         }
-        */
 
         modelMaterial->setOpacity(fbxMaterial.opacity);
     }

From 7c99c85ecae4eb7066c7bb7a679cc542afc4c9d9 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 5 Jan 2018 13:54:16 -0800
Subject: [PATCH 019/569] Revert "temp obj import fixes"

This reverts commit 188e476f2f203bc5e832fb18afd9192a759ef260.
---
 libraries/fbx/src/OBJReader.cpp      | 24 ++----------------------
 libraries/render-utils/src/Model.cpp |  2 +-
 libraries/shared/src/Transform.cpp   |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 8fc683b0d5..2c09b2021d 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -612,34 +612,14 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
                 //   vertex-index/texture-index
                 //   vertex-index/texture-index/surface-normal-index
                 QByteArray token = tokenizer.getDatum();
-                auto firstChar = token[0];
-                // Tokenizer treats line endings as whitespace. Non-digit and non-negative sign indicates done;
-                if (!isdigit(firstChar) && firstChar != '-') {
+                if (!isdigit(token[0])) { // Tokenizer treats line endings as whitespace. Non-digit indicates done;
                     tokenizer.pushBackToken(OBJTokenizer::DATUM_TOKEN);
                     break;
                 }
                 QList<QByteArray> parts = token.split('/');
                 assert(parts.count() >= 1);
                 assert(parts.count() <= 3);
-                // If indices are negative relative indices then adjust them to absolute indices based on current vector sizes
-                // Also add 1 to each index as 1 will be subtracted later on from each index in OBJFace::add
-                int part0 = parts[0].toInt();
-                if (part0 < 0) {
-                    parts[0].setNum(vertices.size() - abs(part0) + 1);
-                }
-                if (parts.count() > 1) {
-                    int part1 = parts[1].toInt();
-                    if (part1 < 0) {
-                        parts[1].setNum(textureUVs.size() - abs(part1) + 1);
-                    }
-                    if (parts.count() > 2) {
-                        int part2 = parts[2].toInt();
-                        if (part2 < 0) {
-                            parts[2].setNum(normals.size() - abs(part2) + 1);
-                        }
-                    }
-                }
-                const QByteArray noData{};
+                const QByteArray noData {};
                 face.add(parts[0], (parts.count() > 1) ? parts[1] : noData, (parts.count() > 2) ? parts[2] : noData,
                          vertices, vertexColors);
                 face.groupName = currentGroup;
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 536e76e44e..b91f4dd405 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -163,7 +163,7 @@ void Model::setScale(const glm::vec3& scale) {
     _scaledToFit = false;
 }
 
-const float SCALE_CHANGE_EPSILON = 0.0000001f;
+const float SCALE_CHANGE_EPSILON = 0.001f;
 
 void Model::setScaleInternal(const glm::vec3& scale) {
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
diff --git a/libraries/shared/src/Transform.cpp b/libraries/shared/src/Transform.cpp
index eeb726ba72..3e29c38add 100644
--- a/libraries/shared/src/Transform.cpp
+++ b/libraries/shared/src/Transform.cpp
@@ -19,7 +19,7 @@
 #include "shared/JSONHelpers.h"
 
 void Transform::evalRotationScale(Quat& rotation, Vec3& scale, const Mat3& rotationScaleMatrix) {
-    const float ACCURACY_THREASHOLD = 0.000001f;
+    const float ACCURACY_THREASHOLD = 0.00001f;
 
     // Following technique taken from:
     // http://callumhay.blogspot.com/2010/10/decomposing-affine-transforms.html

From eaee9b387273e1fef7185551d57a8c315e4ac795 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 8 Jan 2018 16:41:51 -0800
Subject: [PATCH 020/569] constants, pre-PR tweaks

---
 libraries/fbx/src/OBJReader.cpp | 33 +++++++++++++++++++--------------
 libraries/fbx/src/OBJReader.h   |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index a248f6fb68..e5d4fb7bd4 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -35,6 +35,11 @@ QHash<QString, float> COMMENT_SCALE_HINTS = {{"This file uses centimeters as uni
 
 const QString SMART_DEFAULT_MATERIAL_NAME = "High Fidelity smart default material name";
 
+const float ILLUMINATION_MODEL_MIN_OPACITY = 0.1f;
+const float ILLUMINATION_MODEL_APPLY_SHININESS = 0.25f;
+const float ILLUMINATION_MODEL_APPLY_ROUGHNESS = 1.0f;
+const float ILLUMINATION_MODEL_APPLY_NON_METALLIC = 0.0f;
+
 namespace {
 template<class T>
 T& checked_at(QVector<T>& vector, int i) {
@@ -380,7 +385,7 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
     // and https://wikivisually.com/wiki/Material_Template_Library
     QString parser = textureLine;
     while (parser.length() > 0) {
-        if (parser.startsWith("-blendu") || parser.startsWith("-blendv")) {
+        if (parser.startsWith("-blend")) { // -blendu/-blendv
             parser.remove(0, 11); // remove through "-blendu on " or "-blendu off"
             if (parser[0] == ' ') { // extra character for space after off
                 parser.remove(0, 1);
@@ -421,18 +426,18 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             #endif
         } else if (parser.startsWith("-mm")) {
             parser.remove(0, 4); // remove through "-mm "
-            float ignore;
-            parseTextureLineFloat(parser, ignore);
+            float ignore, ignore2;
             parseTextureLineFloat(parser, ignore);
+            parseTextureLineFloat(parser, ignore2);
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -mm";
             #endif
-        } else if (parser.startsWith("-o") || parser.startsWith("-s") || parser.startsWith("-t")) {
-            parser.remove(0, 3); // remove through "-o "
-            float ignore;
-            parseTextureLineFloat(parser, ignore);
-            parseTextureLineFloat(parser, ignore);
+        } else if (parser.startsWith("-o ") || parser.startsWith("-s ") || parser.startsWith("-t ")) {
+            parser.remove(0, 3); // remove through "-o/-s/-t "
+            float ignore, ignore2, ignore3;
             parseTextureLineFloat(parser, ignore);
+            bool hasValue2 = parseTextureLineFloat(parser, ignore2);
+            bool hasValue3 = parseTextureLineFloat(parser, ignore3);
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -o/-s/-t";
             #endif
@@ -944,7 +949,7 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 // We don't support ambient - do nothing?
                 break;
             case 2: // Highlight on
-                fbxMaterial.specularFactor = 1.0f;
+                // Change specular intensity?
                 break;
             case 3: // Reflection on and Ray trace on
                 applyShininess = true;
@@ -982,16 +987,16 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 break;
         }      
 
-        if (applyTransparency && fbxMaterial.opacity <= 0.1f) {
-            fbxMaterial.opacity = 0.1f;
+        if (applyTransparency && fbxMaterial.opacity <= ILLUMINATION_MODEL_MIN_OPACITY) {
+            fbxMaterial.opacity = ILLUMINATION_MODEL_MIN_OPACITY;
         }
         if (applyShininess) {
-            modelMaterial->setRoughness(0.25f);
+            modelMaterial->setRoughness(ILLUMINATION_MODEL_APPLY_SHININESS);
         } else if (applyRoughness) {
-            modelMaterial->setRoughness(1.0f);
+            modelMaterial->setRoughness(ILLUMINATION_MODEL_APPLY_ROUGHNESS);
         }
         if (applyNonMetallic) {
-            modelMaterial->setMetallic(0.0f);
+            modelMaterial->setMetallic(ILLUMINATION_MODEL_APPLY_NON_METALLIC);
         }
         if (fresnelOn) {
             modelMaterial->setFresnel(glm::vec3(1.0f));
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index a4582d6ef4..44382e3603 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -71,7 +71,7 @@ public:
     int illuminationModel;
     bool used { false };
     bool userSpecifiesUV { false };
-    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), illuminationModel(0) {}
+    OBJMaterial() : shininess(0.0f), opacity(1.0f), diffuseColor(0.9f), specularColor(0.9f), emissiveColor(0.0f), illuminationModel(-1) {}
 };
 
 class OBJReader: public QObject { // QObject so we can make network requests.

From 8aa0525f4536b965a6b3bd1586291ca38df164a7 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Wed, 10 Jan 2018 10:32:28 -0800
Subject: [PATCH 021/569] CR style feedback

---
 .../keep-in-zone-example.js                   | 15 +++++++-
 .../entity_edit_filters/position-example.js   | 37 +++++++++++--------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
index 9013edda96..eb9cfbeb4d 100644
--- a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
+++ b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
@@ -1,8 +1,21 @@
+//
+// keep-in-zone-example.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Dec. 15, 2017
+// Copyright 2017 High Fidelity, Inc.
+//
+// This sample entity edit filter script will keep any entity inside the bounding box of the zone this filter is applied to.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
 function filter(properties, type, originalProperties, zoneProperties) {    
 
     var nearZero = 0.0001 * Math.random() + 0.001;
 
-	/* Clamp position changes to bounding box of zone.*/
+    /* Clamp position changes to bounding box of zone.*/
     function clamp(val, min, max) {
         /* Random near-zero value used as "zero" to prevent two sequential updates from being
         exactly the same (which would cause them to be ignored) */
diff --git a/scripts/tutorials/entity_edit_filters/position-example.js b/scripts/tutorials/entity_edit_filters/position-example.js
index 5f17f04542..a6cafe6bcb 100644
--- a/scripts/tutorials/entity_edit_filters/position-example.js
+++ b/scripts/tutorials/entity_edit_filters/position-example.js
@@ -1,16 +1,20 @@
+//
+// position-example.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Dec. 15, 2017
+// Copyright 2017 High Fidelity, Inc.
+//
+// This sample entity edit filter script will only allow position to be changed by no more than 5 meters on any axis.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
 function filter(properties, type, originalProperties) {    
-	
-	/* Clamp position changes.*/
-	var maxChange = 5;
-    function sign(val) {
-        if (val > 0) {
-            return 1;
-        } else if (val < 0) {
-            return -1;
-        } else {
-            return 0;
-        }
-    }
+
+    /* Clamp position changes.*/
+    var maxChange = 5;
 
     function clamp(val, min, max) {
         if (val > max) {
@@ -27,9 +31,12 @@ function filter(properties, type, originalProperties) {
         exactly the same (which would cause them to be ignored) */
         var nearZero = 0.0001 * Math.random() + 0.001;
         var maxFudgeChange = (maxChange + nearZero);
-        properties.position.x = clamp(properties.position.x, originalProperties.position.x - maxFudgeChange, originalProperties.position.x + maxFudgeChange);
-        properties.position.y = clamp(properties.position.y, originalProperties.position.y - maxFudgeChange, originalProperties.position.y + maxFudgeChange);
-        properties.position.z = clamp(properties.position.z, originalProperties.position.z - maxFudgeChange, originalProperties.position.z + maxFudgeChange);
+        properties.position.x = clamp(properties.position.x, originalProperties.position.x 
+                                        - maxFudgeChange, originalProperties.position.x + maxFudgeChange);
+        properties.position.y = clamp(properties.position.y, originalProperties.position.y 
+                                        - maxFudgeChange, originalProperties.position.y + maxFudgeChange);
+        properties.position.z = clamp(properties.position.z, originalProperties.position.z 
+                                        - maxFudgeChange, originalProperties.position.z + maxFudgeChange);
     }
 
     return properties;

From 612f9621b449f07a64425312d8cc16533b675cd0 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 11 Jan 2018 10:00:49 -0800
Subject: [PATCH 022/569] adding filter properties to allow optimization

---
 libraries/entities/src/EntityEditFilters.cpp  | 136 ++++++++++++++----
 libraries/entities/src/EntityEditFilters.h    |   6 +
 .../keep-in-zone-example.js                   |   4 +
 .../entity_edit_filters/position-example.js   |   2 +
 4 files changed, 117 insertions(+), 31 deletions(-)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 13be7ebc7d..2b0dcc9f73 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -61,6 +61,7 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
             if (filterData.rejectAll) {
                 return false;
             }
+
             auto oldProperties = propertiesIn.getDesiredProperties();
             auto specifiedProperties = propertiesIn.getChangedProperties();
             propertiesIn.setDesiredProperties(specifiedProperties);
@@ -69,38 +70,44 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
 
             auto in = QJsonValue::fromVariant(inputValues.toVariant()); // grab json copy now, because the inputValues might be side effected by the filter.
 
-            // get the current properties for then entity and include them for the filter call
-            auto currentProperties = existingEntity ? existingEntity->getProperties() : EntityItemProperties();
-            QScriptValue currentValues = currentProperties.copyToScriptValue(filterData.engine, false, true, true);
-
-            // get the zone properties
-            auto zoneEntity = _tree->findEntityByEntityItemID(id);
-            auto zoneProperties = zoneEntity ? zoneEntity->getProperties() : EntityItemProperties();
-            QScriptValue zoneValues = zoneProperties.copyToScriptValue(filterData.engine, false, true, true);
-
-            if (zoneEntity) {
-                bool success = true;
-                AABox aaBox = zoneEntity->getAABox(success);
-
-                if (success) {
-                    QScriptValue boundingBox = filterData.engine->newObject();
-                    QScriptValue bottomRightNear = vec3toScriptValue(filterData.engine, aaBox.getCorner());
-                    QScriptValue topFarLeft = vec3toScriptValue(filterData.engine, aaBox.calcTopFarLeft());
-                    QScriptValue center = vec3toScriptValue(filterData.engine, aaBox.calcCenter());
-                    QScriptValue boundingBoxDimensions = vec3toScriptValue(filterData.engine, aaBox.getDimensions());
-                    boundingBox.setProperty("brn", bottomRightNear);
-                    boundingBox.setProperty("tfl", topFarLeft);
-                    boundingBox.setProperty("center", center);
-                    boundingBox.setProperty("dimensions", boundingBoxDimensions);
-                    zoneValues.setProperty("boundingBox", boundingBox);
-                }
-            }
-
             QScriptValueList args;
             args << inputValues;
             args << filterType;
-            args << currentValues;
-            args << zoneValues;
+
+            // get the current properties for then entity and include them for the filter call
+            if (existingEntity && filterData.wantsOriginalProperties) {
+                auto currentProperties = existingEntity->getProperties(filterData.includedOriginalProperties);
+                QScriptValue currentValues = currentProperties.copyToScriptValue(filterData.engine, false, true, true);
+                args << currentValues;
+            }
+
+
+            // get the zone properties
+            if (filterData.wantsZoneProperties) {
+                auto zoneEntity = _tree->findEntityByEntityItemID(id);
+                if (zoneEntity) {
+                    auto zoneProperties = zoneEntity->getProperties(filterData.includedZoneProperties);
+                    QScriptValue zoneValues = zoneProperties.copyToScriptValue(filterData.engine, false, true, true);
+
+                    if (filterData.wantsZoneBoundingBox) {
+                        bool success = true;
+                        AABox aaBox = zoneEntity->getAABox(success);
+                        if (success) {
+                            QScriptValue boundingBox = filterData.engine->newObject();
+                            QScriptValue bottomRightNear = vec3toScriptValue(filterData.engine, aaBox.getCorner());
+                            QScriptValue topFarLeft = vec3toScriptValue(filterData.engine, aaBox.calcTopFarLeft());
+                            QScriptValue center = vec3toScriptValue(filterData.engine, aaBox.calcCenter());
+                            QScriptValue boundingBoxDimensions = vec3toScriptValue(filterData.engine, aaBox.getDimensions());
+                            boundingBox.setProperty("brn", bottomRightNear);
+                            boundingBox.setProperty("tfl", topFarLeft);
+                            boundingBox.setProperty("center", center);
+                            boundingBox.setProperty("dimensions", boundingBoxDimensions);
+                            zoneValues.setProperty("boundingBox", boundingBox);
+                        }
+                    }
+                    args << zoneValues;
+                }
+            }
 
             QScriptValue result = filterData.filterFn.call(_nullObjectForFilter, args);
 
@@ -245,8 +252,75 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     delete engine;
                     filterData.rejectAll=true;
                 }
-               
-                
+
+                // check to see if the filterFn has properties asking for Original props
+                QScriptValue wantsOriginalPropertiesValue = filterData.filterFn.property("wantsOriginalProperties");
+                // if the wantsOriginalProperties is a boolean, or a string, or list of strings, then evaluate as follows:
+                //   - boolean - true  - include all original properties
+                //               false - no properties at all
+                //   - string  - empty - no properties at all
+                //               any valid property - include just that property in the Original properties
+                //   - list of strings - include only those properties in the Original properties
+                if (wantsOriginalPropertiesValue.isBool()) {
+                    filterData.wantsOriginalProperties = wantsOriginalPropertiesValue.toBool();
+                } else if (wantsOriginalPropertiesValue.isString()) {
+                    auto stringValue = wantsOriginalPropertiesValue.toString();
+                    filterData.wantsOriginalProperties = !stringValue.isEmpty();
+                    if (filterData.wantsOriginalProperties) {
+                        EntityPropertyFlagsFromScriptValue(wantsOriginalPropertiesValue, filterData.includedOriginalProperties);
+                    }
+                } else if (wantsOriginalPropertiesValue.isArray()) {
+                    auto length = wantsOriginalPropertiesValue.property("length").toInteger();
+                    for (int i; i < length; i++) {
+                        auto stringValue = wantsOriginalPropertiesValue.property(i).toString();
+                        if (!stringValue.isEmpty()) {
+                            filterData.wantsOriginalProperties = true;
+                            break;
+                        }
+                    }
+                    if (filterData.wantsOriginalProperties) {
+                        EntityPropertyFlagsFromScriptValue(wantsOriginalPropertiesValue, filterData.includedOriginalProperties);
+                    }
+                }
+
+                // check to see if the filterFn has properties asking for Zone props
+                QScriptValue wantsZonePropertiesValue = filterData.filterFn.property("wantsZoneProperties");
+                // if the wantsZoneProperties is a boolean, or a string, or list of strings, then evaluate as follows:
+                //   - boolean - true  - include all Zone properties
+                //               false - no properties at all
+                //   - string  - empty - no properties at all
+                //               any valid property - include just that property in the Zone properties
+                //   - list of strings - include only those properties in the Zone properties
+                if (wantsZonePropertiesValue.isBool()) {
+                    filterData.wantsZoneProperties = wantsZonePropertiesValue.toBool();
+                    filterData.wantsZoneBoundingBox = filterData.wantsZoneProperties; // include this too
+                } else if (wantsZonePropertiesValue.isString()) {
+                    auto stringValue = wantsZonePropertiesValue.toString();
+                    filterData.wantsZoneProperties = !stringValue.isEmpty();
+                    if (filterData.wantsZoneProperties) {
+                        EntityPropertyFlagsFromScriptValue(wantsZonePropertiesValue, filterData.includedZoneProperties);
+                    }
+                } else if (wantsZonePropertiesValue.isArray()) {
+                    auto length = wantsZonePropertiesValue.property("length").toInteger();
+                    for (int i; i < length; i++) {
+                        auto stringValue = wantsZonePropertiesValue.property(i).toString();
+                        if (!stringValue.isEmpty()) {
+                            filterData.wantsZoneProperties = true;
+
+                            // boundingBox is a special case since it's not a true EntityPropertyFlag, so we
+                            // need to detect it here.
+                            if (stringValue == "boundingBox") {
+                                filterData.wantsZoneBoundingBox = true;
+                                break; // we can break here, since there are no other special cases
+                            }
+
+                        }
+                    }
+                    if (filterData.wantsZoneProperties) {
+                        EntityPropertyFlagsFromScriptValue(wantsZonePropertiesValue, filterData.includedZoneProperties);
+                    }
+                }
+
                 _lock.lockForWrite();
                 _filterDataMap.insert(entityID, filterData);
                 _lock.unlock();
diff --git a/libraries/entities/src/EntityEditFilters.h b/libraries/entities/src/EntityEditFilters.h
index f25c3c092e..be3df50d3f 100644
--- a/libraries/entities/src/EntityEditFilters.h
+++ b/libraries/entities/src/EntityEditFilters.h
@@ -28,6 +28,12 @@ class EntityEditFilters : public QObject, public Dependency {
 public:
     struct FilterData {
         QScriptValue filterFn;
+        bool wantsOriginalProperties { false };
+        bool wantsZoneProperties { false };
+        EntityPropertyFlags includedOriginalProperties;
+        EntityPropertyFlags includedZoneProperties;
+        bool wantsZoneBoundingBox { false };
+
         std::function<bool()> uncaughtExceptions;
         QScriptEngine* engine;
         bool rejectAll;
diff --git a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
index eb9cfbeb4d..6d83ce1410 100644
--- a/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
+++ b/scripts/tutorials/entity_edit_filters/keep-in-zone-example.js
@@ -35,3 +35,7 @@ function filter(properties, type, originalProperties, zoneProperties) {
 
     return properties;
 }
+
+filter.wantsOriginalProperties = true;
+filter.wantsZoneProperties = true;
+filter;
\ No newline at end of file
diff --git a/scripts/tutorials/entity_edit_filters/position-example.js b/scripts/tutorials/entity_edit_filters/position-example.js
index a6cafe6bcb..01eabee7db 100644
--- a/scripts/tutorials/entity_edit_filters/position-example.js
+++ b/scripts/tutorials/entity_edit_filters/position-example.js
@@ -41,3 +41,5 @@ function filter(properties, type, originalProperties) {
 
     return properties;
 }
+filter.wantsOriginalProperties = true;
+filter;
\ No newline at end of file

From 0145b770da39868ab0209a7cbed7aabbbf0d5ec3 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 11 Jan 2018 17:16:22 -0800
Subject: [PATCH 023/569] fix warnings

---
 libraries/fbx/src/OBJReader.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index e5d4fb7bd4..008b51b0be 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -291,9 +291,10 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "Ns") {
             currentMaterial.shininess = tokenizer.getFloat();
         } else if (token == "Ni") {
-            float ignore = tokenizer.getFloat();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Ni " << ignore;
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ni " << tokenizer.getFloat();
+            #else
+            tokenizer.getFloat();
             #endif
         } else if (token == "d") {
             currentMaterial.opacity = tokenizer.getFloat();
@@ -302,14 +303,16 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
         } else if (token == "illum") {
             currentMaterial.illuminationModel = tokenizer.getFloat();
         } else if (token == "Tf") {
-            glm::vec3 ignore = tokenizer.getVec3();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Tf " << ignore;
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Tf " << tokenizer.getVec3();
+            #else
+            tokenizer.getVec3();
             #endif
         } else if (token == "Ka") {
-            glm::vec3 ignore = tokenizer.getVec3();
             #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << ignore;
+            qCDebug(modelformat) << "OBJ Reader Ignoring material Ka " << tokenizer.getVec3();;
+            #else
+            tokenizer.getVec3();
             #endif
         } else if (token == "Kd") {
             currentMaterial.diffuseColor = tokenizer.getVec3();
@@ -436,8 +439,8 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             parser.remove(0, 3); // remove through "-o/-s/-t "
             float ignore, ignore2, ignore3;
             parseTextureLineFloat(parser, ignore);
-            bool hasValue2 = parseTextureLineFloat(parser, ignore2);
-            bool hasValue3 = parseTextureLineFloat(parser, ignore3);
+            parseTextureLineFloat(parser, ignore2);
+            parseTextureLineFloat(parser, ignore3);
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -o/-s/-t";
             #endif

From 814de4ab81f335d550d09ee42b6d84b0b1dff196 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 12 Jan 2018 11:59:19 +0100
Subject: [PATCH 024/569] Scribe now outputs shaders as cpp files.

---
 cmake/macros/AutoScribeShader.cmake           |   8 +-
 .../display-plugins/hmd/HmdDisplayPlugin.cpp  |   4 +-
 .../RenderableParticleEffectEntityItem.cpp    |   4 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   8 +-
 .../src/RenderablePolyVoxEntityItem.cpp       |  18 +--
 .../src/RenderableShapeEntityItem.cpp         |   4 +-
 libraries/gpu/src/gpu/Shader.h                |   2 +
 libraries/gpu/src/gpu/StandardShaderLib.cpp   |  24 ++--
 libraries/model/src/model/Skybox.cpp          |   4 +-
 .../procedural/src/procedural/Procedural.cpp  |   2 +-
 .../src/procedural/ProceduralSkybox.cpp       |   4 +-
 .../src/AmbientOcclusionEffect.cpp            |  10 +-
 libraries/render-utils/src/AnimDebugDraw.cpp  |   5 +-
 .../render-utils/src/AntialiasingEffect.cpp   |   6 +-
 libraries/render-utils/src/BloomEffect.cpp    |   4 +-
 .../render-utils/src/DebugDeferredBuffer.cpp  |   4 +-
 .../src/DeferredLightingEffect.cpp            |  18 +--
 libraries/render-utils/src/DrawHaze.cpp       |   2 +-
 libraries/render-utils/src/GeometryCache.cpp  |  26 ++--
 .../render-utils/src/HighlightEffect.cpp      |  20 +--
 libraries/render-utils/src/LightClusters.cpp  |  12 +-
 .../render-utils/src/RenderForwardTask.cpp    |   2 +-
 .../render-utils/src/RenderPipelines.cpp      | 132 +++++++++---------
 .../render-utils/src/StencilMaskPass.cpp      |   2 +-
 .../render-utils/src/SubsurfaceScattering.cpp |   8 +-
 .../render-utils/src/SurfaceGeometryPass.cpp  |   6 +-
 libraries/render-utils/src/TextRenderer3D.cpp |   4 +-
 .../render-utils/src/ToneMappingEffect.cpp    |   2 +-
 libraries/render-utils/src/ZoneRenderer.cpp   |   6 +-
 libraries/render-utils/src/text/Font.cpp      |   6 +-
 libraries/render/src/render/BlurTask.cpp      |   8 +-
 .../render/src/render/DrawSceneOctree.cpp     |  10 +-
 libraries/render/src/render/DrawStatus.cpp    |   8 +-
 libraries/render/src/render/DrawTask.cpp      |   4 +-
 .../render/src/render/drawItemBounds.slf      |   1 -
 tests/shaders/src/main.cpp                    |  94 ++++++-------
 tools/scribe/src/main.cpp                     |   8 +-
 37 files changed, 245 insertions(+), 245 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index 1919ecf00a..d25e0e553f 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -39,11 +39,11 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
   get_filename_component(SHADER_TARGET ${SHADER_FILE} NAME_WE)
   get_filename_component(SHADER_EXT ${SHADER_FILE} EXT)
   if(SHADER_EXT STREQUAL .slv)
-    set(SHADER_TARGET ${SHADER_TARGET}_vert.h)
+    set(SHADER_TARGET ${SHADER_TARGET}_vert.cpp)
   elseif(${SHADER_EXT} STREQUAL .slf)
-    set(SHADER_TARGET ${SHADER_TARGET}_frag.h)
+    set(SHADER_TARGET ${SHADER_TARGET}_frag.cpp)
   elseif(${SHADER_EXT} STREQUAL .slg)
-    set(SHADER_TARGET ${SHADER_TARGET}_geom.h)
+    set(SHADER_TARGET ${SHADER_TARGET}_geom.cpp)
   endif()
 
   set(SHADER_TARGET "${SHADERS_DIR}/${SHADER_TARGET}")
@@ -134,6 +134,6 @@ macro(AUTOSCRIBE_SHADER_LIB)
   list(APPEND AUTOSCRIBE_SHADER_LIB_SRC ${AUTOSCRIBE_SHADER_SRC})
 
   # Link library shaders, if they exist
-  include_directories("${SHADERS_DIR}")
+  #include_directories("${SHADERS_DIR}")
 
 endmacro()
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 1d7fee38eb..4f50b5ecd9 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -33,8 +33,8 @@
 #include "../Logging.h"
 #include "../CompositorHelper.h"
 
-#include "render-utils/hmd_ui_vert.h"
-#include "render-utils/hmd_ui_frag.h"
+INCLUDE_SHADER(hmd_ui_vert)
+INCLUDE_SHADER(hmd_ui_frag)
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString DISABLE_PREVIEW = "Disable Preview";
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index a3e6cd4341..b8f979b7fd 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -14,8 +14,8 @@
 
 #include <GeometryCache.h>
 
-#include "textured_particle_vert.h"
-#include "textured_particle_frag.h"
+INCLUDE_SHADER(textured_particle_vert)
+INCLUDE_SHADER(textured_particle_frag)
 
 using namespace render;
 using namespace render::entities;
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index b362721cde..b85771f5b6 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -23,11 +23,11 @@
 #   include <FadeEffect.h>
 #endif
 
-#include "paintStroke_vert.h"
-#include "paintStroke_frag.h"
+INCLUDE_SHADER(paintStroke_vert)
+INCLUDE_SHADER(paintStroke_frag)
 
-#include "paintStroke_fade_vert.h"
-#include "paintStroke_fade_frag.h"
+INCLUDE_SHADER(paintStroke_fade_vert)
+INCLUDE_SHADER(paintStroke_fade_frag)
 
 using namespace render;
 using namespace render::entities;
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index ad0202457e..b245ed7cda 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -27,10 +27,11 @@
 #include <StencilMaskPass.h>
 
 #include "EntityTreeRenderer.h"
-#include "polyvox_vert.h"
-#include "polyvox_frag.h"
-#include "polyvox_fade_vert.h"
-#include "polyvox_fade_frag.h"
+
+INCLUDE_SHADER(polyvox_vert)
+INCLUDE_SHADER(polyvox_frag)
+INCLUDE_SHADER(polyvox_fade_vert)
+INCLUDE_SHADER(polyvox_fade_frag)
 
 #ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
 #   include <FadeEffect.h>
@@ -70,10 +71,11 @@
 #include "StencilMaskPass.h"
 
 #include "EntityTreeRenderer.h"
-#include "polyvox_vert.h"
-#include "polyvox_frag.h"
-#include "polyvox_fade_vert.h"
-#include "polyvox_fade_frag.h"
+
+INCLUDE_SHADER(polyvox_vert)
+INCLUDE_SHADER(polyvox_frag)
+INCLUDE_SHADER(polyvox_fade_vert)
+INCLUDE_SHADER(polyvox_fade_frag)
 
 #include "RenderablePolyVoxEntityItem.h"
 #include "EntityEditPacketSender.h"
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index cdee2c5ec9..cd02186440 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -16,8 +16,8 @@
 #include <GeometryCache.h>
 #include <PerfStat.h>
 
-#include <render-utils/simple_vert.h>
-#include <render-utils/simple_frag.h>
+INCLUDE_SHADER(simple_vert)
+INCLUDE_SHADER(simple_frag)
 
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
diff --git a/libraries/gpu/src/gpu/Shader.h b/libraries/gpu/src/gpu/Shader.h
index 181c9b5e78..5cfdbc8bf4 100755
--- a/libraries/gpu/src/gpu/Shader.h
+++ b/libraries/gpu/src/gpu/Shader.h
@@ -17,6 +17,8 @@
 #include <set>
 
 #include <QUrl>
+
+#define INCLUDE_SHADER(source) extern const char source[];
  
 namespace gpu {
 
diff --git a/libraries/gpu/src/gpu/StandardShaderLib.cpp b/libraries/gpu/src/gpu/StandardShaderLib.cpp
index 0d8d131e0b..93c2228de6 100755
--- a/libraries/gpu/src/gpu/StandardShaderLib.cpp
+++ b/libraries/gpu/src/gpu/StandardShaderLib.cpp
@@ -12,21 +12,21 @@
 //
 #include "StandardShaderLib.h"
 
-#include "DrawUnitQuadTexcoord_vert.h"
-#include "DrawTransformUnitQuad_vert.h"
-#include "DrawTexcoordRectTransformUnitQuad_vert.h"
-#include "DrawViewportQuadTransformTexcoord_vert.h"
-#include "DrawVertexPosition_vert.h"
-#include "DrawTransformVertexPosition_vert.h"
+INCLUDE_SHADER(DrawUnitQuadTexcoord_vert)
+INCLUDE_SHADER(DrawTransformUnitQuad_vert)
+INCLUDE_SHADER(DrawTexcoordRectTransformUnitQuad_vert)
+INCLUDE_SHADER(DrawViewportQuadTransformTexcoord_vert)
+INCLUDE_SHADER(DrawVertexPosition_vert)
+INCLUDE_SHADER(DrawTransformVertexPosition_vert)
 
 const char DrawNada_frag[] = "void main(void) {}"; // DrawNada is really simple...
 
-#include "DrawWhite_frag.h"
-#include "DrawColor_frag.h"
-#include "DrawTexture_frag.h"
-#include "DrawTextureMirroredX_frag.h"
-#include "DrawTextureOpaque_frag.h"
-#include "DrawColoredTexture_frag.h"
+INCLUDE_SHADER(DrawWhite_frag)
+INCLUDE_SHADER(DrawColor_frag)
+INCLUDE_SHADER(DrawTexture_frag)
+INCLUDE_SHADER(DrawTextureMirroredX_frag)
+INCLUDE_SHADER(DrawTextureOpaque_frag)
+INCLUDE_SHADER(DrawColoredTexture_frag)
 
 using namespace gpu;
 
diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index fd3061afa5..7e03890c85 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -15,8 +15,8 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-#include "skybox_vert.h"
-#include "skybox_frag.h"
+INCLUDE_SHADER(skybox_vert)
+INCLUDE_SHADER(skybox_frag)
 
 using namespace model;
 
diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp
index 7b718515a8..c0ebdbb186 100644
--- a/libraries/procedural/src/procedural/Procedural.cpp
+++ b/libraries/procedural/src/procedural/Procedural.cpp
@@ -20,7 +20,7 @@
 #include <NumericalConstants.h>
 #include <GLMHelpers.h>
 
-#include "ProceduralCommon_frag.h"
+INCLUDE_SHADER(ProceduralCommon_frag)
 
 #include "Logging.h"
 
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
index 9544759037..452d3f639a 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
@@ -15,8 +15,8 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-#include <model/skybox_vert.h>
-#include <model/skybox_frag.h>
+INCLUDE_SHADER(skybox_vert)
+INCLUDE_SHADER(skybox_frag)
 
 ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
     _procedural._vertexSource = skybox_vert;
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index 83753131c8..f5b4f0f6bb 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -28,11 +28,11 @@
 #include "DependencyManager.h"
 #include "ViewFrustum.h"
 
-#include "ssao_makePyramid_frag.h"
-#include "ssao_makeOcclusion_frag.h"
-#include "ssao_debugOcclusion_frag.h"
-#include "ssao_makeHorizontalBlur_frag.h"
-#include "ssao_makeVerticalBlur_frag.h"
+INCLUDE_SHADER(ssao_makePyramid_frag)
+INCLUDE_SHADER(ssao_makeOcclusion_frag)
+INCLUDE_SHADER(ssao_debugOcclusion_frag)
+INCLUDE_SHADER(ssao_makeHorizontalBlur_frag)
+INCLUDE_SHADER(ssao_makeVerticalBlur_frag)
 
 
 AmbientOcclusionFramebuffer::AmbientOcclusionFramebuffer() {
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index c22e99cbbc..53ed3ea9a0 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -9,8 +9,6 @@
 
 #include <qmath.h>
 
-#include "animdebugdraw_vert.h"
-#include "animdebugdraw_frag.h"
 #include <gpu/Batch.h>
 #include "AbstractViewStateInterface.h"
 #include "RenderUtilsLogging.h"
@@ -19,6 +17,9 @@
 
 #include "AnimDebugDraw.h"
 
+INCLUDE_SHADER(animdebugdraw_vert)
+INCLUDE_SHADER(animdebugdraw_frag)
+
 class AnimDebugDrawData {
 public:
 
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 70c2e3b5ce..078e906fad 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -23,9 +23,9 @@
 #include "ViewFrustum.h"
 #include "GeometryCache.h"
 
-#include "fxaa_vert.h"
-#include "fxaa_frag.h"
-#include "fxaa_blend_frag.h"
+INCLUDE_SHADER(fxaa_vert)
+INCLUDE_SHADER(fxaa_frag)
+INCLUDE_SHADER(fxaa_blend_frag)
 
 
 Antialiasing::Antialiasing() {
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index 9d9367a6d5..ace347f99e 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -16,8 +16,8 @@
 #include <render/BlurTask.h>
 #include <render/ResampleTask.h>
 
-#include "BloomThreshold_frag.h"
-#include "BloomApply_frag.h"
+INCLUDE_SHADER(BloomThreshold_frag)
+INCLUDE_SHADER(BloomApply_frag)
 
 #define BLOOM_BLUR_LEVEL_COUNT  3
 
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index fe03ead4e1..05cd6a6f0e 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -23,8 +23,8 @@
 #include "TextureCache.h"
 #include "DeferredLightingEffect.h"
 
-#include "debug_deferred_buffer_vert.h"
-#include "debug_deferred_buffer_frag.h"
+INCLUDE_SHADER(debug_deferred_buffer_vert)
+INCLUDE_SHADER(debug_deferred_buffer_frag)
 
 using namespace render;
 
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 81a33f17e3..8ec2c74353 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -24,18 +24,18 @@
 #include "TextureCache.h"
 #include "FramebufferCache.h"
 
-#include "deferred_light_vert.h"
-#include "deferred_light_point_vert.h"
-#include "deferred_light_spot_vert.h"
+INCLUDE_SHADER(deferred_light_vert)
+INCLUDE_SHADER(deferred_light_point_vert)
+INCLUDE_SHADER(deferred_light_spot_vert)
 
-#include "directional_ambient_light_frag.h"
-#include "directional_skybox_light_frag.h"
+INCLUDE_SHADER(directional_ambient_light_frag)
+INCLUDE_SHADER(directional_skybox_light_frag)
 
-#include "directional_ambient_light_shadow_frag.h"
-#include "directional_skybox_light_shadow_frag.h"
+INCLUDE_SHADER(directional_ambient_light_shadow_frag)
+INCLUDE_SHADER(directional_skybox_light_shadow_frag)
 
-#include "local_lights_shading_frag.h"
-#include "local_lights_drawOutline_frag.h"
+INCLUDE_SHADER(local_lights_shading_frag)
+INCLUDE_SHADER(local_lights_drawOutline_frag)
 
 
 using namespace render;
diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp
index da07f5bd9b..dc1893b347 100644
--- a/libraries/render-utils/src/DrawHaze.cpp
+++ b/libraries/render-utils/src/DrawHaze.cpp
@@ -19,7 +19,7 @@
 #include "HazeStage.h"
 #include "LightStage.h"
 
-#include "Haze_frag.h"
+INCLUDE_SHADER(Haze_frag)
 
 void HazeConfig::setHazeColor(const glm::vec3 value) { 
     hazeColor = value; 
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 2616d08600..ac8b300e49 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -34,21 +34,21 @@
 #include "model/TextureMap.h"
 #include "render/Args.h"
 
-#include "standardTransformPNTC_vert.h"
-#include "standardDrawTexture_frag.h"
+INCLUDE_SHADER(standardTransformPNTC_vert)
+INCLUDE_SHADER(standardDrawTexture_frag)
 
-#include "simple_vert.h"
-#include "simple_textured_frag.h"
-#include "simple_textured_unlit_frag.h"
-#include "simple_fade_vert.h"
-#include "simple_textured_fade_frag.h"
-#include "simple_textured_unlit_fade_frag.h"
-#include "simple_opaque_web_browser_frag.h"
-#include "simple_transparent_web_browser_frag.h"
-#include "glowLine_vert.h"
-#include "glowLine_frag.h"
+INCLUDE_SHADER(simple_vert)
+INCLUDE_SHADER(simple_textured_frag)
+INCLUDE_SHADER(simple_textured_unlit_frag)
+INCLUDE_SHADER(simple_fade_vert)
+INCLUDE_SHADER(simple_textured_fade_frag)
+INCLUDE_SHADER(simple_textured_unlit_fade_frag)
+INCLUDE_SHADER(simple_opaque_web_browser_frag)
+INCLUDE_SHADER(simple_transparent_web_browser_frag)
+INCLUDE_SHADER(glowLine_vert)
+INCLUDE_SHADER(glowLine_frag)
 
-#include "grid_frag.h"
+INCLUDE_SHADER(grid_frag)
 
 //#define WANT_DEBUG
 
diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index fee1f4a568..69feffb055 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -22,13 +22,13 @@
 
 #include <sstream>
 
-#include "surfaceGeometry_copyDepth_frag.h"
-#include "debug_deferred_buffer_vert.h"
-#include "debug_deferred_buffer_frag.h"
-#include "Highlight_frag.h"
-#include "Highlight_filled_frag.h"
-#include "Highlight_aabox_vert.h"
-#include "nop_frag.h"
+INCLUDE_SHADER(surfaceGeometry_copyDepth_frag)
+INCLUDE_SHADER(debug_deferred_buffer_vert)
+INCLUDE_SHADER(debug_deferred_buffer_frag)
+INCLUDE_SHADER(Highlight_frag)
+INCLUDE_SHADER(Highlight_filled_frag)
+INCLUDE_SHADER(Highlight_aabox_vert)
+INCLUDE_SHADER(nop_frag)
 
 using namespace render;
 
@@ -547,10 +547,10 @@ const render::Varying DrawHighlightTask::addSelectItemJobs(JobModel& task, const
     return task.addJob<SelectItems>("TransparentSelection", selectItemInput);
 }
 
-#include "model_shadow_vert.h"
-#include "skin_model_shadow_vert.h"
+INCLUDE_SHADER(model_shadow_vert)
+INCLUDE_SHADER(skin_model_shadow_vert)
 
-#include "model_shadow_frag.h"
+INCLUDE_SHADER(model_shadow_frag)
 
 void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gpu::StatePointer state) {
     auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index d6ac7fd2e2..79d755683f 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -18,15 +18,15 @@
 
 #include "StencilMaskPass.h"
 
-#include "lightClusters_drawGrid_vert.h"
-#include "lightClusters_drawGrid_frag.h"
+INCLUDE_SHADER(lightClusters_drawGrid_vert)
+INCLUDE_SHADER(lightClusters_drawGrid_frag)
 
-//#include "lightClusters_drawClusterFromDepth_vert.h"
-#include "lightClusters_drawClusterFromDepth_frag.h"
+//INCLUDE_SHADER(lightClusters_drawClusterFromDepth_vert)
+INCLUDE_SHADER(lightClusters_drawClusterFromDepth_frag)
 
 
-#include "lightClusters_drawClusterContent_vert.h"
-#include "lightClusters_drawClusterContent_frag.h"
+INCLUDE_SHADER(lightClusters_drawClusterContent_vert)
+INCLUDE_SHADER(lightClusters_drawClusterContent_frag)
 
 enum LightClusterGridShader_MapSlot {
     DEFERRED_BUFFER_LINEAR_DEPTH_UNIT = 0,
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index c83251c605..8d02281d05 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -24,7 +24,7 @@
 
 #include <gpu/StandardShaderLib.h>
 
-#include "nop_frag.h"
+INCLUDE_SHADER(nop_frag)
 
 using namespace render;
 extern void initForwardPipelines(ShapePlumber& plumber);
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 7f644add72..62252d3a0b 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -20,86 +20,86 @@
 #include "TextureCache.h"
 #include "render/DrawTask.h"
 
-#include "model_vert.h"
-#include "model_normal_map_vert.h"
-#include "model_lightmap_vert.h"
-#include "model_lightmap_normal_map_vert.h"
-#include "skin_model_vert.h"
-#include "skin_model_normal_map_vert.h"
+INCLUDE_SHADER(model_vert)
+INCLUDE_SHADER(model_normal_map_vert)
+INCLUDE_SHADER(model_lightmap_vert)
+INCLUDE_SHADER(model_lightmap_normal_map_vert)
+INCLUDE_SHADER(skin_model_vert)
+INCLUDE_SHADER(skin_model_normal_map_vert)
 
-#include "model_lightmap_fade_vert.h"
-#include "model_lightmap_normal_map_fade_vert.h"
-#include "skin_model_fade_vert.h"
-#include "skin_model_normal_map_fade_vert.h"
+INCLUDE_SHADER(model_lightmap_fade_vert)
+INCLUDE_SHADER(model_lightmap_normal_map_fade_vert)
+INCLUDE_SHADER(skin_model_fade_vert)
+INCLUDE_SHADER(skin_model_normal_map_fade_vert)
 
-#include "simple_vert.h"
-#include "simple_textured_frag.h"
-#include "simple_textured_unlit_frag.h"
-#include "simple_transparent_textured_frag.h"
-#include "simple_transparent_textured_unlit_frag.h"
+INCLUDE_SHADER(simple_vert)
+INCLUDE_SHADER(simple_textured_frag)
+INCLUDE_SHADER(simple_textured_unlit_frag)
+INCLUDE_SHADER(simple_transparent_textured_frag)
+INCLUDE_SHADER(simple_transparent_textured_unlit_frag)
 
-#include "simple_fade_vert.h"
-#include "simple_textured_fade_frag.h"
-#include "simple_textured_unlit_fade_frag.h"
-#include "simple_transparent_textured_fade_frag.h"
-#include "simple_transparent_textured_unlit_fade_frag.h"
+INCLUDE_SHADER(simple_fade_vert)
+INCLUDE_SHADER(simple_textured_fade_frag)
+INCLUDE_SHADER(simple_textured_unlit_fade_frag)
+INCLUDE_SHADER(simple_transparent_textured_fade_frag)
+INCLUDE_SHADER(simple_transparent_textured_unlit_fade_frag)
 
-#include "model_frag.h"
-#include "model_unlit_frag.h"
-#include "model_normal_map_frag.h"
-#include "model_normal_specular_map_frag.h"
-#include "model_specular_map_frag.h"
+INCLUDE_SHADER(model_frag)
+INCLUDE_SHADER(model_unlit_frag)
+INCLUDE_SHADER(model_normal_map_frag)
+INCLUDE_SHADER(model_normal_specular_map_frag)
+INCLUDE_SHADER(model_specular_map_frag)
 
-#include "model_fade_vert.h"
-#include "model_normal_map_fade_vert.h"
+INCLUDE_SHADER(model_fade_vert)
+INCLUDE_SHADER(model_normal_map_fade_vert)
 
-#include "model_fade_frag.h"
-#include "model_unlit_fade_frag.h"
-#include "model_normal_map_fade_frag.h"
-#include "model_normal_specular_map_fade_frag.h"
-#include "model_specular_map_fade_frag.h"
+INCLUDE_SHADER(model_fade_frag)
+INCLUDE_SHADER(model_unlit_fade_frag)
+INCLUDE_SHADER(model_normal_map_fade_frag)
+INCLUDE_SHADER(model_normal_specular_map_fade_frag)
+INCLUDE_SHADER(model_specular_map_fade_frag)
 
-#include "forward_model_frag.h"
-#include "forward_model_unlit_frag.h"
-#include "forward_model_normal_map_frag.h"
-#include "forward_model_normal_specular_map_frag.h"
-#include "forward_model_specular_map_frag.h"
+INCLUDE_SHADER(forward_model_frag)
+INCLUDE_SHADER(forward_model_unlit_frag)
+INCLUDE_SHADER(forward_model_normal_map_frag)
+INCLUDE_SHADER(forward_model_normal_specular_map_frag)
+INCLUDE_SHADER(forward_model_specular_map_frag)
 
-#include "model_lightmap_frag.h"
-#include "model_lightmap_normal_map_frag.h"
-#include "model_lightmap_normal_specular_map_frag.h"
-#include "model_lightmap_specular_map_frag.h"
-#include "model_translucent_frag.h"
-#include "model_translucent_unlit_frag.h"
+INCLUDE_SHADER(model_lightmap_frag)
+INCLUDE_SHADER(model_lightmap_normal_map_frag)
+INCLUDE_SHADER(model_lightmap_normal_specular_map_frag)
+INCLUDE_SHADER(model_lightmap_specular_map_frag)
+INCLUDE_SHADER(model_translucent_frag)
+INCLUDE_SHADER(model_translucent_unlit_frag)
 
-#include "model_lightmap_fade_frag.h"
-#include "model_lightmap_normal_map_fade_frag.h"
-#include "model_lightmap_normal_specular_map_fade_frag.h"
-#include "model_lightmap_specular_map_fade_frag.h"
-#include "model_translucent_fade_frag.h"
-#include "model_translucent_unlit_fade_frag.h"
+INCLUDE_SHADER(model_lightmap_fade_frag)
+INCLUDE_SHADER(model_lightmap_normal_map_fade_frag)
+INCLUDE_SHADER(model_lightmap_normal_specular_map_fade_frag)
+INCLUDE_SHADER(model_lightmap_specular_map_fade_frag)
+INCLUDE_SHADER(model_translucent_fade_frag)
+INCLUDE_SHADER(model_translucent_unlit_fade_frag)
 
-#include "overlay3D_vert.h"
-#include "overlay3D_frag.h"
-#include "overlay3D_model_frag.h"
-#include "overlay3D_model_translucent_frag.h"
-#include "overlay3D_translucent_frag.h"
-#include "overlay3D_unlit_frag.h"
-#include "overlay3D_translucent_unlit_frag.h"
-#include "overlay3D_model_unlit_frag.h"
-#include "overlay3D_model_translucent_unlit_frag.h"
+INCLUDE_SHADER(overlay3D_vert)
+INCLUDE_SHADER(overlay3D_frag)
+INCLUDE_SHADER(overlay3D_model_frag)
+INCLUDE_SHADER(overlay3D_model_translucent_frag)
+INCLUDE_SHADER(overlay3D_translucent_frag)
+INCLUDE_SHADER(overlay3D_unlit_frag)
+INCLUDE_SHADER(overlay3D_translucent_unlit_frag)
+INCLUDE_SHADER(overlay3D_model_unlit_frag)
+INCLUDE_SHADER(overlay3D_model_translucent_unlit_frag)
 
-#include "model_shadow_vert.h"
-#include "skin_model_shadow_vert.h"
+INCLUDE_SHADER(model_shadow_vert)
+INCLUDE_SHADER(skin_model_shadow_vert)
 
-#include "model_shadow_frag.h"
-#include "skin_model_shadow_frag.h"
+INCLUDE_SHADER(model_shadow_frag)
+INCLUDE_SHADER(skin_model_shadow_frag)
 
-#include "model_shadow_fade_vert.h"
-#include "skin_model_shadow_fade_vert.h"
+INCLUDE_SHADER(model_shadow_fade_vert)
+INCLUDE_SHADER(skin_model_shadow_fade_vert)
 
-#include "model_shadow_fade_frag.h"
-#include "skin_model_shadow_fade_frag.h"
+INCLUDE_SHADER(model_shadow_fade_frag)
+INCLUDE_SHADER(skin_model_shadow_fade_frag)
 
 using namespace render;
 using namespace std::placeholders;
diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp
index f71111b64e..e2a8b31f08 100644
--- a/libraries/render-utils/src/StencilMaskPass.cpp
+++ b/libraries/render-utils/src/StencilMaskPass.cpp
@@ -17,7 +17,7 @@
 
 #include <gpu/StandardShaderLib.h>
 
-#include "stencil_drawMask_frag.h"
+INCLUDE_SHADER(stencil_drawMask_frag)
 
 using namespace render;
 
diff --git a/libraries/render-utils/src/SubsurfaceScattering.cpp b/libraries/render-utils/src/SubsurfaceScattering.cpp
index 1786898e57..e8d7e23ec2 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.cpp
+++ b/libraries/render-utils/src/SubsurfaceScattering.cpp
@@ -17,11 +17,11 @@
 
 #include "DeferredLightingEffect.h"
 
-#include "subsurfaceScattering_makeProfile_frag.h"
-#include "subsurfaceScattering_makeLUT_frag.h"
-#include "subsurfaceScattering_makeSpecularBeckmann_frag.h"
+INCLUDE_SHADER(subsurfaceScattering_makeProfile_frag)
+INCLUDE_SHADER(subsurfaceScattering_makeLUT_frag)
+INCLUDE_SHADER(subsurfaceScattering_makeSpecularBeckmann_frag)
 
-#include "subsurfaceScattering_drawScattering_frag.h"
+INCLUDE_SHADER(subsurfaceScattering_drawScattering_frag)
 
 enum ScatteringShaderBufferSlots {
     ScatteringTask_FrameTransformSlot = 0,
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index c4eea7ce7f..6ad8dc6137 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -25,10 +25,10 @@ const int SurfaceGeometryPass_ParamsSlot = 1;
 const int SurfaceGeometryPass_DepthMapSlot = 0;
 const int SurfaceGeometryPass_NormalMapSlot = 1;
 
-#include "surfaceGeometry_makeLinearDepth_frag.h"
-#include "surfaceGeometry_downsampleDepthNormal_frag.h"
+INCLUDE_SHADER(surfaceGeometry_makeLinearDepth_frag)
+INCLUDE_SHADER(surfaceGeometry_downsampleDepthNormal_frag)
 
-#include "surfaceGeometry_makeCurvature_frag.h"
+INCLUDE_SHADER(surfaceGeometry_makeCurvature_frag)
 
 
 
diff --git a/libraries/render-utils/src/TextRenderer3D.cpp b/libraries/render-utils/src/TextRenderer3D.cpp
index 9c85952107..06e041685a 100644
--- a/libraries/render-utils/src/TextRenderer3D.cpp
+++ b/libraries/render-utils/src/TextRenderer3D.cpp
@@ -25,8 +25,8 @@
 #include "MatrixStack.h"
 #include "RenderUtilsLogging.h"
 
-#include "sdf_text3D_vert.h"
-#include "sdf_text3D_frag.h"
+INCLUDE_SHADER(sdf_text3D_vert)
+INCLUDE_SHADER(sdf_text3D_frag)
 
 #include "GeometryCache.h"
 
diff --git a/libraries/render-utils/src/ToneMappingEffect.cpp b/libraries/render-utils/src/ToneMappingEffect.cpp
index 72d692c5b2..3d3a11f7b3 100644
--- a/libraries/render-utils/src/ToneMappingEffect.cpp
+++ b/libraries/render-utils/src/ToneMappingEffect.cpp
@@ -17,7 +17,7 @@
 #include "StencilMaskPass.h"
 #include "FramebufferCache.h"
 
-#include "toneMapping_frag.h"
+INCLUDE_SHADER(toneMapping_frag)
 
 const int ToneMappingEffect_ParamsSlot = 0;
 const int ToneMappingEffect_LightingMapSlot = 0;
diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp
index c0d01c2eaf..77b5c492d3 100644
--- a/libraries/render-utils/src/ZoneRenderer.cpp
+++ b/libraries/render-utils/src/ZoneRenderer.cpp
@@ -20,9 +20,9 @@
 #include "StencilMaskPass.h"
 #include "DeferredLightingEffect.h"
 
-#include "zone_drawKeyLight_frag.h"
-#include "zone_drawAmbient_frag.h"
-#include "zone_drawSkybox_frag.h"
+INCLUDE_SHADER(zone_drawKeyLight_frag)
+INCLUDE_SHADER(zone_drawAmbient_frag)
+INCLUDE_SHADER(zone_drawSkybox_frag)
 
 
 using namespace render;
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index 8449c58c7c..9e0fbd1522 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -7,9 +7,9 @@
 
 #include <StreamHelpers.h>
 
-#include "sdf_text3D_vert.h"
-#include "sdf_text3D_frag.h"
-#include "sdf_text3D_transparent_frag.h"
+INCLUDE_SHADER(sdf_text3D_vert)
+INCLUDE_SHADER(sdf_text3D_frag)
+INCLUDE_SHADER(sdf_text3D_transparent_frag)
 
 #include "../RenderUtilsLogging.h"
 #include "FontFamilies.h"
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index 2be6f8fad2..4b5d6da8e3 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -13,11 +13,11 @@
 #include <gpu/Context.h>
 #include <gpu/StandardShaderLib.h>
 
-#include "blurGaussianV_frag.h"
-#include "blurGaussianH_frag.h"
+INCLUDE_SHADER(blurGaussianV_frag)
+INCLUDE_SHADER(blurGaussianH_frag)
 
-#include "blurGaussianDepthAwareV_frag.h"
-#include "blurGaussianDepthAwareH_frag.h"
+INCLUDE_SHADER(blurGaussianDepthAwareV_frag)
+INCLUDE_SHADER(blurGaussianDepthAwareH_frag)
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp
index 36663a454a..7823d85dae 100644
--- a/libraries/render/src/render/DrawSceneOctree.cpp
+++ b/libraries/render/src/render/DrawSceneOctree.cpp
@@ -22,12 +22,12 @@
 
 #include "Args.h"
 
-#include "drawCellBounds_vert.h"
-#include "drawCellBounds_frag.h"
-#include "drawLODReticle_frag.h"
+INCLUDE_SHADER(drawCellBounds_vert)
+INCLUDE_SHADER(drawCellBounds_frag)
+INCLUDE_SHADER(drawLODReticle_frag)
 
-#include "drawItemBounds_vert.h"
-#include "drawItemBounds_frag.h"
+INCLUDE_SHADER(drawItemBounds_vert)
+INCLUDE_SHADER(drawItemBounds_frag)
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp
index 148e104453..1c6d7749f8 100644
--- a/libraries/render/src/render/DrawStatus.cpp
+++ b/libraries/render/src/render/DrawStatus.cpp
@@ -21,10 +21,10 @@
 
 #include "Args.h"
 
-#include "drawItemBounds_vert.h"
-#include "drawItemBounds_frag.h"
-#include "drawItemStatus_vert.h"
-#include "drawItemStatus_frag.h"
+INCLUDE_SHADER(drawItemBounds_vert)
+INCLUDE_SHADER(drawItemBounds_frag)
+INCLUDE_SHADER(drawItemStatus_vert)
+INCLUDE_SHADER(drawItemStatus_frag)
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index 629cc55ccb..a6d5072cca 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -22,8 +22,8 @@
 #include <gpu/Context.h>
 #include <gpu/StandardShaderLib.h>
 
-#include <drawItemBounds_vert.h>
-#include <drawItemBounds_frag.h>
+INCLUDE_SHADER(drawItemBounds_vert)
+INCLUDE_SHADER(drawItemBounds_frag)
 
 using namespace render;
 
diff --git a/libraries/render/src/render/drawItemBounds.slf b/libraries/render/src/render/drawItemBounds.slf
index e01d1607bd..84c47d0933 100644
--- a/libraries/render/src/render/drawItemBounds.slf
+++ b/libraries/render/src/render/drawItemBounds.slf
@@ -15,7 +15,6 @@ in vec4 varColor;
 in vec2 varTexcoord;
 out vec4 outFragColor;
 
-
 void main(void) {
     float var = step(fract(varTexcoord.x * varTexcoord.y * 1.0), 0.5);
 
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 7c6886ad93..e0babc8b47 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -23,65 +23,65 @@
 
 #include <gl/QOpenGLContextWrapper.h>
 
-#include <render-utils/simple_vert.h>
-#include <render-utils/simple_frag.h>
-#include <render-utils/simple_textured_frag.h>
-#include <render-utils/simple_textured_unlit_frag.h>
+INCLUDE_SHADER(simple_vert)
+INCLUDE_SHADER(simple_frag)
+INCLUDE_SHADER(simple_textured_frag)
+INCLUDE_SHADER(simple_textured_unlit_frag)
 
-#include <render-utils/deferred_light_vert.h>
-#include <render-utils/deferred_light_point_vert.h>
-#include <render-utils/deferred_light_spot_vert.h>
+INCLUDE_SHADER(deferred_light_vert)
+INCLUDE_SHADER(deferred_light_point_vert)
+INCLUDE_SHADER(deferred_light_spot_vert)
 
-#include <render-utils/directional_ambient_light_frag.h>
-#include <render-utils/directional_skybox_light_frag.h>
+INCLUDE_SHADER(directional_ambient_light_frag)
+INCLUDE_SHADER(directional_skybox_light_frag)
 
-#include <render-utils/standardTransformPNTC_vert.h>
-#include <render-utils/standardDrawTexture_frag.h>
+INCLUDE_SHADER(standardTransformPNTC_vert)
+INCLUDE_SHADER(standardDrawTexture_frag)
 
-#include <render-utils/model_vert.h>
-#include <render-utils/model_shadow_vert.h>
-#include <render-utils/model_normal_map_vert.h>
-#include <render-utils/model_lightmap_vert.h>
-#include <render-utils/model_lightmap_normal_map_vert.h>
-#include <render-utils/skin_model_vert.h>
-#include <render-utils/skin_model_shadow_vert.h>
-#include <render-utils/skin_model_normal_map_vert.h>
+INCLUDE_SHADER(model_vert)
+INCLUDE_SHADER(model_shadow_vert)
+INCLUDE_SHADER(model_normal_map_vert)
+INCLUDE_SHADER(model_lightmap_vert)
+INCLUDE_SHADER(model_lightmap_normal_map_vert)
+INCLUDE_SHADER(skin_model_vert)
+INCLUDE_SHADER(skin_model_shadow_vert)
+INCLUDE_SHADER(skin_model_normal_map_vert)
 
-#include <render-utils/model_frag.h>
-#include <render-utils/model_shadow_frag.h>
-#include <render-utils/model_normal_map_frag.h>
-#include <render-utils/model_normal_specular_map_frag.h>
-#include <render-utils/model_specular_map_frag.h>
-#include <render-utils/model_lightmap_frag.h>
-#include <render-utils/model_lightmap_normal_map_frag.h>
-#include <render-utils/model_lightmap_normal_specular_map_frag.h>
-#include <render-utils/model_lightmap_specular_map_frag.h>
-#include <render-utils/model_translucent_frag.h>
+INCLUDE_SHADER(model_frag)
+INCLUDE_SHADER(model_shadow_frag)
+INCLUDE_SHADER(model_normal_map_frag)
+INCLUDE_SHADER(model_normal_specular_map_frag)
+INCLUDE_SHADER(model_specular_map_frag)
+INCLUDE_SHADER(model_lightmap_frag)
+INCLUDE_SHADER(model_lightmap_normal_map_frag)
+INCLUDE_SHADER(model_lightmap_normal_specular_map_frag)
+INCLUDE_SHADER(model_lightmap_specular_map_frag)
+INCLUDE_SHADER(model_translucent_frag)
 
-#include <entities-renderer/textured_particle_frag.h>
-#include <entities-renderer/textured_particle_vert.h>
+INCLUDE_SHADER(textured_particle_frag)
+INCLUDE_SHADER(textured_particle_vert)
 
-#include <render-utils/overlay3D_vert.h>
-#include <render-utils/overlay3D_frag.h>
+INCLUDE_SHADER(overlay3D_vert)
+INCLUDE_SHADER(overlay3D_frag)
 
-#include <model/skybox_vert.h>
-#include <model/skybox_frag.h>
+INCLUDE_SHADER(skybox_vert)
+INCLUDE_SHADER(skybox_frag)
 
-#include <gpu/DrawTransformUnitQuad_vert.h>
-#include <gpu/DrawTexcoordRectTransformUnitQuad_vert.h>
-#include <gpu/DrawViewportQuadTransformTexcoord_vert.h>
-#include <gpu/DrawTexture_frag.h>
-#include <gpu/DrawTextureOpaque_frag.h>
-#include <gpu/DrawColoredTexture_frag.h>
+INCLUDE_SHADER(DrawTransformUnitQuad_vert)
+INCLUDE_SHADER(DrawTexcoordRectTransformUnitQuad_vert)
+INCLUDE_SHADER(DrawViewportQuadTransformTexcoord_vert)
+INCLUDE_SHADER(DrawTexture_frag)
+INCLUDE_SHADER(DrawTextureOpaque_frag)
+INCLUDE_SHADER(DrawColoredTexture_frag)
 
-#include <render-utils/sdf_text3D_vert.h>
-#include <render-utils/sdf_text3D_frag.h>
+INCLUDE_SHADER(sdf_text3D_vert)
+INCLUDE_SHADER(sdf_text3D_frag)
 
-#include <entities-renderer/paintStroke_vert.h>
-#include <entities-renderer/paintStroke_frag.h>
+INCLUDE_SHADER(paintStroke_vert)
+INCLUDE_SHADER(paintStroke_frag)
 
-#include <entities-renderer/polyvox_vert.h>
-#include <entities-renderer/polyvox_frag.h>
+INCLUDE_SHADER(polyvox_vert)
+INCLUDE_SHADER(polyvox_frag)
 
 // Create a simple OpenGL window that renders text in various ways
 class QTestWindow : public QWindow {
diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index 810f6c0f45..fef2ea0308 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -123,7 +123,7 @@ int main (int argc, char** argv) {
         cerr << "       varname and varvalue must be made of alpha numerical characters with no spaces." << endl;
         cerr << "  -listVars : Will list the vars name and value in the standard output." << endl;
         cerr << "  -showParseTree : Draw the tree obtained while parsing the source" << endl;
-        cerr << "  -c++ : Generate a c++ header file containing the output file stream stored as a char[] variable" << endl;
+        cerr << "  -c++ : Generate a c++ source file containing the output file stream stored as a char[] variable" << endl;
         return 0;
     }
 
@@ -209,9 +209,7 @@ int main (int argc, char** argv) {
         }
 
         targetStringStream << "// File generated by Scribe " << vars["_SCRIBE_DATE"] << std::endl;
-        targetStringStream << "#ifndef scribe_" << targetName << "_h" << std::endl;
-        targetStringStream << "#define scribe_" << targetName << "_h" << std::endl << std::endl;
-
+        targetStringStream << "extern const char " << targetName << "[];\n";
         targetStringStream << "const char " << targetName << "[] = \n";
 
         // Write the pages content
@@ -219,8 +217,6 @@ int main (int argc, char** argv) {
             targetStringStream << "R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\"\n";
         }
         targetStringStream << ";\n" << std::endl << std::endl;
-
-        targetStringStream << "#endif" << std::endl;
     } else {
         targetStringStream << destStringStream.str();
     }

From 420b58fd5b031bac28f11e281e006cd6d891f113 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 12 Jan 2018 15:13:55 +0100
Subject: [PATCH 025/569] Trying to fix Android build error

---
 tools/scribe/src/main.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index fef2ea0308..b95d1df6ec 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -209,8 +209,7 @@ int main (int argc, char** argv) {
         }
 
         targetStringStream << "// File generated by Scribe " << vars["_SCRIBE_DATE"] << std::endl;
-        targetStringStream << "extern const char " << targetName << "[];\n";
-        targetStringStream << "const char " << targetName << "[] = \n";
+        targetStringStream << "extern const char " << targetName << "[] = \n";
 
         // Write the pages content
         for (auto page : pages) {

From 98a47e56fc447f9ad3ad2fd1057ed1ee218ac146 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 12 Jan 2018 17:32:12 +0100
Subject: [PATCH 026/569] Added a hack to force referencing of shader source on
 Android

---
 tools/scribe/src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index b95d1df6ec..8e6ca31c71 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -127,7 +127,7 @@ int main (int argc, char** argv) {
         return 0;
     }
 
-    // Define targetName: if none, get destFilenmae, if none get srcFilename
+    // Define targetName: if none, get destFilename, if none get srcFilename
     if (targetName.empty()) {
         if (destFilename.empty()) {
             targetName = srcFilename;
@@ -216,6 +216,8 @@ int main (int argc, char** argv) {
             targetStringStream << "R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\"\n";
         }
         targetStringStream << ";\n" << std::endl << std::endl;
+        targetStringStream << "// Hack to fix Android link error by forcing a reference to global variable\n";
+        targetStringStream << "class " << targetName << "_used {\npublic:\nstatic const char* get() { return " << targetName << "; }\n};\n" << std::endl;
     } else {
         targetStringStream << destStringStream.str();
     }

From 241849139ffe1c0a28181c7cd32a0d65857379dd Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 15 Jan 2018 10:21:16 -0800
Subject: [PATCH 027/569] wip

---
 libraries/entities/CMakeLists.txt             |   6 +-
 .../entities/src/EntityItemProperties.cpp     |  43 +++++++
 libraries/entities/src/EntityItemProperties.h |  37 ++++--
 .../entities/src/EntityItemPropertiesMacros.h |   1 +
 libraries/entities/src/EntityPropertyFlags.h  |   7 +
 libraries/entities/src/EntityTypes.cpp        |   2 +
 libraries/entities/src/EntityTypes.h          |   3 +-
 libraries/entities/src/MaterialEntityItem.cpp | 120 ++++++++++++++++++
 libraries/entities/src/MaterialEntityItem.h   |  79 ++++++++++++
 libraries/shared/src/MaterialMode.h           |  18 +++
 10 files changed, 301 insertions(+), 15 deletions(-)
 create mode 100644 libraries/entities/src/MaterialEntityItem.cpp
 create mode 100644 libraries/entities/src/MaterialEntityItem.h
 create mode 100644 libraries/shared/src/MaterialMode.h

diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index c23740654e..191e43ebbe 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,4 +1,8 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-link_hifi_libraries(shared networking octree avatars model)
+include_hifi_library_headers(fbx)
+include_hifi_library_headers(gpu)
+include_hifi_library_headers(image)
+include_hifi_library_headers(ktx)
+link_hifi_libraries(shared networking octree avatars model model-networking)
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 8bfce7e2d2..0edec88edf 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -330,6 +330,13 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_START, radiusStart);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
 
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_URL, materialURL);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_TYPE, materialMode);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_PRIORITY, priority);
+    CHECK_PROPERTY_CHANGE(PROP_PARENT_SHAPE_ID, shapeID);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BOUNDS, materialBounds);
+
     // Certifiable Properties
     CHECK_PROPERTY_CHANGE(PROP_ITEM_NAME, itemName);
     CHECK_PROPERTY_CHANGE(PROP_ITEM_DESCRIPTION, itemDescription);
@@ -623,6 +630,16 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IS_UV_MODE_STRETCH, isUVModeStretch);
     }
 
+    // Materials
+    if (_type == EntityTypes::Material) {
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_URL, materialURL);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_TYPE, materialMode);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_PRIORITY, priority);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_SHAPE_ID, shapeID);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BOUNDS, materialBounds);
+    }
+
     if (!skipDefaults && !strictSemantics) {
         AABox aaBox = getAABox();
         QScriptValue boundingBox = engine->newObject();
@@ -755,6 +772,12 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusSpread, float, setRadiusSpread);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusStart, float, setRadiusStart);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusFinish, float, setRadiusFinish);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialURL, QString, setMaterialURL);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialMode, MaterialMode, setMaterialMode);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(blendFactor, float, setBlendFactor);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, int, setPriority);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(shapeID, int, setShapeID);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialBounds, glmVec4, setMaterialBounds);
 
     // Certifiable Properties
     COPY_PROPERTY_FROM_QSCRIPTVALUE(itemName, QString, setItemName);
@@ -1490,6 +1513,16 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_SHAPE, properties.getShape());
             }
 
+            // Materials
+            if (properties.getType() == EntityTypes::Material) {
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, properties.getMaterialURL());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)properties.getMaterialMode());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, properties.getBlendFactor());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, properties.getPriority());
+                APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, properties.getShapeID());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, properties.getMaterialBounds());
+            }
+
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, properties.getCollisionSoundURL());
             APPEND_ENTITY_PROPERTY(PROP_ACTION_DATA, properties.getActionData());
@@ -1845,6 +1878,16 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE, QString, setShape);
     }
 
+    // Materials
+    if (properties.getType() == EntityTypes::Material) {
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_URL, QString, setMaterialURL);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_PRIORITY, uint32_t, setPriority);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_SHAPE_ID, uint32_t, setShapeID);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_BOUNDS, glmVec4, setMaterialBounds);
+    }
+
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ACTION_DATA, QByteArray, setActionData);
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index c3d04dc7ad..3190d66b63 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -44,6 +44,8 @@
 #include "TextEntityItem.h"
 #include "ZoneEntityItem.h"
 
+#include "MaterialMode.h"
+
 const quint64 UNKNOWN_CREATED_TIME = 0;
 
 using ComponentPair = std::pair<const ComponentMode, const QString>;
@@ -58,19 +60,21 @@ const std::array<ComponentPair, COMPONENT_MODE_ITEM_COUNT> COMPONENT_MODES = { {
 /// set of entity item properties via JavaScript hashes/QScriptValues
 /// all units for SI units (meter, second, radian, etc) 
 class EntityItemProperties {
-    friend class EntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class ModelEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class BoxEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class SphereEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class LightEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class TextEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class WebEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class ShapeEntityItem; // TODO: consider removing this friend relationship and use public methods
+    // TODO: consider removing these friend relationship and use public methods
+    friend class EntityItem;
+    friend class ModelEntityItem;
+    friend class BoxEntityItem;
+    friend class SphereEntityItem;
+    friend class LightEntityItem;
+    friend class TextEntityItem;
+    friend class ParticleEffectEntityItem;
+    friend class ZoneEntityItem;
+    friend class WebEntityItem;
+    friend class LineEntityItem;
+    friend class PolyVoxEntityItem;
+    friend class PolyLineEntityItem;
+    friend class ShapeEntityItem;
+    friend class MaterialEntityItem;
 public:
     EntityItemProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags());
     virtual ~EntityItemProperties() = default;
@@ -218,6 +222,13 @@ public:
     DEFINE_PROPERTY_REF(PROP_QUERY_AA_CUBE, QueryAACube, queryAACube, AACube, AACube());
     DEFINE_PROPERTY_REF(PROP_SHAPE, Shape, shape, QString, "Sphere");
 
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_URL, MaterialURL, materialURL, QString, "");
+    DEFINE_PROPERTY_REF_ENUM(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode, UV);
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float, 1.0f);
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_PRIORITY, Priority, priority, uint32_t, 0);
+    DEFINE_PROPERTY_REF(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, uint32_t, 0);
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_BOUNDS, MaterialBounds, materialBounds, glmVec4, glm::vec4(0, 0, 1, 1));
+
     // Certifiable Properties - related to Proof of Purchase certificates
     DEFINE_PROPERTY_REF(PROP_ITEM_NAME, ItemName, itemName, QString, ENTITY_ITEM_DEFAULT_ITEM_NAME);
     DEFINE_PROPERTY_REF(PROP_ITEM_DESCRIPTION, ItemDescription, itemDescription, QString, ENTITY_ITEM_DEFAULT_ITEM_DESCRIPTION);
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index 278d945ab0..c8c8a658ce 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -184,6 +184,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const AACube& v) { retu
     }
 
 typedef glm::vec3 glmVec3;
+typedef glm::vec4 glmVec4;
 typedef glm::quat glmQuat;
 typedef QVector<glm::vec3> qVectorVec3;
 typedef QVector<glm::quat> qVectorQuat;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 7fd72bf0ee..fc9b5cd709 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -226,6 +226,13 @@ enum EntityPropertyList {
 
     PROP_LOCAL_DIMENSIONS, // only used to convert values to and from scripts
 
+    PROP_MATERIAL_URL,
+    PROP_MATERIAL_TYPE,
+    PROP_MATERIAL_BLEND_FACTOR,
+    PROP_MATERIAL_PRIORITY,
+    PROP_PARENT_SHAPE_ID,
+    PROP_MATERIAL_BOUNDS,
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties to end of list just ABOVE this line
     PROP_AFTER_LAST_ITEM,
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index cb17c28fd7..307371c649 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -29,6 +29,7 @@
 #include "PolyVoxEntityItem.h"
 #include "PolyLineEntityItem.h"
 #include "ShapeEntityItem.h"
+#include "MaterialEntityItem.h"
 
 QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
 QMap<QString, EntityTypes::EntityType> EntityTypes::_nameToTypeMap;
@@ -50,6 +51,7 @@ REGISTER_ENTITY_TYPE(PolyLine)
 REGISTER_ENTITY_TYPE(Shape)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory)
+REGISTER_ENTITY_TYPE(Material)
 
 const QString& EntityTypes::getEntityTypeName(EntityType entityType) {
     QMap<EntityType, QString>::iterator matchedTypeName = _typeToNameMap.find(entityType);
diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index 316bf2b813..62011c6e26 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -49,7 +49,8 @@ public:
         PolyVox,
         PolyLine,
         Shape,
-        LAST = Shape
+        Material,
+        LAST = Material
     } EntityType;
 
     static const QString& getEntityTypeName(EntityType entityType);
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
new file mode 100644
index 0000000000..19daa11490
--- /dev/null
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -0,0 +1,120 @@
+//
+//  Created by Sam Gondelman on 1/12/18
+//  Copyright 2018 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 "MaterialEntityItem.h"
+
+#include "EntityItemProperties.h"
+
+EntityItemPointer MaterialEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
+    Pointer entity(new MaterialEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+    entity->setProperties(properties);
+    return entity;
+}
+
+// our non-pure virtual subclass for now...
+MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
+    _type = EntityTypes::Material;
+}
+
+EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
+    EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMode, getMaterialMode);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(blendFactor, getBlendFactor);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(priority, getPriority);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeID, getShapeID);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialBounds, getMaterialBounds);
+    return properties;
+}
+
+bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
+    bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
+    
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialURL, setMaterialURL);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMode, setMaterialMode);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(blendFactor, setBlendFactor);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(priority, setPriority);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeID, setShapeID);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialBounds, setMaterialBounds);
+
+    if (somethingChanged) {
+        bool wantDebug = false;
+        if (wantDebug) {
+            uint64_t now = usecTimestampNow();
+            int elapsed = now - getLastEdited();
+            qCDebug(entities) << "MaterialEntityItem::setProperties() AFTER update... edited AGO=" << elapsed <<
+                    "now=" << now << " getLastEdited()=" << getLastEdited();
+        }
+        setLastEdited(properties.getLastEdited());
+    }
+    return somethingChanged;
+}
+
+int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+                                                ReadBitstreamToTreeParams& args,
+                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                                bool& somethingChanged) {
+
+    int bytesRead = 0;
+    const unsigned char* dataAt = data;
+
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_URL, QString, setMaterialURL);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, int, setPriority);
+    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, int, setShapeID);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, glm::vec4, setMaterialBounds);
+
+    return bytesRead;
+}
+
+
+// TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
+EntityPropertyFlags MaterialEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
+    EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
+    requestedProperties += PROP_MATERIAL_URL;
+    requestedProperties += PROP_MATERIAL_TYPE;
+    requestedProperties += PROP_MATERIAL_BLEND_FACTOR;
+    requestedProperties += PROP_MATERIAL_PRIORITY;
+    requestedProperties += PROP_PARENT_SHAPE_ID;
+    requestedProperties += PROP_MATERIAL_BOUNDS;
+    return requestedProperties;
+}
+
+void MaterialEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+                                    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount, 
+                                    OctreeElement::AppendState& appendState) const { 
+
+    bool successPropertyFits = true;
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, getMaterialURL());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, getMaterialMode());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, getBlendFactor());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, getPriority());
+    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, getShapeID());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, getMaterialBounds());
+}
+
+void MaterialEntityItem::debugDump() const {
+    quint64 now = usecTimestampNow();
+    qCDebug(entities) << "MATERIAL EntityItem id:" << getEntityItemID() << "---------------------------------------------";
+    qCDebug(entities) << "                  name:" << _name;
+    qCDebug(entities) << "                   url:" << _materialURL;
+    qCDebug(entities) << "         material type:" << _materialMode;
+    qCDebug(entities) << "          blend factor:" << _blendFactor;
+    qCDebug(entities) << "              priority:" << _priority;
+    qCDebug(entities) << "       parent shape ID:" << _shapeID;
+    qCDebug(entities) << "       material bounds:" << _materialBounds;
+    qCDebug(entities) << "              position:" << debugTreeVector(getWorldPosition());
+    qCDebug(entities) << "            dimensions:" << debugTreeVector(getScaledDimensions());
+    qCDebug(entities) << "         getLastEdited:" << debugTime(getLastEdited(), now);
+    qCDebug(entities) <<   "SHAPE EntityItem Ptr:" << this;
+}
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
new file mode 100644
index 0000000000..094c94f24c
--- /dev/null
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -0,0 +1,79 @@
+//
+//  Created by Sam Gondelman on 1/12/18
+//  Copyright 2018 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_MaterialEntityItem_h
+#define hifi_MaterialEntityItem_h
+
+#include "EntityItem.h"
+
+#include "MaterialMode.h"
+#include <model-networking/ModelCache.h>
+
+class MaterialEntityItem : public EntityItem {
+    using Pointer = std::shared_ptr<MaterialEntityItem>;
+public:
+    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
+    
+    MaterialEntityItem(const EntityItemID& entityItemID);
+
+    ALLOW_INSTANTIATION // This class can be instantiated
+
+    // methods for getting/setting all properties of an entity
+    virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
+    virtual bool setProperties(const EntityItemProperties& properties) override;
+
+    // TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
+    virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
+
+    virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount,
+                                    OctreeElement::AppendState& appendState) const override;
+
+
+    virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+                                                ReadBitstreamToTreeParams& args,
+                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                                bool& somethingChanged) override;
+
+    void debugDump() const override;
+
+    const QString& getMaterialURL() { return _materialURL; }
+    void setMaterialURL(const QString& materialURL) { _materialURL = materialURL; }
+
+    MaterialMode getMaterialType() { return _materialMode; }
+    void setMaterialMode(MaterialMode mode);
+
+    float getBlendFactor() { return _blendFactor; }
+    void setBlendFactor(float blendFactor) { _blendFactor = blendFactor; }
+
+    int getPriority() { return _priority; }
+    void setPriority(int priority) { _priority = priority; }
+
+    int getShapeID() { return _shapeID; }
+    void setShapeID(int shapeID) { _shapeID = shapeID; }
+
+    const glm::vec4& getMaterialBounds() { return _materialBounds; }
+    void setMaterialBounds(const glm::vec4& materialBounds) { _materialBounds = materialBounds; }
+
+protected:
+    QString _materialURL;
+    MaterialMode _materialMode { UV };
+    float _blendFactor { 1.0f };
+    int _priority { 0 };
+    int _shapeID { 0 };
+    glm::vec4 _materialBounds { 0, 0, 1, 1 };
+    
+    //NetworkMaterial _material;
+
+};
+
+#endif // hifi_MaterialEntityItem_h
diff --git a/libraries/shared/src/MaterialMode.h b/libraries/shared/src/MaterialMode.h
new file mode 100644
index 0000000000..05c6d295a5
--- /dev/null
+++ b/libraries/shared/src/MaterialMode.h
@@ -0,0 +1,18 @@
+//
+//  Created by Sam Gondelman on 1/12/18.
+//  Copyright 2018 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_MaterialMode_h
+#define hifi_MaterialMode_h
+
+enum MaterialMode {
+    UV = 0,
+    PROJECTED
+};
+
+#endif // hifi_MaterialMode_h
+

From 3911ce59cc94828ba6c418af947c993d73903632 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 16 Jan 2018 19:02:12 +0100
Subject: [PATCH 028/569] Scribe now outputs .h and .cpp. Need to change how
 shader source is referenced in C++ code

---
 cmake/macros/AutoScribeShader.cmake           |  37 ++--
 .../display-plugins/hmd/HmdDisplayPlugin.cpp  |   4 +-
 .../RenderableParticleEffectEntityItem.cpp    |   4 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   8 +-
 .../src/RenderablePolyVoxEntityItem.cpp       |  16 +-
 .../src/RenderableShapeEntityItem.cpp         |   4 +-
 libraries/gpu/src/gpu/Shader.h                |   2 -
 libraries/gpu/src/gpu/StandardShaderLib.cpp   |  48 ++---
 libraries/model/src/model/Skybox.cpp          |   8 +-
 .../procedural/src/procedural/Procedural.cpp  |   4 +-
 .../src/procedural/ProceduralSkybox.cpp       |   4 +-
 .../src/AmbientOcclusionEffect.cpp            |  10 +-
 libraries/render-utils/src/AnimDebugDraw.cpp  |   4 +-
 .../render-utils/src/AntialiasingEffect.cpp   |   6 +-
 libraries/render-utils/src/BloomEffect.cpp    |   4 +-
 .../render-utils/src/DebugDeferredBuffer.cpp  |   4 +-
 .../src/DeferredLightingEffect.cpp            |  18 +-
 libraries/render-utils/src/DrawHaze.cpp       |   2 +-
 libraries/render-utils/src/GeometryCache.cpp  |  26 +--
 .../render-utils/src/HighlightEffect.cpp      |  20 +-
 libraries/render-utils/src/LightClusters.cpp  |  12 +-
 .../render-utils/src/RenderForwardTask.cpp    |   4 +-
 .../render-utils/src/RenderPipelines.cpp      | 132 +++++++-------
 .../render-utils/src/StencilMaskPass.cpp      |   4 +-
 .../render-utils/src/SubsurfaceScattering.cpp |   8 +-
 .../render-utils/src/SurfaceGeometryPass.cpp  |  12 +-
 libraries/render-utils/src/TextRenderer3D.cpp |   4 +-
 .../render-utils/src/ToneMappingEffect.cpp    |   4 +-
 libraries/render-utils/src/ZoneRenderer.cpp   |   6 +-
 libraries/render-utils/src/text/Font.cpp      |   6 +-
 libraries/render/src/render/BlurTask.cpp      |   8 +-
 .../render/src/render/DrawSceneOctree.cpp     |  10 +-
 libraries/render/src/render/DrawStatus.cpp    |   8 +-
 libraries/render/src/render/DrawTask.cpp      |   4 +-
 tests/shaders/src/main.cpp                    | 172 +++++++++---------
 tools/scribe/src/main.cpp                     | 136 ++++++++++++--
 36 files changed, 433 insertions(+), 330 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index d25e0e553f..c92f7a3ffe 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -39,24 +39,28 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
   get_filename_component(SHADER_TARGET ${SHADER_FILE} NAME_WE)
   get_filename_component(SHADER_EXT ${SHADER_FILE} EXT)
   if(SHADER_EXT STREQUAL .slv)
-    set(SHADER_TARGET ${SHADER_TARGET}_vert.cpp)
+    set(SHADER_TYPE vert)
   elseif(${SHADER_EXT} STREQUAL .slf)
-    set(SHADER_TARGET ${SHADER_TARGET}_frag.cpp)
+    set(SHADER_TYPE frag)
   elseif(${SHADER_EXT} STREQUAL .slg)
-    set(SHADER_TARGET ${SHADER_TARGET}_geom.cpp)
+    set(SHADER_TYPE geom)
   endif()
+  set(SHADER_TARGET ${SHADER_TARGET}_${SHADER_TYPE})
 
   set(SHADER_TARGET "${SHADERS_DIR}/${SHADER_TARGET}")
+  set(SHADER_TARGET_HEADER ${SHADER_TARGET}.h)
+  set(SHADER_TARGET_SOURCE ${SHADER_TARGET}.cpp)
 
   # Target dependant Custom rule on the SHADER_FILE
   if (APPLE)
     set(GLPROFILE MAC_GL)
-    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
+    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (ANDROID)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
     # for an android build, we can't use the scribe that cmake would normally produce as a target,
     # since it's unrunnable by the cross-compiling build machine
@@ -72,23 +76,25 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
       ")
     endif ()
 
-    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS})
+    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (UNIX)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
+    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   else ()
     set(GLPROFILE PC_GL)
-    set(SCRIBE_ARGS -c++ -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    add_custom_command(OUTPUT ${SHADER_TARGET} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   endif()
 
   #output the generated file name
-  set(AUTOSCRIBE_SHADER_RETURN ${SHADER_TARGET} PARENT_SCOPE)
+  set(AUTOSCRIBE_SHADER_RETURN ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} PARENT_SCOPE)
 
-  file(GLOB INCLUDE_FILES ${SHADER_TARGET})
+  file(GLOB INCLUDE_FILES ${SHADER_TARGET_HEADER})
 
 endfunction()
 
@@ -134,6 +140,9 @@ macro(AUTOSCRIBE_SHADER_LIB)
   list(APPEND AUTOSCRIBE_SHADER_LIB_SRC ${AUTOSCRIBE_SHADER_SRC})
 
   # Link library shaders, if they exist
-  #include_directories("${SHADERS_DIR}")
+  include_directories("${SHADERS_DIR}")
+
+  # Add search directory to find gpu/Shader.h
+  include_directories("${HIFI_LIBRARY_DIR}/gpu/src")
 
 endmacro()
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 4f50b5ecd9..f39203c89d 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -33,8 +33,8 @@
 #include "../Logging.h"
 #include "../CompositorHelper.h"
 
-INCLUDE_SHADER(hmd_ui_vert)
-INCLUDE_SHADER(hmd_ui_frag)
+#include "hmd_ui_vert.h"
+#include "hmd_ui_frag.h"
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString DISABLE_PREVIEW = "Disable Preview";
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index b8f979b7fd..a3e6cd4341 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -14,8 +14,8 @@
 
 #include <GeometryCache.h>
 
-INCLUDE_SHADER(textured_particle_vert)
-INCLUDE_SHADER(textured_particle_frag)
+#include "textured_particle_vert.h"
+#include "textured_particle_frag.h"
 
 using namespace render;
 using namespace render::entities;
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index b85771f5b6..b362721cde 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -23,11 +23,11 @@
 #   include <FadeEffect.h>
 #endif
 
-INCLUDE_SHADER(paintStroke_vert)
-INCLUDE_SHADER(paintStroke_frag)
+#include "paintStroke_vert.h"
+#include "paintStroke_frag.h"
 
-INCLUDE_SHADER(paintStroke_fade_vert)
-INCLUDE_SHADER(paintStroke_fade_frag)
+#include "paintStroke_fade_vert.h"
+#include "paintStroke_fade_frag.h"
 
 using namespace render;
 using namespace render::entities;
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index b245ed7cda..cf12da86e9 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -28,10 +28,10 @@
 
 #include "EntityTreeRenderer.h"
 
-INCLUDE_SHADER(polyvox_vert)
-INCLUDE_SHADER(polyvox_frag)
-INCLUDE_SHADER(polyvox_fade_vert)
-INCLUDE_SHADER(polyvox_fade_frag)
+#include "polyvox_vert.h"
+#include "polyvox_frag.h"
+#include "polyvox_fade_vert.h"
+#include "polyvox_fade_frag.h"
 
 #ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
 #   include <FadeEffect.h>
@@ -72,10 +72,10 @@ INCLUDE_SHADER(polyvox_fade_frag)
 
 #include "EntityTreeRenderer.h"
 
-INCLUDE_SHADER(polyvox_vert)
-INCLUDE_SHADER(polyvox_frag)
-INCLUDE_SHADER(polyvox_fade_vert)
-INCLUDE_SHADER(polyvox_fade_frag)
+#include "polyvox_vert.h"
+#include "polyvox_frag.h"
+#include "polyvox_fade_vert.h"
+#include "polyvox_fade_frag.h"
 
 #include "RenderablePolyVoxEntityItem.h"
 #include "EntityEditPacketSender.h"
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index cd02186440..eddde317fe 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -16,8 +16,8 @@
 #include <GeometryCache.h>
 #include <PerfStat.h>
 
-INCLUDE_SHADER(simple_vert)
-INCLUDE_SHADER(simple_frag)
+#include "simple_vert.h"
+#include "simple_frag.h"
 
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
diff --git a/libraries/gpu/src/gpu/Shader.h b/libraries/gpu/src/gpu/Shader.h
index 5cfdbc8bf4..181c9b5e78 100755
--- a/libraries/gpu/src/gpu/Shader.h
+++ b/libraries/gpu/src/gpu/Shader.h
@@ -17,8 +17,6 @@
 #include <set>
 
 #include <QUrl>
-
-#define INCLUDE_SHADER(source) extern const char source[];
  
 namespace gpu {
 
diff --git a/libraries/gpu/src/gpu/StandardShaderLib.cpp b/libraries/gpu/src/gpu/StandardShaderLib.cpp
index 93c2228de6..0d829fb21f 100755
--- a/libraries/gpu/src/gpu/StandardShaderLib.cpp
+++ b/libraries/gpu/src/gpu/StandardShaderLib.cpp
@@ -12,21 +12,21 @@
 //
 #include "StandardShaderLib.h"
 
-INCLUDE_SHADER(DrawUnitQuadTexcoord_vert)
-INCLUDE_SHADER(DrawTransformUnitQuad_vert)
-INCLUDE_SHADER(DrawTexcoordRectTransformUnitQuad_vert)
-INCLUDE_SHADER(DrawViewportQuadTransformTexcoord_vert)
-INCLUDE_SHADER(DrawVertexPosition_vert)
-INCLUDE_SHADER(DrawTransformVertexPosition_vert)
+#include "DrawUnitQuadTexcoord_vert.h"
+#include "DrawTransformUnitQuad_vert.h"
+#include "DrawTexcoordRectTransformUnitQuad_vert.h"
+#include "DrawViewportQuadTransformTexcoord_vert.h"
+#include "DrawVertexPosition_vert.h"
+#include "DrawTransformVertexPosition_vert.h"
 
 const char DrawNada_frag[] = "void main(void) {}"; // DrawNada is really simple...
 
-INCLUDE_SHADER(DrawWhite_frag)
-INCLUDE_SHADER(DrawColor_frag)
-INCLUDE_SHADER(DrawTexture_frag)
-INCLUDE_SHADER(DrawTextureMirroredX_frag)
-INCLUDE_SHADER(DrawTextureOpaque_frag)
-INCLUDE_SHADER(DrawColoredTexture_frag)
+#include "DrawWhite_frag.h"
+#include "DrawColor_frag.h"
+#include "DrawTexture_frag.h"
+#include "DrawTextureMirroredX_frag.h"
+#include "DrawTextureOpaque_frag.h"
+#include "DrawColoredTexture_frag.h"
 
 using namespace gpu;
 
@@ -73,42 +73,42 @@ ShaderPointer StandardShaderLib::getProgram(GetShader getVS, GetShader getPS) {
 
 ShaderPointer StandardShaderLib::getDrawUnitQuadTexcoordVS() {
     if (!_drawUnitQuadTexcoordVS) {
-        _drawUnitQuadTexcoordVS = gpu::Shader::createVertex(std::string(DrawUnitQuadTexcoord_vert));
+        _drawUnitQuadTexcoordVS = DrawUnitQuadTexcoord_vert::getShader();
     }
     return _drawUnitQuadTexcoordVS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTransformUnitQuadVS() {
     if (!_drawTransformUnitQuadVS) {
-        _drawTransformUnitQuadVS = gpu::Shader::createVertex(std::string(DrawTransformUnitQuad_vert));
+        _drawTransformUnitQuadVS = DrawTransformUnitQuad_vert::getShader();
     }
     return _drawTransformUnitQuadVS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTexcoordRectTransformUnitQuadVS() {
     if (!_drawTexcoordRectTransformUnitQuadVS) {
-        _drawTexcoordRectTransformUnitQuadVS = gpu::Shader::createVertex(std::string(DrawTexcoordRectTransformUnitQuad_vert));
+        _drawTexcoordRectTransformUnitQuadVS = DrawTexcoordRectTransformUnitQuad_vert::getShader();
     }
     return _drawTexcoordRectTransformUnitQuadVS;
 }
 
 ShaderPointer StandardShaderLib::getDrawViewportQuadTransformTexcoordVS() {
     if (!_drawViewportQuadTransformTexcoordVS) {
-        _drawViewportQuadTransformTexcoordVS = gpu::Shader::createVertex(std::string(DrawViewportQuadTransformTexcoord_vert));
+        _drawViewportQuadTransformTexcoordVS = DrawViewportQuadTransformTexcoord_vert::getShader();
     }
     return _drawViewportQuadTransformTexcoordVS;
 }
 
 ShaderPointer StandardShaderLib::getDrawVertexPositionVS() {
     if (!_drawVertexPositionVS) {
-        _drawVertexPositionVS = gpu::Shader::createVertex(std::string(DrawVertexPosition_vert));
+        _drawVertexPositionVS = DrawVertexPosition_vert::getShader();
     }
     return _drawVertexPositionVS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTransformVertexPositionVS() {
     if (!_drawTransformVertexPositionVS) {
-        _drawTransformVertexPositionVS = gpu::Shader::createVertex(std::string(DrawTransformVertexPosition_vert));
+        _drawTransformVertexPositionVS = DrawTransformVertexPosition_vert::getShader();
     }
     return _drawTransformVertexPositionVS;
 }
@@ -122,42 +122,42 @@ ShaderPointer StandardShaderLib::getDrawNadaPS() {
 
 ShaderPointer StandardShaderLib::getDrawWhitePS() {
     if (!_drawWhitePS) {
-        _drawWhitePS = gpu::Shader::createPixel(std::string(DrawWhite_frag));
+        _drawWhitePS = DrawWhite_frag::getShader();
     }
     return _drawWhitePS;
 }
 
 ShaderPointer StandardShaderLib::getDrawColorPS() {
     if (!_drawColorPS) {
-        _drawColorPS = gpu::Shader::createPixel(std::string(DrawColor_frag));
+        _drawColorPS = DrawColor_frag::getShader();
     }
     return _drawColorPS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTexturePS() {
     if (!_drawTexturePS) {
-        _drawTexturePS = gpu::Shader::createPixel(std::string(DrawTexture_frag));
+        _drawTexturePS = DrawTexture_frag::getShader();
     }
     return _drawTexturePS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTextureMirroredXPS() {
     if (!_drawTextureMirroredXPS) {
-        _drawTextureMirroredXPS = gpu::Shader::createPixel(std::string(DrawTextureMirroredX_frag));
+        _drawTextureMirroredXPS = DrawTextureMirroredX_frag::getShader();
     }
     return _drawTextureMirroredXPS;
 }
 
 ShaderPointer StandardShaderLib::getDrawTextureOpaquePS() {
     if (!_drawTextureOpaquePS) {
-        _drawTextureOpaquePS = gpu::Shader::createPixel(std::string(DrawTextureOpaque_frag));
+        _drawTextureOpaquePS = DrawTextureOpaque_frag::getShader();
     }
     return _drawTextureOpaquePS;
 }
 
 ShaderPointer StandardShaderLib::getDrawColoredTexturePS() {
     if (!_drawColoredTexturePS) {
-        _drawColoredTexturePS = gpu::Shader::createPixel(std::string(DrawColoredTexture_frag));
+        _drawColoredTexturePS = DrawColoredTexture_frag::getShader();
     }
     return _drawColoredTexturePS;
 }
diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index 7e03890c85..e2877d4bb4 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -15,8 +15,8 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-INCLUDE_SHADER(skybox_vert)
-INCLUDE_SHADER(skybox_frag)
+#include "skybox_vert.h"
+#include "skybox_frag.h"
 
 using namespace model;
 
@@ -85,8 +85,8 @@ void Skybox::render(gpu::Batch& batch, const ViewFrustum& viewFrustum, const Sky
     static std::once_flag once;
     std::call_once(once, [&] {
         {
-            auto skyVS = gpu::Shader::createVertex(std::string(skybox_vert));
-            auto skyFS = gpu::Shader::createPixel(std::string(skybox_frag));
+            auto skyVS = skybox_vert::getShader();
+            auto skyFS = skybox_frag::getShader();
             auto skyShader = gpu::Shader::createProgram(skyVS, skyFS);
 
             gpu::Shader::BindingSet bindings;
diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp
index c0ebdbb186..ba29768f68 100644
--- a/libraries/procedural/src/procedural/Procedural.cpp
+++ b/libraries/procedural/src/procedural/Procedural.cpp
@@ -20,7 +20,7 @@
 #include <NumericalConstants.h>
 #include <GLMHelpers.h>
 
-INCLUDE_SHADER(ProceduralCommon_frag)
+#include "ProceduralCommon_frag.h"
 
 #include "Logging.h"
 
@@ -241,7 +241,7 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
         std::string fragmentShaderSource = _fragmentSource;
         size_t replaceIndex = fragmentShaderSource.find(PROCEDURAL_COMMON_BLOCK);
         if (replaceIndex != std::string::npos) {
-            fragmentShaderSource.replace(replaceIndex, PROCEDURAL_COMMON_BLOCK.size(), ProceduralCommon_frag);
+            fragmentShaderSource.replace(replaceIndex, PROCEDURAL_COMMON_BLOCK.size(), ProceduralCommon_frag.h";
         }
 
         replaceIndex = fragmentShaderSource.find(PROCEDURAL_VERSION);
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
index 452d3f639a..60fde7bd14 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
@@ -15,8 +15,8 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-INCLUDE_SHADER(skybox_vert)
-INCLUDE_SHADER(skybox_frag)
+#include "skybox_vert.h"
+#include "skybox_frag.h"
 
 ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
     _procedural._vertexSource = skybox_vert;
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index f5b4f0f6bb..83753131c8 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -28,11 +28,11 @@
 #include "DependencyManager.h"
 #include "ViewFrustum.h"
 
-INCLUDE_SHADER(ssao_makePyramid_frag)
-INCLUDE_SHADER(ssao_makeOcclusion_frag)
-INCLUDE_SHADER(ssao_debugOcclusion_frag)
-INCLUDE_SHADER(ssao_makeHorizontalBlur_frag)
-INCLUDE_SHADER(ssao_makeVerticalBlur_frag)
+#include "ssao_makePyramid_frag.h"
+#include "ssao_makeOcclusion_frag.h"
+#include "ssao_debugOcclusion_frag.h"
+#include "ssao_makeHorizontalBlur_frag.h"
+#include "ssao_makeVerticalBlur_frag.h"
 
 
 AmbientOcclusionFramebuffer::AmbientOcclusionFramebuffer() {
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index 53ed3ea9a0..382b4e2d93 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -17,8 +17,8 @@
 
 #include "AnimDebugDraw.h"
 
-INCLUDE_SHADER(animdebugdraw_vert)
-INCLUDE_SHADER(animdebugdraw_frag)
+#include "animdebugdraw_vert.h"
+#include "animdebugdraw_frag.h"
 
 class AnimDebugDrawData {
 public:
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 078e906fad..70c2e3b5ce 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -23,9 +23,9 @@
 #include "ViewFrustum.h"
 #include "GeometryCache.h"
 
-INCLUDE_SHADER(fxaa_vert)
-INCLUDE_SHADER(fxaa_frag)
-INCLUDE_SHADER(fxaa_blend_frag)
+#include "fxaa_vert.h"
+#include "fxaa_frag.h"
+#include "fxaa_blend_frag.h"
 
 
 Antialiasing::Antialiasing() {
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index ace347f99e..9d9367a6d5 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -16,8 +16,8 @@
 #include <render/BlurTask.h>
 #include <render/ResampleTask.h>
 
-INCLUDE_SHADER(BloomThreshold_frag)
-INCLUDE_SHADER(BloomApply_frag)
+#include "BloomThreshold_frag.h"
+#include "BloomApply_frag.h"
 
 #define BLOOM_BLUR_LEVEL_COUNT  3
 
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index 05cd6a6f0e..fe03ead4e1 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -23,8 +23,8 @@
 #include "TextureCache.h"
 #include "DeferredLightingEffect.h"
 
-INCLUDE_SHADER(debug_deferred_buffer_vert)
-INCLUDE_SHADER(debug_deferred_buffer_frag)
+#include "debug_deferred_buffer_vert.h"
+#include "debug_deferred_buffer_frag.h"
 
 using namespace render;
 
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 8ec2c74353..81a33f17e3 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -24,18 +24,18 @@
 #include "TextureCache.h"
 #include "FramebufferCache.h"
 
-INCLUDE_SHADER(deferred_light_vert)
-INCLUDE_SHADER(deferred_light_point_vert)
-INCLUDE_SHADER(deferred_light_spot_vert)
+#include "deferred_light_vert.h"
+#include "deferred_light_point_vert.h"
+#include "deferred_light_spot_vert.h"
 
-INCLUDE_SHADER(directional_ambient_light_frag)
-INCLUDE_SHADER(directional_skybox_light_frag)
+#include "directional_ambient_light_frag.h"
+#include "directional_skybox_light_frag.h"
 
-INCLUDE_SHADER(directional_ambient_light_shadow_frag)
-INCLUDE_SHADER(directional_skybox_light_shadow_frag)
+#include "directional_ambient_light_shadow_frag.h"
+#include "directional_skybox_light_shadow_frag.h"
 
-INCLUDE_SHADER(local_lights_shading_frag)
-INCLUDE_SHADER(local_lights_drawOutline_frag)
+#include "local_lights_shading_frag.h"
+#include "local_lights_drawOutline_frag.h"
 
 
 using namespace render;
diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp
index dc1893b347..da07f5bd9b 100644
--- a/libraries/render-utils/src/DrawHaze.cpp
+++ b/libraries/render-utils/src/DrawHaze.cpp
@@ -19,7 +19,7 @@
 #include "HazeStage.h"
 #include "LightStage.h"
 
-INCLUDE_SHADER(Haze_frag)
+#include "Haze_frag.h"
 
 void HazeConfig::setHazeColor(const glm::vec3 value) { 
     hazeColor = value; 
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index ac8b300e49..2616d08600 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -34,21 +34,21 @@
 #include "model/TextureMap.h"
 #include "render/Args.h"
 
-INCLUDE_SHADER(standardTransformPNTC_vert)
-INCLUDE_SHADER(standardDrawTexture_frag)
+#include "standardTransformPNTC_vert.h"
+#include "standardDrawTexture_frag.h"
 
-INCLUDE_SHADER(simple_vert)
-INCLUDE_SHADER(simple_textured_frag)
-INCLUDE_SHADER(simple_textured_unlit_frag)
-INCLUDE_SHADER(simple_fade_vert)
-INCLUDE_SHADER(simple_textured_fade_frag)
-INCLUDE_SHADER(simple_textured_unlit_fade_frag)
-INCLUDE_SHADER(simple_opaque_web_browser_frag)
-INCLUDE_SHADER(simple_transparent_web_browser_frag)
-INCLUDE_SHADER(glowLine_vert)
-INCLUDE_SHADER(glowLine_frag)
+#include "simple_vert.h"
+#include "simple_textured_frag.h"
+#include "simple_textured_unlit_frag.h"
+#include "simple_fade_vert.h"
+#include "simple_textured_fade_frag.h"
+#include "simple_textured_unlit_fade_frag.h"
+#include "simple_opaque_web_browser_frag.h"
+#include "simple_transparent_web_browser_frag.h"
+#include "glowLine_vert.h"
+#include "glowLine_frag.h"
 
-INCLUDE_SHADER(grid_frag)
+#include "grid_frag.h"
 
 //#define WANT_DEBUG
 
diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index 69feffb055..fee1f4a568 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -22,13 +22,13 @@
 
 #include <sstream>
 
-INCLUDE_SHADER(surfaceGeometry_copyDepth_frag)
-INCLUDE_SHADER(debug_deferred_buffer_vert)
-INCLUDE_SHADER(debug_deferred_buffer_frag)
-INCLUDE_SHADER(Highlight_frag)
-INCLUDE_SHADER(Highlight_filled_frag)
-INCLUDE_SHADER(Highlight_aabox_vert)
-INCLUDE_SHADER(nop_frag)
+#include "surfaceGeometry_copyDepth_frag.h"
+#include "debug_deferred_buffer_vert.h"
+#include "debug_deferred_buffer_frag.h"
+#include "Highlight_frag.h"
+#include "Highlight_filled_frag.h"
+#include "Highlight_aabox_vert.h"
+#include "nop_frag.h"
 
 using namespace render;
 
@@ -547,10 +547,10 @@ const render::Varying DrawHighlightTask::addSelectItemJobs(JobModel& task, const
     return task.addJob<SelectItems>("TransparentSelection", selectItemInput);
 }
 
-INCLUDE_SHADER(model_shadow_vert)
-INCLUDE_SHADER(skin_model_shadow_vert)
+#include "model_shadow_vert.h"
+#include "skin_model_shadow_vert.h"
 
-INCLUDE_SHADER(model_shadow_frag)
+#include "model_shadow_frag.h"
 
 void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gpu::StatePointer state) {
     auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index 79d755683f..d6ac7fd2e2 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -18,15 +18,15 @@
 
 #include "StencilMaskPass.h"
 
-INCLUDE_SHADER(lightClusters_drawGrid_vert)
-INCLUDE_SHADER(lightClusters_drawGrid_frag)
+#include "lightClusters_drawGrid_vert.h"
+#include "lightClusters_drawGrid_frag.h"
 
-//INCLUDE_SHADER(lightClusters_drawClusterFromDepth_vert)
-INCLUDE_SHADER(lightClusters_drawClusterFromDepth_frag)
+//#include "lightClusters_drawClusterFromDepth_vert.h"
+#include "lightClusters_drawClusterFromDepth_frag.h"
 
 
-INCLUDE_SHADER(lightClusters_drawClusterContent_vert)
-INCLUDE_SHADER(lightClusters_drawClusterContent_frag)
+#include "lightClusters_drawClusterContent_vert.h"
+#include "lightClusters_drawClusterContent_frag.h"
 
 enum LightClusterGridShader_MapSlot {
     DEFERRED_BUFFER_LINEAR_DEPTH_UNIT = 0,
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index 8d02281d05..16e739f432 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -24,7 +24,7 @@
 
 #include <gpu/StandardShaderLib.h>
 
-INCLUDE_SHADER(nop_frag)
+#include "nop_frag.h"
 
 using namespace render;
 extern void initForwardPipelines(ShapePlumber& plumber);
@@ -125,7 +125,7 @@ void Draw::run(const RenderContextPointer& renderContext,
 const gpu::PipelinePointer Stencil::getPipeline() {
     if (!_stencilPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(nop_frag));
+        auto ps = gpu::Shader::createPixel(std::string(nop_frag);
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram(*program);
 
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 62252d3a0b..7f644add72 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -20,86 +20,86 @@
 #include "TextureCache.h"
 #include "render/DrawTask.h"
 
-INCLUDE_SHADER(model_vert)
-INCLUDE_SHADER(model_normal_map_vert)
-INCLUDE_SHADER(model_lightmap_vert)
-INCLUDE_SHADER(model_lightmap_normal_map_vert)
-INCLUDE_SHADER(skin_model_vert)
-INCLUDE_SHADER(skin_model_normal_map_vert)
+#include "model_vert.h"
+#include "model_normal_map_vert.h"
+#include "model_lightmap_vert.h"
+#include "model_lightmap_normal_map_vert.h"
+#include "skin_model_vert.h"
+#include "skin_model_normal_map_vert.h"
 
-INCLUDE_SHADER(model_lightmap_fade_vert)
-INCLUDE_SHADER(model_lightmap_normal_map_fade_vert)
-INCLUDE_SHADER(skin_model_fade_vert)
-INCLUDE_SHADER(skin_model_normal_map_fade_vert)
+#include "model_lightmap_fade_vert.h"
+#include "model_lightmap_normal_map_fade_vert.h"
+#include "skin_model_fade_vert.h"
+#include "skin_model_normal_map_fade_vert.h"
 
-INCLUDE_SHADER(simple_vert)
-INCLUDE_SHADER(simple_textured_frag)
-INCLUDE_SHADER(simple_textured_unlit_frag)
-INCLUDE_SHADER(simple_transparent_textured_frag)
-INCLUDE_SHADER(simple_transparent_textured_unlit_frag)
+#include "simple_vert.h"
+#include "simple_textured_frag.h"
+#include "simple_textured_unlit_frag.h"
+#include "simple_transparent_textured_frag.h"
+#include "simple_transparent_textured_unlit_frag.h"
 
-INCLUDE_SHADER(simple_fade_vert)
-INCLUDE_SHADER(simple_textured_fade_frag)
-INCLUDE_SHADER(simple_textured_unlit_fade_frag)
-INCLUDE_SHADER(simple_transparent_textured_fade_frag)
-INCLUDE_SHADER(simple_transparent_textured_unlit_fade_frag)
+#include "simple_fade_vert.h"
+#include "simple_textured_fade_frag.h"
+#include "simple_textured_unlit_fade_frag.h"
+#include "simple_transparent_textured_fade_frag.h"
+#include "simple_transparent_textured_unlit_fade_frag.h"
 
-INCLUDE_SHADER(model_frag)
-INCLUDE_SHADER(model_unlit_frag)
-INCLUDE_SHADER(model_normal_map_frag)
-INCLUDE_SHADER(model_normal_specular_map_frag)
-INCLUDE_SHADER(model_specular_map_frag)
+#include "model_frag.h"
+#include "model_unlit_frag.h"
+#include "model_normal_map_frag.h"
+#include "model_normal_specular_map_frag.h"
+#include "model_specular_map_frag.h"
 
-INCLUDE_SHADER(model_fade_vert)
-INCLUDE_SHADER(model_normal_map_fade_vert)
+#include "model_fade_vert.h"
+#include "model_normal_map_fade_vert.h"
 
-INCLUDE_SHADER(model_fade_frag)
-INCLUDE_SHADER(model_unlit_fade_frag)
-INCLUDE_SHADER(model_normal_map_fade_frag)
-INCLUDE_SHADER(model_normal_specular_map_fade_frag)
-INCLUDE_SHADER(model_specular_map_fade_frag)
+#include "model_fade_frag.h"
+#include "model_unlit_fade_frag.h"
+#include "model_normal_map_fade_frag.h"
+#include "model_normal_specular_map_fade_frag.h"
+#include "model_specular_map_fade_frag.h"
 
-INCLUDE_SHADER(forward_model_frag)
-INCLUDE_SHADER(forward_model_unlit_frag)
-INCLUDE_SHADER(forward_model_normal_map_frag)
-INCLUDE_SHADER(forward_model_normal_specular_map_frag)
-INCLUDE_SHADER(forward_model_specular_map_frag)
+#include "forward_model_frag.h"
+#include "forward_model_unlit_frag.h"
+#include "forward_model_normal_map_frag.h"
+#include "forward_model_normal_specular_map_frag.h"
+#include "forward_model_specular_map_frag.h"
 
-INCLUDE_SHADER(model_lightmap_frag)
-INCLUDE_SHADER(model_lightmap_normal_map_frag)
-INCLUDE_SHADER(model_lightmap_normal_specular_map_frag)
-INCLUDE_SHADER(model_lightmap_specular_map_frag)
-INCLUDE_SHADER(model_translucent_frag)
-INCLUDE_SHADER(model_translucent_unlit_frag)
+#include "model_lightmap_frag.h"
+#include "model_lightmap_normal_map_frag.h"
+#include "model_lightmap_normal_specular_map_frag.h"
+#include "model_lightmap_specular_map_frag.h"
+#include "model_translucent_frag.h"
+#include "model_translucent_unlit_frag.h"
 
-INCLUDE_SHADER(model_lightmap_fade_frag)
-INCLUDE_SHADER(model_lightmap_normal_map_fade_frag)
-INCLUDE_SHADER(model_lightmap_normal_specular_map_fade_frag)
-INCLUDE_SHADER(model_lightmap_specular_map_fade_frag)
-INCLUDE_SHADER(model_translucent_fade_frag)
-INCLUDE_SHADER(model_translucent_unlit_fade_frag)
+#include "model_lightmap_fade_frag.h"
+#include "model_lightmap_normal_map_fade_frag.h"
+#include "model_lightmap_normal_specular_map_fade_frag.h"
+#include "model_lightmap_specular_map_fade_frag.h"
+#include "model_translucent_fade_frag.h"
+#include "model_translucent_unlit_fade_frag.h"
 
-INCLUDE_SHADER(overlay3D_vert)
-INCLUDE_SHADER(overlay3D_frag)
-INCLUDE_SHADER(overlay3D_model_frag)
-INCLUDE_SHADER(overlay3D_model_translucent_frag)
-INCLUDE_SHADER(overlay3D_translucent_frag)
-INCLUDE_SHADER(overlay3D_unlit_frag)
-INCLUDE_SHADER(overlay3D_translucent_unlit_frag)
-INCLUDE_SHADER(overlay3D_model_unlit_frag)
-INCLUDE_SHADER(overlay3D_model_translucent_unlit_frag)
+#include "overlay3D_vert.h"
+#include "overlay3D_frag.h"
+#include "overlay3D_model_frag.h"
+#include "overlay3D_model_translucent_frag.h"
+#include "overlay3D_translucent_frag.h"
+#include "overlay3D_unlit_frag.h"
+#include "overlay3D_translucent_unlit_frag.h"
+#include "overlay3D_model_unlit_frag.h"
+#include "overlay3D_model_translucent_unlit_frag.h"
 
-INCLUDE_SHADER(model_shadow_vert)
-INCLUDE_SHADER(skin_model_shadow_vert)
+#include "model_shadow_vert.h"
+#include "skin_model_shadow_vert.h"
 
-INCLUDE_SHADER(model_shadow_frag)
-INCLUDE_SHADER(skin_model_shadow_frag)
+#include "model_shadow_frag.h"
+#include "skin_model_shadow_frag.h"
 
-INCLUDE_SHADER(model_shadow_fade_vert)
-INCLUDE_SHADER(skin_model_shadow_fade_vert)
+#include "model_shadow_fade_vert.h"
+#include "skin_model_shadow_fade_vert.h"
 
-INCLUDE_SHADER(model_shadow_fade_frag)
-INCLUDE_SHADER(skin_model_shadow_fade_frag)
+#include "model_shadow_fade_frag.h"
+#include "skin_model_shadow_fade_frag.h"
 
 using namespace render;
 using namespace std::placeholders;
diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp
index e2a8b31f08..80c97cf29f 100644
--- a/libraries/render-utils/src/StencilMaskPass.cpp
+++ b/libraries/render-utils/src/StencilMaskPass.cpp
@@ -17,7 +17,7 @@
 
 #include <gpu/StandardShaderLib.h>
 
-INCLUDE_SHADER(stencil_drawMask_frag)
+#include "stencil_drawMask_frag.h"
 
 using namespace render;
 
@@ -60,7 +60,7 @@ gpu::PipelinePointer PrepareStencil::getMeshStencilPipeline() {
 gpu::PipelinePointer PrepareStencil::getPaintStencilPipeline() {
     if (!_paintStencilPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(stencil_drawMask_frag));
+        auto ps = gpu::Shader::createPixel(std::string(stencil_drawMask_frag);
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
 
diff --git a/libraries/render-utils/src/SubsurfaceScattering.cpp b/libraries/render-utils/src/SubsurfaceScattering.cpp
index e8d7e23ec2..1786898e57 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.cpp
+++ b/libraries/render-utils/src/SubsurfaceScattering.cpp
@@ -17,11 +17,11 @@
 
 #include "DeferredLightingEffect.h"
 
-INCLUDE_SHADER(subsurfaceScattering_makeProfile_frag)
-INCLUDE_SHADER(subsurfaceScattering_makeLUT_frag)
-INCLUDE_SHADER(subsurfaceScattering_makeSpecularBeckmann_frag)
+#include "subsurfaceScattering_makeProfile_frag.h"
+#include "subsurfaceScattering_makeLUT_frag.h"
+#include "subsurfaceScattering_makeSpecularBeckmann_frag.h"
 
-INCLUDE_SHADER(subsurfaceScattering_drawScattering_frag)
+#include "subsurfaceScattering_drawScattering_frag.h"
 
 enum ScatteringShaderBufferSlots {
     ScatteringTask_FrameTransformSlot = 0,
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index 6ad8dc6137..af6ff09082 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -25,10 +25,10 @@ const int SurfaceGeometryPass_ParamsSlot = 1;
 const int SurfaceGeometryPass_DepthMapSlot = 0;
 const int SurfaceGeometryPass_NormalMapSlot = 1;
 
-INCLUDE_SHADER(surfaceGeometry_makeLinearDepth_frag)
-INCLUDE_SHADER(surfaceGeometry_downsampleDepthNormal_frag)
+#include "surfaceGeometry_makeLinearDepth_frag.h"
+#include "surfaceGeometry_downsampleDepthNormal_frag.h"
 
-INCLUDE_SHADER(surfaceGeometry_makeCurvature_frag)
+#include "surfaceGeometry_makeCurvature_frag.h"
 
 
 
@@ -212,7 +212,7 @@ void LinearDepthPass::run(const render::RenderContextPointer& renderContext, con
 const gpu::PipelinePointer& LinearDepthPass::getLinearDepthPipeline() {
     if (!_linearDepthPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeLinearDepth_frag));
+        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeLinearDepth_frag);
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -239,7 +239,7 @@ const gpu::PipelinePointer& LinearDepthPass::getLinearDepthPipeline() {
 const gpu::PipelinePointer& LinearDepthPass::getDownsamplePipeline() {
     if (!_downsamplePipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_downsampleDepthNormal_frag));
+        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_downsampleDepthNormal_frag);
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -540,7 +540,7 @@ void SurfaceGeometryPass::run(const render::RenderContextPointer& renderContext,
 const gpu::PipelinePointer& SurfaceGeometryPass::getCurvaturePipeline() {
     if (!_curvaturePipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeCurvature_frag));
+        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeCurvature_frag);
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/TextRenderer3D.cpp b/libraries/render-utils/src/TextRenderer3D.cpp
index 06e041685a..9c85952107 100644
--- a/libraries/render-utils/src/TextRenderer3D.cpp
+++ b/libraries/render-utils/src/TextRenderer3D.cpp
@@ -25,8 +25,8 @@
 #include "MatrixStack.h"
 #include "RenderUtilsLogging.h"
 
-INCLUDE_SHADER(sdf_text3D_vert)
-INCLUDE_SHADER(sdf_text3D_frag)
+#include "sdf_text3D_vert.h"
+#include "sdf_text3D_frag.h"
 
 #include "GeometryCache.h"
 
diff --git a/libraries/render-utils/src/ToneMappingEffect.cpp b/libraries/render-utils/src/ToneMappingEffect.cpp
index 3d3a11f7b3..6cb9541dae 100644
--- a/libraries/render-utils/src/ToneMappingEffect.cpp
+++ b/libraries/render-utils/src/ToneMappingEffect.cpp
@@ -17,7 +17,7 @@
 #include "StencilMaskPass.h"
 #include "FramebufferCache.h"
 
-INCLUDE_SHADER(toneMapping_frag)
+#include "toneMapping_frag.h"
 
 const int ToneMappingEffect_ParamsSlot = 0;
 const int ToneMappingEffect_LightingMapSlot = 0;
@@ -28,7 +28,7 @@ ToneMappingEffect::ToneMappingEffect() {
 }
 
 void ToneMappingEffect::init() {
-    auto blitPS = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(toneMapping_frag)));
+    auto blitPS = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(toneMapping_frag));
 
     auto blitVS = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
     auto blitProgram = gpu::ShaderPointer(gpu::Shader::createProgram(blitVS, blitPS));
diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp
index 77b5c492d3..c0d01c2eaf 100644
--- a/libraries/render-utils/src/ZoneRenderer.cpp
+++ b/libraries/render-utils/src/ZoneRenderer.cpp
@@ -20,9 +20,9 @@
 #include "StencilMaskPass.h"
 #include "DeferredLightingEffect.h"
 
-INCLUDE_SHADER(zone_drawKeyLight_frag)
-INCLUDE_SHADER(zone_drawAmbient_frag)
-INCLUDE_SHADER(zone_drawSkybox_frag)
+#include "zone_drawKeyLight_frag.h"
+#include "zone_drawAmbient_frag.h"
+#include "zone_drawSkybox_frag.h"
 
 
 using namespace render;
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index 9e0fbd1522..8449c58c7c 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -7,9 +7,9 @@
 
 #include <StreamHelpers.h>
 
-INCLUDE_SHADER(sdf_text3D_vert)
-INCLUDE_SHADER(sdf_text3D_frag)
-INCLUDE_SHADER(sdf_text3D_transparent_frag)
+#include "sdf_text3D_vert.h"
+#include "sdf_text3D_frag.h"
+#include "sdf_text3D_transparent_frag.h"
 
 #include "../RenderUtilsLogging.h"
 #include "FontFamilies.h"
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index 4b5d6da8e3..2be6f8fad2 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -13,11 +13,11 @@
 #include <gpu/Context.h>
 #include <gpu/StandardShaderLib.h>
 
-INCLUDE_SHADER(blurGaussianV_frag)
-INCLUDE_SHADER(blurGaussianH_frag)
+#include "blurGaussianV_frag.h"
+#include "blurGaussianH_frag.h"
 
-INCLUDE_SHADER(blurGaussianDepthAwareV_frag)
-INCLUDE_SHADER(blurGaussianDepthAwareH_frag)
+#include "blurGaussianDepthAwareV_frag.h"
+#include "blurGaussianDepthAwareH_frag.h"
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp
index 7823d85dae..36663a454a 100644
--- a/libraries/render/src/render/DrawSceneOctree.cpp
+++ b/libraries/render/src/render/DrawSceneOctree.cpp
@@ -22,12 +22,12 @@
 
 #include "Args.h"
 
-INCLUDE_SHADER(drawCellBounds_vert)
-INCLUDE_SHADER(drawCellBounds_frag)
-INCLUDE_SHADER(drawLODReticle_frag)
+#include "drawCellBounds_vert.h"
+#include "drawCellBounds_frag.h"
+#include "drawLODReticle_frag.h"
 
-INCLUDE_SHADER(drawItemBounds_vert)
-INCLUDE_SHADER(drawItemBounds_frag)
+#include "drawItemBounds_vert.h"
+#include "drawItemBounds_frag.h"
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp
index 1c6d7749f8..148e104453 100644
--- a/libraries/render/src/render/DrawStatus.cpp
+++ b/libraries/render/src/render/DrawStatus.cpp
@@ -21,10 +21,10 @@
 
 #include "Args.h"
 
-INCLUDE_SHADER(drawItemBounds_vert)
-INCLUDE_SHADER(drawItemBounds_frag)
-INCLUDE_SHADER(drawItemStatus_vert)
-INCLUDE_SHADER(drawItemStatus_frag)
+#include "drawItemBounds_vert.h"
+#include "drawItemBounds_frag.h"
+#include "drawItemStatus_vert.h"
+#include "drawItemStatus_frag.h"
 
 using namespace render;
 
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index a6d5072cca..a60bf91062 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -22,8 +22,8 @@
 #include <gpu/Context.h>
 #include <gpu/StandardShaderLib.h>
 
-INCLUDE_SHADER(drawItemBounds_vert)
-INCLUDE_SHADER(drawItemBounds_frag)
+#include "drawItemBounds_vert.h"
+#include "drawItemBounds_frag.h"
 
 using namespace render;
 
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index e0babc8b47..de37c505a6 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -23,65 +23,65 @@
 
 #include <gl/QOpenGLContextWrapper.h>
 
-INCLUDE_SHADER(simple_vert)
-INCLUDE_SHADER(simple_frag)
-INCLUDE_SHADER(simple_textured_frag)
-INCLUDE_SHADER(simple_textured_unlit_frag)
+#include "simple_vert.h"
+#include "simple_frag.h"
+#include "simple_textured_frag.h"
+#include "simple_textured_unlit_frag.h"
 
-INCLUDE_SHADER(deferred_light_vert)
-INCLUDE_SHADER(deferred_light_point_vert)
-INCLUDE_SHADER(deferred_light_spot_vert)
+#include "deferred_light_vert.h"
+#include "deferred_light_point_vert.h"
+#include "deferred_light_spot_vert.h"
 
-INCLUDE_SHADER(directional_ambient_light_frag)
-INCLUDE_SHADER(directional_skybox_light_frag)
+#include "directional_ambient_light_frag.h"
+#include "directional_skybox_light_frag.h"
 
-INCLUDE_SHADER(standardTransformPNTC_vert)
-INCLUDE_SHADER(standardDrawTexture_frag)
+#include "standardTransformPNTC_vert.h"
+#include "standardDrawTexture_frag.h"
 
-INCLUDE_SHADER(model_vert)
-INCLUDE_SHADER(model_shadow_vert)
-INCLUDE_SHADER(model_normal_map_vert)
-INCLUDE_SHADER(model_lightmap_vert)
-INCLUDE_SHADER(model_lightmap_normal_map_vert)
-INCLUDE_SHADER(skin_model_vert)
-INCLUDE_SHADER(skin_model_shadow_vert)
-INCLUDE_SHADER(skin_model_normal_map_vert)
+#include "model_vert.h"
+#include "model_shadow_vert.h"
+#include "model_normal_map_vert.h"
+#include "model_lightmap_vert.h"
+#include "model_lightmap_normal_map_vert.h"
+#include "skin_model_vert.h"
+#include "skin_model_shadow_vert.h"
+#include "skin_model_normal_map_vert.h"
 
-INCLUDE_SHADER(model_frag)
-INCLUDE_SHADER(model_shadow_frag)
-INCLUDE_SHADER(model_normal_map_frag)
-INCLUDE_SHADER(model_normal_specular_map_frag)
-INCLUDE_SHADER(model_specular_map_frag)
-INCLUDE_SHADER(model_lightmap_frag)
-INCLUDE_SHADER(model_lightmap_normal_map_frag)
-INCLUDE_SHADER(model_lightmap_normal_specular_map_frag)
-INCLUDE_SHADER(model_lightmap_specular_map_frag)
-INCLUDE_SHADER(model_translucent_frag)
+#include "model_frag.h"
+#include "model_shadow_frag.h"
+#include "model_normal_map_frag.h"
+#include "model_normal_specular_map_frag.h"
+#include "model_specular_map_frag.h"
+#include "model_lightmap_frag.h"
+#include "model_lightmap_normal_map_frag.h"
+#include "model_lightmap_normal_specular_map_frag.h"
+#include "model_lightmap_specular_map_frag.h"
+#include "model_translucent_frag.h"
 
-INCLUDE_SHADER(textured_particle_frag)
-INCLUDE_SHADER(textured_particle_vert)
+#include "textured_particle_frag.h"
+#include "textured_particle_vert.h"
 
-INCLUDE_SHADER(overlay3D_vert)
-INCLUDE_SHADER(overlay3D_frag)
+#include "overlay3D_vert.h"
+#include "overlay3D_frag.h"
 
-INCLUDE_SHADER(skybox_vert)
-INCLUDE_SHADER(skybox_frag)
+#include "skybox_vert.h"
+#include "skybox_frag.h"
 
-INCLUDE_SHADER(DrawTransformUnitQuad_vert)
-INCLUDE_SHADER(DrawTexcoordRectTransformUnitQuad_vert)
-INCLUDE_SHADER(DrawViewportQuadTransformTexcoord_vert)
-INCLUDE_SHADER(DrawTexture_frag)
-INCLUDE_SHADER(DrawTextureOpaque_frag)
-INCLUDE_SHADER(DrawColoredTexture_frag)
+#include "DrawTransformUnitQuad_vert.h"
+#include "DrawTexcoordRectTransformUnitQuad_vert.h"
+#include "DrawViewportQuadTransformTexcoord_vert.h"
+#include "DrawTexture_frag.h"
+#include "DrawTextureOpaque_frag.h"
+#include "DrawColoredTexture_frag.h"
 
-INCLUDE_SHADER(sdf_text3D_vert)
-INCLUDE_SHADER(sdf_text3D_frag)
+#include "sdf_text3D_vert.h"
+#include "sdf_text3D_frag.h"
 
-INCLUDE_SHADER(paintStroke_vert)
-INCLUDE_SHADER(paintStroke_frag)
+#include "paintStroke_vert.h"
+#include "paintStroke_frag.h"
 
-INCLUDE_SHADER(polyvox_vert)
-INCLUDE_SHADER(polyvox_frag)
+#include "polyvox_vert.h"
+#include "polyvox_frag.h"
 
 // Create a simple OpenGL window that renders text in various ways
 class QTestWindow : public QWindow {
@@ -159,54 +159,54 @@ void QTestWindow::draw() {
 
     static std::once_flag once;
     std::call_once(once, [&]{
-        testShaderBuild(sdf_text3D_vert, sdf_text3D_frag);
+        testShaderBuild(sdf_text3D_vert, sdf_text3D_frag.h";
 
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTexture_frag);
-        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert, DrawTexture_frag);
-        testShaderBuild(DrawViewportQuadTransformTexcoord_vert, DrawTexture_frag);
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTextureOpaque_frag);
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawColoredTexture_frag);
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawTexture_frag.h";
+        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert, DrawTexture_frag.h";
+        testShaderBuild(DrawViewportQuadTransformTexcoord_vert, DrawTexture_frag.h";
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawTextureOpaque_frag.h";
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawColoredTexture_frag.h";
 
-        testShaderBuild(skybox_vert, skybox_frag);
-        testShaderBuild(simple_vert, simple_frag);
-        testShaderBuild(simple_vert, simple_textured_frag);
-        testShaderBuild(simple_vert, simple_textured_unlit_frag);
-        testShaderBuild(deferred_light_vert, directional_ambient_light_frag);
-        testShaderBuild(deferred_light_vert, directional_skybox_light_frag);
-        testShaderBuild(standardTransformPNTC_vert, standardDrawTexture_frag);
-        testShaderBuild(standardTransformPNTC_vert, DrawTextureOpaque_frag);
+        testShaderBuild(skybox_vert, skybox_frag.h";
+        testShaderBuild(simple_vert, simple_frag.h";
+        testShaderBuild(simple_vert, simple_textured_frag.h";
+        testShaderBuild(simple_vert, simple_textured_unlit_frag.h";
+        testShaderBuild(deferred_light_vert, directional_ambient_light_frag.h";
+        testShaderBuild(deferred_light_vert, directional_skybox_light_frag.h";
+        testShaderBuild(standardTransformPNTC_vert, standardDrawTexture_frag.h";
+        testShaderBuild(standardTransformPNTC_vert, DrawTextureOpaque_frag.h";
 
-        testShaderBuild(model_vert, model_frag);
-        testShaderBuild(model_normal_map_vert, model_normal_map_frag);
-        testShaderBuild(model_vert, model_specular_map_frag);
-        testShaderBuild(model_normal_map_vert, model_normal_specular_map_frag);
-        testShaderBuild(model_vert, model_translucent_frag);
-        testShaderBuild(model_normal_map_vert, model_translucent_frag);
-        testShaderBuild(model_lightmap_vert, model_lightmap_frag);
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_map_frag);
-        testShaderBuild(model_lightmap_vert, model_lightmap_specular_map_frag);
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_specular_map_frag);
+        testShaderBuild(model_vert, model_frag.h";
+        testShaderBuild(model_normal_map_vert, model_normal_map_frag.h";
+        testShaderBuild(model_vert, model_specular_map_frag.h";
+        testShaderBuild(model_normal_map_vert, model_normal_specular_map_frag.h";
+        testShaderBuild(model_vert, model_translucent_frag.h";
+        testShaderBuild(model_normal_map_vert, model_translucent_frag.h";
+        testShaderBuild(model_lightmap_vert, model_lightmap_frag.h";
+        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_map_frag.h";
+        testShaderBuild(model_lightmap_vert, model_lightmap_specular_map_frag.h";
+        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_specular_map_frag.h";
 
-        testShaderBuild(skin_model_vert, model_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_normal_map_frag);
-        testShaderBuild(skin_model_vert, model_specular_map_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_normal_specular_map_frag);
-        testShaderBuild(skin_model_vert, model_translucent_frag);
-        testShaderBuild(skin_model_normal_map_vert, model_translucent_frag);
+        testShaderBuild(skin_model_vert, model_frag.h";
+        testShaderBuild(skin_model_normal_map_vert, model_normal_map_frag.h";
+        testShaderBuild(skin_model_vert, model_specular_map_frag.h";
+        testShaderBuild(skin_model_normal_map_vert, model_normal_specular_map_frag.h";
+        testShaderBuild(skin_model_vert, model_translucent_frag.h";
+        testShaderBuild(skin_model_normal_map_vert, model_translucent_frag.h";
 
-        testShaderBuild(model_shadow_vert, model_shadow_frag);
-        testShaderBuild(textured_particle_vert, textured_particle_frag);
+        testShaderBuild(model_shadow_vert, model_shadow_frag.h";
+        testShaderBuild(textured_particle_vert, textured_particle_frag.h";
 /* FIXME: Bring back the ssao shader tests
-        testShaderBuild(gaussian_blur_vertical_vert, gaussian_blur_frag);
-        testShaderBuild(gaussian_blur_horizontal_vert, gaussian_blur_frag);
-        testShaderBuild(ambient_occlusion_vert, ambient_occlusion_frag);
-        testShaderBuild(ambient_occlusion_vert, occlusion_blend_frag);
+        testShaderBuild(gaussian_blur_vertical_vert, gaussian_blur_frag.h";
+        testShaderBuild(gaussian_blur_horizontal_vert, gaussian_blur_frag.h";
+        testShaderBuild(ambient_occlusion_vert, ambient_occlusion_frag.h";
+        testShaderBuild(ambient_occlusion_vert, occlusion_blend_frag.h";
 */
 
-        testShaderBuild(overlay3D_vert, overlay3D_frag);
+        testShaderBuild(overlay3D_vert, overlay3D_frag.h";
 
-        testShaderBuild(paintStroke_vert,paintStroke_frag);
-        testShaderBuild(polyvox_vert, polyvox_frag);
+        testShaderBuild(paintStroke_vert,paintStroke_frag.h";
+        testShaderBuild(polyvox_vert, polyvox_frag.h";
 
     });
     _context.swapBuffers(this);
diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index 8e6ca31c71..2092bc0ea2 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -44,6 +44,18 @@ int main (int argc, char** argv) {
         EXIT,
     } mode = READY;
 
+    enum Type {
+        VERTEX = 0,
+        FRAGMENT,
+        GEOMETRY,
+    } type = VERTEX;
+    static const char* shaderTypeString[] = {
+        "VERTEX", "PIXEL", "GEOMETRY"
+    };
+    static const char* shaderCreateString[] = {
+        "Vertex", "Pixel", "Geometry"
+    };
+
     for (int ii = 1; (mode != EXIT) && (ii < argc); ii++) {
         inputs.push_back(argv[ii]);
 
@@ -66,6 +78,15 @@ int main (int argc, char** argv) {
                 } else if (inputs.back() == "-c++") {
                     makeCPlusPlus = true;
                     mode = READY;
+                } else if (inputs.back() == "-vert") {
+                    type = VERTEX;
+                    mode = READY;
+                } else if (inputs.back() == "-frag") {
+                    type = FRAGMENT;
+                    mode = READY;
+                } else if (inputs.back() == "-geom") {
+                    type = GEOMETRY;
+                    mode = READY;
                 } else {
                     // just grabbed the source filename, stop parameter parsing
                     srcFilename = inputs.back();
@@ -186,7 +207,6 @@ int main (int argc, char** argv) {
         scribe->displayTree(cerr, level);
     }
 
-    std::ostringstream targetStringStream;
     if (makeCPlusPlus) {
         // Because there is a maximum size for literal strings declared in source we need to partition the 
         // full source string stream into pages that seems to be around that value...
@@ -208,32 +228,108 @@ int main (int argc, char** argv) {
             pageSize += lineSize;
         }
 
-        targetStringStream << "// File generated by Scribe " << vars["_SCRIBE_DATE"] << std::endl;
-        targetStringStream << "extern const char " << targetName << "[] = \n";
+        std::stringstream headerStringStream;
+        std::stringstream sourceStringStream;
+        std::string headerFileName = destFilename + ".h";
+        std::string sourceFileName = destFilename + ".cpp";
 
+        sourceStringStream << "// File generated by Scribe " << vars["_SCRIBE_DATE"] << std::endl;
+
+        // Write header file
+        headerStringStream << "#ifndef " << targetName << "_h" << std::endl;
+        headerStringStream << "#define " << targetName << "_h\n" << std::endl;
+        headerStringStream << "#include <gpu/Shader.h>\n" << std::endl;
+        headerStringStream << "class " << targetName << " {" << std::endl;
+        headerStringStream << "public:" << std::endl;
+        headerStringStream << "\tstatic gpu::Shader::Type getType() { return gpu::Shader::" << shaderTypeString[type] << "; }" << std::endl;
+        headerStringStream << "\tstatic const char* getSource() { return _source; }" << std::endl;
+        headerStringStream << "\tstatic gpu::ShaderPointer getShader();" << std::endl;
+        headerStringStream << "private:" << std::endl;
+        headerStringStream << "\tstatic const char* _source;" << std::endl;
+        headerStringStream << "\tstatic gpu::ShaderPointer _shader;" << std::endl;
+        headerStringStream << "};\n" << std::endl;
+        headerStringStream << "#endif // " << targetName << "_h" << std::endl;
+
+        bool mustOutputHeader = destFilename.empty();
+        // Compare with existing file
+        {
+            std::fstream headerFile;
+            headerFile.open(headerFileName, std::fstream::in);
+            if (headerFile.is_open()) {
+                // Skip first line
+                std::string line;
+                std::stringstream previousHeaderStringStream;
+                std::getline(headerFile, line);
+
+                previousHeaderStringStream << headerFile.rdbuf();
+                mustOutputHeader = mustOutputHeader || previousHeaderStringStream.str() != headerStringStream.str();
+            } else {
+                mustOutputHeader = true;
+            }
+        }
+
+        if (mustOutputHeader) {
+            if (!destFilename.empty()) {
+                // File content has changed so write it
+                std::fstream headerFile;
+                headerFile.open(headerFileName, std::fstream::out);
+                if (headerFile.is_open()) {
+                    // First line contains the date of modification
+                    headerFile << sourceStringStream.str();
+                    headerFile << headerStringStream.str();
+                } else {
+                    cerr << "Scribe output file <" << headerFileName << "> failed to open." << endl;
+                    return 0;
+                }
+            } else {
+                cerr << sourceStringStream.str();
+                cerr << headerStringStream.str();
+            }
+        }
+
+        // Write source file
+        sourceStringStream << "#include \"" << targetName << ".h\"\n" << std::endl;
+        sourceStringStream << "gpu::ShaderPointer " << targetName << "::_shader;" << std::endl;
+        sourceStringStream << "const char* " << targetName << "::_source = ";
         // Write the pages content
         for (auto page : pages) {
-            targetStringStream << "R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\"\n";
+            sourceStringStream << "R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\"\n";
         }
-        targetStringStream << ";\n" << std::endl << std::endl;
-        targetStringStream << "// Hack to fix Android link error by forcing a reference to global variable\n";
-        targetStringStream << "class " << targetName << "_used {\npublic:\nstatic const char* get() { return " << targetName << "; }\n};\n" << std::endl;
-    } else {
-        targetStringStream << destStringStream.str();
-    }
+        sourceStringStream << ";\n" << std::endl << std::endl;
 
-    // Destination stream
-    if (!destFilename.empty()) {
-        std::fstream destFileStream;
-        destFileStream.open(destFilename, std::fstream::out);
-        if (!destFileStream.is_open()) {
-            cerr << "Scribe output file " << destFilename << "> failed to open." << endl;
-            return 0;
+        sourceStringStream << "gpu::ShaderPointer " << targetName << "::getShader() {" << std::endl;
+        sourceStringStream << "\tif (_shader==nullptr) {" << std::endl;
+        sourceStringStream << "\t\t_shader = gpu::Shader::create" << shaderCreateString[type] << "(std::string(_source));" << std::endl;
+        sourceStringStream << "\t}" << std::endl;
+        sourceStringStream << "\treturn _shader;" << std::endl;
+        sourceStringStream << "}\n" << std::endl;
+
+        // Destination stream
+        if (!destFilename.empty()) {
+            std::fstream sourceFile;
+            sourceFile.open(sourceFileName, std::fstream::out);
+            if (!sourceFile.is_open()) {
+                cerr << "Scribe output file <" << sourceFileName << "> failed to open." << endl;
+                return 0;
+            }
+            sourceFile << sourceStringStream.str();
+        } else {
+            cerr << sourceStringStream.str();
         }
-        
-        destFileStream << targetStringStream.str();
     } else {
-        cerr << targetStringStream.str();
+        // Destination stream
+        if (!destFilename.empty()) {
+            std::fstream destFileStream;
+            destFileStream.open(destFilename, std::fstream::out);
+            if (!destFileStream.is_open()) {
+                cerr << "Scribe output file <" << destFilename << "> failed to open." << endl;
+                return 0;
+            }
+
+            destFileStream << destStringStream.str();
+        } else {
+            cerr << destStringStream.str();
+        }
     }
 
     return 0;

From 49549ced171962fc090ee8bfe4d3d8e27be260f0 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 17 Jan 2018 10:52:58 +0100
Subject: [PATCH 029/569] Fixed compilation with new shader system

---
 .../display-plugins/hmd/HmdDisplayPlugin.cpp  |   8 +-
 .../RenderableParticleEffectEntityItem.cpp    |   4 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   4 +-
 .../src/RenderablePolyVoxEntityItem.cpp       |   4 +-
 .../src/RenderableShapeEntityItem.cpp         |   8 +-
 .../procedural/src/procedural/Procedural.cpp  |   2 +-
 .../src/procedural/ProceduralSkybox.cpp       |   8 +-
 .../src/AmbientOcclusionEffect.cpp            |   8 +-
 libraries/render-utils/src/AnimDebugDraw.cpp  |   4 +-
 .../render-utils/src/AntialiasingEffect.cpp   |   8 +-
 libraries/render-utils/src/BloomEffect.cpp    |   4 +-
 .../render-utils/src/DebugDeferredBuffer.cpp  |   5 +-
 .../src/DeferredLightingEffect.cpp            |  25 ++-
 libraries/render-utils/src/DrawHaze.cpp       |   2 +-
 libraries/render-utils/src/GeometryCache.cpp  |  35 ++--
 .../render-utils/src/HighlightEffect.cpp      |  19 +-
 libraries/render-utils/src/LightClusters.cpp  |   8 +-
 .../render-utils/src/RenderForwardTask.cpp    |   2 +-
 .../render-utils/src/RenderPipelines.cpp      | 154 ++++++++--------
 .../render-utils/src/StencilMaskPass.cpp      |   2 +-
 .../render-utils/src/SubsurfaceScattering.cpp |   8 +-
 .../render-utils/src/SurfaceGeometryPass.cpp  |   6 +-
 .../render-utils/src/ToneMappingEffect.cpp    |   2 +-
 libraries/render-utils/src/ZoneRenderer.cpp   |   6 +-
 libraries/render-utils/src/text/Font.cpp      |   6 +-
 libraries/render/src/render/BlurTask.cpp      |   8 +-
 .../render/src/render/DrawSceneOctree.cpp     |  10 +-
 libraries/render/src/render/DrawStatus.cpp    |   8 +-
 libraries/render/src/render/DrawTask.cpp      |   4 +-
 tests/shaders/src/main.cpp                    | 172 +++++++++---------
 tools/scribe/src/main.cpp                     |  10 +-
 31 files changed, 273 insertions(+), 281 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index f39203c89d..0a5704f6da 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -33,8 +33,8 @@
 #include "../Logging.h"
 #include "../CompositorHelper.h"
 
-#include "hmd_ui_vert.h"
-#include "hmd_ui_frag.h"
+#include "render-utils/hmd_ui_vert.h"
+#include "render-utils/hmd_ui_frag.h"
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString DISABLE_PREVIEW = "Disable Preview";
@@ -403,8 +403,8 @@ void HmdDisplayPlugin::HUDRenderer::build() {
 
 void HmdDisplayPlugin::HUDRenderer::updatePipeline() {
     if (!pipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(hmd_ui_vert));
-        auto ps = gpu::Shader::createPixel(std::string(hmd_ui_frag));
+        auto vs = hmd_ui_vert::getShader();
+        auto ps = hmd_ui_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::gl::GLBackend::makeProgram(*program, gpu::Shader::BindingSet());
         uniformsLocation = program->getUniformBuffers().findLocation("hudBuffer");
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index a3e6cd4341..9981245e6f 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -36,8 +36,8 @@ static ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, co
             gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
         PrepareStencil::testMask(*state);
 
-        auto vertShader = gpu::Shader::createVertex(std::string(textured_particle_vert));
-        auto fragShader = gpu::Shader::createPixel(std::string(textured_particle_frag));
+        auto vertShader = textured_particle_vert::getShader();
+        auto fragShader = textured_particle_frag::getShader();
 
         auto program = gpu::Shader::createProgram(vertShader, fragShader);
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index b362721cde..8a53c9fba5 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -48,8 +48,8 @@ struct PolyLineUniforms {
 
 static render::ShapePipelinePointer shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key) {
     if (!polylinePipeline) {
-        auto VS = gpu::Shader::createVertex(std::string(paintStroke_vert));
-        auto PS = gpu::Shader::createPixel(std::string(paintStroke_frag));
+        auto VS = paintStroke_vert::getShader();
+        auto PS = paintStroke_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
 #ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
         auto fadeVS = gpu::Shader::createVertex(std::string(paintStroke_fade_vert));
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index cf12da86e9..379103d4b3 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1461,8 +1461,8 @@ static gpu::Stream::FormatPointer _vertexFormat;
 
 ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, const ShapeKey& key) {
     if (!_pipelines[0]) {
-        gpu::ShaderPointer vertexShaders[2] = { gpu::Shader::createVertex(std::string(polyvox_vert)), gpu::Shader::createVertex(std::string(polyvox_fade_vert)) };
-        gpu::ShaderPointer pixelShaders[2] = { gpu::Shader::createPixel(std::string(polyvox_frag)), gpu::Shader::createPixel(std::string(polyvox_fade_frag)) };
+        gpu::ShaderPointer vertexShaders[2] = { polyvox_vert::getShader(), polyvox_fade_vert::getShader() };
+        gpu::ShaderPointer pixelShaders[2] = { polyvox_frag::getShader(), polyvox_fade_frag::getShader() };
 
         gpu::Shader::BindingSet slotBindings;
         slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), MATERIAL_GPU_SLOT));
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index eddde317fe..0c4f8cbd39 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -16,8 +16,8 @@
 #include <GeometryCache.h>
 #include <PerfStat.h>
 
-#include "simple_vert.h"
-#include "simple_frag.h"
+#include "render-utils/simple_vert.h"
+#include "render-utils/simple_frag.h"
 
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
@@ -32,8 +32,8 @@ static const float SPHERE_ENTITY_SCALE = 0.5f;
 
 
 ShapeEntityRenderer::ShapeEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
-    _procedural._vertexSource = simple_vert;
-    _procedural._fragmentSource = simple_frag;
+    _procedural._vertexSource = simple_vert::getSource();
+    _procedural._fragmentSource = simple_frag::getSource();
     _procedural._opaqueState->setCullMode(gpu::State::CULL_NONE);
     _procedural._opaqueState->setDepthTest(true, true, gpu::LESS_EQUAL);
     PrepareStencil::testMaskDrawShape(*_procedural._opaqueState);
diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp
index ba29768f68..52c56d1e7d 100644
--- a/libraries/procedural/src/procedural/Procedural.cpp
+++ b/libraries/procedural/src/procedural/Procedural.cpp
@@ -241,7 +241,7 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
         std::string fragmentShaderSource = _fragmentSource;
         size_t replaceIndex = fragmentShaderSource.find(PROCEDURAL_COMMON_BLOCK);
         if (replaceIndex != std::string::npos) {
-            fragmentShaderSource.replace(replaceIndex, PROCEDURAL_COMMON_BLOCK.size(), ProceduralCommon_frag.h";
+            fragmentShaderSource.replace(replaceIndex, PROCEDURAL_COMMON_BLOCK.size(), ProceduralCommon_frag::getSource());
         }
 
         replaceIndex = fragmentShaderSource.find(PROCEDURAL_VERSION);
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
index 60fde7bd14..8fb74e0b1b 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
@@ -15,12 +15,12 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-#include "skybox_vert.h"
-#include "skybox_frag.h"
+#include "model/skybox_vert.h"
+#include "model/skybox_frag.h"
 
 ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
-    _procedural._vertexSource = skybox_vert;
-    _procedural._fragmentSource = skybox_frag;
+    _procedural._vertexSource = skybox_vert::getSource();
+    _procedural._fragmentSource = skybox_frag::getSource();
     // Adjust the pipeline state for background using the stencil test
     _procedural.setDoesFade(false);
     // Must match PrepareStencil::STENCIL_BACKGROUND
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index 83753131c8..015f5678c8 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -263,7 +263,7 @@ void AmbientOcclusionEffect::configure(const Config& config) {
 const gpu::PipelinePointer& AmbientOcclusionEffect::getOcclusionPipeline() {
     if (!_occlusionPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(ssao_makeOcclusion_frag));
+        auto ps = ssao_makeOcclusion_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -288,7 +288,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getOcclusionPipeline() {
 const gpu::PipelinePointer& AmbientOcclusionEffect::getHBlurPipeline() {
     if (!_hBlurPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(ssao_makeHorizontalBlur_frag));
+        auto ps = ssao_makeHorizontalBlur_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
         
         gpu::Shader::BindingSet slotBindings;
@@ -311,7 +311,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getHBlurPipeline() {
 const gpu::PipelinePointer& AmbientOcclusionEffect::getVBlurPipeline() {
     if (!_vBlurPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(ssao_makeVerticalBlur_frag));
+        auto ps = ssao_makeVerticalBlur_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
         
         gpu::Shader::BindingSet slotBindings;
@@ -458,7 +458,7 @@ void DebugAmbientOcclusion::configure(const Config& config) {
 const gpu::PipelinePointer& DebugAmbientOcclusion::getDebugPipeline() {
     if (!_debugPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(ssao_debugOcclusion_frag));
+        auto ps = ssao_debugOcclusion_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index 382b4e2d93..dc9a4d8a1b 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -102,8 +102,8 @@ AnimDebugDraw::AnimDebugDraw() :
     state->setBlendFunction(false, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD,
                             gpu::State::INV_SRC_ALPHA, gpu::State::FACTOR_ALPHA,
                             gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-    auto vertShader = gpu::Shader::createVertex(std::string(animdebugdraw_vert));
-    auto fragShader = gpu::Shader::createPixel(std::string(animdebugdraw_frag));
+    auto vertShader = animdebugdraw_vert::getShader();
+    auto fragShader = animdebugdraw_frag::getShader();
     auto program = gpu::Shader::createProgram(vertShader, fragShader);
     _pipeline = gpu::Pipeline::create(program, state);
 
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 70c2e3b5ce..bdd8f19a5c 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -57,8 +57,8 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(RenderArgs* ar
     }
 
     if (!_antialiasingPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(fxaa_vert));
-        auto ps = gpu::Shader::createPixel(std::string(fxaa_frag));
+        auto vs = fxaa_vert::getShader();
+        auto ps = fxaa_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -82,8 +82,8 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(RenderArgs* ar
 
 const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
     if (!_blendPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(fxaa_vert));
-        auto ps = gpu::Shader::createPixel(std::string(fxaa_blend_frag));
+        auto vs = fxaa_vert::getShader();
+        auto ps = fxaa_blend_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
index 9d9367a6d5..89a83a651a 100644
--- a/libraries/render-utils/src/BloomEffect.cpp
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -61,7 +61,7 @@ void BloomThreshold::run(const render::RenderContextPointer& renderContext, cons
 
     if (!_pipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(BloomThreshold_frag));
+        auto ps = BloomThreshold_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -113,7 +113,7 @@ void BloomApply::run(const render::RenderContextPointer& renderContext, const In
 
     if (!_pipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(BloomApply_frag));
+        auto ps = BloomApply_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index fe03ead4e1..24cffe2fb8 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -369,8 +369,7 @@ bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, std::string customFile)
 
 const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) {
     if (pipelineNeedsUpdate(mode, customFile)) {
-        static const std::string VERTEX_SHADER { debug_deferred_buffer_vert };
-        static const std::string FRAGMENT_SHADER { debug_deferred_buffer_frag };
+        static const std::string FRAGMENT_SHADER { debug_deferred_buffer_frag::getSource() };
         static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" };
         static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);
         Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,
@@ -380,7 +379,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str
         bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(),
                                     getShaderSourceCode(mode, customFile));
         
-        static const auto vs = gpu::Shader::createVertex(VERTEX_SHADER);
+        const auto vs = debug_deferred_buffer_vert::getShader();
         const auto ps = gpu::Shader::createPixel(bakedFragmentShader);
         const auto program = gpu::Shader::createProgram(vs, ps);
         
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 81a33f17e3..8c3b76f557 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -79,7 +79,7 @@ enum DeferredShader_BufferSlot {
     LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,
 };
 
-static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
+static void loadLightProgram(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
 
 void DeferredLightingEffect::init() {
     _directionalAmbientSphereLightLocations = std::make_shared<LightLocations>();
@@ -91,14 +91,14 @@ void DeferredLightingEffect::init() {
     _localLightLocations = std::make_shared<LightLocations>();
     _localLightOutlineLocations = std::make_shared<LightLocations>();
 
-    loadLightProgram(deferred_light_vert, directional_ambient_light_frag, false, _directionalAmbientSphereLight, _directionalAmbientSphereLightLocations);
-    loadLightProgram(deferred_light_vert, directional_skybox_light_frag, false, _directionalSkyboxLight, _directionalSkyboxLightLocations);
+    loadLightProgram(deferred_light_vert::getShader(), directional_ambient_light_frag::getShader(), false, _directionalAmbientSphereLight, _directionalAmbientSphereLightLocations);
+    loadLightProgram(deferred_light_vert::getShader(), directional_skybox_light_frag::getShader(), false, _directionalSkyboxLight, _directionalSkyboxLightLocations);
 
-    loadLightProgram(deferred_light_vert, directional_ambient_light_shadow_frag, false, _directionalAmbientSphereLightShadow, _directionalAmbientSphereLightShadowLocations);
-    loadLightProgram(deferred_light_vert, directional_skybox_light_shadow_frag, false, _directionalSkyboxLightShadow, _directionalSkyboxLightShadowLocations);
+    loadLightProgram(deferred_light_vert::getShader(), directional_ambient_light_shadow_frag::getShader(), false, _directionalAmbientSphereLightShadow, _directionalAmbientSphereLightShadowLocations);
+    loadLightProgram(deferred_light_vert::getShader(), directional_skybox_light_shadow_frag::getShader(), false, _directionalSkyboxLightShadow, _directionalSkyboxLightShadowLocations);
 
-    loadLightProgram(deferred_light_vert, local_lights_shading_frag, true, _localLight, _localLightLocations);
-    loadLightProgram(deferred_light_vert, local_lights_drawOutline_frag, true, _localLightOutline, _localLightOutlineLocations);
+    loadLightProgram(deferred_light_vert::getShader(), local_lights_shading_frag::getShader(), true, _localLight, _localLightLocations);
+    loadLightProgram(deferred_light_vert::getShader(), local_lights_drawOutline_frag::getShader(), true, _localLightOutline, _localLightOutlineLocations);
 }
 
 void DeferredLightingEffect::setupKeyLightBatch(const RenderArgs* args, gpu::Batch& batch, int lightBufferUnit, int ambientBufferUnit, int skyboxCubemapUnit) {
@@ -144,11 +144,8 @@ void DeferredLightingEffect::unsetKeyLightBatch(gpu::Batch& batch, int lightBuff
     }
 }
 
-static gpu::ShaderPointer makeLightProgram(const char* vertSource, const char* fragSource, LightLocationsPtr& locations) {
-    auto VS = gpu::Shader::createVertex(std::string(vertSource));
-    auto PS = gpu::Shader::createPixel(std::string(fragSource));
-    
-    gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
+static gpu::ShaderPointer makeLightProgram(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, LightLocationsPtr& locations) {
+    gpu::ShaderPointer program = gpu::Shader::createProgram(vertShader, fragShader);
 
     gpu::Shader::BindingSet slotBindings;
     slotBindings.insert(gpu::Shader::Binding(std::string("colorMap"), DEFERRED_BUFFER_COLOR_UNIT));
@@ -196,9 +193,9 @@ static gpu::ShaderPointer makeLightProgram(const char* vertSource, const char* f
     return program;
 }
 
-static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& pipeline, LightLocationsPtr& locations) {
+static void loadLightProgram(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, bool lightVolume, gpu::PipelinePointer& pipeline, LightLocationsPtr& locations) {
 
-    gpu::ShaderPointer program = makeLightProgram(vertSource, fragSource, locations);
+    gpu::ShaderPointer program = makeLightProgram(vertShader, fragShader, locations);
 
     auto state = std::make_shared<gpu::State>();
     state->setColorWriteMask(true, true, true, false);
diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp
index da07f5bd9b..986212ca6e 100644
--- a/libraries/render-utils/src/DrawHaze.cpp
+++ b/libraries/render-utils/src/DrawHaze.cpp
@@ -133,7 +133,7 @@ void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inpu
     RenderArgs* args = renderContext->args;
 
     if (!_hazePipeline) {
-        gpu::ShaderPointer ps = gpu::Shader::createPixel(std::string(Haze_frag));
+        gpu::ShaderPointer ps = Haze_frag::getShader();
         gpu::ShaderPointer vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
 
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 2616d08600..e962c2901f 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -1946,8 +1946,8 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const
     static std::once_flag once;
     std::call_once(once, [&] {
         auto state = std::make_shared<gpu::State>();
-        auto VS = gpu::Shader::createVertex(std::string(glowLine_vert));
-        auto PS = gpu::Shader::createPixel(std::string(glowLine_frag));
+        auto VS = glowLine_vert::getShader();
+        auto PS = glowLine_frag::getShader();
         auto program = gpu::Shader::createProgram(VS, PS);
         state->setCullMode(gpu::State::CULL_NONE);
         state->setDepthTest(true, false, gpu::LESS_EQUAL);
@@ -2002,8 +2002,8 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const
 
 void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
     if (!_standardDrawPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
-        auto ps = gpu::Shader::createPixel(std::string(standardDrawTexture_frag));
+        auto vs = standardTransformPNTC_vert::getShader();
+        auto ps = standardDrawTexture_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
 
@@ -2033,8 +2033,8 @@ void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
 
 void GeometryCache::useGridPipeline(gpu::Batch& batch, GridBuffer gridBuffer, bool isLayered) {
     if (!_gridPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(standardTransformPNTC_vert));
-        auto ps = gpu::Shader::createPixel(std::string(grid_frag));
+        auto vs = standardTransformPNTC_vert::getShader();
+        auto ps = grid_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
         _gridSlot = program->getUniformBuffers().findLocation("gridBuffer");
@@ -2117,12 +2117,9 @@ inline bool operator==(const SimpleProgramKey& a, const SimpleProgramKey& b) {
     return a.getRaw() == b.getRaw();
 }
 
-static void buildWebShader(const std::string& vertShaderText, const std::string& fragShaderText, bool blendEnable,
+static void buildWebShader(const gpu::ShaderPointer& vertShader, const gpu::ShaderPointer& fragShader, bool blendEnable,
                            gpu::ShaderPointer& shaderPointerOut, gpu::PipelinePointer& pipelinePointerOut) {
-    auto VS = gpu::Shader::createVertex(vertShaderText);
-    auto PS = gpu::Shader::createPixel(fragShaderText);
-
-    shaderPointerOut = gpu::Shader::createProgram(VS, PS);
+    shaderPointerOut = gpu::Shader::createProgram(vertShader, fragShader);
 
     gpu::Shader::BindingSet slotBindings;
     gpu::Shader::makeProgram(*shaderPointerOut, slotBindings);
@@ -2145,8 +2142,8 @@ void GeometryCache::bindWebBrowserProgram(gpu::Batch& batch, bool transparent) {
 gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent) {
     static std::once_flag once;
     std::call_once(once, [&]() {
-        buildWebShader(simple_vert, simple_opaque_web_browser_frag, false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
-        buildWebShader(simple_vert, simple_transparent_web_browser_frag, true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
+        buildWebShader(simple_vert::getShader(), simple_opaque_web_browser_frag::getShader(), false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
+        buildWebShader(simple_vert::getShader(), simple_transparent_web_browser_frag::getShader(), true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
     });
 
     return transparent ? _simpleTransparentWebBrowserPipelineNoAA : _simpleOpaqueWebBrowserPipelineNoAA;
@@ -2175,9 +2172,9 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp
     if (!fading) {
         static std::once_flag once;
         std::call_once(once, [&]() {
-            auto VS = gpu::Shader::createVertex(std::string(simple_vert));
-            auto PS = gpu::Shader::createPixel(std::string(simple_textured_frag));
-            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
+            auto VS = simple_vert::getShader();
+            auto PS = simple_textured_frag::getShader();
+            auto PSUnlit = simple_textured_unlit_frag::getShader();
 
             _simpleShader = gpu::Shader::createProgram(VS, PS);
             _unlitShader = gpu::Shader::createProgram(VS, PSUnlit);
@@ -2190,9 +2187,9 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp
     } else {
         static std::once_flag once;
         std::call_once(once, [&]() {
-            auto VS = gpu::Shader::createVertex(std::string(simple_fade_vert));
-            auto PS = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
-            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
+            auto VS = simple_fade_vert::getShader();
+            auto PS = simple_textured_fade_frag::getShader();
+            auto PSUnlit = simple_textured_unlit_fade_frag::getShader();
 
             _simpleFadeShader = gpu::Shader::createProgram(VS, PS);
             _unlitFadeShader = gpu::Shader::createProgram(VS, PSUnlit);
diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index fee1f4a568..9501a74d52 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -130,8 +130,8 @@ void DrawHighlightMask::run(const render::RenderContextPointer& renderContext, c
         fillState->setColorWriteMask(false, false, false, false);
         fillState->setCullMode(gpu::State::CULL_FRONT);
 
-        auto vs = gpu::Shader::createVertex(std::string(Highlight_aabox_vert));
-        auto ps = gpu::Shader::createPixel(std::string(nop_frag));
+        auto vs = Highlight_aabox_vert::getShader();
+        auto ps = nop_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -313,7 +313,7 @@ const gpu::PipelinePointer& DrawHighlight::getPipeline(const render::HighlightSt
         state->setStencilTest(true, 0, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::EQUAL));
 
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(Highlight_frag));
+        auto ps = Highlight_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -325,7 +325,7 @@ const gpu::PipelinePointer& DrawHighlight::getPipeline(const render::HighlightSt
 
         _pipeline = gpu::Pipeline::create(program, state);
 
-        ps = gpu::Shader::createPixel(std::string(Highlight_filled_frag));
+        ps = Highlight_filled_frag::getShader();
         program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram(*program, slotBindings);
         _pipelineFilled = gpu::Pipeline::create(program, state);
@@ -385,8 +385,7 @@ void DebugHighlight::run(const render::RenderContextPointer& renderContext, cons
 }
 
 void DebugHighlight::initializePipelines() {
-    static const std::string VERTEX_SHADER{ debug_deferred_buffer_vert };
-    static const std::string FRAGMENT_SHADER{ debug_deferred_buffer_frag };
+    static const std::string FRAGMENT_SHADER{ debug_deferred_buffer_frag::getSource() };
     static const std::string SOURCE_PLACEHOLDER{ "//SOURCE_PLACEHOLDER" };
     static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);
     Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,
@@ -396,7 +395,7 @@ void DebugHighlight::initializePipelines() {
     state->setDepthTest(gpu::State::DepthTest(false, false));
     state->setStencilTest(true, 0, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::EQUAL));
 
-    const auto vs = gpu::Shader::createVertex(VERTEX_SHADER);
+    const auto vs = debug_deferred_buffer_vert::getShader();
 
     // Depth shader
     {
@@ -553,14 +552,14 @@ const render::Varying DrawHighlightTask::addSelectItemJobs(JobModel& task, const
 #include "model_shadow_frag.h"
 
 void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gpu::StatePointer state) {
-    auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
-    auto modelPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
+    auto modelVertex = model_shadow_vert::getShader();
+    auto modelPixel = model_shadow_frag::getShader();
     gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(modelVertex, modelPixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withoutSkinned(),
         modelProgram, state);
 
-    auto skinVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
+    auto skinVertex = skin_model_shadow_vert::getShader();
     gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, modelPixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned(),
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index d6ac7fd2e2..ea02edb601 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -605,8 +605,8 @@ void DebugLightClusters::configure(const Config& config) {
 
 const gpu::PipelinePointer DebugLightClusters::getDrawClusterGridPipeline() {
     if (!_drawClusterGrid) {
-        auto vs = gpu::Shader::createVertex(std::string(lightClusters_drawGrid_vert));
-        auto ps = gpu::Shader::createPixel(std::string(lightClusters_drawGrid_frag));
+        auto vs = lightClusters_drawGrid_vert::getShader();
+        auto ps = lightClusters_drawGrid_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -635,7 +635,7 @@ const gpu::PipelinePointer DebugLightClusters::getDrawClusterFromDepthPipeline()
     if (!_drawClusterFromDepth) {
        // auto vs = gpu::Shader::createVertex(std::string(lightClusters_drawGrid_vert));
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(lightClusters_drawClusterFromDepth_frag));
+        auto ps = lightClusters_drawClusterFromDepth_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -665,7 +665,7 @@ const gpu::PipelinePointer DebugLightClusters::getDrawClusterContentPipeline() {
     if (!_drawClusterContent) {
       //  auto vs = gpu::Shader::createVertex(std::string(lightClusters_drawClusterContent_vert));
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(lightClusters_drawClusterContent_frag));
+        auto ps = lightClusters_drawClusterContent_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index 16e739f432..1eeac7f449 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -125,7 +125,7 @@ void Draw::run(const RenderContextPointer& renderContext,
 const gpu::PipelinePointer Stencil::getPipeline() {
     if (!_stencilPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(nop_frag);
+        auto ps = nop_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram(*program);
 
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 7f644add72..76e5cbc72a 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -117,16 +117,16 @@ void batchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderArgs* a
 void lightBatchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderArgs* args);
 
 void initOverlay3DPipelines(ShapePlumber& plumber, bool depthTest) {
-    auto vertex = gpu::Shader::createVertex(std::string(overlay3D_vert));
-    auto vertexModel = gpu::Shader::createVertex(std::string(model_vert));
-    auto pixel = gpu::Shader::createPixel(std::string(overlay3D_frag));
-    auto pixelTranslucent = gpu::Shader::createPixel(std::string(overlay3D_translucent_frag));
-    auto pixelUnlit = gpu::Shader::createPixel(std::string(overlay3D_unlit_frag));
-    auto pixelTranslucentUnlit = gpu::Shader::createPixel(std::string(overlay3D_translucent_unlit_frag));
-    auto pixelModel = gpu::Shader::createPixel(std::string(overlay3D_model_frag));
-    auto pixelModelTranslucent = gpu::Shader::createPixel(std::string(overlay3D_model_translucent_frag));
-    auto pixelModelUnlit = gpu::Shader::createPixel(std::string(overlay3D_model_unlit_frag));
-    auto pixelModelTranslucentUnlit = gpu::Shader::createPixel(std::string(overlay3D_model_translucent_unlit_frag));
+    auto vertex = overlay3D_vert::getShader();
+    auto vertexModel = model_vert::getShader();
+    auto pixel = overlay3D_frag::getShader();
+    auto pixelTranslucent = overlay3D_translucent_frag::getShader();
+    auto pixelUnlit = overlay3D_unlit_frag::getShader();
+    auto pixelTranslucentUnlit = overlay3D_translucent_unlit_frag::getShader();
+    auto pixelModel = overlay3D_model_frag::getShader();
+    auto pixelModelTranslucent = overlay3D_model_translucent_frag::getShader();
+    auto pixelModelUnlit = overlay3D_model_unlit_frag::getShader();
+    auto pixelModelTranslucentUnlit = overlay3D_model_translucent_unlit_frag::getShader();
 
     auto opaqueProgram = gpu::Shader::createProgram(vertex, pixel);
     auto translucentProgram = gpu::Shader::createProgram(vertex, pixelTranslucent);
@@ -183,60 +183,60 @@ void initOverlay3DPipelines(ShapePlumber& plumber, bool depthTest) {
 
 void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
     // Vertex shaders
-    auto simpleVertex = gpu::Shader::createVertex(std::string(simple_vert));
-    auto modelVertex = gpu::Shader::createVertex(std::string(model_vert));
-    auto modelNormalMapVertex = gpu::Shader::createVertex(std::string(model_normal_map_vert));
-    auto modelLightmapVertex = gpu::Shader::createVertex(std::string(model_lightmap_vert));
-    auto modelLightmapNormalMapVertex = gpu::Shader::createVertex(std::string(model_lightmap_normal_map_vert));
-    auto modelShadowVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
-    auto skinModelVertex = gpu::Shader::createVertex(std::string(skin_model_vert));
-    auto skinModelNormalMapVertex = gpu::Shader::createVertex(std::string(skin_model_normal_map_vert));
-    auto skinModelShadowVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
-    auto modelLightmapFadeVertex = gpu::Shader::createVertex(std::string(model_lightmap_fade_vert));
-    auto modelLightmapNormalMapFadeVertex = gpu::Shader::createVertex(std::string(model_lightmap_normal_map_fade_vert));
-    auto skinModelFadeVertex = gpu::Shader::createVertex(std::string(skin_model_fade_vert));
-    auto skinModelNormalMapFadeVertex = gpu::Shader::createVertex(std::string(skin_model_normal_map_fade_vert));
+    auto simpleVertex = simple_vert::getShader();
+    auto modelVertex = model_vert::getShader();
+    auto modelNormalMapVertex = model_normal_map_vert::getShader();
+    auto modelLightmapVertex = model_lightmap_vert::getShader();
+    auto modelLightmapNormalMapVertex = model_lightmap_normal_map_vert::getShader();
+    auto modelShadowVertex = model_shadow_vert::getShader();
+    auto skinModelVertex = skin_model_vert::getShader();
+    auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
+    auto skinModelShadowVertex = skin_model_shadow_vert::getShader();
+    auto modelLightmapFadeVertex = model_lightmap_fade_vert::getShader();
+    auto modelLightmapNormalMapFadeVertex = model_lightmap_normal_map_fade_vert::getShader();
+    auto skinModelFadeVertex = skin_model_fade_vert::getShader();
+    auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
 
-    auto modelFadeVertex = gpu::Shader::createVertex(std::string(model_fade_vert));
-    auto modelNormalMapFadeVertex = gpu::Shader::createVertex(std::string(model_normal_map_fade_vert));
-    auto simpleFadeVertex = gpu::Shader::createVertex(std::string(simple_fade_vert));
-    auto modelShadowFadeVertex = gpu::Shader::createVertex(std::string(model_shadow_fade_vert));
-    auto skinModelShadowFadeVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_fade_vert));
+    auto modelFadeVertex = model_fade_vert::getShader();
+    auto modelNormalMapFadeVertex = model_normal_map_fade_vert::getShader();
+    auto simpleFadeVertex = simple_fade_vert::getShader();
+    auto modelShadowFadeVertex = model_shadow_fade_vert::getShader();
+    auto skinModelShadowFadeVertex = skin_model_shadow_fade_vert::getShader();
 
     // Pixel shaders
-    auto simplePixel = gpu::Shader::createPixel(std::string(simple_textured_frag));
-    auto simpleUnlitPixel = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
-    auto simpleTranslucentPixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_frag));
-    auto simpleTranslucentUnlitPixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_unlit_frag));
-    auto modelPixel = gpu::Shader::createPixel(std::string(model_frag));
-    auto modelUnlitPixel = gpu::Shader::createPixel(std::string(model_unlit_frag));
-    auto modelNormalMapPixel = gpu::Shader::createPixel(std::string(model_normal_map_frag));
-    auto modelSpecularMapPixel = gpu::Shader::createPixel(std::string(model_specular_map_frag));
-    auto modelNormalSpecularMapPixel = gpu::Shader::createPixel(std::string(model_normal_specular_map_frag));
-    auto modelTranslucentPixel = gpu::Shader::createPixel(std::string(model_translucent_frag));
-    auto modelTranslucentUnlitPixel = gpu::Shader::createPixel(std::string(model_translucent_unlit_frag));
-    auto modelShadowPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
-    auto modelLightmapPixel = gpu::Shader::createPixel(std::string(model_lightmap_frag));
-    auto modelLightmapNormalMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_map_frag));
-    auto modelLightmapSpecularMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_specular_map_frag));
-    auto modelLightmapNormalSpecularMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_specular_map_frag));
-    auto modelLightmapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_fade_frag));
-    auto modelLightmapNormalMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_map_fade_frag));
-    auto modelLightmapSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_specular_map_fade_frag));
-    auto modelLightmapNormalSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_specular_map_fade_frag));
+    auto simplePixel = simple_textured_frag::getShader();
+    auto simpleUnlitPixel = simple_textured_unlit_frag::getShader();
+    auto simpleTranslucentPixel = simple_transparent_textured_frag::getShader();
+    auto simpleTranslucentUnlitPixel = simple_transparent_textured_unlit_frag::getShader();
+    auto modelPixel = model_frag::getShader();
+    auto modelUnlitPixel = model_unlit_frag::getShader();
+    auto modelNormalMapPixel = model_normal_map_frag::getShader();
+    auto modelSpecularMapPixel = model_specular_map_frag::getShader();
+    auto modelNormalSpecularMapPixel = model_normal_specular_map_frag::getShader();
+    auto modelTranslucentPixel = model_translucent_frag::getShader();
+    auto modelTranslucentUnlitPixel = model_translucent_unlit_frag::getShader();
+    auto modelShadowPixel = model_shadow_frag::getShader();
+    auto modelLightmapPixel = model_lightmap_frag::getShader();
+    auto modelLightmapNormalMapPixel = model_lightmap_normal_map_frag::getShader();
+    auto modelLightmapSpecularMapPixel = model_lightmap_specular_map_frag::getShader();
+    auto modelLightmapNormalSpecularMapPixel = model_lightmap_normal_specular_map_frag::getShader();
+    auto modelLightmapFadePixel = model_lightmap_fade_frag::getShader();
+    auto modelLightmapNormalMapFadePixel = model_lightmap_normal_map_fade_frag::getShader();
+    auto modelLightmapSpecularMapFadePixel = model_lightmap_specular_map_fade_frag::getShader();
+    auto modelLightmapNormalSpecularMapFadePixel = model_lightmap_normal_specular_map_fade_frag::getShader();
 
-    auto modelFadePixel = gpu::Shader::createPixel(std::string(model_fade_frag));
-    auto modelUnlitFadePixel = gpu::Shader::createPixel(std::string(model_unlit_fade_frag));
-    auto modelNormalMapFadePixel = gpu::Shader::createPixel(std::string(model_normal_map_fade_frag));
-    auto modelSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_specular_map_fade_frag));
-    auto modelNormalSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_normal_specular_map_fade_frag));
-    auto modelShadowFadePixel = gpu::Shader::createPixel(std::string(model_shadow_fade_frag));
-    auto modelTranslucentFadePixel = gpu::Shader::createPixel(std::string(model_translucent_fade_frag));
-    auto modelTranslucentUnlitFadePixel = gpu::Shader::createPixel(std::string(model_translucent_unlit_fade_frag));
-    auto simpleFadePixel = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
-    auto simpleUnlitFadePixel = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
-    auto simpleTranslucentFadePixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_fade_frag));
-    auto simpleTranslucentUnlitFadePixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_unlit_fade_frag));
+    auto modelFadePixel = model_fade_frag::getShader();
+    auto modelUnlitFadePixel = model_unlit_fade_frag::getShader();
+    auto modelNormalMapFadePixel = model_normal_map_fade_frag::getShader();
+    auto modelSpecularMapFadePixel = model_specular_map_fade_frag::getShader();
+    auto modelNormalSpecularMapFadePixel = model_normal_specular_map_fade_frag::getShader();
+    auto modelShadowFadePixel = model_shadow_fade_frag::getShader();
+    auto modelTranslucentFadePixel = model_translucent_fade_frag::getShader();
+    auto modelTranslucentUnlitFadePixel = model_translucent_unlit_fade_frag::getShader();
+    auto simpleFadePixel = simple_textured_fade_frag::getShader();
+    auto simpleUnlitFadePixel = simple_textured_unlit_fade_frag::getShader();
+    auto simpleTranslucentFadePixel = simple_transparent_textured_fade_frag::getShader();
+    auto simpleTranslucentUnlitFadePixel = simple_transparent_textured_unlit_fade_frag::getShader();
 
     using Key = render::ShapeKey;
     auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3, _4, _5);
@@ -438,17 +438,17 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
 
 void initForwardPipelines(render::ShapePlumber& plumber) {
     // Vertex shaders
-    auto modelVertex = gpu::Shader::createVertex(std::string(model_vert));
-    auto modelNormalMapVertex = gpu::Shader::createVertex(std::string(model_normal_map_vert));
-    auto skinModelVertex = gpu::Shader::createVertex(std::string(skin_model_vert));
-    auto skinModelNormalMapVertex = gpu::Shader::createVertex(std::string(skin_model_normal_map_vert));
+    auto modelVertex = model_vert::getShader();
+    auto modelNormalMapVertex = model_normal_map_vert::getShader();
+    auto skinModelVertex = skin_model_vert::getShader();
+    auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
 
     // Pixel shaders
-    auto modelPixel = gpu::Shader::createPixel(std::string(forward_model_frag));
-    auto modelUnlitPixel = gpu::Shader::createPixel(std::string(forward_model_unlit_frag));
-    auto modelNormalMapPixel = gpu::Shader::createPixel(std::string(forward_model_normal_map_frag));
-    auto modelSpecularMapPixel = gpu::Shader::createPixel(std::string(forward_model_specular_map_frag));
-    auto modelNormalSpecularMapPixel = gpu::Shader::createPixel(std::string(forward_model_normal_specular_map_frag));
+    auto modelPixel = forward_model_frag::getShader();
+    auto modelUnlitPixel = forward_model_unlit_frag::getShader();
+    auto modelNormalMapPixel = forward_model_normal_map_frag::getShader();
+    auto modelSpecularMapPixel = forward_model_specular_map_frag::getShader();
+    auto modelNormalSpecularMapPixel = forward_model_normal_specular_map_frag::getShader();
 
     using Key = render::ShapeKey;
     auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3, nullptr, nullptr);
@@ -574,29 +574,29 @@ void lightBatchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderAr
 }
 
 void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
-    auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
-    auto modelPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
+    auto modelVertex = model_shadow_vert::getShader();
+    auto modelPixel = model_shadow_frag::getShader();
     gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(modelVertex, modelPixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withoutSkinned().withoutFade(),
         modelProgram, state);
 
-    auto skinVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
-    auto skinPixel = gpu::Shader::createPixel(std::string(skin_model_shadow_frag));
+    auto skinVertex = skin_model_shadow_vert::getShader();
+    auto skinPixel = skin_model_shadow_frag::getShader();
     gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, skinPixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withoutFade(),
         skinProgram, state);
 
-    auto modelFadeVertex = gpu::Shader::createVertex(std::string(model_shadow_fade_vert));
-    auto modelFadePixel = gpu::Shader::createPixel(std::string(model_shadow_fade_frag));
+    auto modelFadeVertex = model_shadow_fade_vert::getShader();
+    auto modelFadePixel = model_shadow_fade_frag::getShader();
     gpu::ShaderPointer modelFadeProgram = gpu::Shader::createProgram(modelFadeVertex, modelFadePixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withoutSkinned().withFade(),
         modelFadeProgram, state);
 
-    auto skinFadeVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_fade_vert));
-    auto skinFadePixel = gpu::Shader::createPixel(std::string(skin_model_shadow_fade_frag));
+    auto skinFadeVertex = skin_model_shadow_fade_vert::getShader();
+    auto skinFadePixel = skin_model_shadow_fade_frag::getShader();
     gpu::ShaderPointer skinFadeProgram = gpu::Shader::createProgram(skinFadeVertex, skinFadePixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withFade(),
diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp
index 80c97cf29f..48beda78bc 100644
--- a/libraries/render-utils/src/StencilMaskPass.cpp
+++ b/libraries/render-utils/src/StencilMaskPass.cpp
@@ -60,7 +60,7 @@ gpu::PipelinePointer PrepareStencil::getMeshStencilPipeline() {
 gpu::PipelinePointer PrepareStencil::getPaintStencilPipeline() {
     if (!_paintStencilPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(stencil_drawMask_frag);
+        auto ps = stencil_drawMask_frag::getShader();
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::Shader::makeProgram((*program));
 
diff --git a/libraries/render-utils/src/SubsurfaceScattering.cpp b/libraries/render-utils/src/SubsurfaceScattering.cpp
index 1786898e57..d6ec73da85 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.cpp
+++ b/libraries/render-utils/src/SubsurfaceScattering.cpp
@@ -308,7 +308,7 @@ void diffuseProfileGPU(gpu::TexturePointer& profileMap, RenderArgs* args) {
     gpu::PipelinePointer makePipeline;
     {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(subsurfaceScattering_makeProfile_frag));
+        auto ps = subsurfaceScattering_makeProfile_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -344,7 +344,7 @@ void diffuseScatterGPU(const gpu::TexturePointer& profileMap, gpu::TexturePointe
     gpu::PipelinePointer makePipeline;
     {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(subsurfaceScattering_makeLUT_frag));
+        auto ps = subsurfaceScattering_makeLUT_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -382,7 +382,7 @@ void computeSpecularBeckmannGPU(gpu::TexturePointer& beckmannMap, RenderArgs* ar
     gpu::PipelinePointer makePipeline;
     {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(subsurfaceScattering_makeSpecularBeckmann_frag));
+        auto ps = subsurfaceScattering_makeSpecularBeckmann_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -457,7 +457,7 @@ void DebugSubsurfaceScattering::configure(const Config& config) {
 gpu::PipelinePointer DebugSubsurfaceScattering::getScatteringPipeline() {
     if (!_scatteringPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(subsurfaceScattering_drawScattering_frag));
+        auto ps = subsurfaceScattering_drawScattering_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index af6ff09082..afed9ee8fd 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -212,7 +212,7 @@ void LinearDepthPass::run(const render::RenderContextPointer& renderContext, con
 const gpu::PipelinePointer& LinearDepthPass::getLinearDepthPipeline() {
     if (!_linearDepthPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeLinearDepth_frag);
+        auto ps = surfaceGeometry_makeLinearDepth_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -239,7 +239,7 @@ const gpu::PipelinePointer& LinearDepthPass::getLinearDepthPipeline() {
 const gpu::PipelinePointer& LinearDepthPass::getDownsamplePipeline() {
     if (!_downsamplePipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_downsampleDepthNormal_frag);
+        auto ps = surfaceGeometry_downsampleDepthNormal_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -540,7 +540,7 @@ void SurfaceGeometryPass::run(const render::RenderContextPointer& renderContext,
 const gpu::PipelinePointer& SurfaceGeometryPass::getCurvaturePipeline() {
     if (!_curvaturePipeline) {
         auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(surfaceGeometry_makeCurvature_frag);
+        auto ps = surfaceGeometry_makeCurvature_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/ToneMappingEffect.cpp b/libraries/render-utils/src/ToneMappingEffect.cpp
index 6cb9541dae..e1abefd681 100644
--- a/libraries/render-utils/src/ToneMappingEffect.cpp
+++ b/libraries/render-utils/src/ToneMappingEffect.cpp
@@ -28,7 +28,7 @@ ToneMappingEffect::ToneMappingEffect() {
 }
 
 void ToneMappingEffect::init() {
-    auto blitPS = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(toneMapping_frag));
+    auto blitPS = toneMapping_frag::getShader();
 
     auto blitVS = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
     auto blitProgram = gpu::ShaderPointer(gpu::Shader::createProgram(blitVS, blitPS));
diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp
index c0d01c2eaf..19a0419a5f 100644
--- a/libraries/render-utils/src/ZoneRenderer.cpp
+++ b/libraries/render-utils/src/ZoneRenderer.cpp
@@ -78,7 +78,7 @@ void SetupZones::run(const RenderContextPointer& context, const Inputs& inputs)
 const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {
     if (!_keyLightPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(zone_drawKeyLight_frag));
+        auto ps = zone_drawKeyLight_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -99,7 +99,7 @@ const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {
 const gpu::PipelinePointer& DebugZoneLighting::getAmbientPipeline() {
     if (!_ambientPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(zone_drawAmbient_frag));
+        auto ps = zone_drawAmbient_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -120,7 +120,7 @@ const gpu::PipelinePointer& DebugZoneLighting::getAmbientPipeline() {
 const gpu::PipelinePointer& DebugZoneLighting::getBackgroundPipeline() {
     if (!_backgroundPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(zone_drawSkybox_frag));
+        auto ps = zone_drawSkybox_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index 8449c58c7c..bcd14a4fbc 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -223,9 +223,9 @@ void Font::setupGPU() {
 
         // Setup render pipeline
         {
-            auto vertexShader = gpu::Shader::createVertex(std::string(sdf_text3D_vert));
-            auto pixelShader = gpu::Shader::createPixel(std::string(sdf_text3D_frag));
-            auto pixelShaderTransparent = gpu::Shader::createPixel(std::string(sdf_text3D_transparent_frag));
+            auto vertexShader = sdf_text3D_vert::getShader();
+            auto pixelShader = sdf_text3D_frag::getShader();
+            auto pixelShaderTransparent = sdf_text3D_transparent_frag::getShader();
             gpu::ShaderPointer program = gpu::Shader::createProgram(vertexShader, pixelShader);
             gpu::ShaderPointer programTransparent = gpu::Shader::createProgram(vertexShader, pixelShaderTransparent);
 
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index 2be6f8fad2..0625179a6d 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -210,7 +210,7 @@ BlurGaussian::BlurGaussian(bool generateOutputFramebuffer, unsigned int downsamp
 gpu::PipelinePointer BlurGaussian::getBlurVPipeline() {
     if (!_blurVPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(blurGaussianV_frag));
+        auto ps = blurGaussianV_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -232,7 +232,7 @@ gpu::PipelinePointer BlurGaussian::getBlurVPipeline() {
 gpu::PipelinePointer BlurGaussian::getBlurHPipeline() {
     if (!_blurHPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(blurGaussianH_frag));
+        auto ps = blurGaussianH_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -324,7 +324,7 @@ BlurGaussianDepthAware::BlurGaussianDepthAware(bool generateOutputFramebuffer, c
 gpu::PipelinePointer BlurGaussianDepthAware::getBlurVPipeline() {
     if (!_blurVPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(blurGaussianDepthAwareV_frag));
+        auto ps = blurGaussianDepthAwareV_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -347,7 +347,7 @@ gpu::PipelinePointer BlurGaussianDepthAware::getBlurVPipeline() {
 gpu::PipelinePointer BlurGaussianDepthAware::getBlurHPipeline() {
     if (!_blurHPipeline) {
         auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
-        auto ps = gpu::Shader::createPixel(std::string(blurGaussianDepthAwareH_frag));
+        auto ps = blurGaussianDepthAwareH_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp
index 36663a454a..f1e85dbb71 100644
--- a/libraries/render/src/render/DrawSceneOctree.cpp
+++ b/libraries/render/src/render/DrawSceneOctree.cpp
@@ -34,8 +34,8 @@ using namespace render;
 
 const gpu::PipelinePointer DrawSceneOctree::getDrawCellBoundsPipeline() {
     if (!_drawCellBoundsPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(drawCellBounds_vert));
-        auto ps = gpu::Shader::createPixel(std::string(drawCellBounds_frag));
+        auto vs = drawCellBounds_vert::getShader();
+        auto ps = drawCellBounds_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -59,7 +59,7 @@ const gpu::PipelinePointer DrawSceneOctree::getDrawCellBoundsPipeline() {
 const gpu::PipelinePointer DrawSceneOctree::getDrawLODReticlePipeline() {
     if (!_drawLODReticlePipeline) {
         auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
-        auto ps = gpu::Shader::createPixel(std::string(drawLODReticle_frag));
+        auto ps = drawLODReticle_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -162,8 +162,8 @@ void DrawSceneOctree::run(const RenderContextPointer& renderContext, const ItemS
 
 const gpu::PipelinePointer DrawItemSelection::getDrawItemBoundPipeline() {
     if (!_drawItemBoundPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(drawItemBounds_vert));
-        auto ps = gpu::Shader::createPixel(std::string(drawItemBounds_frag));
+        auto vs = drawItemBounds_vert::getShader();
+        auto ps = drawItemBounds_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render/src/render/DrawStatus.cpp b/libraries/render/src/render/DrawStatus.cpp
index 148e104453..a11e9b1a88 100644
--- a/libraries/render/src/render/DrawStatus.cpp
+++ b/libraries/render/src/render/DrawStatus.cpp
@@ -35,8 +35,8 @@ void DrawStatusConfig::dirtyHelper() {
 
 const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() {
     if (!_drawItemBoundsPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(drawItemBounds_vert));
-        auto ps = gpu::Shader::createPixel(std::string(drawItemBounds_frag));
+        auto vs = drawItemBounds_vert::getShader();
+        auto ps = drawItemBounds_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
@@ -63,8 +63,8 @@ const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() {
 
 const gpu::PipelinePointer DrawStatus::getDrawItemStatusPipeline() {
     if (!_drawItemStatusPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(drawItemStatus_vert));
-        auto ps = gpu::Shader::createPixel(std::string(drawItemStatus_frag));
+        auto vs = drawItemStatus_vert::getShader();
+        auto ps = drawItemStatus_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index a60bf91062..88d38d1c66 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -155,8 +155,8 @@ void DrawLight::run(const RenderContextPointer& renderContext, const ItemBounds&
 
 const gpu::PipelinePointer DrawBounds::getPipeline() {
     if (!_boundsPipeline) {
-        auto vs = gpu::Shader::createVertex(std::string(drawItemBounds_vert));
-        auto ps = gpu::Shader::createPixel(std::string(drawItemBounds_frag));
+        auto vs = drawItemBounds_vert::getShader();
+        auto ps = drawItemBounds_frag::getShader();
         gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
 
         gpu::Shader::BindingSet slotBindings;
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index de37c505a6..83ada05fbd 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -23,65 +23,65 @@
 
 #include <gl/QOpenGLContextWrapper.h>
 
-#include "simple_vert.h"
-#include "simple_frag.h"
-#include "simple_textured_frag.h"
-#include "simple_textured_unlit_frag.h"
+#include "render-utils/simple_vert.h"
+#include "render-utils/simple_frag.h"
+#include "render-utils/simple_textured_frag.h"
+#include "render-utils/simple_textured_unlit_frag.h"
 
-#include "deferred_light_vert.h"
-#include "deferred_light_point_vert.h"
-#include "deferred_light_spot_vert.h"
+#include "render-utils/deferred_light_vert.h"
+#include "render-utils/deferred_light_point_vert.h"
+#include "render-utils/deferred_light_spot_vert.h"
 
-#include "directional_ambient_light_frag.h"
-#include "directional_skybox_light_frag.h"
+#include "render-utils/directional_ambient_light_frag.h"
+#include "render-utils/directional_skybox_light_frag.h"
 
-#include "standardTransformPNTC_vert.h"
-#include "standardDrawTexture_frag.h"
+#include "render-utils/standardTransformPNTC_vert.h"
+#include "render-utils/standardDrawTexture_frag.h"
 
-#include "model_vert.h"
-#include "model_shadow_vert.h"
-#include "model_normal_map_vert.h"
-#include "model_lightmap_vert.h"
-#include "model_lightmap_normal_map_vert.h"
-#include "skin_model_vert.h"
-#include "skin_model_shadow_vert.h"
-#include "skin_model_normal_map_vert.h"
+#include "render-utils/model_vert.h"
+#include "render-utils/model_shadow_vert.h"
+#include "render-utils/model_normal_map_vert.h"
+#include "render-utils/model_lightmap_vert.h"
+#include "render-utils/model_lightmap_normal_map_vert.h"
+#include "render-utils/skin_model_vert.h"
+#include "render-utils/skin_model_shadow_vert.h"
+#include "render-utils/skin_model_normal_map_vert.h"
 
-#include "model_frag.h"
-#include "model_shadow_frag.h"
-#include "model_normal_map_frag.h"
-#include "model_normal_specular_map_frag.h"
-#include "model_specular_map_frag.h"
-#include "model_lightmap_frag.h"
-#include "model_lightmap_normal_map_frag.h"
-#include "model_lightmap_normal_specular_map_frag.h"
-#include "model_lightmap_specular_map_frag.h"
-#include "model_translucent_frag.h"
+#include "render-utils/model_frag.h"
+#include "render-utils/model_shadow_frag.h"
+#include "render-utils/model_normal_map_frag.h"
+#include "render-utils/model_normal_specular_map_frag.h"
+#include "render-utils/model_specular_map_frag.h"
+#include "render-utils/model_lightmap_frag.h"
+#include "render-utils/model_lightmap_normal_map_frag.h"
+#include "render-utils/model_lightmap_normal_specular_map_frag.h"
+#include "render-utils/model_lightmap_specular_map_frag.h"
+#include "render-utils/model_translucent_frag.h"
 
-#include "textured_particle_frag.h"
-#include "textured_particle_vert.h"
+#include "entities-renderer/textured_particle_frag.h"
+#include "entities-renderer/textured_particle_vert.h"
 
-#include "overlay3D_vert.h"
-#include "overlay3D_frag.h"
+#include "render-utils/overlay3D_vert.h"
+#include "render-utils/overlay3D_frag.h"
 
-#include "skybox_vert.h"
-#include "skybox_frag.h"
+#include "model/skybox_vert.h"
+#include "model/skybox_frag.h"
 
-#include "DrawTransformUnitQuad_vert.h"
-#include "DrawTexcoordRectTransformUnitQuad_vert.h"
-#include "DrawViewportQuadTransformTexcoord_vert.h"
-#include "DrawTexture_frag.h"
-#include "DrawTextureOpaque_frag.h"
-#include "DrawColoredTexture_frag.h"
+#include "gpu/DrawTransformUnitQuad_vert.h"
+#include "gpu/DrawTexcoordRectTransformUnitQuad_vert.h"
+#include "gpu/DrawViewportQuadTransformTexcoord_vert.h"
+#include "gpu/DrawTexture_frag.h"
+#include "gpu/DrawTextureOpaque_frag.h"
+#include "gpu/DrawColoredTexture_frag.h"
 
-#include "sdf_text3D_vert.h"
-#include "sdf_text3D_frag.h"
+#include "render-utils/sdf_text3D_vert.h"
+#include "render-utils/sdf_text3D_frag.h"
 
-#include "paintStroke_vert.h"
-#include "paintStroke_frag.h"
+#include "entities-renderer/paintStroke_vert.h"
+#include "entities-renderer/paintStroke_frag.h"
 
-#include "polyvox_vert.h"
-#include "polyvox_frag.h"
+#include "entities-renderer/polyvox_vert.h"
+#include "entities-renderer/polyvox_frag.h"
 
 // Create a simple OpenGL window that renders text in various ways
 class QTestWindow : public QWindow {
@@ -159,54 +159,54 @@ void QTestWindow::draw() {
 
     static std::once_flag once;
     std::call_once(once, [&]{
-        testShaderBuild(sdf_text3D_vert, sdf_text3D_frag.h";
+        testShaderBuild(sdf_text3D_vert::getSource(), sdf_text3D_frag::getSource());
 
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTexture_frag.h";
-        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert, DrawTexture_frag.h";
-        testShaderBuild(DrawViewportQuadTransformTexcoord_vert, DrawTexture_frag.h";
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawTextureOpaque_frag.h";
-        testShaderBuild(DrawTransformUnitQuad_vert, DrawColoredTexture_frag.h";
+        testShaderBuild(DrawTransformUnitQuad_vert::getSource(), DrawTexture_frag::getSource());
+        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert::getSource(), DrawTexture_frag::getSource());
+        testShaderBuild(DrawViewportQuadTransformTexcoord_vert::getSource(), DrawTexture_frag::getSource());
+        testShaderBuild(DrawTransformUnitQuad_vert::getSource(), DrawTextureOpaque_frag::getSource());
+        testShaderBuild(DrawTransformUnitQuad_vert::getSource(), DrawColoredTexture_frag::getSource());
 
-        testShaderBuild(skybox_vert, skybox_frag.h";
-        testShaderBuild(simple_vert, simple_frag.h";
-        testShaderBuild(simple_vert, simple_textured_frag.h";
-        testShaderBuild(simple_vert, simple_textured_unlit_frag.h";
-        testShaderBuild(deferred_light_vert, directional_ambient_light_frag.h";
-        testShaderBuild(deferred_light_vert, directional_skybox_light_frag.h";
-        testShaderBuild(standardTransformPNTC_vert, standardDrawTexture_frag.h";
-        testShaderBuild(standardTransformPNTC_vert, DrawTextureOpaque_frag.h";
+        testShaderBuild(skybox_vert::getSource(), skybox_frag::getSource());
+        testShaderBuild(simple_vert::getSource(), simple_frag::getSource());
+        testShaderBuild(simple_vert::getSource(), simple_textured_frag::getSource());
+        testShaderBuild(simple_vert::getSource(), simple_textured_unlit_frag::getSource());
+        testShaderBuild(deferred_light_vert::getSource(), directional_ambient_light_frag::getSource());
+        testShaderBuild(deferred_light_vert::getSource(), directional_skybox_light_frag::getSource());
+        testShaderBuild(standardTransformPNTC_vert::getSource(), standardDrawTexture_frag::getSource());
+        testShaderBuild(standardTransformPNTC_vert::getSource(), DrawTextureOpaque_frag::getSource());
 
-        testShaderBuild(model_vert, model_frag.h";
-        testShaderBuild(model_normal_map_vert, model_normal_map_frag.h";
-        testShaderBuild(model_vert, model_specular_map_frag.h";
-        testShaderBuild(model_normal_map_vert, model_normal_specular_map_frag.h";
-        testShaderBuild(model_vert, model_translucent_frag.h";
-        testShaderBuild(model_normal_map_vert, model_translucent_frag.h";
-        testShaderBuild(model_lightmap_vert, model_lightmap_frag.h";
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_map_frag.h";
-        testShaderBuild(model_lightmap_vert, model_lightmap_specular_map_frag.h";
-        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_specular_map_frag.h";
+        testShaderBuild(model_vert::getSource(), model_frag::getSource());
+        testShaderBuild(model_normal_map_vert::getSource(), model_normal_map_frag::getSource());
+        testShaderBuild(model_vert::getSource(), model_specular_map_frag::getSource());
+        testShaderBuild(model_normal_map_vert::getSource(), model_normal_specular_map_frag::getSource());
+        testShaderBuild(model_vert::getSource(), model_translucent_frag::getSource());
+        testShaderBuild(model_normal_map_vert::getSource(), model_translucent_frag::getSource());
+        testShaderBuild(model_lightmap_vert::getSource(), model_lightmap_frag::getSource());
+        testShaderBuild(model_lightmap_normal_map_vert::getSource(), model_lightmap_normal_map_frag::getSource());
+        testShaderBuild(model_lightmap_vert::getSource(), model_lightmap_specular_map_frag::getSource());
+        testShaderBuild(model_lightmap_normal_map_vert::getSource(), model_lightmap_normal_specular_map_frag::getSource());
 
-        testShaderBuild(skin_model_vert, model_frag.h";
-        testShaderBuild(skin_model_normal_map_vert, model_normal_map_frag.h";
-        testShaderBuild(skin_model_vert, model_specular_map_frag.h";
-        testShaderBuild(skin_model_normal_map_vert, model_normal_specular_map_frag.h";
-        testShaderBuild(skin_model_vert, model_translucent_frag.h";
-        testShaderBuild(skin_model_normal_map_vert, model_translucent_frag.h";
+        testShaderBuild(skin_model_vert::getSource(), model_frag::getSource());
+        testShaderBuild(skin_model_normal_map_vert::getSource(), model_normal_map_frag::getSource());
+        testShaderBuild(skin_model_vert::getSource(), model_specular_map_frag::getSource());
+        testShaderBuild(skin_model_normal_map_vert::getSource(), model_normal_specular_map_frag::getSource());
+        testShaderBuild(skin_model_vert::getSource(), model_translucent_frag::getSource());
+        testShaderBuild(skin_model_normal_map_vert::getSource(), model_translucent_frag::getSource());
 
-        testShaderBuild(model_shadow_vert, model_shadow_frag.h";
-        testShaderBuild(textured_particle_vert, textured_particle_frag.h";
+        testShaderBuild(model_shadow_vert::getSource(), model_shadow_frag::getSource());
+        testShaderBuild(textured_particle_vert::getSource(), textured_particle_frag::getSource());
 /* FIXME: Bring back the ssao shader tests
-        testShaderBuild(gaussian_blur_vertical_vert, gaussian_blur_frag.h";
-        testShaderBuild(gaussian_blur_horizontal_vert, gaussian_blur_frag.h";
-        testShaderBuild(ambient_occlusion_vert, ambient_occlusion_frag.h";
-        testShaderBuild(ambient_occlusion_vert, occlusion_blend_frag.h";
+        testShaderBuild(gaussian_blur_vert::getSource()ical_vert::getSource(), gaussian_blur_frag::getSource());
+        testShaderBuild(gaussian_blur_horizontal_vert::getSource(), gaussian_blur_frag::getSource());
+        testShaderBuild(ambient_occlusion_vert::getSource(), ambient_occlusion_frag::getSource());
+        testShaderBuild(ambient_occlusion_vert::getSource(), occlusion_blend_frag::getSource());
 */
 
-        testShaderBuild(overlay3D_vert, overlay3D_frag.h";
+        testShaderBuild(overlay3D_vert::getSource(), overlay3D_frag::getSource());
 
-        testShaderBuild(paintStroke_vert,paintStroke_frag.h";
-        testShaderBuild(polyvox_vert, polyvox_frag.h";
+        testShaderBuild(paintStroke_vert::getSource(),paintStroke_frag::getSource());
+        testShaderBuild(polyvox_vert::getSource(), polyvox_frag::getSource());
 
     });
     _context.swapBuffers(this);
diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index 2092bc0ea2..a7d12d677d 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -184,7 +184,7 @@ int main (int argc, char** argv) {
     srcStream.open(srcFilename, std::fstream::in);
     if (!srcStream.is_open()) {
         cerr << "Failed to open source file <" << srcFilename << ">" << endl;
-        return 0;
+        return 1;
     }
 
     auto scribe = std::make_shared<TextTemplate>(srcFilename, config);
@@ -194,7 +194,7 @@ int main (int argc, char** argv) {
     int numErrors = scribe->scribe(destStringStream, srcStream, vars);
     if (numErrors) {
         cerr << "Scribe " << srcFilename << "> failed: " << numErrors << " errors." << endl;
-        return 0;
+        return 1;
     };
 
 
@@ -279,7 +279,7 @@ int main (int argc, char** argv) {
                     headerFile << headerStringStream.str();
                 } else {
                     cerr << "Scribe output file <" << headerFileName << "> failed to open." << endl;
-                    return 0;
+                    return 1;
                 }
             } else {
                 cerr << sourceStringStream.str();
@@ -310,7 +310,7 @@ int main (int argc, char** argv) {
             sourceFile.open(sourceFileName, std::fstream::out);
             if (!sourceFile.is_open()) {
                 cerr << "Scribe output file <" << sourceFileName << "> failed to open." << endl;
-                return 0;
+                return 1;
             }
             sourceFile << sourceStringStream.str();
         } else {
@@ -323,7 +323,7 @@ int main (int argc, char** argv) {
             destFileStream.open(destFilename, std::fstream::out);
             if (!destFileStream.is_open()) {
                 cerr << "Scribe output file <" << destFilename << "> failed to open." << endl;
-                return 0;
+                return 1;
             }
 
             destFileStream << destStringStream.str();

From 7b420d48e2cf1972d9398ee0032901dc9257cd39 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 17 Jan 2018 10:59:48 +0100
Subject: [PATCH 030/569] Generated shader files are now grouped in a
 sub-filter group in the project

---
 cmake/macros/AutoScribeShader.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index c92f7a3ffe..32b0bc3a2e 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -132,7 +132,7 @@ macro(AUTOSCRIBE_SHADER_LIB)
   if (WIN32)
     source_group("Shaders" FILES ${SHADER_INCLUDE_FILES})
     source_group("Shaders" FILES ${SHADER_SOURCE_FILES})
-    source_group("Shaders" FILES ${AUTOSCRIBE_SHADER_SRC})
+    source_group("Shaders\\generated" FILES ${AUTOSCRIBE_SHADER_SRC})
   endif()
 
   list(APPEND AUTOSCRIBE_SHADER_LIB_SRC ${SHADER_INCLUDE_FILES})

From 54690219e3a22846af3a6ff17353a6eda76a3df4 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 17 Jan 2018 11:12:37 +0100
Subject: [PATCH 031/569] Changed the way shader type is sent to Scribe

---
 cmake/macros/AutoScribeShader.cmake |  8 ++++----
 tools/scribe/src/main.cpp           | 29 ++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index 32b0bc3a2e..313de1437d 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -54,13 +54,13 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
   # Target dependant Custom rule on the SHADER_FILE
   if (APPLE)
     set(GLPROFILE MAC_GL)
-    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
     add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
     add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (ANDROID)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
     # for an android build, we can't use the scribe that cmake would normally produce as a target,
     # since it's unrunnable by the cross-compiling build machine
@@ -80,13 +80,13 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
     add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (UNIX)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
     add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
     add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   else ()
     set(GLPROFILE PC_GL)
-    set(SCRIBE_ARGS -c++ -${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
     add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   endif()
diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index a7d12d677d..83c2fe287a 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -41,6 +41,7 @@ int main (int argc, char** argv) {
         GRAB_VAR_VALUE,
         GRAB_INCLUDE_PATH,
         GRAB_TARGET_NAME,
+        GRAB_SHADER_TYPE,
         EXIT,
     } mode = READY;
 
@@ -78,15 +79,8 @@ int main (int argc, char** argv) {
                 } else if (inputs.back() == "-c++") {
                     makeCPlusPlus = true;
                     mode = READY;
-                } else if (inputs.back() == "-vert") {
-                    type = VERTEX;
-                    mode = READY;
-                } else if (inputs.back() == "-frag") {
-                    type = FRAGMENT;
-                    mode = READY;
-                } else if (inputs.back() == "-geom") {
-                    type = GEOMETRY;
-                    mode = READY;
+                } else if (inputs.back() == "-T") {
+                    mode = GRAB_SHADER_TYPE;
                 } else {
                     // just grabbed the source filename, stop parameter parsing
                     srcFilename = inputs.back();
@@ -127,6 +121,21 @@ int main (int argc, char** argv) {
             }
             break;
                 
+            case GRAB_SHADER_TYPE:
+            {
+                if (inputs.back() == "frag") {
+                    type = FRAGMENT;
+                } else if (inputs.back() == "geom") {
+                    type = GEOMETRY;
+                } else if (inputs.back() == "vert") {
+                    type = VERTEX;
+                } else {
+                    cerr << "Unrecognized shader type. Supported is vert, frag or geom" << endl;
+                }
+                mode = READY;
+            }
+            break;
+
             case EXIT: {
                 // THis shouldn't happen
             }
@@ -145,6 +154,8 @@ int main (int argc, char** argv) {
         cerr << "  -listVars : Will list the vars name and value in the standard output." << endl;
         cerr << "  -showParseTree : Draw the tree obtained while parsing the source" << endl;
         cerr << "  -c++ : Generate a c++ source file containing the output file stream stored as a char[] variable" << endl;
+        cerr << "  -T vert/frag/geom : define the type of the shader. Defaults to VERTEX if not specified." << endl;
+        cerr << "       This is necessary if the -c++ option is used." << endl;
         return 0;
     }
 

From 157a229a4fd57c571a4c05b656bb6ab9efa09342 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 17 Jan 2018 15:09:32 +0100
Subject: [PATCH 032/569] Tried to add GLSL validation in scribe. Issues with
 determining the correct version...

---
 tools/scribe/src/main.cpp | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index 83c2fe287a..9bdcccbfa7 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -56,6 +56,7 @@ int main (int argc, char** argv) {
     static const char* shaderCreateString[] = {
         "Vertex", "Pixel", "Geometry"
     };
+    std::string shaderStage{ "vert" };
 
     for (int ii = 1; (mode != EXIT) && (ii < argc); ii++) {
         inputs.push_back(argv[ii]);
@@ -124,10 +125,13 @@ int main (int argc, char** argv) {
             case GRAB_SHADER_TYPE:
             {
                 if (inputs.back() == "frag") {
+                    shaderStage = inputs.back();
                     type = FRAGMENT;
                 } else if (inputs.back() == "geom") {
+                    shaderStage = inputs.back();
                     type = GEOMETRY;
                 } else if (inputs.back() == "vert") {
+                    shaderStage = inputs.back();
                     type = VERTEX;
                 } else {
                     cerr << "Unrecognized shader type. Supported is vert, frag or geom" << endl;
@@ -218,6 +222,36 @@ int main (int argc, char** argv) {
         scribe->displayTree(cerr, level);
     }
 
+    // This would be nice to implement but not sure how to handle GLSL version
+#if 0
+    // Check if we need to validate the code
+    auto validatorPath = getenv("SCRIBE_VALIDATOR");
+    if (validatorPath) {
+        // Create temporary file with shader code
+        char tempFileNameStub[L_tmpnam];
+        tmpnam(tempFileNameStub);
+        std::string tempFileName{ tempFileNameStub };
+        tempFileName += ".";
+        tempFileName += shaderStage;
+        std::ofstream tempStream(tempFileName);
+        if (tempStream.is_open()) {
+            tempStream << destStringStream.str();
+            tempStream.close();
+            std::string validationCommand{ validatorPath };
+            validationCommand += " ";
+            validationCommand += tempFileName;
+            cout << validationCommand << endl;
+            auto returnCode = system(validationCommand.c_str());
+            if (returnCode != 0) {
+                cerr << "Scribe shader " << targetName << " validation error." << endl;
+            }
+            //remove(tempFileName.c_str());
+        } else {
+            cerr << "Scribe is unable to write shader " << targetName << " to temporary file for validation." << endl;
+        }
+    }
+#endif
+
     if (makeCPlusPlus) {
         // Because there is a maximum size for literal strings declared in source we need to partition the 
         // full source string stream into pages that seems to be around that value...

From 604817bb59ee3fac1211bd2e743e1107def4556e Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 17 Jan 2018 19:21:58 +0100
Subject: [PATCH 033/569] Forgot to fix output custom command on all other
 platforms than Windows

---
 cmake/macros/AutoScribeShader.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index 313de1437d..f15930a7c2 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -56,8 +56,7 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
     set(GLPROFILE MAC_GL)
     set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
-    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (ANDROID)
     set(GLPROFILE LINUX_GL)
     set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
@@ -76,14 +75,12 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
       ")
     endif ()
 
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS})
-    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (UNIX)
     set(GLPROFILE LINUX_GL)
     set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
 
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe)
-    add_custom_command(OUTPUT ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   else ()
     set(GLPROFILE PC_GL)
     set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})

From 514eea5477e5aa73a01fb2e1a610f52787a63dff Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 17 Jan 2018 17:02:10 -0800
Subject: [PATCH 034/569] CR changes

---
 libraries/fbx/src/FBX.h         |  2 +-
 libraries/fbx/src/OBJReader.cpp | 32 +++++++++++---------------------
 libraries/fbx/src/OBJReader.h   |  3 +--
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 0e85891398..56cda9d137 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -179,7 +179,7 @@ public:
     float emissiveIntensity{ 1.0f };
     float ambientFactor{ 1.0f };
 
-    float bumpMultiplier{ 1.0f }; // TODO: to be implemented
+    float bumpMultiplier { 1.0f }; // TODO: to be implemented
 
     QString materialID;
     QString name;
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 008b51b0be..8624efdd56 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -389,10 +389,8 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
     QString parser = textureLine;
     while (parser.length() > 0) {
         if (parser.startsWith("-blend")) { // -blendu/-blendv
-            parser.remove(0, 11); // remove through "-blendu on " or "-blendu off"
-            if (parser[0] == ' ') { // extra character for space after off
-                parser.remove(0, 1);
-            }
+            int removeLength = parser[10] == 'f' ? 12 : 11;
+            parser.remove(0, removeLength); // remove through "-blendu on " or "-blendu off"
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -blendu/-blendv";
             #endif
@@ -407,18 +405,14 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -boost";
             #endif
         } else if (parser.startsWith("-cc")) {
-            parser.remove(0, 7); // remove through "-cc on " or "-cc off"
-            if (parser[0] == ' ') { // extra character for space after off
-                parser.remove(0, 1);
-            }
+            int removeLength = parser[6] == 'f' ? 8 : 7;
+            parser.remove(0, removeLength); // remove through "-cc on " or "-cc off"
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -cc";
             #endif
         } else if (parser.startsWith("-clamp")) {
-            parser.remove(0, 10); // remove through "-clamp on " or "-clamp off"
-            if (parser[0] == ' ') { // extra character for space after off
-                parser.remove(0, 1);
-            }
+            int removeLength = parser[9] == 'f' ? 11 : 10;
+            parser.remove(0, removeLength); // remove through "-clamp on " or "-clamp off"
             #ifdef WANT_DEBUG
             qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -clamp";
             #endif
@@ -941,18 +935,17 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         bool applyRoughness = false;
         bool applyNonMetallic = false;
         bool fresnelOn = false;
-        bool fresnelOff = false;
 
         // Illumination model reference http://paulbourke.net/dataformats/mtl/ 
         switch (objMaterial.illuminationModel) {
             case 0: // Color on and Ambient off
-                // We don't support ambient - do nothing?
+                // We don't support ambient = do nothing?
                 break;
             case 1: // Color on and Ambient on
-                // We don't support ambient - do nothing?
+                // We don't support ambient = do nothing?
                 break;
             case 2: // Highlight on
-                // Change specular intensity?
+                // Change specular intensity = do nothing for now?
                 break;
             case 3: // Reflection on and Ray trace on
                 applyShininess = true;
@@ -969,7 +962,6 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 applyTransparency = true;
                 applyNonMetallic = true;
                 applyShininess = true;
-                fresnelOff = true;
                 break;
             case 7: // Transparency: Refraction on and Reflection: Fresnel on and Ray trace on
                 applyTransparency = true;
@@ -990,8 +982,8 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 break;
         }      
 
-        if (applyTransparency && fbxMaterial.opacity <= ILLUMINATION_MODEL_MIN_OPACITY) {
-            fbxMaterial.opacity = ILLUMINATION_MODEL_MIN_OPACITY;
+        if (applyTransparency) {
+            fbxMaterial.opacity = std::max(fbxMaterial.opacity, ILLUMINATION_MODEL_MIN_OPACITY);
         }
         if (applyShininess) {
             modelMaterial->setRoughness(ILLUMINATION_MODEL_APPLY_SHININESS);
@@ -1003,8 +995,6 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
         }
         if (fresnelOn) {
             modelMaterial->setFresnel(glm::vec3(1.0f));
-        } else if (fresnelOff) {
-            modelMaterial->setFresnel(glm::vec3(0.0f));
         }
 
         modelMaterial->setOpacity(fbxMaterial.opacity);
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 44382e3603..9083a69340 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -50,8 +50,7 @@ private:
 
 class OBJMaterialTextureOptions {
 public:
-    float bumpMultiplier;
-    OBJMaterialTextureOptions() : bumpMultiplier(1.0f) {}
+    float bumpMultiplier { 1.0f };
 }
 ;
 // Materials and references to material names can come in any order, and different mesh parts can refer to the same material.

From 26bf78fb5dbb58baf3f4251ca852518c29ef4660 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 17 Jan 2018 18:30:31 -0800
Subject: [PATCH 035/569] first pass new entity selection edit tools wip

---
 .../system/libraries/entitySelectionTool.js   | 4248 ++++-------------
 1 file changed, 964 insertions(+), 3284 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index b8ba146757..220a7b7c70 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1,9 +1,10 @@
 //
-//  entitySelectionToolClass.js
+//  entitySelectionTool.js
 //  examples
 //
 //  Created by Brad hefta-Gaub on 10/1/14.
 //    Modified by Daniela Fontes * @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017
+//    Modified by David Back on 1/9/2018
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  This script implements a class useful for building tools for editing entities.
@@ -21,12 +22,6 @@ SPACE_WORLD = "world";
 
 Script.include("./controllers.js");
 
-function objectTranslationPlanePoint(position, dimensions) {
-    var newPosition = { x: position.x, y: position.y, z: position.z };
-    newPosition.y -= dimensions.y / 2.0;
-    return newPosition;
-}
-
 SelectionManager = (function() {
     var that = {};
 
@@ -53,10 +48,6 @@ SelectionManager = (function() {
             print("ERROR: entitySelectionTool.handleEntitySelectionToolUpdates - got malformed message: " + message);
         }
 
-        // if (message === 'callUpdate') {
-        //     that._update();
-        // }
-
         if (messageParsed.method === "selectEntity") {
             if (wantDebug) {
                 print("setting selection to " + messageParsed.entityID);
@@ -235,20 +226,49 @@ function getRelativeCenterPosition(dimensions, registrationPoint) {
 SelectionDisplay = (function() {
     var that = {};
 
-    var MINIMUM_DIMENSION = 0.001;
+    var COLOR_GREEN = { red:0, green:255, blue:0 };
+    var COLOR_BLUE = { red:0, green:0, blue:255 };
+    var COLOR_RED = { red:255, green:0, blue:0 };
 
-    var GRABBER_DISTANCE_TO_SIZE_RATIO = 0.0075;
+    var GRABBER_TRANSLATE_ARROW_CONE_OFFSET = 0.3625;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 0.3;
+    var GRABBER_STRETCH_SPHERE_OFFSET = 0.2;
+    var GRABBER_SCALE_CUBE_OFFSET = 0.2;
+
+    var GRABBER_SCALE_CUBE_IDLE_COLOR = { red:120, green:120, blue:120 };
+    var GRABBER_SCALE_CUBE_SELECTED_COLOR = { red:0, green:0, blue:0 };
+    var GRABBER_SCALE_EDGE_COLOR = { red:120, green:120, blue:120 };
+
+    var SCALE_MINIMUM_DIMENSION = 0.02;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
-    var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.2;
+    var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
     var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.6;
     var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18;
     var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.14;
 
-    var ROTATE_ARROW_WEST_NORTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-north.svg";
-    var ROTATE_ARROW_WEST_SOUTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-south.svg";
+    var TRANSLATE_DIRECTION = {
+        X : 0,
+        Y : 1,
+        Z : 2
+    }
 
-    var showExtendedStretchHandles = false;
+    var ROTATE_DIRECTION = {
+        PITCH : 0,
+        YAW : 1,
+        ROLL : 2
+    }
+
+    var SCALE_DIRECTION = {
+        LBN : 0,
+        RBN : 1,
+        LBF : 2,
+        RBF : 3,
+        LTN : 4,
+        RTN : 5,
+        LTF : 6,
+        RTF : 7
+    }
 
     var spaceMode = SPACE_LOCAL;
     var overlayNames = [];
@@ -259,185 +279,95 @@ SelectionDisplay = (function() {
         getControllerWorldLocation(Controller.Standard.RightHand, true)
     ];
 
-    var handleHoverColor = {
-        red: 224,
-        green: 67,
-        blue: 36
-    };
-    var handleHoverAlpha = 1.0;
-
-    var innerSnapAngle = 22.5; // the angle which we snap to on the inner rotation tool
-    var innerRadius;
-    var outerRadius;
-    var yawHandleRotation;
-    var pitchHandleRotation;
-    var rollHandleRotation;
-    var yawCenter;
-    var pitchCenter;
-    var rollCenter;
     var rotZero;
     var rotationNormal;
 
+    var worldRotationX;
+    var worldRotationY;
+    var worldRotationZ;
 
-    var handleColor = {
-        red: 255,
-        green: 255,
-        blue: 255
-    };
-    var handleAlpha = 0.7;
+    var activeTool = null;
+    var grabberTools = {};
 
-    var highlightedHandleColor = {
-        red: 183,
-        green: 64,
-        blue: 44
-    };
-    var highlightedHandleAlpha = 0.9;
-
-    var previousHandle = false;
-    var previousHandleColor;
-    var previousHandleAlpha;
-
-    var grabberSizeCorner = 0.025; // These get resized by updateHandleSizes().
-    var grabberSizeEdge = 0.015;
-    var grabberSizeFace = 0.025;
-    var grabberAlpha = 1;
-    var grabberColorCorner = {
-        red: 120,
-        green: 120,
-        blue: 120
-    };
-    var grabberColorEdge = {
-        red: 0,
-        green: 0,
-        blue: 0
-    };
-    var grabberColorFace = {
-        red: 120,
-        green: 120,
-        blue: 120
-    };
-    var grabberColorCloner = {
-        red: 0,
-        green: 155,
-        blue: 0
-    };
-    var grabberLineWidth = 0.5;
-    var grabberSolid = true;
-    var grabberMoveUpPosition = Vec3.ZERO;
-
-    var lightOverlayColor = {
-        red: 255,
-        green: 153,
-        blue: 0
-    };
-
-    var grabberPropertiesCorner = {
-        position: Vec3.ZERO,
-        size: grabberSizeCorner,
-        color: grabberColorCorner,
-        alpha: 1,
-        solid: grabberSolid,
+    var grabberPropertiesTranslateArrowCones = {
+        shape: "Cone",
+        dimensions: { x:0.05, y:0.05, z:0.05 },
+        solid: true,
         visible: false,
-        dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        ignoreRayIntersection: false,
+        drawInFront: true
     };
-
-    var grabberPropertiesEdge = {
-        position: Vec3.ZERO,
-        size: grabberSizeEdge,
-        color: grabberColorEdge,
-        alpha: 1,
-        solid: grabberSolid,
+    var grabberPropertiesTranslateArrowCylinders = {
+        shape: "Cylinder",
+        dimensions: { x:0.01, y:0.075, z:0.01 },
+        solid: true,
         visible: false,
-        dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        ignoreRayIntersection: false,
+        drawInFront: true
     };
+    var grabberTranslateXCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
+    var grabberTranslateXCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(grabberTranslateXCone, { color : COLOR_RED });
+    Overlays.editOverlay(grabberTranslateXCylinder, { color : COLOR_RED });
+    var grabberTranslateYCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
+    var grabberTranslateYCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(grabberTranslateYCone, { color : COLOR_GREEN });
+    Overlays.editOverlay(grabberTranslateYCylinder, { color : COLOR_GREEN });
+    var grabberTranslateZCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
+    var grabberTranslateZCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(grabberTranslateZCone, { color : COLOR_BLUE });
+    Overlays.editOverlay(grabberTranslateZCylinder, { color : COLOR_BLUE });
 
-    var grabberPropertiesFace = {
-        position: Vec3.ZERO,
-        size: grabberSizeFace,
-        color: grabberColorFace,
+    var grabberPropertiesRotateRings = {
+        size: 0.5,
         alpha: 1,
-        solid: grabberSolid,
+        innerRadius: 0.9,
+        startAt: 0,
+        endAt: 360,
+        majorTickMarksAngle: 5,
+        majorTickMarksLength: 0.1,
         visible: false,
-        dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        ignoreRayIntersection: false,
+        drawInFront: true
     };
+    var grabberRotatePitchRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
+    Overlays.editOverlay(grabberRotatePitchRing, { 
+        color : COLOR_RED,
+        majorTickMarksColor: COLOR_RED,
+    });
+    var grabberRotateYawRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
+    Overlays.editOverlay(grabberRotateYawRing, { 
+        color : COLOR_GREEN,
+        majorTickMarksColor: COLOR_GREEN,
+    });
+    var grabberRotateRollRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
+    Overlays.editOverlay(grabberRotateRollRing, { 
+        color : COLOR_BLUE,
+        majorTickMarksColor: COLOR_BLUE,
+    });
 
-    var grabberPropertiesCloner = {
-        position: Vec3.ZERO,
-        size: grabberSizeCorner,
-        color: grabberColorCloner,
+    var grabberRotateCurrentRing = Overlays.addOverlay("circle3d", {
+        size: 0.5,
         alpha: 1,
-        solid: grabberSolid,
+        color: { red: 224, green: 67, blue: 36 },
+        solid: true,
+        innerRadius: 0.9,
         visible: false,
-        dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
-    };
-
-    var spotLightLineProperties = {
-        color: lightOverlayColor
-    };
-
-    var highlightBox = Overlays.addOverlay("cube", {
-        position: Vec3.ZERO,
-        size: 1,
-        color: {
-            red: 90,
-            green: 90,
-            blue: 90
-        },
-        alpha: 1,
-        solid: false,
-        visible: false,
-        dashed: true,
-        ignoreRayIntersection: true, // this never ray intersects
+        ignoreRayIntersection: true,
         drawInFront: true
     });
 
-    var selectionBox = Overlays.addOverlay("cube", {
-        position: Vec3.ZERO,
-        size: 1,
-        color: {
-            red: 255,
-            green: 0,
-            blue: 0
-        },
-        alpha: 1,
-        solid: false,
-        visible: false,
-        dashed: false
-    });
-
-    var selectionBoxes = [];
-
     var rotationDegreesDisplay = Overlays.addOverlay("text3d", {
-        position: Vec3.ZERO,
         text: "",
-        color: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        backgroundColor: {
-            red: 255,
-            green: 255,
-            blue: 255
-        },
+        color: { red: 0, green: 0, blue: 0 },
+        backgroundColor: { red: 255, green: 255, blue: 255 },
         alpha: 0.7,
         backgroundAlpha: 0.7,
         visible: false,
         isFacingAvatar: true,
         drawInFront: true,
         ignoreRayIntersection: true,
-        dimensions: {
-            x: 0,
-            y: 0
-        },
+        dimensions: { x: 0, y: 0 },
         lineHeight: 0.0,
         topMargin: 0,
         rightMargin: 0,
@@ -445,461 +375,152 @@ SelectionDisplay = (function() {
         leftMargin: 0
     });
 
-    var grabberMoveUp = Overlays.addOverlay("image3d", {
-        url: HIFI_PUBLIC_BUCKET + "images/up-arrow.svg",
-        position: Vec3.ZERO,
-        color: handleColor,
-        alpha: handleAlpha,
+    var grabberPropertiesStretchSpheres = {
+        shape: "Sphere",
+        dimensions: { x:0.02, y:0.02, z:0.02 },
+        solid: true,
         visible: false,
-        size: 0.1,
-        scale: 0.1,
-        isFacingAvatar: true,
+        ignoreRayIntersection: false,
         drawInFront: true
-    });
-
-    // var normalLine = Overlays.addOverlay("line3d", {
-    //                 visible: true,
-    //                 start: { x: 0, y: 0, z: 0 },
-    //                 end: { x: 0, y: 0, z: 0 },
-    //                 color: { red: 255, green: 255, blue: 0 },
-    //                 ignoreRayIntersection: true,
-    // });
-
-    var grabberLBN = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberRBN = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberLBF = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberRBF = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberLTN = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberRTN = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberLTF = Overlays.addOverlay("cube", grabberPropertiesCorner);
-    var grabberRTF = Overlays.addOverlay("cube", grabberPropertiesCorner);
-
-    var grabberTOP = Overlays.addOverlay("cube", grabberPropertiesFace);
-    var grabberBOTTOM = Overlays.addOverlay("cube", grabberPropertiesFace);
-    var grabberLEFT = Overlays.addOverlay("cube", grabberPropertiesFace);
-    var grabberRIGHT = Overlays.addOverlay("cube", grabberPropertiesFace);
-    var grabberNEAR = Overlays.addOverlay("cube", grabberPropertiesFace);
-    var grabberFAR = Overlays.addOverlay("cube", grabberPropertiesFace);
-
-    var grabberEdgeTR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeTL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeTF = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeTN = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeBR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeBL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeBF = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeBN = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeNR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeNL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeFR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberEdgeFL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-
-    var grabberSpotLightCircle = Overlays.addOverlay("circle3d", {
-        color: lightOverlayColor,
-        isSolid: false,
-        visible: false
-    });
-    var grabberSpotLightLineT = Overlays.addOverlay("line3d", spotLightLineProperties);
-    var grabberSpotLightLineB = Overlays.addOverlay("line3d", spotLightLineProperties);
-    var grabberSpotLightLineL = Overlays.addOverlay("line3d", spotLightLineProperties);
-    var grabberSpotLightLineR = Overlays.addOverlay("line3d", spotLightLineProperties);
-
-    var grabberSpotLightCenter = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberSpotLightRadius = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberSpotLightL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberSpotLightR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberSpotLightT = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberSpotLightB = Overlays.addOverlay("cube", grabberPropertiesEdge);
-
-    var spotLightGrabberHandles = [
-        grabberSpotLightCircle, grabberSpotLightCenter, grabberSpotLightRadius,
-        grabberSpotLightLineT, grabberSpotLightLineB, grabberSpotLightLineL, grabberSpotLightLineR,
-        grabberSpotLightT, grabberSpotLightB, grabberSpotLightL, grabberSpotLightR
-    ];
-
-    var grabberPointLightCircleX = Overlays.addOverlay("circle3d", {
-        rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
-        color: lightOverlayColor,
-        isSolid: false,
-        visible: false
-    });
-    var grabberPointLightCircleY = Overlays.addOverlay("circle3d", {
-        rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
-        color: lightOverlayColor,
-        isSolid: false,
-        visible: false
-    });
-    var grabberPointLightCircleZ = Overlays.addOverlay("circle3d", {
-        rotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
-        color: lightOverlayColor,
-        isSolid: false,
-        visible: false
-    });
-    var grabberPointLightT = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberPointLightB = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberPointLightL = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberPointLightR = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberPointLightF = Overlays.addOverlay("cube", grabberPropertiesEdge);
-    var grabberPointLightN = Overlays.addOverlay("cube", grabberPropertiesEdge);
-
-    var pointLightGrabberHandles = [
-        grabberPointLightCircleX, grabberPointLightCircleY, grabberPointLightCircleZ,
-        grabberPointLightT, grabberPointLightB, grabberPointLightL,
-        grabberPointLightR, grabberPointLightF, grabberPointLightN
-    ];
-
-    var grabberCloner = Overlays.addOverlay("cube", grabberPropertiesCloner);
-
-    var stretchHandles = [
-        grabberLBN,
-        grabberRBN,
-        grabberLBF,
-        grabberRBF,
-        grabberLTN,
-        grabberRTN,
-        grabberLTF,
-        grabberRTF,
-        grabberTOP,
-        grabberBOTTOM,
-        grabberLEFT,
-        grabberRIGHT,
-        grabberNEAR,
-        grabberFAR,
-        grabberEdgeTR,
-        grabberEdgeTL,
-        grabberEdgeTF,
-        grabberEdgeTN,
-        grabberEdgeBR,
-        grabberEdgeBL,
-        grabberEdgeBF,
-        grabberEdgeBN,
-        grabberEdgeNR,
-        grabberEdgeNL,
-        grabberEdgeFR,
-        grabberEdgeFL,
-
-        grabberSpotLightLineT,
-        grabberSpotLightLineB,
-        grabberSpotLightLineL,
-        grabberSpotLightLineR,
-
-        grabberSpotLightCenter,
-        grabberSpotLightRadius,
-        grabberSpotLightL,
-        grabberSpotLightR,
-        grabberSpotLightT,
-        grabberSpotLightB,
-
-        grabberPointLightT,
-        grabberPointLightB,
-        grabberPointLightL,
-        grabberPointLightR,
-        grabberPointLightF,
-        grabberPointLightN,
-
-        grabberCloner
-    ];
-
-
-    var baseOverlayAngles = {
-        x: 0,
-        y: 0,
-        z: 0
     };
-    var baseOverlayRotation = Quat.fromVec3Degrees(baseOverlayAngles);
-    var baseOfEntityProjectionOverlay = Overlays.addOverlay("rectangle3d", {
-        position: {
-            x: 1,
-            y: 0,
-            z: 0
-        },
-        color: {
-            red: 51,
-            green: 152,
-            blue: 203
-        },
+    var grabberStretchXSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
+    Overlays.editOverlay(grabberStretchXSphere, { color : COLOR_RED });
+    var grabberStretchYSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
+    Overlays.editOverlay(grabberStretchYSphere, { color : COLOR_GREEN });
+    var grabberStretchZSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
+    Overlays.editOverlay(grabberStretchZSphere, { color : COLOR_BLUE });
+
+    var grabberPropertiesStretchPanel = {
+        shape: "Quad",
         alpha: 0.5,
+        dimensions: { x:GRABBER_SCALE_CUBE_OFFSET * 2, y:GRABBER_SCALE_CUBE_OFFSET * 2, z:0.01 },
         solid: true,
         visible: false,
-        width: 300,
-        height: 200,
-        rotation: baseOverlayRotation,
-        ignoreRayIntersection: true // always ignore this
-    });
+        ignoreRayIntersection: true,
+        drawInFront: true,
+    }
+    var grabberStretchXPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
+    Overlays.editOverlay(grabberStretchXPanel, { color : COLOR_RED });
+    var grabberStretchYPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
+    Overlays.editOverlay(grabberStretchYPanel, { color : COLOR_GREEN });
+    var grabberStretchZPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
+    Overlays.editOverlay(grabberStretchZPanel, { color : COLOR_BLUE });
 
-    var yawOverlayAngles = {
-        x: 90,
-        y: 0,
-        z: 0
+    var grabberPropertiesScaleCubes = {
+        size: 0.025,
+        color: GRABBER_SCALE_CUBE_IDLE_COLOR,
+        solid: true,
+        visible: false,
+        ignoreRayIntersection: false,
+        drawInFront: true,
+        borderSize: 1.4
     };
-    var yawOverlayRotation = Quat.fromVec3Degrees(yawOverlayAngles);
-    var pitchOverlayAngles = {
-        x: 0,
-        y: 90,
-        z: 0
-    };
-    var pitchOverlayRotation = Quat.fromVec3Degrees(pitchOverlayAngles);
-    var rollOverlayAngles = {
-        x: 0,
-        y: 180,
-        z: 0
-    };
-    var rollOverlayRotation = Quat.fromVec3Degrees(rollOverlayAngles);
+    var grabberScaleLBNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x, -y, -z)
+    var grabberScaleRBNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x, -y,  z)
+    var grabberScaleLBFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x, -y, -z)
+    var grabberScaleRBFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x, -y,  z)
+    var grabberScaleLTNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x,  y, -z)
+    var grabberScaleRTNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x,  y,  z)
+    var grabberScaleLTFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x,  y, -z)
+    var grabberScaleRTFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x,  y,  z)
 
-    var xRailOverlay = Overlays.addOverlay("line3d", {
+    var grabberPropertiesScaleEdge = {
+        color: GRABBER_SCALE_EDGE_COLOR,
         visible: false,
-        start: Vec3.ZERO,
-        end: Vec3.ZERO,
-        color: {
-            red: 255,
-            green: 0,
-            blue: 0
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-    var yRailOverlay = Overlays.addOverlay("line3d", {
-        visible: false,
-        start: Vec3.ZERO,
-        end: Vec3.ZERO,
-        color: {
-            red: 0,
-            green: 255,
-            blue: 0
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-    var zRailOverlay = Overlays.addOverlay("line3d", {
-        visible: false,
-        start: Vec3.ZERO,
-        end: Vec3.ZERO,
-        color: {
-            red: 0,
-            green: 0,
-            blue: 255
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-
-    var rotateZeroOverlay = Overlays.addOverlay("line3d", {
-        visible: false,
-        start: Vec3.ZERO,
-        end: Vec3.ZERO,
-        color: {
-            red: 255,
-            green: 0,
-            blue: 0
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-
-    var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
-        visible: false,
-        start: Vec3.ZERO,
-        end: Vec3.ZERO,
-        color: {
-            red: 0,
-            green: 0,
-            blue: 255
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-
-
-    var rotateOverlayInner = Overlays.addOverlay("circle3d", {
-        position: Vec3.ZERO,
-        size: 1,
-        color: {
-            red: 51,
-            green: 152,
-            blue: 203
-        },
-        alpha: 0.2,
-        solid: true,
-        visible: false,
-        rotation: yawOverlayRotation,
-        hasTickMarks: true,
-        majorTickMarksAngle: innerSnapAngle,
-        minorTickMarksAngle: 0,
-        majorTickMarksLength: -0.25,
-        minorTickMarksLength: 0,
-        majorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        minorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-
-    var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
-        position: Vec3.ZERO,
-        size: 1,
-        color: {
-            red: 51,
-            green: 152,
-            blue: 203
-        },
-        alpha: 0.2,
-        solid: true,
-        visible: false,
-        rotation: yawOverlayRotation,
-
-        hasTickMarks: true,
-        majorTickMarksAngle: 45.0,
-        minorTickMarksAngle: 5,
-        majorTickMarksLength: 0.25,
-        minorTickMarksLength: 0.1,
-        majorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        minorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        ignoreRayIntersection: true // always ignore this
-    });
-
-    var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
-        position: Vec3.ZERO,
-        size: 1,
-        color: {
-            red: 224,
-            green: 67,
-            blue: 36
-        },
-        alpha: 0.8,
-        solid: true,
-        visible: false,
-        rotation: yawOverlayRotation,
-        ignoreRayIntersection: true, // always ignore this
-        hasTickMarks: true,
-        majorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        minorTickMarksColor: {
-            red: 0,
-            green: 0,
-            blue: 0
-        }
-    });
-
-    var yawHandle = Overlays.addOverlay("image3d", {
-        url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: Vec3.ZERO,
-        color: handleColor,
-        alpha: handleAlpha,
-        visible: false,
-        size: 0.1,
-        scale: 0.1,
-        isFacingAvatar: false,
-        drawInFront: true
-    });
-
-
-    var pitchHandle = Overlays.addOverlay("image3d", {
-        url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: Vec3.ZERO,
-        color: handleColor,
-        alpha: handleAlpha,
-        visible: false,
-        size: 0.1,
-        scale: 0.1,
-        isFacingAvatar: false,
-        drawInFront: true
-    });
-
-
-    var rollHandle = Overlays.addOverlay("image3d", {
-        url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: Vec3.ZERO,
-        color: handleColor,
-        alpha: handleAlpha,
-        visible: false,
-        size: 0.1,
-        scale: 0.1,
-        isFacingAvatar: false,
-        drawInFront: true
-    });
+        ignoreRayIntersection: true,
+        drawInFront: true,
+        lineWidth: 0.2
+    }
+    var grabberScaleTREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleTLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleTFEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleTNEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleBREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleBLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleBFEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleBNEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleNREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleNLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleFREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var grabberScaleFLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
 
     var allOverlays = [
-        highlightBox,
-        selectionBox,
-        grabberMoveUp,
-        yawHandle,
-        pitchHandle,
-        rollHandle,
-        rotateOverlayInner,
-        rotateOverlayOuter,
-        rotateOverlayCurrent,
-        rotateZeroOverlay,
-        rotateCurrentOverlay,
+        grabberTranslateXCone,
+        grabberTranslateXCylinder,
+        grabberTranslateYCone,
+        grabberTranslateYCylinder,
+        grabberTranslateZCone,
+        grabberTranslateZCylinder,
+        grabberRotatePitchRing,
+        grabberRotateYawRing,
+        grabberRotateRollRing,
+        grabberRotateCurrentRing,
         rotationDegreesDisplay,
-        xRailOverlay,
-        yRailOverlay,
-        zRailOverlay,
-        baseOfEntityProjectionOverlay,
-        grabberSpotLightCircle,
-        grabberPointLightCircleX,
-        grabberPointLightCircleY,
-        grabberPointLightCircleZ
+        grabberStretchXSphere,
+        grabberStretchYSphere,
+        grabberStretchZSphere,
+        grabberStretchXPanel,
+        grabberStretchYPanel,
+        grabberStretchZPanel,
+        grabberScaleLBNCube,
+        grabberScaleRBNCube,
+        grabberScaleLBFCube,
+        grabberScaleRBFCube,
+        grabberScaleLTNCube,
+        grabberScaleRTNCube,
+        grabberScaleLTFCube,
+        grabberScaleRTFCube,
+        grabberScaleTREdge,
+        grabberScaleTLEdge,
+        grabberScaleTFEdge,
+        grabberScaleTNEdge,
+        grabberScaleBREdge,
+        grabberScaleBLEdge,
+        grabberScaleBFEdge,
+        grabberScaleBNEdge,
+        grabberScaleNREdge,
+        grabberScaleNLEdge,
+        grabberScaleFREdge,
+        grabberScaleFLEdge
+    ];
 
-    ].concat(stretchHandles);
-
-    overlayNames[highlightBox] = "highlightBox";
-    overlayNames[selectionBox] = "selectionBox";
-    overlayNames[baseOfEntityProjectionOverlay] = "baseOfEntityProjectionOverlay";
-    overlayNames[grabberMoveUp] = "grabberMoveUp";
-    overlayNames[grabberLBN] = "grabberLBN";
-    overlayNames[grabberLBF] = "grabberLBF";
-    overlayNames[grabberRBN] = "grabberRBN";
-    overlayNames[grabberRBF] = "grabberRBF";
-    overlayNames[grabberLTN] = "grabberLTN";
-    overlayNames[grabberLTF] = "grabberLTF";
-    overlayNames[grabberRTN] = "grabberRTN";
-    overlayNames[grabberRTF] = "grabberRTF";
-
-    overlayNames[grabberTOP] = "grabberTOP";
-    overlayNames[grabberBOTTOM] = "grabberBOTTOM";
-    overlayNames[grabberLEFT] = "grabberLEFT";
-    overlayNames[grabberRIGHT] = "grabberRIGHT";
-    overlayNames[grabberNEAR] = "grabberNEAR";
-    overlayNames[grabberFAR] = "grabberFAR";
-
-    overlayNames[grabberEdgeTR] = "grabberEdgeTR";
-    overlayNames[grabberEdgeTL] = "grabberEdgeTL";
-    overlayNames[grabberEdgeTF] = "grabberEdgeTF";
-    overlayNames[grabberEdgeTN] = "grabberEdgeTN";
-    overlayNames[grabberEdgeBR] = "grabberEdgeBR";
-    overlayNames[grabberEdgeBL] = "grabberEdgeBL";
-    overlayNames[grabberEdgeBF] = "grabberEdgeBF";
-    overlayNames[grabberEdgeBN] = "grabberEdgeBN";
-    overlayNames[grabberEdgeNR] = "grabberEdgeNR";
-    overlayNames[grabberEdgeNL] = "grabberEdgeNL";
-    overlayNames[grabberEdgeFR] = "grabberEdgeFR";
-    overlayNames[grabberEdgeFL] = "grabberEdgeFL";
-
-    overlayNames[yawHandle] = "yawHandle";
-    overlayNames[pitchHandle] = "pitchHandle";
-    overlayNames[rollHandle] = "rollHandle";
-
-    overlayNames[rotateOverlayInner] = "rotateOverlayInner";
-    overlayNames[rotateOverlayOuter] = "rotateOverlayOuter";
-    overlayNames[rotateOverlayCurrent] = "rotateOverlayCurrent";
-
-    overlayNames[rotateZeroOverlay] = "rotateZeroOverlay";
-    overlayNames[rotateCurrentOverlay] = "rotateCurrentOverlay";
-    overlayNames[grabberCloner] = "grabberCloner";
-    var activeTool = null;
-    var grabberTools = {};
+    overlayNames[grabberTranslateXCone] = "grabberTranslateXCone";
+    overlayNames[grabberTranslateXCylinder] = "grabberTranslateXCylinder";
+    overlayNames[grabberTranslateYCone] = "grabberTranslateYCone";
+    overlayNames[grabberTranslateYCylinder] = "grabberTranslateYCylinder";
+    overlayNames[grabberTranslateZCone] = "grabberTranslateZCone";
+    overlayNames[grabberTranslateZCylinder] = "grabberTranslateZCylinder";
+    overlayNames[grabberRotatePitchRing] = "grabberRotatePitchRing";
+    overlayNames[grabberRotateYawRing] = "grabberRotateYawRing";
+    overlayNames[grabberRotateRollRing] = "grabberRotateRollRing";
+    overlayNames[grabberRotateCurrentRing] = "grabberRotateCurrentRing";
+    overlayNames[rotationDegreesDisplay] = "rotationDegreesDisplay";
+    overlayNames[grabberStretchXSphere] = "grabberStretchXSphere";
+    overlayNames[grabberStretchYSphere] = "grabberStretchYSphere";
+    overlayNames[grabberStretchZSphere] = "grabberStretchZSphere";
+    overlayNames[grabberStretchXPanel] = "grabberStretchXPanel";
+    overlayNames[grabberStretchYPanel] = "grabberStretchYPanel";
+    overlayNames[grabberStretchZPanel] = "grabberStretchZPanel";
+    overlayNames[grabberScaleLBNCube] = "grabberScaleLBNCube";
+    overlayNames[grabberScaleRBNCube] = "grabberScaleRBNCube";
+    overlayNames[grabberScaleLBFCube] = "grabberScaleLBFCube";
+    overlayNames[grabberScaleRBFCube] = "grabberScaleRBFCube";
+    overlayNames[grabberScaleLTNCube] = "grabberScaleLTNCube";
+    overlayNames[grabberScaleRTNCube] = "grabberScaleRTNCube";
+    overlayNames[grabberScaleLTFCube] = "grabberScaleLTFCube";
+    overlayNames[grabberScaleRTFCube] = "grabberScaleRTFCube";
+    overlayNames[grabberScaleTREdge] = "grabberScaleTREdge";
+    overlayNames[grabberScaleTLEdge] = "grabberScaleTLEdge";
+    overlayNames[grabberScaleTFEdge] = "grabberScaleTFEdge";
+    overlayNames[grabberScaleTNEdge] = "grabberScaleTNEdge";
+    overlayNames[grabberScaleBREdge] = "grabberScaleBREdge";
+    overlayNames[grabberScaleBLEdge] = "grabberScaleBLEdge";
+    overlayNames[grabberScaleBFEdge] = "grabberScaleBFEdge";
+    overlayNames[grabberScaleBNEdge] = "grabberScaleBNEdge";
+    overlayNames[grabberScaleNREdge] = "grabberScaleNREdge";
+    overlayNames[grabberScaleNLEdge] = "grabberScaleNLEdge";
+    overlayNames[grabberScaleFREdge] = "grabberScaleFREdge";
+    overlayNames[grabberScaleFLEdge] = "grabberScaleFLEdge";
 
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
@@ -932,7 +553,6 @@ SelectionDisplay = (function() {
     that.triggerMapping.from(Controller.Standard.RT).peek().to(makeTriggerHandler(Controller.Standard.RightHand));
     that.triggerMapping.from(Controller.Standard.LT).peek().to(makeTriggerHandler(Controller.Standard.LeftHand));
 
-
     function controllerComputePickRay() {
         var controllerPose = getControllerWorldLocation(activeHand, true);
         if (controllerPose.valid && that.triggered) {
@@ -942,2352 +562,389 @@ SelectionDisplay = (function() {
             return {origin: controllerPosition, direction: controllerDirection};
         }
     }
+
     function generalComputePickRay(x, y) {
         return controllerComputePickRay() || Camera.computePickRay(x, y);
     }
+    
     function addGrabberTool(overlay, tool) {
         grabberTools[overlay] = tool;
         return tool;
     }
 
-    // @param: toolHandle:  The overlayID associated with the tool
-    //         that correlates to the tool you wish to query.
-    // @note: If toolHandle is null or undefined then activeTool
-    //        will be checked against those values as opposed to
-    //        the tool registered under toolHandle.  Null & Undefined 
-    //        are treated as separate values.
-    // @return: bool - Indicates if the activeTool is that queried.
-    function isActiveTool(toolHandle) {
-        if (!toolHandle) {
-            // Allow isActiveTool(null) and similar to return true if there's
-            // no active tool
-            return (activeTool === toolHandle);
-        }
-
-        if (!grabberTools.hasOwnProperty(toolHandle)) {
-            print("WARNING: entitySelectionTool.isActiveTool - Encountered unknown grabberToolHandle: " + toolHandle + ". Tools should be egistered via addGrabberTool.");
-            // EARLY EXIT
-            return false;
-        }
-
-        return (activeTool === grabberTools[ toolHandle ]);
-    }
-
-    // @return string - The mode of the currently active tool;
-    //                  otherwise, "UNKNOWN" if there's no active tool.
-    function getMode() {
-        return (activeTool ? activeTool.mode : "UNKNOWN");
-    }
-
-
-    that.cleanup = function() {
-        for (var i = 0; i < allOverlays.length; i++) {
-            Overlays.deleteOverlay(allOverlays[i]);
-        }
-        for (var j = 0; j < selectionBoxes.length; j++) {
-            Overlays.deleteOverlay(selectionBoxes[j]);
-        }
-    };
-
-    that.highlightSelectable = function(entityID) {
-        var properties = Entities.getEntityProperties(entityID);
-        Overlays.editOverlay(highlightBox, {
-            visible: true,
-            position: properties.boundingBox.center,
-            dimensions: properties.dimensions,
-            rotation: properties.rotation
-        });
-    };
-
-    that.unhighlightSelectable = function(entityID) {
-        Overlays.editOverlay(highlightBox, {
-            visible: false
-        });
-    };
-
-    that.select = function(entityID, event) {
-        var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-
-        lastCameraPosition = Camera.getPosition();
-        lastCameraOrientation = Camera.getOrientation();
-
-        if (event !== false) {
-            pickRay = generalComputePickRay(event.x, event.y);
-
-            var wantDebug = false;
-            if (wantDebug) {
-                print("select() with EVENT...... ");
-                print("                event.y:" + event.y);
-                Vec3.print("       current position:", properties.position);
-            }
-
-
-        }
-
-        Overlays.editOverlay(highlightBox, {
-            visible: false
-        });
-
-        that.updateHandles();
-    };
-
-    // Function: Calculate New Bound Extremes
-    // uses dot product to discover new top and bottom on the new referential (max and min)
-    that.calculateNewBoundExtremes = function(boundPointList, referenceVector) {
-        
-        if (boundPointList.length < 2) {
-            return [null, null];
-        }
-        
-        var refMax = boundPointList[0];
-        var refMin = boundPointList[1];
-        
-        var dotMax = Vec3.dot(boundPointList[0], referenceVector);
-        var dotMin = Vec3.dot(boundPointList[1], referenceVector);
-        
-        if (dotMin > dotMax) {
-            dotMax = dotMin;
-            dotMin = Vec3.dot(boundPointList[0], referenceVector);
-            refMax = boundPointList[1];
-            refMin = boundPointList[0];
-        }
-        
-        for (var i = 2; i < boundPointList.length ; i++) {
-            var dotAux = Vec3.dot(boundPointList[i], referenceVector);
-            if (dotAux > dotMax) {
-                dotMax = dotAux;
-                refMax = boundPointList[i];
-            } else if (dotAux < dotMin) {
-                dotMin = dotAux;
-                refMin = boundPointList[i];
-            }
-        }
-        return [refMin, refMax];
-    }
-
-    // Function: Project Bounding Box Points
-    // Projects all 6 bounding box points: Top, Bottom, Left, Right, Near, Far (assumes center 0,0,0) onto 
-    // one of the basis of the new avatar referencial
-    // dimensions - dimensions of the AABB (axis aligned bounding box) on the standard basis 
-    // [1, 0, 0], [0, 1, 0], [0, 0, 1]
-    // v - projection vector
-    // rotateHandleOffset - offset for the rotation handle gizmo position
-    that.projectBoundingBoxPoints = function(dimensions, v, rotateHandleOffset) {
-        var projT_v = Vec3.dot(Vec3.multiply((dimensions.y / 2) + rotateHandleOffset, Vec3.UNIT_Y), v);
-        projT_v = Vec3.multiply(projT_v, v);
-        
-        var projB_v = Vec3.dot(Vec3.multiply(-(dimensions.y / 2) - rotateHandleOffset, Vec3.UNIT_Y), v);
-        projB_v = Vec3.multiply(projB_v, v);
-        
-        var projL_v = Vec3.dot(Vec3.multiply((dimensions.x / 2) + rotateHandleOffset, Vec3.UNIT_X), v);
-        projL_v = Vec3.multiply(projL_v, v);
-        
-        var projR_v = Vec3.dot(Vec3.multiply(-1.0 * (dimensions.x / 2) - 1.0 * rotateHandleOffset, Vec3.UNIT_X), v);
-        projR_v = Vec3.multiply(projR_v, v);
-        
-        var projN_v = Vec3.dot(Vec3.multiply((dimensions.z / 2) + rotateHandleOffset, Vec3.FRONT), v);
-        projN_v = Vec3.multiply(projN_v, v);
-        
-        var projF_v = Vec3.dot(Vec3.multiply(-1.0 * (dimensions.z / 2) - 1.0 * rotateHandleOffset, Vec3.FRONT), v);
-        projF_v = Vec3.multiply(projF_v, v);
-        
-        var projList = [projT_v, projB_v, projL_v, projR_v, projN_v, projF_v];
-
-        return that.calculateNewBoundExtremes(projList, v);
-    };
-    
-    // FUNCTION: UPDATE ROTATION HANDLES
-    that.updateRotationHandles = function() {
-        var diagonal = (Vec3.length(SelectionManager.worldDimensions) / 2) * 1.1;
-        var halfDimensions = Vec3.multiply(SelectionManager.worldDimensions, 0.5);
-        var innerActive = false;
-        var innerAlpha = 0.2;
-        var outerAlpha = 0.2;
-        if (innerActive) {
-            innerAlpha = 0.5;
-        } else {
-            outerAlpha = 0.5;
-        }
-            // prev 0.05
-        var rotateHandleOffset = 0.05;
-
-        var boundsCenter, objectCenter;
-
-        var dimensions, rotation;
-        if (spaceMode === SPACE_LOCAL) {
-            rotation = SelectionManager.localRotation;
-        } else {
-            rotation = SelectionManager.worldRotation;
-        }
-        objectCenter = SelectionManager.worldPosition;
-        dimensions = SelectionManager.worldDimensions;
-        var position = objectCenter;
-
-        boundsCenter = objectCenter;
-
-        var yawCorner;
-        var pitchCorner;
-        var rollCorner;
-
-        var cameraPosition = Camera.getPosition();
-        var look = Vec3.normalize(Vec3.subtract(cameraPosition, objectCenter));
-
-        // place yaw, pitch and roll rotations on the avatar referential
-        
-        var avatarReferential = Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({
-            x: 0,
-            y: 180,
-            z: 0
-        }));
-        var upVector = Quat.getUp(avatarReferential);
-        var rightVector = Vec3.multiply(-1, Quat.getRight(avatarReferential));
-        var frontVector = Quat.getFront(avatarReferential);
-        
-        // project all 6 bounding box points: Top, Bottom, Left, Right, Near, Far (assumes center 0,0,0) 
-        // onto the new avatar referential
-
-        // UP
-        var projUP = that.projectBoundingBoxPoints(dimensions, upVector, rotateHandleOffset);
-        // RIGHT
-        var projRIGHT = that.projectBoundingBoxPoints(dimensions, rightVector, rotateHandleOffset);
-        // FRONT
-        var projFRONT = that.projectBoundingBoxPoints(dimensions, frontVector, rotateHandleOffset);
-        
-        // YAW
-        yawCenter = Vec3.sum(boundsCenter, projUP[0]); 
-        yawCorner = Vec3.sum(boundsCenter, Vec3.sum(Vec3.sum(projUP[0], projRIGHT[1]), projFRONT[1]));
-        
-        yawHandleRotation = Quat.lookAt(
-            yawCorner, 
-            Vec3.sum(yawCorner, upVector), 
-            Vec3.subtract(yawCenter,yawCorner));
-        yawHandleRotation = Quat.multiply(Quat.angleAxis(45, upVector), yawHandleRotation);
-        
-        // PTCH
-        pitchCorner = Vec3.sum(boundsCenter, Vec3.sum(Vec3.sum(projUP[1], projRIGHT[0]), projFRONT[1]));
-        pitchCenter = Vec3.sum(boundsCenter, projRIGHT[0]); 
-        
-        pitchHandleRotation = Quat.lookAt(
-            pitchCorner, 
-            Vec3.sum(pitchCorner, rightVector), 
-            Vec3.subtract(pitchCenter,pitchCorner));
-        pitchHandleRotation = Quat.multiply(Quat.angleAxis(45, rightVector), pitchHandleRotation);
-        
-        // ROLL
-        rollCorner = Vec3.sum(boundsCenter, Vec3.sum(Vec3.sum(projUP[1], projRIGHT[1]), projFRONT[0]));
-        rollCenter = Vec3.sum(boundsCenter, projFRONT[0]); 
-        
-        rollHandleRotation = Quat.lookAt(
-            rollCorner, 
-            Vec3.sum(rollCorner, frontVector), 
-            Vec3.subtract(rollCenter,rollCorner));
-        rollHandleRotation = Quat.multiply(Quat.angleAxis(45, frontVector), rollHandleRotation);
-        
-
-        var rotateHandlesVisible = true;
-        var rotationOverlaysVisible = false;
-        // note:  Commented out as these are currently unused here; however,
-        //         leaving them around as they document intent of state as it
-        //         relates to modes that may be useful later.
-        // var translateHandlesVisible = true;
-        // var selectionBoxVisible = true;
-        var isPointLight = false;
-        if (SelectionManager.selections.length === 1) {
-            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-            isPointLight = (properties.type === "Light") && !properties.isSpotlight;
-        }
-
-        if (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || 
-                isActiveTool(rollHandle) || isActiveTool(selectionBox) || isActiveTool(grabberCloner)) {
-            rotationOverlaysVisible = true;
-            rotateHandlesVisible = false;
-            // translateHandlesVisible = false;
-            // selectionBoxVisible = false;
-        } else if (isActiveTool(grabberMoveUp) || isPointLight) {
-            rotateHandlesVisible = false;
-        } else if (activeTool) {
-            // every other mode is a stretch mode...
-            rotateHandlesVisible = false;
-            // translateHandlesVisible = false;
-        }
-
-        Overlays.editOverlay(rotateZeroOverlay, {
-            visible: rotationOverlaysVisible
-        });
-        Overlays.editOverlay(rotateCurrentOverlay, {
-            visible: rotationOverlaysVisible
-        });
-
-        Overlays.editOverlay(yawHandle, {
-            visible: rotateHandlesVisible,
-            position: yawCorner,
-            rotation: yawHandleRotation
-        });
-        Overlays.editOverlay(pitchHandle, {
-            visible: rotateHandlesVisible,
-            position: pitchCorner,
-            rotation: pitchHandleRotation
-        });
-        Overlays.editOverlay(rollHandle, {
-            visible: rotateHandlesVisible,
-            position: rollCorner,
-            rotation: rollHandleRotation
-        });
-        
-        
-    };
-
-    // FUNCTION: UPDATE HANDLE SIZES
-    that.updateHandleSizes = function() {
-        if (SelectionManager.hasSelection()) {
-            var diff = Vec3.subtract(SelectionManager.worldPosition, Camera.getPosition());
-            var grabberSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 5;
-            var dimensions = SelectionManager.worldDimensions;
-            var avgDimension = (dimensions.x + dimensions.y + dimensions.z) / 3;
-            grabberSize = Math.min(grabberSize, avgDimension / 10);
-
-            for (var i = 0; i < stretchHandles.length; i++) {
-                Overlays.editOverlay(stretchHandles[i], {
-                    size: grabberSize
-                });
-            }
-            var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7;
-            handleSize = Math.min(handleSize, avgDimension / 3);
-
-            Overlays.editOverlay(yawHandle, {
-                scale: handleSize
-            });
-            Overlays.editOverlay(pitchHandle, {
-                scale: handleSize
-            });
-            Overlays.editOverlay(rollHandle, {
-                scale: handleSize
-            });
-            var upDiff = Vec3.multiply((
-                Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 3), 
-                Quat.getUp(MyAvatar.orientation)
-            );
-            var pos = Vec3.sum(grabberMoveUpPosition, upDiff);
-            Overlays.editOverlay(grabberMoveUp, {
-                position: pos,
-                scale: handleSize / 1.25
-            });
-        }
-    };
-    Script.update.connect(that.updateHandleSizes);
-
-    // FUNCTION: SET SPACE MODE
-    that.setSpaceMode = function(newSpaceMode) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("======> SetSpaceMode called. ========");
-        }
-
-        if (spaceMode !== newSpaceMode) {
-            if (wantDebug) {
-                print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
-            }
-            spaceMode = newSpaceMode;
-            that.updateHandles();
-        } else if (wantDebug) {
-            print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
-        }
-        if (wantDebug) {
-            print("====== SetSpaceMode called. <========");
-        }
-    };
-
-    // FUNCTION: TOGGLE SPACE MODE
-    that.toggleSpaceMode = function() {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("========> ToggleSpaceMode called. =========");
-        }
-        if ((spaceMode === SPACE_WORLD) && (SelectionManager.selections.length > 1)) {
-            if (wantDebug) {
-                print("Local space editing is not available with multiple selections");
-            }
-            return;
-        }
-        if (wantDebug) {
-            print("PreToggle: " + spaceMode);
-        }
-        spaceMode = (spaceMode === SPACE_LOCAL) ? SPACE_WORLD : SPACE_LOCAL;
-        that.updateHandles();
-        if (wantDebug) {
-            print("PostToggle: " + spaceMode);        
-            print("======== ToggleSpaceMode called. <=========");
-        }
-    };
-
-    // FUNCTION: UNSELECT ALL
-    // TODO?: Needs implementation
-    that.unselectAll = function() {};
-
-    // FUNCTION: UPDATE HANDLES
-    that.updateHandles = function() {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("======> Update Handles =======");
-            print("    Selections Count: " + SelectionManager.selections.length);
-            print("    SpaceMode: " + spaceMode);
-            print("    DisplayMode: " + getMode());
-        }
-        if (SelectionManager.selections.length === 0) {
-            that.setOverlaysVisible(false);
-            return;
-        }
-
-        // print("    Triggering updateRotationHandles");
-        that.updateRotationHandles();
-
-        var rotation, dimensions, position, registrationPoint;
-
-        if (spaceMode === SPACE_LOCAL) {
-            rotation = SelectionManager.localRotation;
-            dimensions = SelectionManager.localDimensions;
-            position = SelectionManager.localPosition;
-            registrationPoint = SelectionManager.localRegistrationPoint;
-        } else {
-            rotation = Quat.IDENTITY;
-            dimensions = SelectionManager.worldDimensions;
-            position = SelectionManager.worldPosition;
-            registrationPoint = SelectionManager.worldRegistrationPoint;
-        }
-
-        var registrationPointDimensions = {
-            x: dimensions.x * registrationPoint.x,
-            y: dimensions.y * registrationPoint.y,
-            z: dimensions.z * registrationPoint.z
-        };
-
-        // Center of entity, relative to registration point
-        var center = getRelativeCenterPosition(dimensions, registrationPoint);
-
-        // Distances in world coordinates relative to the registration point
-        var left = -registrationPointDimensions.x;
-        var right = dimensions.x - registrationPointDimensions.x;
-        var bottom = -registrationPointDimensions.y;
-        var top = dimensions.y - registrationPointDimensions.y;
-        var near = -registrationPointDimensions.z;
-        var far = dimensions.z - registrationPointDimensions.z;
-        var front = far;
-
-        var worldTop = SelectionManager.worldDimensions.y / 2;
-
-        var LBN = {
-            x: left,
-            y: bottom,
-            z: near
-        };
-        var RBN = {
-            x: right,
-            y: bottom,
-            z: near
-        };
-        var LBF = {
-            x: left,
-            y: bottom,
-            z: far
-        };
-        var RBF = {
-            x: right,
-            y: bottom,
-            z: far
-        };
-        var LTN = {
-            x: left,
-            y: top,
-            z: near
-        };
-        var RTN = {
-            x: right,
-            y: top,
-            z: near
-        };
-        var LTF = {
-            x: left,
-            y: top,
-            z: far
-        };
-        var RTF = {
-            x: right,
-            y: top,
-            z: far
-        };
-
-        var TOP = {
-            x: center.x,
-            y: top,
-            z: center.z
-        };
-        var BOTTOM = {
-            x: center.x,
-            y: bottom,
-            z: center.z
-        };
-        var LEFT = {
-            x: left,
-            y: center.y,
-            z: center.z
-        };
-        var RIGHT = {
-            x: right,
-            y: center.y,
-            z: center.z
-        };
-        var NEAR = {
-            x: center.x,
-            y: center.y,
-            z: near
-        };
-        var FAR = {
-            x: center.x,
-            y: center.y,
-            z: far
-        };
-
-        var EdgeTR = {
-            x: right,
-            y: top,
-            z: center.z
-        };
-        var EdgeTL = {
-            x: left,
-            y: top,
-            z: center.z
-        };
-        var EdgeTF = {
-            x: center.x,
-            y: top,
-            z: front
-        };
-        var EdgeTN = {
-            x: center.x,
-            y: top,
-            z: near
-        };
-        var EdgeBR = {
-            x: right,
-            y: bottom,
-            z: center.z
-        };
-        var EdgeBL = {
-            x: left,
-            y: bottom,
-            z: center.z
-        };
-        var EdgeBF = {
-            x: center.x,
-            y: bottom,
-            z: front
-        };
-        var EdgeBN = {
-            x: center.x,
-            y: bottom,
-            z: near
-        };
-        var EdgeNR = {
-            x: right,
-            y: center.y,
-            z: near
-        };
-        var EdgeNL = {
-            x: left,
-            y: center.y,
-            z: near
-        };
-        var EdgeFR = {
-            x: right,
-            y: center.y,
-            z: front
-        };
-        var EdgeFL = {
-            x: left,
-            y: center.y,
-            z: front
-        };
-
-        LBN = Vec3.multiplyQbyV(rotation, LBN);
-        RBN = Vec3.multiplyQbyV(rotation, RBN);
-        LBF = Vec3.multiplyQbyV(rotation, LBF);
-        RBF = Vec3.multiplyQbyV(rotation, RBF);
-        LTN = Vec3.multiplyQbyV(rotation, LTN);
-        RTN = Vec3.multiplyQbyV(rotation, RTN);
-        LTF = Vec3.multiplyQbyV(rotation, LTF);
-        RTF = Vec3.multiplyQbyV(rotation, RTF);
-
-        TOP = Vec3.multiplyQbyV(rotation, TOP);
-        BOTTOM = Vec3.multiplyQbyV(rotation, BOTTOM);
-        LEFT = Vec3.multiplyQbyV(rotation, LEFT);
-        RIGHT = Vec3.multiplyQbyV(rotation, RIGHT);
-        NEAR = Vec3.multiplyQbyV(rotation, NEAR);
-        FAR = Vec3.multiplyQbyV(rotation, FAR);
-
-        EdgeTR = Vec3.multiplyQbyV(rotation, EdgeTR);
-        EdgeTL = Vec3.multiplyQbyV(rotation, EdgeTL);
-        EdgeTF = Vec3.multiplyQbyV(rotation, EdgeTF);
-        EdgeTN = Vec3.multiplyQbyV(rotation, EdgeTN);
-        EdgeBR = Vec3.multiplyQbyV(rotation, EdgeBR);
-        EdgeBL = Vec3.multiplyQbyV(rotation, EdgeBL);
-        EdgeBF = Vec3.multiplyQbyV(rotation, EdgeBF);
-        EdgeBN = Vec3.multiplyQbyV(rotation, EdgeBN);
-        EdgeNR = Vec3.multiplyQbyV(rotation, EdgeNR);
-        EdgeNL = Vec3.multiplyQbyV(rotation, EdgeNL);
-        EdgeFR = Vec3.multiplyQbyV(rotation, EdgeFR);
-        EdgeFL = Vec3.multiplyQbyV(rotation, EdgeFL);
-
-        LBN = Vec3.sum(position, LBN);
-        RBN = Vec3.sum(position, RBN);
-        LBF = Vec3.sum(position, LBF);
-        RBF = Vec3.sum(position, RBF);
-        LTN = Vec3.sum(position, LTN);
-        RTN = Vec3.sum(position, RTN);
-        LTF = Vec3.sum(position, LTF);
-        RTF = Vec3.sum(position, RTF);
-
-        TOP = Vec3.sum(position, TOP);
-        BOTTOM = Vec3.sum(position, BOTTOM);
-        LEFT = Vec3.sum(position, LEFT);
-        RIGHT = Vec3.sum(position, RIGHT);
-        NEAR = Vec3.sum(position, NEAR);
-        FAR = Vec3.sum(position, FAR);
-
-        EdgeTR = Vec3.sum(position, EdgeTR);
-        EdgeTL = Vec3.sum(position, EdgeTL);
-        EdgeTF = Vec3.sum(position, EdgeTF);
-        EdgeTN = Vec3.sum(position, EdgeTN);
-        EdgeBR = Vec3.sum(position, EdgeBR);
-        EdgeBL = Vec3.sum(position, EdgeBL);
-        EdgeBF = Vec3.sum(position, EdgeBF);
-        EdgeBN = Vec3.sum(position, EdgeBN);
-        EdgeNR = Vec3.sum(position, EdgeNR);
-        EdgeNL = Vec3.sum(position, EdgeNL);
-        EdgeFR = Vec3.sum(position, EdgeFR);
-        EdgeFL = Vec3.sum(position, EdgeFL);
-
-        var inModeRotate = (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || isActiveTool(rollHandle));
-        var inModeTranslate = (isActiveTool(selectionBox) || isActiveTool(grabberCloner) || isActiveTool(grabberMoveUp));
-        var stretchHandlesVisible = !(inModeRotate || inModeTranslate) && (spaceMode === SPACE_LOCAL);
-        var extendedStretchHandlesVisible = (stretchHandlesVisible && showExtendedStretchHandles);
-        var cloneHandleVisible = !(inModeRotate || inModeTranslate);
-        if (wantDebug) {
-            print("    Set Non-Light Grabbers Visible - Norm: " + stretchHandlesVisible + " Ext: " + extendedStretchHandlesVisible);
-        }
-        var isSingleSelection = (SelectionManager.selections.length === 1);
-
-        if (isSingleSelection) {
-            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-            var isLightSelection = (properties.type === "Light");
-            if (isLightSelection) {
-                if (wantDebug) {
-                    print("    Light Selection revoking Non-Light Grabbers Visibility!");
-                }
-                stretchHandlesVisible = false;
-                extendedStretchHandlesVisible = false;
-                cloneHandleVisible = false;
-                if (properties.isSpotlight) {
-                    that.setPointLightHandlesVisible(false);
-
-                    var distance = (properties.dimensions.z / 2) * Math.sin(properties.cutoff * (Math.PI / 180));
-                    var showEdgeSpotGrabbers = !(inModeTranslate || inModeRotate);
-                    Overlays.editOverlay(grabberSpotLightCenter, {
-                        position: position,
-                        visible: false
-                    });
-                    Overlays.editOverlay(grabberSpotLightRadius, {
-                        position: NEAR,
-                        rotation: rotation,
-                        visible: showEdgeSpotGrabbers
-                    });
-
-                    Overlays.editOverlay(grabberSpotLightL, {
-                        position: EdgeNL,
-                        rotation: rotation,
-                        visible: showEdgeSpotGrabbers
-                    });
-                    Overlays.editOverlay(grabberSpotLightR, {
-                        position: EdgeNR,
-                        rotation: rotation,
-                        visible: showEdgeSpotGrabbers
-                    });
-                    Overlays.editOverlay(grabberSpotLightT, {
-                        position: EdgeTN,
-                        rotation: rotation,
-                        visible: showEdgeSpotGrabbers
-                    });
-                    Overlays.editOverlay(grabberSpotLightB, {
-                        position: EdgeBN,
-                        rotation: rotation,
-                        visible: showEdgeSpotGrabbers
-                    });
-                    Overlays.editOverlay(grabberSpotLightCircle, {
-                        position: NEAR,
-                        dimensions: {
-                            x: distance,
-                            y: distance,
-                            z: 1
-                        },
-                        rotation: rotation,
-                        visible: true
-                    });
-
-                    Overlays.editOverlay(grabberSpotLightLineT, {
-                        start: position,
-                        end: EdgeTN,
-                        visible: true
-                    });
-                    Overlays.editOverlay(grabberSpotLightLineB, {
-                        start: position,
-                        end: EdgeBN,
-                        visible: true
-                    });
-                    Overlays.editOverlay(grabberSpotLightLineR, {
-                        start: position,
-                        end: EdgeNR,
-                        visible: true
-                    });
-                    Overlays.editOverlay(grabberSpotLightLineL, {
-                        start: position,
-                        end: EdgeNL,
-                        visible: true
-                    });
-
-                } else { // ..it's a PointLight
-                    that.setSpotLightHandlesVisible(false);
-
-                    var showEdgePointGrabbers = !inModeTranslate;
-                    Overlays.editOverlay(grabberPointLightT, {
-                        position: TOP,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightB, {
-                        position: BOTTOM,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightL, {
-                        position: LEFT,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightR, {
-                        position: RIGHT,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightF, {
-                        position: FAR,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightN, {
-                        position: NEAR,
-                        rotation: rotation,
-                        visible: showEdgePointGrabbers
-                    });
-                    Overlays.editOverlay(grabberPointLightCircleX, {
-                        position: position,
-                        rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)),
-                        dimensions: {
-                            x: properties.dimensions.z / 2.0,
-                            y: properties.dimensions.z / 2.0,
-                            z: 1
-                        },
-                        visible: true
-                    });
-                    Overlays.editOverlay(grabberPointLightCircleY, {
-                        position: position,
-                        rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
-                        dimensions: {
-                            x: properties.dimensions.z / 2.0,
-                            y: properties.dimensions.z / 2.0,
-                            z: 1
-                        },
-                        visible: true
-                    });
-                    Overlays.editOverlay(grabberPointLightCircleZ, {
-                        position: position,
-                        rotation: rotation,
-                        dimensions: {
-                            x: properties.dimensions.z / 2.0,
-                            y: properties.dimensions.z / 2.0,
-                            z: 1
-                        },
-                        visible: true
-                    });
-                }
-            } else { // ..it's not a light at all
-                that.setSpotLightHandlesVisible(false);
-                that.setPointLightHandlesVisible(false);
-            }
-        }// end of isSingleSelection
-
-
-        Overlays.editOverlay(grabberLBN, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: LBN
-        });
-        Overlays.editOverlay(grabberRBN, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: RBN
-        });
-        Overlays.editOverlay(grabberLBF, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: LBF
-        });
-        Overlays.editOverlay(grabberRBF, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: RBF
-        });
-
-        Overlays.editOverlay(grabberLTN, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: LTN
-        });
-        Overlays.editOverlay(grabberRTN, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: RTN
-        });
-        Overlays.editOverlay(grabberLTF, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: LTF
-        });
-        Overlays.editOverlay(grabberRTF, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: RTF
-        });
-
-        Overlays.editOverlay(grabberTOP, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: TOP
-        });
-        Overlays.editOverlay(grabberBOTTOM, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: BOTTOM
-        });
-        Overlays.editOverlay(grabberLEFT, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: LEFT
-        });
-        Overlays.editOverlay(grabberRIGHT, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: RIGHT
-        });
-        Overlays.editOverlay(grabberNEAR, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: NEAR
-        });
-        Overlays.editOverlay(grabberFAR, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: FAR
-        });
-
-        Overlays.editOverlay(grabberCloner, {
-            visible: cloneHandleVisible,
-            rotation: rotation,
-            position: EdgeTR
-        });
-
-        var selectionBoxPosition = Vec3.multiplyQbyV(rotation, center);
-        selectionBoxPosition = Vec3.sum(position, selectionBoxPosition);
-        Overlays.editOverlay(selectionBox, {
-            position: selectionBoxPosition,
-            dimensions: dimensions,
-            rotation: rotation,
-            visible: !inModeRotate
-        });
-
-        // Create more selection box overlays if we don't have enough
-        var overlaysNeeded = SelectionManager.selections.length - selectionBoxes.length;
-        for (var i = 0; i < overlaysNeeded; i++) {
-            selectionBoxes.push(
-                Overlays.addOverlay("cube", {
-                    position: {
-                        x: 0,
-                        y: 0,
-                        z: 0
-                    },
-                    size: 1,
-                    color: {
-                        red: 255,
-                        green: 153,
-                        blue: 0
-                    },
-                    alpha: 1,
-                    solid: false,
-                    visible: false,
-                    dashed: false,
-                    ignoreRayIntersection: true
-                }));
-        }
-
-        i = 0;
-        // Only show individual selections boxes if there is more than 1 selection
-        if (SelectionManager.selections.length > 1) {
-            for (; i < SelectionManager.selections.length; i++) {
-                var props = Entities.getEntityProperties(SelectionManager.selections[i]);
-
-                // Adjust overlay position to take registrationPoint into account
-                // centeredRP = registrationPoint with range [-0.5, 0.5]
-                var centeredRP = Vec3.subtract(props.registrationPoint, {
-                    x: 0.5,
-                    y: 0.5,
-                    z: 0.5
-                });
-                var offset = vec3Mult(props.dimensions, centeredRP);
-                offset = Vec3.multiply(-1, offset);
-                offset = Vec3.multiplyQbyV(props.rotation, offset);
-                var curBoxPosition = Vec3.sum(props.position, offset);
-
-                var color = {red: 255, green: 128, blue: 0};
-                if (i >= SelectionManager.selections.length - 1) {
-                    color = {red: 255, green: 255, blue: 64};
-                }
-
-                Overlays.editOverlay(selectionBoxes[i], {
-                    position: curBoxPosition,
-                    color: color,
-                    rotation: props.rotation,
-                    dimensions: props.dimensions,
-                    visible: true
-                });
-            }
-        }
-        // Hide any remaining selection boxes
-        for (; i < selectionBoxes.length; i++) {
-            Overlays.editOverlay(selectionBoxes[i], {
-                visible: false
-            });
-        }
-
-        Overlays.editOverlay(grabberEdgeTR, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeTR
-        });
-        Overlays.editOverlay(grabberEdgeTL, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeTL
-        });
-        Overlays.editOverlay(grabberEdgeTF, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeTF
-        });
-        Overlays.editOverlay(grabberEdgeTN, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeTN
-        });
-        Overlays.editOverlay(grabberEdgeBR, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeBR
-        });
-        Overlays.editOverlay(grabberEdgeBL, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeBL
-        });
-        Overlays.editOverlay(grabberEdgeBF, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeBF
-        });
-        Overlays.editOverlay(grabberEdgeBN, {
-            visible: stretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeBN
-        });
-        Overlays.editOverlay(grabberEdgeNR, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeNR
-        });
-        Overlays.editOverlay(grabberEdgeNL, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeNL
-        });
-        Overlays.editOverlay(grabberEdgeFR, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeFR
-        });
-        Overlays.editOverlay(grabberEdgeFL, {
-            visible: extendedStretchHandlesVisible,
-            rotation: rotation,
-            position: EdgeFL
-        });
-
-        var grabberMoveUpOffset = 0.1;
-        var upVec = Quat.getUp(MyAvatar.orientation);
-        grabberMoveUpPosition = {
-            x: position.x + (grabberMoveUpOffset + worldTop) * upVec.x ,
-            y: position.y+ (grabberMoveUpOffset + worldTop) * upVec.y,
-            z: position.z + (grabberMoveUpOffset + worldTop) * upVec.z
-        };
-        Overlays.editOverlay(grabberMoveUp, {
-            visible: (!activeTool) || isActiveTool(grabberMoveUp)
-        });
-
-        Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-            visible: !inModeRotate,
-            solid: true,
-            position: {
-                x: SelectionManager.worldPosition.x,
-                y: grid.getOrigin().y,
-                z: SelectionManager.worldPosition.z
-            },
-            dimensions: {
-                x: SelectionManager.worldDimensions.x,
-                y: SelectionManager.worldDimensions.z
-            },
-            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0)
-        });
-
-        if (wantDebug) {
-            print("====== Update Handles <=======");
-        }
-
-    };
-
-    function helperSetOverlaysVisibility(handleArray, isVisible) {
-        var numHandles = handleArray.length;
-        var visibilityUpdate = { visible: isVisible };
-        for (var handleIndex = 0; handleIndex < numHandles; ++handleIndex) {
-            Overlays.editOverlay(handleArray[ handleIndex ], visibilityUpdate);
-        }
-    }
-
-    // FUNCTION: SET OVERLAYS VISIBLE
-    that.setOverlaysVisible = function(isVisible) {
-        helperSetOverlaysVisibility(allOverlays, isVisible);
-        helperSetOverlaysVisibility(selectionBoxes, isVisible);
-    };
-
-    // FUNCTION: SET ROTATION HANDLES VISIBLE
-    that.setRotationHandlesVisible = function(isVisible) {
-        var visibilityUpdate = { visible: isVisible };
-        Overlays.editOverlay(yawHandle, visibilityUpdate);
-        Overlays.editOverlay(pitchHandle, visibilityUpdate);
-        Overlays.editOverlay(rollHandle, visibilityUpdate);
-    };
-
-    // FUNCTION: SET STRETCH HANDLES VISIBLE
-    that.setStretchHandlesVisible = function(isVisible) {
-        helperSetOverlaysVisibility(stretchHandles, isVisible);
-    };
-
-    // FUNCTION: SET GRABBER MOVE UP VISIBLE
-    that.setGrabberMoveUpVisible = function(isVisible) {
-        Overlays.editOverlay(grabberMoveUp, { visible: isVisible });
-    };
-
-    // FUNCTION: SET GRABBER TOOLS UP VISIBLE
-    that.setGrabberToolsVisible = function(isVisible) {
-        var visibilityUpdate = { visible: isVisible };
-        for (var toolKey in grabberTools) {
-            if (!grabberTools.hasOwnProperty(toolKey)) {
-                // EARLY ITERATION EXIT--(On to the next one)
-                continue;
-            }
-
-            Overlays.editOverlay(toolKey, visibilityUpdate);
-        }
-    };
-
-    // FUNCTION: SET POINT LIGHT HANDLES VISIBLE
-    that.setPointLightHandlesVisible = function(isVisible) {
-        helperSetOverlaysVisibility(pointLightGrabberHandles, isVisible);
-    };
-
-    // FUNCTION: SET SPOT LIGHT HANDLES VISIBLE
-    that.setSpotLightHandlesVisible = function(isVisible) {
-        helperSetOverlaysVisibility(spotLightGrabberHandles, isVisible);
-    };
-
-    // FUNCTION: UNSELECT
-    // TODO?: Needs implementation
-    that.unselect = function(entityID) {};
-
-    var initialXZPick = null;
-    var isConstrained = false;
-    var constrainMajorOnly = false;
-    var startPosition = null;
-    var duplicatedEntityIDs = null;
-
-    // TOOL DEFINITION: TRANSLATE XZ TOOL
-    var translateXZTool = addGrabberTool(selectionBox,{
-        mode: 'TRANSLATE_XZ',
-        pickPlanePosition: { x: 0, y: 0, z: 0 },
-        greatestDimension: 0.0,
-        startingDistance: 0.0,
-        startingElevation: 0.0,
-        onBegin: function(event, pickRay, pickResult, doClone) {
-            var wantDebug = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(Beg) -> =======================");
-                Vec3.print("    pickRay", pickRay);
-                Vec3.print("    pickRay.origin", pickRay.origin);
-                Vec3.print("    pickResult.intersection", pickResult.intersection);
-            }
-
-            SelectionManager.saveProperties();
-            that.setRotationHandlesVisible(false);
-            that.setStretchHandlesVisible(false);
-            that.setGrabberMoveUpVisible(false);
-
-            startPosition = SelectionManager.worldPosition;
-
-            translateXZTool.pickPlanePosition = pickResult.intersection;
-            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
-            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
-            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
-            if (wantDebug) {
-                print("    longest dimension: " + translateXZTool.greatestDimension);
-                print("    starting distance: " + translateXZTool.startingDistance);
-                print("    starting elevation: " + translateXZTool.startingElevation);
-            }
-
-            initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            // Duplicate entities if alt is pressed.  This will make a
-            // copy of the selected entities and move the _original_ entities, not
-            // the new ones.
-            if (event.isAlt || doClone) {
-                duplicatedEntityIDs = [];
-                for (var otherEntityID in SelectionManager.savedProperties) {
-                    var properties = SelectionManager.savedProperties[otherEntityID];
-                    if (!properties.locked) {
-                        var entityID = Entities.addEntity(properties);
-                        duplicatedEntityIDs.push({
-                            entityID: entityID,
-                            properties: properties
-                        });
-                    }
-                }
-            } else {
-                duplicatedEntityIDs = null;
-            }
-
-            isConstrained = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(End) <- =======================");
-            }
-        },
-        onEnd: function(event, reason) {
-            pushCommandForSelections(duplicatedEntityIDs);
-
-            Overlays.editOverlay(xRailOverlay, {
-                visible: false
-            });
-            Overlays.editOverlay(zRailOverlay, {
-                visible: false
-            });
-        },
-        elevation: function(origin, intersection) {
-            return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
-        },
-        onMove: function(event) {
-            var wantDebug = false;
-            pickRay = generalComputePickRay(event.x, event.y);
-
-            var pick = rayPlaneIntersection2(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            // If the pick ray doesn't hit the pick plane in this direction, do nothing.
-            // this will happen when someone drags across the horizon from the side they started on.
-            if (!pick) {
-                if (wantDebug) {
-                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
-                }
-                
-                // EARLY EXIT--(Invalid ray detected.)
-                return;
-            }
-
-            var vector = Vec3.subtract(pick, initialXZPick);
-
-            // If the mouse is too close to the horizon of the pick plane, stop moving
-            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
-            var elevation = translateXZTool.elevation(pickRay.origin, pick);
-            if (wantDebug) {
-                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
-            }
-            if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
-                (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
-                if (wantDebug) {
-                    print("    "+ translateXZTool.mode + " - too close to horizon!");
-                }
-
-                // EARLY EXIT--(Don't proceed past the reached limit.)
-                return;
-            }
-
-            //  If the angular size of the object is too small, stop moving
-            var MIN_ANGULAR_SIZE = 0.01; //  Radians
-            if (translateXZTool.greatestDimension > 0) {
-                var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
-                if (wantDebug) {
-                    print("Angular size = " + angularSize);
-                }
-                if (angularSize < MIN_ANGULAR_SIZE) {
-                    return;
-                }
-            }
-
-            // If shifted, constrain to one axis
-            if (event.isShifted) {
-                if (Math.abs(vector.x) > Math.abs(vector.z)) {
-                    vector.z = 0;
-                } else {
-                    vector.x = 0;
-                }
-                if (!isConstrained) {
-                    Overlays.editOverlay(xRailOverlay, {
-                        visible: true
-                    });
-                    var xStart = Vec3.sum(startPosition, {
-                        x: -10000,
-                        y: 0,
-                        z: 0
-                    });
-                    var xEnd = Vec3.sum(startPosition, {
-                        x: 10000,
-                        y: 0,
-                        z: 0
-                    });
-                    var zStart = Vec3.sum(startPosition, {
-                        x: 0,
-                        y: 0,
-                        z: -10000
-                    });
-                    var zEnd = Vec3.sum(startPosition, {
-                        x: 0,
-                        y: 0,
-                        z: 10000
-                    });
-                    Overlays.editOverlay(xRailOverlay, {
-                        start: xStart,
-                        end: xEnd,
-                        visible: true
-                    });
-                    Overlays.editOverlay(zRailOverlay, {
-                        start: zStart,
-                        end: zEnd,
-                        visible: true
-                    });
-                    isConstrained = true;
-                }
-            } else {
-                if (isConstrained) {
-                    Overlays.editOverlay(xRailOverlay, {
-                        visible: false
-                    });
-                    Overlays.editOverlay(zRailOverlay, {
-                        visible: false
-                    });
-                    isConstrained = false;
-                }
-            }
-
-            constrainMajorOnly = event.isControl;
-            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, SelectionManager.worldDimensions));
-            vector = Vec3.subtract(
-                grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
-                cornerPosition);
-
-
-            for (var i = 0; i < SelectionManager.selections.length; i++) {
-                var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
-                if (!properties) {
-                    continue;
-                }
-                var newPosition = Vec3.sum(properties.position, {
-                    x: vector.x,
-                    y: 0,
-                    z: vector.z
-                });
-                Entities.editEntity(SelectionManager.selections[i], {
-                    position: newPosition
-                });
-
-                if (wantDebug) {
-                    print("translateXZ... ");
-                    Vec3.print("                 vector:", vector);
-                    Vec3.print("            newPosition:", properties.position);
-                    Vec3.print("            newPosition:", newPosition);
-                }
-            }
-
-            SelectionManager._update();
-        }
-    });
-    
-    // GRABBER TOOL: GRABBER MOVE UP
-    var lastXYPick = null;
-    var upDownPickNormal = null;
-    addGrabberTool(grabberMoveUp, {
-        mode: "TRANSLATE_UP_DOWN",
-        onBegin: function(event, pickRay, pickResult) {
-            upDownPickNormal = Quat.getForward(lastCameraOrientation);
-            lastXYPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, upDownPickNormal);
-
-            SelectionManager.saveProperties();
-            that.setGrabberMoveUpVisible(true);
-            that.setStretchHandlesVisible(false);
-            that.setRotationHandlesVisible(false);
-
-            // Duplicate entities if alt is pressed.  This will make a
-            // copy of the selected entities and move the _original_ entities, not
-            // the new ones.
-            if (event.isAlt) {
-                duplicatedEntityIDs = [];
-                for (var otherEntityID in SelectionManager.savedProperties) {
-                    var properties = SelectionManager.savedProperties[otherEntityID];
-                    if (!properties.locked) {
-                        var entityID = Entities.addEntity(properties);
-                        duplicatedEntityIDs.push({
-                            entityID: entityID,
-                            properties: properties
-                        });
-                    }
-                }
-            } else {
-                duplicatedEntityIDs = null;
-            }
-        },
-        onEnd: function(event, reason) {
-            pushCommandForSelections(duplicatedEntityIDs);
-        },
-        onMove: function(event) {
-            pickRay = generalComputePickRay(event.x, event.y);
-
-            // translate mode left/right based on view toward entity
-            var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, upDownPickNormal);
-
-            var vector = Vec3.subtract(newIntersection, lastXYPick);
-
-            // project vector onto avatar up vector
-            // we want the avatar referential not the camera.
-            var avatarUpVector = Quat.getUp(MyAvatar.orientation);
-            var dotVectorUp = Vec3.dot(vector, avatarUpVector);
-            vector = Vec3.multiply(dotVectorUp, avatarUpVector);
-
-
-            vector = grid.snapToGrid(vector);
-
-            
-
-            var wantDebug = false;
-            if (wantDebug) {
-                print("translateUpDown... ");
-                print("                event.y:" + event.y);
-                Vec3.print("        newIntersection:", newIntersection);
-                Vec3.print("                 vector:", vector);
-                // Vec3.print("            newPosition:", newPosition);
-            }
-            for (var i = 0; i < SelectionManager.selections.length; i++) {
-                var id = SelectionManager.selections[i];
-                var properties = SelectionManager.savedProperties[id];
-
-                var original = properties.position;
-                var newPosition = Vec3.sum(properties.position, vector);
-
-                Entities.editEntity(id, {
-                    position: newPosition
-                });
-            }
-
-            SelectionManager._update();
-        }
-    });
-
-    // GRABBER TOOL: GRABBER CLONER
-    addGrabberTool(grabberCloner, {
-        mode: "CLONE",
-        onBegin: function(event, pickRay, pickResult) {
-            var doClone = true;
-            translateXZTool.onBegin(event,pickRay,pickResult,doClone);
-        },
-        elevation: function (event) {
-            translateXZTool.elevation(event);
-        },
-
-        onEnd: function (event) {
-            translateXZTool.onEnd(event);
-        },
-
-        onMove: function (event) {
-            translateXZTool.onMove(event);
-        }
-    });
-
-
-    // FUNCTION: VEC 3 MULT
-    var vec3Mult = function(v1, v2) {
-        return {
-            x: v1.x * v2.x,
-            y: v1.y * v2.y,
-            z: v1.z * v2.z
-        };
-    };
-
-    // FUNCTION: MAKE STRETCH TOOL
-    // stretchMode - name of mode
-    // direction - direction to stretch in
-    // pivot - point to use as a pivot
-    // offset - the position of the overlay tool relative to the selections center position
-    // @return: tool obj
-    var makeStretchTool = function(stretchMode, direction, pivot, offset, customOnMove) {
-        //  directionFor3DStretch - direction and pivot for 3D stretch
-        //  distanceFor3DStretch - distance from the intersection point and the handController 
-        //     used to increase the scale taking into account the distance to the object
-        //    DISTANCE_INFLUENCE_THRESHOLD - constant that holds the minimum distance where the 
-        //     distance to the object will influence the stretch/resize/scale
-        var directionFor3DStretch = getDirectionsFor3DStretch(stretchMode);
-        var distanceFor3DStretch = 0;
-        var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
-        
-        
-        var signs = {
-            x: direction.x < 0 ? -1 : (direction.x > 0 ? 1 : 0),
-            y: direction.y < 0 ? -1 : (direction.y > 0 ? 1 : 0),
-            z: direction.z < 0 ? -1 : (direction.z > 0 ? 1 : 0)
-        };
-
-        var mask = {
-            x: Math.abs(direction.x) > 0 ? 1 : 0,
-            y: Math.abs(direction.y) > 0 ? 1 : 0,
-            z: Math.abs(direction.z) > 0 ? 1 : 0
-        };
-
-
-        var numDimensions = mask.x + mask.y + mask.z;
-
-        var planeNormal = null;
+    function addGrabberTranslateTool(overlay, mode, direction) {
+        var pickNormal = null;
         var lastPick = null;
-        var lastPick3D = null;
-        var initialPosition = null;
-        var initialDimensions = null;
-        var initialIntersection = null;
-        var initialProperties = null;
-        var registrationPoint = null;
-        var deltaPivot = null;
-        var deltaPivot3D = null;
-        var pickRayPosition = null;
-        var pickRayPosition3D = null;
-        var rotation = null;
-
-        var onBegin = function(event, pickRay, pickResult) {
-            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-            initialProperties = properties;
-            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.IDENTITY;
-
-            if (spaceMode === SPACE_LOCAL) {
-                rotation = SelectionManager.localRotation;
-                initialPosition = SelectionManager.localPosition;
-                initialDimensions = SelectionManager.localDimensions;
-                registrationPoint = SelectionManager.localRegistrationPoint;
-            } else {
-                rotation = SelectionManager.worldRotation;
-                initialPosition = SelectionManager.worldPosition;
-                initialDimensions = SelectionManager.worldDimensions;
-                registrationPoint = SelectionManager.worldRegistrationPoint;
-            }
-
-            // Modify range of registrationPoint to be [-0.5, 0.5]
-            var centeredRP = Vec3.subtract(registrationPoint, {
-                x: 0.5,
-                y: 0.5,
-                z: 0.5
-            });
-
-            // Scale pivot to be in the same range as registrationPoint
-            var scaledPivot = Vec3.multiply(0.5, pivot);
-            deltaPivot = Vec3.subtract(centeredRP, scaledPivot);
-
-            var scaledOffset = Vec3.multiply(0.5, offset);
-
-            // Offset from the registration point
-            offsetRP = Vec3.subtract(scaledOffset, centeredRP);
-
-            // Scaled offset in world coordinates
-            var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP);
-            
-            pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
-            
-            if (directionFor3DStretch) {
-                // pivot, offset and pickPlanePosition for 3D manipulation
-                var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch));
-                deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);
-                
-                var scaledOffsetWorld3D = vec3Mult(initialDimensions, 
-                    Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), centeredRP));
-                
-                pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
-            }
-            var start = null;
-            var end = null;
-            if ((numDimensions === 1) && mask.x) {
-                start = Vec3.multiplyQbyV(rotation, {
-                    x: -10000,
-                    y: 0,
-                    z: 0
-                });
-                start = Vec3.sum(start, properties.position);
-                end = Vec3.multiplyQbyV(rotation, {
-                    x: 10000,
-                    y: 0,
-                    z: 0
-                });
-                end = Vec3.sum(end, properties.position);
-                Overlays.editOverlay(xRailOverlay, {
-                    start: start,
-                    end: end,
-                    visible: true
-                });
-            }
-            if ((numDimensions === 1) && mask.y) {
-                start = Vec3.multiplyQbyV(rotation, {
-                    x: 0,
-                    y: -10000,
-                    z: 0
-                });
-                start = Vec3.sum(start, properties.position);
-                end = Vec3.multiplyQbyV(rotation, {
-                    x: 0,
-                    y: 10000,
-                    z: 0
-                });
-                end = Vec3.sum(end, properties.position);
-                Overlays.editOverlay(yRailOverlay, {
-                    start: start,
-                    end: end,
-                    visible: true
-                });
-            }
-            if ((numDimensions === 1) && mask.z) {
-                start = Vec3.multiplyQbyV(rotation, {
-                    x: 0,
-                    y: 0,
-                    z: -10000
-                });
-                start = Vec3.sum(start, properties.position);
-                end = Vec3.multiplyQbyV(rotation, {
-                    x: 0,
-                    y: 0,
-                    z: 10000
-                });
-                end = Vec3.sum(end, properties.position);
-                Overlays.editOverlay(zRailOverlay, {
-                    start: start,
-                    end: end,
-                    visible: true
-                });
-            }
-            if (numDimensions === 1) {
-                if (mask.x === 1) {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
-                } else if (mask.y === 1) {
-                    planeNormal = {
-                        x: 1,
-                        y: 0,
-                        z: 0
-                    };
-                } else {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
+        var projectionVector = null;
+        addGrabberTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                if (direction === TRANSLATE_DIRECTION.X) {
+                    pickNormal = { x:0, y:0, z:1 };
+                } else if (direction === TRANSLATE_DIRECTION.Y) {
+                    pickNormal = { x:1, y:0, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Z) {
+                    pickNormal = { x:0, y:1, z:0 };
                 }
-            } else if (numDimensions === 2) {
-                if (mask.x === 0) {
-                    planeNormal = {
-                        x: 1,
-                        y: 0,
-                        z: 0
-                    };
-                } else if (mask.y === 0) {
-                    planeNormal = {
-                        x: 0,
-                        y: 1,
-                        z: 0
-                    };
-                } else {
-                    planeNormal = {
-                        x: 0,
-                        y: 0,
-                        z: 1
-                    };
-                }
-            }
-            
-            planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
-            lastPick = rayPlaneIntersection(pickRay,
-                pickRayPosition,
-                planeNormal);
-                
-            var planeNormal3D = {
-                x: 0,
-                y: 0,
-                z: 0
-            };
-            if (directionFor3DStretch) {
-                lastPick3D = rayPlaneIntersection(pickRay,
-                    pickRayPosition3D,
-                    planeNormal3D);
-                distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
-            }
-        
-            SelectionManager.saveProperties();
-        };
 
-        var onEnd = function(event, reason) {
-            Overlays.editOverlay(xRailOverlay, {
-                visible: false
-            });
-            Overlays.editOverlay(yRailOverlay, {
-                visible: false
-            });
-            Overlays.editOverlay(zRailOverlay, {
-                visible: false
-            });
+                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                pickNormal = Vec3.multiplyQbyV(rotation, pickNormal);
 
-            pushCommandForSelections();
-        };
+                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+    
+                SelectionManager.saveProperties();
 
-        var onMove = function(event) {
-            var proportional = (spaceMode === SPACE_WORLD) || event.isShifted || isActiveTool(grabberSpotLightRadius);
-
-            var position, dimensions, rotation;
-            if (spaceMode === SPACE_LOCAL) {
-                position = SelectionManager.localPosition;
-                dimensions = SelectionManager.localDimensions;
-                rotation = SelectionManager.localRotation;
-            } else {
-                position = SelectionManager.worldPosition;
-                dimensions = SelectionManager.worldDimensions;
-                rotation = SelectionManager.worldRotation;
-            }
-            
-            var localDeltaPivot = deltaPivot;
-            var localSigns = signs;
-
-            var pickRay = generalComputePickRay(event.x, event.y);
-            
-            // Are we using handControllers or Mouse - only relevant for 3D tools
-            var controllerPose = getControllerWorldLocation(activeHand, true);
-            var vector = null;
-            if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && 
-                    controllerPose.valid && that.triggered && directionFor3DStretch) {
-                localDeltaPivot = deltaPivot3D;
-
-                newPick = pickRay.origin;
-            
-                vector = Vec3.subtract(newPick, lastPick3D);
-                
-                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-            
-                if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
-                    // Range of Motion
-                    vector = Vec3.multiply(distanceFor3DStretch , vector);
-                }
-                
-                localSigns = directionFor3DStretch;
-                
-            } else {
-                newPick = rayPlaneIntersection(pickRay,
-                    pickRayPosition,
-                    planeNormal);
-                vector = Vec3.subtract(newPick, lastPick);
-
-                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-
-                vector = vec3Mult(mask, vector);
-                
-            }
-            
-            if (customOnMove) {
-                var change = Vec3.multiply(-1, vec3Mult(localSigns, vector));
-                customOnMove(vector, change);
-            } else {
-                vector = grid.snapToSpacing(vector);
-
-                var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
-                var newDimensions;
-                if (proportional) {
-                    var absX = Math.abs(changeInDimensions.x);
-                    var absY = Math.abs(changeInDimensions.y);
-                    var absZ = Math.abs(changeInDimensions.z);
-                    var pctChange = 0;
-                    if (absX > absY && absX > absZ) {
-                        pctChange = changeInDimensions.x / initialProperties.dimensions.x;
-                        pctChange = changeInDimensions.x / initialDimensions.x;
-                    } else if (absY > absZ) {
-                        pctChange = changeInDimensions.y / initialProperties.dimensions.y;
-                        pctChange = changeInDimensions.y / initialDimensions.y;
-                    } else {
-                        pctChange = changeInDimensions.z / initialProperties.dimensions.z;
-                        pctChange = changeInDimensions.z / initialDimensions.z;
+                that.setGrabberTranslateXVisible(direction === TRANSLATE_DIRECTION.X);
+                that.setGrabberTranslateYVisible(direction === TRANSLATE_DIRECTION.Y);
+                that.setGrabberTranslateZVisible(direction === TRANSLATE_DIRECTION.Z);
+                that.setGrabberRotateVisible(false);
+                that.setGrabberStretchVisible(false);
+                that.setGrabberScaleVisible(false);
+    
+                // Duplicate entities if alt is pressed.  This will make a
+                // copy of the selected entities and move the _original_ entities, not
+                // the new ones.
+                if (event.isAlt) {
+                    duplicatedEntityIDs = [];
+                    for (var otherEntityID in SelectionManager.savedProperties) {
+                        var properties = SelectionManager.savedProperties[otherEntityID];
+                        if (!properties.locked) {
+                            var entityID = Entities.addEntity(properties);
+                            duplicatedEntityIDs.push({
+                                entityID: entityID,
+                                properties: properties
+                            });
+                        }
                     }
-                    pctChange += 1.0;
-                    newDimensions = Vec3.multiply(pctChange, initialDimensions);
                 } else {
-                    newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
+                    duplicatedEntityIDs = null;
+                }
+            },
+            onEnd: function(event, reason) {
+                pushCommandForSelections(duplicatedEntityIDs);
+            },
+            onMove: function(event) {
+                pickRay = generalComputePickRay(event.x, event.y);
+    
+                // translate mode left/right based on view toward entity
+                var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+                var vector = Vec3.subtract(newIntersection, lastPick);
+                
+                if (direction === TRANSLATE_DIRECTION.X) {
+                    projectionVector = { x:1, y:0, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Y) {
+                    projectionVector = { x:0, y:1, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Z) {
+                    projectionVector = { x:0, y:0, z:1 };
                 }
 
-                newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
-                newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
-                newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
-
-                var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
-                var newPosition = Vec3.sum(initialPosition, changeInPosition);
+                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
 
+                var dotVector = Vec3.dot(vector, projectionVector);
+                vector = Vec3.multiply(dotVector, projectionVector);
+                vector = grid.snapToGrid(vector);
+    
+                var wantDebug = false;
+                if (wantDebug) {
+                    print("translateUpDown... ");
+                    print("                event.y:" + event.y);
+                    Vec3.print("        newIntersection:", newIntersection);
+                    Vec3.print("                 vector:", vector);
+                    // Vec3.print("            newPosition:", newPosition);
+                }
+    
                 for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    Entities.editEntity(SelectionManager.selections[i], {
-                        position: newPosition,
+                    var id = SelectionManager.selections[i];
+                    var properties = SelectionManager.savedProperties[id];
+                    var newPosition = Vec3.sum(properties.position, vector);
+                    Entities.editEntity(id, { position: newPosition });
+                }
+    
+                SelectionManager._update();
+            }
+        });
+    }
+
+    function addGrabberStretchTool(overlay, mode, direction) {
+        var pickNormal = null;
+        var lastPick = null;
+        var projectionVector = null;
+        var stretchPanel = null;
+        addGrabberTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                if (direction === TRANSLATE_DIRECTION.X) {
+                    stretchPanel = grabberStretchXPanel;
+                    pickNormal = { x:0, y:0, z:1 };
+                } else if (direction === TRANSLATE_DIRECTION.Y) {
+                    stretchPanel = grabberStretchYPanel;
+                    pickNormal = { x:1, y:0, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Z) {
+                    stretchPanel = grabberStretchZPanel;
+                    pickNormal = { x:0, y:1, z:0 };
+                }
+
+                Overlays.editOverlay(stretchPanel, { visible:true });
+
+                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                pickNormal = Vec3.multiplyQbyV(rotation, pickNormal);
+
+                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+    
+                SelectionManager.saveProperties();
+
+                that.setGrabberTranslateVisible(false);
+                that.setGrabberRotateVisible(false);
+                that.setGrabberStretchXVisible(direction === TRANSLATE_DIRECTION.X);
+                that.setGrabberStretchYVisible(direction === TRANSLATE_DIRECTION.Y);
+                that.setGrabberStretchZVisible(direction === TRANSLATE_DIRECTION.Z);
+    
+                // Duplicate entities if alt is pressed.  This will make a
+                // copy of the selected entities and move the _original_ entities, not
+                // the new ones.
+                if (event.isAlt) {
+                    duplicatedEntityIDs = [];
+                    for (var otherEntityID in SelectionManager.savedProperties) {
+                        var properties = SelectionManager.savedProperties[otherEntityID];
+                        if (!properties.locked) {
+                            var entityID = Entities.addEntity(properties);
+                            duplicatedEntityIDs.push({
+                                entityID: entityID,
+                                properties: properties
+                            });
+                        }
+                    }
+                } else {
+                    duplicatedEntityIDs = null;
+                }
+            },
+            onEnd: function(event, reason) {
+                Overlays.editOverlay(stretchPanel, { visible:false });
+                pushCommandForSelections(duplicatedEntityIDs);
+            },
+            onMove: function(event) {
+                pickRay = generalComputePickRay(event.x, event.y);
+    
+                // translate mode left/right based on view toward entity
+                var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+                var vector = Vec3.subtract(newIntersection, lastPick);
+
+                if (direction === TRANSLATE_DIRECTION.X) {
+                    projectionVector = { x:1, y:0, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Y) {
+                    projectionVector = { x:0, y:1, z:0 };
+                } else if (direction === TRANSLATE_DIRECTION.Z) {
+                    projectionVector = { x:0, y:0, z:1 };
+                }
+
+                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
+
+                var dotVector = Vec3.dot(vector, projectionVector);
+                vector = Vec3.multiply(dotVector, projectionVector);
+                vector = grid.snapToGrid(vector);
+    
+                var wantDebug = false;
+                if (wantDebug) {
+                    print("translateUpDown... ");
+                    print("                event.y:" + event.y);
+                    Vec3.print("        newIntersection:", newIntersection);
+                    Vec3.print("                 vector:", vector);
+                    // Vec3.print("            newPosition:", newPosition);
+                }
+    
+                for (var i = 0; i < SelectionManager.selections.length; i++) {
+                    var id = SelectionManager.selections[i];
+                    var properties = SelectionManager.savedProperties[id];
+                    var newPosition = Vec3.sum(properties.position, vector);
+                    var difference = Vec3.subtract(newPosition, SelectionManager.worldPosition);
+                    var halfDifference = Vec3.multiply(difference, 0.5);
+                    var quarterDifference = Vec3.multiply(halfDifference, 0.5);
+                    var newDimensions = properties.dimensions;
+                    var actualNewPosition = properties.position;
+
+                    if (direction == TRANSLATE_DIRECTION.X) {
+                        newDimensions.x += halfDifference.x;
+                        actualNewPosition.x += quarterDifference.x;
+                    } else if (direction == TRANSLATE_DIRECTION.Y) {
+                        newDimensions.y += halfDifference.y;
+                        actualNewPosition.y += quarterDifference.y;
+                    } else if (direction == TRANSLATE_DIRECTION.Z) {
+                        newDimensions.z += halfDifference.z;
+                        actualNewPosition.z += quarterDifference.z;
+                    }
+
+                    Entities.editEntity(id, {
+                        position: actualNewPosition,
                         dimensions: newDimensions
                     });
                 }
-                
+    
+                SelectionManager._update();
+            }
+        });
+    }
+
+    function addGrabberScaleTool(overlay, mode, direction) {
+        var pickNormal = null;
+        var lastPick = null;
+        var selectedGrabber = null;
+        addGrabberTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                pickNormal = { x:-1, y:1, z:-1 };
+
+                if (direction === SCALE_DIRECTION.LBN) {
+                    selectedGrabber = grabberScaleLBNCube;
+                } else if (direction === SCALE_DIRECTION.RBN) {
+                    selectedGrabber = grabberScaleRBNCube;
+                } else if (direction === SCALE_DIRECTION.LBF) {
+                    selectedGrabber = grabberScaleLBFCube;
+                } else if (direction === SCALE_DIRECTION.RBF) {
+                    selectedGrabber = grabberScaleRBFCube;
+                } else if (direction === SCALE_DIRECTION.LTN) {
+                    selectedGrabber = grabberScaleLTNCube;
+                } else if (direction === SCALE_DIRECTION.RTN) {
+                    selectedGrabber = grabberScaleRTNCube;
+                } else if (direction === SCALE_DIRECTION.LTF) {
+                    selectedGrabber = grabberScaleLTFCube;
+                } else if (direction === SCALE_DIRECTION.RTF) {
+                    selectedGrabber = grabberScaleRTFCube;
+                }
+                Overlays.editOverlay(selectedGrabber, { color: GRABBER_SCALE_CUBE_SELECTED_COLOR });
+
+                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+    
+                SelectionManager.saveProperties();
+
+                that.setGrabberTranslateVisible(false);
+                that.setGrabberRotateVisible(false);
+                that.setGrabberStretchVisible(false);
+                that.setGrabberScaleVisible(true);
+    
+                // Duplicate entities if alt is pressed.  This will make a
+                // copy of the selected entities and move the _original_ entities, not
+                // the new ones.
+                if (event.isAlt) {
+                    duplicatedEntityIDs = [];
+                    for (var otherEntityID in SelectionManager.savedProperties) {
+                        var properties = SelectionManager.savedProperties[otherEntityID];
+                        if (!properties.locked) {
+                            var entityID = Entities.addEntity(properties);
+                            duplicatedEntityIDs.push({
+                                entityID: entityID,
+                                properties: properties
+                            });
+                        }
+                    }
+                } else {
+                    duplicatedEntityIDs = null;
+                }
+            },
+            onEnd: function(event, reason) {
+                Overlays.editOverlay(selectedGrabber, { color: GRABBER_SCALE_CUBE_IDLE_COLOR });
+                pushCommandForSelections(duplicatedEntityIDs);
+            },
+            onMove: function(event) {
+                pickRay = generalComputePickRay(event.x, event.y);
+    
+                // translate mode left/right based on view toward entity
+                var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
+                var vector = Vec3.subtract(newIntersection, lastPick);
+
+                var projectionVector;
+                if (direction === SCALE_DIRECTION.LBN) {
+                    projectionVector = { x:-1, y:-1, z:-1 };
+                } else if (direction === SCALE_DIRECTION.RBN) {
+                    projectionVector = { x:-1, y:-1, z:1 };
+                } else if (direction === SCALE_DIRECTION.LBF) {
+                    projectionVector = { x:1, y:-1, z:-1 };
+                } else if (direction === SCALE_DIRECTION.RBF) {
+                    projectionVector = { x:1, y:-1, z:1 };
+                } else if (direction === SCALE_DIRECTION.LTN) {
+                    projectionVector = { x:-1, y:1, z:-1 };
+                } else if (direction === SCALE_DIRECTION.RTN) {
+                    projectionVector = { x:-1, y:1, z:1 };
+                } else if (direction === SCALE_DIRECTION.LTF) {
+                    projectionVector = { x:1, y:1, z:-1 };
+                } else if (direction === SCALE_DIRECTION.RTF) {
+                    projectionVector = { x:1, y:1, z:1 };
+                }
+
+                var dotVector = Vec3.dot(vector, projectionVector);
+                vector = Vec3.multiply(dotVector, projectionVector);
+                vector = grid.snapToGrid(vector);
 
                 var wantDebug = false;
                 if (wantDebug) {
-                    print(stretchMode);
-                    // Vec3.print("        newIntersection:", newIntersection);
+                    print("translateUpDown... ");
+                    print("                event.y:" + event.y);
+                    Vec3.print("        newIntersection:", newIntersection);
                     Vec3.print("                 vector:", vector);
-                    // Vec3.print("           oldPOS:", oldPOS);
-                    // Vec3.print("                newPOS:", newPOS);
-                    Vec3.print("            changeInDimensions:", changeInDimensions);
-                    Vec3.print("                 newDimensions:", newDimensions);
-
-                    Vec3.print("              changeInPosition:", changeInPosition);
-                    Vec3.print("                   newPosition:", newPosition);
+                    // Vec3.print("            newPosition:", newPosition);
                 }
+    
+                for (var i = 0; i < SelectionManager.selections.length; i++) {
+                    var id = SelectionManager.selections[i];
+                    var properties = SelectionManager.savedProperties[id];
+                    var newPosition = Vec3.sum(properties.position, vector);
+                    var difference = Vec3.subtract(newPosition, SelectionManager.worldPosition);
+                    var differenceAvg = (difference.x + difference.y + difference.z) / 3;
+                    var newDimensionsX = properties.dimensions.x + differenceAvg;
+                    var newDimensionsY = properties.dimensions.y + differenceAvg;
+                    var newDimensionsZ = properties.dimensions.z + differenceAvg;
+                    if (newDimensionsX < SCALE_MINIMUM_DIMENSION) {
+                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsX;
+                        newDimensionsX += differenceBelow;
+                        newDimensionsY += differenceBelow;
+                        newDimensionsZ += differenceBelow;
+                    }
+                    if (newDimensionsY < SCALE_MINIMUM_DIMENSION) {
+                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsY;
+                        newDimensionsX += differenceBelow;
+                        newDimensionsY += differenceBelow;
+                        newDimensionsZ += differenceBelow;
+                    }
+                    if (newDimensionsZ < SCALE_MINIMUM_DIMENSION) {
+                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsZ;
+                        newDimensionsX += differenceBelow;
+                        newDimensionsY += differenceBelow;
+                        newDimensionsZ += differenceBelow;
+                    }
+                    Entities.editEntity(id, { dimensions: { x:newDimensionsX, y:newDimensionsY, z:newDimensionsZ }});
+                }
+    
+                SelectionManager._update();
             }
-
-            SelectionManager._update();
-        };// End of onMove def
-
-        return {
-            mode: stretchMode,
-            onBegin: onBegin,
-            onMove: onMove,
-            onEnd: onEnd
-        };
-    };
-    
-    // Direction for the stretch tool when using hand controller
-    var directionsFor3DGrab = {
-        LBN: {
-            x: 1,
-            y: 1,
-            z: 1
-        },
-        RBN: {
-            x: -1,
-            y: 1,
-            z: 1
-        },
-        LBF: {
-            x: 1,
-            y: 1,
-            z: -1
-        },
-        RBF: {
-            x: -1,
-            y: 1,
-            z: -1
-        },
-        LTN: {
-            x: 1,
-            y: -1,
-            z: 1
-        },
-        RTN: {
-            x: -1,
-            y: -1,
-            z: 1
-        },
-        LTF: {
-            x: 1,
-            y: -1,
-            z: -1
-        },
-        RTF: {
-            x: -1,
-            y: -1,
-            z: -1
-        }
-    };
-
-    // FUNCTION: GET DIRECTION FOR 3D STRETCH    
-    // Returns a vector with directions for the stretch tool in 3D using hand controllers
-    function getDirectionsFor3DStretch(mode) {
-        if (mode === "STRETCH_LBN") {
-            return directionsFor3DGrab.LBN;
-        } else if (mode === "STRETCH_RBN") {
-            return directionsFor3DGrab.RBN;
-        } else if (mode === "STRETCH_LBF") {
-            return directionsFor3DGrab.LBF;
-        } else if (mode === "STRETCH_RBF") {
-            return directionsFor3DGrab.RBF;
-        } else if (mode === "STRETCH_LTN") {
-            return directionsFor3DGrab.LTN;
-        } else if (mode === "STRETCH_RTN") {
-            return directionsFor3DGrab.RTN;
-        } else if (mode === "STRETCH_LTF") {
-            return directionsFor3DGrab.LTF;
-        } else if (mode === "STRETCH_RTF") {
-            return directionsFor3DGrab.RTF;
-        } else {
-            return null;
-        }
-    }
-    
-    
-    // FUNCTION: ADD STRETCH TOOL
-    function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) {
-        if (!pivot) {
-            pivot = direction;
-        }
-        var tool = makeStretchTool(mode, direction, pivot, offset, handleMove);
-
-        return addGrabberTool(overlay, tool);
-    }
-
-    // FUNCTION: CUTOFF STRETCH FUNC
-    function cutoffStretchFunc(vector, change) {
-        vector = change;
-        var wantDebug = false;
-        if (wantDebug) {
-            Vec3.print("Radius stretch: ", vector);
-        }
-        var length = vector.x + vector.y + vector.z;
-        var props = SelectionManager.savedProperties[SelectionManager.selections[0]];
-
-        var radius = props.dimensions.z / 2;
-        var originalCutoff = props.cutoff;
-
-        var originalSize = radius * Math.tan(originalCutoff * (Math.PI / 180));
-        var newSize = originalSize + length;
-        var cutoff = Math.atan2(newSize, radius) * 180 / Math.PI;
-
-        Entities.editEntity(SelectionManager.selections[0], {
-            cutoff: cutoff
         });
-
-        SelectionManager._update();
     }
 
-    // FUNCTION: RADIUS STRETCH FUNC
-    function radiusStretchFunc(vector, change) {
-        var props = SelectionManager.savedProperties[SelectionManager.selections[0]];
-
-        // Find the axis being adjusted
-        var size;
-        if (Math.abs(change.x) > 0) {
-            size = props.dimensions.x + change.x;
-        } else if (Math.abs(change.y) > 0) {
-            size = props.dimensions.y + change.y;
-        } else if (Math.abs(change.z) > 0) {
-            size = props.dimensions.z + change.z;
-        }
-
-        var newDimensions = {
-            x: size,
-            y: size,
-            z: size
-        };
-
-        Entities.editEntity(SelectionManager.selections[0], {
-            dimensions: newDimensions
-        });
-
-        SelectionManager._update();
-    }
-
-    // STRETCH TOOL DEF SECTION
-    addStretchTool(grabberNEAR, "STRETCH_NEAR", {
-        x: 0,
-        y: 0,
-        z: 1
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, {
-        x: 0,
-        y: 0,
-        z: -1
-    });
-    addStretchTool(grabberFAR, "STRETCH_FAR", {
-        x: 0,
-        y: 0,
-        z: -1
-    }, {
-        x: 0,
-        y: 0,
-        z: -1
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    });
-    addStretchTool(grabberTOP, "STRETCH_TOP", {
-        x: 0,
-        y: -1,
-        z: 0
-    }, {
-        x: 0,
-        y: -1,
-        z: 0
-    }, {
-        x: 0,
-        y: 1,
-        z: 0
-    });
-    addStretchTool(grabberBOTTOM, "STRETCH_BOTTOM", {
-        x: 0,
-        y: 1,
-        z: 0
-    }, {
-        x: 0,
-        y: 1,
-        z: 0
-    }, {
-        x: 0,
-        y: -1,
-        z: 0
-    });
-    addStretchTool(grabberRIGHT, "STRETCH_RIGHT", {
-        x: -1,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: 0,
-        z: 0
-    });
-    addStretchTool(grabberLEFT, "STRETCH_LEFT", {
-        x: 1,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: 0,
-        z: 0
-    });
-
-    addStretchTool(grabberSpotLightRadius, "STRETCH_RADIUS", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, {
-        x: 0,
-        y: 0,
-        z: -1
-    });
-    addStretchTool(grabberSpotLightT, "STRETCH_CUTOFF_T", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: -1,
-        z: 0
-    }, {
-        x: 0,
-        y: 1,
-        z: 0
-    }, cutoffStretchFunc);
-    addStretchTool(grabberSpotLightB, "STRETCH_CUTOFF_B", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 1,
-        z: 0
-    }, {
-        x: 0,
-        y: -1,
-        z: 0
-    }, cutoffStretchFunc);
-    addStretchTool(grabberSpotLightL, "STRETCH_CUTOFF_L", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: 0,
-        z: 0
-    }, cutoffStretchFunc);
-    addStretchTool(grabberSpotLightR, "STRETCH_CUTOFF_R", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: 0,
-        z: 0
-    }, cutoffStretchFunc);
-
-    addStretchTool(grabberPointLightT, "STRETCH_RADIUS_T", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: -1,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, radiusStretchFunc);
-    addStretchTool(grabberPointLightB, "STRETCH_RADIUS_B", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 1,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, radiusStretchFunc);
-    addStretchTool(grabberPointLightL, "STRETCH_RADIUS_L", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, radiusStretchFunc);
-    addStretchTool(grabberPointLightR, "STRETCH_RADIUS_R", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, radiusStretchFunc);
-    addStretchTool(grabberPointLightF, "STRETCH_RADIUS_F", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: -1
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, radiusStretchFunc);
-    addStretchTool(grabberPointLightN, "STRETCH_RADIUS_N", {
-        x: 0,
-        y: 0,
-        z: 0
-    }, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, {
-        x: 0,
-        y: 0,
-        z: -1
-    }, radiusStretchFunc);
-
-    addStretchTool(grabberLBN, "STRETCH_LBN", null, {
-        x: 1,
-        y: 0,
-        z: 1
-    }, {
-        x: -1,
-        y: -1,
-        z: -1
-    });
-    addStretchTool(grabberRBN, "STRETCH_RBN", null, {
-        x: -1,
-        y: 0,
-        z: 1
-    }, {
-        x: 1,
-        y: -1,
-        z: -1
-    });
-    addStretchTool(grabberLBF, "STRETCH_LBF", null, {
-        x: 1,
-        y: 0,
-        z: -1
-    }, {
-        x: -1,
-        y: -1,
-        z: 1
-    });
-    addStretchTool(grabberRBF, "STRETCH_RBF", null, {
-        x: -1,
-        y: 0,
-        z: -1
-    }, {
-        x: 1,
-        y: -1,
-        z: 1
-    });
-    addStretchTool(grabberLTN, "STRETCH_LTN", null, {
-        x: 1,
-        y: 0,
-        z: 1
-    }, {
-        x: -1,
-        y: 1,
-        z: -1
-    });
-    addStretchTool(grabberRTN, "STRETCH_RTN", null, {
-        x: -1,
-        y: 0,
-        z: 1
-    }, {
-        x: 1,
-        y: 1,
-        z: -1
-    });
-    addStretchTool(grabberLTF, "STRETCH_LTF", null, {
-        x: 1,
-        y: 0,
-        z: -1
-    }, {
-        x: -1,
-        y: 1,
-        z: 1
-    });
-    addStretchTool(grabberRTF, "STRETCH_RTF", null, {
-        x: -1,
-        y: 0,
-        z: -1
-    }, {
-        x: 1,
-        y: 1,
-        z: 1
-    });
-
-    addStretchTool(grabberEdgeTR, "STRETCH_EdgeTR", null, {
-        x: 1,
-        y: 1,
-        z: 0
-    }, {
-        x: 1,
-        y: 1,
-        z: 0
-    });
-    addStretchTool(grabberEdgeTL, "STRETCH_EdgeTL", null, {
-        x: -1,
-        y: 1,
-        z: 0
-    }, {
-        x: -1,
-        y: 1,
-        z: 0
-    });
-    addStretchTool(grabberEdgeTF, "STRETCH_EdgeTF", null, {
-        x: 0,
-        y: 1,
-        z: -1
-    }, {
-        x: 0,
-        y: 1,
-        z: -1
-    });
-    addStretchTool(grabberEdgeTN, "STRETCH_EdgeTN", null, {
-        x: 0,
-        y: 1,
-        z: 1
-    }, {
-        x: 0,
-        y: 1,
-        z: 1
-    });
-    addStretchTool(grabberEdgeBR, "STRETCH_EdgeBR", null, {
-        x: -1,
-        y: 0,
-        z: 0
-    }, {
-        x: 1,
-        y: -1,
-        z: 0
-    });
-    addStretchTool(grabberEdgeBL, "STRETCH_EdgeBL", null, {
-        x: 1,
-        y: 0,
-        z: 0
-    }, {
-        x: -1,
-        y: -1,
-        z: 0
-    });
-    addStretchTool(grabberEdgeBF, "STRETCH_EdgeBF", null, {
-        x: 0,
-        y: 0,
-        z: -1
-    }, {
-        x: 0,
-        y: -1,
-        z: -1
-    });
-    addStretchTool(grabberEdgeBN, "STRETCH_EdgeBN", null, {
-        x: 0,
-        y: 0,
-        z: 1
-    }, {
-        x: 0,
-        y: -1,
-        z: 1
-    });
-    addStretchTool(grabberEdgeNR, "STRETCH_EdgeNR", null, {
-        x: -1,
-        y: 0,
-        z: 1
-    }, {
-        x: 1,
-        y: 0,
-        z: -1
-    });
-    addStretchTool(grabberEdgeNL, "STRETCH_EdgeNL", null, {
-        x: 1,
-        y: 0,
-        z: 1
-    }, {
-        x: -1,
-        y: 0,
-        z: -1
-    });
-    addStretchTool(grabberEdgeFR, "STRETCH_EdgeFR", null, {
-        x: -1,
-        y: 0,
-        z: -1
-    }, {
-        x: 1,
-        y: 0,
-        z: 1
-    });
-    addStretchTool(grabberEdgeFL, "STRETCH_EdgeFL", null, {
-        x: 1,
-        y: 0,
-        z: -1
-    }, {
-        x: -1,
-        y: 0,
-        z: 1
-    });
-
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
-    function updateRotationDegreesOverlay(angleFromZero, handleRotation, centerPosition) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("---> updateRotationDegreesOverlay ---");
-            print("    AngleFromZero: " + angleFromZero);
-            print("    HandleRotation - X: " + handleRotation.x + " Y: " + handleRotation.y + " Z: " + handleRotation.z);
-            print("    CenterPos - " + centerPosition.x + " Y: " + centerPosition.y + " Z: " + centerPosition.z);
-        }
-
+    function updateRotationDegreesOverlay(angleFromZero, direction, centerPosition) {
         var angle = angleFromZero * (Math.PI / 180);
         var position = {
-            x: Math.cos(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
-            y: Math.sin(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
+            x: Math.cos(angle) * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
+            y: Math.sin(angle) * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
             z: 0
         };
-        if (wantDebug) {
-            print("    Angle: " + angle);
-            print("    InitialPos: " + position.x + ", " + position.y + ", " + position.z);
-        }
-        
-        position = Vec3.multiplyQbyV(handleRotation, position);
+        if (direction === ROTATE_DIRECTION.PITCH)
+            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, -90, 0), position);
+        else if (direction === ROTATE_DIRECTION.YAW)
+            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(90, 0, 0), position);
+        else if (direction === ROTATE_DIRECTION.ROLL)
+            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, 180, 0), position);
         position = Vec3.sum(centerPosition, position);
         var overlayProps = {
             position: position,
             dimensions: {
-                x: innerRadius * ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
-                y: innerRadius * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
+                x: ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
+                y: ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
             },
-            lineHeight: innerRadius * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
+            lineHeight: ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
             text: normalizeDegrees(-angleFromZero) + "°"
         };
-        if (wantDebug) {
-            print("    TranslatedPos: " + position.x + ", " + position.y + ", " + position.z);
-            print("    OverlayDim - X: " + overlayProps.dimensions.x + " Y: " + overlayProps.dimensions.y + " Z: " + overlayProps.dimensions.z);
-            print("    OverlayLineHeight: " + overlayProps.lineHeight);
-            print("    OverlayText: " + overlayProps.text);
-        }
-
         Overlays.editOverlay(rotationDegreesDisplay, overlayProps);
-        if (wantDebug) {
-            print("<--- updateRotationDegreesOverlay ---");
-        }
     }
 
     // FUNCTION DEF: updateSelectionsRotation
@@ -3322,260 +979,422 @@ SelectionDisplay = (function() {
         }
     }
 
-    function helperRotationHandleOnBegin(event, pickRay, rotAroundAxis, rotCenter, handleRotation) {
+    function addGrabberRotateTool(overlay, mode, direction) {
+        var initialPosition = SelectionManager.worldPosition;
+        var selectedGrabber = null;
+        addGrabberTool(overlay, {
+            mode: mode,
+            onBegin: function(event, pickRay, pickResult) {
+                SelectionManager.saveProperties();
+    
+                that.setGrabberTranslateVisible(false);
+                that.setGrabberRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
+                that.setGrabberRotateYawVisible(direction === ROTATE_DIRECTION.YAW);
+                that.setGrabberRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
+                that.setGrabberStretchVisible(false);
+                that.setGrabberScaleVisible(false);
+
+                initialPosition = SelectionManager.worldPosition;
+
+                if (direction === ROTATE_DIRECTION.PITCH) {
+                    rotationNormal = { x: 1, y: 0, z: 0 };
+                    selectedGrabber = grabberRotatePitchRing;
+                } else if (direction === ROTATE_DIRECTION.YAW) {
+                    rotationNormal = { x: 0, y: 1, z: 0 };
+                    selectedGrabber = grabberRotateYawRing;
+                } else if (direction === ROTATE_DIRECTION.ROLL) {
+                    rotationNormal = { x: 0, y: 0, z: 1 };
+                    selectedGrabber = grabberRotateRollRing;
+                }
+
+                Overlays.editOverlay(selectedGrabber, { hasTickMarks: true });
+
+                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                rotationNormal = Vec3.multiplyQbyV(rotation, rotationNormal);
+
+                var rotCenter = SelectionManager.worldPosition;
+
+                Overlays.editOverlay(rotationDegreesDisplay, { visible: true });
+                Overlays.editOverlay(grabberRotateCurrentRing, { visible: true });
+                updateRotationDegreesOverlay(0, direction, rotCenter);
+
+                // editOverlays may not have committed rotation changes.
+                // Compute zero position based on where the overlay will be eventually.
+                var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+                // In case of a parallel ray, this will be null, which will cause early-out
+                // in the onMove helper.
+                rotZero = result;
+            },
+            onEnd: function(event, reason) {
+                Overlays.editOverlay(rotationDegreesDisplay, { visible: false });
+                Overlays.editOverlay(selectedGrabber, { hasTickMarks: false });
+                Overlays.editOverlay(grabberRotateCurrentRing, { visible: false });
+                pushCommandForSelections();
+            },
+            onMove: function(event) {
+                if (!rotZero) {
+                    print("ERROR: entitySelectionTool.handleRotationHandleOnMove - Invalid RotationZero Specified (missed rotation target plane?)");
+        
+                    // EARLY EXIT
+                    return;
+                }
+                var pickRay = generalComputePickRay(event.x, event.y);
+                var rotCenter = SelectionManager.worldPosition;
+                var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+                if (result) {
+                    var centerToZero = Vec3.subtract(rotZero, rotCenter);
+                    var centerToIntersect = Vec3.subtract(result, rotCenter);
+                    // Note: orientedAngle which wants normalized centerToZero and centerToIntersect
+                    //             handles that internally, so it's to pass unnormalized vectors here.
+                    var angleFromZero = Math.floor((Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal)));        
+                    var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
+                    updateSelectionsRotation(rotChange);
+                    updateRotationDegreesOverlay(-angleFromZero, direction, rotCenter);
+
+                    var worldRotation;
+                    if (direction === ROTATE_DIRECTION.PITCH) {
+                        worldRotation = worldRotationY;
+                    } else if (direction === ROTATE_DIRECTION.YAW) {
+                        worldRotation = worldRotationZ;
+                    } else if (direction === ROTATE_DIRECTION.ROLL) {
+                        worldRotation = worldRotationX;
+                    }
+
+                    var startAtCurrent = 0;
+                    var endAtCurrent = angleFromZero;
+                    if (angleFromZero < 0) {
+                        startAtCurrent = 360 + angleFromZero;
+                        endAtCurrent = 360;
+                    }
+                    Overlays.editOverlay(grabberRotateCurrentRing, {
+                        position: rotCenter,
+                        rotation: worldRotation,
+                        startAt: startAtCurrent,
+                        endAt: endAtCurrent
+                    });
+                }
+            }
+        });
+    }
+
+    // @param: toolHandle:  The overlayID associated with the tool
+    //         that correlates to the tool you wish to query.
+    // @note: If toolHandle is null or undefined then activeTool
+    //        will be checked against those values as opposed to
+    //        the tool registered under toolHandle.  Null & Undefined 
+    //        are treated as separate values.
+    // @return: bool - Indicates if the activeTool is that queried.
+    function isActiveTool(toolHandle) {
+        if (!toolHandle) {
+            // Allow isActiveTool(null) and similar to return true if there's
+            // no active tool
+            return (activeTool === toolHandle);
+        }
+
+        if (!grabberTools.hasOwnProperty(toolHandle)) {
+            print("WARNING: entitySelectionTool.isActiveTool - Encountered unknown grabberToolHandle: " + toolHandle + ". Tools should be registered via addGrabberTool.");
+            // EARLY EXIT
+            return false;
+        }
+
+        return (activeTool === grabberTools[ toolHandle ]);
+    }
+
+    // @return string - The mode of the currently active tool;
+    //                  otherwise, "UNKNOWN" if there's no active tool.
+    function getMode() {
+        return (activeTool ? activeTool.mode : "UNKNOWN");
+    }
+
+    that.cleanup = function() {
+        for (var i = 0; i < allOverlays.length; i++) {
+            Overlays.deleteOverlay(allOverlays[i]);
+        }
+    };
+
+    that.highlightSelectable = function(entityID) {
+        var properties = Entities.getEntityProperties(entityID);
+    };
+
+    that.unhighlightSelectable = function(entityID) {
+    };
+
+    that.select = function(entityID, event) {
+        var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+
+        lastCameraPosition = Camera.getPosition();
+        lastCameraOrientation = Camera.getOrientation();
+
+        if (event !== false) {
+            pickRay = generalComputePickRay(event.x, event.y);
+
+            var wantDebug = false;
+            if (wantDebug) {
+                print("select() with EVENT...... ");
+                print("                event.y:" + event.y);
+                Vec3.print("       current position:", properties.position);
+            }
+        }
+
+        /*
+        Overlays.editOverlay(highlightBox, {
+            visible: false
+        });
+        */
+
+        that.updateHandles();
+    };
+
+    // FUNCTION: UPDATE HANDLE POSITION ROTATION
+    that.updateHandlePositionRotation = function() {
+        if (SelectionManager.hasSelection()) {
+            var worldPosition = SelectionManager.worldPosition;
+            var worldRotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+
+            var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
+            worldRotationX = Quat.multiply(worldRotation, localRotationX);
+            var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
+            worldRotationY = Quat.multiply(worldRotation, localRotationY);
+            var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
+            worldRotationZ = Quat.multiply(worldRotation, localRotationZ);
+
+            var cylinderXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET, y:0, z:0 }));
+            Overlays.editOverlay(grabberTranslateXCylinder, { position: cylinderXPos, rotation:worldRotationX });
+            var coneXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CONE_OFFSET, y:0, z:0 }));
+            Overlays.editOverlay(grabberTranslateXCone, { position: coneXPos, rotation:worldRotationX });
+            var stretchXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_STRETCH_SPHERE_OFFSET, y:0, z:0 }));
+            Overlays.editOverlay(grabberStretchXSphere, { position: stretchXPos });
+            Overlays.editOverlay(grabberStretchXPanel, { position: stretchXPos, rotation:worldRotationY });
+
+            var cylinderYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET, z:0 }));
+            Overlays.editOverlay(grabberTranslateYCylinder, { position: cylinderYPos, rotation:worldRotationY });
+            var coneYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CONE_OFFSET, z:0 }));
+            Overlays.editOverlay(grabberTranslateYCone, { position: coneYPos, rotation:worldRotationY });
+            var stretchYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET, z:0 }));
+            Overlays.editOverlay(grabberStretchYSphere, { position: stretchYPos });
+            Overlays.editOverlay(grabberStretchYPanel, { position: stretchYPos, rotation:worldRotationZ });
+
+            var cylinderZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET }));
+            Overlays.editOverlay(grabberTranslateZCylinder, { position: cylinderZPos, rotation:worldRotationZ });
+            var coneZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CONE_OFFSET }));
+            Overlays.editOverlay(grabberTranslateZCone, { position: coneZPos, rotation:worldRotationZ });
+            var stretchZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET }));
+            Overlays.editOverlay(grabberStretchZSphere, { position: stretchZPos });
+            Overlays.editOverlay(grabberStretchZPanel, { position: stretchZPos, rotation:worldRotationX });
+
+            if (!isActiveTool(grabberRotatePitchRing)) {
+                Overlays.editOverlay(grabberRotatePitchRing, { position: SelectionManager.worldPosition, rotation: worldRotationY });
+            }
+            if (!isActiveTool(grabberRotateYawRing)) {
+                Overlays.editOverlay(grabberRotateYawRing, { position: SelectionManager.worldPosition, rotation: worldRotationZ });
+            }
+            if (!isActiveTool(grabberRotateRollRing)) {
+                Overlays.editOverlay(grabberRotateRollRing, { position: SelectionManager.worldPosition, rotation: worldRotationX });
+            }
+
+            var grabberScaleLBNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleLBNCube, { position:grabberScaleLBNCubePos });
+            var grabberScaleRBNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleRBNCube, { position:grabberScaleRBNCubePos });
+            var grabberScaleLBFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleLBFCube, { position:grabberScaleLBFCubePos });
+            var grabberScaleRBFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleRBFCube, { position:grabberScaleRBFCubePos });
+            var grabberScaleLTNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleLTNCube, { position:grabberScaleLTNCubePos });
+            var grabberScaleRTNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleRTNCube, { position:grabberScaleRTNCubePos });
+            var grabberScaleLTFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleLTFCube, { position:grabberScaleLTFCubePos });
+            var grabberScaleRTFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
+            Overlays.editOverlay(grabberScaleRTFCube, { position:grabberScaleRTFCubePos });
+
+            Overlays.editOverlay(grabberScaleTREdge, { start: grabberScaleRTNCubePos, end:grabberScaleRTFCubePos });
+            Overlays.editOverlay(grabberScaleTLEdge, { start: grabberScaleLTNCubePos, end:grabberScaleLTFCubePos });
+            Overlays.editOverlay(grabberScaleTFEdge, { start: grabberScaleLTFCubePos, end:grabberScaleRTFCubePos });
+            Overlays.editOverlay(grabberScaleTNEdge, { start: grabberScaleLTNCubePos, end:grabberScaleRTNCubePos });
+            Overlays.editOverlay(grabberScaleBREdge, { start: grabberScaleRBNCubePos, end:grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleBLEdge, { start: grabberScaleLBNCubePos, end:grabberScaleLBFCubePos });
+            Overlays.editOverlay(grabberScaleBFEdge, { start: grabberScaleLBFCubePos, end:grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleBNEdge, { start: grabberScaleLBNCubePos, end:grabberScaleRBNCubePos });
+            Overlays.editOverlay(grabberScaleNREdge, { start: grabberScaleRTNCubePos, end:grabberScaleRBNCubePos });
+            Overlays.editOverlay(grabberScaleNLEdge, { start: grabberScaleLTNCubePos, end:grabberScaleLBNCubePos });
+            Overlays.editOverlay(grabberScaleFREdge, { start: grabberScaleRTFCubePos, end:grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleFLEdge, { start: grabberScaleLTFCubePos, end:grabberScaleLBFCubePos });
+        }
+    };
+    Script.update.connect(that.updateHandlePositionRotation);
+
+    // FUNCTION: SET SPACE MODE
+    that.setSpaceMode = function(newSpaceMode) {
         var wantDebug = false;
         if (wantDebug) {
-            print("================== " + getMode() + "(rotation helper onBegin) -> =======================");
+            print("======> SetSpaceMode called. ========");
         }
 
-        SelectionManager.saveProperties();
-        that.setRotationHandlesVisible(false);
-        that.setStretchHandlesVisible(false);
-        that.setGrabberMoveUpVisible(false);
-
-        initialPosition = SelectionManager.worldPosition;
-        rotationNormal = { x: 0, y: 0, z: 0 };
-        rotationNormal[rotAroundAxis] = 1;
-        //get the correct axis according to the avatar referencial
-        var avatarReferential = Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({
-            x: 0,
-            y: 0,
-            z: 0
-        }));
-        rotationNormal = Vec3.multiplyQbyV(avatarReferential, rotationNormal);
-
-        // Size the overlays to the current selection size
-        var diagonal = (Vec3.length(SelectionManager.worldDimensions) / 2) * 1.1;
-        var halfDimensions = Vec3.multiply(SelectionManager.worldDimensions, 0.5);
-        innerRadius = diagonal;
-        outerRadius = diagonal * 1.15;
-        var innerAlpha = 0.2;
-        var outerAlpha = 0.2;
-        Overlays.editOverlay(rotateOverlayInner, {
-            visible: true,
-            rotation: handleRotation,
-            position: rotCenter,
-            size: innerRadius,
-            innerRadius: 0.9,
-            startAt: 0,
-            endAt: 360,
-            alpha: innerAlpha
-        });
-
-        Overlays.editOverlay(rotateOverlayOuter, {
-            visible: true,
-            rotation: handleRotation,
-            position: rotCenter,
-            size: outerRadius,
-            innerRadius: 0.9,
-            startAt: 0,
-            endAt: 360,
-            alpha: outerAlpha
-        });
-
-        Overlays.editOverlay(rotateOverlayCurrent, {
-            visible: true,
-            rotation: handleRotation,
-            position: rotCenter,
-            size: outerRadius,
-            startAt: 0,
-            endAt: 0,
-            innerRadius: 0.9
-        });
-
-        Overlays.editOverlay(rotationDegreesDisplay, {
-            visible: true
-        });
-
-        updateRotationDegreesOverlay(0, handleRotation, rotCenter);
-        
-        // editOverlays may not have committed rotation changes.
-        // Compute zero position based on where the overlay will be eventually.
-        var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
-        // In case of a parallel ray, this will be null, which will cause early-out
-        // in the onMove helper.
-        rotZero = result;
-        
+        if (spaceMode !== newSpaceMode) {
+            if (wantDebug) {
+                print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
+            }
+            spaceMode = newSpaceMode;
+            that.updateHandles();
+        } else if (wantDebug) {
+            print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
+        }
         if (wantDebug) {
-            print("================== " + getMode() + "(rotation helper onBegin) <- =======================");
+            print("====== SetSpaceMode called. <========");
         }
-    }// End_Function(helperRotationHandleOnBegin)
+    };
 
-    function helperRotationHandleOnMove(event, rotAroundAxis, rotCenter, handleRotation) {
-
-        if (!rotZero) {
-            print("ERROR: entitySelectionTool.handleRotationHandleOnMove - Invalid RotationZero Specified (missed rotation target plane?)");
-
-            // EARLY EXIT
+    // FUNCTION: UPDATE HANDLES
+    that.updateHandles = function() {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("======> Update Handles =======");
+            print("    Selections Count: " + SelectionManager.selections.length);
+            print("    SpaceMode: " + spaceMode);
+            print("    DisplayMode: " + getMode());
+        }
+        if (SelectionManager.selections.length === 0) {
+            that.setOverlaysVisible(false);
             return;
         }
 
-        var wantDebug = false;
-        if (wantDebug) {
-            print("================== "+ getMode() + "(rotation helper onMove) -> =======================");
-            Vec3.print("    rotZero: ", rotZero);
-        }
-        var pickRay = generalComputePickRay(event.x, event.y);
-        Overlays.editOverlay(selectionBox, {
-            visible: false
-        });
-        Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-            visible: false
-        });
+        var isSingleSelection = (SelectionManager.selections.length === 1);
+        if (isSingleSelection) {
+        }// end of isSingleSelection
 
-        var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
-        if (result) {
-            var centerToZero = Vec3.subtract(rotZero, rotCenter);
-            var centerToIntersect = Vec3.subtract(result, rotCenter);
-            if (wantDebug) {
-                Vec3.print("    RotationNormal:    ", rotationNormal);
-                Vec3.print("    rotZero:           ", rotZero);
-                Vec3.print("    rotCenter:         ", rotCenter);
-                Vec3.print("    intersect:         ", result);
-                Vec3.print("    centerToZero:      ", centerToZero);
-                Vec3.print("    centerToIntersect: ", centerToIntersect);
-            }
-            // Note: orientedAngle which wants normalized centerToZero and centerToIntersect
-            //             handles that internally, so it's to pass unnormalized vectors here.
-            var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
-
-            var distanceFromCenter = Vec3.length(centerToIntersect);
-            var snapToInner = distanceFromCenter < innerRadius;
-            var snapAngle = snapToInner ? innerSnapAngle : 1.0;
-            angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
-
-            
-            var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
-            updateSelectionsRotation(rotChange);
-            //present angle in avatar referencial
-            angleFromZero = -angleFromZero;
-            updateRotationDegreesOverlay(angleFromZero, handleRotation, rotCenter);
-
-            // update the rotation display accordingly...
-            var startAtCurrent = 0;
-            var endAtCurrent = angleFromZero;
-            var startAtRemainder = angleFromZero;
-            var endAtRemainder = 360;
-            if (angleFromZero < 0) {
-                startAtCurrent = 360 + angleFromZero;
-                endAtCurrent = 360;
-                startAtRemainder = 0;
-                endAtRemainder = startAtCurrent;
-            }
-            if (snapToInner) {
-                Overlays.editOverlay(rotateOverlayOuter, {
-                    startAt: 0,
-                    endAt: 360
-                });
-                Overlays.editOverlay(rotateOverlayInner, {
-                    startAt: startAtRemainder,
-                    endAt: endAtRemainder
-                });
-                Overlays.editOverlay(rotateOverlayCurrent, {
-                    startAt: startAtCurrent,
-                    endAt: endAtCurrent,
-                    size: innerRadius,
-                    majorTickMarksAngle: innerSnapAngle,
-                    minorTickMarksAngle: 0,
-                    majorTickMarksLength: -0.25,
-                    minorTickMarksLength: 0
-                });
-            } else {
-                Overlays.editOverlay(rotateOverlayInner, {
-                    startAt: 0,
-                    endAt: 360
-                });
-                Overlays.editOverlay(rotateOverlayOuter, {
-                    startAt: startAtRemainder,
-                    endAt: endAtRemainder
-                });
-                Overlays.editOverlay(rotateOverlayCurrent, {
-                    startAt: startAtCurrent,
-                    endAt: endAtCurrent,
-                    size: outerRadius,
-                    majorTickMarksAngle: 45.0,
-                    minorTickMarksAngle: 5,
-                    majorTickMarksLength: 0.25,
-                    minorTickMarksLength: 0.1
-                });
-            }
-        }// End_If(results.intersects)
+        that.setGrabberTranslateXVisible(!activeTool || isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder));
+        that.setGrabberTranslateYVisible(!activeTool || isActiveTool(grabberTranslateYCone) || isActiveTool(grabberTranslateYCylinder));
+        that.setGrabberTranslateZVisible(!activeTool || isActiveTool(grabberTranslateZCone) || isActiveTool(grabberTranslateZCylinder));
+        that.setGrabberRotatePitchVisible(!activeTool || isActiveTool(grabberRotatePitchRing));
+        that.setGrabberRotateYawVisible(!activeTool || isActiveTool(grabberRotateYawRing));
+        that.setGrabberRotateRollVisible(!activeTool || isActiveTool(grabberRotateRollRing));
+        that.setGrabberStretchXVisible(!activeTool || isActiveTool(grabberStretchXSphere));
+        that.setGrabberStretchYVisible(!activeTool || isActiveTool(grabberStretchYSphere));
+        that.setGrabberStretchZVisible(!activeTool || isActiveTool(grabberStretchZSphere));
+        that.setGrabberScaleVisible(!activeTool || isActiveTool(grabberScaleLBNCube) || isActiveTool(grabberScaleRBNCube) || isActiveTool(grabberScaleLBFCube) || isActiveTool(grabberScaleRBFCube)
+                                                || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube));
 
         if (wantDebug) {
-            print("================== "+ getMode() + "(rotation helper onMove) <- =======================");
+            print("====== Update Handles <=======");
         }
-    }// End_Function(helperRotationHandleOnMove)
+    };
 
-    function helperRotationHandleOnEnd() {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("================== " + getMode() + "(onEnd) -> =======================");
+    // FUNCTION: SET OVERLAYS VISIBLE
+    that.setOverlaysVisible = function(isVisible) {
+        for (var i = 0; i < allOverlays.length; i++) {
+            Overlays.editOverlay(allOverlays[i], { visible: isVisible });
         }
-        Overlays.editOverlay(rotateOverlayInner, {
-            visible: false
-        });
-        Overlays.editOverlay(rotateOverlayOuter, {
-            visible: false
-        });
-        Overlays.editOverlay(rotateOverlayCurrent, {
-            visible: false
-        });
-        Overlays.editOverlay(rotationDegreesDisplay, {
-            visible: false
-        });
+    };
 
-        pushCommandForSelections();
+    // FUNCTION: SET GRABBER TRANSLATE VISIBLE
+    that.setGrabberTranslateVisible = function(isVisible) {
+        that.setGrabberTranslateXVisible(isVisible);
+        that.setGrabberTranslateYVisible(isVisible);
+        that.setGrabberTranslateZVisible(isVisible);
+    };
 
-        if (wantDebug) {
-            print("================== " + getMode() + "(onEnd) <- =======================");
-        }
-    }// End_Function(helperRotationHandleOnEnd)
+    that.setGrabberTranslateXVisible = function(isVisible) {
+        Overlays.editOverlay(grabberTranslateXCone, { visible: isVisible });
+        Overlays.editOverlay(grabberTranslateXCylinder, { visible: isVisible });
+    };
 
+    that.setGrabberTranslateYVisible = function(isVisible) {
+        Overlays.editOverlay(grabberTranslateYCone, { visible: isVisible });
+        Overlays.editOverlay(grabberTranslateYCylinder, { visible: isVisible });
+    };
 
-    // YAW GRABBER TOOL DEFINITION
-    var initialPosition = SelectionManager.worldPosition;
-    addGrabberTool(yawHandle, {
-        mode: "ROTATE_YAW",
-        onBegin: function(event, pickRay, pickResult) {
-            helperRotationHandleOnBegin(event, pickRay, "y", yawCenter, yawHandleRotation);
-        },
-        onEnd: function(event, reason) {
-            helperRotationHandleOnEnd();
-        },
-        onMove: function(event) {
-            helperRotationHandleOnMove(event, "y", yawCenter, yawHandleRotation);
-        }
-    });
+    that.setGrabberTranslateZVisible = function(isVisible) {
+        Overlays.editOverlay(grabberTranslateZCone, { visible: isVisible });
+        Overlays.editOverlay(grabberTranslateZCylinder, { visible: isVisible });
+    };
 
+    // FUNCTION: SET GRABBER ROTATION VISIBLE
+    that.setGrabberRotateVisible = function(isVisible) {
+        that.setGrabberRotatePitchVisible(isVisible);
+        that.setGrabberRotateYawVisible(isVisible);
+        that.setGrabberRotateRollVisible(isVisible);
+    };
 
-    // PITCH GRABBER TOOL DEFINITION
-    addGrabberTool(pitchHandle, {
-        mode: "ROTATE_PITCH",
-        onBegin: function(event, pickRay, pickResult) {
-            helperRotationHandleOnBegin(event, pickRay, "x", pitchCenter, pitchHandleRotation);
-        },
-        onEnd: function(event, reason) {
-            helperRotationHandleOnEnd();
-        },
-        onMove: function (event) {
-            helperRotationHandleOnMove(event, "x", pitchCenter, pitchHandleRotation);
-        }
-    });
+    that.setGrabberRotatePitchVisible = function(isVisible) {
+        Overlays.editOverlay(grabberRotatePitchRing, { visible: isVisible });
+    };
 
+    that.setGrabberRotateYawVisible = function(isVisible) {
+        Overlays.editOverlay(grabberRotateYawRing, { visible: isVisible });
+    };
 
-    // ROLL GRABBER TOOL DEFINITION
-    addGrabberTool(rollHandle, {
-        mode: "ROTATE_ROLL",
-        onBegin: function(event, pickRay, pickResult) {
-            helperRotationHandleOnBegin(event, pickRay, "z", rollCenter, rollHandleRotation);
-        },
-        onEnd: function (event, reason) {
-            helperRotationHandleOnEnd();
-        },
-        onMove: function(event) {
-            helperRotationHandleOnMove(event, "z", rollCenter, rollHandleRotation);
-        }
-    });
+    that.setGrabberRotateRollVisible = function(isVisible) {
+        Overlays.editOverlay(grabberRotateRollRing, { visible: isVisible });
+    };
+
+    // FUNCTION: SET GRABBER STRETCH VISIBLE
+    that.setGrabberStretchVisible = function(isVisible) {
+        that.setGrabberStretchXVisible(isVisible);
+        that.setGrabberStretchYVisible(isVisible);
+        that.setGrabberStretchZVisible(isVisible);
+    };
+
+    that.setGrabberStretchXVisible = function(isVisible) {
+        Overlays.editOverlay(grabberStretchXSphere, { visible: isVisible });
+    };
+
+    that.setGrabberStretchYVisible = function(isVisible) {
+        Overlays.editOverlay(grabberStretchYSphere, { visible: isVisible });
+    };
+
+    that.setGrabberStretchZVisible = function(isVisible) {
+        Overlays.editOverlay(grabberStretchZSphere, { visible: isVisible });
+    };
+    
+    // FUNCTION: SET GRABBER SCALE VISIBLE
+    that.setGrabberScaleVisible = function(isVisible) {
+        Overlays.editOverlay(grabberScaleLBNCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleRBNCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleLBFCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleRBFCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleLTNCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleRTNCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleLTFCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleRTFCube, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleTREdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleTLEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleTFEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleTNEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleBREdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleBLEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleBFEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleBNEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleNREdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleNLEdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleFREdge, { visible: isVisible });
+        Overlays.editOverlay(grabberScaleFLEdge, { visible: isVisible });
+    };
+
+    addGrabberTranslateTool(grabberTranslateXCone, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
+    addGrabberTranslateTool(grabberTranslateXCylinder, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
+    addGrabberTranslateTool(grabberTranslateYCone, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
+    addGrabberTranslateTool(grabberTranslateYCylinder, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
+    addGrabberTranslateTool(grabberTranslateZCone, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
+    addGrabberTranslateTool(grabberTranslateZCylinder, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
+
+    addGrabberRotateTool(grabberRotatePitchRing, "ROTATE_PITCH", ROTATE_DIRECTION.PITCH);
+    addGrabberRotateTool(grabberRotateYawRing, "ROTATE_YAW", ROTATE_DIRECTION.YAW);
+    addGrabberRotateTool(grabberRotateRollRing, "ROTATE_ROLL", ROTATE_DIRECTION.ROLL);
+
+    addGrabberStretchTool(grabberStretchXSphere, "STRETCH_X", TRANSLATE_DIRECTION.X);
+    addGrabberStretchTool(grabberStretchYSphere, "STRETCH_Y", TRANSLATE_DIRECTION.Y);
+    addGrabberStretchTool(grabberStretchZSphere, "STRETCH_Z", TRANSLATE_DIRECTION.Z);
+
+    addGrabberScaleTool(grabberScaleLBNCube, "SCALE_LBN", SCALE_DIRECTION.LBN);
+    addGrabberScaleTool(grabberScaleRBNCube, "SCALE_RBN", SCALE_DIRECTION.RBN);
+    addGrabberScaleTool(grabberScaleLBFCube, "SCALE_LBF", SCALE_DIRECTION.LBF);
+    addGrabberScaleTool(grabberScaleRBFCube, "SCALE_RBF", SCALE_DIRECTION.RBF);
+    addGrabberScaleTool(grabberScaleLTNCube, "SCALE_LTN", SCALE_DIRECTION.LTN);
+    addGrabberScaleTool(grabberScaleRTNCube, "SCALE_RTN", SCALE_DIRECTION.RTN);
+    addGrabberScaleTool(grabberScaleLTFCube, "SCALE_LTF", SCALE_DIRECTION.LTF);
+    addGrabberScaleTool(grabberScaleRTFCube, "SCALE_RTF", SCALE_DIRECTION.RTF);
 
     // FUNCTION: CHECK MOVE
     that.checkMove = function() {
@@ -3587,7 +1406,7 @@ SelectionDisplay = (function() {
             if (!Vec3.equal(Camera.getPosition(), lastCameraPosition) ||
                 !Quat.equal(Camera.getOrientation(), lastCameraOrientation)) {
 
-                that.updateRotationHandles();
+                //that.updateRotationHandles();
             }
         }
     };
@@ -3606,7 +1425,6 @@ SelectionDisplay = (function() {
         }
     };
 
-
     // FUNCTION DEF(s): Intersection Check Helpers
     function testRayIntersect(queryRay, overlayIncludes, overlayExcludes) {
         var wantDebug = false;
@@ -3650,7 +1468,7 @@ SelectionDisplay = (function() {
 
         var pickRay = generalComputePickRay(event.x, event.y);
         // TODO_Case6491:  Move this out to setup just to make it once
-        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID, selectionBox];
+        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID];
         for (var key in grabberTools) {
             if (grabberTools.hasOwnProperty(key)) {
                 interactiveOverlays.push(key);
@@ -3717,125 +1535,6 @@ SelectionDisplay = (function() {
             return true;
         }
 
-        // if no tool is active, then just look for handles to highlight...
-        var pickRay = generalComputePickRay(event.x, event.y);
-        var result = Overlays.findRayIntersection(pickRay);
-        var pickedColor;
-        var pickedAlpha;
-        var highlightNeeded = false;
-
-        if (result.intersects) {
-            switch (result.overlayID) {
-                case yawHandle:
-                case pitchHandle:
-                case rollHandle:
-                    pickedColor = handleColor;
-                    pickedAlpha = handleAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                case grabberMoveUp:
-                    pickedColor = handleColor;
-                    pickedAlpha = handleAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                case grabberLBN:
-                case grabberLBF:
-                case grabberRBN:
-                case grabberRBF:
-                case grabberLTN:
-                case grabberLTF:
-                case grabberRTN:
-                case grabberRTF:
-                    pickedColor = grabberColorCorner;
-                    pickedAlpha = grabberAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                case grabberTOP:
-                case grabberBOTTOM:
-                case grabberLEFT:
-                case grabberRIGHT:
-                case grabberNEAR:
-                case grabberFAR:
-                    pickedColor = grabberColorFace;
-                    pickedAlpha = grabberAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                case grabberEdgeTR:
-                case grabberEdgeTL:
-                case grabberEdgeTF:
-                case grabberEdgeTN:
-                case grabberEdgeBR:
-                case grabberEdgeBL:
-                case grabberEdgeBF:
-                case grabberEdgeBN:
-                case grabberEdgeNR:
-                case grabberEdgeNL:
-                case grabberEdgeFR:
-                case grabberEdgeFL:
-                case grabberSpotLightRadius:
-                case grabberSpotLightT:
-                case grabberSpotLightB:
-                case grabberSpotLightL:
-                case grabberSpotLightR:
-                case grabberPointLightT:
-                case grabberPointLightB:
-                case grabberPointLightR:
-                case grabberPointLightL:
-                case grabberPointLightN:
-                case grabberPointLightF:
-                    pickedColor = grabberColorEdge;
-                    pickedAlpha = grabberAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                case grabberCloner:
-                    pickedColor = grabberColorCloner;
-                    pickedAlpha = grabberAlpha;
-                    highlightNeeded = true;
-                    break;
-
-                default:
-                    if (previousHandle) {
-                        Overlays.editOverlay(previousHandle, {
-                            color: previousHandleColor,
-                            alpha: previousHandleAlpha
-                        });
-                        previousHandle = false;
-                    }
-                    break;
-            }
-
-            if (highlightNeeded) {
-                if (previousHandle) {
-                    Overlays.editOverlay(previousHandle, {
-                        color: previousHandleColor,
-                        alpha: previousHandleAlpha
-                    });
-                    previousHandle = false;
-                }
-                Overlays.editOverlay(result.overlayID, {
-                    color: highlightedHandleColor,
-                    alpha: highlightedHandleAlpha
-                });
-                previousHandle = result.overlayID;
-                previousHandleColor = pickedColor;
-                previousHandleAlpha = pickedAlpha;
-            }
-
-        } else {
-            if (previousHandle) {
-                Overlays.editOverlay(previousHandle, {
-                    color: previousHandleColor,
-                    alpha: previousHandleAlpha
-                });
-                previousHandle = false;
-            }
-        }
-
         if (wantDebug) {
             print("=============== eST::MouseMoveEvent END =======================");
         }
@@ -3859,23 +1558,6 @@ SelectionDisplay = (function() {
                 print("    ActiveTool(" + activeTool.mode + ")'s missing onEnd");
             }
         }
-        
-        // hide our rotation overlays..., and show our handles
-        if (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || isActiveTool(rollHandle)) {
-            if (wantDebug) {
-                print("    Triggering hide of RotateOverlays");
-            }
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: false
-            });
-            
-        }
 
         showHandles = activeTool; // base on prior tool value
         activeTool = null;
@@ -3900,7 +1582,5 @@ SelectionDisplay = (function() {
     //       Controller.mouseMoveEvent.connect(that.mouseMoveEvent);
     Controller.mouseReleaseEvent.connect(that.mouseReleaseEvent);
 
-
     return that;
-
 }());

From 25f5eb6b4fc3288d23b193e274996f72153cdec5 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 18 Jan 2018 15:08:13 -0800
Subject: [PATCH 036/569] named property example

---
 libraries/entities/src/EntityEditFilters.cpp              | 3 +++
 scripts/tutorials/entity_edit_filters/position-example.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 2b0dcc9f73..a69a8ce7d1 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -299,6 +299,9 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     filterData.wantsZoneProperties = !stringValue.isEmpty();
                     if (filterData.wantsZoneProperties) {
                         EntityPropertyFlagsFromScriptValue(wantsZonePropertiesValue, filterData.includedZoneProperties);
+                        if (stringValue == "boundingBox") {
+                            filterData.wantsZoneBoundingBox = true;
+                        }
                     }
                 } else if (wantsZonePropertiesValue.isArray()) {
                     auto length = wantsZonePropertiesValue.property("length").toInteger();
diff --git a/scripts/tutorials/entity_edit_filters/position-example.js b/scripts/tutorials/entity_edit_filters/position-example.js
index 01eabee7db..314ba0fd9f 100644
--- a/scripts/tutorials/entity_edit_filters/position-example.js
+++ b/scripts/tutorials/entity_edit_filters/position-example.js
@@ -41,5 +41,5 @@ function filter(properties, type, originalProperties) {
 
     return properties;
 }
-filter.wantsOriginalProperties = true;
+filter.wantsOriginalProperties = "position";
 filter;
\ No newline at end of file

From c4359de859a0cf0e1edd112ea828f807cbb7b99e Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 19 Jan 2018 18:20:36 -0800
Subject: [PATCH 037/569] entity edit tools wip update

---
 scripts/system/edit.js                        |    2 +-
 .../system/libraries/entitySelectionTool.js   | 1269 ++++++++++++-----
 2 files changed, 883 insertions(+), 388 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 87cd3e0faf..2b886d2540 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -65,7 +65,7 @@ gridTool.setVisible(false);
 var entityListTool = new EntityListTool();
 
 selectionManager.addEventListener(function () {
-    selectionDisplay.updateHandles();
+    selectionDisplay.updateGrabbers();
     entityIconOverlayManager.updatePositions();
 
     // Update particle explorer
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 220a7b7c70..253c67bfca 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -138,16 +138,16 @@ SelectionManager = (function() {
             that.localPosition = null;
             that.worldDimensions = null;
             that.worldPosition = null;
+            that.worldRotation = null;
         } else if (that.selections.length === 1) {
             properties = Entities.getEntityProperties(that.selections[0]);
             that.localDimensions = properties.dimensions;
             that.localPosition = properties.position;
             that.localRotation = properties.rotation;
             that.localRegistrationPoint = properties.registrationPoint;
-
-            that.worldDimensions = properties.boundingBox.dimensions;
-            that.worldPosition = properties.boundingBox.center;
-
+            that.worldDimensions = properties.dimensions; // properties.boundingbox.dimensions;
+            that.worldPosition = properties.position;
+            that.worldRotation = properties.rotation;
             SelectionDisplay.setSpaceMode(SPACE_LOCAL);
         } else {
             that.localRotation = null;
@@ -194,7 +194,6 @@ SelectionManager = (function() {
                 print("ERROR: entitySelectionTool.update got exception: " + JSON.stringify(e));
             }
         }
-
     };
 
     return that;
@@ -230,16 +229,23 @@ SelectionDisplay = (function() {
     var COLOR_BLUE = { red:0, green:0, blue:255 };
     var COLOR_RED = { red:255, green:0, blue:0 };
 
-    var GRABBER_TRANSLATE_ARROW_CONE_OFFSET = 0.3625;
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 0.3;
-    var GRABBER_STRETCH_SPHERE_OFFSET = 0.2;
-    var GRABBER_SCALE_CUBE_OFFSET = 0.2;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 1.35;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_DIMENSION_MULTIPLE = 0.05;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
+    var GRABBER_TRANSLATE_ARROW_CONE_DIMENSION_MULTIPLE = 0.25;
+    var GRABBER_ROTATE_RINGS_DIMENSION_MULTIPLE = 2.0;
+    var GRABBER_STRETCH_SPHERE_OFFSET = 1.0;
+    var GRABBER_STRETCH_SPHERE_DIMENSION_MULTIPLE = 0.1;
+    var GRABBER_SCALE_CUBE_OFFSET = 1.0;
+    var GRABBER_SCALE_CUBE_DIMENSION_MULTIPLE = 0.15;
+    var GRABBER_CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 }; 
 
     var GRABBER_SCALE_CUBE_IDLE_COLOR = { red:120, green:120, blue:120 };
     var GRABBER_SCALE_CUBE_SELECTED_COLOR = { red:0, green:0, blue:0 };
     var GRABBER_SCALE_EDGE_COLOR = { red:120, green:120, blue:120 };
 
     var SCALE_MINIMUM_DIMENSION = 0.02;
+    var STRETCH_MINIMUM_DIMENSION = 0.001;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
     var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
@@ -253,6 +259,13 @@ SelectionDisplay = (function() {
         Z : 2
     }
 
+    var STRETCH_DIRECTION = {
+        X : 0,
+        Y : 1,
+        Z : 2,
+        ALL : 3
+    }
+
     var ROTATE_DIRECTION = {
         PITCH : 0,
         YAW : 1,
@@ -291,7 +304,6 @@ SelectionDisplay = (function() {
 
     var grabberPropertiesTranslateArrowCones = {
         shape: "Cone",
-        dimensions: { x:0.05, y:0.05, z:0.05 },
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
@@ -299,7 +311,6 @@ SelectionDisplay = (function() {
     };
     var grabberPropertiesTranslateArrowCylinders = {
         shape: "Cylinder",
-        dimensions: { x:0.01, y:0.075, z:0.01 },
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
@@ -319,7 +330,6 @@ SelectionDisplay = (function() {
     Overlays.editOverlay(grabberTranslateZCylinder, { color : COLOR_BLUE });
 
     var grabberPropertiesRotateRings = {
-        size: 0.5,
         alpha: 1,
         innerRadius: 0.9,
         startAt: 0,
@@ -347,9 +357,8 @@ SelectionDisplay = (function() {
     });
 
     var grabberRotateCurrentRing = Overlays.addOverlay("circle3d", {
-        size: 0.5,
         alpha: 1,
-        color: { red: 224, green: 67, blue: 36 },
+        color: { red: 255, green: 99, blue: 9 },
         solid: true,
         innerRadius: 0.9,
         visible: false,
@@ -377,7 +386,6 @@ SelectionDisplay = (function() {
 
     var grabberPropertiesStretchSpheres = {
         shape: "Sphere",
-        dimensions: { x:0.02, y:0.02, z:0.02 },
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
@@ -393,7 +401,6 @@ SelectionDisplay = (function() {
     var grabberPropertiesStretchPanel = {
         shape: "Quad",
         alpha: 0.5,
-        dimensions: { x:GRABBER_SCALE_CUBE_OFFSET * 2, y:GRABBER_SCALE_CUBE_OFFSET * 2, z:0.01 },
         solid: true,
         visible: false,
         ignoreRayIntersection: true,
@@ -444,6 +451,25 @@ SelectionDisplay = (function() {
     var grabberScaleFREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
     var grabberScaleFLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
 
+    var grabberCloner = Overlays.addOverlay("cube", {
+        size: 0.05,
+        color: COLOR_GREEN,
+        solid: true,
+        visible: false,
+        ignoreRayIntersection: false,
+        drawInFront: true,
+        borderSize: 1.4
+    });
+
+    var selectionBox = Overlays.addOverlay("cube", {
+        size: 1,
+        color: COLOR_RED,
+        alpha: 1,
+        solid: false,
+        visible: false,
+        dashed: false
+    });
+
     var allOverlays = [
         grabberTranslateXCone,
         grabberTranslateXCylinder,
@@ -481,7 +507,9 @@ SelectionDisplay = (function() {
         grabberScaleNREdge,
         grabberScaleNLEdge,
         grabberScaleFREdge,
-        grabberScaleFLEdge
+        grabberScaleFLEdge,
+        grabberCloner,
+        selectionBox
     ];
 
     overlayNames[grabberTranslateXCone] = "grabberTranslateXCone";
@@ -521,6 +549,8 @@ SelectionDisplay = (function() {
     overlayNames[grabberScaleNLEdge] = "grabberScaleNLEdge";
     overlayNames[grabberScaleFREdge] = "grabberScaleFREdge";
     overlayNames[grabberScaleFLEdge] = "grabberScaleFLEdge";
+    overlayNames[grabberCloner] = "grabberCloner";
+    overlayNames[selectionBox] = "selectionBox";
 
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
@@ -587,7 +617,7 @@ SelectionDisplay = (function() {
                     pickNormal = { x:0, y:1, z:0 };
                 }
 
-                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                var rotation = SelectionManager.worldRotation;
                 pickNormal = Vec3.multiplyQbyV(rotation, pickNormal);
 
                 lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
@@ -600,6 +630,7 @@ SelectionDisplay = (function() {
                 that.setGrabberRotateVisible(false);
                 that.setGrabberStretchVisible(false);
                 that.setGrabberScaleVisible(false);
+                that.setGrabberClonerVisible(false);
     
                 // Duplicate entities if alt is pressed.  This will make a
                 // copy of the selected entities and move the _original_ entities, not
@@ -638,7 +669,7 @@ SelectionDisplay = (function() {
                     projectionVector = { x:0, y:0, z:1 };
                 }
 
-                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                var rotation = SelectionManager.worldRotation;
                 projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
 
                 var dotVector = Vec3.dot(vector, projectionVector);
@@ -666,258 +697,388 @@ SelectionDisplay = (function() {
         });
     }
 
-    function addGrabberStretchTool(overlay, mode, direction) {
-        var pickNormal = null;
+    // FUNCTION: VEC 3 MULT
+    var vec3Mult = function(v1, v2) {
+        return {
+            x: v1.x * v2.x,
+            y: v1.y * v2.y,
+            z: v1.z * v2.z
+        };
+    };
+
+    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset) {
+        var directionFor3DStretch = directionVec;
+        var distanceFor3DStretch = 0;
+        var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
+        
+        var signs = {
+            x: directionVec.x < 0 ? -1 : (directionVec.x > 0 ? 1 : 0),
+            y: directionVec.y < 0 ? -1 : (directionVec.y > 0 ? 1 : 0),
+            z: directionVec.z < 0 ? -1 : (directionVec.z > 0 ? 1 : 0)
+        };
+
+        var mask = {
+            x: Math.abs(directionVec.x) > 0 ? 1 : 0,
+            y: Math.abs(directionVec.y) > 0 ? 1 : 0,
+            z: Math.abs(directionVec.z) > 0 ? 1 : 0
+        };
+
+        var numDimensions = mask.x + mask.y + mask.z;
+
+        var planeNormal = null;
         var lastPick = null;
-        var projectionVector = null;
-        var stretchPanel = null;
-        addGrabberTool(overlay, {
-            mode: mode,
-            onBegin: function(event, pickRay, pickResult) {
-                if (direction === TRANSLATE_DIRECTION.X) {
-                    stretchPanel = grabberStretchXPanel;
-                    pickNormal = { x:0, y:0, z:1 };
-                } else if (direction === TRANSLATE_DIRECTION.Y) {
-                    stretchPanel = grabberStretchYPanel;
-                    pickNormal = { x:1, y:0, z:0 };
-                } else if (direction === TRANSLATE_DIRECTION.Z) {
-                    stretchPanel = grabberStretchZPanel;
-                    pickNormal = { x:0, y:1, z:0 };
-                }
+        var lastPick3D = null;
+        var initialPosition = null;
+        var initialDimensions = null;
+        var initialIntersection = null;
+        var initialProperties = null;
+        var registrationPoint = null;
+        var deltaPivot = null;
+        var deltaPivot3D = null;
+        var pickRayPosition = null;
+        var pickRayPosition3D = null;
+        var rotation = null;
 
-                Overlays.editOverlay(stretchPanel, { visible:true });
+        var onBegin = function(event, pickRay, pickResult) {
+            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+            initialProperties = properties;
+            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.IDENTITY;
 
-                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
-                pickNormal = Vec3.multiplyQbyV(rotation, pickNormal);
-
-                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
-    
-                SelectionManager.saveProperties();
-
-                that.setGrabberTranslateVisible(false);
-                that.setGrabberRotateVisible(false);
-                that.setGrabberStretchXVisible(direction === TRANSLATE_DIRECTION.X);
-                that.setGrabberStretchYVisible(direction === TRANSLATE_DIRECTION.Y);
-                that.setGrabberStretchZVisible(direction === TRANSLATE_DIRECTION.Z);
-    
-                // Duplicate entities if alt is pressed.  This will make a
-                // copy of the selected entities and move the _original_ entities, not
-                // the new ones.
-                if (event.isAlt) {
-                    duplicatedEntityIDs = [];
-                    for (var otherEntityID in SelectionManager.savedProperties) {
-                        var properties = SelectionManager.savedProperties[otherEntityID];
-                        if (!properties.locked) {
-                            var entityID = Entities.addEntity(properties);
-                            duplicatedEntityIDs.push({
-                                entityID: entityID,
-                                properties: properties
-                            });
-                        }
-                    }
-                } else {
-                    duplicatedEntityIDs = null;
-                }
-            },
-            onEnd: function(event, reason) {
-                Overlays.editOverlay(stretchPanel, { visible:false });
-                pushCommandForSelections(duplicatedEntityIDs);
-            },
-            onMove: function(event) {
-                pickRay = generalComputePickRay(event.x, event.y);
-    
-                // translate mode left/right based on view toward entity
-                var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
-                var vector = Vec3.subtract(newIntersection, lastPick);
-
-                if (direction === TRANSLATE_DIRECTION.X) {
-                    projectionVector = { x:1, y:0, z:0 };
-                } else if (direction === TRANSLATE_DIRECTION.Y) {
-                    projectionVector = { x:0, y:1, z:0 };
-                } else if (direction === TRANSLATE_DIRECTION.Z) {
-                    projectionVector = { x:0, y:0, z:1 };
-                }
-
-                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
-                projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
-
-                var dotVector = Vec3.dot(vector, projectionVector);
-                vector = Vec3.multiply(dotVector, projectionVector);
-                vector = grid.snapToGrid(vector);
-    
-                var wantDebug = false;
-                if (wantDebug) {
-                    print("translateUpDown... ");
-                    print("                event.y:" + event.y);
-                    Vec3.print("        newIntersection:", newIntersection);
-                    Vec3.print("                 vector:", vector);
-                    // Vec3.print("            newPosition:", newPosition);
-                }
-    
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    var id = SelectionManager.selections[i];
-                    var properties = SelectionManager.savedProperties[id];
-                    var newPosition = Vec3.sum(properties.position, vector);
-                    var difference = Vec3.subtract(newPosition, SelectionManager.worldPosition);
-                    var halfDifference = Vec3.multiply(difference, 0.5);
-                    var quarterDifference = Vec3.multiply(halfDifference, 0.5);
-                    var newDimensions = properties.dimensions;
-                    var actualNewPosition = properties.position;
-
-                    if (direction == TRANSLATE_DIRECTION.X) {
-                        newDimensions.x += halfDifference.x;
-                        actualNewPosition.x += quarterDifference.x;
-                    } else if (direction == TRANSLATE_DIRECTION.Y) {
-                        newDimensions.y += halfDifference.y;
-                        actualNewPosition.y += quarterDifference.y;
-                    } else if (direction == TRANSLATE_DIRECTION.Z) {
-                        newDimensions.z += halfDifference.z;
-                        actualNewPosition.z += quarterDifference.z;
-                    }
-
-                    Entities.editEntity(id, {
-                        position: actualNewPosition,
-                        dimensions: newDimensions
-                    });
-                }
-    
-                SelectionManager._update();
+            if (spaceMode === SPACE_LOCAL) {
+                rotation = SelectionManager.localRotation;
+                initialPosition = SelectionManager.localPosition;
+                initialDimensions = SelectionManager.localDimensions;
+                registrationPoint = SelectionManager.localRegistrationPoint;
+            } else {
+                rotation = SelectionManager.worldRotation;
+                initialPosition = SelectionManager.worldPosition;
+                initialDimensions = SelectionManager.worldDimensions;
+                registrationPoint = SelectionManager.worldRegistrationPoint;
             }
-        });
+
+            // Modify range of registrationPoint to be [-0.5, 0.5]
+            var centeredRP = Vec3.subtract(registrationPoint, {
+                x: 0.5,
+                y: 0.5,
+                z: 0.5
+            });
+
+            // Scale pivot to be in the same range as registrationPoint
+            var scaledPivot = Vec3.multiply(0.5, pivot);
+            deltaPivot = Vec3.subtract(centeredRP, scaledPivot);
+
+            var scaledOffset = Vec3.multiply(0.5, offset);
+
+            // Offset from the registration point
+            offsetRP = Vec3.subtract(scaledOffset, centeredRP);
+
+            // Scaled offset in world coordinates
+            var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP);
+            
+            pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
+            
+            if (directionFor3DStretch) {
+                // pivot, offset and pickPlanePosition for 3D manipulation
+                var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch));
+                deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);
+                
+                var scaledOffsetWorld3D = vec3Mult(initialDimensions, 
+                    Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), centeredRP));
+                
+                pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
+            }
+            var start = null;
+            var end = null;
+            if ((numDimensions === 1) && mask.x) {
+                start = Vec3.multiplyQbyV(rotation, {
+                    x: -10000,
+                    y: 0,
+                    z: 0
+                });
+                start = Vec3.sum(start, properties.position);
+                end = Vec3.multiplyQbyV(rotation, {
+                    x: 10000,
+                    y: 0,
+                    z: 0
+                });
+                end = Vec3.sum(end, properties.position);
+            }
+            if ((numDimensions === 1) && mask.y) {
+                start = Vec3.multiplyQbyV(rotation, {
+                    x: 0,
+                    y: -10000,
+                    z: 0
+                });
+                start = Vec3.sum(start, properties.position);
+                end = Vec3.multiplyQbyV(rotation, {
+                    x: 0,
+                    y: 10000,
+                    z: 0
+                });
+                end = Vec3.sum(end, properties.position);
+            }
+            if ((numDimensions === 1) && mask.z) {
+                start = Vec3.multiplyQbyV(rotation, {
+                    x: 0,
+                    y: 0,
+                    z: -10000
+                });
+                start = Vec3.sum(start, properties.position);
+                end = Vec3.multiplyQbyV(rotation, {
+                    x: 0,
+                    y: 0,
+                    z: 10000
+                });
+                end = Vec3.sum(end, properties.position);
+            }
+            if (numDimensions === 1) {
+                if (mask.x === 1) {
+                    planeNormal = {
+                        x: 0,
+                        y: 1,
+                        z: 0
+                    };
+                } else if (mask.y === 1) {
+                    planeNormal = {
+                        x: 1,
+                        y: 0,
+                        z: 0
+                    };
+                } else {
+                    planeNormal = {
+                        x: 0,
+                        y: 1,
+                        z: 0
+                    };
+                }
+            } else if (numDimensions === 2) {
+                if (mask.x === 0) {
+                    planeNormal = {
+                        x: 1,
+                        y: 0,
+                        z: 0
+                    };
+                } else if (mask.y === 0) {
+                    planeNormal = {
+                        x: 0,
+                        y: 1,
+                        z: 0
+                    };
+                } else {
+                    planeNormal = {
+                        x: 0,
+                        y: 0,
+                        z: 1
+                    };
+                }
+            }
+            
+            planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
+            lastPick = rayPlaneIntersection(pickRay,
+                pickRayPosition,
+                planeNormal);
+                
+            var planeNormal3D = {
+                x: 0,
+                y: 0,
+                z: 0
+            };
+            if (directionFor3DStretch) {
+                lastPick3D = rayPlaneIntersection(pickRay,
+                    pickRayPosition3D,
+                    planeNormal3D);
+                distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
+            }
+
+            that.setGrabberTranslateVisible(false);
+            that.setGrabberRotateVisible(false);
+            that.setGrabberScaleVisible(directionEnum === STRETCH_DIRECTION.ALL);
+            that.setGrabberStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
+            that.setGrabberStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
+            that.setGrabberStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
+            that.setGrabberClonerVisible(false);
+        
+            SelectionManager.saveProperties();
+        };
+
+        var onEnd = function(event, reason) {    
+            pushCommandForSelections();
+        };
+
+        var onMove = function(event) {
+            var proportional = (spaceMode === SPACE_WORLD) || event.isShifted || directionEnum === STRETCH_DIRECTION.ALL;
+            
+            var position, dimensions, rotation;
+            if (spaceMode === SPACE_LOCAL) {
+                position = SelectionManager.localPosition;
+                dimensions = SelectionManager.localDimensions;
+                rotation = SelectionManager.localRotation;
+            } else {
+                position = SelectionManager.worldPosition;
+                dimensions = SelectionManager.worldDimensions;
+                rotation = SelectionManager.worldRotation;
+            }
+            
+            var localDeltaPivot = deltaPivot;
+            var localSigns = signs;
+    
+            var pickRay = generalComputePickRay(event.x, event.y);
+            
+            // Are we using handControllers or Mouse - only relevant for 3D tools
+            var controllerPose = getControllerWorldLocation(activeHand, true);
+            var vector = null;
+            if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && 
+                    controllerPose.valid && that.triggered && directionFor3DStretch) {
+                localDeltaPivot = deltaPivot3D;
+    
+                newPick = pickRay.origin;
+            
+                vector = Vec3.subtract(newPick, lastPick3D);
+                
+                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
+            
+                if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
+                    // Range of Motion
+                    vector = Vec3.multiply(distanceFor3DStretch , vector);
+                }
+                
+                localSigns = directionFor3DStretch;
+                
+            } else {
+                newPick = rayPlaneIntersection(pickRay,
+                    pickRayPosition,
+                    planeNormal);
+                vector = Vec3.subtract(newPick, lastPick);
+    
+                vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
+    
+                vector = vec3Mult(mask, vector);
+                
+            }
+            
+            vector = grid.snapToSpacing(vector);
+    
+            var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
+            var newDimensions;
+            if (proportional) {
+                var absX = Math.abs(changeInDimensions.x);
+                var absY = Math.abs(changeInDimensions.y);
+                var absZ = Math.abs(changeInDimensions.z);
+                var pctChange = 0;
+                if (absX > absY && absX > absZ) {
+                    pctChange = changeInDimensions.x / initialProperties.dimensions.x;
+                    pctChange = changeInDimensions.x / initialDimensions.x;
+                } else if (absY > absZ) {
+                    pctChange = changeInDimensions.y / initialProperties.dimensions.y;
+                    pctChange = changeInDimensions.y / initialDimensions.y;
+                } else {
+                    pctChange = changeInDimensions.z / initialProperties.dimensions.z;
+                    pctChange = changeInDimensions.z / initialDimensions.z;
+                }
+                pctChange += 1.0;
+                newDimensions = Vec3.multiply(pctChange, initialDimensions);
+            } else {
+                newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
+            }
+    
+            newDimensions.x = Math.max(newDimensions.x, STRETCH_MINIMUM_DIMENSION);
+            newDimensions.y = Math.max(newDimensions.y, STRETCH_MINIMUM_DIMENSION);
+            newDimensions.z = Math.max(newDimensions.z, STRETCH_MINIMUM_DIMENSION);
+    
+            var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
+            if (directionEnum === STRETCH_DIRECTION.ALL) {
+                changeInPosition = { x:0, y:0, z:0 };
+            }
+            var newPosition = Vec3.sum(initialPosition, changeInPosition);
+    
+            for (var i = 0; i < SelectionManager.selections.length; i++) {
+                Entities.editEntity(SelectionManager.selections[i], {
+                    position: newPosition,
+                    dimensions: newDimensions
+                });
+            }
+                
+            var wantDebug = false;
+            if (wantDebug) {
+                print(stretchMode);
+                // Vec3.print("        newIntersection:", newIntersection);
+                Vec3.print("                 vector:", vector);
+                // Vec3.print("           oldPOS:", oldPOS);
+                // Vec3.print("                newPOS:", newPOS);
+                Vec3.print("            changeInDimensions:", changeInDimensions);
+                Vec3.print("                 newDimensions:", newDimensions);
+    
+                Vec3.print("              changeInPosition:", changeInPosition);
+                Vec3.print("                   newPosition:", newPosition);
+            }
+    
+            SelectionManager._update();
+        };// End of onMove def
+
+        return {
+            mode: stretchMode,
+            onBegin: onBegin,
+            onMove: onMove,
+            onEnd: onEnd
+        };
     }
 
-    function addGrabberScaleTool(overlay, mode, direction) {
-        var pickNormal = null;
-        var lastPick = null;
-        var selectedGrabber = null;
-        addGrabberTool(overlay, {
-            mode: mode,
-            onBegin: function(event, pickRay, pickResult) {
-                pickNormal = { x:-1, y:1, z:-1 };
+    function addGrabberStretchTool(overlay, mode, directionEnum) {
+        var directionVec, pivot, offset;
+        if (directionEnum === STRETCH_DIRECTION.X) {
+            directionVec = { x:-1, y:0, z:0 };
+            pivot = { x:-1, y:0, z:0 };
+            offset = { x:1, y:0, z:0 };
+        } else if (directionEnum === STRETCH_DIRECTION.Y) {
+            directionVec = { x:0, y:-1, z:0 };
+            pivot = { x:0, y:-1, z:0 };
+            offset = { x:0, y:1, z:0 };
+        } else if (directionEnum === STRETCH_DIRECTION.Z) {
+            directionVec = { x:0, y:0, z:-1 };
+            pivot = { x:0, y:0, z:-1 };
+            offset = { x:0, y:0, z:1 };
+        }
+        var tool = makeStretchTool(mode, directionEnum, directionVec, pivot, offset);
+        return addGrabberTool(overlay, tool);
+    }
 
-                if (direction === SCALE_DIRECTION.LBN) {
-                    selectedGrabber = grabberScaleLBNCube;
-                } else if (direction === SCALE_DIRECTION.RBN) {
-                    selectedGrabber = grabberScaleRBNCube;
-                } else if (direction === SCALE_DIRECTION.LBF) {
-                    selectedGrabber = grabberScaleLBFCube;
-                } else if (direction === SCALE_DIRECTION.RBF) {
-                    selectedGrabber = grabberScaleRBFCube;
-                } else if (direction === SCALE_DIRECTION.LTN) {
-                    selectedGrabber = grabberScaleLTNCube;
-                } else if (direction === SCALE_DIRECTION.RTN) {
-                    selectedGrabber = grabberScaleRTNCube;
-                } else if (direction === SCALE_DIRECTION.LTF) {
-                    selectedGrabber = grabberScaleLTFCube;
-                } else if (direction === SCALE_DIRECTION.RTF) {
-                    selectedGrabber = grabberScaleRTFCube;
-                }
-                Overlays.editOverlay(selectedGrabber, { color: GRABBER_SCALE_CUBE_SELECTED_COLOR });
-
-                lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
-    
-                SelectionManager.saveProperties();
-
-                that.setGrabberTranslateVisible(false);
-                that.setGrabberRotateVisible(false);
-                that.setGrabberStretchVisible(false);
-                that.setGrabberScaleVisible(true);
-    
-                // Duplicate entities if alt is pressed.  This will make a
-                // copy of the selected entities and move the _original_ entities, not
-                // the new ones.
-                if (event.isAlt) {
-                    duplicatedEntityIDs = [];
-                    for (var otherEntityID in SelectionManager.savedProperties) {
-                        var properties = SelectionManager.savedProperties[otherEntityID];
-                        if (!properties.locked) {
-                            var entityID = Entities.addEntity(properties);
-                            duplicatedEntityIDs.push({
-                                entityID: entityID,
-                                properties: properties
-                            });
-                        }
-                    }
-                } else {
-                    duplicatedEntityIDs = null;
-                }
-            },
-            onEnd: function(event, reason) {
-                Overlays.editOverlay(selectedGrabber, { color: GRABBER_SCALE_CUBE_IDLE_COLOR });
-                pushCommandForSelections(duplicatedEntityIDs);
-            },
-            onMove: function(event) {
-                pickRay = generalComputePickRay(event.x, event.y);
-    
-                // translate mode left/right based on view toward entity
-                var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
-                var vector = Vec3.subtract(newIntersection, lastPick);
-
-                var projectionVector;
-                if (direction === SCALE_DIRECTION.LBN) {
-                    projectionVector = { x:-1, y:-1, z:-1 };
-                } else if (direction === SCALE_DIRECTION.RBN) {
-                    projectionVector = { x:-1, y:-1, z:1 };
-                } else if (direction === SCALE_DIRECTION.LBF) {
-                    projectionVector = { x:1, y:-1, z:-1 };
-                } else if (direction === SCALE_DIRECTION.RBF) {
-                    projectionVector = { x:1, y:-1, z:1 };
-                } else if (direction === SCALE_DIRECTION.LTN) {
-                    projectionVector = { x:-1, y:1, z:-1 };
-                } else if (direction === SCALE_DIRECTION.RTN) {
-                    projectionVector = { x:-1, y:1, z:1 };
-                } else if (direction === SCALE_DIRECTION.LTF) {
-                    projectionVector = { x:1, y:1, z:-1 };
-                } else if (direction === SCALE_DIRECTION.RTF) {
-                    projectionVector = { x:1, y:1, z:1 };
-                }
-
-                var dotVector = Vec3.dot(vector, projectionVector);
-                vector = Vec3.multiply(dotVector, projectionVector);
-                vector = grid.snapToGrid(vector);
-
-                var wantDebug = false;
-                if (wantDebug) {
-                    print("translateUpDown... ");
-                    print("                event.y:" + event.y);
-                    Vec3.print("        newIntersection:", newIntersection);
-                    Vec3.print("                 vector:", vector);
-                    // Vec3.print("            newPosition:", newPosition);
-                }
-    
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    var id = SelectionManager.selections[i];
-                    var properties = SelectionManager.savedProperties[id];
-                    var newPosition = Vec3.sum(properties.position, vector);
-                    var difference = Vec3.subtract(newPosition, SelectionManager.worldPosition);
-                    var differenceAvg = (difference.x + difference.y + difference.z) / 3;
-                    var newDimensionsX = properties.dimensions.x + differenceAvg;
-                    var newDimensionsY = properties.dimensions.y + differenceAvg;
-                    var newDimensionsZ = properties.dimensions.z + differenceAvg;
-                    if (newDimensionsX < SCALE_MINIMUM_DIMENSION) {
-                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsX;
-                        newDimensionsX += differenceBelow;
-                        newDimensionsY += differenceBelow;
-                        newDimensionsZ += differenceBelow;
-                    }
-                    if (newDimensionsY < SCALE_MINIMUM_DIMENSION) {
-                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsY;
-                        newDimensionsX += differenceBelow;
-                        newDimensionsY += differenceBelow;
-                        newDimensionsZ += differenceBelow;
-                    }
-                    if (newDimensionsZ < SCALE_MINIMUM_DIMENSION) {
-                        var differenceBelow = SCALE_MINIMUM_DIMENSION - newDimensionsZ;
-                        newDimensionsX += differenceBelow;
-                        newDimensionsY += differenceBelow;
-                        newDimensionsZ += differenceBelow;
-                    }
-                    Entities.editEntity(id, { dimensions: { x:newDimensionsX, y:newDimensionsY, z:newDimensionsZ }});
-                }
-    
-                SelectionManager._update();
-            }
-        });
+    function addGrabberScaleTool(overlay, mode, directionEnum) {
+        var directionVec, pivot, offset;
+        if (directionEnum === SCALE_DIRECTION.LBN) {
+            directionVec = { x:1, y:1, z:1 };
+            pivot = { x:1, y:1, z:1 };
+            offset = { x:-1, y:-1, z:-1 };
+        } else if (directionEnum === SCALE_DIRECTION.RBN) {
+            directionVec = { x:1, y:1, z:-1 };
+            pivot = { x:1, y:1, z:-1 };
+            offset = { x:-1, y:-1, z:1 };
+        } else if (directionEnum === SCALE_DIRECTION.LBF) {
+            directionVec = { x:-1, y:1, z:1 };
+            pivot = { x:-1, y:1, z:1 };
+            offset = { x:1, y:-1, z:-1 };
+        } else if (directionEnum === SCALE_DIRECTION.RBF) {
+            directionVec = { x:-1, y:1, z:-1 };
+            pivot = { x:-1, y:1, z:-1 };
+            offset = { x:1, y:-1, z:1 };
+        } else if (directionEnum === SCALE_DIRECTION.LTN) { 
+            directionVec = { x:1, y:-1, z:1 };
+            pivot = { x:1, y:-1, z:1 };
+            offset = { x:-1, y:1, z:-1 };
+        } else if (directionEnum === SCALE_DIRECTION.RTN) {
+            directionVec = { x:1, y:-1, z:-1 };
+            pivot = { x:1, y:-1, z:-1 };
+            offset = { x:-1, y:1, z:1 };
+        } else if (directionEnum === SCALE_DIRECTION.LTF) {
+            directionVec = { x:-1, y:-1, z:1 };
+            pivot = { x:-1, y:-1, z:1 };
+            offset = { x:1, y:1, z:-1 };
+        } else if (directionEnum === SCALE_DIRECTION.RTF) {
+            directionVec = { x:-1, y:-1, z:-1 };
+            pivot = { x:-1, y:-1, z:-1 };
+            offset = { x:1, y:1, z:1 };
+        }
+        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, pivot, offset);
+        return addGrabberTool(overlay, tool);
     }
 
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
@@ -970,9 +1131,9 @@ SelectionDisplay = (function() {
             };
 
             if (reposition) {
-                var dPos = Vec3.subtract(initialProperties.position, initialPosition);
+                var dPos = Vec3.subtract(initialProperties.position, SelectionManager.worldPosition);
                 dPos = Vec3.multiplyQbyV(rotationChange, dPos);
-                newProperties.position = Vec3.sum(initialPosition, dPos);
+                newProperties.position = Vec3.sum(SelectionManager.worldPosition, dPos);
             }
 
             Entities.editEntity(entityID, newProperties);
@@ -980,8 +1141,8 @@ SelectionDisplay = (function() {
     }
 
     function addGrabberRotateTool(overlay, mode, direction) {
-        var initialPosition = SelectionManager.worldPosition;
         var selectedGrabber = null;
+        var worldRotation = null;
         addGrabberTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
@@ -993,29 +1154,37 @@ SelectionDisplay = (function() {
                 that.setGrabberRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
                 that.setGrabberStretchVisible(false);
                 that.setGrabberScaleVisible(false);
-
-                initialPosition = SelectionManager.worldPosition;
+                that.setGrabberClonerVisible(false);
 
                 if (direction === ROTATE_DIRECTION.PITCH) {
                     rotationNormal = { x: 1, y: 0, z: 0 };
+                    worldRotation = worldRotationY;
                     selectedGrabber = grabberRotatePitchRing;
                 } else if (direction === ROTATE_DIRECTION.YAW) {
                     rotationNormal = { x: 0, y: 1, z: 0 };
+                    worldRotation = worldRotationZ;
                     selectedGrabber = grabberRotateYawRing;
                 } else if (direction === ROTATE_DIRECTION.ROLL) {
                     rotationNormal = { x: 0, y: 0, z: 1 };
+                    worldRotation = worldRotationX;
                     selectedGrabber = grabberRotateRollRing;
                 }
 
                 Overlays.editOverlay(selectedGrabber, { hasTickMarks: true });
 
-                var rotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
+                var rotation = SelectionManager.worldRotation;
                 rotationNormal = Vec3.multiplyQbyV(rotation, rotationNormal);
 
                 var rotCenter = SelectionManager.worldPosition;
 
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: true });
-                Overlays.editOverlay(grabberRotateCurrentRing, { visible: true });
+                Overlays.editOverlay(grabberRotateCurrentRing, {
+                    position: rotCenter,
+                    rotation: worldRotation,
+                    startAt: 0,
+                    endAt: 0,
+                    visible: true
+                });
                 updateRotationDegreesOverlay(0, direction, rotCenter);
 
                 // editOverlays may not have committed rotation changes.
@@ -1051,15 +1220,6 @@ SelectionDisplay = (function() {
                     updateSelectionsRotation(rotChange);
                     updateRotationDegreesOverlay(-angleFromZero, direction, rotCenter);
 
-                    var worldRotation;
-                    if (direction === ROTATE_DIRECTION.PITCH) {
-                        worldRotation = worldRotationY;
-                    } else if (direction === ROTATE_DIRECTION.YAW) {
-                        worldRotation = worldRotationZ;
-                    } else if (direction === ROTATE_DIRECTION.ROLL) {
-                        worldRotation = worldRotationX;
-                    }
-
                     var startAtCurrent = 0;
                     var endAtCurrent = angleFromZero;
                     if (angleFromZero < 0) {
@@ -1067,11 +1227,13 @@ SelectionDisplay = (function() {
                         endAtCurrent = 360;
                     }
                     Overlays.editOverlay(grabberRotateCurrentRing, {
-                        position: rotCenter,
-                        rotation: worldRotation,
                         startAt: startAtCurrent,
                         endAt: endAtCurrent
                     });
+                    // not sure why but this seems to be needed to fix an reverse rotation for yaw ring only
+                    if (direction === ROTATE_DIRECTION.YAW) {
+                        Overlays.editOverlay(grabberRotateCurrentRing, { rotation: worldRotationZ });
+                    }
                 }
             }
         });
@@ -1142,89 +1304,9 @@ SelectionDisplay = (function() {
         });
         */
 
-        that.updateHandles();
+        that.updateGrabbers();
     };
 
-    // FUNCTION: UPDATE HANDLE POSITION ROTATION
-    that.updateHandlePositionRotation = function() {
-        if (SelectionManager.hasSelection()) {
-            var worldPosition = SelectionManager.worldPosition;
-            var worldRotation = Entities.getEntityProperties(SelectionManager.selections[0]).rotation;
-
-            var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
-            worldRotationX = Quat.multiply(worldRotation, localRotationX);
-            var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
-            worldRotationY = Quat.multiply(worldRotation, localRotationY);
-            var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
-            worldRotationZ = Quat.multiply(worldRotation, localRotationZ);
-
-            var cylinderXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET, y:0, z:0 }));
-            Overlays.editOverlay(grabberTranslateXCylinder, { position: cylinderXPos, rotation:worldRotationX });
-            var coneXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CONE_OFFSET, y:0, z:0 }));
-            Overlays.editOverlay(grabberTranslateXCone, { position: coneXPos, rotation:worldRotationX });
-            var stretchXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_STRETCH_SPHERE_OFFSET, y:0, z:0 }));
-            Overlays.editOverlay(grabberStretchXSphere, { position: stretchXPos });
-            Overlays.editOverlay(grabberStretchXPanel, { position: stretchXPos, rotation:worldRotationY });
-
-            var cylinderYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET, z:0 }));
-            Overlays.editOverlay(grabberTranslateYCylinder, { position: cylinderYPos, rotation:worldRotationY });
-            var coneYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CONE_OFFSET, z:0 }));
-            Overlays.editOverlay(grabberTranslateYCone, { position: coneYPos, rotation:worldRotationY });
-            var stretchYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET, z:0 }));
-            Overlays.editOverlay(grabberStretchYSphere, { position: stretchYPos });
-            Overlays.editOverlay(grabberStretchYPanel, { position: stretchYPos, rotation:worldRotationZ });
-
-            var cylinderZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET }));
-            Overlays.editOverlay(grabberTranslateZCylinder, { position: cylinderZPos, rotation:worldRotationZ });
-            var coneZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CONE_OFFSET }));
-            Overlays.editOverlay(grabberTranslateZCone, { position: coneZPos, rotation:worldRotationZ });
-            var stretchZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET }));
-            Overlays.editOverlay(grabberStretchZSphere, { position: stretchZPos });
-            Overlays.editOverlay(grabberStretchZPanel, { position: stretchZPos, rotation:worldRotationX });
-
-            if (!isActiveTool(grabberRotatePitchRing)) {
-                Overlays.editOverlay(grabberRotatePitchRing, { position: SelectionManager.worldPosition, rotation: worldRotationY });
-            }
-            if (!isActiveTool(grabberRotateYawRing)) {
-                Overlays.editOverlay(grabberRotateYawRing, { position: SelectionManager.worldPosition, rotation: worldRotationZ });
-            }
-            if (!isActiveTool(grabberRotateRollRing)) {
-                Overlays.editOverlay(grabberRotateRollRing, { position: SelectionManager.worldPosition, rotation: worldRotationX });
-            }
-
-            var grabberScaleLBNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleLBNCube, { position:grabberScaleLBNCubePos });
-            var grabberScaleRBNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleRBNCube, { position:grabberScaleRBNCubePos });
-            var grabberScaleLBFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleLBFCube, { position:grabberScaleLBFCubePos });
-            var grabberScaleRBFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:-GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleRBFCube, { position:grabberScaleRBFCubePos });
-            var grabberScaleLTNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleLTNCube, { position:grabberScaleLTNCubePos });
-            var grabberScaleRTNCubePos = Vec3.sum(worldPosition, { x:-GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleRTNCube, { position:grabberScaleRTNCubePos });
-            var grabberScaleLTFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:-GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleLTFCube, { position:grabberScaleLTFCubePos });
-            var grabberScaleRTFCubePos = Vec3.sum(worldPosition, { x:GRABBER_SCALE_CUBE_OFFSET, y:GRABBER_SCALE_CUBE_OFFSET, z:GRABBER_SCALE_CUBE_OFFSET });
-            Overlays.editOverlay(grabberScaleRTFCube, { position:grabberScaleRTFCubePos });
-
-            Overlays.editOverlay(grabberScaleTREdge, { start: grabberScaleRTNCubePos, end:grabberScaleRTFCubePos });
-            Overlays.editOverlay(grabberScaleTLEdge, { start: grabberScaleLTNCubePos, end:grabberScaleLTFCubePos });
-            Overlays.editOverlay(grabberScaleTFEdge, { start: grabberScaleLTFCubePos, end:grabberScaleRTFCubePos });
-            Overlays.editOverlay(grabberScaleTNEdge, { start: grabberScaleLTNCubePos, end:grabberScaleRTNCubePos });
-            Overlays.editOverlay(grabberScaleBREdge, { start: grabberScaleRBNCubePos, end:grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleBLEdge, { start: grabberScaleLBNCubePos, end:grabberScaleLBFCubePos });
-            Overlays.editOverlay(grabberScaleBFEdge, { start: grabberScaleLBFCubePos, end:grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleBNEdge, { start: grabberScaleLBNCubePos, end:grabberScaleRBNCubePos });
-            Overlays.editOverlay(grabberScaleNREdge, { start: grabberScaleRTNCubePos, end:grabberScaleRBNCubePos });
-            Overlays.editOverlay(grabberScaleNLEdge, { start: grabberScaleLTNCubePos, end:grabberScaleLBNCubePos });
-            Overlays.editOverlay(grabberScaleFREdge, { start: grabberScaleRTFCubePos, end:grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleFLEdge, { start: grabberScaleLTFCubePos, end:grabberScaleLBFCubePos });
-        }
-    };
-    Script.update.connect(that.updateHandlePositionRotation);
-
     // FUNCTION: SET SPACE MODE
     that.setSpaceMode = function(newSpaceMode) {
         var wantDebug = false;
@@ -1237,7 +1319,7 @@ SelectionDisplay = (function() {
                 print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
             }
             spaceMode = newSpaceMode;
-            that.updateHandles();
+            that.updateGrabbers();
         } else if (wantDebug) {
             print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
         }
@@ -1246,23 +1328,243 @@ SelectionDisplay = (function() {
         }
     };
 
-    // FUNCTION: UPDATE HANDLES
-    that.updateHandles = function() {
+    // FUNCTION: UPDATE GRABBERS
+    that.updateGrabbers = function() {
         var wantDebug = false;
         if (wantDebug) {
-            print("======> Update Handles =======");
+            print("======> Update Grabbers =======");
             print("    Selections Count: " + SelectionManager.selections.length);
             print("    SpaceMode: " + spaceMode);
             print("    DisplayMode: " + getMode());
         }
+
         if (SelectionManager.selections.length === 0) {
             that.setOverlaysVisible(false);
             return;
         }
 
-        var isSingleSelection = (SelectionManager.selections.length === 1);
-        if (isSingleSelection) {
-        }// end of isSingleSelection
+        if (SelectionManager.hasSelection()) {
+            var worldPosition = SelectionManager.worldPosition;
+            var worldRotation = SelectionManager.worldRotation;
+            var worldDimensions = SelectionManager.worldDimensions;
+
+            var worldDimensionsX = worldDimensions.x;
+            var worldDimensionsY = worldDimensions.y;
+            var worldDimensionsZ = worldDimensions.z;
+            var dimensionAverage = (worldDimensionsX + worldDimensionsY + worldDimensionsZ) / 3;
+
+            var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
+            worldRotationX = Quat.multiply(worldRotation, localRotationX);
+            var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
+            worldRotationY = Quat.multiply(worldRotation, localRotationY);
+            var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
+            worldRotationZ = Quat.multiply(worldRotation, localRotationZ);
+
+            var arrowCylinderDimension = dimensionAverage * GRABBER_TRANSLATE_ARROW_CYLINDER_DIMENSION_MULTIPLE;
+            var arrowCylinderDimensions = { x:arrowCylinderDimension, y:arrowCylinderDimension * GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, z:arrowCylinderDimension };
+            var arrowConeDimension = dimensionAverage * GRABBER_TRANSLATE_ARROW_CONE_DIMENSION_MULTIPLE;
+            var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
+            var cylinderXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage, y:0, z:0 }));
+            Overlays.editOverlay(grabberTranslateXCylinder, { 
+                position: cylinderXPos, 
+                rotation: worldRotationX,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderXDiff = Vec3.subtract(cylinderXPos, worldPosition);
+            var coneXPos = Vec3.sum(cylinderXPos, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(grabberTranslateXCone, { 
+                position: coneXPos, 
+                rotation: worldRotationX,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage, z:0 }));
+            Overlays.editOverlay(grabberTranslateYCylinder, { 
+                position: cylinderYPos, 
+                rotation: worldRotationY,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderYDiff = Vec3.subtract(cylinderYPos, worldPosition);
+            var coneYPos = Vec3.sum(cylinderYPos, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(grabberTranslateYCone, { 
+                position: coneYPos, 
+                rotation: worldRotationY,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage }));
+            Overlays.editOverlay(grabberTranslateZCylinder, { 
+                position: cylinderZPos, 
+                rotation: worldRotationZ,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderZDiff = Vec3.subtract(cylinderZPos, worldPosition);
+            var coneZPos = Vec3.sum(cylinderZPos, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(grabberTranslateZCone, { 
+                position: coneZPos, 
+                rotation: worldRotationZ,
+                dimensions: arrowConeDimensions
+            });
+
+            var grabberScaleCubeOffsetX = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsX;
+            var grabberScaleCubeOffsetY = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsY;
+            var grabberScaleCubeOffsetZ = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsZ;
+            var scaleDimension = dimensionAverage * GRABBER_SCALE_CUBE_DIMENSION_MULTIPLE;
+            var scaleDimensions = { x:scaleDimension, y:scaleDimension, z:scaleDimension };
+            var grabberScaleLBNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleLBNCube, { 
+                position: grabberScaleLBNCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleRBNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleRBNCube, { 
+                position: grabberScaleRBNCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleLBFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleLBFCube, { 
+                position: grabberScaleLBFCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleRBFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleRBFCube, { 
+                position: grabberScaleRBFCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleLTNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleLTNCube, { 
+                position: grabberScaleLTNCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleRTNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleRTNCube, { 
+                position: grabberScaleRTNCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleLTFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleLTFCube, { 
+                position: grabberScaleLTFCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+            var grabberScaleRTFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            Overlays.editOverlay(grabberScaleRTFCube, { 
+                position: grabberScaleRTFCubePos, 
+                rotation: worldRotation,
+                dimensions: scaleDimensions
+            });
+
+            Overlays.editOverlay(grabberScaleTREdge, { start: grabberScaleRTNCubePos, end: grabberScaleRTFCubePos });
+            Overlays.editOverlay(grabberScaleTLEdge, { start: grabberScaleLTNCubePos, end: grabberScaleLTFCubePos });
+            Overlays.editOverlay(grabberScaleTFEdge, { start: grabberScaleLTFCubePos, end: grabberScaleRTFCubePos });
+            Overlays.editOverlay(grabberScaleTNEdge, { start: grabberScaleLTNCubePos, end: grabberScaleRTNCubePos });
+            Overlays.editOverlay(grabberScaleBREdge, { start: grabberScaleRBNCubePos, end: grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleBLEdge, { start: grabberScaleLBNCubePos, end: grabberScaleLBFCubePos });
+            Overlays.editOverlay(grabberScaleBFEdge, { start: grabberScaleLBFCubePos, end: grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleBNEdge, { start: grabberScaleLBNCubePos, end: grabberScaleRBNCubePos });
+            Overlays.editOverlay(grabberScaleNREdge, { start: grabberScaleRTNCubePos, end: grabberScaleRBNCubePos });
+            Overlays.editOverlay(grabberScaleNLEdge, { start: grabberScaleLTNCubePos, end: grabberScaleLBNCubePos });
+            Overlays.editOverlay(grabberScaleFREdge, { start: grabberScaleRTFCubePos, end: grabberScaleRBFCubePos });
+            Overlays.editOverlay(grabberScaleFLEdge, { start: grabberScaleLTFCubePos, end: grabberScaleLBFCubePos });
+
+            var stretchSphereDimension = dimensionAverage * GRABBER_STRETCH_SPHERE_DIMENSION_MULTIPLE;
+            var stretchSphereDimensions = { x:stretchSphereDimension, y:stretchSphereDimension, z:stretchSphereDimension };
+            var stretchXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsX, y:0, z:0 }));
+            Overlays.editOverlay(grabberStretchXSphere, { 
+                position: stretchXPos, 
+                dimensions: stretchSphereDimensions 
+            });
+            var stretchPanelXDimensions = Vec3.subtract(grabberScaleLTFCubePos, grabberScaleRBFCubePos);
+            var tempY = Math.abs(stretchPanelXDimensions.y);
+            stretchPanelXDimensions.x = 0.01;
+            stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
+            stretchPanelXDimensions.z = tempY;
+            Overlays.editOverlay(grabberStretchXPanel, { 
+                position: stretchXPos, 
+                rotation: worldRotationZ,
+                dimensions: stretchPanelXDimensions
+            });
+            var stretchYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsY, z:0 }));
+            Overlays.editOverlay(grabberStretchYSphere, { 
+                position: stretchYPos, 
+                dimensions: stretchSphereDimensions 
+            });
+            var stretchPanelYDimensions = Vec3.subtract(grabberScaleLTFCubePos, grabberScaleRTNCubePos);
+            var tempX = Math.abs(stretchPanelYDimensions.x);
+            stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
+            stretchPanelYDimensions.y = 0.01;
+            stretchPanelYDimensions.z = tempX;
+            Overlays.editOverlay(grabberStretchYPanel, { 
+                position: stretchYPos, 
+                rotation: worldRotationY,
+                dimensions: stretchPanelYDimensions
+            });
+            var stretchZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsZ }));
+            Overlays.editOverlay(grabberStretchZSphere, { 
+                position: stretchZPos, 
+                dimensions: stretchSphereDimensions 
+            });
+            var stretchPanelZDimensions = Vec3.subtract(grabberScaleRTFCubePos, grabberScaleRBNCubePos);
+            var tempX = Math.abs(stretchPanelZDimensions.x);
+            stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
+            stretchPanelZDimensions.y = tempX;
+            stretchPanelZDimensions.z = 0.01;
+            Overlays.editOverlay(grabberStretchZPanel, { 
+                position: stretchZPos, 
+                rotation: worldRotationX,
+                dimensions: stretchPanelZDimensions
+            });
+
+            var rotateDimension = dimensionAverage * GRABBER_ROTATE_RINGS_DIMENSION_MULTIPLE;
+            var rotateDimensions = { x:rotateDimension, y:rotateDimension, z:rotateDimension };
+            if (!isActiveTool(grabberRotatePitchRing)) {
+                Overlays.editOverlay(grabberRotatePitchRing, { 
+                    position: SelectionManager.worldPosition, 
+                    rotation: worldRotationY,
+                    dimensions: rotateDimensions
+                });
+            }
+            if (!isActiveTool(grabberRotateYawRing)) {
+                Overlays.editOverlay(grabberRotateYawRing, { 
+                    position: SelectionManager.worldPosition, 
+                    rotation: worldRotationZ,
+                    dimensions: rotateDimensions
+                });
+            }
+            if (!isActiveTool(grabberRotateRollRing)) {
+                Overlays.editOverlay(grabberRotateRollRing, { 
+                    position: SelectionManager.worldPosition, 
+                    rotation: worldRotationX,
+                    dimensions: rotateDimensions
+                });
+            }
+            Overlays.editOverlay(grabberRotateCurrentRing, { dimensions: rotateDimensions });
+
+            var inModeRotate = isActiveTool(grabberRotatePitchRing) || isActiveTool(grabberRotateYawRing) || isActiveTool(grabberRotateRollRing);
+            var inModeTranslate = isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder) ||
+                                  isActiveTool(grabberTranslateYCone) || isActiveTool(grabberTranslateYCylinder) ||
+                                  isActiveTool(grabberTranslateZCone) || isActiveTool(grabberTranslateZCylinder) ||
+                                  isActiveTool(grabberCloner) || isActiveTool(selectionBox);
+
+            Overlays.editOverlay(selectionBox, {
+                position: worldPosition,
+                rotation: worldRotation,
+                dimensions: worldDimensions,
+                visible: !inModeRotate
+            });
+
+            var grabberClonerOffset =  { x:GRABBER_CLONER_OFFSET.x * worldDimensionsX, y:GRABBER_CLONER_OFFSET.y * worldDimensionsY, z:GRABBER_CLONER_OFFSET.z * worldDimensionsZ };
+            var grabberClonerPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, grabberClonerOffset));
+            Overlays.editOverlay(grabberCloner, {
+                position: grabberClonerPos,
+                rotation: worldRotation,
+                dimensions: scaleDimensions,
+            });
+        }
 
         that.setGrabberTranslateXVisible(!activeTool || isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder));
         that.setGrabberTranslateYVisible(!activeTool || isActiveTool(grabberTranslateYCone) || isActiveTool(grabberTranslateYCylinder));
@@ -1275,9 +1577,10 @@ SelectionDisplay = (function() {
         that.setGrabberStretchZVisible(!activeTool || isActiveTool(grabberStretchZSphere));
         that.setGrabberScaleVisible(!activeTool || isActiveTool(grabberScaleLBNCube) || isActiveTool(grabberScaleRBNCube) || isActiveTool(grabberScaleLBFCube) || isActiveTool(grabberScaleRBFCube)
                                                 || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube));
+        that.setGrabberClonerVisible(!activeTool || isActiveTool(grabberCloner));
 
         if (wantDebug) {
-            print("====== Update Handles <=======");
+            print("====== Update Grabbers <=======");
         }
     };
 
@@ -1310,7 +1613,7 @@ SelectionDisplay = (function() {
         Overlays.editOverlay(grabberTranslateZCylinder, { visible: isVisible });
     };
 
-    // FUNCTION: SET GRABBER ROTATION VISIBLE
+    // FUNCTION: SET GRABBER ROTATE VISIBLE
     that.setGrabberRotateVisible = function(isVisible) {
         that.setGrabberRotatePitchVisible(isVisible);
         that.setGrabberRotateYawVisible(isVisible);
@@ -1372,6 +1675,189 @@ SelectionDisplay = (function() {
         Overlays.editOverlay(grabberScaleFLEdge, { visible: isVisible });
     };
 
+    // FUNCTION: SET GRABBER CLONER VISIBLE
+    that.setGrabberClonerVisible = function(isVisible) {
+        Overlays.editOverlay(grabberCloner, { visible: isVisible });
+    };
+
+    var initialXZPick = null;
+    var isConstrained = false;
+    var constrainMajorOnly = false;
+    var startPosition = null;
+    var duplicatedEntityIDs = null;
+
+    // TOOL DEFINITION: TRANSLATE XZ TOOL
+    var translateXZTool = addGrabberTool(selectionBox, {
+        mode: 'TRANSLATE_XZ',
+        pickPlanePosition: { x: 0, y: 0, z: 0 },
+        greatestDimension: 0.0,
+        startingDistance: 0.0,
+        startingElevation: 0.0,
+        onBegin: function(event, pickRay, pickResult, doClone) {
+            var wantDebug = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(Beg) -> =======================");
+                Vec3.print("    pickRay", pickRay);
+                Vec3.print("    pickRay.origin", pickRay.origin);
+                Vec3.print("    pickResult.intersection", pickResult.intersection);
+            }
+
+            SelectionManager.saveProperties();
+
+            that.setGrabberTranslateVisible(false);
+            that.setGrabberRotateVisible(false);
+            that.setGrabberScaleVisible(false);
+            that.setGrabberStretchVisible(false);
+            that.setGrabberClonerVisible(false);
+
+            startPosition = SelectionManager.worldPosition;
+
+            translateXZTool.pickPlanePosition = pickResult.intersection;
+            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
+            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
+            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
+            if (wantDebug) {
+                print("    longest dimension: " + translateXZTool.greatestDimension);
+                print("    starting distance: " + translateXZTool.startingDistance);
+                print("    starting elevation: " + translateXZTool.startingElevation);
+            }
+
+            initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
+                x: 0,
+                y: 1,
+                z: 0
+            });
+
+            // Duplicate entities if alt is pressed.  This will make a
+            // copy of the selected entities and move the _original_ entities, not
+            // the new ones.
+            if (event.isAlt || doClone) {
+                duplicatedEntityIDs = [];
+                for (var otherEntityID in SelectionManager.savedProperties) {
+                    var properties = SelectionManager.savedProperties[otherEntityID];
+                    if (!properties.locked) {
+                        var entityID = Entities.addEntity(properties);
+                        duplicatedEntityIDs.push({
+                            entityID: entityID,
+                            properties: properties
+                        });
+                    }
+                }
+            } else {
+                duplicatedEntityIDs = null;
+            }
+
+            isConstrained = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(End) <- =======================");
+            }
+        },
+        onEnd: function(event, reason) {
+            pushCommandForSelections(duplicatedEntityIDs);
+        },
+        elevation: function(origin, intersection) {
+            return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
+        },
+        onMove: function(event) {
+            var wantDebug = false;
+            pickRay = generalComputePickRay(event.x, event.y);
+
+            var pick = rayPlaneIntersection2(pickRay, translateXZTool.pickPlanePosition, {
+                x: 0,
+                y: 1,
+                z: 0
+            });
+
+            // If the pick ray doesn't hit the pick plane in this direction, do nothing.
+            // this will happen when someone drags across the horizon from the side they started on.
+            if (!pick) {
+                if (wantDebug) {
+                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
+                }
+                
+                // EARLY EXIT--(Invalid ray detected.)
+                return;
+            }
+
+            var vector = Vec3.subtract(pick, initialXZPick);
+
+            // If the mouse is too close to the horizon of the pick plane, stop moving
+            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
+            var elevation = translateXZTool.elevation(pickRay.origin, pick);
+            if (wantDebug) {
+                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
+            }
+            if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
+                (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
+                if (wantDebug) {
+                    print("    "+ translateXZTool.mode + " - too close to horizon!");
+                }
+
+                // EARLY EXIT--(Don't proceed past the reached limit.)
+                return;
+            }
+
+            //  If the angular size of the object is too small, stop moving
+            var MIN_ANGULAR_SIZE = 0.01; //  Radians
+            if (translateXZTool.greatestDimension > 0) {
+                var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
+                if (wantDebug) {
+                    print("Angular size = " + angularSize);
+                }
+                if (angularSize < MIN_ANGULAR_SIZE) {
+                    return;
+                }
+            }
+
+            // If shifted, constrain to one axis
+            if (event.isShifted) {
+                if (Math.abs(vector.x) > Math.abs(vector.z)) {
+                    vector.z = 0;
+                } else {
+                    vector.x = 0;
+                }
+                if (!isConstrained) {
+                    isConstrained = true;
+                }
+            } else {
+                if (isConstrained) {
+                    isConstrained = false;
+                }
+            }
+
+            constrainMajorOnly = event.isControl;
+            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, SelectionManager.worldDimensions));
+            vector = Vec3.subtract(
+                grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
+                cornerPosition);
+
+
+            for (var i = 0; i < SelectionManager.selections.length; i++) {
+                var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
+                if (!properties) {
+                    continue;
+                }
+                var newPosition = Vec3.sum(properties.position, {
+                    x: vector.x,
+                    y: 0,
+                    z: vector.z
+                });
+                Entities.editEntity(SelectionManager.selections[i], {
+                    position: newPosition
+                });
+
+                if (wantDebug) {
+                    print("translateXZ... ");
+                    Vec3.print("                 vector:", vector);
+                    Vec3.print("            newPosition:", properties.position);
+                    Vec3.print("            newPosition:", newPosition);
+                }
+            }
+
+            SelectionManager._update();
+        }
+    });
+
     addGrabberTranslateTool(grabberTranslateXCone, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
     addGrabberTranslateTool(grabberTranslateXCylinder, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
     addGrabberTranslateTool(grabberTranslateYCone, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
@@ -1383,9 +1869,9 @@ SelectionDisplay = (function() {
     addGrabberRotateTool(grabberRotateYawRing, "ROTATE_YAW", ROTATE_DIRECTION.YAW);
     addGrabberRotateTool(grabberRotateRollRing, "ROTATE_ROLL", ROTATE_DIRECTION.ROLL);
 
-    addGrabberStretchTool(grabberStretchXSphere, "STRETCH_X", TRANSLATE_DIRECTION.X);
-    addGrabberStretchTool(grabberStretchYSphere, "STRETCH_Y", TRANSLATE_DIRECTION.Y);
-    addGrabberStretchTool(grabberStretchZSphere, "STRETCH_Z", TRANSLATE_DIRECTION.Z);
+    addGrabberStretchTool(grabberStretchXSphere, "STRETCH_X", STRETCH_DIRECTION.X);
+    addGrabberStretchTool(grabberStretchYSphere, "STRETCH_Y", STRETCH_DIRECTION.Y);
+    addGrabberStretchTool(grabberStretchZSphere, "STRETCH_Z", STRETCH_DIRECTION.Z);
 
     addGrabberScaleTool(grabberScaleLBNCube, "SCALE_LBN", SCALE_DIRECTION.LBN);
     addGrabberScaleTool(grabberScaleRBNCube, "SCALE_RBN", SCALE_DIRECTION.RBN);
@@ -1396,19 +1882,28 @@ SelectionDisplay = (function() {
     addGrabberScaleTool(grabberScaleLTFCube, "SCALE_LTF", SCALE_DIRECTION.LTF);
     addGrabberScaleTool(grabberScaleRTFCube, "SCALE_RTF", SCALE_DIRECTION.RTF);
 
+    // GRABBER TOOL: GRABBER CLONER
+    addGrabberTool(grabberCloner, {
+        mode: "CLONE",
+        onBegin: function(event, pickRay, pickResult) {
+            var doClone = true;
+            translateXZTool.onBegin(event,pickRay,pickResult,doClone);
+        },
+        elevation: function (event) {
+            translateXZTool.elevation(event);
+        },
+    
+        onEnd: function (event) {
+            translateXZTool.onEnd(event);
+        },
+    
+        onMove: function (event) {
+            translateXZTool.onMove(event);
+        }
+    });
+
     // FUNCTION: CHECK MOVE
     that.checkMove = function() {
-        if (SelectionManager.hasSelection()) {
-
-            // FIXME - this cause problems with editing in the entity properties window
-            // SelectionManager._update();
-
-            if (!Vec3.equal(Camera.getPosition(), lastCameraPosition) ||
-                !Quat.equal(Camera.getOrientation(), lastCameraOrientation)) {
-
-                //that.updateRotationHandles();
-            }
-        }
     };
 
     that.checkControllerMove = function() {
@@ -1583,4 +2078,4 @@ SelectionDisplay = (function() {
     Controller.mouseReleaseEvent.connect(that.mouseReleaseEvent);
 
     return that;
-}());
+}());
\ No newline at end of file

From 6a035578017935304c77ac8821a5dc5d49f3d3cf Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 23 Jan 2018 14:44:10 -0800
Subject: [PATCH 038/569] don't override sensorToWorldMatrix

---
 interface/src/avatar/MyAvatar.cpp | 10 ++++++----
 interface/src/avatar/MyAvatar.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e93b897013..2943cf7fd8 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1790,7 +1790,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) {
     updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
 }
 
-void MyAvatar::initAnimGraph() {
+void MyAvatar::initAnimGraph(bool updateBodySensorMat) {
     QUrl graphUrl;
     if (!_prefOverrideAnimGraphUrl.get().isEmpty()) {
         graphUrl = _prefOverrideAnimGraphUrl.get();
@@ -1803,8 +1803,10 @@ void MyAvatar::initAnimGraph() {
     _skeletonModel->getRig().initAnimGraph(graphUrl);
     _currentAnimGraphUrl.set(graphUrl);
 
-    _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
-    updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
+    if (updateBodySensorMat) {
+        _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
+        updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
+    }
 }
 
 void MyAvatar::destroyAnimGraph() {
@@ -1819,7 +1821,7 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
         initHeadBones();
         _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
-        initAnimGraph();
+        initAnimGraph(false);
         _isAnimatingScale = true;
     }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 58b49b61ff..cdcd6f4607 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -730,7 +730,7 @@ private:
     void updatePosition(float deltaTime);
     void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
     void initHeadBones();
-    void initAnimGraph();
+    void initAnimGraph(bool updateBodySensorMat = true);
 
     // Avatar Preferences
     QUrl _fullAvatarURLFromPreferences;

From 2cbcc28bd4c860a45e0e050ae959537c6b795a02 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 24 Jan 2018 10:44:04 -0800
Subject: [PATCH 039/569] only call init animGraph once

---
 interface/src/avatar/MyAvatar.cpp | 27 +++++++++++++++------------
 interface/src/avatar/MyAvatar.h   |  4 +++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 1475860665..5f2cbf92b2 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1785,12 +1785,10 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) {
 
     _currentAnimGraphUrl.set(url);
     _skeletonModel->getRig().initAnimGraph(url);
-
-    _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
-    updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
+    connect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
 }
 
-void MyAvatar::initAnimGraph(bool updateBodySensorMat) {
+void MyAvatar::initAnimGraph() {
     QUrl graphUrl;
     if (!_prefOverrideAnimGraphUrl.get().isEmpty()) {
         graphUrl = _prefOverrideAnimGraphUrl.get();
@@ -1802,27 +1800,32 @@ void MyAvatar::initAnimGraph(bool updateBodySensorMat) {
 
     _skeletonModel->getRig().initAnimGraph(graphUrl);
     _currentAnimGraphUrl.set(graphUrl);
-
-    if (updateBodySensorMat) {
-        _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
-        updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
-    }
+    connect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
 }
 
 void MyAvatar::destroyAnimGraph() {
     _skeletonModel->getRig().destroyAnimGraph();
 }
 
+void MyAvatar::animGraphLoaded() {
+    _bodySensorMatrix = deriveBodyFromHMDSensor(); // Based on current cached HMD position/rotation..
+    updateSensorToWorldMatrix(); // Uses updated position/orientation and _bodySensorMatrix changes
+    _isAnimatingScale = true;
+    disconnect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
+}
+
 void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     Avatar::postUpdate(deltaTime, scene);
 
-    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode()) {
+    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _initHeadBones) {
         initHeadBones();
         _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
-        initAnimGraph(false);
-        _isAnimatingScale = true;
+        initAnimGraph();
+        _initHeadBones = false;
+    } else if (!_skeletonModel->isLoaded()) {
+        _initHeadBones = true;
     }
 
     if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) {
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index cdcd6f4607..6a9e0e6a38 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -566,6 +566,7 @@ public slots:
     void increaseSize();
     void decreaseSize();
     void resetSize();
+    void animGraphLoaded();
 
     void setGravity(float gravity);
     float getGravity();
@@ -730,7 +731,7 @@ private:
     void updatePosition(float deltaTime);
     void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
     void initHeadBones();
-    void initAnimGraph(bool updateBodySensorMat = true);
+    void initAnimGraph();
 
     // Avatar Preferences
     QUrl _fullAvatarURLFromPreferences;
@@ -808,6 +809,7 @@ private:
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
     bool _enableDebugDrawDetailedCollision { false };
+    bool _initHeadBones { false };
 
     AudioListenerMode _audioListenerMode;
     glm::vec3 _customListenPosition;

From b7ba7862aa929a501a7fec542974d6ce3ebb4d5c Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 24 Jan 2018 11:18:42 -0800
Subject: [PATCH 040/569] give animGrapgh loader a high priority

---
 libraries/animation/src/AnimNodeLoader.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/animation/src/AnimNodeLoader.cpp b/libraries/animation/src/AnimNodeLoader.cpp
index 33f3d72756..8173845205 100644
--- a/libraries/animation/src/AnimNodeLoader.cpp
+++ b/libraries/animation/src/AnimNodeLoader.cpp
@@ -38,6 +38,8 @@ static AnimNode::Pointer loadManipulatorNode(const QJsonObject& jsonObj, const Q
 static AnimNode::Pointer loadInverseKinematicsNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 static AnimNode::Pointer loadDefaultPoseNode(const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl);
 
+static const float ANIM_GRAPH_LOAD_PRIORITY = 10.0f;
+
 // called after children have been loaded
 // returns node on success, nullptr on failure.
 static bool processDoNothing(AnimNode::Pointer node, const QJsonObject& jsonObj, const QString& id, const QUrl& jsonUrl) { return true; }
@@ -653,6 +655,7 @@ AnimNodeLoader::AnimNodeLoader(const QUrl& url) :
 {
     _resource = QSharedPointer<Resource>::create(url);
     _resource->setSelf(_resource);
+    _resource->setLoadPriority(this, ANIM_GRAPH_LOAD_PRIORITY);
     connect(_resource.data(), &Resource::loaded, this, &AnimNodeLoader::onRequestDone);
     connect(_resource.data(), &Resource::failed, this, &AnimNodeLoader::onRequestError);
     _resource->ensureLoading();

From c96e395a46df93b652a22d605f2b2ceb4bf68b64 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 25 Jan 2018 12:13:32 -0800
Subject: [PATCH 041/569] fix warning

---
 libraries/entities/src/EntityEditFilters.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index a69a8ce7d1..f5bf699e02 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -271,7 +271,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     }
                 } else if (wantsOriginalPropertiesValue.isArray()) {
                     auto length = wantsOriginalPropertiesValue.property("length").toInteger();
-                    for (int i; i < length; i++) {
+                    for (int i = 0; i < length; i++) {
                         auto stringValue = wantsOriginalPropertiesValue.property(i).toString();
                         if (!stringValue.isEmpty()) {
                             filterData.wantsOriginalProperties = true;
@@ -305,7 +305,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     }
                 } else if (wantsZonePropertiesValue.isArray()) {
                     auto length = wantsZonePropertiesValue.property("length").toInteger();
-                    for (int i; i < length; i++) {
+                    for (int i = 0; i < length; i++) {
                         auto stringValue = wantsZonePropertiesValue.property(i).toString();
                         if (!stringValue.isEmpty()) {
                             filterData.wantsZoneProperties = true;

From aea16fe071d1731f783d6f93482c1161e2d513c2 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 25 Jan 2018 15:01:29 -0800
Subject: [PATCH 042/569] add delete filter support

---
 libraries/entities/src/EntityEditFilters.cpp |  1 +
 libraries/entities/src/EntityTree.cpp        | 18 ++++++++++++++++++
 libraries/entities/src/EntityTree.h          |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index f5bf699e02..4e48c671cb 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -245,6 +245,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                 entitiesObject.setProperty("ADD_FILTER_TYPE", EntityTree::FilterType::Add);
                 entitiesObject.setProperty("EDIT_FILTER_TYPE", EntityTree::FilterType::Edit);
                 entitiesObject.setProperty("PHYSICS_FILTER_TYPE", EntityTree::FilterType::Physics);
+                entitiesObject.setProperty("ERASE_FILTER_TYPE", EntityTree::FilterType::Erase);
                 global.setProperty("Entities", entitiesObject);
                 filterData.filterFn = global.property("filter");
                 if (!filterData.filterFn.isFunction()) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 9ab9f63245..629281749e 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1928,6 +1928,24 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
             #endif
 
             EntityItemID entityItemID(entityID);
+
+            EntityItemPointer existingEntity;
+
+            auto startLookup = usecTimestampNow();
+            existingEntity = findEntityByEntityItemID(entityItemID);
+            auto endLookup = usecTimestampNow();
+            _totalLookupTime += endLookup - startLookup;
+
+            auto startFilter = usecTimestampNow();
+            FilterType filterType = FilterType::Erase;
+            EntityItemProperties dummyProperties;
+            bool wasChanged = false;
+
+            bool allowed = (sourceNode->isAllowedEditor()) || filterProperties(existingEntity, dummyProperties, dummyProperties, wasChanged, filterType);
+            auto endFilter = usecTimestampNow();
+
+            _totalFilterTime += endFilter - startFilter;
+
             entityItemIDsToDelete << entityItemID;
 
             if (wantEditLogging() || wantTerseEditLogging()) {
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 11a747d624..ba786fbe98 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -57,7 +57,8 @@ public:
     enum FilterType {
         Add,
         Edit,
-        Physics
+        Physics,
+        Erase
     };
     EntityTree(bool shouldReaverage = false);
     virtual ~EntityTree();

From 6192625942a34242688cb5e087b3fed99ed7e954 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 25 Jan 2018 15:01:50 -0800
Subject: [PATCH 043/569] add delete filter support

---
 .../prevent-erase-in-zone-example.js          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js

diff --git a/scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js b/scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js
new file mode 100644
index 0000000000..356cc55079
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js
@@ -0,0 +1,24 @@
+//
+// prevent-erase-in-zone-example.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Jan. 25, 2018
+// Copyright 2018 High Fidelity, Inc.
+//
+// This sample entity edit filter script will keep prevent any entity inside the zone from being erased.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function filter(properties, type, originalProperties, zoneProperties) {    
+
+    if (type == Entities.ERASE_FILTER_TYPE) {
+        return false;
+    }
+    return properties;
+}
+
+filter.wantsOriginalProperties = true;
+filter.wantsZoneProperties = true;
+filter;
\ No newline at end of file

From 6b0b17ff633f72bb16171da4f34ad9f672ecefec Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 26 Jan 2018 17:57:20 +0100
Subject: [PATCH 044/569] Working on better adaptive bias algorithm for shadow

---
 libraries/render-utils/src/LightStage.cpp     |  8 ++---
 libraries/render-utils/src/LightStage.h       |  2 +-
 .../render-utils/src/RenderShadowTask.cpp     | 10 ++++--
 libraries/render-utils/src/RenderShadowTask.h | 16 ++++++++-
 libraries/render-utils/src/Shadow.slh         | 17 +++++----
 .../src/directional_ambient_light_shadow.slf  |  4 ++-
 .../src/directional_skybox_light_shadow.slf   |  4 ++-
 scripts/developer/utilities/render/shadow.qml | 35 +++++++++++++++++++
 8 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
index f146cd6e0a..eac9dd7657 100644
--- a/libraries/render-utils/src/LightStage.cpp
+++ b/libraries/render-utils/src/LightStage.cpp
@@ -220,7 +220,7 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum,
 }
 
 void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& viewFrustum,
-                                            float nearDepth, float farDepth) {
+                                            float nearDepth, float farDepth, float baseBias) {
     assert(nearDepth < farDepth);
     assert(cascadeIndex < _cascades.size());
 
@@ -270,11 +270,7 @@ void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, co
     // Update the buffer
     auto& schema = _schemaBuffer.edit<Schema>();
     schema.cascades[cascadeIndex].reprojection = _biasMatrix * ortho * shadowViewInverse.getMatrix();
-    // Adapt shadow bias to shadow resolution with a totally empirical formula
-    const auto maxShadowFrustumDim = std::max(fabsf(min.x - max.x), fabsf(min.y - max.y));
-    const auto REFERENCE_TEXEL_DENSITY = 7.5f;
-    const auto cascadeTexelDensity = MAP_SIZE / maxShadowFrustumDim;
-    schema.cascades[cascadeIndex].bias = MAX_BIAS * std::min(1.0f, REFERENCE_TEXEL_DENSITY / cascadeTexelDensity);
+    schema.cascades[cascadeIndex].bias = baseBias;
 }
 
 void LightStage::Shadow::setCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& shadowFrustum) {
diff --git a/libraries/render-utils/src/LightStage.h b/libraries/render-utils/src/LightStage.h
index d1a8680706..c2c2df8c89 100644
--- a/libraries/render-utils/src/LightStage.h
+++ b/libraries/render-utils/src/LightStage.h
@@ -80,7 +80,7 @@ public:
         void setKeylightFrustum(const ViewFrustum& viewFrustum,
                                 float nearDepth = 1.0f, float farDepth = 1000.0f);
         void setKeylightCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& viewFrustum,
-                                float nearDepth = 1.0f, float farDepth = 1000.0f);
+                                float nearDepth = 1.0f, float farDepth = 1000.0f, float baseBias = 0.005f);
         void setCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& shadowFrustum);
 
         const UniformBufferView& getBuffer() const { return _schemaBuffer; }
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index d83dfd73a5..f41860b6de 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -216,7 +216,9 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     task.addJob<RenderShadowSetup>("ShadowSetup");
 
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
-        const auto setupOutput = task.addJob<RenderShadowCascadeSetup>("ShadowCascadeSetup", i);
+        char jobName[64];
+        sprintf(jobName, "ShadowCascadeSetup%d", i);
+        const auto setupOutput = task.addJob<RenderShadowCascadeSetup>(jobName, i);
         const auto shadowFilter = setupOutput.getN<RenderShadowCascadeSetup::Outputs>(1);
 
         // CPU jobs:
@@ -253,6 +255,10 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext) {
     }
 }
 
+void RenderShadowCascadeSetup::configure(const Config& configuration) {
+    _baseBias = configuration.bias * configuration.bias * 0.01f;
+}
+
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
@@ -266,7 +272,7 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
         output.edit1() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
 
-        globalShadow->setKeylightCascadeFrustum(_cascadeIndex, args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR);
+        globalShadow->setKeylightCascadeFrustum(_cascadeIndex, args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR, _baseBias);
 
         // Set the keylight render args
         args->pushViewFrustum(*(globalShadow->getCascade(_cascadeIndex).getFrustum()));
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index d8d4c624e7..42c279c02a 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -62,17 +62,31 @@ public:
 
 };
 
+class RenderShadowCascadeSetupConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(float bias MEMBER bias NOTIFY dirty)
+public:
+
+    float bias{ 0.5f };
+
+signals:
+    void dirty();
+};
+
 class RenderShadowCascadeSetup {
 public:
     using Outputs = render::VaryingSet3<RenderArgs::RenderMode, render::ItemFilter, float>;
-    using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs>;
+    using Config = RenderShadowCascadeSetupConfig;
+    using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs, Config>;
 
     RenderShadowCascadeSetup(unsigned int cascadeIndex) : _cascadeIndex{ cascadeIndex } {}
+    void configure(const Config& configuration);
     void run(const render::RenderContextPointer& renderContext, Outputs& output);
 
 private:
 
     unsigned int _cascadeIndex;
+    float _baseBias{ 0.1f };
 };
 
 class RenderShadowCascadeTeardown {
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index a12dd0f4a4..50ae8864f4 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -83,27 +83,30 @@ float evalShadowAttenuationPCF(int cascadeIndex, ShadowSampleOffsets offsets, ve
     return shadowAttenuation;
 }
 
-float evalShadowCascadeAttenuation(int cascadeIndex, vec3 viewNormal, ShadowSampleOffsets offsets, vec4 shadowTexcoord) {
+float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float bias) {
     if (!isShadowCascadeProjectedOnPixel(shadowTexcoord)) {
         // If a point is not in the map, do not attenuate
         return 1.0;
     }
-    // Multiply bias if we are at a grazing angle with light
-    float tangentFactor = abs(dot(getShadowDirInViewSpace(), viewNormal));
-    float bias = getShadowBias(cascadeIndex) * (5.0-4.0*tangentFactor);
+    // Add fixed bias
+    bias += getShadowBias(cascadeIndex);
     return evalShadowAttenuationPCF(cascadeIndex, offsets, shadowTexcoord, bias);
 }
 
-float evalShadowAttenuation(vec4 worldPosition, float viewDepth, vec3 viewNormal) {
+float evalShadowAttenuation(vec3 worldLightDir, vec4 worldPosition, float viewDepth, vec3 worldNormal) {
     ShadowSampleOffsets offsets = evalShadowFilterOffsets(worldPosition);
     vec4 cascadeShadowCoords[2];
     ivec2 cascadeIndices;
     float cascadeMix = determineShadowCascadesOnPixel(worldPosition, viewDepth, cascadeShadowCoords, cascadeIndices);
 	
+    // Adjust bias if we are at a grazing angle with light
+    float ndotl = dot(worldLightDir, worldNormal);
+    float bias = 0.5*(1.0/(ndotl*ndotl)-1.0);
+    bias *= getShadowScale();
     vec2 cascadeAttenuations = vec2(1.0, 1.0);
-    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, viewNormal, offsets, cascadeShadowCoords[0]);
+    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, offsets, cascadeShadowCoords[0], bias);
     if (cascadeMix > 0.0 && cascadeIndices.y < getShadowCascadeCount()) {
-        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, viewNormal, offsets, cascadeShadowCoords[1]);
+        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, offsets, cascadeShadowCoords[1], bias);
     }
     float attenuation = mix(cascadeAttenuations.x, cascadeAttenuations.y, cascadeMix);
     // Falloff to max distance
diff --git a/libraries/render-utils/src/directional_ambient_light_shadow.slf b/libraries/render-utils/src/directional_ambient_light_shadow.slf
index f7ea8c5966..eead392fd8 100644
--- a/libraries/render-utils/src/directional_ambient_light_shadow.slf
+++ b/libraries/render-utils/src/directional_ambient_light_shadow.slf
@@ -28,7 +28,9 @@ void main(void) {
 
     vec4 viewPos = vec4(frag.position.xyz, 1.0);
     vec4 worldPos = getViewInverse() * viewPos;
-    float shadowAttenuation = evalShadowAttenuation(worldPos, -viewPos.z, frag.normal);
+    Light shadowLight = getKeyLight();
+    vec3 worldLightDirection = getLightDirection(shadowLight);
+    float shadowAttenuation = evalShadowAttenuation(worldLightDirection, worldPos, -viewPos.z, frag.normal);
 
     if (frag.mode == FRAG_MODE_UNLIT) {
         discard;
diff --git a/libraries/render-utils/src/directional_skybox_light_shadow.slf b/libraries/render-utils/src/directional_skybox_light_shadow.slf
index 37c9ae7fba..2a2f8f65a3 100644
--- a/libraries/render-utils/src/directional_skybox_light_shadow.slf
+++ b/libraries/render-utils/src/directional_skybox_light_shadow.slf
@@ -28,7 +28,9 @@ void main(void) {
 
     vec4 viewPos = vec4(frag.position.xyz, 1.0);
     vec4 worldPos = getViewInverse() * viewPos;
-    float shadowAttenuation = evalShadowAttenuation(worldPos, -viewPos.z, frag.normal);
+    Light shadowLight = getKeyLight();
+    vec3 worldLightDirection = getLightDirection(shadowLight);
+    float shadowAttenuation = evalShadowAttenuation(worldLightDirection, worldPos, -viewPos.z, frag.normal);
 
     // Light mapped or not ?
     if (frag.mode == FRAG_MODE_UNLIT) {
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
index a8fcf1aec7..32405a5260 100644
--- a/scripts/developer/utilities/render/shadow.qml
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -10,6 +10,9 @@
 //
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+import  "configSlider"
 
 Column {
     id: root
@@ -68,4 +71,36 @@ Column {
             font.italic: true
         }
     }
+    ConfigSlider {
+        label: qsTr("Cascade 0 bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup0")
+        property: "bias"
+        max: 1.0
+        min: 0.01
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 1 bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup1")
+        property: "bias"
+        max: 1.0
+        min: 0.01
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 2 bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup2")
+        property: "bias"
+        max: 1.0
+        min: 0.01
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 3 bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup3")
+        property: "bias"
+        max: 1.0
+        min: 0.01
+    }
 }

From aa82ad885561411daf1d97778193f22cd18b612b Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Fri, 26 Jan 2018 14:57:36 -0800
Subject: [PATCH 045/569] adjust client to only delete entities on server echo

---
 libraries/entities/src/EntityScriptingInterface.cpp |  5 ++++-
 libraries/entities/src/EntityTree.cpp               | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 206065beeb..877225de77 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -585,7 +585,10 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
                 if (entity->getLocked()) {
                     shouldDelete = false;
                 } else {
-                    _entityTree->deleteEntity(entityID);
+                    // only delete local entities, server entities will round trip through the server filters
+                    if (entity->getClientOnly()) {
+                        _entityTree->deleteEntity(entityID);
+                    }
                 }
             }
         });
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 629281749e..8071a8f9b7 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1946,12 +1946,16 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
 
             _totalFilterTime += endFilter - startFilter;
 
-            entityItemIDsToDelete << entityItemID;
-
-            if (wantEditLogging() || wantTerseEditLogging()) {
-                qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
+            if (allowed) {
+                entityItemIDsToDelete << entityItemID;
+                if (wantEditLogging() || wantTerseEditLogging()) {
+                    qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
+                }
+            } else if (wantEditLogging() || wantTerseEditLogging()) {
+                qCDebug(entities) << "User [" << sourceNode->getUUID() << "] attempted to deleteentity. ID:" << entityItemID << " Filter rejected erase.";
             }
 
+
         }
         deleteEntities(entityItemIDsToDelete, true, true);
     }

From a3d86a02423eeaa22fe373b29531d0fc1f77a52b Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Fri, 26 Jan 2018 17:37:24 -0800
Subject: [PATCH 046/569] cleanup

---
 libraries/entities/src/EntityEditFilters.cpp  |  2 +-
 libraries/entities/src/EntityTree.cpp         | 62 ++++++++++---------
 libraries/entities/src/EntityTree.h           |  4 +-
 ...e.js => prevent-delete-in-zone-example.js} |  6 +-
 4 files changed, 41 insertions(+), 33 deletions(-)
 rename scripts/tutorials/entity_edit_filters/{prevent-erase-in-zone-example.js => prevent-delete-in-zone-example.js} (81%)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 4e48c671cb..4b66b61d93 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -245,7 +245,7 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                 entitiesObject.setProperty("ADD_FILTER_TYPE", EntityTree::FilterType::Add);
                 entitiesObject.setProperty("EDIT_FILTER_TYPE", EntityTree::FilterType::Edit);
                 entitiesObject.setProperty("PHYSICS_FILTER_TYPE", EntityTree::FilterType::Physics);
-                entitiesObject.setProperty("ERASE_FILTER_TYPE", EntityTree::FilterType::Erase);
+                entitiesObject.setProperty("DELETE_FILTER_TYPE", EntityTree::FilterType::Delete);
                 global.setProperty("Entities", entitiesObject);
                 filterData.filterFn = global.property("filter");
                 if (!filterData.filterFn.isFunction()) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 8071a8f9b7..57540092da 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1850,6 +1850,37 @@ void EntityTree::forgetEntitiesDeletedBefore(quint64 sinceTime) {
 }
 
 
+bool EntityTree::shouldEraseEntity(EntityItemID entityID, const SharedNodePointer& sourceNode) {
+    EntityItemPointer existingEntity;
+
+    auto startLookup = usecTimestampNow();
+    existingEntity = findEntityByEntityItemID(entityID);
+    auto endLookup = usecTimestampNow();
+    _totalLookupTime += endLookup - startLookup;
+
+    auto startFilter = usecTimestampNow();
+    FilterType filterType = FilterType::Delete;
+    EntityItemProperties dummyProperties;
+    bool wasChanged = false;
+
+    bool allowed = (sourceNode->isAllowedEditor()) || filterProperties(existingEntity, dummyProperties, dummyProperties, wasChanged, filterType);
+    auto endFilter = usecTimestampNow();
+
+    _totalFilterTime += endFilter - startFilter;
+
+    if (allowed) {
+        if (wantEditLogging() || wantTerseEditLogging()) {
+            qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityID;
+        }
+    }
+    else if (wantEditLogging() || wantTerseEditLogging()) {
+        qCDebug(entities) << "User [" << sourceNode->getUUID() << "] attempted to deleteentity. ID:" << entityID << " Filter rejected erase.";
+    }
+
+    return allowed;
+}
+
+
 // TODO: consider consolidating processEraseMessageDetails() and processEraseMessage()
 int EntityTree::processEraseMessage(ReceivedMessage& message, const SharedNodePointer& sourceNode) {
     #ifdef EXTRA_ERASE_DEBUGGING
@@ -1877,12 +1908,10 @@ int EntityTree::processEraseMessage(ReceivedMessage& message, const SharedNodePo
                 #endif
 
                 EntityItemID entityItemID(entityID);
-                entityItemIDsToDelete << entityItemID;
 
-                if (wantEditLogging() || wantTerseEditLogging()) {
-                    qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
+                if (shouldEraseEntity(entityID, sourceNode)) {
+                    entityItemIDsToDelete << entityItemID;
                 }
-
             }
             deleteEntities(entityItemIDsToDelete, true, true);
         }
@@ -1929,33 +1958,10 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
 
             EntityItemID entityItemID(entityID);
 
-            EntityItemPointer existingEntity;
-
-            auto startLookup = usecTimestampNow();
-            existingEntity = findEntityByEntityItemID(entityItemID);
-            auto endLookup = usecTimestampNow();
-            _totalLookupTime += endLookup - startLookup;
-
-            auto startFilter = usecTimestampNow();
-            FilterType filterType = FilterType::Erase;
-            EntityItemProperties dummyProperties;
-            bool wasChanged = false;
-
-            bool allowed = (sourceNode->isAllowedEditor()) || filterProperties(existingEntity, dummyProperties, dummyProperties, wasChanged, filterType);
-            auto endFilter = usecTimestampNow();
-
-            _totalFilterTime += endFilter - startFilter;
-
-            if (allowed) {
+            if (shouldEraseEntity(entityID, sourceNode)) {
                 entityItemIDsToDelete << entityItemID;
-                if (wantEditLogging() || wantTerseEditLogging()) {
-                    qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityItemID;
-                }
-            } else if (wantEditLogging() || wantTerseEditLogging()) {
-                qCDebug(entities) << "User [" << sourceNode->getUUID() << "] attempted to deleteentity. ID:" << entityItemID << " Filter rejected erase.";
             }
 
-
         }
         deleteEntities(entityItemIDsToDelete, true, true);
     }
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index ba786fbe98..4c5fcdb0f7 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -58,7 +58,7 @@ public:
         Add,
         Edit,
         Physics,
-        Erase
+        Delete
     };
     EntityTree(bool shouldReaverage = false);
     virtual ~EntityTree();
@@ -194,6 +194,8 @@ public:
 
     int processEraseMessage(ReceivedMessage& message, const SharedNodePointer& sourceNode);
     int processEraseMessageDetails(const QByteArray& buffer, const SharedNodePointer& sourceNode);
+    bool shouldEraseEntity(EntityItemID entityID, const SharedNodePointer& sourceNode);
+
 
     EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID)  /*const*/;
     void addEntityMapEntry(EntityItemPointer entity);
diff --git a/scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js b/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
similarity index 81%
rename from scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js
rename to scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
index 356cc55079..94ee58738d 100644
--- a/scripts/tutorials/entity_edit_filters/prevent-erase-in-zone-example.js
+++ b/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
@@ -1,11 +1,11 @@
 //
-// prevent-erase-in-zone-example.js
+// prevent-delete-in-zone-example.js
 // 
 //
 // Created by Brad Hefta-Gaub to use Entities on Jan. 25, 2018
 // Copyright 2018 High Fidelity, Inc.
 //
-// This sample entity edit filter script will keep prevent any entity inside the zone from being erased.
+// This sample entity edit filter script will keep prevent any entity inside the zone from being deleted.
 //
 // Distributed under the Apache License, Version 2.0.
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -13,7 +13,7 @@
 
 function filter(properties, type, originalProperties, zoneProperties) {    
 
-    if (type == Entities.ERASE_FILTER_TYPE) {
+    if (type == Entities.DELETE_FILTER_TYPE) {
         return false;
     }
     return properties;

From b883d006c83f6c333d74be14a4b22a90950a8cd1 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Fri, 26 Jan 2018 18:26:48 -0800
Subject: [PATCH 047/569] add flags to support asking for specific messages,
 update examples

---
 libraries/entities/src/EntityEditFilters.cpp  | 26 +++++++++++++++++++
 libraries/entities/src/EntityEditFilters.h    |  6 +++++
 .../prevent-all-deletes.js                    | 22 ++++++++++++++++
 .../prevent-delete-in-zone-example.js         |  8 +++---
 4 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 scripts/tutorials/entity_edit_filters/prevent-all-deletes.js

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 4b66b61d93..cd1982bdb4 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -62,6 +62,16 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
                 return false;
             }
 
+            // check to see if this filter wants to filter this message type
+            if ((!filterData.wantsToFilterEdit && filterType == EntityTree::FilterType::Edit) ||
+                (!filterData.wantsToFilterPhysics && filterType == EntityTree::FilterType::Physics) ||
+                (!filterData.wantsToFilterDelete && filterType == EntityTree::FilterType::Delete) ||
+                (!filterData.wantsToFilterAdd && filterType == EntityTree::FilterType::Add)) {
+
+                wasChanged = false;
+                return true; // accept the message
+            }
+
             auto oldProperties = propertiesIn.getDesiredProperties();
             auto specifiedProperties = propertiesIn.getChangedProperties();
             propertiesIn.setDesiredProperties(specifiedProperties);
@@ -254,6 +264,22 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     filterData.rejectAll=true;
                 }
 
+                // if the wantsToFilterEdit is a boolean evaluate as a boolean, otherwise assume true
+                QScriptValue wantsToFilterAddValue = filterData.filterFn.property("wantsToFilterAdd");
+                filterData.wantsToFilterAdd = wantsToFilterAddValue.isBool() ? wantsToFilterAddValue.toBool() : true;
+
+                // if the wantsToFilterEdit is a boolean evaluate as a boolean, otherwise assume true
+                QScriptValue wantsToFilterEditValue = filterData.filterFn.property("wantsToFilterEdit");
+                filterData.wantsToFilterEdit = wantsToFilterEditValue.isBool() ? wantsToFilterEditValue.toBool() : true;
+
+                // if the wantsToFilterPhysics is a boolean evaluate as a boolean, otherwise assume true
+                QScriptValue wantsToFilterPhysicsValue = filterData.filterFn.property("wantsToFilterPhysics");
+                filterData.wantsToFilterPhysics = wantsToFilterPhysicsValue.isBool() ? wantsToFilterPhysicsValue.toBool() : true;
+
+                // if the wantsToFilterDelete is a boolean evaluate as a boolean, otherwise assume false
+                QScriptValue wantsToFilterDeleteValue = filterData.filterFn.property("wantsToFilterDelete");
+                filterData.wantsToFilterDelete = wantsToFilterDeleteValue.isBool() ? wantsToFilterDeleteValue.toBool() : false;
+
                 // check to see if the filterFn has properties asking for Original props
                 QScriptValue wantsOriginalPropertiesValue = filterData.filterFn.property("wantsOriginalProperties");
                 // if the wantsOriginalProperties is a boolean, or a string, or list of strings, then evaluate as follows:
diff --git a/libraries/entities/src/EntityEditFilters.h b/libraries/entities/src/EntityEditFilters.h
index be3df50d3f..cb99c97762 100644
--- a/libraries/entities/src/EntityEditFilters.h
+++ b/libraries/entities/src/EntityEditFilters.h
@@ -30,6 +30,12 @@ public:
         QScriptValue filterFn;
         bool wantsOriginalProperties { false };
         bool wantsZoneProperties { false };
+
+        bool wantsToFilterAdd { true };
+        bool wantsToFilterEdit { true };
+        bool wantsToFilterPhysics { true };
+        bool wantsToFilterDelete { true };
+
         EntityPropertyFlags includedOriginalProperties;
         EntityPropertyFlags includedZoneProperties;
         bool wantsZoneBoundingBox { false };
diff --git a/scripts/tutorials/entity_edit_filters/prevent-all-deletes.js b/scripts/tutorials/entity_edit_filters/prevent-all-deletes.js
new file mode 100644
index 0000000000..0e2c54a04a
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/prevent-all-deletes.js
@@ -0,0 +1,22 @@
+//
+// prevent-all-deletes.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Jan. 25, 2018
+// Copyright 2018 High Fidelity, Inc.
+//
+// This sample entity edit filter script will prevent deletes of any entities.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function filter() {    
+    return false; // all deletes are blocked
+}
+
+filter.wantsToFilterAdd = false; // don't run on adds
+filter.wantsToFilterEdit = false; // don't run on edits
+filter.wantsToFilterPhysics = false;  // don't run on physics
+filter.wantsToFilterDelete = true;  // do run on deletes
+filter;
\ No newline at end of file
diff --git a/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js b/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
index 94ee58738d..521bb94d00 100644
--- a/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
+++ b/scripts/tutorials/entity_edit_filters/prevent-delete-in-zone-example.js
@@ -5,13 +5,14 @@
 // Created by Brad Hefta-Gaub to use Entities on Jan. 25, 2018
 // Copyright 2018 High Fidelity, Inc.
 //
-// This sample entity edit filter script will keep prevent any entity inside the zone from being deleted.
+// This sample entity edit filter script will get all edits, adds, physcis, and deletes, but will only block
+// deletes, and will pass through all others.
 //
 // Distributed under the Apache License, Version 2.0.
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-function filter(properties, type, originalProperties, zoneProperties) {    
+function filter(properties, type) {    
 
     if (type == Entities.DELETE_FILTER_TYPE) {
         return false;
@@ -19,6 +20,5 @@ function filter(properties, type, originalProperties, zoneProperties) {
     return properties;
 }
 
-filter.wantsOriginalProperties = true;
-filter.wantsZoneProperties = true;
+filter.wantsToFilterDelete = true;  // do run on deletes
 filter;
\ No newline at end of file

From efc63a41e9551583c3eeb62c41e52e37789594c9 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Fri, 26 Jan 2018 18:49:55 -0800
Subject: [PATCH 048/569] make sure true results for delete actually work, add
 more examples

---
 libraries/entities/src/EntityEditFilters.cpp  | 13 +++++++++-
 ...event-add-of-entities-named-bob-example.js | 26 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 scripts/tutorials/entity_edit_filters/prevent-add-of-entities-named-bob-example.js

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index cd1982bdb4..12bf1ac231 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -125,7 +125,7 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
                 return false;
             }
 
-            if (result.isObject()){
+            if (result.isObject()) {
                 // make propertiesIn reflect the changes, for next filter...
                 propertiesIn.copyFromScriptValue(result, false);
 
@@ -134,6 +134,17 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
                 // Javascript objects are == only if they are the same object. To compare arbitrary values, we need to use JSON.
                 auto out = QJsonValue::fromVariant(result.toVariant());
                 wasChanged |= (in != out);
+            } else if (result.isBool()) {
+
+                // if the filter returned false, then it's authoritative
+                if (!result.toBool()) {
+                    return false;
+                }
+
+                // otherwise, assume it wants to pass all properties
+                propertiesOut = propertiesIn;
+                wasChanged = false;
+                
             } else {
                 return false;
             }
diff --git a/scripts/tutorials/entity_edit_filters/prevent-add-of-entities-named-bob-example.js b/scripts/tutorials/entity_edit_filters/prevent-add-of-entities-named-bob-example.js
new file mode 100644
index 0000000000..03fbe97430
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/prevent-add-of-entities-named-bob-example.js
@@ -0,0 +1,26 @@
+//
+// prevent-add-of-entities-named-bob-example.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Jan. 25, 2018
+// Copyright 2018 High Fidelity, Inc.
+//
+// This sample entity edit filter script will get all edits, adds, physcis, and deletes, but will only block
+// deletes, and will pass through all others.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function filter(properties, type) {
+    if (properties.name == "bob") {
+        return false;
+    }
+    return properties;
+}
+
+filter.wantsToFilterAdd = true;  // do run on add
+filter.wantsToFilterEdit = false;  // do not run on edit
+filter.wantsToFilterPhysics = false;  // do not run on physics
+filter.wantsToFilterDelete = false;  // do not run on delete
+filter;
\ No newline at end of file

From 0324f41565c77acdda2d326560aeba2a2f260498 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Mon, 29 Jan 2018 17:23:35 +0100
Subject: [PATCH 049/569] Trying to improve adaptive shadow bias

---
 libraries/render-utils/src/LightStage.cpp     | 35 ++++++++++++++-----
 libraries/render-utils/src/LightStage.h       |  3 ++
 .../render-utils/src/RenderShadowTask.cpp     |  4 ++-
 libraries/render-utils/src/RenderShadowTask.h |  2 +-
 libraries/render-utils/src/Shadow.slh         | 15 +++++---
 libraries/render-utils/src/ShadowCore.slh     | 14 ++++++--
 libraries/render-utils/src/Shadows_shared.slh |  8 ++---
 7 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
index eac9dd7657..e06d24f1b1 100644
--- a/libraries/render-utils/src/LightStage.cpp
+++ b/libraries/render-utils/src/LightStage.cpp
@@ -23,8 +23,6 @@ const glm::mat4 LightStage::Shadow::_biasMatrix{
     0.5, 0.5, 0.5, 1.0 };
 const int LightStage::Shadow::MAP_SIZE = 1024;
 
-static const auto MAX_BIAS = 0.006f;
-
 const LightStage::Index LightStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
 
 LightStage::LightStage() {
@@ -63,7 +61,7 @@ LightStage::LightStage() {
 
 LightStage::Shadow::Schema::Schema() {
     ShadowTransform defaultTransform;
-    defaultTransform.bias = MAX_BIAS;
+    defaultTransform.fixedBias = 0.005f;
     std::fill(cascades, cascades + SHADOW_CASCADE_MAX_COUNT, defaultTransform);
     invMapSize = 1.0f / MAP_SIZE;
     cascadeCount = 1;
@@ -72,6 +70,18 @@ LightStage::Shadow::Schema::Schema() {
     maxDistance = 20.0f;
 }
 
+void LightStage::Shadow::Schema::updateCascade(int cascadeIndex, const ViewFrustum& shadowFrustum) {
+    auto& cascade = cascades[cascadeIndex];
+    cascade.frustumPosition = shadowFrustum.getPosition();
+    // The adaptative bias is computing how much depth offset we have to add to
+    // push back a coarsely sampled surface perpendicularly to the shadow direction,
+    // to not have shadow acnee. The final computation is done in the shader, based on the
+    // surface normal.
+    auto maxWorldFrustumSize = glm::max(shadowFrustum.getWidth(), shadowFrustum.getHeight());
+    cascade.adaptiveBiasUnitScale = maxWorldFrustumSize * 0.5f * invMapSize;
+    cascade.adaptiveBiasTransformScale = shadowFrustum.getNearClip() * shadowFrustum.getFarClip() / (shadowFrustum.getFarClip() - shadowFrustum.getNearClip());
+}
+
 LightStage::Shadow::Cascade::Cascade() : 
     _frustum{ std::make_shared<ViewFrustum>() },
     _minDistance{ 0.0f },
@@ -210,13 +220,15 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum,
 
     // Position the keylight frustum
     auto position = viewFrustum.getPosition() - (nearDepth + farDepth)*lightDirection;
+    // Update the buffer
+    auto& schema = _schemaBuffer.edit<Schema>();
+    auto cascadeIndex = 0;
     for (auto& cascade : _cascades) {
         cascade._frustum->setOrientation(orientation);
         cascade._frustum->setPosition(position);
+        schema.cascades[cascadeIndex].frustumPosition = position;
+        cascadeIndex++;
     }
-    // Update the buffer
-    auto& schema = _schemaBuffer.edit<Schema>();
-    schema.lightDirInViewSpace = glm::inverse(viewFrustum.getView()) * glm::vec4(lightDirection, 0.f);
 }
 
 void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& viewFrustum,
@@ -269,8 +281,10 @@ void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, co
 
     // Update the buffer
     auto& schema = _schemaBuffer.edit<Schema>();
-    schema.cascades[cascadeIndex].reprojection = _biasMatrix * ortho * shadowViewInverse.getMatrix();
-    schema.cascades[cascadeIndex].bias = baseBias;
+    auto& schemaCascade = schema.cascades[cascadeIndex];
+    schemaCascade.reprojection = _biasMatrix * ortho * shadowViewInverse.getMatrix();
+    schemaCascade.fixedBias = baseBias;
+    schema.updateCascade(cascadeIndex, *cascade._frustum);
 }
 
 void LightStage::Shadow::setCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& shadowFrustum) {
@@ -281,7 +295,10 @@ void LightStage::Shadow::setCascadeFrustum(unsigned int cascadeIndex, const View
 
     *cascade._frustum = shadowFrustum;
     // Update the buffer
-    _schemaBuffer.edit<Schema>().cascades[cascadeIndex].reprojection = _biasMatrix * shadowFrustum.getProjection() * viewInverse.getMatrix();
+    auto& schema = _schemaBuffer.edit<Schema>();
+    auto& schemaCascade = schema.cascades[cascadeIndex];
+    schemaCascade.reprojection = _biasMatrix * shadowFrustum.getProjection() * viewInverse.getMatrix();
+    schema.updateCascade(cascadeIndex, shadowFrustum);
 }
 
 LightStage::Index LightStage::findLight(const LightPointer& light) const {
diff --git a/libraries/render-utils/src/LightStage.h b/libraries/render-utils/src/LightStage.h
index c2c2df8c89..922ec5eb4a 100644
--- a/libraries/render-utils/src/LightStage.h
+++ b/libraries/render-utils/src/LightStage.h
@@ -110,6 +110,8 @@ public:
 
             Schema();
 
+            void updateCascade(int cascadeIndex, const ViewFrustum& shadowFrustum);
+
         };
         UniformBufferView _schemaBuffer = nullptr;
     };
@@ -213,6 +215,7 @@ protected:
     Index _sunOffLightId;
 
     Index _defaultLightId;
+
 };
 using LightStagePointer = std::shared_ptr<LightStage>;
 
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index f41860b6de..2172dda3e3 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -256,7 +256,9 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext) {
 }
 
 void RenderShadowCascadeSetup::configure(const Config& configuration) {
-    _baseBias = configuration.bias * configuration.bias * 0.01f;
+    // I'm not very proud of this empirical adjustment
+    auto cascadeBias = configuration.bias * powf(1.1f, _cascadeIndex);
+    _baseBias = cascadeBias * cascadeBias * 0.01f;
 }
 
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 42c279c02a..c4f0c65bfc 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -67,7 +67,7 @@ class RenderShadowCascadeSetupConfig : public render::Job::Config {
         Q_PROPERTY(float bias MEMBER bias NOTIFY dirty)
 public:
 
-    float bias{ 0.5f };
+    float bias{ 0.25f };
 
 signals:
     void dirty();
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index 50ae8864f4..c11f5fa6a7 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -83,11 +83,17 @@ float evalShadowAttenuationPCF(int cascadeIndex, ShadowSampleOffsets offsets, ve
     return shadowAttenuation;
 }
 
-float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float bias) {
+float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float bias,
+                                   vec3 worldPosition, vec3 worldLightDir) {
     if (!isShadowCascadeProjectedOnPixel(shadowTexcoord)) {
         // If a point is not in the map, do not attenuate
         return 1.0;
     }
+    // After this, bias is in view units
+    bias *= getShadowAdaptiveBiasUnitScale(cascadeIndex);
+    // Transform to texcoord space (between 0 and 1)
+    float shadowDepth = abs(dot(worldPosition-getShadowFrustumPosition(cascadeIndex), worldLightDir));
+    bias = transformShadowAdaptiveBias(cascadeIndex, shadowDepth, bias);
     // Add fixed bias
     bias += getShadowBias(cascadeIndex);
     return evalShadowAttenuationPCF(cascadeIndex, offsets, shadowTexcoord, bias);
@@ -101,12 +107,11 @@ float evalShadowAttenuation(vec3 worldLightDir, vec4 worldPosition, float viewDe
 	
     // Adjust bias if we are at a grazing angle with light
     float ndotl = dot(worldLightDir, worldNormal);
-    float bias = 0.5*(1.0/(ndotl*ndotl)-1.0);
-    bias *= getShadowScale();
+    float bias = 1.0/(ndotl*ndotl)-1.0;
     vec2 cascadeAttenuations = vec2(1.0, 1.0);
-    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, offsets, cascadeShadowCoords[0], bias);
+    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, offsets, cascadeShadowCoords[0], bias, worldPosition.xyz, worldLightDir);
     if (cascadeMix > 0.0 && cascadeIndices.y < getShadowCascadeCount()) {
-        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, offsets, cascadeShadowCoords[1], bias);
+        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, offsets, cascadeShadowCoords[1], bias, worldPosition.xyz, worldLightDir);
     }
     float attenuation = mix(cascadeAttenuations.x, cascadeAttenuations.y, cascadeMix);
     // Falloff to max distance
diff --git a/libraries/render-utils/src/ShadowCore.slh b/libraries/render-utils/src/ShadowCore.slh
index 9b3b086598..2d48e16ef4 100644
--- a/libraries/render-utils/src/ShadowCore.slh
+++ b/libraries/render-utils/src/ShadowCore.slh
@@ -38,11 +38,19 @@ float getShadowScale() {
 }
 
 float getShadowBias(int cascadeIndex) {
-	return shadow.cascades[cascadeIndex].bias;
+	return shadow.cascades[cascadeIndex].fixedBias;
 }
 
-vec3 getShadowDirInViewSpace() {
-    return shadow.lightDirInViewSpace;
+vec3 getShadowFrustumPosition(int cascadeIndex) {
+	return shadow.cascades[cascadeIndex].frustumPosition;
+}
+
+float getShadowAdaptiveBiasUnitScale(int cascadeIndex) {
+	return shadow.cascades[cascadeIndex].adaptiveBiasUnitScale;
+}
+
+float transformShadowAdaptiveBias(int cascadeIndex, float shadowDepth, float depthBias) {
+    return shadow.cascades[cascadeIndex].adaptiveBiasTransformScale * depthBias / (shadowDepth*shadowDepth);
 }
 
 // Compute the texture coordinates from world coordinates
diff --git a/libraries/render-utils/src/Shadows_shared.slh b/libraries/render-utils/src/Shadows_shared.slh
index abb226421c..def6b1b4d4 100644
--- a/libraries/render-utils/src/Shadows_shared.slh
+++ b/libraries/render-utils/src/Shadows_shared.slh
@@ -11,16 +11,16 @@
 
 struct ShadowTransform {
 	MAT4 reprojection;
-
-	float bias;
+    VEC3 frustumPosition;
+	float fixedBias;
+    float adaptiveBiasUnitScale;
+    float adaptiveBiasTransformScale;
     float _padding1;
     float _padding2;
-    float _padding3;
 };
 
 struct ShadowParameters {
     ShadowTransform cascades[SHADOW_CASCADE_MAX_COUNT];
-    VEC3 lightDirInViewSpace;
     int cascadeCount;
     float invMapSize;
     float invCascadeBlendWidth;

From 9ee715364185b913bf928864867278a11ac35af0 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 29 Jan 2018 16:53:02 -0800
Subject: [PATCH 050/569] fix scale speed, fix stretch panels, fix scale cube
 highlight

---
 .../system/libraries/entitySelectionTool.js   | 96 +++++++++++--------
 1 file changed, 58 insertions(+), 38 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 253c67bfca..3da7d1f083 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -246,6 +246,7 @@ SelectionDisplay = (function() {
 
     var SCALE_MINIMUM_DIMENSION = 0.02;
     var STRETCH_MINIMUM_DIMENSION = 0.001;
+    var STRETCH_DIRECTION_ALL_FACTOR = 15;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
     var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
@@ -266,12 +267,6 @@ SelectionDisplay = (function() {
         ALL : 3
     }
 
-    var ROTATE_DIRECTION = {
-        PITCH : 0,
-        YAW : 1,
-        ROLL : 2
-    }
-
     var SCALE_DIRECTION = {
         LBN : 0,
         RBN : 1,
@@ -283,6 +278,12 @@ SelectionDisplay = (function() {
         RTF : 7
     }
 
+    var ROTATE_DIRECTION = {
+        PITCH : 0,
+        YAW : 1,
+        ROLL : 2
+    }
+
     var spaceMode = SPACE_LOCAL;
     var overlayNames = [];
     var lastCameraPosition = Camera.getPosition();
@@ -706,7 +707,7 @@ SelectionDisplay = (function() {
         };
     };
 
-    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset) {
+    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleGrabber) {
         var directionFor3DStretch = directionVec;
         var distanceFor3DStretch = 0;
         var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
@@ -892,16 +893,29 @@ SelectionDisplay = (function() {
 
             that.setGrabberTranslateVisible(false);
             that.setGrabberRotateVisible(false);
-            that.setGrabberScaleVisible(directionEnum === STRETCH_DIRECTION.ALL);
+            that.setGrabberScaleVisible(true);
             that.setGrabberStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
             that.setGrabberStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
             that.setGrabberStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
             that.setGrabberClonerVisible(false);
+
+            if (stretchPanel != null) {
+                Overlays.editOverlay(stretchPanel, { visible: true });
+            }
+            if (scaleGrabber != null) {
+                Overlays.editOverlay(scaleGrabber, { color: GRABBER_SCALE_CUBE_SELECTED_COLOR });
+            }
         
             SelectionManager.saveProperties();
         };
 
         var onEnd = function(event, reason) {    
+            if (stretchPanel != null) {
+                Overlays.editOverlay(stretchPanel, { visible: false });
+            }
+            if (scaleGrabber != null) {
+                Overlays.editOverlay(scaleGrabber, { color: GRABBER_SCALE_CUBE_IDLE_COLOR });
+            }
             pushCommandForSelections();
         };
 
@@ -959,6 +973,11 @@ SelectionDisplay = (function() {
             vector = grid.snapToSpacing(vector);
     
             var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
+
+            if (directionEnum === STRETCH_DIRECTION.ALL) {
+                changeInDimensions = Vec3.multiply(changeInDimensions, STRETCH_DIRECTION_ALL_FACTOR);
+            }
+
             var newDimensions;
             if (proportional) {
                 var absX = Math.abs(changeInDimensions.x);
@@ -1024,60 +1043,53 @@ SelectionDisplay = (function() {
     }
 
     function addGrabberStretchTool(overlay, mode, directionEnum) {
-        var directionVec, pivot, offset;
+        var directionVec, pivot, offset, stretchPanel;
         if (directionEnum === STRETCH_DIRECTION.X) {
+            stretchPanel = grabberStretchXPanel;
             directionVec = { x:-1, y:0, z:0 };
-            pivot = { x:-1, y:0, z:0 };
-            offset = { x:1, y:0, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Y) {
+            stretchPanel = grabberStretchYPanel;
             directionVec = { x:0, y:-1, z:0 };
-            pivot = { x:0, y:-1, z:0 };
-            offset = { x:0, y:1, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Z) {
+            stretchPanel = grabberStretchZPanel
             directionVec = { x:0, y:0, z:-1 };
-            pivot = { x:0, y:0, z:-1 };
-            offset = { x:0, y:0, z:1 };
         }
-        var tool = makeStretchTool(mode, directionEnum, directionVec, pivot, offset);
+        pivot = directionVec;
+        offset = Vec3.multiply(directionVec, -1);
+        var tool = makeStretchTool(mode, directionEnum, directionVec, pivot, offset, stretchPanel, null);
         return addGrabberTool(overlay, tool);
     }
 
     function addGrabberScaleTool(overlay, mode, directionEnum) {
-        var directionVec, pivot, offset;
+        var directionVec, pivot, offset, selectedGrabber;
         if (directionEnum === SCALE_DIRECTION.LBN) {
             directionVec = { x:1, y:1, z:1 };
-            pivot = { x:1, y:1, z:1 };
-            offset = { x:-1, y:-1, z:-1 };
+            selectedGrabber = grabberScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
             directionVec = { x:1, y:1, z:-1 };
-            pivot = { x:1, y:1, z:-1 };
-            offset = { x:-1, y:-1, z:1 };
+            selectedGrabber = grabberScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
             directionVec = { x:-1, y:1, z:1 };
-            pivot = { x:-1, y:1, z:1 };
-            offset = { x:1, y:-1, z:-1 };
+            selectedGrabber = grabberScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
             directionVec = { x:-1, y:1, z:-1 };
-            pivot = { x:-1, y:1, z:-1 };
-            offset = { x:1, y:-1, z:1 };
+            selectedGrabber = grabberScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
             directionVec = { x:1, y:-1, z:1 };
-            pivot = { x:1, y:-1, z:1 };
-            offset = { x:-1, y:1, z:-1 };
+            selectedGrabber = grabberScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
             directionVec = { x:1, y:-1, z:-1 };
-            pivot = { x:1, y:-1, z:-1 };
-            offset = { x:-1, y:1, z:1 };
+            selectedGrabber = grabberScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
             directionVec = { x:-1, y:-1, z:1 };
-            pivot = { x:-1, y:-1, z:1 };
-            offset = { x:1, y:1, z:-1 };
+            selectedGrabber = grabberScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
             directionVec = { x:-1, y:-1, z:-1 };
-            pivot = { x:-1, y:-1, z:-1 };
-            offset = { x:1, y:1, z:1 };
+            selectedGrabber = grabberScaleRTFCube;
         }
-        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, pivot, offset);
+        pivot = directionVec;
+        offset = Vec3.multiply(directionVec, -1);
+        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, pivot, offset, null, selectedGrabber);
         return addGrabberTool(overlay, tool);
     }
 
@@ -1346,6 +1358,7 @@ SelectionDisplay = (function() {
         if (SelectionManager.hasSelection()) {
             var worldPosition = SelectionManager.worldPosition;
             var worldRotation = SelectionManager.worldRotation;
+            var worldRotationInverse = Quat.inverse(worldRotation);
             var worldDimensions = SelectionManager.worldDimensions;
 
             var worldDimensionsX = worldDimensions.x;
@@ -1478,7 +1491,9 @@ SelectionDisplay = (function() {
                 position: stretchXPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var stretchPanelXDimensions = Vec3.subtract(grabberScaleLTFCubePos, grabberScaleRBFCubePos);
+            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleLTFCubePos);
+            var grabberScaleRBFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRBFCubePos);
+            var stretchPanelXDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRBFCubePosRot);
             var tempY = Math.abs(stretchPanelXDimensions.y);
             stretchPanelXDimensions.x = 0.01;
             stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
@@ -1493,7 +1508,9 @@ SelectionDisplay = (function() {
                 position: stretchYPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var stretchPanelYDimensions = Vec3.subtract(grabberScaleLTFCubePos, grabberScaleRTNCubePos);
+            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleLTNCubePos);
+            var grabberScaleRTNCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRTFCubePos);
+            var stretchPanelYDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRTNCubePosRot);
             var tempX = Math.abs(stretchPanelYDimensions.x);
             stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
             stretchPanelYDimensions.y = 0.01;
@@ -1508,7 +1525,9 @@ SelectionDisplay = (function() {
                 position: stretchZPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var stretchPanelZDimensions = Vec3.subtract(grabberScaleRTFCubePos, grabberScaleRBNCubePos);
+            var grabberScaleRTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRTFCubePos);
+            var grabberScaleRBNCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRBNCubePos);
+            var stretchPanelZDimensions = Vec3.subtract(grabberScaleRTFCubePosRot, grabberScaleRBNCubePosRot);
             var tempX = Math.abs(stretchPanelZDimensions.x);
             stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
             stretchPanelZDimensions.y = tempX;
@@ -1576,7 +1595,8 @@ SelectionDisplay = (function() {
         that.setGrabberStretchYVisible(!activeTool || isActiveTool(grabberStretchYSphere));
         that.setGrabberStretchZVisible(!activeTool || isActiveTool(grabberStretchZSphere));
         that.setGrabberScaleVisible(!activeTool || isActiveTool(grabberScaleLBNCube) || isActiveTool(grabberScaleRBNCube) || isActiveTool(grabberScaleLBFCube) || isActiveTool(grabberScaleRBFCube)
-                                                || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube));
+                                                || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube)
+                                                || isActiveTool(grabberStretchXSphere) || isActiveTool(grabberStretchYSphere) || isActiveTool(grabberStretchZSphere));
         that.setGrabberClonerVisible(!activeTool || isActiveTool(grabberCloner));
 
         if (wantDebug) {

From 2f0d92c3cde394770e6613ce2e434ad5d45e9908 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 29 Jan 2018 18:15:01 -0800
Subject: [PATCH 051/569] ctrl 22.5 snapping

---
 .../system/libraries/entitySelectionTool.js   | 62 +++++++++++++++----
 1 file changed, 51 insertions(+), 11 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 3da7d1f083..d843b6282b 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -254,6 +254,10 @@ SelectionDisplay = (function() {
     var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18;
     var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.14;
 
+    var ROTATION_CTRL_SNAP_ANGLE = 22.5;
+    var ROTATION_DEFAULT_SNAP_ANGLE = 1;
+    var ROTATION_DEFAULT_TICK_MARKS_ANGLE = 5;
+
     var TRANSLATE_DIRECTION = {
         X : 0,
         Y : 1,
@@ -300,6 +304,8 @@ SelectionDisplay = (function() {
     var worldRotationY;
     var worldRotationZ;
 
+    var ctrlPressed = false;
+
     var activeTool = null;
     var grabberTools = {};
 
@@ -335,7 +341,7 @@ SelectionDisplay = (function() {
         innerRadius: 0.9,
         startAt: 0,
         endAt: 360,
-        majorTickMarksAngle: 5,
+        majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE,
         majorTickMarksLength: 0.1,
         visible: false,
         ignoreRayIntersection: false,
@@ -584,6 +590,25 @@ SelectionDisplay = (function() {
     that.triggerMapping.from(Controller.Standard.RT).peek().to(makeTriggerHandler(Controller.Standard.RightHand));
     that.triggerMapping.from(Controller.Standard.LT).peek().to(makeTriggerHandler(Controller.Standard.LeftHand));
 
+    // Control key remains active only while key is held down
+    function keyReleaseEvent(key) {
+        if (key.key === 16777249) {
+            ctrlPressed = false;
+            that.updateActiveRotateRing();
+        }
+    }
+
+    // Triggers notification on specific key driven events
+    function keyPressEvent(key) {
+        if (key.key === 16777249) {
+            ctrlPressed = true;
+            that.updateActiveRotateRing();
+        }
+    }
+
+    Controller.keyPressEvent.connect(keyPressEvent);
+    Controller.keyReleaseEvent.connect(keyReleaseEvent);
+
     function controllerComputePickRay() {
         var controllerPose = getControllerWorldLocation(activeHand, true);
         if (controllerPose.valid && that.triggered) {
@@ -1227,7 +1252,9 @@ SelectionDisplay = (function() {
                     var centerToIntersect = Vec3.subtract(result, rotCenter);
                     // Note: orientedAngle which wants normalized centerToZero and centerToIntersect
                     //             handles that internally, so it's to pass unnormalized vectors here.
-                    var angleFromZero = Math.floor((Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal)));        
+                    var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);        
+                    var snapAngle = ctrlPressed ? ROTATION_CTRL_SNAP_ANGLE : ROTATION_DEFAULT_SNAP_ANGLE;
+                    angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
                     var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
                     updateSelectionsRotation(rotChange);
                     updateRotationDegreesOverlay(-angleFromZero, direction, rotCenter);
@@ -1310,12 +1337,6 @@ SelectionDisplay = (function() {
             }
         }
 
-        /*
-        Overlays.editOverlay(highlightBox, {
-            visible: false
-        });
-        */
-
         that.updateGrabbers();
     };
 
@@ -1544,24 +1565,28 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(grabberRotatePitchRing, { 
                     position: SelectionManager.worldPosition, 
                     rotation: worldRotationY,
-                    dimensions: rotateDimensions
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
             }
             if (!isActiveTool(grabberRotateYawRing)) {
                 Overlays.editOverlay(grabberRotateYawRing, { 
                     position: SelectionManager.worldPosition, 
                     rotation: worldRotationZ,
-                    dimensions: rotateDimensions
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
             }
             if (!isActiveTool(grabberRotateRollRing)) {
                 Overlays.editOverlay(grabberRotateRollRing, { 
                     position: SelectionManager.worldPosition, 
                     rotation: worldRotationX,
-                    dimensions: rotateDimensions
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
             }
             Overlays.editOverlay(grabberRotateCurrentRing, { dimensions: rotateDimensions });
+            that.updateActiveRotateRing();
 
             var inModeRotate = isActiveTool(grabberRotatePitchRing) || isActiveTool(grabberRotateYawRing) || isActiveTool(grabberRotateRollRing);
             var inModeTranslate = isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder) ||
@@ -1604,6 +1629,21 @@ SelectionDisplay = (function() {
         }
     };
 
+    that.updateActiveRotateRing = function() {
+        var activeRotateRing = null;
+        if (isActiveTool(grabberRotatePitchRing)) {
+            activeRotateRing = grabberRotatePitchRing;
+        } else if (isActiveTool(grabberRotateYawRing)) {
+            activeRotateRing = grabberRotateYawRing;
+        } else if (isActiveTool(grabberRotateRollRing)) {
+            activeRotateRing = grabberRotateRollRing;
+        }
+        if (activeRotateRing != null) {
+            var tickMarksAngle =  ctrlPressed ? ROTATION_CTRL_SNAP_ANGLE : ROTATION_DEFAULT_TICK_MARKS_ANGLE;
+            Overlays.editOverlay(activeRotateRing, { majorTickMarksAngle: tickMarksAngle });
+        }
+    };
+
     // FUNCTION: SET OVERLAYS VISIBLE
     that.setOverlaysVisible = function(isVisible) {
         for (var i = 0; i < allOverlays.length; i++) {

From e679b75e99a53f45a5d50619c0716339b1b82778 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 29 Jan 2018 19:02:36 -0800
Subject: [PATCH 052/569] fix degree display position

---
 .../system/libraries/entitySelectionTool.js   | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index d843b6282b..fbda9e9eba 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -299,6 +299,7 @@ SelectionDisplay = (function() {
 
     var rotZero;
     var rotationNormal;
+    var rotDegreePos;
 
     var worldRotationX;
     var worldRotationY;
@@ -1119,20 +1120,8 @@ SelectionDisplay = (function() {
     }
 
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
-    function updateRotationDegreesOverlay(angleFromZero, direction, centerPosition) {
+    function updateRotationDegreesOverlay(angleFromZero, position) {
         var angle = angleFromZero * (Math.PI / 180);
-        var position = {
-            x: Math.cos(angle) * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
-            y: Math.sin(angle) * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
-            z: 0
-        };
-        if (direction === ROTATE_DIRECTION.PITCH)
-            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, -90, 0), position);
-        else if (direction === ROTATE_DIRECTION.YAW)
-            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(90, 0, 0), position);
-        else if (direction === ROTATE_DIRECTION.ROLL)
-            position = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, 180, 0), position);
-        position = Vec3.sum(centerPosition, position);
         var overlayProps = {
             position: position,
             dimensions: {
@@ -1222,7 +1211,6 @@ SelectionDisplay = (function() {
                     endAt: 0,
                     visible: true
                 });
-                updateRotationDegreesOverlay(0, direction, rotCenter);
 
                 // editOverlays may not have committed rotation changes.
                 // Compute zero position based on where the overlay will be eventually.
@@ -1230,6 +1218,11 @@ SelectionDisplay = (function() {
                 // In case of a parallel ray, this will be null, which will cause early-out
                 // in the onMove helper.
                 rotZero = result;
+
+                var rotCenterToZero = Vec3.subtract(rotZero, rotCenter);
+                var rotCenterToZeroLength = Vec3.length(rotCenterToZero);
+                rotDegreePos = Vec3.sum(rotCenter, Vec3.multiply(Vec3.normalize(rotCenterToZero), rotCenterToZeroLength * 1.2));
+                updateRotationDegreesOverlay(0, rotDegreePos);
             },
             onEnd: function(event, reason) {
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: false });
@@ -1257,7 +1250,7 @@ SelectionDisplay = (function() {
                     angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
                     var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
                     updateSelectionsRotation(rotChange);
-                    updateRotationDegreesOverlay(-angleFromZero, direction, rotCenter);
+                    updateRotationDegreesOverlay(-angleFromZero, rotDegreePos);
 
                     var startAtCurrent = 0;
                     var endAtCurrent = angleFromZero;

From 5a771e3a168357708d646dcba70c79ceb7eb4cb4 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 26 Jan 2018 17:08:53 -0500
Subject: [PATCH 053/569] [Case 10865] Ctrl/Cmd/Shift+Click Multi-Select for
 Asset Browser.

* Removes manual selectionModel update from controls-uit/Tree.qml
    * This was interfering with the Key+Click functionality.  It
      was introduced via Commit 99617600c47 to address a selection
      issue; however, it's unclear what that issue was.  Selection
      within the Asset Browser works without it at present.
* Amends the ContextMenu within the AssetBrowser to work in conjunction
  with the multi-selection changes.
    * ContextMenu will _only_ display when triggered within the current
      selection be it one or more items as opposed to previous behavior
      of selecting the item the menu was triggered on.
    * CopyURL is only enabled when the selection size is 1
    * Rename is only enabled when the selection size is 1
    * Delete is enabled when the selection size is greater than 0

Changes Committed:
    modified:   interface/resources/qml/controls-uit/Tree.qml
    modified:   interface/resources/qml/hifi/AssetServer.qml
---
 interface/resources/qml/controls-uit/Tree.qml |  4 --
 interface/resources/qml/hifi/AssetServer.qml  | 41 +++++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controls-uit/Tree.qml
index 6bd11295b1..5199a10a27 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controls-uit/Tree.qml
@@ -202,8 +202,4 @@ TreeView {
     }
 
     onDoubleClicked: isExpanded(index) ? collapse(index) : expand(index)
-
-    onClicked: {
-        selectionModel.setCurrentIndex(index, ItemSelectionModel.ClearAndSelect);
-    }
 }
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 37c3c2adab..7c16b19865 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -694,7 +694,7 @@ Windows.ScrollingWindow {
                         }
                     }
                 }
-            }
+            }// End_OF( itemLoader )
 
             Rectangle {
                 id: treeLabelToolTip
@@ -731,50 +731,59 @@ Windows.ScrollingWindow {
                     showTimer.stop();
                     treeLabelToolTip.visible = false;
                 }
-            }
+            }// End_OF( treeLabelToolTip )
             
             MouseArea {
                 propagateComposedEvents: true
                 anchors.fill: parent
                 acceptedButtons: Qt.RightButton
                 onClicked: {
-                    if (!HMD.active) {  // Popup only displays properly on desktop
-                        var index = treeView.indexAt(mouse.x, mouse.y);
-                        treeView.selection.setCurrentIndex(index, 0x0002);
-                        contextMenu.currentIndex = index;
-                        contextMenu.popup();
+                    if (treeView.selection.hasSelection && !HMD.active) {  // Popup only displays properly on desktop
+                        // Only display the popup if the click triggered within
+                        // the selection.
+                        var clickedIndex = treeView.indexAt(mouse.x, mouse.y);
+                        var displayContextMenu = false;
+                        for ( var i = 0; i < selectedItems; ++i) {
+                            var currentSelectedIndex = treeView.selection.selectedIndexes[i];
+                            if (clickedIndex === currentSelectedIndex) {
+                                contextMenu.popup();
+                                break;
+                            }
+                        }
                     }
                 }
             }
-                
+
             Menu {
                 id: contextMenu
                 title: "Edit"
                 property var url: ""
-                property var currentIndex: null
 
                 MenuItem {
                     text: "Copy URL"
+                    enabled: (selectedItems == 1)
                     onTriggered: {
-                        copyURLToClipboard(contextMenu.currentIndex);
+                        copyURLToClipboard(treeView.selection.currentIndex);
                     }
                 }
 
                 MenuItem {
                     text: "Rename"
+                    enabled: (selectedItems == 1)
                     onTriggered: {
-                        renameFile(contextMenu.currentIndex);
+                        renameFile(treeView.selection.currentIndex);
                     }
                 }
 
                 MenuItem {
                     text: "Delete"
+                    enabled: (selectedItems > 0)
                     onTriggered: {
-                        deleteFile(contextMenu.currentIndex);
+                        deleteFile();
                     }
                 }
-            }
-        }
+            }// End_OF( contextMenu )
+        }// End_OF( treeView )
 
         Row {
             id: infoRow
@@ -885,7 +894,7 @@ Windows.ScrollingWindow {
                                             "Baking compresses and optimizes files for faster network transfer and display. We recommend you bake your content to reduce initial load times for your visitors.");
                     }
             } 
-        }
+        }// End_OF( infoRow )
 
         HifiControls.ContentSection {
             id: uploadSection
@@ -945,7 +954,7 @@ Windows.ScrollingWindow {
                     }
                 }
             }
-        }
+        }// End_OF( uploadSection )
     }
 }
 

From dfdf28f37e4572bb95b6354be850356ad8bffa27 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 26 Jan 2018 17:34:05 -0500
Subject: [PATCH 054/569] [Case 10865] Some cleanup for multi-selection
 (details below).

* Remove setCurrentIndex call when looping over current selection.
* Changed selectedItems var name to selectedItemCount to clarify what
  it represents.
* Change path arg name to paths to clarify that there can be more
  than a single path contained within it.

Changes Committed:
    modified:   interface/resources/qml/hifi/AssetServer.qml
---
 interface/resources/qml/hifi/AssetServer.qml | 49 ++++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 7c16b19865..30f76fecd6 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -37,7 +37,7 @@ Windows.ScrollingWindow {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
-    property var selectedItems: treeView.selection.selectedIndexes.length;
+    property var selectedItemCount: treeView.selection.selectedIndexes.length;
 
     Settings {
         category: "Overlay.AssetServer"
@@ -75,17 +75,17 @@ Windows.ScrollingWindow {
         });
     }
 
-    function doDeleteFile(path) {
-        console.log("Deleting " + path);
+    function doDeleteFile(paths) {
+        console.log("Deleting " + paths);
 
-        Assets.deleteMappings(path, function(err) {
+        Assets.deleteMappings(paths, function(err) {
             if (err) {
-                console.log("Asset browser - error deleting path: ", path, err);
+                console.log("Asset browser - error deleting paths: ", paths, err);
 
-                box = errorMessageBox("There was an error deleting:\n" + path + "\n" + err);
+                box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err);
                 box.selected.connect(reload);
             } else {
-                console.log("Asset browser - finished deleting path: ", path);
+                console.log("Asset browser - finished deleting paths: ", paths);
                 reload();
             }
         });
@@ -145,7 +145,7 @@ Windows.ScrollingWindow {
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
         
-        if (selectedItems > 1) {
+        if (selectedItemCount > 1) {
             return false;
         }
 
@@ -155,7 +155,7 @@ Windows.ScrollingWindow {
     }
     
     function canRename() {    
-        if (treeView.selection.hasSelection && selectedItems == 1) {
+        if (treeView.selection.hasSelection && selectedItemCount == 1) {
             return true;
         } else {
             return false;
@@ -333,29 +333,28 @@ Windows.ScrollingWindow {
         });
     }
     function deleteFile(index) {
-        var path = [];
+        var paths = [];
         
         if (!index) {
-            for (var i = 0; i < selectedItems; i++) {
-                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
-                 index = treeView.selection.currentIndex;
-                 path[i] = assetProxyModel.data(index, 0x100);                  
+            for (var i = 0; i < selectedItemCount; ++i) {
+                 index = treeView.selection.selectedIndexes[i];
+                 paths[i] = assetProxyModel.data(index, 0x100);
             }
         }
         
-        if (!path) {
+        if (!paths) {
             return;
         }
 
         var modalMessage = "";
-        var items = selectedItems.toString();
+        var items = selectedItemCount.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
         
-        if (selectedItems > 1) {
+        if (selectedItemCount > 1) {
             modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
         } else {
-            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + paths + "\nDo you want to continue?";
         }
         
         var object = desktop.messageBox({
@@ -367,7 +366,7 @@ Windows.ScrollingWindow {
         });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
-                doDeleteFile(path);
+                doDeleteFile(paths);
             }
         });
     }
@@ -743,7 +742,7 @@ Windows.ScrollingWindow {
                         // the selection.
                         var clickedIndex = treeView.indexAt(mouse.x, mouse.y);
                         var displayContextMenu = false;
-                        for ( var i = 0; i < selectedItems; ++i) {
+                        for ( var i = 0; i < selectedItemCount; ++i) {
                             var currentSelectedIndex = treeView.selection.selectedIndexes[i];
                             if (clickedIndex === currentSelectedIndex) {
                                 contextMenu.popup();
@@ -761,7 +760,7 @@ Windows.ScrollingWindow {
 
                 MenuItem {
                     text: "Copy URL"
-                    enabled: (selectedItems == 1)
+                    enabled: (selectedItemCount == 1)
                     onTriggered: {
                         copyURLToClipboard(treeView.selection.currentIndex);
                     }
@@ -769,7 +768,7 @@ Windows.ScrollingWindow {
 
                 MenuItem {
                     text: "Rename"
-                    enabled: (selectedItems == 1)
+                    enabled: (selectedItemCount == 1)
                     onTriggered: {
                         renameFile(treeView.selection.currentIndex);
                     }
@@ -777,7 +776,7 @@ Windows.ScrollingWindow {
 
                 MenuItem {
                     text: "Delete"
-                    enabled: (selectedItems > 0)
+                    enabled: (selectedItemCount > 0)
                     onTriggered: {
                         deleteFile();
                     }
@@ -796,8 +795,8 @@ Windows.ScrollingWindow {
 
                 function makeText() {
                     var numPendingBakes = assetMappingsModel.numPendingBakes;
-                    if (selectedItems > 1 || numPendingBakes === 0) {
-                        return selectedItems + " items selected";
+                    if (selectedItemCount > 1 || numPendingBakes === 0) {
+                        return selectedItemCount + " items selected";
                     } else {
                         return numPendingBakes + " bakes pending"
                     }

From 70e23f3ce86f5837f24eaea39c422aeea23c64f0 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Tue, 30 Jan 2018 14:00:09 -0500
Subject: [PATCH 055/569] [Case 10865] Bringing in multi-select fix from
 Desktop AssetServer.

Changes Committed:
    modified:   interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
---
 .../qml/hifi/dialogs/TabletAssetServer.qml    | 82 ++++++++++---------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index a02496a252..9c61206592 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -39,7 +39,7 @@ Rectangle {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
-    property var selectedItems: treeView.selection.selectedIndexes.length;
+    property var selectedItemCount: treeView.selection.selectedIndexes.length;
 
     Settings {
         category: "Overlay.AssetServer"
@@ -76,17 +76,17 @@ Rectangle {
         });
     }
 
-    function doDeleteFile(path) {
-        console.log("Deleting " + path);
+    function doDeleteFile(paths) {
+        console.log("Deleting " + paths);
 
-        Assets.deleteMappings(path, function(err) {
+        Assets.deleteMappings(paths, function(err) {
             if (err) {
-                console.log("Asset browser - error deleting path: ", path, err);
+                console.log("Asset browser - error deleting paths: ", paths, err);
 
-                box = errorMessageBox("There was an error deleting:\n" + path + "\n" + err);
+                box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err);
                 box.selected.connect(reload);
             } else {
-                console.log("Asset browser - finished deleting path: ", path);
+                console.log("Asset browser - finished deleting paths: ", paths);
                 reload();
             }
         });
@@ -146,7 +146,7 @@ Rectangle {
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
         
-        if (selectedItems > 1) {
+        if (selectedItemCount > 1) {
             return false;
         }
 
@@ -156,7 +156,7 @@ Rectangle {
     }
     
     function canRename() {    
-        if (treeView.selection.hasSelection && selectedItems == 1) {
+        if (treeView.selection.hasSelection && selectedItemCount == 1) {
             return true;
         } else {
             return false;
@@ -334,29 +334,28 @@ Rectangle {
         });
     }
     function deleteFile(index) {
-        var path = [];
+        var paths = [];
         
         if (!index) {
-            for (var i = 0; i < selectedItems; i++) {
-                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
-                 index = treeView.selection.currentIndex;
-                 path[i] = assetProxyModel.data(index, 0x100);                  
+            for (var i = 0; i < selectedItemCount; ++i) {
+                 index = treeView.selection.selectedIndexes[i];
+                 paths[i] = assetProxyModel.data(index, 0x100);
             }
         }
         
-        if (!path) {
+        if (!paths) {
             return;
         }
 
         var modalMessage = "";
-        var items = selectedItems.toString();
+        var items = selectedItemCount.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
         
-        if (selectedItems > 1) {
+        if (selectedItemCount > 1) {
             modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
         } else {
-            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + paths + "\nDo you want to continue?";
         }
 
         var object = tabletRoot.messageBox({
@@ -368,7 +367,7 @@ Rectangle {
         });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
-                doDeleteFile(path);
+                doDeleteFile(paths);
             }
         });
     }
@@ -693,7 +692,7 @@ Rectangle {
                         }
                     }
                 }
-            }
+            }// End_OF( itemLoader )
 
             Rectangle {
                 id: treeLabelToolTip
@@ -730,50 +729,59 @@ Rectangle {
                     showTimer.stop();
                     treeLabelToolTip.visible = false;
                 }
-            }
+            }// End_OF( treeLabelToolTip )
             
             MouseArea {
                 propagateComposedEvents: true
                 anchors.fill: parent
                 acceptedButtons: Qt.RightButton
                 onClicked: {
-                    if (!HMD.active) {  // Popup only displays properly on desktop
-                        var index = treeView.indexAt(mouse.x, mouse.y);
-                        treeView.selection.setCurrentIndex(index, 0x0002);
-                        contextMenu.currentIndex = index;
-                        contextMenu.popup();
+                    if (treeView.selection.hasSelection && !HMD.active) {  // Popup only displays properly on desktop
+                        // Only display the popup if the click triggered within
+                        // the selection.
+                        var clickedIndex = treeView.indexAt(mouse.x, mouse.y);
+                        var displayContextMenu = false;
+                        for ( var i = 0; i < selectedItemCount; ++i) {
+                            var currentSelectedIndex = treeView.selection.selectedIndexes[i];
+                            if (clickedIndex === currentSelectedIndex) {
+                                contextMenu.popup();
+                                break;
+                            }
+                        }
                     }
                 }
             }
-                
+
             Menu {
                 id: contextMenu
                 title: "Edit"
                 property var url: ""
-                property var currentIndex: null
 
                 MenuItem {
                     text: "Copy URL"
+                    enabled: (selectedItemCount == 1)
                     onTriggered: {
-                        copyURLToClipboard(contextMenu.currentIndex);
+                        copyURLToClipboard(treeView.selection.currentIndex);
                     }
                 }
 
                 MenuItem {
                     text: "Rename"
+                    enabled: (selectedItemCount == 1)
                     onTriggered: {
-                        renameFile(contextMenu.currentIndex);
+                        renameFile(treeView.selection.currentIndex);
                     }
                 }
 
                 MenuItem {
                     text: "Delete"
+                    enabled: (selectedItemCount > 0)
                     onTriggered: {
-                        deleteFile(contextMenu.currentIndex);
+                        deleteFile();
                     }
                 }
-            }
-        }
+            }// End_OF( contextMenu )
+        }// End_OF( treeView )
 
         Row {
             id: infoRow
@@ -786,8 +794,8 @@ Rectangle {
 
                 function makeText() {
                     var numPendingBakes = assetMappingsModel.numPendingBakes;
-                    if (selectedItems > 1 || numPendingBakes === 0) {
-                        return selectedItems + " items selected";
+                    if (selectedItemCount > 1 || numPendingBakes === 0) {
+                        return selectedItemCount + " items selected";
                     } else {
                         return numPendingBakes + " bakes pending"
                     }
@@ -884,7 +892,7 @@ Rectangle {
                                             "Baking compresses and optimizes files for faster network transfer and display. We recommend you bake your content to reduce initial load times for your visitors.");
                     }
             } 
-        }
+        }// End_OF( infoRow )
 
         HifiControls.TabletContentSection {
             id: uploadSection
@@ -961,7 +969,7 @@ Rectangle {
                     }
                 }
             }
-        }
+        }// End_OF( uploadSection )
     }
 }
 

From f344e44d26bf8d307a00593e34481bd25954bebf Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 31 Jan 2018 10:19:17 +0100
Subject: [PATCH 056/569] Switched to a simpler manual fixed/slope based shadow
 bias system. Automatic stuff fail most of the time

---
 libraries/render-utils/src/LightStage.cpp     | 22 +------
 libraries/render-utils/src/LightStage.h       |  4 +-
 .../render-utils/src/RenderShadowTask.cpp     |  8 +--
 libraries/render-utils/src/RenderShadowTask.h |  9 ++-
 libraries/render-utils/src/Shadow.slh         | 18 ++---
 libraries/render-utils/src/ShadowCore.slh     | 13 +---
 libraries/render-utils/src/Shadows_shared.slh |  4 +-
 .../developer/utilities/render/debugShadow.js |  4 +-
 scripts/developer/utilities/render/shadow.qml | 65 +++++++++++++++----
 9 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
index e06d24f1b1..259d0dd665 100644
--- a/libraries/render-utils/src/LightStage.cpp
+++ b/libraries/render-utils/src/LightStage.cpp
@@ -70,18 +70,6 @@ LightStage::Shadow::Schema::Schema() {
     maxDistance = 20.0f;
 }
 
-void LightStage::Shadow::Schema::updateCascade(int cascadeIndex, const ViewFrustum& shadowFrustum) {
-    auto& cascade = cascades[cascadeIndex];
-    cascade.frustumPosition = shadowFrustum.getPosition();
-    // The adaptative bias is computing how much depth offset we have to add to
-    // push back a coarsely sampled surface perpendicularly to the shadow direction,
-    // to not have shadow acnee. The final computation is done in the shader, based on the
-    // surface normal.
-    auto maxWorldFrustumSize = glm::max(shadowFrustum.getWidth(), shadowFrustum.getHeight());
-    cascade.adaptiveBiasUnitScale = maxWorldFrustumSize * 0.5f * invMapSize;
-    cascade.adaptiveBiasTransformScale = shadowFrustum.getNearClip() * shadowFrustum.getFarClip() / (shadowFrustum.getFarClip() - shadowFrustum.getNearClip());
-}
-
 LightStage::Shadow::Cascade::Cascade() : 
     _frustum{ std::make_shared<ViewFrustum>() },
     _minDistance{ 0.0f },
@@ -222,17 +210,14 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum,
     auto position = viewFrustum.getPosition() - (nearDepth + farDepth)*lightDirection;
     // Update the buffer
     auto& schema = _schemaBuffer.edit<Schema>();
-    auto cascadeIndex = 0;
     for (auto& cascade : _cascades) {
         cascade._frustum->setOrientation(orientation);
         cascade._frustum->setPosition(position);
-        schema.cascades[cascadeIndex].frustumPosition = position;
-        cascadeIndex++;
     }
 }
 
 void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& viewFrustum,
-                                            float nearDepth, float farDepth, float baseBias) {
+                                            float nearDepth, float farDepth, float fixedBias, float slopeBias) {
     assert(nearDepth < farDepth);
     assert(cascadeIndex < _cascades.size());
 
@@ -283,8 +268,8 @@ void LightStage::Shadow::setKeylightCascadeFrustum(unsigned int cascadeIndex, co
     auto& schema = _schemaBuffer.edit<Schema>();
     auto& schemaCascade = schema.cascades[cascadeIndex];
     schemaCascade.reprojection = _biasMatrix * ortho * shadowViewInverse.getMatrix();
-    schemaCascade.fixedBias = baseBias;
-    schema.updateCascade(cascadeIndex, *cascade._frustum);
+    schemaCascade.fixedBias = fixedBias;
+    schemaCascade.slopeBias = slopeBias;
 }
 
 void LightStage::Shadow::setCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& shadowFrustum) {
@@ -298,7 +283,6 @@ void LightStage::Shadow::setCascadeFrustum(unsigned int cascadeIndex, const View
     auto& schema = _schemaBuffer.edit<Schema>();
     auto& schemaCascade = schema.cascades[cascadeIndex];
     schemaCascade.reprojection = _biasMatrix * shadowFrustum.getProjection() * viewInverse.getMatrix();
-    schema.updateCascade(cascadeIndex, shadowFrustum);
 }
 
 LightStage::Index LightStage::findLight(const LightPointer& light) const {
diff --git a/libraries/render-utils/src/LightStage.h b/libraries/render-utils/src/LightStage.h
index 922ec5eb4a..9812426fa6 100644
--- a/libraries/render-utils/src/LightStage.h
+++ b/libraries/render-utils/src/LightStage.h
@@ -80,7 +80,7 @@ public:
         void setKeylightFrustum(const ViewFrustum& viewFrustum,
                                 float nearDepth = 1.0f, float farDepth = 1000.0f);
         void setKeylightCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& viewFrustum,
-                                float nearDepth = 1.0f, float farDepth = 1000.0f, float baseBias = 0.005f);
+                                float nearDepth = 1.0f, float farDepth = 1000.0f, float fixedBias = 0.005f, float slopeBias = 0.005f);
         void setCascadeFrustum(unsigned int cascadeIndex, const ViewFrustum& shadowFrustum);
 
         const UniformBufferView& getBuffer() const { return _schemaBuffer; }
@@ -110,8 +110,6 @@ public:
 
             Schema();
 
-            void updateCascade(int cascadeIndex, const ViewFrustum& shadowFrustum);
-
         };
         UniformBufferView _schemaBuffer = nullptr;
     };
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 2172dda3e3..2b5ab09c06 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -256,9 +256,8 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext) {
 }
 
 void RenderShadowCascadeSetup::configure(const Config& configuration) {
-    // I'm not very proud of this empirical adjustment
-    auto cascadeBias = configuration.bias * powf(1.1f, _cascadeIndex);
-    _baseBias = cascadeBias * cascadeBias * 0.01f;
+    _fixedBias = configuration.fixedBias * configuration.fixedBias * configuration.fixedBias * 0.004f;
+    _slopeBias = configuration.slopeBias * configuration.slopeBias * configuration.slopeBias * 0.01f;
 }
 
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
@@ -274,7 +273,8 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
         output.edit1() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
 
-        globalShadow->setKeylightCascadeFrustum(_cascadeIndex, args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR, _baseBias);
+        globalShadow->setKeylightCascadeFrustum(_cascadeIndex, args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR, 
+                                                _fixedBias, _slopeBias);
 
         // Set the keylight render args
         args->pushViewFrustum(*(globalShadow->getCascade(_cascadeIndex).getFrustum()));
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index c4f0c65bfc..7e5655b375 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -64,10 +64,12 @@ public:
 
 class RenderShadowCascadeSetupConfig : public render::Job::Config {
     Q_OBJECT
-        Q_PROPERTY(float bias MEMBER bias NOTIFY dirty)
+        Q_PROPERTY(float fixedBias MEMBER fixedBias NOTIFY dirty)
+        Q_PROPERTY(float slopeBias MEMBER slopeBias NOTIFY dirty)
 public:
 
-    float bias{ 0.25f };
+    float fixedBias{ 0.15f };
+    float slopeBias{ 0.55f };
 
 signals:
     void dirty();
@@ -86,7 +88,8 @@ public:
 private:
 
     unsigned int _cascadeIndex;
-    float _baseBias{ 0.1f };
+    float _fixedBias{ 0.1f };
+    float _slopeBias{ 0.1f };
 };
 
 class RenderShadowCascadeTeardown {
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index c11f5fa6a7..6575e68090 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -83,19 +83,12 @@ float evalShadowAttenuationPCF(int cascadeIndex, ShadowSampleOffsets offsets, ve
     return shadowAttenuation;
 }
 
-float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float bias,
-                                   vec3 worldPosition, vec3 worldLightDir) {
+float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float oneMinusNdotL) {
     if (!isShadowCascadeProjectedOnPixel(shadowTexcoord)) {
         // If a point is not in the map, do not attenuate
         return 1.0;
     }
-    // After this, bias is in view units
-    bias *= getShadowAdaptiveBiasUnitScale(cascadeIndex);
-    // Transform to texcoord space (between 0 and 1)
-    float shadowDepth = abs(dot(worldPosition-getShadowFrustumPosition(cascadeIndex), worldLightDir));
-    bias = transformShadowAdaptiveBias(cascadeIndex, shadowDepth, bias);
-    // Add fixed bias
-    bias += getShadowBias(cascadeIndex);
+    float bias = getShadowFixedBias(cascadeIndex) + getShadowSlopeBias(cascadeIndex) * oneMinusNdotL;
     return evalShadowAttenuationPCF(cascadeIndex, offsets, shadowTexcoord, bias);
 }
 
@@ -106,12 +99,11 @@ float evalShadowAttenuation(vec3 worldLightDir, vec4 worldPosition, float viewDe
     float cascadeMix = determineShadowCascadesOnPixel(worldPosition, viewDepth, cascadeShadowCoords, cascadeIndices);
 	
     // Adjust bias if we are at a grazing angle with light
-    float ndotl = dot(worldLightDir, worldNormal);
-    float bias = 1.0/(ndotl*ndotl)-1.0;
+    float oneMinusNdotL = 1.0 - clamp(dot(worldLightDir, worldNormal), 0, 1);
     vec2 cascadeAttenuations = vec2(1.0, 1.0);
-    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, offsets, cascadeShadowCoords[0], bias, worldPosition.xyz, worldLightDir);
+    cascadeAttenuations.x = evalShadowCascadeAttenuation(cascadeIndices.x, offsets, cascadeShadowCoords[0], oneMinusNdotL);
     if (cascadeMix > 0.0 && cascadeIndices.y < getShadowCascadeCount()) {
-        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, offsets, cascadeShadowCoords[1], bias, worldPosition.xyz, worldLightDir);
+        cascadeAttenuations.y = evalShadowCascadeAttenuation(cascadeIndices.y, offsets, cascadeShadowCoords[1], oneMinusNdotL);
     }
     float attenuation = mix(cascadeAttenuations.x, cascadeAttenuations.y, cascadeMix);
     // Falloff to max distance
diff --git a/libraries/render-utils/src/ShadowCore.slh b/libraries/render-utils/src/ShadowCore.slh
index 2d48e16ef4..782e2bc2b8 100644
--- a/libraries/render-utils/src/ShadowCore.slh
+++ b/libraries/render-utils/src/ShadowCore.slh
@@ -37,21 +37,14 @@ float getShadowScale() {
 	return shadow.invMapSize;
 }
 
-float getShadowBias(int cascadeIndex) {
+float getShadowFixedBias(int cascadeIndex) {
 	return shadow.cascades[cascadeIndex].fixedBias;
 }
 
-vec3 getShadowFrustumPosition(int cascadeIndex) {
-	return shadow.cascades[cascadeIndex].frustumPosition;
+float getShadowSlopeBias(int cascadeIndex) {
+	return shadow.cascades[cascadeIndex].slopeBias;
 }
 
-float getShadowAdaptiveBiasUnitScale(int cascadeIndex) {
-	return shadow.cascades[cascadeIndex].adaptiveBiasUnitScale;
-}
-
-float transformShadowAdaptiveBias(int cascadeIndex, float shadowDepth, float depthBias) {
-    return shadow.cascades[cascadeIndex].adaptiveBiasTransformScale * depthBias / (shadowDepth*shadowDepth);
-}
 
 // Compute the texture coordinates from world coordinates
 vec4 evalShadowTexcoord(int cascadeIndex, vec4 position) {
diff --git a/libraries/render-utils/src/Shadows_shared.slh b/libraries/render-utils/src/Shadows_shared.slh
index def6b1b4d4..0d49fc037e 100644
--- a/libraries/render-utils/src/Shadows_shared.slh
+++ b/libraries/render-utils/src/Shadows_shared.slh
@@ -11,10 +11,8 @@
 
 struct ShadowTransform {
 	MAT4 reprojection;
-    VEC3 frustumPosition;
 	float fixedBias;
-    float adaptiveBiasUnitScale;
-    float adaptiveBiasTransformScale;
+    float slopeBias;
     float _padding1;
     float _padding2;
 };
diff --git a/scripts/developer/utilities/render/debugShadow.js b/scripts/developer/utilities/render/debugShadow.js
index a0d2142258..1f1d00e6b4 100644
--- a/scripts/developer/utilities/render/debugShadow.js
+++ b/scripts/developer/utilities/render/debugShadow.js
@@ -14,7 +14,7 @@ var qml = Script.resolvePath('shadow.qml');
 var window = new OverlayWindow({
     title: 'Shadow Debug',
     source: qml,
-    width: 200, 
-    height: 90
+    width: 250, 
+    height: 300
 });
 window.closed.connect(function() { Script.stop(); });
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
index 32405a5260..a077ab9f50 100644
--- a/scripts/developer/utilities/render/shadow.qml
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -36,6 +36,14 @@ Column {
         shadow1Config.enabled = false;
         shadow2Config.enabled = false;
         shadow3Config.enabled = false;
+        shadow0Config.isFrozen = false;
+        shadow1Config.isFrozen = false;
+        shadow2Config.isFrozen = false;
+        shadow3Config.isFrozen = false;
+        shadow0BoundConfig.isFrozen = false;
+        shadow1BoundConfig.isFrozen = false;
+        shadow2BoundConfig.isFrozen = false;
+        shadow3BoundConfig.isFrozen = false;
     }
 
     CheckBox {
@@ -72,35 +80,68 @@ Column {
         }
     }
     ConfigSlider {
-        label: qsTr("Cascade 0 bias")
+        label: qsTr("Cascade 0 fixed bias")
         integral: false
         config: Render.getConfig("RenderMainView.ShadowCascadeSetup0")
-        property: "bias"
+        property: "fixedBias"
         max: 1.0
-        min: 0.01
+        min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 1 bias")
+        label: qsTr("Cascade 1 fixed bias")
         integral: false
         config: Render.getConfig("RenderMainView.ShadowCascadeSetup1")
-        property: "bias"
+        property: "fixedBias"
         max: 1.0
-        min: 0.01
+        min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 2 bias")
+        label: qsTr("Cascade 2 fixed bias")
         integral: false
         config: Render.getConfig("RenderMainView.ShadowCascadeSetup2")
-        property: "bias"
+        property: "fixedBias"
         max: 1.0
-        min: 0.01
+        min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 3 bias")
+        label: qsTr("Cascade 3 fixed bias")
         integral: false
         config: Render.getConfig("RenderMainView.ShadowCascadeSetup3")
-        property: "bias"
+        property: "fixedBias"
         max: 1.0
-        min: 0.01
+        min: 0.0
+    }
+
+    ConfigSlider {
+        label: qsTr("Cascade 0 slope bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup0")
+        property: "slopeBias"
+        max: 1.0
+        min: 0.0
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 1 slope bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup1")
+        property: "slopeBias"
+        max: 1.0
+        min: 0.0
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 2 slope bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup2")
+        property: "slopeBias"
+        max: 1.0
+        min: 0.0
+    }
+    ConfigSlider {
+        label: qsTr("Cascade 3 slope bias")
+        integral: false
+        config: Render.getConfig("RenderMainView.ShadowCascadeSetup3")
+        property: "slopeBias"
+        max: 1.0
+        min: 0.0
     }
 }

From 3fa2babec2ea97178ae2030982459f6b511366b7 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 31 Jan 2018 11:55:46 +0100
Subject: [PATCH 057/569] Moved cascade frustum pre-computation to single
 ShadowSetup job

---
 .../render-utils/src/RenderShadowTask.cpp     | 75 ++++++++++++++++---
 libraries/render-utils/src/RenderShadowTask.h | 61 ++++++++++-----
 scripts/developer/utilities/render/shadow.qml | 41 +++++-----
 3 files changed, 128 insertions(+), 49 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 2b5ab09c06..b83911582c 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -213,7 +213,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
         initZPassPipelines(*shapePlumber, state);
     }
 
-    task.addJob<RenderShadowSetup>("ShadowSetup");
+    const auto coarseFrustum = task.addJob<RenderShadowSetup>("ShadowSetup");
 
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
         char jobName[64];
@@ -243,7 +243,31 @@ void RenderShadowTask::configure(const Config& configuration) {
 //    Task::configure(configuration);
 }
 
-void RenderShadowSetup::run(const render::RenderContextPointer& renderContext) {
+RenderShadowSetup::RenderShadowSetup() :
+    _coarseShadowFrustum{ std::make_shared<ViewFrustum>() } {
+
+}
+
+void RenderShadowSetup::configure(const Config& configuration) {
+    setConstantBias(0, configuration.constantBias0);
+    setConstantBias(1, configuration.constantBias1);
+    setConstantBias(2, configuration.constantBias2);
+    setConstantBias(3, configuration.constantBias3);
+    setSlopeBias(0, configuration.slopeBias0);
+    setSlopeBias(1, configuration.slopeBias1);
+    setSlopeBias(2, configuration.slopeBias2);
+    setSlopeBias(3, configuration.slopeBias3);
+}
+
+void RenderShadowSetup::setConstantBias(int cascadeIndex, float value) {
+    _bias[cascadeIndex]._constant = value * value * value * 0.004f;
+}
+
+void RenderShadowSetup::setSlopeBias(int cascadeIndex, float value) {
+    _bias[cascadeIndex]._slope = value * value * value * 0.01f;
+}
+
+void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Output& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
     // Cache old render args
@@ -252,12 +276,46 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext) {
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow) {
         globalShadow->setKeylightFrustum(args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR);
-    }
-}
+        auto firstCascadeFrustum = globalShadow->getCascade(0).getFrustum();
+        unsigned int cascadeIndex;
+        _coarseShadowFrustum->setPosition(firstCascadeFrustum->getPosition());
+        _coarseShadowFrustum->setOrientation(firstCascadeFrustum->getOrientation());
 
-void RenderShadowCascadeSetup::configure(const Config& configuration) {
-    _fixedBias = configuration.fixedBias * configuration.fixedBias * configuration.fixedBias * 0.004f;
-    _slopeBias = configuration.slopeBias * configuration.slopeBias * configuration.slopeBias * 0.01f;
+        // Adjust each cascade frustum
+        for (cascadeIndex = 0; cascadeIndex < globalShadow->getCascadeCount(); ++cascadeIndex) {
+            auto& bias = _bias[cascadeIndex];
+            globalShadow->setKeylightCascadeFrustum(cascadeIndex, args->getViewFrustum(),
+                                                    SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR,
+                                                    bias._constant, bias._slope);
+        }
+        // Now adjust coarse frustum bounds
+        auto left = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getRight());
+        auto right = glm::dot(firstCascadeFrustum->getFarTopRight(), firstCascadeFrustum->getRight());
+        auto top = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getUp());
+        auto bottom = glm::dot(firstCascadeFrustum->getFarBottomRight(), firstCascadeFrustum->getUp());
+        auto near = firstCascadeFrustum->getNearClip();
+        auto far = firstCascadeFrustum->getFarClip();
+        for (cascadeIndex = 1; cascadeIndex < globalShadow->getCascadeCount(); ++cascadeIndex) {
+            auto cascadeLeft = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getRight());
+            auto cascadeRight = glm::dot(firstCascadeFrustum->getFarTopRight(), firstCascadeFrustum->getRight());
+            auto cascadeTop = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getUp());
+            auto cascadeBottom = glm::dot(firstCascadeFrustum->getFarBottomRight(), firstCascadeFrustum->getUp());
+            auto cascadeNear = firstCascadeFrustum->getNearClip();
+            auto cascadeFar = firstCascadeFrustum->getFarClip();
+            left = glm::min(left, cascadeLeft);
+            right = glm::max(right, cascadeRight);
+            bottom = glm::min(bottom, cascadeBottom);
+            top = glm::max(top, cascadeTop);
+            near = glm::min(near, cascadeNear);
+            far = glm::max(far, cascadeFar);
+        }
+        _coarseShadowFrustum->setProjection(glm::ortho<float>(left, right, bottom, top, near, far));
+        _coarseShadowFrustum->calculate();
+
+        output = _coarseShadowFrustum;
+    } else {
+        output = nullptr;
+    }
 }
 
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
@@ -273,9 +331,6 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
         output.edit1() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
 
-        globalShadow->setKeylightCascadeFrustum(_cascadeIndex, args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR, 
-                                                _fixedBias, _slopeBias);
-
         // Set the keylight render args
         args->pushViewFrustum(*(globalShadow->getCascade(_cascadeIndex).getFrustum()));
         args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 7e5655b375..f488c46b8e 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -17,6 +17,8 @@
 
 #include <render/CullTask.h>
 
+#include "Shadows_shared.slh"
+
 class ViewFrustum;
 
 class RenderShadowMap {
@@ -53,43 +55,64 @@ public:
     void configure(const Config& configuration);
 };
 
-class RenderShadowSetup {
-public:
-    using JobModel = render::Job::Model<RenderShadowSetup>;
-
-    RenderShadowSetup() {}
-    void run(const render::RenderContextPointer& renderContext);
-
-};
-
-class RenderShadowCascadeSetupConfig : public render::Job::Config {
+class RenderShadowSetupConfig : public render::Job::Config {
     Q_OBJECT
-        Q_PROPERTY(float fixedBias MEMBER fixedBias NOTIFY dirty)
-        Q_PROPERTY(float slopeBias MEMBER slopeBias NOTIFY dirty)
+        Q_PROPERTY(float constantBias0 MEMBER constantBias0 NOTIFY dirty)
+        Q_PROPERTY(float constantBias1 MEMBER constantBias1 NOTIFY dirty)
+        Q_PROPERTY(float constantBias2 MEMBER constantBias2 NOTIFY dirty)
+        Q_PROPERTY(float constantBias3 MEMBER constantBias3 NOTIFY dirty)
+        Q_PROPERTY(float slopeBias0 MEMBER slopeBias0 NOTIFY dirty)
+        Q_PROPERTY(float slopeBias1 MEMBER slopeBias1 NOTIFY dirty)
+        Q_PROPERTY(float slopeBias2 MEMBER slopeBias2 NOTIFY dirty)
+        Q_PROPERTY(float slopeBias3 MEMBER slopeBias3 NOTIFY dirty)
 public:
 
-    float fixedBias{ 0.15f };
-    float slopeBias{ 0.55f };
+    float constantBias0{ 0.15f };
+    float constantBias1{ 0.15f };
+    float constantBias2{ 0.15f };
+    float constantBias3{ 0.15f };
+    float slopeBias0{ 0.55f };
+    float slopeBias1{ 0.55f };
+    float slopeBias2{ 0.55f };
+    float slopeBias3{ 0.55f };
 
 signals:
     void dirty();
 };
 
+class RenderShadowSetup {
+public:
+    using Output = ViewFrustumPointer;
+    using Config = RenderShadowSetupConfig;
+    using JobModel = render::Job::ModelO<RenderShadowSetup, Output, Config>;
+
+    RenderShadowSetup();
+    void configure(const Config& configuration);
+    void run(const render::RenderContextPointer& renderContext, Output& output);
+
+private:
+
+    ViewFrustumPointer _coarseShadowFrustum;
+    struct {
+        float _constant;
+        float _slope;
+    } _bias[SHADOW_CASCADE_MAX_COUNT];
+
+    void setConstantBias(int cascadeIndex, float value);
+    void setSlopeBias(int cascadeIndex, float value);
+};
+
 class RenderShadowCascadeSetup {
 public:
     using Outputs = render::VaryingSet3<RenderArgs::RenderMode, render::ItemFilter, float>;
-    using Config = RenderShadowCascadeSetupConfig;
-    using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs, Config>;
+    using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs>;
 
     RenderShadowCascadeSetup(unsigned int cascadeIndex) : _cascadeIndex{ cascadeIndex } {}
-    void configure(const Config& configuration);
     void run(const render::RenderContextPointer& renderContext, Outputs& output);
 
 private:
 
     unsigned int _cascadeIndex;
-    float _fixedBias{ 0.1f };
-    float _slopeBias{ 0.1f };
 };
 
 class RenderShadowCascadeTeardown {
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
index a077ab9f50..3400dcd847 100644
--- a/scripts/developer/utilities/render/shadow.qml
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -18,6 +18,7 @@ Column {
     id: root
     spacing: 8
     property var viewConfig: Render.getConfig("RenderMainView.DrawViewFrustum");
+    property var shadowConfig : Render.getConfig("RenderMainView.ShadowSetup");
     property var shadow0Config: Render.getConfig("RenderMainView.DrawShadowFrustum0");
     property var shadow1Config: Render.getConfig("RenderMainView.DrawShadowFrustum1");
     property var shadow2Config: Render.getConfig("RenderMainView.DrawShadowFrustum2");
@@ -80,34 +81,34 @@ Column {
         }
     }
     ConfigSlider {
-        label: qsTr("Cascade 0 fixed bias")
+        label: qsTr("Cascade 0 constant bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup0")
-        property: "fixedBias"
+        config: shadowConfig
+        property: "constantBias0"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 1 fixed bias")
+        label: qsTr("Cascade 1 constant bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup1")
-        property: "fixedBias"
+        config: shadowConfig
+        property: "constantBias1"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 2 fixed bias")
+        label: qsTr("Cascade 2 constant bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup2")
-        property: "fixedBias"
+        config: shadowConfig
+        property: "constantBias2"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
-        label: qsTr("Cascade 3 fixed bias")
+        label: qsTr("Cascade 3 constant bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup3")
-        property: "fixedBias"
+        config: shadowConfig
+        property: "constantBias3"
         max: 1.0
         min: 0.0
     }
@@ -115,32 +116,32 @@ Column {
     ConfigSlider {
         label: qsTr("Cascade 0 slope bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup0")
-        property: "slopeBias"
+        config: shadowConfig
+        property: "slopeBias0"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
         label: qsTr("Cascade 1 slope bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup1")
-        property: "slopeBias"
+        config: shadowConfig
+        property: "slopeBias1"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
         label: qsTr("Cascade 2 slope bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup2")
-        property: "slopeBias"
+        config: shadowConfig
+        property: "slopeBias2"
         max: 1.0
         min: 0.0
     }
     ConfigSlider {
         label: qsTr("Cascade 3 slope bias")
         integral: false
-        config: Render.getConfig("RenderMainView.ShadowCascadeSetup3")
-        property: "slopeBias"
+        config: shadowConfig
+        property: "slopeBias3"
         max: 1.0
         min: 0.0
     }

From d422545c78a999041f956e02a5d2e74203e79493 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Wed, 31 Jan 2018 17:13:06 +0100
Subject: [PATCH 058/569] Changed shadow task to do a single octree query as
 well as pipeline/depth sort for all cascades. Still issue with disapearing
 objects from shadow map with viewpoint

---
 .../render-utils/src/RenderShadowTask.cpp     | 105 +++++----
 libraries/render-utils/src/RenderShadowTask.h |  17 +-
 libraries/render-utils/src/RenderViewTask.cpp |   9 +-
 libraries/render/src/render/CullTask.cpp      | 203 ++++++++++++++----
 libraries/render/src/render/CullTask.h        |  40 +++-
 .../src/render/RenderFetchCullSortTask.cpp    |   6 +-
 6 files changed, 273 insertions(+), 107 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index b83911582c..c9df67dad1 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -213,28 +213,34 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
         initZPassPipelines(*shapePlumber, state);
     }
 
-    const auto coarseFrustum = task.addJob<RenderShadowSetup>("ShadowSetup");
+    const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
+    // Fetch and cull the items from the scene
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
+    const auto fetchInput = render::Varying(shadowCasterFilter);
+    const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
+    const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
+    const auto shadowItems = task.addJob<FetchSpatialSelection>("FetchShadowSelection", selectionInputs);
+
+    // Sort
+    const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadow", shadowItems);
+    const auto sortedShapes = task.addJob<DepthSortShapes>("DepthSortShadow", sortedPipelines, true);
 
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
         char jobName[64];
         sprintf(jobName, "ShadowCascadeSetup%d", i);
-        const auto setupOutput = task.addJob<RenderShadowCascadeSetup>(jobName, i);
-        const auto shadowFilter = setupOutput.getN<RenderShadowCascadeSetup::Outputs>(1);
+        const auto shadowFilter = task.addJob<RenderShadowCascadeSetup>(jobName, i);
 
-        // CPU jobs:
-        // Fetch and cull the items from the scene
-        const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowSelection", shadowFilter);
-        const auto cullInputs = CullSpatialSelection::Inputs(shadowSelection, shadowFilter).asVarying();
-        const auto culledShadowSelection = task.addJob<CullSpatialSelection>("CullShadowSelection", cullInputs, cullFunctor, RenderDetails::SHADOW);
-
-        // Sort
-        const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadowSort", culledShadowSelection);
-        const auto sortedShapesAndBounds = task.addJob<DepthSortShapesAndComputeBounds>("DepthSortShadowMap", sortedPipelines, true);
+        // CPU jobs: finer grained culling
+        const auto cullInputs = CullShapeBounds::Inputs(sortedShapes, shadowFilter).asVarying();
+        const auto culledShadowItemsAndBounds = task.addJob<CullShapeBounds>("CullShadowCascade", cullInputs, cullFunctor, RenderDetails::SHADOW);
 
         // GPU jobs: Render to shadow map
-        task.addJob<RenderShadowMap>("RenderShadowMap", sortedShapesAndBounds, shapePlumber, i);
-        task.addJob<RenderShadowCascadeTeardown>("ShadowCascadeTeardown", setupOutput);
+        sprintf(jobName, "RenderShadowMap%d", i);
+        task.addJob<RenderShadowMap>(jobName, culledShadowItemsAndBounds, shapePlumber, i);
+        task.addJob<RenderShadowCascadeTeardown>("ShadowCascadeTeardown", shadowFilter);
     }
+
+    task.addJob<RenderShadowTeardown>("ShadowTeardown", setupOutput);
 }
 
 void RenderShadowTask::configure(const Config& configuration) {
@@ -267,16 +273,19 @@ void RenderShadowSetup::setSlopeBias(int cascadeIndex, float value) {
     _bias[cascadeIndex]._slope = value * value * value * 0.01f;
 }
 
-void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Output& output) {
+void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
+    output.edit0() = args->_renderMode;
+    output.edit1() = args->_sizeScale;
+
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow) {
         globalShadow->setKeylightFrustum(args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR);
-        auto firstCascadeFrustum = globalShadow->getCascade(0).getFrustum();
+        auto& firstCascadeFrustum = globalShadow->getCascade(0).getFrustum();
         unsigned int cascadeIndex;
         _coarseShadowFrustum->setPosition(firstCascadeFrustum->getPosition());
         _coarseShadowFrustum->setOrientation(firstCascadeFrustum->getOrientation());
@@ -296,12 +305,13 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
         auto near = firstCascadeFrustum->getNearClip();
         auto far = firstCascadeFrustum->getFarClip();
         for (cascadeIndex = 1; cascadeIndex < globalShadow->getCascadeCount(); ++cascadeIndex) {
-            auto cascadeLeft = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getRight());
-            auto cascadeRight = glm::dot(firstCascadeFrustum->getFarTopRight(), firstCascadeFrustum->getRight());
-            auto cascadeTop = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getUp());
-            auto cascadeBottom = glm::dot(firstCascadeFrustum->getFarBottomRight(), firstCascadeFrustum->getUp());
-            auto cascadeNear = firstCascadeFrustum->getNearClip();
-            auto cascadeFar = firstCascadeFrustum->getFarClip();
+            auto& cascadeFrustum = globalShadow->getCascade(cascadeIndex).getFrustum();
+            auto cascadeLeft = glm::dot(cascadeFrustum->getFarTopLeft(), cascadeFrustum->getRight());
+            auto cascadeRight = glm::dot(cascadeFrustum->getFarTopRight(), cascadeFrustum->getRight());
+            auto cascadeTop = glm::dot(cascadeFrustum->getFarTopLeft(), cascadeFrustum->getUp());
+            auto cascadeBottom = glm::dot(cascadeFrustum->getFarBottomRight(), cascadeFrustum->getUp());
+            auto cascadeNear = cascadeFrustum->getNearClip();
+            auto cascadeFar = cascadeFrustum->getFarClip();
             left = glm::min(left, cascadeLeft);
             right = glm::max(right, cascadeRight);
             bottom = glm::min(bottom, cascadeBottom);
@@ -312,9 +322,14 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
         _coarseShadowFrustum->setProjection(glm::ortho<float>(left, right, bottom, top, near, far));
         _coarseShadowFrustum->calculate();
 
-        output = _coarseShadowFrustum;
-    } else {
-        output = nullptr;
+        // Push frustum for further culling and selection
+        args->pushViewFrustum(*_coarseShadowFrustum);
+
+        args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
+        if (lightStage->getCurrentKeyLight()->getType() == graphics::Light::SUN) {
+            // Set to ridiculously high amount to prevent solid angle culling in octree selection
+            args->_sizeScale = 1e16f;
+        }
     }
 }
 
@@ -324,37 +339,41 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
-    output.edit0() = args->_renderMode;
-    output.edit2() = args->_sizeScale;
-
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output.edit1() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
+        output = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
 
         // Set the keylight render args
-        args->pushViewFrustum(*(globalShadow->getCascade(_cascadeIndex).getFrustum()));
-        args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
-        if (lightStage->getCurrentKeyLight()->getType() == graphics::Light::SUN) {
-            const float shadowSizeScale = 1e16f;
-            // Set the size scale to a ridiculously high value to prevent small object culling which assumes
-            // the view frustum is a perspective projection. But this isn't the case for the sun which
-            // is an orthographic projection.
-            args->_sizeScale = shadowSizeScale;
-        }
-
+        auto& cascade = globalShadow->getCascade(_cascadeIndex);
+        auto& cascadeFrustum = cascade.getFrustum();
+        args->pushViewFrustum(*cascadeFrustum);
+        // Set the cull threshold to 2 shadow texels.
+        auto texelSize = glm::max(cascadeFrustum->getHeight(), cascadeFrustum->getWidth()) / cascade.framebuffer->getSize().x;
+        texelSize *= 2.0f;
+        // SizeScale is used in the shadow cull function defined ine RenderViewTask
+        args->_sizeScale = texelSize * texelSize;
     } else {
-        output.edit1() = ItemFilter::Builder::nothing();
+        output = ItemFilter::Builder::nothing();
     }
 }
 
 void RenderShadowCascadeTeardown::run(const render::RenderContextPointer& renderContext, const Input& input) {
     RenderArgs* args = renderContext->args;
 
-    if (args->_renderMode == RenderArgs::SHADOW_RENDER_MODE && !input.get1().selectsNothing()) {
+    if (args->_renderMode == RenderArgs::SHADOW_RENDER_MODE && !input.selectsNothing()) {
+        args->popViewFrustum();
+    }
+    assert(args->hasViewFrustum());
+}
+
+void RenderShadowTeardown::run(const render::RenderContextPointer& renderContext, const Input& input) {
+    RenderArgs* args = renderContext->args;
+
+    if (args->_renderMode == RenderArgs::SHADOW_RENDER_MODE) {
         args->popViewFrustum();
     }
     assert(args->hasViewFrustum());
     // Reset the render args
     args->_renderMode = input.get0();
-    args->_sizeScale = input.get2();
-};
+    args->_sizeScale = input.get1();
+}
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index f488c46b8e..1736d07fd5 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -82,13 +82,13 @@ signals:
 
 class RenderShadowSetup {
 public:
-    using Output = ViewFrustumPointer;
+    using Outputs = render::VaryingSet2<RenderArgs::RenderMode, float>;
     using Config = RenderShadowSetupConfig;
-    using JobModel = render::Job::ModelO<RenderShadowSetup, Output, Config>;
+    using JobModel = render::Job::ModelO<RenderShadowSetup, Outputs, Config>;
 
     RenderShadowSetup();
     void configure(const Config& configuration);
-    void run(const render::RenderContextPointer& renderContext, Output& output);
+    void run(const render::RenderContextPointer& renderContext, Outputs& output);
 
 private:
 
@@ -104,7 +104,7 @@ private:
 
 class RenderShadowCascadeSetup {
 public:
-    using Outputs = render::VaryingSet3<RenderArgs::RenderMode, render::ItemFilter, float>;
+    using Outputs = render::ItemFilter;
     using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs>;
 
     RenderShadowCascadeSetup(unsigned int cascadeIndex) : _cascadeIndex{ cascadeIndex } {}
@@ -117,9 +117,16 @@ private:
 
 class RenderShadowCascadeTeardown {
 public:
-    using Input = RenderShadowCascadeSetup::Outputs;
+    using Input = render::ItemFilter;
     using JobModel = render::Job::ModelI<RenderShadowCascadeTeardown, Input>;
     void run(const render::RenderContextPointer& renderContext, const Input& input);
 };
 
+class RenderShadowTeardown {
+public:
+    using Input = RenderShadowSetup::Outputs;
+    using JobModel = render::Job::ModelI<RenderShadowTeardown, Input>;
+    void run(const render::RenderContextPointer& renderContext, const Input& input);
+};
+
 #endif // hifi_RenderShadowTask_h
diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp
index dc6c66e058..c2e43582cd 100644
--- a/libraries/render-utils/src/RenderViewTask.cpp
+++ b/libraries/render-utils/src/RenderViewTask.cpp
@@ -21,13 +21,8 @@ void RenderViewTask::build(JobModel& task, const render::Varying& input, render:
     // but the cullFunctor passed is probably tailored for perspective projection and culls too much.
     task.addJob<RenderShadowTask>("RenderShadowTask", [](const RenderArgs* args, const AABox& bounds) {
         // Cull only objects that are too small relatively to shadow frustum
-        auto& frustum = args->getViewFrustum();
-        auto frustumSize = std::max(frustum.getHeight(), frustum.getWidth());
-        const auto boundsRadius = bounds.getDimensions().length();
-        const auto relativeBoundRadius = boundsRadius / frustumSize;
-        const auto threshold = 1e-3f;
-        return relativeBoundRadius > threshold;
-        return true;
+        const auto boundsSquareRadius = glm::dot(bounds.getDimensions(), bounds.getDimensions());
+        return boundsSquareRadius > args->_sizeScale;
     });
 
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 70331cdb47..c6ff224560 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -19,6 +19,50 @@
 
 using namespace render;
 
+// Culling Frustum / solidAngle test helper class
+struct Test {
+    CullFunctor _functor;
+    RenderArgs* _args;
+    RenderDetails::Item& _renderDetails;
+    glm::vec3 _eyePos;
+    float _squareTanAlpha;
+
+    Test(CullFunctor& functor, RenderArgs* pargs, RenderDetails::Item& renderDetails) :
+        _functor(functor),
+        _args(pargs),
+        _renderDetails(renderDetails) {
+        // FIXME: Keep this code here even though we don't use it yet
+        /*_eyePos = _args->getViewFrustum().getPosition();
+        float a = glm::degrees(Octree::getAccuracyAngle(_args->_sizeScale, _args->_boundaryLevelAdjust));
+        auto angle = std::min(glm::radians(45.0f), a); // no worse than 45 degrees
+        angle = std::max(glm::radians(1.0f / 60.0f), a); // no better than 1 minute of degree
+        auto tanAlpha = tan(angle);
+        _squareTanAlpha = (float)(tanAlpha * tanAlpha);
+        */
+    }
+
+    bool frustumTest(const AABox& bound) {
+        if (!_args->getViewFrustum().boxIntersectsFrustum(bound)) {
+            _renderDetails._outOfView++;
+            return false;
+        }
+        return true;
+    }
+
+    bool solidAngleTest(const AABox& bound) {
+        // FIXME: Keep this code here even though we don't use it yet
+        //auto eyeToPoint = bound.calcCenter() - _eyePos;
+        //auto boundSize = bound.getDimensions();
+        //float test = (glm::dot(boundSize, boundSize) / glm::dot(eyeToPoint, eyeToPoint)) - squareTanAlpha;
+        //if (test < 0.0f) {
+        if (!_functor(_args, bound)) {
+            _renderDetails._tooSmall++;
+            return false;
+        }
+        return true;
+    }
+};
+
 void render::cullItems(const RenderContextPointer& renderContext, const CullFunctor& cullFunctor, RenderDetails::Item& details,
                        const ItemBounds& inItems, ItemBounds& outItems) {
     assert(renderContext->args);
@@ -82,18 +126,20 @@ void FetchSpatialTree::configure(const Config& config) {
     _lodAngle = config.lodAngle;
 }
 
-void FetchSpatialTree::run(const RenderContextPointer& renderContext, const ItemFilter& filter, ItemSpatialTree::ItemSelection& outSelection) {
+void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemSpatialTree::ItemSelection& outSelection) {
     // start fresh
     outSelection.clear();
 
+    auto& filter = inputs;
+
     if (!filter.selectsNothing()) {
         assert(renderContext->args);
         assert(renderContext->args->hasViewFrustum());
         RenderArgs* args = renderContext->args;
         auto& scene = renderContext->_scene;
 
-        // Eventually use a frozen frustum
         auto queryFrustum = args->getViewFrustum();
+        // Eventually use a frozen frustum
         if (_freezeFrustum) {
             if (_justFrozeFrustum) {
                 _justFrozeFrustum = false;
@@ -134,50 +180,6 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
         args->pushViewFrustum(_frozenFrustum); // replace the true view frustum by the frozen one
     }
 
-    // Culling Frustum / solidAngle test helper class
-    struct Test {
-        CullFunctor _functor;
-        RenderArgs* _args;
-        RenderDetails::Item& _renderDetails;
-        glm::vec3 _eyePos;
-        float _squareTanAlpha;
-
-        Test(CullFunctor& functor, RenderArgs* pargs, RenderDetails::Item& renderDetails) :
-            _functor(functor),
-            _args(pargs),
-            _renderDetails(renderDetails)
-        {
-            // FIXME: Keep this code here even though we don't use it yet
-            /*_eyePos = _args->getViewFrustum().getPosition();
-            float a = glm::degrees(Octree::getAccuracyAngle(_args->_sizeScale, _args->_boundaryLevelAdjust));
-            auto angle = std::min(glm::radians(45.0f), a); // no worse than 45 degrees
-            angle = std::max(glm::radians(1.0f / 60.0f), a); // no better than 1 minute of degree
-            auto tanAlpha = tan(angle);
-            _squareTanAlpha = (float)(tanAlpha * tanAlpha);
-            */
-        }
-
-        bool frustumTest(const AABox& bound) {
-            if (!_args->getViewFrustum().boxIntersectsFrustum(bound)) {
-                _renderDetails._outOfView++;
-                return false;
-            }
-            return true;
-        }
-
-        bool solidAngleTest(const AABox& bound) {
-            // FIXME: Keep this code here even though we don't use it yet
-            //auto eyeToPoint = bound.calcCenter() - _eyePos;
-            //auto boundSize = bound.getDimensions();
-            //float test = (glm::dot(boundSize, boundSize) / glm::dot(eyeToPoint, eyeToPoint)) - squareTanAlpha;
-            //if (test < 0.0f) {
-            if (!_functor(_args, bound)) {
-                _renderDetails._tooSmall++;
-                return false;
-            }
-            return true;
-        }
-    };
     Test test(_cullFunctor, args, details);
 
     // Now we have a selection of items to render
@@ -309,3 +311,112 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
 
     std::static_pointer_cast<Config>(renderContext->jobConfig)->numItems = (int)outItems.size();
 }
+
+void CullShapeBounds::run(const RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+
+    const auto& inShapes = inputs.get0();
+    const auto& filter = inputs.get1();
+    auto& outShapes = outputs.edit0();
+    auto& outBounds = outputs.edit1();
+
+    outShapes.clear();
+    outBounds = AABox();
+
+    if (!filter.selectsNothing()) {
+        auto& details = args->_details.edit(_detailType);
+        Test test(_cullFunctor, args, details);
+
+        for (auto& inItems : inShapes) {
+            auto key = inItems.first;
+            auto outItems = outShapes.find(key);
+            if (outItems == outShapes.end()) {
+                outItems = outShapes.insert(std::make_pair(key, ItemBounds{})).first;
+                outItems->second.reserve(inItems.second.size());
+            }
+
+            details._considered += (int)inItems.second.size();
+
+            for (auto& item : inItems.second) {
+                if (test.frustumTest(item.bound) && test.solidAngleTest(item.bound)) {
+                    outItems->second.emplace_back(item);
+                    outBounds += item.bound;
+                }
+            }
+
+            details._rendered += (int)outItems->second.size();
+        }
+
+        for (auto& items : outShapes) {
+            items.second.shrink_to_fit();
+        }
+    }
+}
+
+void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
+                               const Inputs& inputs, ItemBounds& outItems) {
+    assert(renderContext->args);
+    RenderArgs* args = renderContext->args;
+    auto& scene = renderContext->_scene;
+    auto& inSelection = inputs.get0();
+
+    // Now we have a selection of items to render
+    outItems.clear();
+    outItems.reserve(inSelection.numItems());
+
+    const auto filter = inputs.get1();
+    if (!filter.selectsNothing()) {
+        // Now get the bound, and
+        // filter individually against the _filter
+
+        // inside & fit items: filter only, culling is disabled
+        {
+            PerformanceTimer perfTimer("insideFitItems");
+            for (auto id : inSelection.insideItems) {
+                auto& item = scene->getItem(id);
+                if (filter.test(item.getKey())) {
+                    ItemBound itemBound(id, item.getBound());
+                    outItems.emplace_back(itemBound);
+                }
+            }
+        }
+
+        // inside & subcell items: filter only, culling is disabled
+        {
+            PerformanceTimer perfTimer("insideSmallItems");
+            for (auto id : inSelection.insideSubcellItems) {
+                auto& item = scene->getItem(id);
+                if (filter.test(item.getKey())) {
+                    ItemBound itemBound(id, item.getBound());
+                    outItems.emplace_back(itemBound);
+                }
+            }
+        }
+
+        // partial & fit items: filter only, culling is disabled
+        {
+            PerformanceTimer perfTimer("partialFitItems");
+            for (auto id : inSelection.partialItems) {
+                auto& item = scene->getItem(id);
+                if (filter.test(item.getKey())) {
+                    ItemBound itemBound(id, item.getBound());
+                    outItems.emplace_back(itemBound);
+                }
+            }
+        }
+
+        // partial & subcell items: filter only, culling is disabled
+        {
+            PerformanceTimer perfTimer("partialSmallItems");
+            for (auto id : inSelection.partialSubcellItems) {
+                auto& item = scene->getItem(id);
+                if (filter.test(item.getKey())) {
+                    ItemBound itemBound(id, item.getBound());
+                    outItems.emplace_back(itemBound);
+                }
+            }
+        }
+    }
+}
diff --git a/libraries/render/src/render/CullTask.h b/libraries/render/src/render/CullTask.h
index 486c4f4cdf..a140a86aee 100644
--- a/libraries/render/src/render/CullTask.h
+++ b/libraries/render/src/render/CullTask.h
@@ -55,12 +55,13 @@ namespace render {
         float _lodAngle;
     public:
         using Config = FetchSpatialTreeConfig;
-        using JobModel = Job::ModelIO<FetchSpatialTree, ItemFilter, ItemSpatialTree::ItemSelection, Config>;
+        using Inputs = ItemFilter;
+        using JobModel = Job::ModelIO<FetchSpatialTree, Inputs, ItemSpatialTree::ItemSelection, Config>;
 
         FetchSpatialTree() {}
 
         void configure(const Config& config);
-        void run(const RenderContextPointer& renderContext, const ItemFilter& filter, ItemSpatialTree::ItemSelection& outSelection);
+        void run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemSpatialTree::ItemSelection& outSelection);
     };
 
     class CullSpatialSelectionConfig : public Job::Config {
@@ -96,7 +97,8 @@ namespace render {
             _detailType(type) {}
 
         CullSpatialSelection(CullFunctor cullFunctor) :
-            _cullFunctor{ cullFunctor } {}
+            _cullFunctor{ cullFunctor } {
+        }
 
         CullFunctor _cullFunctor;
         RenderDetails::Type _detailType{ RenderDetails::OTHER };
@@ -105,6 +107,38 @@ namespace render {
         void run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems);
     };
 
+    class CullShapeBounds {
+    public:
+        using Inputs = render::VaryingSet2<ShapeBounds, ItemFilter>;
+        using Outputs = render::VaryingSet2<ShapeBounds, AABox>;
+        using JobModel = Job::ModelIO<CullShapeBounds, Inputs, Outputs>;
+
+        CullShapeBounds(CullFunctor cullFunctor, RenderDetails::Type type) :
+            _cullFunctor{ cullFunctor },
+            _detailType(type) {}
+
+        CullShapeBounds(CullFunctor cullFunctor) :
+            _cullFunctor{ cullFunctor } {
+        }
+
+        void run(const RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+    private:
+
+        CullFunctor _cullFunctor;
+        RenderDetails::Type _detailType{ RenderDetails::OTHER };
+
+    };
+
+    class FetchSpatialSelection {
+    public:
+        using Inputs = render::VaryingSet2<ItemSpatialTree::ItemSelection, ItemFilter>;
+        using JobModel = Job::ModelIO<FetchSpatialSelection, Inputs, ItemBounds>;
+
+        FetchSpatialSelection() {}
+        void run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems);
+    };
+
 }
 
 #endif // hifi_render_CullTask_h;
\ No newline at end of file
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index d7294fa2bd..a1b4f079e7 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -23,9 +23,9 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
     // CPU jobs:
     // Fetch and cull the items from the scene
     const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered();
-    const auto spatialFilter = render::Varying(filter);
-    const auto spatialSelection = task.addJob<FetchSpatialTree>("FetchSceneSelection", spatialFilter);
-    const auto cullInputs = CullSpatialSelection::Inputs(spatialSelection, spatialFilter).asVarying();
+    const auto fetchInput = render::Varying(filter);
+    const auto spatialSelection = task.addJob<FetchSpatialTree>("FetchSceneSelection", fetchInput);
+    const auto cullInputs = CullSpatialSelection::Inputs(spatialSelection, render::Varying(filter)).asVarying();
     const auto culledSpatialSelection = task.addJob<CullSpatialSelection>("CullSceneSelection", cullInputs, cullFunctor, RenderDetails::ITEM);
 
     // Overlays are not culled

From c01790bd3e2deefe8789bfeceebff1182a0da76f Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 31 Jan 2018 18:27:15 -0800
Subject: [PATCH 059/569] punch list updates and various fixes

---
 .../system/libraries/entitySelectionTool.js   | 342 ++++++++++++------
 1 file changed, 231 insertions(+), 111 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index fbda9e9eba..87dc089c1a 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -94,6 +94,7 @@ SelectionManager = (function() {
         for (var i = 0; i < entityIDs.length; i++) {
             var entityID = entityIDs[i];
             that.selections.push(entityID);
+            //Selection.addToSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
         }
 
         that._update(true);
@@ -110,8 +111,10 @@ SelectionManager = (function() {
             }
             if (idx === -1) {
                 that.selections.push(entityID);
+                //Selection.addToSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
             } else if (toggleSelection) {
                 that.selections.splice(idx, 1);
+                //Selection.removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
             }
         }
 
@@ -122,6 +125,7 @@ SelectionManager = (function() {
         var idx = that.selections.indexOf(entityID);
         if (idx >= 0) {
             that.selections.splice(idx, 1);
+            //Selection.removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
         }
         that._update(true);
     };
@@ -145,9 +149,9 @@ SelectionManager = (function() {
             that.localPosition = properties.position;
             that.localRotation = properties.rotation;
             that.localRegistrationPoint = properties.registrationPoint;
-            that.worldDimensions = properties.dimensions; // properties.boundingbox.dimensions;
-            that.worldPosition = properties.position;
-            that.worldRotation = properties.rotation;
+            that.worldDimensions = properties.boundingBox.dimensions;
+            that.worldPosition = properties.boundingBox.center;
+            that.worldRotation = properties.boundingBox.rotation;
             SelectionDisplay.setSpaceMode(SPACE_LOCAL);
         } else {
             that.localRotation = null;
@@ -225,39 +229,43 @@ function getRelativeCenterPosition(dimensions, registrationPoint) {
 SelectionDisplay = (function() {
     var that = {};
 
-    var COLOR_GREEN = { red:0, green:255, blue:0 };
-    var COLOR_BLUE = { red:0, green:0, blue:255 };
-    var COLOR_RED = { red:255, green:0, blue:0 };
+    var COLOR_GREEN = { red:44, green:142, blue:14 };
+    var COLOR_BLUE = { red:0, green:147, blue:197 };
+    var COLOR_RED = { red:183, green:10, blue:55 };
 
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 1.35;
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_DIMENSION_MULTIPLE = 0.05;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 0.1;
+    var GRABBER_TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
     var GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
-    var GRABBER_TRANSLATE_ARROW_CONE_DIMENSION_MULTIPLE = 0.25;
-    var GRABBER_ROTATE_RINGS_DIMENSION_MULTIPLE = 2.0;
-    var GRABBER_STRETCH_SPHERE_OFFSET = 1.0;
-    var GRABBER_STRETCH_SPHERE_DIMENSION_MULTIPLE = 0.1;
-    var GRABBER_SCALE_CUBE_OFFSET = 1.0;
-    var GRABBER_SCALE_CUBE_DIMENSION_MULTIPLE = 0.15;
+    var GRABBER_TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
+    var GRABBER_ROTATE_RINGS_CAMERA_DISTANCE_MULTIPLE = 0.15;
+    var GRABBER_STRETCH_SPHERE_OFFSET = 0.06;
+    var GRABBER_STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE = 0.01;
+    var GRABBER_SCALE_CUBE_OFFSET = 0.5;
+    var GRABBER_SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.015;
     var GRABBER_CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 }; 
 
-    var GRABBER_SCALE_CUBE_IDLE_COLOR = { red:120, green:120, blue:120 };
-    var GRABBER_SCALE_CUBE_SELECTED_COLOR = { red:0, green:0, blue:0 };
-    var GRABBER_SCALE_EDGE_COLOR = { red:120, green:120, blue:120 };
+    var GRABBER_SCALE_CUBE_IDLE_COLOR = { red:106, green:106, blue:106 };
+    var GRABBER_SCALE_CUBE_SELECTED_COLOR = { red:18, green:18, blue:18 };
+    var GRABBER_SCALE_EDGE_COLOR = { red:87, green:87, blue:87 };
+    var GRABBER_HOVER_COLOR = { red:227, green:227, blue:227 };
 
     var SCALE_MINIMUM_DIMENSION = 0.02;
     var STRETCH_MINIMUM_DIMENSION = 0.001;
-    var STRETCH_DIRECTION_ALL_FACTOR = 15;
+    var STRETCH_DIRECTION_ALL_FACTOR = 25;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
     var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
-    var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.6;
-    var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18;
-    var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.14;
+    var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.3;
+    var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
+    var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
 
     var ROTATION_CTRL_SNAP_ANGLE = 22.5;
     var ROTATION_DEFAULT_SNAP_ANGLE = 1;
     var ROTATION_DEFAULT_TICK_MARKS_ANGLE = 5;
 
+    var ROTATION_RING_IDLE_INNER_RADIUS = 0.97;
+    var ROTATION_RING_SELECTED_INNER_RADIUS = 0.9;
+
     var TRANSLATE_DIRECTION = {
         X : 0,
         Y : 1,
@@ -307,6 +315,10 @@ SelectionDisplay = (function() {
 
     var ctrlPressed = false;
 
+    var previousHandle = null;
+    var previousHandleHelper = null;
+    var previousHandleColor;
+
     var activeTool = null;
     var grabberTools = {};
 
@@ -339,9 +351,10 @@ SelectionDisplay = (function() {
 
     var grabberPropertiesRotateRings = {
         alpha: 1,
-        innerRadius: 0.9,
+        solid: true,
         startAt: 0,
         endAt: 360,
+        innerRadius: ROTATION_RING_IDLE_INNER_RADIUS,
         majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE,
         majorTickMarksLength: 0.1,
         visible: false,
@@ -472,7 +485,7 @@ SelectionDisplay = (function() {
     var selectionBox = Overlays.addOverlay("cube", {
         size: 1,
         color: COLOR_RED,
-        alpha: 1,
+        alpha: 0, // setting to 0 alpha for now to keep this hidden vs using visible false because its used as the translate xz tool overlay
         solid: false,
         visible: false,
         dashed: false
@@ -644,12 +657,13 @@ SelectionDisplay = (function() {
                     pickNormal = { x:0, y:1, z:0 };
                 }
 
-                var rotation = SelectionManager.worldRotation;
+                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 pickNormal = Vec3.multiplyQbyV(rotation, pickNormal);
 
                 lastPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, pickNormal);
     
                 SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
 
                 that.setGrabberTranslateXVisible(direction === TRANSLATE_DIRECTION.X);
                 that.setGrabberTranslateYVisible(direction === TRANSLATE_DIRECTION.Y);
@@ -696,7 +710,7 @@ SelectionDisplay = (function() {
                     projectionVector = { x:0, y:0, z:1 };
                 }
 
-                var rotation = SelectionManager.worldRotation;
+                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 projectionVector = Vec3.multiplyQbyV(rotation, projectionVector);
 
                 var dotVector = Vec3.dot(vector, projectionVector);
@@ -924,6 +938,9 @@ SelectionDisplay = (function() {
             that.setGrabberStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
             that.setGrabberStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
             that.setGrabberClonerVisible(false);
+        
+            SelectionManager.saveProperties();
+            that.resetPreviousHandleColor();
 
             if (stretchPanel != null) {
                 Overlays.editOverlay(stretchPanel, { visible: true });
@@ -931,8 +948,6 @@ SelectionDisplay = (function() {
             if (scaleGrabber != null) {
                 Overlays.editOverlay(scaleGrabber, { color: GRABBER_SCALE_CUBE_SELECTED_COLOR });
             }
-        
-            SelectionManager.saveProperties();
         };
 
         var onEnd = function(event, reason) {    
@@ -1122,13 +1137,15 @@ SelectionDisplay = (function() {
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
     function updateRotationDegreesOverlay(angleFromZero, position) {
         var angle = angleFromZero * (Math.PI / 180);
+        var cameraPosition = Camera.getPosition();
+        var entityToCameraDistance = Vec3.length(Vec3.subtract(cameraPosition, position));
         var overlayProps = {
             position: position,
             dimensions: {
-                x: ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
-                y: ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
+                x: entityToCameraDistance * ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
+                y: entityToCameraDistance * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
             },
-            lineHeight: ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
+            lineHeight: entityToCameraDistance * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
             text: normalizeDegrees(-angleFromZero) + "°"
         };
         Overlays.editOverlay(rotationDegreesDisplay, overlayProps);
@@ -1173,6 +1190,7 @@ SelectionDisplay = (function() {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
                 SelectionManager.saveProperties();
+                that.resetPreviousHandleColor();
     
                 that.setGrabberTranslateVisible(false);
                 that.setGrabberRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
@@ -1196,9 +1214,13 @@ SelectionDisplay = (function() {
                     selectedGrabber = grabberRotateRollRing;
                 }
 
-                Overlays.editOverlay(selectedGrabber, { hasTickMarks: true });
+                Overlays.editOverlay(selectedGrabber, { 
+                    hasTickMarks: true,
+                    solid: false,
+                    innerRadius: ROTATION_RING_SELECTED_INNER_RADIUS
+                });
 
-                var rotation = SelectionManager.worldRotation;
+                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 rotationNormal = Vec3.multiplyQbyV(rotation, rotationNormal);
 
                 var rotCenter = SelectionManager.worldPosition;
@@ -1221,12 +1243,16 @@ SelectionDisplay = (function() {
 
                 var rotCenterToZero = Vec3.subtract(rotZero, rotCenter);
                 var rotCenterToZeroLength = Vec3.length(rotCenterToZero);
-                rotDegreePos = Vec3.sum(rotCenter, Vec3.multiply(Vec3.normalize(rotCenterToZero), rotCenterToZeroLength * 1.2));
+                rotDegreePos = Vec3.sum(rotCenter, Vec3.multiply(Vec3.normalize(rotCenterToZero), rotCenterToZeroLength * 1.75));
                 updateRotationDegreesOverlay(0, rotDegreePos);
             },
             onEnd: function(event, reason) {
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: false });
-                Overlays.editOverlay(selectedGrabber, { hasTickMarks: false });
+                Overlays.editOverlay(selectedGrabber, { 
+                    hasTickMarks: false,
+                    solid: true,
+                    innerRadius: ROTATION_RING_IDLE_INNER_RADIUS
+                });
                 Overlays.editOverlay(grabberRotateCurrentRing, { visible: false });
                 pushCommandForSelections();
             },
@@ -1266,6 +1292,7 @@ SelectionDisplay = (function() {
                     if (direction === ROTATE_DIRECTION.YAW) {
                         Overlays.editOverlay(grabberRotateCurrentRing, { rotation: worldRotationZ });
                     }
+
                 }
             }
         });
@@ -1307,7 +1334,6 @@ SelectionDisplay = (function() {
     };
 
     that.highlightSelectable = function(entityID) {
-        var properties = Entities.getEntityProperties(entityID);
     };
 
     that.unhighlightSelectable = function(entityID) {
@@ -1370,118 +1396,119 @@ SelectionDisplay = (function() {
         }
 
         if (SelectionManager.hasSelection()) {
-            var worldPosition = SelectionManager.worldPosition;
-            var worldRotation = SelectionManager.worldRotation;
-            var worldRotationInverse = Quat.inverse(worldRotation);
-            var worldDimensions = SelectionManager.worldDimensions;
+            var position = SelectionManager.worldPosition;
+            var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
+            var dimensions = spaceMode === SPACE_LOCAL ? SelectionManager.localDimensions : SelectionManager.worldDimensions;
+            var rotationInverse = Quat.inverse(rotation);
 
-            var worldDimensionsX = worldDimensions.x;
-            var worldDimensionsY = worldDimensions.y;
-            var worldDimensionsZ = worldDimensions.z;
-            var dimensionAverage = (worldDimensionsX + worldDimensionsY + worldDimensionsZ) / 3;
+            var cameraPosition = Camera.getPosition();
+            var entityToCameraDistance = Vec3.length(Vec3.subtract(cameraPosition, position));
 
             var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
-            worldRotationX = Quat.multiply(worldRotation, localRotationX);
+            rotationX = Quat.multiply(rotation, localRotationX);
+            worldRotationX = rotationX;
             var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
-            worldRotationY = Quat.multiply(worldRotation, localRotationY);
+            rotationY = Quat.multiply(rotation, localRotationY);
+            worldRotationY = rotationY;
             var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
-            worldRotationZ = Quat.multiply(worldRotation, localRotationZ);
+            rotationZ = Quat.multiply(rotation, localRotationZ);
+            worldRotationZ = rotationZ;
 
-            var arrowCylinderDimension = dimensionAverage * GRABBER_TRANSLATE_ARROW_CYLINDER_DIMENSION_MULTIPLE;
+            var arrowCylinderDimension = entityToCameraDistance * GRABBER_TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE;
             var arrowCylinderDimensions = { x:arrowCylinderDimension, y:arrowCylinderDimension * GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, z:arrowCylinderDimension };
-            var arrowConeDimension = dimensionAverage * GRABBER_TRANSLATE_ARROW_CONE_DIMENSION_MULTIPLE;
+            var arrowConeDimension = entityToCameraDistance * GRABBER_TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE;
             var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
-            var cylinderXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage, y:0, z:0 }));
+            var cylinderXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance, y:0, z:0 }));
             Overlays.editOverlay(grabberTranslateXCylinder, { 
                 position: cylinderXPos, 
-                rotation: worldRotationX,
+                rotation: rotationX,
                 dimensions: arrowCylinderDimensions
             });
-            var cylinderXDiff = Vec3.subtract(cylinderXPos, worldPosition);
+            var cylinderXDiff = Vec3.subtract(cylinderXPos, position);
             var coneXPos = Vec3.sum(cylinderXPos, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowCylinderDimensions.y * 0.83));
             Overlays.editOverlay(grabberTranslateXCone, { 
                 position: coneXPos, 
-                rotation: worldRotationX,
+                rotation: rotationX,
                 dimensions: arrowConeDimensions
             });
-            var cylinderYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage, z:0 }));
+            var cylinderYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance, z:0 }));
             Overlays.editOverlay(grabberTranslateYCylinder, { 
                 position: cylinderYPos, 
-                rotation: worldRotationY,
+                rotation: rotationY,
                 dimensions: arrowCylinderDimensions
             });
-            var cylinderYDiff = Vec3.subtract(cylinderYPos, worldPosition);
+            var cylinderYDiff = Vec3.subtract(cylinderYPos, position);
             var coneYPos = Vec3.sum(cylinderYPos, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowCylinderDimensions.y * 0.83));
             Overlays.editOverlay(grabberTranslateYCone, { 
                 position: coneYPos, 
-                rotation: worldRotationY,
+                rotation: rotationY,
                 dimensions: arrowConeDimensions
             });
-            var cylinderZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * dimensionAverage }));
+            var cylinderZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance }));
             Overlays.editOverlay(grabberTranslateZCylinder, { 
                 position: cylinderZPos, 
-                rotation: worldRotationZ,
+                rotation: rotationZ,
                 dimensions: arrowCylinderDimensions
             });
-            var cylinderZDiff = Vec3.subtract(cylinderZPos, worldPosition);
+            var cylinderZDiff = Vec3.subtract(cylinderZPos, position);
             var coneZPos = Vec3.sum(cylinderZPos, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowCylinderDimensions.y * 0.83));
             Overlays.editOverlay(grabberTranslateZCone, { 
                 position: coneZPos, 
-                rotation: worldRotationZ,
+                rotation: rotationZ,
                 dimensions: arrowConeDimensions
             });
 
-            var grabberScaleCubeOffsetX = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsX;
-            var grabberScaleCubeOffsetY = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsY;
-            var grabberScaleCubeOffsetZ = GRABBER_SCALE_CUBE_OFFSET * worldDimensionsZ;
-            var scaleDimension = dimensionAverage * GRABBER_SCALE_CUBE_DIMENSION_MULTIPLE;
+            var grabberScaleCubeOffsetX = GRABBER_SCALE_CUBE_OFFSET * dimensions.x;
+            var grabberScaleCubeOffsetY = GRABBER_SCALE_CUBE_OFFSET * dimensions.y;
+            var grabberScaleCubeOffsetZ = GRABBER_SCALE_CUBE_OFFSET * dimensions.z;
+            var scaleDimension = entityToCameraDistance * GRABBER_SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE;
             var scaleDimensions = { x:scaleDimension, y:scaleDimension, z:scaleDimension };
-            var grabberScaleLBNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            var grabberScaleLBNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleLBNCube, { 
                 position: grabberScaleLBNCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleRBNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            var grabberScaleRBNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleRBNCube, { 
                 position: grabberScaleRBNCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleLBFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            var grabberScaleLBFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleLBFCube, { 
                 position: grabberScaleLBFCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleRBFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            var grabberScaleRBFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleRBFCube, { 
                 position: grabberScaleRBFCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleLTNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            var grabberScaleLTNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleLTNCube, { 
                 position: grabberScaleLTNCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleRTNCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            var grabberScaleRTNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleRTNCube, { 
                 position: grabberScaleRTNCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleLTFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
+            var grabberScaleLTFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleLTFCube, { 
                 position: grabberScaleLTFCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
-            var grabberScaleRTFCubePos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
+            var grabberScaleRTFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
             Overlays.editOverlay(grabberScaleRTFCube, { 
                 position: grabberScaleRTFCubePos, 
-                rotation: worldRotation,
+                rotation: rotation,
                 dimensions: scaleDimensions
             });
 
@@ -1498,82 +1525,85 @@ SelectionDisplay = (function() {
             Overlays.editOverlay(grabberScaleFREdge, { start: grabberScaleRTFCubePos, end: grabberScaleRBFCubePos });
             Overlays.editOverlay(grabberScaleFLEdge, { start: grabberScaleLTFCubePos, end: grabberScaleLBFCubePos });
 
-            var stretchSphereDimension = dimensionAverage * GRABBER_STRETCH_SPHERE_DIMENSION_MULTIPLE;
+            var stretchSphereDimension = entityToCameraDistance * GRABBER_STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE;
             var stretchSphereDimensions = { x:stretchSphereDimension, y:stretchSphereDimension, z:stretchSphereDimension };
-            var stretchXPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsX, y:0, z:0 }));
+            var stretchXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance, y:0, z:0 }));
             Overlays.editOverlay(grabberStretchXSphere, { 
                 position: stretchXPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleLTFCubePos);
-            var grabberScaleRBFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRBFCubePos);
+            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleLTFCubePos);
+            var grabberScaleRBFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRBFCubePos);
             var stretchPanelXDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRBFCubePosRot);
             var tempY = Math.abs(stretchPanelXDimensions.y);
             stretchPanelXDimensions.x = 0.01;
             stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
             stretchPanelXDimensions.z = tempY;
+            var stretchPanelXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:dimensions.x / 2, y:0, z:0 }));
             Overlays.editOverlay(grabberStretchXPanel, { 
-                position: stretchXPos, 
-                rotation: worldRotationZ,
+                position: stretchPanelXPos, 
+                rotation: rotationZ,
                 dimensions: stretchPanelXDimensions
             });
-            var stretchYPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsY, z:0 }));
+            var stretchYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance, z:0 }));
             Overlays.editOverlay(grabberStretchYSphere, { 
                 position: stretchYPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleLTNCubePos);
-            var grabberScaleRTNCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRTFCubePos);
+            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleLTNCubePos);
+            var grabberScaleRTNCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRTFCubePos);
             var stretchPanelYDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRTNCubePosRot);
             var tempX = Math.abs(stretchPanelYDimensions.x);
             stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
             stretchPanelYDimensions.y = 0.01;
             stretchPanelYDimensions.z = tempX;
+            var stretchPanelYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:dimensions.y / 2, z:0 }));
             Overlays.editOverlay(grabberStretchYPanel, { 
-                position: stretchYPos, 
-                rotation: worldRotationY,
+                position: stretchPanelYPos, 
+                rotation: rotationY,
                 dimensions: stretchPanelYDimensions
             });
-            var stretchZPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET * worldDimensionsZ }));
+            var stretchZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance }));
             Overlays.editOverlay(grabberStretchZSphere, { 
                 position: stretchZPos, 
                 dimensions: stretchSphereDimensions 
             });
-            var grabberScaleRTFCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRTFCubePos);
-            var grabberScaleRBNCubePosRot = Vec3.multiplyQbyV(worldRotationInverse, grabberScaleRBNCubePos);
+            var grabberScaleRTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRTFCubePos);
+            var grabberScaleRBNCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRBNCubePos);
             var stretchPanelZDimensions = Vec3.subtract(grabberScaleRTFCubePosRot, grabberScaleRBNCubePosRot);
             var tempX = Math.abs(stretchPanelZDimensions.x);
             stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
             stretchPanelZDimensions.y = tempX;
             stretchPanelZDimensions.z = 0.01;
+            var stretchPanelZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:dimensions.z / 2 }));
             Overlays.editOverlay(grabberStretchZPanel, { 
-                position: stretchZPos, 
-                rotation: worldRotationX,
+                position: stretchPanelZPos, 
+                rotation: rotationX,
                 dimensions: stretchPanelZDimensions
             });
 
-            var rotateDimension = dimensionAverage * GRABBER_ROTATE_RINGS_DIMENSION_MULTIPLE;
+            var rotateDimension = entityToCameraDistance * GRABBER_ROTATE_RINGS_CAMERA_DISTANCE_MULTIPLE;
             var rotateDimensions = { x:rotateDimension, y:rotateDimension, z:rotateDimension };
             if (!isActiveTool(grabberRotatePitchRing)) {
                 Overlays.editOverlay(grabberRotatePitchRing, { 
-                    position: SelectionManager.worldPosition, 
-                    rotation: worldRotationY,
+                    position: position, 
+                    rotation: rotationY,
                     dimensions: rotateDimensions,
                     majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
             }
             if (!isActiveTool(grabberRotateYawRing)) {
                 Overlays.editOverlay(grabberRotateYawRing, { 
-                    position: SelectionManager.worldPosition, 
-                    rotation: worldRotationZ,
+                    position: position, 
+                    rotation: rotationZ,
                     dimensions: rotateDimensions,
                     majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
             }
             if (!isActiveTool(grabberRotateRollRing)) {
                 Overlays.editOverlay(grabberRotateRollRing, { 
-                    position: SelectionManager.worldPosition, 
-                    rotation: worldRotationX,
+                    position: position, 
+                    rotation: rotationX,
                     dimensions: rotateDimensions,
                     majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
                 });
@@ -1588,18 +1618,18 @@ SelectionDisplay = (function() {
                                   isActiveTool(grabberCloner) || isActiveTool(selectionBox);
 
             Overlays.editOverlay(selectionBox, {
-                position: worldPosition,
-                rotation: worldRotation,
-                dimensions: worldDimensions,
+                position: position,
+                rotation: rotation,
+                dimensions: dimensions,
                 visible: !inModeRotate
             });
 
-            var grabberClonerOffset =  { x:GRABBER_CLONER_OFFSET.x * worldDimensionsX, y:GRABBER_CLONER_OFFSET.y * worldDimensionsY, z:GRABBER_CLONER_OFFSET.z * worldDimensionsZ };
-            var grabberClonerPos = Vec3.sum(worldPosition, Vec3.multiplyQbyV(worldRotation, grabberClonerOffset));
+            var grabberClonerOffset =  { x:GRABBER_CLONER_OFFSET.x * dimensions.x, y:GRABBER_CLONER_OFFSET.y * dimensions.y, z:GRABBER_CLONER_OFFSET.z * dimensions.z };
+            var grabberClonerPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, grabberClonerOffset));
             Overlays.editOverlay(grabberCloner, {
                 position: grabberClonerPos,
-                rotation: worldRotation,
-                dimensions: scaleDimensions,
+                rotation: rotation,
+                dimensions: scaleDimensions
             });
         }
 
@@ -1615,12 +1645,14 @@ SelectionDisplay = (function() {
         that.setGrabberScaleVisible(!activeTool || isActiveTool(grabberScaleLBNCube) || isActiveTool(grabberScaleRBNCube) || isActiveTool(grabberScaleLBFCube) || isActiveTool(grabberScaleRBFCube)
                                                 || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube)
                                                 || isActiveTool(grabberStretchXSphere) || isActiveTool(grabberStretchYSphere) || isActiveTool(grabberStretchZSphere));
-        that.setGrabberClonerVisible(!activeTool || isActiveTool(grabberCloner));
+        //keep cloner always hidden for now since you can hold Alt to clone while dragging to translate  - we may bring cloner back for HMD only later
+        //that.setGrabberClonerVisible(!activeTool || isActiveTool(grabberCloner));
 
         if (wantDebug) {
             print("====== Update Grabbers <=======");
         }
     };
+    Script.update.connect(that.updateGrabbers);
 
     that.updateActiveRotateRing = function() {
         var activeRotateRing = null;
@@ -1756,6 +1788,7 @@ SelectionDisplay = (function() {
             }
 
             SelectionManager.saveProperties();
+            that.resetPreviousHandleColor();
 
             that.setGrabberTranslateVisible(false);
             that.setGrabberRotateVisible(false);
@@ -2059,6 +2092,33 @@ SelectionDisplay = (function() {
         return activeTool;
     };
 
+    that.resetPreviousHandleColor = function() {
+        if (previousHandle != null) {
+            Overlays.editOverlay(previousHandle, { color: previousHandleColor });
+            previousHandle = null;
+        }
+        if (previousHandleHelper != null) {
+            Overlays.editOverlay(previousHandleHelper, { color: previousHandleColor });
+            previousHandleHelper = null;
+        }
+    };
+
+    that.getHandleHelper = function(overlay) {
+        if (overlay === grabberTranslateXCone) {
+            return grabberTranslateXCylinder;
+        } else if (overlay === grabberTranslateXCylinder) {
+            return grabberTranslateXCone;
+        } else if (overlay === grabberTranslateYCone) {
+            return grabberTranslateYCylinder;
+        } else if (overlay === grabberTranslateYCylinder) {
+            return grabberTranslateYCone;
+        } else if (overlay === grabberTranslateZCone) {
+            return grabberTranslateZCylinder;
+        } else if (overlay === grabberTranslateZCylinder) {
+            return grabberTranslateZCone;
+        }
+    };
+
     // FUNCTION: MOUSE MOVE EVENT
     that.mouseMoveEvent = function(event) {
         var wantDebug = false;
@@ -2083,6 +2143,66 @@ SelectionDisplay = (function() {
             return true;
         }
 
+        // if no tool is active, then just look for handles to highlight...
+        var pickRay = generalComputePickRay(event.x, event.y);
+        var result = Overlays.findRayIntersection(pickRay);
+        var pickedColor;
+        var highlightNeeded = false;
+
+        if (result.intersects) {
+            switch (result.overlayID) {
+                case grabberTranslateXCone:
+                case grabberTranslateXCylinder:
+                case grabberRotatePitchRing:
+                case grabberStretchXSphere:
+                    pickedColor = COLOR_RED;
+                    highlightNeeded = true;
+                    break;
+                case grabberTranslateYCone:
+                case grabberTranslateYCylinder:
+                case grabberRotateYawRing:
+                case grabberStretchYSphere:
+                    pickedColor = COLOR_GREEN;
+                    highlightNeeded = true;
+                    break;
+                case grabberTranslateZCone:
+                case grabberTranslateZCylinder:
+                case grabberRotateRollRing:
+                case grabberStretchZSphere:
+                    pickedColor = COLOR_BLUE;
+                    highlightNeeded = true;
+                    break;
+                case grabberScaleLBNCube:
+                case grabberScaleRBNCube:
+                case grabberScaleLBFCube:
+                case grabberScaleRBFCube:
+                case grabberScaleLTNCube:
+                case grabberScaleRTNCube:
+                case grabberScaleLTFCube:
+                case grabberScaleRTFCube:
+                    pickedColor = GRABBER_SCALE_CUBE_IDLE_COLOR;
+                    highlightNeeded = true;
+                    break;
+                default:
+                    that.resetPreviousHandleColor();
+                    break;
+            }
+
+            if (highlightNeeded) {
+                that.resetPreviousHandleColor();
+                Overlays.editOverlay(result.overlayID, { color: GRABBER_HOVER_COLOR });
+                previousHandle = result.overlayID;
+                previousHandleHelper = that.getHandleHelper(result.overlayID);
+                if (previousHandleHelper != null) {
+                    Overlays.editOverlay(previousHandleHelper, { color: GRABBER_HOVER_COLOR });
+                }
+                previousHandleColor = pickedColor;
+            }
+
+        } else {
+            that.resetPreviousHandleColor();
+        }
+
         if (wantDebug) {
             print("=============== eST::MouseMoveEvent END =======================");
         }

From 06afaa7470f90a6b152c474958315d4c7e80ddd5 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 21 Dec 2017 15:13:57 -0500
Subject: [PATCH 060/569] BufferView <-> QVariant/QScriptValue conversion

update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
---
 interface/CMakeLists.txt                      |   2 +-
 interface/src/Application.cpp                 |  68 +-
 interface/src/Application.h                   |   1 -
 interface/src/ui/overlays/Base3DOverlay.h     |   6 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |   7 +
 interface/src/ui/overlays/ModelOverlay.h      |   1 +
 interface/src/ui/overlays/Shape3DOverlay.cpp  |  15 +
 interface/src/ui/overlays/Shape3DOverlay.h    |   1 +
 libraries/avatars-renderer/CMakeLists.txt     |   1 +
 .../src/avatars-renderer/Avatar.cpp           |  28 +
 .../src/avatars-renderer/Avatar.h             |   5 +-
 libraries/entities-renderer/CMakeLists.txt    |   1 +
 .../src/RenderableEntityItem.h                |   6 +-
 .../src/RenderableModelEntityItem.cpp         |  15 +-
 .../src/RenderableModelEntityItem.h           |   2 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   6 +-
 .../src/RenderablePolyLineEntityItem.h        |   1 +
 .../src/RenderablePolyVoxEntityItem.cpp       |  54 +-
 .../src/RenderablePolyVoxEntityItem.h         |   7 +-
 .../src/RenderableShapeEntityItem.cpp         |  21 +
 .../src/RenderableShapeEntityItem.h           |   2 +
 libraries/entities/src/EntityItem.h           |   4 -
 .../entities/src/EntityScriptingInterface.cpp |  24 -
 .../entities/src/EntityScriptingInterface.h   |   4 -
 libraries/fbx/src/FBXReader.cpp               |  16 +-
 libraries/fbx/src/OBJWriter.cpp               |  78 +-
 libraries/graphics-scripting/CMakeLists.txt   |   5 +
 .../graphics-scripting/BufferViewHelpers.cpp  | 195 ++++
 .../graphics-scripting/BufferViewHelpers.h    |  18 +
 .../BufferViewScripting.cpp                   |  83 ++
 .../graphics-scripting/BufferViewScripting.h  |  11 +
 .../src/graphics-scripting/DebugNames.h       |  72 ++
 .../ModelScriptingInterface.cpp               | 836 ++++++++++++++++++
 .../ModelScriptingInterface.h                 |  68 ++
 .../src/graphics-scripting/ScriptableMesh.cpp | 359 ++++++++
 .../src/graphics-scripting/ScriptableMesh.h   | 127 +++
 .../src/graphics-scripting/ScriptableModel.h  |  80 ++
 libraries/graphics/src/graphics/Geometry.cpp  |   6 +
 libraries/graphics/src/graphics/Geometry.h    |   1 +
 .../src/model-networking/SimpleMeshProxy.cpp  |  27 -
 .../src/model-networking/SimpleMeshProxy.h    |  36 -
 libraries/render-utils/CMakeLists.txt         |   1 +
 libraries/render-utils/src/GeometryCache.cpp  |  45 +
 libraries/render-utils/src/GeometryCache.h    |   1 +
 libraries/render-utils/src/Model.cpp          |  87 +-
 libraries/render-utils/src/Model.h            |   5 +-
 .../src/ModelScriptingInterface.cpp           | 251 ------
 .../src/ModelScriptingInterface.h             |  39 -
 libraries/script-engine/src/ScriptEngine.cpp  |   6 -
 libraries/shared/src/RegisteredMetaTypes.cpp  |  65 --
 libraries/shared/src/RegisteredMetaTypes.h    |  42 -
 51 files changed, 2242 insertions(+), 600 deletions(-)
 create mode 100644 libraries/graphics-scripting/CMakeLists.txt
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/DebugNames.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
 delete mode 100644 libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
 delete mode 100644 libraries/model-networking/src/model-networking/SimpleMeshProxy.h
 delete mode 100644 libraries/script-engine/src/ModelScriptingInterface.cpp
 delete mode 100644 libraries/script-engine/src/ModelScriptingInterface.h

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index ee2997e216..081eeae02e 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -191,7 +191,7 @@ endif()
 
 # link required hifi libraries
 link_hifi_libraries(
-  shared octree ktx gpu gl procedural graphics render
+  shared octree ktx gpu gl procedural graphics graphics-scripting render
   pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 99bd4d5758..f24969ce60 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -166,6 +166,7 @@
 #include "scripting/AccountServicesScriptingInterface.h"
 #include "scripting/HMDScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
+#include "graphics-scripting/ModelScriptingInterface.h"
 #include "scripting/SettingsScriptingInterface.h"
 #include "scripting/WindowScriptingInterface.h"
 #include "scripting/ControllerScriptingInterface.h"
@@ -198,7 +199,6 @@
 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
 #include <src/scripting/GooglePolyScriptingInterface.h>
 #include <EntityScriptClient.h>
-#include <ModelScriptingInterface.h>
 
 #include <PickManager.h>
 #include <PointerManager.h>
@@ -593,6 +593,66 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
     }
 }
 
+
+class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
+public:
+    virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) {
+        QString error;
+
+        scriptable::ModelProviderPointer provider;
+        if (auto entityInterface = getEntityModelProvider(static_cast<EntityItemID>(uuid))) {
+            provider = entityInterface;
+        } else if (auto overlayInterface = getOverlayModelProvider(static_cast<OverlayID>(uuid))) {
+            provider = overlayInterface;
+        } else if (auto avatarInterface = getAvatarModelProvider(uuid)) {
+            provider = avatarInterface;
+        }
+
+        return provider;
+    }
+
+    scriptable::ModelProviderPointer getEntityModelProvider(EntityItemID entityID) {
+        scriptable::ModelProviderPointer provider;
+        auto entityTreeRenderer = qApp->getEntities();
+        auto entityTree = entityTreeRenderer->getTree();
+        if (auto entity = entityTree->findEntityByID(entityID)) {
+            if (auto renderer = entityTreeRenderer->renderableForEntityId(entityID)) {
+                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(renderer);
+                provider->metadata["providerType"] = "entity";
+            } else {
+                qCWarning(interfaceapp) << "no renderer for entity ID" << entityID.toString();
+            }
+        }
+        return provider;
+    }
+
+    scriptable::ModelProviderPointer getOverlayModelProvider(OverlayID overlayID) {
+        scriptable::ModelProviderPointer provider;
+        auto &overlays = qApp->getOverlays();
+        if (auto overlay = overlays.getOverlay(overlayID)) {
+            if (auto base3d = std::dynamic_pointer_cast<Base3DOverlay>(overlay)) {
+                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(base3d);
+                provider->metadata["providerType"] = "overlay";
+            } else {
+                qCWarning(interfaceapp) << "no renderer for overlay ID" << overlayID.toString();
+            }
+        }
+        return provider;
+    }
+
+    scriptable::ModelProviderPointer getAvatarModelProvider(QUuid sessionUUID) {
+        scriptable::ModelProviderPointer provider;
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        if (auto avatar = avatarManager->getAvatarBySessionID(sessionUUID)) {
+            if (avatar->getSessionUUID() == sessionUUID) {
+                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
+                provider->metadata["providerType"] = "avatar";
+            }
+        }
+        return provider;
+    }
+};
+
 static const QString STATE_IN_HMD = "InHMD";
 static const QString STATE_CAMERA_FULL_SCREEN_MIRROR = "CameraFSM";
 static const QString STATE_CAMERA_FIRST_PERSON = "CameraFirstPerson";
@@ -737,6 +797,9 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<DesktopScriptingInterface>();
     DependencyManager::set<EntityScriptingInterface>(true);
+    DependencyManager::set<ModelScriptingInterface>();
+    DependencyManager::registerInheritance<scriptable::ModelProviderFactory, ApplicationMeshProvider>();
+    DependencyManager::set<ApplicationMeshProvider>();
     DependencyManager::set<RecordingScriptingInterface>();
     DependencyManager::set<WindowScriptingInterface>();
     DependencyManager::set<HMDScriptingInterface>();
@@ -5915,6 +5978,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Render", _renderEngine->getConfiguration().get());
 
+    ModelScriptingInterface::registerMetaTypes(scriptEngine.data());
+    scriptEngine->registerGlobalObject("Model", DependencyManager::get<ModelScriptingInterface>().data());
+
     scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
 
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ddb8ce11e5..ae07ebd9dd 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -72,7 +72,6 @@
 
 #include <procedural/ProceduralSkybox.h>
 #include <graphics/Skybox.h>
-#include <ModelScriptingInterface.h>
 #include "FrameTimingsScriptingInterface.h"
 
 #include "Sound.h"
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index df0f3c4728..0c8bc5aacb 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -13,10 +13,11 @@
 
 #include <Transform.h>
 #include <SpatiallyNestable.h>
-
+#include <graphics-scripting/ScriptableModel.h>
 #include "Overlay.h"
 
-class Base3DOverlay : public Overlay, public SpatiallyNestable {
+namespace model { class Mesh; }
+class Base3DOverlay : public Overlay, public SpatiallyNestable, public scriptable::ModelProvider {
     Q_OBJECT
     using Parent = Overlay;
 
@@ -36,6 +37,7 @@ public:
     virtual bool is3D() const override { return true; }
 
     virtual uint32_t fetchMetaSubItems(render::ItemIDs& subItems) const override { subItems.push_back(getRenderItemID()); return (uint32_t) subItems.size(); }
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
 
     // TODO: consider implementing registration points in this class
     glm::vec3 getCenter() const { return getWorldPosition(); }
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 310dbf78d8..5a80ca1abf 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -629,3 +629,10 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     }
     return 0;
 }
+
+scriptable::ScriptableModel ModelOverlay::getScriptableModel(bool* ok) {
+    if (!_model || !_model->isLoaded()) {
+        return Base3DOverlay::getScriptableModel(ok);
+    }
+    return _model->getScriptableModel(ok);
+}
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 60ba90e568..32d9a08c70 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,6 +59,7 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 97342a80ab..8bb3d16888 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -179,3 +179,18 @@ Transform Shape3DOverlay::evalRenderTransform() {
     transform.setRotation(rotation);
     return transform;
 }
+
+scriptable::ScriptableModel Shape3DOverlay::getScriptableModel(bool* ok) {
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    auto vertexColor = ColorUtils::toVec3(_color);
+    scriptable::ScriptableModel result;
+    result.metadata = {
+        { "origin", "Shape3DOverlay::"+shapeStrings[_shape] },
+        { "overlayID", getID() },
+    };
+    result.meshes << geometryCache->meshFromShape(_shape, vertexColor);
+    if (ok) {
+        *ok = true;
+    }
+    return result;
+}
diff --git a/interface/src/ui/overlays/Shape3DOverlay.h b/interface/src/ui/overlays/Shape3DOverlay.h
index 7fc95ec981..34f82af278 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.h
+++ b/interface/src/ui/overlays/Shape3DOverlay.h
@@ -37,6 +37,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt
index 53edc692f2..f7e951500b 100644
--- a/libraries/avatars-renderer/CMakeLists.txt
+++ b/libraries/avatars-renderer/CMakeLists.txt
@@ -13,5 +13,6 @@ include_hifi_library_headers(entities-renderer)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(octree)
+include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
 
 target_bullet()
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 500a24763d..8e22f355e4 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -35,6 +35,8 @@
 #include "ModelEntityItem.h"
 #include "RenderableModelEntityItem.h"
 
+#include <graphics-scripting/ScriptableModel.h>
+
 #include "Logging.h"
 
 using namespace std;
@@ -1760,3 +1762,29 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
         return DEFAULT_AVATAR_EYE_HEIGHT;
     }
 }
+
+scriptable::ScriptableModel Avatar::getScriptableModel(bool* ok) {
+    qDebug() << "Avatar::getScriptableModel" ;
+    if (!_skeletonModel || !_skeletonModel->isLoaded()) {
+        return scriptable::ModelProvider::modelUnavailableError(ok);
+    }
+    scriptable::ScriptableModel result;
+    result.metadata = {
+        { "avatarID", getSessionUUID().toString() },
+        { "url", _skeletonModelURL.toString() },
+        { "origin", "Avatar/avatar::" + _displayName },
+        { "textures", _skeletonModel->getTextures() },
+    };
+    result.mixin(_skeletonModel->getScriptableModel(ok));
+
+    // FIXME: for now access to attachment models are merged with the main avatar model
+    for (auto& attachmentModel : _attachmentModels) {
+        if (attachmentModel->isLoaded()) {
+            result.mixin(attachmentModel->getScriptableModel(ok));
+        }
+    }
+    if (ok) {
+        *ok = true;
+    }
+    return result;
+}
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index c2b404a925..5cfc399b65 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -20,6 +20,7 @@
 #include <AvatarData.h>
 #include <ShapeInfo.h>
 #include <render/Scene.h>
+#include <graphics-scripting/ScriptableModel.h>
 #include <GLMHelpers.h>
 
 
@@ -53,7 +54,7 @@ class Texture;
 
 using AvatarPhysicsCallback = std::function<void(uint32_t)>;
 
-class Avatar : public AvatarData {
+class Avatar : public AvatarData, public scriptable::ModelProvider {
     Q_OBJECT
 
     /**jsdoc
@@ -272,6 +273,8 @@ public:
 
     virtual void setAvatarEntityDataChanged(bool value) override;
 
+
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index ea75367e1e..27ea04f642 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -13,6 +13,7 @@ include_hifi_library_headers(fbx)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(controllers)
+include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
 
 target_bullet()
 target_polyvox()
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 8eb82e2c6e..f07b67fbd0 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -17,13 +17,14 @@
 #include <Sound.h>
 #include "AbstractViewStateInterface.h"
 #include "EntitiesRendererLogging.h"
+#include <graphics-scripting/ScriptableModel.h>
 
 class EntityTreeRenderer;
 
 namespace render { namespace entities {
 
 // Base class for all renderable entities
-class EntityRenderer : public QObject, public std::enable_shared_from_this<EntityRenderer>, public PayloadProxyInterface, protected ReadWriteLockable {
+class EntityRenderer : public QObject, public std::enable_shared_from_this<EntityRenderer>, public PayloadProxyInterface, protected ReadWriteLockable, public scriptable::ModelProvider {
     Q_OBJECT
 
     using Pointer = std::shared_ptr<EntityRenderer>;
@@ -37,7 +38,7 @@ public:
     virtual bool wantsKeyboardFocus() const { return false; }
     virtual void setProxyWindow(QWindow* proxyWindow) {}
     virtual QObject* getEventHandler() { return nullptr; }
-    const EntityItemPointer& getEntity() { return _entity; }
+    const EntityItemPointer& getEntity() const { return _entity; }
     const ItemID& getRenderItemID() const { return _renderItemID; }
 
     const SharedSoundPointer& getCollisionSound() { return _collisionSound; }
@@ -54,6 +55,7 @@ public:
 
     const uint64_t& getUpdateTime() const { return _updateTime; }
 
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
 protected:
     virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
     virtual void onAddToScene(const EntityItemPointer& entity);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 9fcb7640ef..7b022fefac 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -950,13 +950,18 @@ QStringList RenderableModelEntityItem::getJointNames() const {
     return result;
 }
 
-bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
-    auto model = getModel();
+
+scriptable::ScriptableModel render::entities::ModelEntityRenderer::getScriptableModel(bool* ok) {
+    ModelPointer model;
+    withReadLock([&] {
+        model = _model;
+    });
+
     if (!model || !model->isLoaded()) {
-        return false;
+        return scriptable::ModelProvider::modelUnavailableError(ok);
     }
-    BLOCKING_INVOKE_METHOD(model.get(), "getMeshes", Q_RETURN_ARG(MeshProxyList, result));
-    return !result.isEmpty();
+
+    return _model->getScriptableModel(ok);
 }
 
 void RenderableModelEntityItem::simulateRelayedJoints() {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 33fc9910a0..3e952cb9a7 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -111,7 +111,6 @@ public:
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;
 
-    bool getMeshes(MeshProxyList& result) override;
     const void* getCollisionMeshKey() const { return _collisionMeshKey; }
 
 signals:
@@ -141,6 +140,7 @@ class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem
 
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 4d223669b4..e18bd2a7fe 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -281,6 +281,10 @@ std::vector<PolyLineEntityRenderer::Vertex> PolyLineEntityRenderer::updateVertic
     return vertices;
 }
 
+scriptable::ScriptableModel PolyLineEntityRenderer::getScriptableModel(bool *ok) {
+    // TODO: adapt polyline into a triangles mesh...
+    return EntityRenderer::getScriptableModel(ok);
+}
 
 void PolyLineEntityRenderer::doRender(RenderArgs* args) {
     if (_empty) {
@@ -319,4 +323,4 @@ void PolyLineEntityRenderer::doRender(RenderArgs* args) {
 #endif
 
     batch.draw(gpu::TRIANGLE_STRIP, _numVertices, 0);
-}
\ No newline at end of file
+}
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 1e27ac9ae7..3bb8901178 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -25,6 +25,7 @@ class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
 public:
     PolyLineEntityRenderer(const EntityItemPointer& entity);
 
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 protected:
     virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
     virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index ade3790df6..fd923c40b0 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -20,8 +20,6 @@
 #include <QByteArray>
 #include <QtConcurrent/QtConcurrentRun>
 
-#include <model-networking/SimpleMeshProxy.h>
-#include <ModelScriptingInterface.h>
 #include <EntityEditPacketSender.h>
 #include <PhysicalEntitySimulation.h>
 #include <StencilMaskPass.h>
@@ -1416,36 +1414,36 @@ void RenderablePolyVoxEntityItem::bonkNeighbors() {
     }
 }
 
-bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
-    if (!updateDependents()) {
-        return false;
+scriptable::ScriptableModel RenderablePolyVoxEntityItem::getScriptableModel(bool * ok) {
+    if (!updateDependents() || !_mesh) {
+        return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
     bool success = false;
-    if (_mesh) {
-        MeshProxy* meshProxy = nullptr;
-        glm::mat4 transform = voxelToLocalMatrix();
-        withReadLock([&] {
-            gpu::BufferView::Index numVertices = (gpu::BufferView::Index)_mesh->getNumVertices();
-            if (!_meshReady) {
-                // we aren't ready to return a mesh.  the caller will have to try again later.
-                success = false;
-            } else if (numVertices == 0) {
-                // we are ready, but there are no triangles in the mesh.
-                success = true;
-            } else {
-                success = true;
-                // the mesh will be in voxel-space.  transform it into object-space
-                meshProxy = new SimpleMeshProxy(
-                    _mesh->map([=](glm::vec3 position) { return glm::vec3(transform * glm::vec4(position, 1.0f)); },
-                    [=](glm::vec3 color) { return color; },
-                    [=](glm::vec3 normal) { return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
-                    [&](uint32_t index) { return index; }));
-                result << meshProxy;
-            }
-        });
+    glm::mat4 transform = voxelToLocalMatrix();
+    scriptable::ScriptableModel result;
+    withReadLock([&] {
+        gpu::BufferView::Index numVertices = (gpu::BufferView::Index)_mesh->getNumVertices();
+        if (!_meshReady) {
+            // we aren't ready to return a mesh.  the caller will have to try again later.
+            success = false;
+        } else if (numVertices == 0) {
+            // we are ready, but there are no triangles in the mesh.
+            success = true;
+        } else {
+            success = true;
+            // the mesh will be in voxel-space.  transform it into object-space
+            result.meshes << 
+                _mesh->map([=](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                           [=](glm::vec3 color){ return color; },
+                           [=](glm::vec3 normal){ return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
+                           [&](uint32_t index){ return index; });
+        }
+    });
+    if (ok) {
+        *ok = success;
     }
-    return success;
+    return result;
 }
 
 using namespace render;
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index db0f0b729a..55b9be23d8 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -32,7 +32,7 @@ namespace render { namespace entities {
 class PolyVoxEntityRenderer;
 } } 
 
-class RenderablePolyVoxEntityItem : public PolyVoxEntityItem {
+class RenderablePolyVoxEntityItem : public PolyVoxEntityItem, public scriptable::ModelProvider {
     friend class render::entities::PolyVoxEntityRenderer;
 
 public:
@@ -113,7 +113,7 @@ public:
 
     void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
 
-    bool getMeshes(MeshProxyList& result) override;
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 
 private:
     bool updateOnCount(const ivec3& v, uint8_t toValue);
@@ -163,6 +163,9 @@ class PolyVoxEntityRenderer : public TypedEntityRenderer<RenderablePolyVoxEntity
 
 public:
     PolyVoxEntityRenderer(const EntityItemPointer& entity);
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override {
+        return asTypedEntity<RenderablePolyVoxEntityItem>()->getScriptableModel(ok);
+    }
     
 protected:
     virtual ItemKey getKey() override { return ItemKey::Builder::opaqueShape(); }
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index cdee2c5ec9..746102681c 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -156,3 +156,24 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     const auto triCount = geometryCache->getShapeTriangleCount(geometryShape);
     args->_details._trianglesRendered += (int)triCount;
 }
+
+scriptable::ScriptableModel ShapeEntityRenderer::getScriptableModel(bool* ok)  {
+    scriptable::ScriptableModel result;
+    result.metadata = {
+        { "entityID", getEntity()->getID().toString() },
+        { "shape", entity::stringFromShape(_shape) },
+        { "userData", getEntity()->getUserData() },
+    };
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    auto geometryShape = geometryCache->getShapeForEntityShape(_shape);
+    auto vertexColor = glm::vec3(_color);
+    auto success = false;
+    if (auto mesh = geometryCache->meshFromShape(geometryShape, vertexColor)) {
+        result.meshes << mesh;
+        success = true;
+    }
+    if (ok) {
+        *ok = success;
+    }
+    return result;
+}
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index 433cb41ad2..6ada7e7317 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -22,6 +22,8 @@ class ShapeEntityRenderer : public TypedEntityRenderer<ShapeEntityItem> {
 public:
     ShapeEntityRenderer(const EntityItemPointer& entity);
 
+    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+
 private:
     virtual bool needsRenderUpdate() const override;
     virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 4c398b8a29..5c9324fc8a 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -57,8 +57,6 @@ using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElemen
 #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10))
 #define debugTreeVector(V) V << "[" << V << " in meters ]"
 
-class MeshProxyList;
-
 /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
 /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
 /// one directly, instead you must only construct one of it's derived classes with additional features.
@@ -456,8 +454,6 @@ public:
 
     bool matchesJSONFilters(const QJsonObject& jsonFilters) const;
 
-    virtual bool getMeshes(MeshProxyList& result) { return true; }
-
     virtual void locationChanged(bool tellPhysics = true) override;
 
     virtual bool getScalesWithParent() const override;
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 4342f0e683..a7f1d6b9f1 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -1805,30 +1805,6 @@ bool EntityScriptingInterface::AABoxIntersectsCapsule(const glm::vec3& low, cons
     return aaBox.findCapsulePenetration(start, end, radius, penetration);
 }
 
-void EntityScriptingInterface::getMeshes(QUuid entityID, QScriptValue callback) {
-    PROFILE_RANGE(script_entities, __FUNCTION__);
-
-    EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
-    if (!entity) {
-        qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID;
-        QScriptValueList args { callback.engine()->undefinedValue(), false };
-        callback.call(QScriptValue(), args);
-        return;
-    }
-
-    MeshProxyList result;
-    bool success = entity->getMeshes(result);
-
-    if (success) {
-        QScriptValue resultAsScriptValue = meshesToScriptValue(callback.engine(), result);
-        QScriptValueList args { resultAsScriptValue, true };
-        callback.call(QScriptValue(), args);
-    } else {
-        QScriptValueList args { callback.engine()->undefinedValue(), false };
-        callback.call(QScriptValue(), args);
-    }
-}
-
 glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) {
     glm::mat4 result;
     if (_entityTree) {
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 4c4e2ffbfd..da201f93eb 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -37,7 +37,6 @@
 #include "BaseScriptEngine.h"
 
 class EntityTree;
-class MeshProxy;
 
 // helper factory to compose standardized, async metadata queries for "magic" Entity properties
 // like .script and .serverScripts.  This is used for automated testing of core scripting features
@@ -401,9 +400,6 @@ public slots:
     Q_INVOKABLE bool AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,
                                             const glm::vec3& start, const glm::vec3& end, float radius);
 
-    // FIXME move to a renderable entity interface
-    Q_INVOKABLE void getMeshes(QUuid entityID, QScriptValue callback);
-
     /**jsdoc
      * Returns object to world transform, excluding scale
      *
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 14462e0558..50abe7928f 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1967,19 +1967,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             }
         }
     }
-    {
-        int i = 0;
-        for (const auto& mesh : geometry.meshes) {
-            auto name = geometry.getModelNameOfMesh(i++);
-            if (!name.isEmpty()) {
-                if (mesh._mesh) {
-                    mesh._mesh->displayName += "#" + name;
-                } else {
-                    qDebug() << "modelName but no mesh._mesh" << name;
-                }
-            }
-        }
-    }
+
     return geometryPtr;
 }
 
@@ -1995,7 +1983,7 @@ FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QStri
     reader._loadLightmaps = loadLightmaps;
     reader._lightmapLevel = lightmapLevel;
 
-    qCDebug(modelformat) << "Reading FBX: " << url;
+    qDebug() << "Reading FBX: " << url;
 
     return reader.extractFBXGeometry(mapping, url);
 }
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 4441ae6649..37bced8458 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -46,9 +46,12 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
     QList<int> meshNormalStartOffset;
     int currentVertexStartOffset = 0;
     int currentNormalStartOffset = 0;
+    int subMeshIndex = 0;
+    out << "# OBJWriter::writeOBJToTextStream\n";
 
     // write out vertices (and maybe colors)
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# vertices::subMeshIndex " << subMeshIndex++ << "\n";
         meshVertexStartOffset.append(currentVertexStartOffset);
         const gpu::BufferView& vertexBuffer = mesh->getVertexBuffer();
 
@@ -81,7 +84,9 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
 
     // write out normals
     bool haveNormals = true;
+    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# normals::subMeshIndex " << subMeshIndex++ << "\n";
         meshNormalStartOffset.append(currentNormalStartOffset);
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
@@ -98,7 +103,9 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
 
     // write out faces
     int nth = 0;
+    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# faces::subMeshIndex " << subMeshIndex++ << "\n";
         currentVertexStartOffset = meshVertexStartOffset.takeFirst();
         currentNormalStartOffset = meshNormalStartOffset.takeFirst();
 
@@ -106,35 +113,25 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& indexBuffer = mesh->getIndexBuffer();
 
         graphics::Index partCount = (graphics::Index)mesh->getNumParts();
+        QString name = (!mesh->displayName.size() ? QString("mesh-%1-part").arg(nth) : QString(mesh->displayName))
+            .replace(QRegExp("[^-_a-zA-Z0-9]"), "_");
         for (int partIndex = 0; partIndex < partCount; partIndex++) {
             const graphics::Mesh::Part& part = partBuffer.get<graphics::Mesh::Part>(partIndex);
 
-            out << "g part-" << nth++ << "\n";
+            out << QString("g %1-%2-%3\n").arg(subMeshIndex, 3, 10, QChar('0')).arg(name).arg(partIndex);
 
-            // graphics::Mesh::TRIANGLES
-            // TODO -- handle other formats
-            gpu::BufferView::Iterator<const uint32_t> indexItr = indexBuffer.cbegin<uint32_t>();
-            indexItr += part._startIndex;
-
-            int indexCount = 0;
-            while (indexItr != indexBuffer.cend<uint32_t>() && indexCount < part._numIndices) {
-                uint32_t index0 = *indexItr;
-                indexItr++;
-                indexCount++;
-                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
-                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
-                    break;
+            const bool shorts = indexBuffer._element == gpu::Element::INDEX_UINT16;
+            auto face = [&](uint32_t i0, uint32_t i1, uint32_t i2) {
+                uint32_t index0, index1, index2;
+                if (shorts) {
+                    index0 = indexBuffer.get<uint16_t>(i0);
+                    index1 = indexBuffer.get<uint16_t>(i1);
+                    index2 = indexBuffer.get<uint16_t>(i2);
+                } else {
+                    index0 = indexBuffer.get<uint32_t>(i0);
+                    index1 = indexBuffer.get<uint32_t>(i1);
+                    index2 = indexBuffer.get<uint32_t>(i2);
                 }
-                uint32_t index1 = *indexItr;
-                indexItr++;
-                indexCount++;
-                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
-                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
-                    break;
-                }
-                uint32_t index2 = *indexItr;
-                indexItr++;
-                indexCount++;
 
                 out << "f ";
                 if (haveNormals) {
@@ -146,6 +143,39 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
                     out << currentVertexStartOffset + index1 + 1 << " ";
                     out << currentVertexStartOffset + index2 + 1 << "\n";
                 }
+            };
+
+            // graphics::Mesh::TRIANGLES / graphics::Mesh::QUADS
+            // TODO -- handle other formats
+            uint32_t len = part._startIndex + part._numIndices;
+            auto stringFromTopology = [&](graphics::Mesh::Topology topo) -> QString {
+                return topo == graphics::Mesh::Topology::QUADS ? "QUADS" :
+                topo == graphics::Mesh::Topology::QUAD_STRIP ? "QUAD_STRIP" :
+                topo == graphics::Mesh::Topology::TRIANGLES ? "TRIANGLES" :
+                topo == graphics::Mesh::Topology::TRIANGLE_STRIP ? "TRIANGLE_STRIP" :
+                topo == graphics::Mesh::Topology::QUAD_STRIP ? "QUAD_STRIP" :
+                QString("topo:%1").arg((int)topo);
+            };
+
+            qCDebug(modelformat) << "OBJWriter -- part" << partIndex << "topo" << stringFromTopology(part._topology) << "index elements" << (shorts ? "uint16_t" : "uint32_t");
+            if (part._topology == graphics::Mesh::TRIANGLES && len % 3 != 0) {
+                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 3" << len;
+            }
+            if (part._topology == graphics::Mesh::QUADS && len % 4 != 0) {
+                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 4" << len;
+            }
+            if (len > indexBuffer.getNumElements()) {
+                qCDebug(modelformat) << "OBJWriter -- len > index size" << len << indexBuffer.getNumElements();
+            }
+            if (part._topology == graphics::Mesh::QUADS) {
+                for (uint32_t idx = part._startIndex; idx+3 < len; idx += 4) {
+                    face(idx+0, idx+1, idx+3);
+                    face(idx+1, idx+2, idx+3);
+                }
+            } else if (part._topology == graphics::Mesh::TRIANGLES) {
+                for (uint32_t idx = part._startIndex; idx+2 < len; idx += 3) {
+                    face(idx+0, idx+1, idx+2);
+                }
             }
             out << "\n";
         }
diff --git a/libraries/graphics-scripting/CMakeLists.txt b/libraries/graphics-scripting/CMakeLists.txt
new file mode 100644
index 0000000000..e7fa3de155
--- /dev/null
+++ b/libraries/graphics-scripting/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(TARGET_NAME graphics-scripting)
+setup_hifi_library()
+link_hifi_libraries(shared networking graphics fbx model-networking script-engine)
+include_hifi_library_headers(gpu)
+include_hifi_library_headers(graphics-scripting)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
new file mode 100644
index 0000000000..e865ed0e5a
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
@@ -0,0 +1,195 @@
+#include "./graphics-scripting/BufferViewHelpers.h"
+
+#include <QDebug>
+#include <QVariant>
+
+#include <gpu/Buffer.h>
+#include <gpu/Format.h>
+#include <gpu/Stream.h>
+
+#include <glm/gtc/packing.hpp>
+
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+    #include "DebugNames.h"
+#endif
+
+namespace {
+    const std::array<const char*, 4> XYZW = {{ "x", "y", "z", "w" }};
+    const std::array<const char*, 4> ZERO123 = {{ "0", "1", "2", "3" }};
+}
+
+template <typename T>
+QVariant getBufferViewElement(const gpu::BufferView& view, quint32 index, bool asArray = false) {
+    return glmVecToVariant(view.get<T>(index), asArray);
+}
+
+template <typename T>
+void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QVariant& v) {
+    view.edit<T>(index) = glmVecFromVariant<T>(v);
+}
+
+//FIXME copied from Model.cpp
+static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
+    auto absNormal = glm::abs(normal);
+    auto absTangent = glm::abs(tangent);
+    normal /= glm::max(1e-6f, glm::max(glm::max(absNormal.x, absNormal.y), absNormal.z));
+    tangent /= glm::max(1e-6f, glm::max(glm::max(absTangent.x, absTangent.y), absTangent.z));
+    normal = glm::clamp(normal, -1.0f, 1.0f);
+    tangent = glm::clamp(tangent, -1.0f, 1.0f);
+    normal *= 511.0f;
+    tangent *= 511.0f;
+    normal = glm::round(normal);
+    tangent = glm::round(tangent);
+
+    glm::detail::i10i10i10i2 normalStruct;
+    glm::detail::i10i10i10i2 tangentStruct;
+    normalStruct.data.x = int(normal.x);
+    normalStruct.data.y = int(normal.y);
+    normalStruct.data.z = int(normal.z);
+    normalStruct.data.w = 0;
+    tangentStruct.data.x = int(tangent.x);
+    tangentStruct.data.y = int(tangent.y);
+    tangentStruct.data.z = int(tangent.z);
+    tangentStruct.data.w = 0;
+    packedNormal = normalStruct.pack;
+    packedTangent = tangentStruct.pack;
+}
+
+bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v) {
+    const auto& element = view._element;
+    const auto vecN = element.getScalarCount();
+    const auto dataType = element.getType();
+    const auto byteLength = element.getSize();
+    const auto BYTES_PER_ELEMENT = byteLength / vecN;
+    if (BYTES_PER_ELEMENT == 1) {
+        switch(vecN) {
+        case 2: setBufferViewElement<glm::u8vec2>(view, index, v); return true;
+        case 3: setBufferViewElement<glm::u8vec3>(view, index, v); return true;
+        case 4: {
+            if (element == gpu::Element::COLOR_RGBA_32) {
+                glm::uint32 rawColor;// = glm::packUnorm4x8(glm::vec4(glmVecFromVariant<glm::vec3>(v), 0.0f));
+                glm::uint32 unused;
+                packNormalAndTangent(glmVecFromVariant<glm::vec3>(v), glm::vec3(), rawColor, unused);
+                view.edit<glm::uint32>(index) = rawColor;
+            } else if (element == gpu::Element::VEC4F_NORMALIZED_XYZ10W2) {
+                glm::uint32 packedNormal;// = glm::packSnorm3x10_1x2(glm::vec4(glmVecFromVariant<glm::vec3>(v), 0.0f));
+                glm::uint32 unused;
+                packNormalAndTangent(glm::vec3(), glmVecFromVariant<glm::vec3>(v), unused, packedNormal);
+                view.edit<glm::uint32>(index) = packedNormal;
+            }
+            setBufferViewElement<glm::u8vec4>(view, index, v); return true;
+        }
+        }
+    } else if (BYTES_PER_ELEMENT == 2) {
+        switch(vecN) {
+        case 2: setBufferViewElement<glm::u16vec2>(view, index, v); return true;
+        case 3: setBufferViewElement<glm::u16vec3>(view, index, v); return true;
+        case 4: setBufferViewElement<glm::u16vec4>(view, index, v); return true;
+        }
+    } else if (BYTES_PER_ELEMENT == 4) {
+        if (dataType == gpu::FLOAT) {
+            switch(vecN) {
+            case 2: setBufferViewElement<glm::vec2>(view, index, v); return true;
+            case 3: setBufferViewElement<glm::vec3>(view, index, v); return true;
+            case 4: setBufferViewElement<glm::vec4>(view, index, v); return true;
+            }
+        } else {
+            switch(vecN) {
+            case 2: setBufferViewElement<glm::u32vec2>(view, index, v); return true;
+            case 3: setBufferViewElement<glm::u32vec3>(view, index, v); return true;
+            case 4: setBufferViewElement<glm::u32vec4>(view, index, v); return true;
+            }
+        }
+    }
+    return false;
+}
+
+QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
+    const auto& element = view._element;
+    const auto vecN = element.getScalarCount();
+    const auto dataType = element.getType();
+    const auto byteLength = element.getSize();
+    const auto BYTES_PER_ELEMENT = byteLength / vecN;
+    Q_ASSERT(index < view.getNumElements());
+    Q_ASSERT(index * vecN * BYTES_PER_ELEMENT < (view._size - vecN * BYTES_PER_ELEMENT));
+    if (BYTES_PER_ELEMENT == 1) {
+        switch(vecN) {
+        case 2: return getBufferViewElement<glm::u8vec2>(view, index, asArray);
+        case 3: return getBufferViewElement<glm::u8vec3>(view, index, asArray);
+        case 4: {
+            if (element == gpu::Element::COLOR_RGBA_32) {
+                auto rawColor = view.get<glm::uint32>(index);
+                return glmVecToVariant(glm::vec3(glm::unpackUnorm4x8(rawColor)));
+            } else if (element == gpu::Element::VEC4F_NORMALIZED_XYZ10W2) {
+                auto packedNormal = view.get<glm::uint32>(index);
+                return glmVecToVariant(glm::vec3(glm::unpackSnorm3x10_1x2(packedNormal)));
+            }
+
+            return getBufferViewElement<glm::u8vec4>(view, index, asArray); 
+        }
+        }
+    } else if (BYTES_PER_ELEMENT == 2) {
+        switch(vecN) {
+        case 2: return getBufferViewElement<glm::u16vec2>(view, index, asArray);
+        case 3: return getBufferViewElement<glm::u16vec3>(view, index, asArray);
+        case 4: return getBufferViewElement<glm::u16vec4>(view, index, asArray);
+        }
+    } else if (BYTES_PER_ELEMENT == 4) {
+        if (dataType == gpu::FLOAT) {
+            switch(vecN) {
+            case 2: return getBufferViewElement<glm::vec2>(view, index, asArray);
+            case 3: return getBufferViewElement<glm::vec3>(view, index, asArray);
+            case 4: return getBufferViewElement<glm::vec4>(view, index, asArray);
+            }
+        } else {
+            switch(vecN) {
+            case 2: return getBufferViewElement<glm::u32vec2>(view, index, asArray);
+            case 3: return getBufferViewElement<glm::u32vec3>(view, index, asArray);
+            case 4: return getBufferViewElement<glm::u32vec4>(view, index, asArray);
+            }
+        }
+    }
+    return QVariant();
+}
+
+template <typename T>
+QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
+    static const auto len = T().length();
+    if (asArray) {
+        QVariantList list;
+        for (int i = 0; i < len ; i++) {
+            list << v[i];
+        }
+        return list;
+    } else {
+        QVariantMap obj;
+        for (int i = 0; i < len ; i++) {
+            obj[XYZW[i]] = v[i];
+        }
+        return obj;
+    }
+}
+template <typename T>
+const T glmVecFromVariant(const QVariant& v) {
+    auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
+    static const auto len = T().length();
+    const auto& components = isMap ? XYZW : ZERO123;
+    T result;
+    QVariantMap map;
+    QVariantList list;
+    if (isMap) map = v.toMap(); else list = v.toList();
+    for (int i = 0; i < len ; i++) {
+        float value;
+        if (isMap) {
+            value = map.value(components[i]).toFloat();
+        } else {
+            value = list.value(i).toFloat();
+        }
+        if (value != value) { // NAN
+            qWarning().nospace()<< "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
+        }
+        result[i] = value;
+    }
+    return result;
+}
+
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
new file mode 100644
index 0000000000..0fe2602f6c
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
@@ -0,0 +1,18 @@
+//
+//  Copyright 2018 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
+//
+#pragma once
+
+#include <QtCore>
+
+namespace gpu { class BufferView;  }
+
+template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
+template <typename T> const T glmVecFromVariant(const QVariant& v);
+QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
+bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v);
+
+
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
new file mode 100644
index 0000000000..367c0589e9
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
@@ -0,0 +1,83 @@
+#include "BufferViewScripting.h"
+
+#include <QDebug>
+#include <QVariant>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
+
+#include <gpu/Buffer.h>
+#include <gpu/Format.h>
+#include <gpu/Stream.h>
+
+#include <graphics-scripting/BufferViewHelpers.h>
+
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+    #include <graphics/DebugNames.h>
+#endif
+
+namespace {
+    const std::array<const char*, 4> XYZW = {{ "x", "y", "z", "w" }};
+    const std::array<const char*, 4> ZERO123 = {{ "0", "1", "2", "3" }};
+}
+
+template <typename T>
+QScriptValue getBufferViewElement(QScriptEngine* js, const gpu::BufferView& view, quint32 index, bool asArray = false) {
+    return glmVecToScriptValue(js, view.get<T>(index), asArray);
+}
+
+QScriptValue bufferViewElementToScriptValue(QScriptEngine* engine, const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
+    QVariant result = bufferViewElementToVariant(view, index, asArray, hint);
+    if (!result.isValid()) {
+        return QScriptValue::NullValue;
+    }
+    return engine->toScriptValue(result);
+}
+
+template <typename T>
+void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QScriptValue& v) {
+    view.edit<T>(index) = glmVecFromScriptValue<T>(v);
+}
+
+bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferView& view, quint32 index) {
+    return bufferViewElementFromVariant(view, index, v.toVariant());
+}
+
+//
+
+template <typename T>
+QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray) {
+    static const auto len = T().length();
+    const auto& components = asArray ? ZERO123 : XYZW;
+    auto obj = asArray ? js->newArray() : js->newObject();
+    for (int i = 0; i < len ; i++) {
+        const auto key = components[i];
+        const auto value = v[i];
+        if (value != value) { // NAN
+#ifdef DEV_BUILD
+            qWarning().nospace()<< "vec" << len << "." << key << " converting NAN to javascript NaN.... " << value;
+#endif
+            obj.setProperty(key, js->globalObject().property("NaN"));
+        } else {
+            obj.setProperty(key, value);
+        }
+    }
+    return obj;
+}
+
+template <typename T>
+const T glmVecFromScriptValue(const QScriptValue& v) {
+    static const auto len = T().length();
+    const auto& components = v.property("x").isValid() ? XYZW : ZERO123;
+    T result;
+    for (int i = 0; i < len ; i++) {
+        const auto key = components[i];
+        const auto value = v.property(key).toNumber();
+#ifdef DEV_BUILD
+        if (value != value) { // NAN
+            qWarning().nospace()<< "vec" << len << "." << key << " NAN received from script.... " << v.toVariant().toString();
+        }
+#endif
+        result[i] = value;
+    }
+    return result;
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
new file mode 100644
index 0000000000..f2e3fe734e
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <QtCore>
+
+namespace gpu { class BufferView;  }
+class QScriptValue;
+class QScriptEngine;
+template <typename T> QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray = false);
+template <typename T> const T glmVecFromScriptValue(const QScriptValue& v);
+QScriptValue bufferViewElementToScriptValue(QScriptEngine* engine, const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
+bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferView& view, quint32 index);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h b/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h
new file mode 100644
index 0000000000..e5edf1c9d8
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h
@@ -0,0 +1,72 @@
+#pragma once
+#include <QtCore>
+#include <QVariant>
+#include <QObject>
+#include <gpu/Format.h>
+#include <gpu/Stream.h>
+//#include <gpu/Buffer.h>
+
+Q_DECLARE_METATYPE(gpu::Type);
+#ifdef QT_MOC_RUN
+class DebugNames {
+        Q_OBJECT
+public:
+#else
+  namespace DebugNames {
+    Q_NAMESPACE
+        #endif
+    
+enum Type : uint8_t {
+
+    FLOAT = 0,
+    INT32,
+    UINT32,
+    HALF,
+    INT16,
+    UINT16,
+    INT8,
+    UINT8,
+
+    NINT32,
+    NUINT32,
+    NINT16,
+    NUINT16,
+    NINT8,
+    NUINT8,
+
+    COMPRESSED,
+
+    NUM_TYPES,
+
+    BOOL = UINT8,
+    NORMALIZED_START = NINT32,
+};
+    
+    Q_ENUM_NS(Type)
+    enum InputSlot {
+        POSITION = 0,
+        NORMAL = 1,
+        COLOR = 2,
+        TEXCOORD0 = 3,
+        TEXCOORD = TEXCOORD0,
+        TANGENT = 4,
+        SKIN_CLUSTER_INDEX = 5,
+        SKIN_CLUSTER_WEIGHT = 6,
+        TEXCOORD1 = 7,
+        TEXCOORD2 = 8,
+        TEXCOORD3 = 9,
+        TEXCOORD4 = 10,
+
+        NUM_INPUT_SLOTS,
+
+        DRAW_CALL_INFO = 15, // Reserve last input slot for draw call infos
+    };
+
+    Q_ENUM_NS(InputSlot)
+    inline QString stringFrom(Type t) { return QVariant::fromValue(t).toString(); }
+    inline QString stringFrom(InputSlot t) { return QVariant::fromValue(t).toString(); }
+    inline QString stringFrom(gpu::Type t) { return stringFrom((Type)t); }
+    inline QString stringFrom(gpu::Stream::Slot t) { return stringFrom((InputSlot)t); }
+
+    extern const QMetaObject staticMetaObject;
+  };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
new file mode 100644
index 0000000000..68a00bc02c
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
@@ -0,0 +1,836 @@
+//
+//  ModelScriptingInterface.cpp
+//  libraries/script-engine/src
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#include "ModelScriptingInterface.h"
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValueIterator>
+#include <QtScript/QScriptValue>
+#include <QUuid>
+#include "BaseScriptEngine.h"
+#include "ScriptEngineLogging.h"
+#include "OBJWriter.h"
+#include "OBJReader.h"
+//#include "ui/overlays/Base3DOverlay.h"
+//#include "EntityTreeRenderer.h"
+//#include "avatar/AvatarManager.h"
+//#include "RenderableEntityItem.h"
+
+#include <glm/gtx/string_cast.hpp>
+#include <GeometryUtil.h>
+
+#include <shared/QtHelpers.h>
+
+
+#include <graphics-scripting/DebugNames.h>
+
+#include <graphics-scripting/BufferViewHelpers.h>
+#include "BufferViewScripting.h"
+
+#include "ScriptableMesh.h"
+
+using ScriptableMesh = scriptable::ScriptableMesh;
+
+#include "ModelScriptingInterface.moc"
+
+namespace {
+    QLoggingCategory model_scripting { "hifi.model.scripting" };
+}
+
+ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
+    if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
+        this->registerMetaTypes(scriptEngine);
+    }
+}
+
+QString ModelScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
+    const auto& in = _in.getMeshes();
+    qCDebug(model_scripting) << "meshToOBJ" << in.size();
+    if (in.size()) {
+        QList<scriptable::MeshPointer> meshes;
+        foreach (const auto meshProxy, in) {
+            qCDebug(model_scripting) << "meshToOBJ" << meshProxy.get();
+            if (meshProxy) {
+                meshes.append(getMeshPointer(meshProxy));
+            }
+        }
+        if (meshes.size()) {
+            return writeOBJToString(meshes);
+        }
+    }
+    context()->throwError(QString("null mesh"));
+    return QString();
+}
+
+QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _in) {
+    const auto& in = _in.getMeshes();
+
+    // figure out the size of the resulting mesh
+    size_t totalVertexCount { 0 };
+    size_t totalColorCount { 0 };
+    size_t totalNormalCount { 0 };
+    size_t totalIndexCount { 0 };
+    foreach (const scriptable::ScriptableMeshPointer meshProxy, in) {
+        scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
+        totalVertexCount += mesh->getNumVertices();
+
+        int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(attributeTypeColor);
+        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
+        totalColorCount += numColors;
+
+        int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
+        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
+        gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
+        totalNormalCount += numNormals;
+
+        totalIndexCount += mesh->getNumIndices();
+    }
+
+    // alloc the resulting mesh
+    gpu::Resource::Size combinedVertexSize = totalVertexCount * sizeof(glm::vec3);
+    unsigned char* combinedVertexData  = new unsigned char[combinedVertexSize];
+    unsigned char* combinedVertexDataCursor = combinedVertexData;
+
+    gpu::Resource::Size combinedColorSize = totalColorCount * sizeof(glm::vec3);
+    unsigned char* combinedColorData  = new unsigned char[combinedColorSize];
+    unsigned char* combinedColorDataCursor = combinedColorData;
+
+    gpu::Resource::Size combinedNormalSize = totalNormalCount * sizeof(glm::vec3);
+    unsigned char* combinedNormalData  = new unsigned char[combinedNormalSize];
+    unsigned char* combinedNormalDataCursor = combinedNormalData;
+
+    gpu::Resource::Size combinedIndexSize = totalIndexCount * sizeof(uint32_t);
+    unsigned char* combinedIndexData  = new unsigned char[combinedIndexSize];
+    unsigned char* combinedIndexDataCursor = combinedIndexData;
+
+    uint32_t indexStartOffset { 0 };
+
+    foreach (const scriptable::ScriptableMeshPointer meshProxy, in) {
+        scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
+        mesh->forEach(
+            [&](glm::vec3 position){
+                memcpy(combinedVertexDataCursor, &position, sizeof(position));
+                combinedVertexDataCursor += sizeof(position);
+            },
+            [&](glm::vec3 color){
+                memcpy(combinedColorDataCursor, &color, sizeof(color));
+                combinedColorDataCursor += sizeof(color);
+            },
+            [&](glm::vec3 normal){
+                memcpy(combinedNormalDataCursor, &normal, sizeof(normal));
+                combinedNormalDataCursor += sizeof(normal);
+            },
+            [&](uint32_t index){
+                index += indexStartOffset;
+                memcpy(combinedIndexDataCursor, &index, sizeof(index));
+                combinedIndexDataCursor += sizeof(index);
+            });
+
+        gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+        indexStartOffset += numVertices;
+    }
+
+    graphics::MeshPointer result(new graphics::Mesh());
+
+    gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData);
+    gpu::BufferPointer combinedVertexBufferPointer(combinedVertexBuffer);
+    gpu::BufferView combinedVertexBufferView(combinedVertexBufferPointer, vertexElement);
+    result->setVertexBuffer(combinedVertexBufferView);
+
+    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedColorsBuffer = new gpu::Buffer(combinedColorSize, combinedColorData);
+    gpu::BufferPointer combinedColorsBufferPointer(combinedColorsBuffer);
+    gpu::BufferView combinedColorsBufferView(combinedColorsBufferPointer, colorElement);
+    result->addAttribute(attributeTypeColor, combinedColorsBufferView);
+
+    int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
+    gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedNormalsBuffer = new gpu::Buffer(combinedNormalSize, combinedNormalData);
+    gpu::BufferPointer combinedNormalsBufferPointer(combinedNormalsBuffer);
+    gpu::BufferView combinedNormalsBufferView(combinedNormalsBufferPointer, normalElement);
+    result->addAttribute(attributeTypeNormal, combinedNormalsBufferView);
+
+    gpu::Element indexElement = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW);
+    gpu::Buffer* combinedIndexesBuffer = new gpu::Buffer(combinedIndexSize, combinedIndexData);
+    gpu::BufferPointer combinedIndexesBufferPointer(combinedIndexesBuffer);
+    gpu::BufferView combinedIndexesBufferView(combinedIndexesBufferPointer, indexElement);
+    result->setIndexBuffer(combinedIndexesBufferView);
+
+    std::vector<graphics::Mesh::Part> parts;
+    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
+                                         (graphics::Index)result->getNumIndices(), // numIndices
+                                         (graphics::Index)0, // baseVertex
+                                         graphics::Mesh::TRIANGLES)); // topology
+    result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
+                                                          (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
+
+
+    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, result));
+    return engine()->toScriptValue(result);
+}
+
+QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform) {
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return false;
+    }
+
+    graphics::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                                          [&](glm::vec3 color){ return color; },
+                                          [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
+                                          [&](uint32_t index){ return index; });
+    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, result));
+    return engine()->toScriptValue(resultProxy);
+}
+
+QScriptValue ModelScriptingInterface::getVertexCount(scriptable::ScriptableMeshPointer meshProxy) {
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return -1;
+    }
+    return (uint32_t)mesh->getNumVertices();
+}
+
+QScriptValue ModelScriptingInterface::getVertex(scriptable::ScriptableMeshPointer meshProxy, mesh::uint32 vertexIndex) {
+    auto mesh = getMeshPointer(meshProxy);
+
+    const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
+    auto numVertices = mesh->getNumVertices();
+
+    if (vertexIndex >= numVertices) {
+        context()->throwError(QString("invalid index: %1 [0,%2)").arg(vertexIndex).arg(numVertices));
+        return QScriptValue::NullValue;
+    }
+
+    glm::vec3 pos = vertexBufferView.get<glm::vec3>(vertexIndex);
+    return engine()->toScriptValue(pos);
+}
+
+QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
+                                              const QVector<glm::vec3>& normals,
+                                              const QVector<mesh::MeshFace>& faces) {
+    graphics::MeshPointer mesh(new graphics::Mesh());
+
+    // vertices
+    auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
+    auto vertexBufferPtr = gpu::BufferPointer(vertexBuffer);
+    gpu::BufferView vertexBufferView(vertexBufferPtr, 0, vertexBufferPtr->getSize(),
+                                     sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
+    mesh->setVertexBuffer(vertexBufferView);
+
+    if (vertices.size() == normals.size()) {
+        // normals
+        auto normalBuffer = std::make_shared<gpu::Buffer>(normals.size() * sizeof(glm::vec3), (gpu::Byte*)normals.data());
+        auto normalBufferPtr = gpu::BufferPointer(normalBuffer);
+        gpu::BufferView normalBufferView(normalBufferPtr, 0, normalBufferPtr->getSize(),
+                                         sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
+        mesh->addAttribute(gpu::Stream::NORMAL, normalBufferView);
+    } else {
+        qCWarning(model_scripting, "ModelScriptingInterface::newMesh normals must be same length as vertices");
+    }
+
+    // indices (faces)
+    int VERTICES_PER_TRIANGLE = 3;
+    int indexBufferSize = faces.size() * sizeof(uint32_t) * VERTICES_PER_TRIANGLE;
+    unsigned char* indexData  = new unsigned char[indexBufferSize];
+    unsigned char* indexDataCursor = indexData;
+    foreach(const mesh::MeshFace& meshFace, faces) {
+        for (int i = 0; i < VERTICES_PER_TRIANGLE; i++) {
+            memcpy(indexDataCursor, &meshFace.vertexIndices[i], sizeof(uint32_t));
+            indexDataCursor += sizeof(uint32_t);
+        }
+    }
+    auto indexBuffer = std::make_shared<gpu::Buffer>(indexBufferSize, (gpu::Byte*)indexData);
+    auto indexBufferPtr = gpu::BufferPointer(indexBuffer);
+    gpu::BufferView indexBufferView(indexBufferPtr, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW));
+    mesh->setIndexBuffer(indexBufferView);
+
+    // parts
+    std::vector<graphics::Mesh::Part> parts;
+    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
+                                         (graphics::Index)faces.size() * 3, // numIndices
+                                         (graphics::Index)0, // baseVertex
+                                         graphics::Mesh::TRIANGLES)); // topology
+    mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
+                                                        (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
+
+
+
+    scriptable::ScriptableMeshPointer meshProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, mesh));
+    return engine()->toScriptValue(meshProxy);
+}
+
+QScriptValue ModelScriptingInterface::mapAttributeValues(
+    QScriptValue _in,
+    QScriptValue scopeOrCallback,
+    QScriptValue methodOrName
+    ) {
+    qCInfo(model_scripting) << "mapAttributeValues" << _in.toVariant().typeName() << _in.toVariant().toString() << _in.toQObject();
+    auto in = qscriptvalue_cast<scriptable::ScriptableModel>(_in).getMeshes();
+    if (in.size()) {
+        foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
+            mapMeshAttributeValues(meshProxy, scopeOrCallback, methodOrName);
+        }
+        return thisObject();
+    } else if (auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(_in.toQObject())) {
+        return mapMeshAttributeValues(meshProxy->shared_from_this(), scopeOrCallback, methodOrName);
+    } else {
+        context()->throwError("invalid ModelProxy || MeshProxyPointer");
+    }
+    return false;
+}
+
+
+QScriptValue ModelScriptingInterface::unrollVertices(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals) {
+    auto mesh = getMeshPointer(meshProxy);
+    qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices" << !!mesh<< !!meshProxy;
+    if (!mesh) {
+        return QScriptValue();
+    }
+
+    auto positions = mesh->getVertexBuffer();
+    auto indices = mesh->getIndexBuffer();
+    quint32 numPoints = (quint32)indices.getNumElements();
+    auto buffer = new gpu::Buffer();
+    buffer->resize(numPoints * sizeof(uint32_t));
+    auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
+    qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices numPoints" << numPoints;
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto sz = view._element.getSize();
+        auto buffer = new gpu::Buffer();
+        buffer->resize(numPoints * sz);
+        auto points = gpu::BufferView(buffer, view._element);
+        auto src = (uint8_t*)view._buffer->getData();
+        auto dest = (uint8_t*)points._buffer->getData();
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices buffer" << a.first;
+        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices source" << view.getNumElements();
+        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices dest" << points.getNumElements();
+        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices sz" << sz << src << dest << slot;
+        auto esize = indices._element.getSize();
+        const char* hint= a.first.toStdString().c_str();
+        for(quint32 i = 0; i < numPoints; i++) {
+            quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
+            newindices.edit<uint32_t>(i) = i;
+            bufferViewElementFromVariant(
+                points, i,
+                bufferViewElementToVariant(view, index, false, hint)
+                    );
+        }
+        if (slot == gpu::Stream::POSITION) {
+            mesh->setVertexBuffer(points);
+        } else {
+            mesh->addAttribute(slot, points);
+        }
+    }
+    mesh->setIndexBuffer(newindices);
+    if (recalcNormals) {
+        recalculateNormals(meshProxy);
+    }
+    return true;
+}
+
+namespace {
+    template <typename T>
+    gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType) {
+        auto vertexBuffer = std::make_shared<gpu::Buffer>(
+            elements.size() * sizeof(T),
+            (gpu::Byte*)elements.data()
+        );
+        return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
+    }
+
+    gpu::BufferView cloneBufferView(const gpu::BufferView& input) {
+        //qCInfo(model_scripting) << "input" << input.getNumElements() << input._buffer->getSize();
+        auto output = gpu::BufferView(
+            std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
+            input._offset,
+            input._size,
+            input._stride,
+            input._element
+            );
+        //qCInfo(model_scripting) << "after" << output.getNumElements() << output._buffer->getSize();
+        return output;
+    }
+
+    gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements) {
+        auto effectiveSize = input._buffer->getSize() / input.getNumElements();
+        qCInfo(model_scripting) << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
+        auto vsize = input._element.getSize() * numElements;
+        gpu::Byte *data = new gpu::Byte[vsize];
+        memset(data, 0, vsize);
+        auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
+        delete[] data;
+        auto output = gpu::BufferView(buffer, input._element);
+        qCInfo(model_scripting) << "resized output" << output.getNumElements() << output._buffer->getSize();
+        return output;
+    }
+}
+
+bool ModelScriptingInterface::replaceMeshData(scriptable::ScriptableMeshPointer dest, scriptable::ScriptableMeshPointer src, const QVector<QString>& attributeNames) {
+    auto target = getMeshPointer(dest);
+    auto source = getMeshPointer(src);
+    if (!target || !source) {
+        context()->throwError("ModelScriptingInterface::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
+        return false;
+    }
+
+    QVector<QString> attributes = attributeNames.isEmpty() ? src->getAttributeNames() : attributeNames;
+
+    //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData -- source:" << source->displayName << "target:" << target->displayName << "attributes:" << attributes;
+
+    // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
+    if (attributeNames.isEmpty()) {
+        auto attributeViews = ScriptableMesh::gatherBufferViews(target);
+        for (const auto& a : attributeViews) {
+            auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+            if (!attributes.contains(a.first)) {
+                //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData -- pruning target attribute" << a.first << slot;
+                target->removeAttribute(slot);
+            }
+        }
+    }
+
+    target->setVertexBuffer(cloneBufferView(source->getVertexBuffer()));
+    target->setIndexBuffer(cloneBufferView(source->getIndexBuffer()));
+    target->setPartBuffer(cloneBufferView(source->getPartBuffer()));
+
+    for (const auto& a : attributes) {
+        auto slot = ScriptableMesh::ATTRIBUTES[a];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+        // auto& before = target->getAttributeBuffer(slot);
+        auto& input = source->getAttributeBuffer(slot);
+        if (input.getNumElements() == 0) {
+            //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData buffer is empty -- pruning" << a << slot;
+            target->removeAttribute(slot);
+        } else {
+            // if (before.getNumElements() == 0) {
+            //     qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData target buffer is empty -- adding" << a << slot;
+            // } else {
+            //     qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData target buffer exists -- updating" << a << slot;
+            // }
+            target->addAttribute(slot, cloneBufferView(input));
+        }
+        // auto& after = target->getAttributeBuffer(slot);
+        // qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
+    }
+
+
+    return true;
+}
+
+bool ModelScriptingInterface::dedupeVertices(scriptable::ScriptableMeshPointer meshProxy, float epsilon) {
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return false;
+    }
+    auto positions = mesh->getVertexBuffer();
+    auto numPositions = positions.getNumElements();
+    const auto epsilon2 = epsilon*epsilon;
+
+    QVector<glm::vec3> uniqueVerts;
+    uniqueVerts.reserve((int)numPositions);
+    QMap<quint32,quint32> remapIndices;
+
+    for (quint32 i = 0; i < numPositions; i++) {
+        const quint32 numUnique = uniqueVerts.size();
+        const auto& position = positions.get<glm::vec3>(i);
+        bool unique = true;
+        for (quint32 j = 0; j < numUnique; j++) {
+            if (glm::length2(uniqueVerts[j] - position) <= epsilon2) {
+                remapIndices[i] = j;
+                unique = false;
+                break;
+            }
+        }
+        if (unique) {
+            uniqueVerts << position;
+            remapIndices[i] = numUnique;
+        }
+    }
+
+    qCInfo(model_scripting) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
+
+    auto indices = mesh->getIndexBuffer();
+    auto numIndices = indices.getNumElements();
+    auto esize = indices._element.getSize();
+    QVector<quint32> newIndices;
+    newIndices.reserve((int)numIndices);
+    for (quint32 i = 0; i < numIndices; i++) {
+        quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
+        if (remapIndices.contains(index)) {
+            //qCInfo(model_scripting) << i << index << "->" << remapIndices[index];
+            newIndices << remapIndices[index];
+        } else {
+            qCInfo(model_scripting) << i << index << "!remapIndices[index]";
+        }
+    }
+
+    mesh->setIndexBuffer(bufferViewFromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
+    mesh->setVertexBuffer(bufferViewFromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
+
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    quint32 numUniqueVerts = uniqueVerts.size();
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+        qCInfo(model_scripting) << "ModelScriptingInterface::dedupeVertices" << a.first << slot << view.getNumElements();
+        auto newView = resizedBufferView(view, numUniqueVerts);
+        qCInfo(model_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
+        quint32 numElements = (quint32)view.getNumElements();
+        for (quint32 i = 0; i < numElements; i++) {
+            quint32 fromVertexIndex = i;
+            quint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
+            bufferViewElementFromVariant(
+                newView, toVertexIndex,
+                bufferViewElementToVariant(view, fromVertexIndex, false, "dedupe")
+                );
+        }
+        mesh->addAttribute(slot, newView);
+    }
+    return true;
+}
+
+QScriptValue ModelScriptingInterface::cloneMesh(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals) {
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return QScriptValue::NullValue;
+    }
+    graphics::MeshPointer clone(new graphics::Mesh());
+    clone->displayName = mesh->displayName + "-clone";
+    qCInfo(model_scripting) << "ModelScriptingInterface::cloneMesh" << !!mesh<< !!meshProxy;
+    if (!mesh) {
+        return QScriptValue::NullValue;
+    }
+
+    clone->setIndexBuffer(cloneBufferView(mesh->getIndexBuffer()));
+    clone->setPartBuffer(cloneBufferView(mesh->getPartBuffer()));
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices buffer" << a.first << slot;
+        auto points = cloneBufferView(view);
+        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices source" << view.getNumElements();
+        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices dest" << points.getNumElements();
+        if (slot == gpu::Stream::POSITION) {
+            clone->setVertexBuffer(points);
+        } else {
+            clone->addAttribute(slot, points);
+        }
+    }
+
+    auto result = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, clone));
+    if (recalcNormals) {
+        recalculateNormals(result);
+    }
+    return engine()->toScriptValue(result);
+}
+
+bool ModelScriptingInterface::recalculateNormals(scriptable::ScriptableMeshPointer meshProxy) {
+    qCInfo(model_scripting) << "Recalculating normals" << !!meshProxy;
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return false;
+    }
+    ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
+    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
+    auto verts = mesh->getVertexBuffer();
+    auto indices = mesh->getIndexBuffer();
+    auto esize = indices._element.getSize();
+    auto numPoints = indices.getNumElements();
+    const auto TRIANGLE = 3;
+    quint32 numFaces = (quint32)numPoints / TRIANGLE;
+    //QVector<Triangle> faces;
+    QVector<glm::vec3> faceNormals;
+    QMap<QString,QVector<quint32>> vertexToFaces;
+    //faces.resize(numFaces);
+    faceNormals.resize(numFaces);
+    auto numNormals = normals.getNumElements();
+    qCInfo(model_scripting) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
+    if (normals.getNumElements() != verts.getNumElements()) {
+        return false;
+    }
+    for (quint32 i = 0; i < numFaces; i++) {
+        quint32 I = TRIANGLE * i;
+        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
+        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
+        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
+
+        Triangle face = {
+            verts.get<glm::vec3>(i1),
+            verts.get<glm::vec3>(i2),
+            verts.get<glm::vec3>(i0)
+        };
+        faceNormals[i] = face.getNormal();
+        if (glm::isnan(faceNormals[i].x)) {
+            qCInfo(model_scripting) << i << i0 << i1 << i2 << vec3toVariant(face.v0) << vec3toVariant(face.v1) << vec3toVariant(face.v2);
+            break;
+        }
+        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
+    }
+    for (quint32 j = 0; j < numNormals; j++) {
+        //auto v = verts.get<glm::vec3>(j);
+        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
+        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
+        const auto& faces = vertexToFaces.value(key);
+        if (faces.size()) {
+            for (const auto i : faces) {
+                normal += faceNormals[i];
+            }
+            normal *= 1.0f / (float)faces.size();
+        } else {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(model_scripting) << "no faces for key!?" << key;
+            }
+            normal = verts.get<glm::vec3>(j);
+        }
+        if (glm::isnan(normal.x)) {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(model_scripting) << "isnan(normal.x)" << j << vec3toVariant(normal);
+            }
+            break;
+        }
+        normals.edit<glm::vec3>(j) = glm::normalize(normal);
+    }
+    return true;
+}
+
+QScriptValue ModelScriptingInterface::mapMeshAttributeValues(
+    scriptable::ScriptableMeshPointer meshProxy, QScriptValue scopeOrCallback, QScriptValue methodOrName
+) {
+    auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return false;
+    }
+    auto scopedHandler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+
+    // input buffers
+    gpu::BufferView positions = mesh->getVertexBuffer();
+
+    const auto nPositions = positions.getNumElements();
+
+    // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
+    auto scope = scopedHandler.property("scope");
+    auto callback = scopedHandler.property("callback");
+    auto js = engine(); // cache value to avoid resolving each iteration
+    auto meshPart = js->toScriptValue(meshProxy);
+
+    auto obj = js->newObject();
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" });
+    for (uint32_t i=0; i < nPositions; i++) {
+        for (const auto& a : attributeViews) {
+            bool asArray = a.second._element.getType() != gpu::FLOAT;
+            obj.setProperty(a.first, bufferViewElementToScriptValue(js, a.second, i, asArray, a.first.toStdString().c_str()));
+        }
+        auto result = callback.call(scope, { obj, i, meshPart });
+        if (js->hasUncaughtException()) {
+            context()->throwValue(js->uncaughtException());
+            return false;
+        }
+
+        if (result.isBool() && !result.toBool()) {
+            // bail without modifying data if user explicitly returns false
+            continue;
+        }
+        if (result.isObject() && !result.strictlyEquals(obj)) {
+            // user returned a new object (ie: instead of modifying input properties)
+            obj = result;
+        }
+
+        for (const auto& a : attributeViews) {
+            const auto& attribute = obj.property(a.first);
+            auto& view = a.second;
+            if (attribute.isValid()) {
+                bufferViewElementFromScriptValue(attribute, view, i);
+            }
+        }
+    }
+    return thisObject();
+}
+
+void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName) {
+    auto handler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+    Q_ASSERT(handler.engine() == this->engine());
+    QPointer<BaseScriptEngine> engine = dynamic_cast<BaseScriptEngine*>(handler.engine());
+
+    scriptable::ScriptableModel meshes;
+    bool success = false;
+    QString error;
+
+    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
+    qDebug() << "appProvider" << appProvider.data();
+    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
+    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
+    if (providerType.isEmpty()) {
+        providerType = "unknown";
+    }
+    if (provider) {
+        qCDebug(model_scripting) << "fetching meshes from " << providerType << "...";
+        auto scriptableMeshes = provider->getScriptableModel(&success);
+        qCDebug(model_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
+        if (success) {
+            meshes = scriptableMeshes;//SimpleModelProxy::fromScriptableModel(scriptableMeshes);
+        }
+    }
+    if (!success) {
+        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
+    }
+
+    if (!error.isEmpty()) {
+        qCWarning(model_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
+        callScopedHandlerObject(handler, engine->makeError(error), QScriptValue::NullValue);
+    } else {
+        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->toScriptValue(meshes));
+    }
+}
+
+namespace {
+    QScriptValue meshToScriptValue(QScriptEngine* engine, scriptable::ScriptableMeshPointer const &in) {
+        return engine->newQObject(in.get(), QScriptEngine::QtOwnership,
+            QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects
+        );
+    }
+
+    void meshFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
+        auto obj = value.toQObject();
+        //qDebug() << "meshFromScriptValue" << obj;
+        if (auto tmp = qobject_cast<scriptable::ScriptableMesh*>(obj)) {
+            out = tmp->shared_from_this();
+        }
+        // FIXME: Why does above cast not work on Win32!?
+        if (!out) {
+            auto smp = static_cast<scriptable::ScriptableMesh*>(obj);
+            //qDebug() << "meshFromScriptValue2" << smp;
+            out = smp->shared_from_this();
+        }
+    }
+
+    QScriptValue meshesToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer &in) {
+        // QScriptValueList result;
+        QScriptValue result = engine->newArray();
+        int i = 0;
+        foreach(scriptable::ScriptableMeshPointer const meshProxy, in->getMeshes()) {
+            result.setProperty(i++, meshToScriptValue(engine, meshProxy));
+        }
+        return result;
+    }
+
+    void meshesFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
+        const auto length = value.property("length").toInt32();
+        qCDebug(model_scripting) << "in meshesFromScriptValue, length =" << length;
+        for (int i = 0; i < length; i++) {
+            if (const auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(value.property(i).toQObject())) {
+                out->meshes.append(meshProxy->getMeshPointer());
+            } else {
+                qCDebug(model_scripting) << "null meshProxy" << i;
+            }
+        }
+    }
+
+    void modelProxyFromScriptValue(const QScriptValue& object, scriptable::ScriptableModel &meshes) {
+        auto meshesProperty = object.property("meshes");
+        if (meshesProperty.property("length").toInt32() > 0) {
+            //meshes._meshes = qobject_cast<scriptable::ScriptableModelPointer>(meshesProperty.toQObject());
+            // qDebug() << "modelProxyFromScriptValue" << meshesProperty.property("length").toInt32() << meshesProperty.toVariant().typeName();
+            qScriptValueToSequence(meshesProperty, meshes.meshes);
+        } else if (auto mesh = qobject_cast<scriptable::ScriptableMesh*>(object.toQObject())) {
+            meshes.meshes << mesh->getMeshPointer();
+        } else {
+            qDebug() << "modelProxyFromScriptValue -- unrecognized input" << object.toVariant().toString();
+        }
+
+        meshes.metadata = object.property("metadata").toVariant().toMap();
+    }
+
+    QScriptValue modelProxyToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModel &in) {
+        QScriptValue obj = engine->newObject();
+        obj.setProperty("meshes", qScriptValueFromSequence(engine, in.meshes));
+        obj.setProperty("metadata", engine->toScriptValue(in.metadata));
+        return obj;
+    }
+
+    QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
+        QScriptValue obj = engine->newObject();
+        obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
+        return obj;
+    }
+
+    void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
+        qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
+    }
+
+    QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
+        return qScriptValueFromSequence(engine, vector);
+    }
+
+    void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
+        qScriptValueToSequence(array, result);
+    }
+
+    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<mesh::uint32>& vector) {
+        return qScriptValueFromSequence(engine, vector);
+    }
+
+    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<mesh::uint32>& result) {
+        qScriptValueToSequence(array, result);
+    }
+}
+
+int meshUint32 = qRegisterMetaType<mesh::uint32>();
+namespace mesh {
+    int meshUint32 = qRegisterMetaType<uint32>();
+}
+int qVectorMeshUint32 = qRegisterMetaType<QVector<mesh::uint32>>();
+
+void ModelScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
+    qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
+    qScriptRegisterSequenceMetaType<mesh::MeshFaces>(engine);
+    qScriptRegisterSequenceMetaType<QVector<mesh::uint32>>(engine);
+    qScriptRegisterMetaType(engine, modelProxyToScriptValue, modelProxyFromScriptValue);
+
+    qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
+    qScriptRegisterMetaType(engine, meshToScriptValue, meshFromScriptValue);
+    qScriptRegisterMetaType(engine, meshesToScriptValue, meshesFromScriptValue);
+    qScriptRegisterMetaType(engine, meshFaceToScriptValue, meshFaceFromScriptValue);
+    qScriptRegisterMetaType(engine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
+}
+
+MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPointer meshProxy) {
+    MeshPointer result;
+    if (!meshProxy) {
+        if (context()){
+            context()->throwError("expected meshProxy as first parameter");
+        }
+        return result;
+    }
+    auto mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        if (context()) {
+            context()->throwError("expected valid meshProxy as first parameter");
+        }
+        return result;
+    }
+    return mesh;
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
new file mode 100644
index 0000000000..d10fd28170
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
@@ -0,0 +1,68 @@
+//
+//  ModelScriptingInterface.h
+//  libraries/script-engine/src
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#ifndef hifi_ModelScriptingInterface_h
+#define hifi_ModelScriptingInterface_h
+
+#include <QtCore/QObject>
+#include <QUrl>
+
+#include <RegisteredMetaTypes.h>
+
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptable>
+
+#include "ScriptableMesh.h"
+#include <DependencyManager.h>
+class ModelScriptingInterface : public QObject, public QScriptable, public Dependency {
+    Q_OBJECT
+
+public:
+    ModelScriptingInterface(QObject* parent = nullptr);
+    static void registerMetaTypes(QScriptEngine* engine);
+
+public slots:
+    /**jsdoc
+     * Returns the meshes associated with a UUID (entityID, overlayID, or avatarID)
+     *
+     * @function ModelScriptingInterface.getMeshes
+     * @param {EntityID} entityID The ID of the entity whose meshes are to be retrieve
+     */
+    void getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName = QScriptValue());
+
+    bool dedupeVertices(scriptable::ScriptableMeshPointer meshProxy, float epsilon = 1e-6);
+    bool recalculateNormals(scriptable::ScriptableMeshPointer meshProxy);
+    QScriptValue cloneMesh(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals = true);
+    QScriptValue unrollVertices(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals = true);
+    QScriptValue mapAttributeValues(QScriptValue in,
+                                                QScriptValue scopeOrCallback,
+                                                QScriptValue methodOrName = QScriptValue());
+    QScriptValue mapMeshAttributeValues(scriptable::ScriptableMeshPointer meshProxy,
+                                                QScriptValue scopeOrCallback,
+                                                QScriptValue methodOrName = QScriptValue());
+
+    QString meshToOBJ(const scriptable::ScriptableModel& in);
+
+    bool replaceMeshData(scriptable::ScriptableMeshPointer dest, scriptable::ScriptableMeshPointer source, const QVector<QString>& attributeNames = QVector<QString>());
+    QScriptValue appendMeshes(scriptable::ScriptableModel in);
+    QScriptValue transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform);
+    QScriptValue newMesh(const QVector<glm::vec3>& vertices,
+                                     const QVector<glm::vec3>& normals,
+                                     const QVector<mesh::MeshFace>& faces);
+    QScriptValue getVertexCount(scriptable::ScriptableMeshPointer meshProxy);
+    QScriptValue getVertex(scriptable::ScriptableMeshPointer meshProxy, mesh::uint32 vertexIndex);
+
+private:
+    scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
+
+};
+
+#endif // hifi_ModelScriptingInterface_h
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
new file mode 100644
index 0000000000..47d91e9e59
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -0,0 +1,359 @@
+//
+//  SimpleMeshProxy.cpp
+//  libraries/model-networking/src/model-networking/
+//
+//  Created by Seth Alves on 2017-3-22.
+//  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
+//
+
+#include "ScriptableMesh.h"
+
+#include <glm/glm.hpp>
+#include <glm/gtx/transform.hpp>
+#include <glm/gtx/norm.hpp>
+#include <graphics/Geometry.h>
+#include <graphics-scripting/DebugNames.h>
+#include <graphics-scripting/BufferViewHelpers.h>
+#include <Extents.h>
+
+#include "ScriptableMesh.moc"
+
+#include <RegisteredMetaTypes.h>
+
+QLoggingCategory mesh_logging { "hifi.scripting.mesh" };
+
+// FIXME: unroll/resolve before PR
+using namespace scriptable;
+QMap<QString,int> ScriptableMesh::ATTRIBUTES{
+    {"position", gpu::Stream::POSITION },
+    {"normal", gpu::Stream::NORMAL },
+    {"color", gpu::Stream::COLOR },
+    {"tangent", gpu::Stream::TEXCOORD0 },
+    {"skin_cluster_index", gpu::Stream::SKIN_CLUSTER_INDEX },
+    {"skin_cluster_weight", gpu::Stream::SKIN_CLUSTER_WEIGHT },
+    {"texcoord0", gpu::Stream::TEXCOORD0 },
+    {"texcoord1", gpu::Stream::TEXCOORD1 },
+    {"texcoord2", gpu::Stream::TEXCOORD2 },
+    {"texcoord3", gpu::Stream::TEXCOORD3 },
+    {"texcoord4", gpu::Stream::TEXCOORD4 },
+};
+
+QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() const {
+    QVector<scriptable::ScriptableMeshPointer> out;
+    for(auto& mesh : meshes) {
+        out << scriptable::ScriptableMeshPointer(new ScriptableMesh(std::const_pointer_cast<scriptable::ScriptableModel>(this->shared_from_this()), mesh));
+    }
+    return out;
+}
+
+quint32 ScriptableMesh::getNumVertices() const {
+    if (auto mesh = getMeshPointer()) {
+        return (quint32)mesh->getNumVertices();
+    }
+    return 0;
+}
+
+// glm::vec3 ScriptableMesh::getPos3(quint32 index) const {
+//     if (auto mesh = getMeshPointer()) {
+//         if (index < getNumVertices()) {
+//             return mesh->getPos3(index);
+//         }
+//     }
+//     return glm::vec3(NAN);
+// }
+
+namespace {
+    gpu::BufferView getBufferView(scriptable::MeshPointer mesh, gpu::Stream::Slot slot) {
+        return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
+    }
+}
+
+QVector<quint32> ScriptableMesh::findNearbyIndices(const glm::vec3& origin, float epsilon) const {
+    QVector<quint32> result;
+    if (auto mesh = getMeshPointer()) {
+        const auto& pos = getBufferView(mesh, gpu::Stream::POSITION);
+        const uint32_t num = (uint32_t)pos.getNumElements();
+        for (uint32_t i = 0; i < num; i++) {
+            const auto& position = pos.get<glm::vec3>(i);
+            if (glm::distance(position, origin) <= epsilon) {
+                result << i;
+            }
+        }
+    }
+    return result;
+}
+
+QVector<quint32> ScriptableMesh::getIndices() const {
+    QVector<quint32> result;
+    if (auto mesh = getMeshPointer()) {
+        qCDebug(mesh_logging, "getTriangleIndices mesh %p", mesh.get());
+        gpu::BufferView indexBufferView = mesh->getIndexBuffer();
+        if (quint32 count = (quint32)indexBufferView.getNumElements()) {
+            result.resize(count);
+            auto buffer = indexBufferView._buffer;
+            if (indexBufferView._element.getSize() == 4) {
+                // memcpy(result.data(), buffer->getData(), result.size()*sizeof(quint32));
+                for (quint32 i = 0; i < count; i++) {
+                    result[i] = indexBufferView.get<quint32>(i);
+                }
+            } else {
+                for (quint32 i = 0; i < count; i++) {
+                    result[i] = indexBufferView.get<quint16>(i);
+                }
+            }
+        }
+    }
+    return result;
+}
+
+quint32 ScriptableMesh::getNumAttributes() const {
+    if (auto mesh = getMeshPointer()) {
+        return (quint32)mesh->getNumAttributes();
+    }
+    return 0;
+}
+QVector<QString> ScriptableMesh::getAttributeNames() const {
+    QVector<QString> result;
+    if (auto mesh = getMeshPointer()) {
+        for (const auto& a : ATTRIBUTES.toStdMap()) {
+            auto bufferView = getBufferView(mesh, a.second);
+            if (bufferView.getNumElements() > 0) {
+                result << a.first;
+            }
+        }
+    }
+    return result;
+}
+
+// override
+QVariantMap ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
+    return getVertexAttributes(vertexIndex, getAttributeNames());
+}
+
+bool ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
+    qDebug()  << "setVertexAttributes" << vertexIndex << attributes;
+    for (auto& a : gatherBufferViews(getMeshPointer())) {
+        const auto& name = a.first;
+        const auto& value = attributes.value(name);
+        if (value.isValid()) {
+            auto& view = a.second;
+            bufferViewElementFromVariant(view, vertexIndex, value);
+        } else {
+            qCDebug(mesh_logging) << "setVertexAttributes" << vertexIndex << name;
+        }
+    }
+    return true;
+}
+
+int ScriptableMesh::_getSlotNumber(const QString& attributeName) const {
+    if (auto mesh = getMeshPointer()) {
+        return ATTRIBUTES.value(attributeName, -1);
+    }
+    return -1;
+}
+
+
+QVariantMap ScriptableMesh::getMeshExtents() const {
+    auto mesh = getMeshPointer();
+    auto box = mesh ? mesh->evalPartsBound(0, (int)mesh->getNumParts()) : AABox();
+    return {
+        { "brn", glmVecToVariant(box.getCorner()) },
+        { "tfl", glmVecToVariant(box.calcTopFarLeft()) },
+        { "center", glmVecToVariant(box.calcCenter()) },
+        { "min", glmVecToVariant(box.getMinimumPoint()) },
+        { "max", glmVecToVariant(box.getMaximumPoint()) },
+        { "dimensions", glmVecToVariant(box.getDimensions()) },
+    };
+}
+
+quint32 ScriptableMesh::getNumParts() const {
+    if (auto mesh = getMeshPointer()) {
+        return (quint32)mesh->getNumParts();
+    }
+    return 0;
+}
+
+QVariantMap ScriptableMesh::scaleToFit(float unitScale) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        auto center = box.calcCenter();
+        float maxDimension = glm::distance(box.getMaximumPoint(), box.getMinimumPoint());
+        return scale(glm::vec3(unitScale / maxDimension), center);
+    }
+    return {};
+}
+QVariantMap ScriptableMesh::translate(const glm::vec3& translation) {
+    return transform(glm::translate(translation));
+}
+QVariantMap ScriptableMesh::scale(const glm::vec3& scale, const glm::vec3& origin) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
+        return transform(glm::translate(center) * glm::scale(scale));
+    }
+    return {};
+}
+QVariantMap ScriptableMesh::rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin) {
+    return rotate(glm::quat(glm::radians(eulerAngles)), origin);
+}
+QVariantMap ScriptableMesh::rotate(const glm::quat& rotation, const glm::vec3& origin) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
+        return transform(glm::translate(center) * glm::toMat4(rotation));
+    }
+    return {};
+}
+QVariantMap ScriptableMesh::transform(const glm::mat4& transform) {
+    if (auto mesh = getMeshPointer()) {
+        const auto& pos = getBufferView(mesh, gpu::Stream::POSITION);
+        const uint32_t num = (uint32_t)pos.getNumElements();
+        for (uint32_t i = 0; i < num; i++) {
+            auto& position = pos.edit<glm::vec3>(i);
+            position = transform * glm::vec4(position, 1.0f);
+        }
+    }
+    return getMeshExtents();
+}
+
+QVariantList ScriptableMesh::getAttributeValues(const QString& attributeName) const {
+    QVariantList result;
+    auto slotNum = _getSlotNumber(attributeName);
+    if (slotNum >= 0) {
+        auto slot = (gpu::Stream::Slot)slotNum;
+        const auto& bufferView = getBufferView(getMeshPointer(), slot);
+        if (auto len = bufferView.getNumElements()) {
+            bool asArray = bufferView._element.getType() != gpu::FLOAT;
+            for (quint32 i = 0; i < len; i++) {
+                result << bufferViewElementToVariant(bufferView, i, asArray, attributeName.toStdString().c_str());
+            }
+        }
+    }
+    return result;
+}
+QVariantMap ScriptableMesh::getVertexAttributes(quint32 vertexIndex, QVector<QString> names) const {
+    QVariantMap result;
+    auto mesh = getMeshPointer();
+    if (!mesh || vertexIndex >= getNumVertices()) {
+        return result;
+    }
+    for (const auto& a : ATTRIBUTES.toStdMap()) {
+        auto name = a.first;
+        if (!names.contains(name)) {
+            continue;
+        }
+        auto slot = a.second;
+        const gpu::BufferView& bufferView = getBufferView(mesh, slot);
+        if (vertexIndex < bufferView.getNumElements()) {
+            bool asArray = bufferView._element.getType() != gpu::FLOAT;
+            result[name] = bufferViewElementToVariant(bufferView, vertexIndex, asArray, name.toStdString().c_str());
+        }
+    }
+    return result;
+}
+
+/// --- buffer view <-> variant helpers
+
+namespace {
+    // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
+    gpu::BufferView _expandedAttributeBuffer(const scriptable::MeshPointer mesh, gpu::Stream::Slot slot, const gpu::Element& elementType) {
+        gpu::Size elementSize = elementType.getSize();
+        gpu::BufferView bufferView = getBufferView(mesh, slot);
+        auto nPositions = mesh->getNumVertices();
+        auto vsize = nPositions * elementSize;
+        auto diffTypes = (elementType.getType() != bufferView._element.getType()  ||
+                          elementType.getSize() > bufferView._element.getSize() ||
+                          elementType.getScalarCount() > bufferView._element.getScalarCount() ||
+                          vsize > bufferView._size
+            );
+        auto hint = DebugNames::stringFrom(slot);
+
+#ifdef DEV_BUILD
+        auto beforeCount = bufferView.getNumElements();
+        auto beforeTotal = bufferView._size;
+#endif
+        if (bufferView.getNumElements() < nPositions || diffTypes) {
+            if (!bufferView._buffer || bufferView.getNumElements() == 0) {
+                qCInfo(mesh_logging).nospace() << "ScriptableMesh -- adding missing mesh attribute '" << hint << "' for BufferView";
+                gpu::Byte *data = new gpu::Byte[vsize];
+                memset(data, 0, vsize);
+                auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
+                delete[] data;
+                bufferView = gpu::BufferView(buffer, elementType);
+                mesh->addAttribute(slot, bufferView);
+            } else {
+                qCInfo(mesh_logging) << "ScriptableMesh -- resizing Buffer current:" << hint << bufferView._buffer->getSize() << "wanted:" << vsize;
+                bufferView._element = elementType;
+                bufferView._buffer->resize(vsize);
+                bufferView._size = bufferView._buffer->getSize();
+            }
+        }
+#ifdef DEV_BUILD
+        auto afterCount = bufferView.getNumElements();
+        auto afterTotal = bufferView._size;
+        if (beforeTotal != afterTotal || beforeCount != afterCount) {
+            auto typeName = DebugNames::stringFrom(bufferView._element.getType());
+            qCDebug(mesh_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
+                          hint.toStdString().c_str(), bufferView._element.getScalarCount(),
+                          typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+        }
+#endif
+        return bufferView;
+    }
+    const gpu::Element UNUSED{ gpu::SCALAR, gpu::UINT8, gpu::RAW };
+
+    gpu::Element getVecNElement(gpu::Type T, int N) {
+        switch(N) {
+        case 2: return { gpu::VEC2, T, gpu::XY };
+        case 3: return { gpu::VEC3, T, gpu::XYZ };
+        case 4: return { gpu::VEC4, T, gpu::XYZW };
+        }
+        Q_ASSERT(false);
+        return UNUSED;
+    }
+
+    gpu::BufferView expandAttributeToMatchPositions(scriptable::MeshPointer mesh, gpu::Stream::Slot slot) {
+        if (slot == gpu::Stream::POSITION) {
+            return getBufferView(mesh, slot);
+        }
+        return _expandedAttributeBuffer(mesh, slot, getVecNElement(gpu::FLOAT, 3));
+    }
+}
+
+std::map<QString, gpu::BufferView> ScriptableMesh::gatherBufferViews(scriptable::MeshPointer mesh, const QStringList& expandToMatchPositions) {
+    std::map<QString, gpu::BufferView> attributeViews;
+    if (!mesh) {
+        return attributeViews;
+    }
+    for (const auto& a : ScriptableMesh::ATTRIBUTES.toStdMap()) {
+        auto name = a.first;
+        auto slot = a.second;
+        if (expandToMatchPositions.contains(name)) {
+            expandAttributeToMatchPositions(mesh, slot);
+        }
+        auto view = getBufferView(mesh, slot);
+        auto beforeCount = view.getNumElements();
+        if (beforeCount > 0) {
+            auto element = view._element;
+            auto vecN = element.getScalarCount();
+            auto type = element.getType();
+            QString typeName = DebugNames::stringFrom(element.getType());
+            auto beforeTotal = view._size;
+
+            attributeViews[name] = _expandedAttributeBuffer(mesh, slot, getVecNElement(type, vecN));
+
+#if DEV_BUILD
+            auto afterTotal = attributeViews[name]._size;
+            auto afterCount = attributeViews[name].getNumElements();
+            if (beforeTotal != afterTotal || beforeCount != afterCount) {
+                qCDebug(mesh_logging, "NOTE:: gatherBufferViews.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
+                              name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+            }
+#endif
+        }
+    }
+    return attributeViews;
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
new file mode 100644
index 0000000000..da11002906
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -0,0 +1,127 @@
+#pragma once
+
+#include <glm/glm.hpp>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include <QtCore/QUuid>
+#include <memory>
+
+#include <DependencyManager.h>
+
+#include <graphics-scripting/ScriptableModel.h>
+
+namespace graphics {
+    class Mesh;
+}
+namespace gpu {
+    class BufferView;
+}
+namespace scriptable {
+    class ScriptableMesh : public QObject, public std::enable_shared_from_this<ScriptableMesh> {
+        Q_OBJECT
+    public:
+        ScriptableModelPointer _model;
+        scriptable::MeshPointer _mesh;
+        QVariantMap _metadata;
+    ScriptableMesh() : QObject() {}
+    ScriptableMesh(ScriptableModelPointer parent, scriptable::MeshPointer mesh) : QObject(), _model(parent), _mesh(mesh) {}
+    ScriptableMesh(const ScriptableMesh& other) : QObject(), _model(other._model), _mesh(other._mesh), _metadata(other._metadata) {}
+        ~ScriptableMesh() { qDebug() << "~ScriptableMesh" << this; }
+        Q_PROPERTY(quint32 numParts READ getNumParts)
+        Q_PROPERTY(quint32 numAttributes READ getNumAttributes)
+        Q_PROPERTY(quint32 numVertices READ getNumVertices)
+        Q_PROPERTY(quint32 numIndices READ getNumIndices)
+        Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
+
+        virtual scriptable::MeshPointer getMeshPointer() const { return _mesh; }
+        Q_INVOKABLE virtual quint32 getNumParts() const;
+        Q_INVOKABLE virtual quint32 getNumVertices() const;
+        Q_INVOKABLE virtual quint32 getNumAttributes() const;
+        Q_INVOKABLE virtual quint32 getNumIndices() const { return 0;  }
+        Q_INVOKABLE virtual QVector<QString> getAttributeNames() const;
+        Q_INVOKABLE virtual QVariantMap getVertexAttributes(quint32 vertexIndex) const;
+        Q_INVOKABLE virtual QVariantMap getVertexAttributes(quint32 vertexIndex, QVector<QString> attributes) const;
+        
+        Q_INVOKABLE virtual QVector<quint32> getIndices() const;
+        Q_INVOKABLE virtual QVector<quint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
+        Q_INVOKABLE virtual QVariantMap getMeshExtents() const;
+        Q_INVOKABLE virtual bool setVertexAttributes(quint32 vertexIndex, QVariantMap attributes);
+        Q_INVOKABLE virtual QVariantMap scaleToFit(float unitScale);
+
+    static QMap<QString,int> ATTRIBUTES;
+    static std::map<QString, gpu::BufferView> gatherBufferViews(MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
+
+    Q_INVOKABLE QVariantList getAttributeValues(const QString& attributeName) const;
+
+    Q_INVOKABLE int _getSlotNumber(const QString& attributeName) const;
+
+    QVariantMap translate(const glm::vec3& translation);
+    QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
+    QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
+    QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
+    Q_INVOKABLE QVariantMap transform(const glm::mat4& transform);
+    };
+
+    // TODO: for now this is a part-specific wrapper around ScriptableMesh
+    class ScriptableMeshPart : public ScriptableMesh {
+        Q_OBJECT
+    public:
+        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { _model=view._model; _mesh=view._mesh; return *this; };
+        ScriptableMeshPart(const ScriptableMeshPart& other) : ScriptableMesh(other._model, other._mesh) {}
+        ScriptableMeshPart() : ScriptableMesh(nullptr, nullptr) {}
+        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
+        ScriptableMeshPart(ScriptableMeshPointer mesh) : ScriptableMesh(mesh->_model, mesh->_mesh) {}
+        Q_PROPERTY(QString topology READ getTopology)
+        Q_PROPERTY(quint32 numFaces READ getNumFaces)
+
+        scriptable::MeshPointer parentMesh;
+        int partIndex;
+        QString getTopology() const { return "triangles"; }         
+        Q_INVOKABLE virtual quint32 getNumFaces() const { return getIndices().size() / 3; }
+        Q_INVOKABLE virtual QVector<quint32> getFace(quint32 faceIndex) const {
+            auto inds = getIndices();
+            return faceIndex+2 < (quint32)inds.size() ? inds.mid(faceIndex*3, 3) : QVector<quint32>();
+        }
+    };
+
+    class GraphicsScriptingInterface : public QObject {
+        Q_OBJECT
+    public:
+        GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent) {}
+    GraphicsScriptingInterface(const GraphicsScriptingInterface& other) {}
+        public slots:
+            ScriptableMeshPart exportMeshPart(ScriptableMesh mesh, int part) { return {}; }
+        
+    };
+}
+
+Q_DECLARE_METATYPE(scriptable::ScriptableMesh)
+Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
+Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
+Q_DECLARE_METATYPE(scriptable::ScriptableMeshPart)
+Q_DECLARE_METATYPE(scriptable::GraphicsScriptingInterface)
+
+// FIXME: faces were supported in the original Model.* API -- are they still needed/used/useful for anything yet?
+#include <memory>
+
+namespace mesh {
+    using uint32 = quint32;
+    class MeshFace;
+    using MeshFaces = QVector<mesh::MeshFace>;
+    class MeshFace {
+    public:
+        MeshFace() {}
+        MeshFace(QVector<mesh::uint32> vertexIndices) : vertexIndices(vertexIndices) {}
+        ~MeshFace() {}
+
+        QVector<mesh::uint32> vertexIndices;
+        // TODO -- material...
+    };
+};
+
+Q_DECLARE_METATYPE(mesh::MeshFace)
+Q_DECLARE_METATYPE(QVector<mesh::MeshFace>)
+Q_DECLARE_METATYPE(mesh::uint32)
+Q_DECLARE_METATYPE(QVector<mesh::uint32>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
new file mode 100644
index 0000000000..e8cf6f1656
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <glm/glm.hpp>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include <QtCore/QUuid>
+#include <memory>
+
+#include <DependencyManager.h>
+
+namespace graphics {
+    class Mesh;
+}
+namespace gpu {
+    class BufferView;
+}
+namespace scriptable {
+    using Mesh = graphics::Mesh;
+    using MeshPointer = std::shared_ptr<scriptable::Mesh>;
+
+    class ScriptableModel;
+    class ScriptableMesh;
+    class ScriptableMeshPart;
+    using ScriptableModelPointer = std::shared_ptr<scriptable::ScriptableModel>;
+    using ScriptableMeshPointer = std::shared_ptr<scriptable::ScriptableMesh>;
+    using ScriptableMeshPartPointer = std::shared_ptr<scriptable::ScriptableMeshPart>;
+    class ScriptableModel : public QObject, public std::enable_shared_from_this<ScriptableModel> {
+        Q_OBJECT
+    public:
+        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
+
+        Q_INVOKABLE QString toString() { return "[ScriptableModel " + objectName()+"]"; }
+        ScriptableModel(QObject* parent = nullptr) : QObject(parent) {}
+        ScriptableModel(const ScriptableModel& other) : objectID(other.objectID), metadata(other.metadata), meshes(other.meshes)  {}
+        ScriptableModel& operator=(const ScriptableModel& view) {
+            objectID = view.objectID;
+            metadata = view.metadata;
+            meshes = view.meshes;
+            return *this;
+        }
+        ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
+        void mixin(const ScriptableModel& other) {
+            for (const auto& key : other.metadata.keys()) {
+                metadata[key] = other.metadata[key];
+            }
+            for(const auto&mesh : other.meshes) {
+                meshes << mesh;
+            }
+        }
+        QUuid objectID;
+        QVariantMap metadata;
+        QVector<scriptable::MeshPointer> meshes;
+        // TODO: in future accessors for these could go here
+        QVariantMap shapes;
+        QVariantMap materials;
+        QVariantMap armature;
+
+        QVector<scriptable::ScriptableMeshPointer> getMeshes() const;
+    };
+
+    class ModelProvider {
+    public:
+        QVariantMap metadata;
+        static scriptable::ScriptableModel modelUnavailableError(bool* ok) { if (ok) { *ok = false; } return {}; }
+        virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) = 0;
+    };
+    using ModelProviderPointer = std::shared_ptr<scriptable::ModelProvider>;
+    class ModelProviderFactory : public Dependency {
+    public:
+        virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) = 0;
+    };
+        
+}
+
+Q_DECLARE_METATYPE(scriptable::MeshPointer)
+Q_DECLARE_METATYPE(scriptable::ScriptableModel)
+Q_DECLARE_METATYPE(scriptable::ScriptableModelPointer)
+
diff --git a/libraries/graphics/src/graphics/Geometry.cpp b/libraries/graphics/src/graphics/Geometry.cpp
index ba5afcbc62..d43c773249 100755
--- a/libraries/graphics/src/graphics/Geometry.cpp
+++ b/libraries/graphics/src/graphics/Geometry.cpp
@@ -42,6 +42,11 @@ void Mesh::addAttribute(Slot slot, const BufferView& buffer) {
     evalVertexFormat();
 }
 
+void Mesh::removeAttribute(Slot slot) {
+    _attributeBuffers.erase(slot);
+    evalVertexFormat();
+}
+
 const BufferView Mesh::getAttributeBuffer(int attrib) const {
     auto attribBuffer = _attributeBuffers.find(attrib);
     if (attribBuffer != _attributeBuffers.end()) {
@@ -224,6 +229,7 @@ graphics::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
     }
 
     graphics::MeshPointer result(new graphics::Mesh());
+    result->displayName = displayName;
 
     gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
     gpu::Buffer* resultVertexBuffer = new gpu::Buffer(vertexSize, resultVertexData.get());
diff --git a/libraries/graphics/src/graphics/Geometry.h b/libraries/graphics/src/graphics/Geometry.h
index 642aa9e38d..23ebec2965 100755
--- a/libraries/graphics/src/graphics/Geometry.h
+++ b/libraries/graphics/src/graphics/Geometry.h
@@ -56,6 +56,7 @@ public:
     // Attribute Buffers
     size_t getNumAttributes() const { return _attributeBuffers.size(); }
     void addAttribute(Slot slot, const BufferView& buffer);
+    void removeAttribute(Slot slot);
     const BufferView getAttributeBuffer(int attrib) const;
 
     // Stream format
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp b/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
deleted file mode 100644
index 741478789e..0000000000
--- a/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  SimpleMeshProxy.cpp
-//  libraries/model-networking/src/model-networking/
-//
-//  Created by Seth Alves on 2017-3-22.
-//  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
-//
-
-#include "SimpleMeshProxy.h"
-
-#include <graphics/Geometry.h>
-
-MeshPointer SimpleMeshProxy::getMeshPointer() const {
-    return _mesh;
-}
-
-int SimpleMeshProxy::getNumVertices() const {
-    return (int)_mesh->getNumVertices();
-}
-
-glm::vec3 SimpleMeshProxy::getPos3(int index) const {
-    return _mesh->getPos3(index);
-}
-
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
deleted file mode 100644
index 24c3fca27e..0000000000
--- a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  SimpleMeshProxy.h
-//  libraries/model-networking/src/model-networking/
-//
-//  Created by Seth Alves on 2017-1-27.
-//  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
-//
-
-#ifndef hifi_SimpleMeshProxy_h
-#define hifi_SimpleMeshProxy_h
-
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-#include <QtScript/QScriptValue>
-
-#include <RegisteredMetaTypes.h>
-
-class SimpleMeshProxy : public MeshProxy {
-public:
-    SimpleMeshProxy(const MeshPointer& mesh) : _mesh(mesh) { }
-
-    MeshPointer getMeshPointer() const override;
-
-    int getNumVertices() const override;
-
-    glm::vec3 getPos3(int index) const override;
-
-
-protected:
-    const MeshPointer _mesh;
-};
-
-#endif // hifi_SimpleMeshProxy_h
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 6be3057c93..55762e38fd 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -7,6 +7,7 @@ link_hifi_libraries(shared ktx gpu graphics model-networking render animation fb
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(audio)
+include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
 
 if (NOT ANDROID)
   target_nsight()
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 23473e74f2..6aa42cf6df 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -2407,3 +2407,48 @@ void GeometryCache::renderWireCubeInstance(RenderArgs* args, gpu::Batch& batch,
     assert(pipeline != nullptr);
     renderInstances(args, batch, color, true, pipeline, GeometryCache::Cube);
 }
+
+graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec3 color) {
+    auto shapeData = getShapeData(geometryShape);
+
+    qDebug() << "GeometryCache::getMeshProxyListFromShape" << shapeData << stringFromShape(geometryShape);
+
+    auto cloneBufferView = [](const gpu::BufferView& in) -> gpu::BufferView {
+        auto buffer = std::make_shared<gpu::Buffer>(*in._buffer); // copy
+        // FIXME: gpu::BufferView seems to have a bug where constructing a new instance from an existing one
+        //   results in over-multiplied buffer/view sizes -- hence constructing manually here from each input prop
+        auto out = gpu::BufferView(buffer, in._offset, in._size, in._stride, in._element);
+        Q_ASSERT(out.getNumElements() == in.getNumElements());
+        Q_ASSERT(out._size == in._size);
+        Q_ASSERT(out._buffer->getSize() == in._buffer->getSize());
+        return out;
+    };
+    
+    auto positionsBufferView = cloneBufferView(shapeData->_positionView);
+    auto normalsBufferView = cloneBufferView(shapeData->_normalView);
+    auto indexBufferView = cloneBufferView(shapeData->_indicesView);
+
+    gpu::BufferView::Size numVertices = positionsBufferView.getNumElements();
+    Q_ASSERT(numVertices == normalsBufferView.getNumElements());
+
+    // apply input color across all vertices
+    auto colorsBufferView = cloneBufferView(shapeData->_normalView);
+    for (gpu::BufferView::Size i = 0; i < numVertices; i++) {
+        colorsBufferView.edit<glm::vec3>((gpu::BufferView::Index)i) = color;
+    }
+
+    graphics::MeshPointer mesh(new graphics::Mesh());
+    mesh->setVertexBuffer(positionsBufferView);
+    mesh->setIndexBuffer(indexBufferView);
+    mesh->addAttribute(gpu::Stream::NORMAL, normalsBufferView);
+    mesh->addAttribute(gpu::Stream::COLOR, colorsBufferView);
+
+    const auto startIndex = 0, baseVertex = 0;
+    graphics::Mesh::Part part(startIndex, (graphics::Index)indexBufferView.getNumElements(), baseVertex, graphics::Mesh::TRIANGLES);
+    auto partBuffer = new gpu::Buffer(sizeof(graphics::Mesh::Part), (gpu::Byte*)&part);
+    mesh->setPartBuffer(gpu::BufferView(partBuffer, gpu::Element::PART_DRAWCALL));
+
+    mesh->displayName = QString("GeometryCache/shape::%1").arg(GeometryCache::stringFromShape(geometryShape));
+
+    return mesh;
+}
diff --git a/libraries/render-utils/src/GeometryCache.h b/libraries/render-utils/src/GeometryCache.h
index 63af30bb79..998043b80e 100644
--- a/libraries/render-utils/src/GeometryCache.h
+++ b/libraries/render-utils/src/GeometryCache.h
@@ -375,6 +375,7 @@ public:
     /// otherwise nullptr in the event of an error.
     const ShapeData * getShapeData(Shape shape) const;
 
+    graphics::MeshPointer meshFromShape(Shape geometryShape, glm::vec3 color);
 private:
 
     GeometryCache();
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b0763c0fb3..d595136c56 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -26,7 +26,7 @@
 #include <GLMHelpers.h>
 #include <TBBHelpers.h>
 
-#include <model-networking/SimpleMeshProxy.h>
+#include <graphics-scripting/ScriptableModel.h>
 #include <DualQuaternion.h>
 
 #include <glm/gtc/packing.hpp>
@@ -573,15 +573,21 @@ bool Model::convexHullContains(glm::vec3 point) {
     return false;
 }
 
-MeshProxyList Model::getMeshes() const {
-    MeshProxyList result;
+scriptable::ScriptableModel Model::getScriptableModel(bool* ok) {
+    scriptable::ScriptableModel result;
     const Geometry::Pointer& renderGeometry = getGeometry();
-    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
 
     if (!isLoaded()) {
+        qDebug() << "Model::getScriptableModel -- !isLoaded";
+        if (ok) {
+            *ok = false;
+        }
         return result;
     }
 
+// TODO: remove -- this was an earlier approach using renderGeometry instead of FBXGeometry
+#if 0 // renderGeometry approach
+    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
     Transform offset;
     offset.setScale(_scale);
     offset.postTranslate(_offset);
@@ -591,20 +597,67 @@ MeshProxyList Model::getMeshes() const {
         if (!mesh) {
             continue;
         }
-
-        MeshProxy* meshProxy = new SimpleMeshProxy(
-            mesh->map(
-                [=](glm::vec3 position) {
-                    return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
-                },
-                [=](glm::vec3 color) { return color; },
-                [=](glm::vec3 normal) {
-                    return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
-                },
-                [&](uint32_t index) { return index; }));
-        result << meshProxy;
+        qDebug() << "Model::getScriptableModel #" << i++ << mesh->displayName;
+        auto newmesh = mesh->map(
+            [=](glm::vec3 position) {
+                return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
+            },
+            [=](glm::vec3 color) { return color; },
+            [=](glm::vec3 normal) {
+                return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
+            },
+            [&](uint32_t index) { return index; });
+        newmesh->displayName = mesh->displayName;
+        result << newmesh;
     }
-
+#endif
+    const FBXGeometry& geometry = getFBXGeometry();
+    auto mat4toVariant = [](const glm::mat4& mat4) -> QVariant {
+        QVector<float> floats;
+        floats.resize(16);
+        memcpy(floats.data(), &mat4, sizeof(glm::mat4));
+        QVariant v;
+        v.setValue<QVector<float>>(floats);
+        return v;
+    };
+    result.metadata = {
+        { "url", _url.toString() },
+        { "textures", renderGeometry->getTextures() },
+        { "offset", vec3toVariant(_offset) },
+        { "scale", vec3toVariant(_scale) },
+        { "rotation", quatToVariant(_rotation) },
+        { "translation", vec3toVariant(_translation) },
+        { "meshToModel", mat4toVariant(glm::scale(_scale) * glm::translate(_offset)) },
+        { "meshToWorld", mat4toVariant(createMatFromQuatAndPos(_rotation, _translation) * (glm::scale(_scale) * glm::translate(_offset))) },
+        { "geometryOffset", mat4toVariant(geometry.offset) },
+    };
+    QVariantList submeshes;
+    int numberOfMeshes = geometry.meshes.size();
+    for (int i = 0; i < numberOfMeshes; i++) {
+        const FBXMesh& fbxMesh = geometry.meshes.at(i);
+        auto mesh = fbxMesh._mesh;
+        if (!mesh) {
+            continue;
+        }
+        result.meshes << std::const_pointer_cast<graphics::Mesh>(mesh);
+        auto extraInfo = geometry.getModelNameOfMesh(i);
+        qDebug() << "Model::getScriptableModel #" << i << QString(mesh->displayName) << extraInfo;
+        submeshes << QVariantMap{
+            { "index", i },
+            { "meshIndex", fbxMesh.meshIndex },
+            { "modelName", extraInfo },
+            { "transform", mat4toVariant(fbxMesh.modelTransform) },
+            { "extents", QVariantMap({
+                { "minimum", vec3toVariant(fbxMesh.meshExtents.minimum) },
+                { "maximum", vec3toVariant(fbxMesh.meshExtents.maximum) },
+            })},
+        };
+    }
+    if (ok) {
+        *ok = true;
+    }
+    qDebug() << "//Model::getScriptableModel -- #" << result.meshes.size();
+    result.metadata["submeshes"] = submeshes;
     return result;
 }
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 027d52ecfd..4fd00c9f9a 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -27,6 +27,7 @@
 #include <gpu/Batch.h>
 #include <render/Forward.h>
 #include <render/Scene.h>
+#include <graphics-scripting/ScriptableModel.h>
 #include <Transform.h>
 #include <SpatiallyNestable.h>
 #include <TriangleSet.h>
@@ -64,7 +65,7 @@ using ModelWeakPointer = std::weak_ptr<Model>;
 
 
 /// A generic 3D model displaying geometry loaded from a URL.
-class Model : public QObject, public std::enable_shared_from_this<Model> {
+class Model : public QObject, public std::enable_shared_from_this<Model>, public scriptable::ModelProvider {
     Q_OBJECT
 
 public:
@@ -313,7 +314,7 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
-    Q_INVOKABLE MeshProxyList getMeshes() const;
+    Q_INVOKABLE virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
 
     void scaleToFit();
 
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
deleted file mode 100644
index c693083ebf..0000000000
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-//
-//  ModelScriptingInterface.cpp
-//  libraries/script-engine/src
-//
-//  Created by Seth Alves on 2017-1-27.
-//  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
-//
-
-#include "ModelScriptingInterface.h"
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-#include <QtScript/QScriptValue>
-#include <model-networking/SimpleMeshProxy.h>
-#include "ScriptEngine.h"
-#include "ScriptEngineLogging.h"
-#include "OBJWriter.h"
-
-ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
-    _modelScriptEngine = qobject_cast<QScriptEngine*>(parent);
-
-    qScriptRegisterSequenceMetaType<QList<MeshProxy*>>(_modelScriptEngine);
-    qScriptRegisterMetaType(_modelScriptEngine, meshFaceToScriptValue, meshFaceFromScriptValue);
-    qScriptRegisterMetaType(_modelScriptEngine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
-}
-
-QString ModelScriptingInterface::meshToOBJ(MeshProxyList in) {
-    QList<MeshPointer> meshes;
-    foreach (const MeshProxy* meshProxy, in) {
-        meshes.append(meshProxy->getMeshPointer());
-    }
-
-    return writeOBJToString(meshes);
-}
-
-QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
-    // figure out the size of the resulting mesh
-    size_t totalVertexCount { 0 };
-    size_t totalColorCount { 0 };
-    size_t totalNormalCount { 0 };
-    size_t totalIndexCount { 0 };
-    foreach (const MeshProxy* meshProxy, in) {
-        MeshPointer mesh = meshProxy->getMeshPointer();
-        totalVertexCount += mesh->getNumVertices();
-
-        int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
-        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(attributeTypeColor);
-        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
-        totalColorCount += numColors;
-
-        int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
-        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
-        gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
-        totalNormalCount += numNormals;
-
-        totalIndexCount += mesh->getNumIndices();
-    }
-
-    // alloc the resulting mesh
-    gpu::Resource::Size combinedVertexSize = totalVertexCount * sizeof(glm::vec3);
-    std::unique_ptr<unsigned char> combinedVertexData{ new unsigned char[combinedVertexSize] };
-    unsigned char* combinedVertexDataCursor = combinedVertexData.get();
-
-    gpu::Resource::Size combinedColorSize = totalColorCount * sizeof(glm::vec3);
-    std::unique_ptr<unsigned char> combinedColorData{ new unsigned char[combinedColorSize] };
-    unsigned char* combinedColorDataCursor = combinedColorData.get();
-
-    gpu::Resource::Size combinedNormalSize = totalNormalCount * sizeof(glm::vec3);
-    std::unique_ptr<unsigned char> combinedNormalData{ new unsigned char[combinedNormalSize] };
-    unsigned char* combinedNormalDataCursor = combinedNormalData.get();
-
-    gpu::Resource::Size combinedIndexSize = totalIndexCount * sizeof(uint32_t);
-    std::unique_ptr<unsigned char> combinedIndexData{ new unsigned char[combinedIndexSize] };
-    unsigned char* combinedIndexDataCursor = combinedIndexData.get();
-
-    uint32_t indexStartOffset { 0 };
-
-    foreach (const MeshProxy* meshProxy, in) {
-        MeshPointer mesh = meshProxy->getMeshPointer();
-        mesh->forEach(
-            [&](glm::vec3 position){
-                memcpy(combinedVertexDataCursor, &position, sizeof(position));
-                combinedVertexDataCursor += sizeof(position);
-            },
-            [&](glm::vec3 color){
-                memcpy(combinedColorDataCursor, &color, sizeof(color));
-                combinedColorDataCursor += sizeof(color);
-            },
-            [&](glm::vec3 normal){
-                memcpy(combinedNormalDataCursor, &normal, sizeof(normal));
-                combinedNormalDataCursor += sizeof(normal);
-            },
-            [&](uint32_t index){
-                index += indexStartOffset;
-                memcpy(combinedIndexDataCursor, &index, sizeof(index));
-                combinedIndexDataCursor += sizeof(index);
-            });
-
-        gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
-        indexStartOffset += numVertices;
-    }
-
-    graphics::MeshPointer result(new graphics::Mesh());
-
-    gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());
-    gpu::BufferPointer combinedVertexBufferPointer(combinedVertexBuffer);
-    gpu::BufferView combinedVertexBufferView(combinedVertexBufferPointer, vertexElement);
-    result->setVertexBuffer(combinedVertexBufferView);
-
-    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
-    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedColorsBuffer = new gpu::Buffer(combinedColorSize, combinedColorData.get());
-    gpu::BufferPointer combinedColorsBufferPointer(combinedColorsBuffer);
-    gpu::BufferView combinedColorsBufferView(combinedColorsBufferPointer, colorElement);
-    result->addAttribute(attributeTypeColor, combinedColorsBufferView);
-
-    int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
-    gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedNormalsBuffer = new gpu::Buffer(combinedNormalSize, combinedNormalData.get());
-    gpu::BufferPointer combinedNormalsBufferPointer(combinedNormalsBuffer);
-    gpu::BufferView combinedNormalsBufferView(combinedNormalsBufferPointer, normalElement);
-    result->addAttribute(attributeTypeNormal, combinedNormalsBufferView);
-
-    gpu::Element indexElement = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW);
-    gpu::Buffer* combinedIndexesBuffer = new gpu::Buffer(combinedIndexSize, combinedIndexData.get());
-    gpu::BufferPointer combinedIndexesBufferPointer(combinedIndexesBuffer);
-    gpu::BufferView combinedIndexesBufferView(combinedIndexesBufferPointer, indexElement);
-    result->setIndexBuffer(combinedIndexesBufferView);
-
-    std::vector<graphics::Mesh::Part> parts;
-    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
-                                         (graphics::Index)result->getNumIndices(), // numIndices
-                                         (graphics::Index)0, // baseVertex
-                                         graphics::Mesh::TRIANGLES)); // topology
-    result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
-                                                          (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
-
-
-    MeshProxy* resultProxy = new SimpleMeshProxy(result);
-    return meshToScriptValue(_modelScriptEngine, resultProxy);
-}
-
-QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshProxy* meshProxy) {
-    if (!meshProxy) {
-        return QScriptValue(false);
-    }
-    MeshPointer mesh = meshProxy->getMeshPointer();
-    if (!mesh) {
-        return QScriptValue(false);
-    }
-
-    const auto inverseTransposeTransform = glm::inverse(glm::transpose(transform));
-    graphics::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
-                                          [&](glm::vec3 color){ return color; },
-                                          [&](glm::vec3 normal){ return glm::vec3(inverseTransposeTransform * glm::vec4(normal, 0.0f)); },
-                                          [&](uint32_t index){ return index; });
-    MeshProxy* resultProxy = new SimpleMeshProxy(result);
-    return meshToScriptValue(_modelScriptEngine, resultProxy);
-}
-
-QScriptValue ModelScriptingInterface::getVertexCount(MeshProxy* meshProxy) {
-    if (!meshProxy) {
-        return QScriptValue(false);
-    }
-    MeshPointer mesh = meshProxy->getMeshPointer();
-    if (!mesh) {
-        return QScriptValue(false);
-    }
-
-    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
-
-    return numVertices;
-}
-
-QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertexIndex) {
-    if (!meshProxy) {
-        return QScriptValue(false);
-    }
-    MeshPointer mesh = meshProxy->getMeshPointer();
-    if (!mesh) {
-        return QScriptValue(false);
-    }
-
-    const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
-    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
-
-    if (vertexIndex < 0 || vertexIndex >= numVertices) {
-        return QScriptValue(false);
-    }
-
-    glm::vec3 pos = vertexBufferView.get<glm::vec3>(vertexIndex);
-    return vec3toScriptValue(_modelScriptEngine, pos);
-}
-
-
-QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
-                                              const QVector<glm::vec3>& normals,
-                                              const QVector<MeshFace>& faces) {
-    graphics::MeshPointer mesh(new graphics::Mesh());
-
-    // vertices
-    auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
-    auto vertexBufferPtr = gpu::BufferPointer(vertexBuffer);
-    gpu::BufferView vertexBufferView(vertexBufferPtr, 0, vertexBufferPtr->getSize(),
-                                     sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-    mesh->setVertexBuffer(vertexBufferView);
-
-    if (vertices.size() == normals.size()) {
-        // normals
-        auto normalBuffer = std::make_shared<gpu::Buffer>(normals.size() * sizeof(glm::vec3), (gpu::Byte*)normals.data());
-        auto normalBufferPtr = gpu::BufferPointer(normalBuffer);
-        gpu::BufferView normalBufferView(normalBufferPtr, 0, normalBufferPtr->getSize(),
-                                         sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-        mesh->addAttribute(gpu::Stream::NORMAL, normalBufferView);
-    } else {
-        qCDebug(scriptengine) << "ModelScriptingInterface::newMesh normals must be same length as vertices";
-    }
-
-    // indices (faces)
-    int VERTICES_PER_TRIANGLE = 3;
-    int indexBufferSize = faces.size() * sizeof(uint32_t) * VERTICES_PER_TRIANGLE;
-    unsigned char* indexData  = new unsigned char[indexBufferSize];
-    unsigned char* indexDataCursor = indexData;
-    foreach(const MeshFace& meshFace, faces) {
-        for (int i = 0; i < VERTICES_PER_TRIANGLE; i++) {
-            memcpy(indexDataCursor, &meshFace.vertexIndices[i], sizeof(uint32_t));
-            indexDataCursor += sizeof(uint32_t);
-        }
-    }
-    auto indexBuffer = std::make_shared<gpu::Buffer>(indexBufferSize, (gpu::Byte*)indexData);
-    auto indexBufferPtr = gpu::BufferPointer(indexBuffer);
-    gpu::BufferView indexBufferView(indexBufferPtr, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW));
-    mesh->setIndexBuffer(indexBufferView);
-
-    // parts
-    std::vector<graphics::Mesh::Part> parts;
-    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
-                                         (graphics::Index)faces.size() * 3, // numIndices
-                                         (graphics::Index)0, // baseVertex
-                                         graphics::Mesh::TRIANGLES)); // topology
-    mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
-                                                        (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
-
-
-
-    MeshProxy* meshProxy = new SimpleMeshProxy(mesh);
-    return meshToScriptValue(_modelScriptEngine, meshProxy);
-}
diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h
deleted file mode 100644
index 3c239f006f..0000000000
--- a/libraries/script-engine/src/ModelScriptingInterface.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  ModelScriptingInterface.h
-//  libraries/script-engine/src
-//
-//  Created by Seth Alves on 2017-1-27.
-//  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
-//
-
-#ifndef hifi_ModelScriptingInterface_h
-#define hifi_ModelScriptingInterface_h
-
-#include <QtCore/QObject>
-
-#include <RegisteredMetaTypes.h>
-class QScriptEngine;
-
-class ModelScriptingInterface : public QObject {
-    Q_OBJECT
-
-public:
-    ModelScriptingInterface(QObject* parent);
-
-    Q_INVOKABLE QString meshToOBJ(MeshProxyList in);
-    Q_INVOKABLE QScriptValue appendMeshes(MeshProxyList in);
-    Q_INVOKABLE QScriptValue transformMesh(glm::mat4 transform, MeshProxy* meshProxy);
-    Q_INVOKABLE QScriptValue newMesh(const QVector<glm::vec3>& vertices,
-                                     const QVector<glm::vec3>& normals,
-                                     const QVector<MeshFace>& faces);
-    Q_INVOKABLE QScriptValue getVertexCount(MeshProxy* meshProxy);
-    Q_INVOKABLE QScriptValue getVertex(MeshProxy* meshProxy, int vertexIndex);
-
-private:
-    QScriptEngine* _modelScriptEngine { nullptr };
-};
-
-#endif // hifi_ModelScriptingInterface_h
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index c79ffffec7..ffb1b7bc74 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -73,8 +73,6 @@
 #include "WebSocketClass.h"
 #include "RecordingScriptingInterface.h"
 #include "ScriptEngines.h"
-#include "ModelScriptingInterface.h"
-
 
 #include <Profile.h>
 
@@ -711,10 +709,6 @@ void ScriptEngine::init() {
 
     registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
 
-    registerGlobalObject("Model", new ModelScriptingInterface(this));
-    qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
-    qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
-
     registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
 }
 
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index 7b455beae5..9ad5c27072 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -855,68 +855,3 @@ QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const Animatio
 void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& details) {
     // nothing for now...
 }
-
-QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in) {
-    return engine->newQObject(in, QScriptEngine::QtOwnership,
-        QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
-}
-
-void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out) {
-    out = qobject_cast<MeshProxy*>(value.toQObject());
-}
-
-QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in) {
-    // QScriptValueList result;
-    QScriptValue result = engine->newArray();
-    int i = 0;
-    foreach(MeshProxy* const meshProxy, in) {
-        result.setProperty(i++, meshToScriptValue(engine, meshProxy));
-    }
-    return result;
-}
-
-void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out) {
-    QScriptValueIterator itr(value);
-
-    qDebug() << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32();
-
-    while (itr.hasNext()) {
-        itr.next();
-        MeshProxy* meshProxy = qscriptvalue_cast<MeshProxyList::value_type>(itr.value());
-        if (meshProxy) {
-            out.append(meshProxy);
-        } else {
-            qDebug() << "null meshProxy";
-        }
-    }
-}
-
-
-QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace) {
-    QScriptValue obj = engine->newObject();
-    obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
-    return obj;
-}
-
-void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult) {
-    qVectorIntFromScriptValue(object.property("vertices"), meshFaceResult.vertexIndices);
-}
-
-QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector) {
-    QScriptValue array = engine->newArray();
-    for (int i = 0; i < vector.size(); i++) {
-        array.setProperty(i, meshFaceToScriptValue(engine, vector.at(i)));
-    }
-    return array;
-}
-
-void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result) {
-    int length = array.property("length").toInteger();
-    result.clear();
-
-    for (int i = 0; i < length; i++) {
-        MeshFace meshFace = MeshFace();
-        meshFaceFromScriptValue(array.property(i), meshFace);
-        result << meshFace;
-    }
-}
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 25b2cec331..e8390c3a86 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -315,51 +315,9 @@ Q_DECLARE_METATYPE(AnimationDetails);
 QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& event);
 void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& event);
 
-namespace graphics {
-    class Mesh;
-}
-
-using MeshPointer = std::shared_ptr<graphics::Mesh>;
 
 
-class MeshProxy : public QObject {
-    Q_OBJECT
 
-public:
-    virtual MeshPointer getMeshPointer() const = 0;
-    Q_INVOKABLE virtual int getNumVertices() const = 0;
-    Q_INVOKABLE virtual glm::vec3 getPos3(int index) const = 0;
-};
-
-Q_DECLARE_METATYPE(MeshProxy*);
-
-class MeshProxyList : public QList<MeshProxy*> {}; // typedef and using fight with the Qt macros/templates, do this instead
-Q_DECLARE_METATYPE(MeshProxyList);
-
-
-QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in);
-void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out);
-
-QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in);
-void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out);
-
-class MeshFace {
-
-public:
-    MeshFace() {}
-    ~MeshFace() {}
-
-    QVector<uint32_t> vertexIndices;
-    // TODO -- material...
-};
-
-Q_DECLARE_METATYPE(MeshFace)
-Q_DECLARE_METATYPE(QVector<MeshFace>)
-
-QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace);
-void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult);
-QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector);
-void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result);
 
 
 #endif // hifi_RegisteredMetaTypes_h

From db56246cd6b1e88bd438ee5d8e4714b0948cc285 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 1 Feb 2018 17:30:56 -0800
Subject: [PATCH 061/569] more fixes, clean up, updates

---
 scripts/system/edit.js                        |    3 +-
 .../system/libraries/entitySelectionTool.js   | 2525 +++++++++--------
 2 files changed, 1313 insertions(+), 1215 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 8dd2980ee6..4ef88fcd21 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -65,7 +65,7 @@ gridTool.setVisible(false);
 var entityListTool = new EntityListTool();
 
 selectionManager.addEventListener(function () {
-    selectionDisplay.updateGrabbers();
+    selectionDisplay.updateHandles();
     entityIconOverlayManager.updatePositions();
 
     // Update particle explorer
@@ -1250,7 +1250,6 @@ var lastPosition = null;
 // Do some stuff regularly, like check for placement of various overlays
 Script.update.connect(function (deltaTime) {
     progressDialog.move();
-    selectionDisplay.checkMove();
     selectionDisplay.checkControllerMove();
     var dOrientation = Math.abs(Quat.dot(Camera.orientation, lastOrientation) - 1);
     var dPosition = Vec3.distance(Camera.position, lastPosition);
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 87dc089c1a..c68fb6e71c 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -19,6 +19,7 @@ HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
 SPACE_LOCAL = "local";
 SPACE_WORLD = "world";
+HIGHLIGHT_LIST_NAME = "editHandleHighlightList";
 
 Script.include("./controllers.js");
 
@@ -58,6 +59,22 @@ SelectionManager = (function() {
 
     subscribeToUpdateMessages();
 
+    var COLOR_ORANGE_HIGHLIGHT = { red: 255, green: 99, blue: 9 }
+    var editHandleOutlineStyle = {
+        outlineUnoccludedColor: COLOR_ORANGE_HIGHLIGHT,
+        outlineOccludedColor: COLOR_ORANGE_HIGHLIGHT,
+        fillUnoccludedColor: COLOR_ORANGE_HIGHLIGHT,
+        fillOccludedColor: COLOR_ORANGE_HIGHLIGHT,
+        outlineUnoccludedAlpha: 1,
+        outlineOccludedAlpha: 0,
+        fillUnoccludedAlpha: 0,
+        fillOccludedAlpha: 0,
+        outlineWidth: 3,
+        isOutlineSmooth: true
+    };
+    //disabling this for now as it is causing rendering issues with the other handle overlays
+    //Selection.enableListHighlight(HIGHLIGHT_LIST_NAME, editHandleOutlineStyle);
+
     that.savedProperties = {};
     that.selections = [];
     var listeners = [];
@@ -94,7 +111,7 @@ SelectionManager = (function() {
         for (var i = 0; i < entityIDs.length; i++) {
             var entityID = entityIDs[i];
             that.selections.push(entityID);
-            //Selection.addToSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
+            Selection.addToSelectedItemsList(HIGHLIGHT_LIST_NAME, "entity", entityID);
         }
 
         that._update(true);
@@ -111,10 +128,10 @@ SelectionManager = (function() {
             }
             if (idx === -1) {
                 that.selections.push(entityID);
-                //Selection.addToSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
+                Selection.addToSelectedItemsList(HIGHLIGHT_LIST_NAME, "entity", entityID);
             } else if (toggleSelection) {
                 that.selections.splice(idx, 1);
-                //Selection.removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
+                Selection.removeFromSelectedItemsList(HIGHLIGHT_LIST_NAME, "entity", entityID);
             }
         }
 
@@ -125,7 +142,7 @@ SelectionManager = (function() {
         var idx = that.selections.indexOf(entityID);
         if (idx >= 0) {
             that.selections.splice(idx, 1);
-            //Selection.removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityID);
+            Selection.removeFromSelectedItemsList(HIGHLIGHT_LIST_NAME, "entity", entityID);
         }
         that._update(true);
     };
@@ -149,9 +166,11 @@ SelectionManager = (function() {
             that.localPosition = properties.position;
             that.localRotation = properties.rotation;
             that.localRegistrationPoint = properties.registrationPoint;
+
             that.worldDimensions = properties.boundingBox.dimensions;
             that.worldPosition = properties.boundingBox.center;
             that.worldRotation = properties.boundingBox.rotation;
+
             SelectionDisplay.setSpaceMode(SPACE_LOCAL);
         } else {
             that.localRotation = null;
@@ -163,7 +182,7 @@ SelectionManager = (function() {
             var brn = properties.boundingBox.brn;
             var tfl = properties.boundingBox.tfl;
 
-            for (var i = 1; i < that.selections.length; i++) {
+            for (var i = 0; i < that.selections.length; i++) {
                 properties = Entities.getEntityProperties(that.selections[i]);
                 var bb = properties.boundingBox;
                 brn.x = Math.min(bb.brn.x, brn.x);
@@ -213,18 +232,6 @@ function normalizeDegrees(degrees) {
     return degrees;
 }
 
-// FUNCTION: getRelativeCenterPosition
-// Return the enter position of an entity relative to it's registrationPoint
-// A registration point of (0.5, 0.5, 0.5) will have an offset of (0, 0, 0)
-// A registration point of (1.0, 1.0, 1.0) will have an offset of (-dimensions.x / 2, -dimensions.y / 2, -dimensions.z / 2)
-function getRelativeCenterPosition(dimensions, registrationPoint) {
-    return {
-        x: -dimensions.x * (registrationPoint.x - 0.5),
-        y: -dimensions.y * (registrationPoint.y - 0.5),
-        z: -dimensions.z * (registrationPoint.z - 0.5)
-    };
-}
-
 // SELECTION DISPLAY DEFINITION
 SelectionDisplay = (function() {
     var that = {};
@@ -232,39 +239,39 @@ SelectionDisplay = (function() {
     var COLOR_GREEN = { red:44, green:142, blue:14 };
     var COLOR_BLUE = { red:0, green:147, blue:197 };
     var COLOR_RED = { red:183, green:10, blue:55 };
+    var COLOR_HOVER = { red:227, green:227, blue:227 };
+    var COLOR_SCALE_EDGE = { red:87, green:87, blue:87 };
+    var COLOR_SCALE_CUBE = { red:106, green:106, blue:106 };
+    var COLOR_SCALE_CUBE_SELECTED = { red:18, green:18, blue:18 };
 
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET = 0.1;
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
-    var GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
-    var GRABBER_TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
-    var GRABBER_ROTATE_RINGS_CAMERA_DISTANCE_MULTIPLE = 0.15;
-    var GRABBER_STRETCH_SPHERE_OFFSET = 0.06;
-    var GRABBER_STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE = 0.01;
-    var GRABBER_SCALE_CUBE_OFFSET = 0.5;
-    var GRABBER_SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.015;
-    var GRABBER_CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 }; 
+    var TRANSLATE_ARROW_CYLINDER_OFFSET = 0.1;
+    var TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
+    var TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
+    var TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
 
-    var GRABBER_SCALE_CUBE_IDLE_COLOR = { red:106, green:106, blue:106 };
-    var GRABBER_SCALE_CUBE_SELECTED_COLOR = { red:18, green:18, blue:18 };
-    var GRABBER_SCALE_EDGE_COLOR = { red:87, green:87, blue:87 };
-    var GRABBER_HOVER_COLOR = { red:227, green:227, blue:227 };
-
-    var SCALE_MINIMUM_DIMENSION = 0.02;
-    var STRETCH_MINIMUM_DIMENSION = 0.001;
-    var STRETCH_DIRECTION_ALL_FACTOR = 25;
+    var ROTATE_RING_CAMERA_DISTANCE_MULTIPLE = 0.15;
+    var ROTATE_CTRL_SNAP_ANGLE = 22.5;
+    var ROTATE_DEFAULT_SNAP_ANGLE = 1;
+    var ROTATE_DEFAULT_TICK_MARKS_ANGLE = 5;
+    var ROTATE_RING_IDLE_INNER_RADIUS = 0.97;
+    var ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
-    var ROTATION_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
-    var ROTATION_DISPLAY_SIZE_X_MULTIPLIER = 0.3;
-    var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
-    var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
+    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
+    var ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.3;
+    var ROTATE_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
+    var ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
 
-    var ROTATION_CTRL_SNAP_ANGLE = 22.5;
-    var ROTATION_DEFAULT_SNAP_ANGLE = 1;
-    var ROTATION_DEFAULT_TICK_MARKS_ANGLE = 5;
+    var STRETCH_SPHERE_OFFSET = 0.06;
+    var STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE = 0.01;
+    var STRETCH_MINIMUM_DIMENSION = 0.001;
+    var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2;
 
-    var ROTATION_RING_IDLE_INNER_RADIUS = 0.97;
-    var ROTATION_RING_SELECTED_INNER_RADIUS = 0.9;
+    var SCALE_CUBE_OFFSET = 0.5;
+    var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.015;
+    var SCALE_MINIMUM_DIMENSION = 0.02;
+
+    var CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 };     
 
     var TRANSLATE_DIRECTION = {
         X : 0,
@@ -305,79 +312,76 @@ SelectionDisplay = (function() {
         getControllerWorldLocation(Controller.Standard.RightHand, true)
     ];
 
-    var rotZero;
+    var rotationZero;
     var rotationNormal;
-    var rotDegreePos;
+    var rotationDegreesPosition;
 
     var worldRotationX;
     var worldRotationY;
     var worldRotationZ;
 
-    var ctrlPressed = false;
-
     var previousHandle = null;
     var previousHandleHelper = null;
     var previousHandleColor;
 
-    var activeTool = null;
-    var grabberTools = {};
+    var ctrlPressed = false;
 
-    var grabberPropertiesTranslateArrowCones = {
+    var handlePropertiesTranslateArrowCones = {
         shape: "Cone",
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
         drawInFront: true
     };
-    var grabberPropertiesTranslateArrowCylinders = {
+    var handlePropertiesTranslateArrowCylinders = {
         shape: "Cylinder",
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
         drawInFront: true
     };
-    var grabberTranslateXCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
-    var grabberTranslateXCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
-    Overlays.editOverlay(grabberTranslateXCone, { color : COLOR_RED });
-    Overlays.editOverlay(grabberTranslateXCylinder, { color : COLOR_RED });
-    var grabberTranslateYCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
-    var grabberTranslateYCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
-    Overlays.editOverlay(grabberTranslateYCone, { color : COLOR_GREEN });
-    Overlays.editOverlay(grabberTranslateYCylinder, { color : COLOR_GREEN });
-    var grabberTranslateZCone = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCones);
-    var grabberTranslateZCylinder = Overlays.addOverlay("shape", grabberPropertiesTranslateArrowCylinders);
-    Overlays.editOverlay(grabberTranslateZCone, { color : COLOR_BLUE });
-    Overlays.editOverlay(grabberTranslateZCylinder, { color : COLOR_BLUE });
+    var handleTranslateXCone = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCones);
+    var handleTranslateXCylinder = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(handleTranslateXCone, { color : COLOR_RED });
+    Overlays.editOverlay(handleTranslateXCylinder, { color : COLOR_RED });
+    var handleTranslateYCone = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCones);
+    var handleTranslateYCylinder = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(handleTranslateYCone, { color : COLOR_GREEN });
+    Overlays.editOverlay(handleTranslateYCylinder, { color : COLOR_GREEN });
+    var handleTranslateZCone = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCones);
+    var handleTranslateZCylinder = Overlays.addOverlay("shape", handlePropertiesTranslateArrowCylinders);
+    Overlays.editOverlay(handleTranslateZCone, { color : COLOR_BLUE });
+    Overlays.editOverlay(handleTranslateZCylinder, { color : COLOR_BLUE });
 
-    var grabberPropertiesRotateRings = {
+    var handlePropertiesRotateRings = {
         alpha: 1,
         solid: true,
         startAt: 0,
         endAt: 360,
-        innerRadius: ROTATION_RING_IDLE_INNER_RADIUS,
-        majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE,
+        innerRadius: ROTATE_RING_IDLE_INNER_RADIUS,
+        majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE,
         majorTickMarksLength: 0.1,
         visible: false,
         ignoreRayIntersection: false,
         drawInFront: true
     };
-    var grabberRotatePitchRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
-    Overlays.editOverlay(grabberRotatePitchRing, { 
+    var handleRotatePitchRing = Overlays.addOverlay("circle3d", handlePropertiesRotateRings);
+    Overlays.editOverlay(handleRotatePitchRing, { 
         color : COLOR_RED,
         majorTickMarksColor: COLOR_RED,
     });
-    var grabberRotateYawRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
-    Overlays.editOverlay(grabberRotateYawRing, { 
+    var handleRotateYawRing = Overlays.addOverlay("circle3d", handlePropertiesRotateRings);
+    Overlays.editOverlay(handleRotateYawRing, { 
         color : COLOR_GREEN,
         majorTickMarksColor: COLOR_GREEN,
     });
-    var grabberRotateRollRing = Overlays.addOverlay("circle3d", grabberPropertiesRotateRings);
-    Overlays.editOverlay(grabberRotateRollRing, { 
+    var handleRotateRollRing = Overlays.addOverlay("circle3d", handlePropertiesRotateRings);
+    Overlays.editOverlay(handleRotateRollRing, { 
         color : COLOR_BLUE,
         majorTickMarksColor: COLOR_BLUE,
     });
 
-    var grabberRotateCurrentRing = Overlays.addOverlay("circle3d", {
+    var handleRotateCurrentRing = Overlays.addOverlay("circle3d", {
         alpha: 1,
         color: { red: 255, green: 99, blue: 9 },
         solid: true,
@@ -405,21 +409,21 @@ SelectionDisplay = (function() {
         leftMargin: 0
     });
 
-    var grabberPropertiesStretchSpheres = {
+    var handlePropertiesStretchSpheres = {
         shape: "Sphere",
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
         drawInFront: true
     };
-    var grabberStretchXSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
-    Overlays.editOverlay(grabberStretchXSphere, { color : COLOR_RED });
-    var grabberStretchYSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
-    Overlays.editOverlay(grabberStretchYSphere, { color : COLOR_GREEN });
-    var grabberStretchZSphere = Overlays.addOverlay("shape", grabberPropertiesStretchSpheres);
-    Overlays.editOverlay(grabberStretchZSphere, { color : COLOR_BLUE });
+    var handleStretchXSphere = Overlays.addOverlay("shape", handlePropertiesStretchSpheres);
+    Overlays.editOverlay(handleStretchXSphere, { color : COLOR_RED });
+    var handleStretchYSphere = Overlays.addOverlay("shape", handlePropertiesStretchSpheres);
+    Overlays.editOverlay(handleStretchYSphere, { color : COLOR_GREEN });
+    var handleStretchZSphere = Overlays.addOverlay("shape", handlePropertiesStretchSpheres);
+    Overlays.editOverlay(handleStretchZSphere, { color : COLOR_BLUE });
 
-    var grabberPropertiesStretchPanel = {
+    var handlePropertiesStretchPanel = {
         shape: "Quad",
         alpha: 0.5,
         solid: true,
@@ -427,52 +431,52 @@ SelectionDisplay = (function() {
         ignoreRayIntersection: true,
         drawInFront: true,
     }
-    var grabberStretchXPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
-    Overlays.editOverlay(grabberStretchXPanel, { color : COLOR_RED });
-    var grabberStretchYPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
-    Overlays.editOverlay(grabberStretchYPanel, { color : COLOR_GREEN });
-    var grabberStretchZPanel = Overlays.addOverlay("shape", grabberPropertiesStretchPanel);
-    Overlays.editOverlay(grabberStretchZPanel, { color : COLOR_BLUE });
+    var handleStretchXPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel);
+    Overlays.editOverlay(handleStretchXPanel, { color : COLOR_RED });
+    var handleStretchYPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel);
+    Overlays.editOverlay(handleStretchYPanel, { color : COLOR_GREEN });
+    var handleStretchZPanel = Overlays.addOverlay("shape", handlePropertiesStretchPanel);
+    Overlays.editOverlay(handleStretchZPanel, { color : COLOR_BLUE });
 
-    var grabberPropertiesScaleCubes = {
+    var handlePropertiesScaleCubes = {
         size: 0.025,
-        color: GRABBER_SCALE_CUBE_IDLE_COLOR,
+        color: COLOR_SCALE_CUBE,
         solid: true,
         visible: false,
         ignoreRayIntersection: false,
         drawInFront: true,
         borderSize: 1.4
     };
-    var grabberScaleLBNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x, -y, -z)
-    var grabberScaleRBNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x, -y,  z)
-    var grabberScaleLBFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x, -y, -z)
-    var grabberScaleRBFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x, -y,  z)
-    var grabberScaleLTNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x,  y, -z)
-    var grabberScaleRTNCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // (-x,  y,  z)
-    var grabberScaleLTFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x,  y, -z)
-    var grabberScaleRTFCube = Overlays.addOverlay("cube", grabberPropertiesScaleCubes); // ( x,  y,  z)
+    var handleScaleLBNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x, -y, -z)
+    var handleScaleRBNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x, -y,  z)
+    var handleScaleLBFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x, -y, -z)
+    var handleScaleRBFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x, -y,  z)
+    var handleScaleLTNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x,  y, -z)
+    var handleScaleRTNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x,  y,  z)
+    var handleScaleLTFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x,  y, -z)
+    var handleScaleRTFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x,  y,  z)
 
-    var grabberPropertiesScaleEdge = {
-        color: GRABBER_SCALE_EDGE_COLOR,
+    var handlePropertiesScaleEdge = {
+        color: COLOR_SCALE_EDGE,
         visible: false,
         ignoreRayIntersection: true,
         drawInFront: true,
         lineWidth: 0.2
     }
-    var grabberScaleTREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleTLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleTFEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleTNEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleBREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleBLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleBFEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleBNEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleNREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleNLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleFREdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
-    var grabberScaleFLEdge = Overlays.addOverlay("line3d", grabberPropertiesScaleEdge);
+    var handleScaleTREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleTLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleTFEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleTNEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleBREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleBLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleBFEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleBNEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleNREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleNLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleFREdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
+    var handleScaleFLEdge = Overlays.addOverlay("line3d", handlePropertiesScaleEdge);
 
-    var grabberCloner = Overlays.addOverlay("cube", {
+    var handleCloner = Overlays.addOverlay("cube", {
         size: 0.05,
         color: COLOR_GREEN,
         solid: true,
@@ -482,97 +486,107 @@ SelectionDisplay = (function() {
         borderSize: 1.4
     });
 
+    // setting to 0 alpha for now to keep this hidden vs using visible false 
+    // because its used as the translate xz tool handle overlay
     var selectionBox = Overlays.addOverlay("cube", {
         size: 1,
         color: COLOR_RED,
-        alpha: 0, // setting to 0 alpha for now to keep this hidden vs using visible false because its used as the translate xz tool overlay
+        alpha: 0,
         solid: false,
         visible: false,
         dashed: false
     });
 
     var allOverlays = [
-        grabberTranslateXCone,
-        grabberTranslateXCylinder,
-        grabberTranslateYCone,
-        grabberTranslateYCylinder,
-        grabberTranslateZCone,
-        grabberTranslateZCylinder,
-        grabberRotatePitchRing,
-        grabberRotateYawRing,
-        grabberRotateRollRing,
-        grabberRotateCurrentRing,
+        handleTranslateXCone,
+        handleTranslateXCylinder,
+        handleTranslateYCone,
+        handleTranslateYCylinder,
+        handleTranslateZCone,
+        handleTranslateZCylinder,
+        handleRotatePitchRing,
+        handleRotateYawRing,
+        handleRotateRollRing,
+        handleRotateCurrentRing,
         rotationDegreesDisplay,
-        grabberStretchXSphere,
-        grabberStretchYSphere,
-        grabberStretchZSphere,
-        grabberStretchXPanel,
-        grabberStretchYPanel,
-        grabberStretchZPanel,
-        grabberScaleLBNCube,
-        grabberScaleRBNCube,
-        grabberScaleLBFCube,
-        grabberScaleRBFCube,
-        grabberScaleLTNCube,
-        grabberScaleRTNCube,
-        grabberScaleLTFCube,
-        grabberScaleRTFCube,
-        grabberScaleTREdge,
-        grabberScaleTLEdge,
-        grabberScaleTFEdge,
-        grabberScaleTNEdge,
-        grabberScaleBREdge,
-        grabberScaleBLEdge,
-        grabberScaleBFEdge,
-        grabberScaleBNEdge,
-        grabberScaleNREdge,
-        grabberScaleNLEdge,
-        grabberScaleFREdge,
-        grabberScaleFLEdge,
-        grabberCloner,
+        handleStretchXSphere,
+        handleStretchYSphere,
+        handleStretchZSphere,
+        handleStretchXPanel,
+        handleStretchYPanel,
+        handleStretchZPanel,
+        handleScaleLBNCube,
+        handleScaleRBNCube,
+        handleScaleLBFCube,
+        handleScaleRBFCube,
+        handleScaleLTNCube,
+        handleScaleRTNCube,
+        handleScaleLTFCube,
+        handleScaleRTFCube,
+        handleScaleTREdge,
+        handleScaleTLEdge,
+        handleScaleTFEdge,
+        handleScaleTNEdge,
+        handleScaleBREdge,
+        handleScaleBLEdge,
+        handleScaleBFEdge,
+        handleScaleBNEdge,
+        handleScaleNREdge,
+        handleScaleNLEdge,
+        handleScaleFREdge,
+        handleScaleFLEdge,
+        handleCloner,
         selectionBox
     ];
 
-    overlayNames[grabberTranslateXCone] = "grabberTranslateXCone";
-    overlayNames[grabberTranslateXCylinder] = "grabberTranslateXCylinder";
-    overlayNames[grabberTranslateYCone] = "grabberTranslateYCone";
-    overlayNames[grabberTranslateYCylinder] = "grabberTranslateYCylinder";
-    overlayNames[grabberTranslateZCone] = "grabberTranslateZCone";
-    overlayNames[grabberTranslateZCylinder] = "grabberTranslateZCylinder";
-    overlayNames[grabberRotatePitchRing] = "grabberRotatePitchRing";
-    overlayNames[grabberRotateYawRing] = "grabberRotateYawRing";
-    overlayNames[grabberRotateRollRing] = "grabberRotateRollRing";
-    overlayNames[grabberRotateCurrentRing] = "grabberRotateCurrentRing";
+    overlayNames[handleTranslateXCone] = "handleTranslateXCone";
+    overlayNames[handleTranslateXCylinder] = "handleTranslateXCylinder";
+    overlayNames[handleTranslateYCone] = "handleTranslateYCone";
+    overlayNames[handleTranslateYCylinder] = "handleTranslateYCylinder";
+    overlayNames[handleTranslateZCone] = "handleTranslateZCone";
+    overlayNames[handleTranslateZCylinder] = "handleTranslateZCylinder";
+
+    overlayNames[handleRotatePitchRing] = "handleRotatePitchRing";
+    overlayNames[handleRotateYawRing] = "handleRotateYawRing";
+    overlayNames[handleRotateRollRing] = "handleRotateRollRing";
+    overlayNames[handleRotateCurrentRing] = "handleRotateCurrentRing";
     overlayNames[rotationDegreesDisplay] = "rotationDegreesDisplay";
-    overlayNames[grabberStretchXSphere] = "grabberStretchXSphere";
-    overlayNames[grabberStretchYSphere] = "grabberStretchYSphere";
-    overlayNames[grabberStretchZSphere] = "grabberStretchZSphere";
-    overlayNames[grabberStretchXPanel] = "grabberStretchXPanel";
-    overlayNames[grabberStretchYPanel] = "grabberStretchYPanel";
-    overlayNames[grabberStretchZPanel] = "grabberStretchZPanel";
-    overlayNames[grabberScaleLBNCube] = "grabberScaleLBNCube";
-    overlayNames[grabberScaleRBNCube] = "grabberScaleRBNCube";
-    overlayNames[grabberScaleLBFCube] = "grabberScaleLBFCube";
-    overlayNames[grabberScaleRBFCube] = "grabberScaleRBFCube";
-    overlayNames[grabberScaleLTNCube] = "grabberScaleLTNCube";
-    overlayNames[grabberScaleRTNCube] = "grabberScaleRTNCube";
-    overlayNames[grabberScaleLTFCube] = "grabberScaleLTFCube";
-    overlayNames[grabberScaleRTFCube] = "grabberScaleRTFCube";
-    overlayNames[grabberScaleTREdge] = "grabberScaleTREdge";
-    overlayNames[grabberScaleTLEdge] = "grabberScaleTLEdge";
-    overlayNames[grabberScaleTFEdge] = "grabberScaleTFEdge";
-    overlayNames[grabberScaleTNEdge] = "grabberScaleTNEdge";
-    overlayNames[grabberScaleBREdge] = "grabberScaleBREdge";
-    overlayNames[grabberScaleBLEdge] = "grabberScaleBLEdge";
-    overlayNames[grabberScaleBFEdge] = "grabberScaleBFEdge";
-    overlayNames[grabberScaleBNEdge] = "grabberScaleBNEdge";
-    overlayNames[grabberScaleNREdge] = "grabberScaleNREdge";
-    overlayNames[grabberScaleNLEdge] = "grabberScaleNLEdge";
-    overlayNames[grabberScaleFREdge] = "grabberScaleFREdge";
-    overlayNames[grabberScaleFLEdge] = "grabberScaleFLEdge";
-    overlayNames[grabberCloner] = "grabberCloner";
+
+    overlayNames[handleStretchXSphere] = "handleStretchXSphere";
+    overlayNames[handleStretchYSphere] = "handleStretchYSphere";
+    overlayNames[handleStretchZSphere] = "handleStretchZSphere";
+    overlayNames[handleStretchXPanel] = "handleStretchXPanel";
+    overlayNames[handleStretchYPanel] = "handleStretchYPanel";
+    overlayNames[handleStretchZPanel] = "handleStretchZPanel";
+
+    overlayNames[handleScaleLBNCube] = "handleScaleLBNCube";
+    overlayNames[handleScaleRBNCube] = "handleScaleRBNCube";
+    overlayNames[handleScaleLBFCube] = "handleScaleLBFCube";
+    overlayNames[handleScaleRBFCube] = "handleScaleRBFCube";
+    overlayNames[handleScaleLTNCube] = "handleScaleLTNCube";
+    overlayNames[handleScaleRTNCube] = "handleScaleRTNCube";
+    overlayNames[handleScaleLTFCube] = "handleScaleLTFCube";
+    overlayNames[handleScaleRTFCube] = "handleScaleRTFCube";
+
+    overlayNames[handleScaleTREdge] = "handleScaleTREdge";
+    overlayNames[handleScaleTLEdge] = "handleScaleTLEdge";
+    overlayNames[handleScaleTFEdge] = "handleScaleTFEdge";
+    overlayNames[handleScaleTNEdge] = "handleScaleTNEdge";
+    overlayNames[handleScaleBREdge] = "handleScaleBREdge";
+    overlayNames[handleScaleBLEdge] = "handleScaleBLEdge";
+    overlayNames[handleScaleBFEdge] = "handleScaleBFEdge";
+    overlayNames[handleScaleBNEdge] = "handleScaleBNEdge";
+    overlayNames[handleScaleNREdge] = "handleScaleNREdge";
+    overlayNames[handleScaleNLEdge] = "handleScaleNLEdge";
+    overlayNames[handleScaleFREdge] = "handleScaleFREdge";
+    overlayNames[handleScaleFLEdge] = "handleScaleFLEdge";
+
+    overlayNames[handleCloner] = "handleCloner";
     overlayNames[selectionBox] = "selectionBox";
 
+    var activeTool = null;
+    var handleTools = {};
+
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
     that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
@@ -604,8 +618,247 @@ SelectionDisplay = (function() {
     that.triggerMapping.from(Controller.Standard.RT).peek().to(makeTriggerHandler(Controller.Standard.RightHand));
     that.triggerMapping.from(Controller.Standard.LT).peek().to(makeTriggerHandler(Controller.Standard.LeftHand));
 
+    // FUNCTION DEF(s): Intersection Check Helpers
+    function testRayIntersect(queryRay, overlayIncludes, overlayExcludes) {
+        var wantDebug = false;
+        if ((queryRay === undefined) || (queryRay === null)) {
+            if (wantDebug) {
+                print("testRayIntersect - EARLY EXIT -> queryRay is undefined OR null!");
+            }
+            return null;
+        }
+
+        var intersectObj = Overlays.findRayIntersection(queryRay, true, overlayIncludes, overlayExcludes);
+
+        if (wantDebug) {
+            if (!overlayIncludes) {
+                print("testRayIntersect - no overlayIncludes provided.");
+            }
+            if (!overlayExcludes) {
+                print("testRayIntersect - no overlayExcludes provided.");
+            }
+            print("testRayIntersect - Hit: " + intersectObj.intersects);
+            print("    intersectObj.overlayID:" + intersectObj.overlayID + "[" + overlayNames[intersectObj.overlayID] + "]");
+            print("        OverlayName: " + overlayNames[intersectObj.overlayID]);
+            print("    intersectObj.distance:" + intersectObj.distance);
+            print("    intersectObj.face:" + intersectObj.face);
+            Vec3.print("    intersectObj.intersection:", intersectObj.intersection);
+        }
+
+        return intersectObj;
+    }
+
+    // FUNCTION: MOUSE PRESS EVENT
+    that.mousePressEvent = function (event) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MousePressEvent BEG =======================");
+        }
+        if (!event.isLeftButton && !that.triggered) {
+            // EARLY EXIT-(if another mouse button than left is pressed ignore it)
+            return false;
+        }
+
+        var pickRay = generalComputePickRay(event.x, event.y);
+        // TODO_Case6491:  Move this out to setup just to make it once
+        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID];
+        for (var key in handleTools) {
+            if (handleTools.hasOwnProperty(key)) {
+                interactiveOverlays.push(key);
+            }
+        }
+
+        // Start with unknown mode, in case no tool can handle this.
+        activeTool = null;
+
+        var results = testRayIntersect(pickRay, interactiveOverlays);
+        if (results.intersects) {
+            var hitOverlayID = results.overlayID;
+            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || (hitOverlayID === HMD.homeButtonID)) {
+                // EARLY EXIT-(mouse clicks on the tablet should override the edit affordances)
+                return false;
+            }
+
+            entityIconOverlayManager.setIconsSelectable(SelectionManager.selections, true);
+
+            var hitTool = handleTools[ hitOverlayID ];
+            if (hitTool) {
+                activeTool = hitTool;
+                if (activeTool.onBegin) {
+                    activeTool.onBegin(event, pickRay, results);
+                } else {
+                    print("ERROR: entitySelectionTool.mousePressEvent - ActiveTool(" + activeTool.mode + ") missing onBegin");
+                }
+            } else {
+                print("ERROR: entitySelectionTool.mousePressEvent - Hit unexpected object, check interactiveOverlays");
+            }// End_if (hitTool)
+        }// End_If(results.intersects)
+
+        if (wantDebug) {
+            print("    DisplayMode: " + getMode());
+            print("=============== eST::MousePressEvent END =======================");
+        }
+
+        // If mode is known then we successfully handled this;
+        // otherwise, we're missing a tool.
+        return activeTool;
+    };
+
+    that.resetPreviousHandleColor = function() {
+        if (previousHandle != null) {
+            Overlays.editOverlay(previousHandle, { color: previousHandleColor });
+            previousHandle = null;
+        }
+        if (previousHandleHelper != null) {
+            Overlays.editOverlay(previousHandleHelper, { color: previousHandleColor });
+            previousHandleHelper = null;
+        }
+    };
+
+    that.getHandleHelper = function(overlay) {
+        if (overlay === handleTranslateXCone) {
+            return handleTranslateXCylinder;
+        } else if (overlay === handleTranslateXCylinder) {
+            return handleTranslateXCone;
+        } else if (overlay === handleTranslateYCone) {
+            return handleTranslateYCylinder;
+        } else if (overlay === handleTranslateYCylinder) {
+            return handleTranslateYCone;
+        } else if (overlay === handleTranslateZCone) {
+            return handleTranslateZCylinder;
+        } else if (overlay === handleTranslateZCylinder) {
+            return handleTranslateZCone;
+        }
+    };
+
+    // FUNCTION: MOUSE MOVE EVENT
+    that.mouseMoveEvent = function(event) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MouseMoveEvent BEG =======================");
+        }
+        if (activeTool) {
+            if (wantDebug) {
+                print("    Trigger ActiveTool(" + activeTool.mode + ")'s onMove");
+            }
+            activeTool.onMove(event);
+
+            if (wantDebug) {
+                print("    Trigger SelectionManager::update");
+            }
+            SelectionManager._update();
+
+            if (wantDebug) {
+                print("=============== eST::MouseMoveEvent END =======================");
+            }
+            // EARLY EXIT--(Move handled via active tool)
+            return true;
+        }
+
+        // if no tool is active, then just look for handles to highlight...
+        var pickRay = generalComputePickRay(event.x, event.y);
+        var result = Overlays.findRayIntersection(pickRay);
+        var pickedColor;
+        var highlightNeeded = false;
+
+        if (result.intersects) {
+            switch (result.overlayID) {
+                case handleTranslateXCone:
+                case handleTranslateXCylinder:
+                case handleRotatePitchRing:
+                case handleStretchXSphere:
+                    pickedColor = COLOR_RED;
+                    highlightNeeded = true;
+                    break;
+                case handleTranslateYCone:
+                case handleTranslateYCylinder:
+                case handleRotateYawRing:
+                case handleStretchYSphere:
+                    pickedColor = COLOR_GREEN;
+                    highlightNeeded = true;
+                    break;
+                case handleTranslateZCone:
+                case handleTranslateZCylinder:
+                case handleRotateRollRing:
+                case handleStretchZSphere:
+                    pickedColor = COLOR_BLUE;
+                    highlightNeeded = true;
+                    break;
+                case handleScaleLBNCube:
+                case handleScaleRBNCube:
+                case handleScaleLBFCube:
+                case handleScaleRBFCube:
+                case handleScaleLTNCube:
+                case handleScaleRTNCube:
+                case handleScaleLTFCube:
+                case handleScaleRTFCube:
+                    pickedColor = COLOR_SCALE_CUBE;
+                    highlightNeeded = true;
+                    break;
+                default:
+                    that.resetPreviousHandleColor();
+                    break;
+            }
+
+            if (highlightNeeded) {
+                that.resetPreviousHandleColor();
+                Overlays.editOverlay(result.overlayID, { color: COLOR_HOVER });
+                previousHandle = result.overlayID;
+                previousHandleHelper = that.getHandleHelper(result.overlayID);
+                if (previousHandleHelper != null) {
+                    Overlays.editOverlay(previousHandleHelper, { color: COLOR_HOVER });
+                }
+                previousHandleColor = pickedColor;
+            }
+
+        } else {
+            that.resetPreviousHandleColor();
+        }
+
+        if (wantDebug) {
+            print("=============== eST::MouseMoveEvent END =======================");
+        }
+        return false;
+    };
+
+    // FUNCTION: MOUSE RELEASE EVENT
+    that.mouseReleaseEvent = function(event) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MouseReleaseEvent BEG =======================");
+        }
+        var showHandles = false;
+        if (activeTool) {
+            if (activeTool.onEnd) {
+                if (wantDebug) {
+                    print("    Triggering ActiveTool(" + activeTool.mode + ")'s onEnd");
+                }
+                activeTool.onEnd(event);
+            } else if (wantDebug) {
+                print("    ActiveTool(" + activeTool.mode + ")'s missing onEnd");
+            }
+        }
+
+        showHandles = activeTool; // base on prior tool value
+        activeTool = null;
+
+        // if something is selected, then reset the "original" properties for any potential next click+move operation
+        if (SelectionManager.hasSelection()) {
+            if (showHandles) {
+                if (wantDebug) {
+                    print("    Triggering that.select");
+                }
+                that.select(SelectionManager.selections[0], event);
+            }
+        }
+
+        if (wantDebug) {
+            print("=============== eST::MouseReleaseEvent END =======================");
+        }
+    };
+
     // Control key remains active only while key is held down
-    function keyReleaseEvent(key) {
+    that.keyReleaseEvent = function(key) {
         if (key.key === 16777249) {
             ctrlPressed = false;
             that.updateActiveRotateRing();
@@ -613,15 +866,33 @@ SelectionDisplay = (function() {
     }
 
     // Triggers notification on specific key driven events
-    function keyPressEvent(key) {
+    that.keyPressEvent = function(key) {
         if (key.key === 16777249) {
             ctrlPressed = true;
             that.updateActiveRotateRing();
         }
     }
 
-    Controller.keyPressEvent.connect(keyPressEvent);
-    Controller.keyReleaseEvent.connect(keyReleaseEvent);
+    // NOTE: mousePressEvent and mouseMoveEvent from the main script should call us., so we don't hook these:
+    //       Controller.mousePressEvent.connect(that.mousePressEvent);
+    //       Controller.mouseMoveEvent.connect(that.mouseMoveEvent);
+    Controller.mouseReleaseEvent.connect(that.mouseReleaseEvent);
+    Controller.keyPressEvent.connect(that.keyPressEvent);
+    Controller.keyReleaseEvent.connect(that.keyReleaseEvent);
+
+    that.checkControllerMove = function() {
+        if (SelectionManager.hasSelection()) {
+            var controllerPose = getControllerWorldLocation(activeHand, true);
+            var hand = (activeHand === Controller.Standard.LeftHand) ? 0 : 1;
+            if (controllerPose.valid && lastControllerPoses[hand].valid) {
+                if (!Vec3.equal(controllerPose.position, lastControllerPoses[hand].position) ||
+                    !Vec3.equal(controllerPose.rotation, lastControllerPoses[hand].rotation)) {
+                    that.mouseMoveEvent({});
+                }
+            }
+            lastControllerPoses[hand] = controllerPose;
+        }
+    };
 
     function controllerComputePickRay() {
         var controllerPose = getControllerWorldLocation(activeHand, true);
@@ -636,17 +907,703 @@ SelectionDisplay = (function() {
     function generalComputePickRay(x, y) {
         return controllerComputePickRay() || Camera.computePickRay(x, y);
     }
-    
-    function addGrabberTool(overlay, tool) {
-        grabberTools[overlay] = tool;
+
+    function getDistanceToCamera(position) {
+        var cameraPosition = Camera.getPosition();
+        var toCameraDistance = Vec3.length(Vec3.subtract(cameraPosition, position));
+        return toCameraDistance;
+    }
+
+    // @return string - The mode of the currently active tool;
+    //                  otherwise, "UNKNOWN" if there's no active tool.
+    function getMode() {
+        return (activeTool ? activeTool.mode : "UNKNOWN");
+    }
+
+    that.cleanup = function() {
+        for (var i = 0; i < allOverlays.length; i++) {
+            Overlays.deleteOverlay(allOverlays[i]);
+        }
+    };
+
+    that.select = function(entityID, event) {
+        var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+
+        lastCameraPosition = Camera.getPosition();
+        lastCameraOrientation = Camera.getOrientation();
+
+        if (event !== false) {
+            pickRay = generalComputePickRay(event.x, event.y);
+
+            var wantDebug = false;
+            if (wantDebug) {
+                print("select() with EVENT...... ");
+                print("                event.y:" + event.y);
+                Vec3.print("       current position:", properties.position);
+            }
+        }
+
+        that.updateHandles();
+    };
+
+    // FUNCTION: SET SPACE MODE
+    that.setSpaceMode = function(newSpaceMode) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("======> SetSpaceMode called. ========");
+        }
+
+        if (spaceMode !== newSpaceMode) {
+            if (wantDebug) {
+                print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
+            }
+            spaceMode = newSpaceMode;
+            that.updateHandles();
+        } else if (wantDebug) {
+            print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
+        }
+        if (wantDebug) {
+            print("====== SetSpaceMode called. <========");
+        }
+    };
+
+    function addHandleTool(overlay, tool) {
+        handleTools[overlay] = tool;
         return tool;
     }
 
-    function addGrabberTranslateTool(overlay, mode, direction) {
+    // @param: toolHandle:  The overlayID associated with the tool
+    //         that correlates to the tool you wish to query.
+    // @note: If toolHandle is null or undefined then activeTool
+    //        will be checked against those values as opposed to
+    //        the tool registered under toolHandle.  Null & Undefined 
+    //        are treated as separate values.
+    // @return: bool - Indicates if the activeTool is that queried.
+    function isActiveTool(toolHandle) {
+        if (!toolHandle) {
+            // Allow isActiveTool(null) and similar to return true if there's
+            // no active tool
+            return (activeTool === toolHandle);
+        }
+
+        if (!handleTools.hasOwnProperty(toolHandle)) {
+            print("WARNING: entitySelectionTool.isActiveTool - Encountered unknown grabberToolHandle: " + toolHandle + ". Tools should be registered via addHandleTool.");
+            // EARLY EXIT
+            return false;
+        }
+
+        return (activeTool === handleTools[ toolHandle ]);
+    }
+
+    // FUNCTION: UPDATE HANDLES
+    that.updateHandles = function() {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("======> Update Handles =======");
+            print("    Selections Count: " + SelectionManager.selections.length);
+            print("    SpaceMode: " + spaceMode);
+            print("    DisplayMode: " + getMode());
+        }
+
+        if (SelectionManager.selections.length === 0) {
+            that.setOverlaysVisible(false);
+            return;
+        }
+
+        if (SelectionManager.hasSelection()) {
+            var position = SelectionManager.worldPosition;
+            var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
+            var dimensions = spaceMode === SPACE_LOCAL ? SelectionManager.localDimensions : SelectionManager.worldDimensions;
+            var rotationInverse = Quat.inverse(rotation);
+            var toCameraDistance = getDistanceToCamera(position);
+
+            var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
+            rotationX = Quat.multiply(rotation, localRotationX);
+            worldRotationX = rotationX;
+            var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
+            rotationY = Quat.multiply(rotation, localRotationY);
+            worldRotationY = rotationY;
+            var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
+            rotationZ = Quat.multiply(rotation, localRotationZ);
+            worldRotationZ = rotationZ;
+
+            // UPDATE TRANSLATION ARROWS
+            var arrowCylinderDimension = toCameraDistance * TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE;
+            var arrowCylinderDimensions = { 
+                x:arrowCylinderDimension, 
+                y:arrowCylinderDimension * TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, 
+                z:arrowCylinderDimension 
+            };
+            var arrowConeDimension = toCameraDistance * TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE;
+            var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
+            var cylinderXPosition = { x:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance, y:0, z:0 };
+            cylinderXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderXPosition));
+            Overlays.editOverlay(handleTranslateXCylinder, { 
+                position: cylinderXPosition, 
+                rotation: rotationX,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderXDiff = Vec3.subtract(cylinderXPosition, position);
+            var coneXPosition = Vec3.sum(cylinderXPosition, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(handleTranslateXCone, { 
+                position: coneXPosition, 
+                rotation: rotationX,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderYPosition = { x:0, y:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance, z:0 };
+            cylinderYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderYPosition));
+            Overlays.editOverlay(handleTranslateYCylinder, { 
+                position: cylinderYPosition, 
+                rotation: rotationY,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderYDiff = Vec3.subtract(cylinderYPosition, position);
+            var coneYPosition = Vec3.sum(cylinderYPosition, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(handleTranslateYCone, { 
+                position: coneYPosition, 
+                rotation: rotationY,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderZPosition = { x:0, y:0, z:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance };
+            cylinderZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderZPosition));
+            Overlays.editOverlay(handleTranslateZCylinder, { 
+                position: cylinderZPosition, 
+                rotation: rotationZ,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderZDiff = Vec3.subtract(cylinderZPosition, position);
+            var coneZPosition = Vec3.sum(cylinderZPosition, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowCylinderDimensions.y * 0.83));
+            Overlays.editOverlay(handleTranslateZCone, { 
+                position: coneZPosition, 
+                rotation: rotationZ,
+                dimensions: arrowConeDimensions
+            });
+
+            // UPDATE ROTATION RINGS
+            var rotateDimension = toCameraDistance * ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var rotateDimensions = { x:rotateDimension, y:rotateDimension, z:rotateDimension };
+            if (!isActiveTool(handleRotatePitchRing)) {
+                Overlays.editOverlay(handleRotatePitchRing, { 
+                    position: position, 
+                    rotation: rotationY,
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE
+                });
+            }
+            if (!isActiveTool(handleRotateYawRing)) {
+                Overlays.editOverlay(handleRotateYawRing, { 
+                    position: position, 
+                    rotation: rotationZ,
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE
+                });
+            }
+            if (!isActiveTool(handleRotateRollRing)) {
+                Overlays.editOverlay(handleRotateRollRing, { 
+                    position: position, 
+                    rotation: rotationX,
+                    dimensions: rotateDimensions,
+                    majorTickMarksAngle: ROTATE_DEFAULT_TICK_MARKS_ANGLE
+                });
+            }
+            Overlays.editOverlay(handleRotateCurrentRing, { dimensions: rotateDimensions });
+            that.updateActiveRotateRing();
+
+            // UPDATE SCALE CUBES
+            var scaleCubeOffsetX = SCALE_CUBE_OFFSET * dimensions.x;
+            var scaleCubeOffsetY = SCALE_CUBE_OFFSET * dimensions.y;
+            var scaleCubeOffsetZ = SCALE_CUBE_OFFSET * dimensions.z;
+            var scaleCubeDimension = toCameraDistance * SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE;
+            var scaleCubeDimensions = { x:scaleCubeDimension, y:scaleCubeDimension, z:scaleCubeDimension };
+            var scaleCubeRotation = spaceMode === SPACE_LOCAL ? rotation : Quat.IDENTITY;
+            var scaleLBNCubePosition = { x:-scaleCubeOffsetX, y:-scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            scaleLBNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLBNCubePosition));
+            Overlays.editOverlay(handleScaleLBNCube, { 
+                position: scaleLBNCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleRBNCubePosition = { x:-scaleCubeOffsetX, y:-scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            scaleRBNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRBNCubePosition));
+            Overlays.editOverlay(handleScaleRBNCube, { 
+                position: scaleRBNCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleLBFCubePosition = { x:scaleCubeOffsetX, y:-scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            scaleLBFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLBFCubePosition));
+            Overlays.editOverlay(handleScaleLBFCube, { 
+                position: scaleLBFCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleRBFCubePosition = { x:scaleCubeOffsetX, y:-scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            scaleRBFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRBFCubePosition));
+            Overlays.editOverlay(handleScaleRBFCube, { 
+                position: scaleRBFCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleLTNCubePosition = { x:-scaleCubeOffsetX, y:scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            scaleLTNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLTNCubePosition));
+            Overlays.editOverlay(handleScaleLTNCube, { 
+                position: scaleLTNCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleRTNCubePosition = { x:-scaleCubeOffsetX, y:scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            scaleRTNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRTNCubePosition));
+            Overlays.editOverlay(handleScaleRTNCube, { 
+                position: scaleRTNCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleLTFCubePosition = { x:scaleCubeOffsetX, y:scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            scaleLTFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLTFCubePosition));
+            Overlays.editOverlay(handleScaleLTFCube, { 
+                position: scaleLTFCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+            var scaleRTFCubePosition = { x:scaleCubeOffsetX, y:scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            scaleRTFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRTFCubePosition));
+            Overlays.editOverlay(handleScaleRTFCube, { 
+                position: scaleRTFCubePosition, 
+                rotation: scaleCubeRotation,
+                dimensions: scaleCubeDimensions
+            });
+
+            // UPDATE SCALE EDGES
+            Overlays.editOverlay(handleScaleTREdge, { start: scaleRTNCubePosition, end: scaleRTFCubePosition });
+            Overlays.editOverlay(handleScaleTLEdge, { start: scaleLTNCubePosition, end: scaleLTFCubePosition });
+            Overlays.editOverlay(handleScaleTFEdge, { start: scaleLTFCubePosition, end: scaleRTFCubePosition });
+            Overlays.editOverlay(handleScaleTNEdge, { start: scaleLTNCubePosition, end: scaleRTNCubePosition });
+            Overlays.editOverlay(handleScaleBREdge, { start: scaleRBNCubePosition, end: scaleRBFCubePosition });
+            Overlays.editOverlay(handleScaleBLEdge, { start: scaleLBNCubePosition, end: scaleLBFCubePosition });
+            Overlays.editOverlay(handleScaleBFEdge, { start: scaleLBFCubePosition, end: scaleRBFCubePosition });
+            Overlays.editOverlay(handleScaleBNEdge, { start: scaleLBNCubePosition, end: scaleRBNCubePosition });
+            Overlays.editOverlay(handleScaleNREdge, { start: scaleRTNCubePosition, end: scaleRBNCubePosition });
+            Overlays.editOverlay(handleScaleNLEdge, { start: scaleLTNCubePosition, end: scaleLBNCubePosition });
+            Overlays.editOverlay(handleScaleFREdge, { start: scaleRTFCubePosition, end: scaleRBFCubePosition });
+            Overlays.editOverlay(handleScaleFLEdge, { start: scaleLTFCubePosition, end: scaleLBFCubePosition });
+
+            // UPDATE STRETCH SPHERES
+            var stretchSphereDimension = toCameraDistance * STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE;
+            var stretchSphereDimensions = { x:stretchSphereDimension, y:stretchSphereDimension, z:stretchSphereDimension };
+            var stretchXPosition = { x:STRETCH_SPHERE_OFFSET * toCameraDistance, y:0, z:0 };
+            stretchXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchXPosition));
+            Overlays.editOverlay(handleStretchXSphere, { 
+                position: stretchXPosition, 
+                dimensions: stretchSphereDimensions 
+            });
+            var stretchYPosition = { x:0, y:STRETCH_SPHERE_OFFSET * toCameraDistance, z:0 };
+            stretchYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchYPosition));
+            Overlays.editOverlay(handleStretchYSphere, { 
+                position: stretchYPosition, 
+                dimensions: stretchSphereDimensions 
+            });
+            var stretchZPosition = { x:0, y:0, z:STRETCH_SPHERE_OFFSET * toCameraDistance };
+            stretchZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchZPosition));
+            Overlays.editOverlay(handleStretchZSphere, { 
+                position: stretchZPosition, 
+                dimensions: stretchSphereDimensions 
+            });
+
+            // UPDATE STRETCH HIGHLIGHT PANELS
+            var scaleLTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleLTFCubePosition);
+            var scaleRBFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRBFCubePosition);
+            var stretchPanelXDimensions = Vec3.subtract(scaleLTFCubePositionRotated, scaleRBFCubePositionRotated);
+            var tempY = Math.abs(stretchPanelXDimensions.y);
+            stretchPanelXDimensions.x = 0.01;
+            stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
+            stretchPanelXDimensions.z = tempY;
+            var stretchPanelXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:dimensions.x / 2, y:0, z:0 }));
+            Overlays.editOverlay(handleStretchXPanel, { 
+                position: stretchPanelXPosition, 
+                rotation: rotationZ,
+                dimensions: stretchPanelXDimensions
+            });
+            var scaleLTNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleLTNCubePosition);
+            var scaleRTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTFCubePosition);
+            var stretchPanelYDimensions = Vec3.subtract(scaleLTNCubePositionRotated, scaleRTFCubePositionRotated);
+            var tempX = Math.abs(stretchPanelYDimensions.x);
+            stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
+            stretchPanelYDimensions.y = 0.01;
+            stretchPanelYDimensions.z = tempX;
+            var stretchPanelYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:dimensions.y / 2, z:0 }));
+            Overlays.editOverlay(handleStretchYPanel, { 
+                position: stretchPanelYPosition, 
+                rotation: rotationY,
+                dimensions: stretchPanelYDimensions
+            });
+            var scaleRTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTFCubePosition);
+            var scaleRBNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRBNCubePosition);
+            var stretchPanelZDimensions = Vec3.subtract(scaleRTFCubePositionRotated, scaleRBNCubePositionRotated);
+            var tempX = Math.abs(stretchPanelZDimensions.x);
+            stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
+            stretchPanelZDimensions.y = tempX;
+            stretchPanelZDimensions.z = 0.01;
+            var stretchPanelZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:dimensions.z / 2 }));
+            Overlays.editOverlay(handleStretchZPanel, { 
+                position: stretchPanelZPosition, 
+                rotation: rotationX,
+                dimensions: stretchPanelZDimensions
+            });
+
+            // UPDATE SELECTION BOX (CURRENTLY INVISIBLE WITH 0 ALPHA FOR TRANSLATE XZ TOOL)
+            var inModeRotate = isActiveTool(handleRotatePitchRing) || 
+                               isActiveTool(handleRotateYawRing) || 
+                               isActiveTool(handleRotateRollRing);
+            Overlays.editOverlay(selectionBox, {
+                position: position,
+                rotation: rotation,
+                dimensions: dimensions,
+                visible: !inModeRotate
+            });
+
+            // UPDATE CLONER (CURRENTLY HIDDEN FOR NOW)
+            var handleClonerOffset =  { 
+                x:CLONER_OFFSET.x * dimensions.x, 
+                y:CLONER_OFFSET.y * dimensions.y, 
+                z:CLONER_OFFSET.z * dimensions.z 
+            };
+            var handleClonerPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, handleClonerOffset));
+            Overlays.editOverlay(handleCloner, {
+                position: handleClonerPos,
+                rotation: rotation,
+                dimensions: scaleCubeDimensions
+            });
+        }
+
+        that.setHandleTranslateXVisible(!activeTool || isActiveTool(handleTranslateXCone) || isActiveTool(handleTranslateXCylinder));
+        that.setHandleTranslateYVisible(!activeTool || isActiveTool(handleTranslateYCone) || isActiveTool(handleTranslateYCylinder));
+        that.setHandleTranslateZVisible(!activeTool || isActiveTool(handleTranslateZCone) || isActiveTool(handleTranslateZCylinder));
+        that.setHandleRotatePitchVisible(!activeTool || isActiveTool(handleRotatePitchRing));
+        that.setHandleRotateYawVisible(!activeTool || isActiveTool(handleRotateYawRing));
+        that.setHandleRotateRollVisible(!activeTool || isActiveTool(handleRotateRollRing));
+
+        var showScaleStretch = !activeTool && SelectionManager.selections.length === 1;
+        that.setHandleStretchXVisible(showScaleStretch || isActiveTool(handleStretchXSphere));
+        that.setHandleStretchYVisible(showScaleStretch || isActiveTool(handleStretchYSphere));
+        that.setHandleStretchZVisible(showScaleStretch || isActiveTool(handleStretchZSphere));
+        that.setHandleScaleCubeVisible(showScaleStretch || isActiveTool(handleScaleLBNCube) || isActiveTool(handleScaleRBNCube) || isActiveTool(handleScaleLBFCube) || isActiveTool(handleScaleRBFCube)
+                                                || isActiveTool(handleScaleLTNCube) || isActiveTool(handleScaleRTNCube) || isActiveTool(handleScaleLTFCube) || isActiveTool(handleScaleRTFCube)
+                                                || isActiveTool(handleStretchXSphere) || isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
+        that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) && !isActiveTool(handleRotateRollRing));
+
+        //keep cloner always hidden for now since you can hold Alt to clone while dragging to translate  - we may bring cloner back for HMD only later
+        //that.setHandleClonerVisible(!activeTool || isActiveTool(handleCloner));
+
+        if (wantDebug) {
+            print("====== Update Handles <=======");
+        }
+    };
+    Script.update.connect(that.updateHandles);
+
+    // FUNCTION: UPDATE ACTIVE ROTATE RING
+    that.updateActiveRotateRing = function() {
+        var activeRotateRing = null;
+        if (isActiveTool(handleRotatePitchRing)) {
+            activeRotateRing = handleRotatePitchRing;
+        } else if (isActiveTool(handleRotateYawRing)) {
+            activeRotateRing = handleRotateYawRing;
+        } else if (isActiveTool(handleRotateRollRing)) {
+            activeRotateRing = handleRotateRollRing;
+        }
+        if (activeRotateRing != null) {
+            var tickMarksAngle =  ctrlPressed ? ROTATE_CTRL_SNAP_ANGLE : ROTATE_DEFAULT_TICK_MARKS_ANGLE;
+            Overlays.editOverlay(activeRotateRing, { majorTickMarksAngle: tickMarksAngle });
+        }
+    };
+
+    // FUNCTION: SET OVERLAYS VISIBLE
+    that.setOverlaysVisible = function(isVisible) {
+        for (var i = 0; i < allOverlays.length; i++) {
+            Overlays.editOverlay(allOverlays[i], { visible: isVisible });
+        }
+    };
+
+    // FUNCTION: SET HANDLE TRANSLATE VISIBLE
+    that.setHandleTranslateVisible = function(isVisible) {
+        that.setHandleTranslateXVisible(isVisible);
+        that.setHandleTranslateYVisible(isVisible);
+        that.setHandleTranslateZVisible(isVisible);
+    };
+
+    that.setHandleTranslateXVisible = function(isVisible) {
+        Overlays.editOverlay(handleTranslateXCone, { visible: isVisible });
+        Overlays.editOverlay(handleTranslateXCylinder, { visible: isVisible });
+    };
+
+    that.setHandleTranslateYVisible = function(isVisible) {
+        Overlays.editOverlay(handleTranslateYCone, { visible: isVisible });
+        Overlays.editOverlay(handleTranslateYCylinder, { visible: isVisible });
+    };
+
+    that.setHandleTranslateZVisible = function(isVisible) {
+        Overlays.editOverlay(handleTranslateZCone, { visible: isVisible });
+        Overlays.editOverlay(handleTranslateZCylinder, { visible: isVisible });
+    };
+
+    // FUNCTION: SET HANDLE ROTATE VISIBLE
+    that.setHandleRotateVisible = function(isVisible) {
+        that.setHandleRotatePitchVisible(isVisible);
+        that.setHandleRotateYawVisible(isVisible);
+        that.setHandleRotateRollVisible(isVisible);
+    };
+
+    that.setHandleRotatePitchVisible = function(isVisible) {
+        Overlays.editOverlay(handleRotatePitchRing, { visible: isVisible });
+    };
+
+    that.setHandleRotateYawVisible = function(isVisible) {
+        Overlays.editOverlay(handleRotateYawRing, { visible: isVisible });
+    };
+
+    that.setHandleRotateRollVisible = function(isVisible) {
+        Overlays.editOverlay(handleRotateRollRing, { visible: isVisible });
+    };
+
+    // FUNCTION: SET HANDLE STRETCH VISIBLE
+    that.setHandleStretchVisible = function(isVisible) {
+        that.setHandleStretchXVisible(isVisible);
+        that.setHandleStretchYVisible(isVisible);
+        that.setHandleStretchZVisible(isVisible);
+    };
+
+    that.setHandleStretchXVisible = function(isVisible) {
+        Overlays.editOverlay(handleStretchXSphere, { visible: isVisible });
+    };
+
+    that.setHandleStretchYVisible = function(isVisible) {
+        Overlays.editOverlay(handleStretchYSphere, { visible: isVisible });
+    };
+
+    that.setHandleStretchZVisible = function(isVisible) {
+        Overlays.editOverlay(handleStretchZSphere, { visible: isVisible });
+    };
+    
+    // FUNCTION: SET HANDLE SCALE VISIBLE
+    that.setHandleScaleVisible = function(isVisible) {
+        that.setHandleScaleCubeVisible(isVisible);
+        that.setHandleScaleEdgeVisible(isVisible);
+    };
+
+    that.setHandleScaleCubeVisible = function(isVisible) {
+        Overlays.editOverlay(handleScaleLBNCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleRBNCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleLBFCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleRBFCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleLTNCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleRTNCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleLTFCube, { visible: isVisible });
+        Overlays.editOverlay(handleScaleRTFCube, { visible: isVisible });
+    };
+
+    that.setHandleScaleEdgeVisible = function(isVisible) {
+        Overlays.editOverlay(handleScaleTREdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleTLEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleTFEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleTNEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleBREdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleBLEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleBFEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleBNEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleNREdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleNLEdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleFREdge, { visible: isVisible });
+        Overlays.editOverlay(handleScaleFLEdge, { visible: isVisible });
+    };
+
+    // FUNCTION: SET HANDLE CLONER VISIBLE
+    that.setHandleClonerVisible = function(isVisible) {
+        Overlays.editOverlay(handleCloner, { visible: isVisible });
+    };
+
+    // TOOL DEFINITION: TRANSLATE XZ TOOL
+    var initialXZPick = null;
+    var isConstrained = false;
+    var constrainMajorOnly = false;
+    var startPosition = null;
+    var duplicatedEntityIDs = null;
+    var translateXZTool = addHandleTool(selectionBox, {
+        mode: 'TRANSLATE_XZ',
+        pickPlanePosition: { x: 0, y: 0, z: 0 },
+        greatestDimension: 0.0,
+        startingDistance: 0.0,
+        startingElevation: 0.0,
+        onBegin: function(event, pickRay, pickResult, doClone) {
+            var wantDebug = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(Beg) -> =======================");
+                Vec3.print("    pickRay", pickRay);
+                Vec3.print("    pickRay.origin", pickRay.origin);
+                Vec3.print("    pickResult.intersection", pickResult.intersection);
+            }
+
+            SelectionManager.saveProperties();
+            that.resetPreviousHandleColor();
+
+            that.setHandleTranslateVisible(false);
+            that.setHandleRotateVisible(false);
+            that.setHandleScaleCubeVisible(false);
+            that.setHandleStretchVisible(false);
+            that.setHandleClonerVisible(false);
+
+            startPosition = SelectionManager.worldPosition;
+
+            translateXZTool.pickPlanePosition = pickResult.intersection;
+            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
+            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
+            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
+            if (wantDebug) {
+                print("    longest dimension: " + translateXZTool.greatestDimension);
+                print("    starting distance: " + translateXZTool.startingDistance);
+                print("    starting elevation: " + translateXZTool.startingElevation);
+            }
+
+            initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
+                x: 0,
+                y: 1,
+                z: 0
+            });
+
+            // Duplicate entities if alt is pressed.  This will make a
+            // copy of the selected entities and move the _original_ entities, not
+            // the new ones.
+            if (event.isAlt || doClone) {
+                duplicatedEntityIDs = [];
+                for (var otherEntityID in SelectionManager.savedProperties) {
+                    var properties = SelectionManager.savedProperties[otherEntityID];
+                    if (!properties.locked) {
+                        var entityID = Entities.addEntity(properties);
+                        duplicatedEntityIDs.push({
+                            entityID: entityID,
+                            properties: properties
+                        });
+                    }
+                }
+            } else {
+                duplicatedEntityIDs = null;
+            }
+
+            isConstrained = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(End) <- =======================");
+            }
+        },
+        onEnd: function(event, reason) {
+            pushCommandForSelections(duplicatedEntityIDs);
+        },
+        elevation: function(origin, intersection) {
+            return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
+        },
+        onMove: function(event) {
+            var wantDebug = false;
+            pickRay = generalComputePickRay(event.x, event.y);
+
+            var pick = rayPlaneIntersection2(pickRay, translateXZTool.pickPlanePosition, {
+                x: 0,
+                y: 1,
+                z: 0
+            });
+
+            // If the pick ray doesn't hit the pick plane in this direction, do nothing.
+            // this will happen when someone drags across the horizon from the side they started on.
+            if (!pick) {
+                if (wantDebug) {
+                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
+                }
+                
+                // EARLY EXIT--(Invalid ray detected.)
+                return;
+            }
+
+            var vector = Vec3.subtract(pick, initialXZPick);
+
+            // If the mouse is too close to the horizon of the pick plane, stop moving
+            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
+            var elevation = translateXZTool.elevation(pickRay.origin, pick);
+            if (wantDebug) {
+                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
+            }
+            if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
+                (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
+                if (wantDebug) {
+                    print("    "+ translateXZTool.mode + " - too close to horizon!");
+                }
+
+                // EARLY EXIT--(Don't proceed past the reached limit.)
+                return;
+            }
+
+            //  If the angular size of the object is too small, stop moving
+            var MIN_ANGULAR_SIZE = 0.01; //  Radians
+            if (translateXZTool.greatestDimension > 0) {
+                var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
+                if (wantDebug) {
+                    print("Angular size = " + angularSize);
+                }
+                if (angularSize < MIN_ANGULAR_SIZE) {
+                    return;
+                }
+            }
+
+            // If shifted, constrain to one axis
+            if (event.isShifted) {
+                if (Math.abs(vector.x) > Math.abs(vector.z)) {
+                    vector.z = 0;
+                } else {
+                    vector.x = 0;
+                }
+                if (!isConstrained) {
+                    isConstrained = true;
+                }
+            } else {
+                if (isConstrained) {
+                    isConstrained = false;
+                }
+            }
+
+            constrainMajorOnly = event.isControl;
+            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, SelectionManager.worldDimensions));
+            vector = Vec3.subtract(
+                grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
+                cornerPosition);
+
+
+            for (var i = 0; i < SelectionManager.selections.length; i++) {
+                var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
+                if (!properties) {
+                    continue;
+                }
+                var newPosition = Vec3.sum(properties.position, {
+                    x: vector.x,
+                    y: 0,
+                    z: vector.z
+                });
+                Entities.editEntity(SelectionManager.selections[i], {
+                    position: newPosition
+                });
+
+                if (wantDebug) {
+                    print("translateXZ... ");
+                    Vec3.print("                 vector:", vector);
+                    Vec3.print("            newPosition:", properties.position);
+                    Vec3.print("            newPosition:", newPosition);
+                }
+            }
+
+            SelectionManager._update();
+        }
+    });
+
+    // TOOL DEFINITION: HANDLE TRANSLATE TOOL    
+    function addHandleTranslateTool(overlay, mode, direction) {
         var pickNormal = null;
         var lastPick = null;
         var projectionVector = null;
-        addGrabberTool(overlay, {
+        addHandleTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
                 if (direction === TRANSLATE_DIRECTION.X) {
@@ -665,13 +1622,13 @@ SelectionDisplay = (function() {
                 SelectionManager.saveProperties();
                 that.resetPreviousHandleColor();
 
-                that.setGrabberTranslateXVisible(direction === TRANSLATE_DIRECTION.X);
-                that.setGrabberTranslateYVisible(direction === TRANSLATE_DIRECTION.Y);
-                that.setGrabberTranslateZVisible(direction === TRANSLATE_DIRECTION.Z);
-                that.setGrabberRotateVisible(false);
-                that.setGrabberStretchVisible(false);
-                that.setGrabberScaleVisible(false);
-                that.setGrabberClonerVisible(false);
+                that.setHandleTranslateXVisible(direction === TRANSLATE_DIRECTION.X);
+                that.setHandleTranslateYVisible(direction === TRANSLATE_DIRECTION.Y);
+                that.setHandleTranslateZVisible(direction === TRANSLATE_DIRECTION.Z);
+                that.setHandleRotateVisible(false);
+                that.setHandleStretchVisible(false);
+                that.setHandleScaleCubeVisible(false);
+                that.setHandleClonerVisible(false);
     
                 // Duplicate entities if alt is pressed.  This will make a
                 // copy of the selected entities and move the _original_ entities, not
@@ -747,7 +1704,8 @@ SelectionDisplay = (function() {
         };
     };
 
-    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleGrabber) {
+    // TOOL DEFINITION: HANDLE STRETCH TOOL   
+    function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleHandle) {
         var directionFor3DStretch = directionVec;
         var distanceFor3DStretch = 0;
         var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
@@ -931,13 +1889,13 @@ SelectionDisplay = (function() {
                 distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
             }
 
-            that.setGrabberTranslateVisible(false);
-            that.setGrabberRotateVisible(false);
-            that.setGrabberScaleVisible(true);
-            that.setGrabberStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
-            that.setGrabberStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
-            that.setGrabberStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
-            that.setGrabberClonerVisible(false);
+            that.setHandleTranslateVisible(false);
+            that.setHandleRotateVisible(false);
+            that.setHandleScaleCubeVisible(true);
+            that.setHandleStretchXVisible(directionEnum === STRETCH_DIRECTION.X);
+            that.setHandleStretchYVisible(directionEnum === STRETCH_DIRECTION.Y);
+            that.setHandleStretchZVisible(directionEnum === STRETCH_DIRECTION.Z);
+            that.setHandleClonerVisible(false);
         
             SelectionManager.saveProperties();
             that.resetPreviousHandleColor();
@@ -945,8 +1903,8 @@ SelectionDisplay = (function() {
             if (stretchPanel != null) {
                 Overlays.editOverlay(stretchPanel, { visible: true });
             }
-            if (scaleGrabber != null) {
-                Overlays.editOverlay(scaleGrabber, { color: GRABBER_SCALE_CUBE_SELECTED_COLOR });
+            if (scaleHandle != null) {
+                Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
             }
         };
 
@@ -954,8 +1912,8 @@ SelectionDisplay = (function() {
             if (stretchPanel != null) {
                 Overlays.editOverlay(stretchPanel, { visible: false });
             }
-            if (scaleGrabber != null) {
-                Overlays.editOverlay(scaleGrabber, { color: GRABBER_SCALE_CUBE_IDLE_COLOR });
+            if (scaleHandle != null) {
+                Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE });
             }
             pushCommandForSelections();
         };
@@ -1008,7 +1966,6 @@ SelectionDisplay = (function() {
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
     
                 vector = vec3Mult(mask, vector);
-                
             }
             
             vector = grid.snapToSpacing(vector);
@@ -1016,7 +1973,9 @@ SelectionDisplay = (function() {
             var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
 
             if (directionEnum === STRETCH_DIRECTION.ALL) {
-                changeInDimensions = Vec3.multiply(changeInDimensions, STRETCH_DIRECTION_ALL_FACTOR);
+                var toCameraDistance = getDistanceToCamera(position);
+                var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;
+                changeInDimensions = Vec3.multiply(changeInDimensions, dimensionsMultiple);
             }
 
             var newDimensions;
@@ -1083,76 +2042,74 @@ SelectionDisplay = (function() {
         };
     }
 
-    function addGrabberStretchTool(overlay, mode, directionEnum) {
-        var directionVec, pivot, offset, stretchPanel;
+    function addHandleStretchTool(overlay, mode, directionEnum) {
+        var directionVec, offset, stretchPanel;
         if (directionEnum === STRETCH_DIRECTION.X) {
-            stretchPanel = grabberStretchXPanel;
+            stretchPanel = handleStretchXPanel;
             directionVec = { x:-1, y:0, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Y) {
-            stretchPanel = grabberStretchYPanel;
+            stretchPanel = handleStretchYPanel;
             directionVec = { x:0, y:-1, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Z) {
-            stretchPanel = grabberStretchZPanel
+            stretchPanel = handleStretchZPanel
             directionVec = { x:0, y:0, z:-1 };
         }
-        pivot = directionVec;
         offset = Vec3.multiply(directionVec, -1);
-        var tool = makeStretchTool(mode, directionEnum, directionVec, pivot, offset, stretchPanel, null);
-        return addGrabberTool(overlay, tool);
+        var tool = makeStretchTool(mode, directionEnum, directionVec, directionVec, offset, stretchPanel, null);
+        return addHandleTool(overlay, tool);
     }
 
-    function addGrabberScaleTool(overlay, mode, directionEnum) {
-        var directionVec, pivot, offset, selectedGrabber;
+    // TOOL DEFINITION: HANDLE SCALE TOOL   
+    function addHandleScaleTool(overlay, mode, directionEnum) {
+        var directionVec, offset, selectedHandle;
         if (directionEnum === SCALE_DIRECTION.LBN) {
             directionVec = { x:1, y:1, z:1 };
-            selectedGrabber = grabberScaleLBNCube;
+            selectedHandle = handleScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
             directionVec = { x:1, y:1, z:-1 };
-            selectedGrabber = grabberScaleRBNCube;
+            selectedHandle = handleScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
             directionVec = { x:-1, y:1, z:1 };
-            selectedGrabber = grabberScaleLBFCube;
+            selectedHandle = handleScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
             directionVec = { x:-1, y:1, z:-1 };
-            selectedGrabber = grabberScaleRBFCube;
+            selectedHandle = handleScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
             directionVec = { x:1, y:-1, z:1 };
-            selectedGrabber = grabberScaleLTNCube;
+            selectedHandle = handleScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
             directionVec = { x:1, y:-1, z:-1 };
-            selectedGrabber = grabberScaleRTNCube;
+            selectedHandle = handleScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
             directionVec = { x:-1, y:-1, z:1 };
-            selectedGrabber = grabberScaleLTFCube;
+            selectedHandle = handleScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
             directionVec = { x:-1, y:-1, z:-1 };
-            selectedGrabber = grabberScaleRTFCube;
+            selectedHandle = handleScaleRTFCube;
         }
-        pivot = directionVec;
         offset = Vec3.multiply(directionVec, -1);
-        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, pivot, offset, null, selectedGrabber);
-        return addGrabberTool(overlay, tool);
+        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, directionVec, offset, null, selectedHandle);
+        return addHandleTool(overlay, tool);
     }
 
     // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
     function updateRotationDegreesOverlay(angleFromZero, position) {
         var angle = angleFromZero * (Math.PI / 180);
-        var cameraPosition = Camera.getPosition();
-        var entityToCameraDistance = Vec3.length(Vec3.subtract(cameraPosition, position));
+        var toCameraDistance = getDistanceToCamera(position);
         var overlayProps = {
             position: position,
             dimensions: {
-                x: entityToCameraDistance * ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
-                y: entityToCameraDistance * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
+                x: toCameraDistance * ROTATE_DISPLAY_SIZE_X_MULTIPLIER,
+                y: toCameraDistance * ROTATE_DISPLAY_SIZE_Y_MULTIPLIER
             },
-            lineHeight: entityToCameraDistance * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
+            lineHeight: toCameraDistance * ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER,
             text: normalizeDegrees(-angleFromZero) + "°"
         };
         Overlays.editOverlay(rotationDegreesDisplay, overlayProps);
     }
 
     // FUNCTION DEF: updateSelectionsRotation
-    //    Helper func used by rotation grabber tools 
+    //    Helper func used by rotation handle tools 
     function updateSelectionsRotation(rotationChange) {
         if (!rotationChange) {
             print("ERROR: entitySelectionTool.updateSelectionsRotation - Invalid arg specified!!");
@@ -1173,61 +2130,76 @@ SelectionDisplay = (function() {
                 rotation: Quat.multiply(rotationChange, initialProperties.rotation)
             };
 
+            Quat.print("OldRotation ", initialProperties.rotation);
+            Quat.print("NewRotation ", newProperties.rotation);
+
             if (reposition) {
                 var dPos = Vec3.subtract(initialProperties.position, SelectionManager.worldPosition);
+                Vec3.print("SelectionManager.worldPosition ", SelectionManager.worldPosition);
+                Vec3.print("initialProperties.position ", initialProperties.position);
+                Vec3.print("dPos 1 ", dPos);
                 dPos = Vec3.multiplyQbyV(rotationChange, dPos);
+                Vec3.print("dPos 2 ", dPos);
                 newProperties.position = Vec3.sum(SelectionManager.worldPosition, dPos);
+                Vec3.print("newProperties.position ", newProperties.position);
             }
 
             Entities.editEntity(entityID, newProperties);
         }
     }
 
-    function addGrabberRotateTool(overlay, mode, direction) {
-        var selectedGrabber = null;
+    // TOOL DEFINITION: HANDLE ROTATION TOOL   
+    function addHandleRotateTool(overlay, mode, direction) {
+        var selectedHandle = null;
         var worldRotation = null;
-        addGrabberTool(overlay, {
+        var rotationCenter = null;
+        addHandleTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
+                var wantDebug = false;
+                if (wantDebug) {
+                    print("================== " + getMode() + "(addHandleRotateTool onBegin) -> =======================");
+                }
+
                 SelectionManager.saveProperties();
                 that.resetPreviousHandleColor();
     
-                that.setGrabberTranslateVisible(false);
-                that.setGrabberRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
-                that.setGrabberRotateYawVisible(direction === ROTATE_DIRECTION.YAW);
-                that.setGrabberRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
-                that.setGrabberStretchVisible(false);
-                that.setGrabberScaleVisible(false);
-                that.setGrabberClonerVisible(false);
+                that.setHandleTranslateVisible(false);
+                that.setHandleRotatePitchVisible(direction === ROTATE_DIRECTION.PITCH);
+                that.setHandleRotateYawVisible(direction === ROTATE_DIRECTION.YAW);
+                that.setHandleRotateRollVisible(direction === ROTATE_DIRECTION.ROLL);
+                that.setHandleStretchVisible(false);
+                that.setHandleScaleCubeVisible(false);
+                that.setHandleClonerVisible(false);
 
                 if (direction === ROTATE_DIRECTION.PITCH) {
                     rotationNormal = { x: 1, y: 0, z: 0 };
                     worldRotation = worldRotationY;
-                    selectedGrabber = grabberRotatePitchRing;
+                    selectedHandle = handleRotatePitchRing;
                 } else if (direction === ROTATE_DIRECTION.YAW) {
                     rotationNormal = { x: 0, y: 1, z: 0 };
                     worldRotation = worldRotationZ;
-                    selectedGrabber = grabberRotateYawRing;
+                    selectedHandle = handleRotateYawRing;
                 } else if (direction === ROTATE_DIRECTION.ROLL) {
                     rotationNormal = { x: 0, y: 0, z: 1 };
                     worldRotation = worldRotationX;
-                    selectedGrabber = grabberRotateRollRing;
+                    selectedHandle = handleRotateRollRing;
                 }
 
-                Overlays.editOverlay(selectedGrabber, { 
+                Overlays.editOverlay(selectedHandle, { 
                     hasTickMarks: true,
                     solid: false,
-                    innerRadius: ROTATION_RING_SELECTED_INNER_RADIUS
+                    innerRadius: ROTATE_RING_SELECTED_INNER_RADIUS
                 });
 
                 var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
                 rotationNormal = Vec3.multiplyQbyV(rotation, rotationNormal);
 
-                var rotCenter = SelectionManager.worldPosition;
+                rotationCenter = SelectionManager.worldPosition;
 
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: true });
-                Overlays.editOverlay(grabberRotateCurrentRing, {
-                    position: rotCenter,
+                Overlays.editOverlay(handleRotateCurrentRing, {
+                    position: rotationCenter,
                     rotation: worldRotation,
                     startAt: 0,
                     endAt: 0,
@@ -1236,47 +2208,78 @@ SelectionDisplay = (function() {
 
                 // editOverlays may not have committed rotation changes.
                 // Compute zero position based on where the overlay will be eventually.
-                var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+                var result = rayPlaneIntersection(pickRay, rotationCenter, rotationNormal);
                 // In case of a parallel ray, this will be null, which will cause early-out
                 // in the onMove helper.
-                rotZero = result;
+                rotationZero = result;
 
-                var rotCenterToZero = Vec3.subtract(rotZero, rotCenter);
-                var rotCenterToZeroLength = Vec3.length(rotCenterToZero);
-                rotDegreePos = Vec3.sum(rotCenter, Vec3.multiply(Vec3.normalize(rotCenterToZero), rotCenterToZeroLength * 1.75));
-                updateRotationDegreesOverlay(0, rotDegreePos);
+                var rotationCenterToZero = Vec3.subtract(rotationZero, rotationCenter);
+                var rotationCenterToZeroLength = Vec3.length(rotationCenterToZero);
+                rotationDegreesPosition = Vec3.sum(rotationCenter, Vec3.multiply(Vec3.normalize(rotationCenterToZero), rotationCenterToZeroLength * 1.75));
+                updateRotationDegreesOverlay(0, rotationDegreesPosition);
+
+                if (wantDebug) {
+                    print("================== " + getMode() + "(addHandleRotateTool onBegin) <- =======================");
+                }
             },
             onEnd: function(event, reason) {
+                var wantDebug = false;
+                if (wantDebug) {
+                    print("================== " + getMode() + "(addHandleRotateTool onEnd) -> =======================");
+                }
                 Overlays.editOverlay(rotationDegreesDisplay, { visible: false });
-                Overlays.editOverlay(selectedGrabber, { 
+                Overlays.editOverlay(selectedHandle, { 
                     hasTickMarks: false,
                     solid: true,
-                    innerRadius: ROTATION_RING_IDLE_INNER_RADIUS
+                    innerRadius: ROTATE_RING_IDLE_INNER_RADIUS
                 });
-                Overlays.editOverlay(grabberRotateCurrentRing, { visible: false });
+                Overlays.editOverlay(handleRotateCurrentRing, { visible: false });
                 pushCommandForSelections();
+                if (wantDebug) {
+                    print("================== " + getMode() + "(addHandleRotateTool onEnd) <- =======================");
+                }
             },
             onMove: function(event) {
-                if (!rotZero) {
-                    print("ERROR: entitySelectionTool.handleRotationHandleOnMove - Invalid RotationZero Specified (missed rotation target plane?)");
-        
+                if (!rotationZero) {
+                    print("ERROR: entitySelectionTool.addHandleRotateTool.onMove - Invalid RotationZero Specified (missed rotation target plane?)");
+
                     // EARLY EXIT
                     return;
                 }
+                
+                var wantDebug = true;
+                if (wantDebug) {
+                    print("================== "+ getMode() + "(addHandleRotateTool onMove) -> =======================");
+                    Vec3.print("    rotationZero: ", rotationZero);
+                }
+
                 var pickRay = generalComputePickRay(event.x, event.y);
-                var rotCenter = SelectionManager.worldPosition;
-                var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+                var result = rayPlaneIntersection(pickRay, rotationCenter, rotationNormal);
                 if (result) {
-                    var centerToZero = Vec3.subtract(rotZero, rotCenter);
-                    var centerToIntersect = Vec3.subtract(result, rotCenter);
+                    var centerToZero = Vec3.subtract(rotationZero, rotationCenter);
+                    var centerToIntersect = Vec3.subtract(result, rotationCenter);
+
+                    if (wantDebug) {
+                        Vec3.print("    RotationNormal:    ", rotationNormal);
+                        Vec3.print("    rotationZero:           ", rotationZero);
+                        Vec3.print("    rotationCenter:         ", rotationCenter);
+                        Vec3.print("    intersect:         ", result);
+                        Vec3.print("    centerToZero:      ", centerToZero);
+                        Vec3.print("    centerToIntersect: ", centerToIntersect);
+                    }
+
                     // Note: orientedAngle which wants normalized centerToZero and centerToIntersect
                     //             handles that internally, so it's to pass unnormalized vectors here.
                     var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);        
-                    var snapAngle = ctrlPressed ? ROTATION_CTRL_SNAP_ANGLE : ROTATION_DEFAULT_SNAP_ANGLE;
+                    var snapAngle = ctrlPressed ? ROTATE_CTRL_SNAP_ANGLE : ROTATE_DEFAULT_SNAP_ANGLE;
                     angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
                     var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
+                    if (wantDebug) {
+                        Quat.print("    rotChange: ", rotChange)
+                        print("    angleFromZero: ", angleFromZero);
+                    }
                     updateSelectionsRotation(rotChange);
-                    updateRotationDegreesOverlay(-angleFromZero, rotDegreePos);
+                    updateRotationDegreesOverlay(-angleFromZero, rotationDegreesPosition);
 
                     var startAtCurrent = 0;
                     var endAtCurrent = angleFromZero;
@@ -1284,692 +2287,26 @@ SelectionDisplay = (function() {
                         startAtCurrent = 360 + angleFromZero;
                         endAtCurrent = 360;
                     }
-                    Overlays.editOverlay(grabberRotateCurrentRing, {
+                    Overlays.editOverlay(handleRotateCurrentRing, {
                         startAt: startAtCurrent,
                         endAt: endAtCurrent
                     });
+
                     // not sure why but this seems to be needed to fix an reverse rotation for yaw ring only
                     if (direction === ROTATE_DIRECTION.YAW) {
-                        Overlays.editOverlay(grabberRotateCurrentRing, { rotation: worldRotationZ });
+                        Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
                     }
+                }
 
+                if (wantDebug) {
+                    print("================== "+ getMode() + "(addHandleRotateTool onMove) <- =======================");
                 }
             }
         });
     }
 
-    // @param: toolHandle:  The overlayID associated with the tool
-    //         that correlates to the tool you wish to query.
-    // @note: If toolHandle is null or undefined then activeTool
-    //        will be checked against those values as opposed to
-    //        the tool registered under toolHandle.  Null & Undefined 
-    //        are treated as separate values.
-    // @return: bool - Indicates if the activeTool is that queried.
-    function isActiveTool(toolHandle) {
-        if (!toolHandle) {
-            // Allow isActiveTool(null) and similar to return true if there's
-            // no active tool
-            return (activeTool === toolHandle);
-        }
-
-        if (!grabberTools.hasOwnProperty(toolHandle)) {
-            print("WARNING: entitySelectionTool.isActiveTool - Encountered unknown grabberToolHandle: " + toolHandle + ". Tools should be registered via addGrabberTool.");
-            // EARLY EXIT
-            return false;
-        }
-
-        return (activeTool === grabberTools[ toolHandle ]);
-    }
-
-    // @return string - The mode of the currently active tool;
-    //                  otherwise, "UNKNOWN" if there's no active tool.
-    function getMode() {
-        return (activeTool ? activeTool.mode : "UNKNOWN");
-    }
-
-    that.cleanup = function() {
-        for (var i = 0; i < allOverlays.length; i++) {
-            Overlays.deleteOverlay(allOverlays[i]);
-        }
-    };
-
-    that.highlightSelectable = function(entityID) {
-    };
-
-    that.unhighlightSelectable = function(entityID) {
-    };
-
-    that.select = function(entityID, event) {
-        var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
-
-        lastCameraPosition = Camera.getPosition();
-        lastCameraOrientation = Camera.getOrientation();
-
-        if (event !== false) {
-            pickRay = generalComputePickRay(event.x, event.y);
-
-            var wantDebug = false;
-            if (wantDebug) {
-                print("select() with EVENT...... ");
-                print("                event.y:" + event.y);
-                Vec3.print("       current position:", properties.position);
-            }
-        }
-
-        that.updateGrabbers();
-    };
-
-    // FUNCTION: SET SPACE MODE
-    that.setSpaceMode = function(newSpaceMode) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("======> SetSpaceMode called. ========");
-        }
-
-        if (spaceMode !== newSpaceMode) {
-            if (wantDebug) {
-                print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
-            }
-            spaceMode = newSpaceMode;
-            that.updateGrabbers();
-        } else if (wantDebug) {
-            print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
-        }
-        if (wantDebug) {
-            print("====== SetSpaceMode called. <========");
-        }
-    };
-
-    // FUNCTION: UPDATE GRABBERS
-    that.updateGrabbers = function() {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("======> Update Grabbers =======");
-            print("    Selections Count: " + SelectionManager.selections.length);
-            print("    SpaceMode: " + spaceMode);
-            print("    DisplayMode: " + getMode());
-        }
-
-        if (SelectionManager.selections.length === 0) {
-            that.setOverlaysVisible(false);
-            return;
-        }
-
-        if (SelectionManager.hasSelection()) {
-            var position = SelectionManager.worldPosition;
-            var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
-            var dimensions = spaceMode === SPACE_LOCAL ? SelectionManager.localDimensions : SelectionManager.worldDimensions;
-            var rotationInverse = Quat.inverse(rotation);
-
-            var cameraPosition = Camera.getPosition();
-            var entityToCameraDistance = Vec3.length(Vec3.subtract(cameraPosition, position));
-
-            var localRotationX = Quat.fromPitchYawRollDegrees(0, 0, -90);
-            rotationX = Quat.multiply(rotation, localRotationX);
-            worldRotationX = rotationX;
-            var localRotationY = Quat.fromPitchYawRollDegrees(0, 90, 0);
-            rotationY = Quat.multiply(rotation, localRotationY);
-            worldRotationY = rotationY;
-            var localRotationZ = Quat.fromPitchYawRollDegrees(90, 0, 0);
-            rotationZ = Quat.multiply(rotation, localRotationZ);
-            worldRotationZ = rotationZ;
-
-            var arrowCylinderDimension = entityToCameraDistance * GRABBER_TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE;
-            var arrowCylinderDimensions = { x:arrowCylinderDimension, y:arrowCylinderDimension * GRABBER_TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, z:arrowCylinderDimension };
-            var arrowConeDimension = entityToCameraDistance * GRABBER_TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE;
-            var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
-            var cylinderXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance, y:0, z:0 }));
-            Overlays.editOverlay(grabberTranslateXCylinder, { 
-                position: cylinderXPos, 
-                rotation: rotationX,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderXDiff = Vec3.subtract(cylinderXPos, position);
-            var coneXPos = Vec3.sum(cylinderXPos, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowCylinderDimensions.y * 0.83));
-            Overlays.editOverlay(grabberTranslateXCone, { 
-                position: coneXPos, 
-                rotation: rotationX,
-                dimensions: arrowConeDimensions
-            });
-            var cylinderYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance, z:0 }));
-            Overlays.editOverlay(grabberTranslateYCylinder, { 
-                position: cylinderYPos, 
-                rotation: rotationY,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderYDiff = Vec3.subtract(cylinderYPos, position);
-            var coneYPos = Vec3.sum(cylinderYPos, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowCylinderDimensions.y * 0.83));
-            Overlays.editOverlay(grabberTranslateYCone, { 
-                position: coneYPos, 
-                rotation: rotationY,
-                dimensions: arrowConeDimensions
-            });
-            var cylinderZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:GRABBER_TRANSLATE_ARROW_CYLINDER_OFFSET * entityToCameraDistance }));
-            Overlays.editOverlay(grabberTranslateZCylinder, { 
-                position: cylinderZPos, 
-                rotation: rotationZ,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderZDiff = Vec3.subtract(cylinderZPos, position);
-            var coneZPos = Vec3.sum(cylinderZPos, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowCylinderDimensions.y * 0.83));
-            Overlays.editOverlay(grabberTranslateZCone, { 
-                position: coneZPos, 
-                rotation: rotationZ,
-                dimensions: arrowConeDimensions
-            });
-
-            var grabberScaleCubeOffsetX = GRABBER_SCALE_CUBE_OFFSET * dimensions.x;
-            var grabberScaleCubeOffsetY = GRABBER_SCALE_CUBE_OFFSET * dimensions.y;
-            var grabberScaleCubeOffsetZ = GRABBER_SCALE_CUBE_OFFSET * dimensions.z;
-            var scaleDimension = entityToCameraDistance * GRABBER_SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE;
-            var scaleDimensions = { x:scaleDimension, y:scaleDimension, z:scaleDimension };
-            var grabberScaleLBNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleLBNCube, { 
-                position: grabberScaleLBNCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleRBNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleRBNCube, { 
-                position: grabberScaleRBNCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleLBFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleLBFCube, { 
-                position: grabberScaleLBFCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleRBFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:-grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleRBFCube, { 
-                position: grabberScaleRBFCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleLTNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleLTNCube, { 
-                position: grabberScaleLTNCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleRTNCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:-grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleRTNCube, { 
-                position: grabberScaleRTNCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleLTFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:-grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleLTFCube, { 
-                position: grabberScaleLTFCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-            var grabberScaleRTFCubePos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:grabberScaleCubeOffsetX, y:grabberScaleCubeOffsetY, z:grabberScaleCubeOffsetZ }));
-            Overlays.editOverlay(grabberScaleRTFCube, { 
-                position: grabberScaleRTFCubePos, 
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-
-            Overlays.editOverlay(grabberScaleTREdge, { start: grabberScaleRTNCubePos, end: grabberScaleRTFCubePos });
-            Overlays.editOverlay(grabberScaleTLEdge, { start: grabberScaleLTNCubePos, end: grabberScaleLTFCubePos });
-            Overlays.editOverlay(grabberScaleTFEdge, { start: grabberScaleLTFCubePos, end: grabberScaleRTFCubePos });
-            Overlays.editOverlay(grabberScaleTNEdge, { start: grabberScaleLTNCubePos, end: grabberScaleRTNCubePos });
-            Overlays.editOverlay(grabberScaleBREdge, { start: grabberScaleRBNCubePos, end: grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleBLEdge, { start: grabberScaleLBNCubePos, end: grabberScaleLBFCubePos });
-            Overlays.editOverlay(grabberScaleBFEdge, { start: grabberScaleLBFCubePos, end: grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleBNEdge, { start: grabberScaleLBNCubePos, end: grabberScaleRBNCubePos });
-            Overlays.editOverlay(grabberScaleNREdge, { start: grabberScaleRTNCubePos, end: grabberScaleRBNCubePos });
-            Overlays.editOverlay(grabberScaleNLEdge, { start: grabberScaleLTNCubePos, end: grabberScaleLBNCubePos });
-            Overlays.editOverlay(grabberScaleFREdge, { start: grabberScaleRTFCubePos, end: grabberScaleRBFCubePos });
-            Overlays.editOverlay(grabberScaleFLEdge, { start: grabberScaleLTFCubePos, end: grabberScaleLBFCubePos });
-
-            var stretchSphereDimension = entityToCameraDistance * GRABBER_STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE;
-            var stretchSphereDimensions = { x:stretchSphereDimension, y:stretchSphereDimension, z:stretchSphereDimension };
-            var stretchXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance, y:0, z:0 }));
-            Overlays.editOverlay(grabberStretchXSphere, { 
-                position: stretchXPos, 
-                dimensions: stretchSphereDimensions 
-            });
-            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleLTFCubePos);
-            var grabberScaleRBFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRBFCubePos);
-            var stretchPanelXDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRBFCubePosRot);
-            var tempY = Math.abs(stretchPanelXDimensions.y);
-            stretchPanelXDimensions.x = 0.01;
-            stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
-            stretchPanelXDimensions.z = tempY;
-            var stretchPanelXPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:dimensions.x / 2, y:0, z:0 }));
-            Overlays.editOverlay(grabberStretchXPanel, { 
-                position: stretchPanelXPos, 
-                rotation: rotationZ,
-                dimensions: stretchPanelXDimensions
-            });
-            var stretchYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance, z:0 }));
-            Overlays.editOverlay(grabberStretchYSphere, { 
-                position: stretchYPos, 
-                dimensions: stretchSphereDimensions 
-            });
-            var grabberScaleLTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleLTNCubePos);
-            var grabberScaleRTNCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRTFCubePos);
-            var stretchPanelYDimensions = Vec3.subtract(grabberScaleLTFCubePosRot, grabberScaleRTNCubePosRot);
-            var tempX = Math.abs(stretchPanelYDimensions.x);
-            stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
-            stretchPanelYDimensions.y = 0.01;
-            stretchPanelYDimensions.z = tempX;
-            var stretchPanelYPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:dimensions.y / 2, z:0 }));
-            Overlays.editOverlay(grabberStretchYPanel, { 
-                position: stretchPanelYPos, 
-                rotation: rotationY,
-                dimensions: stretchPanelYDimensions
-            });
-            var stretchZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:GRABBER_STRETCH_SPHERE_OFFSET * entityToCameraDistance }));
-            Overlays.editOverlay(grabberStretchZSphere, { 
-                position: stretchZPos, 
-                dimensions: stretchSphereDimensions 
-            });
-            var grabberScaleRTFCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRTFCubePos);
-            var grabberScaleRBNCubePosRot = Vec3.multiplyQbyV(rotationInverse, grabberScaleRBNCubePos);
-            var stretchPanelZDimensions = Vec3.subtract(grabberScaleRTFCubePosRot, grabberScaleRBNCubePosRot);
-            var tempX = Math.abs(stretchPanelZDimensions.x);
-            stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
-            stretchPanelZDimensions.y = tempX;
-            stretchPanelZDimensions.z = 0.01;
-            var stretchPanelZPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:dimensions.z / 2 }));
-            Overlays.editOverlay(grabberStretchZPanel, { 
-                position: stretchPanelZPos, 
-                rotation: rotationX,
-                dimensions: stretchPanelZDimensions
-            });
-
-            var rotateDimension = entityToCameraDistance * GRABBER_ROTATE_RINGS_CAMERA_DISTANCE_MULTIPLE;
-            var rotateDimensions = { x:rotateDimension, y:rotateDimension, z:rotateDimension };
-            if (!isActiveTool(grabberRotatePitchRing)) {
-                Overlays.editOverlay(grabberRotatePitchRing, { 
-                    position: position, 
-                    rotation: rotationY,
-                    dimensions: rotateDimensions,
-                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
-                });
-            }
-            if (!isActiveTool(grabberRotateYawRing)) {
-                Overlays.editOverlay(grabberRotateYawRing, { 
-                    position: position, 
-                    rotation: rotationZ,
-                    dimensions: rotateDimensions,
-                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
-                });
-            }
-            if (!isActiveTool(grabberRotateRollRing)) {
-                Overlays.editOverlay(grabberRotateRollRing, { 
-                    position: position, 
-                    rotation: rotationX,
-                    dimensions: rotateDimensions,
-                    majorTickMarksAngle: ROTATION_DEFAULT_TICK_MARKS_ANGLE
-                });
-            }
-            Overlays.editOverlay(grabberRotateCurrentRing, { dimensions: rotateDimensions });
-            that.updateActiveRotateRing();
-
-            var inModeRotate = isActiveTool(grabberRotatePitchRing) || isActiveTool(grabberRotateYawRing) || isActiveTool(grabberRotateRollRing);
-            var inModeTranslate = isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder) ||
-                                  isActiveTool(grabberTranslateYCone) || isActiveTool(grabberTranslateYCylinder) ||
-                                  isActiveTool(grabberTranslateZCone) || isActiveTool(grabberTranslateZCylinder) ||
-                                  isActiveTool(grabberCloner) || isActiveTool(selectionBox);
-
-            Overlays.editOverlay(selectionBox, {
-                position: position,
-                rotation: rotation,
-                dimensions: dimensions,
-                visible: !inModeRotate
-            });
-
-            var grabberClonerOffset =  { x:GRABBER_CLONER_OFFSET.x * dimensions.x, y:GRABBER_CLONER_OFFSET.y * dimensions.y, z:GRABBER_CLONER_OFFSET.z * dimensions.z };
-            var grabberClonerPos = Vec3.sum(position, Vec3.multiplyQbyV(rotation, grabberClonerOffset));
-            Overlays.editOverlay(grabberCloner, {
-                position: grabberClonerPos,
-                rotation: rotation,
-                dimensions: scaleDimensions
-            });
-        }
-
-        that.setGrabberTranslateXVisible(!activeTool || isActiveTool(grabberTranslateXCone) || isActiveTool(grabberTranslateXCylinder));
-        that.setGrabberTranslateYVisible(!activeTool || isActiveTool(grabberTranslateYCone) || isActiveTool(grabberTranslateYCylinder));
-        that.setGrabberTranslateZVisible(!activeTool || isActiveTool(grabberTranslateZCone) || isActiveTool(grabberTranslateZCylinder));
-        that.setGrabberRotatePitchVisible(!activeTool || isActiveTool(grabberRotatePitchRing));
-        that.setGrabberRotateYawVisible(!activeTool || isActiveTool(grabberRotateYawRing));
-        that.setGrabberRotateRollVisible(!activeTool || isActiveTool(grabberRotateRollRing));
-        that.setGrabberStretchXVisible(!activeTool || isActiveTool(grabberStretchXSphere));
-        that.setGrabberStretchYVisible(!activeTool || isActiveTool(grabberStretchYSphere));
-        that.setGrabberStretchZVisible(!activeTool || isActiveTool(grabberStretchZSphere));
-        that.setGrabberScaleVisible(!activeTool || isActiveTool(grabberScaleLBNCube) || isActiveTool(grabberScaleRBNCube) || isActiveTool(grabberScaleLBFCube) || isActiveTool(grabberScaleRBFCube)
-                                                || isActiveTool(grabberScaleLTNCube) || isActiveTool(grabberScaleRTNCube) || isActiveTool(grabberScaleLTFCube) || isActiveTool(grabberScaleRTFCube)
-                                                || isActiveTool(grabberStretchXSphere) || isActiveTool(grabberStretchYSphere) || isActiveTool(grabberStretchZSphere));
-        //keep cloner always hidden for now since you can hold Alt to clone while dragging to translate  - we may bring cloner back for HMD only later
-        //that.setGrabberClonerVisible(!activeTool || isActiveTool(grabberCloner));
-
-        if (wantDebug) {
-            print("====== Update Grabbers <=======");
-        }
-    };
-    Script.update.connect(that.updateGrabbers);
-
-    that.updateActiveRotateRing = function() {
-        var activeRotateRing = null;
-        if (isActiveTool(grabberRotatePitchRing)) {
-            activeRotateRing = grabberRotatePitchRing;
-        } else if (isActiveTool(grabberRotateYawRing)) {
-            activeRotateRing = grabberRotateYawRing;
-        } else if (isActiveTool(grabberRotateRollRing)) {
-            activeRotateRing = grabberRotateRollRing;
-        }
-        if (activeRotateRing != null) {
-            var tickMarksAngle =  ctrlPressed ? ROTATION_CTRL_SNAP_ANGLE : ROTATION_DEFAULT_TICK_MARKS_ANGLE;
-            Overlays.editOverlay(activeRotateRing, { majorTickMarksAngle: tickMarksAngle });
-        }
-    };
-
-    // FUNCTION: SET OVERLAYS VISIBLE
-    that.setOverlaysVisible = function(isVisible) {
-        for (var i = 0; i < allOverlays.length; i++) {
-            Overlays.editOverlay(allOverlays[i], { visible: isVisible });
-        }
-    };
-
-    // FUNCTION: SET GRABBER TRANSLATE VISIBLE
-    that.setGrabberTranslateVisible = function(isVisible) {
-        that.setGrabberTranslateXVisible(isVisible);
-        that.setGrabberTranslateYVisible(isVisible);
-        that.setGrabberTranslateZVisible(isVisible);
-    };
-
-    that.setGrabberTranslateXVisible = function(isVisible) {
-        Overlays.editOverlay(grabberTranslateXCone, { visible: isVisible });
-        Overlays.editOverlay(grabberTranslateXCylinder, { visible: isVisible });
-    };
-
-    that.setGrabberTranslateYVisible = function(isVisible) {
-        Overlays.editOverlay(grabberTranslateYCone, { visible: isVisible });
-        Overlays.editOverlay(grabberTranslateYCylinder, { visible: isVisible });
-    };
-
-    that.setGrabberTranslateZVisible = function(isVisible) {
-        Overlays.editOverlay(grabberTranslateZCone, { visible: isVisible });
-        Overlays.editOverlay(grabberTranslateZCylinder, { visible: isVisible });
-    };
-
-    // FUNCTION: SET GRABBER ROTATE VISIBLE
-    that.setGrabberRotateVisible = function(isVisible) {
-        that.setGrabberRotatePitchVisible(isVisible);
-        that.setGrabberRotateYawVisible(isVisible);
-        that.setGrabberRotateRollVisible(isVisible);
-    };
-
-    that.setGrabberRotatePitchVisible = function(isVisible) {
-        Overlays.editOverlay(grabberRotatePitchRing, { visible: isVisible });
-    };
-
-    that.setGrabberRotateYawVisible = function(isVisible) {
-        Overlays.editOverlay(grabberRotateYawRing, { visible: isVisible });
-    };
-
-    that.setGrabberRotateRollVisible = function(isVisible) {
-        Overlays.editOverlay(grabberRotateRollRing, { visible: isVisible });
-    };
-
-    // FUNCTION: SET GRABBER STRETCH VISIBLE
-    that.setGrabberStretchVisible = function(isVisible) {
-        that.setGrabberStretchXVisible(isVisible);
-        that.setGrabberStretchYVisible(isVisible);
-        that.setGrabberStretchZVisible(isVisible);
-    };
-
-    that.setGrabberStretchXVisible = function(isVisible) {
-        Overlays.editOverlay(grabberStretchXSphere, { visible: isVisible });
-    };
-
-    that.setGrabberStretchYVisible = function(isVisible) {
-        Overlays.editOverlay(grabberStretchYSphere, { visible: isVisible });
-    };
-
-    that.setGrabberStretchZVisible = function(isVisible) {
-        Overlays.editOverlay(grabberStretchZSphere, { visible: isVisible });
-    };
-    
-    // FUNCTION: SET GRABBER SCALE VISIBLE
-    that.setGrabberScaleVisible = function(isVisible) {
-        Overlays.editOverlay(grabberScaleLBNCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleRBNCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleLBFCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleRBFCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleLTNCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleRTNCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleLTFCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleRTFCube, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleTREdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleTLEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleTFEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleTNEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleBREdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleBLEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleBFEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleBNEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleNREdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleNLEdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleFREdge, { visible: isVisible });
-        Overlays.editOverlay(grabberScaleFLEdge, { visible: isVisible });
-    };
-
-    // FUNCTION: SET GRABBER CLONER VISIBLE
-    that.setGrabberClonerVisible = function(isVisible) {
-        Overlays.editOverlay(grabberCloner, { visible: isVisible });
-    };
-
-    var initialXZPick = null;
-    var isConstrained = false;
-    var constrainMajorOnly = false;
-    var startPosition = null;
-    var duplicatedEntityIDs = null;
-
-    // TOOL DEFINITION: TRANSLATE XZ TOOL
-    var translateXZTool = addGrabberTool(selectionBox, {
-        mode: 'TRANSLATE_XZ',
-        pickPlanePosition: { x: 0, y: 0, z: 0 },
-        greatestDimension: 0.0,
-        startingDistance: 0.0,
-        startingElevation: 0.0,
-        onBegin: function(event, pickRay, pickResult, doClone) {
-            var wantDebug = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(Beg) -> =======================");
-                Vec3.print("    pickRay", pickRay);
-                Vec3.print("    pickRay.origin", pickRay.origin);
-                Vec3.print("    pickResult.intersection", pickResult.intersection);
-            }
-
-            SelectionManager.saveProperties();
-            that.resetPreviousHandleColor();
-
-            that.setGrabberTranslateVisible(false);
-            that.setGrabberRotateVisible(false);
-            that.setGrabberScaleVisible(false);
-            that.setGrabberStretchVisible(false);
-            that.setGrabberClonerVisible(false);
-
-            startPosition = SelectionManager.worldPosition;
-
-            translateXZTool.pickPlanePosition = pickResult.intersection;
-            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
-            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
-            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
-            if (wantDebug) {
-                print("    longest dimension: " + translateXZTool.greatestDimension);
-                print("    starting distance: " + translateXZTool.startingDistance);
-                print("    starting elevation: " + translateXZTool.startingElevation);
-            }
-
-            initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            // Duplicate entities if alt is pressed.  This will make a
-            // copy of the selected entities and move the _original_ entities, not
-            // the new ones.
-            if (event.isAlt || doClone) {
-                duplicatedEntityIDs = [];
-                for (var otherEntityID in SelectionManager.savedProperties) {
-                    var properties = SelectionManager.savedProperties[otherEntityID];
-                    if (!properties.locked) {
-                        var entityID = Entities.addEntity(properties);
-                        duplicatedEntityIDs.push({
-                            entityID: entityID,
-                            properties: properties
-                        });
-                    }
-                }
-            } else {
-                duplicatedEntityIDs = null;
-            }
-
-            isConstrained = false;
-            if (wantDebug) {
-                print("================== TRANSLATE_XZ(End) <- =======================");
-            }
-        },
-        onEnd: function(event, reason) {
-            pushCommandForSelections(duplicatedEntityIDs);
-        },
-        elevation: function(origin, intersection) {
-            return (origin.y - intersection.y) / Vec3.distance(origin, intersection);
-        },
-        onMove: function(event) {
-            var wantDebug = false;
-            pickRay = generalComputePickRay(event.x, event.y);
-
-            var pick = rayPlaneIntersection2(pickRay, translateXZTool.pickPlanePosition, {
-                x: 0,
-                y: 1,
-                z: 0
-            });
-
-            // If the pick ray doesn't hit the pick plane in this direction, do nothing.
-            // this will happen when someone drags across the horizon from the side they started on.
-            if (!pick) {
-                if (wantDebug) {
-                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
-                }
-                
-                // EARLY EXIT--(Invalid ray detected.)
-                return;
-            }
-
-            var vector = Vec3.subtract(pick, initialXZPick);
-
-            // If the mouse is too close to the horizon of the pick plane, stop moving
-            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
-            var elevation = translateXZTool.elevation(pickRay.origin, pick);
-            if (wantDebug) {
-                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
-            }
-            if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
-                (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
-                if (wantDebug) {
-                    print("    "+ translateXZTool.mode + " - too close to horizon!");
-                }
-
-                // EARLY EXIT--(Don't proceed past the reached limit.)
-                return;
-            }
-
-            //  If the angular size of the object is too small, stop moving
-            var MIN_ANGULAR_SIZE = 0.01; //  Radians
-            if (translateXZTool.greatestDimension > 0) {
-                var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
-                if (wantDebug) {
-                    print("Angular size = " + angularSize);
-                }
-                if (angularSize < MIN_ANGULAR_SIZE) {
-                    return;
-                }
-            }
-
-            // If shifted, constrain to one axis
-            if (event.isShifted) {
-                if (Math.abs(vector.x) > Math.abs(vector.z)) {
-                    vector.z = 0;
-                } else {
-                    vector.x = 0;
-                }
-                if (!isConstrained) {
-                    isConstrained = true;
-                }
-            } else {
-                if (isConstrained) {
-                    isConstrained = false;
-                }
-            }
-
-            constrainMajorOnly = event.isControl;
-            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, SelectionManager.worldDimensions));
-            vector = Vec3.subtract(
-                grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
-                cornerPosition);
-
-
-            for (var i = 0; i < SelectionManager.selections.length; i++) {
-                var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
-                if (!properties) {
-                    continue;
-                }
-                var newPosition = Vec3.sum(properties.position, {
-                    x: vector.x,
-                    y: 0,
-                    z: vector.z
-                });
-                Entities.editEntity(SelectionManager.selections[i], {
-                    position: newPosition
-                });
-
-                if (wantDebug) {
-                    print("translateXZ... ");
-                    Vec3.print("                 vector:", vector);
-                    Vec3.print("            newPosition:", properties.position);
-                    Vec3.print("            newPosition:", newPosition);
-                }
-            }
-
-            SelectionManager._update();
-        }
-    });
-
-    addGrabberTranslateTool(grabberTranslateXCone, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
-    addGrabberTranslateTool(grabberTranslateXCylinder, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
-    addGrabberTranslateTool(grabberTranslateYCone, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
-    addGrabberTranslateTool(grabberTranslateYCylinder, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
-    addGrabberTranslateTool(grabberTranslateZCone, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
-    addGrabberTranslateTool(grabberTranslateZCylinder, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
-
-    addGrabberRotateTool(grabberRotatePitchRing, "ROTATE_PITCH", ROTATE_DIRECTION.PITCH);
-    addGrabberRotateTool(grabberRotateYawRing, "ROTATE_YAW", ROTATE_DIRECTION.YAW);
-    addGrabberRotateTool(grabberRotateRollRing, "ROTATE_ROLL", ROTATE_DIRECTION.ROLL);
-
-    addGrabberStretchTool(grabberStretchXSphere, "STRETCH_X", STRETCH_DIRECTION.X);
-    addGrabberStretchTool(grabberStretchYSphere, "STRETCH_Y", STRETCH_DIRECTION.Y);
-    addGrabberStretchTool(grabberStretchZSphere, "STRETCH_Z", STRETCH_DIRECTION.Z);
-
-    addGrabberScaleTool(grabberScaleLBNCube, "SCALE_LBN", SCALE_DIRECTION.LBN);
-    addGrabberScaleTool(grabberScaleRBNCube, "SCALE_RBN", SCALE_DIRECTION.RBN);
-    addGrabberScaleTool(grabberScaleLBFCube, "SCALE_LBF", SCALE_DIRECTION.LBF);
-    addGrabberScaleTool(grabberScaleRBFCube, "SCALE_RBF", SCALE_DIRECTION.RBF);
-    addGrabberScaleTool(grabberScaleLTNCube, "SCALE_LTN", SCALE_DIRECTION.LTN);
-    addGrabberScaleTool(grabberScaleRTNCube, "SCALE_RTN", SCALE_DIRECTION.RTN);
-    addGrabberScaleTool(grabberScaleLTFCube, "SCALE_LTF", SCALE_DIRECTION.LTF);
-    addGrabberScaleTool(grabberScaleRTFCube, "SCALE_RTF", SCALE_DIRECTION.RTF);
-
-    // GRABBER TOOL: GRABBER CLONER
-    addGrabberTool(grabberCloner, {
+    // TOOL DEFINITION: HANDLE CLONER
+    addHandleTool(handleCloner, {
         mode: "CLONE",
         onBegin: function(event, pickRay, pickResult) {
             var doClone = true;
@@ -1988,267 +2325,29 @@ SelectionDisplay = (function() {
         }
     });
 
-    // FUNCTION: CHECK MOVE
-    that.checkMove = function() {
-    };
+    addHandleTranslateTool(handleTranslateXCone, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
+    addHandleTranslateTool(handleTranslateXCylinder, "TRANSLATE_X", TRANSLATE_DIRECTION.X);
+    addHandleTranslateTool(handleTranslateYCone, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
+    addHandleTranslateTool(handleTranslateYCylinder, "TRANSLATE_Y", TRANSLATE_DIRECTION.Y);
+    addHandleTranslateTool(handleTranslateZCone, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
+    addHandleTranslateTool(handleTranslateZCylinder, "TRANSLATE_Z", TRANSLATE_DIRECTION.Z);
 
-    that.checkControllerMove = function() {
-        if (SelectionManager.hasSelection()) {
-            var controllerPose = getControllerWorldLocation(activeHand, true);
-            var hand = (activeHand === Controller.Standard.LeftHand) ? 0 : 1;
-            if (controllerPose.valid && lastControllerPoses[hand].valid) {
-                if (!Vec3.equal(controllerPose.position, lastControllerPoses[hand].position) ||
-                    !Vec3.equal(controllerPose.rotation, lastControllerPoses[hand].rotation)) {
-                    that.mouseMoveEvent({});
-                }
-            }
-            lastControllerPoses[hand] = controllerPose;
-        }
-    };
+    addHandleRotateTool(handleRotatePitchRing, "ROTATE_PITCH", ROTATE_DIRECTION.PITCH);
+    addHandleRotateTool(handleRotateYawRing, "ROTATE_YAW", ROTATE_DIRECTION.YAW);
+    addHandleRotateTool(handleRotateRollRing, "ROTATE_ROLL", ROTATE_DIRECTION.ROLL);
 
-    // FUNCTION DEF(s): Intersection Check Helpers
-    function testRayIntersect(queryRay, overlayIncludes, overlayExcludes) {
-        var wantDebug = false;
-        if ((queryRay === undefined) || (queryRay === null)) {
-            if (wantDebug) {
-                print("testRayIntersect - EARLY EXIT -> queryRay is undefined OR null!");
-            }
-            return null;
-        }
+    addHandleStretchTool(handleStretchXSphere, "STRETCH_X", STRETCH_DIRECTION.X);
+    addHandleStretchTool(handleStretchYSphere, "STRETCH_Y", STRETCH_DIRECTION.Y);
+    addHandleStretchTool(handleStretchZSphere, "STRETCH_Z", STRETCH_DIRECTION.Z);
 
-        var intersectObj = Overlays.findRayIntersection(queryRay, true, overlayIncludes, overlayExcludes);
-
-        if (wantDebug) {
-            if (!overlayIncludes) {
-                print("testRayIntersect - no overlayIncludes provided.");
-            }
-            if (!overlayExcludes) {
-                print("testRayIntersect - no overlayExcludes provided.");
-            }
-            print("testRayIntersect - Hit: " + intersectObj.intersects);
-            print("    intersectObj.overlayID:" + intersectObj.overlayID + "[" + overlayNames[intersectObj.overlayID] + "]");
-            print("        OverlayName: " + overlayNames[intersectObj.overlayID]);
-            print("    intersectObj.distance:" + intersectObj.distance);
-            print("    intersectObj.face:" + intersectObj.face);
-            Vec3.print("    intersectObj.intersection:", intersectObj.intersection);
-        }
-
-        return intersectObj;
-    }
-
-    // FUNCTION: MOUSE PRESS EVENT
-    that.mousePressEvent = function (event) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("=============== eST::MousePressEvent BEG =======================");
-        }
-        if (!event.isLeftButton && !that.triggered) {
-            // EARLY EXIT-(if another mouse button than left is pressed ignore it)
-            return false;
-        }
-
-        var pickRay = generalComputePickRay(event.x, event.y);
-        // TODO_Case6491:  Move this out to setup just to make it once
-        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID];
-        for (var key in grabberTools) {
-            if (grabberTools.hasOwnProperty(key)) {
-                interactiveOverlays.push(key);
-            }
-        }
-
-        // Start with unknown mode, in case no tool can handle this.
-        activeTool = null;
-
-        var results = testRayIntersect(pickRay, interactiveOverlays);
-        if (results.intersects) {
-            var hitOverlayID = results.overlayID;
-            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || (hitOverlayID === HMD.homeButtonID)) {
-                // EARLY EXIT-(mouse clicks on the tablet should override the edit affordances)
-                return false;
-            }
-
-            entityIconOverlayManager.setIconsSelectable(SelectionManager.selections, true);
-
-            var hitTool = grabberTools[ hitOverlayID ];
-            if (hitTool) {
-                activeTool = hitTool;
-                if (activeTool.onBegin) {
-                    activeTool.onBegin(event, pickRay, results);
-                } else {
-                    print("ERROR: entitySelectionTool.mousePressEvent - ActiveTool(" + activeTool.mode + ") missing onBegin");
-                }
-            } else {
-                print("ERROR: entitySelectionTool.mousePressEvent - Hit unexpected object, check interactiveOverlays");
-            }// End_if (hitTool)
-        }// End_If(results.intersects)
-
-        if (wantDebug) {
-            print("    DisplayMode: " + getMode());
-            print("=============== eST::MousePressEvent END =======================");
-        }
-
-        // If mode is known then we successfully handled this;
-        // otherwise, we're missing a tool.
-        return activeTool;
-    };
-
-    that.resetPreviousHandleColor = function() {
-        if (previousHandle != null) {
-            Overlays.editOverlay(previousHandle, { color: previousHandleColor });
-            previousHandle = null;
-        }
-        if (previousHandleHelper != null) {
-            Overlays.editOverlay(previousHandleHelper, { color: previousHandleColor });
-            previousHandleHelper = null;
-        }
-    };
-
-    that.getHandleHelper = function(overlay) {
-        if (overlay === grabberTranslateXCone) {
-            return grabberTranslateXCylinder;
-        } else if (overlay === grabberTranslateXCylinder) {
-            return grabberTranslateXCone;
-        } else if (overlay === grabberTranslateYCone) {
-            return grabberTranslateYCylinder;
-        } else if (overlay === grabberTranslateYCylinder) {
-            return grabberTranslateYCone;
-        } else if (overlay === grabberTranslateZCone) {
-            return grabberTranslateZCylinder;
-        } else if (overlay === grabberTranslateZCylinder) {
-            return grabberTranslateZCone;
-        }
-    };
-
-    // FUNCTION: MOUSE MOVE EVENT
-    that.mouseMoveEvent = function(event) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("=============== eST::MouseMoveEvent BEG =======================");
-        }
-        if (activeTool) {
-            if (wantDebug) {
-                print("    Trigger ActiveTool(" + activeTool.mode + ")'s onMove");
-            }
-            activeTool.onMove(event);
-
-            if (wantDebug) {
-                print("    Trigger SelectionManager::update");
-            }
-            SelectionManager._update();
-
-            if (wantDebug) {
-                print("=============== eST::MouseMoveEvent END =======================");
-            }
-            // EARLY EXIT--(Move handled via active tool)
-            return true;
-        }
-
-        // if no tool is active, then just look for handles to highlight...
-        var pickRay = generalComputePickRay(event.x, event.y);
-        var result = Overlays.findRayIntersection(pickRay);
-        var pickedColor;
-        var highlightNeeded = false;
-
-        if (result.intersects) {
-            switch (result.overlayID) {
-                case grabberTranslateXCone:
-                case grabberTranslateXCylinder:
-                case grabberRotatePitchRing:
-                case grabberStretchXSphere:
-                    pickedColor = COLOR_RED;
-                    highlightNeeded = true;
-                    break;
-                case grabberTranslateYCone:
-                case grabberTranslateYCylinder:
-                case grabberRotateYawRing:
-                case grabberStretchYSphere:
-                    pickedColor = COLOR_GREEN;
-                    highlightNeeded = true;
-                    break;
-                case grabberTranslateZCone:
-                case grabberTranslateZCylinder:
-                case grabberRotateRollRing:
-                case grabberStretchZSphere:
-                    pickedColor = COLOR_BLUE;
-                    highlightNeeded = true;
-                    break;
-                case grabberScaleLBNCube:
-                case grabberScaleRBNCube:
-                case grabberScaleLBFCube:
-                case grabberScaleRBFCube:
-                case grabberScaleLTNCube:
-                case grabberScaleRTNCube:
-                case grabberScaleLTFCube:
-                case grabberScaleRTFCube:
-                    pickedColor = GRABBER_SCALE_CUBE_IDLE_COLOR;
-                    highlightNeeded = true;
-                    break;
-                default:
-                    that.resetPreviousHandleColor();
-                    break;
-            }
-
-            if (highlightNeeded) {
-                that.resetPreviousHandleColor();
-                Overlays.editOverlay(result.overlayID, { color: GRABBER_HOVER_COLOR });
-                previousHandle = result.overlayID;
-                previousHandleHelper = that.getHandleHelper(result.overlayID);
-                if (previousHandleHelper != null) {
-                    Overlays.editOverlay(previousHandleHelper, { color: GRABBER_HOVER_COLOR });
-                }
-                previousHandleColor = pickedColor;
-            }
-
-        } else {
-            that.resetPreviousHandleColor();
-        }
-
-        if (wantDebug) {
-            print("=============== eST::MouseMoveEvent END =======================");
-        }
-        return false;
-    };
-
-    // FUNCTION: MOUSE RELEASE EVENT
-    that.mouseReleaseEvent = function(event) {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("=============== eST::MouseReleaseEvent BEG =======================");
-        }
-        var showHandles = false;
-        if (activeTool) {
-            if (activeTool.onEnd) {
-                if (wantDebug) {
-                    print("    Triggering ActiveTool(" + activeTool.mode + ")'s onEnd");
-                }
-                activeTool.onEnd(event);
-            } else if (wantDebug) {
-                print("    ActiveTool(" + activeTool.mode + ")'s missing onEnd");
-            }
-        }
-
-        showHandles = activeTool; // base on prior tool value
-        activeTool = null;
-
-        // if something is selected, then reset the "original" properties for any potential next click+move operation
-        if (SelectionManager.hasSelection()) {
-            if (showHandles) {
-                if (wantDebug) {
-                    print("    Triggering that.select");
-                }
-                that.select(SelectionManager.selections[0], event);
-            }
-        }
-
-        if (wantDebug) {
-            print("=============== eST::MouseReleaseEvent END =======================");
-        }
-    };
-
-    // NOTE: mousePressEvent and mouseMoveEvent from the main script should call us., so we don't hook these:
-    //       Controller.mousePressEvent.connect(that.mousePressEvent);
-    //       Controller.mouseMoveEvent.connect(that.mouseMoveEvent);
-    Controller.mouseReleaseEvent.connect(that.mouseReleaseEvent);
+    addHandleScaleTool(handleScaleLBNCube, "SCALE_LBN", SCALE_DIRECTION.LBN);
+    addHandleScaleTool(handleScaleRBNCube, "SCALE_RBN", SCALE_DIRECTION.RBN);
+    addHandleScaleTool(handleScaleLBFCube, "SCALE_LBF", SCALE_DIRECTION.LBF);
+    addHandleScaleTool(handleScaleRBFCube, "SCALE_RBF", SCALE_DIRECTION.RBF);
+    addHandleScaleTool(handleScaleLTNCube, "SCALE_LTN", SCALE_DIRECTION.LTN);
+    addHandleScaleTool(handleScaleRTNCube, "SCALE_RTN", SCALE_DIRECTION.RTN);
+    addHandleScaleTool(handleScaleLTFCube, "SCALE_LTF", SCALE_DIRECTION.LTF);
+    addHandleScaleTool(handleScaleRTFCube, "SCALE_RTF", SCALE_DIRECTION.RTF);
 
     return that;
 }());
\ No newline at end of file

From 55f55cd78bdc52c5c2529d27b26dccb0e19f13eb Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 1 Feb 2018 17:59:38 -0800
Subject: [PATCH 062/569] few more updates

---
 .../system/libraries/entitySelectionTool.js   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index c68fb6e71c..d294fecf21 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -248,6 +248,7 @@ SelectionDisplay = (function() {
     var TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE = 0.005;
     var TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE = 7.5;
     var TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE = 0.025;
+    var TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE = 0.83;
 
     var ROTATE_RING_CAMERA_DISTANCE_MULTIPLE = 0.15;
     var ROTATE_CTRL_SNAP_ANGLE = 22.5;
@@ -257,7 +258,7 @@ SelectionDisplay = (function() {
     var ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
-    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 1.0;
+    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 1.75;
     var ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.3;
     var ROTATE_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
     var ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
@@ -674,7 +675,8 @@ SelectionDisplay = (function() {
         var results = testRayIntersect(pickRay, interactiveOverlays);
         if (results.intersects) {
             var hitOverlayID = results.overlayID;
-            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || (hitOverlayID === HMD.homeButtonID)) {
+            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || 
+                (hitOverlayID === HMD.homeButtonID)) {
                 // EARLY EXIT-(mouse clicks on the tablet should override the edit affordances)
                 return false;
             }
@@ -1036,6 +1038,7 @@ SelectionDisplay = (function() {
             };
             var arrowConeDimension = toCameraDistance * TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE;
             var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
+            var arrowConeOffset = arrowCylinderDimensions.y * TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE;
             var cylinderXPosition = { x:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance, y:0, z:0 };
             cylinderXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderXPosition));
             Overlays.editOverlay(handleTranslateXCylinder, { 
@@ -1044,7 +1047,7 @@ SelectionDisplay = (function() {
                 dimensions: arrowCylinderDimensions
             });
             var cylinderXDiff = Vec3.subtract(cylinderXPosition, position);
-            var coneXPosition = Vec3.sum(cylinderXPosition, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowCylinderDimensions.y * 0.83));
+            var coneXPosition = Vec3.sum(cylinderXPosition, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowConeOffset));
             Overlays.editOverlay(handleTranslateXCone, { 
                 position: coneXPosition, 
                 rotation: rotationX,
@@ -1058,7 +1061,7 @@ SelectionDisplay = (function() {
                 dimensions: arrowCylinderDimensions
             });
             var cylinderYDiff = Vec3.subtract(cylinderYPosition, position);
-            var coneYPosition = Vec3.sum(cylinderYPosition, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowCylinderDimensions.y * 0.83));
+            var coneYPosition = Vec3.sum(cylinderYPosition, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowConeOffset));
             Overlays.editOverlay(handleTranslateYCone, { 
                 position: coneYPosition, 
                 rotation: rotationY,
@@ -1072,7 +1075,7 @@ SelectionDisplay = (function() {
                 dimensions: arrowCylinderDimensions
             });
             var cylinderZDiff = Vec3.subtract(cylinderZPosition, position);
-            var coneZPosition = Vec3.sum(cylinderZPosition, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowCylinderDimensions.y * 0.83));
+            var coneZPosition = Vec3.sum(cylinderZPosition, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowConeOffset));
             Overlays.editOverlay(handleTranslateZCone, { 
                 position: coneZPosition, 
                 rotation: rotationZ,
@@ -1275,9 +1278,12 @@ SelectionDisplay = (function() {
             });
         }
 
-        that.setHandleTranslateXVisible(!activeTool || isActiveTool(handleTranslateXCone) || isActiveTool(handleTranslateXCylinder));
-        that.setHandleTranslateYVisible(!activeTool || isActiveTool(handleTranslateYCone) || isActiveTool(handleTranslateYCylinder));
-        that.setHandleTranslateZVisible(!activeTool || isActiveTool(handleTranslateZCone) || isActiveTool(handleTranslateZCylinder));
+        that.setHandleTranslateXVisible(!activeTool || isActiveTool(handleTranslateXCone) || 
+                                                       isActiveTool(handleTranslateXCylinder));
+        that.setHandleTranslateYVisible(!activeTool || isActiveTool(handleTranslateYCone) || 
+                                                       isActiveTool(handleTranslateYCylinder));
+        that.setHandleTranslateZVisible(!activeTool || isActiveTool(handleTranslateZCone) || 
+                                                       isActiveTool(handleTranslateZCylinder));
         that.setHandleRotatePitchVisible(!activeTool || isActiveTool(handleRotatePitchRing));
         that.setHandleRotateYawVisible(!activeTool || isActiveTool(handleRotateYawRing));
         that.setHandleRotateRollVisible(!activeTool || isActiveTool(handleRotateRollRing));
@@ -1286,10 +1292,14 @@ SelectionDisplay = (function() {
         that.setHandleStretchXVisible(showScaleStretch || isActiveTool(handleStretchXSphere));
         that.setHandleStretchYVisible(showScaleStretch || isActiveTool(handleStretchYSphere));
         that.setHandleStretchZVisible(showScaleStretch || isActiveTool(handleStretchZSphere));
-        that.setHandleScaleCubeVisible(showScaleStretch || isActiveTool(handleScaleLBNCube) || isActiveTool(handleScaleRBNCube) || isActiveTool(handleScaleLBFCube) || isActiveTool(handleScaleRBFCube)
-                                                || isActiveTool(handleScaleLTNCube) || isActiveTool(handleScaleRTNCube) || isActiveTool(handleScaleLTFCube) || isActiveTool(handleScaleRTFCube)
-                                                || isActiveTool(handleStretchXSphere) || isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
-        that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) && !isActiveTool(handleRotateRollRing));
+        that.setHandleScaleCubeVisible(showScaleStretch || isActiveTool(handleScaleLBNCube) || 
+                                       isActiveTool(handleScaleRBNCube) || isActiveTool(handleScaleLBFCube) || 
+                                       isActiveTool(handleScaleRBFCube) || isActiveTool(handleScaleLTNCube) || 
+                                       isActiveTool(handleScaleRTNCube) || isActiveTool(handleScaleLTFCube) || 
+                                       isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
+                                       isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
+        that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) && 
+                                       !isActiveTool(handleRotateRollRing));
 
         //keep cloner always hidden for now since you can hold Alt to clone while dragging to translate  - we may bring cloner back for HMD only later
         //that.setHandleClonerVisible(!activeTool || isActiveTool(handleCloner));
@@ -1453,7 +1463,9 @@ SelectionDisplay = (function() {
             startPosition = SelectionManager.worldPosition;
 
             translateXZTool.pickPlanePosition = pickResult.intersection;
-            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
+            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, 
+                                                                  SelectionManager.worldDimensions.y), 
+                                                                  SelectionManager.worldDimensions.z);
             translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
             translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
             if (wantDebug) {
@@ -2215,7 +2227,8 @@ SelectionDisplay = (function() {
 
                 var rotationCenterToZero = Vec3.subtract(rotationZero, rotationCenter);
                 var rotationCenterToZeroLength = Vec3.length(rotationCenterToZero);
-                rotationDegreesPosition = Vec3.sum(rotationCenter, Vec3.multiply(Vec3.normalize(rotationCenterToZero), rotationCenterToZeroLength * 1.75));
+                rotationDegreesPosition = Vec3.sum(rotationCenter, Vec3.multiply(Vec3.normalize(rotationCenterToZero), 
+                                                   rotationCenterToZeroLength * ROTATE_DISPLAY_DISTANCE_MULTIPLIER));
                 updateRotationDegreesOverlay(0, rotationDegreesPosition);
 
                 if (wantDebug) {
@@ -2350,4 +2363,4 @@ SelectionDisplay = (function() {
     addHandleScaleTool(handleScaleRTFCube, "SCALE_RTF", SCALE_DIRECTION.RTF);
 
     return that;
-}());
\ No newline at end of file
+}());

From 3804917cf46abb3f9919e252d68ad41a0aa5b6c3 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 2 Feb 2018 09:40:57 +0100
Subject: [PATCH 063/569] Orthographic octree selection seems to be working

---
 libraries/gpu/src/gpu/Framebuffer.cpp         |  2 +-
 libraries/octree/src/OctreeUtils.cpp          |  8 +-
 libraries/octree/src/OctreeUtils.h            |  3 +-
 .../render-utils/src/RenderShadowTask.cpp     | 50 +++++++++----
 libraries/render-utils/src/RenderShadowTask.h | 10 +--
 libraries/render-utils/src/Shadow.slh         |  5 --
 libraries/render-utils/src/ShadowCore.slh     |  4 +-
 libraries/render/src/render/CullTask.cpp      | 30 +++++---
 libraries/render/src/render/CullTask.h        |  3 +-
 .../render/src/render/DrawSceneOctree.cpp     |  2 +-
 .../src/render/RenderFetchCullSortTask.cpp    |  2 +-
 libraries/render/src/render/SpatialTree.cpp   | 74 +++++++++++++------
 libraries/render/src/render/SpatialTree.h     | 31 ++++----
 libraries/shared/src/ViewFrustum.cpp          |  4 +
 libraries/shared/src/ViewFrustum.h            |  1 +
 15 files changed, 152 insertions(+), 77 deletions(-)

diff --git a/libraries/gpu/src/gpu/Framebuffer.cpp b/libraries/gpu/src/gpu/Framebuffer.cpp
index 4fcc9ab0f9..8bb9be4a76 100755
--- a/libraries/gpu/src/gpu/Framebuffer.cpp
+++ b/libraries/gpu/src/gpu/Framebuffer.cpp
@@ -62,7 +62,7 @@ Framebuffer* Framebuffer::createShadowmap(uint16 width) {
     samplerDesc._wrapModeU = Sampler::WRAP_BORDER;
     samplerDesc._wrapModeV = Sampler::WRAP_BORDER;
     samplerDesc._filter = Sampler::FILTER_MIN_MAG_LINEAR;
-    samplerDesc._comparisonFunc = LESS_EQUAL;
+    samplerDesc._comparisonFunc = LESS;
 
     depthTexture->setSampler(Sampler(samplerDesc));
     framebuffer->setDepthStencilBuffer(depthTexture, depthFormat);
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index c55016d8e2..ca15324d4e 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -64,8 +64,14 @@ float boundaryDistanceForRenderLevel(unsigned int renderLevel, float voxelSizeSc
     return voxelSizeScale / powf(2.0f, renderLevel);
 }
 
-float getAccuracyAngle(float octreeSizeScale, int boundaryLevelAdjust) {
+float getPerspectiveAccuracyAngle(float octreeSizeScale, int boundaryLevelAdjust) {
     const float maxScale = (float)TREE_SCALE;
     float visibleDistanceAtMaxScale = boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale) / OCTREE_TO_MESH_RATIO;
     return atan(maxScale / visibleDistanceAtMaxScale);
 }
+
+float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust) {
+    // Smallest visible element is 1cm
+    const float smallestSize = 0.01f;
+    return (smallestSize * MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT) / boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale);
+}
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index c257bcd5f1..0f87bb6f68 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -25,7 +25,8 @@ float calculateRenderAccuracy(const glm::vec3& position,
 
 float boundaryDistanceForRenderLevel(unsigned int renderLevel, float voxelSizeScale);
 
-float getAccuracyAngle(float octreeSizeScale, int boundaryLevelAdjust);
+float getPerspectiveAccuracyAngle(float octreeSizeScale, int boundaryLevelAdjust);
+float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust);
 
 // MIN_ELEMENT_ANGULAR_DIAMETER = angular diameter of 1x1x1m cube at 400m = sqrt(3) / 400 = 0.0043301 radians ~= 0.25 degrees
 const float MIN_ELEMENT_ANGULAR_DIAMETER = 0.0043301f; // radians
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index c9df67dad1..b576bf774c 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -214,9 +214,10 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     }
 
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
+    const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
     static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
-    const auto fetchInput = render::Varying(shadowCasterFilter);
+    const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
     const auto shadowItems = task.addJob<FetchSpatialSelection>("FetchShadowSelection", selectionInputs);
@@ -281,14 +282,15 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
 
     output.edit0() = args->_renderMode;
     output.edit1() = args->_sizeScale;
+    output.edit2() = glm::ivec2(0, 0);
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow) {
         globalShadow->setKeylightFrustum(args->getViewFrustum(), SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR);
-        auto& firstCascadeFrustum = globalShadow->getCascade(0).getFrustum();
+
+        auto& firstCascade = globalShadow->getCascade(0);
+        auto& firstCascadeFrustum = firstCascade.getFrustum();
         unsigned int cascadeIndex;
-        _coarseShadowFrustum->setPosition(firstCascadeFrustum->getPosition());
-        _coarseShadowFrustum->setOrientation(firstCascadeFrustum->getOrientation());
 
         // Adjust each cascade frustum
         for (cascadeIndex = 0; cascadeIndex < globalShadow->getCascadeCount(); ++cascadeIndex) {
@@ -297,19 +299,29 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
                                                     SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR,
                                                     bias._constant, bias._slope);
         }
+
         // Now adjust coarse frustum bounds
-        auto left = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getRight());
-        auto right = glm::dot(firstCascadeFrustum->getFarTopRight(), firstCascadeFrustum->getRight());
-        auto top = glm::dot(firstCascadeFrustum->getFarTopLeft(), firstCascadeFrustum->getUp());
-        auto bottom = glm::dot(firstCascadeFrustum->getFarBottomRight(), firstCascadeFrustum->getUp());
+        auto frustumPosition = firstCascadeFrustum->getPosition();
+        auto farTopLeft = firstCascadeFrustum->getFarTopLeft() - frustumPosition;
+        auto farBottomRight = firstCascadeFrustum->getFarBottomRight() - frustumPosition;
+
+        auto left = glm::dot(farTopLeft, firstCascadeFrustum->getRight());
+        auto right = glm::dot(farBottomRight, firstCascadeFrustum->getRight());
+        auto top = glm::dot(farTopLeft, firstCascadeFrustum->getUp());
+        auto bottom = glm::dot(farBottomRight, firstCascadeFrustum->getUp());
         auto near = firstCascadeFrustum->getNearClip();
         auto far = firstCascadeFrustum->getFarClip();
+
         for (cascadeIndex = 1; cascadeIndex < globalShadow->getCascadeCount(); ++cascadeIndex) {
             auto& cascadeFrustum = globalShadow->getCascade(cascadeIndex).getFrustum();
-            auto cascadeLeft = glm::dot(cascadeFrustum->getFarTopLeft(), cascadeFrustum->getRight());
-            auto cascadeRight = glm::dot(cascadeFrustum->getFarTopRight(), cascadeFrustum->getRight());
-            auto cascadeTop = glm::dot(cascadeFrustum->getFarTopLeft(), cascadeFrustum->getUp());
-            auto cascadeBottom = glm::dot(cascadeFrustum->getFarBottomRight(), cascadeFrustum->getUp());
+
+            farTopLeft = cascadeFrustum->getFarTopLeft() - frustumPosition;
+            farBottomRight = cascadeFrustum->getFarBottomRight() - frustumPosition;
+
+            auto cascadeLeft = glm::dot(farTopLeft, cascadeFrustum->getRight());
+            auto cascadeRight = glm::dot(farBottomRight, cascadeFrustum->getRight());
+            auto cascadeTop = glm::dot(farTopLeft, cascadeFrustum->getUp());
+            auto cascadeBottom = glm::dot(farBottomRight, cascadeFrustum->getUp());
             auto cascadeNear = cascadeFrustum->getNearClip();
             auto cascadeFar = cascadeFrustum->getFarClip();
             left = glm::min(left, cascadeLeft);
@@ -319,6 +331,9 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
             near = glm::min(near, cascadeNear);
             far = glm::max(far, cascadeFar);
         }
+
+        _coarseShadowFrustum->setPosition(firstCascadeFrustum->getPosition());
+        _coarseShadowFrustum->setOrientation(firstCascadeFrustum->getOrientation());
         _coarseShadowFrustum->setProjection(glm::ortho<float>(left, right, bottom, top, near, far));
         _coarseShadowFrustum->calculate();
 
@@ -326,10 +341,13 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
         args->pushViewFrustum(*_coarseShadowFrustum);
 
         args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
-        if (lightStage->getCurrentKeyLight()->getType() == graphics::Light::SUN) {
-            // Set to ridiculously high amount to prevent solid angle culling in octree selection
-            args->_sizeScale = 1e16f;
-        }
+
+        // We want for the octree query enough resolution to catch the details in the lowest cascade. So compute
+        // the desired resolution for the first cascade frustum and extrapolate it to the coarse frustum.
+        glm::ivec2 queryResolution = firstCascade.framebuffer->getSize();
+        queryResolution.x = int(queryResolution.x * _coarseShadowFrustum->getWidth() / firstCascadeFrustum->getWidth());
+        queryResolution.y = int(queryResolution.y * _coarseShadowFrustum->getHeight() / firstCascadeFrustum->getHeight());
+        output.edit2() = queryResolution;
     }
 }
 
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 1736d07fd5..ce4c3047d8 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -71,10 +71,10 @@ public:
     float constantBias1{ 0.15f };
     float constantBias2{ 0.15f };
     float constantBias3{ 0.15f };
-    float slopeBias0{ 0.55f };
-    float slopeBias1{ 0.55f };
-    float slopeBias2{ 0.55f };
-    float slopeBias3{ 0.55f };
+    float slopeBias0{ 0.6f };
+    float slopeBias1{ 0.6f };
+    float slopeBias2{ 0.6f };
+    float slopeBias3{ 0.6f };
 
 signals:
     void dirty();
@@ -82,7 +82,7 @@ signals:
 
 class RenderShadowSetup {
 public:
-    using Outputs = render::VaryingSet2<RenderArgs::RenderMode, float>;
+    using Outputs = render::VaryingSet3<RenderArgs::RenderMode, float, glm::ivec2>;
     using Config = RenderShadowSetupConfig;
     using JobModel = render::Job::ModelO<RenderShadowSetup, Outputs, Config>;
 
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index 6575e68090..e87519b5f4 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -79,15 +79,10 @@ float evalShadowAttenuationPCF(int cascadeIndex, ShadowSampleOffsets offsets, ve
         fetchShadow(cascadeIndex, shadowTexcoord.xyz + offsets.points[2]) +
         fetchShadow(cascadeIndex, shadowTexcoord.xyz + offsets.points[3])
     );
-
     return shadowAttenuation;
 }
 
 float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets, vec4 shadowTexcoord, float oneMinusNdotL) {
-    if (!isShadowCascadeProjectedOnPixel(shadowTexcoord)) {
-        // If a point is not in the map, do not attenuate
-        return 1.0;
-    }
     float bias = getShadowFixedBias(cascadeIndex) + getShadowSlopeBias(cascadeIndex) * oneMinusNdotL;
     return evalShadowAttenuationPCF(cascadeIndex, offsets, shadowTexcoord, bias);
 }
diff --git a/libraries/render-utils/src/ShadowCore.slh b/libraries/render-utils/src/ShadowCore.slh
index 782e2bc2b8..e49e8d638f 100644
--- a/libraries/render-utils/src/ShadowCore.slh
+++ b/libraries/render-utils/src/ShadowCore.slh
@@ -53,8 +53,8 @@ vec4 evalShadowTexcoord(int cascadeIndex, vec4 position) {
 }
 
 bool isShadowCascadeProjectedOnPixel(vec4 cascadeTexCoords) {
-    bvec2 greaterThanZero = greaterThanEqual(cascadeTexCoords.xy, vec2(0));
-    bvec2 lessThanOne = lessThanEqual(cascadeTexCoords.xy, vec2(1));
+    bvec2 greaterThanZero = greaterThan(cascadeTexCoords.xy, vec2(0));
+    bvec2 lessThanOne = lessThan(cascadeTexCoords.xy, vec2(1));
     return all(greaterThanZero) && all(lessThanOne);
 }
 
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index c6ff224560..b3efc4f1a8 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -14,8 +14,8 @@
 #include <algorithm>
 #include <assert.h>
 
-#include <OctreeUtils.h>
 #include <PerfStat.h>
+#include <OctreeUtils.h>
 
 using namespace render;
 
@@ -33,7 +33,7 @@ struct Test {
         _renderDetails(renderDetails) {
         // FIXME: Keep this code here even though we don't use it yet
         /*_eyePos = _args->getViewFrustum().getPosition();
-        float a = glm::degrees(Octree::getAccuracyAngle(_args->_sizeScale, _args->_boundaryLevelAdjust));
+        float a = glm::degrees(Octree::getPerspectiveAccuracyAngle(_args->_sizeScale, _args->_boundaryLevelAdjust));
         auto angle = std::min(glm::radians(45.0f), a); // no worse than 45 degrees
         angle = std::max(glm::radians(1.0f / 60.0f), a); // no better than 1 minute of degree
         auto tanAlpha = tan(angle);
@@ -130,7 +130,8 @@ void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inpu
     // start fresh
     outSelection.clear();
 
-    auto& filter = inputs;
+    auto& filter = inputs.get0();
+    auto frustumResolution = inputs.get1();
 
     if (!filter.selectsNothing()) {
         assert(renderContext->args);
@@ -149,8 +150,19 @@ void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inpu
         }
 
         // Octree selection!
-        float angle = glm::degrees(getAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
-        scene->getSpatialTree().selectCellItems(outSelection, filter, queryFrustum, angle);
+        float threshold = 0.0f;
+        if (queryFrustum.isPerspective()) {
+            threshold = getPerspectiveAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust);
+            if (frustumResolution.y > 0) {
+                threshold = glm::max(queryFrustum.getFieldOfView() / frustumResolution.y, threshold);
+            }
+        } else {
+            threshold = getOrthographicAccuracySize(args->_sizeScale, args->_boundaryLevelAdjust);
+            glm::vec2 frustumSize = glm::vec2(queryFrustum.getWidth(), queryFrustum.getHeight());
+            const auto pixelResolution = frustumResolution.x > 0 ? frustumResolution : glm::ivec2(2048, 2048);
+            threshold = glm::max(threshold, glm::min(frustumSize.x / pixelResolution.x, frustumSize.y / pixelResolution.y));
+        }
+        scene->getSpatialTree().selectCellItems(outSelection, filter, queryFrustum, threshold);
     }
 }
 
@@ -371,7 +383,7 @@ void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
         // Now get the bound, and
         // filter individually against the _filter
 
-        // inside & fit items: filter only, culling is disabled
+        // inside & fit items: filter only
         {
             PerformanceTimer perfTimer("insideFitItems");
             for (auto id : inSelection.insideItems) {
@@ -383,7 +395,7 @@ void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
             }
         }
 
-        // inside & subcell items: filter only, culling is disabled
+        // inside & subcell items: filter only
         {
             PerformanceTimer perfTimer("insideSmallItems");
             for (auto id : inSelection.insideSubcellItems) {
@@ -395,7 +407,7 @@ void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
             }
         }
 
-        // partial & fit items: filter only, culling is disabled
+        // partial & fit items: filter only
         {
             PerformanceTimer perfTimer("partialFitItems");
             for (auto id : inSelection.partialItems) {
@@ -407,7 +419,7 @@ void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
             }
         }
 
-        // partial & subcell items: filter only, culling is disabled
+        // partial & subcell items: filter only
         {
             PerformanceTimer perfTimer("partialSmallItems");
             for (auto id : inSelection.partialSubcellItems) {
diff --git a/libraries/render/src/render/CullTask.h b/libraries/render/src/render/CullTask.h
index a140a86aee..53d46d11b4 100644
--- a/libraries/render/src/render/CullTask.h
+++ b/libraries/render/src/render/CullTask.h
@@ -53,9 +53,10 @@ namespace render {
         bool _justFrozeFrustum{ false };
         ViewFrustum _frozenFrustum;
         float _lodAngle;
+
     public:
         using Config = FetchSpatialTreeConfig;
-        using Inputs = ItemFilter;
+        using Inputs = render::VaryingSet2<ItemFilter, glm::ivec2>;
         using JobModel = Job::ModelIO<FetchSpatialTree, Inputs, ItemSpatialTree::ItemSelection, Config>;
 
         FetchSpatialTree() {}
diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp
index 36663a454a..08d6340e43 100644
--- a/libraries/render/src/render/DrawSceneOctree.cpp
+++ b/libraries/render/src/render/DrawSceneOctree.cpp
@@ -148,7 +148,7 @@ void DrawSceneOctree::run(const RenderContextPointer& renderContext, const ItemS
         }
         // Draw the LOD Reticle
         {
-            float angle = glm::degrees(getAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
+            float angle = glm::degrees(getPerspectiveAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
             Transform crosshairModel;
             crosshairModel.setTranslation(glm::vec3(0.0, 0.0, -1000.0));
             crosshairModel.setScale(1000.0f * tanf(glm::radians(angle))); // Scaling at the actual tan of the lod angle => Multiplied by TWO
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index a1b4f079e7..23935851b3 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -23,7 +23,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
     // CPU jobs:
     // Fetch and cull the items from the scene
     const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered();
-    const auto fetchInput = render::Varying(filter);
+    const auto fetchInput = FetchSpatialTree::Inputs(filter, glm::ivec2(0,0)).asVarying();
     const auto spatialSelection = task.addJob<FetchSpatialTree>("FetchSceneSelection", fetchInput);
     const auto cullInputs = CullSpatialSelection::Inputs(spatialSelection, render::Varying(filter)).asVarying();
     const auto culledSpatialSelection = task.addJob<CullSpatialSelection>("CullSceneSelection", cullInputs, cullFunctor, RenderDetails::ITEM);
diff --git a/libraries/render/src/render/SpatialTree.cpp b/libraries/render/src/render/SpatialTree.cpp
index 1bb3538521..c9f810ebc5 100644
--- a/libraries/render/src/render/SpatialTree.cpp
+++ b/libraries/render/src/render/SpatialTree.cpp
@@ -12,9 +12,26 @@
 
 #include <ViewFrustum.h>
 
-
 using namespace render;
 
+void Octree::PerspectiveSelector::setAngle(float a) {
+    const float MAX_LOD_ANGLE = glm::radians(45.0f);
+    const float MIN_LOD_ANGLE = glm::radians(1.0f / 60.0f);
+
+    angle = std::max(MIN_LOD_ANGLE, std::min(MAX_LOD_ANGLE, a));
+    auto tanAlpha = tan(angle);
+    squareTanAlpha = (float)(tanAlpha * tanAlpha);
+}
+
+float Octree::PerspectiveSelector::testThreshold(const Coord3f& point, float size) const {
+    auto eyeToPoint = point - eyePos;
+    return (size * size / glm::dot(eyeToPoint, eyeToPoint)) - squareTanAlpha;
+}
+
+float Octree::OrthographicSelector::testThreshold(const Coord3f& point, float size) const {
+    return (size * size) - squareMinSize;
+}
+
 
 const float Octree::INV_DEPTH_DIM[] = {
     1.0f,
@@ -520,10 +537,9 @@ int Octree::selectTraverse(Index cellID, CellSelection& selection, const Frustum
 
             // Test for lod
             auto cellLocation = cell.getlocation();
-            float lod = selector.testSolidAngle(cellLocation.getCenter(), Octree::getCoordSubcellWidth(cellLocation.depth));
-            if (lod < 0.0f) {
+            float test = selector.testThreshold(cellLocation.getCenter(), Octree::getCoordSubcellWidth(cellLocation.depth));
+            if (test < 0.0f) {
                 return 0;
-                break;
             }
 
             // Select this cell partially in frustum
@@ -543,13 +559,13 @@ int Octree::selectTraverse(Index cellID, CellSelection& selection, const Frustum
 }
 
 
-int  Octree::selectBranch(Index cellID, CellSelection& selection, const FrustumSelector& selector) const {
+int Octree::selectBranch(Index cellID, CellSelection& selection, const FrustumSelector& selector) const {
     int numSelectedsIn = (int) selection.size();
     auto cell = getConcreteCell(cellID);
 
     auto cellLocation = cell.getlocation();
-    float lod = selector.testSolidAngle(cellLocation.getCenter(), Octree::getCoordSubcellWidth(cellLocation.depth));
-    if (lod < 0.0f) {
+    float test = selector.testThreshold(cellLocation.getCenter(), Octree::getCoordSubcellWidth(cellLocation.depth));
+    if (test < 0.0f) {
         return 0;
     }
 
@@ -580,24 +596,40 @@ int Octree::selectCellBrick(Index cellID, CellSelection& selection, bool inside)
     return (int) selection.size() - numSelectedsIn;
 }
 
-
-int ItemSpatialTree::selectCells(CellSelection& selection, const ViewFrustum& frustum, float lodAngle) const {
+int ItemSpatialTree::selectCells(CellSelection& selection, const ViewFrustum& frustum, float threshold) const {
     auto worldPlanes = frustum.getPlanes();
-    FrustumSelector selector;
-    for (int i = 0; i < ViewFrustum::NUM_PLANES; i++) {
-        ::Plane octPlane;
-        octPlane.setNormalAndPoint(worldPlanes[i].getNormal(), evalCoordf(worldPlanes[i].getPoint(), ROOT_DEPTH));
-        selector.frustum[i] = Coord4f(octPlane.getNormal(), octPlane.getDCoefficient());
+    if (frustum.isPerspective()) {
+        PerspectiveSelector selector;
+        for (int i = 0; i < ViewFrustum::NUM_PLANES; i++) {
+            ::Plane octPlane;
+            octPlane.setNormalAndPoint(worldPlanes[i].getNormal(), evalCoordf(worldPlanes[i].getPoint(), ROOT_DEPTH));
+            selector.frustum[i] = Coord4f(octPlane.getNormal(), octPlane.getDCoefficient());
+        }
+
+        selector.eyePos = evalCoordf(frustum.getPosition(), ROOT_DEPTH);
+        selector.setAngle(threshold);
+
+        return Octree::select(selection, selector);
+    } else {
+        OrthographicSelector selector;
+        for (int i = 0; i < ViewFrustum::NUM_PLANES; i++) {
+            ::Plane octPlane;
+            octPlane.setNormalAndPoint(worldPlanes[i].getNormal(), evalCoordf(worldPlanes[i].getPoint(), ROOT_DEPTH));
+            selector.frustum[i] = Coord4f(octPlane.getNormal(), octPlane.getDCoefficient());
+        }
+
+        // Divide the threshold (which is in world distance units) by the dimension of the octree
+        // as all further computations will be done in normalized octree units
+        threshold *= getInvCellWidth(ROOT_DEPTH);
+        selector.setSize(threshold);
+
+        return Octree::select(selection, selector);
     }
-
-    selector.eyePos = evalCoordf(frustum.getPosition(), ROOT_DEPTH);
-    selector.setAngle(glm::radians(lodAngle));
-
-    return Octree::select(selection, selector);
 }
 
-int ItemSpatialTree::selectCellItems(ItemSelection& selection, const ItemFilter& filter, const ViewFrustum& frustum, float lodAngle) const {
-    selectCells(selection.cellSelection, frustum, lodAngle);
+int ItemSpatialTree::selectCellItems(ItemSelection& selection, const ItemFilter& filter, const ViewFrustum& frustum, 
+                                     float threshold) const {
+    selectCells(selection.cellSelection, frustum, threshold);
 
     // Just grab the items in every selected bricks
     for (auto brickId : selection.cellSelection.insideBricks) {
diff --git a/libraries/render/src/render/SpatialTree.h b/libraries/render/src/render/SpatialTree.h
index a89b9847e6..b06053344d 100644
--- a/libraries/render/src/render/SpatialTree.h
+++ b/libraries/render/src/render/SpatialTree.h
@@ -312,23 +312,27 @@ namespace render {
         class FrustumSelector {
         public:
             Coord4f frustum[6];
+            
+            virtual ~FrustumSelector() {}
+            virtual float testThreshold(const Coord3f& point, float size) const = 0;
+        };
+
+        class PerspectiveSelector : public FrustumSelector {
+        public:
             Coord3f eyePos;
             float   angle;
             float   squareTanAlpha;
 
-            const float MAX_LOD_ANGLE = glm::radians(45.0f);
-            const float MIN_LOD_ANGLE = glm::radians(1.0f / 60.0f);
+            void setAngle(float a);
+            float testThreshold(const Coord3f& point, float size) const override;
+        };
 
-            void setAngle(float a) {
-                angle = std::max(MIN_LOD_ANGLE, std::min(MAX_LOD_ANGLE, a));
-                auto tanAlpha = tan(angle);
-                squareTanAlpha = (float)(tanAlpha * tanAlpha);
-            }
+        class OrthographicSelector : public FrustumSelector {
+        public:
+            float   squareMinSize;
 
-            float testSolidAngle(const Coord3f& point, float size) const {
-                auto eyeToPoint = point - eyePos;
-                return (size * size / glm::dot(eyeToPoint, eyeToPoint)) - squareTanAlpha;
-            }
+            void setSize(float a) { squareMinSize = a * a; }
+            float testThreshold(const Coord3f& point, float size) const override;
         };
 
         int select(CellSelection& selection, const FrustumSelector& selector) const;
@@ -443,7 +447,7 @@ namespace render {
         Index resetItem(Index oldCell, const ItemKey& oldKey, const AABox& bound, const ItemID& item, ItemKey& newKey);
 
         // Selection and traverse
-        int selectCells(CellSelection& selection, const ViewFrustum& frustum, float lodAngle) const;
+        int selectCells(CellSelection& selection, const ViewFrustum& frustum, float threshold) const;
 
         class ItemSelection {
         public:
@@ -469,7 +473,8 @@ namespace render {
             }
         };
 
-        int selectCellItems(ItemSelection& selection, const ItemFilter& filter, const ViewFrustum& frustum, float lodAngle) const;
+        int selectCellItems(ItemSelection& selection, const ItemFilter& filter, const ViewFrustum& frustum, 
+                            float threshold) const;
     };
 }
 
diff --git a/libraries/shared/src/ViewFrustum.cpp b/libraries/shared/src/ViewFrustum.cpp
index 5b016d4e91..0f98e8020c 100644
--- a/libraries/shared/src/ViewFrustum.cpp
+++ b/libraries/shared/src/ViewFrustum.cpp
@@ -847,3 +847,7 @@ void ViewFrustum::tesselateSides(const glm::vec3 points[8], Triangle triangles[8
         triangle.v2 = points[vertexIndices[2]];
     }
 }
+
+bool ViewFrustum::isPerspective() const {
+    return _projection[3][2] != 0.0f && _projection[2][3] != 0.0f && _projection[3][3] == 0.0f;
+}
diff --git a/libraries/shared/src/ViewFrustum.h b/libraries/shared/src/ViewFrustum.h
index b55fe8b327..859b5c49c5 100644
--- a/libraries/shared/src/ViewFrustum.h
+++ b/libraries/shared/src/ViewFrustum.h
@@ -49,6 +49,7 @@ public:
     // setters for lens attributes
     void setProjection(const glm::mat4 & projection);
     void setFocalLength(float focalLength) { _focalLength = focalLength; }
+    bool isPerspective() const;
 
     // getters for lens attributes
     const glm::mat4& getProjection() const { return _projection; }

From 1f4671ba175547f00ccce78b30627bba9de321b6 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 2 Feb 2018 11:09:28 +0100
Subject: [PATCH 064/569] Cleaned up orthographic shadow culling functor

---
 interface/src/SecondaryCamera.cpp             |  2 +-
 .../render-utils/src/RenderShadowTask.cpp     | 25 ++++++++++---------
 libraries/render-utils/src/RenderShadowTask.h | 20 ++++++++++++---
 libraries/render-utils/src/RenderViewTask.cpp |  8 +-----
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/interface/src/SecondaryCamera.cpp b/interface/src/SecondaryCamera.cpp
index 5db34c9441..c4199f15b2 100644
--- a/interface/src/SecondaryCamera.cpp
+++ b/interface/src/SecondaryCamera.cpp
@@ -19,7 +19,7 @@
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
 void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {
-    task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
+    task.addJob<RenderShadowTask>("RenderShadowTask");
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
     if (!isDeferred) {
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index b576bf774c..da7f6d97fa 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -200,8 +200,10 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
     });
 }
 
-void RenderShadowTask::build(JobModel& task, const render::Varying& input, render::Varying& output, CullFunctor cullFunctor) {
-    cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&) { return true; };
+void RenderShadowTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
+    ::CullFunctor cullFunctor = [this](const RenderArgs* args, const AABox& bounds) {
+        return _cullFunctor(args, bounds);
+    };
 
     // Prepare the ShapePipeline
     ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
@@ -229,7 +231,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
         char jobName[64];
         sprintf(jobName, "ShadowCascadeSetup%d", i);
-        const auto shadowFilter = task.addJob<RenderShadowCascadeSetup>(jobName, i);
+        const auto shadowFilter = task.addJob<RenderShadowCascadeSetup>(jobName, i, _cullFunctor);
 
         // CPU jobs: finer grained culling
         const auto cullInputs = CullShapeBounds::Inputs(sortedShapes, shadowFilter).asVarying();
@@ -281,8 +283,7 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
     RenderArgs* args = renderContext->args;
 
     output.edit0() = args->_renderMode;
-    output.edit1() = args->_sizeScale;
-    output.edit2() = glm::ivec2(0, 0);
+    output.edit1() = glm::ivec2(0, 0);
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow) {
@@ -347,7 +348,7 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
         glm::ivec2 queryResolution = firstCascade.framebuffer->getSize();
         queryResolution.x = int(queryResolution.x * _coarseShadowFrustum->getWidth() / firstCascadeFrustum->getWidth());
         queryResolution.y = int(queryResolution.y * _coarseShadowFrustum->getHeight() / firstCascadeFrustum->getHeight());
-        output.edit2() = queryResolution;
+        output.edit1() = queryResolution;
     }
 }
 
@@ -365,11 +366,12 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
         auto& cascade = globalShadow->getCascade(_cascadeIndex);
         auto& cascadeFrustum = cascade.getFrustum();
         args->pushViewFrustum(*cascadeFrustum);
-        // Set the cull threshold to 2 shadow texels.
-        auto texelSize = glm::max(cascadeFrustum->getHeight(), cascadeFrustum->getWidth()) / cascade.framebuffer->getSize().x;
-        texelSize *= 2.0f;
-        // SizeScale is used in the shadow cull function defined ine RenderViewTask
-        args->_sizeScale = texelSize * texelSize;
+        auto texelSize = glm::min(cascadeFrustum->getHeight(), cascadeFrustum->getWidth()) / cascade.framebuffer->getSize().x;
+        // Set the cull threshold to 16 shadow texels.
+        const auto minTexelCount = 16.0f;
+        // TODO : maybe adapt that with LOD management system?
+        texelSize *= minTexelCount;
+        _cullFunctor._minSquareSize = texelSize * texelSize;
     } else {
         output = ItemFilter::Builder::nothing();
     }
@@ -393,5 +395,4 @@ void RenderShadowTeardown::run(const render::RenderContextPointer& renderContext
     assert(args->hasViewFrustum());
     // Reset the render args
     args->_renderMode = input.get0();
-    args->_sizeScale = input.get1();
 }
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index ce4c3047d8..15651354f1 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -50,9 +50,22 @@ public:
     using JobModel = render::Task::Model<RenderShadowTask, Config>;
 
     RenderShadowTask() {}
-    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor shouldRender);
+    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
 
     void configure(const Config& configuration);
+
+    struct CullFunctor {
+        float _minSquareSize{ 0.0f };
+
+        bool operator()(const RenderArgs* args, const AABox& bounds) const {
+            // Cull only objects that are too small relatively to shadow frustum
+            const auto boundsSquareRadius = glm::dot(bounds.getDimensions(), bounds.getDimensions());
+            return boundsSquareRadius > _minSquareSize;
+        }
+    };
+
+    CullFunctor _cullFunctor;
+
 };
 
 class RenderShadowSetupConfig : public render::Job::Config {
@@ -82,7 +95,7 @@ signals:
 
 class RenderShadowSetup {
 public:
-    using Outputs = render::VaryingSet3<RenderArgs::RenderMode, float, glm::ivec2>;
+    using Outputs = render::VaryingSet2<RenderArgs::RenderMode, glm::ivec2>;
     using Config = RenderShadowSetupConfig;
     using JobModel = render::Job::ModelO<RenderShadowSetup, Outputs, Config>;
 
@@ -107,12 +120,13 @@ public:
     using Outputs = render::ItemFilter;
     using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs>;
 
-    RenderShadowCascadeSetup(unsigned int cascadeIndex) : _cascadeIndex{ cascadeIndex } {}
+    RenderShadowCascadeSetup(unsigned int cascadeIndex, RenderShadowTask::CullFunctor& cullFunctor) : _cascadeIndex{ cascadeIndex }, _cullFunctor{ cullFunctor } {}
     void run(const render::RenderContextPointer& renderContext, Outputs& output);
 
 private:
 
     unsigned int _cascadeIndex;
+    RenderShadowTask::CullFunctor& _cullFunctor;
 };
 
 class RenderShadowCascadeTeardown {
diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp
index c2e43582cd..68585ac437 100644
--- a/libraries/render-utils/src/RenderViewTask.cpp
+++ b/libraries/render-utils/src/RenderViewTask.cpp
@@ -17,13 +17,7 @@
 void RenderViewTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, bool isDeferred) {
    // auto items = input.get<Input>();
 
-    // Shadows use an orthographic projection because they are linked to sunlights
-    // but the cullFunctor passed is probably tailored for perspective projection and culls too much.
-    task.addJob<RenderShadowTask>("RenderShadowTask", [](const RenderArgs* args, const AABox& bounds) {
-        // Cull only objects that are too small relatively to shadow frustum
-        const auto boundsSquareRadius = glm::dot(bounds.getDimensions(), bounds.getDimensions());
-        return boundsSquareRadius > args->_sizeScale;
-    });
+    task.addJob<RenderShadowTask>("RenderShadowTask");
 
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
     assert(items.canCast<RenderFetchCullSortTask::Output>());

From 234cb1e3e612a1fe4b19ac516840b771a020f0da Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 2 Feb 2018 12:15:43 +0100
Subject: [PATCH 065/569] Added anti frustum test to remove lower cascade
 objects from higher shadow cascades

---
 .../render-utils/src/RenderShadowTask.cpp     | 24 ++++++++++---
 libraries/render-utils/src/RenderShadowTask.h |  2 +-
 libraries/render/src/render/CullTask.cpp      | 36 ++++++++++++++-----
 libraries/render/src/render/CullTask.h        |  2 +-
 libraries/shared/src/ViewFrustum.cpp          | 12 +++++++
 libraries/shared/src/ViewFrustum.h            |  1 +
 6 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index da7f6d97fa..829c0fbcf2 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -228,13 +228,26 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadow", shadowItems);
     const auto sortedShapes = task.addJob<DepthSortShapes>("DepthSortShadow", sortedPipelines, true);
 
+    render::Varying cascadeFrustums[SHADOW_CASCADE_MAX_COUNT] = {
+        ViewFrustumPointer(),
+        ViewFrustumPointer(),
+        ViewFrustumPointer(),
+        ViewFrustumPointer()
+    };
+
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
         char jobName[64];
         sprintf(jobName, "ShadowCascadeSetup%d", i);
-        const auto shadowFilter = task.addJob<RenderShadowCascadeSetup>(jobName, i, _cullFunctor);
+        const auto cascadeSetupOutput = task.addJob<RenderShadowCascadeSetup>(jobName, i, _cullFunctor);
+        const auto shadowFilter = cascadeSetupOutput.getN<RenderShadowCascadeSetup::Outputs>(0);
+        auto antiFrustum = render::Varying(ViewFrustumPointer());
+        cascadeFrustums[i] = cascadeSetupOutput.getN<RenderShadowCascadeSetup::Outputs>(1);
+        if (i > 1) {
+            antiFrustum = cascadeFrustums[i - 2];
+        }
 
         // CPU jobs: finer grained culling
-        const auto cullInputs = CullShapeBounds::Inputs(sortedShapes, shadowFilter).asVarying();
+        const auto cullInputs = CullShapeBounds::Inputs(sortedShapes, shadowFilter, antiFrustum).asVarying();
         const auto culledShadowItemsAndBounds = task.addJob<CullShapeBounds>("CullShadowCascade", cullInputs, cullFunctor, RenderDetails::SHADOW);
 
         // GPU jobs: Render to shadow map
@@ -360,7 +373,7 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
+        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
 
         // Set the keylight render args
         auto& cascade = globalShadow->getCascade(_cascadeIndex);
@@ -372,8 +385,11 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
         // TODO : maybe adapt that with LOD management system?
         texelSize *= minTexelCount;
         _cullFunctor._minSquareSize = texelSize * texelSize;
+
+        output.edit1() = cascadeFrustum;
     } else {
-        output = ItemFilter::Builder::nothing();
+        output.edit0() = ItemFilter::Builder::nothing();
+        output.edit1() = ViewFrustumPointer();
     }
 }
 
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 15651354f1..975f755a48 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -117,7 +117,7 @@ private:
 
 class RenderShadowCascadeSetup {
 public:
-    using Outputs = render::ItemFilter;
+    using Outputs = render::VaryingSet2<render::ItemFilter, ViewFrustumPointer>;
     using JobModel = render::Job::ModelO<RenderShadowCascadeSetup, Outputs>;
 
     RenderShadowCascadeSetup(unsigned int cascadeIndex, RenderShadowTask::CullFunctor& cullFunctor) : _cascadeIndex{ cascadeIndex }, _cullFunctor{ cullFunctor } {}
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index b3efc4f1a8..633465dba3 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -24,13 +24,15 @@ struct Test {
     CullFunctor _functor;
     RenderArgs* _args;
     RenderDetails::Item& _renderDetails;
+    ViewFrustumPointer _antiFrustum;
     glm::vec3 _eyePos;
     float _squareTanAlpha;
 
-    Test(CullFunctor& functor, RenderArgs* pargs, RenderDetails::Item& renderDetails) :
+    Test(CullFunctor& functor, RenderArgs* pargs, RenderDetails::Item& renderDetails, ViewFrustumPointer antiFrustum = nullptr) :
         _functor(functor),
         _args(pargs),
-        _renderDetails(renderDetails) {
+        _renderDetails(renderDetails),
+        _antiFrustum(antiFrustum) {
         // FIXME: Keep this code here even though we don't use it yet
         /*_eyePos = _args->getViewFrustum().getPosition();
         float a = glm::degrees(Octree::getPerspectiveAccuracyAngle(_args->_sizeScale, _args->_boundaryLevelAdjust));
@@ -49,6 +51,15 @@ struct Test {
         return true;
     }
 
+    bool antiFrustumTest(const AABox& bound) {
+        assert(_antiFrustum);
+        if (_antiFrustum->boxInsideFrustum(bound)) {
+            _renderDetails._outOfView++;
+            return false;
+        }
+        return true;
+    }
+
     bool solidAngleTest(const AABox& bound) {
         // FIXME: Keep this code here even though we don't use it yet
         //auto eyeToPoint = bound.calcCenter() - _eyePos;
@@ -331,6 +342,7 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
 
     const auto& inShapes = inputs.get0();
     const auto& filter = inputs.get1();
+    const auto& antiFrustum = inputs.get2();
     auto& outShapes = outputs.edit0();
     auto& outBounds = outputs.edit1();
 
@@ -339,7 +351,7 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
 
     if (!filter.selectsNothing()) {
         auto& details = args->_details.edit(_detailType);
-        Test test(_cullFunctor, args, details);
+        Test test(_cullFunctor, args, details, antiFrustum);
 
         for (auto& inItems : inShapes) {
             auto key = inItems.first;
@@ -351,13 +363,21 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
 
             details._considered += (int)inItems.second.size();
 
-            for (auto& item : inItems.second) {
-                if (test.frustumTest(item.bound) && test.solidAngleTest(item.bound)) {
-                    outItems->second.emplace_back(item);
-                    outBounds += item.bound;
+            if (antiFrustum == nullptr) {
+                for (auto& item : inItems.second) {
+                    if (test.solidAngleTest(item.bound) && test.frustumTest(item.bound)) {
+                        outItems->second.emplace_back(item);
+                        outBounds += item.bound;
+                    }
+                }
+            } else {
+                for (auto& item : inItems.second) {
+                    if (test.solidAngleTest(item.bound) && test.frustumTest(item.bound) && test.antiFrustumTest(item.bound)) {
+                        outItems->second.emplace_back(item);
+                        outBounds += item.bound;
+                    }
                 }
             }
-
             details._rendered += (int)outItems->second.size();
         }
 
diff --git a/libraries/render/src/render/CullTask.h b/libraries/render/src/render/CullTask.h
index 53d46d11b4..a9695d6281 100644
--- a/libraries/render/src/render/CullTask.h
+++ b/libraries/render/src/render/CullTask.h
@@ -110,7 +110,7 @@ namespace render {
 
     class CullShapeBounds {
     public:
-        using Inputs = render::VaryingSet2<ShapeBounds, ItemFilter>;
+        using Inputs = render::VaryingSet3<ShapeBounds, ItemFilter, ViewFrustumPointer>;
         using Outputs = render::VaryingSet2<ShapeBounds, AABox>;
         using JobModel = Job::ModelIO<CullShapeBounds, Inputs, Outputs>;
 
diff --git a/libraries/shared/src/ViewFrustum.cpp b/libraries/shared/src/ViewFrustum.cpp
index 0f98e8020c..2a2eebc0a7 100644
--- a/libraries/shared/src/ViewFrustum.cpp
+++ b/libraries/shared/src/ViewFrustum.cpp
@@ -280,6 +280,18 @@ bool ViewFrustum::boxIntersectsFrustum(const AABox& box) const {
     return true;
 }
 
+bool ViewFrustum::boxInsideFrustum(const AABox& box) const {
+    // only check against frustum
+    for (int i = 0; i < NUM_FRUSTUM_PLANES; i++) {
+        const glm::vec3& normal = _planes[i].getNormal();
+        // check distance to nearest box point
+        if (_planes[i].distance(box.getNearestVertex(normal)) < 0.0f) {
+            return false;
+        }
+    }
+    return true;
+}
+
 bool ViewFrustum::sphereIntersectsKeyhole(const glm::vec3& center, float radius) const {
     // check positive touch against central sphere
     if (glm::length(center - _position) <= (radius + _centerSphereRadius)) {
diff --git a/libraries/shared/src/ViewFrustum.h b/libraries/shared/src/ViewFrustum.h
index 859b5c49c5..981aabe70c 100644
--- a/libraries/shared/src/ViewFrustum.h
+++ b/libraries/shared/src/ViewFrustum.h
@@ -104,6 +104,7 @@ public:
     bool sphereIntersectsFrustum(const glm::vec3& center, float radius) const;
     bool cubeIntersectsFrustum(const AACube& box) const;
     bool boxIntersectsFrustum(const AABox& box) const;
+    bool boxInsideFrustum(const AABox& box) const;
 
     bool sphereIntersectsKeyhole(const glm::vec3& center, float radius) const;
     bool cubeIntersectsKeyhole(const AACube& cube) const;

From e9747e9d85336baa56c12f664aa0dcda54ee2e6b Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 2 Feb 2018 15:06:22 +0100
Subject: [PATCH 066/569] Small optimisations in shadow shader

---
 libraries/render-utils/src/RenderShadowTask.cpp | 4 ++--
 libraries/render-utils/src/RenderShadowTask.h   | 8 ++++----
 libraries/render-utils/src/Shadow.slh           | 2 +-
 libraries/render-utils/src/ShadowCore.slh       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 829c0fbcf2..f3797edc11 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -380,8 +380,8 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
         auto& cascadeFrustum = cascade.getFrustum();
         args->pushViewFrustum(*cascadeFrustum);
         auto texelSize = glm::min(cascadeFrustum->getHeight(), cascadeFrustum->getWidth()) / cascade.framebuffer->getSize().x;
-        // Set the cull threshold to 16 shadow texels.
-        const auto minTexelCount = 16.0f;
+        // Set the cull threshold to 24 shadow texels. This is totally arbitrary
+        const auto minTexelCount = 24.0f;
         // TODO : maybe adapt that with LOD management system?
         texelSize *= minTexelCount;
         _cullFunctor._minSquareSize = texelSize * texelSize;
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 975f755a48..87d78ffe51 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -82,12 +82,12 @@ public:
 
     float constantBias0{ 0.15f };
     float constantBias1{ 0.15f };
-    float constantBias2{ 0.15f };
-    float constantBias3{ 0.15f };
+    float constantBias2{ 0.175f };
+    float constantBias3{ 0.2f };
     float slopeBias0{ 0.6f };
     float slopeBias1{ 0.6f };
-    float slopeBias2{ 0.6f };
-    float slopeBias3{ 0.6f };
+    float slopeBias2{ 0.7f };
+    float slopeBias3{ 0.82f };
 
 signals:
     void dirty();
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index e87519b5f4..abb04a4498 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -89,7 +89,7 @@ float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets
 
 float evalShadowAttenuation(vec3 worldLightDir, vec4 worldPosition, float viewDepth, vec3 worldNormal) {
     ShadowSampleOffsets offsets = evalShadowFilterOffsets(worldPosition);
-    vec4 cascadeShadowCoords[2];
+    vec4 cascadeShadowCoords[2] = { vec4(0), vec4(0) };
     ivec2 cascadeIndices;
     float cascadeMix = determineShadowCascadesOnPixel(worldPosition, viewDepth, cascadeShadowCoords, cascadeIndices);
 	
diff --git a/libraries/render-utils/src/ShadowCore.slh b/libraries/render-utils/src/ShadowCore.slh
index e49e8d638f..a787c54ca0 100644
--- a/libraries/render-utils/src/ShadowCore.slh
+++ b/libraries/render-utils/src/ShadowCore.slh
@@ -82,10 +82,10 @@ float evalShadowCascadeWeight(vec4 cascadeTexCoords) {
 float determineShadowCascadesOnPixel(vec4 worldPosition, float viewDepth, out vec4 cascadeShadowCoords[2], out ivec2 cascadeIndices) {
     cascadeIndices.x = getFirstShadowCascadeOnPixel(0, worldPosition, cascadeShadowCoords[0]);
     cascadeIndices.y = cascadeIndices.x+1;
-    if (cascadeIndices.x < (getShadowCascadeCount()-1)) {
+    float firstCascadeWeight = evalShadowCascadeWeight(cascadeShadowCoords[0]);
+    if (firstCascadeWeight<1.0 && cascadeIndices.x < (getShadowCascadeCount()-1)) {
         cascadeIndices.y = getFirstShadowCascadeOnPixel(cascadeIndices.y, worldPosition, cascadeShadowCoords[1]);
 
-        float firstCascadeWeight = evalShadowCascadeWeight(cascadeShadowCoords[0]);
         float secondCascadeWeight = evalShadowCascadeWeight(cascadeShadowCoords[1]);
         // Returns the mix amount between first and second cascade.
         return ((1.0-firstCascadeWeight) * secondCascadeWeight) / (firstCascadeWeight + secondCascadeWeight);

From 8a011036ef4f9be5b5412936a3f0cfe6a0de208b Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 2 Feb 2018 18:07:35 +0100
Subject: [PATCH 067/569] Removed warnings on mac and ubuntu

---
 libraries/render-utils/src/LightStage.cpp | 2 --
 libraries/render/src/render/CullTask.cpp  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
index 259d0dd665..854ff71e20 100644
--- a/libraries/render-utils/src/LightStage.cpp
+++ b/libraries/render-utils/src/LightStage.cpp
@@ -208,8 +208,6 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum,
 
     // Position the keylight frustum
     auto position = viewFrustum.getPosition() - (nearDepth + farDepth)*lightDirection;
-    // Update the buffer
-    auto& schema = _schemaBuffer.edit<Schema>();
     for (auto& cascade : _cascades) {
         cascade._frustum->setOrientation(orientation);
         cascade._frustum->setPosition(position);
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 633465dba3..c745220ab8 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -390,7 +390,6 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
 void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
                                const Inputs& inputs, ItemBounds& outItems) {
     assert(renderContext->args);
-    RenderArgs* args = renderContext->args;
     auto& scene = renderContext->_scene;
     auto& inSelection = inputs.get0();
 

From 3a7290c3ede88e7e402c1547d6133621c19c62fa Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Mon, 8 Jan 2018 12:15:13 -0800
Subject: [PATCH 068/569] starting 2d image entity type

---
 libraries/entities/src/EntityTypes.h       |  1 +
 libraries/entities/src/FlatImageEntity.cpp | 74 ++++++++++++++++++++++
 libraries/entities/src/FlatImageEntity.h   | 41 ++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 libraries/entities/src/FlatImageEntity.cpp
 create mode 100644 libraries/entities/src/FlatImageEntity.h

diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index 316bf2b813..dac36f28dd 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -49,6 +49,7 @@ public:
         PolyVox,
         PolyLine,
         Shape,
+        Image,
         LAST = Shape
     } EntityType;
 
diff --git a/libraries/entities/src/FlatImageEntity.cpp b/libraries/entities/src/FlatImageEntity.cpp
new file mode 100644
index 0000000000..9eb3f64bcb
--- /dev/null
+++ b/libraries/entities/src/FlatImageEntity.cpp
@@ -0,0 +1,74 @@
+//
+//  FlatImageEntity.cpp
+//  libraries/entities/src
+//
+//  Created by Elisa Lupin-Jimenez on 1/3/18.
+//  Copyright 2018 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 <QtCore/QJsonDocument>
+
+#include <ByteCountCoding.h>
+#include <GLMHelpers.h>
+#include <glm/gtx/transform.hpp>
+#include <GeometryUtil.h>
+
+#include "EntitiesLogging.h"
+#include "EntityItemProperties.h"
+#include "EntityTree.h"
+#include "EntityTreeElement.h"
+#include "ResourceCache.h"
+#include "ShapeEntityItem.h"
+#include "FlatImageEntity.h"
+
+const QString FlatImageEntity::DEFAULT_IMAGE_URL = QString("");
+
+EntityItemPointer FlatImageEntity::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
+    EntityItemPointer entity(new FlatImageEntity(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+    entity->setProperties(properties);
+    return entity;
+}
+
+FlatImageEntity::FlatImageEntity(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
+    _type = EntityTypes::Image;
+}
+
+EntityItemProperties FlatImageEntity::getProperties(EntityPropertyFlags desiredProperties) const {
+    EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
+    properties.setShape("Image");
+    return properties;
+}
+
+bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
+    bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
+
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
+
+    if (somethingChanged) {
+        bool wantDebug = false;
+        if (wantDebug) {
+            uint64_t now = usecTimestampNow();
+            int elapsed = now - getLastEdited();
+            qCDebug(entities) << "FlatImageEntity::setProperties() AFTER update... edited AGO=" << elapsed <<
+                "now=" << now << " getLastEdited()=" << getLastEdited();
+        }
+        setLastEdited(properties.getLastEdited());
+    }
+    return somethingChanged;
+}
+
+void FlatImageEntity::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
+    EntityPropertyFlags& requestedProperties,
+    EntityPropertyFlags& propertyFlags,
+    EntityPropertyFlags& propertiesDidntFit,
+    int& propertyCount,
+    OctreeElement::AppendState& appendState) const {
+
+    bool successPropertyFits = true;
+    APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
+}
+
diff --git a/libraries/entities/src/FlatImageEntity.h b/libraries/entities/src/FlatImageEntity.h
new file mode 100644
index 0000000000..08c13f8f9f
--- /dev/null
+++ b/libraries/entities/src/FlatImageEntity.h
@@ -0,0 +1,41 @@
+//
+//  FlatImageEntity.h
+//  libraries/entities/src
+//
+//  Created by Elisa Lupin-Jimenez on 1/3/18.
+//  Copyright 2018 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_FlatImageEntity_h
+#define hifi_FlatImageEntity_h
+
+#include "EntityItem.h"
+
+class FlatImageEntity : public EntityItem {
+public:
+    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
+
+    FlatImageEntity(const EntityItemID& entityItemID);
+
+    ALLOW_INSTANTIATION // This class can be instantiated
+
+    // methods for getting/setting all properties of an entity
+    virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
+    virtual bool setProperties(const EntityItemProperties& properties) override;
+
+    virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
+        EntityPropertyFlags& requestedProperties,
+        EntityPropertyFlags& propertyFlags,
+        EntityPropertyFlags& propertiesDidntFit,
+        int& propertyCount,
+        OctreeElement::AppendState& appendState) const override;
+
+    static const QString DEFAULT_IMAGE_URL;
+
+};
+
+#endif // hifi_FlatImageEntity_h

From fdca8ab93eef09e21af8883e20b5072441300b80 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 9 Jan 2018 17:46:24 -0800
Subject: [PATCH 069/569] added image button to edit.js, working on connecting
 to cpp

---
 .../resources/qml/hifi/tablet/EditTabView.qml | 12 ++++++
 .../entities/src/EntityItemProperties.cpp     |  4 ++
 libraries/entities/src/EntityItemProperties.h |  1 +
 libraries/entities/src/EntityPropertyFlags.h  |  3 ++
 libraries/entities/src/EntityTypes.cpp        |  1 +
 libraries/entities/src/EntityTypes.h          |  2 +-
 libraries/entities/src/FlatImageEntity.cpp    | 43 +++++++++++++++++--
 libraries/entities/src/FlatImageEntity.h      | 12 ++++++
 scripts/system/edit.js                        | 14 +++++-
 9 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index e94325f399..482469d355 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -101,6 +101,18 @@ TabView {
                     }
                 }
 
+                // for image
+                NewEntityButton {
+                    icon: "icons/create-icons/25-web-1-01.svg"
+                    text: "IMAGE"
+                    onClicked: {
+                        editRoot.sendToScript({
+                            method: "newEntityButtonClicked", params: { buttonName: "newImageButton" }
+                        });
+                        editTabView.currentIndex = 2
+                    }
+                }
+
                 NewEntityButton {
                     icon: "icons/create-icons/25-web-1-01.svg"
                     text: "WEB"
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index e2a5ddf8b5..a1c51b650f 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1369,6 +1369,10 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_DPI, properties.getDPI());
             }
 
+            if (properties.getType() == EntityTypes::Image) {
+                APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, properties.getImageURL());
+            }
+
             if (properties.getType() == EntityTypes::Text) {
                 APPEND_ENTITY_PROPERTY(PROP_TEXT, properties.getText());
                 APPEND_ENTITY_PROPERTY(PROP_LINE_HEIGHT, properties.getLineHeight());
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 3e0770f386..5bd6836336 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -194,6 +194,7 @@ public:
     DEFINE_PROPERTY_GROUP(Haze, haze, HazePropertyGroup);
     DEFINE_PROPERTY_GROUP(Animation, animation, AnimationPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString, "");
+    DEFINE_PROPERTY_REF(PROP_IMAGE_URL, ImageURL, imageURL, QString, "");
     DEFINE_PROPERTY(PROP_LINE_WIDTH, LineWidth, lineWidth, float, LineEntityItem::DEFAULT_LINE_WIDTH);
     DEFINE_PROPERTY_REF(LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, QVector<glm::vec3>());
     DEFINE_PROPERTY_REF(PROP_HREF, Href, href, QString, "");
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 90438ab01c..4768ebed86 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -42,6 +42,9 @@ enum EntityPropertyList {
     PROP_ANIMATION_ALLOW_TRANSLATION,
     PROP_RELAY_PARENT_JOINTS,
 
+    // for image
+    PROP_IMAGE_URL,
+
     // these properties are supported by the EntityItem base class
     PROP_REGISTRATION_POINT,
     PROP_ANGULAR_VELOCITY,
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index cb17c28fd7..e53b9d02f6 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -89,6 +89,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
     EntityItemPointer newEntityItem = NULL;
     EntityTypeFactory factory = NULL;
     if (entityType >= 0 && entityType <= LAST) {
+        qCDebug(entities) << "type: " << entityType;
         factory = _factories[entityType];
     }
     if (factory) {
diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index dac36f28dd..8d986c8090 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -48,8 +48,8 @@ public:
         Line,
         PolyVox,
         PolyLine,
-        Shape,
         Image,
+        Shape,
         LAST = Shape
     } EntityType;
 
diff --git a/libraries/entities/src/FlatImageEntity.cpp b/libraries/entities/src/FlatImageEntity.cpp
index 9eb3f64bcb..66a5702747 100644
--- a/libraries/entities/src/FlatImageEntity.cpp
+++ b/libraries/entities/src/FlatImageEntity.cpp
@@ -38,14 +38,14 @@ FlatImageEntity::FlatImageEntity(const EntityItemID& entityItemID) : EntityItem(
 
 EntityItemProperties FlatImageEntity::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
-    properties.setShape("Image");
+    properties.setShape("Quad");
     return properties;
 }
 
 bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
+    //SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -60,6 +60,13 @@ bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
     return somethingChanged;
 }
 
+// TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
+EntityPropertyFlags FlatImageEntity::getEntityProperties(EncodeBitstreamParams& params) const {
+    EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
+
+    return requestedProperties;
+}
+
 void FlatImageEntity::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
     EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
     EntityPropertyFlags& requestedProperties,
@@ -69,6 +76,36 @@ void FlatImageEntity::appendSubclassData(OctreePacketData* packetData, EncodeBit
     OctreeElement::AppendState& appendState) const {
 
     bool successPropertyFits = true;
-    APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
+    // Using "Quad" shape as defined in ShapeEntityItem.cpp
+    APPEND_ENTITY_PROPERTY(PROP_SHAPE, "Quad");
+}
+
+int FlatImageEntity::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+    ReadBitstreamToTreeParams& args,
+    EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+    bool& somethingChanged) {
+
+    int bytesRead = 0;
+    const unsigned char* dataAt = data;
+
+    return bytesRead;
+}
+
+void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
+    const float MAX_FLAT_DIMENSION = 0.0001f;
+    if (value.y > MAX_FLAT_DIMENSION) {
+        // enforce flatness in Y
+        glm::vec3 newDimensions = value;
+        newDimensions.y = MAX_FLAT_DIMENSION;
+        EntityItem::setUnscaledDimensions(newDimensions);
+    } else {
+        EntityItem::setUnscaledDimensions(value);
+    }
+}
+
+QString FlatImageEntity::getImageURL() const {
+    return resultWithReadLock<QString>([&] {
+        return _imageURL;
+    });
 }
 
diff --git a/libraries/entities/src/FlatImageEntity.h b/libraries/entities/src/FlatImageEntity.h
index 08c13f8f9f..4dd91b1215 100644
--- a/libraries/entities/src/FlatImageEntity.h
+++ b/libraries/entities/src/FlatImageEntity.h
@@ -26,6 +26,8 @@ public:
     virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
     virtual bool setProperties(const EntityItemProperties& properties) override;
 
+    EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
+
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
         EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
         EntityPropertyFlags& requestedProperties,
@@ -34,7 +36,17 @@ public:
         int& propertyCount,
         OctreeElement::AppendState& appendState) const override;
 
+    int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+        ReadBitstreamToTreeParams& args,
+        EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+        bool& somethingChanged) override;
+
+
     static const QString DEFAULT_IMAGE_URL;
+    QString getImageURL() const;
+
+protected:
+    QString _imageURL;
 
 };
 
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 863c185cb4..4241468de1 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -251,7 +251,8 @@ var toolBar = (function () {
             // Align entity with Avatar orientation.
             properties.rotation = MyAvatar.orientation;
             
-            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
+            // added image here
+            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Image", "Web"];
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
                     
                 // Adjust position of entity per bounding box prior to creating it.
@@ -286,6 +287,7 @@ var toolBar = (function () {
                 properties.userData = JSON.stringify({ grabbableKey: { grabbable: false } });
             }
 
+            print("properties.type: " + properties.type);
             entityID = Entities.addEntity(properties);
 
             if (properties.type === "ParticleEffect") {
@@ -538,6 +540,16 @@ var toolBar = (function () {
             });
         });
 
+        // for image button
+        addButton("newImageButton", "web-01.svg", function () {
+            print("new image message is received");
+            createNewEntity({
+                type: "Image",
+                dimensions: DEFAULT_DIMENSIONS,
+                sourceUrl: "https://highfidelity.com/"
+            });
+        });
+
         addButton("newWebButton", "web-01.svg", function () {
             createNewEntity({
                 type: "Web",

From fc0e87d5eaa13cf7c97a1ab2ab8a8eac264576d5 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 10 Jan 2018 17:08:55 -0800
Subject: [PATCH 070/569] more infrastructure links

---
 .../entities/src/EntityItemProperties.cpp     |  9 ++++
 .../entities/src/EntityScriptingInterface.cpp |  2 +
 libraries/entities/src/EntityTree.cpp         |  1 +
 libraries/entities/src/EntityTypes.cpp        |  4 +-
 ...latImageEntity.cpp => ImageEntityItem.cpp} | 42 ++++++++++++-------
 .../{FlatImageEntity.h => ImageEntityItem.h}  | 13 +++---
 scripts/system/edit.js                        |  2 +-
 7 files changed, 51 insertions(+), 22 deletions(-)
 rename libraries/entities/src/{FlatImageEntity.cpp => ImageEntityItem.cpp} (70%)
 rename libraries/entities/src/{FlatImageEntity.h => ImageEntityItem.h} (85%)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index a1c51b650f..fc8ca18fb6 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -590,6 +590,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_SKYBOX_MODE, skyboxMode, getSkyboxModeAsString());
     }
 
+    // Image only
+    if (_type == EntityTypes::Image) {
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL);
+    }
+
     // Web only
     if (_type == EntityTypes::Web) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_SOURCE_URL, sourceUrl);
@@ -1734,6 +1739,10 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DPI, uint16_t, setDPI);
     }
 
+    if (properties.getType() == EntityTypes::Image) {
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IMAGE_URL, QString, setImageURL);
+    }
+
     if (properties.getType() == EntityTypes::Text) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT, QString, setText);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_HEIGHT, float, setLineHeight);
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 4342f0e683..cab4251d97 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -266,6 +266,8 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
     bool success = true;
     if (_entityTree) {
         _entityTree->withWriteLock([&] {
+            propertiesWithSimID.getType();
+            qCDebug(entities) << "check 2 type: " << propertiesWithSimID.getType();
             EntityItemPointer entity = _entityTree->addEntity(id, propertiesWithSimID);
             if (entity) {
                 if (propertiesWithSimID.queryAACubeRelatedPropertyChanged()) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index bf29f3bec9..56c3aa216c 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -514,6 +514,7 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
 
     // construct the instance of the entity
     EntityTypes::EntityType type = props.getType();
+    qCDebug(entities) << "check 3 type: " << type;
     result = EntityTypes::constructEntityItem(type, entityID, props);
 
     if (result) {
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index e53b9d02f6..2e4a0e89a9 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -28,6 +28,7 @@
 #include "LineEntityItem.h"
 #include "PolyVoxEntityItem.h"
 #include "PolyLineEntityItem.h"
+#include "ImageEntityItem.h"
 #include "ShapeEntityItem.h"
 
 QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
@@ -47,6 +48,7 @@ REGISTER_ENTITY_TYPE(Zone)
 REGISTER_ENTITY_TYPE(Line)
 REGISTER_ENTITY_TYPE(PolyVox)
 REGISTER_ENTITY_TYPE(PolyLine)
+REGISTER_ENTITY_TYPE(Image)
 REGISTER_ENTITY_TYPE(Shape)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory)
@@ -89,7 +91,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
     EntityItemPointer newEntityItem = NULL;
     EntityTypeFactory factory = NULL;
     if (entityType >= 0 && entityType <= LAST) {
-        qCDebug(entities) << "type: " << entityType;
+        qCDebug(entities) << "check 4 type: " << entityType;
         factory = _factories[entityType];
     }
     if (factory) {
diff --git a/libraries/entities/src/FlatImageEntity.cpp b/libraries/entities/src/ImageEntityItem.cpp
similarity index 70%
rename from libraries/entities/src/FlatImageEntity.cpp
rename to libraries/entities/src/ImageEntityItem.cpp
index 66a5702747..a94374f7b5 100644
--- a/libraries/entities/src/FlatImageEntity.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -1,5 +1,5 @@
 //
-//  FlatImageEntity.cpp
+//  ImageEntityItem.cpp
 //  libraries/entities/src
 //
 //  Created by Elisa Lupin-Jimenez on 1/3/18.
@@ -22,27 +22,27 @@
 #include "EntityTreeElement.h"
 #include "ResourceCache.h"
 #include "ShapeEntityItem.h"
-#include "FlatImageEntity.h"
+#include "ImageEntityItem.h"
 
-const QString FlatImageEntity::DEFAULT_IMAGE_URL = QString("");
+const QString ImageEntityItem::DEFAULT_IMAGE_URL = QString("");
 
-EntityItemPointer FlatImageEntity::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity(new FlatImageEntity(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
+EntityItemPointer ImageEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
+    EntityItemPointer entity(new ImageEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
-FlatImageEntity::FlatImageEntity(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
+ImageEntityItem::ImageEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
     _type = EntityTypes::Image;
 }
 
-EntityItemProperties FlatImageEntity::getProperties(EntityPropertyFlags desiredProperties) const {
+EntityItemProperties ImageEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     properties.setShape("Quad");
     return properties;
 }
 
-bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
+bool ImageEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
     //SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
@@ -52,7 +52,7 @@ bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
         if (wantDebug) {
             uint64_t now = usecTimestampNow();
             int elapsed = now - getLastEdited();
-            qCDebug(entities) << "FlatImageEntity::setProperties() AFTER update... edited AGO=" << elapsed <<
+            qCDebug(entities) << "ImageEntityItem::setProperties() AFTER update... edited AGO=" << elapsed <<
                 "now=" << now << " getLastEdited()=" << getLastEdited();
         }
         setLastEdited(properties.getLastEdited());
@@ -61,13 +61,13 @@ bool FlatImageEntity::setProperties(const EntityItemProperties& properties) {
 }
 
 // TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
-EntityPropertyFlags FlatImageEntity::getEntityProperties(EncodeBitstreamParams& params) const {
+EntityPropertyFlags ImageEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
     return requestedProperties;
 }
 
-void FlatImageEntity::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+void ImageEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
     EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
     EntityPropertyFlags& requestedProperties,
     EntityPropertyFlags& propertyFlags,
@@ -80,7 +80,7 @@ void FlatImageEntity::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, "Quad");
 }
 
-int FlatImageEntity::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
     ReadBitstreamToTreeParams& args,
     EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
     bool& somethingChanged) {
@@ -91,7 +91,7 @@ int FlatImageEntity::readEntitySubclassDataFromBuffer(const unsigned char* data,
     return bytesRead;
 }
 
-void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
+/*void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
     const float MAX_FLAT_DIMENSION = 0.0001f;
     if (value.y > MAX_FLAT_DIMENSION) {
         // enforce flatness in Y
@@ -101,9 +101,23 @@ void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
     } else {
         EntityItem::setUnscaledDimensions(value);
     }
+}*/
+
+void ImageEntityItem::setImageURL(const QString& value) {
+    withWriteLock([&] {
+        if (_imageURL != value) {
+            auto newURL = QUrl::fromUserInput(value);
+
+            if (newURL.isValid()) {
+                _imageURL = newURL.toDisplayString();
+            } else {
+                qCDebug(entities) << "Clearing image entity source URL since" << value << "cannot be parsed to a valid URL.";
+            }
+        }
+    });
 }
 
-QString FlatImageEntity::getImageURL() const {
+QString ImageEntityItem::getImageURL() const {
     return resultWithReadLock<QString>([&] {
         return _imageURL;
     });
diff --git a/libraries/entities/src/FlatImageEntity.h b/libraries/entities/src/ImageEntityItem.h
similarity index 85%
rename from libraries/entities/src/FlatImageEntity.h
rename to libraries/entities/src/ImageEntityItem.h
index 4dd91b1215..55e8fc7b36 100644
--- a/libraries/entities/src/FlatImageEntity.h
+++ b/libraries/entities/src/ImageEntityItem.h
@@ -1,5 +1,5 @@
 //
-//  FlatImageEntity.h
+//  ImageEntityItem.h
 //  libraries/entities/src
 //
 //  Created by Elisa Lupin-Jimenez on 1/3/18.
@@ -9,16 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_FlatImageEntity_h
-#define hifi_FlatImageEntity_h
+#ifndef hifi_ImageEntityItem_h
+#define hifi_ImageEntityItem_h
 
 #include "EntityItem.h"
 
-class FlatImageEntity : public EntityItem {
+class ImageEntityItem : public EntityItem {
 public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
-    FlatImageEntity(const EntityItemID& entityItemID);
+    ImageEntityItem(const EntityItemID& entityItemID);
 
     ALLOW_INSTANTIATION // This class can be instantiated
 
@@ -43,6 +43,7 @@ public:
 
 
     static const QString DEFAULT_IMAGE_URL;
+    virtual void setImageURL(const QString& value);
     QString getImageURL() const;
 
 protected:
@@ -50,4 +51,4 @@ protected:
 
 };
 
-#endif // hifi_FlatImageEntity_h
+#endif // hifi_ImageEntityItem_h
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 4241468de1..bcd39ab0a5 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -287,7 +287,7 @@ var toolBar = (function () {
                 properties.userData = JSON.stringify({ grabbableKey: { grabbable: false } });
             }
 
-            print("properties.type: " + properties.type);
+            print("check 1 type: " + properties.type);
             entityID = Entities.addEntity(properties);
 
             if (properties.type === "ParticleEffect") {

From 72d8f90ec1b8950dc06bacff76ff84c114df07f7 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Thu, 11 Jan 2018 14:43:19 -0800
Subject: [PATCH 071/569] not sure why entities don't render with these changes

---
 libraries/entities/src/EntityItemProperties.h | 1 +
 libraries/entities/src/EntityTypes.cpp        | 2 +-
 libraries/entities/src/ImageEntityItem.cpp    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 5bd6836336..e121332374 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -67,6 +67,7 @@ class EntityItemProperties {
     friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class WebEntityItem; // TODO: consider removing this friend relationship and use public methods
+    friend class ImageEntityItem;
     friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 2e4a0e89a9..47ec408374 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -91,7 +91,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
     EntityItemPointer newEntityItem = NULL;
     EntityTypeFactory factory = NULL;
     if (entityType >= 0 && entityType <= LAST) {
-        qCDebug(entities) << "check 4 type: " << entityType;
+        qCDebug(entities) << "check 4 type: " << entityType << ", name: " << properties.getName();
         factory = _factories[entityType];
     }
     if (factory) {
diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
index a94374f7b5..2e6432ba19 100644
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -24,7 +24,7 @@
 #include "ShapeEntityItem.h"
 #include "ImageEntityItem.h"
 
-const QString ImageEntityItem::DEFAULT_IMAGE_URL = QString("");
+const QString ImageEntityItem::DEFAULT_IMAGE_URL("");
 
 EntityItemPointer ImageEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     EntityItemPointer entity(new ImageEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });

From 3d000d3d011396aee7ae664d8c64f7f2ffaf77d8 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Thu, 11 Jan 2018 16:11:01 -0800
Subject: [PATCH 072/569] changed packet number

---
 libraries/networking/src/udt/PacketHeaders.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index c48c6bfc0b..1ceb9b8e73 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -31,7 +31,6 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
             return static_cast<PacketVersion>(EntityVersion::SoftEntities);
-
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::RemovedJurisdictions);
         case PacketType::AvatarIdentity:

From 6f76650789ba9454e8d8634098e7519d1a3daa43 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 16 Jan 2018 12:17:39 -0800
Subject: [PATCH 073/569] updated with master

---
 libraries/entities/src/ImageEntityItem.cpp | 9 +++++++--
 libraries/entities/src/ImageEntityItem.h   | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
index 2e6432ba19..41bd55ee85 100644
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -38,6 +38,8 @@ ImageEntityItem::ImageEntityItem(const EntityItemID& entityItemID) : EntityItem(
 
 EntityItemProperties ImageEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(imageURL, getImageURL);
+    // Using "Quad" shape as defined in ShapeEntityItem.cpp
     properties.setShape("Quad");
     return properties;
 }
@@ -45,7 +47,7 @@ EntityItemProperties ImageEntityItem::getProperties(EntityPropertyFlags desiredP
 bool ImageEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
-    //SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(imageURL, setImageURL);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -63,7 +65,7 @@ bool ImageEntityItem::setProperties(const EntityItemProperties& properties) {
 // TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
 EntityPropertyFlags ImageEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
-
+    requestedProperties += PROP_IMAGE_URL;
     return requestedProperties;
 }
 
@@ -78,6 +80,7 @@ void ImageEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     bool successPropertyFits = true;
     // Using "Quad" shape as defined in ShapeEntityItem.cpp
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, "Quad");
+    APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, _imageURL);
 }
 
 int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
@@ -88,6 +91,8 @@ int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     int bytesRead = 0;
     const unsigned char* dataAt = data;
 
+    READ_ENTITY_PROPERTY(PROP_IMAGE_URL, QString, setImageURL);
+
     return bytesRead;
 }
 
diff --git a/libraries/entities/src/ImageEntityItem.h b/libraries/entities/src/ImageEntityItem.h
index 55e8fc7b36..229b6f190f 100644
--- a/libraries/entities/src/ImageEntityItem.h
+++ b/libraries/entities/src/ImageEntityItem.h
@@ -13,6 +13,7 @@
 #define hifi_ImageEntityItem_h
 
 #include "EntityItem.h"
+#include "ShapeEntityItem.h"
 
 class ImageEntityItem : public EntityItem {
 public:
@@ -49,6 +50,9 @@ public:
 protected:
     QString _imageURL;
 
+    entity::Shape _shape{ entity::Shape::Quad };
+    ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_BOX };
+
 };
 
 #endif // hifi_ImageEntityItem_h

From c9c55af66153882bc6fec49cbfd736b2d3308bf8 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 16 Jan 2018 17:37:49 -0800
Subject: [PATCH 074/569] setting up properties page (not complete)

---
 libraries/entities/src/ImageEntityItem.cpp | 16 +++++++++++++---
 libraries/entities/src/ImageEntityItem.h   |  4 ++++
 scripts/system/html/entityProperties.html  |  9 +++++++++
 scripts/system/html/js/entityProperties.js | 11 +++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
index 41bd55ee85..1a6ab1e146 100644
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -79,7 +79,6 @@ void ImageEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
     bool successPropertyFits = true;
     // Using "Quad" shape as defined in ShapeEntityItem.cpp
-    APPEND_ENTITY_PROPERTY(PROP_SHAPE, "Quad");
     APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, _imageURL);
 }
 
@@ -96,7 +95,7 @@ int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     return bytesRead;
 }
 
-/*void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
+void ImageEntityItem::setUnscaledDimensions(const glm::vec3& value) {
     const float MAX_FLAT_DIMENSION = 0.0001f;
     if (value.y > MAX_FLAT_DIMENSION) {
         // enforce flatness in Y
@@ -106,7 +105,7 @@ int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     } else {
         EntityItem::setUnscaledDimensions(value);
     }
-}*/
+}
 
 void ImageEntityItem::setImageURL(const QString& value) {
     withWriteLock([&] {
@@ -128,3 +127,14 @@ QString ImageEntityItem::getImageURL() const {
     });
 }
 
+/*void ImageEntityItem::computeShapeInfo(ShapeInfo& info) {
+    // This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc)
+    // is set.
+
+    EntityItem::computeShapeInfo(info);
+}*/
+
+// This value specifies how the shape should be treated by physics calculations.
+ShapeType ImageEntityItem::getShapeType() const {
+    return _collisionShapeType;
+}
diff --git a/libraries/entities/src/ImageEntityItem.h b/libraries/entities/src/ImageEntityItem.h
index 229b6f190f..f3f4fbe6c7 100644
--- a/libraries/entities/src/ImageEntityItem.h
+++ b/libraries/entities/src/ImageEntityItem.h
@@ -42,11 +42,15 @@ public:
         EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
         bool& somethingChanged) override;
 
+    void setUnscaledDimensions(const glm::vec3& value) override;
 
     static const QString DEFAULT_IMAGE_URL;
     virtual void setImageURL(const QString& value);
     QString getImageURL() const;
 
+    //virtual void computeShapeInfo(ShapeInfo& info) override;
+    virtual ShapeType getShapeType() const override;
+
 protected:
     QString _imageURL;
 
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b93974ee77..6e8178d408 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -714,6 +714,15 @@
             </fieldset>
         </fieldset>
 
+        <fieldset id="image" class="major">
+            <legend class="section-header image-group image-section">
+                Image<span>M</span>
+            </legend>
+            <div class="image-group image-section property url ">
+                <label for="property-image-url">Image URL</label>
+                <input type="text" id="property-image-url">
+            </div>
+        </fieldset>
 
         <fieldset id="web" class="major">
             <legend class="section-header web-group web-section">
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7008d0df66..05a1b2576b 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -133,6 +133,11 @@ function createEmitGroupNumberPropertyUpdateFunction(group, propertyName) {
     };
 }
 
+function createImageURLUpdateFunction(propertyName) {
+    return function() {
+        updateProperty(propertyName, this.value);
+    }
+}
 
 function createEmitTextPropertyUpdateFunction(propertyName) {
     return function() {
@@ -621,6 +626,8 @@ function loaded() {
         var elModelTextures = document.getElementById("property-model-textures");
         var elModelOriginalTextures = document.getElementById("property-model-original-textures");
 
+        var elImageURL = document.getElementById("property-image-url");
+
         var elWebSourceURL = document.getElementById("property-web-source-url");
         var elWebDPI = document.getElementById("property-web-dpi");
 
@@ -985,6 +992,8 @@ function loaded() {
                         } else if (properties.type === "Web") {
                             elWebSourceURL.value = properties.sourceUrl;
                             elWebDPI.value = properties.dpi;
+                        } else if (properties.type === "Image") {
+                            elImageURL.value = properties.imageURL;
                         } else if (properties.type === "Text") {
                             elTextText.value = properties.text;
                             elTextLineHeight.value = properties.lineHeight.toFixed(4);
@@ -1352,6 +1361,8 @@ function loaded() {
 
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
+        elImageURL.addEventListener('change', createImageURLUpdateFunction('imageURL'));
+
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));
         elWebDPI.addEventListener('change', createEmitNumberPropertyUpdateFunction('dpi', 0));
 

From ecb53192add37a7bb70c88d2c00b6568aab0db7d Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 17 Jan 2018 11:57:40 -0800
Subject: [PATCH 075/569] edit properties reflect image members

---
 scripts/system/html/css/edit-style.css     | 49 +++++++++++++++++++++-
 scripts/system/html/js/entityProperties.js |  7 ++--
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 736d42d593..58acc317bd 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -448,7 +448,7 @@ input[type=checkbox]:checked + label:hover {
     border: 1.5pt solid black;
 }
 
-.shape-section, .light-section, .model-section, .web-section, .hyperlink-section, .text-section, .zone-section {
+.shape-section, .light-section, .model-section, .web-section, .image-section, .hyperlink-section, .text-section, .zone-section {
     display: table;
 }
 
@@ -564,6 +564,7 @@ hr {
 
 .text-group[collapsed="true"] ~ .text-group,
 .zone-group[collapsed="true"] ~ .zone-group,
+.image-group[collapsed="true"] ~ .image-group,
 .web-group[collapsed="true"] ~ .web-group,
 .hyperlink-group[collapsed="true"] ~ .hyperlink-group,
 .spatial-group[collapsed="true"] ~ .spatial-group,
@@ -1466,6 +1467,9 @@ input#reset-to-natural-dimensions {
 #properties-list.ShapeMenu #text,
 #properties-list.BoxMenu #text,
 #properties-list.SphereMenu #text,
+#properties-list.ShapeMenu #image,
+#properties-list.BoxMenu #image,
+#properties-list.SphereMenu #image,
 #properties-list.ShapeMenu #web,
 #properties-list.BoxMenu #web,
 #properties-list.SphereMenu #web {
@@ -1497,6 +1501,7 @@ input#reset-to-natural-dimensions {
 #properties-list.ParticleEffectMenu #shape-list,
 #properties-list.ParticleEffectMenu #text,
 #properties-list.ParticleEffectMenu #web,
+#properties-list.ParticleEffectMenu #image,
 #properties-list.ParticleEffectMenu #zone {
     display: none;
 }
@@ -1527,6 +1532,7 @@ input#reset-to-natural-dimensions {
 #properties-list.LightMenu #model,
 #properties-list.LightMenu #zone,
 #properties-list.LightMenu #text,
+#properties-list.LightMenu #image,
 #properties-list.LightMenu #web {
     display: none;
 }
@@ -1563,6 +1569,7 @@ input#reset-to-natural-dimensions {
 #properties-list.ModelMenu #light,
 #properties-list.ModelMenu #zone,
 #properties-list.ModelMenu #text,
+#properties-list.ModelMenu #image,
 #properties-list.ModelMenu #web {
     display: none;
 }
@@ -1599,6 +1606,7 @@ input#reset-to-natural-dimensions {
 #properties-list.ZoneMenu #light,
 #properties-list.ZoneMenu #model,
 #properties-list.ZoneMenu #text,
+#properties-list.ZoneMenu #image,
 #properties-list.ZoneMenu #web {
     display: none;
 }
@@ -1609,6 +1617,43 @@ input#reset-to-natural-dimensions {
 }
 
 
+/* -----   Order of Menu items for Image   ----- */
+#properties-list.ImageMenu #general {
+    order: 1;
+}
+#properties-list.ImageMenu #image {
+    order: 2;
+}
+#properties-list.ImageMenu #collision-info {
+    order: 3;
+}
+#properties-list.ImageMenu #physical {
+    order: 4;
+}
+#properties-list.ImageMenu #spatial {
+    order: 5;
+}
+#properties-list.ImageMenu #behavior {
+    order: 6;
+}
+#properties-list.ImageMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.ImageMenu #light,
+#properties-list.ImageMenu #model,
+#properties-list.ImageMenu #zone,
+#properties-list.ImageMenu #web,
+#properties-list.ImageMenu #text {
+    display: none;
+}
+/* items to hide */
+#properties-list.ImageMenu #shape-list,
+#properties-list.ImageMenu #base-color-section {
+    display: none;
+}
+
+
 /* -----   Order of Menu items for Web   ----- */
 #properties-list.WebMenu #general {
     order: 1;
@@ -1635,6 +1680,7 @@ input#reset-to-natural-dimensions {
 #properties-list.WebMenu #light,
 #properties-list.WebMenu #model,
 #properties-list.WebMenu #zone,
+#properties-list.WebMenu #image,
 #properties-list.WebMenu #text {
     display: none;
 }
@@ -1672,6 +1718,7 @@ input#reset-to-natural-dimensions {
 #properties-list.TextMenu #light,
 #properties-list.TextMenu #model,
 #properties-list.TextMenu #zone,
+#properties-list.TextMenu #image,
 #properties-list.TextMenu #web {
     display: none;
 }
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 05a1b2576b..54b50de106 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -19,6 +19,7 @@ var ICON_FOR_TYPE = {
     ParticleEffect: "&#xe004;",
     Model: "&#xe008;",
     Web: "q",
+    Image: "q", // what do? 
     Text: "l",
     Light: "p",
     Zone: "o",
@@ -134,9 +135,9 @@ function createEmitGroupNumberPropertyUpdateFunction(group, propertyName) {
 }
 
 function createImageURLUpdateFunction(propertyName) {
-    return function() {
+    return function () {
         updateProperty(propertyName, this.value);
-    }
+    };
 }
 
 function createEmitTextPropertyUpdateFunction(propertyName) {
@@ -1735,7 +1736,7 @@ function loaded() {
     }
 
     // Dropdowns
-    // For each dropdown the following replacement is created in place of the oriringal dropdown...
+    // For each dropdown the following replacement is created in place of the original dropdown...
     // Structure created:
     //  <dl dropped="true/false">
     //      <dt name="?" id="?" value="?"><span>display text</span><span>carat</span></dt>

From dc5f29aa58268a9abdc9b82f6a9bc41828c28832 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 17 Jan 2018 17:57:09 -0800
Subject: [PATCH 076/569] entity item properties hooked up for image

---
 libraries/entities/src/EntityItemProperties.cpp | 9 +++++++++
 scripts/system/edit.js                          | 2 +-
 scripts/system/html/js/entityProperties.js      | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index fc8ca18fb6..3729c75f3d 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -350,6 +350,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_AMBIENT_LIGHT_MODE, ambientLightMode);
     CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode);
 
+    CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL);
+
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_DATA, voxelData);
@@ -785,6 +787,8 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(ambientLightMode, AmbientLightMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(skyboxMode, SkyboxMode);
 
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(imageURL, QString, setImageURL);
+
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelVolumeSize, glmVec3, setVoxelVolumeSize);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelData, QByteArray, setVoxelData);
@@ -945,6 +949,8 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(ambientLightMode);
     COPY_PROPERTY_IF_CHANGED(skyboxMode);
 
+    COPY_PROPERTY_IF_CHANGED(imageURL);
+
     COPY_PROPERTY_IF_CHANGED(sourceUrl);
     COPY_PROPERTY_IF_CHANGED(voxelVolumeSize);
     COPY_PROPERTY_IF_CHANGED(voxelData);
@@ -1138,6 +1144,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
         ADD_PROPERTY_TO_MAP(PROP_NAME, Name, name, QString);
         ADD_PROPERTY_TO_MAP(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString);
+        ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_LINE_WIDTH, LineWidth, lineWidth, float);
         ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>);
         ADD_PROPERTY_TO_MAP(PROP_HREF, Href, href, QString);
@@ -2060,6 +2067,8 @@ void EntityItemProperties::markAllChanged() {
     _skybox.markAllChanged();
     _haze.markAllChanged();
 
+    _imageURLChanged = true;
+
     _sourceUrlChanged = true;
     _voxelVolumeSizeChanged = true;
     _voxelDataChanged = true;
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index bcd39ab0a5..5f976e07d3 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -546,7 +546,7 @@ var toolBar = (function () {
             createNewEntity({
                 type: "Image",
                 dimensions: DEFAULT_DIMENSIONS,
-                sourceUrl: "https://highfidelity.com/"
+                imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg"
             });
         });
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 54b50de106..7c3af548ba 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -19,7 +19,7 @@ var ICON_FOR_TYPE = {
     ParticleEffect: "&#xe004;",
     Model: "&#xe008;",
     Web: "q",
-    Image: "q", // what do? 
+    Image: "q", // change this when image type icon added 
     Text: "l",
     Light: "p",
     Zone: "o",
@@ -995,6 +995,7 @@ function loaded() {
                             elWebDPI.value = properties.dpi;
                         } else if (properties.type === "Image") {
                             elImageURL.value = properties.imageURL;
+                            //elImageURL.value = properties.sourceURL;
                         } else if (properties.type === "Text") {
                             elTextText.value = properties.text;
                             elTextLineHeight.value = properties.lineHeight.toFixed(4);

From 576d683d3bb62baef14c4ddc2f3696ca71679258 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Thu, 18 Jan 2018 14:40:33 -0800
Subject: [PATCH 077/569] initial changes to incorporate snap model

---
 libraries/entities/src/EntityScriptingInterface.cpp | 2 --
 libraries/entities/src/EntityTree.cpp               | 1 -
 libraries/entities/src/EntityTypes.cpp              | 4 +++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index cab4251d97..4342f0e683 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -266,8 +266,6 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
     bool success = true;
     if (_entityTree) {
         _entityTree->withWriteLock([&] {
-            propertiesWithSimID.getType();
-            qCDebug(entities) << "check 2 type: " << propertiesWithSimID.getType();
             EntityItemPointer entity = _entityTree->addEntity(id, propertiesWithSimID);
             if (entity) {
                 if (propertiesWithSimID.queryAACubeRelatedPropertyChanged()) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 56c3aa216c..bf29f3bec9 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -514,7 +514,6 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
 
     // construct the instance of the entity
     EntityTypes::EntityType type = props.getType();
-    qCDebug(entities) << "check 3 type: " << type;
     result = EntityTypes::constructEntityItem(type, entityID, props);
 
     if (result) {
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 47ec408374..6326df3cc1 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -91,7 +91,9 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
     EntityItemPointer newEntityItem = NULL;
     EntityTypeFactory factory = NULL;
     if (entityType >= 0 && entityType <= LAST) {
-        qCDebug(entities) << "check 4 type: " << entityType << ", name: " << properties.getName();
+        if (getEntityTypeName(entityType) == "Image") {
+            entityType = getEntityTypeFromName("Web");
+        }
         factory = _factories[entityType];
     }
     if (factory) {

From ceb621a52151d20bfa66dd4eb09779c45f003901 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Mon, 22 Jan 2018 11:36:58 -0800
Subject: [PATCH 078/569] reverted protocol change for images

---
 libraries/entities/src/EntityItemProperties.cpp | 16 ++++++++--------
 libraries/entities/src/EntityItemProperties.h   |  2 +-
 libraries/entities/src/EntityPropertyFlags.h    |  4 ++--
 libraries/entities/src/EntityTypes.cpp          |  7 ++-----
 libraries/entities/src/EntityTypes.h            |  2 +-
 libraries/entities/src/ImageEntityItem.cpp      |  8 ++++++--
 libraries/entities/src/ImageEntityItem.h        |  4 ++++
 scripts/system/edit.js                          | 10 +++++++++-
 8 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 3729c75f3d..48ad9601ba 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -350,7 +350,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_AMBIENT_LIGHT_MODE, ambientLightMode);
     CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode);
 
-    CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL);
+    //CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL);
 
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
@@ -593,9 +593,9 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     }
 
     // Image only
-    if (_type == EntityTypes::Image) {
+    /*if (_type == EntityTypes::Image) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL);
-    }
+    }*/
 
     // Web only
     if (_type == EntityTypes::Web) {
@@ -1144,7 +1144,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
         ADD_PROPERTY_TO_MAP(PROP_NAME, Name, name, QString);
         ADD_PROPERTY_TO_MAP(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString);
-        ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString);
+        //ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_LINE_WIDTH, LineWidth, lineWidth, float);
         ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>);
         ADD_PROPERTY_TO_MAP(PROP_HREF, Href, href, QString);
@@ -1381,9 +1381,9 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_DPI, properties.getDPI());
             }
 
-            if (properties.getType() == EntityTypes::Image) {
+            /*if (properties.getType() == EntityTypes::Image) {
                 APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, properties.getImageURL());
-            }
+            }*/
 
             if (properties.getType() == EntityTypes::Text) {
                 APPEND_ENTITY_PROPERTY(PROP_TEXT, properties.getText());
@@ -1746,9 +1746,9 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DPI, uint16_t, setDPI);
     }
 
-    if (properties.getType() == EntityTypes::Image) {
+    /*if (properties.getType() == EntityTypes::Image) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IMAGE_URL, QString, setImageURL);
-    }
+    }*/
 
     if (properties.getType() == EntityTypes::Text) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT, QString, setText);
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index e121332374..14544cd4d1 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -67,7 +67,7 @@ class EntityItemProperties {
     friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class WebEntityItem; // TODO: consider removing this friend relationship and use public methods
-    friend class ImageEntityItem;
+    //friend class ImageEntityItem;
     friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 4768ebed86..ec8f4e08c8 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -42,8 +42,8 @@ enum EntityPropertyList {
     PROP_ANIMATION_ALLOW_TRANSLATION,
     PROP_RELAY_PARENT_JOINTS,
 
-    // for image
-    PROP_IMAGE_URL,
+    /*// for image
+    PROP_IMAGE_URL,*/
 
     // these properties are supported by the EntityItem base class
     PROP_REGISTRATION_POINT,
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 6326df3cc1..6bf5a176a7 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -28,7 +28,7 @@
 #include "LineEntityItem.h"
 #include "PolyVoxEntityItem.h"
 #include "PolyLineEntityItem.h"
-#include "ImageEntityItem.h"
+//#include "ImageEntityItem.h"
 #include "ShapeEntityItem.h"
 
 QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
@@ -48,7 +48,7 @@ REGISTER_ENTITY_TYPE(Zone)
 REGISTER_ENTITY_TYPE(Line)
 REGISTER_ENTITY_TYPE(PolyVox)
 REGISTER_ENTITY_TYPE(PolyLine)
-REGISTER_ENTITY_TYPE(Image)
+//REGISTER_ENTITY_TYPE(Image)
 REGISTER_ENTITY_TYPE(Shape)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory)
@@ -91,9 +91,6 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
     EntityItemPointer newEntityItem = NULL;
     EntityTypeFactory factory = NULL;
     if (entityType >= 0 && entityType <= LAST) {
-        if (getEntityTypeName(entityType) == "Image") {
-            entityType = getEntityTypeFromName("Web");
-        }
         factory = _factories[entityType];
     }
     if (factory) {
diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index 8d986c8090..6fe4274820 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -48,7 +48,7 @@ public:
         Line,
         PolyVox,
         PolyLine,
-        Image,
+        //Image,
         Shape,
         LAST = Shape
     } EntityType;
diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
index 1a6ab1e146..e30d85257e 100644
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+/* NOT IN USE
+
 #include <QtCore/QJsonDocument>
 
 #include <ByteCountCoding.h>
@@ -127,14 +129,16 @@ QString ImageEntityItem::getImageURL() const {
     });
 }
 
-/*void ImageEntityItem::computeShapeInfo(ShapeInfo& info) {
+void ImageEntityItem::computeShapeInfo(ShapeInfo& info) {
     // This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc)
     // is set.
 
     EntityItem::computeShapeInfo(info);
-}*/
+}
 
 // This value specifies how the shape should be treated by physics calculations.
 ShapeType ImageEntityItem::getShapeType() const {
     return _collisionShapeType;
 }
+
+*/
diff --git a/libraries/entities/src/ImageEntityItem.h b/libraries/entities/src/ImageEntityItem.h
index f3f4fbe6c7..276d21e6f0 100644
--- a/libraries/entities/src/ImageEntityItem.h
+++ b/libraries/entities/src/ImageEntityItem.h
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+/* NOT IN USE
+
 #ifndef hifi_ImageEntityItem_h
 #define hifi_ImageEntityItem_h
 
@@ -60,3 +62,5 @@ protected:
 };
 
 #endif // hifi_ImageEntityItem_h
+
+*/
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 5f976e07d3..1d02fed787 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -540,7 +540,7 @@ var toolBar = (function () {
             });
         });
 
-        // for image button
+        /*// for image button
         addButton("newImageButton", "web-01.svg", function () {
             print("new image message is received");
             createNewEntity({
@@ -548,6 +548,14 @@ var toolBar = (function () {
                 dimensions: DEFAULT_DIMENSIONS,
                 imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg"
             });
+        });*/
+        addButton("newImageButton", "web-01.svg", function () {
+            createNewEntity({
+                type: "Model",
+                dimensions: DEFAULT_DIMENSIONS,
+                modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx",
+                textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
+            });
         });
 
         addButton("newWebButton", "web-01.svg", function () {

From 308e481e63f5d19db4f8548c3a8689d60a22958f Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Mon, 22 Jan 2018 17:46:12 -0800
Subject: [PATCH 079/569] switch to image property list not working

---
 scripts/system/edit.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 1d02fed787..6f48e1167a 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -252,7 +252,7 @@ var toolBar = (function () {
             properties.rotation = MyAvatar.orientation;
             
             // added image here
-            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Image", "Web"];
+            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
                     
                 // Adjust position of entity per bounding box prior to creating it.
@@ -287,7 +287,6 @@ var toolBar = (function () {
                 properties.userData = JSON.stringify({ grabbableKey: { grabbable: false } });
             }
 
-            print("check 1 type: " + properties.type);
             entityID = Entities.addEntity(properties);
 
             if (properties.type === "ParticleEffect") {
@@ -540,20 +539,21 @@ var toolBar = (function () {
             });
         });
 
-        /*// for image button
-        addButton("newImageButton", "web-01.svg", function () {
-            print("new image message is received");
-            createNewEntity({
-                type: "Image",
-                dimensions: DEFAULT_DIMENSIONS,
-                imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg"
-            });
-        });*/
         addButton("newImageButton", "web-01.svg", function () {
             createNewEntity({
                 type: "Model",
-                dimensions: DEFAULT_DIMENSIONS,
+                // make constant for this later
+                dimensions: {
+                    x: 4.16,
+                    y: 0.02,
+                    z: 2.58
+                },
                 modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx",
+                imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg",
+                // will this work?
+                /*get textures() {
+                    return JSON.stringify({ "tex.picture": this.imageURL });
+                }*/
                 textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
             });
         });

From 42151b8fd47f6b32d3662d9d599096ec4d290408 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 23 Jan 2018 14:50:41 -0800
Subject: [PATCH 080/569] creating new image entity opens image property
 options

---
 .../entities/src/EntityItemProperties.cpp     |  12 +-
 libraries/entities/src/EntityItemProperties.h |   2 +-
 libraries/entities/src/ImageEntityItem.cpp    |   2 +-
 scripts/system/edit.js                        |   6 +-
 scripts/system/html/js/entityProperties.js    | 123 ++++++++++++++++++
 5 files changed, 136 insertions(+), 9 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 48ad9601ba..7fcfc00ee8 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -592,8 +592,10 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_SKYBOX_MODE, skyboxMode, getSkyboxModeAsString());
     }
 
-    // Image only
-    /*if (_type == EntityTypes::Image) {
+
+
+    /*// Image only
+    if (_type == EntityTypes::Image) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL);
     }*/
 
@@ -787,7 +789,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(ambientLightMode, AmbientLightMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(skyboxMode, SkyboxMode);
 
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(imageURL, QString, setImageURL);
+    //COPY_PROPERTY_FROM_QSCRIPTVALUE(imageURL, QString, setImageURL);
 
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelVolumeSize, glmVec3, setVoxelVolumeSize);
@@ -949,7 +951,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(ambientLightMode);
     COPY_PROPERTY_IF_CHANGED(skyboxMode);
 
-    COPY_PROPERTY_IF_CHANGED(imageURL);
+    //COPY_PROPERTY_IF_CHANGED(imageURL);
 
     COPY_PROPERTY_IF_CHANGED(sourceUrl);
     COPY_PROPERTY_IF_CHANGED(voxelVolumeSize);
@@ -2067,7 +2069,7 @@ void EntityItemProperties::markAllChanged() {
     _skybox.markAllChanged();
     _haze.markAllChanged();
 
-    _imageURLChanged = true;
+    //_imageURLChanged = true;
 
     _sourceUrlChanged = true;
     _voxelVolumeSizeChanged = true;
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 14544cd4d1..5ca28a12c5 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -195,7 +195,7 @@ public:
     DEFINE_PROPERTY_GROUP(Haze, haze, HazePropertyGroup);
     DEFINE_PROPERTY_GROUP(Animation, animation, AnimationPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString, "");
-    DEFINE_PROPERTY_REF(PROP_IMAGE_URL, ImageURL, imageURL, QString, "");
+    //DEFINE_PROPERTY_REF(PROP_IMAGE_URL, ImageURL, imageURL, QString, "");
     DEFINE_PROPERTY(PROP_LINE_WIDTH, LineWidth, lineWidth, float, LineEntityItem::DEFAULT_LINE_WIDTH);
     DEFINE_PROPERTY_REF(LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, QVector<glm::vec3>());
     DEFINE_PROPERTY_REF(PROP_HREF, Href, href, QString, "");
diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
index e30d85257e..9969a39ed0 100644
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ b/libraries/entities/src/ImageEntityItem.cpp
@@ -35,7 +35,7 @@ EntityItemPointer ImageEntityItem::factory(const EntityItemID& entityID, const E
 }
 
 ImageEntityItem::ImageEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
-    _type = EntityTypes::Image;
+    //_type = EntityTypes::Image;
 }
 
 EntityItemProperties ImageEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 6f48e1167a..a5c236a6c9 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -253,6 +253,8 @@ var toolBar = (function () {
             
             // added image here
             var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
+            //var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Image", "Web"];
+
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
                     
                 // Adjust position of entity per bounding box prior to creating it.
@@ -539,6 +541,7 @@ var toolBar = (function () {
             });
         });
 
+        // for image button
         addButton("newImageButton", "web-01.svg", function () {
             createNewEntity({
                 type: "Model",
@@ -548,8 +551,7 @@ var toolBar = (function () {
                     y: 0.02,
                     z: 2.58
                 },
-                modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Test/snapshot.fbx",
-                imageURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg",
+                modelURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx",
                 // will this work?
                 /*get textures() {
                     return JSON.stringify({ "tex.picture": this.imageURL });
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7c3af548ba..2b90f8ddfa 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -511,6 +511,10 @@ function loaded() {
         var elPropertiesList = document.getElementById("properties-list");
         var elID = document.getElementById("property-id");
         var elType = document.getElementById("property-type");
+<<<<<<< HEAD
+=======
+        debugPrint("the type is: " + JSON.stringify(elType));
+>>>>>>> creating new image entity opens image property options
         var elTypeIcon = document.getElementById("type-icon");
         var elName = document.getElementById("property-name");
         var elLocked = document.getElementById("property-locked");
@@ -661,16 +665,28 @@ function loaded() {
         var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
 
         // Skybox
+<<<<<<< HEAD
         var elZoneSkyboxModeInherit = document.getElementById("property-zone-skybox-mode-inherit");
         var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
         var elZoneSkyboxModeEnabled = document.getElementById("property-zone-skybox-mode-enabled");
+=======
+        var elZoneSkyboxModeInherit  = document.getElementById("property-zone-skybox-mode-inherit");
+        var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
+        var elZoneSkyboxModeEnabled  = document.getElementById("property-zone-skybox-mode-enabled");
+>>>>>>> creating new image entity opens image property options
 
         // Ambient light
         var elCopySkyboxURLToAmbientURL = document.getElementById("copy-skybox-url-to-ambient-url");
 
+<<<<<<< HEAD
         var elZoneAmbientLightModeInherit = document.getElementById("property-zone-ambient-light-mode-inherit");
         var elZoneAmbientLightModeDisabled = document.getElementById("property-zone-ambient-light-mode-disabled");
         var elZoneAmbientLightModeEnabled = document.getElementById("property-zone-ambient-light-mode-enabled");
+=======
+        var elZoneAmbientLightModeInherit  = document.getElementById("property-zone-ambient-light-mode-inherit");
+        var elZoneAmbientLightModeDisabled = document.getElementById("property-zone-ambient-light-mode-disabled");
+        var elZoneAmbientLightModeEnabled  = document.getElementById("property-zone-ambient-light-mode-enabled");
+>>>>>>> creating new image entity opens image property options
 
         var elZoneAmbientLightIntensity = document.getElementById("property-zone-key-ambient-intensity");
         var elZoneAmbientLightURL = document.getElementById("property-zone-key-ambient-url");
@@ -787,7 +803,11 @@ function loaded() {
                     } else {
 
                         properties = data.selections[0].properties;
+<<<<<<< HEAD
 
+=======
+                        debugPrint("props: " + JSON.stringify(properties));
+>>>>>>> creating new image entity opens image property options
                         if (lastEntityID !== '"' + properties.id + '"' && lastEntityID !== null && editor !== null) {
                             saveJSONUserData(true);
                         }
@@ -796,6 +816,14 @@ function loaded() {
                         lastEntityID = '"' + properties.id + '"';
                         elID.value = properties.id;
 
+<<<<<<< HEAD
+=======
+                        // image is not yet a separate entity type
+                        if (properties.type === "Model" && properties.modelURL === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
+                            properties.type = "Image";
+                        }
+
+>>>>>>> creating new image entity opens image property options
                         // Create class name for css ruleset filtering
                         elPropertiesList.className = properties.type + 'Menu';
 
@@ -1024,9 +1052,15 @@ function loaded() {
 
                         } else if (properties.type === "Zone") {
                             // Key light
+<<<<<<< HEAD
                             elZoneKeyLightModeInherit.checked = (properties.keyLightMode === 'inherit');
                             elZoneKeyLightModeDisabled.checked = (properties.keyLightMode === 'disabled');
                             elZoneKeyLightModeEnabled.checked = (properties.keyLightMode === 'enabled');
+=======
+                            elZoneKeyLightModeInherit.checked  = (properties.keyLightMode === 'inherit');
+                            elZoneKeyLightModeDisabled.checked = (properties.keyLightMode === 'disabled');
+                            elZoneKeyLightModeEnabled.checked  = (properties.keyLightMode === 'enabled');
+>>>>>>> creating new image entity opens image property options
 
                             elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + 
                                                    properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
@@ -1038,6 +1072,7 @@ function loaded() {
                             elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
 
                             // Skybox
+<<<<<<< HEAD
                             elZoneSkyboxModeInherit.checked = (properties.skyboxMode === 'inherit');
                             elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
                             elZoneSkyboxModeEnabled.checked = (properties.skyboxMode === 'enabled');
@@ -1046,14 +1081,30 @@ function loaded() {
                             elZoneAmbientLightModeInherit.checked = (properties.ambientLightMode === 'inherit');
                             elZoneAmbientLightModeDisabled.checked = (properties.ambientLightMode === 'disabled');
                             elZoneAmbientLightModeEnabled.checked = (properties.ambientLightMode === 'enabled');
+=======
+                            elZoneSkyboxModeInherit.checked  = (properties.skyboxMode === 'inherit');
+                            elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
+                            elZoneSkyboxModeEnabled.checked  = (properties.skyboxMode === 'enabled');
+
+                            // Ambient light
+                            elZoneAmbientLightModeInherit.checked  = (properties.ambientLightMode === 'inherit');
+                            elZoneAmbientLightModeDisabled.checked = (properties.ambientLightMode === 'disabled');
+                            elZoneAmbientLightModeEnabled.checked  = (properties.ambientLightMode === 'enabled');
+>>>>>>> creating new image entity opens image property options
 
                             elZoneAmbientLightIntensity.value = properties.ambientLight.ambientIntensity.toFixed(2);
                             elZoneAmbientLightURL.value = properties.ambientLight.ambientURL;
 
                             // Haze
+<<<<<<< HEAD
                             elZoneHazeModeInherit.checked = (properties.hazeMode === 'inherit');
                             elZoneHazeModeDisabled.checked = (properties.hazeMode === 'disabled');
                             elZoneHazeModeEnabled.checked = (properties.hazeMode === 'enabled');
+=======
+                            elZoneHazeModeInherit.checked  = (properties.hazeMode === 'inherit');
+                            elZoneHazeModeDisabled.checked = (properties.hazeMode === 'disabled');
+                            elZoneHazeModeEnabled.checked  = (properties.hazeMode === 'enabled');
+>>>>>>> creating new image entity opens image property options
 
                             elZoneHazeRange.value = properties.haze.hazeRange.toFixed(0);
                             elZoneHazeColor.style.backgroundColor = "rgb(" + 
@@ -1319,15 +1370,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-color-control2').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-color-control2').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1343,15 +1403,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-light-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-light-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1400,15 +1469,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-text-text-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-text-text-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 $(el).attr('active', 'false');
                 emitColorPropertyUpdate('textColor', rgb.r, rgb.g, rgb.b);
             }
@@ -1424,15 +1502,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-text-background-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-text-background-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('backgroundColor', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1449,15 +1536,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
             }
         }));
@@ -1518,15 +1614,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('hazeColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
         }));
@@ -1543,15 +1648,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('hazeGlareColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
         }));
@@ -1585,15 +1699,24 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
+<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
+=======
+>>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'false');
             },
+<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
+=======
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+>>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox');
             }
         }));

From fe3bc00baa0cb1bcaaa3090e5ca3e438ba47874a Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 23 Jan 2018 16:45:54 -0800
Subject: [PATCH 081/569] loading and rendering atp and http image files

---
 scripts/system/html/js/entityProperties.js | 131 ++-------------------
 1 file changed, 7 insertions(+), 124 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 2b90f8ddfa..e7526fa2e0 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -136,7 +136,8 @@ function createEmitGroupNumberPropertyUpdateFunction(group, propertyName) {
 
 function createImageURLUpdateFunction(propertyName) {
     return function () {
-        updateProperty(propertyName, this.value);
+        var newTextures = JSON.stringify({ "tex.picture": this.value });
+        updateProperty(propertyName, newTextures);
     };
 }
 
@@ -511,10 +512,6 @@ function loaded() {
         var elPropertiesList = document.getElementById("properties-list");
         var elID = document.getElementById("property-id");
         var elType = document.getElementById("property-type");
-<<<<<<< HEAD
-=======
-        debugPrint("the type is: " + JSON.stringify(elType));
->>>>>>> creating new image entity opens image property options
         var elTypeIcon = document.getElementById("type-icon");
         var elName = document.getElementById("property-name");
         var elLocked = document.getElementById("property-locked");
@@ -665,28 +662,16 @@ function loaded() {
         var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
 
         // Skybox
-<<<<<<< HEAD
         var elZoneSkyboxModeInherit = document.getElementById("property-zone-skybox-mode-inherit");
         var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
         var elZoneSkyboxModeEnabled = document.getElementById("property-zone-skybox-mode-enabled");
-=======
-        var elZoneSkyboxModeInherit  = document.getElementById("property-zone-skybox-mode-inherit");
-        var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
-        var elZoneSkyboxModeEnabled  = document.getElementById("property-zone-skybox-mode-enabled");
->>>>>>> creating new image entity opens image property options
 
         // Ambient light
         var elCopySkyboxURLToAmbientURL = document.getElementById("copy-skybox-url-to-ambient-url");
 
-<<<<<<< HEAD
         var elZoneAmbientLightModeInherit = document.getElementById("property-zone-ambient-light-mode-inherit");
         var elZoneAmbientLightModeDisabled = document.getElementById("property-zone-ambient-light-mode-disabled");
         var elZoneAmbientLightModeEnabled = document.getElementById("property-zone-ambient-light-mode-enabled");
-=======
-        var elZoneAmbientLightModeInherit  = document.getElementById("property-zone-ambient-light-mode-inherit");
-        var elZoneAmbientLightModeDisabled = document.getElementById("property-zone-ambient-light-mode-disabled");
-        var elZoneAmbientLightModeEnabled  = document.getElementById("property-zone-ambient-light-mode-enabled");
->>>>>>> creating new image entity opens image property options
 
         var elZoneAmbientLightIntensity = document.getElementById("property-zone-key-ambient-intensity");
         var elZoneAmbientLightURL = document.getElementById("property-zone-key-ambient-url");
@@ -803,11 +788,6 @@ function loaded() {
                     } else {
 
                         properties = data.selections[0].properties;
-<<<<<<< HEAD
-
-=======
-                        debugPrint("props: " + JSON.stringify(properties));
->>>>>>> creating new image entity opens image property options
                         if (lastEntityID !== '"' + properties.id + '"' && lastEntityID !== null && editor !== null) {
                             saveJSONUserData(true);
                         }
@@ -816,14 +796,11 @@ function loaded() {
                         lastEntityID = '"' + properties.id + '"';
                         elID.value = properties.id;
 
-<<<<<<< HEAD
-=======
-                        // image is not yet a separate entity type
+                        // HTML workaround since image is not yet a separate entity type
                         if (properties.type === "Model" && properties.modelURL === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
                             properties.type = "Image";
                         }
 
->>>>>>> creating new image entity opens image property options
                         // Create class name for css ruleset filtering
                         elPropertiesList.className = properties.type + 'Menu';
 
@@ -1022,8 +999,9 @@ function loaded() {
                             elWebSourceURL.value = properties.sourceUrl;
                             elWebDPI.value = properties.dpi;
                         } else if (properties.type === "Image") {
-                            elImageURL.value = properties.imageURL;
-                            //elImageURL.value = properties.sourceURL;
+                            var imageLink = JSON.parse(properties.textures)["tex.picture"];
+                            debugPrint("image url is: " + imageLink);
+                            elImageURL.value = imageLink;
                         } else if (properties.type === "Text") {
                             elTextText.value = properties.text;
                             elTextLineHeight.value = properties.lineHeight.toFixed(4);
@@ -1052,15 +1030,9 @@ function loaded() {
 
                         } else if (properties.type === "Zone") {
                             // Key light
-<<<<<<< HEAD
                             elZoneKeyLightModeInherit.checked = (properties.keyLightMode === 'inherit');
                             elZoneKeyLightModeDisabled.checked = (properties.keyLightMode === 'disabled');
                             elZoneKeyLightModeEnabled.checked = (properties.keyLightMode === 'enabled');
-=======
-                            elZoneKeyLightModeInherit.checked  = (properties.keyLightMode === 'inherit');
-                            elZoneKeyLightModeDisabled.checked = (properties.keyLightMode === 'disabled');
-                            elZoneKeyLightModeEnabled.checked  = (properties.keyLightMode === 'enabled');
->>>>>>> creating new image entity opens image property options
 
                             elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + 
                                                    properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
@@ -1072,7 +1044,6 @@ function loaded() {
                             elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
 
                             // Skybox
-<<<<<<< HEAD
                             elZoneSkyboxModeInherit.checked = (properties.skyboxMode === 'inherit');
                             elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
                             elZoneSkyboxModeEnabled.checked = (properties.skyboxMode === 'enabled');
@@ -1081,30 +1052,14 @@ function loaded() {
                             elZoneAmbientLightModeInherit.checked = (properties.ambientLightMode === 'inherit');
                             elZoneAmbientLightModeDisabled.checked = (properties.ambientLightMode === 'disabled');
                             elZoneAmbientLightModeEnabled.checked = (properties.ambientLightMode === 'enabled');
-=======
-                            elZoneSkyboxModeInherit.checked  = (properties.skyboxMode === 'inherit');
-                            elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
-                            elZoneSkyboxModeEnabled.checked  = (properties.skyboxMode === 'enabled');
-
-                            // Ambient light
-                            elZoneAmbientLightModeInherit.checked  = (properties.ambientLightMode === 'inherit');
-                            elZoneAmbientLightModeDisabled.checked = (properties.ambientLightMode === 'disabled');
-                            elZoneAmbientLightModeEnabled.checked  = (properties.ambientLightMode === 'enabled');
->>>>>>> creating new image entity opens image property options
 
                             elZoneAmbientLightIntensity.value = properties.ambientLight.ambientIntensity.toFixed(2);
                             elZoneAmbientLightURL.value = properties.ambientLight.ambientURL;
 
                             // Haze
-<<<<<<< HEAD
                             elZoneHazeModeInherit.checked = (properties.hazeMode === 'inherit');
                             elZoneHazeModeDisabled.checked = (properties.hazeMode === 'disabled');
                             elZoneHazeModeEnabled.checked = (properties.hazeMode === 'enabled');
-=======
-                            elZoneHazeModeInherit.checked  = (properties.hazeMode === 'inherit');
-                            elZoneHazeModeDisabled.checked = (properties.hazeMode === 'disabled');
-                            elZoneHazeModeEnabled.checked  = (properties.hazeMode === 'enabled');
->>>>>>> creating new image entity opens image property options
 
                             elZoneHazeRange.value = properties.haze.hazeRange.toFixed(0);
                             elZoneHazeColor.style.backgroundColor = "rgb(" + 
@@ -1370,24 +1325,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-color-control2').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-color-control2').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1403,24 +1349,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-light-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-light-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1432,7 +1369,7 @@ function loaded() {
 
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
-        elImageURL.addEventListener('change', createImageURLUpdateFunction('imageURL'));
+        elImageURL.addEventListener('change', createImageURLUpdateFunction('textures'));
 
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));
         elWebDPI.addEventListener('change', createEmitNumberPropertyUpdateFunction('dpi', 0));
@@ -1469,24 +1406,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-text-text-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-text-text-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 $(el).attr('active', 'false');
                 emitColorPropertyUpdate('textColor', rgb.r, rgb.g, rgb.b);
             }
@@ -1502,24 +1430,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-text-background-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-text-background-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('backgroundColor', rgb.r, rgb.g, rgb.b);
             }
         }));
@@ -1536,24 +1455,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
             }
         }));
@@ -1614,24 +1524,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('hazeColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
         }));
@@ -1648,24 +1549,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('hazeGlareColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
         }));
@@ -1699,24 +1591,15 @@ function loaded() {
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
-<<<<<<< HEAD
             submit: false, // We don't want to have a submission button
-=======
->>>>>>> creating new image entity opens image property options
             onShow: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'true');
             },
             onHide: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'false');
             },
-<<<<<<< HEAD
             onChange: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
-=======
-            onSubmit: function(hsb, hex, rgb, el) {
-                $(el).css('background-color', '#' + hex);
-                $(el).colpickHide();
->>>>>>> creating new image entity opens image property options
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox');
             }
         }));

From d390e20139efdd55dea99abe44959bbf2e203a46 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 24 Jan 2018 11:31:47 -0800
Subject: [PATCH 082/569] removed extraneous commenting and image class

---
 .../resources/qml/hifi/tablet/EditTabView.qml |   1 -
 .../entities/src/EntityItemProperties.cpp     |  24 ---
 libraries/entities/src/EntityItemProperties.h |   2 -
 libraries/entities/src/EntityPropertyFlags.h  |   3 -
 libraries/entities/src/EntityTypes.cpp        |   2 -
 libraries/entities/src/EntityTypes.h          |   1 -
 libraries/entities/src/ImageEntityItem.cpp    | 144 ------------------
 libraries/entities/src/ImageEntityItem.h      |  66 --------
 scripts/system/edit.js                        |   9 +-
 scripts/system/html/js/entityProperties.js    |   1 -
 10 files changed, 1 insertion(+), 252 deletions(-)
 delete mode 100644 libraries/entities/src/ImageEntityItem.cpp
 delete mode 100644 libraries/entities/src/ImageEntityItem.h

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index 482469d355..ea5762d00a 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -101,7 +101,6 @@ TabView {
                     }
                 }
 
-                // for image
                 NewEntityButton {
                     icon: "icons/create-icons/25-web-1-01.svg"
                     text: "IMAGE"
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 7fcfc00ee8..e2a5ddf8b5 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -350,8 +350,6 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_AMBIENT_LIGHT_MODE, ambientLightMode);
     CHECK_PROPERTY_CHANGE(PROP_SKYBOX_MODE, skyboxMode);
 
-    //CHECK_PROPERTY_CHANGE(PROP_IMAGE_URL, imageURL);
-
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_DATA, voxelData);
@@ -592,13 +590,6 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_SKYBOX_MODE, skyboxMode, getSkyboxModeAsString());
     }
 
-
-
-    /*// Image only
-    if (_type == EntityTypes::Image) {
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IMAGE_URL, imageURL);
-    }*/
-
     // Web only
     if (_type == EntityTypes::Web) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_SOURCE_URL, sourceUrl);
@@ -789,8 +780,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(ambientLightMode, AmbientLightMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(skyboxMode, SkyboxMode);
 
-    //COPY_PROPERTY_FROM_QSCRIPTVALUE(imageURL, QString, setImageURL);
-
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelVolumeSize, glmVec3, setVoxelVolumeSize);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelData, QByteArray, setVoxelData);
@@ -951,8 +940,6 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(ambientLightMode);
     COPY_PROPERTY_IF_CHANGED(skyboxMode);
 
-    //COPY_PROPERTY_IF_CHANGED(imageURL);
-
     COPY_PROPERTY_IF_CHANGED(sourceUrl);
     COPY_PROPERTY_IF_CHANGED(voxelVolumeSize);
     COPY_PROPERTY_IF_CHANGED(voxelData);
@@ -1146,7 +1133,6 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
         ADD_PROPERTY_TO_MAP(PROP_NAME, Name, name, QString);
         ADD_PROPERTY_TO_MAP(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString);
-        //ADD_PROPERTY_TO_MAP(PROP_IMAGE_URL, ImageURL, imageURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_LINE_WIDTH, LineWidth, lineWidth, float);
         ADD_PROPERTY_TO_MAP(PROP_LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>);
         ADD_PROPERTY_TO_MAP(PROP_HREF, Href, href, QString);
@@ -1383,10 +1369,6 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_DPI, properties.getDPI());
             }
 
-            /*if (properties.getType() == EntityTypes::Image) {
-                APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, properties.getImageURL());
-            }*/
-
             if (properties.getType() == EntityTypes::Text) {
                 APPEND_ENTITY_PROPERTY(PROP_TEXT, properties.getText());
                 APPEND_ENTITY_PROPERTY(PROP_LINE_HEIGHT, properties.getLineHeight());
@@ -1748,10 +1730,6 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DPI, uint16_t, setDPI);
     }
 
-    /*if (properties.getType() == EntityTypes::Image) {
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IMAGE_URL, QString, setImageURL);
-    }*/
-
     if (properties.getType() == EntityTypes::Text) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT, QString, setText);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_HEIGHT, float, setLineHeight);
@@ -2069,8 +2047,6 @@ void EntityItemProperties::markAllChanged() {
     _skybox.markAllChanged();
     _haze.markAllChanged();
 
-    //_imageURLChanged = true;
-
     _sourceUrlChanged = true;
     _voxelVolumeSizeChanged = true;
     _voxelDataChanged = true;
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 5ca28a12c5..3e0770f386 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -67,7 +67,6 @@ class EntityItemProperties {
     friend class ParticleEffectEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class ZoneEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class WebEntityItem; // TODO: consider removing this friend relationship and use public methods
-    //friend class ImageEntityItem;
     friend class LineEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyVoxEntityItem; // TODO: consider removing this friend relationship and use public methods
     friend class PolyLineEntityItem; // TODO: consider removing this friend relationship and use public methods
@@ -195,7 +194,6 @@ public:
     DEFINE_PROPERTY_GROUP(Haze, haze, HazePropertyGroup);
     DEFINE_PROPERTY_GROUP(Animation, animation, AnimationPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString, "");
-    //DEFINE_PROPERTY_REF(PROP_IMAGE_URL, ImageURL, imageURL, QString, "");
     DEFINE_PROPERTY(PROP_LINE_WIDTH, LineWidth, lineWidth, float, LineEntityItem::DEFAULT_LINE_WIDTH);
     DEFINE_PROPERTY_REF(LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>, QVector<glm::vec3>());
     DEFINE_PROPERTY_REF(PROP_HREF, Href, href, QString, "");
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index ec8f4e08c8..90438ab01c 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -42,9 +42,6 @@ enum EntityPropertyList {
     PROP_ANIMATION_ALLOW_TRANSLATION,
     PROP_RELAY_PARENT_JOINTS,
 
-    /*// for image
-    PROP_IMAGE_URL,*/
-
     // these properties are supported by the EntityItem base class
     PROP_REGISTRATION_POINT,
     PROP_ANGULAR_VELOCITY,
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 6bf5a176a7..cb17c28fd7 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -28,7 +28,6 @@
 #include "LineEntityItem.h"
 #include "PolyVoxEntityItem.h"
 #include "PolyLineEntityItem.h"
-//#include "ImageEntityItem.h"
 #include "ShapeEntityItem.h"
 
 QMap<EntityTypes::EntityType, QString> EntityTypes::_typeToNameMap;
@@ -48,7 +47,6 @@ REGISTER_ENTITY_TYPE(Zone)
 REGISTER_ENTITY_TYPE(Line)
 REGISTER_ENTITY_TYPE(PolyVox)
 REGISTER_ENTITY_TYPE(PolyLine)
-//REGISTER_ENTITY_TYPE(Image)
 REGISTER_ENTITY_TYPE(Shape)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, ShapeEntityItem::boxFactory)
 REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, ShapeEntityItem::sphereFactory)
diff --git a/libraries/entities/src/EntityTypes.h b/libraries/entities/src/EntityTypes.h
index 6fe4274820..316bf2b813 100644
--- a/libraries/entities/src/EntityTypes.h
+++ b/libraries/entities/src/EntityTypes.h
@@ -48,7 +48,6 @@ public:
         Line,
         PolyVox,
         PolyLine,
-        //Image,
         Shape,
         LAST = Shape
     } EntityType;
diff --git a/libraries/entities/src/ImageEntityItem.cpp b/libraries/entities/src/ImageEntityItem.cpp
deleted file mode 100644
index 9969a39ed0..0000000000
--- a/libraries/entities/src/ImageEntityItem.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-//  ImageEntityItem.cpp
-//  libraries/entities/src
-//
-//  Created by Elisa Lupin-Jimenez on 1/3/18.
-//  Copyright 2018 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
-//
-
-/* NOT IN USE
-
-#include <QtCore/QJsonDocument>
-
-#include <ByteCountCoding.h>
-#include <GLMHelpers.h>
-#include <glm/gtx/transform.hpp>
-#include <GeometryUtil.h>
-
-#include "EntitiesLogging.h"
-#include "EntityItemProperties.h"
-#include "EntityTree.h"
-#include "EntityTreeElement.h"
-#include "ResourceCache.h"
-#include "ShapeEntityItem.h"
-#include "ImageEntityItem.h"
-
-const QString ImageEntityItem::DEFAULT_IMAGE_URL("");
-
-EntityItemPointer ImageEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity(new ImageEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
-    entity->setProperties(properties);
-    return entity;
-}
-
-ImageEntityItem::ImageEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
-    //_type = EntityTypes::Image;
-}
-
-EntityItemProperties ImageEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
-    EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(imageURL, getImageURL);
-    // Using "Quad" shape as defined in ShapeEntityItem.cpp
-    properties.setShape("Quad");
-    return properties;
-}
-
-bool ImageEntityItem::setProperties(const EntityItemProperties& properties) {
-    bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
-
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(imageURL, setImageURL);
-
-    if (somethingChanged) {
-        bool wantDebug = false;
-        if (wantDebug) {
-            uint64_t now = usecTimestampNow();
-            int elapsed = now - getLastEdited();
-            qCDebug(entities) << "ImageEntityItem::setProperties() AFTER update... edited AGO=" << elapsed <<
-                "now=" << now << " getLastEdited()=" << getLastEdited();
-        }
-        setLastEdited(properties.getLastEdited());
-    }
-    return somethingChanged;
-}
-
-// TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
-EntityPropertyFlags ImageEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
-    EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
-    requestedProperties += PROP_IMAGE_URL;
-    return requestedProperties;
-}
-
-void ImageEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-    EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
-    EntityPropertyFlags& requestedProperties,
-    EntityPropertyFlags& propertyFlags,
-    EntityPropertyFlags& propertiesDidntFit,
-    int& propertyCount,
-    OctreeElement::AppendState& appendState) const {
-
-    bool successPropertyFits = true;
-    // Using "Quad" shape as defined in ShapeEntityItem.cpp
-    APPEND_ENTITY_PROPERTY(PROP_IMAGE_URL, _imageURL);
-}
-
-int ImageEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-    ReadBitstreamToTreeParams& args,
-    EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-    bool& somethingChanged) {
-
-    int bytesRead = 0;
-    const unsigned char* dataAt = data;
-
-    READ_ENTITY_PROPERTY(PROP_IMAGE_URL, QString, setImageURL);
-
-    return bytesRead;
-}
-
-void ImageEntityItem::setUnscaledDimensions(const glm::vec3& value) {
-    const float MAX_FLAT_DIMENSION = 0.0001f;
-    if (value.y > MAX_FLAT_DIMENSION) {
-        // enforce flatness in Y
-        glm::vec3 newDimensions = value;
-        newDimensions.y = MAX_FLAT_DIMENSION;
-        EntityItem::setUnscaledDimensions(newDimensions);
-    } else {
-        EntityItem::setUnscaledDimensions(value);
-    }
-}
-
-void ImageEntityItem::setImageURL(const QString& value) {
-    withWriteLock([&] {
-        if (_imageURL != value) {
-            auto newURL = QUrl::fromUserInput(value);
-
-            if (newURL.isValid()) {
-                _imageURL = newURL.toDisplayString();
-            } else {
-                qCDebug(entities) << "Clearing image entity source URL since" << value << "cannot be parsed to a valid URL.";
-            }
-        }
-    });
-}
-
-QString ImageEntityItem::getImageURL() const {
-    return resultWithReadLock<QString>([&] {
-        return _imageURL;
-    });
-}
-
-void ImageEntityItem::computeShapeInfo(ShapeInfo& info) {
-    // This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc)
-    // is set.
-
-    EntityItem::computeShapeInfo(info);
-}
-
-// This value specifies how the shape should be treated by physics calculations.
-ShapeType ImageEntityItem::getShapeType() const {
-    return _collisionShapeType;
-}
-
-*/
diff --git a/libraries/entities/src/ImageEntityItem.h b/libraries/entities/src/ImageEntityItem.h
deleted file mode 100644
index 276d21e6f0..0000000000
--- a/libraries/entities/src/ImageEntityItem.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  ImageEntityItem.h
-//  libraries/entities/src
-//
-//  Created by Elisa Lupin-Jimenez on 1/3/18.
-//  Copyright 2018 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
-//
-
-/* NOT IN USE
-
-#ifndef hifi_ImageEntityItem_h
-#define hifi_ImageEntityItem_h
-
-#include "EntityItem.h"
-#include "ShapeEntityItem.h"
-
-class ImageEntityItem : public EntityItem {
-public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-
-    ImageEntityItem(const EntityItemID& entityItemID);
-
-    ALLOW_INSTANTIATION // This class can be instantiated
-
-    // methods for getting/setting all properties of an entity
-    virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
-    virtual bool setProperties(const EntityItemProperties& properties) override;
-
-    EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
-
-    virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
-        EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
-        EntityPropertyFlags& requestedProperties,
-        EntityPropertyFlags& propertyFlags,
-        EntityPropertyFlags& propertiesDidntFit,
-        int& propertyCount,
-        OctreeElement::AppendState& appendState) const override;
-
-    int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-        ReadBitstreamToTreeParams& args,
-        EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-        bool& somethingChanged) override;
-
-    void setUnscaledDimensions(const glm::vec3& value) override;
-
-    static const QString DEFAULT_IMAGE_URL;
-    virtual void setImageURL(const QString& value);
-    QString getImageURL() const;
-
-    //virtual void computeShapeInfo(ShapeInfo& info) override;
-    virtual ShapeType getShapeType() const override;
-
-protected:
-    QString _imageURL;
-
-    entity::Shape _shape{ entity::Shape::Quad };
-    ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_BOX };
-
-};
-
-#endif // hifi_ImageEntityItem_h
-
-*/
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index a5c236a6c9..20425c7ea6 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -251,9 +251,7 @@ var toolBar = (function () {
             // Align entity with Avatar orientation.
             properties.rotation = MyAvatar.orientation;
             
-            // added image here
             var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
-            //var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Image", "Web"];
 
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
                     
@@ -541,21 +539,16 @@ var toolBar = (function () {
             });
         });
 
-        // for image button
         addButton("newImageButton", "web-01.svg", function () {
             createNewEntity({
                 type: "Model",
-                // make constant for this later
                 dimensions: {
                     x: 4.16,
                     y: 0.02,
                     z: 2.58
                 },
                 modelURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx",
-                // will this work?
-                /*get textures() {
-                    return JSON.stringify({ "tex.picture": this.imageURL });
-                }*/
+                // change to another default image
                 textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
             });
         });
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index e7526fa2e0..59b54b1020 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1000,7 +1000,6 @@ function loaded() {
                             elWebDPI.value = properties.dpi;
                         } else if (properties.type === "Image") {
                             var imageLink = JSON.parse(properties.textures)["tex.picture"];
-                            debugPrint("image url is: " + imageLink);
                             elImageURL.value = imageLink;
                         } else if (properties.type === "Text") {
                             elTextText.value = properties.text;

From bd7204e6efd507be41c4a45d3ec4e21d61d44db2 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 24 Jan 2018 12:01:59 -0800
Subject: [PATCH 083/569] image entity now has grabbable and dynamic options

---
 scripts/system/edit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 20425c7ea6..c298da38bc 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -547,6 +547,7 @@ var toolBar = (function () {
                     y: 0.02,
                     z: 2.58
                 },
+                shapeType: "box",
                 modelURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx",
                 // change to another default image
                 textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })

From 2ff47fa454b494ce64d2afa7e4396f0233e32ea7 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Thu, 25 Jan 2018 14:39:45 -0800
Subject: [PATCH 084/569] images auto-add to asset server, started asset
 browser add link

---
 interface/resources/qml/hifi/AssetServer.qml |  3 +-
 interface/src/Application.cpp                | 42 ++++++++++++++++----
 interface/src/Application.h                  |  1 +
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 37c3c2adab..6a4e703413 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -142,8 +142,9 @@ Windows.ScrollingWindow {
         });
     }
 
+    // Elisa note - need to link this with specific add entity call
     function canAddToWorld(path) {
-        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
         
         if (selectedItems > 1) {
             return false;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 99bd4d5758..b53ba61e61 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -335,15 +335,17 @@ static const int MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
 // we will never drop below the 'min' value
 static const int MIN_PROCESSING_THREAD_POOL_SIZE = 1;
 
-static const QString SNAPSHOT_EXTENSION  = ".jpg";
-static const QString SVO_EXTENSION  = ".svo";
+static const QString SNAPSHOT_EXTENSION = ".jpg";
+static const QString JPG_EXTENSION = ".jpg";
+static const QString PNG_EXTENSION = ".png";
+static const QString SVO_EXTENSION = ".svo";
 static const QString SVO_JSON_EXTENSION = ".svo.json";
 static const QString JSON_GZ_EXTENSION = ".json.gz";
 static const QString JSON_EXTENSION = ".json";
-static const QString JS_EXTENSION  = ".js";
-static const QString FST_EXTENSION  = ".fst";
-static const QString FBX_EXTENSION  = ".fbx";
-static const QString OBJ_EXTENSION  = ".obj";
+static const QString JS_EXTENSION = ".js";
+static const QString FST_EXTENSION = ".fst";
+static const QString FBX_EXTENSION = ".fbx";
+static const QString OBJ_EXTENSION = ".obj";
 static const QString AVA_JSON_EXTENSION = ".ava.json";
 static const QString WEB_VIEW_TAG = "noDownload=true";
 static const QString ZIP_EXTENSION = ".zip";
@@ -382,7 +384,9 @@ const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensi
     { JS_EXTENSION, &Application::askToLoadScript },
     { FST_EXTENSION, &Application::askToSetAvatarUrl },
     { JSON_GZ_EXTENSION, &Application::askToReplaceDomainContent },
-    { ZIP_EXTENSION, &Application::importFromZIP }
+    { ZIP_EXTENSION, &Application::importFromZIP },
+    { JPG_EXTENSION, &Application::importImage },
+    { PNG_EXTENSION, &Application::importImage }
 };
 
 class DeadlockWatchdogThread : public QThread {
@@ -2899,6 +2903,27 @@ bool Application::importFromZIP(const QString& filePath) {
     return true;
 }
 
+bool Application::importImage(const QString& urlString) {
+    qCDebug(interfaceapp) << "dragged image";
+    QString filepath(urlString);
+    filepath.remove("file:///");
+    //<<gets stuck at addAssetToWorldUpload()>>
+    addAssetToWorld(filepath, "", false, false);
+    //emit uploadRequest(urlString);
+    /*auto upload = DependencyManager::get<AssetClient>()->createUpload(urlString);
+    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
+    if (upload->getError() != AssetUpload::NoError) {
+    QString errorInfo = "Could not upload model to the Asset Server.";
+    qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+    //addAssetToWorldError(filenameFromPath(urlString), errorInfo);
+    } else {
+    //addAssetToWorldSetMapping(urlString, QString("/" + filenameFromPath(urlString)), hash);
+    }
+    upload->deleteLater();
+    });*/
+    return true;
+}
+
 // thread-safe
 void Application::onPresent(quint32 frameCount) {
     bool expected = false;
@@ -6403,6 +6428,7 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
     // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
     QString mapping;
     QString filename = filenameFromPath(path);
+    qCDebug(interfaceapp) << "Filename is: " << filename;
     if (isZip || isBlocks) {
         QString assetName = zipFile.section("/", -1).remove(QRegExp("[.]zip(.*)$"));
         QString assetFolder = path.section("model_repo/", -1);
@@ -6425,6 +6451,8 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
 }
 
 void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) {
+    qCDebug(interfaceapp) << "mapping request is: " << mapping;
+    qCDebug(interfaceapp) << "file is located: " << filePath;
     auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
 
     QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ddb8ce11e5..0e9bf95081 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -469,6 +469,7 @@ private:
     bool importJSONFromURL(const QString& urlString);
     bool importSVOFromURL(const QString& urlString);
     bool importFromZIP(const QString& filePath);
+    bool importImage(const QString& urlString);
 
     bool nearbyEntitiesAreReadyForPhysics();
     int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode);

From 62437dcc2265886c5d0fb7349c4625d4e68d18d7 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Thu, 25 Jan 2018 15:26:26 -0800
Subject: [PATCH 085/569] drag and drop works

---
 interface/src/Application.cpp | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b53ba61e61..b203487547 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2904,23 +2904,10 @@ bool Application::importFromZIP(const QString& filePath) {
 }
 
 bool Application::importImage(const QString& urlString) {
-    qCDebug(interfaceapp) << "dragged image";
+    qCDebug(interfaceapp) << "An image file has been dropped in";
     QString filepath(urlString);
     filepath.remove("file:///");
-    //<<gets stuck at addAssetToWorldUpload()>>
     addAssetToWorld(filepath, "", false, false);
-    //emit uploadRequest(urlString);
-    /*auto upload = DependencyManager::get<AssetClient>()->createUpload(urlString);
-    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
-    if (upload->getError() != AssetUpload::NoError) {
-    QString errorInfo = "Could not upload model to the Asset Server.";
-    qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-    //addAssetToWorldError(filenameFromPath(urlString), errorInfo);
-    } else {
-    //addAssetToWorldSetMapping(urlString, QString("/" + filenameFromPath(urlString)), hash);
-    }
-    upload->deleteLater();
-    });*/
     return true;
 }
 
@@ -6428,7 +6415,6 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
     // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
     QString mapping;
     QString filename = filenameFromPath(path);
-    qCDebug(interfaceapp) << "Filename is: " << filename;
     if (isZip || isBlocks) {
         QString assetName = zipFile.section("/", -1).remove(QRegExp("[.]zip(.*)$"));
         QString assetFolder = path.section("model_repo/", -1);
@@ -6451,8 +6437,6 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
 }
 
 void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) {
-    qCDebug(interfaceapp) << "mapping request is: " << mapping;
-    qCDebug(interfaceapp) << "file is located: " << filePath;
     auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
 
     QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
@@ -6519,7 +6503,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
             // to prevent files that aren't models from being loaded into world automatically
-            if (filePath.endsWith(".obj") || filePath.endsWith(".fbx")) {
+            if (filePath.endsWith(OBJ_EXTENSION) || filePath.endsWith(FBX_EXTENSION) || 
+                filePath.endsWith(JPG_EXTENSION) || filePath.endsWith(PNG_EXTENSION)) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {
                 qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
@@ -6536,8 +6521,17 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
     EntityItemProperties properties;
     properties.setType(EntityTypes::Model);
     properties.setName(mapping.right(mapping.length() - 1));
-    properties.setModelURL("atp:" + mapping);
-    properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
+    if (filePath.endsWith(PNG_EXTENSION) || filePath.endsWith(JPG_EXTENSION)) {
+        QJsonObject textures {
+            {"tex.picture", QString("atp:" + mapping) }
+        };
+        properties.setModelURL("https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx");
+        properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact));
+        properties.setShapeType(SHAPE_TYPE_BOX);
+    } else {
+        properties.setModelURL("atp:" + mapping);
+        properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
+    }
     properties.setCollisionless(true);  // Temporarily set so that doesn't collide with avatar.
     properties.setVisible(false);  // Temporarily set so that don't see at large unresized dimensions.
     glm::vec3 positionOffset = getMyAvatar()->getWorldOrientation() * (getMyAvatar()->getSensorToWorldScale() * glm::vec3(0.0f, 0.0f, -2.0f));

From 9f8e2017ceab378aec06a75c6f447317f68b1e32 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Fri, 26 Jan 2018 14:39:04 -0800
Subject: [PATCH 086/569] can add image directly from asset server

---
 interface/resources/qml/hifi/AssetServer.qml  | 167 ++++++++++--------
 .../qml/hifi/dialogs/TabletAssetServer.qml    | 167 ++++++++++--------
 .../entities/src/EntityScriptingInterface.cpp |   5 +-
 .../entities/src/EntityScriptingInterface.h   |   2 +-
 4 files changed, 183 insertions(+), 158 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 6a4e703413..04fceec1f3 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -182,92 +182,103 @@ Windows.ScrollingWindow {
             return;
         }
 
-        var SHAPE_TYPE_NONE = 0;
-        var SHAPE_TYPE_SIMPLE_HULL = 1;
-        var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
-        var SHAPE_TYPE_STATIC_MESH = 3;
-        var SHAPE_TYPE_BOX = 4;
-        var SHAPE_TYPE_SPHERE = 5;
+        if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
+            var name = assetProxyModel.data(treeView.selection.currentIndex);
+            var modelURL = "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx";
+            var textures = JSON.stringify({ "tex.picture": defaultURL});
+            var shapeType = "box";
+            var dynamic = false;
+            var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
+            var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
+        } else {
+            var SHAPE_TYPE_NONE = 0;
+            var SHAPE_TYPE_SIMPLE_HULL = 1;
+            var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
+            var SHAPE_TYPE_STATIC_MESH = 3;
+            var SHAPE_TYPE_BOX = 4;
+            var SHAPE_TYPE_SPHERE = 5;
         
-        var SHAPE_TYPES = [];
-        SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
-        SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
-        SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
-        SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
-        SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
-        SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
+            var SHAPE_TYPES = [];
+            SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
+            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
+            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
+            SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
+            SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
+            SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
         
-        var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
-        var DYNAMIC_DEFAULT = false;
-        var prompt = desktop.customInputDialog({
-            textInput: {
-                label: "Model URL",
-                text: defaultURL
-            },
-            comboBox: {
-                label: "Automatic Collisions",
-                index: SHAPE_TYPE_DEFAULT,
-                items: SHAPE_TYPES
-            },
-            checkBox: {
-                label: "Dynamic",
-                checked: DYNAMIC_DEFAULT,
-                disableForItems: [
-                    SHAPE_TYPE_STATIC_MESH
-                ],
-                checkStateOnDisable: false,
-                warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
-            }
-        });
-
-        prompt.selected.connect(function (jsonResult) {
-            if (jsonResult) {
-                var result = JSON.parse(jsonResult);
-                var url = result.textInput.trim();
-                var shapeType;
-                switch (result.comboBox) {
-                    case SHAPE_TYPE_SIMPLE_HULL:
-                        shapeType = "simple-hull";
-                        break;
-                    case SHAPE_TYPE_SIMPLE_COMPOUND:
-                        shapeType = "simple-compound";
-                        break;
-                    case SHAPE_TYPE_STATIC_MESH:
-                        shapeType = "static-mesh";
-                        break;
-                    case SHAPE_TYPE_BOX:
-                        shapeType = "box";
-                        break;
-                    case SHAPE_TYPE_SPHERE:
-                        shapeType = "sphere";
-                        break;
-                    default:
-                        shapeType = "none";
+            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
+            var DYNAMIC_DEFAULT = false;
+            var prompt = desktop.customInputDialog({
+                textInput: {
+                    label: "Model URL",
+                    text: defaultURL
+                },
+                comboBox: {
+                    label: "Automatic Collisions",
+                    index: SHAPE_TYPE_DEFAULT,
+                    items: SHAPE_TYPES
+                },
+                checkBox: {
+                    label: "Dynamic",
+                    checked: DYNAMIC_DEFAULT,
+                    disableForItems: [
+                        SHAPE_TYPE_STATIC_MESH
+                    ],
+                    checkStateOnDisable: false,
+                    warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
                 }
+            });
 
-                var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
-                if (shapeType === "static-mesh" && dynamic) {
-                    // The prompt should prevent this case
-                    print("Error: model cannot be both static mesh and dynamic.  This should never happen.");
-                } else if (url) {
-                    var name = assetProxyModel.data(treeView.selection.currentIndex);
-                    var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
-                    var gravity;
-                    if (dynamic) {
-                        // Create a vector <0, -10, 0>.  { x: 0, y: -10, z: 0 } won't work because Qt is dumb and this is a
-                        // different scripting engine from QTScript.
-                        gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 10);
-                    } else {
-                        gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+            prompt.selected.connect(function (jsonResult) {
+                if (jsonResult) {
+                    var result = JSON.parse(jsonResult);
+                    var url = result.textInput.trim();
+                    var shapeType;
+                    switch (result.comboBox) {
+                        case SHAPE_TYPE_SIMPLE_HULL:
+                            shapeType = "simple-hull";
+                            break;
+                        case SHAPE_TYPE_SIMPLE_COMPOUND:
+                            shapeType = "simple-compound";
+                            break;
+                        case SHAPE_TYPE_STATIC_MESH:
+                            shapeType = "static-mesh";
+                            break;
+                        case SHAPE_TYPE_BOX:
+                            shapeType = "box";
+                            break;
+                        case SHAPE_TYPE_SPHERE:
+                            shapeType = "sphere";
+                            break;
+                        default:
+                            shapeType = "none";
                     }
 
-                    print("Asset browser - adding asset " + url + " (" + name + ") to world.");
+                    var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
+                    if (shapeType === "static-mesh" && dynamic) {
+                        // The prompt should prevent this case
+                        print("Error: model cannot be both static mesh and dynamic.  This should never happen.");
+                    } else if (url) {
+                        var name = assetProxyModel.data(treeView.selection.currentIndex);
+                        var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
+                        var gravity;
+                        if (dynamic) {
+                            // Create a vector <0, -10, 0>.  { x: 0, y: -10, z: 0 } won't work because Qt is dumb and this is a
+                            // different scripting engine from QTScript.
+                            gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 10);
+                        } else {
+                            gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+                        }
 
-                    // Entities.addEntity doesn't work from QML, so we use this.
-                    Entities.addModelEntity(name, url, shapeType, dynamic, addPosition, gravity);
+                        print("Asset browser - adding asset " + url + " (" + name + ") to world.");
+
+                        // Entities.addEntity doesn't work from QML, so we use this.
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     function copyURLToClipboard(index) {
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index a02496a252..ef4fb8d177 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -182,92 +182,103 @@ Rectangle {
             return;
         }
 
-        var SHAPE_TYPE_NONE = 0;
-        var SHAPE_TYPE_SIMPLE_HULL = 1;
-        var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
-        var SHAPE_TYPE_STATIC_MESH = 3;
-        var SHAPE_TYPE_BOX = 4;
-        var SHAPE_TYPE_SPHERE = 5;
+        if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
+            var name = assetProxyModel.data(treeView.selection.currentIndex);
+            var modelURL = "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx";
+            var textures = JSON.stringify({ "tex.picture": defaultURL});
+            var shapeType = "box";
+            var dynamic = false;
+            var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
+            var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
+        } else {
+            var SHAPE_TYPE_NONE = 0;
+            var SHAPE_TYPE_SIMPLE_HULL = 1;
+            var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
+            var SHAPE_TYPE_STATIC_MESH = 3;
+            var SHAPE_TYPE_BOX = 4;
+            var SHAPE_TYPE_SPHERE = 5;
         
-        var SHAPE_TYPES = [];
-        SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
-        SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
-        SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
-        SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
-        SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
-        SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
+            var SHAPE_TYPES = [];
+            SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
+            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
+            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
+            SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
+            SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
+            SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
         
-        var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
-        var DYNAMIC_DEFAULT = false;
-        var prompt = tabletRoot.customInputDialog({
-            textInput: {
-                label: "Model URL",
-                text: defaultURL
-            },
-            comboBox: {
-                label: "Automatic Collisions",
-                index: SHAPE_TYPE_DEFAULT,
-                items: SHAPE_TYPES
-            },
-            checkBox: {
-                label: "Dynamic",
-                checked: DYNAMIC_DEFAULT,
-                disableForItems: [
-                    SHAPE_TYPE_STATIC_MESH
-                ],
-                checkStateOnDisable: false,
-                warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
-            }
-        });
-
-        prompt.selected.connect(function (jsonResult) {
-            if (jsonResult) {
-                var result = JSON.parse(jsonResult);
-                var url = result.textInput.trim();
-                var shapeType;
-                switch (result.comboBox) {
-                    case SHAPE_TYPE_SIMPLE_HULL:
-                        shapeType = "simple-hull";
-                        break;
-                    case SHAPE_TYPE_SIMPLE_COMPOUND:
-                        shapeType = "simple-compound";
-                        break;
-                    case SHAPE_TYPE_STATIC_MESH:
-                        shapeType = "static-mesh";
-                        break;
-                    case SHAPE_TYPE_BOX:
-                        shapeType = "box";
-                        break;
-                    case SHAPE_TYPE_SPHERE:
-                        shapeType = "sphere";
-                        break;
-                    default:
-                        shapeType = "none";
+            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
+            var DYNAMIC_DEFAULT = false;
+            var prompt = tabletRoot.customInputDialog({
+                textInput: {
+                    label: "Model URL",
+                    text: defaultURL
+                },
+                comboBox: {
+                    label: "Automatic Collisions",
+                    index: SHAPE_TYPE_DEFAULT,
+                    items: SHAPE_TYPES
+                },
+                checkBox: {
+                    label: "Dynamic",
+                    checked: DYNAMIC_DEFAULT,
+                    disableForItems: [
+                        SHAPE_TYPE_STATIC_MESH
+                    ],
+                    checkStateOnDisable: false,
+                    warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
                 }
+            });
 
-                var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
-                if (shapeType === "static-mesh" && dynamic) {
-                    // The prompt should prevent this case
-                    print("Error: model cannot be both static mesh and dynamic.  This should never happen.");
-                } else if (url) {
-                    var name = assetProxyModel.data(treeView.selection.currentIndex);
-                    var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
-                    var gravity;
-                    if (dynamic) {
-                        // Create a vector <0, -10, 0>.  { x: 0, y: -10, z: 0 } won't work because Qt is dumb and this is a
-                        // different scripting engine from QTScript.
-                        gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 10);
-                    } else {
-                        gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+            prompt.selected.connect(function (jsonResult) {
+                if (jsonResult) {
+                    var result = JSON.parse(jsonResult);
+                    var url = result.textInput.trim();
+                    var shapeType;
+                    switch (result.comboBox) {
+                        case SHAPE_TYPE_SIMPLE_HULL:
+                            shapeType = "simple-hull";
+                            break;
+                        case SHAPE_TYPE_SIMPLE_COMPOUND:
+                            shapeType = "simple-compound";
+                            break;
+                        case SHAPE_TYPE_STATIC_MESH:
+                            shapeType = "static-mesh";
+                            break;
+                        case SHAPE_TYPE_BOX:
+                            shapeType = "box";
+                            break;
+                        case SHAPE_TYPE_SPHERE:
+                            shapeType = "sphere";
+                            break;
+                        default:
+                            shapeType = "none";
                     }
 
-                    print("Asset browser - adding asset " + url + " (" + name + ") to world.");
+                    var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
+                    if (shapeType === "static-mesh" && dynamic) {
+                        // The prompt should prevent this case
+                        print("Error: model cannot be both static mesh and dynamic.  This should never happen.");
+                    } else if (url) {
+                        var name = assetProxyModel.data(treeView.selection.currentIndex);
+                        var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
+                        var gravity;
+                        if (dynamic) {
+                            // Create a vector <0, -10, 0>.  { x: 0, y: -10, z: 0 } won't work because Qt is dumb and this is a
+                            // different scripting engine from QTScript.
+                            gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 10);
+                        } else {
+                            gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
+                        }
 
-                    // Entities.addEntity doesn't work from QML, so we use this.
-                    Entities.addModelEntity(name, url, shapeType, dynamic, addPosition, gravity);
+                        print("Asset browser - adding asset " + url + " (" + name + ") to world.");
+
+                        // Entities.addEntity doesn't work from QML, so we use this.
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     function copyURLToClipboard(index) {
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 4342f0e683..06a141a95e 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -299,7 +299,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
     }
 }
 
-QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType,
+QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QString& modelUrl, const QString& textures, const QString& shapeType,
                                                bool dynamic, const glm::vec3& position, const glm::vec3& gravity) {
     _activityTracking.addedEntityCount++;
 
@@ -311,6 +311,9 @@ QUuid EntityScriptingInterface::addModelEntity(const QString& name, const QStrin
     properties.setDynamic(dynamic);
     properties.setPosition(position);
     properties.setGravity(gravity);
+    if (!textures.isEmpty()) {
+        properties.setTextures(textures);
+    }
     return addEntity(properties);
 }
 
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index d1b321dbca..919d0e3489 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -158,7 +158,7 @@ public slots:
 
     /// temporary method until addEntity can be used from QJSEngine
     /// Deliberately not adding jsdoc, only used internally.
-    Q_INVOKABLE QUuid addModelEntity(const QString& name, const QString& modelUrl, const QString& shapeType, bool dynamic,
+    Q_INVOKABLE QUuid addModelEntity(const QString& name, const QString& modelUrl, const QString& textures, const QString& shapeType, bool dynamic,
                                      const glm::vec3& position, const glm::vec3& gravity);
 
     /**jsdoc

From cc4bafb46fdcd4b599e2d24d2fd09393bec555dd Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Fri, 26 Jan 2018 15:40:22 -0800
Subject: [PATCH 087/569] image entities shown as images in entity list

---
 interface/resources/qml/hifi/AssetServer.qml | 1 -
 scripts/system/html/js/entityList.js         | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 04fceec1f3..b173b3826d 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -142,7 +142,6 @@ Windows.ScrollingWindow {
         });
     }
 
-    // Elisa note - need to link this with specific add entity call
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
         
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index 7b25e66c67..dde91dc694 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -156,6 +156,10 @@ function loaded() {
           var urlParts = url.split('/');
           var filename = urlParts[urlParts.length - 1];
 
+          if (url === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
+              type = "Image";
+          }
+
           if (entities[id] === undefined) {
               entityList.add([{
                   id: id, name: name, type: type, url: filename, locked: locked, visible: visible,

From f71d9e4d6a4a994cb26187476ac78e86c6f5b998 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 30 Jan 2018 17:49:30 -0800
Subject: [PATCH 088/569] snapshot referenced locally, won't work on OS

---
 interface/resources/qml/hifi/AssetServer.qml    |   2 +-
 .../qml/hifi/dialogs/TabletAssetServer.qml      |   2 +-
 interface/resources/snapshot/snapshot.fbx       | Bin 0 -> 51420 bytes
 interface/src/Application.cpp                   |   2 +-
 scripts/system/edit.js                          |   4 ++--
 scripts/system/html/js/entityList.js            |   4 +++-
 scripts/system/html/js/entityProperties.js      |   3 ++-
 7 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 interface/resources/snapshot/snapshot.fbx

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index b173b3826d..42b8118115 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -183,7 +183,7 @@ Windows.ScrollingWindow {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx";
+            var modelURL = "qrc:///snapshot/snapshot.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index ef4fb8d177..315def6f14 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -184,7 +184,7 @@ Rectangle {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx";
+            var modelURL = "qrc:///snapshot/snapshot.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/resources/snapshot/snapshot.fbx b/interface/resources/snapshot/snapshot.fbx
new file mode 100644
index 0000000000000000000000000000000000000000..641a7f82ebd0a67a9364c21867bad4a02d246048
GIT binary patch
literal 51420
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
IwBH~9Z+ICcSO5S3

literal 0
HcmV?d00001

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b203487547..53c1e3fad5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6525,7 +6525,7 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
         QJsonObject textures {
             {"tex.picture", QString("atp:" + mapping) }
         };
-        properties.setModelURL("https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx");
+        properties.setModelURL("qrc:///snapshot/snapshot.fbx");
         properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact));
         properties.setShapeType(SHAPE_TYPE_BOX);
     } else {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index c298da38bc..ece8516567 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -548,9 +548,9 @@ var toolBar = (function () {
                     z: 2.58
                 },
                 shapeType: "box",
-                modelURL: "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx",
+                modelURL: 'qrc:///snapshot/snapshot.fbx',
                 // change to another default image
-                textures: JSON.stringify({ "tex.picture": "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/dog.jpg" })
+                textures: JSON.stringify({ "tex.picture": 'qrc:///snapshot/img/no-image.jpg' })
             });
         });
 
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index dde91dc694..85cd77bd28 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -156,7 +156,9 @@ function loaded() {
           var urlParts = url.split('/');
           var filename = urlParts[urlParts.length - 1];
 
-          if (url === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
+          var snapURL = 'qrc:///snapshot/snapshot.fbx';
+
+          if (url === snapURL) {
               type = "Image";
           }
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 59b54b1020..acaff333e2 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -797,7 +797,8 @@ function loaded() {
                         elID.value = properties.id;
 
                         // HTML workaround since image is not yet a separate entity type
-                        if (properties.type === "Model" && properties.modelURL === "https://hifi-content.s3.amazonaws.com/elisalj/image_entity/snapshot.fbx") {
+                        var snapURL = 'qrc:///snapshot/snapshot.fbx';
+                        if (properties.type === "Model" && properties.modelURL === snapURL) {
                             properties.type = "Image";
                         }
 

From d7a847930d3f8d88cbbb505a6f6b6bafbbad8ac6 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 31 Jan 2018 11:44:22 -0800
Subject: [PATCH 089/569] added image icon

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 31232 -> 31500 bytes
 .../fonts/hifi-glyphs/fonts/hifi-glyphs.eot   | Bin 0 -> 31678 bytes
 .../fonts/hifi-glyphs/fonts/hifi-glyphs.svg   | 148 ++++++++++++++++++
 .../fonts/hifi-glyphs/fonts/hifi-glyphs.ttf   | Bin 0 -> 31500 bytes
 .../fonts/hifi-glyphs/fonts/hifi-glyphs.woff  | Bin 0 -> 20032 bytes
 .../fonts/hifi-glyphs/icons-reference.html    |  94 ++++++++++-
 .../resources/fonts/hifi-glyphs/styles.css    |  35 ++++-
 .../resources/icons/create-icons/image.svg    |  23 +++
 .../resources/qml/hifi/tablet/EditTabView.qml |   2 +-
 scripts/system/edit.js                        |   1 -
 scripts/system/html/js/entityProperties.js    |   2 +-
 11 files changed, 298 insertions(+), 7 deletions(-)
 create mode 100644 interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.eot
 create mode 100644 interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.svg
 create mode 100644 interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.ttf
 create mode 100644 interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.woff
 create mode 100644 interface/resources/icons/create-icons/image.svg

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 4cc5a0fe4f098a287c1df067c8bff37695f96d34..8907cf7858dd304cdad024bfa1ff4ca5cd94caf9 100644
GIT binary patch
delta 724
zcmX|8O=uHg5Ph>h-=@iK`jgG3nn;_(>^4eivq_UGO~Jo<F|=TbMMMp4+7ufbOoXNf
z)00JPFXkYKcP|x$5Gg@WiU+-jf_e}S#e)b1@t}etsbnh-ym=31-Y~<ge5bXaQ~?1{
zumT<vV`G!4a$frbEPn&wJALxh7#d)}@@oLS<7WrV@h4{r08If%Pv<j*>*03;0QVN)
zX6G`+!tO43VEF|A+uTBVcJti01h6S!VKbM_%s5l^Fo2H$;<;S5k`V@J8z2?H!Cbzy
z)bq8w1E5C$1r`>kGZRPhIY1l%$d}J76|h4W0UB;CbTyOD?i_ub28u0Dt*}@u&77$F
zfYNh-k#!sa-mUbPOYI{+;NZ}T_jeoG9&-)t4kc;5HcC}WC9NtCSnyeP&}HzJ@<E`J
zt-D~u-kclThj(`^kAEBg6s%r`XSD$DB7P0GYcV0faq$baDOSHyVMt<<wrB$iLKwm^
zq>u(EYPvN^4f+E^ov|n-DW(Vg0d|0kC*nP%B`gw6E$TNDaYHwBiAl^DrG#$iK__|C
zgvNqQH)8RGsp$dcRy}4sMsz<!WHetIVLC1-%{OvIblCQ}+9g@d?pM9d&q5nVeG1Ry
zuwn1e>da|B<gm%S<dJEWd@h&QN}(>rZC7X`baPejBPrbc<$R?GqWn-6M7gWo&g@Y|
z_0ABp$wt^A$>#-+s4~gUOI;p%;PR4JZB63kHo?uwYRz#?q0T5G=(k{E5D^Sl!^PgV
zXrw>VZw^L=tM`g}b*VT{>$OkCZsO=x?RV*^Ad2((%v^P|?5DNrhqBl4|CbHzFM6Dk
ACjbBd

delta 475
zcmX|-Pe>F27{!0z?6_>Hl;lBV(GkK38QNLUDR4XK+M&==V(DOwy1BW#IkZFUivMnc
zu9t>xA`)~ow8=vt6p=S0FG+_EdkD#nVnUZTW~4s&c<=Jw_uf}Nk@;hpLx6hb2{DjN
z4&5p){#k?4cOcr=)0^ZiVJLkBwEn>>@&4_bHb@G%JDRubp^+~yLD>UkV%#d&)hZz<
zZ3B_<T<PJ$%I+r!ry%<#leWg{vn!v0Z$MWjlb*BGm{dR-fs2{EQ*7OAIuEh|qU9z>
zt$}N19n^G#H0Q0N%}*Hyx#|acY~|BOiC6dFNgar1PZpdz_VZ;ZyoZ|KK{<i1xtW9e
z=emDUtKiRm`}*N2D(i>OBq3$*y0~&1KYOszK#GhJ3Ro0XZUASApy0dARxVdMs@1@+
zt-^nf_8?G1_yAr@=z@5iYMY{fmkMuXy@o=qG??fZ80f@_VPLwtqn$Bz!_ea~!*o}j
oc6Zu&BxUcwX_D7Z->L4-ly+$eL51KxrwMlxFZ_S{m45ugzdev~Hvj+t

diff --git a/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.eot b/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.eot
new file mode 100644
index 0000000000000000000000000000000000000000..d3591e6499c6afaf63e4a2c0f144f4722c2f8d9f
GIT binary patch
literal 31678
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
bCvOlCVat}z6UqGWr}IDmvpC=|7xaGtqWegL

literal 0
HcmV?d00001

diff --git a/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.svg b/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.svg
new file mode 100644
index 0000000000..43c4932879
--- /dev/null
+++ b/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by Fontastic.me</metadata>
+<defs>
+<font id="hifi-glyphs" horiz-adv-x="512">
+<font-face font-family="hifi-glyphs" units-per-em="512" ascent="480" descent="-32"/>
+<missing-glyph horiz-adv-x="512" />
+
+<glyph glyph-name="hmd" unicode="&#98;" d="M381 139l-70 0c-18 0-30 17-40 33-4 6-11 16-15 18-4-2-10-12-15-18-11-15-23-33-43-33l-67 0c-53 0-97 42-97 95l0 45c0 53 44 96 97 96l250 0c53 0 96-43 96-96l0-45c0-52-43-95-96-95z m-125 77c16 0 26-15 36-30 5-7 15-22 19-22l70 0c39 0 71 32 71 70l0 45c0 39-32 70-71 70l-250 0c-39 0-71-31-71-70l0-45c0-38 32-70 71-70l67 0c6 0 16 14 22 23 10 14 20 29 35 29 1 0 1 0 1 0z"/>
+<glyph glyph-name="2d-screen" unicode="&#99;" d="M395 386l-276 0c-33 0-60-28-60-61l0-116c0-33 27-62 60-62l127 0 0-27-80 0c-8 0-14-5-14-13 0-8 7-13 14-13l186 0c7 0 13 5 13 13 0 8-6 13-13 13l-81 0 0 27 124 0c33 0 60 29 60 62l0 116c0 33-27 61-60 61z m32-177c0-18-14-33-32-33l-134 0c-1 0-1 0-2 0-1 0-2 0-2 0l-138 0c-18 0-32 15-32 33l0 116c0 18 14 33 32 33l276 0c18 0 32-15 32-33z"/>
+<glyph glyph-name="keyboard" unicode="&#100;" d="M375 250l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m-36 0l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m-36 0l-26 0 0 25 26 0z m225-1l17 0c7 0 13 6 13 13 0 8-6 14-13 14l-18 0m-262 0l-17 0c-7 0-13-6-13-14 0-7 6-13 13-13l18 0m251 39l-31 0 0 25 31 0z m-41 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-42 0l-31 0 0 25 31 0z m-41 0l-32 0 0 25 32 0z m219 0l17 0c7 0 13 6 13 13 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-7 6-13 13-13l18 0m287-124l-315 0c-32 0-59 27-59 60l0 77c0 33 27 60 59 60l315 0c33 0 60-27 60-60l0-77c0-33-27-60-60-60z m-315 171c-18 0-33-15-33-34l0-77c0-19 15-34 33-34l315 0c19 0 34 16 34 34l0 77c0 19-15 34-34 34z m249-99l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m251-25l17 0c7 0 13 6 13 13 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-7 6-13 13-13l18 0"/>
+<glyph glyph-name="hand-controllers" unicode="&#101;" d="M141 268l-3 0c-7 0-13 5-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-8-6-13-13-13z m28 26l-3 0c-7 0-13 6-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-7-6-13-13-13z m-12-169l-11 0c-31 0-50 23-50 60l-10 143c0 34 27 61 60 61l11 0c33 0 60-27 60-60l0-1-10-144c0-36-20-59-50-59z m-11 238c-19 0-34-15-34-34l10-143c0-14 3-35 24-35l11 0c21 0 24 21 24 34l10 144c-1 19-16 34-34 34z m203-69c-7 0-13 5-13 13l0 2c0 8 6 13 13 13 7 0 13-5 13-13l0-2c0-7-6-13-13-13z m27-29c-8 0-13 6-13 13l0 3c0 7 5 13 13 13 7 0 13-6 13-13l0-3c0-7-6-13-13-13z m-11-140l-10 0c-31 0-51 23-51 60l-9 143c0 34 27 61 60 61l10 0c33 0 60-27 60-60l0-1-9-144c0-36-20-59-51-59z m-10 238c-19 0-34-15-34-34l9-143c0-14 4-35 25-35l11 0c21 0 24 21 24 34l9 144c0 19-15 34-33 34z"/>
+<glyph glyph-name="headphones-mic" unicode="&#102;" d="M419 348l-22 0c-3 48-42 83-89 83l-105 0c-47 0-86-35-89-83l-20 0c-25 0-45-19-45-44l0-71c0-25 20-45 45-45l19 0c1-27 14-50 33-66-3-17 5-35 20-45l41-25c7-4 15-7 23-7 3 0 6 1 10 2 11 2 21 9 27 19 13 21 6 48-14 60l-41 26c-10 6-21 8-33 5-8-2-15-6-20-11-12 11-20 27-20 45l0 152c0 34 29 62 64 62l105 0c35 0 64-28 64-62l0-152c0-1-1-3-1-3l48 0c25 0 46 20 46 45l0 71c0 25-21 44-46 44z m-306-134l-19 0c-10 0-19 9-19 19l0 71c0 10 9 19 19 19l19 0z m61-90c3 4 7 6 11 7 2 1 3 1 4 1 4 0 7-1 9-3l41-25c8-5 11-16 6-24-3-4-7-7-11-8-5-1-10 0-14 2l-40 25c-8 6-11 16-6 25z m264 109c0-10-8-19-19-19l-22 0 0 109 22 0c11 0 19-9 19-19z"/>
+<glyph glyph-name="gamepad" unicode="&#103;" d="M107 136c-10 0-20 3-29 10-46 37-8 131-4 141l1 1c1 4 3 7 5 11 16 30 37 73 81 73l182 0c51 0 71-47 87-85 5-10 44-101 4-138-28-26-67-1-102 22-21 13-42 26-56 26l-39 0c-13 0-33-13-53-27-25-16-52-34-77-34z m-10 141c-10-24-30-90-3-112 17-13 47 7 76 26 24 16 47 31 67 31l40 0c20 0 44-15 68-30 28-18 59-37 72-25 23 22 0 89-10 110-17 42-31 70-64 70l-182 0c-29 0-45-33-59-60-2-3-3-7-5-10z m247-36l-3 0c-7 0-13 6-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-7-6-13-13-13z m0 55l-3 0c-7 0-13 6-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-7-6-13-13-13z m-29-29l-2 0c-8 0-13 6-13 13 0 8 5 13 13 13l2 0c8 0 13-5 13-13 0-7-5-13-13-13z m57 0l-3 0c-7 0-13 6-13 13 0 8 6 13 13 13l3 0c7 0 13-5 13-13 0-7-6-13-13-13z m-172 26l-12 0 0 13c0 7-6 13-13 13-7 0-13-6-13-13l0-13-13 0c-7 0-13-6-13-13 0-7 6-13 13-13l13 0 0-12c0-8 6-14 13-14 7 0 13 6 13 14l0 12 12 0c8 0 13 6 13 13 0 7-5 13-13 13z"/>
+<glyph glyph-name="headphones" unicode="&#104;" d="M141 168l0 152c0 35 28 65 63 65l106 0c34 0 62-30 62-65l0-151c0-1 1-3 0-4l48 0c25 0 47 21 47 46l0 70c0 25-22 45-47 45l-21 0c-4 47-42 83-89 83l-106 0c-47 0-86-36-89-83l-19 0c-25 0-45-20-45-45l0-70c0-25 20-46 45-46l45 0z m-63 43l0 70c0 11 7 19 18 19l19 0 0-108-19 0c-11 0-18 8-18 19z m362 0c0-11-9-19-20-19l-20 0 0 108 20 0c11 0 20-8 20-19z"/>
+<glyph glyph-name="mic" unicode="&#105;" d="M318 370c0 33-26 59-59 59l-6 0c-33 0-59-26-59-59l0-105c0-33 26-59 59-59l6 0c33 0 59 26 59 59z m-25-103c0-19-15-34-34-34l-7 0c-19 0-34 15-34 34l0 104c0 19 15 34 34 34l7 0c19 0 34-15 34-34z m82 8c0 7-6 13-12 13-7 0-13-6-13-13 0-51-42-93-93-93-52 0-93 42-93 93 0 7-6 13-13 13-7 0-12-6-12-13 0-60 46-110 104-117l0-34-80 0c-8 0-14-6-14-14 0-7 6-13 14-13l186 0c7 0 13 6 13 13 0 8-6 14-13 14l-80 0 0 34c60 6 106 56 106 117z"/>
+<glyph glyph-name="upload" unicode="&#106;" d="M330 193l-83 86-84-86 52 0 0-141 61 23 0 118z m-12 247c-39 0-76-15-105-41-23-21-40-49-47-80-9 3-19 4-29 4-53 0-97-43-97-97 0-54 44-98 97-98 1 0 19 0 45 0l0 29c-26 0-44 0-45 0-37 0-68 31-68 69 0 37 31 68 68 68 12 0 23-3 34-9l19-11 2 23c3 31 18 59 41 81 23 21 54 33 85 33 70 0 127-57 127-127 0-70-57-127-127-127 0 0-5 0-10 0l0-29c5 0 10 0 10 0 86 0 156 70 156 156 0 86-70 156-156 156z"/>
+<glyph glyph-name="script" unicode="&#107;" d="M283 80l-150 0c-30 0-56 15-73 44-13 21-17 42-17 42l-3 15 91 0 0 252 315 0 0-238c1-7 5-58-21-87-13-14-29-21-50-21-42 0-63 23-73 41-6 11-9 21-10 29l-220 0c2-6 5-13 9-20 13-21 31-32 52-32l150 0c7 0 13-6 13-13 0-6-6-12-13-12z m-127 101l158 0 1-12c0 0 1-15 9-30 10-18 27-28 51-28 13 0 23 5 31 13 10 11 14 29 15 42 1 15 0 27 0 27l0 1 0 214-265 0z m225 168l-185 0c-8 0-14 6-14 13 0 8 6 14 14 14l185 0c8 0 14-6 14-14 0-7-6-13-14-13z m0-61l-185 0c-8 0-14 7-14 14 0 8 6 14 14 14l185 0c8 0 14-6 14-14 0-7-6-14-14-14z m0-60l-185 0c-8 0-14 6-14 14 0 7 6 13 14 13l185 0c8 0 14-6 14-13 0-8-6-14-14-14z"/>
+<glyph glyph-name="text" unicode="&#108;" d="M220 134l-81 232c-1 2-3 4-6 4l-10 0c-3 0-5-2-6-4l-83-233c-1-2 0-5 1-7 1-1 3-3 6-3l16 0c3 0 5 3 6 5l27 79 74 0 27-79c1-2 4-5 7-5l16 0c2 0 4 2 5 4 2 1 2 4 1 7z m-120 102l26 73c1 2 1 3 2 5 0-2 1-3 2-4l24-74z m252 60c-10 12-25 18-44 18-17 0-35-5-53-14-3-2-4-6-3-9l5-14c1-2 2-3 4-4 2-1 4 0 6 1 14 8 28 12 41 12 11 0 19-3 23-10 5-7 8-18 8-33l0-4-23-1c-25 0-44-6-58-16-14-11-21-26-21-45 0-17 4-31 14-40 10-10 23-16 40-16 12 0 23 3 32 8 6 4 11 8 17 14l1-13c1-4 4-7 7-7l10 0c4 0 8 4 8 8l0 115c0 23-5 39-14 50z m-87-119c0 11 4 19 11 24 8 5 22 9 42 10l19 1 0-10c0-17-4-30-12-39-8-9-19-13-33-13-9 0-16 2-20 7-5 4-7 11-7 20z m186-105c-10 0-15 8-15 18 0 22 0 298 0 320 0 10 5 19 15 19 0 0 0 0 0 0 10 0 15-8 15-18 1-22 1-299 1-321 0-10-6-18-16-18 0 0 0 0 0 0z"/>
+<glyph glyph-name="cube" unicode="&#109;" d="M452 421l-263 26c-3 0-6 0-8-2l0 0-126-88c-1-1-1-1-1-1-3-3-4-7-4-10l0-263c0-7 5-12 12-13l262-26c0 0 1 0 1 0 3 0 5 1 8 2l126 89c0 0 0 0 0 1 3 2 4 6 4 9l0 263c0 7-5 12-11 13z m-22-274l-2-1c0 0 0 0 0-1 0 0 0 0 0 0l-89-62 0 230 98 69 0-222c-1-6-2-9-7-13z m-227 272l211-21-92-65-222 22 86 61c1 0 1 0 1 0 0 0 0 0 0 0 3 2 7 4 11 4 2 0 4-1 5-1z m110-347l-237 23 0 236 237-23z"/>
+<glyph glyph-name="sphere" unicode="&#110;" d="M418 415c-91 91-237 91-327 0-44-43-68-101-68-163 0-62 24-120 68-164 45-45 104-67 163-67 59 0 119 22 164 67 43 44 68 102 68 164-1 62-25 120-68 163z m-305-22c30 30 67 49 106 55-8-11-14-26-20-44-13-41-20-96-20-154 0-3 0-7 0-10 6-1 12-2 19-3 2 0 4 0 6 0 0 4 0 8 0 13 0 117 30 193 52 200 1 0 1 1 1 1 51 0 100-20 138-58 37-37 58-85 59-137-5-22-82-53-200-53-116 0-192 29-200 52 1 52 22 101 59 138z m283-283c-40-39-92-59-144-58-14 9-30 43-40 97l-25 1c3-19 7-39 12-54 5-16 11-30 17-40-38 7-74 25-103 54-30 30-49 67-56 107 11-7 25-13 42-18 42-14 97-21 155-21 58 0 113 7 154 21 18 5 32 12 43 19-7-41-26-78-55-108z"/>
+<glyph glyph-name="zone" unicode="&#111;" d="M381 372c-3 7-9 11-17 11l-72 0 0-34 30 0-163-163 0 36-36 0 0-79 1 0c0-2 1-4 2-6 2-7 9-11 16-11l83 0 0 35-41 0 162 161 0-25 35 0 0 62c1 4 1 9 0 13z m-43-298c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-21-22-21-12 0-22 9-22 21z m-71 0c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-21-21-21-12 0-22 9-22 21z m-72 0c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-21-22-21-12 0-22 9-22 21z m-71 0c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-21-21-21-12 0-22 9-22 21z m-50-21c-6 0-11 2-15 6-4 4-7 10-7 15 0 6 3 12 7 16 4 4 9 6 15 6 6 0 11-2 15-6 4-4 7-10 7-16 0-5-2-11-7-15-4-4-9-6-15-6z m-22 93c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-22-22-22-12 0-22 10-22 22z m0 71c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-21-22-21-12 0-22 9-22 21z m0 72c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-22-22-22-12 0-22 10-22 22z m0 71c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-21-22-21-12 0-22 9-22 21z m286 72c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-22-22-22-12 0-22 10-22 22z m-71 0c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-22-21-22-12 0-22 10-22 22z m-72 0c0 12 10 22 22 22 12 0 22-10 22-22 0-12-10-22-22-22-12 0-22 10-22 22z m-71 0c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-22-21-22-12 0-22 10-22 22z m308-22c-6 0-12 3-16 7-4 4-6 9-6 15 0 6 2 11 6 15 4 4 10 7 16 7 5 0 11-3 15-7 4-4 6-9 6-15 0-6-2-11-6-15-4-4-10-7-15-7z m-22-264c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-22-21-22-12 0-22 10-22 22z m0 71c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-21-21-21-12 0-22 9-22 21z m0 72c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-22-21-22-12 0-22 10-22 22z m0 71c0 12 10 22 22 22 12 0 21-10 21-22 0-12-9-21-21-21-12 0-22 9-22 21z"/>
+<glyph glyph-name="light" unicode="&#112;" d="M298 259c0-21-18-38-39-38-21 0-38 17-38 38 0 22 17 39 38 39 21 0 39-17 39-39z m-39-109c-60 0-109 49-109 109 0 61 49 110 109 110 61 0 110-49 110-110 0-60-50-109-110-109z m0 190c-44 0-80-36-80-81 0-44 36-80 80-80 45 0 81 36 81 80 0 45-36 81-81 81z m155-97c-8 0-14 7-14 15 0 8 6 14 14 14 17 0 35 0 52 0 0 0 0 0 0 0 8 0 14-6 14-14 0-8-6-14-14-14-17 0-35 0-52-1 0 0 0 0 0 0z m-308 0c-17 1-35 1-52 1-8 0-14 6-14 14 0 8 7 14 14 14 0 0 0 0 1 0 17 0 34 0 51 0 8 0 14-7 14-14 0-8-6-15-14-15z m263 109c-3 0-7 2-10 5-5 5-5 14 0 20 12 12 24 24 36 36 6 6 15 6 21 1 5-6 5-15 0-21-12-12-25-24-37-36-3-3-6-5-10-5z m-255-254c-3 0-7 2-10 5-5 5-5 14 0 20 13 12 25 24 37 36 6 5 15 5 20 0 6-6 6-15 0-20-12-13-24-25-37-37-2-2-6-4-10-4z m146 300c-8 0-14 6-14 14 0 17 0 34 0 52 0 7 6 14 14 14 0 0 0 0 0 0 8 0 14-6 14-14 0-18 1-35 1-52 0-8-7-14-15-14z m0-360c0 0 0 0 0 0-8 0-14 6-14 14 0 17 0 35 0 52 0 8 6 14 14 14 0 0 0 0 0 0 8 0 15-7 15-14 0-18-1-35-1-52 0-8-6-14-14-14z m-109 315c-3 0-7 1-10 4-12 12-24 24-36 36-6 6-6 15-1 20 6 6 15 6 21 0 12-12 24-24 36-36 6-6 6-15 0-20-2-3-6-4-10-4z m254-255c-3 0-7 1-10 4-12 12-24 25-36 37-5 6-5 15 0 20 6 6 15 6 20 0 13-12 25-25 37-37 5-5 5-14-1-20-2-3-6-4-10-4z"/>
+<glyph glyph-name="web" unicode="&#113;" d="M438 390c0 8-6 15-14 15l-333 0c-8 0-15-7-15-15l0-298c0-8 7-14 15-14l333 0c8 0 14 6 14 14z m-219-8l172 0c8 0 15-7 15-16 0-9-7-16-15-16l-172 0c-8 0-15 7-15 16 0 9 7 16 15 16z m-47 1c9 0 16-7 16-16 0-10-7-17-16-17-10 0-17 7-17 17 0 9 7 16 17 16z m-51 0c9 0 17-7 17-16 0-10-8-17-17-17-9 0-17 7-17 17 0 9 8 16 17 16z m291-276l-308 0 0 219 308 0z m-250 84l-15 0-20 60 13 0 14-45 15 45 13 0 15-45 14 45 13 0-20-60-14 0-14 41z m137 25l-46 0c0-5 2-8 6-11 3-2 8-4 12-4 8 0 13 3 17 7l7-8c-6-6-14-9-25-9-8 0-15 2-21 8-6 5-9 13-9 22 0 9 3 17 9 22 6 6 13 9 21 9 8 0 15-3 21-8 6-5 8-11 8-20z m-46 9l34 0c0 5-2 9-5 12-3 3-7 4-11 4-5 0-9-1-13-4-3-3-5-7-5-12z m101 27c8 0 14-3 20-9 6-5 9-12 9-22 0-9-3-16-9-22-5-6-12-8-19-8-8 0-15 3-21 9l0-9-12 0 0 83 12 0 0-34c5 8 12 12 20 12z m-20-31c0-6 2-10 5-14 4-4 8-5 13-5 5 0 9 1 13 5 3 4 5 8 5 14 0 6-2 10-5 14-4 4-8 6-13 6-5 0-9-2-13-6-3-4-5-8-5-14z"/>
+<glyph glyph-name="web-2" unicode="&#114;" d="M438 390c0 8-6 15-14 15l-333 0c-8 0-15-7-15-15l0-298c0-8 7-14 15-14l333 0c8 0 14 6 14 14z m-219-8l172 0c8 0 15-7 15-16 0-9-7-16-15-16l-172 0c-8 0-15 7-15 16 0 9 7 16 15 16z m-47 1c9 0 16-7 16-16 0-10-7-17-16-17-10 0-17 7-17 17 0 9 7 16 17 16z m-51 0c9 0 17-7 17-16 0-10-8-17-17-17-9 0-17 7-17 17 0 9 8 16 17 16z m291-276l-308 0 0 219 308 0z"/>
+<glyph glyph-name="edit" unicode="&#115;" d="M196 214c-27-27-54-54-81-81-6 6-13 13-19 19 27 27 54 54 81 81l-22 21c-31-31-61-62-92-92-7-7-11-13-12-22-3-25-7-50-11-76 3 0 4 0 6 0 24 5 48 10 72 15 5 1 10 4 13 7 32 32 64 64 96 96z m126 207c10 10 21 21 33 32 4 4 10 4 14 0 19-19 38-38 57-57 4-5 4-10 0-15-11-11-22-22-34-33-23 24-46 48-70 73z m23-181c-5-1-8 0-11 3-8 8-15 15-23 23 18 18 37 37 55 55 2 2 4 4 4 4-24 25-47 49-71 74-2-2-3-4-5-6-18-18-37-37-55-55-34 34-67 67-101 101-2 2-5 5-8 7-18 14-42 12-57-5-15-17-14-42 2-58 50-51 101-101 151-151 17-16 33-33 50-49 2-3 3-5 2-8-2-8-4-15-4-23-4-48 27-90 73-102 20-5 39-4 58 4-1 2-3 3-5 4-14 14-28 28-42 42-10 11-11 26-2 36 8 8 16 16 24 24 11 10 24 10 35 0 2-1 4-4 6-6 15-14 29-28 43-42 0 0 1 0 2 1 1 8 3 16 4 24 7 69-59 123-125 103z m-243 162c-7 0-14 6-14 14 0 8 6 14 14 14 8 0 15-6 15-14 0-7-7-14-15-14z m198-46c6-6 13-12 19-19-13-13-26-26-39-39-7 6-13 12-20 19 14 13 27 26 40 39z"/>
+<glyph glyph-name="market" unicode="&#116;" d="M88 370c3 0 7 0 10 0 6 0 11-1 15-2 9-2 16-8 20-16 3-5 4-10 6-15 2-6 3-13 5-19 3-10 5-19 8-27 2-6 3-13 5-19 3-7 5-15 7-23 3-9 6-19 9-30 0-2 1-4 1-6 2-8 5-17 9-24 3-7 8-12 13-15 6-3 13-5 22-6 2 0 5 0 7 0l21 0 57 0c25 0 50 0 75 0 12 0 25 0 37 0 1 0 1 0 2 0 6 0 13 0 17 2 5 3 7 9 9 16l3 10c0 0 0 0 0 0 0 2 1 3 1 3 5 20 11 40 17 60 1 4 2 9 4 13 2 8 4 16 7 24 2 7 4 16 0 22-3 4-9 5-14 5-6 0-188-2-284-4l-4 0-5 22c0 3-1 6-2 9 0 3-1 5-1 7-1 2-1 3-1 4-1 4-2 7-3 11-2 6-6 12-11 17-5 5-11 8-17 9-3 1-6 1-10 1-5 1-9 1-14 1-19 0-38 0-59 0-1 0-3 0-4 0-3 0-7 0-10-1-3 0-6-2-8-4-3-5-4-11-2-17 2-5 6-6 9-7 4-1 8-1 13-1 5 0 10 0 16 0l16 0c3 0 5 0 8 0z m353-78l-26-92-6-4-2 0c-2 0-21 0-55 0-50 0-118-1-125-1l-1-1 0 0c-6 0-12 2-16 6-4 4-6 10-8 16-3 12-6 25-10 39-1 4-2 8-3 12-2 4-3 8-4 13l-4 12z m-194-164c-9 0-15-2-20-7-5-5-8-11-8-20 0-8 3-16 8-21 5-5 13-8 20-8 17 0 30 12 30 28 0 8-3 15-9 20-5 6-12 8-21 8z m139 0c-9 0-16-2-21-6-5-6-8-13-8-21 0-9 3-16 8-21 5-6 12-8 21-8 16 0 29 13 29 29 0 8-3 14-8 20-5 5-13 7-21 7z"/>
+<glyph glyph-name="directory" unicode="&#117;" d="M432 451l-99-38c-2 0-3-1-4-1-3 1-5 2-8 2l-116 38c-8 3-15 6-30-1l-91-35c-17-5-32-16-32-31l0-303c0-15 14-27 32-27l99 38c3 1 6 2 9 4 1-1 3-2 4-2 3-1 5-2 7-3 0 0 1 0 1-1 0 0 1 0 1 0l116-38 0 0c8-1 12-1 21 3l90 34c13 6 32 16 32 31l0 304c0 14-14 26-32 26z m-351-371c-1 0-1 1-1 2l0 303c0 2 5 6 14 9l1 0 1 1 89 34c1-1 0-1 0-2l0-303c0-1-3-4-16-10z m356 42c-1-2-5-5-17-11l-90-34c0 1-1 1-1 2l0 304c0 1 5 5 14 8l1 0 1 1 91 34c0 0 1-1 1-1z"/>
+<glyph glyph-name="menu" unicode="&#118;" d="M257 22c-60 0-119 22-164 67-44 44-68 102-68 164 0 62 24 120 68 163 90 91 237 91 327 0 44-43 68-101 68-163 0-62-24-120-68-164-45-45-104-67-163-67z m0 431c-52 0-103-20-142-59-38-38-58-88-58-141 0-54 20-104 58-142 78-78 205-78 283 0 38 38 59 88 59 142 0 53-21 103-59 141-39 39-90 59-141 59z m101-133l-203 0c-8 0-15 7-15 15 0 8 7 15 15 15l203 0c8 0 14-7 14-15 0-8-6-15-14-15z m0-84l-203 0c-8 0-15 7-15 15 0 8 7 15 15 15l203 0c8 0 14-7 14-15 0-8-6-15-14-15z m0-81l-203 0c-8 0-15 7-15 15 0 8 7 14 15 14l203 0c8 0 14-6 14-14 0-8-6-15-14-15z"/>
+<glyph glyph-name="close" unicode="&#119;" d="M258 19c-59 0-118 23-163 68-44 43-68 101-68 163 0 62 24 120 68 164 90 90 237 90 327 0 44-44 68-102 68-164 0-62-24-120-68-163-45-45-104-68-164-68z m0 431c-51 0-102-19-141-58-38-38-59-88-59-142 0-53 21-103 59-141 78-78 205-78 283 0 38 38 58 88 58 141 0 54-20 104-58 142-39 39-90 58-142 58z m25-200l67 67c7 7 7 18 0 25-7 7-18 7-25 0l-67-67-66 67c-7 7-18 7-25 0-7-7-7-18 0-25l66-67-66-66c-7-7-7-18 0-25 7-7 18-7 25 0l66 66 67-66c7-7 18-7 25 0 7 7 7 18 0 25z"/>
+<glyph glyph-name="close-inverted" unicode="&#120;" d="M400 388c-39 39-90 59-142 59-51 0-102-20-141-59-38-37-59-88-59-141 0-53 21-104 59-141 78-78 205-78 283 0 38 37 58 88 58 141 0 53-20 104-58 141z m-45-208c8-9 8-22 0-30-8-8-21-8-29 0l-68 67-67-67c-8-8-21-8-29 0-9 8-9 21 0 30l67 67-67 67c-9 8-9 22 0 30 8 8 21 8 29 0l67-68 68 68c8 8 21 8 29 0 8-9 8-22 0-30l-67-67z"/>
+<glyph glyph-name="pin" unicode="&#121;" d="M304 144c1 16-2 31-8 45l97 115 25-8c14-4 29 2 36 14 8 13 6 29-5 39l-116 116c-10 11-26 13-39 5-12-8-18-23-13-37l8-25-115-102c-33 11-72 2-98-24-12-12-12-33 0-45l65-65-83-82c-6-7-6-17 0-23 6-6 16-6 23 0l82 83 66-66c13-13 33-13 45 0 17 17 28 38 30 60z m-205 115c21 22 55 26 81 9l145 130-14 45 116-116-45 13-126-149c25-28 18-62-4-85z"/>
+<glyph glyph-name="pin-inverted" unicode="&#122;" d="M297 160c2 14 0 27-6 39l92 106 21-5c13-4 26 2 33 13 8 12 6 26-3 35l-98 99c-9 8-24 10-35 2-11-7-17-21-13-33l6-22-106-96c-30 9-64 0-88-24-12-12-13-30-2-41l55-55-77-76c-5-6-6-15-1-20 6-6 15-5 20 1l77 76 56-56c11-11 29-10 41 2 15 15 25 35 28 55z"/>
+<glyph glyph-name="resize-handle" unicode="&#65;" d="M262 175l70 71c7 7 18 7 25 0 7-7 7-18 0-25l-70-71c-7-7-18-7-25 0-7 7-7 18 0 25m-101 0l175 175c7 7 18 7 25 0 7-7 7-18 0-25l-175-175c-7-7-18-7-25 0-7 7-7 18 0 25"/>
+<glyph glyph-name="diclosure-expand" unicode="&#66;" d="M239 187c-3 0-6 1-8 3-5 5-5 12 0 17l42 42-43 44c-5 4-5 12 0 17 4 4 12 4 17 0l60-61-60-59c-2-2-5-3-8-3z"/>
+<glyph glyph-name="reload-small" unicode="&#97;" d="M334 253c-9 0-18-7-18-16-3-27-25-47-52-47-29 0-52 24-52 52 0 11 2 27 14 38 6 5 14 9 24 12-5-7-4-16 2-22 3-3 8-4 12-4 5 0 9 1 13 5l28 28c1 2 3 4 3 7 3 6 1 13-3 18l-29 29c-3 3-7 5-12 5-5 0-9-2-12-5-4-3-5-8-5-12 0-5 1-9 5-13l0 0c-20-3-37-11-50-23-16-16-25-38-25-63 0-47 39-86 86-86 45 0 82 33 87 78 1 9-6 18-16 19z"/>
+<glyph glyph-name="close-small" unicode="&#67;" d="M291 259l43 44c8 7 8 19 0 27-7 7-19 7-26 0l-44-44-44 44c-7 7-19 7-26 0-8-8-8-20 0-27l43-44-43-43c-8-8-8-20 0-27 7-7 19-7 26 0l44 44 44-44c7-7 19-7 26 0 8 8 8 19 0 27z"/>
+<glyph glyph-name="backward" unicode="&#69;" d="M292 349c-5 3-12 3-18-1l-94-71c-4-3-7-8-7-13 0-5 2-10 6-14l95-80c3-2 7-4 11-4 2 0 5 1 7 2 6 3 10 9 10 15l0 151c0 6-4 12-10 15"/>
+<glyph glyph-name="reload" unicode="&#70;" d="M365 261c-9 1-17-5-18-15-4-45-43-80-89-80-49 0-89 40-89 89 0 19 4 45 25 65 16 15 39 23 68 25l-15-16c-6-6-6-17 0-24 4-3 8-4 12-4 4 0 9 1 12 5l43 44c2 2 3 4 4 6 2 6 1 13-4 18l-44 44c-6 6-17 6-23 0-7-7-7-17 0-24l15-15c-38-2-69-14-91-35-23-21-36-53-36-88 0-68 55-123 123-123 64 0 116 47 122 110 1 9-5 18-15 18"/>
+<glyph glyph-name="minimize" unicode="&#73;" d="M154 282l198 0c10 0 18-8 18-18 0-10-8-18-18-18l-198 0c-10 0-18 8-18 18 0 10 8 18 18 18"/>
+<glyph glyph-name="maximize" unicode="&#74;" d="M157 244l77 0 0-75c0-9 8-17 17-17 9 0 17 8 17 17l0 75 75 0c10 0 17 8 17 17 0 10-7 18-17 18l-75 0 0 76c0 10-8 17-17 17-9 0-17-7-17-17l0-76-77 0c-10 0-17-8-17-18 0-9 8-17 17-17z"/>
+<glyph glyph-name="maximize-inverted" unicode="&#75;" d="M251 434c-96 0-173-78-173-173 0-96 77-173 173-173 95 0 173 77 173 173 0 95-78 173-173 173z m93-190l-77 0 0-76c0-10-7-17-16-17-9 0-16 7-16 17l0 76-77 0c-10 0-17 8-17 17 0 9 7 17 17 17l77 0 0 76c0 9 7 17 16 17 9 0 16-8 16-17l0-76 77 0c9 0 17-8 17-17 0-9-8-17-17-17z"/>
+<glyph glyph-name="disclosure-button-expand" unicode="&#76;" d="M264 202l-60 59c-4 5-4 12 0 17 5 4 13 4 17 0l43-43 43 44c4 4 12 4 17 0 4-5 4-13 0-17z m90-79l-188 0c-16 0-29 13-29 29l0 188c0 16 13 29 29 29l188 0c16 0 29-13 29-29l0-188c0-16-13-29-29-29z m-188 222c-3 0-5-2-5-5l0-188c0-3 2-5 5-5l188 0c3 0 5 2 5 5l0 188c0 3-2 5-5 5z"/>
+<glyph glyph-name="disclosure-button-collapse" unicode="&#77;" d="M264 290l-60-59c-4-5-4-12 0-17 5-4 13-4 17 0l43 43 43-44c4-4 12-4 17 0 4 5 4 13 0 17z m119 50l0-188c0-16-13-29-29-29l-188 0c-16 0-29 13-29 29l0 188c0 16 13 29 29 29l188 0c16 0 29-13 29-29z m-29-193c3 0 5 2 5 5l0 188c0 3-2 5-5 5l-188 0c-3 0-5-2-5-5l0-188c0-3 2-5 5-5z"/>
+<glyph glyph-name="script-stop" unicode="&#78;" d="M298 79l-145 0c-29 0-54 14-71 42-13 20-17 41-17 41l-3 16 267 0 1-13c0 0 1-15 9-29 9-17 26-26 48-26 13 0 23 4 30 12 16 18 16 54 15 66l0 1 0 205-270 0c-7 0-13 7-13 14 0 7 6 14 13 14l294 0 0-232c1-7 5-57-20-86-13-13-29-20-49-20-41 0-61 22-71 41-6 9-9 18-10 27l-211 0c2-7 5-12 9-18 12-20 29-31 49-31l145 0c8 0 13-5 13-12 0-7-5-12-13-12z m95 258l-112 0c-7 0-14 7-14 14 0 8 7 15 14 15l112 0c8 0 14-7 14-15 0-8-6-14-14-14z m0-58l-143 0c-7 0-14 6-14 14 0 8 7 14 14 14l143 0c8 0 14-6 14-14 0-8-6-14-14-14z m0-58l-112 0c-7 0-14 6-14 14 0 8 7 14 14 14l112 0c8 0 14-6 14-14 0-8-6-14-14-14z m-204 72l42 42c7 7 7 19 0 26-7 7-18 7-25 0l-43-42-42 42c-7 7-18 7-26 0-7-7-7-19 0-26l43-42-43-42c-7-7-7-19 0-26 8-7 19-7 26 0l42 42 43-42c7-7 18-7 25 0 7 7 7 19 0 26z"/>
+<glyph glyph-name="script-reload" unicode="&#79;" d="M236 295c-10 1-18-6-19-15-2-26-24-45-50-45-28 0-50 22-50 50 0 10 2 25 14 36 5 6 13 10 23 12-4-7-4-15 2-21 3-3 7-5 12-5 4 0 9 2 12 5l27 28c1 2 3 4 3 6 3 7 2 14-3 18l-28 28c-3 3-7 5-11 5-5 0-9-2-12-5-3-3-5-7-5-12 0-4 2-9 5-12l1-1c-20-2-37-10-49-22-16-14-25-36-25-60 0-46 38-84 84-84 43 0 79 33 83 76 1 9-5 17-14 18z m62-216l-145 0c-30 0-55 15-72 43-12 20-16 40-16 41l-3 15 267 0 0-12c0 0 1-15 9-29 10-18 26-26 49-26 13 0 22 4 29 11 16 19 16 55 14 67l0 1 0 207-215 0c-7 0-12 5-12 12 0 8 5 13 12 13l241 0 0-231c1-7 5-57-21-86-12-13-28-20-48-20-41 0-62 22-72 40-5 10-8 20-10 27l-210 0c2-5 5-11 8-17 13-20 29-29 50-29l145 0c7 0 13-6 13-14 0-7-6-13-13-13z m95 259l-139 0c-8 0-14 6-14 14 0 8 6 14 14 14l139 0c7 0 14-6 14-14 0-8-7-14-14-14z m0-58l-103 0c-7 0-14 6-14 14 0 8 7 14 14 14l103 0c7 0 14-6 14-14 0-8-7-14-14-14z m0-58l-111 0c-7 0-14 6-14 14 0 8 7 14 14 14l111 0c7 0 14-6 14-14 0-8-7-14-14-14z"/>
+<glyph glyph-name="script-run" unicode="&#80;" d="M209 309l-79 60c-5 3-11 4-16 1-4-2-8-7-8-13l0-126c0-6 4-11 9-14 2-1 4-1 6-1 3 0 7 1 9 3l80 68c3 3 5 7 5 11 0 5-2 9-6 11m89-232l-145 0c-30 0-55 16-72 44-12 20-16 40-16 41l-3 16 267 0 0-13c0 0 1-14 9-29 10-17 26-26 49-26 13 0 22 4 29 12 16 18 16 54 14 66l0 1 0 206-269 0c-7 0-13 6-13 13 0 7 6 13 13 13l295 0 0-230c1-8 5-57-21-86-12-14-28-21-48-21-41 0-62 23-72 41-5 10-8 19-10 28l-210 0c2-7 5-12 8-18 13-20 29-31 50-31l145 0c7 0 13-7 13-14 0-7-6-13-13-13z m95 261l-180 0c-7 0-14 6-14 14 0 8 7 14 14 14l180 0c7 0 14-6 14-14 0-8-7-14-14-14z m0-59l-135 0c-8 0-14 7-14 15 0 7 6 14 14 14l135 0c7 0 14-7 14-14 0-8-7-15-14-15z m0-58l-180 0c-7 0-14 7-14 14 0 8 7 15 14 15l180 0c7 0 14-7 14-15 0-8-7-14-14-14z"/>
+<glyph glyph-name="script-new" unicode="&#81;" d="M298 80l-145 0c-30 0-55 15-72 43-12 20-16 40-16 41l-3 16 267 0 0-12c0-1 1-15 9-29 10-18 26-27 49-27 13 0 22 4 29 12 16 18 16 54 14 66l0 1 0 206-269 0c-7 0-13 6-13 13 0 7 6 13 13 13l295 0 0-230c1-8 5-57-21-86-12-14-28-21-48-21-41 0-62 23-72 41-5 10-8 19-10 28l-210 0c2-7 5-12 8-18 13-20 29-30 50-30l145 0c7 0 13-7 13-14 0-7-6-13-13-13z m95 260l-180 0c-7 0-14 6-14 14 0 8 7 14 14 14l180 0c7 0 14-6 14-14 0-8-7-14-14-14z m0-59l-135 0c-8 0-14 7-14 15 0 7 6 14 14 14l135 0c7 0 14-7 14-14 0-8-7-15-14-15z m0-58l-180 0c-7 0-14 7-14 14 0 8 7 15 14 15l180 0c7 0 14-7 14-15 0-7-7-14-14-14z m-250 90l0 53c0 9-7 16-16 16-9 0-16-7-16-16l0-53-54 0c-9 0-16-8-16-17 0-9 8-17 16-17l54 0 0-53c0-9 7-16 16-16 9 0 16 8 16 17l0 52 54 0c9 0 16 8 16 17 0 9-8 16-17 16z"/>
+<glyph glyph-name="hifi-forum" unicode="&#50;" d="M265 410c-83 0-150-68-150-150 0-24 6-47 16-67l-27-79 80 20c23-16 51-25 81-25 83 0 150 68 150 150 0 83-67 151-150 151z m38-248c-9 0-17 7-17 17 0 7 4 14 12 16l0 46-74 33 0-56c7-2 12-8 12-16 0-10-7-18-17-18-10 0-19 8-19 18 0 7 6 13 10 16l0 111c-4 2-10 9-10 16 0 10 9 17 19 17 9 0 17-7 17-17 0-8-5-14-12-16l0-41 74-33 0 51c-8 3-12 9-12 16 0 10 7 18 17 18 10 0 17-8 17-18 0-7-5-14-12-16l0-110c7-3 12-9 12-17 0-10-7-17-17-17z"/>
+<glyph glyph-name="hifi-logo-small" unicode="&#83;" d="M374 374c-32 32-74 49-119 49-46 0-88-17-120-49-32-32-49-74-49-119 0-45 17-87 49-118 32-32 74-49 119-49 45 0 88 17 119 49 32 32 49 73 49 118 1 45-17 87-48 119z m-17-221c-28-28-65-43-103-43-39 0-75 15-103 43-27 27-42 64-42 102 0 39 15 75 42 103 28 28 64 43 103 43 38 0 75-15 103-43 27-28 42-64 42-103 0-39-15-76-42-102z m-145 47c-5 0-9 3-9 6l0 126c0 3 4 7 9 7 6 0 10-4 10-7l0-125c0-4-4-7-10-7z m0 118c-5 0-10 2-14 6-7 7-7 20 0 27 5 5 9 6 14 6 6 0 11-2 14-6 4-4 5-8 5-14 0-5-2-10-5-13-4-4-8-6-14-6z m0-144c-5 0-10 2-14 5-4 5-5 9-5 14 0 6 2 11 5 14 5 4 9 5 14 5 6 0 11-2 14-5 4-4 5-8 5-14 0-5-2-10-5-14-4-3-8-5-14-5z m85 2c-6 0-10 3-10 7l0 121c0 4 4 7 10 7 5 0 9-3 9-7l0-121c0-5-4-7-9-7z m0 120c-6 0-11 2-14 5-8 8-8 20 0 28 4 4 8 5 14 5 5 0 10-2 14-5 4-4 5-9 5-14 0-5-2-11-5-14-4-3-9-5-14-5z m0-144c-6 0-11 2-14 5-8 7-8 20 0 28 4 4 8 5 14 5 5 0 10-2 14-5 4-5 5-9 5-14 0-5-2-11-5-14-4-3-9-5-14-5z m1 73l-85 40 1 18 86-40z"/>
+<glyph glyph-name="avatar-1" unicode="&#84;" d="M293 71c-1 0-1 0-1 0-14-1-14-1-16 12-6 43-11 86-16 128-1 2-1 4-1 6-3 0-6 0-9 0-2-10-3-20-4-31-4-36-8-72-12-109-1-7-2-8-9-8-2 0-5 0-7 0 0 74 1 181 1 254-1-1-33 0-44 1-15 0-62 1-79 1-8 0-14 3-18 10-1 2-2 4-4 7 8 0 15 0 22 1 35 1 99 8 100 12 14 11 23 10 36 10 15 0 31 0 46-1 11 0 24 3 37-10 20-10 81-10 123-11 0 0 1 0 1 0-4-12-12-17-25-17-29-1-77-3-127-1 2-73 4-181 6-254z m-32 371c16-6 14-20 13-32 0-5-1-10-1-14-2-11-10-18-20-18-11 0-19 8-20 18-1 6-1 13-2 20-1 7 3 13 11 15 10 3 10 3 19 11z"/>
+<glyph glyph-name="placemark" unicode="&#85;" d="M134 98c31-32 73-49 119-49l1 0c45 0 86 16 117 47 31 30 48 71 48 114 1 46-16 88-46 120-9 9-20 17-31 24-3-7-6-15-10-22 5-4 11-8 16-13 15-14 28-32 33-46l1-1c0-1 0-2-1-3l-1 0c-12-7-25-10-38-12-2-1-4-1-7-2l-1 0c0 0-1 0-2 1 0 0-1 1-1 1l0 1c-3 15-6 31-12 46l-7-15c4-11 6-21 8-32l0-1c0-1 0-1 0-2-1-1-1-1-2-1l-1 0-55-3-4 0c0 0-1 0-1 0-1 1-1 2-1 2l0 74c-5 9-8 17-11 26 0-1 0-1 0-1l-1 0 0-97c0 0 0-1 0-2 0-1-1-2-2-2l-1 0c0 0-1 0-1 0l-51 3c-1 0-2 0-2 1-1 1-1 2 0 2l0 1c5 27 13 58 35 83 6 6 12 13 20 16 0 0 1 0 1 0-3 7-6 15-9 22-37-4-71-20-99-47-30-30-47-70-48-113-1-46 16-88 47-120z m198 72c0 4 1 7 1 10l0 0c0 7 1 14 1 21 0 9 0 18 0 27 0 3 0 6 0 9l0 1c-1 1-1 6 5 7 11 3 23 5 34 8l1 0c3 1 7 2 11 2l1 1c1 0 3-1 3-2l0-1c0-1 1-1 1-2 1-3 1-5 2-8 3-14 4-27 3-40-2-12-8-21-18-25-8-3-17-5-25-8-3 0-7-1-10-2-1-1-3-1-4-1-1 0-1 0-2 0l-1-1c0 0 0 0 0 0-1 0-2 1-2 1-1 1-1 1-1 2z m2-17c12 4 23 7 35 10l14 4c1 0 2 0 2-1 1 0 1-2 1-2l-1-2c-7-18-17-34-30-47-13-13-28-24-46-31l-2-1c0 0-1 0-1 0-1 0-1 0-2 0 0 1-1 2-1 3l1 1c0 1 0 1 0 1 0 1 0 2 1 3 6 9 15 24 22 55 1 3 2 6 7 7z m-78 83c0 1 1 3 2 3l3 0 41 2 13 1c0 0 1 0 1 0l1 0c0 0 0-1 1-1l1 0c1 0 2-1 2-3 0-1 0-3 0-5 0-2 0-4 0-6l0-5c1-7 1-15 0-22l0-4c0-5 0-11-1-17 0-1 0-3 0-5 0-1 0-3 0-4 0-2-1-7-7-8-10 0-20-1-30-2l-2 0c-3-1-8-1-12-1-5-1-7-1-8-1-1 0-1 0-2 0l-2 1c-1 1-1 2-1 3l0 74z m0-92c0 1 1 3 2 3l3 0 51 3c1 0 2 0 2-1 1 0 1-1 1-2l0-1c0 0 0-1 0-1 0 0 0 0-1-1 0 0 0-1 0-1l0-1c0-1-1-3-1-4-1-2-2-5-3-7l-1-3c-3-9-7-18-11-27-4-8-9-14-14-19-5-6-13-9-23-10l-3 0c-1 0-1 0-2 1 0 0 0 1 0 2l0 69z m-52-59c-1-1-1-2-2-2 0 0-1 1-1 1l-2 1c-27 6-64 40-78 79l-1 1c0 1 0 2 1 3 1 1 2 1 3 1l13-4c12-4 24-7 36-11 3-1 6-2 7-7 5-24 12-42 23-57l1-2c1-1 1-3 0-3z m40-10c0-1-1-1-1-2-1 0-2 0-2 0 0 0-1 0-1 0-1 0-14 4-20 11-15 19-23 41-29 61 0 0 0 0 0 1l0 1c0 1 0 1 1 2 0 1 1 1 2 1l1 0 29-2 17-1c2-1 3-2 3-3l0-69z m-21 165l18-2c2 0 3-1 3-2l0-75c0-1-1-2-1-2-1-1-2-1-2-1 0 0 0 0-1 0 0 0-14 2-21 2-8 1-17 2-26 3-4 0-6 4-6 7-2 18-3 35-3 47 0 5-1 22-1 22 0 1 1 2 1 2 1 1 1 1 2 1z m-98 32l1 1c12 31 42 59 76 71l3 1c1 0 2 0 3-1 0-1 0-2 0-3l-2-3c-18-25-25-53-31-79l0-1c0-1 0-2-1-2 0 0-1-1-1-1-1 0-1 0-1 0l-1 1c-5 1-11 3-17 4-8 2-18 4-27 8l0 1c-2 0-2 2-2 3z m-8-18l1 1c0 1 1 2 3 2l49-13c1 0 2-1 2-3l2-71c0-1 0-2-1-2-1-1-1-1-2-1 0 0 0 0 0 0l-1 0c-1 0-2 1-3 1l0 0c-2 0-4 1-7 1-16 4-29 9-39 17-6 4-9 8-9 15-1 19 1 37 5 53z m178 42c-8 16-14 31-21 46-8 17-17 35-24 52-14 31 3 65 36 71 28 5 56-16 59-44 0-9-1-18-5-26-14-32-29-64-44-97 0 0-1-1-1-2z m27 117c0 15-12 28-27 28-15 0-27-12-28-27 0-16 13-28 28-28 15 0 27 12 27 27z"/>
+<glyph glyph-name="box" unicode="&#86;" d="M318 74l126 89 15-22-126-88z m-137 101l0-99 27 0 0 96z m145-125c-1 0-1 0-2 0l-262 26c-7 1-12 7-12 13l0 263c0 4 1 7 4 10 3 2 7 4 10 3l263-26c7 0 12-6 12-13l0-262c0-4-2-8-4-10-3-3-6-4-9-4z m-250 51l236-23 0 236-236 23z m377 326l-263 26c-3 1-7-1-10-3-3-3-4-6-4-10l0-21c3 2 7 3 11 3 0 0 0 0 1 0 3 2 7 4 11 4 2 0 3 0 5-1l234-23 0-236c0-7-3-10-10-14 1-2 1-5 1-7 1-2 0-3 0-5l21-2c1 0 1 0 2 0 3 0 6 1 8 4 3 2 5 6 5 10l0 262c0 7-5 13-12 13z m-397-64l125 88 16-22-126-88z m262-26l126 88 15-22-126-88z m-256-123l2 27 263-26-3-26z m146 37l0 91-27 0 0-88c9-1 18-2 27-3z"/>
+<glyph glyph-name="community" unicode="&#48;" d="M50 175c-4 0-8 2-11 6-4 6-2 14 4 18l24 16 69 48 89-64c6-4 7-13 3-19-5-6-13-7-19-3l-74 53-53-37-24-16c-3-1-5-2-8-2z m130-10l-44 32-47-32-22-14 0-63 135 0 0 60z m120 10c-4 0-9 2-11 6-4 6-3 14 3 18l25 16 68 48 89-64c6-4 7-13 3-19-4-6-13-7-19-3l-73 53-54-37-24-16c-2-1-5-2-7-2z m129-10l-46 32-45-32-22-14 0-63 135 0 0 60z m-256 202c-4 0-9 2-11 5-4 7-3 15 4 19l24 16 68 48 89-65c6-4 7-12 3-18-4-6-12-7-18-3l-74 53-53-37-25-16c-2-2-5-2-7-2z m129-11l-46 32-45-31-22-15 0-62 135 0 0 60z"/>
+<glyph glyph-name="grab-handle" unicode="&#88;" d="M280 318c0 10 9 19 20 19 10 0 19-9 19-19 0-11-9-20-19-20-11 0-20 9-20 20z m-46-20c-5 0-10 2-14 6-3 4-5 8-5 14 0 5 2 10 5 13 4 4 9 6 14 6 5 0 10-2 13-6 4-3 6-8 6-13 0-5-2-10-6-14-3-4-8-6-13-6z m46-42c0 10 9 19 20 19 10 0 19-9 19-19 0-11-9-20-19-20-11 0-20 9-20 20z m-46-20c-5 0-10 3-14 6-3 4-5 9-5 14 0 5 2 10 5 13 4 4 9 6 14 6 5 0 10-2 13-6 4-3 6-8 6-13 0-5-2-10-6-14-3-3-8-6-13-6z m46-42c0 10 9 19 20 19 10 0 19-9 19-19 0-11-9-19-19-19-11 0-20 8-20 19z m-46-19c-5 0-10 2-14 5-3 4-5 9-5 14 0 5 2 10 5 13 4 4 9 6 14 6 5 0 10-2 13-6 4-3 6-8 6-13 0-5-2-10-6-14-3-3-8-5-13-5z"/>
+<glyph glyph-name="search" unicode="&#89;" d="M277 185c-48 0-88 40-88 88 0 49 40 89 88 89 49 0 89-40 89-89 0-48-40-88-89-88z m0 159c-38 0-70-32-70-71 0-38 32-70 70-70 39 0 71 32 71 70 0 39-32 71-71 71z m-112-205c-2 0-4 1-6 2-4 4-4 9 0 13l61 64c3 4 9 4 12 0 4-3 4-9 1-12l-61-64c-2-2-5-3-7-3z"/>
+<glyph glyph-name="disclosure-collapse" unicode="&#90;" d="M264 198l-60 59c-4 5-4 12 0 17 5 4 13 4 17 0l43-43 43 44c4 4 12 4 17 0 4-5 4-13 0-17z"/>
+<glyph glyph-name="script-upload" unicode="&#82;" d="M260 91l-117 0c-29 0-54 15-71 43-13 20-17 40-17 41l-3 16 157 0c7 0 13-5 13-12 0-7-6-12-13-12l-124 0c2-8 5-12 9-18 12-20 29-31 49-31l117 0c7 0 13-6 13-14 0-7-6-13-13-13z m117 7c-7 0-12 6-12 13 0 7 5 13 12 13 13 0 23 4 30 11 16 19 16 55 14 67l1 1 0 0 0 206-257 0 0-226c0-7-5-13-12-13-8 0-13 6-13 13l0 251 306 0 0-230c1-7 5-57-20-86-13-13-28-20-49-20z m6 253l-179 0c-8 0-14 6-14 14 0 8 6 14 14 14l179 0c8 0 14-6 14-14 0-8-6-14-14-14z m0-58l-179 0c-8 0-14 6-14 14 0 8 6 14 14 14l179 0c8 0 14-6 14-14 0-8-6-14-14-14z m0-58l-16 0c-8 0-14 6-14 14 0 8 6 14 14 14l16 0c8 0 14-6 14-14 0-8-6-14-14-14z m-110 0l-69 0c-8 0-14 6-14 14 0 8 6 14 14 14l69 0c8 0 14-6 14-14 0-8-6-14-14-14z m127-71l-80 83-81-83 49 0 0-136 62 22 0 114z"/>
+<glyph glyph-name="code" unicode="&#87;" d="M92 242l74 73c6 6 15 6 21 0 6-5 6-15 0-21l-53-52 54-54c6-6 6-16 0-21-5-6-15-6-21 0z m347 0l-74 73c-5 6-15 6-21 0-5-5-5-15 0-21l53-52-54-54c-6-6-6-16 0-21 6-6 15-6 21 0z m-223-137c-1 0-2 0-4 1-5 2-8 8-6 14l98 254c3 6 9 8 15 6 5-2 8-8 6-14l-99-254c-1-4-5-7-10-7z"/>
+<glyph glyph-name="avatar" unicode="&#60;" d="M256 88c-93 0-169 75-169 168 0 93 76 169 169 169 93 0 169-76 169-169 0-93-76-168-169-168z m0 316c-81 0-148-66-148-148 0-81 67-147 148-147 81 0 148 66 148 147 0 82-67 148-148 148z m97-90l-1 1c-3 3-7 4-10 4-1 0-61-9-86-9-1 0-1 0-2 0-25 0-87 10-87 10-5 0-10-2-13-6l-1-2c-2-3-2-7-1-10 1-4 3-6 6-8 12-5 49-20 60-22 2 0 5 0 6-7 1-8-3-46-7-65-5-17-13-40-13-41-2-6 1-13 7-15l8-3c3-1 6-1 9 1 3 1 5 4 6 7l21 65 20-67c1-3 3-6 6-7 2-1 4-1 5-1 2 0 3 0 5 0l7 3c5 2 8 8 7 14 0 0-6 24-11 44-3 12-4 30-5 45 0 9-1 16-2 22 0 1 0 4 5 5 0 0 1 0 2 0l55 22c4 2 6 5 7 9 1 4 0 8-3 11z m-68 37c0-16-13-29-29-29-16 0-29 13-29 29 0 16 13 29 29 29 16 0 29-13 29-29z"/>
+<glyph glyph-name="arrows-h" unicode="&#58;" d="M512 256c0-5-2-9-5-13l-74-73c-3-4-7-5-12-5-5 0-10 1-13 5-4 4-6 8-6 13l0 36-292 0 0-36c0-5-2-9-6-13-3-4-8-5-13-5-5 0-9 1-12 5l-74 73c-3 4-5 8-5 13 0 5 2 9 5 13l74 73c3 4 7 5 12 5 5 0 10-1 13-5 4-4 6-8 6-13l0-36 292 0 0 36c0 5 2 9 6 13 3 4 8 5 13 5 5 0 9-1 12-5l74-73c3-4 5-8 5-13z"/>
+<glyph glyph-name="arrows-v" unicode="&#59;" d="M347 421c0-5-1-10-5-13-4-4-8-6-13-6l-36 0 0-292 36 0c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5-5 0-9 2-13 5l-73 74c-4 3-5 7-5 12 0 5 1 10 5 13 4 4 8 6 13 6l36 0 0 292-36 0c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5 5 0 9-2 13-5l73-74c4-3 5-7 5-12z"/>
+<glyph glyph-name="arrows" unicode="&#96;" d="M512 256c0-5-2-9-5-13l-74-73c-3-4-7-5-12-5-5 0-10 1-13 5-4 4-6 8-6 13l0 36-109 0 0-109 36 0c5 0 9-2 13-6 4-3 5-8 5-13 0-5-1-9-5-12l-73-74c-4-3-8-5-13-5-5 0-9 2-13 5l-73 74c-4 3-5 7-5 12 0 5 1 10 5 13 4 4 8 6 13 6l36 0 0 109-109 0 0-36c0-5-2-9-6-13-3-4-8-5-13-5-5 0-9 1-12 5l-74 73c-3 4-5 8-5 13 0 5 2 9 5 13l74 73c3 4 7 5 12 5 5 0 10-1 13-5 4-4 6-8 6-13l0-36 109 0 0 109-36 0c-5 0-9 2-13 6-4 3-5 8-5 13 0 5 1 9 5 12l73 74c4 3 8 5 13 5 5 0 9-2 13-5l73-74c4-3 5-7 5-12 0-5-1-10-5-13-4-4-8-6-13-6l-36 0 0-109 109 0 0 36c0 5 2 9 6 13 3 4 8 5 13 5 5 0 9-1 12-5l74-73c3-4 5-8 5-13z"/>
+<glyph glyph-name="compress" unicode="&#33;" d="M256 238l0-128c0-5-2-10-5-13-4-4-8-6-13-6-5 0-10 2-13 6l-41 41-95-95c-2-2-4-3-7-3-2 0-4 1-6 3l-33 33c-2 2-3 4-3 6 0 3 1 5 3 7l95 95-41 41c-4 3-6 8-6 13 0 5 2 9 6 13 3 3 8 5 13 5l128 0c5 0 9-2 13-5 3-4 5-8 5-13z m216 192c0-3-1-5-3-7l-95-95 41-41c4-3 6-8 6-13 0-5-2-9-6-13-3-3-8-5-13-5l-128 0c-5 0-9 2-13 5-3 4-5 8-5 13l0 128c0 5 2 10 5 13 4 4 8 6 13 6 5 0 10-2 13-6l41-41 95 95c2 2 4 3 7 3 2 0 4-1 6-3l33-33c2-2 3-4 3-6z"/>
+<glyph glyph-name="expand" unicode="&#34;" d="M252 210c0-2-1-4-3-6l-94-95 41-41c3-4 5-8 5-13 0-5-2-9-5-13-4-4-8-5-13-5l-128 0c-5 0-9 1-13 5-4 4-5 8-5 13l0 128c0 5 1 9 5 13 4 3 8 5 13 5 5 0 9-2 13-5l41-41 95 94c2 2 4 3 6 3 3 0 5-1 7-3l32-32c2-2 3-4 3-7z m223 247l0-128c0-5-1-9-5-13-4-3-8-5-13-5-5 0-9 2-13 5l-41 41-95-94c-2-2-4-3-6-3-3 0-5 1-7 3l-32 32c-2 2-3 4-3 7 0 2 1 4 3 6l94 95-41 41c-3 4-5 8-5 13 0 5 2 9 5 13 4 4 8 5 13 5l128 0c5 0 9-1 13-5 4-4 5-8 5-13z"/>
+<glyph glyph-name="placemark-1" unicode="&#35;" d="M475 213l0 176c-32-17-61-26-87-26-16 0-29 3-41 10-19 9-37 16-53 21-16 6-33 8-51 8-33 0-71-12-115-36l0-171c47 21 88 32 124 32 10 0 20-1 29-2 10-1 19-4 28-7 10-4 17-7 22-9 6-3 13-6 24-12l8-4c8-4 18-6 29-6 23 0 50 9 83 26z m-384 226c0-7-1-13-5-18-3-6-7-10-13-14l0-361c0-3-1-5-2-7-2-2-4-2-7-2l-18 0c-3 0-5 0-7 2-2 2-2 4-2 7l0 361c-6 4-10 8-14 14-3 5-5 11-5 18 0 10 4 19 11 26 7 7 16 10 26 10 10 0 19-3 26-10 7-7 10-16 10-26z m421-18l0-218c0-8-3-13-10-17-2-1-4-2-5-2-41-22-77-33-105-33-17 0-32 3-45 10l-8 4c-13 6-22 10-29 13-6 3-15 6-26 9-10 2-21 4-32 4-20 0-42-5-68-13-25-8-47-18-65-29-3-2-6-3-9-3-3 0-6 1-9 3-7 3-10 9-10 16l0 212c0 6 3 11 9 15 7 4 14 8 23 12 8 5 19 9 32 15 14 6 28 11 44 14 15 4 30 6 44 6 21 0 41-3 60-9 18-6 38-14 60-25 7-3 15-5 25-5 23 0 53 11 89 32 4 2 7 4 8 5 6 3 12 3 18-1 6-4 9-9 9-15z"/>
+<glyph glyph-name="circle" unicode="&#36;" d="M366 238c0 35-13 65-38 90-25 25-55 38-90 38-36 0-66-13-91-38-25-25-37-55-37-90 0-36 12-66 37-91 25-25 55-37 91-37 35 0 65 12 90 37 25 25 38 55 38 91z m36 0c0-23-4-44-13-64-8-20-20-38-35-53-15-14-32-26-52-35-21-9-42-13-64-13-23 0-44 4-64 13-20 9-38 21-53 35-14 15-26 33-35 53-9 20-13 41-13 64 0 22 4 43 13 64 9 20 21 37 35 52 15 15 33 27 53 35 20 9 41 13 64 13 22 0 43-4 64-13 20-8 37-20 52-35 15-15 27-32 35-52 9-21 13-42 13-64z"/>
+<glyph glyph-name="hand-pointer" unicode="&#57;" d="M183 475c-10 0-19-3-26-10-7-7-11-16-11-26l0-256-43 58c-8 10-18 15-30 15-10 0-19-4-26-11-7-7-10-16-10-26 0-8 2-15 7-22l110-146c7-10 17-14 29-14l205 0c4 0 8 1 11 3 4 3 6 6 7 10l26 105c5 19 7 37 7 56l0 62c0 8-3 14-8 20-5 6-12 9-20 9-7 0-14-3-19-8-5-6-8-12-8-20l-9 0 0 18c0 9-3 17-9 23-6 6-14 10-23 10-9 0-16-4-23-10-6-6-9-14-9-22l0-19-9 0 0 26c0 10-4 19-11 27-7 8-16 11-26 11-10 0-19-3-26-10-7-8-10-16-10-26l0-28-10 0 0 163c0 11-3 20-10 27-7 8-16 11-26 11z m0 37c20 0 38-7 52-22 14-15 21-32 21-53l0-63c4 1 7 1 9 1 19 0 35-7 50-20 9 4 18 6 28 6 21 0 39-8 52-25 6 2 11 2 16 2 18 0 33-6 46-19 12-13 18-28 18-46l0-62c0-22-2-44-8-64l-26-106c-3-12-9-22-19-29-10-8-21-12-34-12l-205 0c-12 0-22 3-33 8-10 5-19 12-26 21l-109 146c-10 13-15 28-15 44 0 20 7 38 21 52 14 14 32 22 52 22 13 0 25-4 37-10l0 156c0 20 7 37 21 52 14 14 32 21 52 21z m36-402l0 109-9 0 0-109z m74 0l0 109-10 0 0-109z m73 0l0 109-9 0 0-109z"/>
+<glyph glyph-name="plus-square-o" unicode="&#37;" d="M384 283l0-18c0-3-1-5-3-6-1-2-3-3-6-3l-101 0 0-101c0-2-1-4-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 2-2 4-2 6l0 101-101 0c-3 0-5 1-6 3-2 1-3 3-3 6l0 18c0 3 1 5 3 7 1 2 3 3 6 3l101 0 0 100c0 3 1 5 2 7 2 1 4 2 7 2l18 0c3 0 5-1 7-2 1-2 2-4 2-7l0-100 101 0c3 0 5-1 6-3 2-2 3-4 3-7z m37-128l0 238c0 13-5 23-14 32-9 9-20 14-32 14l-238 0c-12 0-23-5-32-14-9-9-14-19-14-32l0-238c0-12 5-23 14-32 9-9 20-13 32-13l238 0c12 0 23 4 32 13 9 9 14 20 14 32z m36 238l0-238c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-23 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 35 24 58 24l238 0c23 0 42-8 58-24 16-16 24-35 24-58z"/>
+<glyph glyph-name="square" unicode="&#39;" d="M375 439l-238 0c-12 0-23-5-32-14-9-9-14-19-14-32l0-238c0-12 5-23 14-32 9-9 20-13 32-13l238 0c12 0 23 4 32 13 9 9 14 20 14 32l0 238c0 13-5 23-14 32-9 9-20 14-32 14z m82-46l0-238c0-22-8-42-24-58-16-16-35-24-58-24l-238 0c-23 0-42 8-58 24-16 16-24 36-24 58l0 238c0 23 8 42 24 58 16 16 35 24 58 24l238 0c23 0 42-8 58-24 16-16 24-35 24-58z"/>
+<glyph glyph-name="align-center" unicode="&#56;" d="M416 434l-320 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17l320 0c10 0 17 7 17 17l0 16c0 10-7 17-17 17z m-26-135l0 16c0 10-8 17-17 17l-234 0c-9 0-17-7-17-17l0-16c0-10 8-17 17-17l234 0c9 0 17 7 17 17z m8-171l-284 0c-10 0-18-7-18-17l0-16c0-10 8-17 18-17l284 0c10 0 18 7 18 17l0 0 0 16 0 0c0 10-8 17-18 17z m-25 85c0 10-8 17-18 17l-198 0c-10 0-18-7-18-17l0-16c0-10 8-17 18-17l198 0c10 0 18 7 18 17 0 0 0 0 0 0z"/>
+<glyph glyph-name="align-justify" unicode="&#41;" d="M416 433l-320 0c-10 0-17-8-17-17l0-16c0-10 7-18 17-18l320 0c10 0 17 8 17 18l0 16c0 9-7 17-17 17z m0-101l-320 0c-10 0-17-8-17-17l0-16c0-10 7-18 17-18l320 0c10 0 17 8 17 18l0 16c0 9-7 17-17 17z m0-101l-320 0c-10 0-17-8-17-18l0-16c0-9 7-17 17-17l320 0c10 0 17 8 17 17l0 16c0 10-7 18-17 18z m0-101l-320 0c-10 0-17-8-17-18l0-16c0-9 7-17 17-17l320 0c10 0 17 8 17 17l0 16c0 10-7 18-17 18z"/>
+<glyph glyph-name="align-left" unicode="&#42;" d="M416 434l-320 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17l320 0c10 0 17 7 17 17l0 16c0 10-7 17-17 17z m-320-152l234 0c9 0 17 7 17 17l0 16c0 10-8 18-17 18l-234 0c-10 0-17-8-17-18l0-16c0-10 7-17 17-17z m285-154l-285 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17l285 0c10 0 17 7 17 17l0 0 0 16 0 0c0 10-7 17-17 17z m-285 52l199 0c9 0 17 7 17 17 0 0 0 0 0 0l0 16c0 10-8 17-17 17l-199 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17z"/>
+<glyph glyph-name="align-right" unicode="&#94;" d="M416 434l-320 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17l320 0c10 0 17 7 17 17l0 16c0 10-7 17-17 17z m0-102l-234 0c-9 0-17-7-17-17l0-16c0-10 8-17 17-17l234 0c10 0 17 7 17 17l0 16c0 10-7 17-17 17z m0-204l-285 0c-10 0-17-7-17-17l0-16c0-10 7-17 17-17l285 0c9 0 17 7 17 17l0 0 0 16 0 0c0 10-8 17-17 17z m17 85c0 10-7 17-17 17l-199 0c-9 0-17-7-17-17l0-16c0-10 8-17 17-17l199 0c10 0 17 7 17 17 0 0 0 0 0 0z"/>
+<glyph glyph-name="bars" unicode="&#55;" d="M475 128l0-37c0-5-1-9-5-12-4-4-8-6-13-6l-402 0c-5 0-9 2-13 6-4 3-5 7-5 12l0 37c0 5 1 9 5 13 4 3 8 5 13 5l402 0c5 0 9-2 13-5 4-4 5-8 5-13z m0 146l0-36c0-5-1-10-5-13-4-4-8-6-13-6l-402 0c-5 0-9 2-13 6-4 3-5 8-5 13l0 36c0 5 1 10 5 13 4 4 8 6 13 6l402 0c5 0 9-2 13-6 4-3 5-8 5-13z m0 147l0-37c0-5-1-9-5-13-4-3-8-5-13-5l-402 0c-5 0-9 2-13 5-4 4-5 8-5 13l0 37c0 5 1 9 5 12 4 4 8 6 13 6l402 0c5 0 9-2 13-6 4-3 5-7 5-12z"/>
+<glyph glyph-name="circle-slash" unicode="&#44;" d="M256 416c-88 0-160-72-160-160 0-88 72-160 160-160 88 0 160 72 160 160 0 88-72 160-160 160z m0-64c14 0 27-3 39-8l-127-127c-5 12-8 25-8 39 0 53 43 96 96 96z m0-192c-14 0-27 3-39 9l127 126c5-12 8-25 8-39 0-53-43-96-96-96z"/>
+<glyph glyph-name="sync" unicode="&#40;" d="M392 275c6-41-7-84-39-115-47-47-119-52-173-17l38 36-138 19 19-134 42 40c76-55 183-50 251 18 40 39 58 91 56 142z m-233 77c47 46 119 52 173 17l-38-36 138-19-19 134-42-40c-76 55-183 50-251-18-40-39-58-91-56-142l56-11c-6 41 7 84 39 115z"/>
+<glyph glyph-name="key" unicode="&#45;" d="M479 282c-1 2-1 4-3 6-2 2-5 3-7 3l-202 0c-13 51-60 89-115 89-65 0-119-54-119-119 0-66 54-119 119-119 59 0 107 43 117 99l45 0 0-65 0 0c0-5 5-9 10-9 0 0 0 0 0 0l0 0 31 0 0 0c5 0 10 4 10 9l0 0 0 65 26 0 0-100 0 0c0-5 4-9 9-9 0 0 0 0 0 0l32 0c0 0 0 0 0 0 5 0 9 4 10 9l0 0 0 100 27 0 0 0c2 0 5 0 7 2 2 2 3 5 3 7l0 0 0 32 0 0z m-327-90c-37 0-68 30-68 68 0 38 31 68 68 68 38 0 68-30 68-68 0-38-30-68-68-68z"/>
+<glyph glyph-name="link" unicode="&#46;" d="M202 136c5 5 10 7 17 7 7 0 13-2 19-7 10-11 10-23 0-36 0 0-22-20-22-20-19-19-42-29-68-29-26 0-49 10-68 29-19 19-29 42-29 67 0 27 10 50 29 69 0 0 76 76 76 76 24 23 48 36 73 39 26 3 47-4 66-22 5-5 8-11 8-18 0-7-3-13-8-19-12-11-24-11-36 0-17 17-40 11-68-17 0 0-75-75-75-75-9-9-14-20-14-33 0-13 5-23 14-31 9-9 19-14 32-14 13 0 23 5 32 14 0 0 22 20 22 20m230 294c19-19 29-42 29-68 0-26-10-49-29-68 0 0-81-81-81-81-25-25-51-37-77-37-21 0-40 9-57 26-5 5-7 10-7 17 0 7 2 13 7 19 5 4 11 7 18 7 7 0 13-3 18-7 17-17 38-13 62 12 0 0 81 80 81 80 10 9 15 20 15 32 0 13-5 24-15 32-8 9-17 14-28 16-11 2-22-2-31-11 0 0-26-25-26-25-5-5-11-7-18-7-7 0-13 2-18 7-11 11-11 23 0 36 0 0 26 25 26 25 18 19 40 27 65 26 25-1 47-11 66-31"/>
+<glyph glyph-name="location" unicode="&#47;" d="M256 512c-88 0-160-72-160-160 0-89 80-208 160-352 80 144 160 263 160 352 0 88-71 160-160 160z m0-224c-35 0-64 28-64 64 0 35 29 64 64 64 36 0 64-29 64-64 0-36-28-64-64-64z"/>
+<glyph glyph-name="carat-r" unicode="&#51;" d="M304 249l-55-43 0 86z"/>
+<glyph glyph-name="carat-l" unicode="&#52;" d="M225 250l55 43 0-87z"/>
+<glyph glyph-name="folder-lg" unicode="&#62;" d="M203 385l38-51 185 0 0-206-333 0 0 257 110 0m0 30l-110 0c-17 0-30-14-30-30l0-257c0-17 13-30 30-30l333 0c17 0 30 13 30 30l0 206c0 16-13 30-30 30l-170 0-29 39c-6 7-15 12-24 12z"/>
+<glyph glyph-name="folder-sm" unicode="&#63;" d="M226 324l20-27 98 0 0-109-176 0 0 136 58 0m0 24l-58 0c-13 0-24-11-24-24l0-136c0-13 11-24 24-24l176 0c13 0 24 11 24 24l0 109c0 13-11 24-24 24l-86 0-12 17c-5 6-12 10-20 10z"/>
+<glyph glyph-name="level-up" unicode="&#49;" d="M331 274c-9 9-21 14-37 14l-68 0 32 32c5 4 5 12 0 17-2 2-5 3-8 3-3 0-6-1-9-3l-59-60 60-60c5-4 13-4 17 0 5 5 5 12 0 17l-31 31 66 0c9 0 16-2 19-7 6-6 5-15 5-16l0 0 0-75c0-6 5-12 12-12 6 0 11 6 11 12l0 73c0 5 1 21-10 34z"/>
+<glyph glyph-name="info" unicode="&#91;" d="M267 218c-1-7 0-10 7-10l8 0-3-15c-7-3-13-4-18-4-11 0-22 6-19 24l8 56c-3 0-7 1-11 2l2 17 36 0z m15 94c-1-7-8-11-15-11-8 0-14 6-13 14 1 7 8 11 15 11 8 0 14-5 13-14z m65 29c-23 23-53 35-85 35-33 0-63-12-86-35-23-23-35-53-35-85 0-33 12-63 35-85 23-23 53-35 85-35 33 0 63 12 85 35 23 23 35 53 35 85 1 31-11 61-34 85z m18-85c0-28-11-55-31-73-19-20-45-31-73-31-28 0-54 11-73 31-20 19-31 45-31 73 0 27 11 53 31 73 19 20 45 31 73 31 28 0 54-11 73-31 20-20 31-46 31-73z"/>
+<glyph glyph-name="question" unicode="&#93;" d="M360 346c1 0 3-1 3-3l0-181c0-2-2-3-3-3l-182 0c-1 0-3 1-3 3l0 181c0 2 2 3 3 3l182 0m0 17l-182 0c-11 0-20-9-20-20l0-181c0-11 9-20 20-20l182 0c11 0 20 9 20 20l0 181c0 11-9 20-20 20z m-133-55c20 7 29 9 47 9 28 0 40-10 40-34l0-5c0-17-6-24-17-28-8-3-16-5-25-8l0-17-20 0-3 30c12 3 22 7 30 9 8 3 11 7 11 13l0 4c0 13-4 16-18 16-10 0-16-1-24-4l-2-12-19 0z m21-110c0 9 5 13 14 13 10 0 15-4 15-13 0-9-5-13-15-13-9 0-14 4-14 13z"/>
+<glyph glyph-name="alert" unicode="&#43;" d="M267 369l120-207-240 0 120 207m0 18c-6 0-12-3-16-9l-119-207c-4-6-4-12 0-18 3-6 9-9 15-9l240 0c6 0 12 3 15 9 4 6 4 12 0 18l-119 207c-4 6-10 9-16 9z m-15-195c0 9 5 13 15 13 9 0 14-4 14-13 0-9-5-13-14-13-10 0-15 4-15 13z m28 96l-6-67-15 0-6 67 0 21 27 0z"/>
+<glyph glyph-name="home" unicode="&#95;" d="M265 376l133-122-49 0 0-112-169 0 0 112-49 0 134 122m0 20c-5 0-10-2-14-5l-134-122c-6-5-8-14-5-22 3-8 11-13 19-13l29 0 0-92c0-11 9-20 20-20l169 0c11 0 20 9 20 20l0 92 29 0c9 0 16 5 19 13 3 8 1 17-5 22l-134 122c-4 3-9 5-13 5z"/>
+<glyph glyph-name="error" unicode="&#61;" d="M258 143c-29 0-58 11-80 33-21 22-33 50-33 80 0 30 12 59 33 80 44 44 116 44 160 0 22-21 34-50 34-80 0-30-12-58-34-80-22-22-51-33-80-33z m0 211c-25 0-50-9-69-29-18-18-29-43-29-69 0-26 11-50 29-69 38-38 100-38 139 0 18 19 28 43 28 69 0 26-10 51-28 69-20 20-45 29-70 29z m13-98l32 33c4 3 4 9 0 12-3 3-9 3-12 0l-33-33-32 33c-4 3-9 3-12 0-4-3-4-9 0-12l32-33-32-32c-4-4-4-9 0-13 3-3 8-3 12 0l32 33 33-33c3-3 9-3 12 0 4 4 4 9 0 13z"/>
+<glyph glyph-name="settings" unicode="&#64;" d="M352 276c-3 0-6-1-8-2-1 0-1 0-1 0-3 0-6-1-8-2-2 9-6 17-11 25 3 1 6 2 8 4 0 0 0 0 0 0 3 1 5 3 7 5 8 8 8 20 0 28-7 7-20 7-27-1-2-2-4-4-5-7 0 0 0 0 0 0-2-2-4-5-4-8-8 5-16 9-25 11 1 2 2 5 2 8 0 0 0 1 0 1 1 2 2 5 2 8 0 11-9 19-20 19-10 0-19-8-19-19 0-3 1-6 2-8 0-1 0-1 0-1 0-3 1-6 2-8-9-2-18-6-25-11-1 3-2 6-5 8 0 0 0 0 0 0-1 3-2 5-4 7-8 8-20 8-28 0-7-7-7-20 0-27 2-2 5-4 7-5 1 0 1 0 1 0 2-2 4-4 7-4-5-8-8-16-10-25-3 1-6 2-9 2 0 0 0 0 0 0-2 1-5 2-8 2-11 0-20-9-20-20 0-10 9-19 20-19 3 0 6 0 8 2 0 0 0-1 0-1 4 0 6 1 9 3 2-9 5-18 10-25-2-1-5-2-7-5 0 0 0 0 0 0-3-1-6-2-8-4-7-8-7-20 0-28 4-4 9-5 14-5 5 0 10 1 14 5 2 2 4 5 4 7 1 1 1 1 1 1 2 2 3 4 4 7 8-5 16-8 25-10-1-3-2-6-2-9 0 0 0 0 0 0-1-2-2-5-2-8 0-11 9-20 20-20 10 0 19 9 19 20 0 3-1 6-2 8 0 0 0 0 0 0 0 3-1 6-2 9 9 2 17 5 25 10 1-3 2-5 4-7 1 0 1 0 1-1 1-2 2-5 4-7 4-4 9-5 14-5 5 0 10 1 14 5 7 8 7 20 0 28-2 2-5 3-7 4-1 0-1 0-1 0-2 3-4 4-7 5 5 7 8 16 10 25 3-1 6-2 9-2 0 0 0 0 0 0 2-1 5-2 8-2 11 0 19 9 19 19 0 0 0 0 0 0 0 0 0 1 0 1 0 10-9 19-19 19z m-90-61c-22 0-41 19-41 41 0 23 19 41 41 41 23 0 41-18 41-41 0-22-18-41-41-41z"/>
+<glyph glyph-name="trash" unicode="&#123;" d="M201 302l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-2 1-2 3-2 6l0 165c0 2 0 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3-1-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 1-1 2-4 2-6z m73 0l0-165c0-3 0-5-2-6-2-2-4-3-7-3l-18 0c-3 0-5 1-7 3-1 1-2 3-2 6l0 165c0 2 1 5 2 6 2 2 4 3 7 3l18 0c3 0 5-1 7-3 2-1 2-4 2-6z m37-207l0 271-256 0 0-271c0-4 1-8 2-12 1-3 3-6 4-7 2-2 3-3 3-3l238 0c0 0 1 1 3 3 1 1 3 4 4 7 1 4 2 8 2 12z m-192 307l128 0-14 34c-1 1-3 2-5 3l-90 0c-2-1-4-2-5-3z m265-9l0-18c0-3-1-5-2-7-2-1-4-2-7-2l-27 0 0-271c0-16-5-30-14-41-9-12-20-17-32-17l-238 0c-12 0-23 5-32 16-9 11-14 25-14 41l0 272-27 0c-3 0-5 1-7 2-1 2-2 4-2 7l0 18c0 3 1 5 2 7 2 1 4 2 7 2l88 0 20 48c3 7 8 13 16 18 7 5 15 7 22 7l92 0c7 0 15-2 22-7 8-5 13-11 16-18l20-48 88 0c3 0 5-1 7-2 1-2 2-4 2-7z"/>
+<glyph glyph-name="object-group" unicode="&#57344;" d="M549 402l-37 0 0-292 37 0 0-110-110 0 0 37-366 0 0-37-110 0 0 110 37 0 0 292-37 0 0 110 110 0 0-37 366 0 0 37 110 0z m-74 73l0-36 37 0 0 36z m-475 0l0-36 37 0 0 36z m37-438l0 36-37 0 0-36z m402 36l0 37 36 0 0 292-36 0 0 37-366 0 0-37-36 0 0-292 36 0 0-37z m73-36l0 36-37 0 0-36z m-183 292l110 0 0-219-256 0 0 73-110 0 0 219 256 0z m-219-110l183 0 0 147-183 0z m292-73l0 147-73 0 0-110-110 0 0-37z"/>
+<glyph glyph-name="cm" unicode="&#125;" d="M202 207c-5 0-10 1-14 4-4 2-8 5-11 10-2 4-4 9-6 15-1 6-2 12-2 20 0 7 1 13 2 19 2 6 4 11 6 16 3 4 7 7 11 10 4 2 9 3 14 3 5 0 9-1 12-2 4-2 6-4 8-6l-8-11c-1 1-3 3-5 4-2 1-4 2-7 2-3 0-5-1-7-3-3-2-4-4-6-7-1-3-2-7-3-11-1-5-1-9-1-14 0-5 0-10 1-14 1-4 2-8 3-11 2-3 3-5 6-7 2-2 5-3 8-3 3 0 5 1 7 2 2 1 4 2 5 4l7-12c-5-5-11-8-20-8z m55 92c4 3 9 5 15 5 4 0 6 0 9-2 2-1 4-2 6-4 1-2 3-4 4-6 1-2 1-4 2-7l0 0c1 2 2 5 4 7 1 2 3 4 5 6 2 2 4 3 7 4 2 1 5 2 8 2 5 0 9-1 12-3 3-2 6-5 7-8 2-4 3-7 4-12 0-4 1-9 1-13l0-58-16 0 0 58c0 3 0 5 0 8-1 3-1 5-2 7-1 2-2 4-4 6-2 1-4 2-7 2-2 0-5-1-7-3-2-1-4-3-5-5-2-3-3-6-4-9-1-4-1-7-1-12l0-52-15 0 0 58c0 3 0 5-1 8 0 3-1 5-1 7-1 3-3 4-4 6-2 1-4 2-7 2-3 0-5-1-7-2-2-2-4-4-6-6-1-3-2-6-3-9-1-3-1-7-1-11l0-53-15 0 0 68c0 4-1 7-1 12 0 4 0 8 0 11l15 0c0-3 0-6 0-9 1-3 1-5 1-7l0 0c1 6 4 10 7 14z"/>
+<glyph glyph-name="msvg" unicode="&#126;" d="M228 299c4 3 8 5 15 5 3 0 6 0 8-2 2-1 4-2 6-4 2-2 3-4 4-6 1-2 2-4 2-7l1 0c0 2 2 5 3 7 1 2 3 4 5 6 2 2 4 3 7 4 2 1 5 2 9 2 4 0 8-1 12-3 3-2 5-5 7-8 1-4 2-7 3-12 1-4 1-9 1-13l0-58-16 0 0 58c0 3 0 5 0 8 0 3-1 5-2 7-1 2-2 4-4 6-1 1-4 2-7 2-2 0-5-1-7-3-2-1-4-3-5-5-2-3-3-6-4-9 0-4-1-7-1-12l0-52-15 0 0 58c0 3 0 5 0 8-1 3-1 5-2 7-1 3-2 4-4 6-2 1-4 2-7 2-2 0-5-1-7-2-2-2-4-4-5-6-2-3-3-6-4-9-1-3-1-7-1-11l0-53-15 0 0 68c0 4 0 7 0 12 0 4-1 8-1 11l15 0c0-3 0-6 1-9 0-3 0-5 0-7l0 0c1 6 4 10 8 14z"/>
+<glyph glyph-name="deg" unicode="&#92;" d="M199 210l0 14-1 0c-1-4-4-9-7-12-3-3-8-5-14-5-5 0-9 1-12 4-4 2-7 6-9 10-3 4-5 9-6 15-1 6-2 13-2 20 0 7 1 13 2 19 1 6 3 11 5 16 3 4 6 7 10 10 3 2 7 3 12 3 5 0 10-1 13-4 4-3 7-7 8-12l0 0 0 59 16 0 0-137z m0 45c0 5-1 10-1 14-1 5-2 8-4 11-1 3-3 6-5 8-2 2-5 2-8 2-3 0-5 0-8-2-2-2-3-5-5-8-1-3-2-6-3-11-1-4-1-9-1-14 0-4 0-9 1-13 1-4 2-8 3-11 2-3 3-6 5-8 3-1 5-2 8-2 3 0 6 1 8 2 2 2 4 5 5 8 2 3 3 7 4 11 0 4 1 9 1 13z m49-3c0-5 1-9 1-13 1-3 2-7 4-9 1-3 3-5 5-7 3-2 5-2 8-2 5 0 8 1 10 3 3 3 5 6 6 9l12-6c-3-6-6-11-11-15-4-3-10-5-17-5-10 0-19 4-24 13-6 8-9 20-9 35 0 8 0 14 2 20 2 6 4 11 7 16 3 4 6 7 10 10 4 2 9 3 14 3 5 0 10-1 14-3 4-3 7-6 9-10 3-4 5-9 6-14 1-6 1-12 1-18l0-7-48 0z m33 12c0 8-2 14-4 19-3 5-6 7-12 7-3 0-6 0-8-2-2-2-3-4-5-7-1-3-2-6-3-9 0-3-1-6-1-8z m79 37l15 0 0-91c0-6-1-12-2-17-1-5-3-10-6-14-2-4-6-7-10-9-5-2-10-3-16-3-7 0-12 1-18 4-5 2-10 6-13 10l9 11c3-3 6-6 10-8 3-2 8-3 12-3 4 0 7 0 9 2 3 1 5 3 6 6 1 3 2 6 3 9 1 4 1 8 1 12l0 14-1 0c-1-5-3-9-7-12-3-3-7-5-14-5-4 0-8 1-12 4-4 2-7 6-9 10-3 4-4 9-6 15-1 6-2 13-2 20 0 7 1 13 2 19 1 6 3 11 6 15 2 5 5 8 9 10 3 3 8 4 12 4 6 0 10-2 14-5 3-3 6-6 7-11l1 0 0 13z m0-45c0 4 0 9-1 13-1 5-2 8-3 11-2 4-4 6-6 8-2 2-5 3-8 3-3 0-5-1-7-3-2-2-4-4-5-8-2-3-3-6-4-11 0-4-1-9-1-13 0-5 1-10 1-14 1-4 2-8 4-11 1-3 3-6 5-8 2-1 4-2 7-2 3 0 6 1 8 2 2 2 4 5 6 8 1 3 2 7 3 11 1 4 1 9 1 14z"/>
+<glyph glyph-name="px" unicode="&#124;" d="M206 301l0-14 1 0c1 5 3 9 7 12 3 3 8 5 14 5 4 0 9-1 12-4 4-2 7-6 9-10 3-4 5-9 6-15 1-6 2-13 2-20 0-7-1-13-2-19-1-6-3-11-6-15-2-5-5-8-9-10-3-3-7-4-12-4-5 0-10 1-14 5-3 3-6 7-7 11l0 0 0-56-16 0 0 134z m0-45c0-5 1-10 1-14 1-4 2-8 4-11 1-3 3-6 5-8 2-1 5-2 8-2 3 0 5 1 7 2 3 2 4 5 6 8 1 3 2 7 3 11 0 4 1 9 1 14 0 4-1 9-1 13-1 5-2 8-3 11-2 3-3 6-6 8-2 2-4 2-7 2-3 0-6 0-8-2-2-2-4-5-5-8-2-3-3-6-4-11 0-4-1-9-1-13z m86 2l-23 43 17 0 15-32 13 32 17 0-22-43 24-48-17 0-16 36-16-36-17 0z"/>
+<glyph glyph-name="m-sq" unicode="&#57345;" d="M204 299c4 3 8 5 15 5 3 0 6 0 8-2 2-1 4-2 6-4 2-2 3-4 4-6 1-2 2-4 2-7l1 0c0 2 2 5 3 7 1 2 3 4 5 6 2 2 4 3 7 4 2 1 5 2 9 2 4 0 8-1 12-3 3-2 5-5 7-8 1-4 2-7 3-12 1-4 1-9 1-13l0-58-16 0 0 58c0 3 0 5 0 8 0 3-1 5-2 7-1 2-2 4-4 6-1 1-4 2-7 2-2 0-5-1-7-3-2-1-4-3-5-5-2-3-3-6-4-9 0-4-1-7-1-12l0-52-15 0 0 58c0 3 0 5 0 8-1 3-1 5-2 7-1 3-2 4-4 6-2 1-4 2-7 2-2 0-5-1-7-2-2-2-4-4-5-6-2-3-3-6-4-9-1-3-1-7-1-11l0-53-15 0 0 68c0 4 0 7 0 12 0 4-1 8-1 11l15 0c0-3 0-6 1-9 0-3 0-5 0-7l0 0c1 6 4 10 8 14z m129 44c0-2-1-4-1-5-1-2-1-4-2-6-1-1-2-3-3-5-2-2-3-3-4-5l-14-20 23 0 0-7-32 0 0 8 18 24c2 3 3 6 4 8 2 3 2 5 2 8 0 3-1 5-2 7-1 3-3 4-6 4-2 0-4-1-6-3-2-2-3-4-3-7l-8 1c1 5 3 9 6 12 3 2 7 4 12 4 2 0 4-1 6-2 2-1 4-2 5-3 2-2 3-4 3-6 1-2 2-4 2-7z"/>
+<glyph glyph-name="m-cubed" unicode="&#57346;" d="M204 299c4 3 8 5 15 5 3 0 6 0 8-2 2-1 4-2 6-4 2-2 3-4 4-6 1-2 2-4 2-7l1 0c0 2 2 5 3 7 1 2 3 4 5 6 2 2 4 3 7 4 2 1 5 2 9 2 4 0 8-1 12-3 3-2 5-5 7-8 1-4 2-7 3-12 1-4 1-9 1-13l0-58-16 0 0 58c0 3 0 5 0 8 0 3-1 5-2 7-1 2-2 4-4 6-1 1-4 2-7 2-2 0-5-1-7-3-2-1-4-3-5-5-2-3-3-6-4-9 0-4-1-7-1-12l0-52-15 0 0 58c0 3 0 5 0 8-1 3-1 5-2 7-1 3-2 4-4 6-2 1-4 2-7 2-2 0-5-1-7-2-2-2-4-4-5-6-2-3-3-6-4-9-1-3-1-7-1-11l0-53-15 0 0 68c0 4 0 7 0 12 0 4-1 8-1 11l15 0c0-3 0-6 1-9 0-3 0-5 0-7l0 0c1 6 4 10 8 14z m130 14c0-3-1-5-2-7 0-3-2-5-3-7-2-1-3-3-6-4-2-1-4-1-7-1-5 0-8 1-11 3-4 2-6 6-7 10l7 2c1-2 2-4 4-6 2-1 4-2 7-2 1 0 3 0 4 1 1 1 2 2 3 3 1 1 2 2 2 4 1 1 1 3 1 4 0 4-1 7-3 9-3 2-5 3-9 3l-2 0 0 7 2 0c3 0 6 1 8 3 1 2 2 5 2 8 0 2 0 3 0 4 0 1-1 2-2 3 0 1-1 2-2 3-1 1-3 1-4 1-2 0-4-1-5-2-2-1-3-2-4-4l-7 2c1 2 2 3 3 5 1 1 3 2 4 3 1 1 3 2 4 2 2 1 4 1 5 1 3 0 5-1 7-1 2-1 3-2 5-4 1-1 2-3 3-5 1-2 1-4 1-7 0-2 0-3 0-5-1-2-1-3-2-4-1-2-2-3-3-4-1-1-3-1-4-2l0 0c3-1 6-3 8-6 2-2 3-6 3-10z"/>
+<glyph glyph-name="acceleration" unicode="&#57347;" d="M207 350c3 2 8 3 14 3 3 0 5 0 8-1 2 0 4-1 5-2 2-1 3-2 4-4 1-1 2-3 2-4l0 0c1 1 2 3 3 4 2 1 3 3 5 4 2 1 4 2 7 2 2 1 5 1 8 1 5 0 8 0 11-1 3-2 5-3 7-5 1-2 2-5 3-7 1-3 1-6 1-8l0-35-15 0 0 35c0 1 0 3 0 4 0 2-1 4-2 5-1 1-2 2-3 3-2 1-4 1-7 1-2 0-4 0-6-1-2-1-4-2-6-4-1-1-2-3-3-5-1-2-1-4-1-7l0-31-14 0 0 35c0 1-1 3-1 4 0 2-1 3-1 5-1 1-2 2-4 3-2 1-4 1-7 1-2 0-4 0-6-1-2-1-4-2-5-4-2-1-3-3-3-5-1-2-2-4-2-7l0-32-14 0 0 41c0 3 0 5 0 8 0 2 0 4-1 6l14 0c0-1 1-3 1-5 0-2 0-3 0-4l0 0c2 3 4 6 8 8z m112-92c0-2 0-4-1-5 0-1-1-3-2-4 0-2-1-3-2-4-1-2-2-3-3-5l-11-15 18 0 0-6-25 0 0 6 14 20c2 2 3 4 4 6 1 2 1 4 1 6 0 3 0 5-1 6-1 2-3 3-5 3-2 0-4-1-5-2-1-2-2-3-2-6l-7 1c1 4 3 7 5 9 2 2 5 3 9 3 2 0 4 0 6-1 1 0 3-1 4-3 1-1 2-2 2-4 1-2 1-3 1-5z m-112-18c-1 1-2 2-3 3-1 1-3 1-5 1-1 0-3 0-4-2-1-1-2-3-2-5 0-2 1-3 2-4 1-1 3-2 6-3 1-1 2-1 3-2 2-1 3-2 4-3 1-1 2-2 2-4 1-1 1-3 1-5 0-2 0-4-1-6-1-2-2-3-3-5-1-1-3-2-4-2-2-1-4-1-6-1-3 0-5 0-7 1-3 1-4 3-6 5l5 5c1-2 2-3 3-4 2 0 3-1 5-1 2 0 4 1 5 2 1 2 2 3 2 6 0 1 0 2-1 3 0 1-1 2-2 2 0 1-1 1-2 2-1 0-2 1-3 1-2 1-3 1-4 2-1 0-2 1-3 2-1 1-1 2-2 4 0 1-1 3-1 5 0 2 1 4 1 5 1 2 2 3 3 5 1 1 3 2 4 2 2 1 4 1 6 1 2 0 5 0 7-1 2-1 3-2 5-4z m18-16c0-2 0-4 0-6 1-2 1-4 2-5 1-1 2-3 3-3 1-1 3-2 4-2 2 0 4 1 5 2 1 2 2 3 3 5l6-3c-2-3-3-6-6-8-2-1-5-2-8-2-5 0-10 2-13 6-3 4-4 10-4 18 0 4 0 7 1 10 1 3 2 6 4 8 1 2 3 3 5 5 2 1 4 1 7 1 2 0 5 0 7-1 2-2 3-3 5-5 1-2 2-5 2-7 1-3 1-6 1-9l0-4-24 0z m16 6c0 4 0 7-2 10-1 2-3 4-6 4-1 0-3-1-4-2-1-1-2-2-2-3-1-2-1-3-2-5 0-1 0-2 0-4l16 0z m31-28c-3 0-5 0-7 1-2 2-4 3-5 5-2 3-3 5-3 8-1 3-1 6-1 10 0 4 0 7 1 10 0 3 1 5 3 8 1 2 3 3 5 5 2 1 5 1 7 1 3 0 5 0 6-1 2-1 3-1 4-2l-4-6c0 1-1 1-2 2-1 0-2 1-4 1-1 0-2-1-3-2-1-1-2-2-3-3-1-2-1-4-2-6 0-2 0-4 0-7 0-2 0-5 0-7 1-2 1-4 2-5 1-2 2-3 3-4 1-1 2-1 4-1 1 0 3 0 4 1 1 0 1 1 2 2l4-6c-3-3-6-4-11-4z m17 74l-107 0c-2 0-4 2-4 4 0 2 2 4 4 4l107 0c2 0 4-2 4-4 0-2-2-4-4-4z"/>
+<glyph glyph-name="particles" unicode="&#57348;" d="M332 229c0 12 10 23 23 23 13 0 23-11 23-23 0-13-10-24-23-24-13 0-23 11-23 24z m-54-68c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m-62-18c0 13 11 23 24 23 12 0 23-10 23-23 0-13-11-23-23-23-13 0-24 10-24 23z m-46 60c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m81-138c-5 3-8 9-9 15-1 6 1 12 4 17 4 5 9 8 15 9 6 1 13 0 18-4 5-4 8-9 9-15 1-6-1-13-4-18-4-4-9-8-16-9-6-1-12 1-17 5z m-183 201c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m111 46c0 13 10 24 23 24 13 0 23-11 23-24 0-12-10-23-23-23-13 0-23 11-23 23z m71-94c0 13 11 23 24 23 12 0 23-10 23-23 0-13-11-23-23-23-13 0-24 10-24 23z m163 52c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-12 0-23 10-23 23z m-111 38c0 13 11 23 23 23 13 0 24-10 24-23 0-13-11-23-24-23-12 0-23 10-23 23z m-170 90c0 13 11 24 24 24 12 0 23-11 23-24 0-12-11-23-23-23-13 0-24 11-24 23z m235-23c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z"/>
+<glyph glyph-name="voxels" unicode="&#57349;" d="M434 379l-85 49c-4 2-10 2-14 0l-77-45-79 46c-4 2-10 2-14 0l-85-49c-4-3-7-7-7-12l0-98c0-5 3-10 7-13l78-45 0-89c0-5 3-10 7-12l85-49c2-2 5-2 7-2 2 0 5 0 7 2l85 49c4 2 7 7 7 12l0 88 78 45c5 3 7 7 7 12l0 99c0 5-2 9-7 12z m-21-88l-59 34 0 68 59-35z m-69-55l-73 42 0 80 59 35 0-68-29-17c-6-3-8-11-4-16 2-4 6-6 10-6 2 0 4 0 6 1l29 17 60-34z m-75-57l0 66 59-34 0-66z m-26 113l-59 34 0 68 59-34z m-142 68l59 34 0-68-31-18c-6-3-8-11-5-17 2-3 7-6 11-6 2 0 4 1 6 2l31 18 59-34-60-34-70 41z m156-270l-71 41 0 81 59 34 0-67-28-16c-6-3-8-11-5-17 3-3 7-6 11-6 2 0 4 1 6 2l28 16 59-34z"/>
+<glyph glyph-name="lock" unicode="&#57350;" d="M389 233l0 62c0 68-55 124-123 124-69 0-124-56-124-124l0-62c-24-4-44-26-44-52l0-74c0-29 24-52 52-52l230 0c29 0 53 23 53 52l0 74c0 26-18 48-44 52z m-123 129c37 0 67-30 67-67l0-61-135 0 0 61c0 37 31 67 68 67z"/>
+<glyph glyph-name="visible" unicode="&#57351;" d="M258 116c-55 0-106 17-147 51-31 25-47 51-47 52-4 7-4 16 1 23 2 4 66 98 195 96 133-3 192-93 195-97 4-6 4-15 0-22 0-1-15-27-46-53-29-23-79-50-151-50 0 0 0 0 0 0z m-148 113c7-7 17-18 30-29 34-27 73-40 118-40 0 0 0 0 0 0 47 0 88 13 122 40 13 10 23 21 29 29-7 7-16 16-30 26-34 25-74 38-119 38-81 2-130-42-150-64z m-27 1z m227-4c0-25-21-46-47-46-26 0-47 21-47 46 0 26 21 47 47 47 26 0 47-21 47-47z"/>
+<glyph glyph-name="model" unicode="&#57352;" d="M494 395c-2 5-8 8-13 7l-90-16 45 72c3 5 2 11-1 15-4 4-10 5-15 3l-213-98c-15 5-72 27-111 43 0 0-1 0-1 0 0 0 0 0 0 0 0 0-1 0-1 1 0 0-1 0-1 0 0 0-1 0-1 0 0 0 0 0 0 0-1 0-1 0-2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-1 0-1 0 0 0 0 0 0-1-1 0-1 0-2 0 0 0 0 0 0 0 0 0-1 0-1 0 0 0 0-1 0-1-1 0-2 0-3-1 0 0 0 0 0 0 0-1-1-1-1-1 0 0 0 0 0 0 0 0 0-1 0-1-1 0-1 0-1 0 0 0 0 0 0-1 0 0 0 0-1-1l-27-52-33-40c-3-4-3-10 0-15 2-3 6-5 10-5 1 0 2 0 4 1l50 17 40 2-26-51c-3-4-2-9 1-13 1-1 26-30 52-58 15-17 28-30 38-40 6-6 11-11 15-14l-16-61-46-18c-6-3-9-10-6-16 2-5 6-8 11-8 1 0 3 1 4 1l45 18 17-15c2-3 5-4 8-4 4 0 7 2 9 5 5 5 4 12-1 17l-17 15 16 61 76-90c2-2 6-4 9-4 1 0 2 0 3 0l85 23c5 2 8 6 9 11 0 5-2 9-7 12l-136 72 45 91 178 123c5 3 6 9 4 15z m-200-117l-122 55 41 21 181 83z m-148 73l-24 33c16-6 39-15 54-21z m-59-6l-9 13 15 29 27-38 2-2z m36-77l23 44c18-45 35-91 47-121-19 20-45 49-70 77z m194-194l-57 68 105-55z m-94 101c-5 14-42 104-30 77 0-2-21 49-28 66l121-59-48-95z m108 120l43 63 70 16z"/>
+<glyph glyph-name="forward" unicode="&#68;" d="M330 278l-95 70c-5 4-12 5-18 2-5-3-9-9-9-16l0-150c0-7 4-13 10-16 2-1 5-2 7-2 4 0 8 2 11 5l95 79c4 4 6 9 6 14-1 5-3 10-7 14"/>
+<glyph glyph-name="avatar-2" unicode="&#57353;" d="M256 88c-93 0-169 75-169 168 0 93 76 169 169 169 93 0 169-76 169-169 0-93-76-168-169-168z m0 316c-81 0-148-66-148-148 0-81 67-147 148-147 81 0 148 66 148 147 0 82-67 148-148 148z m97-90l-1 1c-3 3-7 4-10 4-1 0-61-9-86-9-1 0-1 0-2 0-25 0-87 10-87 10-5 0-10-2-13-6l-1-2c-2-3-2-7-1-10 1-4 3-6 6-8 12-5 49-20 60-22 2 0 5 0 6-7 1-8-3-46-7-65-5-17-13-40-13-41-2-6 1-13 7-15l8-3c3-1 6-1 9 1 3 1 5 4 6 7l21 65 20-67c1-3 3-6 6-7 2-1 4-1 5-1 2 0 3 0 5 0l7 3c5 2 8 8 7 14 0 0-6 24-11 44-3 12-4 30-5 45 0 9-1 16-2 22 0 1 0 4 5 5 0 0 1 0 2 0l55 22c4 2 6 5 7 9 1 4 0 8-3 11z m-68 37c0-16-13-29-29-29-16 0-29 13-29 29 0 16 13 29 29 29 16 0 29-13 29-29z"/>
+<glyph glyph-name="arrow-dn" unicode="&#53;" d="M258 219l-43 55 86 0z"/>
+<glyph glyph-name="arrow-up" unicode="&#54;" d="M258 283l43-55-86 0z"/>
+<glyph glyph-name="time" unicode="&#57354;" d="M256 390c-73 0-132-59-132-132 0-73 59-132 132-132 73 0 132 59 132 132 0 73-59 132-132 132z m60-162l1 0-64 0c-2 0-4 0-6 1-8 2-15 10-15 19l0 0 2 92c0 11 9 20 19 20 11 0 20-9 20-20l-1-72 44 0c11 0 20-9 20-20 0-10-9-20-20-20z"/>
+<glyph glyph-name="transparency" unicode="&#57355;" d="M349 349c1 0 3-1 3-3l0-181c0-2-2-3-3-3l-182 0c-1 0-3 1-3 3l0 181c0 2 2 3 3 3l182 0m0 17l-182 0c-11 0-20-9-20-20l0-181c0-11 9-20 20-20l182 0c11 0 20 9 20 20l0 181c0 11-9 20-20 20z m-187-108l96 0 0-96-96 0z m94 94l96 0 0-95-96 0z"/>
+<glyph glyph-name="unmuted" unicode="&#71;" d="M298 255c-1-8-2-17-3-25-2-7-4-15-6-22-2-6-1-11 3-14 7-6 16-3 19 6 8 23 12 47 9 71-1 14-4 27-9 40-3 7-12 10-18 5-5-3-7-8-4-14 5-15 8-31 9-47m-35 81c0 12-5 20-16 24-7 3-19 2-27-7-11-12-22-24-34-37-1-1-3-1-5-2-4 0-7 0-11 0-3 0-5 0-8 0-15 0-26-10-26-23 0-28 0-42 0-71 0-11 10-22 21-23 4 0 9 0 14 0 3-1 7-1 10-1 2 0 4-1 5-2 10-11 22-23 33-36 6-6 12-9 20-9 3 0 5 1 8 2 11 3 16 12 16 24 0 22 0 39 0 59l0 43c0 19 0 59 0 59m-26-3l0-155-1 1c-3 3-5 5-7 7l-8 9c-8 9-16 17-23 25-2 2-4 2-6 2-4 1-9 1-13 1-2 0-4 0-7 0l-9 0 0 65 2 0c3 0 5 0 8 0 6 0 12 0 18 0 0 0 0 0 0 0 3 0 5 1 8 4 10 10 20 21 30 32z m140-78c0 3-1 6-1 10-1 7-1 14-2 22-3 15-7 31-14 47-2 4-5 7-9 8-4 1-8 0-11-3-5-4-6-10-4-16 9-22 13-42 14-64 1-24-4-49-14-72-1-4-2-8 0-11 1-3 4-6 7-7 2-1 4-1 5-1 6 0 10 3 13 9 10 25 15 51 16 78z"/>
+<glyph glyph-name="user" unicode="&#57356;" d="M257 406c-83 0-151-68-151-151 0-83 68-150 151-150 83 0 150 67 150 150 0 83-67 151-150 151z m0-282c-73 0-132 59-132 131 0 73 59 132 132 132 73 0 132-59 132-132 0-72-59-131-132-131z m45 179c0-24-19-43-42-43-24 0-43 19-43 43 0 23 19 42 43 42 23 0 42-19 42-42z m-10-71l-62 0c-25 0-53-12-53-37l0-18c26-23 50-32 77-32 32 0 69 14 85 33l0 17c0 25-22 37-47 37z"/>
+<glyph glyph-name="edit-pencil" unicode="&#57357;" d="M341 403c9 9 18 19 28 28 4 4 9 3 12-1 17-16 33-32 50-49 3-4 4-8 0-12-10-10-20-19-29-29-20 21-41 42-61 63z m-25-23c-1-2-2-4-3-5-9-9-17-17-26-26-49-49-153-152-175-175-5-5-9-11-10-19-3-22-6-43-10-66 3 1 4 1 6 1 20 4 41 8 62 13 4 1 8 3 11 6 21 21 109 108 163 162 13 14 27 28 41 42 2 1 3 3 4 3-21 21-41 42-63 64z m-158-231c-6 6-12 12-17 17 21 21 137 137 177 177 5-5 11-11 16-17-7-7-14-14-21-22-50-50-138-137-155-155z"/>
+<glyph glyph-name="muted" unicode="&#72;" d="M377 274l-57-57c-5-5-13-5-18 0-5 5-5 13 0 18l57 57c5 5 13 5 18 0 5-5 5-13 0-18m-18-57l-57 57c-5 5-5 13 0 18 5 5 13 5 18 0l57-57c5-5 5-13 0-18-5-5-13-5-18 0m-95 120c0 12-6 21-17 25-8 3-20 3-29-7-11-12-23-25-35-37-1-2-3-2-4-3-4 0-8 0-12 0-3 0-6 0-8 0-15 0-27-11-27-24 0-29 0-42 0-73 0-11 10-22 21-23 5-1 10-1 15-1 4 0 7 0 11 0 1 0 3-1 4-2 11-12 23-24 35-37 5-7 12-10 20-10 3 0 6 1 9 2 11 4 17 13 17 25 0 22 0 40 0 60l0 45c0 20 0 60 0 60m-28-3l0-159-1 1c-3 3-5 5-7 8l-9 9c-8 9-16 17-24 26-1 1-3 2-5 2-5 0-9 0-14 0-2 0-5 0-7 0l-10 0 0 67 3 0c3 0 5 0 8 0 6 0 12 0 19 0 0 0 0 0 0 0 3 0 5 1 8 4 10 11 20 22 31 34z"/>
+<glyph glyph-name="vol-0" unicode="&#57358;" d="M109 352c-2-2-5-4-8-4-7 0-13 0-18 0-2 0-4 0-7 0-2 0-4 0-6 0-23 0-41-16-41-37 0-44 0-65 0-113 1-17 15-33 32-35 8-1 16-1 23-1l1 0c5 0 11 0 16 0 3 0 6-2 8-4 15-15 35-37 54-58 8-9 18-14 30-14 4 0 8 1 12 2 16 6 23 19 23 39l0 162c0 31 2 94 2 95 0 19-9 31-25 37-11 5-29 4-42-10-20-23-37-42-54-59z m66 14l15 18 0-259-4 7c-2 2-4 4-6 6-1 2-3 4-5 6l-13 14c-3 3-6 6-9 10-9 10-18 20-27 30-2 2-6 3-8 3-6 0-13 0-21 0l-29 0 0 106 7 0c3 0 5 0 8 0 1 0 2 0 4 0 5 0 11 0 16 0 4 0 9 0 13 0l1 0c4 0 7 2 11 6 7 8 14 16 21 23 8 10 17 20 26 30z"/>
+<glyph glyph-name="vol-1" unicode="&#57359;" d="M109 352c-2-2-5-4-8-4-7 0-13 0-18 0-2 0-4 0-7 0-2 0-4 0-6 0-23 0-41-16-41-37 0-44 0-65 0-113 1-17 15-33 32-35 8-1 16-1 23-1l1 0c5 0 11 0 16 0 3 0 6-2 8-4 15-15 35-37 54-58 8-9 18-14 30-14 4 0 8 1 12 2 16 6 23 19 23 39l0 162c0 31 2 94 2 95 0 19-9 31-25 37-11 5-29 4-42-10-20-23-37-42-54-59z m66 14l15 18 0-259-4 7c-2 2-4 4-6 6-1 2-3 4-5 6l-13 14c-3 3-6 6-9 10-9 10-18 20-27 30-2 2-6 3-8 3-6 0-13 0-21 0l-29 0 0 106 7 0c3 0 5 0 8 0 1 0 2 0 4 0 5 0 11 0 16 0 4 0 9 0 13 0l1 0c4 0 7 2 11 6 7 8 14 16 21 23 8 10 17 20 26 30z m89-110c0 32-15 58-34 58-19 0-34-26-34-58 0-32 15-58 34-58 19 0 34 26 34 58z"/>
+<glyph glyph-name="vol-2" unicode="&#57360;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m-195 98c-2-2-5-4-8-4-7 0-13 0-18 0-2 0-4 0-7 0-2 0-4 0-6 0-23 0-41-16-41-37 0-44 0-65 0-113 1-17 15-33 32-35 8-1 16-1 23-1l1 0c5 0 11 0 16 0 3 0 6-2 8-4 15-15 35-37 54-58 8-9 18-14 30-14 4 0 8 1 12 2 16 6 23 19 23 39l0 162c0 31 2 94 2 95 0 19-9 31-25 37-11 5-29 4-42-10-20-23-37-42-54-59z m66 14l15 18 0-259-4 7c-2 2-4 4-6 6-1 2-3 4-5 6l-13 14c-3 3-6 6-9 10-9 10-18 20-27 30-2 2-6 3-8 3-6 0-13 0-21 0l-29 0 0 106 7 0c3 0 5 0 8 0 1 0 2 0 4 0 5 0 11 0 16 0 4 0 9 0 13 0l1 0c4 0 7 2 11 6 7 8 14 16 21 23 8 10 17 20 26 30z m89-110c0 32-15 58-34 58-19 0-34-26-34-58 0-32 15-58 34-58 19 0 34 26 34 58z"/>
+<glyph glyph-name="vol-3" unicode="&#57361;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m-195 98c-2-2-5-4-8-4-7 0-13 0-18 0-2 0-4 0-7 0-2 0-4 0-6 0-23 0-41-16-41-37 0-44 0-65 0-113 1-17 15-33 32-35 8-1 16-1 23-1l1 0c5 0 11 0 16 0 3 0 6-2 8-4 15-15 35-37 54-58 8-9 18-14 30-14 4 0 8 1 12 2 16 6 23 19 23 39l0 162c0 31 2 94 2 95 0 19-9 31-25 37-11 5-29 4-42-10-20-23-37-42-54-59z m66 14l15 18 0-259-4 7c-2 2-4 4-6 6-1 2-3 4-5 6l-13 14c-3 3-6 6-9 10-9 10-18 20-27 30-2 2-6 3-8 3-6 0-13 0-21 0l-29 0 0 106 7 0c3 0 5 0 8 0 1 0 2 0 4 0 5 0 11 0 16 0 4 0 9 0 13 0l1 0c4 0 7 2 11 6 7 8 14 16 21 23 8 10 17 20 26 30z m245-112c-1 6-1 11-2 16-1 11-2 23-3 35-4 25-12 51-22 76-3 6-8 11-14 12-7 2-13 1-19-4-8-6-10-15-5-26 13-34 21-67 21-102 1-39-6-78-22-116-2-6-3-13 0-18 2-5 6-9 12-11 2-1 5-2 8-2 8 0 16 6 20 16 16 39 25 81 26 124z m-156 2c0 32-15 58-34 58-19 0-34-26-34-58 0-32 15-58 34-58 19 0 34 26 34 58z"/>
+<glyph glyph-name="vol-4" unicode="&#57362;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m-195 98c-2-2-5-4-8-4-7 0-13 0-18 0-2 0-4 0-7 0-2 0-4 0-6 0-23 0-41-16-41-37 0-44 0-65 0-113 1-17 15-33 32-35 8-1 16-1 23-1l1 0c5 0 11 0 16 0 3 0 6-2 8-4 15-15 35-37 54-58 8-9 18-14 30-14 4 0 8 1 12 2 16 6 23 19 23 39l0 162c0 31 2 94 2 95 0 19-9 31-25 37-11 5-29 4-42-10-20-23-37-42-54-59z m66 14l15 18 0-259-4 7c-2 2-4 4-6 6-1 2-3 4-5 6l-13 14c-3 3-6 6-9 10-9 10-18 20-27 30-2 2-6 3-8 3-6 0-13 0-21 0l-29 0 0 106 7 0c3 0 5 0 8 0 1 0 2 0 4 0 5 0 11 0 16 0 4 0 9 0 13 0l1 0c4 0 7 2 11 6 7 8 14 16 21 23 8 10 17 20 26 30z m245-112c-1 6-1 11-2 16-1 11-2 23-3 35-4 25-12 51-22 76-3 6-8 11-14 12-7 2-13 1-19-4-8-6-10-15-5-26 13-34 21-67 21-102 1-39-6-78-22-116-2-6-3-13 0-18 2-5 6-9 12-11 2-1 5-2 8-2 8 0 16 6 20 16 16 39 25 81 26 124z m-156 2c0 32-15 58-34 58-19 0-34-26-34-58 0-32 15-58 34-58 19 0 34 26 34 58z m173-186c-4 0-7 1-10 3-10 5-13 18-8 27 45 79 61 208-4 322-6 9-3 22 7 27 10 6 22 2 27-7 74-127 55-273 5-362-4-6-10-10-17-10z"/>
+<glyph glyph-name="vol-x-0" unicode="&#57363;" d="M209 196l-57 58 56 57c9 9 9 22 0 31-8 8-22 8-30-1l-57-57-57 58c-8 8-22 8-30-1-9-8-9-22 0-30l57-58-53-58c-9-9-9-22 0-31 8-8 22-8 30 0l54 58 57-57c8-8 22-8 30 0 9 9 8 23 0 31z"/>
+<glyph glyph-name="vol-x-1" unicode="&#57364;" d="M248 305l-48-48 48-50c10 10 16 28 16 49 0 21-6 39-16 49z m-39-109l-57 58 56 57c9 9 9 22 0 31-8 8-22 8-30-1l-57-57-57 58c-8 8-22 8-30-1-9-8-9-22 0-30l57-58-53-58c-9-9-9-22 0-31 8-8 22-8 30 0l54 58 57-57c8-8 22-8 30 0 9 9 8 23 0 31z"/>
+<glyph glyph-name="vol-x-2" unicode="&#57365;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m-56 51l-48-48 48-50c10 10 16 28 16 49 0 21-6 39-16 49z m-39-109l-57 58 56 57c9 9 9 22 0 31-8 8-22 8-30-1l-57-57-57 58c-8 8-22 8-30-1-9-8-9-22 0-30l57-58-53-58c-9-9-9-22 0-31 8-8 22-8 30 0l54 58 57-57c8-8 22-8 30 0 9 9 8 23 0 31z"/>
+<glyph glyph-name="vol-x-3" unicode="&#57366;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m116 0c-1 6-1 11-2 16-1 11-2 23-3 35-4 25-12 51-22 76-3 6-8 11-14 12-7 2-13 1-19-4-8-6-10-15-5-26 13-34 21-67 21-102 1-39-6-78-22-116-2-6-3-13 0-18 2-5 6-9 12-11 2-1 5-2 8-2 8 0 16 6 20 16 16 39 25 81 26 124z m-172 51l-48-48 48-50c10 10 16 28 16 49 0 21-6 39-16 49z m-39-109l-57 58 56 57c9 9 9 22 0 31-8 8-22 8-30-1l-57-57-57 58c-8 8-22 8-30-1-9-8-9-22 0-30l57-58-53-58c-9-9-9-22 0-31 8-8 22-8 30 0l54 58 57-57c8-8 22-8 30 0 9 9 8 23 0 31z"/>
+<glyph glyph-name="vol-x-4" unicode="&#57367;" d="M304 254c-2-13-3-26-5-39-2-12-6-24-10-36-3-10-1-17 5-22 12-9 26-5 31 9 14 37 19 75 15 115-3 21-8 43-16 63-4 12-18 16-28 9-8-5-10-13-7-24 9-24 14-49 15-75m116 0c-1 6-1 11-2 16-1 11-2 23-3 35-4 25-12 51-22 76-3 6-8 11-14 12-7 2-13 1-19-4-8-6-10-15-5-26 13-34 21-67 21-102 1-39-6-78-22-116-2-6-3-13 0-18 2-5 6-9 12-11 2-1 5-2 8-2 8 0 16 6 20 16 16 39 25 81 26 124z m17-184c-4 0-7 1-10 3-10 5-13 18-8 27 45 79 61 208-4 322-6 9-3 22 7 27 10 6 22 2 27-7 74-127 55-273 5-362-4-6-10-10-17-10z m-189 235l-48-48 48-50c10 10 16 28 16 49 0 21-6 39-16 49z m-39-109l-57 58 56 57c9 9 9 22 0 31-8 8-22 8-30-1l-57-57-57 58c-8 8-22 8-30-1-9-8-9-22 0-30l57-58-53-58c-9-9-9-22 0-31 8-8 22-8 30 0l54 58 57-57c8-8 22-8 30 0 9 9 8 23 0 31z"/>
+<glyph glyph-name="share-ext" unicode="&#57368;" d="M135 133c0 71 0 127 0 198 51 0 85 0 136 0 1 0 1-1 1-1-4-3-7-7-11-10-4-4-8-10-13-12-5-2-11 0-17 0-28 0-39 0-67 0-2 0-3 0-5 0 0-56 0-96 0-151 55 0 94 0 149 0 0 2 0 3 0 5 0 32 0 50 0 82 0 3 1 5 3 7 7 7 14 13 20 20 0-51 0-87 0-138-71 0-125 0-196 0z m202 222c-21 0-42 0-64 0 0 8 0 16 0 24 35 0 71 0 106 0 0-36 0-71 0-107-8 0-15 0-23 0 0 22 0 43 0 65-49-49-97-97-145-145-6 7-12 12-17 17 48 48 96 97 144 145 0 0 0 1-1 1z"/>
+<glyph glyph-name="ellipsis" unicode="&#57369;" d="M174 232c-14 0-25 10-25 24 0 13 11 24 25 24 13 0 24-11 24-24 0-14-11-24-24-24z m78 0c-14 0-25 10-25 24 0 13 11 24 25 24 13 0 24-11 24-24 0-14-11-24-24-24z m78 0c-14 0-25 10-25 24 0 13 11 24 25 24 13 0 24-11 24-24 0-14-11-24-24-24z"/>
+<glyph glyph-name="check" unicode="&#57370;" d="M256 426c95 0 172-77 171-173 0-93-77-169-171-169-95 0-171 77-171 173 0 93 78 169 171 169z m-23-192c-2 3-3 5-4 6-13 13-26 26-39 39-10 11-26 12-36 2-10-10-10-25 1-36 20-21 40-41 60-61 11-10 26-10 36 0 36 35 71 71 106 107 4 3 7 9 8 14 2 10-3 21-13 26-10 4-21 3-29-5-28-29-57-57-85-86-2-1-3-3-5-6z"/>
+<glyph glyph-name="sliders" unicode="&#38;" d="M185 371l-35 0c-9 0-17-8-17-16 0-9 8-16 17-16l35 0z m190 0l-99 0 0-32 99 0c9 0 17 7 17 16 0 8-8 16-17 16m-163-195l-62 0c-9 0-17-8-17-17 0-9 8-16 17-16l62 0z m163 0l-71 0 0-33 71 0c9 0 17 7 17 16 0 9-8 17-17 17m-63 95l-162 0c-9 0-17-6-17-15 0-9 8-16 17-16l162 0z m-63 120c2 0 4-1 6-4 2-1 2-4 2-8l0-48c0-4 0-7-2-8-2-3-4-4-6-4l-36 0c-2 0-4 1-6 4-2 2-2 5-2 8l0 48c0 4 0 6 2 8 2 3 4 4 6 4z m126-100c2 0 4-1 6-4 2-2 2-5 2-8l0-48c0-2-1-5-2-8-2-2-4-4-6-4l-34 0c-2 0-4 2-6 4-2 2-3 5-3 8l0 48c0 4 1 7 3 8 2 3 4 4 6 4z m-100-96c2 0 5-1 7-3 2-3 2-6 2-9l0-48c0-2 0-5-2-8-2-3-4-4-7-4l-36 0c-3 0-5 1-6 4-2 2-3 5-3 8l0 48c0 4 1 6 3 9 1 2 4 3 6 3z"/>
+<glyph glyph-name="polyline" unicode="&#57371;" d="M150 90c1 0 3 0 5-1 4-1 8 0 12 2 3 1 6 5 7 9 1 3 0 8-2 11-2 3-5 6-9 7-2 1-4 1-5 1-4 1-8 1-12-1-3-2-6-6-7-9-1-4-1-8 2-12 2-3 5-6 9-7z m-55 36c1-2 2-3 3-5 1 0 1-1 2-1 0-1 1-2 2-2 3-3 6-5 10-5 2 0 4 1 6 2 2 0 4 1 5 3 2 3 4 6 4 10 0 4-1 8-4 11-1 1-3 2-4 4 1-1 2-2 3-3-1 0-1 1-1 1-2 3-6 6-9 7-2 1-4 1-6 0-2 0-4 0-6-2-3-2-6-5-7-9-1-4 0-7 2-11z m-15 64c0-3 0-6 0-8 0-4 1-8 4-11 3-3 7-5 11-4 8 0 15 6 15 15 0 2 0 5 0 8 0 4-2 8-5 10-2 3-6 5-10 5-9-1-15-7-15-15z m22 87c-5-10-9-21-12-32-2-8 3-17 10-19 9-1 16 3 19 11 2 8 5 17 9 25 3 7 2 16-6 20-6 4-17 2-20-5z m59 82c-12-12-23-24-33-38-5-6-2-16 5-20 8-5 16-1 20 5 8 11 19 22 29 32 6 5 6 15 0 21-6 6-15 5-21 0z m104-63c-19-8-25-31-20-50 4-21 23-33 43-34 21-2 40 10 52 26 12 18 14 41 8 62-7 20-21 37-40 47-19 9-42 11-63 4-39-12-65-49-69-89-3-38 15-77 45-100 33-27 78-34 119-23 80 23 131 113 109 193-10 37-37 66-72 81-40 16-88 11-128-3-10-3-21-8-31-13-7-3-9-13-5-20 4-7 13-9 20-5 32 15 68 24 104 20 15-1 30-6 42-14 3-1 6-3 9-6 2-1-2 2 0 0 1 0 2-1 2-2 2-1 4-2 5-4 3-2 5-5 7-7 0 0 4-5 2-3 1-1 2-3 3-4 2-3 4-6 6-9 1-2 2-4 2-6 1 0 1-1 1-2-1 3 1-1 1-1 3-8 5-16 6-25 0 2 0-1 0-1 1-1 1-2 1-3 0-2 0-4 0-6 0-5 0-10 0-15-1-7-2-14-4-23-4-16-10-29-20-43-1-2-2-4-4-5 0-1-1-3 0-1-1-1-1-2-2-2-2-3-5-7-8-9-2-3-5-5-8-8-1-1-3-2-4-4 0 0-2-2-1 0-1-1-2-2-3-3-14-10-26-15-41-19-9-2-14-3-23-3-9-1-17 0-23 1-16 3-31 9-43 19-1 1-5 4-7 7-3 2-6 5-8 8 0 1-2 3-1 1 0 0 0 1-1 2-1 1-2 3-3 5-2 3-4 6-6 10 0 1-2 5-1 3-1 1-2 3-2 5-2 4-3 8-3 12-1 1-1 3-1 5-1 2 0-2 0 0 0 1 0 2-1 3 0 4 0 8 0 12 0 2 1 4 1 6 0 3 0 1 0 0 0 1 0 2 0 3 1 4 2 8 3 11 1 2 1 4 2 5 0 0 1 3 0 2 0-2 1 1 1 1 2 4 4 7 6 11 1 1 2 2 3 4-1-2 0 0 0 0 1 1 2 2 2 2 3 3 6 6 9 9 0 0 2 1 0 0 1 1 2 1 3 2 1 1 3 2 5 3 3 2 7 4 10 5 8 3 14 4 22 4 2 0 5 0 7-1-2 1 2 0 3 0 2-1 4-1 5-2 1 0 2-1 3-1-2 1 1 0 1-1 4-1 7-3 10-5-1 1 2-2 3-2 1-2 3-4 4-5 1-1 2-2 2-3 0 1-1 2 1 0 1-2 2-3 3-5 1-2 2-3 3-5 1-3 0-2 0-1 0-1 1-3 1-4 1-2 1-4 2-5 0-1 0-2 0-4 0 2 1 0 1 0 0-3 0-5 0-7 0-1 0-2 0-2 0-1 0-1 0 0 0-1 0-2-1-2 0-2 0-4-1-6 0-1-1-2-1-3-1-2 1 2 0 0-1-2-2-3-3-5 0-1-1-1-1-2-3-4 1 1-1-1-1-1-2-3-3-4-1 0-5-4-3-2-2-1-3-2-5-3 0 0-1-1-2-1-1-1 2 0-1-1-2 0-4-1-6-1 3 1-1 0-2 0-1 0-3 0-4 0 3 0 0 0 0 0-1 1-3 1-4 1 0 0-3 1-1 1 2-1 0 0 0 0-2 1-4 2-5 3 2-2-1 1-2 2 2-2-1 1-1 2-2 2 0 1 0 0 0 1-1 2-1 2 0 1 0 2 0 2-1 2 0-2 0 0 0 1-1 3-1 4 0 1 1 2 1 3 0-3 0-1 0 0 0 1 0 2 1 3 0 0 1 3 0 1-1-2 1 2 2 2-2-2 0 1 1 2-2-2 2 0 3 1 7 3 9 14 5 20-5 8-13 10-21 6z"/>
+<glyph glyph-name="source" unicode="&#57372;" d="M397 222c-40 0-73-28-76-67-41 9-57 54-59 60-16 47-46 69-90 69-4 0-7 0-10-1l-3 0c-1 0-1 0-2 0l-2-2c-7-4-27-13-42-13-27 0-49 22-49 49 0 26 22 48 49 48 27 0 49-22 49-48 0-3 0-8 0-8 0-1 0-1 0-2 1-1 2-1 2-1l181-1c1 0 2 1 2 1 1 1 1 2 1 2 0 0 0 6 0 9 0 26 22 48 49 48 27 0 49-22 49-48 0-27-22-49-49-49-11 0-21 4-30 10 0 1-1 1-1 1-1 0-1 0-1 0-1 0-1-1-2-1l-14-19c0-1-1-1-1-2 1-1 1-1 1-2 14-10 31-16 48-16 43 0 78 35 78 77 0 43-35 77-78 77-41 0-74-26-77-65l-131 0c-3 39-36 66-76 66-43 0-78-35-78-77 0-43 35-77 78-77 21 0 45 9 54 15 2 0 3 0 4 0 31 0 51-14 63-49 1-3 26-79 101-79l0 0 12 0c1 0 2 1 2 1 1 1 1 1 1 2 0 0-1 16-1 18 0 26 21 45 48 45 27 0 49-21 49-48 0-26-22-48-49-48-11 0-21 3-30 10 0 0-1 0-1 0 0 0-1 0-1 0 0 0-1 0-2-1l-14-18c0-1-1-2 0-2 0-1 0-2 1-2 13-10 30-16 47-16 43 0 78 35 78 77 0 43-35 77-78 77z"/>
+<glyph glyph-name="playback-play" unicode="&#57373;" d="M128 416l256-160-256-160z"/>
+<glyph glyph-name="stop-square" unicode="&#57374;" d="M384 128l-256 0 0 256 256 0z"/>
+<glyph glyph-name="avatar-t-pose" unicode="&#57375;" d="M274 70c-1 0-1 0-1 0-12-1-14 2-14 12 0 0 0 133 0 135-3 0-6 0-9 0-2-10 1-140 1-140-1-7-2-8-9-8-2 0-5 0-7 0-8 109-16 188-16 188 0 24 0 46 0 66-1-1-33 0-44 1-15 0-62 1-79 1-8 0-14 3-18 10-1 2-2 4-4 6 8 1 15 1 22 1 35 2 99 9 100 13 14 10 23 10 36 10 15 0 31 0 46-1 11-1 24 3 37-10 20-10 81-11 123-11 0 0 1 0 1-1-4-11-12-17-25-16-29-1-77-3-127-1 1-20 1-42 2-66 0 0-6-59-15-189z m-13 372c16-6 14-20 13-32 0-5-1-10-1-14-2-11-10-18-20-18-11 0-19 8-20 18-1 6-1 13-2 20-1 7 3 13 11 15 10 3 10 3 19 11z"/>
+<glyph glyph-name="check-1" unicode="&#57376;" d="M233 234c-2 3-3 5-4 6-13 13-26 26-39 39-10 11-26 12-36 2-10-10-10-25 1-36 20-21 40-41 60-61 11-10 26-10 36 0 36 35 71 71 106 107 4 3 7 9 8 14 2 10-3 21-13 26-10 4-21 3-29-5-28-29-57-57-85-86-2-1-3-3-5-6z"/>
+<glyph glyph-name="exchange" unicode="&#57377;" d="M315 344c0 8 0 15 0 22 0 7 0 13 1 20 0 2 2 5 3 6 3 1 6 0 8-1 1 0 2-1 2-1 21-21 41-42 62-62 5-5 5-8 0-13-21-21-42-42-62-63-5-4-11-4-13 1-1 1-1 3-1 5 0 11 0 22 0 33 0 2 0 3 0 6-2 0-4 0-5 0-61 0-122 0-183 0-9 0-10 1-10 10 0 10 0 19 0 29 0 6 2 8 8 9 1 0 2 0 4 0 60 0 120 0 180 0 2-1 4-1 6-1z m-116-121c2 0 4 0 6 0 61 0 122 0 182 0 9 0 11-1 11-10 0-10 0-19 0-29 0-6-3-8-9-9-1 0-3 0-4 0-60 0-120 0-180 0-2 0-4 0-6 0 0-2 0-3 0-5 0-11 0-23 0-34 0-4-1-6-4-8-4-1-6 0-9 2-21 22-42 43-64 64-4 4-4 7 1 12 21 21 42 42 63 63 3 3 6 4 9 2 3-1 4-4 4-7 0-12 0-24 0-35 0-2 0-3 0-6z"/>
+<glyph glyph-name="hfc" unicode="&#57378;" d="M370 142c-12-23-30-42-51-55-12-8-25-14-39-18-38-12-79-7-115 12-35 19-61 51-72 90-12 38-7 79 12 114 12 23 29 42 50 55 7 5 14 8 22 12l1-229c10-6 22-11 34-14l-1 251c13 2 31 2 50 2l1-254c12 2 24 6 34 11l0 244c37 0 72-1 84-1l7 33c-15 0-52 1-91 1l0 57 166 1 0 34-201-1 1-91c-19 0-37-1-51-2l-1 93-34-1 1-98c-44-15-80-45-102-86-24-44-29-94-15-141 14-47 46-86 89-110 44-23 94-29 141-15 17 6 33 13 48 22 26 17 47 40 62 68 8 14 13 28 17 44-11 2-22 4-33 7-3-12-8-24-14-35z"/>
+<glyph glyph-name="home-1" unicode="&#57379;" d="M155 273c-5 0-10 2-14 7-5 7-3 17 5 23l29 19 84 59 109-79c8-5 9-15 4-22-5-8-16-9-23-4l-90 65-65-46-30-19c-3-2-6-3-9-3z m84-78c0 12 10 21 21 21 11 0 21-10 21-21l0-60 75 0 0 89-32 24-64 46-68-46-33-21 0-92 80 0 0 60z"/>
+<glyph glyph-name="private-key" unicode="&#57380;" d="M238 263c-30 43-16 96 20 121 34 25 82 21 112-8 30-31 33-79 8-114-25-34-77-48-120-18-21-21-41-41-61-61 2-3 5-6 7-8 6-6 12-12 18-18 3-3 3-5 0-7-3-3-6-6-9-9-3-3-5-3-7 0-5 5-9 9-14 14-5-5-9-10-14-15 4-4 9-9 14-14 2-2 2-4 0-6-4-3-7-7-10-10-3-2-4-2-6 0-14 14-28 28-42 42-4 3-2 5 0 7 33 33 67 66 100 99 1 2 3 3 4 5z m131 51c0 34-26 61-61 61-33 0-60-27-61-60 0-35 27-61 62-62 33 0 60 28 60 61z"/>
+<glyph glyph-name="security-pic" unicode="&#57382;" d="M365 406l-212 0c-18 0-33-14-33-32l0-91c9 5 18 11 27 15l0 76c0 3 3 5 6 5l212 0c3 0 5-2 5-5l0-212c0-3-2-6-5-6l-106 0 0-27 106 0c18 0 32 15 32 33l0 212c0 18-14 32-32 32z m-153-209l0 16c0 28-23 51-51 51-28 0-51-23-51-51l0-16c-10-2-18-11-18-22l0-39c0-12 9-22 21-22l95 0c12 0 21 10 21 22l0 39c1 11-7 20-17 22z m-51 44c15 0 27-12 27-28l0-16-55 0 0 16c0 16 13 28 28 28z m183 49l-66 49-83-50c7-4 14-10 19-17l62 37 68-50 0 31z m-114-44l114 0 0-26-114 0z"/>
+<glyph glyph-name="wallet" unicode="&#57383;" d="M400 400c-3 10-8 19-15 24-7 5-15 8-24 7l-227 0c-19 0-35-15-35-34l0-58c-19-2-34-18-34-37l0-95c0-19 15-35 34-37l0-53c0-19 16-34 35-34l228 0c20 0 30 16 38 31l0 1c1 2 21 53 21 139 0 83-19 140-21 146z m-309-193l0 95c0 6 5 11 11 11l86 0c6 0 11-5 11-11l0-95c0-6-5-11-11-11l-86 0c-6 0-11 5-11 11z m285-82c-8-16-11-16-14-16l-228 0c-5 0-9 4-9 8l0 53 63 0c21 0 37 17 37 37l0 95c0 20-16 37-37 37l-63 0 0 58c0 4 4 8 9 8l228 0c3 0 10 1 13-13l0 0 0-1c1 0 20-55 20-137 0-77-17-124-19-129z"/>
+<glyph glyph-name="send" unicode="&#57384;" d="M391 376c4-4 4-10 2-16-7-21-14-42-22-63-21-63-43-125-65-188-1-4-4-7-6-10-8-6-17-4-22 5-15 28-30 56-44 85-1 1 0 3 0 4 18 21 35 43 53 64 5 6 10 12 15 18 4 6 5 10 1 14-4 4-8 3-14-1-18-15-36-30-54-44-9-8-19-16-28-24-1-1-3-1-4 0-29 14-57 29-85 44-6 3-8 8-8 14 1 7 5 11 11 13 36 13 72 25 107 37 49 17 97 34 145 51 7 2 13 2 18-3z"/>
+<glyph glyph-name="password" unicode="&#57385;" d="M104 267l0 41 22 0 0-41 35 20 11-19-35-20 35-20-11-20-35 20 0-40-22 0 0 40-35-20-11 20 35 20-35 20 11 19z m136 0l0 41 23 0 0-41 35 20 11-19-35-20 35-20-11-20-35 20 0-40-23 0 0 40-35-20-11 20 35 20-35 20 11 19z m137 0l0 41 23 0 0-41 34 20 12-19-35-20 35-20-12-20-35 20 0-40-22 0 0 40-35-20-11 20 35 20-35 20 11 19z"/>
+<glyph glyph-name="rez" unicode="&#57381;" d="M373 321c-2 5-6 8-11 8l-49 8 55 61c4 4 5 9 3 14-2 5-7 8-12 8 0 0 0 0 0 0l-114-1c-5-1-10-4-12-9l-54-136c-1-4-1-8 1-11 2-4 6-6 9-7l38-5-54-136c-2-6 0-13 6-16 2-1 4-2 7-2 3 0 7 2 10 5l175 206c3 4 3 9 2 13z"/>
+<glyph glyph-name="keyboard-collapse" unicode="&#57387;" d="M373 249l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m224-1l18 0c7 0 13 6 13 13 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-7 6-13 13-13l17 0m252 39l-31 0 0 25 31 0z m-42 0l-31 0 0 25 31 0z m-41 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-41 0l-32 0 0 25 32 0z m218-1l18 0c7 0 13 6 13 13 0 8-6 14-13 14l-18 0m-262 0l-17 0c-7 0-13-6-13-14 0-7 6-13 13-13l17 0m288-124l-315 0c-33 0-59 28-59 61l0 76c0 34 26 61 59 61l315 0c33 0 59-27 59-61l0-76c1-33-26-61-59-61z m-315 172c-18 0-33-16-33-34l0-77c0-19 15-34 33-34l315 0c18 0 33 15 33 34l0 77c0 19-15 34-33 34z m248-99l32 0 0-25-32 0z m-41 0l31 0 0-25-31 0z m-42 0l31 0 0-25-31 0z m-43 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-41 0l31 0 0-25-31 0z m250-26l18 0c7 0 13 6 13 14 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-8 6-13 13-13l17 0m81-82l50-50 53 54-107 0"/>
+<glyph glyph-name="image" unicode="&#57386;" d="M257 428c52 0 104 0 156 0 24 0 37-13 37-37 1-90 1-179 0-269 0-25-13-38-39-38-103 0-207 0-311 0-26 0-39 13-39 40 0 88 0 176 0 263 0 28 13 41 41 41 51 0 103 0 155 0z m167-263c0 7 0 10 0 14 0 69 0 138 0 206 0 17 0 17-17 17-101 0-202 0-303 0-16 0-17-1-17-17 0-58 0-115 0-173 0-3 0-7 0-12 8 3 14 6 19 9 17 8 30 7 44-6 5-5 10-10 15-15 5-7 11-8 19-4 40 21 81 41 121 61 19 10 31 8 46-7 9-9 18-18 27-27 15-15 29-29 46-46z m-328-54c7 0 11-1 15-1 98 0 197 0 296 0 6 0 14 2 16 6 5 7 0 14-6 20-27 26-54 53-80 80-8 9-15 9-26 4-67-35-135-68-203-102-3-2-6-4-12-7z m-8 26c21 10 40 20 63 31-8 7-14 12-20 17-2 2-7 3-10 3-30-9-36-17-34-48 0 0 0-1 1-3z m134 169c1-25-21-46-46-46-25-1-46 20-47 46 0 25 21 46 47 47 25 0 46-21 46-47z m-46 22c-12 0-22-9-22-21 0-13 9-22 21-23 13 0 23 9 23 22 0 13-10 22-22 22z"/>
+</font></defs></svg>
diff --git a/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8907cf7858dd304cdad024bfa1ff4ca5cd94caf9
GIT binary patch
literal 31500
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
N>M#B*4miyP{a;nvG!p;-

literal 0
HcmV?d00001

diff --git a/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.woff b/interface/resources/fonts/hifi-glyphs/fonts/hifi-glyphs.woff
new file mode 100644
index 0000000000000000000000000000000000000000..152e5b4cfc7c4c4a93501e1299cd76b08f99f111
GIT binary patch
literal 20032
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%0D1$`SCH$>QhGYmjr*m3L
zNy%<SG<`wAy1GDs8=yXk-lb9IL&d($lV*|%NEG8@QUIjE8;C0Lsh(61*F#VbhbR?d
zjF=RG6?riU)F&dXrPtAWX*W$$CN3ux5Lqgx3!q~K3s}?@utHYI;4d*Pm_#%rFmZ&m
zXbBnb8qIY<=K(Eog_k)QnzcW?nsxG2i!ksT7>%eAMjKMYYD9qnxe^dXE2ub`G3jga
zAxfSD_telB=j%7J7BxlST~1BH)ENjz`T@8EKm~B6X_{Iv>2;#(hGIcap~Y}dgl8!=
z<rWVQz${BDoPooDnUGe&Y9zX5V)4rPo8}*6$A%+AA?Nu39qf&TQ{>_XCeHITAp<}T
z*#lBh26hXgSs}=%eI;1{??8~qxiw7RP_7WNzZIZ`LUvRqzud_bOqhKFu}KXBR*<BE
z;Umim2uI!dIs4uYCU2-J+SgD=mVt=mk_O~wCN6M16^Zk$0FpLn&p!t0{9BUz<r5xD
z1i^$B;p+VzOwQ2I@~X5mQ|u9XWa{9-0|z#`ioN57)%!30rSnC4@t0Sx>9~i24Y2W^
z1FOlwRY$sBq-6fa^279S&)#)=Y9=3|577I&AF8Rj`fBGCdi4)$_VgU0&(dcm4(-_k
z?0b0PX-a<Ye1<)*!e0GV_wy<=DLrN4toA2RWtd5{9JAx>i}c7efU*A=7zZwXAHleI
z_3C3_tU)k3kGNnwO%L}X7!wcC`{@HcCxX#^h(1G~oh*VeewdOO=bP-Sw=!muMw9T0
z(xge2y>jcVjCY+hY1TB!E3e%8D&t+7W|o>s^2)MTUuC>&uPzY&toeUo_tb((^8j?a
zqNaAC+uhxVq1$IB5AWHHgNI(9b}>a(IqO(x=T#=1rul@GNQY@6L6$CE_8Q||#}jnO
zN|0BVEnCLK<1`FK5_y_VlUHATZ5iWTdv$?g&)a9QVpkLtdnDXL!+CP+D_35@BvUa8
zQre&y!zAzi<hJiJksO`O<z{F1THC=E4g4W7!*Ih!A(zglM?{cwHgO1(jVS|(a56HO
z8q!F6`aCDV7(?oyG(emxJHXmYoF&ZEw7H{w6R}UWzjQF{K)vBr&e_glrfsx=@9qMK
z4%wHnLQkw`a4-_-lcHJjjc;9ZE$H{Sgc@A7VAj0-)_u=0(X2d{%Wd4a!`c!jfB7&q
z#qc>}IBRCp1rdh-yK@;Ut_&q2$!Itg)=0O0(HV>pQNrR7bW*TyWRpMwBm|JdB;S7>
z2t%_-JRl*M&ez`b(E|33_KhDaa-(x2Q)wscyIGW&ib7sIa`#INr-8=gL4_xDp6p*;
zRmH${Qs+R{yL#OISKDASk{Orc+^X93tLQiBy1n!XI%7?ZjO25p=?Rt40Iz|_1<@<(
zplj6y{iq6Hp)z0@g60Ot2z(6E(!zLp5;U+Zs3}9TbTcL-c(8P$;sA}(mg$bol+4ko
z33ZNImWlGlJ^&Wo{x!f26kNGvGJ-6;`oQYdjCY+dX%0AM|Nb=x81LFNbI8I6Rv$RP
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
b<~#wjV?_f1c${NkW<Umv3}^rV0FD3!P!lI<

literal 0
HcmV?d00001

diff --git a/interface/resources/fonts/hifi-glyphs/icons-reference.html b/interface/resources/fonts/hifi-glyphs/icons-reference.html
index 99e826e0b9..2ca94d4110 100644
--- a/interface/resources/fonts/hifi-glyphs/icons-reference.html
+++ b/interface/resources/fonts/hifi-glyphs/icons-reference.html
@@ -12,7 +12,7 @@
   <body>
     <div class="container">
       <h1>HiFi Glyphs</h1>
-      <p class="small">This font was created in<a href="http://highfidelity.com/">High Fidelity</a></p>
+      <p class="small">This font was created for use in<a href="http://highfidelity.io/">High Fidelity</a></p>
       <h2>CSS mapping</h2>
       <ul class="glyphs css-mapping">
         <li>
@@ -520,8 +520,52 @@
           <input type="text" readonly="readonly" value="avatar-t-pose">
         </li>
         <li>
-          <div class="icon icon-check-2-01"></div>
-          <input type="text" readonly="readonly" value="check-2-01">
+          <div class="icon icon-check-1"></div>
+          <input type="text" readonly="readonly" value="check-1">
+        </li>
+        <li>
+          <div class="icon icon-exchange"></div>
+          <input type="text" readonly="readonly" value="exchange">
+        </li>
+        <li>
+          <div class="icon icon-hfc"></div>
+          <input type="text" readonly="readonly" value="hfc">
+        </li>
+        <li>
+          <div class="icon icon-home-1"></div>
+          <input type="text" readonly="readonly" value="home-1">
+        </li>
+        <li>
+          <div class="icon icon-private-key"></div>
+          <input type="text" readonly="readonly" value="private-key">
+        </li>
+        <li>
+          <div class="icon icon-security-pic"></div>
+          <input type="text" readonly="readonly" value="security-pic">
+        </li>
+        <li>
+          <div class="icon icon-wallet"></div>
+          <input type="text" readonly="readonly" value="wallet">
+        </li>
+        <li>
+          <div class="icon icon-send"></div>
+          <input type="text" readonly="readonly" value="send">
+        </li>
+        <li>
+          <div class="icon icon-password"></div>
+          <input type="text" readonly="readonly" value="password">
+        </li>
+        <li>
+          <div class="icon icon-rez"></div>
+          <input type="text" readonly="readonly" value="rez">
+        </li>
+        <li>
+          <div class="icon icon-keyboard-collapse"></div>
+          <input type="text" readonly="readonly" value="keyboard-collapse">
+        </li>
+        <li>
+          <div class="icon icon-image"></div>
+          <input type="text" readonly="readonly" value="image">
         </li>
       </ul>
       <h2>Character mapping</h2>
@@ -1034,6 +1078,50 @@
           <div data-icon="&#xe020;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe020;">
         </li>
+        <li>
+          <div data-icon="&#xe021;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe021;">
+        </li>
+        <li>
+          <div data-icon="&#xe022;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe022;">
+        </li>
+        <li>
+          <div data-icon="&#xe023;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe023;">
+        </li>
+        <li>
+          <div data-icon="&#xe024;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe024;">
+        </li>
+        <li>
+          <div data-icon="&#xe026;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe026;">
+        </li>
+        <li>
+          <div data-icon="&#xe027;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe027;">
+        </li>
+        <li>
+          <div data-icon="&#xe028;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe028;">
+        </li>
+        <li>
+          <div data-icon="&#xe029;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe029;">
+        </li>
+        <li>
+          <div data-icon="&#xe025;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe025;">
+        </li>
+        <li>
+          <div data-icon="&#xe02b;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe02b;">
+        </li>
+        <li>
+          <div data-icon="&#xe02a;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe02a;">
+        </li>
       </ul>
     </div>
     <script>(function() {
diff --git a/interface/resources/fonts/hifi-glyphs/styles.css b/interface/resources/fonts/hifi-glyphs/styles.css
index 66277740fc..2413af5492 100644
--- a/interface/resources/fonts/hifi-glyphs/styles.css
+++ b/interface/resources/fonts/hifi-glyphs/styles.css
@@ -416,6 +416,39 @@
 .icon-avatar-t-pose:before {
   content: "\e01f";
 }
-.icon-check-2-01:before {
+.icon-check-1:before {
   content: "\e020";
 }
+.icon-exchange:before {
+  content: "\e021";
+}
+.icon-hfc:before {
+  content: "\e022";
+}
+.icon-home-1:before {
+  content: "\e023";
+}
+.icon-private-key:before {
+  content: "\e024";
+}
+.icon-security-pic:before {
+  content: "\e026";
+}
+.icon-wallet:before {
+  content: "\e027";
+}
+.icon-send:before {
+  content: "\e028";
+}
+.icon-password:before {
+  content: "\e029";
+}
+.icon-rez:before {
+  content: "\e025";
+}
+.icon-keyboard-collapse:before {
+  content: "\e02b";
+}
+.icon-image:before {
+  content: "\e02a";
+}
diff --git a/interface/resources/icons/create-icons/image.svg b/interface/resources/icons/create-icons/image.svg
new file mode 100644
index 0000000000..08a6c1aad2
--- /dev/null
+++ b/interface/resources/icons/create-icons/image.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M256.5,83.7c52.1,0,104.2-0.1,156.3,0.1c23.7,0.1,37.6,13.5,37.6,37.2c0.2,89.6,0.3,179.2,0,268.7
+		c-0.1,25.5-13.6,38.2-39,38.3c-103.8,0.1-207.5,0.1-311.3,0c-25.8,0-38.8-13.5-38.8-39.7c0-87.9,0-175.9,0-263.8
+		c0-27.7,12.8-40.7,40.2-40.8C153.2,83.6,204.8,83.7,256.5,83.7z M423.7,347c0.4-6.9,0.7-10.5,0.7-14.1c0-68.8,0-137.5,0-206.3
+		c0-16.2-0.6-16.7-17-16.7c-101.3,0-202.5,0-303.8,0c-15.9,0-16.9,1-16.9,17.2c0,57.5,0,115,0,172.5c0,3.5,0.3,7.1,0.6,12.4
+		c7.3-3.5,13.2-6.3,19.1-9.2c16.7-8.1,29.8-6.4,43.6,6c5.2,4.7,10.3,9.8,14.7,15.3c5.6,6.9,10.8,7.8,19.1,3.5
+		c40.3-20.8,81-40.9,121.6-61.1c18.3-9.1,30.6-7.1,45.3,7c9.3,9,18.3,18.2,27.4,27.4C392.7,315.5,407.2,330.2,423.7,347z
+		 M95.6,400.9c7.3,0.4,11.2,0.8,15.1,0.8c98.7,0,197.5,0.1,296.2-0.2c5.6,0,14-1.4,16.2-5.1c4.5-7.4-0.3-14.4-6.5-20.5
+		c-26.8-26.2-53.5-52.6-79.5-79.6c-8.5-8.9-15.4-9.4-26.1-4c-67.5,34.3-135.3,67.9-203,101.8C104.9,395.7,101.8,397.5,95.6,400.9z
+		 M88.2,375.1c20.6-10.3,40.2-20.1,62.4-31.3c-7.6-6.7-13.2-12.2-19.5-16.9c-2.6-1.9-7-3.3-9.9-2.5c-30,8.1-36,16.8-34,47.6
+		C87.1,372.4,87.4,372.8,88.2,375.1z"/>
+	<path class="st0" d="M222.2,205.5c0.3,25.1-20.8,46.5-46,46.8c-25.1,0.3-46.5-20.8-46.8-46.1c-0.3-25.1,20.8-46.5,46.1-46.8
+		C200.5,159.2,221.9,180.2,222.2,205.5z M176,184.1c-12.3-0.1-21.7,9-21.9,21.3c-0.2,12.3,8.8,21.8,21,22.2
+		c12.8,0.4,22.5-9.1,22.5-21.9C197.5,193.4,188.3,184.2,176,184.1z"/>
+</g>
+</svg>
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index ea5762d00a..899d604878 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -102,7 +102,7 @@ TabView {
                 }
 
                 NewEntityButton {
-                    icon: "icons/create-icons/25-web-1-01.svg"
+                    icon: "icons/create-icons/image.svg"
                     text: "IMAGE"
                     onClicked: {
                         editRoot.sendToScript({
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ece8516567..81e982d367 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -549,7 +549,6 @@ var toolBar = (function () {
                 },
                 shapeType: "box",
                 modelURL: 'qrc:///snapshot/snapshot.fbx',
-                // change to another default image
                 textures: JSON.stringify({ "tex.picture": 'qrc:///snapshot/img/no-image.jpg' })
             });
         });
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index acaff333e2..cb4e7be7cc 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -19,7 +19,7 @@ var ICON_FOR_TYPE = {
     ParticleEffect: "&#xe004;",
     Model: "&#xe008;",
     Web: "q",
-    Image: "q", // change this when image type icon added 
+    Image: "&#xe02a;",
     Text: "l",
     Light: "p",
     Zone: "o",

From 73fde4333ef96380cebf9c0b5ea78880853f73f4 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 31 Jan 2018 16:18:44 -0800
Subject: [PATCH 090/569] new local reference to image model

---
 .../images/default-image-model.fbx}                 | Bin
 interface/resources/qml/hifi/AssetServer.qml        |   2 +-
 .../qml/hifi/dialogs/TabletAssetServer.qml          |   2 +-
 scripts/system/edit.js                              |   6 ++++--
 scripts/system/html/js/entityList.js                |   4 ++--
 scripts/system/html/js/entityProperties.js          |   6 ++++--
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename interface/resources/{snapshot/snapshot.fbx => meshes/images/default-image-model.fbx} (100%)

diff --git a/interface/resources/snapshot/snapshot.fbx b/interface/resources/meshes/images/default-image-model.fbx
similarity index 100%
rename from interface/resources/snapshot/snapshot.fbx
rename to interface/resources/meshes/images/default-image-model.fbx
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 42b8118115..f3c910d95c 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -183,7 +183,7 @@ Windows.ScrollingWindow {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "qrc:///snapshot/snapshot.fbx";
+            var modelURL = "../../meshes/images/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 315def6f14..e852604af5 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -184,7 +184,7 @@ Rectangle {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "qrc:///snapshot/snapshot.fbx";
+            var modelURL = "../../../meshes/images/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 81e982d367..5cc39d0aa6 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -540,6 +540,8 @@ var toolBar = (function () {
         });
 
         addButton("newImageButton", "web-01.svg", function () {
+            var IMAGE_MODEL = Script.resolvePath("../../interface/resources/meshes/images/default-image-model.fbx");
+            var DEFAULT_IMAGE = Script.resolvePath("../../interface/resources/snapshot/img/no-image.jpg");
             createNewEntity({
                 type: "Model",
                 dimensions: {
@@ -548,8 +550,8 @@ var toolBar = (function () {
                     z: 2.58
                 },
                 shapeType: "box",
-                modelURL: 'qrc:///snapshot/snapshot.fbx',
-                textures: JSON.stringify({ "tex.picture": 'qrc:///snapshot/img/no-image.jpg' })
+                modelURL: IMAGE_MODEL,
+                textures: JSON.stringify({ "tex.picture": DEFAULT_IMAGE })
             });
         });
 
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index 85cd77bd28..625aa26b00 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -156,9 +156,9 @@ function loaded() {
           var urlParts = url.split('/');
           var filename = urlParts[urlParts.length - 1];
 
-          var snapURL = 'qrc:///snapshot/snapshot.fbx';
+          var IMAGE_MODEL_NAME = 'default-image-model.fbx';
 
-          if (url === snapURL) {
+          if (filename === IMAGE_MODEL_NAME) {
               type = "Image";
           }
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index cb4e7be7cc..bb5fd71aeb 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -797,8 +797,10 @@ function loaded() {
                         elID.value = properties.id;
 
                         // HTML workaround since image is not yet a separate entity type
-                        var snapURL = 'qrc:///snapshot/snapshot.fbx';
-                        if (properties.type === "Model" && properties.modelURL === snapURL) {
+                        var IMAGE_MODEL_NAME = 'default-image-model.fbx';
+                        var urlParts = properties.modelURL.split('/')
+                        var propsFilename = urlParts[urlParts.length - 1];
+                        if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) {
                             properties.type = "Image";
                         }
 

From d20ff0955c687d04514b1bebab34654943ba98d3 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Fri, 2 Feb 2018 11:26:21 -0800
Subject: [PATCH 091/569] qml doesn't work, .js might not work on osx

---
 interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +-
 scripts/system/edit.js                                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index e852604af5..37aa51464d 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -199,7 +199,7 @@ Rectangle {
             var SHAPE_TYPE_BOX = 4;
             var SHAPE_TYPE_SPHERE = 5;
         
-            var SHAPE_TYPES = [];
+            var SHAPE_TYPES = [];ww
             SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 5cc39d0aa6..aab47d4b91 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -540,8 +540,8 @@ var toolBar = (function () {
         });
 
         addButton("newImageButton", "web-01.svg", function () {
-            var IMAGE_MODEL = Script.resolvePath("../../interface/resources/meshes/images/default-image-model.fbx");
-            var DEFAULT_IMAGE = Script.resolvePath("../../interface/resources/snapshot/img/no-image.jpg");
+            var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx";
+            var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg";
             createNewEntity({
                 type: "Model",
                 dimensions: {

From 8ebb3e52d8be7cfc452462acd59af585c75726a3 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 2 Feb 2018 11:42:55 -0800
Subject: [PATCH 092/569] Misc bug fixes

---
 assignment-client/src/audio/AudioMixerSlave.cpp      |  8 +++-----
 interface/src/AvatarBookmarks.cpp                    | 12 ++++++------
 interface/src/AvatarEntitiesBookmarks.cpp            | 12 ++++++------
 libraries/animation/src/Rig.cpp                      |  4 ++--
 libraries/networking/src/AddressManager.cpp          |  2 +-
 libraries/networking/src/NodeList.cpp                |  4 ++--
 libraries/plugins/src/plugins/PluginManager.cpp      |  3 ++-
 libraries/recording/src/recording/Deck.cpp           |  4 ++--
 .../render-utils/src/DeferredLightingEffect.cpp      |  2 --
 libraries/shared/src/QVariantGLM.cpp                 |  2 +-
 libraries/shared/src/TriangleSet.h                   |  2 +-
 libraries/ui/src/QmlWindowClass.cpp                  |  1 -
 libraries/ui/src/ui/Menu.cpp                         |  1 -
 plugins/oculus/src/OculusBaseDisplayPlugin.cpp       |  2 +-
 14 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index 6d150a0dc3..705642b8a5 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -170,7 +170,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
                 auto nodeID = node->getUUID();
 
                 // compute the node's max relative volume
-                float nodeVolume;
+                float nodeVolume = 0.0f;
                 for (auto& streamPair : nodeData->getAudioStreams()) {
                     auto nodeStream = streamPair.second;
 
@@ -187,10 +187,8 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) {
                 }
 
                 // max-heapify the nodes by relative volume
-                throttledNodes.push_back(std::make_pair(nodeVolume, node));
-                if (!throttledNodes.empty()) {
-                    std::push_heap(throttledNodes.begin(), throttledNodes.end());
-                }
+                throttledNodes.push_back({ nodeVolume, node });
+                std::push_heap(throttledNodes.begin(), throttledNodes.end());
             }
         }
     });
diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index 5b9c45eef5..0f177e3d15 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -121,13 +121,13 @@ void AvatarBookmarks::addBookmark() {
         const QVariant& avatarScale = myAvatar->getAvatarScale();
 
         // If Avatar attachments ever change, this is where to update them, when saving remember to also append to AVATAR_BOOKMARK_VERSION
-        QVariantMap *bookmark = new QVariantMap;
-        bookmark->insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION);
-        bookmark->insert(ENTRY_AVATAR_URL, avatarUrl);
-        bookmark->insert(ENTRY_AVATAR_SCALE, avatarScale);
-        bookmark->insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant());
+        QVariantMap bookmark;
+        bookmark.insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION);
+        bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
+        bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
+        bookmark.insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant());
 
-        Bookmarks::addBookmarkToFile(bookmarkName, *bookmark);
+        Bookmarks::addBookmarkToFile(bookmarkName, bookmark);
     });
 
 }
diff --git a/interface/src/AvatarEntitiesBookmarks.cpp b/interface/src/AvatarEntitiesBookmarks.cpp
index d108bf3a23..21d3657346 100644
--- a/interface/src/AvatarEntitiesBookmarks.cpp
+++ b/interface/src/AvatarEntitiesBookmarks.cpp
@@ -144,13 +144,13 @@ void AvatarEntitiesBookmarks::addBookmark() {
         const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString();
         const QVariant& avatarScale = myAvatar->getAvatarScale();
 
-        QVariantMap *bookmark = new QVariantMap;
-        bookmark->insert(ENTRY_VERSION, AVATAR_ENTITIES_BOOKMARK_VERSION);
-        bookmark->insert(ENTRY_AVATAR_URL, avatarUrl);
-        bookmark->insert(ENTRY_AVATAR_SCALE, avatarScale);
-        bookmark->insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant());
+        QVariantMap bookmark;
+        bookmark.insert(ENTRY_VERSION, AVATAR_ENTITIES_BOOKMARK_VERSION);
+        bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
+        bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
+        bookmark.insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant());
 
-        Bookmarks::addBookmarkToFile(bookmarkName, *bookmark);
+        Bookmarks::addBookmarkToFile(bookmarkName, bookmark);
     });
 }
 
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index a939db92aa..672014fc55 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1244,7 +1244,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         int handJointIndex = _animSkeleton->nameToJointIndex("LeftHand");
         int armJointIndex = _animSkeleton->nameToJointIndex("LeftArm");
         int elbowJointIndex = _animSkeleton->nameToJointIndex("LeftForeArm");
-        if (!leftArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
+        if (!leftArmEnabled && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
             glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, true);
 
             // smooth toward desired pole vector from previous pole vector...  to reduce jitter
@@ -1291,7 +1291,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         int handJointIndex = _animSkeleton->nameToJointIndex("RightHand");
         int armJointIndex = _animSkeleton->nameToJointIndex("RightArm");
         int elbowJointIndex = _animSkeleton->nameToJointIndex("RightForeArm");
-        if (!rightArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
+        if (!rightArmEnabled && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) {
             glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, false);
 
             // smooth toward desired pole vector from previous pole vector...  to reduce jitter
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 4e1354d3aa..f5678d6bb8 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -666,7 +666,7 @@ bool AddressManager::handleViewpoint(const QString& viewpointString, bool should
             }
             
             emit locationChangeRequired(newPosition, orientationChanged, 
-                LookupTrigger::VisitUserFromPAL ? cancelOutRollAndPitch(newOrientation): newOrientation,
+                trigger == LookupTrigger::VisitUserFromPAL ? cancelOutRollAndPitch(newOrientation): newOrientation,
                 shouldFace
             );
 
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 1c18125433..9aa88c1c0c 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -999,7 +999,7 @@ void NodeList::setAvatarGain(const QUuid& nodeID, float gain) {
             }
 
             sendPacket(std::move(setAvatarGainPacket), *audioMixer);
-            QWriteLocker{ &_avatarGainMapLock };
+            QWriteLocker lock{ &_avatarGainMapLock };
             _avatarGainMap[nodeID] = gain;
 
         } else {
@@ -1011,7 +1011,7 @@ void NodeList::setAvatarGain(const QUuid& nodeID, float gain) {
 }
 
 float NodeList::getAvatarGain(const QUuid& nodeID) {
-    QReadLocker{ &_avatarGainMapLock };
+    QReadLocker lock{ &_avatarGainMapLock };
     auto it = _avatarGainMap.find(nodeID);
     if (it != _avatarGainMap.cend()) {
         return it->second;
diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp
index 630520957a..dbd6845676 100644
--- a/libraries/plugins/src/plugins/PluginManager.cpp
+++ b/libraries/plugins/src/plugins/PluginManager.cpp
@@ -214,9 +214,10 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() {
 }
 
 void PluginManager::disableDisplayPlugin(const QString& name) {
-    std::remove_if(_displayPlugins.begin(), _displayPlugins.end(), [&](const DisplayPluginPointer& plugin){
+    auto it = std::remove_if(_displayPlugins.begin(), _displayPlugins.end(), [&](const DisplayPluginPointer& plugin){
         return plugin->getName() == name;
     });
+    _displayPlugins.erase(it, _displayPlugins.end());
 }
 
 
diff --git a/libraries/recording/src/recording/Deck.cpp b/libraries/recording/src/recording/Deck.cpp
index c9ac0524ad..69a8587581 100644
--- a/libraries/recording/src/recording/Deck.cpp
+++ b/libraries/recording/src/recording/Deck.cpp
@@ -187,14 +187,14 @@ void Deck::processFrames() {
 
 void Deck::removeClip(const ClipConstPointer& clip) {
     Locker lock(_mutex);
-    std::remove_if(_clips.begin(), _clips.end(), [&](const Clip::ConstPointer& testClip)->bool {
+    _clips.remove_if([&](const Clip::ConstPointer& testClip)->bool {
         return (clip == testClip);
     });
 }
 
 void Deck::removeClip(const QString& clipName) {
     Locker lock(_mutex);
-    std::remove_if(_clips.begin(), _clips.end(), [&](const Clip::ConstPointer& clip)->bool {
+    _clips.remove_if([&](const Clip::ConstPointer& clip)->bool {
         return (clip->getName() == clipName);
     });
 }
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index d0d9708c04..af7fc82cdf 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -753,8 +753,6 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
             auto textureCache = DependencyManager::get<TextureCache>();
             {
                 PROFILE_RANGE(render, "Process Default Skybox");
-                auto textureCache = DependencyManager::get<TextureCache>();
-
                 QFileSelector fileSelector;
                 fileSelector.setExtraSelectors(FileUtils::getFileSelectors());
                 auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx");
diff --git a/libraries/shared/src/QVariantGLM.cpp b/libraries/shared/src/QVariantGLM.cpp
index b5b840c2ca..1c73315d94 100644
--- a/libraries/shared/src/QVariantGLM.cpp
+++ b/libraries/shared/src/QVariantGLM.cpp
@@ -66,7 +66,7 @@ void qListtoRgbColor(const QVariant& q, rgbColor& returnValue) {
 
 glm::vec3 qMapToGlmVec3(const QVariant& q) {
     QVariantMap qMap = q.toMap();
-    if (qMap.contains("x") && qMap.contains("y") && qMap.contains("y")) {
+    if (qMap.contains("x") && qMap.contains("y") && qMap.contains("z")) {
         return glm::vec3(
                 qMap["x"].toFloat(),
                 qMap["y"].toFloat(),
diff --git a/libraries/shared/src/TriangleSet.h b/libraries/shared/src/TriangleSet.h
index 786f58804f..9f688f9def 100644
--- a/libraries/shared/src/TriangleSet.h
+++ b/libraries/shared/src/TriangleSet.h
@@ -85,7 +85,7 @@ public:
 protected:
 
     bool _isBalanced{ false };
-    TriangleOctreeCell _triangleOctree;
     std::vector<Triangle> _triangles;
+    TriangleOctreeCell _triangleOctree;
     AABox _bounds;
 };
diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp
index 0825d238bc..02c9707d95 100644
--- a/libraries/ui/src/QmlWindowClass.cpp
+++ b/libraries/ui/src/QmlWindowClass.cpp
@@ -37,7 +37,6 @@ static const uvec2 MIN_QML_WINDOW_SIZE { 120, 80 };
 
 QVariantMap QmlWindowClass::parseArguments(QScriptContext* context) {
     const auto argumentCount = context->argumentCount();
-    QString title;
     QVariantMap properties;
     if (argumentCount > 1) {
         if (!context->argument(0).isUndefined()) {
diff --git a/libraries/ui/src/ui/Menu.cpp b/libraries/ui/src/ui/Menu.cpp
index 4e61eba28f..b600fc7b29 100644
--- a/libraries/ui/src/ui/Menu.cpp
+++ b/libraries/ui/src/ui/Menu.cpp
@@ -300,7 +300,6 @@ QAction* Menu::getActionFromName(const QString& menuName, MenuWrapper* menu) {
     }
 
     foreach (QAction* menuAction, menuActions) {
-        QString actionText = menuAction->text();
         if (menuName == menuAction->text()) {
             return menuAction;
         }
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index d03419d025..d8f2db75c9 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -41,7 +41,7 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     std::array<glm::mat4, 2> handPoses;
     // Make controller poses available to the presentation thread
     ovr_for_each_hand([&](ovrHandType hand) {
-        static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked & ovrStatus_PositionTracked;
+        static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked | ovrStatus_PositionTracked;
         if (REQUIRED_HAND_STATUS != (trackingState.HandStatusFlags[hand] & REQUIRED_HAND_STATUS)) {
             return;
         }

From e2bf8ad231d5afe23892b481cb8cf3ae35c4cb8f Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Fri, 2 Feb 2018 15:36:28 -0800
Subject: [PATCH 093/569] reverted to S3 for model URL

---
 interface/resources/qml/hifi/AssetServer.qml               | 2 +-
 interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +-
 interface/src/Application.cpp                              | 2 +-
 scripts/system/edit.js                                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index f3c910d95c..b8cafdd6c5 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -183,7 +183,7 @@ Windows.ScrollingWindow {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "../../meshes/images/default-image-model.fbx";
+            var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 37aa51464d..bf5ead30f6 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -184,7 +184,7 @@ Rectangle {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "../../../meshes/images/default-image-model.fbx";
+            var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 53c1e3fad5..1d27973332 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6525,7 +6525,7 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
         QJsonObject textures {
             {"tex.picture", QString("atp:" + mapping) }
         };
-        properties.setModelURL("qrc:///snapshot/snapshot.fbx");
+        properties.setModelURL("https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx");
         properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact));
         properties.setShapeType(SHAPE_TYPE_BOX);
     } else {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index aab47d4b91..91e6e85444 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -540,8 +540,8 @@ var toolBar = (function () {
         });
 
         addButton("newImageButton", "web-01.svg", function () {
-            var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx";
-            var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg";
+            var IMAGE_MODEL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
+            var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
             createNewEntity({
                 type: "Model",
                 dimensions: {

From 900669d937a713abda4524d37360008b4e3703c5 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 2 Feb 2018 16:44:59 -0800
Subject: [PATCH 094/569] fix multi-selection rotation yay!

---
 libraries/entities/src/EntityItem.cpp         |  2 ++
 .../system/libraries/entitySelectionTool.js   | 31 ++++++-------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index fe5213baa8..4005f335a2 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1518,6 +1518,8 @@ AABox EntityItem::getAABox(bool& success) const {
     } else {
         success = true;
     }
+    if (_cachedAABox.getCorner().x > -85.0f || _cachedAABox.getCorner().x < -86.0f)
+        qDebug() << "_cachedAABox corner " << _cachedAABox.getCorner().x << " " << _cachedAABox.getCorner().y << " " << _cachedAABox.getCorner().z;
     return _cachedAABox;
 }
 
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index d294fecf21..cdf3c9610b 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -240,6 +240,7 @@ SelectionDisplay = (function() {
     var COLOR_BLUE = { red:0, green:147, blue:197 };
     var COLOR_RED = { red:183, green:10, blue:55 };
     var COLOR_HOVER = { red:227, green:227, blue:227 };
+    var COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
     var COLOR_SCALE_EDGE = { red:87, green:87, blue:87 };
     var COLOR_SCALE_CUBE = { red:106, green:106, blue:106 };
     var COLOR_SCALE_CUBE_SELECTED = { red:18, green:18, blue:18 };
@@ -254,7 +255,7 @@ SelectionDisplay = (function() {
     var ROTATE_CTRL_SNAP_ANGLE = 22.5;
     var ROTATE_DEFAULT_SNAP_ANGLE = 1;
     var ROTATE_DEFAULT_TICK_MARKS_ANGLE = 5;
-    var ROTATE_RING_IDLE_INNER_RADIUS = 0.97;
+    var ROTATE_RING_IDLE_INNER_RADIUS = 0.95;
     var ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
@@ -384,7 +385,7 @@ SelectionDisplay = (function() {
 
     var handleRotateCurrentRing = Overlays.addOverlay("circle3d", {
         alpha: 1,
-        color: { red: 255, green: 99, blue: 9 },
+        color: COLOR_ROTATE_CURRENT_RING,
         solid: true,
         innerRadius: 0.9,
         visible: false,
@@ -2122,14 +2123,14 @@ SelectionDisplay = (function() {
 
     // FUNCTION DEF: updateSelectionsRotation
     //    Helper func used by rotation handle tools 
-    function updateSelectionsRotation(rotationChange) {
+    function updateSelectionsRotation(rotationChange, initialPosition) {
         if (!rotationChange) {
             print("ERROR: entitySelectionTool.updateSelectionsRotation - Invalid arg specified!!");
 
             // EARLY EXIT
             return;
         }
-        
+
         // Entities should only reposition if we are rotating multiple selections around
         // the selections center point.  Otherwise, the rotation will be around the entities
         // registration point which does not need repositioning.
@@ -2142,18 +2143,10 @@ SelectionDisplay = (function() {
                 rotation: Quat.multiply(rotationChange, initialProperties.rotation)
             };
 
-            Quat.print("OldRotation ", initialProperties.rotation);
-            Quat.print("NewRotation ", newProperties.rotation);
-
             if (reposition) {
-                var dPos = Vec3.subtract(initialProperties.position, SelectionManager.worldPosition);
-                Vec3.print("SelectionManager.worldPosition ", SelectionManager.worldPosition);
-                Vec3.print("initialProperties.position ", initialProperties.position);
-                Vec3.print("dPos 1 ", dPos);
+                var dPos = Vec3.subtract(initialProperties.position, initialPosition);
                 dPos = Vec3.multiplyQbyV(rotationChange, dPos);
-                Vec3.print("dPos 2 ", dPos);
-                newProperties.position = Vec3.sum(SelectionManager.worldPosition, dPos);
-                Vec3.print("newProperties.position ", newProperties.position);
+                newProperties.position = Vec3.sum(initialPosition, dPos);
             }
 
             Entities.editEntity(entityID, newProperties);
@@ -2260,7 +2253,7 @@ SelectionDisplay = (function() {
                     return;
                 }
                 
-                var wantDebug = true;
+                var wantDebug = false;
                 if (wantDebug) {
                     print("================== "+ getMode() + "(addHandleRotateTool onMove) -> =======================");
                     Vec3.print("    rotationZero: ", rotationZero);
@@ -2286,12 +2279,8 @@ SelectionDisplay = (function() {
                     var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);        
                     var snapAngle = ctrlPressed ? ROTATE_CTRL_SNAP_ANGLE : ROTATE_DEFAULT_SNAP_ANGLE;
                     angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
-                    var rotChange = Quat.angleAxis(angleFromZero, rotationNormal);
-                    if (wantDebug) {
-                        Quat.print("    rotChange: ", rotChange)
-                        print("    angleFromZero: ", angleFromZero);
-                    }
-                    updateSelectionsRotation(rotChange);
+                    var rotationChange = Quat.angleAxis(angleFromZero, rotationNormal);
+                    updateSelectionsRotation(rotationChange, rotationCenter);
                     updateRotationDegreesOverlay(-angleFromZero, rotationDegreesPosition);
 
                     var startAtCurrent = 0;

From 1e7717b491c5d3669de35c1efbe085849af51c6d Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 2 Feb 2018 16:46:12 -0800
Subject: [PATCH 095/569] remove debug line

---
 libraries/entities/src/EntityItem.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 4005f335a2..fe5213baa8 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1518,8 +1518,6 @@ AABox EntityItem::getAABox(bool& success) const {
     } else {
         success = true;
     }
-    if (_cachedAABox.getCorner().x > -85.0f || _cachedAABox.getCorner().x < -86.0f)
-        qDebug() << "_cachedAABox corner " << _cachedAABox.getCorner().x << " " << _cachedAABox.getCorner().y << " " << _cachedAABox.getCorner().z;
     return _cachedAABox;
 }
 

From d7f4b033e8f6d5249e43001dac5f1453093a4e06 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 17 Jan 2018 15:56:18 -0800
Subject: [PATCH 096/569] wip finish adding material entity

---
 .../resources/qml/hifi/tablet/EditTabView.qml |  11 +
 .../qml/hifi/tablet/NewMaterialDialog.qml     | 174 +++++++++++++
 .../src/RenderableEntityItem.cpp              |   7 +-
 .../src/RenderableEntityItem.h                |   1 -
 .../src/RenderableMaterialEntityItem.cpp      | 238 ++++++++++++++++++
 .../src/RenderableMaterialEntityItem.h        |  54 ++++
 .../entities/src/EntityItemProperties.cpp     |  63 ++++-
 .../entities/src/EntityItemPropertiesMacros.h |  23 ++
 libraries/entities/src/MaterialEntityItem.cpp | 229 +++++++++++++++--
 libraries/entities/src/MaterialEntityItem.h   |  34 ++-
 libraries/graphics/src/graphics/Material.cpp  |   2 +-
 .../src/model-networking/ModelCache.cpp       |  91 ++++++-
 .../src/model-networking/ModelCache.h         |  20 +-
 .../src/model-networking/TextureCache.cpp     |   2 +
 .../src/model-networking/TextureCache.h       |   1 -
 libraries/networking/src/ResourceCache.cpp    |   9 +-
 .../networking/src/udt/PacketHeaders.cpp      |   2 +-
 libraries/networking/src/udt/PacketHeaders.h  |   3 +-
 libraries/octree/src/OctreePacketData.h       |   4 +
 .../src/CauterizedMeshPartPayload.cpp         |   4 +-
 .../src/CauterizedMeshPartPayload.h           |   2 +-
 libraries/render-utils/src/GeometryCache.cpp  |   1 -
 .../render-utils/src/MeshPartPayload.cpp      | 152 +----------
 libraries/render-utils/src/MeshPartPayload.h  |   8 +-
 libraries/render/CMakeLists.txt               |   6 +-
 libraries/render/src/render/ShapePipeline.cpp | 121 +++++++++
 libraries/render/src/render/ShapePipeline.h   |   4 +
 libraries/shared/src/MaterialMode.cpp         |  24 ++
 libraries/shared/src/MaterialMode.h           |   7 +
 scripts/developer/tests/toolbarTest.js        |  12 +-
 scripts/system/edit.js                        |  45 +++-
 scripts/system/html/css/edit-style.css        |  49 +++-
 scripts/system/html/entityProperties.html     |  45 ++++
 scripts/system/html/js/entityProperties.js    |  52 +++-
 scripts/system/libraries/entityList.js        |  10 +-
 35 files changed, 1291 insertions(+), 219 deletions(-)
 create mode 100644 interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
 create mode 100644 libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
 create mode 100644 libraries/entities-renderer/src/RenderableMaterialEntityItem.h
 create mode 100644 libraries/shared/src/MaterialMode.cpp

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index e94325f399..65dd871fb2 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -133,6 +133,17 @@ TabView {
                         editTabView.currentIndex = 4
                     }
                 }
+
+                NewEntityButton {
+                    icon: "icons/create-icons/94-model-01.svg"
+                    text: "MATERIAL"
+                    onClicked: {
+                        editRoot.sendToScript({
+                            method: "newEntityButtonClicked", params: { buttonName: "newMaterialButton" }
+                        });
+                        editTabView.currentIndex = 2
+                    }
+                }
             }
 
             HifiControls.Button {
diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
new file mode 100644
index 0000000000..6d3477187b
--- /dev/null
+++ b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
@@ -0,0 +1,174 @@
+//
+//  NewMaterialDialog.qml
+//  qml/hifi
+//
+//  Created by Sam Gondelman on 1/17/18
+//  Copyright 2018 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 QtQuick.Dialogs 1.2 as OriginalDialogs
+
+import "../../styles-uit"
+import "../../controls-uit"
+import "../dialogs"
+
+Rectangle {
+    id: newMaterialDialog
+    // width: parent.width
+    // height: parent.height
+    HifiConstants { id: hifi }
+    color: hifi.colors.baseGray;
+    signal sendToScript(var message);
+    property bool keyboardEnabled: false
+    property bool punctuationMode: false
+    property bool keyboardRasied: false
+
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
+    Item {
+        id: column1
+        anchors.rightMargin: 10
+        anchors.leftMargin: 10
+        anchors.bottomMargin: 10
+        anchors.topMargin: 10
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: keyboard.top
+
+        Text {
+            id: text1
+            text: qsTr("Material URL")
+            color: "#ffffff"
+            font.pixelSize: 12
+        }
+
+        TextInput {
+            id: materialURL
+            height: 20
+            text: qsTr("")
+            color: "white"
+            anchors.top: text1.bottom
+            anchors.topMargin: 5
+            anchors.left: parent.left
+            anchors.leftMargin: 0
+            anchors.right: parent.right
+            anchors.rightMargin: 0
+            font.pixelSize: 12
+
+            onAccepted: {
+                newMaterialDialog.keyboardEnabled = false;
+            }
+            
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    newMaterialDialog.keyboardEnabled = HMD.active
+                    parent.focus = true;
+                    parent.forceActiveFocus();
+                    materialURL.cursorPosition = materialURL.positionAt(mouseX, mouseY, TextInput.CursorBetweenCharaters);
+                }
+            }
+        }
+
+        Rectangle {
+            id: textInputBox
+            color: "white"
+            anchors.fill: materialURL
+            opacity: 0.1
+        }
+
+        Row {
+            id: row1
+            height: 400
+            spacing: 30
+            anchors.top: materialURL.bottom
+            anchors.topMargin: 5
+            anchors.left: parent.left
+            anchors.leftMargin: 0
+            anchors.right: parent.right
+            anchors.rightMargin: 0
+
+            Column {
+                id: column3
+                height: 400
+                spacing: 10
+
+                Text {
+                    id: text3
+                    text: qsTr("Material Mode")
+                    color: "#ffffff"
+                    font.pixelSize: 12
+                }
+
+                ComboBox {
+                    id: materialMode
+                    property var materialArray: ["UV space material",
+                                                 "3D projected material"]
+
+                    width: 200
+                    z: 100
+                    transformOrigin: Item.Center
+                    model: materialArray
+                }
+
+                Row {
+                    id: row3
+                    width: 200
+                    height: 400
+                    spacing: 5
+
+                    anchors.horizontalCenter: column3.horizontalCenter
+                    anchors.horizontalCenterOffset: -20
+
+                    Button {
+                        id: button1
+                        text: qsTr("Add")
+                        z: -1
+                        onClicked: {
+                            newMaterialDialog.sendToScript({
+                                method: "newMaterialDialogAdd",
+                                params: {
+                                    textInput: materialURL.text,
+                                    comboBox: materialMode.currentIndex
+                                }
+                            });
+                        }
+                    }
+
+                    Button {
+                        id: button2
+                        z: -1
+                        text: qsTr("Cancel")
+                        onClicked: {
+                            newMaterialDialog.sendToScript({method: "newMaterialDialogCancel"})
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Keyboard {
+        id: keyboard
+        raised: parent.keyboardEnabled
+        numeric: parent.punctuationMode
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+    }
+}
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index fb9aba636b..cbd2df86ad 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -25,6 +25,7 @@
 #include "RenderableTextEntityItem.h"
 #include "RenderableWebEntityItem.h"
 #include "RenderableZoneEntityItem.h"
+#include "RenderableMaterialEntityItem.h"
 
 
 using namespace render;
@@ -247,6 +248,10 @@ EntityRenderer::Pointer EntityRenderer::addToScene(EntityTreeRenderer& renderer,
             result = make_renderer<ZoneEntityRenderer>(entity);
             break;
 
+        case Type::Material:
+            result = make_renderer<MaterialEntityRenderer>(entity);
+            break;
+
         default:
             break;
     }
@@ -388,4 +393,4 @@ void EntityRenderer::onAddToScene(const EntityItemPointer& entity) {
 void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) { 
     entity->deregisterChangeHandler(_changeHandlerId);
     QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
-}
+}
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 8eb82e2c6e..e54ae2f6b4 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -59,7 +59,6 @@ protected:
     virtual void onAddToScene(const EntityItemPointer& entity);
     virtual void onRemoveFromScene(const EntityItemPointer& entity);
 
-protected:
     EntityRenderer(const EntityItemPointer& entity);
     ~EntityRenderer();
 
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
new file mode 100644
index 0000000000..83754c1c16
--- /dev/null
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -0,0 +1,238 @@
+//
+//  Created by Sam Gondelman on 1/18/2018
+//  Copyright 2018 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 "RenderableMaterialEntityItem.h"
+
+using namespace render;
+using namespace render::entities;
+
+bool MaterialEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (entity->getMaterial() != _drawMaterial) {
+        return true;
+    }
+    return false;
+}
+
+void MaterialEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    withWriteLock([&] {
+        _drawMaterial = entity->getMaterial();
+        _renderTransform = getModelTransform();
+        const float MATERIAL_ENTITY_SCALE = 0.5f;
+        _renderTransform.postScale(MATERIAL_ENTITY_SCALE);
+        _renderTransform.postScale(ENTITY_ITEM_DEFAULT_DIMENSIONS);
+    });
+}
+
+ItemKey MaterialEntityRenderer::getKey() {
+    ItemKey::Builder builder;
+    builder.withTypeShape();
+
+    if (!_visible) {
+        builder.withInvisible();
+    }
+
+    if (_drawMaterial) {
+        auto matKey = _drawMaterial->getKey();
+        if (matKey.isTranslucent()) {
+            builder.withTransparent();
+        }
+    }
+
+    return builder.build();
+}
+
+ShapeKey MaterialEntityRenderer::getShapeKey() {
+    graphics::MaterialKey drawMaterialKey;
+    if (_drawMaterial) {
+        drawMaterialKey = _drawMaterial->getKey();
+    }
+
+    bool isTranslucent = drawMaterialKey.isTranslucent();
+    bool hasTangents = drawMaterialKey.isNormalMap();
+    bool hasSpecular = drawMaterialKey.isMetallicMap();
+    bool hasLightmap = drawMaterialKey.isLightmapMap();
+    bool isUnlit = drawMaterialKey.isUnlit();
+    
+    ShapeKey::Builder builder;
+    builder.withMaterial();
+
+    if (isTranslucent) {
+        builder.withTranslucent();
+    }
+    if (hasTangents) {
+        builder.withTangents();
+    }
+    if (hasSpecular) {
+        builder.withSpecular();
+    }
+    if (hasLightmap) {
+        builder.withLightmap();
+    }
+    if (isUnlit) {
+        builder.withUnlit();
+    }
+
+    return builder.build();
+}
+
+glm::vec3 MaterialEntityRenderer::getVertexPos(float phi, float theta) {
+    return glm::vec3(glm::sin(theta) * glm::cos(phi), glm::cos(theta), glm::sin(theta) * glm::sin(phi));
+}
+
+glm::vec3 MaterialEntityRenderer::getTangent(float phi, float theta) {
+    return glm::vec3(-glm::cos(theta) * glm::cos(phi), 0, -glm::cos(theta) * glm::sin(phi));
+}
+
+void MaterialEntityRenderer::addVertex(std::vector<float>& buffer, const glm::vec3& pos, const glm::vec3& tan, const glm::vec2 uv) {
+    buffer.push_back(pos.x); buffer.push_back(pos.y); buffer.push_back(pos.z);
+    buffer.push_back(tan.x); buffer.push_back(tan.y); buffer.push_back(tan.z);
+    buffer.push_back(uv.x); buffer.push_back(uv.y);
+}
+
+void MaterialEntityRenderer::addTriangleFan(std::vector<float>& buffer, int stack, int step) {
+    float v1 = ((float)stack) / STACKS;
+    float theta1 = v1 * M_PI;
+    glm::vec3 tip = getVertexPos(0, theta1);
+    float v2 = ((float)(stack + step)) / STACKS;
+    float theta2 = v2 * M_PI;
+    for (int i = 0; i < SLICES; i++) {
+        float u1 = ((float)i) / SLICES;
+        float u2 = ((float)(i + step)) / SLICES;
+        float phi1 = u1 * M_PI_TIMES_2;
+        float phi2 = u2 * M_PI_TIMES_2;
+        /* (flipped for negative step)
+             p1
+            /  \
+           /    \
+          /      \
+        p3 ------ p2
+        */
+
+        glm::vec3 pos2 = getVertexPos(phi2, theta2);
+        glm::vec3 pos3 = getVertexPos(phi1, theta2);
+
+        glm::vec3 tan1 = getTangent(0, theta1);
+        glm::vec3 tan2 = getTangent(phi2, theta2);
+        glm::vec3 tan3 = getTangent(phi1, theta2);
+
+        glm::vec2 uv1 = glm::vec2((u1 + u2) / 2.0f, v1);
+        glm::vec2 uv2 = glm::vec2(u2, v2);
+        glm::vec2 uv3 = glm::vec2(u1, v2);
+
+        addVertex(buffer, tip, tan1, uv1);
+        addVertex(buffer, pos2, tan2, uv2);
+        addVertex(buffer, pos3, tan3, uv3);
+
+        _numVertices += 3;
+    }
+}
+
+int MaterialEntityRenderer::_numVertices = 0;
+std::shared_ptr<gpu::Stream::Format> MaterialEntityRenderer::_streamFormat = nullptr;
+std::shared_ptr<gpu::BufferStream> MaterialEntityRenderer::_stream = nullptr;
+std::shared_ptr<gpu::Buffer> MaterialEntityRenderer::_verticesBuffer = nullptr;
+
+void MaterialEntityRenderer::generateMesh() {
+    _streamFormat = std::make_shared<gpu::Stream::Format>();
+    _stream = std::make_shared<gpu::BufferStream>();
+    _verticesBuffer = std::make_shared<gpu::Buffer>();
+
+    const int NUM_POS_COORDS = 3;
+    const int NUM_TANGENT_COORDS = 3;
+    const int VERTEX_TANGENT_OFFSET = NUM_POS_COORDS * sizeof(float);
+    const int VERTEX_TEXCOORD_OFFSET = VERTEX_TANGENT_OFFSET + NUM_TANGENT_COORDS * sizeof(float);
+
+    _streamFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
+    _streamFormat->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
+    _streamFormat->setAttribute(gpu::Stream::TANGENT, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), VERTEX_TANGENT_OFFSET);
+    _streamFormat->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), VERTEX_TEXCOORD_OFFSET);
+
+    _stream->addBuffer(_verticesBuffer, 0, _streamFormat->getChannels().at(0)._stride);
+
+    std::vector<float> vertexBuffer;
+
+    // Top
+    addTriangleFan(vertexBuffer, 0, 1);
+
+    // Middle section
+    for (int j = 1; j < STACKS - 1; j++) {
+        float v1 = ((float)j) / STACKS;
+        float v2 = ((float)(j + 1)) / STACKS;
+        float theta1 = v1 * M_PI;
+        float theta2 = v2 * M_PI;
+        for (int i = 0; i < SLICES; i++) {
+            float u1 = ((float)i) / SLICES;
+            float u2 = ((float)(i + 1)) / SLICES;
+            float phi1 = u1 * M_PI_TIMES_2;
+            float phi2 = u2 * M_PI_TIMES_2;
+
+            /*
+            p2 ---- p3
+             |    /  |
+             |   /   |
+             |  /    |
+            p1 ---- p4
+            */
+
+            glm::vec3 pos1 = getVertexPos(phi1, theta2);
+            glm::vec3 pos2 = getVertexPos(phi1, theta1);
+            glm::vec3 pos3 = getVertexPos(phi2, theta1);
+            glm::vec3 pos4 = getVertexPos(phi2, theta2);
+
+            glm::vec3 tan1 = getTangent(phi1, theta2);
+            glm::vec3 tan2 = getTangent(phi1, theta1);
+            glm::vec3 tan3 = getTangent(phi2, theta1);
+            glm::vec3 tan4 = getTangent(phi2, theta2);
+
+            glm::vec2 uv1 = glm::vec2(u1, v2);
+            glm::vec2 uv2 = glm::vec2(u1, v1);
+            glm::vec2 uv3 = glm::vec2(u2, v1);
+            glm::vec2 uv4 = glm::vec2(u2, v2);
+
+            addVertex(vertexBuffer, pos1, tan1, uv1);
+            addVertex(vertexBuffer, pos2, tan2, uv2);
+            addVertex(vertexBuffer, pos3, tan3, uv3);
+
+            addVertex(vertexBuffer, pos3, tan3, uv3);
+            addVertex(vertexBuffer, pos4, tan4, uv4);
+            addVertex(vertexBuffer, pos1, tan1, uv1);
+
+            _numVertices += 6;
+        }
+    }
+
+    // Bottom
+    addTriangleFan(vertexBuffer, STACKS, -1);
+
+    _verticesBuffer->append(vertexBuffer.size() * sizeof(float), (gpu::Byte*) vertexBuffer.data());
+}
+
+void MaterialEntityRenderer::doRender(RenderArgs* args) {
+    PerformanceTimer perfTimer("RenderableMaterialEntityItem::render");
+    Q_ASSERT(args->_batch);
+
+    gpu::Batch& batch = *args->_batch;
+
+    batch.setModelTransform(_renderTransform);
+
+    // bind the material
+    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
+    args->_details._materialSwitches++;
+
+    // Draw!
+    if (_numVertices == 0) {
+        generateMesh();
+    }
+
+    batch.setInputFormat(_streamFormat);
+    batch.setInputStream(0, *_stream);
+    batch.draw(gpu::TRIANGLES, _numVertices, 0);
+
+    const int NUM_VERTICES_PER_TRIANGLE = 3;
+    args->_details._trianglesRendered += _numVertices / NUM_VERTICES_PER_TRIANGLE;
+}
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
new file mode 100644
index 0000000000..166ad762cc
--- /dev/null
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
@@ -0,0 +1,54 @@
+//
+//  Created by Sam Gondelman on 1/18/2018
+//  Copyright 2018 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_RenderableMaterialEntityItem_h
+#define hifi_RenderableMaterialEntityItem_h
+
+#include "RenderableEntityItem.h"
+
+#include <MaterialEntityItem.h>
+
+class NetworkMaterial;
+
+namespace render { namespace entities { 
+
+class MaterialEntityRenderer : public TypedEntityRenderer<MaterialEntityItem> {
+    using Parent = TypedEntityRenderer<MaterialEntityItem>;
+    using Pointer = std::shared_ptr<MaterialEntityRenderer>;
+public:
+    MaterialEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {}
+
+private:
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+
+    ItemKey getKey() override;
+    ShapeKey getShapeKey() override;
+
+    Transform _renderTransform;
+
+    std::shared_ptr<NetworkMaterial> _drawMaterial;
+
+    static int _numVertices;
+    static std::shared_ptr<gpu::Stream::Format> _streamFormat;
+    static std::shared_ptr<gpu::BufferStream> _stream;
+    static std::shared_ptr<gpu::Buffer> _verticesBuffer;
+
+    void generateMesh();
+    void addTriangleFan(std::vector<float>& buffer, int stack, int step);
+    static glm::vec3 getVertexPos(float phi, float theta);
+    static glm::vec3 getTangent(float phi, float theta);
+    static void addVertex(std::vector<float>& buffer, const glm::vec3& pos, const glm::vec3& tan, const glm::vec2 uv);
+    const int SLICES = 15;
+    const int STACKS = 9;
+    const float M_PI_TIMES_2 = 2.0f * M_PI;
+};
+
+} } 
+#endif // hifi_RenderableMaterialEntityItem_h
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index f8f8859d73..77300be399 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -115,6 +115,17 @@ void buildStringToShapeTypeLookup() {
     addShapeType(SHAPE_TYPE_STATIC_MESH);
 }
 
+QHash<QString, MaterialMode> stringToMaterialModeLookup;
+
+void addMaterialMode(MaterialMode mode) {
+    stringToMaterialModeLookup[MaterialModeHelpers::getNameForMaterialMode(mode)] = mode;
+}
+
+void buildStringToMaterialModeLookup() {
+    addMaterialMode(UV);
+    addMaterialMode(PROJECTED);
+}
+
 QString getCollisionGroupAsString(uint8_t group) {
     switch (group) {
         case USER_COLLISION_GROUP_DYNAMIC:
@@ -259,6 +270,21 @@ void EntityItemProperties::setSkyboxModeFromString(const QString& skyboxMode) {
     }
 }
 
+QString EntityItemProperties::getMaterialModeAsString() const {
+    return MaterialModeHelpers::getNameForMaterialMode(_materialMode);
+}
+
+void EntityItemProperties::setMaterialModeFromString(const QString& materialMode) {
+    if (stringToMaterialModeLookup.empty()) {
+        buildStringToMaterialModeLookup();
+    }
+    auto materialModeItr = stringToMaterialModeLookup.find(materialMode.toLower());
+    if (materialModeItr != stringToMaterialModeLookup.end()) {
+        _materialMode = materialModeItr.value();
+        _materialModeChanged = true;
+    }
+}
+
 EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     EntityPropertyFlags changedProperties;
 
@@ -329,7 +355,6 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_SPREAD, radiusSpread);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_START, radiusStart);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
-
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_URL, materialURL);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_TYPE, materialMode);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
@@ -635,7 +660,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     // Materials
     if (_type == EntityTypes::Material) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_URL, materialURL);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_TYPE, materialMode);
+        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_MATERIAL_TYPE, materialMode, getMaterialModeAsString());
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_PRIORITY, priority);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_SHAPE_ID, shapeID);
@@ -776,7 +801,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusFinish, float, setRadiusFinish);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(relayParentJoints, bool, setRelayParentJoints);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialURL, QString, setMaterialURL);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialMode, MaterialMode, setMaterialMode);
+    COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(materialMode, MaterialMode, setMaterialMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(blendFactor, float, setBlendFactor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, int, setPriority);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(shapeID, int, setShapeID);
@@ -1135,6 +1160,13 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_START, RadiusStart, radiusStart, float);
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float);
 
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_URL, MaterialURL, materialURL, QString);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_PRIORITY, Priority, priority, uint32_t);
+        ADD_PROPERTY_TO_MAP(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, uint32_t);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_BOUNDS, MaterialBounds, materialBounds, glmVec4);
+
         // Certifiable Properties
         ADD_PROPERTY_TO_MAP(PROP_ITEM_NAME, ItemName, itemName, QString);
         ADD_PROPERTY_TO_MAP(PROP_ITEM_DESCRIPTION, ItemDescription, itemDescription, QString);
@@ -2067,6 +2099,13 @@ void EntityItemProperties::markAllChanged() {
     //_alphaStartChanged = true;
     //_alphaFinishChanged = true;
 
+    _materialURLChanged = true;
+    _materialModeChanged = true;
+    _blendFactorChanged = true;
+    _priorityChanged = true;
+    _shapeIDChanged = true;
+    _materialBoundsChanged = true;
+
     // Certifiable Properties
     _itemNameChanged = true;
     _itemDescriptionChanged = true;
@@ -2390,6 +2429,24 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (radiusFinishChanged()) {
         out += "radiusFinish";
     }
+    if (materialURLChanged()) {
+        out += "materialURL";
+    }
+    if (materialModeChanged()) {
+        out += "materialMode";
+    }
+    if (blendFactorChanged()) {
+        out += "blendFactor";
+    }
+    if (priorityChanged()) {
+        out += "priority";
+    }
+    if (shapeIDChanged()) {
+        out += "shapeID";
+    }
+    if (materialBoundsChanged()) {
+        out += "materialBounds";
+    }
 
     // Certifiable Properties
     if (itemNameChanged()) {
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index c8c8a658ce..557a8476fa 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -242,6 +242,29 @@ inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isVal
     return glm::vec3(0);
 }
 
+inline glmVec4 glmVec4_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
+    isValid = false; /// assume it can't be converted
+    QScriptValue x = v.property("x");
+    QScriptValue y = v.property("y");
+    QScriptValue z = v.property("z");
+    QScriptValue w = v.property("w");
+    if (x.isValid() && y.isValid() && z.isValid() && w.isValid()) {
+        glm::vec4 newValue(0);
+        newValue.x = x.toVariant().toFloat();
+        newValue.y = y.toVariant().toFloat();
+        newValue.z = z.toVariant().toFloat();
+        newValue.w = w.toVariant().toFloat();
+        isValid = !glm::isnan(newValue.x) &&
+            !glm::isnan(newValue.y) &&
+            !glm::isnan(newValue.z) &&
+            !glm::isnan(newValue.w);
+        if (isValid) {
+            return newValue;
+        }
+    }
+    return glm::vec4(0);
+}
+
 inline AACube AACube_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
     isValid = true;
     AACube result;
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index 19daa11490..bbcc691879 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -10,6 +10,9 @@
 
 #include "EntityItemProperties.h"
 
+#include "QJsonDocument"
+#include "QJsonArray"
+
 EntityItemPointer MaterialEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     Pointer entity(new MaterialEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
@@ -34,7 +37,7 @@ EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desir
 
 bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
-    
+
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialURL, setMaterialURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMode, setMaterialMode);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(blendFactor, setBlendFactor);
@@ -55,6 +58,139 @@ bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
     return somethingChanged;
 }
 
+bool MaterialEntityItem::parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB) {
+    if (array.isArray()) {
+        QJsonArray colorArray = array.toArray();
+        if (colorArray.size() >= 3 && colorArray[0].isDouble() && colorArray[1].isDouble() && colorArray[2].isDouble()) {
+            isSRGB = true;
+            if (colorArray.size() >= 4) {
+                if (colorArray[3].isBool()) {
+                    isSRGB = colorArray[3].toBool();
+                }
+            }
+            color = glm::vec3(colorArray[0].toDouble(), colorArray[1].toDouble(), colorArray[2].toDouble());
+            return true;
+        }
+    }
+    return false;
+}
+
+void MaterialEntityItem::parseJSONMaterial(const QJsonObject& materialJSON) {
+    QString name = "";
+    std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
+    for (auto& key : materialJSON.keys()) {
+        if (key == "name") {
+            auto nameJSON = materialJSON.value(key);
+            if (nameJSON.isString()) {
+                name = nameJSON.toString();
+            }
+        } else if (key == "emissive") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setEmissive(color, isSRGB);
+            }
+        } else if (key == "opacity") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setOpacity(value.toDouble());
+            }
+        } else if (key == "albedo") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setAlbedo(color, isSRGB);
+            }
+        } else if (key == "roughness") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setRoughness(value.toDouble());
+            }
+        } else if (key == "fresnel") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setFresnel(color, isSRGB);
+            }
+        } else if (key == "metallic") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setMetallic(value.toDouble());
+            }
+        } else if (key == "scattering") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setScattering(value.toDouble());
+            }
+        } else if (key == "emissiveMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setEmissiveMap(value.toString());
+            }
+        } else if (key == "albedoMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                bool useAlphaChannel = false;
+                auto opacityMap = materialJSON.find("opacityMap");
+                if (opacityMap != materialJSON.end() && opacityMap->isString() && opacityMap->toString() == value.toString()) {
+                    useAlphaChannel = true;
+                }
+                material->setAlbedoMap(value.toString(), useAlphaChannel);
+            }
+        } else if (key == "roughnessMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setRoughnessMap(value.toString(), false);
+            }
+        } else if (key == "glossMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setRoughnessMap(value.toString(), true);
+            }
+        } else if (key == "metallicMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setMetallicMap(value.toString(), false);
+            }
+        } else if (key == "specularMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setMetallicMap(value.toString(), true);
+            }
+        } else if (key == "normalMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setNormalMap(value.toString(), false);
+            }
+        } else if (key == "bumpMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setNormalMap(value.toString(), true);
+            }
+        } else if (key == "occlusionMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setOcclusionMap(value.toString());
+            }
+        } else if (key == "scatteringMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setScatteringMap(value.toString());
+            }
+        } else if (key == "lightMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setLightmapMap(value.toString());
+            }
+        }
+    }
+    _materials[name] = material;
+    _materialNames.push_back(name);
+}
+
 int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
                                                 ReadBitstreamToTreeParams& args,
                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
@@ -66,8 +202,8 @@ int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
     READ_ENTITY_PROPERTY(PROP_MATERIAL_URL, QString, setMaterialURL);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, int, setPriority);
-    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, int, setShapeID);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, uint32_t, setPriority);
+    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, uint32_t, setShapeID);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, glm::vec4, setMaterialBounds);
 
     return bytesRead;
@@ -96,25 +232,82 @@ void MaterialEntityItem::appendSubclassData(OctreePacketData* packetData, Encode
 
     bool successPropertyFits = true;
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, getMaterialURL());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, getMaterialMode());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)getMaterialMode());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, getBlendFactor());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, getPriority());
-    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, getShapeID());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, (uint32_t)getPriority());
+    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, (uint32_t)getShapeID());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, getMaterialBounds());
 }
 
 void MaterialEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
-    qCDebug(entities) << "MATERIAL EntityItem id:" << getEntityItemID() << "---------------------------------------------";
-    qCDebug(entities) << "                  name:" << _name;
-    qCDebug(entities) << "                   url:" << _materialURL;
-    qCDebug(entities) << "         material type:" << _materialMode;
-    qCDebug(entities) << "          blend factor:" << _blendFactor;
-    qCDebug(entities) << "              priority:" << _priority;
-    qCDebug(entities) << "       parent shape ID:" << _shapeID;
-    qCDebug(entities) << "       material bounds:" << _materialBounds;
-    qCDebug(entities) << "              position:" << debugTreeVector(getWorldPosition());
-    qCDebug(entities) << "            dimensions:" << debugTreeVector(getScaledDimensions());
-    qCDebug(entities) << "         getLastEdited:" << debugTime(getLastEdited(), now);
-    qCDebug(entities) <<   "SHAPE EntityItem Ptr:" << this;
+    qCDebug(entities) << " MATERIAL EntityItem id:" << getEntityItemID() << "---------------------------------------------";
+    qCDebug(entities) << "                   name:" << _name;
+    qCDebug(entities) << "          material json:" << _materialURL;
+    qCDebug(entities) << "  current material name:" << _currentMaterialName;
+    qCDebug(entities) << "          material type:" << _materialMode;
+    qCDebug(entities) << "           blend factor:" << _blendFactor;
+    qCDebug(entities) << "               priority:" << _priority;
+    qCDebug(entities) << "        parent shape ID:" << _shapeID;
+    qCDebug(entities) << "        material bounds:" << _materialBounds;
+    qCDebug(entities) << "               position:" << debugTreeVector(getWorldPosition());
+    qCDebug(entities) << "             dimensions:" << debugTreeVector(getScaledDimensions());
+    qCDebug(entities) << "          getLastEdited:" << debugTime(getLastEdited(), now);
+    qCDebug(entities) << "MATERIAL EntityItem Ptr:" << this;
 }
+
+void MaterialEntityItem::setUnscaledDimensions(const glm::vec3& value) {
+    EntityItem::setUnscaledDimensions(ENTITY_ITEM_DEFAULT_DIMENSIONS);
+}
+
+std::shared_ptr<NetworkMaterial> MaterialEntityItem::getMaterial() const {
+    auto material = _materials.find(_currentMaterialName);
+    if (material != _materials.end()) {
+        return material.value();
+    } else {
+        return nullptr;
+    }
+}
+
+void MaterialEntityItem::setMaterialURL(const QString& materialURLString) {
+    if (materialURLString.startsWith("userData")) {
+        QJsonDocument materialJSON = QJsonDocument::fromJson(getUserData().toUtf8());
+        _materials.clear();
+        _materialNames.clear();
+        if (!materialJSON.isNull()) {
+            if (materialJSON.isArray()) {
+                QJsonArray materials = materialJSON.array();
+                for (auto& material : materials) {
+                    if (!material.isNull() && material.isObject()) {
+                        parseJSONMaterial(material.toObject());
+                    }
+                }
+            } else if (materialJSON.isObject()) {
+                parseJSONMaterial(materialJSON.object());
+            }
+        }
+    }
+    _materialURL = materialURLString;
+
+    // TODO: if URL ends with ?string, set _currentMaterialName = string
+
+    // Since our JSON changed, the current name might not be valid anymore, so we need to update
+    setCurrentMaterialName(_currentMaterialName);
+}
+
+void MaterialEntityItem::setCurrentMaterialName(const QString& currentMaterialName) {
+    auto material = _materials.find(currentMaterialName);
+    if (material != _materials.end()) {
+        _currentMaterialName = currentMaterialName;
+    } else if (_materialNames.size() > 0) {
+        setCurrentMaterialName(_materialNames[0]);
+    }
+}
+
+void MaterialEntityItem::setUserData(const QString& userData) {
+    EntityItem::setUserData(userData);
+    if (_materialURL.startsWith("userData")) {
+        // Trigger material update when user data changes
+        setMaterialURL(_materialURL);
+    }
+}
\ No newline at end of file
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index 094c94f24c..80fe226b68 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -46,25 +46,34 @@ public:
 
     void debugDump() const override;
 
-    const QString& getMaterialURL() { return _materialURL; }
-    void setMaterialURL(const QString& materialURL) { _materialURL = materialURL; }
+    virtual void setUnscaledDimensions(const glm::vec3& value) override;
 
-    MaterialMode getMaterialType() { return _materialMode; }
-    void setMaterialMode(MaterialMode mode);
+    QString getMaterialURL() const { return _materialURL; }
+    void setMaterialURL(const QString& materialURLString);
 
-    float getBlendFactor() { return _blendFactor; }
+    QString getCurrentMaterialName() const { return _currentMaterialName; }
+    void setCurrentMaterialName(const QString& currentMaterialName);
+
+    MaterialMode getMaterialMode() const { return _materialMode; }
+    void setMaterialMode(MaterialMode mode) { _materialMode = mode; }
+
+    float getBlendFactor() const { return _blendFactor; }
     void setBlendFactor(float blendFactor) { _blendFactor = blendFactor; }
 
-    int getPriority() { return _priority; }
+    int getPriority() const { return _priority; }
     void setPriority(int priority) { _priority = priority; }
 
-    int getShapeID() { return _shapeID; }
+    int getShapeID() const { return _shapeID; }
     void setShapeID(int shapeID) { _shapeID = shapeID; }
 
-    const glm::vec4& getMaterialBounds() { return _materialBounds; }
+    glm::vec4 getMaterialBounds() const { return _materialBounds; }
     void setMaterialBounds(const glm::vec4& materialBounds) { _materialBounds = materialBounds; }
 
-protected:
+    std::shared_ptr<NetworkMaterial> getMaterial() const;
+
+    void setUserData(const QString& userData) override;
+
+private:
     QString _materialURL;
     MaterialMode _materialMode { UV };
     float _blendFactor { 1.0f };
@@ -72,7 +81,12 @@ protected:
     int _shapeID { 0 };
     glm::vec4 _materialBounds { 0, 0, 1, 1 };
     
-    //NetworkMaterial _material;
+    QHash<QString, std::shared_ptr<NetworkMaterial>> _materials;
+    std::vector<QString> _materialNames;
+    QString _currentMaterialName;
+
+    void parseJSONMaterial(const QJsonObject& materialJSON);
+    static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
 
 };
 
diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp
index ea5bd331c9..6cc6b8472f 100755
--- a/libraries/graphics/src/graphics/Material.cpp
+++ b/libraries/graphics/src/graphics/Material.cpp
@@ -221,4 +221,4 @@ bool Material::calculateMaterialInfo() const {
         _hasCalculatedTextureInfo = allTextures;
     }
     return _hasCalculatedTextureInfo;
-}
+}
\ No newline at end of file
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 07f7283bfa..1fe3648838 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -425,7 +425,7 @@ bool Geometry::areTexturesLoaded() const {
     return true;
 }
 
-const std::shared_ptr<const NetworkMaterial> Geometry::getShapeMaterial(int partID) const {
+const std::shared_ptr<NetworkMaterial> Geometry::getShapeMaterial(int partID) const {
     if ((partID >= 0) && (partID < (int)_meshParts->size())) {
         int materialID = _meshParts->at(partID)->materialID;
         if ((materialID >= 0) && (materialID < (int)_materials.size())) {
@@ -491,6 +491,15 @@ void GeometryResourceWatcher::resourceRefreshed() {
     // _instance.reset();
 }
 
+NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
+    Material(m),
+    _textures(m._textures),
+    _albedoTransform(m._albedoTransform),
+    _lightmapParams(m._lightmapParams),
+    _lightmapTransform(m._lightmapTransform),
+    _isOriginal(m._isOriginal)
+{}
+
 const QString NetworkMaterial::NO_TEXTURE = QString();
 
 const QString& NetworkMaterial::getTextureName(MapChannel channel) {
@@ -532,19 +541,85 @@ graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl
 }
 
 graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel) {
-    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type);
-    _textures[channel].texture = texture;
+    auto textureCache = DependencyManager::get<TextureCache>();
+    if (textureCache) {
+        auto texture = textureCache->getTexture(url, type);
+        _textures[channel].texture = texture;
 
-    auto map = std::make_shared<graphics::TextureMap>();
-    map->setTextureSource(texture->_textureSource);
+        auto map = std::make_shared<graphics::TextureMap>();
+        if (texture) {
+            map->setTextureSource(texture->_textureSource);
+            emit textureFinished();
+        }
 
-    return map;
+        return map;
+    }
+    return nullptr;
+}
+
+void NetworkMaterial::setAlbedoMap(const QString& url, bool useAlphaChannel) {
+    auto map = fetchTextureMap(QUrl(url), image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
+    if (map) {
+        map->setUseAlphaChannel(useAlphaChannel);
+        setTextureMap(MapChannel::ALBEDO_MAP, map);
+    }
+}
+
+void NetworkMaterial::setNormalMap(const QString& url, bool isBumpmap) {
+    auto map = fetchTextureMap(QUrl(url), isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE, MapChannel::NORMAL_MAP);
+    if (map) {
+        setTextureMap(MapChannel::NORMAL_MAP, map);
+    }
+}
+
+void NetworkMaterial::setRoughnessMap(const QString& url, bool isGloss) {
+    auto map = fetchTextureMap(QUrl(url), isGloss ? image::TextureUsage::GLOSS_TEXTURE : image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
+    if (map) {
+        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
+    }
+}
+
+void NetworkMaterial::setMetallicMap(const QString& url, bool isSpecular) {
+    auto map = fetchTextureMap(QUrl(url), isSpecular ? image::TextureUsage::SPECULAR_TEXTURE : image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
+    if (map) {
+        setTextureMap(MapChannel::METALLIC_MAP, map);
+    }
+}
+
+void NetworkMaterial::setOcclusionMap(const QString& url) {
+    auto map = fetchTextureMap(QUrl(url), image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
+    if (map) {
+        setTextureMap(MapChannel::OCCLUSION_MAP, map);
+    }
+}
+
+void NetworkMaterial::setEmissiveMap(const QString& url) {
+    auto map = fetchTextureMap(QUrl(url), image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
+    if (map) {
+        setTextureMap(MapChannel::EMISSIVE_MAP, map);
+    }
+}
+
+void NetworkMaterial::setScatteringMap(const QString& url) {
+    auto map = fetchTextureMap(QUrl(url), image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
+    if (map) {
+        setTextureMap(MapChannel::SCATTERING_MAP, map);
+    }
+}
+
+void NetworkMaterial::setLightmapMap(const QString& url) {
+    auto map = fetchTextureMap(QUrl(url), image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
+    if (map) {
+        //map->setTextureTransform(_lightmapTransform);
+        //map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
+        setTextureMap(MapChannel::LIGHTMAP_MAP, map);
+    }
 }
 
 NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl) :
-    graphics::Material(*material._material)
+    graphics::Material(*material._material),
+    _textures(MapChannel::NUM_MAP_CHANNELS)
 {
-    _textures = Textures(MapChannel::NUM_MAP_CHANNELS);
     if (!material.albedoTexture.filename.isEmpty()) {
         auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
         _albedoTransform = material.albedoTexture.transform;
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index f650b3f2eb..575f94f9bf 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -48,7 +48,7 @@ public:
 
     const FBXGeometry& getFBXGeometry() const { return *_fbxGeometry; }
     const GeometryMeshes& getMeshes() const { return *_meshes; }
-    const std::shared_ptr<const NetworkMaterial> getShapeMaterial(int shapeID) const;
+    const std::shared_ptr<NetworkMaterial> getShapeMaterial(int shapeID) const;
 
     const QVariantMap getTextures() const;
     void setTextures(const QVariantMap& textureMap);
@@ -131,7 +131,6 @@ private:
     Geometry::Pointer& _geometryRef;
 };
 
-
 /// Stores cached model geometries.
 class ModelCache : public ResourceCache, public Dependency {
     Q_OBJECT
@@ -157,11 +156,26 @@ private:
     virtual ~ModelCache() = default;
 };
 
-class NetworkMaterial : public graphics::Material {
+class NetworkMaterial : public QObject, public graphics::Material {
+    Q_OBJECT
 public:
     using MapChannel = graphics::Material::MapChannel;
 
+    NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
     NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl);
+    NetworkMaterial(const NetworkMaterial& material);
+
+    void setAlbedoMap(const QString& url, bool useAlphaChannel);
+    void setNormalMap(const QString& url, bool isBumpmap);
+    void setRoughnessMap(const QString& url, bool isGloss);
+    void setMetallicMap(const QString& url, bool isSpecular);
+    void setOcclusionMap(const QString& url);
+    void setEmissiveMap(const QString& url);
+    void setScatteringMap(const QString& url);
+    void setLightmapMap(const QString& url);
+
+signals:
+    void textureFinished();
 
 protected:
     friend class Geometry;
diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp
index 8153dba3a5..3402758ef1 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.cpp
+++ b/libraries/model-networking/src/model-networking/TextureCache.cpp
@@ -275,6 +275,8 @@ QSharedPointer<Resource> TextureCache::createResource(const QUrl& url, const QSh
     return QSharedPointer<Resource>(texture, &Resource::deleter);
 }
 
+int networkTexturePointerMetaTypeId = qRegisterMetaType<QWeakPointer<NetworkTexture>>();
+
 NetworkTexture::NetworkTexture(const QUrl& url) :
 Resource(url),
 _type(),
diff --git a/libraries/model-networking/src/model-networking/TextureCache.h b/libraries/model-networking/src/model-networking/TextureCache.h
index 742d003d02..6a88eb641a 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.h
+++ b/libraries/model-networking/src/model-networking/TextureCache.h
@@ -163,7 +163,6 @@ public:
     NetworkTexturePointer getTexture(const QUrl& url, image::TextureUsage::Type type = image::TextureUsage::DEFAULT_TEXTURE,
         const QByteArray& content = QByteArray(), int maxNumPixels = ABSOLUTE_MAX_TEXTURE_NUM_PIXELS);
 
-
     gpu::TexturePointer getTextureByHash(const std::string& hash);
     gpu::TexturePointer cacheTextureByHash(const std::string& hash, const gpu::TexturePointer& texture);
 
diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index a3ac995bcf..7ba7cca96d 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -340,14 +340,6 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
         return resource;
     }
 
-    if (QThread::currentThread() != thread()) {
-        qCDebug(networking) << "Fetching asynchronously:" << url;
-        QMetaObject::invokeMethod(this, "getResource",
-            Q_ARG(QUrl, url), Q_ARG(QUrl, fallback));
-            // Cannot use extra parameter as it might be freed before the invocation
-        return QSharedPointer<Resource>();
-    }
-
     if (!url.isValid() && !url.isEmpty() && fallback.isValid()) {
         return getResource(fallback, QUrl());
     }
@@ -358,6 +350,7 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
         extra);
     resource->setSelf(resource);
     resource->setCache(this);
+    resource->moveToThread(qApp->thread());
     connect(resource.data(), &Resource::updateSize, this, &ResourceCache::updateTotalSize);
     {
         QWriteLocker locker(&_resourcesLock);
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 711aeb2cc2..98ad1ab323 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -30,7 +30,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return static_cast<PacketVersion>(EntityVersion::SoftEntities);
+            return static_cast<PacketVersion>(EntityVersion::MaterialEntities);
 
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::RemovedJurisdictions);
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 458666571c..e13809810c 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -206,7 +206,8 @@ enum class EntityVersion : PacketVersion {
     OwnershipChallengeFix,
     ZoneLightInheritModes = 82,
     ZoneStageRemoved,
-    SoftEntities
+    SoftEntities,
+    MaterialEntities
 };
 
 enum class EntityScriptCallMethodVersion : PacketVersion {
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index ef4e98798f..7f8eb49101 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -33,6 +33,8 @@
 #include <NLPacket.h>
 #include <udt/PacketHeaders.h>
 
+#include "MaterialMode.h"
+
 #include "OctreeConstants.h"
 #include "OctreeElement.h"
 
@@ -249,6 +251,7 @@ public:
     
     static int unpackDataFromBytes(const unsigned char* dataBytes, float& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec3& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec4& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, bool& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, quint64& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, uint32_t& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
@@ -257,6 +260,7 @@ public:
     static int unpackDataFromBytes(const unsigned char* dataBytes, rgbColor& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::quat& result) { int bytes = unpackOrientationQuatFromBytes(dataBytes, result); return bytes; }
     static int unpackDataFromBytes(const unsigned char* dataBytes, ShapeType& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, MaterialMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, QString& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, QUuid& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, xColor& result);
diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
index 3d213840dd..41a5bf5faf 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
@@ -38,7 +38,7 @@ void CauterizedMeshPartPayload::updateTransformForCauterizedMesh(const Transform
     _cauterizedTransform = renderTransform;
 }
 
-void CauterizedMeshPartPayload::bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const {
+void CauterizedMeshPartPayload::bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const {
     bool useCauterizedMesh = (renderMode != RenderArgs::RenderMode::SHADOW_RENDER_MODE && renderMode != RenderArgs::RenderMode::SECONDARY_CAMERA_RENDER_MODE) && _enableCauterization;
     if (useCauterizedMesh) {
         if (_cauterizedClusterBuffer) {
@@ -46,7 +46,7 @@ void CauterizedMeshPartPayload::bindTransform(gpu::Batch& batch, const render::S
         }
         batch.setModelTransform(_cauterizedTransform);
     } else {
-        ModelMeshPartPayload::bindTransform(batch, locations, renderMode);
+        ModelMeshPartPayload::bindTransform(batch, renderMode);
     }
 }
 
diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.h b/libraries/render-utils/src/CauterizedMeshPartPayload.h
index 2337632047..3c0f90fcb5 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.h
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.h
@@ -25,7 +25,7 @@ public:
 
     void updateTransformForCauterizedMesh(const Transform& renderTransform);
 
-    void bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const override;
+    void bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const override;
 
     void setEnableCauterization(bool enableCauterization) { _enableCauterization = enableCauterization; }
 
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 1fd6ca2980..0d76b2c093 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -1318,7 +1318,6 @@ void GeometryCache::renderUnitQuad(gpu::Batch& batch, const glm::vec4& color, in
     renderQuad(batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, color, id);
 }
 
-
 void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, const glm::vec2& maxCorner,
     const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner,
     const glm::vec4& color, int id) {
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index c506887fc4..dd5809093e 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -125,126 +125,7 @@ void MeshPartPayload::bindMesh(gpu::Batch& batch) {
     batch.setInputStream(0, _drawMesh->getVertexStream());
 }
 
-void MeshPartPayload::bindMaterial(gpu::Batch& batch, const ShapePipeline::LocationsPointer locations, bool enableTextures) const {
-    if (!_drawMaterial) {
-        return;
-    }
-
-    auto textureCache = DependencyManager::get<TextureCache>();
-
-    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, _drawMaterial->getSchemaBuffer());
-    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::TEXMAPARRAY, _drawMaterial->getTexMapArrayBuffer());
-
-    const auto& materialKey = _drawMaterial->getKey();
-    const auto& textureMaps = _drawMaterial->getTextureMaps();
-
-    int numUnlit = 0;
-    if (materialKey.isUnlit()) {
-        numUnlit++;
-    }
-
-    if (!enableTextures) {
-        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
-        return;
-    }
-
-    // Albedo
-    if (materialKey.isAlbedoMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::ALBEDO_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getGrayTexture());
-        }
-    }
-
-    // Roughness map
-    if (materialKey.isRoughnessMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::ROUGHNESS_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Normal map
-    if (materialKey.isNormalMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::NORMAL_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
-        }
-    }
-
-    // Metallic map
-    if (materialKey.isMetallicMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::METALLIC_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
-        }
-    }
-
-    // Occlusion map
-    if (materialKey.isOcclusionMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::OCCLUSION_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Scattering map
-    if (materialKey.isScatteringMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::SCATTERING_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Emissive / Lightmap
-    if (materialKey.isLightmapMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::LIGHTMAP_MAP);
-
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getGrayTexture());
-        }
-    } else if (materialKey.isEmissiveMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::EMISSIVE_MAP);
-
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
-        }
-    }
-}
-
-void MeshPartPayload::bindTransform(gpu::Batch& batch, const ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const {
+void MeshPartPayload::bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const {
     batch.setModelTransform(_drawTransform);
 }
 
@@ -252,23 +133,21 @@ void MeshPartPayload::bindTransform(gpu::Batch& batch, const ShapePipeline::Loca
 void MeshPartPayload::render(RenderArgs* args) {
     PerformanceTimer perfTimer("MeshPartPayload::render");
 
+    if (!args) {
+        return;
+    }
+
     gpu::Batch& batch = *(args->_batch);
 
-    auto locations = args->_shapePipeline->locations;
-    assert(locations);
-
     // Bind the model transform and the skinCLusterMatrices if needed
-    bindTransform(batch, locations, args->_renderMode);
+    bindTransform(batch, args->_renderMode);
 
     //Bind the index buffer and vertex buffer and Blend shapes if needed
     bindMesh(batch);
 
     // apply material properties
-    bindMaterial(batch, locations, args->_enableTexturing);
-
-    if (args) {
-        args->_details._materialSwitches++;
-    }
+    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
+    args->_details._materialSwitches++;
 
     // Draw!
     {
@@ -276,10 +155,8 @@ void MeshPartPayload::render(RenderArgs* args) {
         drawCall(batch);
     }
 
-    if (args) {
-        const int INDICES_PER_TRIANGLE = 3;
-        args->_details._trianglesRendered += _drawPart._numIndices / INDICES_PER_TRIANGLE;
-    }
+    const int INDICES_PER_TRIANGLE = 3;
+    args->_details._trianglesRendered += _drawPart._numIndices / INDICES_PER_TRIANGLE;
 }
 
 namespace render {
@@ -500,7 +377,7 @@ void ModelMeshPartPayload::bindMesh(gpu::Batch& batch) {
     }
 }
 
-void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, const ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const {
+void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const {
     if (_clusterBuffer) {
         batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::SKINNING, _clusterBuffer);
     }
@@ -515,17 +392,14 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     }
 
     gpu::Batch& batch = *(args->_batch);
-    auto locations =  args->_shapePipeline->locations;
-    assert(locations);
 
-    bindTransform(batch, locations, args->_renderMode);
+    bindTransform(batch, args->_renderMode);
 
     //Bind the index buffer and vertex buffer and Blend shapes if needed
     bindMesh(batch);
 
     // apply material properties
-    bindMaterial(batch, locations, args->_enableTexturing);
-
+    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 8160b9f009..7ec02ae7f0 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -17,7 +17,6 @@
 #include <gpu/Batch.h>
 
 #include <render/Scene.h>
-#include <render/ShapePipeline.h>
 
 #include <graphics/Geometry.h>
 
@@ -49,8 +48,7 @@ public:
     // ModelMeshPartPayload functions to perform render
     void drawCall(gpu::Batch& batch) const;
     virtual void bindMesh(gpu::Batch& batch);
-    virtual void bindMaterial(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, bool enableTextures) const;
-    virtual void bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const;
+    virtual void bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const;
 
     // Payload resource cached values
     Transform _drawTransform;
@@ -63,7 +61,7 @@ public:
     mutable graphics::Box _worldBound;
     std::shared_ptr<const graphics::Mesh> _drawMesh;
 
-    std::shared_ptr<const graphics::Material> _drawMaterial;
+    std::shared_ptr<graphics::Material> _drawMaterial;
     graphics::Mesh::Part _drawPart;
 
     size_t getVerticesCount() const { return _drawMesh ? _drawMesh->getNumVertices() : 0; }
@@ -109,7 +107,7 @@ public:
 
     // ModelMeshPartPayload functions to perform render
     void bindMesh(gpu::Batch& batch) override;
-    void bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const override;
+    void bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const override;
 
     void computeAdjustedLocalBound(const std::vector<TransformType>& clusterTransforms);
 
diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index 1d88c3e5f5..4f8673cde6 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -2,7 +2,9 @@ set(TARGET_NAME render)
 AUTOSCRIBE_SHADER_LIB(gpu graphics)
 setup_hifi_library()
 
-# render needs octree only for getAccuracyAngle(float, int)
-link_hifi_libraries(shared ktx gpu graphics octree)
+# render needs octree only for getAccuracyAngle(float, int), and model-networking for TextureCache
+link_hifi_libraries(shared ktx gpu graphics octree model-networking)
+include_hifi_library_headers(networking)
+include_hifi_library_headers(image)
 
 target_nsight()
diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp
index 4254280fa1..db4ff604ca 100644
--- a/libraries/render/src/render/ShapePipeline.cpp
+++ b/libraries/render/src/render/ShapePipeline.cpp
@@ -15,6 +15,8 @@
 
 #include <PerfStat.h>
 
+#include <model-networking/TextureCache.h>
+
 using namespace render;
 
 ShapePipeline::CustomFactoryMap ShapePipeline::_globalCustomFactoryMap;
@@ -157,3 +159,122 @@ const ShapePipelinePointer ShapePlumber::pickPipeline(RenderArgs* args, const Ke
 
     return shapePipeline;
 }
+
+void ShapePipeline::bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures) const {
+    if (!material) {
+        return;
+    }
+
+    auto textureCache = DependencyManager::get<TextureCache>();
+
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, material->getSchemaBuffer());
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::TEXMAPARRAY, material->getTexMapArrayBuffer());
+
+    const auto& materialKey = material->getKey();
+    const auto& textureMaps = material->getTextureMaps();
+
+    int numUnlit = 0;
+    if (materialKey.isUnlit()) {
+        numUnlit++;
+    }
+
+    if (!enableTextures) {
+        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
+        return;
+    }
+
+    // Albedo
+    if (materialKey.isAlbedoMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::ALBEDO_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getGrayTexture());
+        }
+    }
+
+    // Roughness map
+    if (materialKey.isRoughnessMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::ROUGHNESS_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Normal map
+    if (materialKey.isNormalMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::NORMAL_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
+        }
+    }
+
+    // Metallic map
+    if (materialKey.isMetallicMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::METALLIC_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
+        }
+    }
+
+    // Occlusion map
+    if (materialKey.isOcclusionMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::OCCLUSION_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Scattering map
+    if (materialKey.isScatteringMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::SCATTERING_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Emissive / Lightmap
+    if (materialKey.isLightmapMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::LIGHTMAP_MAP);
+
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getGrayTexture());
+        }
+    } else if (materialKey.isEmissiveMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::EMISSIVE_MAP);
+
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
+        }
+    }
+}
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index be77e2f95e..3e358e9ac2 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -18,6 +18,8 @@
 
 #include "Args.h"
 
+#include <graphics/Material.h>
+
 namespace render {
 class Item;
 class ShapePlumber;
@@ -294,6 +296,8 @@ public:
 
     void prepareShapeItem(Args* args, const ShapeKey& key, const Item& shape);
 
+    void bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures) const;
+
 protected:
     friend class ShapePlumber;
 
diff --git a/libraries/shared/src/MaterialMode.cpp b/libraries/shared/src/MaterialMode.cpp
new file mode 100644
index 0000000000..cb656a7bf7
--- /dev/null
+++ b/libraries/shared/src/MaterialMode.cpp
@@ -0,0 +1,24 @@
+//
+//  Created by Sam Gondelman on 1/17/2018
+//  Copyright 2018 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 "MaterialMode.h"
+
+const char* materialModeNames[] = {
+    "uv",
+    "projected"
+};
+
+static const size_t MATERIAL_MODE_NAMES = (sizeof(materialModeNames) / sizeof((materialModeNames)[0]));
+
+QString MaterialModeHelpers::getNameForMaterialMode(MaterialMode mode) {
+    if (((int)mode <= 0) || ((int)mode >= (int)MATERIAL_MODE_NAMES)) {
+        mode = (MaterialMode)0;
+    }
+
+    return materialModeNames[(int)mode];
+}
\ No newline at end of file
diff --git a/libraries/shared/src/MaterialMode.h b/libraries/shared/src/MaterialMode.h
index 05c6d295a5..a933693f75 100644
--- a/libraries/shared/src/MaterialMode.h
+++ b/libraries/shared/src/MaterialMode.h
@@ -9,10 +9,17 @@
 #ifndef hifi_MaterialMode_h
 #define hifi_MaterialMode_h
 
+#include "QString"
+
 enum MaterialMode {
     UV = 0,
     PROJECTED
 };
 
+class MaterialModeHelpers {
+public:
+    static QString getNameForMaterialMode(MaterialMode mode);
+};
+
 #endif // hifi_MaterialMode_h
 
diff --git a/scripts/developer/tests/toolbarTest.js b/scripts/developer/tests/toolbarTest.js
index e21fbd8e19..dfc97ebe39 100644
--- a/scripts/developer/tests/toolbarTest.js
+++ b/scripts/developer/tests/toolbarTest.js
@@ -11,7 +11,8 @@ var toolBar = (function() {
         newTextButton,
         newWebButton,
         newZoneButton,
-        newParticleButton
+        newParticleButton,
+        newMaterialButton
 
     var toolIconUrl = Script.resolvePath("../../system/assets/images/tools/");
 
@@ -89,6 +90,13 @@ var toolBar = (function() {
             visible: false
         });
 
+        newMaterialButton = toolBar.addButton({
+            objectName: "newMaterialButton",
+            imageURL: toolIconUrl + "model-01.svg",
+            alpha: 0.9,
+            visible: false
+        });
+
         that.setActive(false);
         newModelButton.clicked();
     }
@@ -109,8 +117,8 @@ var toolBar = (function() {
         newTextButton.writeProperty('visible', doShow);
         newWebButton.writeProperty('visible', doShow);
         newZoneButton.writeProperty('visible', doShow);
-        newModelButton.writeProperty('visible', doShow);
         newParticleButton.writeProperty('visible', doShow);
+        newMaterialButton.writeProperty('visible', doShow);
     };
 
     initialize();
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 87cd3e0faf..928d8ba1fa 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -251,7 +251,7 @@ var toolBar = (function () {
             // Align entity with Avatar orientation.
             properties.rotation = MyAvatar.orientation;
             
-            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
+            var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web", "Material"];
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
                     
                 // Adjust position of entity per bounding box prior to creating it.
@@ -354,6 +354,9 @@ var toolBar = (function () {
     var SHAPE_TYPE_SPHERE = 5;
     var DYNAMIC_DEFAULT = false;
 
+    var MATERIAL_MODE_UV = 0;
+    var MATERIAL_MODE_PROJECTED = 1;
+
     function handleNewModelDialogResult(result) {
         if (result) {
             var url = result.textInput;
@@ -394,6 +397,28 @@ var toolBar = (function () {
         }
     }
 
+    function handleNewMaterialDialogResult(result) {
+        if (result) {
+            var json = result.textInput;
+            var materialMode;
+            switch (result.comboBox) {
+                case MATERIAL_MODE_PROJECTED:
+                    materialMode = "projected";
+                    break;
+                default:
+                    shapeType = "uv";
+            }
+
+            if (json) {
+                createNewEntity({
+                    type: "Material",
+                    materialURL: json,
+                    materialMode: materialMode
+                });
+            }
+        }
+    }
+
     function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml.
         var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
         tablet.popFromStack();
@@ -404,6 +429,9 @@ var toolBar = (function () {
         case "newEntityButtonClicked":
             buttonHandlers[message.params.buttonName]();
             break;
+        case "newMaterialDialogAdd":
+            handleNewMaterialDialogResult(message.params);
+            break;
         }
     }
 
@@ -614,6 +642,17 @@ var toolBar = (function () {
             });
         });
 
+        addButton("newMaterialButton", "model-01.svg", function () {
+            var MATERIAL_MODES = [];
+            MATERIAL_MODES[MATERIAL_MODE_UV] = "UV space material";
+            MATERIAL_MODES[MATERIAL_MODE_PROJECTED] = "3D projected material";
+            var MATERIAL_MODE_DEFAULT = MATERIAL_MODE_UV;
+
+            // tablet version of new material dialog
+            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+            tablet.pushOntoStack("NewMaterialDialog.qml");
+        });
+
         that.setActive(false);
     }
 
@@ -1983,7 +2022,7 @@ var PropertiesTool = function (opts) {
                     );
                 }
                 Entities.editEntity(selectionManager.selections[0], data.properties);
-                if (data.properties.name !== undefined || data.properties.modelURL !== undefined ||
+                if (data.properties.name !== undefined || data.properties.modelURL !== undefined || data.properties.materialURL !== undefined ||
                         data.properties.visible !== undefined || data.properties.locked !== undefined) {
                     entityListTool.sendUpdate();
                 }
@@ -1994,7 +2033,7 @@ var PropertiesTool = function (opts) {
             parentSelectedEntities();
         } else if (data.type === 'unparent') {
             unparentSelectedEntities();
-        } else if (data.type === 'saveUserData'){
+        } else if (data.type === 'saveUserData') {
             //the event bridge and json parsing handle our avatar id string differently.
             var actualID = data.id.split('"')[1];
             Entities.editEntity(actualID, data.properties);
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 736d42d593..96084f355f 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -448,7 +448,7 @@ input[type=checkbox]:checked + label:hover {
     border: 1.5pt solid black;
 }
 
-.shape-section, .light-section, .model-section, .web-section, .hyperlink-section, .text-section, .zone-section {
+.shape-section, .light-section, .model-section, .web-section, .hyperlink-section, .text-section, .zone-section, .material-section {
     display: table;
 }
 
@@ -570,6 +570,7 @@ hr {
 .physical-group[collapsed="true"] ~ .physical-group,
 .behavior-group[collapsed="true"] ~ .behavior-group,
 .model-group[collapsed="true"] ~ .model-group,
+.material-group[collapsed="true"] ~ .material-group,
 .light-group[collapsed="true"] ~ .light-group {
     display: none !important;
 }
@@ -1386,7 +1387,7 @@ input#reset-to-natural-dimensions {
 }
 
 
-#static-userdata{
+#static-userdata {
     display: none;
     z-index: 99;
     position: absolute;
@@ -1397,7 +1398,7 @@ input#reset-to-natural-dimensions {
     background-color: #2e2e2e;
 }
 
-#userdata-saved{
+#userdata-saved {
     margin-top:5px;
     font-size:16px;
     display:none;
@@ -1454,6 +1455,9 @@ input#reset-to-natural-dimensions {
     order: 6;
 }
 
+#properties-list.ShapeMenu #material,
+#properties-list.BoxMenu #material,
+#properties-list.SphereMenu #material,
 #properties-list.ShapeMenu #light,
 #properties-list.BoxMenu #light,
 #properties-list.SphereMenu #light,
@@ -1490,6 +1494,7 @@ input#reset-to-natural-dimensions {
 }
 
 /* items to hide    */
+#properties-list.ParticleEffectMenu #material,
 #properties-list.ParticleEffectMenu #base-color-section,
 #properties-list.ParticleEffectMenu #hyperlink,
 #properties-list.ParticleEffectMenu #light,
@@ -1524,6 +1529,7 @@ input#reset-to-natural-dimensions {
     order: 7;
 }
 /* sections to hide    */
+#properties-list.LightMenu #material,
 #properties-list.LightMenu #model,
 #properties-list.LightMenu #zone,
 #properties-list.LightMenu #text,
@@ -1560,6 +1566,7 @@ input#reset-to-natural-dimensions {
     order: 7;
 }
 /* sections to hide    */
+#properties-list.ModelMenu #material,
 #properties-list.ModelMenu #light,
 #properties-list.ModelMenu #zone,
 #properties-list.ModelMenu #text,
@@ -1596,6 +1603,7 @@ input#reset-to-natural-dimensions {
     order: 7;
 }
 /* sections to hide    */
+#properties-list.ZoneMenu #material,
 #properties-list.ZoneMenu #light,
 #properties-list.ZoneMenu #model,
 #properties-list.ZoneMenu #text,
@@ -1632,6 +1640,7 @@ input#reset-to-natural-dimensions {
     order: 7;
 }
 /* sections to hide    */
+#properties-list.WebMenu #material,
 #properties-list.WebMenu #light,
 #properties-list.WebMenu #model,
 #properties-list.WebMenu #zone,
@@ -1669,6 +1678,7 @@ input#reset-to-natural-dimensions {
     order: 7;
 }
 /* sections to hide    */
+#properties-list.TextMenu #material,
 #properties-list.TextMenu #light,
 #properties-list.TextMenu #model,
 #properties-list.TextMenu #zone,
@@ -1681,6 +1691,39 @@ input#reset-to-natural-dimensions {
     display: none
 }
 
+/* -----   Order of Menu items for Material   ----- */
+#properties-list.MaterialMenu #general {
+    order: 1;
+}
+#properties-list.MaterialMenu #material {
+    order: 2;
+}
+#properties-list.MaterialMenu #spatial {
+    order: 3;
+}
+#properties-list.MaterialMenu #hyperlink {
+    order: 4;
+}
+#properties-list.MaterialMenu #behavior {
+    order: 5;
+}
+
+/* sections to hide    */
+#properties-list.MaterialMenu #physical,
+#properties-list.MaterialMenu #collision-info,
+#properties-list.MaterialMenu #model,
+#properties-list.MaterialMenu #light,
+#properties-list.MaterialMenu #zone,
+#properties-list.MaterialMenu #text,
+#properties-list.MaterialMenu #web {
+    display: none;
+}
+/* items to hide */
+#properties-list.MaterialMenu #shape-list,
+#properties-list.MaterialMenu #base-color-section {
+    display: none
+}
+
 
 /* Currently always hidden */
 #properties-list #polyvox {
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b93974ee77..93d22180c9 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -761,6 +761,51 @@
             </div>
         </fieldset>
 
+        <fieldset id="material" class="major">
+            <legend class="section-header material-group material-section">
+                Material<span>M</span>
+            </legend>
+            <fieldset class="minor">
+                <div class="material-group material-section property url">
+                    <label for="property-material-url">Material URL</label>
+                    <input type="text" id="property-material-url">
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="material-group material-section property dropdown">
+                    <label>Material mode </label>
+                    <select name="SelectMaterialMode" id="property-material-mode">
+                        <option value="uv">UV space material</option>
+                        <option value="projected">3D projected material</option>
+                    </select>
+                </div>
+
+                <div class="material-group material-section property number">
+                    <label>Blend Factor </label>
+                    <input type="number" id="property-blend-factor" min="0" max="1" step="0.1">
+                </div>
+
+                <div class="material-group material-section property number">
+                    <label>Priority </label>
+                    <input type="number" id="property-priority">
+                </div>
+
+                <div class="material-group material-section property number">
+                    <label>Shape ID </label>
+                    <input type="number" id="property-shape-id" min="0">
+                </div>
+
+                <div class="material-group material-section property tuple">
+                    <label>Material Bounds </label>
+                    <div><input type="number" class="x" id="property-material-bounds-x" min="0" max="1" step="0.1"><label for="property-material-bounds-x">Left:</label></div>
+                    <div><input type="number" class="y" id="property-material-bounds-y" min="0" max="1" step="0.1"><label for="property-material-bounds-y">Top:</label></div>
+                    <div><input type="number" class="z" id="property-material-bounds-z" min="0" max="1" step="0.1"><label for="property-material-bounds-z">Right:</label></div>
+                    <div><input type="number" class="w" id="property-material-bounds-w" min="0" max="1" step="0.1"><label for="property-material-bounds-w">Bottom:</label></div>
+                </div>
+
+            </fieldset>
+        </fieldset>
+
     </div>
 </body>
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 72092b66ca..af9d106149 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -24,7 +24,8 @@ var ICON_FOR_TYPE = {
     Zone: "o",
     PolyVox: "&#xe005;",
     Multiple: "&#xe000;",
-    PolyLine: "&#xe01b;"
+    PolyLine: "&#xe01b;",
+    Material: "&#xe008;"
 };
 
 var EDITOR_TIMEOUT_DURATION = 1500;
@@ -77,7 +78,6 @@ function disableProperties() {
     if ($('#userdata-editor').css('display') === "block" && elLocked.checked === true) {
         showStaticUserData();
     }
-
 }
 
 function showElements(els, show) {
@@ -192,6 +192,19 @@ function createEmitGroupVec3PropertyUpdateFunction(group, property, elX, elY, el
     };
 }
 
+function createEmitVec4PropertyUpdateFunction(property, elX, elY, elZ, elW) {
+    return function () {
+        var properties = {};
+        properties[property] = {
+            x: elX.value,
+            y: elY.value,
+            z: elZ.value,
+            w: elW.value
+        };
+        updateProperties(properties);
+    };
+}
+
 function createEmitVec3PropertyUpdateFunctionWithMultiplier(property, elX, elY, elZ, multiplier) {
     return function() {
         var properties = {};
@@ -473,7 +486,6 @@ function bindAllNonJSONEditorElements() {
             } else {
                 if ($('#userdata-editor').css('height') !== "0px") {
                     saveJSONUserData(true);
-
                 }
             }
         });
@@ -621,6 +633,16 @@ function loaded() {
         var elModelTextures = document.getElementById("property-model-textures");
         var elModelOriginalTextures = document.getElementById("property-model-original-textures");
 
+        var elMaterialURL = document.getElementById("property-material-url");
+        var elMaterialMode = document.getElementById("property-material-mode");
+        var elBlendFactor = document.getElementById("property-blend-factor");
+        var elPriority = document.getElementById("property-priority");
+        var elShapeID = document.getElementById("property-shape-id");
+        var elMaterialBoundsX = document.getElementById("property-material-bounds-x");
+        var elMaterialBoundsY = document.getElementById("property-material-bounds-y");
+        var elMaterialBoundsZ = document.getElementById("property-material-bounds-z");
+        var elMaterialBoundsW = document.getElementById("property-material-bounds-w");
+
         var elWebSourceURL = document.getElementById("property-web-source-url");
         var elWebDPI = document.getElementById("property-web-dpi");
 
@@ -1105,6 +1127,17 @@ function loaded() {
                             elXTextureURL.value = properties.xTextureURL;
                             elYTextureURL.value = properties.yTextureURL;
                             elZTextureURL.value = properties.zTextureURL;
+                        } else if (properties.type === "Material") {
+                            elMaterialURL.value = properties.materialURL;
+                            elMaterialMode.value = properties.materialMode;
+                            setDropdownText(elMaterialMode);
+                            elBlendFactor.value = properties.blendFactor.toFixed(2);
+                            elPriority.value = properties.priority;
+                            elShapeID.value = properties.shapeID;
+                            elMaterialBoundsX.value = properties.materialBounds.x.toFixed(2);
+                            elMaterialBoundsY.value = properties.materialBounds.y.toFixed(2);
+                            elMaterialBoundsZ.value = properties.materialBounds.z.toFixed(2);
+                            //elMaterialBoundsW.value = properties.materialBounds.w.toFixed(2);
                         }
 
                         if (properties.locked) {
@@ -1375,6 +1408,19 @@ function loaded() {
 
         elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
 
+        elMaterialURL.addEventListener('change', createEmitTextPropertyUpdateFunction('materialURL'));
+        elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
+        elBlendFactor.addEventListener('change', createEmitNumberPropertyUpdateFunction('blendFactor', 2));
+        elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority'));
+        elShapeID.addEventListener('change', createEmitNumberPropertyUpdateFunction('shapeID'));
+
+        var materialBoundsChangeFunction = createEmitVec4PropertyUpdateFunction('materialBounds',
+            elMaterialBoundsX, elMaterialBoundsY, elMaterialBoundsZ, elMaterialBoundsW);
+        elMaterialBoundsX.addEventListener('change', materialBoundsChangeFunction);
+        elMaterialBoundsY.addEventListener('change', materialBoundsChangeFunction);
+        elMaterialBoundsZ.addEventListener('change', materialBoundsChangeFunction);
+        elMaterialBoundsW.addEventListener('change', materialBoundsChangeFunction);
+
         elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text'));
         elTextFaceCamera.addEventListener('change', createEmitCheckedPropertyUpdateFunction('faceCamera'));
         elTextLineHeight.addEventListener('change', createEmitNumberPropertyUpdateFunction('lineHeight'));
diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js
index 9d9689000e..d53766ab4e 100644
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@@ -77,18 +77,24 @@ EntityListTool = function(opts) {
             var properties = Entities.getEntityProperties(id);
 
             if (!filterInView || Vec3.distance(properties.position, cameraPosition) <= searchRadius) {
+                var url = "";
+                if (properties.type == "Model") {
+                    url = properties.modelURL;
+                } else if (properties.type == "Material") {
+                    url = properties.materialURL;
+                }
                 entities.push({
                     id: id,
                     name: properties.name,
                     type: properties.type,
-                    url: properties.type == "Model" ? properties.modelURL : "",
+                    url: url,
                     locked: properties.locked,
                     visible: properties.visible,
                     verticesCount: valueIfDefined(properties.renderInfo.verticesCount),
                     texturesCount: valueIfDefined(properties.renderInfo.texturesCount),
                     texturesSize: valueIfDefined(properties.renderInfo.texturesSize),
                     hasTransparent: valueIfDefined(properties.renderInfo.hasTransparent),
-                    isBaked: properties.type == "Model" ? properties.modelURL.toLowerCase().endsWith(".baked.fbx") : false, 
+                    isBaked: properties.type == "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
                     drawCalls: valueIfDefined(properties.renderInfo.drawCalls),
                     hasScript: properties.script !== ""
                 });

From ed4cbe267950232bfa77956f3c20333e3e1efdb4 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 2 Feb 2018 17:05:25 -0800
Subject: [PATCH 097/569] fix fill ring rotation

---
 scripts/system/libraries/entitySelectionTool.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index cdf3c9610b..27f464058f 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -2296,7 +2296,11 @@ SelectionDisplay = (function() {
 
                     // not sure why but this seems to be needed to fix an reverse rotation for yaw ring only
                     if (direction === ROTATE_DIRECTION.YAW) {
-                        Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
+                        if (spaceMode === SPACE_LOCAL) {
+                            Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
+                        } else {
+                            Overlays.editOverlay(handleRotateCurrentRing, { rotation: Quat.fromPitchYawRollDegrees(-90, 0, 0) });
+                        }
                     }
                 }
 

From ececd1c60f132b97348569e7ac37de794a85c072 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 2 Feb 2018 17:14:48 -0800
Subject: [PATCH 098/569] fix loop index change

---
 scripts/system/libraries/entitySelectionTool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 27f464058f..31df28c61b 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -182,7 +182,7 @@ SelectionManager = (function() {
             var brn = properties.boundingBox.brn;
             var tfl = properties.boundingBox.tfl;
 
-            for (var i = 0; i < that.selections.length; i++) {
+            for (var i = 1; i < that.selections.length; i++) {
                 properties = Entities.getEntityProperties(that.selections[i]);
                 var bb = properties.boundingBox;
                 brn.x = Math.min(bb.brn.x, brn.x);

From 71a8e96d5a209a6435c480748559b9f05f1ef543 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Fri, 2 Feb 2018 18:14:12 -0800
Subject: [PATCH 099/569] fix several CR requests

---
 libraries/entities/src/EntityEditFilters.cpp | 29 ++++++++++----------
 libraries/entities/src/EntityTree.cpp        |  3 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp
index 12bf1ac231..676b1ce518 100644
--- a/libraries/entities/src/EntityEditFilters.cpp
+++ b/libraries/entities/src/EntityEditFilters.cpp
@@ -41,8 +41,8 @@ QList<EntityItemID> EntityEditFilters::getZonesByPosition(glm::vec3& position) {
     return zones;
 }
 
-bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut, bool& wasChanged, 
-        EntityTree::FilterType filterType, EntityItemID& itemID, EntityItemPointer& existingEntity) {
+bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut,
+        bool& wasChanged, EntityTree::FilterType filterType, EntityItemID& itemID, EntityItemPointer& existingEntity) {
     
     // get the ids of all the zones (plus the global entity edit filter) that the position
     // lies within
@@ -115,6 +115,15 @@ bool EntityEditFilters::filter(glm::vec3& position, EntityItemProperties& proper
                             zoneValues.setProperty("boundingBox", boundingBox);
                         }
                     }
+
+                    // If this is an add or delete, or original properties weren't requested
+                    // there won't be original properties in the args, but zone properties need
+                    // to be the fourth parameter, so we need to pad the args accordingly
+                    int EXPECTED_ARGS = 3;
+                    if (args.length() < EXPECTED_ARGS) {
+                        args << QScriptValue();
+                    }
+                    assert(args.length() == EXPECTED_ARGS); // we MUST have 3 args by now!
                     args << zoneValues;
                 }
             }
@@ -308,17 +317,8 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                         EntityPropertyFlagsFromScriptValue(wantsOriginalPropertiesValue, filterData.includedOriginalProperties);
                     }
                 } else if (wantsOriginalPropertiesValue.isArray()) {
-                    auto length = wantsOriginalPropertiesValue.property("length").toInteger();
-                    for (int i = 0; i < length; i++) {
-                        auto stringValue = wantsOriginalPropertiesValue.property(i).toString();
-                        if (!stringValue.isEmpty()) {
-                            filterData.wantsOriginalProperties = true;
-                            break;
-                        }
-                    }
-                    if (filterData.wantsOriginalProperties) {
-                        EntityPropertyFlagsFromScriptValue(wantsOriginalPropertiesValue, filterData.includedOriginalProperties);
-                    }
+                    EntityPropertyFlagsFromScriptValue(wantsOriginalPropertiesValue, filterData.includedOriginalProperties);
+                    filterData.wantsOriginalProperties = !filterData.includedOriginalProperties.isEmpty();
                 }
 
                 // check to see if the filterFn has properties asking for Zone props
@@ -336,9 +336,10 @@ void EntityEditFilters::scriptRequestFinished(EntityItemID entityID) {
                     auto stringValue = wantsZonePropertiesValue.toString();
                     filterData.wantsZoneProperties = !stringValue.isEmpty();
                     if (filterData.wantsZoneProperties) {
-                        EntityPropertyFlagsFromScriptValue(wantsZonePropertiesValue, filterData.includedZoneProperties);
                         if (stringValue == "boundingBox") {
                             filterData.wantsZoneBoundingBox = true;
+                        } else {
+                            EntityPropertyFlagsFromScriptValue(wantsZonePropertiesValue, filterData.includedZoneProperties);
                         }
                     }
                 } else if (wantsZonePropertiesValue.isArray()) {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 4cc643bae6..d5dc6399f4 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1882,8 +1882,7 @@ bool EntityTree::shouldEraseEntity(EntityItemID entityID, const SharedNodePointe
         if (wantEditLogging() || wantTerseEditLogging()) {
             qCDebug(entities) << "User [" << sourceNode->getUUID() << "] deleting entity. ID:" << entityID;
         }
-    }
-    else if (wantEditLogging() || wantTerseEditLogging()) {
+    } else if (wantEditLogging() || wantTerseEditLogging()) {
         qCDebug(entities) << "User [" << sourceNode->getUUID() << "] attempted to deleteentity. ID:" << entityID << " Filter rejected erase.";
     }
 

From d842e532ee61e80b444e860ee851651dddeda741 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 14:02:30 +1300
Subject: [PATCH 100/569] Remove Window.customPrompt() from JavaScript API

---
 interface/src/Application.cpp                 |  1 -
 .../scripting/WindowScriptingInterface.cpp    | 22 -------------------
 .../src/scripting/WindowScriptingInterface.h  | 20 -----------------
 libraries/ui/src/OffscreenUi.cpp              | 17 --------------
 libraries/ui/src/OffscreenUi.h                |  2 --
 5 files changed, 62 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1a54c94d53..31c0b3555c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5857,7 +5857,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface);
 
     scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
-    qScriptRegisterMetaType(scriptEngine.data(), CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue);
     scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
                         LocationScriptingInterface::locationSetter, "Window");
     // register `location` on the global object.
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index d419d7484b..65873dc1dc 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -32,20 +32,6 @@ static const QString LAST_BROWSE_LOCATION_SETTING = "LastBrowseLocation";
 static const QString LAST_BROWSE_ASSETS_LOCATION_SETTING = "LastBrowseAssetsLocation";
 
 
-QScriptValue CustomPromptResultToScriptValue(QScriptEngine* engine, const CustomPromptResult& result) {
-    if (!result.value.isValid()) {
-        return QScriptValue::UndefinedValue;
-    }
-
-    Q_ASSERT(result.value.userType() == qMetaTypeId<QVariantMap>());
-    return engine->toScriptValue(result.value.toMap());
-}
-
-void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptResult& result) {
-    result.value = object.toVariant();
-}
-
-
 WindowScriptingInterface::WindowScriptingInterface() {
     const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
     connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);
@@ -140,14 +126,6 @@ void WindowScriptingInterface::disconnectedFromDomain() {
     emit domainChanged("");
 }
 
-CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) {
-    CustomPromptResult result;
-    bool ok = false;
-    auto configMap = config.toMap();
-    result.value = OffscreenUi::getCustomInfo(OffscreenUi::ICON_NONE, "", configMap, &ok);
-    return ok ? result : CustomPromptResult();
-}
-
 QString fixupPathForMac(const QString& directory) {
     // On OS X `directory` does not work as expected unless a file is included in the path, so we append a bogus
     // filename if the directory is valid.
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index dc71611c5b..d5f40b83c6 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -22,17 +22,6 @@
 
 #include <DependencyManager.h>
 
-class CustomPromptResult {
-public:
-    QVariant value;
-};
-
-Q_DECLARE_METATYPE(CustomPromptResult);
-
-QScriptValue CustomPromptResultToScriptValue(QScriptEngine* engine, const CustomPromptResult& result);
-void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptResult& result);
-
-
 /**jsdoc
  * The Window API provides various facilities not covered elsewhere: window dimensions, window focus, normal or entity camera
  * view, clipboard, announcements, user connections, common dialog boxes, snapshots, file import, domain changes, domain 
@@ -142,15 +131,6 @@ public slots:
      */
     void promptAsync(const QString& message = "", const QString& defaultText = "");
 
-    /**jsdoc
-     * Prompt the user for input in a custom, modal dialog.
-     * @deprecated This function is deprecated and will soon be removed.
-     * @function Window.customPrompt
-     * @param {object} config - Configures the modal dialog.
-     * @returns {object} The user's response.
-     */
-    CustomPromptResult customPrompt(const QVariant& config);
-
     /**jsdoc
      * Prompt the user to choose a directory. Displays a modal dialog that navigates the directory tree.
      * @function Window.browseDir
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 221f5013bf..f28e1954e4 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -384,19 +384,6 @@ QString OffscreenUi::getItem(const Icon icon, const QString& title, const QStrin
     return result.toString();
 }
 
-QVariant OffscreenUi::getCustomInfo(const Icon icon, const QString& title, const QVariantMap& config, bool* ok) {
-    if (ok) {
-        *ok = false;
-    }
-
-    QVariant result = DependencyManager::get<OffscreenUi>()->customInputDialog(icon, title, config);
-    if (ok && result.isValid()) {
-        *ok = true;
-    }
-
-    return result;
-}
-
 ModalDialogListener* OffscreenUi::getTextAsync(const Icon icon, const QString& title, const QString& label, const QString& text) {
     return DependencyManager::get<OffscreenUi>()->inputDialogAsync(icon, title, label, text);
 }
@@ -418,10 +405,6 @@ ModalDialogListener* OffscreenUi::getItemAsync(const Icon icon, const QString& t
     return inputDialogListener;
 }
 
-ModalDialogListener* OffscreenUi::getCustomInfoAsync(const Icon icon, const QString& title, const QVariantMap& config) {
-    return DependencyManager::get<OffscreenUi>()->customInputDialogAsync(icon, title, config);
-}
-
 QVariant OffscreenUi::inputDialog(const Icon icon, const QString& title, const QString& label, const QVariant& current) {
     if (QThread::currentThread() != thread()) {
         QVariant result;
diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h
index ab3a209820..8e10ebde08 100644
--- a/libraries/ui/src/OffscreenUi.h
+++ b/libraries/ui/src/OffscreenUi.h
@@ -231,10 +231,8 @@ public:
 
     static QString getText(const Icon icon, const QString & title, const QString & label, const QString & text = QString(), bool * ok = 0);
     static QString getItem(const Icon icon, const QString & title, const QString & label, const QStringList & items, int current = 0, bool editable = true, bool * ok = 0);
-    static QVariant getCustomInfo(const Icon icon, const QString& title, const QVariantMap& config, bool* ok = 0);
     static ModalDialogListener* getTextAsync(const Icon icon, const QString & title, const QString & label, const QString & text = QString());
     static ModalDialogListener* getItemAsync(const Icon icon, const QString & title, const QString & label, const QStringList & items, int current = 0, bool editable = true);
-    static ModalDialogListener* getCustomInfoAsync(const Icon icon, const QString& title, const QVariantMap& config);
 
     unsigned int getMenuUserDataId() const;
     QList<QObject *> &getModalDialogListeners();

From 8e2a3e8c99ff2bc1f36349db28d5d9a92d3dbfc7 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 14:15:48 +1300
Subject: [PATCH 101/569] Remove Overlays.getOverlayObject() from JavaScript
 API

---
 interface/src/ui/overlays/Overlays.cpp | 15 ---------------
 interface/src/ui/overlays/Overlays.h   |  9 ---------
 scripts/system/libraries/WebTablet.js  |  4 ----
 3 files changed, 28 deletions(-)

diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index 6898b5ed2b..35274e4fbe 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -388,21 +388,6 @@ QString Overlays::getOverlayType(OverlayID overlayId) {
     return "";
 }
 
-QObject* Overlays::getOverlayObject(OverlayID id) {
-    if (QThread::currentThread() != thread()) {
-        QObject* result;
-        PROFILE_RANGE(script, __FUNCTION__);
-        BLOCKING_INVOKE_METHOD(this, "getOverlayObject", Q_RETURN_ARG(QObject*, result), Q_ARG(OverlayID, id));
-        return result;
-    }
-
-    Overlay::Pointer thisOverlay = getOverlay(id);
-    if (thisOverlay) {
-        return qobject_cast<QObject*>(&(*thisOverlay));
-    }
-    return nullptr;
-}
-
 OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) {
     if (!_enabled) {
         return UNKNOWN_OVERLAY_ID;
diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
index 113ee92b80..2da375f6e4 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -227,15 +227,6 @@ public slots:
      */
     QString getOverlayType(OverlayID overlayId);
 
-    /**jsdoc
-     * Get the overlay script object.
-     * @function Overlays.getOverlayObject
-     * @deprecated This function is deprecated and will soon be removed.
-     * @param {Uuid} overlayID - The ID of the overlay to get the script object of.
-     * @returns {object} The script object for the overlay if found.
-     */
-    QObject* getOverlayObject(OverlayID id);
-
     /**jsdoc
      * Get the ID of the 2D overlay at a particular point on the screen or HUD.
      * @function Overlays.getOverlayAtPoint
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 05b4963280..2b7c0343e2 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -305,10 +305,6 @@ WebTablet.prototype.setScriptURL = function (scriptURL) {
     Overlays.editOverlay(this.webOverlayID, { scriptURL: scriptURL });
 };
 
-WebTablet.prototype.getOverlayObject = function () {
-    return Overlays.getOverlayObject(this.webOverlayID);
-};
-
 WebTablet.prototype.setWidth = function (width) {
     // imported from libraries/utils.js
     resizeTablet(width);

From dd5cc8677d5a86f0772170b407916ecd2a84db63 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 14:46:49 +1300
Subject: [PATCH 102/569] Remove Overlays.findRayIntersectionVector() from
 JavaScript API

---
 interface/src/ui/overlays/Overlays.h | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
index 2da375f6e4..3efe94c206 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -98,6 +98,11 @@ public:
     OverlayID addOverlay(Overlay* overlay) { return addOverlay(Overlay::Pointer(overlay)); }
     OverlayID addOverlay(const Overlay::Pointer& overlay);
 
+    RayToOverlayIntersectionResult findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
+        const QVector<OverlayID>& overlaysToInclude,
+        const QVector<OverlayID>& overlaysToDiscard,
+        bool visibleOnly = false, bool collidableOnly = false);
+
     bool mousePressEvent(QMouseEvent* event);
     bool mouseDoublePressEvent(QMouseEvent* event);
     bool mouseReleaseEvent(QMouseEvent* event);
@@ -347,28 +352,6 @@ public slots:
                                                        bool visibleOnly = false,
                                                        bool collidableOnly = false);
 
-    // TODO: Apart from the name, this function signature on JavaScript is identical to that of findRayIntersection() and should
-    // probably be removed from the JavaScript API so as not to cause confusion.
-    /**jsdoc
-     * Find the closest 3D overlay intersected by a {@link PickRay}.
-     * @function Overlays.findRayIntersectionVector
-     * @deprecated Use {@link Overlays.findRayIntersection} instead; it has identical parameters and results.
-     * @param {PickRay} pickRay - The PickRay to use for finding overlays.
-     * @param {boolean} [precisionPicking=false] - <em>Unused</em>; exists to match Entity API.
-     * @param {Array.<Uuid>} [overlayIDsToInclude=[]] - Whitelist for intersection test. If empty then the result isn't limited
-     *     to overlays in the list.
-     * @param {Array.<Uuid>} [overlayIDsToExclude=[]] - Blacklist for intersection test. If empty then the result doesn't
-     *     exclude overlays in the list.
-     * @param {boolean} [visibleOnly=false] - <em>Unused</em>; exists to match Entity API.
-     * @param {boolean} [collidableOnly=false] - <em>Unused</em>; exists to match Entity API.
-     * @returns {Overlays.RayToOverlayIntersectionResult} The closest 3D overlay intersected by <code>pickRay</code>, taking
-     *     into account <code>overlayIDsToInclude</code> and <code>overlayIDsToExclude</code> if they're not empty.
-     */
-    RayToOverlayIntersectionResult findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
-                                                             const QVector<OverlayID>& overlaysToInclude,
-                                                             const QVector<OverlayID>& overlaysToDiscard,
-                                                             bool visibleOnly = false, bool collidableOnly = false);
-
     /**jsdoc
      * Return a list of 3D overlays with bounding boxes that touch a search sphere.
      * @function Overlays.findOverlays

From 0c0734a255a181cc6c5ee1f1d62f972d894d01cf Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 14:54:14 +1300
Subject: [PATCH 103/569] Remove unused Overlays property, borderSize, and
 associated code

---
 interface/src/Application.cpp                       |  1 -
 interface/src/ui/overlays/Cube3DOverlay.cpp         | 13 -------------
 interface/src/ui/overlays/Cube3DOverlay.h           |  5 -----
 interface/src/ui/overlays/Shape3DOverlay.cpp        | 12 ------------
 interface/src/ui/overlays/Shape3DOverlay.h          |  5 -----
 scripts/developer/debugging/queryAACubeInspector.js |  1 -
 scripts/system/libraries/entitySelectionTool.js     | 12 ++++--------
 7 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 31c0b3555c..bc567c0452 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4717,7 +4717,6 @@ void Application::setKeyboardFocusHighlight(const glm::vec3& position, const glm
     if (_keyboardFocusHighlightID == UNKNOWN_OVERLAY_ID || !getOverlays().isAddedOverlay(_keyboardFocusHighlightID)) {
         _keyboardFocusHighlight = std::make_shared<Cube3DOverlay>();
         _keyboardFocusHighlight->setAlpha(1.0f);
-        _keyboardFocusHighlight->setBorderSize(1.0f);
         _keyboardFocusHighlight->setColor({ 0xFF, 0xEF, 0x00 });
         _keyboardFocusHighlight->setIsSolid(false);
         _keyboardFocusHighlight->setPulseMin(0.5);
diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp
index f13f782482..29c4f592f5 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@@ -125,13 +125,6 @@ Cube3DOverlay* Cube3DOverlay::createClone() const {
 
 void Cube3DOverlay::setProperties(const QVariantMap& properties) {
     Volume3DOverlay::setProperties(properties);
-
-    auto borderSize = properties["borderSize"];
-
-    if (borderSize.isValid()) {
-        float value = borderSize.toFloat();
-        setBorderSize(value);
-    }
 }
 
 /**jsdoc
@@ -177,14 +170,8 @@ void Cube3DOverlay::setProperties(const QVariantMap& properties) {
  *     <code>parentID</code> is an avatar skeleton. A value of <code>65535</code> means "no joint".
  *
  * @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
- *
- * @property {number} borderSize - Not used.
  */
 QVariant Cube3DOverlay::getProperty(const QString& property) {
-    if (property == "borderSize") {
-        return _borderSize;
-    }
-
     return Volume3DOverlay::getProperty(property);
 }
 
diff --git a/interface/src/ui/overlays/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h
index e7b58ad911..5d83cbb2c1 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.h
+++ b/interface/src/ui/overlays/Cube3DOverlay.h
@@ -29,10 +29,6 @@ public:
 
     virtual Cube3DOverlay* createClone() const override;
 
-    float getBorderSize() const { return _borderSize; }
-
-    void setBorderSize(float value) { _borderSize = value; }
-
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
@@ -40,7 +36,6 @@ protected:
     Transform evalRenderTransform() override;
 
 private:
-    float _borderSize;
     // edges on a cube
     std::array<int, 12> _geometryIds;
 };
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 97342a80ab..64acdcccdb 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -99,13 +99,6 @@ void Shape3DOverlay::setProperties(const QVariantMap& properties) {
             }
         }
     }
-
-    auto borderSize = properties["borderSize"];
-
-    if (borderSize.isValid()) {
-        float value = borderSize.toFloat();
-        setBorderSize(value);
-    }
 }
 
 /**jsdoc
@@ -153,13 +146,8 @@ void Shape3DOverlay::setProperties(const QVariantMap& properties) {
  * @property {Vec3} dimensions - The dimensions of the overlay. Synonyms: <code>scale</code>, <code>size</code>.
  *
  * @property {Shape} shape=Hexagon - The geometrical shape of the overlay.
- * @property {number} borderSize - Not used.
  */
 QVariant Shape3DOverlay::getProperty(const QString& property) {
-    if (property == "borderSize") {
-        return _borderSize;
-    }
-
     if (property == "shape") {
         return shapeStrings[_shape];
     }
diff --git a/interface/src/ui/overlays/Shape3DOverlay.h b/interface/src/ui/overlays/Shape3DOverlay.h
index 7fc95ec981..0196c707d7 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.h
+++ b/interface/src/ui/overlays/Shape3DOverlay.h
@@ -30,10 +30,6 @@ public:
 
     virtual Shape3DOverlay* createClone() const override;
 
-    float getBorderSize() const { return _borderSize; }
-
-    void setBorderSize(float value) { _borderSize = value; }
-
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
@@ -41,7 +37,6 @@ protected:
     Transform evalRenderTransform() override;
 
 private:
-    float _borderSize;
     GeometryCache::Shape _shape { GeometryCache::Hexagon };
 };
 
diff --git a/scripts/developer/debugging/queryAACubeInspector.js b/scripts/developer/debugging/queryAACubeInspector.js
index 2d585ffce4..d8a87c3cf5 100644
--- a/scripts/developer/debugging/queryAACubeInspector.js
+++ b/scripts/developer/debugging/queryAACubeInspector.js
@@ -40,7 +40,6 @@ function updateOverlay(entityID, queryAACube) {
                 blue: 255
             },
             alpha: 1,
-            // borderSize: ...,
             solid: false
         });
     }
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index b8ba146757..4133447f97 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -339,8 +339,7 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        drawInFront: true
     };
 
     var grabberPropertiesEdge = {
@@ -351,8 +350,7 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        drawInFront: true
     };
 
     var grabberPropertiesFace = {
@@ -363,8 +361,7 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        drawInFront: true
     };
 
     var grabberPropertiesCloner = {
@@ -375,8 +372,7 @@ SelectionDisplay = (function() {
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        drawInFront: true,
-        borderSize: 1.4
+        drawInFront: true
     };
 
     var spotLightLineProperties = {

From 42498314f1d783727707a0a8b9b3c54f31580371 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 14:59:06 +1300
Subject: [PATCH 104/569] Remove further unused variable noticed in passing

---
 interface/src/ui/ApplicationOverlay.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/src/ui/ApplicationOverlay.h b/interface/src/ui/ApplicationOverlay.h
index b36b4f02df..23055cf246 100644
--- a/interface/src/ui/ApplicationOverlay.h
+++ b/interface/src/ui/ApplicationOverlay.h
@@ -42,8 +42,6 @@ private:
     int _domainStatusBorder;
     int _magnifierBorder;
 
-    ivec2 _previousBorderSize{ -1 };
-
     gpu::TexturePointer _uiTexture;
     gpu::TexturePointer _overlayDepthTexture;
     gpu::TexturePointer _overlayColorTexture;

From efddec621f4f98581227285529fec80ebfb986f2 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 15:16:20 +1300
Subject: [PATCH 105/569] Remove Menu.addActionGroup() and removeActionGroup()
 from JavaScript API

---
 interface/src/Menu.cpp                         |  1 +
 .../src/scripting/MenuScriptingInterface.cpp   | 16 ----------------
 .../src/scripting/MenuScriptingInterface.h     |  7 -------
 libraries/ui/src/ui/Menu.cpp                   | 18 ------------------
 libraries/ui/src/ui/Menu.h                     |  3 ---
 5 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index f3d8ea2344..464de87fdb 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -210,6 +210,7 @@ Menu::Menu() {
     auto avatarEntitiesBookmarks = DependencyManager::get<AvatarEntitiesBookmarks>();
     avatarEntitiesBookmarks->setupMenus(this, avatarMenu);
 
+
     // Display menu ----------------------------------
     // FIXME - this is not yet matching Alan's spec because it doesn't have
     // menus for "2D"/"3D" - we need to add support for detecting the appropriate
diff --git a/interface/src/scripting/MenuScriptingInterface.cpp b/interface/src/scripting/MenuScriptingInterface.cpp
index d9372978e8..551cb36e65 100644
--- a/interface/src/scripting/MenuScriptingInterface.cpp
+++ b/interface/src/scripting/MenuScriptingInterface.cpp
@@ -94,22 +94,6 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString&
     return result;
 }
 
-void MenuScriptingInterface::addActionGroup(const QString& groupName, const QStringList& actionList,
-                                            const QString& selected) {
-    static const char* slot = SLOT(menuItemTriggered());
-    QMetaObject::invokeMethod(Menu::getInstance(), "addActionGroup",
-                              Q_ARG(const QString&, groupName),
-                              Q_ARG(const QStringList&, actionList),
-                              Q_ARG(const QString&, selected),
-                              Q_ARG(QObject*, this),
-                              Q_ARG(const char*, slot));
-}
-
-void MenuScriptingInterface::removeActionGroup(const QString& groupName) {
-    QMetaObject::invokeMethod(Menu::getInstance(), "removeActionGroup",
-                              Q_ARG(const QString&, groupName));
-}
-
 bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) {
     if (QThread::currentThread() == qApp->thread()) {
         return Menu::getInstance()->isOptionChecked(menuOption);
diff --git a/interface/src/scripting/MenuScriptingInterface.h b/interface/src/scripting/MenuScriptingInterface.h
index 59cfc76d21..b4f6178d33 100644
--- a/interface/src/scripting/MenuScriptingInterface.h
+++ b/interface/src/scripting/MenuScriptingInterface.h
@@ -163,13 +163,6 @@ public slots:
      */
     bool menuItemExists(const QString& menuName, const QString& menuitem);
 
-    /**
-     * TODO: Not working; don't document until fixed.
-     */
-    void addActionGroup(const QString& groupName, const QStringList& actionList,
-                        const QString& selected = QString());
-    void removeActionGroup(const QString& groupName);
-
     /**jsdoc
      * Check whether a checkable menu item is checked.
      * @function Menu.isOptionChecked
diff --git a/libraries/ui/src/ui/Menu.cpp b/libraries/ui/src/ui/Menu.cpp
index 4e61eba28f..577e2564a7 100644
--- a/libraries/ui/src/ui/Menu.cpp
+++ b/libraries/ui/src/ui/Menu.cpp
@@ -539,24 +539,6 @@ void Menu::setGroupingIsVisible(const QString& grouping, bool isVisible) {
     QMenuBar::repaint();
 }
 
-void Menu::addActionGroup(const QString& groupName, const QStringList& actionList, const QString& selected, QObject* receiver, const char* slot) {
-    auto menu = addMenu(groupName);
-
-    QActionGroup* actionGroup = new QActionGroup(menu);
-    actionGroup->setExclusive(true);
-
-    for (auto action : actionList) {
-        auto item = addCheckableActionToQMenuAndActionHash(menu, action, 0, action == selected, receiver, slot);
-        actionGroup->addAction(item);
-    }
-
-    QMenuBar::repaint();
-}
-
-void Menu::removeActionGroup(const QString& groupName) {
-    removeMenu(groupName);
-}
-
 MenuWrapper::MenuWrapper(ui::Menu& rootMenu, QMenu* menu) : _rootMenu(rootMenu), _realMenu(menu) {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     offscreenUi->addMenuInitializer([=](VrMenu* vrMenu) {
diff --git a/libraries/ui/src/ui/Menu.h b/libraries/ui/src/ui/Menu.h
index 25f8f74063..4ca69b44e6 100644
--- a/libraries/ui/src/ui/Menu.h
+++ b/libraries/ui/src/ui/Menu.h
@@ -110,9 +110,6 @@ public slots:
     void removeSeparator(const QString& menuName, const QString& separatorName);
     void removeMenuItem(const QString& menuName, const QString& menuitem);
     bool menuItemExists(const QString& menuName, const QString& menuitem);
-    void addActionGroup(const QString& groupName, const QStringList& actionList, const QString& selected = QString(), 
-        QObject* receiver = nullptr, const char* slot = nullptr);
-    void removeActionGroup(const QString& groupName);
     bool isOptionChecked(const QString& menuOption) const;
     void setIsOptionChecked(const QString& menuOption, bool isChecked);
 

From 615e54620b3a0e8da9160a37b956ff012b5943d2 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 4 Feb 2018 15:38:33 +1300
Subject: [PATCH 106/569] Remove Menu.isInfoViewVisible() and closeInfoView()
 from JavaScript API

---
 .../src/scripting/MenuScriptingInterface.cpp     | 16 ----------------
 interface/src/scripting/MenuScriptingInterface.h |  6 ------
 libraries/ui/src/ui/Menu.cpp                     | 10 ----------
 libraries/ui/src/ui/Menu.h                       |  3 ---
 scripts/system/help.js                           | 10 ----------
 5 files changed, 45 deletions(-)

diff --git a/interface/src/scripting/MenuScriptingInterface.cpp b/interface/src/scripting/MenuScriptingInterface.cpp
index 551cb36e65..d6dc2fa703 100644
--- a/interface/src/scripting/MenuScriptingInterface.cpp
+++ b/interface/src/scripting/MenuScriptingInterface.cpp
@@ -131,19 +131,3 @@ void MenuScriptingInterface::setMenuEnabled(const QString& menuOption, bool isCh
 void MenuScriptingInterface::triggerOption(const QString& menuOption) {
     QMetaObject::invokeMethod(Menu::getInstance(), "triggerOption", Q_ARG(const QString&, menuOption));    
 }
-
-void MenuScriptingInterface::closeInfoView(const QString& path) {
-    QMetaObject::invokeMethod(Menu::getInstance(), "closeInfoView", Q_ARG(const QString&, path));
-}
-
-bool MenuScriptingInterface::isInfoViewVisible(const QString& path) {
-    if (QThread::currentThread() == qApp->thread()) {
-        return Menu::getInstance()->isInfoViewVisible(path);
-    }
-        
-    bool result;
-    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isInfoViewVisible",
-        Q_RETURN_ARG(bool, result), Q_ARG(const QString&, path));
-    return result;
-}
-
diff --git a/interface/src/scripting/MenuScriptingInterface.h b/interface/src/scripting/MenuScriptingInterface.h
index b4f6178d33..649c444eaf 100644
--- a/interface/src/scripting/MenuScriptingInterface.h
+++ b/interface/src/scripting/MenuScriptingInterface.h
@@ -215,12 +215,6 @@ public slots:
      */
     void setMenuEnabled(const QString& menuName, bool isEnabled);
 
-    /**
-    * TODO: Not used or useful; will not document until used.
-    */
-    void closeInfoView(const QString& path);
-    bool isInfoViewVisible(const QString& path);
-
 signals:
     /**jsdoc
      * Triggered when a menu item is clicked (or triggered by {@link Menu.triggerOption}).
diff --git a/libraries/ui/src/ui/Menu.cpp b/libraries/ui/src/ui/Menu.cpp
index 577e2564a7..d4566dc151 100644
--- a/libraries/ui/src/ui/Menu.cpp
+++ b/libraries/ui/src/ui/Menu.cpp
@@ -268,16 +268,6 @@ bool Menu::isOptionChecked(const QString& menuOption) const {
     return false;
 }
 
-void Menu::closeInfoView(const QString& path) {
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->hide(path);
-}
-
-bool Menu::isInfoViewVisible(const QString& path) {
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    return offscreenUi->isVisible(path);
-}
-
 void Menu::triggerOption(const QString& menuOption) {
     QAction* action = _actionHash.value(menuOption);
     if (action) {
diff --git a/libraries/ui/src/ui/Menu.h b/libraries/ui/src/ui/Menu.h
index 4ca69b44e6..2977a5330a 100644
--- a/libraries/ui/src/ui/Menu.h
+++ b/libraries/ui/src/ui/Menu.h
@@ -122,9 +122,6 @@ public slots:
     void toggleDeveloperMenus();
     void toggleAdvancedMenus();
 
-    bool isInfoViewVisible(const QString& path);
-    void closeInfoView(const QString& path);
-    
     void triggerOption(const QString& menuOption);
 
     static bool isSomeSubmenuShown() { return _isSomeSubmenuShown; }
diff --git a/scripts/system/help.js b/scripts/system/help.js
index 9ab7fa3fb3..494b0a2cdb 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -47,22 +47,12 @@
     button.clicked.connect(onClicked);
     tablet.screenChanged.connect(onScreenChanged);
 
-    var POLL_RATE = 500;
-    var interval = Script.setInterval(function () {
-        var visible = Menu.isInfoViewVisible('InfoView_html/help.html');
-        if (visible !== enabled) {
-            enabled = visible;
-            button.editProperties({isActive: enabled});
-        }
-    }, POLL_RATE);
-
     Script.scriptEnding.connect(function () {
         if (onHelpScreen) {
             tablet.gotoHomeScreen();
         }
         button.clicked.disconnect(onClicked);
         tablet.screenChanged.disconnect(onScreenChanged);
-        Script.clearInterval(interval);
         if (tablet) {
             tablet.removeButton(button);
         }

From 22b33c7391a76afdb4dcef188404c0b7c56ee6a0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 5 Feb 2018 11:22:40 +1300
Subject: [PATCH 107/569] Update Overlays circle3d JSDoc per recent code
 changes

---
 interface/src/ui/overlays/Circle3DOverlay.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 5e38f28a06..33f40f7c63 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -425,10 +425,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
  *     <em>Write-only.</em>
  * @property {Color} outerColor - Sets the values of <code>outerStartColor</code> and <code>outerEndColor</code>.
  *     <em>Write-only.</em>
- * @property {Color} innerStartcolor - The color at the inner start point of the overlay. <em>Write-only.</em>
- * @property {Color} innerEndColor - The color at the inner end point of the overlay. <em>Write-only.</em>
- * @property {Color} outerStartColor - The color at the outer start point of the overlay. <em>Write-only.</em>
- * @property {Color} outerEndColor - The color at the outer end point of the overlay. <em>Write-only.</em>
+ * @property {Color} innerStartcolor - The color at the inner start point of the overlay.
+ * @property {Color} innerEndColor - The color at the inner end point of the overlay.
+ * @property {Color} outerStartColor - The color at the outer start point of the overlay.
+ * @property {Color} outerEndColor - The color at the outer end point of the overlay.
  * @property {number} alpha=0.5 - The opacity of the overlay, <code>0.0</code> - <code>1.0</code>. Setting this value also sets
  *     the values of <code>innerStartAlpha</code>, <code>innerEndAlpha</code>, <code>outerStartAlpha</code>, and 
  *     <code>outerEndAlpha</code>. Synonym: <code>Alpha</code>; <em>write-only</em>.
@@ -440,10 +440,10 @@ void Circle3DOverlay::setProperties(const QVariantMap& properties) {
  *     <em>Write-only.</em>
  * @property {number} outerAlpha - Sets the values of <code>outerStartAlpha</code> and <code>outerEndAlpha</code>.
  *     <em>Write-only.</em>
- * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay. <em>Write-only.</em>
- * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay. <em>Write-only.</em>
- * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay. <em>Write-only.</em>
- * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay. <em>Write-only.</em>
+ * @property {number} innerStartAlpha=0 - The alpha at the inner start point of the overlay.
+ * @property {number} innerEndAlpha=0 - The alpha at the inner end point of the overlay.
+ * @property {number} outerStartAlpha=0 - The alpha at the outer start point of the overlay.
+ * @property {number} outerEndAlpha=0 - The alpha at the outer end point of the overlay.
 
  * @property {boolean} hasTickMarks=false - If <code>true</code>, tick marks are drawn.
  * @property {number} majorTickMarksAngle=0 - The angle between major tick marks, in degrees.

From 445ffbd82f27590c6035af1407be3b3d7ce3539a Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Mon, 5 Feb 2018 16:35:55 +0100
Subject: [PATCH 108/569] Added tag bits to shadow octree query

---
 libraries/render-utils/src/RenderShadowTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index e6bbc06510..33887675ab 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -218,7 +218,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered();
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();

From 2896c32bda0058aa2f242d604525ba05e5c6c6ec Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Mon, 5 Feb 2018 17:49:31 +0100
Subject: [PATCH 109/569] Switched debug fade script to app but still working
 on broken layout

---
 .../developer/utilities/render/debugFade.js   |  83 +++-
 scripts/developer/utilities/render/fade.qml   | 438 +++++++++---------
 2 files changed, 293 insertions(+), 228 deletions(-)

diff --git a/scripts/developer/utilities/render/debugFade.js b/scripts/developer/utilities/render/debugFade.js
index b01c4b5e1f..d20d5a70cf 100644
--- a/scripts/developer/utilities/render/debugFade.js
+++ b/scripts/developer/utilities/render/debugFade.js
@@ -1,3 +1,5 @@
+"use strict";
+
 //
 //  debugFade.js
 //  developer/utilities/render
@@ -9,13 +11,74 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// Set up the qml ui
-var qml = Script.resolvePath('fade.qml');
-var window = new OverlayWindow({
-    title: 'Fade',
-    source: qml,
-    width: 910, 
-    height: 610,
-});
-window.setPosition(50, 50);
-window.closed.connect(function() { Script.stop(); });
+(function() {
+    var TABLET_BUTTON_NAME = "Fade";
+    var QMLAPP_URL = Script.resolvePath("./fade.qml");
+    var ICON_URL = Script.resolvePath("../../../system/assets/images/fade-i.svg");
+    var ACTIVE_ICON_URL = Script.resolvePath("../../../system/assets/images/fade-a.svg");
+
+   
+    var onScreen = false;
+
+    function onClicked() {
+        if (onScreen) {
+            tablet.gotoHomeScreen();
+        } else {
+            tablet.loadQMLSource(QMLAPP_URL);
+        }
+    }
+
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    var button = tablet.addButton({
+        text: TABLET_BUTTON_NAME,
+        icon: ICON_URL,
+        activeIcon: ACTIVE_ICON_URL
+    });
+
+    var hasEventBridge = false;
+
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
+    }
+
+    function onScreenChanged(type, url) {
+        if (url === QMLAPP_URL) {
+            onScreen = true;
+        } else { 
+            onScreen = false;
+        }
+        
+        button.editProperties({isActive: onScreen});
+        wireEventBridge(onScreen);
+    }
+
+    function fromQml(message) {
+    }
+        
+    button.clicked.connect(onClicked);
+    tablet.screenChanged.connect(onScreenChanged);
+
+    Script.scriptEnding.connect(function () {
+        if (onScreen) {
+            tablet.gotoHomeScreen();
+        }
+        button.clicked.disconnect(onClicked);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        tablet.removeButton(button);
+    });
+
+}()); 
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/fade.qml b/scripts/developer/utilities/render/fade.qml
index 1dffd0fbbb..48e2cf6856 100644
--- a/scripts/developer/utilities/render/fade.qml
+++ b/scripts/developer/utilities/render/fade.qml
@@ -8,169 +8,176 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
 //
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
-import "configSlider"
+import QtQuick.Layouts 1.3
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+import  "configSlider"
 import "../lib/plotperf"
 
-Column {
+Rectangle {
+    HifiConstants { id: hifi;}
     id: root
+    anchors.margins: hifi.dimensions.contentMargin.x
+    
+    color: hifi.colors.baseGray;
+
     property var config: Render.getConfig("RenderMainView.Fade");
     property var configEdit: Render.getConfig("RenderMainView.FadeEdit");
-    spacing: 8
 
-    Row {
-        spacing: 8
+    Column {
+        spacing: 5
+        anchors.left: parent.left
+        anchors.right: parent.right       
+        anchors.margins: hifi.dimensions.contentMargin.x  
+        HifiControls.Label {
+            text: "Fade"       
+        }
 
-        CheckBox {
-            text: "Edit Fade"
-            checked: root.configEdit["editFade"]
-            onCheckedChanged: {
-                root.configEdit["editFade"] = checked;
-                Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = checked;
+        Row {
+            anchors.left: parent.left
+            anchors.right: parent.right 
+            spacing: 20
+
+            HifiControls.CheckBox {
+                boxSize: 20
+                text: "Edit"
+                checked: root.configEdit["editFade"]
+                onCheckedChanged: {
+                    root.configEdit["editFade"] = checked;
+                    Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = checked;
+                }
+            }
+            HifiControls.ComboBox {
+                id: categoryBox
+                width: 260
+                model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]
+                Timer {
+                    id: postpone
+                    interval: 100; running: false; repeat: false
+                    onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
+                }
+                onCurrentIndexChanged: {
+                    root.config["editedCategory"] = currentIndex;
+                    // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
+                    // by setting the loader source to Null and then recreate it 100ms later
+                    paramWidgetLoader.sourceComponent = undefined;
+                    postpone.interval = 100
+                    postpone.start()
+                }
+            }
+            HifiControls.CheckBox {
+                boxSize: 20
+                text: "Manual"
+                checked: root.config["manualFade"]
+                onCheckedChanged: {
+                    root.config["manualFade"] = checked;
+                }
             }
         }
-        ComboBox {
-            id: categoryBox
-            width: 400
-            model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]
-            Timer {
-                id: postpone
-                interval: 100; running: false; repeat: false
-                onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
-            }
-            onCurrentIndexChanged: {
-                root.config["editedCategory"] = currentIndex;
-                // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
-                // by setting the loader source to Null and then recreate it 100ms later
-                paramWidgetLoader.sourceComponent = undefined;
-                postpone.interval = 100
-                postpone.start()
-            }
-        }
-    }
-    Row {
-        spacing: 8
 
-        CheckBox {
-            text: "Manual"
-            checked: root.config["manualFade"]
-            onCheckedChanged: {
-                root.config["manualFade"] = checked;
-            }
-        }
         ConfigSlider {
+            height: 35
             label: "Threshold"
             integral: false
             config: root.config
             property: "manualThreshold"
             max: 1.0
             min: 0.0
-            width: 400
+            anchors.left: parent.left
+            anchors.right: parent.right
         }
-    }
-
-    Action {
-        id: saveAction
-        text: "Save"
-        onTriggered: {
-            root.config.save()
-        }
-    }
-    Action {
-        id: loadAction
-        text: "Load"
-        onTriggered: {
-            root.config.load()
-            // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
-            // by setting the loader source to Null and then recreate it 500ms later
-            paramWidgetLoader.sourceComponent = undefined;
-            postpone.interval = 500
-            postpone.start()
-        }
-    }
-
-    Component {
-        id: paramWidgets
-
-        Column {
-            spacing: 8
-
-            CheckBox {
-                text: "Invert"
-                checked: root.config["isInverted"]
-                onCheckedChanged: { root.config["isInverted"] = checked }
+        
+        Action {
+            id: saveAction
+            text: "Save"
+            onTriggered: {
+                root.config.save()
             }
-            Row {
-                spacing: 8
+        }
+        Action {
+            id: loadAction
+            text: "Load"
+            onTriggered: {
+                root.config.load()
+                // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
+                // by setting the loader source to Null and then recreate it 500ms later
+                paramWidgetLoader.sourceComponent = undefined;
+                postpone.interval = 500
+                postpone.start()
+            }
+        }
 
+              
+        Component {
+            id: paramWidgets
+
+            Column {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                spacing: 10
+
+                HifiControls.CheckBox {
+                    text: "Invert"
+                    checked: root.config["isInverted"]
+                    onCheckedChanged: { root.config["isInverted"] = checked }
+                }
                 GroupBox {
                     title: "Base Gradient"
-                    width: 450
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+
                     Column {
                         spacing: 8
+                        anchors.left: parent.left
+                        anchors.right: parent.right
 
-                        ConfigSlider {
-                            label: "Size X"
-                            integral: false
-                            config: root.config
-                            property: "baseSizeX"
-                            max: 1.0
-                            min: 0.0
-                            width: 400
-                        }
-                        ConfigSlider {
-                            label: "Size Y"
-                            integral: false
-                            config: root.config
-                            property: "baseSizeY"
-                            max: 1.0
-                            min: 0.0
-                            width: 400
-                        }
-                        ConfigSlider {
-                            label: "Size Z"
-                            integral: false
-                            config: root.config
-                            property: "baseSizeZ"
-                            max: 1.0
-                            min: 0.0
-                            width: 400
-                        }
-                        ConfigSlider {
-                            label: "Level"
-                            integral: false
-                            config: root.config
-                            property: "baseLevel"
-                            max: 1.0
-                            min: 0.0
-                            width: 400
+                        Repeater {
+                            model: [
+                            "Size X:baseSizeX", 
+                            "Size Y:baseSizeY", 
+                            "Size Z:baseSizeZ",
+                            "Level:baseLevel" ]                  
+
+                            ConfigSlider {
+                                height: 35
+                                label:  modelData.split(":")[0]
+                                integral: false
+                                config: root.config
+                                property:  modelData.split(":")[1]
+                                max: 1.0
+                                min: 0.0
+                            }
                         }
                     }
                 }
                 GroupBox {
                     title: "Noise Gradient"
-                    width: 450
+                    
                     Column {
                         spacing: 8
+                        anchors.left: parent.left
+                        anchors.right: parent.right
 
                         ConfigSlider {
+                            height: 35
                             label: "Size X"
                             integral: false
                             config: root.config
                             property: "noiseSizeX"
                             max: 1.0
                             min: 0.0
-                            width: 400
                         }
                         ConfigSlider {
+                            height: 35
                             label: "Size Y"
                             integral: false
                             config: root.config
                             property: "noiseSizeY"
                             max: 1.0
                             min: 0.0
-                            width: 400
                         }
                         ConfigSlider {
                             label: "Size Z"
@@ -179,7 +186,6 @@ Column {
                             property: "noiseSizeZ"
                             max: 1.0
                             min: 0.0
-                            width: 400
                         }
                         ConfigSlider {
                             label: "Level"
@@ -188,19 +194,15 @@ Column {
                             property: "noiseLevel"
                             max: 1.0
                             min: 0.0
-                            width: 400
                         }
                     }
                 }
-            }
-            Row {
-                spacing: 8
-
                 GroupBox {
                     title: "Edge"
-                    width: 450
+
                     Column {
-                        spacing: 8
+                        anchors.left: parent.left
+                        anchors.right: parent.right
 
                         ConfigSlider {
                             label: "Width"
@@ -209,12 +211,13 @@ Column {
                             property: "edgeWidth"
                             max: 1.0
                             min: 0.0
-                            width: 400
                         }
                         GroupBox {
                             title: "Inner color"
                             Column {
-                                spacing: 8
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+
                                 ConfigSlider {
                                     label: "Color R"
                                     integral: false
@@ -222,7 +225,6 @@ Column {
                                     property: "edgeInnerColorR"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color G"
@@ -231,7 +233,6 @@ Column {
                                     property: "edgeInnerColorG"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color B"
@@ -240,7 +241,6 @@ Column {
                                     property: "edgeInnerColorB"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color intensity"
@@ -249,14 +249,15 @@ Column {
                                     property: "edgeInnerIntensity"
                                     max: 5.0
                                     min: 0.0
-                                    width: 400
                                 }
                             }
                         }
                         GroupBox {
                             title: "Outer color"
                             Column {
-                                spacing: 8
+                                anchors.left: parent.left
+                                anchors.right: parent.right 
+
                                 ConfigSlider {
                                     label: "Color R"
                                     integral: false
@@ -264,7 +265,6 @@ Column {
                                     property: "edgeOuterColorR"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color G"
@@ -273,7 +273,6 @@ Column {
                                     property: "edgeOuterColorG"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color B"
@@ -282,7 +281,6 @@ Column {
                                     property: "edgeOuterColorB"
                                     max: 1.0
                                     min: 0.0
-                                    width: 400
                                 }
                                 ConfigSlider {
                                     label: "Color intensity"
@@ -291,107 +289,111 @@ Column {
                                     property: "edgeOuterIntensity"
                                     max: 5.0
                                     min: 0.0
-                                    width: 400
                                 }
                             }
                         }
                     }
                 }
 
-                Column {
-                    GroupBox {
-                        title: "Timing"
-                        width: 450
-                        Column {
-                            spacing: 8
+                GroupBox {
+                    title: "Timing"
 
-                            ConfigSlider {
-                                label: "Duration"
-                                integral: false
-                                config: root.config
-                                property: "duration"
-                                max: 10.0
-                                min: 0.1
-                                width: 400
+                    Column {
+                        anchors.left: parent.left
+                        anchors.right: parent.right 
+
+                        ConfigSlider {
+                            label: "Duration"
+                            integral: false
+                            config: root.config
+                            property: "duration"
+                            max: 10.0
+                            min: 0.1
+                        }
+                        HifiControls.ComboBox {
+                            width: 200
+                            model: ["Linear", "Ease In", "Ease Out", "Ease In / Out"]
+                            currentIndex: root.config["timing"]
+                            onCurrentIndexChanged: {
+                                root.config["timing"] = currentIndex;
                             }
-                            ComboBox {
-                                width: 400
-                                model: ["Linear", "Ease In", "Ease Out", "Ease In / Out"]
-                                currentIndex: root.config["timing"]
-                                onCurrentIndexChanged: {
-                                    root.config["timing"] = currentIndex;
+                        }
+                        GroupBox {
+                            title: "Noise Animation"
+                            Column {
+                                anchors.left: parent.left
+                                anchors.right: parent.right 
+
+                                ConfigSlider {
+                                    label: "Speed X"
+                                    integral: false
+                                    config: root.config
+                                    property: "noiseSpeedX"
+                                    max: 1.0
+                                    min: -1.0
+                                }
+                                ConfigSlider {
+                                    label: "Speed Y"
+                                    integral: false
+                                    config: root.config
+                                    property: "noiseSpeedY"
+                                    max: 1.0
+                                    min: -1.0
+                                }
+                                ConfigSlider {
+                                    label: "Speed Z"
+                                    integral: false
+                                    config: root.config
+                                    property: "noiseSpeedZ"
+                                    max: 1.0
+                                    min: -1.0
                                 }
                             }
-                            GroupBox {
-                                title: "Noise Animation"
-                                Column {
-                                    spacing: 8
-                                    ConfigSlider {
-                                        label: "Speed X"
-                                        integral: false
-                                        config: root.config
-                                        property: "noiseSpeedX"
-                                        max: 1.0
-                                        min: -1.0
-                                        width: 400
-                                    }
-                                    ConfigSlider {
-                                        label: "Speed Y"
-                                        integral: false
-                                        config: root.config
-                                        property: "noiseSpeedY"
-                                        max: 1.0
-                                        min: -1.0
-                                        width: 400
-                                    }
-                                    ConfigSlider {
-                                        label: "Speed Z"
-                                        integral: false
-                                        config: root.config
-                                        property: "noiseSpeedZ"
-                                        max: 1.0
-                                        min: -1.0
-                                        width: 400
-                                    }
+                        }
+
+                        PlotPerf {
+                            title: "Threshold"
+                            height: parent.evalEvenHeight()
+                            object:  config
+                            valueUnit: "%"
+                            valueScale: 0.01
+                            valueNumDigits: "1"
+                            plots: [
+                                {
+                                    prop: "threshold",
+                                    label: "Threshold",
+                                    color: "#FFBB77"
                                 }
-                            }
-
-                            PlotPerf {
-                                title: "Threshold"
-                                height: parent.evalEvenHeight()
-                                object:  config
-                                valueUnit: "%"
-                                valueScale: 0.01
-                                valueNumDigits: "1"
-                                plots: [
-                                    {
-                                        prop: "threshold",
-                                        label: "Threshold",
-                                        color: "#FFBB77"
-                                    }
-                                ]
-                            }
-
+                            ]
                         }
+
                     }
-
-                    Row {
-                        spacing: 8
-                        Button {
-                            action: saveAction
-                        }
-                        Button {
-                            action: loadAction
-                        }
-                    }
-
                 }
+
             }
         }
-    }
 
-    Loader {
-        id: paramWidgetLoader
-        sourceComponent: paramWidgets
+
+
+
+        Loader {
+            id: paramWidgetLoader
+            sourceComponent: paramWidgets
+        }
+
+        Row {
+            anchors.left: parent.left
+            anchors.right: parent.right 
+
+            Button {
+                action: saveAction
+            }
+            Button {
+                action: loadAction
+            }
+        }
+
+
+        
     }
-}
+}
\ No newline at end of file

From e3f9cce6e6a3548c917f909b473f3bbb9bcfe105 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 6 Feb 2018 12:14:33 +1300
Subject: [PATCH 110/569] Fix Record app dialog not always opening successfully

---
 .../marketplace/record/html/js/record.js          | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/unpublishedScripts/marketplace/record/html/js/record.js b/unpublishedScripts/marketplace/record/html/js/record.js
index aae4d1c89a..39278e9d7e 100644
--- a/unpublishedScripts/marketplace/record/html/js/record.js
+++ b/unpublishedScripts/marketplace/record/html/js/record.js
@@ -252,16 +252,17 @@ function onFinishOnOpenClicked() {
 }
 
 function signalBodyLoaded() {
-    EventBridge.emitWebEvent(JSON.stringify({
-        type: EVENT_BRIDGE_TYPE,
-        action: BODY_LOADED_ACTION
-    }));
+    var EVENTBRIDGE_OPEN_DELAY = 500; // Delay required to ensure EventBridge is ready for use.
+    setTimeout(function () {
+        EventBridge.scriptEventReceived.connect(onScriptEventReceived);
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: EVENT_BRIDGE_TYPE,
+            action: BODY_LOADED_ACTION
+        }));
+    }, EVENTBRIDGE_OPEN_DELAY);
 }
 
 function onBodyLoaded() {
-
-    EventBridge.scriptEventReceived.connect(onScriptEventReceived);
-
     elRecordings = document.getElementById("recordings");
 
     elRecordingsTable = document.getElementById("recordings-table");

From f611990b10538a0fd778be485ec9e30792efa4e2 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Mon, 5 Feb 2018 12:00:54 -0800
Subject: [PATCH 111/569] Fix overlimit shader char strings

---
 libraries/render-utils/src/DeferredLightingEffect.cpp | 10 +++++-----
 tests/shaders/src/main.cpp                            |  2 +-
 tools/scribe/src/main.cpp                             |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index d0d9708c04..7aefb9c13c 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -83,7 +83,7 @@ enum DeferredShader_BufferSlot {
     LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,
 };
 
-static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
+static void loadLightProgram(const std::string& vertSource, const std::string& fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
 
 void DeferredLightingEffect::init() {
     _directionalAmbientSphereLightLocations = std::make_shared<LightLocations>();
@@ -171,9 +171,9 @@ void DeferredLightingEffect::unsetLocalLightsBatch(gpu::Batch& batch, int cluste
     }
 }
 
-static gpu::ShaderPointer makeLightProgram(const char* vertSource, const char* fragSource, LightLocationsPtr& locations) {
-    auto VS = gpu::Shader::createVertex(std::string(vertSource));
-    auto PS = gpu::Shader::createPixel(std::string(fragSource));
+static gpu::ShaderPointer makeLightProgram(const std::string& vertSource, const std::string& fragSource, LightLocationsPtr& locations) {
+    auto VS = gpu::Shader::createVertex(vertSource);
+    auto PS = gpu::Shader::createPixel(fragSource);
     
     gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
 
@@ -224,7 +224,7 @@ static gpu::ShaderPointer makeLightProgram(const char* vertSource, const char* f
     return program;
 }
 
-static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& pipeline, LightLocationsPtr& locations) {
+static void loadLightProgram(const std::string& vertSource, const std::string& fragSource, bool lightVolume, gpu::PipelinePointer& pipeline, LightLocationsPtr& locations) {
 
     gpu::ShaderPointer program = makeLightProgram(vertSource, fragSource, locations);
 
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 3f48e37a76..b1a969fcc8 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -135,7 +135,7 @@ const std::string PIXEL_SHADER_DEFINES{ R"GLSL(
 #define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
 )GLSL" };
 
-void testShaderBuild(const char* vs_src, const char * fs_src) {
+void testShaderBuild(const std::string& vs_src, const std::string& fs_src) {
     std::string error;
     std::vector<char> binary;
     GLuint vs, fs;
diff --git a/tools/scribe/src/main.cpp b/tools/scribe/src/main.cpp
index 810f6c0f45..4f58ada303 100755
--- a/tools/scribe/src/main.cpp
+++ b/tools/scribe/src/main.cpp
@@ -211,12 +211,13 @@ int main (int argc, char** argv) {
         targetStringStream << "// File generated by Scribe " << vars["_SCRIBE_DATE"] << std::endl;
         targetStringStream << "#ifndef scribe_" << targetName << "_h" << std::endl;
         targetStringStream << "#define scribe_" << targetName << "_h" << std::endl << std::endl;
+        targetStringStream << "#include <string>" << std::endl << std::endl;
 
-        targetStringStream << "const char " << targetName << "[] = \n";
+        targetStringStream << "static std::string " << targetName << " = std::string()\n";
 
         // Write the pages content
         for (auto page : pages) {
-            targetStringStream << "R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\"\n";
+            targetStringStream << "+ std::string(R\"SCRIBE(\n" << page->str() << "\n)SCRIBE\")\n";
         }
         targetStringStream << ";\n" << std::endl << std::endl;
 

From e87067f93d0841312c540073b755100ceb458f48 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 5 Feb 2018 15:31:37 -0800
Subject: [PATCH 112/569] fix variable naming and edge case

---
 interface/src/avatar/MyAvatar.cpp | 10 ++++++----
 interface/src/avatar/MyAvatar.h   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 516c601931..0ee409745f 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1448,6 +1448,10 @@ void MyAvatar::clearJointsData() {
 }
 
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
+    if (skeletonModelURL != _skeletonModelURL) {
+        _shouldInitHeadBones = true;
+    }
+
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
@@ -1893,14 +1897,12 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     Avatar::postUpdate(deltaTime, scene);
 
-    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _initHeadBones) {
+    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _shouldInitHeadBones) {
         initHeadBones();
         _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
         initAnimGraph();
-        _initHeadBones = false;
-    } else if (!_skeletonModel->isLoaded()) {
-        _initHeadBones = true;
+        _shouldInitHeadBones = false;
     }
 
     if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) {
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 532eb06974..45dddb45a4 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -817,7 +817,7 @@ private:
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
     bool _enableDebugDrawDetailedCollision { false };
-    bool _initHeadBones { false };
+    bool _shouldInitHeadBones { true };
 
     mutable bool _cauterizationNeedsUpdate; // do we need to scan children and update their "cauterized" state?
 

From 7f6471fcd189ad04feaa3cec153583bb3752df69 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 6 Feb 2018 13:24:41 +1300
Subject: [PATCH 113/569] Fix recording just made not being automatically
 played back

---
 unpublishedScripts/marketplace/record/record.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unpublishedScripts/marketplace/record/record.js b/unpublishedScripts/marketplace/record/record.js
index 68c7ea3f5a..dda78dbd02 100644
--- a/unpublishedScripts/marketplace/record/record.js
+++ b/unpublishedScripts/marketplace/record/record.js
@@ -139,7 +139,8 @@
         }
 
         function setMappingCallback(status) {
-            if (status !== "") {
+            // FIXME: "" is for RC < 63, null is for RC >= 63. Remove the former when RC63 is no longer used.
+            if (status !== "" && status !== null) {
                 error("Error mapping recording to " + mappingPath + " on Asset Server!", status);
                 return;
             }

From cf87052b7fd852c1446931f7a0433848b3d5edb6 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Mon, 5 Feb 2018 17:29:00 -0800
Subject: [PATCH 114/569] Added option to select snapshot filename in scripts.

---
 interface/src/Application.cpp                    | 12 ++++++------
 interface/src/Application.h                      |  6 ++++--
 .../src/scripting/WindowScriptingInterface.cpp   |  8 ++++----
 .../src/scripting/WindowScriptingInterface.h     |  4 ++--
 interface/src/ui/Snapshot.cpp                    | 16 ++++++++++++----
 interface/src/ui/Snapshot.h                      |  4 ++--
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3e7dd3e223..710c9aca73 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6934,10 +6934,10 @@ void Application::loadAvatarBrowser() const {
     DependencyManager::get<HMDScriptingInterface>()->openTablet();
 }
 
-void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio) {
-    postLambdaEvent([notify, includeAnimated, aspectRatio, this] {
+void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) {
+    postLambdaEvent([notify, includeAnimated, aspectRatio, filename, this] {
         // Get a screenshot and save it
-        QString path = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getScreenshot(aspectRatio));
+        QString path = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getScreenshot(aspectRatio), filename);
         // If we're not doing an animated snapshot as well...
         if (!includeAnimated) {
             // Tell the dependency manager that the capture of the still snapshot has taken place.
@@ -6949,9 +6949,9 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa
     });
 }
 
-void Application::takeSecondaryCameraSnapshot() {
-    postLambdaEvent([this] {
-        QString snapshotPath = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getSecondaryCameraScreenshot());
+void Application::takeSecondaryCameraSnapshot(const QString& filename) {
+    postLambdaEvent([filename, this] {
+        QString snapshotPath = Snapshot::saveSnapshot(getActiveDisplayPlugin()->getSecondaryCameraScreenshot(), filename);
         emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(snapshotPath, true);
     });
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ddb8ce11e5..471f3103b8 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -266,8 +266,10 @@ public:
 
     float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
-    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f);
-    void takeSecondaryCameraSnapshot();
+    // Note that takeSnapshot has a default value, as this method is used internally.
+    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = "");
+    void takeSecondaryCameraSnapshot(const QString& filename);
+
     void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
     graphics::SkyboxPointer getDefaultSkybox() const { return _defaultSkybox; }
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 8a7743a849..3a3d313fb4 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -430,12 +430,12 @@ bool WindowScriptingInterface::setDisplayTexture(const QString& name) {
     return  qApp->getActiveDisplayPlugin()->setDisplayTexture(name);   // Plugins that don't know how, answer false.
 }
 
-void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio) {
-    qApp->takeSnapshot(notify, includeAnimated, aspectRatio);
+void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) {
+    qApp->takeSnapshot(notify, includeAnimated, aspectRatio, filename);
 }
 
-void WindowScriptingInterface::takeSecondaryCameraSnapshot() {
-    qApp->takeSecondaryCameraSnapshot();
+void WindowScriptingInterface::takeSecondaryCameraSnapshot(const QString& filename) {
+    qApp->takeSecondaryCameraSnapshot(filename);
 }
 
 void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) {
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index dc71611c5b..41310c45fd 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -357,13 +357,13 @@ public slots:
      * var aspect = 1920 / 1080;
      * Window.takeSnapshot(notify, animated, aspect);
      */
-    void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
+    void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = "");
 
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
      */
-    void takeSecondaryCameraSnapshot();
+    void takeSecondaryCameraSnapshot(const QString& filename = "");
 
     /**jsdoc
      * Emit a {@link Window.connectionAdded|connectionAdded} or a {@link Window.connectionError|connectionError} signal that
diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index 59ecce5bc7..c1e077a980 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -73,9 +73,9 @@ SnapshotMetaData* Snapshot::parseSnapshotData(QString snapshotPath) {
     return data;
 }
 
-QString Snapshot::saveSnapshot(QImage image) {
+QString Snapshot::saveSnapshot(QImage image, const QString& filename) {
 
-    QFile* snapshotFile = savedFileForSnapshot(image, false);
+    QFile* snapshotFile = savedFileForSnapshot(image, false, filename);
 
     // we don't need the snapshot file, so close it, grab its filename and delete it
     snapshotFile->close();
@@ -92,7 +92,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
     return static_cast<QTemporaryFile*>(savedFileForSnapshot(image, true));
 }
 
-QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) {
+QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename) {
 
     // adding URL to snapshot
     QUrl currentURL = DependencyManager::get<AddressManager>()->currentShareableAddress();
@@ -104,7 +104,15 @@ QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) {
 
     QDateTime now = QDateTime::currentDateTime();
 
-    QString filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT));
+    // If user has requested specific filename then use it, else create the filename
+	// 'jpg" is appended, as the image is saved in jpg format.  This is the case for all snapshots
+	//       (see definition of FILENAME_PATH_FORMAT)
+    QString filename;
+    if (userSelectedFilename != "") {
+        filename = userSelectedFilename + ".jpg";
+    } else {
+        filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT));
+    }
 
     const int IMAGE_QUALITY = 100;
 
diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h
index 1246e1d004..edbfe5d272 100644
--- a/interface/src/ui/Snapshot.h
+++ b/interface/src/ui/Snapshot.h
@@ -37,7 +37,7 @@ class Snapshot : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
 public:
-    static QString saveSnapshot(QImage image);
+    static QString saveSnapshot(QImage image, const QString& filename);
     static QTemporaryFile* saveTempSnapshot(QImage image);
     static SnapshotMetaData* parseSnapshotData(QString snapshotPath);
 
@@ -51,7 +51,7 @@ public slots:
     Q_INVOKABLE QString getSnapshotsLocation();
     Q_INVOKABLE void setSnapshotsLocation(const QString& location);
 private:
-    static QFile* savedFileForSnapshot(QImage & image, bool isTemporary);
+    static QFile* savedFileForSnapshot(QImage & image, bool isTemporary, const QString& userSelectedFilename = "");
 };
 
 #endif // hifi_Snapshot_h

From 179aca2bf99f24340c60ef98a52cdc832f3e8091 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 6 Feb 2018 11:47:39 +0100
Subject: [PATCH 115/569] Shadow task now uses LOD culling from main view task

---
 interface/src/SecondaryCamera.cpp             |  2 +-
 .../render-utils/src/RenderShadowTask.cpp     | 18 ++++++++++---
 libraries/render-utils/src/RenderShadowTask.h |  5 ++--
 libraries/render-utils/src/RenderViewTask.cpp |  4 ++-
 libraries/render/src/render/CullTask.cpp      | 26 +++++++++++++++++++
 libraries/render/src/render/CullTask.h        | 13 ++++++++++
 6 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/interface/src/SecondaryCamera.cpp b/interface/src/SecondaryCamera.cpp
index ed16cc4321..45f1756eb7 100644
--- a/interface/src/SecondaryCamera.cpp
+++ b/interface/src/SecondaryCamera.cpp
@@ -19,7 +19,7 @@
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
 void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {    
-    task.addJob<RenderShadowTask>("RenderShadowTask", render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
+    task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor, render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, render::ItemKey::TAG_BITS_1, render::ItemKey::TAG_BITS_1);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
     if (!isDeferred) {
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 33887675ab..e8963c2e4e 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -200,8 +200,8 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
     });
 }
 
-void RenderShadowTask::build(JobModel& task, const render::Varying& input, render::Varying& output, uint8_t tagBits, uint8_t tagMask) {
-    ::CullFunctor cullFunctor = [this](const RenderArgs* args, const AABox& bounds) {
+void RenderShadowTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cameraCullFunctor, uint8_t tagBits, uint8_t tagMask) {
+    ::CullFunctor shadowCullFunctor = [this](const RenderArgs* args, const AABox& bounds) {
         return _cullFunctor(args, bounds);
     };
 
@@ -224,8 +224,14 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
     const auto shadowItems = task.addJob<FetchSpatialSelection>("FetchShadowSelection", selectionInputs);
 
+    // Cull objects that are not visible in camera view. Hopefully the cull functor only performs LOD culling, not
+    // frustum culling or this will make shadow casters out of the camera frustum disappear.
+    const auto cameraFrustum = setupOutput.getN<RenderShadowSetup::Outputs>(2);
+    const auto applyFunctorInputs = ApplyCullFunctorOnItemBounds::Inputs(shadowItems, cameraFrustum).asVarying();
+    const auto culledShadowItems = task.addJob<ApplyCullFunctorOnItemBounds>("ShadowCullCamera", applyFunctorInputs, cameraCullFunctor);
+
     // Sort
-    const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadow", shadowItems);
+    const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadow", culledShadowItems);
     const auto sortedShapes = task.addJob<DepthSortShapes>("DepthSortShadow", sortedPipelines, true);
 
     render::Varying cascadeFrustums[SHADOW_CASCADE_MAX_COUNT] = {
@@ -248,7 +254,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
 
         // CPU jobs: finer grained culling
         const auto cullInputs = CullShapeBounds::Inputs(sortedShapes, shadowFilter, antiFrustum).asVarying();
-        const auto culledShadowItemsAndBounds = task.addJob<CullShapeBounds>("CullShadowCascade", cullInputs, cullFunctor, RenderDetails::SHADOW);
+        const auto culledShadowItemsAndBounds = task.addJob<CullShapeBounds>("CullShadowCascade", cullInputs, shadowCullFunctor, RenderDetails::SHADOW);
 
         // GPU jobs: Render to shadow map
         sprintf(jobName, "RenderShadowMap%d", i);
@@ -266,6 +272,7 @@ void RenderShadowTask::configure(const Config& configuration) {
 }
 
 RenderShadowSetup::RenderShadowSetup() :
+    _cameraFrustum{ std::make_shared<ViewFrustum>() },
     _coarseShadowFrustum{ std::make_shared<ViewFrustum>() } {
 
 }
@@ -297,6 +304,9 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
 
     output.edit0() = args->_renderMode;
     output.edit1() = glm::ivec2(0, 0);
+    // Save main camera frustum
+    *_cameraFrustum = args->getViewFrustum();
+    output.edit2() = _cameraFrustum;
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow) {
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 4ae43a7b6c..7f127a558c 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -50,7 +50,7 @@ public:
     using JobModel = render::Task::Model<RenderShadowTask, Config>;
 
     RenderShadowTask() {}
-    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, uint8_t tagBits = 0x00, uint8_t tagMask = 0x00);
+    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cameraCullFunctor, uint8_t tagBits = 0x00, uint8_t tagMask = 0x00);
 
     void configure(const Config& configuration);
 
@@ -95,7 +95,7 @@ signals:
 
 class RenderShadowSetup {
 public:
-    using Outputs = render::VaryingSet2<RenderArgs::RenderMode, glm::ivec2>;
+    using Outputs = render::VaryingSet3<RenderArgs::RenderMode, glm::ivec2, ViewFrustumPointer>;
     using Config = RenderShadowSetupConfig;
     using JobModel = render::Job::ModelO<RenderShadowSetup, Outputs, Config>;
 
@@ -105,6 +105,7 @@ public:
 
 private:
 
+    ViewFrustumPointer _cameraFrustum;
     ViewFrustumPointer _coarseShadowFrustum;
     struct {
         float _constant;
diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp
index 93844b3a39..122fc16e61 100644
--- a/libraries/render-utils/src/RenderViewTask.cpp
+++ b/libraries/render-utils/src/RenderViewTask.cpp
@@ -17,7 +17,9 @@
 void RenderViewTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, bool isDeferred, uint8_t tagBits, uint8_t tagMask) {
    // auto items = input.get<Input>();
 
-    task.addJob<RenderShadowTask>("RenderShadowTask", tagBits, tagMask);
+    // Warning : the cull functor passed to the shadow pass should only be testing for LOD culling. If frustum culling
+    // is performed, then casters not in the view frustum will be removed, which is not what we wish.
+    task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor, tagBits, tagMask);
 
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor, tagBits, tagMask);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 3062966241..4dec3030ef 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -389,6 +389,32 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
     }
 }
 
+void ApplyCullFunctorOnItemBounds::run(const RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+    auto& inItems = inputs.get0();
+    auto& outItems = outputs;
+    auto inputFrustum = inputs.get1();
+
+    if (inputFrustum != nullptr) {
+        args->pushViewFrustum(*inputFrustum);
+    }
+
+    outItems.clear();
+    outItems.reserve(inItems.size());
+
+    for (auto& item : inItems) {
+        if (_cullFunctor(args, item.bound)) {
+            outItems.emplace_back(item);
+        }
+    }
+
+    if (inputFrustum != nullptr) {
+        args->popViewFrustum();
+    }
+}
+
 void FetchSpatialSelection::run(const RenderContextPointer& renderContext,
                                const Inputs& inputs, ItemBounds& outItems) {
     assert(renderContext->args);
diff --git a/libraries/render/src/render/CullTask.h b/libraries/render/src/render/CullTask.h
index bb6a7e84f1..3c5a30de89 100644
--- a/libraries/render/src/render/CullTask.h
+++ b/libraries/render/src/render/CullTask.h
@@ -140,6 +140,19 @@ namespace render {
         void run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems);
     };
 
+    class ApplyCullFunctorOnItemBounds {
+    public:
+        using Inputs = render::VaryingSet2<ItemBounds, ViewFrustumPointer>;
+        using Outputs = ItemBounds;
+        using JobModel = Job::ModelIO<ApplyCullFunctorOnItemBounds, Inputs, Outputs>;
+
+        ApplyCullFunctorOnItemBounds(render::CullFunctor cullFunctor) : _cullFunctor(cullFunctor) {}
+        void run(const RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+    private:
+
+        render::CullFunctor _cullFunctor;
+    };
 }
 
 #endif // hifi_render_CullTask_h;
\ No newline at end of file

From 51ea89ffea08e79483eb94b375509edd0e05c895 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 6 Feb 2018 15:16:50 +0100
Subject: [PATCH 116/569] Renamed fade scripts to transition scripts and still
 working on layout

---
 .../{debugFade.js => debugTransition.js}      |  10 +-
 .../render/{fade.qml => transition.qml}       | 311 ++++++++----------
 2 files changed, 150 insertions(+), 171 deletions(-)
 rename scripts/developer/utilities/render/{debugFade.js => debugTransition.js} (91%)
 rename scripts/developer/utilities/render/{fade.qml => transition.qml} (56%)

diff --git a/scripts/developer/utilities/render/debugFade.js b/scripts/developer/utilities/render/debugTransition.js
similarity index 91%
rename from scripts/developer/utilities/render/debugFade.js
rename to scripts/developer/utilities/render/debugTransition.js
index d20d5a70cf..161ff3f5d4 100644
--- a/scripts/developer/utilities/render/debugFade.js
+++ b/scripts/developer/utilities/render/debugTransition.js
@@ -1,7 +1,7 @@
 "use strict";
 
 //
-//  debugFade.js
+//  debugTransition.js
 //  developer/utilities/render
 //
 //  Olivier Prat, created on 30/04/2017.
@@ -12,10 +12,10 @@
 //
 
 (function() {
-    var TABLET_BUTTON_NAME = "Fade";
-    var QMLAPP_URL = Script.resolvePath("./fade.qml");
-    var ICON_URL = Script.resolvePath("../../../system/assets/images/fade-i.svg");
-    var ACTIVE_ICON_URL = Script.resolvePath("../../../system/assets/images/fade-a.svg");
+    var TABLET_BUTTON_NAME = "Transition";
+    var QMLAPP_URL = Script.resolvePath("./transition.qml");
+    var ICON_URL = Script.resolvePath("../../../system/assets/images/transition-i.svg");
+    var ACTIVE_ICON_URL = Script.resolvePath("../../../system/assets/images/transition-a.svg");
 
    
     var onScreen = false;
diff --git a/scripts/developer/utilities/render/fade.qml b/scripts/developer/utilities/render/transition.qml
similarity index 56%
rename from scripts/developer/utilities/render/fade.qml
rename to scripts/developer/utilities/render/transition.qml
index 48e2cf6856..5f48c69daf 100644
--- a/scripts/developer/utilities/render/fade.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -1,5 +1,5 @@
 //
-//  fade.qml
+//  transition.qml
 //  developer/utilities/render
 //
 //  Olivier Prat, created on 30/04/2017.
@@ -27,21 +27,21 @@ Rectangle {
     property var config: Render.getConfig("RenderMainView.Fade");
     property var configEdit: Render.getConfig("RenderMainView.FadeEdit");
 
-    Column {
+    ColumnLayout {
         spacing: 5
-        anchors.left: parent.left
-        anchors.right: parent.right       
+        anchors.fill: parent      
         anchors.margins: hifi.dimensions.contentMargin.x  
         HifiControls.Label {
-            text: "Fade"       
+            text: "Transition"       
         }
 
-        Row {
-            anchors.left: parent.left
-            anchors.right: parent.right 
+        RowLayout {
             spacing: 20
+            Layout.fillWidth: true
+            id: root_col
 
             HifiControls.CheckBox {
+                anchors.verticalCenter: parent.verticalCenter
                 boxSize: 20
                 text: "Edit"
                 checked: root.configEdit["editFade"]
@@ -51,13 +51,16 @@ Rectangle {
                 }
             }
             HifiControls.ComboBox {
+                anchors.verticalCenter: parent.verticalCenter
+                Layout.fillWidth: true
                 id: categoryBox
-                width: 260
                 model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]
                 Timer {
                     id: postpone
                     interval: 100; running: false; repeat: false
-                    onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
+                    onTriggered: { 
+                        paramWidgetLoader.sourceComponent = paramWidgets
+                    }
                 }
                 onCurrentIndexChanged: {
                     root.config["editedCategory"] = currentIndex;
@@ -68,26 +71,32 @@ Rectangle {
                     postpone.start()
                 }
             }
+        }
+
+        RowLayout {
+            spacing: 20
+            height: 38
             HifiControls.CheckBox {
                 boxSize: 20
+                anchors.verticalCenter: parent.verticalCenter
                 text: "Manual"
                 checked: root.config["manualFade"]
                 onCheckedChanged: {
                     root.config["manualFade"] = checked;
                 }
             }
-        }
-
-        ConfigSlider {
-            height: 35
-            label: "Threshold"
-            integral: false
-            config: root.config
-            property: "manualThreshold"
-            max: 1.0
-            min: 0.0
-            anchors.left: parent.left
-            anchors.right: parent.right
+            ConfigSlider {
+                anchors.left: undefined
+                anchors.verticalCenter: parent.verticalCenter
+                height: 38
+                width: 320
+                label: "Threshold"
+                integral: false
+                config: root.config
+                property: "manualThreshold"
+                max: 1.0
+                min: 0.0
+            }
         }
         
         Action {
@@ -110,101 +119,92 @@ Rectangle {
             }
         }
 
+        Separator {}  
               
         Component {
             id: paramWidgets
 
-            Column {
-                anchors.left: parent.left
-                anchors.right: parent.right
+            ColumnLayout {
                 spacing: 10
+                width: root_col.width
 
                 HifiControls.CheckBox {
                     text: "Invert"
+                    boxSize: 20
                     checked: root.config["isInverted"]
                     onCheckedChanged: { root.config["isInverted"] = checked }
                 }
-                GroupBox {
-                    title: "Base Gradient"
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+                RowLayout {
+                    Layout.fillWidth: true
 
-                    Column {
-                        spacing: 8
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                    GroupBox {
+                        title: "Base Gradient"
+                        Layout.fillWidth: true
 
-                        Repeater {
-                            model: [
-                            "Size X:baseSizeX", 
-                            "Size Y:baseSizeY", 
-                            "Size Z:baseSizeZ",
-                            "Level:baseLevel" ]                  
+                        Column {
+                            spacing: 8
+                            anchors.left: parent.left
+                            anchors.right: parent.right
 
-                            ConfigSlider {
-                                height: 35
-                                label:  modelData.split(":")[0]
-                                integral: false
-                                config: root.config
-                                property:  modelData.split(":")[1]
-                                max: 1.0
-                                min: 0.0
+                            Repeater {
+                                model: [
+                                "Size X:baseSizeX", 
+                                "Size Y:baseSizeY", 
+                                "Size Z:baseSizeZ",
+                                "Level:baseLevel" ]                  
+
+                                ConfigSlider {
+                                    height: 38
+                                    label:  modelData.split(":")[0]
+                                    integral: false
+                                    config: root.config
+                                    property:  modelData.split(":")[1]
+                                    max: 1.0
+                                    min: 0.0
+                                }
+                            }
+                        }
+                    }
+                    GroupBox {
+                        title: "Noise Gradient"
+                        Layout.fillWidth: true
+                        
+                        Column {
+                            spacing: 8
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+
+                            Repeater {
+                                model: [
+                                "Size X:noiseSizeX", 
+                                "Size Y:noiseSizeY", 
+                                "Size Z:noiseSizeZ",
+                                "Level:noiseLevel" ]                  
+
+                                ConfigSlider {
+                                    height: 38
+                                    label:  modelData.split(":")[0]
+                                    integral: false
+                                    config: root.config
+                                    property:  modelData.split(":")[1]
+                                    max: 1.0
+                                    min: 0.0
+                                }
                             }
                         }
                     }
                 }
                 GroupBox {
-                    title: "Noise Gradient"
-                    
+                    title: "Edge"
+                    Layout.fillWidth: true
+
                     Column {
                         spacing: 8
                         anchors.left: parent.left
                         anchors.right: parent.right
 
                         ConfigSlider {
-                            height: 35
-                            label: "Size X"
-                            integral: false
-                            config: root.config
-                            property: "noiseSizeX"
-                            max: 1.0
-                            min: 0.0
-                        }
-                        ConfigSlider {
-                            height: 35
-                            label: "Size Y"
-                            integral: false
-                            config: root.config
-                            property: "noiseSizeY"
-                            max: 1.0
-                            min: 0.0
-                        }
-                        ConfigSlider {
-                            label: "Size Z"
-                            integral: false
-                            config: root.config
-                            property: "noiseSizeZ"
-                            max: 1.0
-                            min: 0.0
-                        }
-                        ConfigSlider {
-                            label: "Level"
-                            integral: false
-                            config: root.config
-                            property: "noiseLevel"
-                            max: 1.0
-                            min: 0.0
-                        }
-                    }
-                }
-                GroupBox {
-                    title: "Edge"
-
-                    Column {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        ConfigSlider {
+                            height: 38
                             label: "Width"
                             integral: false
                             config: root.config
@@ -212,83 +212,63 @@ Rectangle {
                             max: 1.0
                             min: 0.0
                         }
-                        GroupBox {
-                            title: "Inner color"
-                            Column {
-                                anchors.left: parent.left
-                                anchors.right: parent.right
+                        Row {
+                            spacing: 8
+                            anchors.left: parent.left
+                            anchors.right: parent.right
 
-                                ConfigSlider {
-                                    label: "Color R"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeInnerColorR"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color G"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeInnerColorG"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color B"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeInnerColorB"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color intensity"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeInnerIntensity"
-                                    max: 5.0
-                                    min: 0.0
+                            GroupBox {
+                                title: "Inner color"
+                                Layout.fillWidth: true
+
+                                Column {
+                                    anchors.left: parent.left
+                                    anchors.right: parent.right
+
+                                    Repeater {
+                                        model: [
+                                        "Color R:edgeInnerColorR", 
+                                        "Color G:edgeInnerColorG", 
+                                        "Color B:edgeInnerColorB",
+                                        "Color intensity:edgeInnerIntensity" ]                  
+
+                                        ConfigSlider {
+                                            height: 38
+                                            label:  modelData.split(":")[0]
+                                            integral: false
+                                            config: root.config
+                                            property:  modelData.split(":")[1]
+                                            max: 1.0
+                                            min: 0.0
+                                        }
+                                    }
                                 }
                             }
-                        }
-                        GroupBox {
-                            title: "Outer color"
-                            Column {
-                                anchors.left: parent.left
-                                anchors.right: parent.right 
+                            GroupBox {
+                                title: "Outer color"
+                                Layout.fillWidth: true
 
-                                ConfigSlider {
-                                    label: "Color R"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeOuterColorR"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color G"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeOuterColorG"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color B"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeOuterColorB"
-                                    max: 1.0
-                                    min: 0.0
-                                }
-                                ConfigSlider {
-                                    label: "Color intensity"
-                                    integral: false
-                                    config: root.config
-                                    property: "edgeOuterIntensity"
-                                    max: 5.0
-                                    min: 0.0
+                                Column {
+                                    anchors.left: parent.left
+                                    anchors.right: parent.right 
+
+                                    Repeater {
+                                        model: [
+                                        "Color R:edgeOuterColorR", 
+                                        "Color G:edgeOuterColorG", 
+                                        "Color B:edgeOuterColorB",
+                                        "Color intensity:edgeOuterIntensity" ]                  
+
+                                        ConfigSlider {
+                                            height: 38
+                                            label:  modelData.split(":")[0]
+                                            integral: false
+                                            config: root.config
+                                            property:  modelData.split(":")[1]
+                                            max: 1.0
+                                            min: 0.0
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -375,7 +355,6 @@ Rectangle {
 
 
 
-
         Loader {
             id: paramWidgetLoader
             sourceComponent: paramWidgets

From 8c12ab9b76ec20f907e1b3544184e76e2be646ba Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 6 Feb 2018 16:19:15 +0100
Subject: [PATCH 117/569] Used color selectors in transition.qml

---
 .../developer/utilities/render/transition.qml | 264 +++++++++---------
 1 file changed, 133 insertions(+), 131 deletions(-)

diff --git a/scripts/developer/utilities/render/transition.qml b/scripts/developer/utilities/render/transition.qml
index 5f48c69daf..36cab7688c 100644
--- a/scripts/developer/utilities/render/transition.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -28,8 +28,9 @@ Rectangle {
     property var configEdit: Render.getConfig("RenderMainView.FadeEdit");
 
     ColumnLayout {
-        spacing: 5
-        anchors.fill: parent      
+        spacing: 3
+        anchors.left: parent.left
+        anchors.right: parent.right      
         anchors.margins: hifi.dimensions.contentMargin.x  
         HifiControls.Label {
             text: "Transition"       
@@ -75,7 +76,7 @@ Rectangle {
 
         RowLayout {
             spacing: 20
-            height: 38
+            height: 36
             HifiControls.CheckBox {
                 boxSize: 20
                 anchors.verticalCenter: parent.verticalCenter
@@ -88,7 +89,7 @@ Rectangle {
             ConfigSlider {
                 anchors.left: undefined
                 anchors.verticalCenter: parent.verticalCenter
-                height: 38
+                height: 36
                 width: 320
                 label: "Threshold"
                 integral: false
@@ -125,7 +126,7 @@ Rectangle {
             id: paramWidgets
 
             ColumnLayout {
-                spacing: 10
+                spacing: 3
                 width: root_col.width
 
                 HifiControls.CheckBox {
@@ -142,7 +143,7 @@ Rectangle {
                         Layout.fillWidth: true
 
                         Column {
-                            spacing: 8
+                            spacing: 3
                             anchors.left: parent.left
                             anchors.right: parent.right
 
@@ -154,7 +155,7 @@ Rectangle {
                                 "Level:baseLevel" ]                  
 
                                 ConfigSlider {
-                                    height: 38
+                                    height: 36
                                     label:  modelData.split(":")[0]
                                     integral: false
                                     config: root.config
@@ -170,7 +171,7 @@ Rectangle {
                         Layout.fillWidth: true
                         
                         Column {
-                            spacing: 8
+                            spacing: 3
                             anchors.left: parent.left
                             anchors.right: parent.right
 
@@ -182,7 +183,7 @@ Rectangle {
                                 "Level:noiseLevel" ]                  
 
                                 ConfigSlider {
-                                    height: 38
+                                    height: 36
                                     label:  modelData.split(":")[0]
                                     integral: false
                                     config: root.config
@@ -194,58 +195,118 @@ Rectangle {
                         }
                     }
                 }
-                GroupBox {
-                    title: "Edge"
+
+
+                ConfigSlider {
+                    height: 36
+                    label: "Edge Width"
+                    integral: false
+                    config: root.config
+                    property: "edgeWidth"
+                    max: 1.0
+                    min: 0.0
+                }
+                RowLayout {
                     Layout.fillWidth: true
 
-                    Column {
-                        spacing: 8
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                    GroupBox {
+                        title: "Edge Inner color"
+                        Layout.fillWidth: true
 
-                        ConfigSlider {
-                            height: 38
-                            label: "Width"
-                            integral: false
-                            config: root.config
-                            property: "edgeWidth"
-                            max: 1.0
-                            min: 0.0
-                        }
-                        Row {
-                            spacing: 8
+                        Column {
                             anchors.left: parent.left
                             anchors.right: parent.right
 
-                            GroupBox {
-                                title: "Inner color"
-                                Layout.fillWidth: true
-
-                                Column {
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-
-                                    Repeater {
-                                        model: [
-                                        "Color R:edgeInnerColorR", 
-                                        "Color G:edgeInnerColorG", 
-                                        "Color B:edgeInnerColorB",
-                                        "Color intensity:edgeInnerIntensity" ]                  
-
-                                        ConfigSlider {
-                                            height: 38
-                                            label:  modelData.split(":")[0]
-                                            integral: false
-                                            config: root.config
-                                            property:  modelData.split(":")[1]
-                                            max: 1.0
-                                            min: 0.0
-                                        }
-                                    }
+                            Color {
+                                height: 30
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                _color: Qt.rgba(root.config.edgeInnerColorR, root.config.edgeInnerColorG, root.config.edgeInnerColorB, 1.0)
+                                onNewColor: {
+                                    root.config.edgeInnerColorR = _color.red
+                                    root.config.edgeInnerColorG = _color.green
+                                    root.config.edgeInnerColorB = _color.blue
                                 }
                             }
+                            ConfigSlider {
+                                height: 36
+                                label: "Intensity"
+                                integral: false
+                                config: root.config
+                                property: "edgeInnerIntensity"
+                                max: 1.0
+                                min: 0.0
+                            }
+                        }
+                    }
+                    GroupBox {
+                        title: "Edge Outer color"
+                        Layout.fillWidth: true
+
+                        Column {
+                            anchors.left: parent.left
+                            anchors.right: parent.right 
+
+                            Color {
+                                height: 30
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                _color: Qt.rgba(root.config.edgeOuterColorR, root.config.edgeOuterColorG, root.config.edgeOuterColorB, 1.0)
+                                onNewColor: {
+                                    root.config.edgeOuterColorR = _color.red
+                                    root.config.edgeOuterColorG = _color.green
+                                    root.config.edgeOuterColorB = _color.blue
+                                }
+                            }
+                            ConfigSlider {
+                                height: 36
+                                label: "Intensity"
+                                integral: false
+                                config: root.config
+                                property: "edgeOuterIntensity"
+                                max: 1.0
+                                min: 0.0
+                            }
+                        }
+                    }
+                }
+                GroupBox {
+                    title: "Timing"
+                    Layout.fillWidth: true
+
+                    ColumnLayout {
+                        anchors.left: parent.left
+                        anchors.right: parent.right 
+
+                        RowLayout {
+                            Layout.fillWidth: true
+
+                            ConfigSlider {
+                                anchors.left: undefined
+                                anchors.right: undefined
+                                Layout.fillWidth: true
+                                height: 36
+                                label: "Duration"
+                                integral: false
+                                config: root.config
+                                property: "duration"
+                                max: 10.0
+                                min: 0.1
+                            }
+                            HifiControls.ComboBox {
+                                Layout.fillWidth: true
+                                model: ["Linear", "Ease In", "Ease Out", "Ease In / Out"]
+                                currentIndex: root.config["timing"]
+                                onCurrentIndexChanged: {
+                                    root.config["timing"] = currentIndex;
+                                }
+                            }
+                        }
+                        RowLayout {
+                            Layout.fillWidth: true
+
                             GroupBox {
-                                title: "Outer color"
+                                title: "Noise Animation"
                                 Layout.fillWidth: true
 
                                 Column {
@@ -254,99 +315,40 @@ Rectangle {
 
                                     Repeater {
                                         model: [
-                                        "Color R:edgeOuterColorR", 
-                                        "Color G:edgeOuterColorG", 
-                                        "Color B:edgeOuterColorB",
-                                        "Color intensity:edgeOuterIntensity" ]                  
+                                        "Speed X:noiseSpeedX", 
+                                        "Speed Y:noiseSpeedY", 
+                                        "Speed Z:noiseSpeedZ" ]                  
 
                                         ConfigSlider {
-                                            height: 38
+                                            height: 36
                                             label:  modelData.split(":")[0]
                                             integral: false
                                             config: root.config
                                             property:  modelData.split(":")[1]
                                             max: 1.0
-                                            min: 0.0
+                                            min: -1.0
                                         }
                                     }
                                 }
                             }
-                        }
-                    }
-                }
 
-                GroupBox {
-                    title: "Timing"
-
-                    Column {
-                        anchors.left: parent.left
-                        anchors.right: parent.right 
-
-                        ConfigSlider {
-                            label: "Duration"
-                            integral: false
-                            config: root.config
-                            property: "duration"
-                            max: 10.0
-                            min: 0.1
-                        }
-                        HifiControls.ComboBox {
-                            width: 200
-                            model: ["Linear", "Ease In", "Ease Out", "Ease In / Out"]
-                            currentIndex: root.config["timing"]
-                            onCurrentIndexChanged: {
-                                root.config["timing"] = currentIndex;
+                            PlotPerf {
+                                title: "Threshold"
+                                Layout.fillWidth: true
+                                height: parent.evalEvenHeight()
+                                object:  config
+                                valueUnit: "%"
+                                valueScale: 0.01
+                                valueNumDigits: "1"
+                                plots: [
+                                    {
+                                        prop: "threshold",
+                                        label: "Threshold",
+                                        color: "#FFBB77"
+                                    }
+                                ]
                             }
                         }
-                        GroupBox {
-                            title: "Noise Animation"
-                            Column {
-                                anchors.left: parent.left
-                                anchors.right: parent.right 
-
-                                ConfigSlider {
-                                    label: "Speed X"
-                                    integral: false
-                                    config: root.config
-                                    property: "noiseSpeedX"
-                                    max: 1.0
-                                    min: -1.0
-                                }
-                                ConfigSlider {
-                                    label: "Speed Y"
-                                    integral: false
-                                    config: root.config
-                                    property: "noiseSpeedY"
-                                    max: 1.0
-                                    min: -1.0
-                                }
-                                ConfigSlider {
-                                    label: "Speed Z"
-                                    integral: false
-                                    config: root.config
-                                    property: "noiseSpeedZ"
-                                    max: 1.0
-                                    min: -1.0
-                                }
-                            }
-                        }
-
-                        PlotPerf {
-                            title: "Threshold"
-                            height: parent.evalEvenHeight()
-                            object:  config
-                            valueUnit: "%"
-                            valueScale: 0.01
-                            valueNumDigits: "1"
-                            plots: [
-                                {
-                                    prop: "threshold",
-                                    label: "Threshold",
-                                    color: "#FFBB77"
-                                }
-                            ]
-                        }
-
                     }
                 }
 

From fc1d9319bd6eb777af136d9245a9feab114db223 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 6 Feb 2018 16:31:53 +0100
Subject: [PATCH 118/569] Finished correcting transition.qml layouts

---
 scripts/developer/utilities/render/transition.qml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/developer/utilities/render/transition.qml b/scripts/developer/utilities/render/transition.qml
index 36cab7688c..de59d32df2 100644
--- a/scripts/developer/utilities/render/transition.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -305,9 +305,15 @@ Rectangle {
                         RowLayout {
                             Layout.fillWidth: true
 
+                            function evalEvenHeight() {
+                                // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?
+                                return (height - spacing * (children.length - 1)) / children.length
+                            }
+
                             GroupBox {
                                 title: "Noise Animation"
                                 Layout.fillWidth: true
+                                id: animBox
 
                                 Column {
                                     anchors.left: parent.left
@@ -334,9 +340,10 @@ Rectangle {
 
                             PlotPerf {
                                 title: "Threshold"
-                                Layout.fillWidth: true
-                                height: parent.evalEvenHeight()
-                                object:  config
+                                width: 200
+                                anchors.top: animBox.top
+                                anchors.bottom : animBox.bottom
+                                object: root.config
                                 valueUnit: "%"
                                 valueScale: 0.01
                                 valueNumDigits: "1"

From 733d36df473aa73c4f81d42537a312032a41840b Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 6 Feb 2018 17:57:04 +0100
Subject: [PATCH 119/569] Fixed save / load of fade effect configurations

---
 libraries/render-utils/src/FadeEffectJobs.cpp | 96 +++++++++----------
 libraries/render-utils/src/FadeEffectJobs.h   | 28 ++----
 .../developer/utilities/render/transition.qml | 12 +--
 3 files changed, 58 insertions(+), 78 deletions(-)

diff --git a/libraries/render-utils/src/FadeEffectJobs.cpp b/libraries/render-utils/src/FadeEffectJobs.cpp
index d00632c017..da3f8dddc0 100644
--- a/libraries/render-utils/src/FadeEffectJobs.cpp
+++ b/libraries/render-utils/src/FadeEffectJobs.cpp
@@ -297,19 +297,20 @@ float FadeConfig::getEdgeWidth() const {
     return sqrtf(events[editedCategory].edgeWidth);
 }
 
-void FadeConfig::setEdgeInnerColorR(float value) {
-    events[editedCategory].edgeInnerColor.r = value;
+void FadeConfig::setEdgeInnerColor(const QColor& value) {
+    events[editedCategory].edgeInnerColor.r = value.redF();
+    events[editedCategory].edgeInnerColor.g = value.greenF();
+    events[editedCategory].edgeInnerColor.b = value.blueF();
     emit dirty();
 }
 
-void FadeConfig::setEdgeInnerColorG(float value) {
-    events[editedCategory].edgeInnerColor.g = value;
-    emit dirty();
-}
-
-void FadeConfig::setEdgeInnerColorB(float value) {
-    events[editedCategory].edgeInnerColor.b = value;
-    emit dirty();
+QColor FadeConfig::getEdgeInnerColor() const {
+    QColor color;
+    color.setRedF(events[editedCategory].edgeInnerColor.r);
+    color.setGreenF(events[editedCategory].edgeInnerColor.g);
+    color.setBlueF(events[editedCategory].edgeInnerColor.b);
+    color.setAlphaF(1.0f);
+    return color;
 }
 
 void FadeConfig::setEdgeInnerIntensity(float value) {
@@ -317,19 +318,20 @@ void FadeConfig::setEdgeInnerIntensity(float value) {
     emit dirty();
 }
 
-void FadeConfig::setEdgeOuterColorR(float value) {
-    events[editedCategory].edgeOuterColor.r = value;
+void FadeConfig::setEdgeOuterColor(const QColor& value) {
+    events[editedCategory].edgeOuterColor.r = value.redF();
+    events[editedCategory].edgeOuterColor.g = value.greenF();
+    events[editedCategory].edgeOuterColor.b = value.blueF();
     emit dirty();
 }
 
-void FadeConfig::setEdgeOuterColorG(float value) {
-    events[editedCategory].edgeOuterColor.g = value;
-    emit dirty();
-}
-
-void FadeConfig::setEdgeOuterColorB(float value) {
-    events[editedCategory].edgeOuterColor.b = value;
-    emit dirty();
+QColor FadeConfig::getEdgeOuterColor() const {
+    QColor color;
+    color.setRedF(events[editedCategory].edgeOuterColor.r);
+    color.setGreenF(events[editedCategory].edgeOuterColor.g);
+    color.setBlueF(events[editedCategory].edgeOuterColor.b);
+    color.setAlphaF(1.0f);
+    return color;
 }
 
 void FadeConfig::setEdgeOuterIntensity(float value) {
@@ -352,13 +354,13 @@ QString FadeConfig::eventNames[FADE_CATEGORY_COUNT] = {
 };
 
 void FadeConfig::save() const {
+    // Save will only work if the HIFI_USE_SOURCE_TREE_RESOURCES environment variable is set
     assert(editedCategory < FADE_CATEGORY_COUNT);
     QJsonObject lProperties;
-    const QString configFile = "config/" + eventNames[editedCategory] + ".json";
-    QUrl path(PathUtils::resourcesPath() + configFile);
-    QFile file(path.toString());
+    const QString configFilePath = PathUtils::resourcesPath() + "config/" + eventNames[editedCategory] + ".json";
+    QFile file(configFilePath);
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
-        qWarning() << "Fade event configuration file " << path << " cannot be opened";
+        qWarning() << "Fade event configuration file " << configFilePath << " cannot be opened";
     }
     else {
         const auto& event = events[editedCategory];
@@ -381,15 +383,13 @@ void FadeConfig::save() const {
 }
 
 void FadeConfig::load() {
-    const QString configFile = "config/" + eventNames[editedCategory] + ".json";
-
-    QUrl path(PathUtils::resourcesPath() + configFile);
-    QFile file(path.toString());
+    const QString configFilePath = PathUtils::resourcesPath() + "config/" + eventNames[editedCategory] + ".json";
+    QFile file(configFilePath);
     if (!file.exists()) {
-        qWarning() << "Fade event configuration file " << path << " does not exist";
+        qWarning() << "Fade event configuration file " << configFilePath << " does not exist";
     }
     else if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qWarning() << "Fade event configuration file " << path << " cannot be opened";
+        qWarning() << "Fade event configuration file " << configFilePath << " cannot be opened";
     }
     else {
         QString fileData = file.readAll();
@@ -401,14 +401,14 @@ void FadeConfig::load() {
             QJsonValue value;
             auto& event = events[editedCategory];
 
-            qCDebug(renderlogging) << "Fade event configuration file" << path << "loaded";
+            qCDebug(renderlogging) << "Fade event configuration file" << configFilePath << "loaded";
 
             value = jsonObject["edgeInnerColor"];
             if (value.isArray()) {
                 QJsonArray data = value.toArray();
 
                 if (data.size() < 4) {
-                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
+                    qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
                 }
                 else {
                     event.edgeInnerColor.r = (float)data.at(0).toDouble();
@@ -418,7 +418,7 @@ void FadeConfig::load() {
                 }
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
             }
 
             value = jsonObject["edgeOuterColor"];
@@ -426,7 +426,7 @@ void FadeConfig::load() {
                 QJsonArray data = value.toArray();
 
                 if (data.size() < 4) {
-                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
+                    qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
                 }
                 else {
                     event.edgeOuterColor.r = (float)data.at(0).toDouble();
@@ -436,7 +436,7 @@ void FadeConfig::load() {
                 }
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
             }
 
             value = jsonObject["noiseSize"];
@@ -444,7 +444,7 @@ void FadeConfig::load() {
                 QJsonArray data = value.toArray();
 
                 if (data.size() < 3) {
-                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSize' field. Expected array of size 3";
+                    qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'noiseSize' field. Expected array of size 3";
                 }
                 else {
                     event.noiseSize.x = (float)data.at(0).toDouble();
@@ -453,7 +453,7 @@ void FadeConfig::load() {
                 }
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSize' field. Expected array of size 3";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'noiseSize' field. Expected array of size 3";
             }
 
             value = jsonObject["noiseSpeed"];
@@ -461,7 +461,7 @@ void FadeConfig::load() {
                 QJsonArray data = value.toArray();
 
                 if (data.size() < 3) {
-                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
+                    qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
                 }
                 else {
                     event.noiseSpeed.x = (float)data.at(0).toDouble();
@@ -470,7 +470,7 @@ void FadeConfig::load() {
                 }
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
             }
 
             value = jsonObject["baseSize"];
@@ -478,7 +478,7 @@ void FadeConfig::load() {
                 QJsonArray data = value.toArray();
 
                 if (data.size() < 3) {
-                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseSize' field. Expected array of size 3";
+                    qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'baseSize' field. Expected array of size 3";
                 }
                 else {
                     event.baseSize.x = (float)data.at(0).toDouble();
@@ -487,7 +487,7 @@ void FadeConfig::load() {
                 }
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseSize' field. Expected array of size 3";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'baseSize' field. Expected array of size 3";
             }
 
             value = jsonObject["noiseLevel"];
@@ -495,7 +495,7 @@ void FadeConfig::load() {
                 event.noiseLevel = (float)value.toDouble();
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseLevel' field. Expected float value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'noiseLevel' field. Expected float value";
             }
 
             value = jsonObject["baseLevel"];
@@ -503,7 +503,7 @@ void FadeConfig::load() {
                 event.baseLevel = (float)value.toDouble();
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseLevel' field. Expected float value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'baseLevel' field. Expected float value";
             }
 
             value = jsonObject["duration"];
@@ -511,7 +511,7 @@ void FadeConfig::load() {
                 event.duration = (float)value.toDouble();
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'duration' field. Expected float value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'duration' field. Expected float value";
             }
 
             value = jsonObject["edgeWidth"];
@@ -519,7 +519,7 @@ void FadeConfig::load() {
                 event.edgeWidth = std::min(1.f, std::max(0.f, (float)value.toDouble()));
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeWidth' field. Expected float value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'edgeWidth' field. Expected float value";
             }
 
             value = jsonObject["timing"];
@@ -527,7 +527,7 @@ void FadeConfig::load() {
                 event.timing = std::max(0, std::min(TIMING_COUNT - 1, value.toInt()));
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'timing' field. Expected integer value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'timing' field. Expected integer value";
             }
 
             value = jsonObject["isInverted"];
@@ -535,13 +535,13 @@ void FadeConfig::load() {
                 event.isInverted = value.toBool();
             }
             else {
-                qWarning() << "Fade event configuration file " << path << " contains an invalid 'isInverted' field. Expected boolean value";
+                qWarning() << "Fade event configuration file " << configFilePath << " contains an invalid 'isInverted' field. Expected boolean value";
             }
 
             emit dirty();
         }
         else {
-            qWarning() << "Fade event configuration file" << path << "failed to load:" <<
+            qWarning() << "Fade event configuration file" << configFilePath << "failed to load:" <<
                 error.errorString() << "at offset" << error.offset;
         }
     }
diff --git a/libraries/render-utils/src/FadeEffectJobs.h b/libraries/render-utils/src/FadeEffectJobs.h
index a585d5b98a..783f026bcd 100644
--- a/libraries/render-utils/src/FadeEffectJobs.h
+++ b/libraries/render-utils/src/FadeEffectJobs.h
@@ -56,13 +56,9 @@ class FadeConfig : public render::Job::Config {
         Q_PROPERTY(float noiseSizeZ READ getNoiseSizeZ WRITE setNoiseSizeZ NOTIFY dirty)
         Q_PROPERTY(float noiseLevel READ getNoiseLevel WRITE setNoiseLevel NOTIFY dirty)
         Q_PROPERTY(float edgeWidth READ getEdgeWidth WRITE setEdgeWidth NOTIFY dirty)
-        Q_PROPERTY(float edgeInnerColorR READ getEdgeInnerColorR WRITE setEdgeInnerColorR NOTIFY dirty)
-        Q_PROPERTY(float edgeInnerColorG READ getEdgeInnerColorG WRITE setEdgeInnerColorG NOTIFY dirty)
-        Q_PROPERTY(float edgeInnerColorB READ getEdgeInnerColorB WRITE setEdgeInnerColorB NOTIFY dirty)
+        Q_PROPERTY(QColor edgeInnerColor READ getEdgeInnerColor WRITE setEdgeInnerColor NOTIFY dirty)
         Q_PROPERTY(float edgeInnerIntensity READ getEdgeInnerIntensity WRITE setEdgeInnerIntensity NOTIFY dirty)
-        Q_PROPERTY(float edgeOuterColorR READ getEdgeOuterColorR WRITE setEdgeOuterColorR NOTIFY dirty)
-        Q_PROPERTY(float edgeOuterColorG READ getEdgeOuterColorG WRITE setEdgeOuterColorG NOTIFY dirty)
-        Q_PROPERTY(float edgeOuterColorB READ getEdgeOuterColorB WRITE setEdgeOuterColorB NOTIFY dirty)
+        Q_PROPERTY(QColor edgeOuterColor READ getEdgeOuterColor WRITE setEdgeOuterColor NOTIFY dirty)
         Q_PROPERTY(float edgeOuterIntensity READ getEdgeOuterIntensity WRITE setEdgeOuterIntensity NOTIFY dirty)
         Q_PROPERTY(int timing READ getTiming WRITE setTiming NOTIFY dirty)
         Q_PROPERTY(float noiseSpeedX READ getNoiseSpeedX WRITE setNoiseSpeedX NOTIFY dirty)
@@ -129,26 +125,14 @@ public:
     void setEdgeWidth(float value);
     float getEdgeWidth() const;
 
-    void setEdgeInnerColorR(float value);
-    float getEdgeInnerColorR() const { return events[editedCategory].edgeInnerColor.r; }
-
-    void setEdgeInnerColorG(float value);
-    float getEdgeInnerColorG() const { return events[editedCategory].edgeInnerColor.g; }
-
-    void setEdgeInnerColorB(float value);
-    float getEdgeInnerColorB() const { return events[editedCategory].edgeInnerColor.b; }
+    void setEdgeInnerColor(const QColor& value);
+    QColor getEdgeInnerColor() const;
 
     void setEdgeInnerIntensity(float value);
     float getEdgeInnerIntensity() const { return events[editedCategory].edgeInnerColor.a; }
 
-    void setEdgeOuterColorR(float value);
-    float getEdgeOuterColorR() const { return events[editedCategory].edgeOuterColor.r; }
-
-    void setEdgeOuterColorG(float value);
-    float getEdgeOuterColorG() const { return events[editedCategory].edgeOuterColor.g; }
-
-    void setEdgeOuterColorB(float value);
-    float getEdgeOuterColorB() const { return events[editedCategory].edgeOuterColor.b; }
+    void setEdgeOuterColor(const QColor& value);
+    QColor getEdgeOuterColor() const;
 
     void setEdgeOuterIntensity(float value);
     float getEdgeOuterIntensity() const { return events[editedCategory].edgeOuterColor.a; }
diff --git a/scripts/developer/utilities/render/transition.qml b/scripts/developer/utilities/render/transition.qml
index de59d32df2..e83a85f8ed 100644
--- a/scripts/developer/utilities/render/transition.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -221,11 +221,9 @@ Rectangle {
                                 height: 30
                                 anchors.left: parent.left
                                 anchors.right: parent.right
-                                _color: Qt.rgba(root.config.edgeInnerColorR, root.config.edgeInnerColorG, root.config.edgeInnerColorB, 1.0)
+                                _color: root.config.edgeInnerColor
                                 onNewColor: {
-                                    root.config.edgeInnerColorR = _color.red
-                                    root.config.edgeInnerColorG = _color.green
-                                    root.config.edgeInnerColorB = _color.blue
+                                    root.config.edgeInnerColor = _color
                                 }
                             }
                             ConfigSlider {
@@ -251,11 +249,9 @@ Rectangle {
                                 height: 30
                                 anchors.left: parent.left
                                 anchors.right: parent.right
-                                _color: Qt.rgba(root.config.edgeOuterColorR, root.config.edgeOuterColorG, root.config.edgeOuterColorB, 1.0)
+                                _color: root.config.edgeOuterColor
                                 onNewColor: {
-                                    root.config.edgeOuterColorR = _color.red
-                                    root.config.edgeOuterColorG = _color.green
-                                    root.config.edgeOuterColorB = _color.blue
+                                    root.config.edgeOuterColor = _color
                                 }
                             }
                             ConfigSlider {

From faec9a62b6320a5ad05c1cb660871ed9881ff20e Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Tue, 6 Feb 2018 11:01:50 -0800
Subject: [PATCH 120/569] Changed "" to QString()

---
 interface/src/Application.h                        | 2 +-
 interface/src/scripting/WindowScriptingInterface.h | 4 ++--
 interface/src/ui/Snapshot.cpp                      | 2 +-
 interface/src/ui/Snapshot.h                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index 471f3103b8..33f784a07f 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -267,7 +267,7 @@ public:
     float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
     // Note that takeSnapshot has a default value, as this method is used internally.
-    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = "");
+    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
     void takeSecondaryCameraSnapshot(const QString& filename);
 
     void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 41310c45fd..b38d27aac5 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -357,13 +357,13 @@ public slots:
      * var aspect = 1920 / 1080;
      * Window.takeSnapshot(notify, animated, aspect);
      */
-    void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = "");
+    void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
 
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
      */
-    void takeSecondaryCameraSnapshot(const QString& filename = "");
+    void takeSecondaryCameraSnapshot(const QString& filename = QString());
 
     /**jsdoc
      * Emit a {@link Window.connectionAdded|connectionAdded} or a {@link Window.connectionError|connectionError} signal that
diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index c1e077a980..9b3089d78d 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -108,7 +108,7 @@ QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QSt
 	// 'jpg" is appended, as the image is saved in jpg format.  This is the case for all snapshots
 	//       (see definition of FILENAME_PATH_FORMAT)
     QString filename;
-    if (userSelectedFilename != "") {
+    if (!userSelectedFilename.isNull()) {
         filename = userSelectedFilename + ".jpg";
     } else {
         filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT));
diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h
index edbfe5d272..62d3ed3db8 100644
--- a/interface/src/ui/Snapshot.h
+++ b/interface/src/ui/Snapshot.h
@@ -51,7 +51,7 @@ public slots:
     Q_INVOKABLE QString getSnapshotsLocation();
     Q_INVOKABLE void setSnapshotsLocation(const QString& location);
 private:
-    static QFile* savedFileForSnapshot(QImage & image, bool isTemporary, const QString& userSelectedFilename = "");
+    static QFile* savedFileForSnapshot(QImage & image, bool isTemporary, const QString& userSelectedFilename = QString());
 };
 
 #endif // hifi_Snapshot_h

From 7d5502eb929bd4347824992df3a17fe7748109b7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 26 Jun 2017 09:38:51 -0700
Subject: [PATCH 121/569] Migrating QML rendering off the main thread

---
 android/app/CMakeLists.txt                    |    2 +-
 interface/CMakeLists.txt                      |    4 +-
 interface/src/Application.cpp                 |  150 ++-
 interface/src/Application.h                   |    2 +
 .../src/scripting/LimitlessConnection.cpp     |    4 +-
 interface/src/ui/AvatarInputs.cpp             |    1 -
 interface/src/ui/Stats.cpp                    |    1 -
 interface/src/ui/overlays/Web3DOverlay.cpp    |    6 +-
 libraries/entities-renderer/CMakeLists.txt    |    2 +-
 .../src/RenderableWebEntityItem.cpp           |   18 +-
 libraries/gl/src/gl/GLHelpers.cpp             |   47 +
 libraries/gl/src/gl/GLHelpers.h               |   11 +-
 libraries/gpu-gl/src/gpu/gl/GLShared.cpp      |   44 +-
 libraries/gpu-gl/src/gpu/gl/GLShared.h        |    7 +-
 .../src/gpu/gl41/GL41BackendTexture.cpp       |    4 +-
 libraries/qml/CMakeLists.txt                  |    6 +
 libraries/qml/src/qml/Logging.cpp             |   11 +
 libraries/qml/src/qml/Logging.h               |   16 +
 libraries/qml/src/qml/OffscreenSurface.cpp    |  355 +++++
 libraries/qml/src/qml/OffscreenSurface.h      |  127 ++
 libraries/qml/src/qml/impl/Profiling.cpp      |   12 +
 libraries/qml/src/qml/impl/Profiling.h        |   13 +
 libraries/qml/src/qml/impl/RenderControl.cpp  |   29 +
 libraries/qml/src/qml/impl/RenderControl.h    |   26 +
 .../qml/src/qml/impl/RenderEventHandler.cpp   |  169 +++
 .../qml/src/qml/impl/RenderEventHandler.h     |   56 +
 libraries/qml/src/qml/impl/SharedObject.cpp   |  448 +++++++
 libraries/qml/src/qml/impl/SharedObject.h     |  119 ++
 libraries/qml/src/qml/impl/TextureCache.cpp   |  152 +++
 libraries/qml/src/qml/impl/TextureCache.h     |   75 ++
 libraries/ui/CMakeLists.txt                   |    4 +-
 libraries/ui/src/OffscreenUi.cpp              |   22 +-
 libraries/ui/src/OffscreenUi.h                |    4 +-
 libraries/ui/src/ui/OffscreenQmlSurface.cpp   | 1163 +++--------------
 libraries/ui/src/ui/OffscreenQmlSurface.h     |  174 +--
 .../ui/src/ui/OffscreenQmlSurfaceCache.cpp    |    1 -
 plugins/hifiNeuron/CMakeLists.txt             |    2 +-
 plugins/oculus/CMakeLists.txt                 |    2 +-
 plugins/openvr/CMakeLists.txt                 |    2 +-
 tests/qml/CMakeLists.txt                      |   13 +
 tests/qml/qml/main.qml                        |  100 ++
 tests/qml/qml/qml/+android/UI.js              |   55 +
 tests/qml/qml/qml/+ios/UI.js                  |   55 +
 tests/qml/qml/qml/+osx/UI.js                  |   55 +
 tests/qml/qml/qml/ButtonPage.qml              |  140 ++
 tests/qml/qml/qml/InputPage.qml               |  126 ++
 tests/qml/qml/qml/ProgressPage.qml            |  102 ++
 tests/qml/qml/qml/UI.js                       |   55 +
 tests/qml/src/main.cpp                        |  198 +++
 tests/render-perf/CMakeLists.txt              |    4 +-
 50 files changed, 2918 insertions(+), 1276 deletions(-)
 create mode 100644 libraries/qml/CMakeLists.txt
 create mode 100644 libraries/qml/src/qml/Logging.cpp
 create mode 100644 libraries/qml/src/qml/Logging.h
 create mode 100644 libraries/qml/src/qml/OffscreenSurface.cpp
 create mode 100644 libraries/qml/src/qml/OffscreenSurface.h
 create mode 100644 libraries/qml/src/qml/impl/Profiling.cpp
 create mode 100644 libraries/qml/src/qml/impl/Profiling.h
 create mode 100644 libraries/qml/src/qml/impl/RenderControl.cpp
 create mode 100644 libraries/qml/src/qml/impl/RenderControl.h
 create mode 100644 libraries/qml/src/qml/impl/RenderEventHandler.cpp
 create mode 100644 libraries/qml/src/qml/impl/RenderEventHandler.h
 create mode 100644 libraries/qml/src/qml/impl/SharedObject.cpp
 create mode 100644 libraries/qml/src/qml/impl/SharedObject.h
 create mode 100644 libraries/qml/src/qml/impl/TextureCache.cpp
 create mode 100644 libraries/qml/src/qml/impl/TextureCache.h
 create mode 100644 tests/qml/CMakeLists.txt
 create mode 100644 tests/qml/qml/main.qml
 create mode 100644 tests/qml/qml/qml/+android/UI.js
 create mode 100644 tests/qml/qml/qml/+ios/UI.js
 create mode 100644 tests/qml/qml/qml/+osx/UI.js
 create mode 100644 tests/qml/qml/qml/ButtonPage.qml
 create mode 100644 tests/qml/qml/qml/InputPage.qml
 create mode 100644 tests/qml/qml/qml/ProgressPage.qml
 create mode 100644 tests/qml/qml/qml/UI.js
 create mode 100644 tests/qml/src/main.cpp

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 4c50cd8609..0ef1427306 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared networking gl gpu image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index d80bc846f0..728f1467e0 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TARGET_NAME interface)
 project(${TARGET_NAME})
 
 file(GLOB_RECURSE QML_SRC resources/qml/*.qml resources/qml/*.js)
-add_custom_target(qml SOURCES ${QML_SRC})
+add_custom_target(qmls SOURCES ${QML_SRC})
 GroupSources("resources/qml")
 
 function(JOIN VALUES GLUE OUTPUT)
@@ -208,7 +208,7 @@ link_hifi_libraries(
   pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
-  render-utils entities-renderer avatars-renderer ui auto-updater midi
+  render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers
   ui-plugins display-plugins input-plugins
   ${PLATFORM_GL_BACKEND}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3e7dd3e223..41e7f79445 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -318,7 +318,7 @@ static QTimer pingTimer;
 static bool DISABLE_WATCHDOG = true;
 #else
 static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
-static bool DISABLE_WATCHDOG = QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
+static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
 #endif
 
 #if defined(USE_GLES)
@@ -427,10 +427,6 @@ public:
     void run() override {
         while (!_quit) {
             QThread::sleep(HEARTBEAT_UPDATE_INTERVAL_SECS);
-            // Don't do heartbeat detection under nsight
-            if (nsightActive() || _paused) {
-                continue;
-            }
             uint64_t lastHeartbeat = _heartbeat; // sample atomic _heartbeat, because we could context switch away and have it updated on us
             uint64_t now = usecTimestampNow();
             auto lastHeartbeatAge = (now > lastHeartbeat) ? now - lastHeartbeat : 0;
@@ -797,6 +793,8 @@ std::shared_ptr<Cube3DOverlay> _keyboardFocusHighlight{ nullptr };
 OverlayID _keyboardFocusHighlightID{ UNKNOWN_OVERLAY_ID };
 
 
+OffscreenGLCanvas* _qmlShareContext { nullptr };
+
 // FIXME hack access to the internal share context for the Chromium helper
 // Normally we'd want to use QWebEngine::initialize(), but we can't because
 // our primary context is a QGLWidget, which can't easily be initialized to share
@@ -2259,18 +2257,37 @@ void Application::initializeGL() {
         _isGLInitialized = true;
     }
 
+    // Build a shared canvas / context for the Chromium processes
     _glWidget->makeCurrent();
 
 #if !defined(DISABLE_QML)
+    // Chromium rendering uses some GL functions that prevent nSight from capturing
+    // frames, so we only create the shared context if nsight is NOT active.
     if (!nsightActive()) {
         _chromiumShareContext = new OffscreenGLCanvas();
         _chromiumShareContext->setObjectName("ChromiumShareContext");
         _chromiumShareContext->create(_glWidget->qglContext());
         _chromiumShareContext->makeCurrent();
+        if (!_chromiumShareContext->makeCurrent()) {
+            qCWarning(interfaceapp, "Unable to make chromium shared context current");
+        }
         qt_gl_set_global_share_context(_chromiumShareContext->getContext());
+    } else {
+        qCWarning(interfaceapp) << "nSIGHT detected, disabling chrome rendering";
     }
 #endif
 
+    // Build a shared canvas / context for the QML rendering
+    _glWidget->makeCurrent();
+    _qmlShareContext = new OffscreenGLCanvas();
+    _qmlShareContext->setObjectName("QmlShareContext");
+    _qmlShareContext->create(_glWidget->qglContext());
+    if (!_qmlShareContext->makeCurrent()) {
+        qCWarning(interfaceapp, "Unable to make QML shared context current");
+    }
+    OffscreenQmlSurface::setSharedContext(_qmlShareContext->getContext());
+    _qmlShareContext->doneCurrent();
+
     _glWidget->makeCurrent();
     gpu::Context::init<gpu::gl::GLBackend>();
     qApp->setProperty(hifi::properties::gl::MAKE_PROGRAM_CALLBACK,
@@ -2313,20 +2330,23 @@ void Application::initializeGL() {
     if (!_offscreenContext->makeCurrent()) {
         qFatal("Unable to make offscreen context current");
     }
+    _offscreenContext->doneCurrent();
+    _renderEventHandler = new RenderEventHandler(_glWidget->qglContext());
 
     // The UI can't be created until the primary OpenGL
     // context is created, because it needs to share
     // texture resources
     // Needs to happen AFTER the render engine initialization to access its configuration
+    if (!_offscreenContext->makeCurrent()) {
+        qFatal("Unable to make offscreen context current");
+    }
+
     initializeUi();
     qCDebug(interfaceapp, "Initialized Offscreen UI.");
-    _glWidget->makeCurrent();
-
-
-    // call Menu getInstance static method to set up the menu
-    // Needs to happen AFTER the QML UI initialization
-    _window->setMenuBar(Menu::getInstance());
 
+    if (!_offscreenContext->makeCurrent()) {
+        qFatal("Unable to make offscreen context current");
+    }
     init();
     qCDebug(interfaceapp, "init() complete.");
 
@@ -2337,7 +2357,6 @@ void Application::initializeGL() {
 
     _idleLoopStdev.reset();
 
-    _renderEventHandler = new RenderEventHandler(_glWidget->qglContext());
 
     // Restore the primary GL content for the main thread
     if (!_offscreenContext->makeCurrent()) {
@@ -2404,9 +2423,11 @@ void Application::initializeUi() {
         tabletScriptingInterface->getTablet(SYSTEM_TABLET);
     }
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->create();
 
-    auto surfaceContext = offscreenUi->getSurfaceContext();
+    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
+        this, &Application::onDesktopRootContextCreated);
+    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
+        this, &Application::onDesktopRootItemCreated);
 
     offscreenUi->setProxyWindow(_window->windowHandle());
     // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
@@ -2416,14 +2437,53 @@ void Application::initializeUi() {
     // do better detection in the offscreen UI of what has focus
     offscreenUi->setNavigationFocused(false);
 
-    auto engine = surfaceContext->engine();
-    connect(engine, &QQmlEngine::quit, [] {
-        qApp->quit();
-    });
-
-
     setupPreferences();
 
+    _glWidget->installEventFilter(offscreenUi.data());
+    offscreenUi->setMouseTranslator([=](const QPointF& pt) {
+        QPointF result = pt;
+        auto displayPlugin = getActiveDisplayPlugin();
+        if (displayPlugin->isHmd()) {
+            getApplicationCompositor().handleRealMouseMoveEvent(false);
+            auto resultVec = getApplicationCompositor().getReticlePosition();
+            result = QPointF(resultVec.x, resultVec.y);
+        }
+        return result.toPoint();
+    });
+    offscreenUi->resume();
+    connect(_window, &MainWindow::windowGeometryChanged, [this](const QRect& r){
+        resizeGL();
+    });
+
+    // This will set up the input plugins UI
+    _activeInputPlugins.clear();
+    foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
+        if (KeyboardMouseDevice::NAME == inputPlugin->getName()) {
+            _keyboardMouseDevice = std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin);
+        }
+        if (TouchscreenDevice::NAME == inputPlugin->getName()) {
+            _touchscreenDevice = std::dynamic_pointer_cast<TouchscreenDevice>(inputPlugin);
+        }
+    }
+
+    auto compositorHelper = DependencyManager::get<CompositorHelper>();
+    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
+        if (isHMDMode()) {
+            showCursor(compositorHelper->getAllowMouseCapture() ?
+                       Cursor::Manager::lookupIcon(_preferredCursor.get()) :
+                       Cursor::Icon::SYSTEM);
+        }
+    });
+
+    // Pre-create a couple of Web3D overlays to speed up tablet UI
+    auto offscreenSurfaceCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
+    offscreenSurfaceCache->reserve(TabletScriptingInterface::QML, 1);
+    offscreenSurfaceCache->reserve(Web3DOverlay::QML, 2);
+}
+
+
+void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
+    auto engine = surfaceContext->engine();
     // in Qt 5.10.0 there is already an "Audio" object in the QML context
     // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
     surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
@@ -2505,48 +2565,12 @@ void Application::initializeUi() {
         surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
     }
 
-
-    _glWidget->installEventFilter(offscreenUi.data());
-    offscreenUi->setMouseTranslator([=](const QPointF& pt) {
-        QPointF result = pt;
-        auto displayPlugin = getActiveDisplayPlugin();
-        if (displayPlugin->isHmd()) {
-            getApplicationCompositor().handleRealMouseMoveEvent(false);
-            auto resultVec = getApplicationCompositor().getReticlePosition();
-            result = QPointF(resultVec.x, resultVec.y);
-        }
-        return result.toPoint();
-    });
-    offscreenUi->resume();
-    connect(_window, &MainWindow::windowGeometryChanged, [this](const QRect& r){
-        resizeGL();
-    });
-
-    // This will set up the input plugins UI
-    _activeInputPlugins.clear();
-    foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
-        if (KeyboardMouseDevice::NAME == inputPlugin->getName()) {
-            _keyboardMouseDevice = std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin);
-        }
-        if (TouchscreenDevice::NAME == inputPlugin->getName()) {
-            _touchscreenDevice = std::dynamic_pointer_cast<TouchscreenDevice>(inputPlugin);
-        }
-    }
     _window->setMenuBar(new Menu());
+}
 
-    auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
-        if (isHMDMode()) {
-            showCursor(compositorHelper->getAllowMouseCapture() ?
-                       Cursor::Manager::lookupIcon(_preferredCursor.get()) :
-                       Cursor::Icon::SYSTEM);
-        }
-    });
-
-    // Pre-create a couple of Web3D overlays to speed up tablet UI
-    auto offscreenSurfaceCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
-    offscreenSurfaceCache->reserve(TabletScriptingInterface::QML, 1);
-    offscreenSurfaceCache->reserve(Web3DOverlay::QML, 2);
+void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
+    Stats::show();
+    AvatarInputs::show();
 }
 
 void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
@@ -2785,6 +2809,8 @@ void Application::resizeGL() {
         QMutexLocker viewLocker(&_viewMutex);
         _myCamera.loadViewFrustum(_viewFrustum);
     }
+
+    DependencyManager::get<OffscreenUi>()->resize(fromGlm(displayPlugin->getRecommendedUiSize()));
 }
 
 void Application::handleSandboxStatus(QNetworkReply* reply) {
@@ -3993,7 +4019,7 @@ void Application::idle() {
         // Bit of a hack since there's no device pixel ratio change event I can find.
         if (offscreenUi->size() != fromGlm(uiSize)) {
             qCDebug(interfaceapp) << "Device pixel ratio changed, triggering resize to " << uiSize;
-            offscreenUi->resize(fromGlm(uiSize), true);
+            offscreenUi->resize(fromGlm(uiSize));
             _offscreenContext->makeCurrent();
         }
     }
@@ -7325,9 +7351,7 @@ void Application::updateDisplayMode() {
             action->setChecked(true);
         }
 
-        _offscreenContext->makeCurrent();
         offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
-        _offscreenContext->makeCurrent();
         getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
         _displayPlugin = newDisplayPlugin;
         connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent, Qt::DirectConnection);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ddb8ce11e5..0f6f0b21db 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -389,6 +389,8 @@ public slots:
     void setPreferredCursor(const QString& cursor);
 
 private slots:
+    void onDesktopRootItemCreated(QQuickItem* qmlContext);
+    void onDesktopRootContextCreated(QQmlContext* qmlContext);
     void showDesktop();
     void clearDomainOctreeDetails();
     void clearDomainAvatars();
diff --git a/interface/src/scripting/LimitlessConnection.cpp b/interface/src/scripting/LimitlessConnection.cpp
index b9f4eacd4b..f504136489 100644
--- a/interface/src/scripting/LimitlessConnection.cpp
+++ b/interface/src/scripting/LimitlessConnection.cpp
@@ -1,8 +1,10 @@
+#include "LimitlessConnection.h"
+
+#include <QJsonObject>
 #include <QJsonDocument>
 #include <QJsonArray>
 #include <src/InterfaceLogging.h>
 #include <src/ui/AvatarInputs.h>
-#include "LimitlessConnection.h"
 #include "LimitlessVoiceRecognitionScriptingInterface.h"
 
 LimitlessConnection::LimitlessConnection() :
diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp
index ccac6d7207..fe79bec6ef 100644
--- a/interface/src/ui/AvatarInputs.cpp
+++ b/interface/src/ui/AvatarInputs.cpp
@@ -25,7 +25,6 @@ Setting::Handle<bool> showAudioToolsSetting { QStringList { "AvatarInputs", "sho
 AvatarInputs* AvatarInputs::getInstance() {
     if (!INSTANCE) {
         AvatarInputs::registerType();
-        AvatarInputs::show();
         Q_ASSERT(INSTANCE);
     }
     return INSTANCE;
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index c157898e74..80f57bfe0e 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -48,7 +48,6 @@ QString getTextureMemoryPressureModeString();
 Stats* Stats::getInstance() {
     if (!INSTANCE) {
         Stats::registerType();
-        Stats::show();
         Q_ASSERT(INSTANCE);
     }
     return INSTANCE;
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 5fb4d58340..9560748b9f 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -135,7 +135,11 @@ void Web3DOverlay::destroyWebSurface() {
 
     QObject::disconnect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
     QObject::disconnect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, this, &Web3DOverlay::webEventReceived);
-    DependencyManager::get<OffscreenQmlSurfaceCache>()->release(QML, _webSurface);
+    auto offscreenCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
+    // FIXME prevents crash on shutdown, but we shoudln't have to do this check
+    if (offscreenCache) {
+        offscreenCache->release(QML, _webSurface);
+    }
     _webSurface.reset();
 }
 
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 4b94757dec..4eaa16a107 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME entities-renderer)
 AUTOSCRIBE_SHADER_LIB(gpu graphics procedural render render-utils)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared gpu procedural graphics model-networking script-engine render render-utils image ui pointers)
+link_hifi_libraries(shared gpu procedural graphics model-networking script-engine render render-utils image qml ui pointers)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(gl)
 include_hifi_library_headers(ktx)
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index 3789cca69a..f7aaa43b7d 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -221,19 +221,17 @@ bool WebEntityRenderer::buildWebSurface(const TypedEntityPointer& entity) {
         });
     };
 
-    {
-    	// FIXME use the surface cache instead of explicit creation
-        _webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
-        _webSurface->create();
-    }
-
+    // FIXME use the surface cache instead of explicit creation
+    _webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
     // FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces
     // and the current rendering load)
     _webSurface->setMaxFps(DEFAULT_MAX_FPS);
-    // FIXME - Keyboard HMD only: Possibly add "HMDinfo" object to context for WebView.qml.
-    _webSurface->getSurfaceContext()->setContextProperty("desktop", QVariant());
-    // Let us interact with the keyboard
-    _webSurface->getSurfaceContext()->setContextProperty("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
+    QObject::connect(_webSurface.data(), &OffscreenQmlSurface::rootContextCreated, [this](QQmlContext* surfaceContext) {
+        // FIXME - Keyboard HMD only: Possibly add "HMDinfo" object to context for WebView.qml.
+        surfaceContext->setContextProperty("desktop", QVariant());
+        // Let us interact with the keyboard
+        surfaceContext->setContextProperty("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
+    });
     _fadeStartTime = usecTimestampNow();
     loadSourceURL();
     _webSurface->resume();
diff --git a/libraries/gl/src/gl/GLHelpers.cpp b/libraries/gl/src/gl/GLHelpers.cpp
index d5e3bb5a67..e3f85afa78 100644
--- a/libraries/gl/src/gl/GLHelpers.cpp
+++ b/libraries/gl/src/gl/GLHelpers.cpp
@@ -81,6 +81,10 @@ bool isRenderThread() {
     return QThread::currentThread() == RENDER_THREAD;
 }
 
+#if defined(Q_OS_ANDROID)
+#define USE_GLES 1
+#endif
+
 namespace gl {
     void withSavedContext(const std::function<void()>& f) {
         // Save the original GL context, because creating a QML surface will create a new context
@@ -91,4 +95,47 @@ namespace gl {
             savedContext->makeCurrent(savedSurface);
         }
     }
+
+    bool checkGLError(const char* name) {
+        GLenum error = glGetError();
+        if (!error) {
+            return false;
+        } 
+        switch (error) {
+            case GL_INVALID_ENUM:
+                qCWarning(glLogging) << "GLBackend" << name << ": An unacceptable value is specified for an enumerated argument.The offending command is ignored and has no other side effect than to set the error flag.";
+                break;
+            case GL_INVALID_VALUE:
+                qCWarning(glLogging) << "GLBackend" << name << ": A numeric argument is out of range.The offending command is ignored and has no other side effect than to set the error flag";
+                break;
+            case GL_INVALID_OPERATION:
+                qCWarning(glLogging) << "GLBackend" << name << ": The specified operation is not allowed in the current state.The offending command is ignored and has no other side effect than to set the error flag..";
+                break;
+            case GL_INVALID_FRAMEBUFFER_OPERATION:
+                qCWarning(glLogging) << "GLBackend" << name << ": The framebuffer object is not complete.The offending command is ignored and has no other side effect than to set the error flag.";
+                break;
+            case GL_OUT_OF_MEMORY:
+                qCWarning(glLogging) << "GLBackend" << name << ": There is not enough memory left to execute the command.The state of the GL is undefined, except for the state of the error flags, after this error is recorded.";
+                break;
+#if !defined(USE_GLES)
+            case GL_STACK_UNDERFLOW:
+                qCWarning(glLogging) << "GLBackend" << name << ": An attempt has been made to perform an operation that would cause an internal stack to underflow.";
+                break;
+            case GL_STACK_OVERFLOW:
+                qCWarning(glLogging) << "GLBackend" << name << ": An attempt has been made to perform an operation that would cause an internal stack to overflow.";
+                break;
+#endif
+        }
+        return true;
+    }
+
+
+    bool checkGLErrorDebug(const char* name) {
+#ifdef DEBUG
+        return checkGLError(name);
+#else
+        Q_UNUSED(name);
+        return false;
+#endif
+    }
 }
diff --git a/libraries/gl/src/gl/GLHelpers.h b/libraries/gl/src/gl/GLHelpers.h
index 581bb09360..dcbf5a9e77 100644
--- a/libraries/gl/src/gl/GLHelpers.h
+++ b/libraries/gl/src/gl/GLHelpers.h
@@ -13,6 +13,8 @@
 #include <functional>
 #include <QJsonObject>
 
+#include "GLLogging.h"
+
 // 16 bits of depth precision
 #define DEFAULT_GL_DEPTH_BUFFER_BITS 16
 // 8 bits of stencil buffer (typically you really only need 1 bit for functionality
@@ -43,6 +45,13 @@ bool isRenderThread();
 
 namespace gl {
     void withSavedContext(const std::function<void()>& f);
-}
+
+    bool checkGLError(const char* name);
+
+    bool checkGLErrorDebug(const char* name);
+
+} // namespace gl
+
+#define CHECK_GL_ERROR() ::gl::checkGLErrorDebug(__FUNCTION__)
 
 #endif
diff --git a/libraries/gpu-gl/src/gpu/gl/GLShared.cpp b/libraries/gpu-gl/src/gpu/gl/GLShared.cpp
index 5a015cd550..dc1c8036b0 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLShared.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLShared.cpp
@@ -8,12 +8,13 @@
 #include "GLShared.h"
 
 #include <mutex>
+#include <fstream>
 
 #include <QtCore/QThread>
 
+#include <gl/GLHelpers.h>
 #include <GPUIdent.h>
 #include <NumericalConstants.h>
-#include <fstream>
 
 Q_LOGGING_CATEGORY(gpugllogging, "hifi.gpu.gl")
 Q_LOGGING_CATEGORY(trace_render_gpu_gl, "trace.render.gpu.gl")
@@ -21,47 +22,6 @@ Q_LOGGING_CATEGORY(trace_render_gpu_gl_detail, "trace.render.gpu.gl.detail")
 
 namespace gpu { namespace gl {
 
-bool checkGLError(const char* name) {
-    GLenum error = glGetError();
-    if (!error) {
-        return false;
-    } else {
-        switch (error) {
-        case GL_INVALID_ENUM:
-            qCWarning(gpugllogging) << "GLBackend::" << name << ": An unacceptable value is specified for an enumerated argument.The offending command is ignored and has no other side effect than to set the error flag.";
-            break;
-        case GL_INVALID_VALUE:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": A numeric argument is out of range.The offending command is ignored and has no other side effect than to set the error flag";
-            break;
-        case GL_INVALID_OPERATION:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": The specified operation is not allowed in the current state.The offending command is ignored and has no other side effect than to set the error flag..";
-            break;
-        case GL_INVALID_FRAMEBUFFER_OPERATION:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": The framebuffer object is not complete.The offending command is ignored and has no other side effect than to set the error flag.";
-            break;
-        case GL_OUT_OF_MEMORY:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": There is not enough memory left to execute the command.The state of the GL is undefined, except for the state of the error flags, after this error is recorded.";
-            break;
-        case GL_STACK_UNDERFLOW:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": An attempt has been made to perform an operation that would cause an internal stack to underflow.";
-            break;
-        case GL_STACK_OVERFLOW:
-            qCWarning(gpugllogging) << "GLBackend" << name << ": An attempt has been made to perform an operation that would cause an internal stack to overflow.";
-            break;
-        }
-        return true;
-    }
-}
-
-bool checkGLErrorDebug(const char* name) {
-#ifdef DEBUG
-    return checkGLError(name);
-#else
-    Q_UNUSED(name);
-    return false;
-#endif
-}
-
 gpu::Size getFreeDedicatedMemory() {
     Size result { 0 };
     static bool nvidiaMemorySupported { true };
diff --git a/libraries/gpu-gl/src/gpu/gl/GLShared.h b/libraries/gpu-gl/src/gpu/gl/GLShared.h
index 6c2948a736..ccdf0a5c41 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLShared.h
+++ b/libraries/gpu-gl/src/gpu/gl/GLShared.h
@@ -9,6 +9,7 @@
 #define hifi_gpu_GLShared_h
 
 #include <gl/Config.h>
+#include <gl/GLHelpers.h>
 #include <gpu/Forward.h>
 #include <gpu/Format.h>
 #include <gpu/Context.h>
@@ -114,9 +115,6 @@ static const GLenum ELEMENT_TYPE_TO_GL[gpu::NUM_TYPES] = {
     GL_INT_2_10_10_10_REV,
 };
 
-bool checkGLError(const char* name = nullptr);
-bool checkGLErrorDebug(const char* name = nullptr);
-
 class GLBackend;
 
 template <typename GPUType>
@@ -141,11 +139,8 @@ class GLShader;
 class GLTexture;
 struct ShaderObject;
 
-
 } } // namespace gpu::gl 
 
-#define CHECK_GL_ERROR() gpu::gl::checkGLErrorDebug(__FUNCTION__)
-
 #endif
 
 
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
index 925e83bb77..2834a8463c 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
@@ -413,7 +413,7 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
         sourceMip._size = (GLint)faceTargets.size() * sourceMip._faceSize;
         sourceMip._offset = bufferOffset;
         bufferOffset += sourceMip._size;
-        gpu::gl::checkGLError();
+        ::gl::checkGLError(__FUNCTION__);
     }
     (void)CHECK_GL_ERROR();
 
@@ -458,7 +458,7 @@ void copyCompressedTexGPUMem(const gpu::Texture& texture, GLenum texTarget, GLui
 #endif
             glCompressedTexSubImage2D(faceTargets[f], destLevel, 0, 0, sourceMip._width, sourceMip._height, internalFormat,
                 sourceMip._faceSize, BUFFER_OFFSET(sourceMip._offset + f * sourceMip._faceSize));
-            gpu::gl::checkGLError();
+            ::gl::checkGLError(__FUNCTION__);
         }
     }
 
diff --git a/libraries/qml/CMakeLists.txt b/libraries/qml/CMakeLists.txt
new file mode 100644
index 0000000000..f8ed7acdb1
--- /dev/null
+++ b/libraries/qml/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(TARGET_NAME qml)
+setup_hifi_library(Multimedia Network Qml Quick WebChannel WebSockets ${PLATFORM_QT_COMPONENTS})
+link_hifi_libraries(shared networking gl)
+
+# Required for some low level GL interaction in the OffscreenQMLSurface
+target_opengl()
diff --git a/libraries/qml/src/qml/Logging.cpp b/libraries/qml/src/qml/Logging.cpp
new file mode 100644
index 0000000000..c809cab944
--- /dev/null
+++ b/libraries/qml/src/qml/Logging.cpp
@@ -0,0 +1,11 @@
+//
+//  Created by Bradley Austin Davis 2016/03/01
+//  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
+//
+
+#include "Logging.h"
+
+Q_LOGGING_CATEGORY(qmlLogging, "hifi.qml")
diff --git a/libraries/qml/src/qml/Logging.h b/libraries/qml/src/qml/Logging.h
new file mode 100644
index 0000000000..487566701d
--- /dev/null
+++ b/libraries/qml/src/qml/Logging.h
@@ -0,0 +1,16 @@
+//
+//  Created by Bradley Austin Davis 2018/01/04
+//  Copyright 2013-2018 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_Controllers_Logging_h
+#define hifi_Controllers_Logging_h
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(qmlLogging)
+
+#endif
diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
new file mode 100644
index 0000000000..87fc8a3025
--- /dev/null
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -0,0 +1,355 @@
+//
+//  Created by Bradley Austin Davis on 2015-05-13
+//  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
+//
+#include "OffscreenSurface.h"
+
+#include <unordered_set>
+#include <unordered_map>
+
+#include <QtCore/QThread>
+#include <QtQml/QtQml>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlComponent>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickRenderControl>
+
+#include <GLMHelpers.h>
+
+#include <gl/OffscreenGLCanvas.h>
+#include <shared/ReadWriteLockable.h>
+
+#include "Logging.h"
+#include "impl/SharedObject.h"
+#include "impl/TextureCache.h"
+
+using namespace hifi::qml;
+using namespace hifi::qml::impl;
+
+static uvec2 clampSize(const uvec2& size, uint32_t maxDimension) {
+    return glm::clamp(size, glm::uvec2(1), glm::uvec2(maxDimension));
+}
+
+static QSize clampSize(const QSize& qsize, uint32_t maxDimension) {
+    return fromGlm(clampSize(toGlm(qsize), maxDimension));
+}
+
+const QmlContextObjectCallback OffscreenSurface::DEFAULT_CONTEXT_CALLBACK = [](QQmlContext*, QQuickItem*) {};
+
+void OffscreenSurface::initializeEngine(QQmlEngine* engine) {
+}
+
+using namespace hifi::qml::impl;
+
+size_t OffscreenSurface::getUsedTextureMemory() {
+    return SharedObject::getTextureCache().getUsedTextureMemory();
+}
+
+void OffscreenSurface::setSharedContext(QOpenGLContext* sharedContext) {
+    SharedObject::setSharedContext(sharedContext);
+}
+
+std::function<void(uint32_t, void*)> OffscreenSurface::getDiscardLambda() {
+    return [](uint32_t texture, void* fence) {
+        SharedObject::getTextureCache().releaseTexture({ texture, static_cast<GLsync>(fence) });
+    };
+}
+
+OffscreenSurface::OffscreenSurface()
+    : _sharedObject(new impl::SharedObject()) {
+}
+
+OffscreenSurface::~OffscreenSurface() {
+    disconnect(qApp);
+    _sharedObject->destroy();
+}
+
+bool OffscreenSurface::fetchTexture(TextureAndFence& textureAndFence) {
+    if (!_sharedObject) {
+        return false;
+    }
+    hifi::qml::impl::TextureAndFence typedTextureAndFence;
+    bool result = _sharedObject->fetchTexture(typedTextureAndFence);
+    textureAndFence = typedTextureAndFence;
+    return result;
+}
+
+void OffscreenSurface::resize(const QSize& newSize_) {
+    const uint32_t MAX_OFFSCREEN_DIMENSION = 4096;
+    _sharedObject->setSize(clampSize(newSize_, MAX_OFFSCREEN_DIMENSION));
+}
+
+QQuickItem* OffscreenSurface::getRootItem() {
+    return _sharedObject->getRootItem();
+}
+
+void OffscreenSurface::clearCache() {
+    _sharedObject->getContext()->engine()->clearComponentCache();
+}
+
+QPointF OffscreenSurface::mapToVirtualScreen(const QPointF& originalPoint) {
+    return _mouseTranslator(originalPoint);
+}
+
+///////////////////////////////////////////////////////
+//
+// Event handling customization
+//
+
+bool OffscreenSurface::filterEnabled(QObject* originalDestination, QEvent* event) const {
+    if (!_sharedObject || _sharedObject->getWindow() == originalDestination) {
+        return false;
+    }
+    // Only intercept events while we're in an active state
+    if (_sharedObject->isPaused()) {
+        return false;
+    }
+    return true;
+}
+
+bool OffscreenSurface::eventFilter(QObject* originalDestination, QEvent* event) {
+    if (!filterEnabled(originalDestination, event)) {
+        return false;
+    }
+#ifdef DEBUG
+    // Don't intercept our own events, or we enter an infinite recursion
+    {
+        auto rootItem = _sharedObject->getRootItem();
+        auto quickWindow = _sharedObject->getWindow();
+        QObject* recurseTest = originalDestination;
+        while (recurseTest) {
+            Q_ASSERT(recurseTest != rootItem && recurseTest != quickWindow);
+            recurseTest = recurseTest->parent();
+        }
+    }
+#endif
+
+    switch (event->type()) {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease: {
+            event->ignore();
+            if (QCoreApplication::sendEvent(_sharedObject->getWindow(), event)) {
+                return event->isAccepted();
+            }
+            break;
+        }
+
+        case QEvent::Wheel: {
+            QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
+            QPointF transformedPos = mapToVirtualScreen(wheelEvent->pos());
+            QWheelEvent mappedEvent(transformedPos, wheelEvent->delta(), wheelEvent->buttons(), wheelEvent->modifiers(),
+                                    wheelEvent->orientation());
+            mappedEvent.ignore();
+            if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &mappedEvent)) {
+                return mappedEvent.isAccepted();
+            }
+            break;
+        }
+        case QEvent::MouseMove: {
+            QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
+            QPointF transformedPos = mapToVirtualScreen(mouseEvent->localPos());
+            QMouseEvent mappedEvent(mouseEvent->type(), transformedPos, mouseEvent->screenPos(), mouseEvent->button(),
+                                    mouseEvent->buttons(), mouseEvent->modifiers());
+            if (event->type() == QEvent::MouseMove) {
+                // TODO - this line necessary for the QML Tooltop to work (which is not currently being used), but it causes interface to crash on launch on a fresh install
+                // need to investigate into why this crash is happening.
+                //_qmlContext->setContextProperty("lastMousePosition", transformedPos);
+            }
+            mappedEvent.ignore();
+            if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &mappedEvent)) {
+                return mappedEvent.isAccepted();
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    return false;
+}
+
+void OffscreenSurface::pause() {
+    _sharedObject->pause();
+}
+
+void OffscreenSurface::resume() {
+    _sharedObject->resume();
+}
+
+bool OffscreenSurface::isPaused() const {
+    return _sharedObject->isPaused();
+}
+
+void OffscreenSurface::setProxyWindow(QWindow* window) {
+    _sharedObject->setProxyWindow(window);
+}
+
+QObject* OffscreenSurface::getEventHandler() {
+    return getWindow();
+}
+
+QQuickWindow* OffscreenSurface::getWindow() {
+    return _sharedObject->getWindow();
+}
+
+QSize OffscreenSurface::size() const {
+    return _sharedObject->getSize();
+}
+
+QQmlContext* OffscreenSurface::getSurfaceContext() {
+    return _sharedObject->getContext();
+}
+
+void OffscreenSurface::setMaxFps(uint8_t maxFps) {
+    _sharedObject->setMaxFps(maxFps);
+}
+
+void OffscreenSurface::load(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) {
+    loadInternal(qmlSource, false, parent, [callback](QQmlContext* context, QQuickItem* newItem) {
+        QJSValue(callback).call(QJSValueList() << context->engine()->newQObject(newItem));
+    });
+}
+
+void OffscreenSurface::load(const QUrl& qmlSource, bool createNewContext, const QmlContextObjectCallback& callback) {
+    loadInternal(qmlSource, createNewContext, nullptr, callback);
+}
+
+void OffscreenSurface::loadInNewContext(const QUrl& qmlSource, const QmlContextObjectCallback& callback) {
+    load(qmlSource, true, callback);
+}
+
+void OffscreenSurface::load(const QUrl& qmlSource, const QmlContextObjectCallback& callback) {
+    load(qmlSource, false, callback);
+}
+
+void OffscreenSurface::load(const QString& qmlSourceFile, const QmlContextObjectCallback& callback) {
+    return load(QUrl(qmlSourceFile), callback);
+}
+
+void OffscreenSurface::loadInternal(const QUrl& qmlSource,
+                                    bool createNewContext,
+                                    QQuickItem* parent,
+                                    const QmlContextObjectCallback& callback) {
+    if (QThread::currentThread() != thread()) {
+        qFatal("Called load on a non-surface thread");
+    }
+    // Synchronous loading may take a while; restart the deadlock timer
+    QMetaObject::invokeMethod(qApp, "updateHeartbeat", Qt::DirectConnection);
+
+    if (!getRootItem()) {
+        _sharedObject->create(this);
+    }
+
+    QUrl finalQmlSource = qmlSource;
+    if ((qmlSource.isRelative() && !qmlSource.isEmpty()) || qmlSource.scheme() == QLatin1String("file")) {
+        finalQmlSource = getSurfaceContext()->resolvedUrl(qmlSource);
+    }
+
+    if (!getRootItem()) {
+        _sharedObject->setObjectName(finalQmlSource.toString());
+    }
+
+    auto targetContext = contextForUrl(finalQmlSource, parent, createNewContext);
+    auto qmlComponent = new QQmlComponent(getSurfaceContext()->engine(), finalQmlSource, QQmlComponent::PreferSynchronous);
+    if (qmlComponent->isLoading()) {
+        connect(qmlComponent, &QQmlComponent::statusChanged, this,
+                [=](QQmlComponent::Status) { finishQmlLoad(qmlComponent, targetContext, parent, callback); });
+        return;
+    }
+
+    finishQmlLoad(qmlComponent, targetContext, parent, callback);
+}
+
+void OffscreenSurface::finishQmlLoad(QQmlComponent* qmlComponent,
+                                     QQmlContext* qmlContext,
+                                     QQuickItem* parent,
+                                     const QmlContextObjectCallback& callback) {
+    disconnect(qmlComponent, &QQmlComponent::statusChanged, this, 0);
+    if (qmlComponent->isError()) {
+        for (const auto& error : qmlComponent->errors()) {
+            qCWarning(qmlLogging) << error.url() << error.line() << error;
+        }
+        qmlComponent->deleteLater();
+        return;
+    }
+
+    QObject* newObject = qmlComponent->beginCreate(qmlContext);
+    if (qmlComponent->isError()) {
+        for (const auto& error : qmlComponent->errors()) {
+            qCWarning(qmlLogging) << error.url() << error.line() << error;
+        }
+        if (!getRootItem()) {
+            qFatal("Unable to finish loading QML root");
+        }
+        qmlComponent->deleteLater();
+        return;
+    }
+
+    if (!newObject) {
+        if (!getRootItem()) {
+            qFatal("Could not load object as root item");
+            return;
+        }
+        qCWarning(qmlLogging) << "Unable to load QML item";
+        return;
+    }
+
+    qmlContext->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
+
+    // All quick items should be focusable
+    QQuickItem* newItem = qobject_cast<QQuickItem*>(newObject);
+    if (newItem) {
+        // Make sure we make items focusable (critical for
+        // supporting keyboard shortcuts)
+        newItem->setFlag(QQuickItem::ItemIsFocusScope, true);
+    }
+
+    bool rootCreated = getRootItem() != nullptr;
+
+    // Make sure we will call callback for this codepath
+    // Call this before qmlComponent->completeCreate() otherwise ghost window appears
+    // If we already have a root, just set a couple of flags and the ancestry
+    if (rootCreated) {
+        callback(qmlContext, newItem);
+        if (!parent) {
+            parent = getRootItem();
+        }
+        // Allow child windows to be destroyed from JS
+        QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership);
+        newObject->setParent(parent);
+        newItem->setParentItem(parent);
+    } else {
+        // The root item is ready. Associate it with the window.
+        _sharedObject->setRootItem(newItem);
+    }
+
+    qmlComponent->completeCreate();
+    qmlComponent->deleteLater();
+
+    onItemCreated(qmlContext, newItem);
+    connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
+
+    if (!rootCreated) {
+        onRootCreated();
+        emit rootItemCreated(newItem);
+        // Call this callback after rootitem is set, otherwise VrMenu wont work
+        callback(qmlContext, newItem);
+    }
+}
+
+QQmlContext* OffscreenSurface::contextForUrl(const QUrl& qmlSource, QQuickItem* parent, bool forceNewContext) {
+    QQmlContext* targetContext = parent ? QQmlEngine::contextForObject(parent) : getSurfaceContext();
+    if (!targetContext) {
+        targetContext = getSurfaceContext();
+    }
+
+    if (getRootItem() && forceNewContext) {
+        targetContext = new QQmlContext(targetContext, targetContext->engine());
+    }
+
+    return targetContext;
+}
diff --git a/libraries/qml/src/qml/OffscreenSurface.h b/libraries/qml/src/qml/OffscreenSurface.h
new file mode 100644
index 0000000000..555f2ee6a4
--- /dev/null
+++ b/libraries/qml/src/qml/OffscreenSurface.h
@@ -0,0 +1,127 @@
+//
+//  Created by Bradley Austin Davis on 2015-04-04
+//  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
+//
+#pragma once
+#ifndef hifi_qml_OffscreenSurface_h
+#define hifi_qml_OffscreenSurface_h
+
+#include <atomic>
+#include <queue>
+#include <map>
+#include <functional>
+
+#include <QtCore/QUrl>
+#include <QtCore/QSize>
+#include <QtCore/QPointF>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QTimer>
+
+#include <QtQml/QJSValue>
+
+class QWindow;
+class QOpenGLContext;
+class QQmlContext;
+class QQmlEngine;
+class QQmlComponent;
+class QQuickWindow;
+class QQuickItem;
+class OffscreenQmlSharedObject;
+
+namespace hifi { namespace qml {
+
+namespace impl {
+class SharedObject;
+}
+
+using QmlContextObjectCallback = ::std::function<void(QQmlContext*, QQuickItem*)>;
+
+class OffscreenSurface : public QObject {
+    Q_OBJECT
+
+public:
+    static const QmlContextObjectCallback DEFAULT_CONTEXT_CALLBACK;
+
+    using TextureAndFence = std::pair<uint32_t, void*>;
+    using MouseTranslator = std::function<QPoint(const QPointF&)>;
+
+    static void setSharedContext(QOpenGLContext* context);
+
+    OffscreenSurface();
+    virtual ~OffscreenSurface();
+
+    QSize size() const;
+    virtual void resize(const QSize& size);
+    void clearCache();
+
+    void setMaxFps(uint8_t maxFps);
+    // Optional values for event handling
+    void setProxyWindow(QWindow* window);
+    void setMouseTranslator(const MouseTranslator& mouseTranslator) { _mouseTranslator = mouseTranslator; }
+
+    void pause();
+    void resume();
+    bool isPaused() const;
+
+    QQuickItem* getRootItem();
+    QQuickWindow* getWindow();
+    QObject* getEventHandler();
+    QQmlContext* getSurfaceContext();
+
+    // Checks to see if a new texture is available.  If one is, the function returns true and
+    // textureAndFence will be populated with the texture ID and a fence which will be signalled
+    // when the texture is safe to read.
+    // Returns false if no new texture is available
+    bool fetchTexture(TextureAndFence& textureAndFence);
+
+    static std::function<void(uint32_t, void*)> getDiscardLambda();
+    static size_t getUsedTextureMemory();
+    QPointF mapToVirtualScreen(const QPointF& originalPoint);
+
+    // For use from QML/JS
+    Q_INVOKABLE void load(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback);
+
+    // For use from C++
+    Q_INVOKABLE void load(const QUrl& qmlSource, const QmlContextObjectCallback& callback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void load(const QUrl& qmlSource, bool createNewContext, const QmlContextObjectCallback& callback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void load(const QString& qmlSourceFile, const QmlContextObjectCallback& callback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void loadInNewContext(const QUrl& qmlSource, const QmlContextObjectCallback& callback = DEFAULT_CONTEXT_CALLBACK);
+
+public slots:
+    virtual void onFocusObjectChanged(QObject* newFocus) {}
+
+signals:
+    void rootContextCreated(QQmlContext* rootContext);
+    void rootItemCreated(QQuickItem* rootContext);
+
+protected:
+    bool eventFilter(QObject* originalDestination, QEvent* event) override;
+    bool filterEnabled(QObject* originalDestination, QEvent* event) const;
+
+    virtual void initializeEngine(QQmlEngine* engine);
+    virtual void loadInternal(const QUrl& qmlSource,
+                      bool createNewContext,
+                      QQuickItem* parent,
+                      const QmlContextObjectCallback& callback) final;
+    virtual void finishQmlLoad(QQmlComponent* qmlComponent,
+                       QQmlContext* qmlContext,
+                       QQuickItem* parent,
+                       const QmlContextObjectCallback& onQmlLoadedCallback) final;
+
+    virtual void onRootCreated() {}
+    virtual void onItemCreated(QQmlContext* context, QQuickItem* newItem) {}
+    virtual void onRootContextCreated(QQmlContext* qmlContext) {}
+
+    virtual QQmlContext* contextForUrl(const QUrl& qmlSource, QQuickItem* parent, bool forceNewContext);
+private:
+    MouseTranslator _mouseTranslator{ [](const QPointF& p) { return p.toPoint(); } };
+    friend class hifi::qml::impl::SharedObject;
+    impl::SharedObject* const _sharedObject;
+};
+
+}}  // namespace hifi::qml
+
+#endif
diff --git a/libraries/qml/src/qml/impl/Profiling.cpp b/libraries/qml/src/qml/impl/Profiling.cpp
new file mode 100644
index 0000000000..488b45b082
--- /dev/null
+++ b/libraries/qml/src/qml/impl/Profiling.cpp
@@ -0,0 +1,12 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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 "Profiling.h"
+
+Q_LOGGING_CATEGORY(trace_render_qml, "trace.render.qml")
+Q_LOGGING_CATEGORY(trace_render_qml_gl, "trace.render.qml.gl")
diff --git a/libraries/qml/src/qml/impl/Profiling.h b/libraries/qml/src/qml/impl/Profiling.h
new file mode 100644
index 0000000000..c1f3decedc
--- /dev/null
+++ b/libraries/qml/src/qml/impl/Profiling.h
@@ -0,0 +1,13 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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
+//
+#pragma once
+
+#include <Profile.h>
+
+Q_DECLARE_LOGGING_CATEGORY(trace_render_qml)
+Q_DECLARE_LOGGING_CATEGORY(trace_render_qml_gl)
diff --git a/libraries/qml/src/qml/impl/RenderControl.cpp b/libraries/qml/src/qml/impl/RenderControl.cpp
new file mode 100644
index 0000000000..885d719df5
--- /dev/null
+++ b/libraries/qml/src/qml/impl/RenderControl.cpp
@@ -0,0 +1,29 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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 "RenderControl.h"
+
+using namespace hifi::qml::impl;
+
+RenderControl::RenderControl(QObject* parent) : QQuickRenderControl(parent) {
+
+}
+
+void RenderControl::setRenderWindow(QWindow* renderWindow) {
+    _renderWindow = renderWindow;
+}
+
+QWindow* RenderControl::renderWindow(QPoint* offset) {
+    if (nullptr == _renderWindow) {
+        return QQuickRenderControl::renderWindow(offset);
+    }
+    if (nullptr != offset) {
+        offset->rx() = offset->ry() = 0;
+    }
+    return _renderWindow;
+}
+
diff --git a/libraries/qml/src/qml/impl/RenderControl.h b/libraries/qml/src/qml/impl/RenderControl.h
new file mode 100644
index 0000000000..e63196b6ee
--- /dev/null
+++ b/libraries/qml/src/qml/impl/RenderControl.h
@@ -0,0 +1,26 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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
+//
+#pragma once
+
+#include <QtQuick/QQuickRenderControl>
+
+namespace hifi { namespace qml { namespace impl {
+
+class RenderControl : public QQuickRenderControl {
+public:
+    RenderControl(QObject* parent = Q_NULLPTR);
+    void setRenderWindow(QWindow* renderWindow);
+
+protected:
+    QWindow* renderWindow(QPoint* offset) override;
+
+private:
+    QWindow* _renderWindow{ nullptr };
+};
+
+}}}  // namespace hifi::qml::impl
diff --git a/libraries/qml/src/qml/impl/RenderEventHandler.cpp b/libraries/qml/src/qml/impl/RenderEventHandler.cpp
new file mode 100644
index 0000000000..cce1b68da9
--- /dev/null
+++ b/libraries/qml/src/qml/impl/RenderEventHandler.cpp
@@ -0,0 +1,169 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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 "RenderEventHandler.h"
+
+#include <gl/Config.h>
+#include <gl/QOpenGLContextWrapper.h>
+
+#include <QtQuick/QQuickWindow>
+
+#include <shared/NsightHelpers.h>
+#include "Profiling.h"
+#include "SharedObject.h"
+#include "TextureCache.h"
+#include "RenderControl.h"
+#include "../Logging.h"
+
+using namespace hifi::qml::impl;
+
+bool RenderEventHandler::event(QEvent* e) {
+    switch (static_cast<OffscreenEvent::Type>(e->type())) {
+        case OffscreenEvent::Render:
+            onRender();
+            return true;
+
+        case OffscreenEvent::Initialize:
+            onInitalize();
+            return true;
+
+        case OffscreenEvent::Quit:
+            onQuit();
+            return true;
+
+        default:
+            break;
+    }
+    return QObject::event(e);
+}
+
+RenderEventHandler::RenderEventHandler(SharedObject* shared, QThread* targetThread)
+    : _shared(shared) {
+    // Create the GL canvas in the same thread as the share canvas
+    if (!_canvas.create(SharedObject::getSharedContext())) {
+        qFatal("Unable to create new offscreen GL context");
+    }
+
+    moveToThread(targetThread);
+    _canvas.moveToThreadWithContext(targetThread);
+}
+
+void RenderEventHandler::onInitalize() {
+    if (_shared->isQuit()) {
+        return;
+    }
+
+    if (!_canvas.makeCurrent()) {
+        qFatal("Unable to make QML rendering context current on render thread");
+    }
+    _shared->initializeRenderControl(_canvas.getContext());
+}
+
+void RenderEventHandler::resize() {
+    PROFILE_RANGE(render_qml_gl, __FUNCTION__);
+    auto targetSize = _shared->getSize();
+    if (_currentSize != targetSize) {
+        auto& offscreenTextures = SharedObject::getTextureCache();
+        // Release hold on the textures of the old size
+        if (_currentSize != QSize()) {
+            _shared->releaseTextureAndFence();
+            offscreenTextures.releaseSize(_currentSize);
+        }
+
+        _currentSize = targetSize;
+
+        // Acquire the new texture size
+        if (_currentSize != QSize()) {
+            qCDebug(qmlLogging) << "Upating offscreen textures to " << _currentSize.width() << " x " << _currentSize.height();
+            offscreenTextures.acquireSize(_currentSize);
+            if (_depthStencil) {
+                glDeleteRenderbuffers(1, &_depthStencil);
+                _depthStencil = 0;
+            }
+            glGenRenderbuffers(1, &_depthStencil);
+            glBindRenderbuffer(GL_RENDERBUFFER, _depthStencil);
+            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, _currentSize.width(), _currentSize.height());
+            if (!_fbo) {
+                glGenFramebuffers(1, &_fbo);
+            }
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+            glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencil);
+            glViewport(0, 0, _currentSize.width(), _currentSize.height());
+            glScissor(0, 0, _currentSize.width(), _currentSize.height());
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+        }
+    }
+}
+
+void RenderEventHandler::onRender() {
+    if (_shared->isQuit()) {
+        return;
+    }
+
+    if (_canvas.getContext() != QOpenGLContextWrapper::currentContext()) {
+        qFatal("QML rendering context not current on render thread");
+    }
+
+    PROFILE_RANGE(render_qml_gl, __FUNCTION__);
+
+    if (!_shared->preRender()) {
+        return;
+    }
+
+    resize();
+
+    {
+        PROFILE_RANGE(render_qml_gl, "render");
+        GLuint texture = SharedObject::getTextureCache().acquireTexture(_currentSize);
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+        glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, 0);
+        if (nsightActive()) {
+            glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        } else {
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+            _shared->_quickWindow->setRenderTarget(_fbo, _currentSize);
+            _shared->_renderControl->render();
+        }
+        _shared->_lastRenderTime = usecTimestampNow();
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glGenerateMipmap(GL_TEXTURE_2D);
+        glBindTexture(GL_TEXTURE_2D, 0);
+        auto fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        glFlush();
+        _shared->updateTextureAndFence({ texture, fence });
+        // Fence will be used in another thread / context, so a flush is required
+        _shared->_quickWindow->resetOpenGLState();
+    }
+}
+
+void RenderEventHandler::onQuit() {
+    if (_canvas.getContext() != QOpenGLContextWrapper::currentContext()) {
+        qFatal("QML rendering context not current on render thread");
+    }
+
+    if (_depthStencil) {
+        glDeleteRenderbuffers(1, &_depthStencil);
+        _depthStencil = 0;
+    }
+
+    if (_fbo) {
+        glDeleteFramebuffers(1, &_fbo);
+        _fbo = 0;
+    }
+
+    _shared->shutdownRendering(_canvas, _currentSize);
+    // Release the reference to the shared object.  This will allow it to 
+    // be destroyed (should happen on it's own thread).
+    _shared->deleteLater();
+
+    deleteLater();
+
+    QThread::currentThread()->quit();
+}
diff --git a/libraries/qml/src/qml/impl/RenderEventHandler.h b/libraries/qml/src/qml/impl/RenderEventHandler.h
new file mode 100644
index 0000000000..d1e079cc85
--- /dev/null
+++ b/libraries/qml/src/qml/impl/RenderEventHandler.h
@@ -0,0 +1,56 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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
+//
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QThread>
+#include <QtGui/qevent.h>
+
+#include <GLMHelpers.h>
+#include <gl/OffscreenGLCanvas.h>
+
+namespace hifi { namespace qml { namespace impl {
+
+class SharedObject;
+
+class OffscreenEvent : public QEvent {
+public:
+    enum Type {
+        Initialize = QEvent::User + 1,
+        Render,
+        Quit
+    };
+
+    OffscreenEvent(Type type) : QEvent(static_cast<QEvent::Type>(type)) {}
+};
+
+/* The render event handler lives on the QML rendering thread for a given surface
+ * (each surface has a dedicated rendering thread) and handles events of type 
+ * OffscreenEvent to do one time initialization or destruction, and to actually 
+ * perform the render.  
+ */
+class RenderEventHandler : public QObject {
+public:
+    RenderEventHandler(SharedObject* shared, QThread* targetThread);
+
+private:
+    bool event(QEvent* e) override;
+    void onInitalize();
+    void resize();
+    void onRender();
+    void onQuit();
+
+    SharedObject* const _shared;
+    OffscreenGLCanvas _canvas;
+    QSize _currentSize;
+
+    uint32_t _fbo{ 0 };
+    uint32_t _depthStencil{ 0 };
+};
+
+}}}  // namespace hifi::qml::impl
diff --git a/libraries/qml/src/qml/impl/SharedObject.cpp b/libraries/qml/src/qml/impl/SharedObject.cpp
new file mode 100644
index 0000000000..f2af5bd036
--- /dev/null
+++ b/libraries/qml/src/qml/impl/SharedObject.cpp
@@ -0,0 +1,448 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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 "SharedObject.h"
+
+#include <QtCore/qlogging.h>
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/QQuickItem>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
+
+#include <QtGui/QOpenGLContext>
+
+#include <NumericalConstants.h>
+#include <shared/NsightHelpers.h>
+#include <gl/QOpenGLContextWrapper.h>
+
+#include "../OffscreenSurface.h"
+#include "../Logging.h"
+
+#include "Profiling.h"
+#include "RenderControl.h"
+#include "RenderEventHandler.h"
+#include "TextureCache.h"
+
+// Time between receiving a request to render the offscreen UI actually triggering
+// the render.  Could possibly be increased depending on the framerate we expect to
+// achieve.
+// This has the effect of capping the framerate at 200
+static const int MIN_TIMER_MS = 5;
+
+using namespace hifi::qml;
+using namespace hifi::qml::impl;
+
+TextureCache offscreenTextures;
+
+TextureCache& SharedObject::getTextureCache() {
+    return offscreenTextures;
+}
+
+#define OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY "com.highfidelity.qml.gl.sharedContext"
+void SharedObject::setSharedContext(QOpenGLContext* sharedContext) {
+    qApp->setProperty(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY, QVariant::fromValue<void*>(sharedContext));
+    if (QOpenGLContextWrapper::currentContext() != sharedContext) {
+        qFatal("The shared context must be the current context when setting");
+    }
+}
+
+QOpenGLContext* SharedObject::getSharedContext() {
+    return static_cast<QOpenGLContext*>(qApp->property(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY).value<void*>());
+}
+
+SharedObject::SharedObject() {
+    // Create render control
+    _renderControl = new RenderControl();
+
+    // Create a QQuickWindow that is associated with our render control.
+    // This window never gets created or shown, meaning that it will never get an underlying native (platform) window.
+    // NOTE: Must be created on the main thread so that OffscreenQmlSurface can send it events
+    // NOTE: Must be created on the rendering thread or it will refuse to render,
+    //       so we wait until after its ctor to move object/context to this thread.
+    QQuickWindow::setDefaultAlphaBuffer(true);
+    _quickWindow = new QQuickWindow(_renderControl);
+    _quickWindow->setColor(QColor(255, 255, 255, 0));
+    _quickWindow->setClearBeforeRendering(true);
+
+    QObject::connect(qApp, &QCoreApplication::aboutToQuit, this, &SharedObject::onAboutToQuit);
+}
+
+SharedObject::~SharedObject() {
+    if (_quickWindow) {
+        _quickWindow->destroy();
+        _quickWindow = nullptr;
+    }
+
+    if (_renderControl) {
+        _renderControl->deleteLater();
+        _renderControl = nullptr;
+    }
+
+    if (_renderThread) {
+        _renderThread->quit();
+        _renderThread->deleteLater();
+    }
+
+    if (_rootItem) {
+        _rootItem->deleteLater();
+        _rootItem = nullptr;
+    }
+
+    releaseEngine(_qmlContext->engine());
+}
+
+void SharedObject::create(OffscreenSurface* surface) {
+    if (_rootItem) {
+        qFatal("QML surface root item already set");
+    }
+
+    QObject::connect(_quickWindow, &QQuickWindow::focusObjectChanged, surface, &OffscreenSurface::onFocusObjectChanged);
+
+    // Create a QML engine.
+    auto qmlEngine = acquireEngine(surface);
+    _qmlContext = new QQmlContext(qmlEngine->rootContext(), qmlEngine);
+    surface->onRootContextCreated(_qmlContext);
+    emit surface->rootContextCreated(_qmlContext);
+
+    if (!qmlEngine->incubationController()) {
+        qmlEngine->setIncubationController(_quickWindow->incubationController());
+    }
+    _qmlContext->setContextProperty("offscreenWindow", QVariant::fromValue(_quickWindow));
+}
+
+void SharedObject::setRootItem(QQuickItem* rootItem) {
+    _rootItem = rootItem;
+    _rootItem->setSize(_quickWindow->size());
+
+    // Create the render thread
+    _renderThread = new QThread();
+    _renderThread->setObjectName(objectName());
+    _renderThread->start();
+
+    // Create event handler for the render thread
+    _renderObject = new RenderEventHandler(this, _renderThread);
+    QCoreApplication::postEvent(this, new OffscreenEvent(OffscreenEvent::Initialize));
+
+    QObject::connect(_renderControl, &QQuickRenderControl::renderRequested, this, &SharedObject::requestRender);
+    QObject::connect(_renderControl, &QQuickRenderControl::sceneChanged, this, &SharedObject::requestRenderSync);
+}
+
+void SharedObject::destroy() {
+    if (_quit) {
+        return;
+    }
+
+    if (!_rootItem) {
+        deleteLater();
+        return;
+    }
+
+
+    _paused = true;
+    if (_renderTimer) {
+        QObject::disconnect(_renderTimer);
+        _renderTimer->deleteLater();
+    }
+
+    QObject::disconnect(_renderControl);
+    QObject::disconnect(qApp);
+
+    QMutexLocker lock(&_mutex);
+    _quit = true;
+    QCoreApplication::postEvent(_renderObject, new OffscreenEvent(OffscreenEvent::Quit));
+}
+
+
+#define SINGLE_QML_ENGINE 0
+
+
+#if SINGLE_QML_ENGINE
+static QQmlEngine* globalEngine{ nullptr };
+static size_t globalEngineRefCount{ 0 };
+#endif
+
+QQmlEngine* SharedObject::acquireEngine(OffscreenSurface* surface) {
+    Q_ASSERT(QThread::currentThread() == qApp->thread());
+
+    QQmlEngine* result = nullptr;
+    if (QThread::currentThread() != qApp->thread()) {
+        qCWarning(qmlLogging) << "Cannot acquire QML engine on any thread but the main thread";
+    }
+
+#if SINGLE_QML_ENGINE
+    if (!globalEngine) {
+        Q_ASSERT(0 == globalEngineRefCount);
+        globalEngine = new QQmlEngine();
+        surface->initializeQmlEngine(result);
+        ++globalEngineRefCount;
+    }
+    result = globalEngine;
+#else
+    result = new QQmlEngine();
+    surface->initializeEngine(result);
+#endif
+
+    return result;
+}
+
+void SharedObject::releaseEngine(QQmlEngine* engine) {
+    Q_ASSERT(QThread::currentThread() == qApp->thread());
+#if SINGLE_QML_ENGINE
+    Q_ASSERT(0 != globalEngineRefCount);
+    if (0 == --globalEngineRefCount) {
+        globalEngine->deleteLater();
+        globalEngine = nullptr;
+    }
+#else
+    engine->deleteLater();
+#endif
+}
+
+bool SharedObject::event(QEvent* e) {
+    switch (static_cast<OffscreenEvent::Type>(e->type())) {
+        case OffscreenEvent::Initialize:
+            onInitialize();
+            return true;
+
+        case OffscreenEvent::Render:
+            onRender();
+            return true;
+
+        default:
+            break;
+    }
+    return QObject::event(e);
+}
+
+// Called by the render event handler, from the render thread
+void SharedObject::initializeRenderControl(QOpenGLContext* context) {
+    if (context->shareContext() != getSharedContext()) {
+        qFatal("QML rendering context has no share context");
+    }
+
+    if (!nsightActive()) {
+        _renderControl->initialize(context);
+    }
+}
+
+void SharedObject::releaseTextureAndFence() {
+    QMutexLocker lock(&_mutex);
+    // If the most recent texture was unused, we can directly recycle it
+    if (_latestTextureAndFence.first) {
+        offscreenTextures.releaseTexture(_latestTextureAndFence);
+        _latestTextureAndFence = TextureAndFence{ 0, 0 };
+    }
+}
+
+void SharedObject::setRenderTarget(uint32_t fbo, const QSize& size) {
+    _quickWindow->setRenderTarget(fbo, size);
+}
+
+QSize SharedObject::getSize() const {
+    QMutexLocker locker(&_mutex);
+    return _size;
+}
+
+void SharedObject::setSize(const QSize& size) {
+    if (getSize() == size) {
+        return;
+    }
+
+    {
+        QMutexLocker locker(&_mutex);
+        _size = size;
+    }
+
+    qCDebug(qmlLogging) << "Offscreen UI resizing to " << size.width() << "x" << size.height();
+    _quickWindow->setGeometry(QRect(QPoint(), size));
+    _quickWindow->contentItem()->setSize(size);
+
+    if (_rootItem) {
+        _qmlContext->setContextProperty("surfaceSize", size);
+        _rootItem->setSize(size);
+    }
+
+    requestRenderSync();
+}
+
+bool SharedObject::preRender() {
+    QMutexLocker lock(&_mutex);
+    if (_paused) {
+        if (_syncRequested) {
+            wake();
+        }
+        return false;
+    }
+
+    if (_syncRequested) {
+        bool syncResult = true;
+        if (!nsightActive()) {
+            PROFILE_RANGE(render_qml_gl, "sync")
+            syncResult = _renderControl->sync();
+        }
+        wake();
+        if (!syncResult) {
+            return false;
+        }
+        _syncRequested = false;
+    }
+
+    return true;
+}
+
+void SharedObject::shutdownRendering(OffscreenGLCanvas& canvas, const QSize& size) {
+    QMutexLocker locker(&_mutex);
+    if (size != QSize(0, 0)) {
+        offscreenTextures.releaseSize(size);
+    }
+    _renderControl->invalidate();
+    canvas.doneCurrent();
+    wake();
+}
+
+bool SharedObject::isQuit() {
+    QMutexLocker locker(&_mutex);
+    return _quit;
+}
+
+void SharedObject::requestRender() {
+    // Don't queue multiple renders
+    if (_renderRequested) {
+        return;
+    }
+    _renderRequested = true;
+}
+
+void SharedObject::requestRenderSync() {
+    if (_quit) {
+        return;
+    }
+
+    {
+        QMutexLocker lock(&_mutex);
+        _syncRequested = true;
+    }
+
+    requestRender();
+}
+
+bool SharedObject::fetchTexture(TextureAndFence& textureAndFence) {
+    QMutexLocker locker(&_mutex);
+    if (0 == _latestTextureAndFence.first) {
+        return false;
+    }
+    textureAndFence = { 0, 0 };
+    std::swap(textureAndFence, _latestTextureAndFence);
+    return true;
+}
+
+void SharedObject::setProxyWindow(QWindow* window) {
+    _proxyWindow = window;
+    _renderControl->setRenderWindow(window);
+}
+
+void SharedObject::wait() {
+    _cond.wait(&_mutex);
+}
+
+void SharedObject::wake() {
+    _cond.wakeOne();
+}
+
+void SharedObject::onInitialize() {
+    // Associate root item with the window.
+    _rootItem->setParentItem(_quickWindow->contentItem());
+    _renderControl->prepareThread(_renderThread);
+
+    // Set up the render thread
+    QCoreApplication::postEvent(_renderObject, new OffscreenEvent(OffscreenEvent::Initialize));
+
+    requestRender();
+
+    // Set up timer to trigger renders
+    _renderTimer = new QTimer(this);
+    QObject::connect(_renderTimer, &QTimer::timeout, this, &SharedObject::onTimer);
+
+    _renderTimer->setTimerType(Qt::PreciseTimer);
+    _renderTimer->setInterval(MIN_TIMER_MS);  // 5ms, Qt::PreciseTimer required
+    _renderTimer->start();
+}
+
+void SharedObject::onRender() {
+    PROFILE_RANGE(render_qml, __FUNCTION__);
+    if (_quit) {
+        return;
+    }
+
+    QMutexLocker lock(&_mutex);
+    if (_syncRequested) {
+        lock.unlock();
+        _renderControl->polishItems();
+        lock.relock();
+        QCoreApplication::postEvent(_renderObject, new OffscreenEvent(OffscreenEvent::Render));
+        // sync and render request, main and render threads must be synchronized
+        wait();
+    } else {
+        QCoreApplication::postEvent(_renderObject, new OffscreenEvent(OffscreenEvent::Render));
+    }
+    _renderRequested = false;
+}
+
+void SharedObject::onTimer() {
+    offscreenTextures.report();
+    if (!_renderRequested) {
+        return;
+    }
+
+    {
+        QMutexLocker locker(&_mutex);
+        // Don't queue more than one frame at a time
+        if (0 != _latestTextureAndFence.first) {
+            return;
+        }
+    }
+
+    {
+        auto minRenderInterval = USECS_PER_SECOND / _maxFps;
+        auto lastInterval = usecTimestampNow() - _lastRenderTime;
+        // Don't exceed the framerate limit
+        if (lastInterval < minRenderInterval) {
+            return;
+        }
+    }
+
+    QCoreApplication::postEvent(this, new OffscreenEvent(OffscreenEvent::Render));
+}
+
+void SharedObject::onAboutToQuit() {
+    destroy();
+}
+
+void SharedObject::updateTextureAndFence(const TextureAndFence& newTextureAndFence) {
+    QMutexLocker locker(&_mutex);
+    // If the most recent texture was unused, we can directly recycle it
+    if (_latestTextureAndFence.first) {
+        offscreenTextures.releaseTexture(_latestTextureAndFence);
+        _latestTextureAndFence = { 0, 0 };
+    }
+
+    _latestTextureAndFence = newTextureAndFence;
+}
+
+void SharedObject::pause() {
+    _paused = true;
+}
+
+void SharedObject::resume() {
+    _paused = false;
+    requestRender();
+}
+
+bool SharedObject::isPaused() const {
+    return _paused;
+}
diff --git a/libraries/qml/src/qml/impl/SharedObject.h b/libraries/qml/src/qml/impl/SharedObject.h
new file mode 100644
index 0000000000..76dde611fc
--- /dev/null
+++ b/libraries/qml/src/qml/impl/SharedObject.h
@@ -0,0 +1,119 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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
+//
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QThread>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QSize>
+
+#include "TextureCache.h"
+
+
+class QWindow;
+class QTimer;
+class QQuickWindow;
+class QQuickItem;
+class QOpenGLContext;
+class QQmlEngine;
+class QQmlContext;
+class OffscreenGLCanvas;
+
+namespace hifi { namespace qml {
+
+class OffscreenSurface;
+
+namespace impl {
+
+class RenderControl;
+class RenderEventHandler;
+
+class SharedObject : public QObject {
+    Q_OBJECT
+
+    friend class RenderEventHandler;
+
+public:
+    static void setSharedContext(QOpenGLContext* context);
+    static QOpenGLContext* getSharedContext();
+    static TextureCache& getTextureCache();
+
+    SharedObject();
+    virtual ~SharedObject();
+
+    void create(OffscreenSurface* surface);
+    void setRootItem(QQuickItem* rootItem);
+    void destroy();
+    bool isQuit();
+
+    QSize getSize() const;
+    void setSize(const QSize& size);
+    void setMaxFps(uint8_t maxFps) { _maxFps = maxFps; }
+
+    QQuickWindow* getWindow() { return _quickWindow; }
+    QQuickItem* getRootItem() { return _rootItem; }
+    QQmlContext* getContext() { return _qmlContext; }
+    void setProxyWindow(QWindow* window);
+
+    void pause();
+    void resume();
+    bool isPaused() const;
+    bool fetchTexture(TextureAndFence& textureAndFence);
+
+
+private:
+    bool event(QEvent* e) override;
+
+    bool preRender();
+    void shutdownRendering(OffscreenGLCanvas& canvas, const QSize& size);
+    // Called by the render event handler, from the render thread
+    void initializeRenderControl(QOpenGLContext* context);
+    void releaseTextureAndFence();
+    void setRenderTarget(uint32_t fbo, const QSize& size);
+
+    QQmlEngine* acquireEngine(OffscreenSurface* surface);
+    void releaseEngine(QQmlEngine* engine);
+
+    void requestRender();
+    void requestRenderSync();
+    void wait();
+    void wake();
+    void onInitialize();
+    void onRender();
+    void onTimer();
+    void onAboutToQuit();
+    void updateTextureAndFence(const TextureAndFence& newTextureAndFence);
+
+    // Texture management
+    TextureAndFence _latestTextureAndFence{ 0, 0 };
+    RenderControl* _renderControl{ nullptr };
+    RenderEventHandler* _renderObject{ nullptr };
+    QQuickWindow* _quickWindow{ nullptr };
+    QWindow* _proxyWindow{ nullptr };
+    QQuickItem* _item{ nullptr };
+    QQuickItem* _rootItem{ nullptr };
+    QQmlContext* _qmlContext{ nullptr };
+    QTimer* _renderTimer{ nullptr };
+    QThread* _renderThread{ nullptr };
+    QWaitCondition _cond;
+    mutable QMutex _mutex;
+
+    uint64_t _lastRenderTime{ 0 };
+    QSize _size{ 100, 100 };
+    uint8_t _maxFps{ 60 };
+
+    bool _renderRequested{ false };
+    bool _syncRequested{ false };
+    bool _quit{ false };
+    bool _paused{ false };
+};
+
+}  // namespace impl
+}}  // namespace hifi::qml
diff --git a/libraries/qml/src/qml/impl/TextureCache.cpp b/libraries/qml/src/qml/impl/TextureCache.cpp
new file mode 100644
index 0000000000..c649a36594
--- /dev/null
+++ b/libraries/qml/src/qml/impl/TextureCache.cpp
@@ -0,0 +1,152 @@
+#include "TextureCache.h"
+
+#include <cassert>
+
+#include <gl/Config.h>
+
+#include <QtCore/QThread>
+#include <QtCore/QCoreApplication>
+
+#include "Profiling.h"
+
+using namespace hifi::qml::impl;
+
+#if defined(Q_OS_ANDROID)
+#define USE_GLES 1
+#endif
+
+uint64_t uvec2ToUint64(const QSize& size) {
+    uint64_t result = size.width();
+    result <<= 32;
+    result |= size.height();
+    return result;
+}
+
+void TextureCache::acquireSize(const QSize& size) {
+    auto sizeKey = uvec2ToUint64(size);
+    Lock lock(_mutex);
+    auto& textureSet = _textures[sizeKey];
+    ++textureSet.clientCount;
+}
+
+void TextureCache::releaseSize(const QSize& size) {
+    auto sizeKey = uvec2ToUint64(size);
+    ValueList texturesToDelete;
+    {
+        Lock lock(_mutex);
+        assert(_textures.count(sizeKey));
+        auto& textureSet = _textures[sizeKey];
+        if (0 == --textureSet.clientCount) {
+            texturesToDelete.swap(textureSet.returnedTextures);
+            _textures.erase(sizeKey);
+        }
+    }
+    for (const auto& textureAndFence : texturesToDelete) {
+        destroy(textureAndFence);
+    }
+}
+
+uint32_t TextureCache::acquireTexture(const QSize& size) {
+    Lock lock(_mutex);
+    recycle();
+
+
+    ++_activeTextureCount;
+    auto sizeKey = uvec2ToUint64(size);
+    assert(_textures.count(sizeKey));
+    auto& textureSet = _textures[sizeKey];
+    if (!textureSet.returnedTextures.empty()) {
+        auto textureAndFence = textureSet.returnedTextures.front();
+        textureSet.returnedTextures.pop_front();
+        glWaitSync((GLsync)textureAndFence.second, 0, GL_TIMEOUT_IGNORED);
+        glDeleteSync((GLsync)textureAndFence.second);
+        return textureAndFence.first;
+    }
+    return createTexture(size);
+}
+
+void TextureCache::releaseTexture(const Value& textureAndFence) {
+    --_activeTextureCount;
+    Lock lock(_mutex);
+    _returnedTextures.push_back(textureAndFence);
+}
+
+void TextureCache::report() {
+    if (randFloat() < 0.01f) {
+        PROFILE_COUNTER(render_qml_gl, "offscreenTextures",
+                        {
+                            { "total", QVariant::fromValue(_allTextureCount.load()) },
+                            { "active", QVariant::fromValue(_activeTextureCount.load()) },
+                        });
+        PROFILE_COUNTER(render_qml_gl, "offscreenTextureMemory", { { "value", QVariant::fromValue(_totalTextureUsage) } });
+    }
+}
+
+size_t TextureCache::getUsedTextureMemory() {
+    return _totalTextureUsage;
+}
+
+size_t TextureCache::getMemoryForSize(const QSize& size) {
+    // Base size + mips
+    return static_cast<size_t>(((size.width() * size.height()) << 2) * 1.33f);
+}
+
+void TextureCache::destroyTexture(uint32_t texture) {
+    --_allTextureCount;
+    auto size = _textureSizes[texture];
+    assert(getMemoryForSize(size) <= _totalTextureUsage);
+    _totalTextureUsage -= getMemoryForSize(size);
+    _textureSizes.erase(texture);
+    // FIXME prevents crash on shutdown, but we should migrate to a global functions object owned by the shared context.
+    glDeleteTextures(1, &texture);
+}
+
+void TextureCache::destroy(const Value& textureAndFence) {
+    const auto& fence = textureAndFence.second;
+    // FIXME prevents crash on shutdown, but we should migrate to a global functions object owned by the shared context.
+    glWaitSync((GLsync)fence, 0, GL_TIMEOUT_IGNORED);
+    glDeleteSync((GLsync)fence);
+    destroyTexture(textureAndFence.first);
+}
+
+uint32_t TextureCache::createTexture(const QSize& size) {
+    // Need a new texture
+    uint32_t newTexture;
+    glGenTextures(1, &newTexture);
+    ++_allTextureCount;
+    _textureSizes[newTexture] = size;
+    _totalTextureUsage += getMemoryForSize(size);
+    glBindTexture(GL_TEXTURE_2D, newTexture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f);
+#if !defined(USE_GLES)
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -0.2f);
+#endif
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, size.width(), size.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+    return newTexture;
+}
+
+void TextureCache::recycle() {
+    // First handle any global returns
+    ValueList returnedTextures;
+    returnedTextures.swap(_returnedTextures);
+
+    for (auto textureAndFence : returnedTextures) {
+        GLuint texture = textureAndFence.first;
+        QSize size = _textureSizes[texture];
+        auto sizeKey = uvec2ToUint64(size);
+        // Textures can be returned after all surfaces of the given size have been destroyed,
+        // in which case we just destroy the texture
+        if (!_textures.count(sizeKey)) {
+            destroy(textureAndFence);
+            continue;
+        }
+        _textures[sizeKey].returnedTextures.push_back(textureAndFence);
+    }
+}
diff --git a/libraries/qml/src/qml/impl/TextureCache.h b/libraries/qml/src/qml/impl/TextureCache.h
new file mode 100644
index 0000000000..572e1cadea
--- /dev/null
+++ b/libraries/qml/src/qml/impl/TextureCache.h
@@ -0,0 +1,75 @@
+//
+//  Created by Bradley Austin Davis on 2018-01-04
+//  Copyright 2013-2018 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
+//
+#pragma once
+#ifndef hifi_QmlTextureCache_h
+#define hifi_QmlTextureCache_h
+
+#include <list>
+#include <mutex>
+#include <functional>
+#include <unordered_map>
+#include <utility>
+#include <cstdint>
+
+#include <QtCore/QSize>
+
+namespace hifi { namespace qml { namespace impl {
+
+class TextureAndFence : public std::pair<uint32_t, void*> {
+    using Parent = std::pair<uint32_t, void*>;
+public:
+    TextureAndFence() : Parent(0, 0) {}
+    TextureAndFence(uint32_t texture, void* sync) : Parent(texture, sync) {};
+};
+
+
+class TextureCache {
+public:
+    using Value = TextureAndFence;
+    using ValueList = std::list<Value>;
+    using Size = uint64_t;
+
+    struct TextureSet {
+        Size textureSize;
+        // The number of surfaces with this size
+        size_t clientCount{ 0 };
+        ValueList returnedTextures;
+    };
+
+
+    void releaseSize(const QSize& size);
+    void acquireSize(const QSize& size);
+    uint32_t acquireTexture(const QSize& size);
+    void releaseTexture(const Value& textureAndFence);
+
+    // For debugging
+    void report();
+    size_t getUsedTextureMemory();
+private:
+    static size_t getMemoryForSize(const QSize& size);
+
+    uint32_t createTexture(const QSize& size);
+    void destroyTexture(uint32_t texture);
+
+    void destroy(const Value& textureAndFence);
+    void recycle();
+
+    using Mutex = std::mutex;
+    using Lock = std::unique_lock<Mutex>;
+    std::atomic<int> _allTextureCount;
+    std::atomic<int> _activeTextureCount;
+    std::unordered_map<Size, TextureSet> _textures;
+    std::unordered_map<uint32_t, QSize> _textureSizes;
+    Mutex _mutex;
+    std::list<Value> _returnedTextures;
+    size_t _totalTextureUsage{ 0 };
+};
+
+}}}  // namespace hifi::qml::impl
+
+#endif
diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt
index d16377587c..cbafc00f82 100644
--- a/libraries/ui/CMakeLists.txt
+++ b/libraries/ui/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME ui)
-setup_hifi_library(Widgets Multimedia Network Qml Quick Script WebChannel WebSockets XmlPatterns ${PLATFORM_QT_COMPONENTS})
-link_hifi_libraries(shared networking gl audio audio-client plugins pointers)
+setup_hifi_library(OpenGL Multimedia Network Qml Quick Script WebChannel WebSockets XmlPatterns ${PLATFORM_QT_COMPONENTS})
+link_hifi_libraries(shared networking qml gl audio audio-client plugins pointers)
 include_hifi_library_headers(controllers)
 
 # Required for some low level GL interaction in the OffscreenQMLSurface
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 221f5013bf..0e3c15b965 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -127,13 +127,17 @@ void OffscreenUi::removeModalDialog(QObject* modal) {
     }
 }
 
-void OffscreenUi::create() {
-    OffscreenQmlSurface::create();
-    auto myContext = getSurfaceContext();
+void OffscreenUi::onRootContextCreated(QQmlContext* qmlContext) {
+    OffscreenQmlSurface::onRootContextCreated(qmlContext);
+    qmlContext->setContextProperty("OffscreenUi", this);
+    qmlContext->setContextProperty("offscreenFlags", offscreenFlags = new OffscreenFlags());
+    qmlContext->setContextProperty("fileDialogHelper", new FileDialogHelper());
+#ifdef DEBUG
+    qmlContext->setContextProperty("DebugQML", QVariant(true));
+#else 
+    qmlContext->setContextProperty("DebugQML", QVariant(false));
+#endif
 
-    myContext->setContextProperty("OffscreenUi", this);
-    myContext->setContextProperty("offscreenFlags", offscreenFlags = new OffscreenFlags());
-    myContext->setContextProperty("fileDialogHelper", new FileDialogHelper());
 }
 
 void OffscreenUi::show(const QUrl& url, const QString& name, std::function<void(QQmlContext*, QObject*)> f) {
@@ -656,12 +660,6 @@ void OffscreenUi::createDesktop(const QUrl& url) {
         return;
     }
 
-#ifdef DEBUG
-    getSurfaceContext()->setContextProperty("DebugQML", QVariant(true));
-#else 
-    getSurfaceContext()->setContextProperty("DebugQML", QVariant(false));
-#endif
-
     load(url, [=](QQmlContext* context, QObject* newObject) {
         Q_UNUSED(context)
         _desktop = static_cast<QQuickItem*>(newObject);
diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h
index ab3a209820..e507333840 100644
--- a/libraries/ui/src/OffscreenUi.h
+++ b/libraries/ui/src/OffscreenUi.h
@@ -57,7 +57,6 @@ class OffscreenUi : public OffscreenQmlSurface, public Dependency {
     friend class VrMenu;
 public:
     OffscreenUi();
-    virtual void create() override;
     void createDesktop(const QUrl& url);
     void show(const QUrl& url, const QString& name, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
     void hide(const QString& name);
@@ -253,6 +252,9 @@ private slots:
     void hoverEndEvent(const PointerEvent& event);
     void handlePointerEvent(const PointerEvent& event);
 
+protected:
+    void onRootContextCreated(QQmlContext* qmlContext) override;
+
 private:
     QString fileDialog(const QVariantMap& properties);
     ModalDialogListener *fileDialogAsync(const QVariantMap &properties);
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 6ff0a7d416..3c713db163 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -7,13 +7,13 @@
 //
 #include "OffscreenQmlSurface.h"
 
-#include <AudioClient.h>
-
 #include <unordered_set>
 #include <unordered_map>
 
 #include <gl/Config.h>
 
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions_4_1_Core>
 #include <QtWidgets/QWidget>
 #include <QtQml/QtQml>
 #include <QtQml/QQmlEngine>
@@ -41,11 +41,11 @@
 #include <AccountManager.h>
 #include <NetworkAccessManager.h>
 #include <GLMHelpers.h>
+#include <AudioClient.h>
 
 #include <gl/OffscreenGLCanvas.h>
 #include <gl/GLHelpers.h>
 #include <gl/Context.h>
-#include <gl/Config.h>
 #include <shared/ReadWriteLockable.h>
 
 #include "ImageProvider.h"
@@ -57,16 +57,12 @@
 #include "ToolbarScriptingInterface.h"
 #include "Logging.h"
 
-Q_LOGGING_CATEGORY(trace_render_qml, "trace.render.qml")
-Q_LOGGING_CATEGORY(trace_render_qml_gl, "trace.render.qml.gl")
-Q_LOGGING_CATEGORY(offscreenFocus, "hifi.offscreen.focus")
-
+namespace hifi { namespace qml { namespace offscreen {
 
 class OffscreenQmlWhitelist : public Dependency, private ReadWriteLockable {
     SINGLETON_DEPENDENCY
 
 public:
-
     void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback) {
         withWriteLock([&] {
             for (auto url : urls) {
@@ -90,241 +86,32 @@ public:
     }
 
 private:
-    
     QHash<QUrl, QList<QmlContextCallback>> _callbacks;
 };
 
 QSharedPointer<OffscreenQmlWhitelist> getQmlWhitelist() {
     static std::once_flag once;
-    std::call_once(once, [&] {
-        DependencyManager::set<OffscreenQmlWhitelist>();
-    });
+    std::call_once(once, [&] { DependencyManager::set<OffscreenQmlWhitelist>(); });
 
     return DependencyManager::get<OffscreenQmlWhitelist>();
 }
 
-
-void OffscreenQmlSurface::addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback) {
-    getQmlWhitelist()->addWhitelistContextHandler(urls, callback);
-}
-
-
-QmlContextObjectCallback OffscreenQmlSurface::DEFAULT_CONTEXT_CALLBACK = [](QQmlContext*, QQuickItem*) {};
-
-struct TextureSet {
-    // The number of surfaces with this size
-    size_t count { 0 };
-    std::list<OffscreenQmlSurface::TextureAndFence> returnedTextures;
-};
-
-uint64_t uvec2ToUint64(const uvec2& v) {
-    uint64_t result = v.x;
-    result <<= 32;
-    result |= v.y;
-    return result;
-}
-
 // Class to handle changing QML audio output device using another thread
 class AudioHandler : public QObject, QRunnable {
     Q_OBJECT
 public:
-    AudioHandler(QSharedPointer<OffscreenQmlSurface> surface, const QString& deviceName, QObject* parent = nullptr) : QObject(parent) {
-        _newTargetDevice = deviceName;
-        _surface = surface;
-        setAutoDelete(true);
-        if (deviceName.size() > 0) {
-            QThreadPool::globalInstance()->start(this);
-        }
-    }
-    virtual ~AudioHandler() {
-        qDebug() << "Audio Handler Destroyed";
-    }
-    void run() override {
-        if (!_surface.isNull() && _surface->getRootItem() && !_surface->getCleaned()) {
-            for (auto player : _surface->getRootItem()->findChildren<QMediaPlayer*>()) {
-                auto mediaState = player->state();
-                QMediaService *svc = player->service();
-                if (nullptr == svc) {
-                    return;
-                }
-                QAudioOutputSelectorControl *out = qobject_cast<QAudioOutputSelectorControl *>
-                    (svc->requestControl(QAudioOutputSelectorControl_iid));
-                if (nullptr == out) {
-                    return;
-                }
-                QString deviceOuput;
-                auto outputs = out->availableOutputs();
-                for (int i = 0; i < outputs.size(); i++) {
-                    QString output = outputs[i];
-                    QString description = out->outputDescription(output);
-                    if (description == _newTargetDevice) {
-                        deviceOuput = output;
-                        break;
-                    }
-                }
-                out->setActiveOutput(deviceOuput);
-                svc->releaseControl(out);
-                // if multimedia was paused, it will start playing automatically after changing audio device
-                // this will reset it back to a paused state
-                if (mediaState == QMediaPlayer::State::PausedState) {
-                    player->pause();
-                }
-                else if (mediaState == QMediaPlayer::State::StoppedState) {
-                    player->stop();
-                }
-            }
-        }
-        qDebug() << "QML Audio changed to " << _newTargetDevice;
-    }
+    AudioHandler(OffscreenQmlSurface* surface, const QString& deviceName, QObject* parent = nullptr);
+
+    virtual ~AudioHandler() { qDebug() << "Audio Handler Destroyed"; }
+
+    void run() override;
 
 private:
     QString _newTargetDevice;
     QSharedPointer<OffscreenQmlSurface> _surface;
+    std::vector<QMediaPlayer*> _players;
 };
 
-class OffscreenTextures {
-public:
-    GLuint getNextTexture(const uvec2& size) {
-        assert(QThread::currentThread() == qApp->thread());
-
-        recycle();
-
-        ++_activeTextureCount;
-        auto sizeKey = uvec2ToUint64(size);
-        assert(_textures.count(sizeKey));
-        auto& textureSet = _textures[sizeKey];
-        if (!textureSet.returnedTextures.empty()) {
-            auto textureAndFence = textureSet.returnedTextures.front();
-            textureSet.returnedTextures.pop_front();
-            waitOnFence(static_cast<GLsync>(textureAndFence.second));
-            return textureAndFence.first;
-        }
-
-        return createTexture(size);
-    }
-
-    void releaseSize(const uvec2& size) {
-        assert(QThread::currentThread() == qApp->thread());
-        auto sizeKey = uvec2ToUint64(size);
-        assert(_textures.count(sizeKey));
-        auto& textureSet = _textures[sizeKey];
-        if (0 == --textureSet.count) {
-            for (const auto& textureAndFence : textureSet.returnedTextures) {
-                destroy(textureAndFence);
-            }
-            _textures.erase(sizeKey);
-        }
-    }
-
-    void acquireSize(const uvec2& size) {
-        assert(QThread::currentThread() == qApp->thread());
-        auto sizeKey = uvec2ToUint64(size);
-        auto& textureSet = _textures[sizeKey];
-        ++textureSet.count;
-    }
-
-    // May be called on any thread
-    void releaseTexture(const OffscreenQmlSurface::TextureAndFence & textureAndFence) {
-        --_activeTextureCount;
-        Lock lock(_mutex);
-        _returnedTextures.push_back(textureAndFence);
-    }
-
-    void report() {
-        if (randFloat() < 0.01f) {
-            PROFILE_COUNTER(render_qml_gl, "offscreenTextures", {
-                { "total", QVariant::fromValue(_allTextureCount.load()) },
-                { "active", QVariant::fromValue(_activeTextureCount.load()) },
-            });
-            PROFILE_COUNTER(render_qml_gl, "offscreenTextureMemory", {
-                { "value", QVariant::fromValue(_totalTextureUsage) }
-            });
-        }
-    }
-
-    size_t getUsedTextureMemory() { return _totalTextureUsage; }
-private:
-    static void waitOnFence(GLsync fence) {
-        glWaitSync(fence, 0, GL_TIMEOUT_IGNORED);
-        glDeleteSync(fence);
-    }
-
-    static size_t getMemoryForSize(const uvec2& size) {
-        // Base size + mips
-        return static_cast<size_t>(((size.x * size.y) << 2) * 1.33f);
-    }
-
-    void destroyTexture(GLuint texture) {
-        --_allTextureCount;
-        auto size = _textureSizes[texture];
-        assert(getMemoryForSize(size) <= _totalTextureUsage);
-        _totalTextureUsage -= getMemoryForSize(size);
-        _textureSizes.erase(texture);
-        glDeleteTextures(1, &texture);
-    }
-
-    void destroy(const OffscreenQmlSurface::TextureAndFence& textureAndFence) {
-        waitOnFence(static_cast<GLsync>(textureAndFence.second));
-        destroyTexture(textureAndFence.first);
-    }
-
-    GLuint createTexture(const uvec2& size) {
-        // Need a new texture
-        uint32_t newTexture;
-        glGenTextures(1, &newTexture);
-        ++_allTextureCount;
-        _textureSizes[newTexture] = size;
-        _totalTextureUsage += getMemoryForSize(size);
-        glBindTexture(GL_TEXTURE_2D, newTexture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f);
-#if !defined(USE_GLES)
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -0.2f);
-#endif
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 8.0f);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, size.x, size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        return newTexture;
-    }
-
-    void recycle() {
-        assert(QThread::currentThread() == qApp->thread());
-        // First handle any global returns
-        std::list<OffscreenQmlSurface::TextureAndFence> returnedTextures;
-        {
-            Lock lock(_mutex);
-            returnedTextures.swap(_returnedTextures);
-        }
-
-        for (auto textureAndFence : returnedTextures) {
-            GLuint texture = textureAndFence.first;
-            uvec2 size = _textureSizes[texture];
-            auto sizeKey = uvec2ToUint64(size);
-            // Textures can be returned after all surfaces of the given size have been destroyed,
-            // in which case we just destroy the texture
-            if (!_textures.count(sizeKey)) {
-                destroy(textureAndFence);
-                continue;
-            }
-            _textures[sizeKey].returnedTextures.push_back(textureAndFence);
-        }
-    }
-
-    using Mutex = std::mutex;
-    using Lock = std::unique_lock<Mutex>;
-    std::atomic<int> _allTextureCount;
-    std::atomic<int> _activeTextureCount;
-    std::unordered_map<uint64_t, TextureSet> _textures;
-    std::unordered_map<GLuint, uvec2> _textureSizes;
-    Mutex _mutex;
-    std::list<OffscreenQmlSurface::TextureAndFence> _returnedTextures;
-    size_t _totalTextureUsage { 0 };
-} offscreenTextures;
-
 class UrlHandler : public QObject {
     Q_OBJECT
 public:
@@ -339,57 +126,22 @@ public:
     }
 };
 
-// Time between receiving a request to render the offscreen UI actually triggering
-// the render.  Could possibly be increased depending on the framerate we expect to
-// achieve.
-// This has the effect of capping the framerate at 200
-static const int MIN_TIMER_MS = 5;
-
-class QMyQuickRenderControl : public QQuickRenderControl {
-protected:
-    QWindow* renderWindow(QPoint* offset) Q_DECL_OVERRIDE{
-        if (nullptr == _renderWindow) {
-            return QQuickRenderControl::renderWindow(offset);
-        }
-        if (nullptr != offset) {
-            offset->rx() = offset->ry() = 0;
-        }
-        return _renderWindow;
-    }
-
-private:
-    QWindow* _renderWindow{ nullptr };
-    friend class OffscreenQmlRenderThread;
-    friend class OffscreenQmlSurface;
-};
-
-size_t OffscreenQmlSurface::getUsedTextureMemory() {
-    return offscreenTextures.getUsedTextureMemory();
-}
-
-class QmlNetworkAccessManager : public NetworkAccessManager {
-public:
-    friend class QmlNetworkAccessManagerFactory;
-protected:
-    QmlNetworkAccessManager(QObject* parent) : NetworkAccessManager(parent) { }
-};
-
 class QmlNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory {
 public:
-    QNetworkAccessManager* create(QObject* parent) override;
+    class QmlNetworkAccessManager : public NetworkAccessManager {
+    public:
+        QmlNetworkAccessManager(QObject* parent)
+            : NetworkAccessManager(parent){};
+    };
+    QNetworkAccessManager* create(QObject* parent) override { return new QmlNetworkAccessManager(parent); }
 };
 
-QNetworkAccessManager* QmlNetworkAccessManagerFactory::create(QObject* parent) {
-    return new QmlNetworkAccessManager(parent);
-}
-
 QString getEventBridgeJavascript() {
     // FIXME: Refactor with similar code in RenderableWebEntityItem
     QString javaScriptToInject;
     QFile webChannelFile(":qtwebchannel/qwebchannel.js");
     QFile createGlobalEventBridgeFile(PathUtils::resourcesPath() + "/html/createGlobalEventBridge.js");
-    if (webChannelFile.open(QFile::ReadOnly | QFile::Text) &&
-        createGlobalEventBridgeFile.open(QFile::ReadOnly | QFile::Text)) {
+    if (webChannelFile.open(QFile::ReadOnly | QFile::Text) && createGlobalEventBridgeFile.open(QFile::ReadOnly | QFile::Text)) {
         QString webChannelStr = QTextStream(&webChannelFile).readAll();
         QString createGlobalEventBridgeStr = QTextStream(&createGlobalEventBridgeFile).readAll();
         javaScriptToInject = webChannelStr + createGlobalEventBridgeStr;
@@ -404,28 +156,82 @@ class EventBridgeWrapper : public QObject {
     Q_PROPERTY(QObject* eventBridge READ getEventBridge CONSTANT);
 
 public:
-    EventBridgeWrapper(QObject* eventBridge, QObject* parent = nullptr) : QObject(parent), _eventBridge(eventBridge) {
-    }
+    EventBridgeWrapper(QObject* eventBridge, QObject* parent = nullptr)
+        : QObject(parent)
+        , _eventBridge(eventBridge) {}
 
-    QObject* getEventBridge() {
-        return _eventBridge;
-    }
+    QObject* getEventBridge() { return _eventBridge; }
 
 private:
     QObject* _eventBridge;
 };
 
+}}}  // namespace hifi::qml::offscreen
 
+using namespace hifi::qml::offscreen;
 
-#define SINGLE_QML_ENGINE 0
+AudioHandler::AudioHandler(OffscreenQmlSurface* surface, const QString& deviceName, QObject* parent)
+    : QObject(parent) {
+    setAutoDelete(true);
+    _newTargetDevice = deviceName;
+    auto rootItem = surface->getRootItem();
+    if (rootItem) {
+        for (auto player : rootItem->findChildren<QMediaPlayer*>()) {
+            _players.push_back(player);
+        }
+    }
 
-#if SINGLE_QML_ENGINE
-static QQmlEngine* globalEngine{ nullptr };
-static size_t globalEngineRefCount{ 0 };
-#endif
+    if (!_newTargetDevice.isEmpty() && !_players.empty()) {
+        QThreadPool::globalInstance()->start(this);
+    } else {
+        deleteLater();
+    }
+}
 
-void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
-    new QQmlFileSelector(engine, window);
+void AudioHandler::run() {
+    for (auto player : _players) {
+        auto mediaState = player->state();
+        QMediaService* svc = player->service();
+        if (nullptr == svc) {
+            continue;
+        }
+        QAudioOutputSelectorControl* out =
+            qobject_cast<QAudioOutputSelectorControl*>(svc->requestControl(QAudioOutputSelectorControl_iid));
+        if (nullptr == out) {
+            continue;
+        }
+        QString deviceOuput;
+        auto outputs = out->availableOutputs();
+        for (int i = 0; i < outputs.size(); i++) {
+            QString output = outputs[i];
+            QString description = out->outputDescription(output);
+            if (description == _newTargetDevice) {
+                deviceOuput = output;
+                break;
+            }
+        }
+        out->setActiveOutput(deviceOuput);
+        svc->releaseControl(out);
+        // if multimedia was paused, it will start playing automatically after changing audio device
+        // this will reset it back to a paused state
+        if (mediaState == QMediaPlayer::State::PausedState) {
+            player->pause();
+        } else if (mediaState == QMediaPlayer::State::StoppedState) {
+            player->stop();
+        }
+    }
+    qDebug() << "QML Audio changed to " << _newTargetDevice;
+}
+
+void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
+    Parent::initializeEngine(engine);
+
+    static std::once_flag once;
+    std::call_once(once, [] { 
+        qRegisterMetaType<TabletProxy*>();
+        qRegisterMetaType<TabletButtonProxy*>();
+        qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
+    });
 
     // register the pixmap image provider (used only for security image, for now)
     engine->addImageProvider(ImageProvider::PROVIDER_NAME, new ImageProvider());
@@ -438,432 +244,40 @@ void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
         qDebug() << path;
     }
 
-    if (!engine->incubationController()) {
-        engine->setIncubationController(window->incubationController());
-    }
     auto rootContext = engine->rootContext();
     rootContext->setContextProperty("GL", ::getGLContextData());
     rootContext->setContextProperty("urlHandler", new UrlHandler());
-    rootContext->setContextProperty("resourceDirectoryUrl", QUrl(PathUtils::resourcesUrl()));
+    rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
     rootContext->setContextProperty("pathToFonts", "../../");
     rootContext->setContextProperty("ApplicationInterface", qApp);
     auto javaScriptToInject = getEventBridgeJavascript();
     if (!javaScriptToInject.isEmpty()) {
         rootContext->setContextProperty("eventBridgeJavaScriptToInject", QVariant(javaScriptToInject));
     }
-#if !defined(Q_OS_ANDROID)
     rootContext->setContextProperty("FileTypeProfile", new FileTypeProfile(rootContext));
     rootContext->setContextProperty("HFWebEngineProfile", new HFWebEngineProfile(rootContext));
-#endif
     rootContext->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
-    static std::once_flag once;
-    std::call_once(once, [&] {
-        qRegisterMetaType<TabletProxy*>();
-        qRegisterMetaType<TabletButtonProxy*>();
-    });
     rootContext->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
     rootContext->setContextProperty("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
-    TabletProxy* tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+    TabletProxy* tablet =
+        DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
     engine->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
 }
 
-QQmlEngine* acquireEngine(QQuickWindow* window) {
-    Q_ASSERT(QThread::currentThread() == qApp->thread());
-
-    QQmlEngine* result = nullptr;
-    if (QThread::currentThread() != qApp->thread()) {
-        qCWarning(uiLogging) << "Cannot acquire QML engine on any thread but the main thread";
-    }
-    static std::once_flag once;
-    std::call_once(once, [] {
-        qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
-    });
-
-
-#if SINGLE_QML_ENGINE
-    if (!globalEngine) {
-        Q_ASSERT(0 == globalEngineRefCount);
-        globalEngine = new QQmlEngine();
-        initializeQmlEngine(result, window);
-        ++globalEngineRefCount;
-    }
-    result = globalEngine;
-#else
-    result = new QQmlEngine();
-    initializeQmlEngine(result, window);
-#endif
-
-    return result;
+void OffscreenQmlSurface::addWhitelistContextHandler(const std::initializer_list<QUrl>& urls,
+                                                     const QmlContextCallback& callback) {
+    getQmlWhitelist()->addWhitelistContextHandler(urls, callback);
 }
 
-void releaseEngine(QQmlEngine* engine) {
-    Q_ASSERT(QThread::currentThread() == qApp->thread());
-#if SINGLE_QML_ENGINE
-    Q_ASSERT(0 != globalEngineRefCount);
-    if (0 == --globalEngineRefCount) {
-        globalEngine->deleteLater();
-        globalEngine = nullptr;
-    }
-#else
-    engine->deleteLater();
-#endif
-}
-
-#define OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY "com.highfidelity.qml.gl.sharedContext"
-void OffscreenQmlSurface::setSharedContext(QOpenGLContext* sharedContext) {
-    qApp->setProperty(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY, QVariant::fromValue<void*>(sharedContext));
-}
-
-QOpenGLContext* OffscreenQmlSurface::getSharedContext() {
-    return static_cast<QOpenGLContext*>(qApp->property(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY).value<void*>());
-}
-
-void OffscreenQmlSurface::cleanup() {
-    _isCleaned = true;
-#if !defined(DISABLE_QML)
-    _canvas->makeCurrent();
-
-    _renderControl->invalidate();
-    delete _renderControl; // and invalidate
-
-    if (_depthStencil) {
-        glDeleteRenderbuffers(1, &_depthStencil);
-        _depthStencil = 0;
-    }
-    if (_fbo) {
-        glDeleteFramebuffers(1, &_fbo);
-        _fbo = 0;
-    }
-
-    offscreenTextures.releaseSize(_size);
-
-    _canvas->doneCurrent();
-#endif
-}
-
-void OffscreenQmlSurface::render() {
-#if !defined(DISABLE_QML)
-
-    if (nsightActive()) {
-        return;
-    }
-    if (_paused) {
-        return;
-    }
-
-    PROFILE_RANGE(render_qml_gl, __FUNCTION__)
-    _canvas->makeCurrent();
-
-    _renderControl->sync();
-    _quickWindow->setRenderTarget(_fbo, QSize(_size.x, _size.y));
-
-    GLuint texture = offscreenTextures.getNextTexture(_size);
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
-    glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texture, 0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    _renderControl->render();
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-    glBindTexture(GL_TEXTURE_2D, texture);
-    glGenerateMipmap(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, 0);
-
-
-    {
-        // If the most recent texture was unused, we can directly recycle it
-        auto fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        // Fence will be used in another thread / context, so a flush is required
-        glFlush();
-
-        {
-            Lock lock(_latestTextureAndFenceMutex);
-            if (_latestTextureAndFence.first) {
-                offscreenTextures.releaseTexture(_latestTextureAndFence);
-                _latestTextureAndFence = { 0, 0 };
-            }
-            _latestTextureAndFence = { texture, fence};
-        }
-    }
-
-    _quickWindow->resetOpenGLState();
-    _lastRenderTime = usecTimestampNow();
-    _canvas->doneCurrent();
-#endif
-}
-
-bool OffscreenQmlSurface::fetchTexture(TextureAndFence& textureAndFence) {
-    textureAndFence = { 0, 0 };
-
-    // Lock free early check
-    if (0 == _latestTextureAndFence.first) {
-        return false;
-    }
-
-    // Ensure writes to the latest texture are complete before before returning it for reading
-    {
-        Lock lock(_latestTextureAndFenceMutex);
-        // Double check inside the lock
-        if (0 == _latestTextureAndFence.first) {
-            return false;
-        }
-        textureAndFence = _latestTextureAndFence;
-        _latestTextureAndFence = { 0, 0 };
-    }
-    return true;
-}
-
-std::function<void(uint32_t, void*)> OffscreenQmlSurface::getDiscardLambda() {
-    return [](uint32_t texture, void* fence) {
-        offscreenTextures.releaseTexture({ texture, static_cast<GLsync>(fence) });
-    };
-}
-
-bool OffscreenQmlSurface::allowNewFrame(uint8_t fps) {
-    // If we already have a pending texture, don't render another one
-    // i.e. don't render faster than the consumer context, since it wastes
-    // GPU cycles on producing output that will never be seen
-    if (0 != _latestTextureAndFence.first) {
-        return false;
-    }
-
-    auto minRenderInterval = USECS_PER_SECOND / fps;
-    auto lastInterval = usecTimestampNow() - _lastRenderTime;
-    return (lastInterval > minRenderInterval);
-}
-
-OffscreenQmlSurface::OffscreenQmlSurface() {
-}
-
-OffscreenQmlSurface::~OffscreenQmlSurface() {
-    QObject::disconnect(&_updateTimer);
-    disconnectAudioOutputTimer();
-    QObject::disconnect(qApp);
-
-    cleanup();
-    auto engine = _qmlContext->engine();
-#if !defined(DISABLE_QML)
-    _canvas->deleteLater();
-#endif
-    _rootItem->deleteLater();
-    _quickWindow->deleteLater();
-    releaseEngine(engine);
-}
-
-void OffscreenQmlSurface::onAboutToQuit() {
-    _paused = true;
-    QObject::disconnect(&_updateTimer);
-    disconnectAudioOutputTimer();
-    
-}
-
-void OffscreenQmlSurface::disconnectAudioOutputTimer() {
-#if !defined(Q_OS_ANDROID)
-    if (_audioOutputUpdateTimer.isActive()) {
-        _audioOutputUpdateTimer.stop();
-    }
-    QObject::disconnect(&_audioOutputUpdateTimer);
-#endif
-}
-
-void OffscreenQmlSurface::create() {
-    qCDebug(uiLogging) << "Building QML surface";
-
-#if !defined(DISABLE_QML)
-    _renderControl = new QMyQuickRenderControl();
-    connect(_renderControl, &QQuickRenderControl::renderRequested, this, [this] { _render = true; });
-    connect(_renderControl, &QQuickRenderControl::sceneChanged, this, [this] { _render = _polish = true; });
-
-    QQuickWindow::setDefaultAlphaBuffer(true);
-
-    // Create a QQuickWindow that is associated with our render control.
-    // This window never gets created or shown, meaning that it will never get an underlying native (platform) window.
-    // NOTE: Must be created on the main thread so that OffscreenQmlSurface can send it events
-    // NOTE: Must be created on the rendering thread or it will refuse to render,
-    //       so we wait until after its ctor to move object/context to this thread.
-    _quickWindow = new QQuickWindow(_renderControl);
-    _quickWindow->setColor(QColor(255, 255, 255, 0));
-    _quickWindow->setClearBeforeRendering(false);
-
-    _renderControl->_renderWindow = _proxyWindow;
-    _canvas = new OffscreenGLCanvas();
-    if (!_canvas->create(getSharedContext())) {
-        qFatal("Failed to create OffscreenGLCanvas");
-        return;
-    };
-
-    // acquireEngine interrogates the GL context, so we need to have the context current here
-    if (!_canvas->makeCurrent()) {
-        qFatal("Failed to make context current for QML Renderer");
-        return;
-    }
-#else
-    _quickWindow = new QQuickWindow();
-#endif
-
-
-    connect(_quickWindow, &QQuickWindow::focusObjectChanged, this, &OffscreenQmlSurface::onFocusObjectChanged);
-
-    
-    // Create a QML engine.
-    auto qmlEngine = acquireEngine(_quickWindow);
-
-    _qmlContext = new QQmlContext(qmlEngine->rootContext());
-    _qmlContext->setBaseUrl(QUrl{ PathUtils::qmlBaseUrl() });
-    _qmlContext->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
-    _qmlContext->setContextProperty("eventBridge", this);
-    _qmlContext->setContextProperty("webEntity", this);
-    _qmlContext->setContextProperty("QmlSurface", this);
-
+void OffscreenQmlSurface::onRootContextCreated(QQmlContext* qmlContext) {
+    OffscreenSurface::onRootContextCreated(qmlContext);
+    qmlContext->setBaseUrl(PathUtils::qmlBaseUrl());
+    qmlContext->setContextProperty("eventBridge", this);
+    qmlContext->setContextProperty("webEntity", this);
+    qmlContext->setContextProperty("QmlSurface", this);
     // FIXME Compatibility mechanism for existing HTML and JS that uses eventBridgeWrapper
     // Find a way to flag older scripts using this mechanism and wanr that this is deprecated
-    _qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(this, _qmlContext));
-
-#if !defined(DISABLE_QML)
-    _renderControl->initialize(_canvas->getContext());
-#endif
-
-#if !defined(Q_OS_ANDROID)
-    // Connect with the audio client and listen for audio device changes
-    auto audioIO = DependencyManager::get<AudioClient>();
-    connect(audioIO.data(), &AudioClient::deviceChanged, this, [&](QAudio::Mode mode, const QAudioDeviceInfo& device) {
-        if (mode == QAudio::Mode::AudioOutput) {
-            QMetaObject::invokeMethod(this, "changeAudioOutputDevice", Qt::QueuedConnection, Q_ARG(QString, device.deviceName()));
-        }
-    });
-
-    // Setup the update of the QML media components with the current audio output device
-    QObject::connect(&_audioOutputUpdateTimer, &QTimer::timeout, this, [this]() {
-        if (_currentAudioOutputDevice.size() > 0) {
-            new AudioHandler(sharedFromThis(), _currentAudioOutputDevice);
-        }
-    });
-    int waitForAudioQmlMs = 200;
-    _audioOutputUpdateTimer.setInterval(waitForAudioQmlMs);
-    _audioOutputUpdateTimer.setSingleShot(true);
-#endif
-
-    // When Quick says there is a need to render, we will not render immediately. Instead,
-    // a timer with a small interval is used to get better performance.
-    QObject::connect(&_updateTimer, &QTimer::timeout, this, &OffscreenQmlSurface::updateQuick);
-    QObject::connect(qApp, &QCoreApplication::aboutToQuit, this, &OffscreenQmlSurface::onAboutToQuit);
-    _updateTimer.setTimerType(Qt::PreciseTimer);
-    _updateTimer.setInterval(MIN_TIMER_MS); // 5ms, Qt::PreciseTimer required
-    _updateTimer.start();
-}
-
-void OffscreenQmlSurface::changeAudioOutputDevice(const QString& deviceName, bool isHtmlUpdate) {
-#if !defined(Q_OS_ANDROID)
-    _currentAudioOutputDevice = deviceName;
-    if (_rootItem != nullptr && !isHtmlUpdate) {
-        QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
-    }
-    emit audioOutputDeviceChanged(deviceName);
-#endif
-}
-
-void OffscreenQmlSurface::forceHtmlAudioOutputDeviceUpdate() {
-#if !defined(Q_OS_ANDROID)
-    if (_currentAudioOutputDevice.size() > 0) {
-        QMetaObject::invokeMethod(this, "changeAudioOutputDevice", Qt::QueuedConnection,
-            Q_ARG(QString, _currentAudioOutputDevice), Q_ARG(bool, true));
-    }
-#endif
-}
-
-void OffscreenQmlSurface::forceQmlAudioOutputDeviceUpdate() {
-#if !defined(Q_OS_ANDROID)
-    if (QThread::currentThread() != qApp->thread()) {
-        QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
-    } else {
-        if (_audioOutputUpdateTimer.isActive()) {
-            _audioOutputUpdateTimer.stop();
-        }
-        _audioOutputUpdateTimer.start();
-    }
-#endif
-}
-
-static uvec2 clampSize(const uvec2& size, uint32_t maxDimension) {
-    return glm::clamp(size, glm::uvec2(1), glm::uvec2(maxDimension));
-}
-
-static QSize clampSize(const QSize& qsize, uint32_t maxDimension) {
-    return fromGlm(clampSize(toGlm(qsize), maxDimension));
-}
-
-void OffscreenQmlSurface::resize(const QSize& newSize_, bool forceResize) {
-
-    if (!_quickWindow) {
-        return;
-    }
-
-    const uint32_t MAX_OFFSCREEN_DIMENSION = 4096;
-    const QSize newSize = clampSize(newSize_, MAX_OFFSCREEN_DIMENSION);
-    if (!forceResize && newSize == _quickWindow->geometry().size()) {
-        return;
-    }
-
-    _qmlContext->setContextProperty("surfaceSize", newSize);
-
-    if (_rootItem) {
-        _rootItem->setSize(newSize);
-    }
-
-    // Update our members
-    _quickWindow->setGeometry(QRect(QPoint(), newSize));
-    _quickWindow->contentItem()->setSize(newSize);
-
-    // Qt bug in 5.4 forces this check of pixel ratio,
-    // even though we're rendering offscreen.
-    uvec2 newOffscreenSize = toGlm(newSize);
-    if (newOffscreenSize == _size) {
-        return;
-    }
-
-#if !defined(DISABLE_QML)
-    qCDebug(uiLogging) << "Offscreen UI resizing to " << newSize.width() << "x" << newSize.height();
-    gl::withSavedContext([&] {
-        _canvas->makeCurrent();
-
-        // Release hold on the textures of the old size
-        if (uvec2() != _size) {
-            {
-                Lock lock(_latestTextureAndFenceMutex);
-                // If the most recent texture was unused, we can directly recycle it
-                if (_latestTextureAndFence.first) {
-                    offscreenTextures.releaseTexture(_latestTextureAndFence);
-                    _latestTextureAndFence = { 0, 0 };
-                }
-            }
-            offscreenTextures.releaseSize(_size);
-        }
-
-        _size = newOffscreenSize;
-
-        // Acquire the new texture size
-        if (uvec2() != _size) {
-            offscreenTextures.acquireSize(_size);
-            if (_depthStencil) {
-                glDeleteRenderbuffers(1, &_depthStencil);
-                _depthStencil = 0;
-            }
-            glGenRenderbuffers(1, &_depthStencil);
-            glBindRenderbuffer(GL_RENDERBUFFER, _depthStencil);
-            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, _size.x, _size.y);
-            if (!_fbo) {
-                glGenFramebuffers(1, &_fbo);
-            }
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
-            glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depthStencil);
-            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-        }
-
-        _canvas->doneCurrent();
-    });
-#endif
-}
-
-QQuickItem* OffscreenQmlSurface::getRootItem() {
-    return _rootItem;
+    qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(this, qmlContext));
 }
 
 QQmlContext* OffscreenQmlSurface::contextForUrl(const QUrl& qmlSource, QQuickItem* parent, bool forceNewContext) {
@@ -872,13 +286,7 @@ QQmlContext* OffscreenQmlSurface::contextForUrl(const QUrl& qmlSource, QQuickIte
     // If we have whitelisted content, we must load a new context
     forceNewContext |= !callbacks.empty();
 
-    QQmlContext* targetContext = parent ? QQmlEngine::contextForObject(parent) : _qmlContext;
-    if (!targetContext) {
-    	targetContext = _qmlContext;
-    }
-    if (_rootItem && forceNewContext) {
-        targetContext = new QQmlContext(targetContext);
-    }
+    QQmlContext* targetContext = Parent::contextForUrl(qmlSource, parent, forceNewContext);
 
     for (const auto& callback : callbacks) {
         callback(targetContext);
@@ -887,171 +295,48 @@ QQmlContext* OffscreenQmlSurface::contextForUrl(const QUrl& qmlSource, QQuickIte
     return targetContext;
 }
 
-void OffscreenQmlSurface::load(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback) {
-    loadInternal(qmlSource, false, parent, [callback](QQmlContext* context, QQuickItem* newItem) {
-        QJSValue(callback).call(QJSValueList() << context->engine()->newQObject(newItem));
-    });
-}
-
-void OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext, const QmlContextObjectCallback& onQmlLoadedCallback) {
-    loadInternal(qmlSource, createNewContext, nullptr, onQmlLoadedCallback);
-}
-    
-void OffscreenQmlSurface::loadInternal(const QUrl& qmlSource, bool createNewContext, QQuickItem* parent, const QmlContextObjectCallback& onQmlLoadedCallback) {
-    if (QThread::currentThread() != thread()) {
-        qCWarning(uiLogging) << "Called load on a non-surface thread";
-    }
-    // Synchronous loading may take a while; restart the deadlock timer
-    QMetaObject::invokeMethod(qApp, "updateHeartbeat", Qt::DirectConnection);
-
-    QUrl finalQmlSource = qmlSource;
-    if ((qmlSource.isRelative() && !qmlSource.isEmpty()) || qmlSource.scheme() == QLatin1String("file")) {
-        finalQmlSource = _qmlContext->resolvedUrl(qmlSource);
-    }
-
-    auto targetContext = contextForUrl(finalQmlSource, parent, createNewContext);
-    auto qmlComponent = new QQmlComponent(_qmlContext->engine(), finalQmlSource, QQmlComponent::PreferSynchronous);
-    if (qmlComponent->isLoading()) {
-        connect(qmlComponent, &QQmlComponent::statusChanged, this, [=](QQmlComponent::Status) { 
-            finishQmlLoad(qmlComponent, targetContext, parent, onQmlLoadedCallback);
-        });
-        return;
-    }
-
-    finishQmlLoad(qmlComponent, targetContext, parent, onQmlLoadedCallback);
-}
-
-void OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, const QmlContextObjectCallback& onQmlLoadedCallback) {
-    load(qmlSource, true, onQmlLoadedCallback);
-}
-
-void OffscreenQmlSurface::load(const QUrl& qmlSource, const QmlContextObjectCallback& onQmlLoadedCallback) {
-    load(qmlSource, false, onQmlLoadedCallback);
-}
-
-void OffscreenQmlSurface::load(const QString& qmlSourceFile, const QmlContextObjectCallback& onQmlLoadedCallback)  {
-    return load(QUrl(qmlSourceFile), onQmlLoadedCallback);
-}
-
-void OffscreenQmlSurface::clearCache() {
-    _qmlContext->engine()->clearComponentCache();
-}
-
-
-void OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, QQuickItem* parent, const QmlContextObjectCallback& callback) {
-    disconnect(qmlComponent, &QQmlComponent::statusChanged, this, 0);
-    if (qmlComponent->isError()) {
-        for (const auto& error : qmlComponent->errors()) {
-            qCWarning(uiLogging) << error.url() << error.line() << error;
-        }
-        qmlComponent->deleteLater();
-        return;
-    }
-
-    QObject* newObject = qmlComponent->beginCreate(qmlContext);
-    if (qmlComponent->isError()) {
-        for (const auto& error : qmlComponent->errors()) {
-            qCWarning(uiLogging) << error.url() << error.line() << error;
-        }
-        if (!_rootItem) {
-            qFatal("Unable to finish loading QML root");
-        }
-        qmlComponent->deleteLater();
-        return;
-    }
-
-    if (!newObject) {
-        if (!_rootItem) {
-            qFatal("Could not load object as root item");
-            return;
-        }
-        qCWarning(uiLogging) << "Unable to load QML item";
-        return;
-    }
-
+void OffscreenQmlSurface::onItemCreated(QQmlContext* qmlContext, QQuickItem* newItem) {
     QObject* eventBridge = qmlContext->contextProperty("eventBridge").value<QObject*>();
-    if (qmlContext != _qmlContext && eventBridge && eventBridge != this) {
+    if (qmlContext != getSurfaceContext() && eventBridge && eventBridge != this) {
         // FIXME Compatibility mechanism for existing HTML and JS that uses eventBridgeWrapper
         // Find a way to flag older scripts using this mechanism and wanr that this is deprecated
         qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(eventBridge, qmlContext));
     }
 
-    qmlContext->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
-
-    // All quick items should be focusable
-    QQuickItem* newItem = qobject_cast<QQuickItem*>(newObject);
-    if (newItem) {
-        // Make sure we make items focusable (critical for
-        // supporting keyboard shortcuts)
-        newItem->setFlag(QQuickItem::ItemIsFocusScope, true);
-    }
-
-
-    // Make sure we will call callback for this codepath
-    // Call this before qmlComponent->completeCreate() otherwise ghost window appears
-    // If we already have a root, just set a couple of flags and the ancestry
-    if (_rootItem) {
-        callback(qmlContext, newItem);
-
-        if (!parent) {
-            parent = _rootItem;
-        }
-        // Allow child windows to be destroyed from JS
-        QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership);
-        newObject->setParent(parent);
-        newItem->setParentItem(parent);
-    }
-
-    qmlComponent->completeCreate();
-    qmlComponent->deleteLater();
-
-    if (_rootItem) {
-        QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
-        return;
-    }
-
     connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
+}
 
-    // The root item is ready. Associate it with the window.
-    _rootItem = newItem;
-    _rootItem->setParentItem(_quickWindow->contentItem());
-    _rootItem->setSize(_quickWindow->renderTargetSize());
+void OffscreenQmlSurface::onRootCreated() {
+    getSurfaceContext()->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
 
-    if (_rootItem->objectName() == "tabletRoot") {
-        _qmlContext->setContextProperty("tabletRoot", QVariant::fromValue(_rootItem));
+    // Connect with the audio client and listen for audio device changes
+    auto audioIO = DependencyManager::get<AudioClient>();
+    connect(audioIO.data(), &AudioClient::deviceChanged, this, [&](QAudio::Mode mode, const QAudioDeviceInfo& device) {
+        if (mode == QAudio::Mode::AudioOutput) {
+            QMetaObject::invokeMethod(this, "changeAudioOutputDevice", Qt::QueuedConnection, Q_ARG(QString, device.deviceName()));
+        }
+    });
+
+#if !defined(Q_OS_ANDROID)
+    // Setup the update of the QML media components with the current audio output device
+    QObject::connect(&_audioOutputUpdateTimer, &QTimer::timeout, this, [this]() {
+        if (_currentAudioOutputDevice.size() > 0) {
+            new AudioHandler(this, _currentAudioOutputDevice);
+        }
+    });
+    int waitForAudioQmlMs = 200;
+    _audioOutputUpdateTimer.setInterval(waitForAudioQmlMs);
+    _audioOutputUpdateTimer.setSingleShot(true);
+#endif
+
+    if (getRootItem()->objectName() == "tabletRoot") {
+        getSurfaceContext()->setContextProperty("tabletRoot", QVariant::fromValue(getRootItem()));
         auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
         tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", this);
         QObject* tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");
-        _qmlContext->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
+        getSurfaceContext()->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
     }
     QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
-    // Call this callback after rootitem is set, otherwise VrMenu wont work
-    callback(qmlContext, newItem);
-}
-
-void OffscreenQmlSurface::updateQuick() {
-    offscreenTextures.report();
-    // If we're
-    //   a) not set up
-    //   b) already rendering a frame
-    //   c) rendering too fast
-    // then skip this
-    if (!allowNewFrame(_maxFps)) {
-        return;
-    }
-
-    if (_polish) {
-        PROFILE_RANGE(render_qml, "OffscreenQML polish")
-#if !defined(DISABLE_QML)
-        _renderControl->polishItems();
-#endif
-        _polish = false;
-    }
-
-    if (_render) {
-        render();
-        _render = false;
-    }
 }
 
 QPointF OffscreenQmlSurface::mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject) {
@@ -1063,106 +348,37 @@ QPointF OffscreenQmlSurface::mapWindowToUi(const QPointF& sourcePosition, QObjec
     }
     vec2 offscreenPosition = toGlm(sourcePosition);
     offscreenPosition /= sourceSize;
-    offscreenPosition *= vec2(toGlm(_quickWindow->size()));
+    offscreenPosition *= vec2(toGlm(getWindow()->size()));
     return QPointF(offscreenPosition.x, offscreenPosition.y);
 }
 
-QPointF OffscreenQmlSurface::mapToVirtualScreen(const QPointF& originalPoint) {
-    return _mouseTranslator(originalPoint);
-}
-
 ///////////////////////////////////////////////////////
 //
 // Event handling customization
 //
 
-bool OffscreenQmlSurface::filterEnabled(QObject* originalDestination, QEvent* event) const {
-    if (_quickWindow == originalDestination) {
-        return false;
-    }
-    // Only intercept events while we're in an active state
-    if (_paused) {
-        return false;
-    }
-    return true;
-}
-
 bool OffscreenQmlSurface::eventFilter(QObject* originalDestination, QEvent* event) {
     if (!filterEnabled(originalDestination, event)) {
         return false;
     }
-#ifdef DEBUG
-    // Don't intercept our own events, or we enter an infinite recursion
-    QObject* recurseTest = originalDestination;
-    while (recurseTest) {
-        Q_ASSERT(recurseTest != _rootItem && recurseTest != _quickWindow);
-        recurseTest = recurseTest->parent();
-    }
-#endif
 
-    switch (event->type()) {
-        case QEvent::Resize: {
-            QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
-            QWidget* widget = static_cast<QWidget*>(originalDestination);
-            if (widget) {
-                this->resize(resizeEvent->size());
-            }
-            break;
+    if (event->type() == QEvent::Resize) {
+        QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
+        QWidget* widget = static_cast<QWidget*>(originalDestination);
+        if (widget) {
+            this->resize(resizeEvent->size());
         }
-
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease: {
-            event->ignore();
-            if (QCoreApplication::sendEvent(_quickWindow, event)) {
-                return event->isAccepted();
-            }
-            break;
-        }
-
-        case QEvent::Wheel: {
-            QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
-            QPointF transformedPos = mapToVirtualScreen(wheelEvent->pos());
-            QWheelEvent mappedEvent(
-                    transformedPos,
-                    wheelEvent->delta(),  wheelEvent->buttons(),
-                    wheelEvent->modifiers(), wheelEvent->orientation());
-            mappedEvent.ignore();
-            if (QCoreApplication::sendEvent(_quickWindow, &mappedEvent)) {
-                return mappedEvent.isAccepted();
-            }
-            break;
-        }
-#if defined(Q_OS_ANDROID)
-        case QEvent::TouchBegin:
-        case QEvent::TouchUpdate:
-        case QEvent::TouchEnd: {
-            QTouchEvent *originalEvent = static_cast<QTouchEvent *>(event);
-            QTouchEvent *fakeEvent = new QTouchEvent(*originalEvent);
-            auto newTouchPoints = fakeEvent->touchPoints();
-            for (size_t i = 0; i < newTouchPoints.size(); ++i) {
-                const auto &originalPoint = originalEvent->touchPoints()[i];
-                auto &newPoint = newTouchPoints[i];
-                newPoint.setPos(originalPoint.pos());
-            }
-            fakeEvent->setTouchPoints(newTouchPoints);
-            if (QCoreApplication::sendEvent(_quickWindow, fakeEvent)) {
-                qInfo() << __FUNCTION__ << "sent fake touch event:" << fakeEvent->type()
-                        << "_quickWindow handled it... accepted:" << fakeEvent->isAccepted();
-                return false; //event->isAccepted();
-            }
-            break;
-        }
-#endif
-        default:
-            break;
     }
 
-    return false;
+    return Parent::eventFilter(originalDestination, event);
 }
 
 unsigned int OffscreenQmlSurface::deviceIdByTouchPoint(qreal x, qreal y) {
-    auto mapped = _rootItem->mapFromGlobal(QPoint(x, y));
+    if (!getRootItem()) {
+        return PointerEvent::INVALID_POINTER_ID;
+    }
 
+    auto mapped = getRootItem()->mapFromGlobal(QPoint(x, y));
     for (auto pair : _activeTouchPoints) {
         if (mapped.x() == (int)pair.second.touchPoint.pos().x() && mapped.y() == (int)pair.second.touchPoint.pos().y()) {
             return pair.first;
@@ -1207,7 +423,7 @@ void OffscreenQmlSurface::hoverEndEvent(const PointerEvent& event, class QTouchD
 
 bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QTouchDevice& device, bool release) {
     // Ignore mouse interaction if we're paused
-    if (_paused || !_quickWindow) {
+    if (!getRootItem() || isPaused()) {
         return false;
     }
 
@@ -1226,7 +442,8 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
     // - this was a hover end event and the mouse wasn't pressed
     // - this was a release event and we aren't still hovering
     auto touchPoint = _activeTouchPoints.find(event.getID());
-    bool removeTouchPoint = release || (touchPoint != _activeTouchPoints.end() && !touchPoint->second.hovering && state == Qt::TouchPointReleased);
+    bool removeTouchPoint =
+        release || (touchPoint != _activeTouchPoints.end() && !touchPoint->second.hovering && state == Qt::TouchPointReleased);
     QEvent::Type touchType = QEvent::TouchUpdate;
     if (_activeTouchPoints.empty()) {
         // If the first active touch point is being created, send a begin
@@ -1259,9 +476,9 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
             touchPoints.push_back(entry.second.touchPoint);
         }
 
-        touchEvent.setWindow(_quickWindow);
         touchEvent.setDevice(&device);
-        touchEvent.setTarget(_rootItem);
+        touchEvent.setWindow(getWindow());
+        touchEvent.setTarget(getRootItem());
         touchEvent.setTouchPoints(touchPoints);
         touchEvent.setTouchPointStates(touchPointStates);
         touchEvent.setTimestamp((ulong)QDateTime::currentMSecsSinceEpoch());
@@ -1285,25 +502,26 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
     bool eventsAccepted = true;
 
     if (event.getType() == PointerEvent::Move) {
-        QMouseEvent mouseEvent(QEvent::MouseMove, windowPoint, windowPoint, windowPoint, button, buttons, event.getKeyboardModifiers());
+        QMouseEvent mouseEvent(QEvent::MouseMove, windowPoint, windowPoint, windowPoint, button, buttons,
+                               event.getKeyboardModifiers());
         // TODO - this line necessary for the QML Tooltop to work (which is not currently being used), but it causes interface to crash on launch on a fresh install
         // need to investigate into why this crash is happening.
         //_qmlContext->setContextProperty("lastMousePosition", windowPoint);
         mouseEvent.ignore();
-        if (QCoreApplication::sendEvent(_quickWindow, &mouseEvent)) {
+        if (QCoreApplication::sendEvent(getWindow(), &mouseEvent)) {
             eventSent = true;
             eventsAccepted &= mouseEvent.isAccepted();
         }
     }
 
     if (touchType == QEvent::TouchBegin) {
-        _touchBeginAccepted = QCoreApplication::sendEvent(_quickWindow, &touchEvent);
+        _touchBeginAccepted = QCoreApplication::sendEvent(getWindow(), &touchEvent);
         if (_touchBeginAccepted) {
             eventSent = true;
             eventsAccepted &= touchEvent.isAccepted();
         }
     } else if (_touchBeginAccepted) {
-        if (QCoreApplication::sendEvent(_quickWindow, &touchEvent)) {
+        if (QCoreApplication::sendEvent(getWindow(), &touchEvent)) {
             eventSent = true;
             eventsAccepted &= touchEvent.isAccepted();
         }
@@ -1316,49 +534,10 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
     return eventSent && eventsAccepted;
 }
 
-void OffscreenQmlSurface::pause() {
-    _paused = true;
-}
-
-void OffscreenQmlSurface::resume() {
-    _paused = false;
-    _render = true;
-
-    if (getRootItem()) {
-        getRootItem()->setProperty("eventBridge", QVariant::fromValue(this));
+void OffscreenQmlSurface::focusDestroyed(QObject* obj) {
+    if (_currentFocusItem) {
+        disconnect(_currentFocusItem, &QObject::destroyed, this, &OffscreenQmlSurface::focusDestroyed);
     }
-}
-
-bool OffscreenQmlSurface::isPaused() const {
-    return _paused;
-}
-
-void OffscreenQmlSurface::setProxyWindow(QWindow* window) {
-    _proxyWindow = window;
-#if !defined(DISABLE_QML)
-    if (_renderControl) {
-        _renderControl->_renderWindow = window;
-    }
-#endif
-}
-
-QObject* OffscreenQmlSurface::getEventHandler() {
-    return getWindow();
-}
-
-QQuickWindow* OffscreenQmlSurface::getWindow() {
-    return _quickWindow;
-}
-
-QSize OffscreenQmlSurface::size() const {
-    return _quickWindow->geometry().size();
-}
-
-QQmlContext* OffscreenQmlSurface::getSurfaceContext() {
-    return _qmlContext;
-}
-
-void OffscreenQmlSurface::focusDestroyed(QObject *obj) {
     _currentFocusItem = nullptr;
 }
 
@@ -1454,8 +633,7 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key, QObject* targetOverrid
 }
 
 void OffscreenQmlSurface::lowerKeyboard() {
-
-    QSignalBlocker blocker(_quickWindow);
+    QSignalBlocker blocker(getWindow());
 
     if (_currentFocusItem) {
         _currentFocusItem->setFocus(false);
@@ -1464,7 +642,8 @@ void OffscreenQmlSurface::lowerKeyboard() {
 }
 
 void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool numeric, bool passwordField) {
-    qCDebug(uiLogging) << "setKeyboardRaised: " << object << ", raised: " << raised << ", numeric: " << numeric << ", password: " << passwordField;
+    qCDebug(uiLogging) << "setKeyboardRaised: " << object << ", raised: " << raised << ", numeric: " << numeric
+                       << ", password: " << passwordField;
 
     if (!object) {
         return;
@@ -1488,7 +667,6 @@ void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool n
             numeric = numeric || QString(item->metaObject()->className()).left(7) == "SpinBox";
 
             if (item->property("keyboardRaised").isValid()) {
-
                 // FIXME - HMD only: Possibly set value of "keyboardEnabled" per isHMDMode() for use in WebView.qml.
                 if (item->property("punctuationMode").isValid()) {
                     item->setProperty("punctuationMode", QVariant(numeric));
@@ -1544,11 +722,42 @@ void OffscreenQmlSurface::emitWebEvent(const QVariant& message) {
 void OffscreenQmlSurface::sendToQml(const QVariant& message) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "emitQmlEvent", Qt::QueuedConnection, Q_ARG(QVariant, message));
-    } else if (_rootItem) {
+    } else if (getRootItem()) {
         // call fromScript method on qml root
-        QMetaObject::invokeMethod(_rootItem, "fromScript", Qt::QueuedConnection, Q_ARG(QVariant, message));
+        QMetaObject::invokeMethod(getRootItem(), "fromScript", Qt::QueuedConnection, Q_ARG(QVariant, message));
     }
 }
 
+void OffscreenQmlSurface::changeAudioOutputDevice(const QString& deviceName, bool isHtmlUpdate) {
+#if !defined(Q_OS_ANDROID)
+    _currentAudioOutputDevice = deviceName;
+    if (getRootItem() && !isHtmlUpdate) {
+        QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
+    }
+    emit audioOutputDeviceChanged(deviceName);
+#endif
+}
+
+void OffscreenQmlSurface::forceHtmlAudioOutputDeviceUpdate() {
+#if !defined(Q_OS_ANDROID)
+    if (_currentAudioOutputDevice.size() > 0) {
+        QMetaObject::invokeMethod(this, "changeAudioOutputDevice", Qt::QueuedConnection,
+            Q_ARG(QString, _currentAudioOutputDevice), Q_ARG(bool, true));
+    }
+#endif
+}
+
+void OffscreenQmlSurface::forceQmlAudioOutputDeviceUpdate() {
+#if !defined(Q_OS_ANDROID)
+    if (QThread::currentThread() != qApp->thread()) {
+        QMetaObject::invokeMethod(this, "forceQmlAudioOutputDeviceUpdate", Qt::QueuedConnection);
+    } else {
+        if (_audioOutputUpdateTimer.isActive()) {
+            _audioOutputUpdateTimer.stop();
+        }
+        _audioOutputUpdateTimer.start();
+    }
+#endif
+}
 
 #include "OffscreenQmlSurface.moc"
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.h b/libraries/ui/src/ui/OffscreenQmlSurface.h
index 08c7ca6bf8..9fa86f12a3 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.h
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.h
@@ -9,200 +9,79 @@
 #ifndef hifi_OffscreenQmlSurface_h
 #define hifi_OffscreenQmlSurface_h
 
-#include <atomic>
-#include <queue>
-#include <map>
-#include <functional>
-
-#include <QtCore/QJsonObject>
-#include <QtCore/QTimer>
-#include <QtCore/QUrl>
-
-#include <GLMHelpers.h>
-#include <ThreadHelpers.h>
+#include <qml/OffscreenSurface.h>
+#include <QtGui/qevent.h>
 
 #include <QTouchEvent>
 #include "PointerEvent.h"
 
-class QWindow;
-class QMyQuickRenderControl;
-class OffscreenGLCanvas;
-class QOpenGLContext;
-class QQmlEngine;
-class QQmlContext;
-class QQmlComponent;
-class QQuickWindow;
-class QQuickItem;
-class QJSValue;
-
-// GPU resources are typically buffered for one copy being used by the renderer, 
-// one copy in flight, and one copy being used by the receiver
-#define GPU_RESOURCE_BUFFER_SIZE 3
-
 using QmlContextCallback = std::function<void(QQmlContext*)>;
-using QmlContextObjectCallback = std::function<void(QQmlContext*, QQuickItem*)>;
 
-class OffscreenQmlSurface : public QObject, public QEnableSharedFromThis<OffscreenQmlSurface> {
+class OffscreenQmlSurface : public hifi::qml::OffscreenSurface {
+    using Parent = hifi::qml::OffscreenSurface;
     Q_OBJECT
     Q_PROPERTY(bool focusText READ isFocusText NOTIFY focusTextChanged)
 public:
-    static void setSharedContext(QOpenGLContext* context);
-
-    static QmlContextObjectCallback DEFAULT_CONTEXT_CALLBACK;
+    
     static void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback);
     static void addWhitelistContextHandler(const QUrl& url, const QmlContextCallback& callback) { addWhitelistContextHandler({ { url } }, callback); };
 
-    OffscreenQmlSurface();
-    virtual ~OffscreenQmlSurface();
-
-    using MouseTranslator = std::function<QPoint(const QPointF&)>;
-
-    virtual void create();
-    void resize(const QSize& size, bool forceResize = false);
-    QSize size() const;
-
-    // Usable from QML code as QmlSurface.load(url, parent, function(newItem){ ... })
-    Q_INVOKABLE void load(const QUrl& qmlSource, QQuickItem* parent, const QJSValue& callback);
-
-    // For C++ use 
-    Q_INVOKABLE void load(const QUrl& qmlSource, bool createNewContext, const QmlContextObjectCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
-    Q_INVOKABLE void loadInNewContext(const QUrl& qmlSource, const QmlContextObjectCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
-    Q_INVOKABLE void load(const QUrl& qmlSource, const QmlContextObjectCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
-    Q_INVOKABLE void load(const QString& qmlSourceFile, const QmlContextObjectCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
-
-    void clearCache();
-    void setMaxFps(uint8_t maxFps) { _maxFps = maxFps; }
-    // Optional values for event handling
-    void setProxyWindow(QWindow* window);
-    void setMouseTranslator(MouseTranslator mouseTranslator) {
-        _mouseTranslator = mouseTranslator;
-    }
-
     bool isFocusText() const { return _focusText; }
-    void pause();
-    void resume();
-    bool isPaused() const;
     bool getCleaned() { return _isCleaned; }
 
-    QQuickItem* getRootItem();
-    QQuickWindow* getWindow();
-    QObject* getEventHandler();
-    QQmlContext* getSurfaceContext();
-
-    QPointF mapToVirtualScreen(const QPointF& originalPoint);
     bool eventFilter(QObject* originalDestination, QEvent* event) override;
-
     void setKeyboardRaised(QObject* object, bool raised, bool numeric = false, bool passwordField = false);
     Q_INVOKABLE void synthesizeKeyPress(QString key, QObject* targetOverride = nullptr);
     Q_INVOKABLE void lowerKeyboard();
-
-    using TextureAndFence = std::pair<uint32_t, void*>;
-    // Checks to see if a new texture is available.  If one is, the function returns true and 
-    // textureAndFence will be populated with the texture ID and a fence which will be signalled 
-    // when the texture is safe to read.
-    // Returns false if no new texture is available
-    bool fetchTexture(TextureAndFence& textureAndFence);
-
-    static std::function<void(uint32_t, void*)> getDiscardLambda();
-    static size_t getUsedTextureMemory();
-
     PointerEvent::EventType choosePointerEventType(QEvent::Type type);
-
     unsigned int deviceIdByTouchPoint(qreal x, qreal y);
 
 signals:
     void focusObjectChanged(QObject* newFocus);
     void focusTextChanged(bool focusText);
-
-public slots:
-    void onAboutToQuit();
-    void focusDestroyed(QObject *obj);
-
-    // audio output device
-public slots:
-    void changeAudioOutputDevice(const QString& deviceName, bool isHtmlUpdate = false);
-    void forceHtmlAudioOutputDeviceUpdate();
-    void forceQmlAudioOutputDeviceUpdate();
-
-signals:
     void audioOutputDeviceChanged(const QString& deviceName);
 
-    // event bridge
-public slots:
-    void emitScriptEvent(const QVariant& scriptMessage);
-    void emitWebEvent(const QVariant& webMessage);
-signals:
-    void scriptEventReceived(const QVariant& message);
+    // web event bridge
     void webEventReceived(const QVariant& message);
-
+    // script event bridge
+    void scriptEventReceived(const QVariant& message);
     // qml event bridge
+    void fromQml(const QVariant& message);
+
 public slots:
+    void focusDestroyed(QObject *obj);
+    // script event bridge
+    void emitScriptEvent(const QVariant& scriptMessage);
+    // web event bridge
+    void emitWebEvent(const QVariant& webMessage);
+    // qml event bridge
     void sendToQml(const QVariant& message);
-signals:
-    void fromQml(QVariant message);
 
 protected:
-    bool filterEnabled(QObject* originalDestination, QEvent* event) const;
     void setFocusText(bool newFocusText);
+    void initializeEngine(QQmlEngine* engine) override;
+    void onRootContextCreated(QQmlContext* qmlContext) override;
 
 private:
-    static QOpenGLContext* getSharedContext();
-
-    QQmlContext* contextForUrl(const QUrl& url, QQuickItem* parent, bool forceNewContext = false);
-    void loadInternal(const QUrl& qmlSource, bool createNewContext, QQuickItem* parent, const QmlContextObjectCallback& onQmlLoadedCallback);
-    void finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, QQuickItem* parent, const QmlContextObjectCallback& onQmlLoadedCallback);
+    void onRootCreated() override;
+    void onItemCreated(QQmlContext* qmlContext, QQuickItem* newItem) override;
+    QQmlContext* contextForUrl(const QUrl& url, QQuickItem* parent, bool forceNewContext = false) override;
     QPointF mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject);
-    bool allowNewFrame(uint8_t fps);
-    void render();
-    void cleanup();
-    void disconnectAudioOutputTimer();
 
 private slots:
-    void updateQuick();
-    void onFocusObjectChanged(QObject* newFocus);
+    void onFocusObjectChanged(QObject* newFocus) override;
 
 public slots:
     void hoverBeginEvent(const PointerEvent& event, class QTouchDevice& device);
     void hoverEndEvent(const PointerEvent& event, class QTouchDevice& device);
     bool handlePointerEvent(const PointerEvent& event, class QTouchDevice& device, bool release = false);
+    void changeAudioOutputDevice(const QString& deviceName, bool isHtmlUpdate = false);
+    void forceHtmlAudioOutputDeviceUpdate();
+    void forceQmlAudioOutputDeviceUpdate();
 
 private:
-    using Mutex = std::mutex;
-    using Lock = std::unique_lock<std::mutex>;
-
-    QQuickWindow* _quickWindow { nullptr };
-    QQmlContext* _qmlContext { nullptr };
-    QQuickItem* _rootItem { nullptr };
-
-#if !defined(DISABLE_QML)
-    QMyQuickRenderControl* _renderControl{ nullptr };
-    OffscreenGLCanvas* _canvas { nullptr };
-#endif
-
-    QTimer _updateTimer;
-    uint32_t _fbo { 0 };
-    uint32_t _depthStencil { 0 };
-    uint64_t _lastRenderTime { 0 };
-    uvec2 _size;
-
-#if !defined(Q_OS_ANDROID)
-    QTimer _audioOutputUpdateTimer;
-    QString _currentAudioOutputDevice;
-#endif
-    
-    // Texture management
-    Mutex _latestTextureAndFenceMutex;
-    TextureAndFence _latestTextureAndFence { 0, 0 };
-
-    bool _render { false };
-    bool _polish { true };
-    bool _paused { true };
     bool _focusText { false };
     bool _isCleaned{ false };
-    uint8_t _maxFps { 60 };
-    MouseTranslator _mouseTranslator { [](const QPointF& p) { return p.toPoint();  } };
-    QWindow* _proxyWindow { nullptr };
-
     QQuickItem* _currentFocusItem { nullptr };
 
     struct TouchState {
@@ -214,6 +93,9 @@ private:
     bool _pressed;
     bool _touchBeginAccepted { false };
     std::map<uint32_t, TouchState> _activeTouchPoints;
+
+    QString _currentAudioOutputDevice;
+    QTimer _audioOutputUpdateTimer;
 };
 
 #endif
diff --git a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
index 9b6b031dd9..7efa36624b 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
@@ -44,7 +44,6 @@ void OffscreenQmlSurfaceCache::release(const QString& rootSource, const QSharedP
 
 QSharedPointer<OffscreenQmlSurface> OffscreenQmlSurfaceCache::buildSurface(const QString& rootSource) {
     auto surface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface());
-    surface->create();
     surface->load(rootSource);
     surface->resize(QSize(100, 100));
     return surface;
diff --git a/plugins/hifiNeuron/CMakeLists.txt b/plugins/hifiNeuron/CMakeLists.txt
index dd78b52240..7d2616e4d6 100644
--- a/plugins/hifiNeuron/CMakeLists.txt
+++ b/plugins/hifiNeuron/CMakeLists.txt
@@ -10,7 +10,7 @@ if (APPLE OR WIN32)
     
     set(TARGET_NAME hifiNeuron)
     setup_hifi_plugin(Qml)
-    link_hifi_libraries(shared controllers ui plugins input-plugins)
+    link_hifi_libraries(shared controllers qml ui plugins input-plugins)
     target_neuron()
 
 endif()
diff --git a/plugins/oculus/CMakeLists.txt b/plugins/oculus/CMakeLists.txt
index 59986d103e..2a011a349a 100644
--- a/plugins/oculus/CMakeLists.txt
+++ b/plugins/oculus/CMakeLists.txt
@@ -19,7 +19,7 @@ if (WIN32 AND (NOT USE_GLES))
   set(TARGET_NAME oculus)
   setup_hifi_plugin(Multimedia)
   link_hifi_libraries(
-    shared gl gpu controllers ui
+    shared gl gpu gpu-gl controllers ui qml
     plugins ui-plugins display-plugins input-plugins
     audio-client networking render-utils
     ${PLATFORM_GL_BACKEND}
diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt
index 487a005068..a6e90aa5a6 100644
--- a/plugins/openvr/CMakeLists.txt
+++ b/plugins/openvr/CMakeLists.txt
@@ -11,7 +11,7 @@ if (WIN32 AND (NOT USE_GLES))
     add_definitions(-DGLEW_STATIC)
     set(TARGET_NAME openvr)
     setup_hifi_plugin(Gui Qml Multimedia)
-    link_hifi_libraries(shared gl networking controllers ui 
+    link_hifi_libraries(shared gl qml networking controllers ui 
         plugins display-plugins ui-plugins input-plugins script-engine
         audio-client render-utils graphics gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND})
 
diff --git a/tests/qml/CMakeLists.txt b/tests/qml/CMakeLists.txt
new file mode 100644
index 0000000000..f56b8c4533
--- /dev/null
+++ b/tests/qml/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(TARGET_NAME qml-test)
+setup_hifi_project(Quick Qml Gui OpenGL)
+setup_memory_debugger()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
+link_hifi_libraries(shared networking gl qml)
+
+if (WIN32)
+    set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/qml\"")
+
+    package_libraries_for_deployment()
+endif()
+
+target_nsight()
diff --git a/tests/qml/qml/main.qml b/tests/qml/qml/main.qml
new file mode 100644
index 0000000000..3b37543393
--- /dev/null
+++ b/tests/qml/qml/main.qml
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.1
+import QtQuick.Dialogs 1.1
+import QtQuick.Controls 1.2
+import "qml/UI.js" as UI
+import "qml"
+
+Item {
+    width: 640
+    height: 480
+    
+    Rectangle {
+        width: 5
+        height: 5
+        color: "red"
+        ColorAnimation on color { loops: Animation.Infinite; from: "red"; to: "yellow"; duration: 1000 }
+    }
+
+    TabView {
+        id: tabView
+
+        anchors.fill: parent
+        anchors.margins: UI.margin
+        tabPosition: UI.tabPosition
+
+        Layout.minimumWidth: 360
+        Layout.minimumHeight: 360
+        Layout.preferredWidth: 480
+        Layout.preferredHeight: 640
+
+        Tab {
+            title: "Buttons"
+            ButtonPage {
+                enabled: enabler.checked
+            }
+        }
+        Tab {
+            title: "Progress"
+            ProgressPage {
+                enabled: enabler.checked
+            }
+        }
+        Tab {
+            title: "Input"
+            InputPage {
+                enabled: enabler.checked
+            }
+        }
+    }
+}
diff --git a/tests/qml/qml/qml/+android/UI.js b/tests/qml/qml/qml/+android/UI.js
new file mode 100644
index 0000000000..be7ddfa967
--- /dev/null
+++ b/tests/qml/qml/qml/+android/UI.js
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+.pragma library
+
+var margin = 0
+var tabPosition = Qt.BottomEdge
+var label = "Gallery"
diff --git a/tests/qml/qml/qml/+ios/UI.js b/tests/qml/qml/qml/+ios/UI.js
new file mode 100644
index 0000000000..be7ddfa967
--- /dev/null
+++ b/tests/qml/qml/qml/+ios/UI.js
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+.pragma library
+
+var margin = 0
+var tabPosition = Qt.BottomEdge
+var label = "Gallery"
diff --git a/tests/qml/qml/qml/+osx/UI.js b/tests/qml/qml/qml/+osx/UI.js
new file mode 100644
index 0000000000..28b13b64aa
--- /dev/null
+++ b/tests/qml/qml/qml/+osx/UI.js
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+.pragma library
+
+var margin = 12
+var tabPosition = Qt.TopEdge
+var label = ""
diff --git a/tests/qml/qml/qml/ButtonPage.qml b/tests/qml/qml/qml/ButtonPage.qml
new file mode 100644
index 0000000000..8eb9c1a730
--- /dev/null
+++ b/tests/qml/qml/qml/ButtonPage.qml
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.2
+
+ScrollView {
+    id: page
+    implicitWidth: 640
+    implicitHeight: 200
+
+    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+
+    Item {
+        id: content
+
+        width: Math.max(page.viewport.width, grid.implicitWidth + 2 * grid.rowSpacing)
+        height: Math.max(page.viewport.height, grid.implicitHeight + 2 * grid.columnSpacing)
+
+        GridLayout {
+            id: grid
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: grid.rowSpacing
+            anchors.rightMargin: grid.rowSpacing
+            anchors.topMargin: grid.columnSpacing
+
+            columns: page.width < page.height ? 1 : 2
+
+            GroupBox {
+                title: "Button"
+                Layout.fillWidth: true
+                Layout.columnSpan: grid.columns
+                RowLayout {
+                    anchors.fill: parent
+                    Button { text: "OK"; isDefault: true }
+                    Button { text: "Cancel" }
+                    Item { Layout.fillWidth: true }
+                    Button {
+                        text: "Attach"
+                        menu: Menu {
+                            MenuItem { text: "Image" }
+                            MenuItem { text: "Document" }
+                        }
+                    }
+                }
+            }
+
+            GroupBox {
+                title: "CheckBox"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    CheckBox { text: "E-mail"; checked: true }
+                    CheckBox { text: "Calendar"; checked: true }
+                    CheckBox { text: "Contacts" }
+                }
+            }
+
+            GroupBox {
+                title: "RadioButton"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    ExclusiveGroup { id: radioGroup }
+                    RadioButton { text: "Portrait"; exclusiveGroup: radioGroup }
+                    RadioButton { text: "Landscape"; exclusiveGroup: radioGroup }
+                    RadioButton { text: "Automatic"; exclusiveGroup: radioGroup; checked: true }
+                }
+            }
+
+            GroupBox {
+                title: "Switch"
+                Layout.fillWidth: true
+                Layout.columnSpan: grid.columns
+                ColumnLayout {
+                    anchors.fill: parent
+                    RowLayout {
+                        Label { text: "Wi-Fi"; Layout.fillWidth: true }
+                        Switch { checked: true }
+                    }
+                    RowLayout {
+                        Label { text: "Bluetooth"; Layout.fillWidth: true }
+                        Switch { checked: false }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/qml/qml/qml/InputPage.qml b/tests/qml/qml/qml/InputPage.qml
new file mode 100644
index 0000000000..78ef0a64d6
--- /dev/null
+++ b/tests/qml/qml/qml/InputPage.qml
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.2
+
+ScrollView {
+    id: page
+    implicitWidth: 640
+    implicitHeight: 400
+
+    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+
+    Item {
+        id: content
+
+        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
+        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
+
+        ColumnLayout {
+            id: column
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: column.spacing
+
+            GroupBox {
+                title: "TextField"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    TextField { placeholderText: "..."; Layout.fillWidth: true; z: 1 }
+                    TextField { placeholderText: "Password"; echoMode: TextInput.Password; Layout.fillWidth: true }
+                }
+            }
+
+            GroupBox {
+                title: "ComboBox"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    ComboBox {
+                        model: Qt.fontFamilies()
+                        Layout.fillWidth: true
+                    }
+                    ComboBox {
+                        editable: true
+                        model: ListModel {
+                            id: listModel
+                            ListElement { text: "Apple" }
+                            ListElement { text: "Banana" }
+                            ListElement { text: "Coconut" }
+                            ListElement { text: "Orange" }
+                        }
+                        onAccepted: {
+                            if (find(currentText) === -1) {
+                                listModel.append({text: editText})
+                                currentIndex = find(editText)
+                            }
+                        }
+                        Layout.fillWidth: true
+                    }
+                }
+            }
+
+            GroupBox {
+                title: "SpinBox"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    SpinBox { value: 99; Layout.fillWidth: true; z: 1 }
+                    SpinBox { decimals: 2; Layout.fillWidth: true }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/qml/qml/qml/ProgressPage.qml b/tests/qml/qml/qml/ProgressPage.qml
new file mode 100644
index 0000000000..5123d101ff
--- /dev/null
+++ b/tests/qml/qml/qml/ProgressPage.qml
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.2
+
+ScrollView {
+    id: page
+    implicitWidth: 640
+    implicitHeight: 400
+
+    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+
+    Item {
+        id: content
+
+        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
+        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
+
+        ColumnLayout {
+            id: column
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: column.spacing
+
+            GroupBox {
+                title: "ProgressBar"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    ProgressBar { indeterminate: true; Layout.fillWidth: true }
+                    ProgressBar { value: slider.value; Layout.fillWidth: true }
+                }
+            }
+
+            GroupBox {
+                title: "Slider"
+                Layout.fillWidth: true
+                ColumnLayout {
+                    anchors.fill: parent
+                    Slider { id: slider; value: 0.5; Layout.fillWidth: true }
+                }
+            }
+
+            GroupBox {
+                title: "BusyIndicator"
+                Layout.fillWidth: true
+                BusyIndicator { running: true }
+            }
+        }
+    }
+}
diff --git a/tests/qml/qml/qml/UI.js b/tests/qml/qml/qml/UI.js
new file mode 100644
index 0000000000..3899ced027
--- /dev/null
+++ b/tests/qml/qml/qml/UI.js
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+.pragma library
+
+var margin = 2
+var tabPosition = Qt.TopEdge
+var label = ""
diff --git a/tests/qml/src/main.cpp b/tests/qml/src/main.cpp
new file mode 100644
index 0000000000..219efa5996
--- /dev/null
+++ b/tests/qml/src/main.cpp
@@ -0,0 +1,198 @@
+//
+//  main.cpp
+//  tests/gpu-test/src
+//
+//  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
+//
+
+#include <unordered_map>
+#include <memory>
+#include <cstdio>
+
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDir>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QFile>
+#include <QtCore/QLoggingCategory>
+
+#include <QtGui/QResizeEvent>
+#include <QtGui/QWindow>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QImage>
+#include <QtGui/QOpenGLFunctions_4_5_Core>
+#include <QtGui/QOpenGLContext>
+
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlComponent>
+
+#include <gl/OffscreenGLCanvas.h>
+#include <GLMHelpers.h>
+#include <PathUtils.h>
+#include <NumericalConstants.h>
+#include <PerfStat.h>
+#include <PathUtils.h>
+#include <ViewFrustum.h>
+#include <qml/OffscreenSurface.h>
+
+
+class OffscreenQmlSurface : public hifi::qml::OffscreenSurface {
+
+};
+
+class TestWindow : public QWindow {
+
+public:
+    TestWindow();
+
+
+private:
+    using TextureAndFence = hifi::qml::OffscreenSurface::TextureAndFence;
+    QOpenGLContext _glContext;
+    OffscreenGLCanvas _sharedContext;
+    OffscreenQmlSurface _offscreenQml;
+    QOpenGLFunctions_4_5_Core _glf;
+    uint32_t _currentTexture{ 0 };
+    GLsync _readFence{ 0 };
+    std::function<void(uint32_t, void*)> _discardLamdba;
+    QSize _size;
+    GLuint _fbo{ 0 };
+    const QSize _qmlSize{ 640, 480 };
+    bool _aboutToQuit{ false };
+    void initGl();
+    void resizeWindow(const QSize& size);
+    void draw();
+    void resizeEvent(QResizeEvent* ev) override;
+};
+
+TestWindow::TestWindow() {
+    setSurfaceType(QSurface::OpenGLSurface);
+
+    QSurfaceFormat format;
+    format.setDepthBufferSize(24);
+    format.setStencilBufferSize(8);
+    format.setVersion(4, 5);
+    format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
+    format.setOption(QSurfaceFormat::DebugContext);
+    QSurfaceFormat::setDefaultFormat(format);
+    setFormat(format);
+
+    show();
+
+    resize(QSize(800, 600));
+
+    auto timer = new QTimer(this);
+    timer->setTimerType(Qt::PreciseTimer);
+    timer->setInterval(5);
+    connect(timer, &QTimer::timeout, [&] { draw(); });
+    timer->start();
+
+    connect(qApp, &QCoreApplication::aboutToQuit, [this, timer] {
+        timer->stop();
+        _aboutToQuit = true;
+    });
+
+}
+
+void TestWindow::initGl() {
+    _glContext.setFormat(format());
+    if (!_glContext.create() || !_glContext.makeCurrent(this)) {
+        qFatal("Unable to intialize Window GL context");
+    }
+
+    _glf.initializeOpenGLFunctions();
+    _glf.glCreateFramebuffers(1, &_fbo);
+
+    if (!_sharedContext.create(&_glContext) || !_sharedContext.makeCurrent()) {
+        qFatal("Unable to intialize Shared GL context");
+    }
+    hifi::qml::OffscreenSurface::setSharedContext(_sharedContext.getContext());
+    _discardLamdba = _offscreenQml.getDiscardLambda();
+    _offscreenQml.resize({ 640, 480 });
+    _offscreenQml.load(QUrl::fromLocalFile("C:/Users/bdavi/Git/hifi/tests/qml/qml/main.qml"));
+}
+
+void TestWindow::resizeWindow(const QSize& size) {
+    _size = size;
+}
+
+void TestWindow::draw() {
+    if (_aboutToQuit) {
+        return;
+    }
+
+    // Attempting to draw before we're visible and have a valid size will
+    // produce GL errors.
+    if (!isVisible() || _size.width() <= 0 || _size.height() <= 0) {
+        return;
+    }
+
+    static std::once_flag once;
+    std::call_once(once, [&] { initGl(); });
+
+    if (!_glContext.makeCurrent(this)) {
+        return;
+    }
+
+    _glf.glClearColor(1, 0, 0, 1);
+    _glf.glClear(GL_COLOR_BUFFER_BIT);
+
+    TextureAndFence newTextureAndFence;
+    if (_offscreenQml.fetchTexture(newTextureAndFence)) {
+        if (_currentTexture) {
+            _discardLamdba(_currentTexture, _readFence);
+            _readFence = 0;
+        }
+
+        _currentTexture = newTextureAndFence.first;
+        _glf.glWaitSync((GLsync)newTextureAndFence.second, 0, GL_TIMEOUT_IGNORED);
+        _glf.glNamedFramebufferTexture(_fbo, GL_COLOR_ATTACHMENT0, _currentTexture, 0);
+    }
+    
+    auto diff = _size - _qmlSize;
+    diff /= 2;
+    auto qmlExtent = diff + _qmlSize;
+
+    if (_currentTexture) {
+        _glf.glBlitNamedFramebuffer(_fbo, 0, 
+            0, 0, _qmlSize.width() - 1, _qmlSize.height() - 1, 
+            diff.width(), diff.height(), qmlExtent.width() - 1, qmlExtent.height() - 2, 
+            GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    }
+
+    if (_readFence) {
+        _glf.glDeleteSync(_readFence);
+    }
+    _readFence = _glf.glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    _glf.glFlush();
+
+    _glContext.swapBuffers(this);
+}
+
+void TestWindow::resizeEvent(QResizeEvent* ev) {
+    resizeWindow(ev->size());
+}
+
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (!message.isEmpty()) {
+#ifdef Q_OS_WIN
+        OutputDebugStringA(message.toLocal8Bit().constData());
+        OutputDebugStringA("\n");
+#endif
+    }
+}
+
+int main(int argc, char** argv) {   
+    QGuiApplication app(argc, argv);
+    qInstallMessageHandler(messageHandler);
+    TestWindow window;
+    app.exec();
+    return 0;
+}
+
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index d377b7616d..57ae7dace7 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -14,11 +14,11 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 # link in the shared libraries
 link_hifi_libraries(
     shared networking animation 
-    ktx image octree gl gpu  
+    ktx image octree gl gpu gpu-gl  
     render render-utils 
     graphics fbx model-networking 
     entities entities-renderer audio avatars script-engine 
-    physics procedural midi ui
+    physics procedural midi qml ui
     ${PLATFORM_GL_BACKEND}
 )
 

From 75cf22ca7fe7bab1c59ca08d4d99bccf0eba9cf6 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 7 Feb 2018 09:45:21 +1300
Subject: [PATCH 122/569] Remove support for old High Fidelity versions

---
 unpublishedScripts/marketplace/record/record.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/unpublishedScripts/marketplace/record/record.js b/unpublishedScripts/marketplace/record/record.js
index dda78dbd02..08400dbb85 100644
--- a/unpublishedScripts/marketplace/record/record.js
+++ b/unpublishedScripts/marketplace/record/record.js
@@ -139,8 +139,7 @@
         }
 
         function setMappingCallback(status) {
-            // FIXME: "" is for RC < 63, null is for RC >= 63. Remove the former when RC63 is no longer used.
-            if (status !== "" && status !== null) {
+            if (status !== null) {
                 error("Error mapping recording to " + mappingPath + " on Asset Server!", status);
                 return;
             }

From 4f0ca6a9049dbcb2dcfe20d70a32c4f83f02b8a9 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 6 Feb 2018 13:44:59 -0800
Subject: [PATCH 123/569] fix lasers going to origin

---
 scripts/system/libraries/pointersUtils.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/system/libraries/pointersUtils.js b/scripts/system/libraries/pointersUtils.js
index 2af563f8d4..53959b91f8 100644
--- a/scripts/system/libraries/pointersUtils.js
+++ b/scripts/system/libraries/pointersUtils.js
@@ -30,7 +30,6 @@ Pointer = function(hudLayer, pickType, pointerData) {
         ignoreRayIntersection: true, // always ignore this
         drawInFront: !hudLayer, // Even when burried inside of something, show it.
         drawHUDLayer: hudLayer,
-        parentID: MyAvatar.SELF_ID
     };
     this.halfEnd = {
         type: "sphere",
@@ -53,7 +52,6 @@ Pointer = function(hudLayer, pickType, pointerData) {
         ignoreRayIntersection: true, // always ignore this
         drawInFront: !hudLayer, // Even when burried inside of something, show it.
         drawHUDLayer: hudLayer,
-        parentID: MyAvatar.SELF_ID
     };
     this.fullEnd = {
         type: "sphere",
@@ -76,7 +74,6 @@ Pointer = function(hudLayer, pickType, pointerData) {
         ignoreRayIntersection: true, // always ignore this
         drawInFront: !hudLayer, // Even when burried inside of something, show it.
         drawHUDLayer: hudLayer,
-        parentID: MyAvatar.SELF_ID
     };
 
     this.renderStates = [

From 51b55aedcfb8cb5d226897ff746c49783d513fc6 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 6 Feb 2018 16:07:46 -0800
Subject: [PATCH 124/569] CR changes, fix colors, add minimum overlay
 dimensions for HMD

---
 libraries/gl/src/gl/Context.cpp               |   2 +-
 .../system/libraries/entitySelectionTool.js   | 256 +++++++++---------
 2 files changed, 132 insertions(+), 126 deletions(-)

diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 309839808e..155849bffa 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -147,7 +147,7 @@ static void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum s
     }
     // FIXME For high severity errors, force a sync to the log, since we might crash
     // before the log file was flushed otherwise.  Performance hit here
-    qCDebug(glLogging) << "OpenGL: " << message;
+    //qCDebug(glLogging) << "OpenGL: " << message;
 }
 
 static void setupPixelFormatSimple(HDC hdc) {
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 31df28c61b..24ec12a2c8 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -222,7 +222,7 @@ SelectionManager = (function() {
     return that;
 })();
 
-// Normalize degrees to be in the range (-180, 180]
+// Normalize degrees to be in the range (-180, 180)
 function normalizeDegrees(degrees) {
     degrees = ((degrees + 180) % 360) - 180;
     if (degrees <= -180) {
@@ -236,9 +236,11 @@ function normalizeDegrees(degrees) {
 SelectionDisplay = (function() {
     var that = {};
 
-    var COLOR_GREEN = { red:44, green:142, blue:14 };
+    var NEGATE_VECTOR = -1;
+
+    var COLOR_GREEN = { red:31, green:198, blue:166 };
     var COLOR_BLUE = { red:0, green:147, blue:197 };
-    var COLOR_RED = { red:183, green:10, blue:55 };
+    var COLOR_RED = { red:226, green:51, blue:77 };
     var COLOR_HOVER = { red:227, green:227, blue:227 };
     var COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
     var COLOR_SCALE_EDGE = { red:87, green:87, blue:87 };
@@ -259,8 +261,8 @@ SelectionDisplay = (function() {
     var ROTATE_RING_SELECTED_INNER_RADIUS = 0.9;
 
     // These are multipliers for sizing the rotation degrees display while rotating an entity
-    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 1.75;
-    var ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.3;
+    var ROTATE_DISPLAY_DISTANCE_MULTIPLIER = 2;
+    var ROTATE_DISPLAY_SIZE_X_MULTIPLIER = 0.2;
     var ROTATE_DISPLAY_SIZE_Y_MULTIPLIER = 0.09;
     var ROTATE_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.07;
 
@@ -268,12 +270,15 @@ SelectionDisplay = (function() {
     var STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE = 0.01;
     var STRETCH_MINIMUM_DIMENSION = 0.001;
     var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2;
+    var STRETCH_PANEL_WIDTH = 0.01;
 
     var SCALE_CUBE_OFFSET = 0.5;
     var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.015;
     var SCALE_MINIMUM_DIMENSION = 0.02;
 
-    var CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 };     
+    var CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 };    
+    
+    var CTRL_KEY_CODE = 16777249;
 
     var TRANSLATE_DIRECTION = {
         X : 0,
@@ -862,7 +867,7 @@ SelectionDisplay = (function() {
 
     // Control key remains active only while key is held down
     that.keyReleaseEvent = function(key) {
-        if (key.key === 16777249) {
+        if (key.key === CTRL_KEY_CODE) {
             ctrlPressed = false;
             that.updateActiveRotateRing();
         }
@@ -870,7 +875,7 @@ SelectionDisplay = (function() {
 
     // Triggers notification on specific key driven events
     that.keyPressEvent = function(key) {
-        if (key.key === 16777249) {
+        if (key.key === CTRL_KEY_CODE) {
             ctrlPressed = true;
             that.updateActiveRotateRing();
         }
@@ -1030,61 +1035,15 @@ SelectionDisplay = (function() {
             rotationZ = Quat.multiply(rotation, localRotationZ);
             worldRotationZ = rotationZ;
 
-            // UPDATE TRANSLATION ARROWS
-            var arrowCylinderDimension = toCameraDistance * TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE;
-            var arrowCylinderDimensions = { 
-                x:arrowCylinderDimension, 
-                y:arrowCylinderDimension * TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, 
-                z:arrowCylinderDimension 
-            };
-            var arrowConeDimension = toCameraDistance * TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE;
-            var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
-            var arrowConeOffset = arrowCylinderDimensions.y * TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE;
-            var cylinderXPosition = { x:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance, y:0, z:0 };
-            cylinderXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderXPosition));
-            Overlays.editOverlay(handleTranslateXCylinder, { 
-                position: cylinderXPosition, 
-                rotation: rotationX,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderXDiff = Vec3.subtract(cylinderXPosition, position);
-            var coneXPosition = Vec3.sum(cylinderXPosition, Vec3.multiply(Vec3.normalize(cylinderXDiff), arrowConeOffset));
-            Overlays.editOverlay(handleTranslateXCone, { 
-                position: coneXPosition, 
-                rotation: rotationX,
-                dimensions: arrowConeDimensions
-            });
-            var cylinderYPosition = { x:0, y:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance, z:0 };
-            cylinderYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderYPosition));
-            Overlays.editOverlay(handleTranslateYCylinder, { 
-                position: cylinderYPosition, 
-                rotation: rotationY,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderYDiff = Vec3.subtract(cylinderYPosition, position);
-            var coneYPosition = Vec3.sum(cylinderYPosition, Vec3.multiply(Vec3.normalize(cylinderYDiff), arrowConeOffset));
-            Overlays.editOverlay(handleTranslateYCone, { 
-                position: coneYPosition, 
-                rotation: rotationY,
-                dimensions: arrowConeDimensions
-            });
-            var cylinderZPosition = { x:0, y:0, z:TRANSLATE_ARROW_CYLINDER_OFFSET * toCameraDistance };
-            cylinderZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderZPosition));
-            Overlays.editOverlay(handleTranslateZCylinder, { 
-                position: cylinderZPosition, 
-                rotation: rotationZ,
-                dimensions: arrowCylinderDimensions
-            });
-            var cylinderZDiff = Vec3.subtract(cylinderZPosition, position);
-            var coneZPosition = Vec3.sum(cylinderZPosition, Vec3.multiply(Vec3.normalize(cylinderZDiff), arrowConeOffset));
-            Overlays.editOverlay(handleTranslateZCone, { 
-                position: coneZPosition, 
-                rotation: rotationZ,
-                dimensions: arrowConeDimensions
-            });
+            // in HMD we clamp the overlays to the bounding box for now so lasers can hit them
+            var maxHandleDimension = 0;
+            if (HMD.active) {
+                maxHandleDimension = Math.max(dimensions.x, dimensions.y, dimensions.z);
+            }
 
             // UPDATE ROTATION RINGS
-            var rotateDimension = toCameraDistance * ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            // rotateDimension is used as the base dimension for all overlays
+            var rotateDimension = Math.max(maxHandleDimension, toCameraDistance * ROTATE_RING_CAMERA_DISTANCE_MULTIPLE);
             var rotateDimensions = { x:rotateDimension, y:rotateDimension, z:rotateDimension };
             if (!isActiveTool(handleRotatePitchRing)) {
                 Overlays.editOverlay(handleRotatePitchRing, { 
@@ -1113,11 +1072,68 @@ SelectionDisplay = (function() {
             Overlays.editOverlay(handleRotateCurrentRing, { dimensions: rotateDimensions });
             that.updateActiveRotateRing();
 
+            // UPDATE TRANSLATION ARROWS
+            var arrowCylinderDimension = rotateDimension * TRANSLATE_ARROW_CYLINDER_CAMERA_DISTANCE_MULTIPLE / 
+                                                           ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var arrowCylinderDimensions = { 
+                x:arrowCylinderDimension, 
+                y:arrowCylinderDimension * TRANSLATE_ARROW_CYLINDER_Y_MULTIPLE, 
+                z:arrowCylinderDimension 
+            };
+            var arrowConeDimension = rotateDimension * TRANSLATE_ARROW_CONE_CAMERA_DISTANCE_MULTIPLE / 
+                                                       ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var arrowConeDimensions = { x:arrowConeDimension, y:arrowConeDimension, z:arrowConeDimension };
+            var arrowCylinderOffset = rotateDimension * TRANSLATE_ARROW_CYLINDER_OFFSET / ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var arrowConeOffset = arrowCylinderDimensions.y * TRANSLATE_ARROW_CONE_OFFSET_CYLINDER_DIMENSION_MULTIPLE;
+            var cylinderXPosition = { x:arrowCylinderOffset, y:0, z:0 };
+            cylinderXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderXPosition));
+            Overlays.editOverlay(handleTranslateXCylinder, { 
+                position: cylinderXPosition, 
+                rotation: rotationX,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderXOffset = Vec3.subtract(cylinderXPosition, position);
+            var coneXPosition = Vec3.sum(cylinderXPosition, Vec3.multiply(Vec3.normalize(cylinderXOffset), arrowConeOffset));
+            Overlays.editOverlay(handleTranslateXCone, { 
+                position: coneXPosition, 
+                rotation: rotationX,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderYPosition = { x:0, y:arrowCylinderOffset, z:0 };
+            cylinderYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderYPosition));
+            Overlays.editOverlay(handleTranslateYCylinder, { 
+                position: cylinderYPosition, 
+                rotation: rotationY,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderYOffset = Vec3.subtract(cylinderYPosition, position);
+            var coneYPosition = Vec3.sum(cylinderYPosition, Vec3.multiply(Vec3.normalize(cylinderYOffset), arrowConeOffset));
+            Overlays.editOverlay(handleTranslateYCone, { 
+                position: coneYPosition, 
+                rotation: rotationY,
+                dimensions: arrowConeDimensions
+            });
+            var cylinderZPosition = { x:0, y:0, z:arrowCylinderOffset };
+            cylinderZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, cylinderZPosition));
+            Overlays.editOverlay(handleTranslateZCylinder, { 
+                position: cylinderZPosition, 
+                rotation: rotationZ,
+                dimensions: arrowCylinderDimensions
+            });
+            var cylinderZOffset = Vec3.subtract(cylinderZPosition, position);
+            var coneZPosition = Vec3.sum(cylinderZPosition, Vec3.multiply(Vec3.normalize(cylinderZOffset), arrowConeOffset));
+            Overlays.editOverlay(handleTranslateZCone, { 
+                position: coneZPosition, 
+                rotation: rotationZ,
+                dimensions: arrowConeDimensions
+            });
+
             // UPDATE SCALE CUBES
             var scaleCubeOffsetX = SCALE_CUBE_OFFSET * dimensions.x;
             var scaleCubeOffsetY = SCALE_CUBE_OFFSET * dimensions.y;
             var scaleCubeOffsetZ = SCALE_CUBE_OFFSET * dimensions.z;
-            var scaleCubeDimension = toCameraDistance * SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE;
+            var scaleCubeDimension = rotateDimension * SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE / 
+                                                       ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
             var scaleCubeDimensions = { x:scaleCubeDimension, y:scaleCubeDimension, z:scaleCubeDimension };
             var scaleCubeRotation = spaceMode === SPACE_LOCAL ? rotation : Quat.IDENTITY;
             var scaleLBNCubePosition = { x:-scaleCubeOffsetX, y:-scaleCubeOffsetY, z:-scaleCubeOffsetZ };
@@ -1192,21 +1208,23 @@ SelectionDisplay = (function() {
             Overlays.editOverlay(handleScaleFLEdge, { start: scaleLTFCubePosition, end: scaleLBFCubePosition });
 
             // UPDATE STRETCH SPHERES
-            var stretchSphereDimension = toCameraDistance * STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE;
+            var stretchSphereDimension = rotateDimension * STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE / 
+                                                           ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
             var stretchSphereDimensions = { x:stretchSphereDimension, y:stretchSphereDimension, z:stretchSphereDimension };
-            var stretchXPosition = { x:STRETCH_SPHERE_OFFSET * toCameraDistance, y:0, z:0 };
+            var stretchSphereOffset = rotateDimension * STRETCH_SPHERE_OFFSET / ROTATE_RING_CAMERA_DISTANCE_MULTIPLE;
+            var stretchXPosition = { x:stretchSphereOffset, y:0, z:0 };
             stretchXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchXPosition));
             Overlays.editOverlay(handleStretchXSphere, { 
                 position: stretchXPosition, 
                 dimensions: stretchSphereDimensions 
             });
-            var stretchYPosition = { x:0, y:STRETCH_SPHERE_OFFSET * toCameraDistance, z:0 };
+            var stretchYPosition = { x:0, y:stretchSphereOffset, z:0 };
             stretchYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchYPosition));
             Overlays.editOverlay(handleStretchYSphere, { 
                 position: stretchYPosition, 
                 dimensions: stretchSphereDimensions 
             });
-            var stretchZPosition = { x:0, y:0, z:STRETCH_SPHERE_OFFSET * toCameraDistance };
+            var stretchZPosition = { x:0, y:0, z:stretchSphereOffset };
             stretchZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, stretchZPosition));
             Overlays.editOverlay(handleStretchZSphere, { 
                 position: stretchZPosition, 
@@ -1218,7 +1236,7 @@ SelectionDisplay = (function() {
             var scaleRBFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRBFCubePosition);
             var stretchPanelXDimensions = Vec3.subtract(scaleLTFCubePositionRotated, scaleRBFCubePositionRotated);
             var tempY = Math.abs(stretchPanelXDimensions.y);
-            stretchPanelXDimensions.x = 0.01;
+            stretchPanelXDimensions.x = STRETCH_PANEL_WIDTH;
             stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
             stretchPanelXDimensions.z = tempY;
             var stretchPanelXPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:dimensions.x / 2, y:0, z:0 }));
@@ -1232,7 +1250,7 @@ SelectionDisplay = (function() {
             var stretchPanelYDimensions = Vec3.subtract(scaleLTNCubePositionRotated, scaleRTFCubePositionRotated);
             var tempX = Math.abs(stretchPanelYDimensions.x);
             stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
-            stretchPanelYDimensions.y = 0.01;
+            stretchPanelYDimensions.y = STRETCH_PANEL_WIDTH;
             stretchPanelYDimensions.z = tempX;
             var stretchPanelYPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:dimensions.y / 2, z:0 }));
             Overlays.editOverlay(handleStretchYPanel, { 
@@ -1246,7 +1264,7 @@ SelectionDisplay = (function() {
             var tempX = Math.abs(stretchPanelZDimensions.x);
             stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
             stretchPanelZDimensions.y = tempX;
-            stretchPanelZDimensions.z = 0.01;
+            stretchPanelZDimensions.z = STRETCH_PANEL_WIDTH;
             var stretchPanelZPosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, { x:0, y:0, z:dimensions.z / 2 }));
             Overlays.editOverlay(handleStretchZPanel, { 
                 position: stretchPanelZPosition, 
@@ -1302,7 +1320,8 @@ SelectionDisplay = (function() {
         that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) && 
                                        !isActiveTool(handleRotateRollRing));
 
-        //keep cloner always hidden for now since you can hold Alt to clone while dragging to translate  - we may bring cloner back for HMD only later
+        //keep cloner always hidden for now since you can hold Alt to clone while  
+        //translating an entity - we may bring cloner back for HMD only later
         //that.setHandleClonerVisible(!activeTool || isActiveTool(handleCloner));
 
         if (wantDebug) {
@@ -1584,7 +1603,6 @@ SelectionDisplay = (function() {
                 grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
                 cornerPosition);
 
-
             for (var i = 0; i < SelectionManager.selections.length; i++) {
                 var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
                 if (!properties) {
@@ -1693,7 +1711,6 @@ SelectionDisplay = (function() {
                     print("                event.y:" + event.y);
                     Vec3.print("        newIntersection:", newIntersection);
                     Vec3.print("                 vector:", vector);
-                    // Vec3.print("            newPosition:", newPosition);
                 }
     
                 for (var i = 0; i < SelectionManager.selections.length; i++) {
@@ -1947,7 +1964,6 @@ SelectionDisplay = (function() {
             
             var localDeltaPivot = deltaPivot;
             var localSigns = signs;
-    
             var pickRay = generalComputePickRay(event.x, event.y);
             
             // Are we using handControllers or Mouse - only relevant for 3D tools
@@ -1956,35 +1972,24 @@ SelectionDisplay = (function() {
             if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && 
                     controllerPose.valid && that.triggered && directionFor3DStretch) {
                 localDeltaPivot = deltaPivot3D;
-    
                 newPick = pickRay.origin;
-            
                 vector = Vec3.subtract(newPick, lastPick3D);
-                
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-            
                 if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
                     // Range of Motion
                     vector = Vec3.multiply(distanceFor3DStretch , vector);
                 }
-                
                 localSigns = directionFor3DStretch;
-                
             } else {
-                newPick = rayPlaneIntersection(pickRay,
-                    pickRayPosition,
-                    planeNormal);
+                newPick = rayPlaneIntersection(pickRay, pickRayPosition, planeNormal);
                 vector = Vec3.subtract(newPick, lastPick);
-    
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
-    
                 vector = vec3Mult(mask, vector);
             }
             
             vector = grid.snapToSpacing(vector);
     
-            var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
-
+            var changeInDimensions = Vec3.multiply(NEGATE_VECTOR, vec3Mult(localSigns, vector));
             if (directionEnum === STRETCH_DIRECTION.ALL) {
                 var toCameraDistance = getDistanceToCamera(position);
                 var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;
@@ -1993,22 +1998,22 @@ SelectionDisplay = (function() {
 
             var newDimensions;
             if (proportional) {
-                var absX = Math.abs(changeInDimensions.x);
-                var absY = Math.abs(changeInDimensions.y);
-                var absZ = Math.abs(changeInDimensions.z);
-                var pctChange = 0;
-                if (absX > absY && absX > absZ) {
-                    pctChange = changeInDimensions.x / initialProperties.dimensions.x;
-                    pctChange = changeInDimensions.x / initialDimensions.x;
-                } else if (absY > absZ) {
-                    pctChange = changeInDimensions.y / initialProperties.dimensions.y;
-                    pctChange = changeInDimensions.y / initialDimensions.y;
+                var absoluteX = Math.abs(changeInDimensions.x);
+                var absoluteY = Math.abs(changeInDimensions.y);
+                var absoluteZ = Math.abs(changeInDimensions.z);
+                var percentChange = 0;
+                if (absoluteX > absoluteY && absoluteX > absoluteZ) {
+                    percentChange = changeInDimensions.x / initialProperties.dimensions.x;
+                    percentChange = changeInDimensions.x / initialDimensions.x;
+                } else if (absoluteY > absoluteZ) {
+                    percentChange = changeInDimensions.y / initialProperties.dimensions.y;
+                    percentChange = changeInDimensions.y / initialDimensions.y;
                 } else {
-                    pctChange = changeInDimensions.z / initialProperties.dimensions.z;
-                    pctChange = changeInDimensions.z / initialDimensions.z;
+                    percentChange = changeInDimensions.z / initialProperties.dimensions.z;
+                    percentChange = changeInDimensions.z / initialDimensions.z;
                 }
-                pctChange += 1.0;
-                newDimensions = Vec3.multiply(pctChange, initialDimensions);
+                percentChange += 1.0;
+                newDimensions = Vec3.multiply(percentChange, initialDimensions);
             } else {
                 newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
             }
@@ -2033,13 +2038,9 @@ SelectionDisplay = (function() {
             var wantDebug = false;
             if (wantDebug) {
                 print(stretchMode);
-                // Vec3.print("        newIntersection:", newIntersection);
                 Vec3.print("                 vector:", vector);
-                // Vec3.print("           oldPOS:", oldPOS);
-                // Vec3.print("                newPOS:", newPOS);
                 Vec3.print("            changeInDimensions:", changeInDimensions);
                 Vec3.print("                 newDimensions:", newDimensions);
-    
                 Vec3.print("              changeInPosition:", changeInPosition);
                 Vec3.print("                   newPosition:", newPosition);
             }
@@ -2056,52 +2057,53 @@ SelectionDisplay = (function() {
     }
 
     function addHandleStretchTool(overlay, mode, directionEnum) {
-        var directionVec, offset, stretchPanel;
+        var directionVector, offset, stretchPanel;
         if (directionEnum === STRETCH_DIRECTION.X) {
             stretchPanel = handleStretchXPanel;
-            directionVec = { x:-1, y:0, z:0 };
+            directionVector = { x:-1, y:0, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Y) {
             stretchPanel = handleStretchYPanel;
-            directionVec = { x:0, y:-1, z:0 };
+            directionVector = { x:0, y:-1, z:0 };
         } else if (directionEnum === STRETCH_DIRECTION.Z) {
             stretchPanel = handleStretchZPanel
-            directionVec = { x:0, y:0, z:-1 };
+            directionVector = { x:0, y:0, z:-1 };
         }
-        offset = Vec3.multiply(directionVec, -1);
-        var tool = makeStretchTool(mode, directionEnum, directionVec, directionVec, offset, stretchPanel, null);
+        offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
+        var tool = makeStretchTool(mode, directionEnum, directionVector, directionVector, offset, stretchPanel, null);
         return addHandleTool(overlay, tool);
     }
 
     // TOOL DEFINITION: HANDLE SCALE TOOL   
     function addHandleScaleTool(overlay, mode, directionEnum) {
-        var directionVec, offset, selectedHandle;
+        var directionVector, offset, selectedHandle;
         if (directionEnum === SCALE_DIRECTION.LBN) {
-            directionVec = { x:1, y:1, z:1 };
+            directionVector = { x:1, y:1, z:1 };
             selectedHandle = handleScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
-            directionVec = { x:1, y:1, z:-1 };
+            directionVector = { x:1, y:1, z:-1 };
             selectedHandle = handleScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
-            directionVec = { x:-1, y:1, z:1 };
+            directionVector = { x:-1, y:1, z:1 };
             selectedHandle = handleScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
-            directionVec = { x:-1, y:1, z:-1 };
+            directionVector = { x:-1, y:1, z:-1 };
             selectedHandle = handleScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
-            directionVec = { x:1, y:-1, z:1 };
+            directionVector = { x:1, y:-1, z:1 };
             selectedHandle = handleScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
-            directionVec = { x:1, y:-1, z:-1 };
+            directionVector = { x:1, y:-1, z:-1 };
             selectedHandle = handleScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
-            directionVec = { x:-1, y:-1, z:1 };
+            directionVector = { x:-1, y:-1, z:1 };
             selectedHandle = handleScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
-            directionVec = { x:-1, y:-1, z:-1 };
+            directionVector = { x:-1, y:-1, z:-1 };
             selectedHandle = handleScaleRTFCube;
         }
-        offset = Vec3.multiply(directionVec, -1);
-        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVec, directionVec, offset, null, selectedHandle);
+        offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
+        var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVector, 
+                                   directionVector, offset, null, selectedHandle);
         return addHandleTool(overlay, tool);
     }
 
@@ -2158,6 +2160,7 @@ SelectionDisplay = (function() {
         var selectedHandle = null;
         var worldRotation = null;
         var rotationCenter = null;
+        var initialRotation = null;
         addHandleTool(overlay, {
             mode: mode,
             onBegin: function(event, pickRay, pickResult) {
@@ -2197,8 +2200,8 @@ SelectionDisplay = (function() {
                     innerRadius: ROTATE_RING_SELECTED_INNER_RADIUS
                 });
 
-                var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
-                rotationNormal = Vec3.multiplyQbyV(rotation, rotationNormal);
+                initialRotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
+                rotationNormal = Vec3.multiplyQbyV(initialRotation, rotationNormal);
 
                 rotationCenter = SelectionManager.worldPosition;
 
@@ -2247,7 +2250,8 @@ SelectionDisplay = (function() {
             },
             onMove: function(event) {
                 if (!rotationZero) {
-                    print("ERROR: entitySelectionTool.addHandleRotateTool.onMove - Invalid RotationZero Specified (missed rotation target plane?)");
+                    print("ERROR: entitySelectionTool.addHandleRotateTool.onMove - " +
+                          "Invalid RotationZero Specified (missed rotation target plane?)");
 
                     // EARLY EXIT
                     return;
@@ -2299,7 +2303,9 @@ SelectionDisplay = (function() {
                         if (spaceMode === SPACE_LOCAL) {
                             Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
                         } else {
-                            Overlays.editOverlay(handleRotateCurrentRing, { rotation: Quat.fromPitchYawRollDegrees(-90, 0, 0) });
+                            Overlays.editOverlay(handleRotateCurrentRing, { 
+                                rotation: Quat.fromPitchYawRollDegrees(-90, 0, 0) 
+                            });
                         }
                     }
                 }

From d5bf9cdbcd1da585e14c0d1748f5388f97446716 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Tue, 6 Feb 2018 16:16:25 -0800
Subject: [PATCH 125/569] Updated JSDoc comments.

---
 interface/src/scripting/WindowScriptingInterface.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index b38d27aac5..cc81f0a082 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -334,6 +334,8 @@ public slots:
      * @param {number} aspectRatio=0 - The width/height ratio of the snapshot required. If the value is <code>0</code> the
      *     full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
      *     dimensions is adjusted in order to match the aspect ratio.
+     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ",jpg".
+	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'
      * @example <caption>Using the snapshot function and signals.</caption>
      * function onStillSnapshotTaken(path, notify) {
      *     print("Still snapshot taken: " + path);
@@ -355,13 +357,17 @@ public slots:
      * var notify = true;
      * var animated = true;
      * var aspect = 1920 / 1080;
-     * Window.takeSnapshot(notify, animated, aspect);
+     * var filename = QString();
+     * Window.takeSnapshot(notify, animated, aspect, filename);
      */
     void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
 
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
+     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ",jpg"
+     *
+     * var filename = QString();
      */
     void takeSecondaryCameraSnapshot(const QString& filename = QString());
 

From a2798190140f9efe71f767b98393f4704210fc7b Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 6 Feb 2018 16:33:27 -0800
Subject: [PATCH 126/569] woops

---
 libraries/gl/src/gl/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 155849bffa..309839808e 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -147,7 +147,7 @@ static void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum s
     }
     // FIXME For high severity errors, force a sync to the log, since we might crash
     // before the log file was flushed otherwise.  Performance hit here
-    //qCDebug(glLogging) << "OpenGL: " << message;
+    qCDebug(glLogging) << "OpenGL: " << message;
 }
 
 static void setupPixelFormatSimple(HDC hdc) {

From 5579eac034a9ca5cd1ed13032a1c9e1f1b538a29 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Tue, 6 Feb 2018 16:42:25 -0800
Subject: [PATCH 127/569] Nothing...

---
 interface/src/scripting/WindowScriptingInterface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index cc81f0a082..76decf4362 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -365,7 +365,7 @@ public slots:
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
-     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ",jpg"
+     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ".jpg"
      *
      * var filename = QString();
      */

From 6092f1503e12f220289dbe86ae8c63173236c12c Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Tue, 6 Feb 2018 15:57:53 -0800
Subject: [PATCH 128/569] Fixing android build

---
 android/app/build.gradle            |  2 +-
 android/build.gradle                | 12 +++++-----
 cmake/macros/AutoScribeShader.cmake | 34 +++++++----------------------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1cff708c3b..ba3d16ad4d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,7 +18,7 @@ android {
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
                     '-DQT_CMAKE_PREFIX_PATH=' + HIFI_ANDROID_PRECOMPILED + '/qt/lib/cmake',
-                    '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe',
+                    '-DNATIVE_SCRIBE=' + HIFI_ANDROID_PRECOMPILED + '/scribe' + EXEC_SUFFIX,
                     '-DHIFI_ANDROID_PRECOMPILED=' + HIFI_ANDROID_PRECOMPILED,
                     '-DRELEASE_NUMBER=' + RELEASE_NUMBER,
                     '-DRELEASE_TYPE=' + RELEASE_TYPE,
diff --git a/android/build.gradle b/android/build.gradle
index b1ac692517..9e5e76f0e3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -137,16 +137,16 @@ def packages = [
 def scribeLocalFile='scribe' + EXEC_SUFFIX
 
 def scribeFile='scribe_linux_x86_64'
-def scribeChecksum='c98678d9726bd8bbf1bab792acf3ff6c'
-def scribeVersion='onfeBkJWcJiTwiGOyZPVBjlyhoYQ4Axn'
+def scribeChecksum='ca4b904f52f4f993c29175ba96798fa6'
+def scribeVersion='wgpf4dB2Ltzg4Lb2jJ4nPFsHoDkmK_OO'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     scribeFile = 'scribe_osx_x86_64'
-    scribeChecksum='a137ad62c1bf7cca739da219544a9a16'
-    scribeVersion='kU.Aq512HVe65uRnkFEWQEqeQfaYF2c0'
+    scribeChecksum='72db9d32d4e1e50add755570ac5eb749'
+    scribeVersion='o_NbPrktzEYtBkQf3Tn7zc1nZWzM52w6'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     scribeFile = 'scribe_win32_x86_64.exe'
-    scribeChecksum='75c2ce9ed45d17de375e3988bfaba816'
-    scribeVersion='24TfWFh1FBY.t6i_LdzAXZYeQOtmQNZp'
+    scribeChecksum='678e43d290c90fda670c6fefe038a06d'
+    scribeVersion='GCCJxlmd2irvNOFWfZR0U1UCLHndHQrC'
 }
 
 def options = [
diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index f15930a7c2..c4cd2d186a 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -50,43 +50,25 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
   set(SHADER_TARGET "${SHADERS_DIR}/${SHADER_TARGET}")
   set(SHADER_TARGET_HEADER ${SHADER_TARGET}.h)
   set(SHADER_TARGET_SOURCE ${SHADER_TARGET}.cpp)
+  set(SCRIBE_COMMAND scribe)
 
   # Target dependant Custom rule on the SHADER_FILE
   if (APPLE)
     set(GLPROFILE MAC_GL)
-    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
-
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   elseif (ANDROID)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
-
-    # for an android build, we can't use the scribe that cmake would normally produce as a target,
-    # since it's unrunnable by the cross-compiling build machine
-
-    # so, we require the compiling user to point us at a compiled executable version for their native toolchain
-    if (NOT NATIVE_SCRIBE)
-        find_program(NATIVE_SCRIBE scribe PATHS ${SCRIBE_PATH} ENV SCRIBE_PATH)
-    endif()
-
-    if (NOT NATIVE_SCRIBE)
-      message(FATAL_ERROR "The High Fidelity scribe tool is required for shader pre-processing. \
-        Please compile scribe using your native toolchain and set SCRIBE_PATH to the path containing the scribe executable in your ENV.\
-      ")
-    endif ()
-
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND ${NATIVE_SCRIBE} ${SCRIBE_ARGS} DEPENDS ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
+    set(SCRIBE_COMMAND ${NATIVE_SCRIBE})
   elseif (UNIX)
     set(GLPROFILE LINUX_GL)
-    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
-
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   else ()
     set(GLPROFILE PC_GL)
-    set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
-
-    add_custom_command(OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} COMMAND scribe ${SCRIBE_ARGS} DEPENDS scribe ${SHADER_INCLUDE_FILES} ${SHADER_FILE})
   endif()
+  set(SCRIBE_ARGS -c++ -T ${SHADER_TYPE} -D GLPROFILE ${GLPROFILE} ${SCRIBE_INCLUDES} -o ${SHADER_TARGET} ${SHADER_FILE})
+  add_custom_command(
+    OUTPUT ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} 
+    COMMAND ${SCRIBE_COMMAND} ${SCRIBE_ARGS} 
+    DEPENDS ${SCRIBE_COMMAND} ${SHADER_INCLUDE_FILES} ${SHADER_FILE}
+  )
 
   #output the generated file name
   set(AUTOSCRIBE_SHADER_RETURN ${SHADER_TARGET_HEADER} ${SHADER_TARGET_SOURCE} PARENT_SCOPE)

From a578e6441687dd2df2ca21df5a6e51f68e347e08 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 09:44:45 -0800
Subject: [PATCH 129/569] Remove Qt dependency from scribe

---
 tools/scribe/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/scribe/CMakeLists.txt b/tools/scribe/CMakeLists.txt
index e62a3467e0..9c71aeec9c 100755
--- a/tools/scribe/CMakeLists.txt
+++ b/tools/scribe/CMakeLists.txt
@@ -1,3 +1,8 @@
 set(TARGET_NAME scribe)
 
-setup_hifi_project()
+# don't use the setup_hifi_project macro as we don't want Qt or GLM dependencies
+file(GLOB TARGET_SRCS src/*)
+add_executable(${TARGET_NAME} ${TARGET_SRCS})
+if (WIN32)
+ set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
+endif()

From 52af45a35513dda34efca3ef5adb48315c81e034 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 09:47:51 -0800
Subject: [PATCH 130/569] Create scribe only build mode

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbec4a0884..25fd4731e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,11 @@ include("cmake/init.cmake")
 
 include("cmake/compiler.cmake")
 
+if (BUILD_SCRIBE_ONLY)
+    add_subdirectory(tools/scribe)
+    return()
+endif()
+
 if (NOT DEFINED SERVER_ONLY)
   set(SERVER_ONLY 0)
 endif()

From 62de08f324922b9c68c027b8ba9baf6eed8179d2 Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Wed, 7 Feb 2018 10:16:27 -0800
Subject: [PATCH 131/569] fix issue with top icon changing

---
 scripts/system/html/entityProperties.html  | 20 ++++++++++----------
 scripts/system/html/js/entityProperties.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b93974ee77..65786eeef8 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -78,7 +78,7 @@
         </fieldset>
 
         <fieldset id="collision-info" class="major">
-            <legend class="section-header"> Collision<span>M</span> </legend>
+            <legend class="section-header"> Collision<span class=".collapse-icon">M</span> </legend>
             <fieldset class="minor">
                 <div class="behavior-group property checkbox">
                     <input type="checkbox" id="property-collisionless">
@@ -168,7 +168,7 @@
 
         <fieldset id="physical" class="major">
             <legend class="section-header physical-group">
-                Physical<span>M</span>
+                Physical<span class=".collapse-icon"> M</span>
             </legend>
             <fieldset class="minor">
                 <fieldset class="physical-group property xyz fstuple">
@@ -228,7 +228,7 @@
 
         <fieldset id="spatial" class="major">
             <legend class="section-header spatial-group">
-                Spatial<span>M</span>
+                Spatial<span class=".collapse-icon" >M</span>
             </legend>
             <fieldset class="spatial-group property xyz fstuple">
                 <legend>Position <span class="unit">m</span></legend>
@@ -296,7 +296,7 @@
 
         <fieldset id="behavior" class="major">
             <legend class="section-header behavior-group">
-                Behavior<span>M</span>
+                Behavior<span class=".collapse-icon">M</span>
             </legend>
             <div class="property textarea">
                 <label for="property-user-data">User data</label>
@@ -357,7 +357,7 @@
 
         <fieldset id="hyperlink" class="major">
             <legend class="section-header hyperlink-group hyperlink-section">
-                Hyperlink<span>M</span>
+                Hyperlink<span class=".collapse-icon">M</span>
             </legend>
             <div class="hyperlink-group hyperlink-section property url">
                 <label for="property-hyperlink-href">Href - hifi://address</label>
@@ -369,7 +369,7 @@
 
         <fieldset id="light" class="major">
             <legend class="section-header light-group light-section">
-                Light<span>M</span>
+                Light<span class=".collapse-icon">M</span>
             </legend>
             <fieldset class="light-group light-section property rgb fstuple">
                 <div class="color-picker" id="property-light-color"></div>
@@ -403,7 +403,7 @@
 
         <fieldset id="model" class="major">
             <legend class="section-header model-group model-section zone-section">
-                Model<span>M</span>
+                Model<span class=".collapse-icon">M</span>
             </legend>
             <fieldset class="minor">
                 <div class="model-group model-section property url ">
@@ -487,7 +487,7 @@
 
         <fieldset id="zone" class="major">
             <legend class="section-header zone-group zone-section">
-                Zone<span>M</span>
+                Zone<span class=".collapse-icon">M</span>
             </legend>
             <fieldset class="minor">
                 <div class="zone-group zone-section property checkbox">
@@ -680,7 +680,7 @@
         </fieldset>
         <fieldset id="text" class="major">
             <legend class="section-header text-group text-section">
-                Text<span>M</span>
+                Text<span class=".collapse-icon">M</span>
             </legend>
             <div class="text-group text-section property text">
                 <label for="property-text-text">Text content</label>
@@ -717,7 +717,7 @@
 
         <fieldset id="web" class="major">
             <legend class="section-header web-group web-section">
-                Web<span>M</span>
+                Web<span class=".collapse-icon">M</span>
             </legend>
             <div class="web-group web-section property url ">
                 <label for="property-web-source-url">Source URL</label>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7008d0df66..0c812f2410 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1697,7 +1697,7 @@ function loaded() {
         var isCollapsed = element.dataset.collapsed !== "true";
         element.dataset.collapsed = isCollapsed ? "true" : false;
         element.setAttribute("collapsed", isCollapsed ? "true" : "false");
-        element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M";
+        element.getElementsByClassName(".collapse-icon")[0].textContent = isCollapsed ? "L" : "M";
     };
 
     for (var collapseIndex = 0, numCollapsibles = elCollapsible.length; collapseIndex < numCollapsibles; ++collapseIndex) {

From fcb59a4ee6f9242aef1825fbdbf74a85e13f5307 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 11:06:30 -0800
Subject: [PATCH 132/569] Fixing android

---
 libraries/ui/src/ui/OffscreenQmlSurface.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 3c713db163..ea34f3de76 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -254,8 +254,10 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
     if (!javaScriptToInject.isEmpty()) {
         rootContext->setContextProperty("eventBridgeJavaScriptToInject", QVariant(javaScriptToInject));
     }
+#if !defined(Q_OS_ANDROID)
     rootContext->setContextProperty("FileTypeProfile", new FileTypeProfile(rootContext));
     rootContext->setContextProperty("HFWebEngineProfile", new HFWebEngineProfile(rootContext));
+#endif
     rootContext->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
     rootContext->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
     rootContext->setContextProperty("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());

From adb6f66a05a7ce4d9181712e5c24b8222983e70b Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 8 Feb 2018 09:51:48 +1300
Subject: [PATCH 133/569] Handle tablet entities and overlays not being
 available

---
 scripts/system/audio.js                          |  5 +++--
 .../system/controllers/controllerDispatcher.js   |  2 +-
 .../controllers/controllerModules/inEditMode.js  |  7 ++++---
 .../controllerModules/inVREditMode.js            |  5 +++--
 .../controllerModules/nearParentGrabOverlay.js   |  4 ++--
 .../controllers/controllerModules/stylusInput.js |  4 ++--
 scripts/system/controllers/grab.js               |  5 ++++-
 scripts/system/edit.js                           |  8 ++++----
 scripts/system/help.js                           |  5 ++---
 scripts/system/libraries/WebTablet.js            |  5 ++++-
 scripts/system/libraries/entitySelectionTool.js  | 11 ++++++++---
 scripts/system/libraries/utils.js                | 14 ++++++++++++++
 scripts/system/marketplaces/marketplaces.js      |  5 +++--
 scripts/system/menu.js                           |  5 +++--
 scripts/system/tablet-ui/tabletUI.js             | 16 ++++++++--------
 scripts/system/tablet-users.js                   |  5 ++---
 .../marketplace/shapes/modules/laser.js          | 12 +++++++++++-
 17 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/scripts/system/audio.js b/scripts/system/audio.js
index a93177ca38..ee82c0c6ea 100644
--- a/scripts/system/audio.js
+++ b/scripts/system/audio.js
@@ -42,8 +42,9 @@ function onClicked() {
         // for toolbar-mode: go back to home screen, this will close the window.
         tablet.gotoHomeScreen();
     } else {
-        var entity = HMD.tabletID;
-        Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+        if (HMD.tabletID) {
+            Entities.editEntity(HMD.tabletID, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+        }
         tablet.loadQMLSource(AUDIO_QML_SOURCE);
     }
 }
diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 16f1d086b7..b2455b3f5a 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -146,7 +146,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         };
 
         this.setIgnorePointerItems = function() {
-            if (HMD.tabletID !== this.tabletID) {
+            if (HMD.tabletID && HMD.tabletID !== this.tabletID) {
                 this.tabletID = HMD.tabletID;
                 Pointers.setIgnoreItems(_this.leftPointer, _this.blacklist);
                 Pointers.setIgnoreItems(_this.rightPointer, _this.blacklist);
diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js
index 763258573d..202290f2df 100644
--- a/scripts/system/controllers/controllerModules/inEditMode.js
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -32,7 +32,7 @@ Script.include("/~/system/libraries/utils.js");
 
         this.nearTablet = function(overlays) {
             for (var i = 0; i < overlays.length; i++) {
-                if (overlays[i] === HMD.tabletID) {
+                if (HMD.tabletID && overlays[i] === HMD.tabletID) {
                     return true;
                 }
             }
@@ -44,7 +44,8 @@ Script.include("/~/system/libraries/utils.js");
         };
 
         this.pointingAtTablet = function(objectID) {
-            return objectID === HMD.tabletScreenID || objectID === HMD.homeButtonID;
+            return (HMD.tabletScreenID && objectID === HMD.tabletScreenID)
+                || (HMD.homeButtonID && objectID === HMD.homeButtonID);
         };
 
         this.sendPickData = function(controllerData) {
@@ -106,7 +107,7 @@ Script.include("/~/system/libraries/utils.js");
             if (nearOverlay) {
                 var nearOverlayReady = nearOverlay.isReady(controllerData);
 
-                if (nearOverlayReady.active && nearOverlay.grabbedThingID === HMD.tabletID) {
+                if (nearOverlayReady.active && HMD.tabletID && nearOverlay.grabbedThingID === HMD.tabletID) {
                     return this.exitModule();
                 }
             }
diff --git a/scripts/system/controllers/controllerModules/inVREditMode.js b/scripts/system/controllers/controllerModules/inVREditMode.js
index 38eca65dd3..7b78d5e1c4 100644
--- a/scripts/system/controllers/controllerModules/inVREditMode.js
+++ b/scripts/system/controllers/controllerModules/inVREditMode.js
@@ -31,7 +31,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         );
 
         this.pointingAtTablet = function (objectID) {
-            return objectID === HMD.tabletScreenID || objectID === HMD.homeButtonID;
+            return (HMD.tabletScreenID && objectID === HMD.tabletScreenID)
+                || (HMD.homeButtonID && objectID === HMD.homeButtonID);
         };
 
         this.isReady = function (controllerData) {
@@ -76,7 +77,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                 : "LeftNearParentingGrabOverlay");
             if (nearOverlay) {
                 var nearOverlayReady = nearOverlay.isReady(controllerData);
-                if (nearOverlayReady.active && nearOverlay.grabbedThingID === HMD.tabletID) {
+                if (nearOverlayReady.active && HMD.tabletID && nearOverlay.grabbedThingID === HMD.tabletID) {
                     return makeRunningValues(false, [], []);
                 }
             }
diff --git a/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js b/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
index fa0fe31de2..0f876816b3 100644
--- a/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
+++ b/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
@@ -117,7 +117,7 @@ Script.include("/~/system/libraries/utils.js");
             Overlays.editOverlay(this.grabbedThingID, reparentProps);
 
             // resizeTablet to counter adjust offsets to account for change of scale from sensorToWorldMatrix
-            if (this.grabbedThingID === HMD.tabletID) {
+            if (HMD.tabletID && this.grabbedThingID === HMD.tabletID) {
                 resizeTablet(getTabletWidthFromSettings(), reparentProps.parentJointIndex);
             }
 
@@ -143,7 +143,7 @@ Script.include("/~/system/libraries/utils.js");
                 });
 
                 // resizeTablet to counter adjust offsets to account for change of scale from sensorToWorldMatrix
-                if (this.grabbedThingID === HMD.tabletID) {
+                if (HMD.tabletID && this.grabbedThingID === HMD.tabletID) {
                     resizeTablet(getTabletWidthFromSettings(), this.previousParentJointIndex[this.grabbedThingID]);
                 }
             }
diff --git a/scripts/system/controllers/controllerModules/stylusInput.js b/scripts/system/controllers/controllerModules/stylusInput.js
index aa65135289..a512fd89db 100644
--- a/scripts/system/controllers/controllerModules/stylusInput.js
+++ b/scripts/system/controllers/controllerModules/stylusInput.js
@@ -20,7 +20,7 @@ Script.include("/~/system/libraries/controllers.js");
         var stylusTargetIDs = [];
         for (var index = 0; index < stylusTargets.length; index++) {
             var stylusTarget = stylusTargets[index];
-            if (stylusTarget.distance <= maxNormalDistance && stylusTarget.id !== HMD.tabletID) {
+            if (stylusTarget.distance <= maxNormalDistance && !(HMD.tabletID && stylusTarget.id === HMD.tabletID)) {
                 stylusTargetIDs.push(stylusTarget.id);
             }
         }
@@ -96,7 +96,7 @@ Script.include("/~/system/libraries/controllers.js");
             var i, stylusTarget;
 
             for (i = 0; i < candidateOverlays.length; i++) {
-                if (candidateOverlays[i] !== HMD.tabletID &&
+                if (!(HMD.tabletID && candidateOverlays[i] === HMD.tabletID) &&
                     Overlays.getProperty(candidateOverlays[i], "visible")) {
                     stylusTarget = getOverlayDistance(controllerPosition, candidateOverlays[i]);
                     if (stylusTarget) {
diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js
index a51cea67f8..b62cb3dd90 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -263,7 +263,10 @@ function Grabber() {
         filter: Picks.PICK_OVERLAYS,
         enabled: true
     });
-    RayPick.setIncludeItems(this.mouseRayOverlays, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
+    var tabletItems = getMainTabletIDs();
+    if (tabletItems.length > 0) {
+        RayPick.setIncludeItems(this.mouseRayOverlays, tabletItems);
+    }
     var renderStates = [{name: "grabbed", end: beacon}];
     this.mouseRayEntities = Pointers.createPointer(PickType.Ray, {
         joint: "Mouse",
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 863c185cb4..42c1cc4b51 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -31,6 +31,7 @@ Script.include([
     "libraries/entityCameraTool.js",
     "libraries/gridTool.js",
     "libraries/entityList.js",
+    "libraries/utils.js",
     "particle_explorer/particleExplorerTool.js",
     "libraries/entityIconOverlayManager.js"
 ]);
@@ -733,8 +734,7 @@ function findClickedEntity(event) {
     }
 
     var pickRay = Camera.computePickRay(event.x, event.y);
-
-    var overlayResult = Overlays.findRayIntersection(pickRay, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
+    var overlayResult = Overlays.findRayIntersection(pickRay, true, getMainTabletIDs());
     if (overlayResult.intersects) {
         return null;
     }
@@ -922,7 +922,7 @@ function mouseReleaseEvent(event) {
 
 function wasTabletClicked(event) {
     var rayPick = Camera.computePickRay(event.x, event.y);
-    var result = Overlays.findRayIntersection(rayPick, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
+    var result = Overlays.findRayIntersection(rayPick, true, getMainTabletIDs());
     return result.intersects;
 }
 
@@ -945,7 +945,7 @@ function mouseClickEvent(event) {
         toolBar.setActive(true);
         var pickRay = result.pickRay;
         var foundEntity = result.entityID;
-        if (foundEntity === HMD.tabletID) {
+        if (HMD.tabletID && foundEntity === HMD.tabletID) {
             return;
         }
         properties = Entities.getEntityProperties(foundEntity);
diff --git a/scripts/system/help.js b/scripts/system/help.js
index 9ab7fa3fb3..6fe0da8a86 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -30,9 +30,8 @@
         if (onHelpScreen) {
             tablet.gotoHomeScreen();
         } else {
-            var tabletEntity = HMD.tabletID;
-            if (tabletEntity) {
-                Entities.editEntity(tabletEntity, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
+            if (HMD.tabletID) {
+                Entities.editEntity(HMD.tabletID, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
             }
             Menu.triggerOption('Help...');
             onHelpScreen = true;
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 05b4963280..c4ad2b43a7 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -334,7 +334,7 @@ WebTablet.prototype.destroy = function () {
 };
 
 WebTablet.prototype.geometryChanged = function (geometry) {
-    if (!HMD.active) {
+    if (!HMD.active && HMD.tabletID) {
         var tabletProperties = {};
         // compute position, rotation & parentJointIndex of the tablet
         this.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);
@@ -462,6 +462,9 @@ WebTablet.prototype.calculateTabletAttachmentProperties = function (hand, useMou
 };
 
 WebTablet.prototype.onHmdChanged = function () {
+    if (!HMD.tabletID) {
+        return;
+    }
     var tabletProperties = {};
     // compute position, rotation & parentJointIndex of the tablet
     this.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index b8ba146757..eea541a430 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -19,7 +19,10 @@ HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 SPACE_LOCAL = "local";
 SPACE_WORLD = "world";
 
-Script.include("./controllers.js");
+Script.include([
+    "./controllers.js",
+    "./utils.js"
+]);
 
 function objectTranslationPlanePoint(position, dimensions) {
     var newPosition = { x: position.x, y: position.y, z: position.z };
@@ -3650,7 +3653,8 @@ SelectionDisplay = (function() {
 
         var pickRay = generalComputePickRay(event.x, event.y);
         // TODO_Case6491:  Move this out to setup just to make it once
-        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID, selectionBox];
+        var interactiveOverlays = getMainTabletIDs();
+        interactiveOverlays.push(selectionBox);
         for (var key in grabberTools) {
             if (grabberTools.hasOwnProperty(key)) {
                 interactiveOverlays.push(key);
@@ -3663,7 +3667,8 @@ SelectionDisplay = (function() {
         var results = testRayIntersect(pickRay, interactiveOverlays);
         if (results.intersects) {
             var hitOverlayID = results.overlayID;
-            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || (hitOverlayID === HMD.homeButtonID)) {
+            if ((HMD.tabletID && hitOverlayID === HMD.tabletID) || (HMD.tabletScreenID && hitOverlayID === HMD.tabletScreenID)
+                    || (HMD.homeButtonID && hitOverlayID === HMD.homeButtonID)) {
                 // EARLY EXIT-(mouse clicks on the tablet should override the edit affordances)
                 return false;
             }
diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js
index bc83cc582c..442a9f6d24 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -428,3 +428,17 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
         dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim }
     });
 };
+
+getMainTabletIDs = function () {
+    var tabletIDs = [];
+    if (HMD.tabletID) {
+        tabletIDs.push(HMD.tabletID);
+    }
+    if (HMD.tabletScreenID) {
+        tabletIDs.push(HMD.tabletScreenID);
+    }
+    if (HMD.homeButtonID) {
+        tabletIDs.push(HMD.homeButtonID);
+    }
+    return tabletIDs;
+};
\ No newline at end of file
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index facb932eb0..5d905f7553 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -104,8 +104,9 @@ var selectionDisplay = null; // for gridTool.js to ignore
             tablet.gotoHomeScreen();
         } else {
             Wallet.refreshWalletStatus();
-            var entity = HMD.tabletID;
-            Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+            if (HMD.tabletID) {
+                Entities.editEntity(HMD.tabletID, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+            }
             showMarketplace();
         }
     }
diff --git a/scripts/system/menu.js b/scripts/system/menu.js
index c7a44d3e48..c27dae6780 100644
--- a/scripts/system/menu.js
+++ b/scripts/system/menu.js
@@ -28,8 +28,9 @@ var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            var entity = HMD.tabletID;
-            Entities.editEntity(entity, {textures: JSON.stringify({"tex.close": HOME_BUTTON_TEXTURE})});
+            if (HMD.tabletID) {
+                Entities.editEntity(HMD.tabletID, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+            }
             tablet.gotoMenuScreen();
         }
     }
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 36a1cbcdd9..100d0e82ee 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -41,14 +41,14 @@
         if (!UIWebTablet) {
             return false;
         }
-        if (Overlays.getProperty(HMD.tabletID, "type") != "model") {
+        if (Overlays.getProperty(HMD.tabletID, "type") !== "model") {
             if (debugTablet) {
                 print("TABLET is invalid due to frame: " + JSON.stringify(Overlays.getProperty(HMD.tabletID, "type")));
             }
             return false;
         }
-        if (Overlays.getProperty(HMD.homeButtonID, "type") != "circle3d" ||
-            Overlays.getProperty(HMD.tabletScreenID, "type") != "web3d") {
+        if (Overlays.getProperty(HMD.homeButtonID, "type") !== "circle3d" ||
+                Overlays.getProperty(HMD.tabletScreenID, "type") !== "web3d") {
             if (debugTablet) {
                 print("TABLET is invalid due to other");
             }
@@ -112,7 +112,7 @@
     }
 
     function showTabletUI() {
-        checkTablet()
+        checkTablet();
 
         if (!tabletRezzed || !tabletIsValid()) {
             closeTabletUI();
@@ -157,7 +157,7 @@
     }
 
     function closeTabletUI() {
-        checkTablet()
+        checkTablet();
         gTablet.tabletShown = false;
         if (UIWebTablet) {
             if (UIWebTablet.onClose) {
@@ -178,14 +178,14 @@
             print("TABLET closeTabletUI, UIWebTablet is null");
         }
         tabletRezzed = false;
-        gTablet = null
+        gTablet = null;
     }
 
 
     function updateShowTablet() {
         var now = Date.now();
 
-        checkTablet()
+        checkTablet();
 
         // close the WebTablet if it we go into toolbar mode.
         var tabletShown = gTablet.tabletShown;
@@ -270,7 +270,7 @@
         }
         if (channel === "home") {
             if (UIWebTablet) {
-                checkTablet()
+                checkTablet();
                 gTablet.landscape = false;
             }
         }
diff --git a/scripts/system/tablet-users.js b/scripts/system/tablet-users.js
index 6181173818..92aefd1e80 100644
--- a/scripts/system/tablet-users.js
+++ b/scripts/system/tablet-users.js
@@ -48,9 +48,8 @@
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            var tabletEntity = HMD.tabletID;
-            if (tabletEntity) {
-                Entities.editEntity(tabletEntity, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
+            if (HMD.tabletID) {
+                Entities.editEntity(HMD.tabletID, {textures: JSON.stringify({"tex.close" : HOME_BUTTON_TEXTURE})});
             }
             shouldActivateButton = true;
             tablet.gotoWebScreen(USERS_URL);
diff --git a/unpublishedScripts/marketplace/shapes/modules/laser.js b/unpublishedScripts/marketplace/shapes/modules/laser.js
index d5feda0e1f..067b605047 100644
--- a/unpublishedScripts/marketplace/shapes/modules/laser.js
+++ b/unpublishedScripts/marketplace/shapes/modules/laser.js
@@ -173,8 +173,18 @@ Laser = function (side) {
             // Normal laser operation with trigger.
             intersection = Overlays.findRayIntersection(pickRay, PRECISION_PICKING, NO_INCLUDE_IDS, NO_EXCLUDE_IDS,
                 VISIBLE_ONLY);
+            var tabletIDs = [];
+            if (HMD.tabletID) {
+                tabletIDs.push(HMD.tabletID);
+            }
+            if (HMD.tabletScreenID) {
+                tabletIDs.push(HMD.tabletScreenID);
+            }
+            if (HMD.homeButtonID) {
+                tabletIDs.push(HMD.homeButtonID);
+            }
             if (Reticle.pointingAtSystemOverlay || (intersection.overlayID
-                    && [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID].indexOf(intersection.overlayID) !== -1)) {
+                    && tabletIDs.indexOf(intersection.overlayID) !== -1)) {
                 // No laser if pointing at HUD overlay or tablet; system provides lasers for these cases.
                 if (isLaserOn) {
                     isLaserOn = false;

From be4a009e119159ade0e93096c34ba7d03ccd9506 Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Wed, 7 Feb 2018 13:18:32 -0800
Subject: [PATCH 134/569] make it so only the icon on collapse headers
 collapses headers

---
 scripts/system/html/js/entityProperties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 0c812f2410..1b37c9da6e 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1702,7 +1702,7 @@ function loaded() {
 
     for (var collapseIndex = 0, numCollapsibles = elCollapsible.length; collapseIndex < numCollapsibles; ++collapseIndex) {
         var curCollapsibleElement = elCollapsible[collapseIndex];
-        curCollapsibleElement.addEventListener("click", toggleCollapsedEvent, true);
+        curCollapsibleElement.getElementsByTagName('span')[0].addEventListener("click", toggleCollapsedEvent, true);
     }
 
 

From 84f44539907b8846c803a14dfd02e51c2708428f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 7 Feb 2018 13:32:30 -0800
Subject: [PATCH 135/569] undo part of #12312

---
 interface/src/ui/overlays/Web3DOverlay.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 5fb4d58340..4f96e70aa9 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -80,7 +80,6 @@ Web3DOverlay::Web3DOverlay() {
     _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
     _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
     _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-
 }
 
 Web3DOverlay::Web3DOverlay(const Web3DOverlay* Web3DOverlay) :
@@ -201,6 +200,11 @@ void Web3DOverlay::setupQmlSurface() {
 
         _webSurface->getSurfaceContext()->setContextProperty("offscreenFlags", flags);
         _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
+
+        _webSurface->getSurfaceContext()->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
+
         // in Qt 5.10.0 there is already an "Audio" object in the QML context
         // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
         _webSurface->getSurfaceContext()->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());

From 2270dcd79d66ab842a7dbe38a4c7231068d4c6e5 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.com>
Date: Wed, 7 Feb 2018 10:19:30 -0800
Subject: [PATCH 136/569] Merge pull request #12316 from
 zfox23/commerce_inspectionCertRedesign

Commerce: Inspection Certificate Redesign
---
 .../InspectionCertificate.qml                 | 548 ++++++++++++------
 .../images/cert-bg-gold-split.png             | Bin 0 -> 189708 bytes
 .../inspectionCertificate/images/cert-bg.jpg  | Bin 64011 -> 0 bytes
 .../images/nocert-bg-split.png                | Bin 0 -> 17201 bytes
 .../commerce/wallet/sendMoney/SendMoney.qml   |   2 +-
 .../wallet/sendMoney/images/loader.gif        | Bin 59412 -> 0 bytes
 6 files changed, 362 insertions(+), 188 deletions(-)
 create mode 100644 interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg-gold-split.png
 delete mode 100644 interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg
 create mode 100644 interface/resources/qml/hifi/commerce/inspectionCertificate/images/nocert-bg-split.png
 delete mode 100644 interface/resources/qml/hifi/commerce/wallet/sendMoney/images/loader.gif

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 421fa4b074..2c7319be09 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -19,21 +19,30 @@ import "../../../controls-uit" as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 
-// references XXX from root context
-
 Rectangle {
     HifiConstants { id: hifi; }
 
     id: root;
-    property string marketplaceUrl;
-    property string certificateId;
+    property string marketplaceUrl: "";
+    property string certificateId: "";
     property string itemName: "--";
     property string itemOwner: "--";
     property string itemEdition: "--";
     property string dateOfPurchase: "--";
+    property string itemCost: "--";
+    property string certTitleTextColor: hifi.colors.darkGray;
+    property string certTextColor: hifi.colors.white;
+    property string infoTextColor: hifi.colors.blueAccent;
+    // 0 means replace none
+    // 4 means replace all but "Item Edition"
+    // 5 means replace all 5 replaceable fields
+    property int certInfoReplaceMode: 5;
     property bool isLightbox: false;
     property bool isMyCert: false;
-    property bool isCertificateInvalid: false;
+    property bool useGoldCert: true;
+    property bool certificateInfoPending: true;
+    property int certificateStatus: 0;
+    property bool certificateStatusPending: true;
     // Style
     color: hifi.colors.faintGray;
     Connections {
@@ -45,71 +54,130 @@ Rectangle {
             } else {
                 root.marketplaceUrl = result.data.marketplace_item_url;
                 root.isMyCert = result.isMyCert ? result.isMyCert : false;
-                root.itemOwner = root.isCertificateInvalid ? "--" : (root.isMyCert ? Account.username :
-                "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022");
-                root.itemEdition = root.isCertificateInvalid ? "Uncertified Copy" :
-                (result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run));
-                root.dateOfPurchase = root.isCertificateInvalid ? "" : getFormattedDate(result.data.transfer_created_at * 1000);
-                root.itemName = result.data.marketplace_item_name;
+
+                if (root.certInfoReplaceMode > 3) {
+                    root.itemName = result.data.marketplace_item_name;
+                    // "\u2022" is the Unicode character 'BULLET' - it's what's used in password fields on the web, etc
+                    root.itemOwner = root.isMyCert ? Account.username :
+                    "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
+                    root.dateOfPurchase = root.isMyCert ? getFormattedDate(result.data.transfer_created_at * 1000) : "Undisclosed";
+                    root.itemCost = (root.isMyCert && result.data.cost !== undefined) ? result.data.cost : "Undisclosed";
+                }
+                if (root.certInfoReplaceMode > 4) {
+                    root.itemEdition = result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run);
+                }
+
+                if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+                    if (root.isMyCert) {
+                        errorText.text = "This item is an uncertified copy of an item you purchased.";
+                    } else {
+                        errorText.text = "The person who placed this item doesn't own it.";
+                    }
+                }
 
                 if (result.data.invalid_reason || result.data.transfer_status[0] === "failed") {
-                    titleBarText.text = "Invalid Certificate";
-                    titleBarText.color = hifi.colors.redHighlight;
+                    root.useGoldCert = false;
+                    root.certTitleTextColor = hifi.colors.redHighlight;
+                    root.certTextColor = hifi.colors.redHighlight;
+                    root.infoTextColor = hifi.colors.redHighlight;
+                    titleBarText.text = "Certificate\nNo Longer Valid";
                     popText.text = "";
+                    showInMarketplaceButton.visible = false;
+                    // "Edition" text previously set above in this function
+                    // "Owner" text previously set above in this function
+                    // "Purchase Date" text previously set above in this function
+                    // "Purchase Price" text previously set above in this function
                     if (result.data.invalid_reason) {
                         errorText.text = result.data.invalid_reason;
                     }
                 } else if (result.data.transfer_status[0] === "pending") {
+                    root.useGoldCert = false;
+                    root.certTitleTextColor = hifi.colors.redHighlight;
+                    root.certTextColor = hifi.colors.redHighlight;
+                    root.infoTextColor = hifi.colors.redHighlight;
                     titleBarText.text = "Certificate Pending";
+                    popText.text = "";
+                    showInMarketplaceButton.visible = true;
+                    // "Edition" text previously set above in this function
+                    // "Owner" text previously set above in this function
+                    // "Purchase Date" text previously set above in this function
+                    // "Purchase Price" text previously set above in this function
                     errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
                     "this entity will be cleaned up by the domain.";
-                    errorText.color = hifi.colors.baseGray;
                 }
             }
+            root.certificateInfoPending = false;
         }
 
         onUpdateCertificateStatus: {
-            if (certStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
-                // NOP
-            } else if (certStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
-                root.isCertificateInvalid = true;
-                errorText.text = "Verification of this certificate timed out.";
-                errorText.color = hifi.colors.redHighlight;
-            } else if (certStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
-                root.isCertificateInvalid = true;
-                titleBarText.text = "Invalid Certificate";
-                titleBarText.color = hifi.colors.redHighlight;
-
+            root.certificateStatus = certStatus;
+            if (root.certificateStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
+                root.useGoldCert = true;
+                root.certTitleTextColor = hifi.colors.darkGray;
+                root.certTextColor = hifi.colors.white;
+                root.infoTextColor = hifi.colors.blueAccent;
+                titleBarText.text = "Certificate";
+                popText.text = "PROOF OF PROVENANCE";
+                showInMarketplaceButton.visible = true;
+                root.certInfoReplaceMode = 5;
+                // "Item Name" text will be set in "onCertificateInfoResult()"
+                // "Edition" text will be set in "onCertificateInfoResult()"
+                // "Owner" text will be set in "onCertificateInfoResult()"
+                // "Purchase Date" text will be set in "onCertificateInfoResult()"
+                // "Purchase Price" text will be set in "onCertificateInfoResult()"
+                errorText.text = "";
+            } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
+                root.useGoldCert = false;
+                root.certTitleTextColor = hifi.colors.redHighlight;
+                root.certTextColor = hifi.colors.redHighlight;
+                root.infoTextColor = hifi.colors.redHighlight;
+                titleBarText.text = "Request Timed Out";
                 popText.text = "";
+                showInMarketplaceButton.visible = false;
+                root.certInfoReplaceMode = 0;
+                root.itemName = "";
+                root.itemEdition = "";
                 root.itemOwner = "";
-                dateOfPurchaseHeader.text = "";
                 root.dateOfPurchase = "";
-                root.itemEdition = "Uncertified Copy";
-
+                root.itemCost = "";
+                errorText.text = "Your request to inspect this item timed out. Please try again later.";
+            } else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
+                root.useGoldCert = false;
+                root.certTitleTextColor = hifi.colors.redHighlight;
+                root.certTextColor = hifi.colors.redHighlight;
+                root.infoTextColor = hifi.colors.redHighlight;
+                titleBarText.text = "Certificate\nNo Longer Valid";
+                popText.text = "";
+                showInMarketplaceButton.visible = true;
+                root.certInfoReplaceMode = 5;
+                // "Item Name" text will be set in "onCertificateInfoResult()"
+                // "Edition" text will be set in "onCertificateInfoResult()"
+                // "Owner" text will be set in "onCertificateInfoResult()"
+                // "Purchase Date" text will be set in "onCertificateInfoResult()"
+                // "Purchase Price" text will be set in "onCertificateInfoResult()"
                 errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
-                errorText.color = hifi.colors.baseGray;
-            } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
-                root.isCertificateInvalid = true;
+            } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+                root.useGoldCert = false;
+                root.certTitleTextColor = hifi.colors.redHighlight;
+                root.certTextColor = hifi.colors.redHighlight;
+                root.infoTextColor = hifi.colors.redHighlight;
                 titleBarText.text = "Invalid Certificate";
-                titleBarText.color = hifi.colors.redHighlight;
-
                 popText.text = "";
-                root.itemOwner = "";
-                dateOfPurchaseHeader.text = "";
-                root.dateOfPurchase = "";
-                root.itemEdition = "Uncertified Copy";
-
-                errorText.text = "The avatar who rezzed this item doesn't own it.";
-                errorText.color = hifi.colors.baseGray;
+                showInMarketplaceButton.visible = true;
+                root.certInfoReplaceMode = 4;
+                // "Item Name" text will be set in "onCertificateInfoResult()"
+                root.itemEdition = "Uncertified Copy"
+                // "Owner" text will be set in "onCertificateInfoResult()"
+                // "Purchase Date" text will be set in "onCertificateInfoResult()"
+                // "Purchase Price" text will be set in "onCertificateInfoResult()"
+                // "Error Text" text will be set in "onCertificateInfoResult()"
             } else {
                 console.log("Unknown certificate status received from ledger signal!");
             }
-        }
-    }
-
-    onCertificateIdChanged: {
-        if (certificateId !== "") {
-            Commerce.certificateInfo(certificateId);
+            
+            root.certificateStatusPending = false;
+            // We've gotten cert status - we are GO on getting the cert info
+            Commerce.certificateInfo(root.certificateId);
         }
     }
 
@@ -122,9 +190,35 @@ Rectangle {
         hoverEnabled: true;
     }
 
-    Image {
+    Rectangle {
+        id: loadingOverlay;
+        z: 998;
+
+        visible: root.certificateInfoPending || root.certificateStatusPending;
         anchors.fill: parent;
-        source: "images/cert-bg.jpg";
+        color: Qt.rgba(0.0, 0.0, 0.0, 0.7);
+
+        // This object is always used in a popup or full-screen Wallet section.
+        // This MouseArea is used to prevent a user from being
+        //     able to click on a button/mouseArea underneath the popup/section.
+        MouseArea {
+            anchors.fill: parent;
+            propagateComposedEvents: false;
+        }
+                
+        AnimatedImage {
+            source: "../common/images/loader.gif"
+            width: 96;
+            height: width;
+            anchors.verticalCenter: parent.verticalCenter;
+            anchors.horizontalCenter: parent.horizontalCenter;
+        }
+    }
+
+    Image {
+        id: backgroundImage;
+        anchors.fill: parent;
+        source: root.useGoldCert ? "images/cert-bg-gold-split.png" : "images/nocert-bg-split.png";
     }
 
     // Title text
@@ -137,16 +231,17 @@ Rectangle {
         anchors.top: parent.top;
         anchors.topMargin: 40;
         anchors.left: parent.left;
-        anchors.leftMargin: 45;
+        anchors.leftMargin: 36;
         anchors.right: parent.right;
+        anchors.rightMargin: 8;
         height: paintedHeight;
         // Style
-        color: hifi.colors.darkGray;
+        color: root.certTitleTextColor;
+        wrapMode: Text.WordWrap;
     }
     // Title text
     RalewayRegular {
         id: popText;
-        text: "Proof of Provenance";
         // Text size
         size: 16;
         // Anchors
@@ -154,9 +249,38 @@ Rectangle {
         anchors.topMargin: 4;
         anchors.left: titleBarText.left;
         anchors.right: titleBarText.right;
-        height: paintedHeight;
+        height: text === "" ? 0 : paintedHeight;
         // Style
-        color: hifi.colors.darkGray;
+        color: root.certTitleTextColor;
+    }
+            
+    // "Close" button
+    HiFiGlyphs {
+        id: closeGlyphButton;
+        text: hifi.glyphs.close;
+        color: hifi.colors.white;
+        size: 26;
+        anchors.top: parent.top;
+        anchors.topMargin: 10;
+        anchors.right: parent.right;
+        anchors.rightMargin: 10;
+        MouseArea {
+            anchors.fill: parent;
+            hoverEnabled: true;
+            onEntered: {
+                parent.text = hifi.glyphs.closeInverted;
+            }
+            onExited: {
+                parent.text = hifi.glyphs.close;
+            }
+            onClicked: {
+                if (root.isLightbox) {
+                    root.visible = false;
+                } else {
+                    sendToScript({method: 'inspectionCertificate_closeClicked', closeGoesToPurchases: root.closeGoesToPurchases});
+                }
+            }
+        }
     }
 
     //
@@ -164,11 +288,13 @@ Rectangle {
     //
     Item {
         id: certificateContainer;
-        anchors.top: popText.bottom;
-        anchors.topMargin: 30;
-        anchors.bottom: buttonsContainer.top;
+        anchors.top: titleBarText.top;
+        anchors.topMargin: 110;
+        anchors.bottom: infoContainer.top;
         anchors.left: parent.left;
+        anchors.leftMargin: titleBarText.anchors.leftMargin;
         anchors.right: parent.right;
+        anchors.rightMargin: 24;
 
         RalewayRegular {
             id: itemNameHeader;
@@ -178,9 +304,7 @@ Rectangle {
             // Anchors
             anchors.top: parent.top;
             anchors.left: parent.left;
-            anchors.leftMargin: 45;
             anchors.right: parent.right;
-            anchors.rightMargin: 16;
             height: paintedHeight;
             // Style
             color: hifi.colors.darkGray;
@@ -197,79 +321,30 @@ Rectangle {
             anchors.right: itemNameHeader.right;
             height: paintedHeight;
             // Style
-            color: hifi.colors.white;
+            color: root.certTextColor;
             elide: Text.ElideRight;
             MouseArea {
+                enabled: showInMarketplaceButton.visible;
                 anchors.fill: parent;
                 hoverEnabled: enabled;
                 onClicked: {
                     sendToScript({method: 'inspectionCertificate_showInMarketplaceClicked', marketplaceUrl: root.marketplaceUrl});
                 }
                 onEntered: itemName.color = hifi.colors.blueHighlight;
-                onExited: itemName.color = hifi.colors.white;
+                onExited: itemName.color = root.certTextColor;
             }
         }
 
-        RalewayRegular {
-            id: ownedByHeader;
-            text: "OWNER";
-            // Text size
-            size: 16;
-            // Anchors
-            anchors.top: itemName.bottom;
-            anchors.topMargin: 28;
-            anchors.left: parent.left;
-            anchors.leftMargin: 45;
-            anchors.right: parent.right;
-            anchors.rightMargin: 16;
-            height: paintedHeight;
-            // Style
-            color: hifi.colors.darkGray;
-        }
-        RalewayRegular {
-            id: ownedBy;
-            text: root.itemOwner;
-            // Text size
-            size: 22;
-            // Anchors
-            anchors.top: ownedByHeader.bottom;
-            anchors.topMargin: 8;
-            anchors.left: ownedByHeader.left;
-            height: paintedHeight;
-            // Style
-            color: hifi.colors.white;
-            elide: Text.ElideRight;
-        }
-        AnonymousProRegular {
-            id: isMyCertText;
-            visible: root.isMyCert && !root.isCertificateInvalid;
-            text: "(Private)";
-            size: 18;
-            // Anchors
-            anchors.top: ownedBy.top;
-            anchors.topMargin: 4;
-            anchors.bottom: ownedBy.bottom;
-            anchors.left: ownedBy.right;
-            anchors.leftMargin: 6;
-            anchors.right: ownedByHeader.right;
-            // Style
-            color: hifi.colors.white;
-            elide: Text.ElideRight;
-            verticalAlignment: Text.AlignVCenter;
-        }
-
         RalewayRegular {
             id: editionHeader;
             text: "EDITION";
             // Text size
             size: 16;
             // Anchors
-            anchors.top: ownedBy.bottom;
+            anchors.top: itemName.bottom;
             anchors.topMargin: 28;
             anchors.left: parent.left;
-            anchors.leftMargin: 45;
             anchors.right: parent.right;
-            anchors.rightMargin: 16;
             height: paintedHeight;
             // Style
             color: hifi.colors.darkGray;
@@ -286,21 +361,117 @@ Rectangle {
             anchors.right: editionHeader.right;
             height: paintedHeight;
             // Style
-            color: hifi.colors.white;
+            color: root.certTextColor;
+        }
+
+        // "Show In Marketplace" button
+        HifiControlsUit.Button {
+            id: showInMarketplaceButton;
+            enabled: root.marketplaceUrl;
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.light;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 48;
+            anchors.right: parent.right;
+            width: 200;
+            height: 40;
+            text: "View In Market"
+            onClicked: {
+                sendToScript({method: 'inspectionCertificate_showInMarketplaceClicked', marketplaceUrl: root.marketplaceUrl});
+            }
+        }
+    }
+    //
+    // "CERTIFICATE" END
+    //
+
+    //
+    // "INFO CONTAINER" START
+    //
+    Item {
+        id: infoContainer;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.leftMargin: titleBarText.anchors.leftMargin;
+        anchors.right: parent.right;
+        anchors.rightMargin: 24;
+        height: root.useGoldCert ? 220 : 372;
+
+        RalewayRegular {
+            id: errorText;
+            visible: !root.useGoldCert;
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 36;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: 116;
+            // Style
+            wrapMode: Text.WordWrap;
+            color: hifi.colors.baseGray;
+            verticalAlignment: Text.AlignTop;
+        }
+
+        RalewayRegular {
+            id: ownedByHeader;
+            text: "OWNER";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: errorText.visible ? errorText.bottom : parent.top;
+            anchors.topMargin: 28;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: ownedBy;
+            text: root.itemOwner;
+            // Text size
+            size: 22;
+            // Anchors
+            anchors.top: ownedByHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: ownedByHeader.left;
+            height: paintedHeight;
+            // Style
+            color: root.infoTextColor;
+            elide: Text.ElideRight;
+        }
+        AnonymousProRegular {
+            id: isMyCertText;
+            visible: root.isMyCert && ownedBy.text !== "--" && ownedBy.text !== "";
+            text: "(Private)";
+            size: 18;
+            // Anchors
+            anchors.top: ownedBy.top;
+            anchors.topMargin: 4;
+            anchors.bottom: ownedBy.bottom;
+            anchors.left: ownedBy.right;
+            anchors.leftMargin: 6;
+            anchors.right: ownedByHeader.right;
+            // Style
+            color: root.infoTextColor;
+            elide: Text.ElideRight;
+            verticalAlignment: Text.AlignVCenter;
         }
 
         RalewayRegular {
             id: dateOfPurchaseHeader;
-            text: "DATE OF PURCHASE";
+            text: "PURCHASE DATE";
             // Text size
             size: 16;
             // Anchors
-            anchors.top: edition.bottom;
+            anchors.top: ownedBy.bottom;
             anchors.topMargin: 28;
             anchors.left: parent.left;
-            anchors.leftMargin: 45;
-            anchors.right: parent.right;
-            anchors.rightMargin: 16;
+            anchors.right: parent.horizontalCenter;
+            anchors.rightMargin: 8;
             height: paintedHeight;
             // Style
             color: hifi.colors.darkGray;
@@ -317,73 +488,58 @@ Rectangle {
             anchors.right: dateOfPurchaseHeader.right;
             height: paintedHeight;
             // Style
-            color: hifi.colors.white;
+            color: root.infoTextColor;
         }
 
         RalewayRegular {
-            id: errorText;
+            id: priceHeader;
+            text: "PURCHASE PRICE";
             // Text size
-            size: 20;
+            size: 16;
             // Anchors
-            anchors.top: dateOfPurchase.bottom;
-            anchors.topMargin: 36;
-            anchors.left: dateOfPurchase.left;
-            anchors.right: dateOfPurchase.right;
-            anchors.bottom: parent.bottom;
-            // Style
-            wrapMode: Text.WordWrap;
-            color: hifi.colors.redHighlight;
-            verticalAlignment: Text.AlignTop;
-        }
-    }
-    //
-    // "CERTIFICATE" END
-    //
-
-    Item {
-        id: buttonsContainer;
-        anchors.bottom: parent.bottom;
-        anchors.bottomMargin: 30;
-        anchors.left: parent.left;
-        anchors.right: parent.right;
-        height: 50;
-        
-        // "Cancel" button
-        HifiControlsUit.Button {
-            color: hifi.buttons.noneBorderlessWhite;
-            colorScheme: hifi.colorSchemes.light;
-            anchors.top: parent.top;
-            anchors.left: parent.left;
-            anchors.leftMargin: 30;
-            width: parent.width/2 - 50;
-            height: 50;
-            text: "close";
-            onClicked: {
-                if (root.isLightbox) {
-                    root.visible = false;
-                } else {
-                    sendToScript({method: 'inspectionCertificate_closeClicked', closeGoesToPurchases: root.closeGoesToPurchases});
-                }
-            }
-        }   
-
-        // "Show In Marketplace" button
-        HifiControlsUit.Button {
-            id: showInMarketplaceButton;
-            enabled: root.marketplaceUrl;
-            color: hifi.buttons.blue;
-            colorScheme: hifi.colorSchemes.light;
-            anchors.top: parent.top;
+            anchors.top: ownedBy.bottom;
+            anchors.topMargin: 28;
+            anchors.left: parent.horizontalCenter;
             anchors.right: parent.right;
-            anchors.rightMargin: 30;
-            width: parent.width/2 - 50;
-            height: 50;
-            text: "View In Market"
-            onClicked: {
-                sendToScript({method: 'inspectionCertificate_showInMarketplaceClicked', marketplaceUrl: root.marketplaceUrl});
-            }
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+        HiFiGlyphs {
+            id: hfcGlyph;
+            visible: priceText.text !== "Undisclosed" && priceText.text !== "";
+            text: hifi.glyphs.hfc;
+            // Size
+            size: 24;
+            // Anchors
+            anchors.top: priceHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: priceHeader.left;
+            width: visible ? paintedWidth + 6 : 0;
+            height: 40;
+            // Style
+            color: root.infoTextColor;
+            verticalAlignment: Text.AlignTop;
+            horizontalAlignment: Text.AlignLeft;
+        }
+        AnonymousProRegular {
+            id: priceText;
+            text: root.itemCost;
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: priceHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: hfcGlyph.right;
+            anchors.right: priceHeader.right;
+            height: paintedHeight;
+            // Style
+            color: root.infoTextColor;
         }
     }
+    //
+    // "INFO CONTAINER" END
+    //
 
     //
     // FUNCTION DEFINITIONS START
@@ -404,19 +560,11 @@ Rectangle {
     function fromScript(message) {
         switch (message.method) {
             case 'inspectionCertificate_setCertificateId':
+                resetCert(false);
                 root.certificateId = message.certificateId;
             break;
             case 'inspectionCertificate_resetCert':
-                titleBarText.text = "Certificate";
-                popText.text = "PROOF OF PURCHASE";
-                root.certificateId = "";
-                root.itemName = "--";
-                root.itemOwner = "--";
-                root.itemEdition = "--";
-                root.dateOfPurchase = "--";
-                root.marketplaceUrl = "";
-                root.isMyCert = false;
-                errorText.text = "";
+                resetCert(true);
             break;
             default:
                 console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
@@ -424,7 +572,33 @@ Rectangle {
     }
     signal sendToScript(var message);
 
+    function resetCert(alsoResetCertID) {
+        if (alsoResetCertID) {
+            root.certificateId = "";
+        }
+        root.certInfoReplaceMode = 5;
+        root.certificateInfoPending = true;
+        root.certificateStatusPending = true;
+        root.useGoldCert = true;
+        root.certTitleTextColor = hifi.colors.darkGray;
+        root.certTextColor = hifi.colors.white;
+        root.infoTextColor = hifi.colors.blueAccent;
+        titleBarText.text = "Certificate";
+        popText.text = "";
+        root.itemName = "--";
+        root.itemOwner = "--";
+        root.itemEdition = "--";
+        root.dateOfPurchase = "--";
+        root.marketplaceUrl = "";
+        root.itemCost = "--";
+        root.isMyCert = false;
+        errorText.text = "";
+    }
+
     function getFormattedDate(timestamp) {
+        if (timestamp === "--") {
+            return "--";
+        }
         function addLeadingZero(n) {
             return n < 10 ? '0' + n : '' + n;
         }
@@ -449,7 +623,7 @@ Rectangle {
 
         var min = addLeadingZero(a.getMinutes());
         var sec = addLeadingZero(a.getSeconds());
-        return year + '-' + month + '-' + day + '<br>' + drawnHour + ':' + min + amOrPm;
+        return year + '-' + month + '-' + day + ' ' + drawnHour + ':' + min + amOrPm;
     }
     //
     // FUNCTION DEFINITIONS END
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg-gold-split.png b/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg-gold-split.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a17df0b16f35320b67561440d6d9cf11cb2f29
GIT binary patch
literal 189708
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

literal 0
HcmV?d00001

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg b/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg
deleted file mode 100644
index b39a55e4e83f3290d7befdfeb1055cf9b73f4bfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64011
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

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/images/nocert-bg-split.png b/interface/resources/qml/hifi/commerce/inspectionCertificate/images/nocert-bg-split.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f5a492653b84bf6b739ae270180b1bb7b0d48d
GIT binary patch
literal 17201
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
F{|C0gl@I^`

literal 0
HcmV?d00001

diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
index ee1246c0c4..7dd72b904e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
@@ -1115,7 +1115,7 @@ Item {
                 
         AnimatedImage {
             id: sendingMoneyImage;
-            source: "./images/loader.gif"
+            source: "../../common/images/loader.gif"
             width: 96;
             height: width;
             anchors.verticalCenter: parent.verticalCenter;
diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/images/loader.gif b/interface/resources/qml/hifi/commerce/wallet/sendMoney/images/loader.gif
deleted file mode 100644
index 0536bd1884f1cb4a814b729803b1996c8347d182..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59412
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
L8@}NiK8F7Q4CAa&


From e01e88d4ae95f55880c894e574a845a16245fa01 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 7 Feb 2018 15:13:22 -0800
Subject: [PATCH 137/569] This works, but is it correct?

---
 .gitignore                                           |  5 ++++-
 .../inspectionCertificate/InspectionCertificate.qml  |  2 ++
 .../src/ui/overlays/ContextOverlayInterface.cpp      | 12 ++++++++----
 interface/src/ui/overlays/ContextOverlayInterface.h  |  2 +-
 scripts/system/marketplaces/marketplaces.js          |  3 +++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f45572c388..1ffb93fe80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,4 +85,7 @@ npm-debug.log
 android/app/src/main/assets
 
 # Resource binary file
-interface/compiledResources
\ No newline at end of file
+interface/compiledResources
+
+# GPUCache
+interface/resources/GPUCache/*
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 2c7319be09..bef03bd4c1 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -256,6 +256,7 @@ Rectangle {
             
     // "Close" button
     HiFiGlyphs {
+        z: 999; 
         id: closeGlyphButton;
         text: hifi.glyphs.close;
         color: hifi.colors.white;
@@ -562,6 +563,7 @@ Rectangle {
             case 'inspectionCertificate_setCertificateId':
                 resetCert(false);
                 root.certificateId = message.certificateId;
+                sendToScript({method: 'inspectionCertificate_requestOwnershipVerification', certificateId: root.certificateId});
             break;
             case 'inspectionCertificate_resetCert':
                 resetCert(true);
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index ed7b811fb0..77284408cd 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -221,13 +221,13 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
 void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (overlayID == _contextOverlayID  && event.getButton() == PointerEvent::PrimaryButton) {
         qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
+        emit contextOverlayClicked(_currentEntityWithContextOverlay);
         Setting::Handle<bool> _settingSwitch{ "commerce", true };
         if (_settingSwitch.get()) {
             openInspectionCertificate();
         } else {
             openMarketplace();
         }
-        emit contextOverlayClicked(_currentEntityWithContextOverlay);
         _contextOverlayJustClicked = true;
     }
 }
@@ -350,6 +350,12 @@ void ContextOverlayInterface::requestOwnershipVerification(const QUuid& entityID
             emit DependencyManager::get<WalletScriptingInterface>()->ownershipVerificationFailed(_lastInspectedEntity);
             qCDebug(context_overlay) << "Entity" << _lastInspectedEntity << "failed static certificate verification!";
         }
+    } else {
+        // We don't currently verify ownership of entities that aren't Avatar Entities,
+        //     so they always pass Ownership Verification. It's necessary to emit this signal
+        //     so that the Inspection Certificate can continue its information-grabbing process.
+        auto ledger = DependencyManager::get<Ledger>();
+        emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_SUCCESS));
     }
 }
 
@@ -357,12 +363,10 @@ static const QString INSPECTION_CERTIFICATE_QML_PATH = "hifi/commerce/inspection
 void ContextOverlayInterface::openInspectionCertificate() {
     // lets open the tablet to the inspection certificate QML
     if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) {
+        setLastInspectedEntity(_currentEntityWithContextOverlay);
         auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
         tablet->loadQMLSource(INSPECTION_CERTIFICATE_QML_PATH);
         _hmdScriptingInterface->openTablet();
-
-        setLastInspectedEntity(_currentEntityWithContextOverlay);
-        requestOwnershipVerification(_lastInspectedEntity);
     }
 }
 
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index 6aad2a773b..fcdf2d5820 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -57,7 +57,7 @@ public:
     bool getEnabled() { return _enabled; }
     bool getIsInMarketplaceInspectionMode() { return _isInMarketplaceInspectionMode; }
     void setIsInMarketplaceInspectionMode(bool mode) { _isInMarketplaceInspectionMode = mode; }
-    void requestOwnershipVerification(const QUuid& entityID);
+    Q_INVOKABLE void requestOwnershipVerification(const QUuid& entityID);
     EntityPropertyFlags getEntityPropertyFlags() { return _entityPropertyFlags; }
 
 signals:
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index facb932eb0..f0aef6fffe 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -563,6 +563,9 @@ var selectionDisplay = null; // for gridTool.js to ignore
             case 'inspectionCertificate_closeClicked':
                 tablet.gotoHomeScreen();
                 break;
+            case 'inspectionCertificate_requestOwnershipVerification':
+                ContextOverlay.requestOwnershipVerification(message.certificateId);
+                break;
             case 'inspectionCertificate_showInMarketplaceClicked':
                 tablet.gotoWebScreen(message.marketplaceUrl, MARKETPLACES_INJECT_SCRIPT_URL);
                 break;

From 2c514b5d1b3c0daec0b3970ed49d182c54f4409e Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 15:27:34 -0800
Subject: [PATCH 138/569] Don't trigger a backtrace exception on quitting while
 in HMD

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

diff --git a/interface/src/Application_render.cpp b/interface/src/Application_render.cpp
index e1f198eed2..5cc072df37 100644
--- a/interface/src/Application_render.cpp
+++ b/interface/src/Application_render.cpp
@@ -55,7 +55,7 @@ void Application::paintGL() {
         // If a display plugin loses it's underlying support, it
         // needs to be able to signal us to not use it
         if (!displayPlugin->beginFrameRender(_renderFrameCount)) {
-            updateDisplayMode();
+            QMetaObject::invokeMethod(this, "updateDisplayMode");
             return;
         }
     }

From f5e2e4f3d89713368f55b2063fc1ba54e52c6609 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 7 Feb 2018 15:44:21 -0800
Subject: [PATCH 139/569] Comment change

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 77284408cd..4dacab8936 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -221,13 +221,13 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
 void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (overlayID == _contextOverlayID  && event.getButton() == PointerEvent::PrimaryButton) {
         qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
-        emit contextOverlayClicked(_currentEntityWithContextOverlay);
         Setting::Handle<bool> _settingSwitch{ "commerce", true };
         if (_settingSwitch.get()) {
             openInspectionCertificate();
         } else {
             openMarketplace();
         }
+        emit contextOverlayClicked(_currentEntityWithContextOverlay);
         _contextOverlayJustClicked = true;
     }
 }
@@ -352,8 +352,8 @@ void ContextOverlayInterface::requestOwnershipVerification(const QUuid& entityID
         }
     } else {
         // We don't currently verify ownership of entities that aren't Avatar Entities,
-        //     so they always pass Ownership Verification. It's necessary to emit this signal
-        //     so that the Inspection Certificate can continue its information-grabbing process.
+        // so they always pass Ownership Verification. It's necessary to emit this signal
+        // so that the Inspection Certificate can continue its information-grabbing process.
         auto ledger = DependencyManager::get<Ledger>();
         emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_SUCCESS));
     }

From b6ac3484284f7d05e9322658bd281d91bdd95d1e Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 7 Feb 2018 16:30:07 -0800
Subject: [PATCH 140/569] get children of animated entity joints to follow
 along, again

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp  | 9 +++++++++
 libraries/shared/src/SpatiallyNestable.h                 | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 137203f475..c8d22bb06c 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -985,6 +985,7 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
         return;
     }
 
+    bool changed { false };
     // relay any inbound joint changes from scripts/animation/network to the model/rig
     _jointDataLock.withWriteLock([&] {
         for (int index = 0; index < _localJointData.size(); ++index) {
@@ -992,13 +993,21 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
             if (jointData.rotationDirty) {
                 model->setJointRotation(index, true, jointData.joint.rotation, 1.0f);
                 jointData.rotationDirty = false;
+                changed = true;
             }
             if (jointData.translationDirty) {
                 model->setJointTranslation(index, true, jointData.joint.translation, 1.0f);
                 jointData.translationDirty = false;
+                changed = true;
             }
         }
     });
+
+    if (changed) {
+        forEachChild([&](SpatiallyNestablePointer object) {
+            object->locationChanged(tellPhysics);
+        });
+    }
 }
 
 using namespace render;
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index 090ca4c266..5d4793ba4e 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -207,6 +207,10 @@ public:
 
     void dump(const QString& prefix = "") const;
 
+    virtual void locationChanged(bool tellPhysics = true); // called when a this object's location has changed
+    virtual void dimensionsChanged() { _queryAACubeSet = false; } // called when a this object's dimensions have changed
+    virtual void parentDeleted() { } // called on children of a deleted parent
+
 protected:
     const NestableType _nestableType; // EntityItem or an AvatarData
     QUuid _id;
@@ -218,10 +222,6 @@ protected:
     mutable ReadWriteLockable _childrenLock;
     mutable QHash<QUuid, SpatiallyNestableWeakPointer> _children;
 
-    virtual void locationChanged(bool tellPhysics = true); // called when a this object's location has changed
-    virtual void dimensionsChanged() { _queryAACubeSet = false; } // called when a this object's dimensions have changed
-    virtual void parentDeleted() { } // called on children of a deleted parent
-
     // _queryAACube is used to decide where something lives in the octree
     mutable AACube _queryAACube;
     mutable bool _queryAACubeSet { false };

From 31c2b8fea92c3b01ca9d8b379ee705205a1aebc5 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 7 Feb 2018 16:31:38 -0800
Subject: [PATCH 141/569] oops

---
 libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c8d22bb06c..ca15382c71 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1005,7 +1005,7 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
 
     if (changed) {
         forEachChild([&](SpatiallyNestablePointer object) {
-            object->locationChanged(tellPhysics);
+            object->locationChanged(false);
         });
     }
 }

From 77741c28514c7197d8880288b5a61be0aa327853 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 7 Feb 2018 16:43:15 -0800
Subject: [PATCH 142/569] Fix for deadlock triggering while loading QML engine

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3e7dd3e223..c22a370b1f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2404,7 +2404,9 @@ void Application::initializeUi() {
         tabletScriptingInterface->getTablet(SYSTEM_TABLET);
     }
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    DeadlockWatchdogThread::pause();
     offscreenUi->create();
+    DeadlockWatchdogThread::resume();
 
     auto surfaceContext = offscreenUi->getSurfaceContext();
 

From 572edab79fbc363c407eaec3da177b041c29277a Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:48:31 -0800
Subject: [PATCH 143/569] remove dupe const

---
 libraries/shared/src/BitVectorHelpers.h   | 2 ++
 tests/shared/src/BitVectorHelperTests.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/BitVectorHelpers.h b/libraries/shared/src/BitVectorHelpers.h
index 9f5af0c380..a619fe3999 100644
--- a/libraries/shared/src/BitVectorHelpers.h
+++ b/libraries/shared/src/BitVectorHelpers.h
@@ -12,6 +12,8 @@
 #ifndef hifi_BitVectorHelpers_h
 #define hifi_BitVectorHelpers_h
 
+#include "NumericalConstants.h"
+
 int calcBitVectorSize(int numBits) {
     return ((numBits - 1) >> 3) + 1;
 }
diff --git a/tests/shared/src/BitVectorHelperTests.cpp b/tests/shared/src/BitVectorHelperTests.cpp
index 070e90eec7..618a86cad1 100644
--- a/tests/shared/src/BitVectorHelperTests.cpp
+++ b/tests/shared/src/BitVectorHelperTests.cpp
@@ -20,8 +20,6 @@
 
 QTEST_MAIN(BitVectorHelperTests)
 
-const int BITS_IN_BYTE = 8;
-
 void BitVectorHelperTests::sizeTest() {
     std::vector<int> sizes = {0, 6, 7, 8, 30, 31, 32, 33, 87, 88, 89, 90, 90, 91, 92, 93};
     for (auto& size : sizes) {

From f0bb4d3da70baff2897085b0d309970b95c37e77 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:48:43 -0800
Subject: [PATCH 144/569] fix API bitrot and remove extra whitespace

---
 tests/shared/src/FileCacheTests.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/shared/src/FileCacheTests.cpp b/tests/shared/src/FileCacheTests.cpp
index 3f1c5e1a01..b7c2103817 100644
--- a/tests/shared/src/FileCacheTests.cpp
+++ b/tests/shared/src/FileCacheTests.cpp
@@ -33,7 +33,7 @@ size_t FileCacheTests::getCacheDirectorySize() const {
     return result;
 }
 
-FileCachePointer makeFileCache(QString& location) {
+FileCachePointer makeFileCache(QString location) {
     auto result = std::make_shared<FileCache>(location.toStdString(), "tmp");
     result->initialize();
     result->setMaxSize(MAX_UNUSED_SIZE);
@@ -53,7 +53,7 @@ void FileCacheTests::testUnusedFiles() {
             auto file = cache->writeFile(TEST_DATA.data(), FileCache::Metadata(key, TEST_DATA.size()));
             QVERIFY(file->_locked);
             inUseFiles.push_back(file);
-            
+
             QThread::msleep(10);
         }
         QCOMPARE(cache->getNumCachedFiles(), (size_t)0);
@@ -100,13 +100,13 @@ void FileCacheTests::testUnusedFiles() {
             inUseFiles.push_back(file);
 
             if (i == 94) {
-                // Each access touches the file, so we need to sleep here to ensure that the the last 5 files 
+                // Each access touches the file, so we need to sleep here to ensure that the the last 5 files
                 // have later times for cache ejection priority, otherwise the test runs too fast to reliably
-                // differentiate 
+                // differentiate
                 QThread::msleep(1000);
             }
         }
-        
+
         QCOMPARE(cache->getNumCachedFiles(), (size_t)0);
         QCOMPARE(cache->getNumTotalFiles(), (size_t)10);
         inUseFiles.clear();
@@ -119,7 +119,7 @@ size_t FileCacheTests::getFreeSpace() const {
     return QStorageInfo(_testDir.path()).bytesFree();
 }
 
-// FIXME if something else is changing the amount of free space on the target drive concurrently with this test 
+// FIXME if something else is changing the amount of free space on the target drive concurrently with this test
 // running, then it may fail
 void FileCacheTests::testFreeSpacePreservation() {
     QCOMPARE(getCacheDirectorySize(), MAX_UNUSED_SIZE);

From b3452f274e7433b7d497fe5f8df28996988185ba Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:49:22 -0800
Subject: [PATCH 145/569] use glm::nan() for platform-agnostic code

---
 tests/shared/src/GeometryUtilTests.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/shared/src/GeometryUtilTests.cpp b/tests/shared/src/GeometryUtilTests.cpp
index ccb3dc8a0e..eb9be4987f 100644
--- a/tests/shared/src/GeometryUtilTests.cpp
+++ b/tests/shared/src/GeometryUtilTests.cpp
@@ -31,20 +31,20 @@ static void testSphereVsCone(const glm::vec3 coneNormal, const glm::vec3 coneBiN
     glm::vec3 coneCenter = glm::vec3(0.0f, 0.0f, 0.0f);
     glm::vec3 sphereCenter = coneCenter + coneEdge * sphereDistance;
     float result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE(result < coneAngle, true);
 
     // push sphere outward from edge so it is tangent to the cone.
     glm::vec3 sphereOffset = glm::angleAxis(PI / 2.0f, w) * coneEdge;
     sphereCenter += sphereOffset * sphereRadius;
     result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE_WITH_ABS_ERROR(result, coneAngle, 0.001f);
 
     // push sphere outward from edge a bit further, so it is outside of the cone.
     sphereCenter += 0.1f * sphereOffset;
     result = coneSphereAngle(coneCenter, u, sphereCenter, sphereRadius);
-    QCOMPARE(isnan(result), false);
+    QCOMPARE(glm::isnan(result), false);
     QCOMPARE(result > coneAngle, true);
 }
 

From 64ec4dac7a697771af4782c9e959d1dc3ad14b62 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:49:42 -0800
Subject: [PATCH 146/569] remove broken DEV_BUILD context

---
 tests/shared/src/PathUtilsTests.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/shared/src/PathUtilsTests.cpp b/tests/shared/src/PathUtilsTests.cpp
index 1c445908f7..3aec4fa5f9 100644
--- a/tests/shared/src/PathUtilsTests.cpp
+++ b/tests/shared/src/PathUtilsTests.cpp
@@ -16,12 +16,8 @@
 QTEST_MAIN(PathUtilsTests)
 
 void PathUtilsTests::testPathUtils() {
-    QString result = PathUtils::qmlBasePath();
-#if DEV_BUILD
-    QVERIFY(result.startsWith("file:///"));
-#else
+    QString result = PathUtils::qmlBaseUrl();
     QVERIFY(result.startsWith("qrc:///"));
-#endif
     QVERIFY(result.endsWith("/"));
 }
 

From 784b265a86c00c9598be630083bf52f37f3beb9e Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 7 Feb 2018 18:11:00 -0800
Subject: [PATCH 147/569] better texture option parsing

---
 libraries/fbx/src/OBJReader.cpp | 184 ++++++++++++++------------------
 libraries/fbx/src/OBJReader.h   |   2 -
 2 files changed, 78 insertions(+), 108 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 3221e3a191..603bf5b39e 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -15,6 +15,7 @@
 #include "OBJReader.h"
 
 #include <ctype.h>  // .obj files are not locale-specific. The C/ASCII charset applies.
+#include <sstream> 
 
 #include <QtCore/QBuffer>
 #include <QtCore/QIODevice>
@@ -345,115 +346,86 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
     }
 } 
 
-bool OBJReader::parseTextureLineFloat(QString& parser, float& result) {
-    if (parser.length() == 0) {
-        return false;
-    }
-    auto firstChar = parser[0];
-    if ((firstChar < '0' || firstChar > '9') && firstChar != '-') {
-        return false;
-    }
-    int floatEnd = parser.indexOf(' ');
-    if (floatEnd < 0) {
-        floatEnd = parser.length();
-    }
-    QString floatStr = parser.left(floatEnd);
-    try
-    {
-        result = std::stof(floatStr.toStdString());
-        parser.remove(0, floatStr.length() + 1);
-        return true;
-    }
-    catch (const std::exception& /*e*/)
-    {
-        return false;
-    }
-}
-
-bool OBJReader::parseTextureLineString(QString& parser, QByteArray& result) {
-    if (parser.length() == 0) {
-        return false;
-    }
-    int stringEnd = parser.indexOf(' ');
-    if (stringEnd < 0) {
-        stringEnd = parser.length();
-    }
-    result = parser.left(stringEnd).toUtf8();
-    parser.remove(0, result.length() + 1);
-    return true;
-}
-
 void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions) {
     // Texture options reference http://paulbourke.net/dataformats/mtl/
     // and https://wikivisually.com/wiki/Material_Template_Library
-    QString parser = textureLine;
-    while (parser.length() > 0) {
-        if (parser.startsWith("-blend")) { // -blendu/-blendv
-            int removeLength = parser[10] == 'f' ? 12 : 11;
-            parser.remove(0, removeLength); // remove through "-blendu on " or "-blendu off"
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -blendu/-blendv";
-            #endif
-        } else if (parser.startsWith("-bm")) {
-            parser.remove(0, 4); // remove through "-bm "
-            parseTextureLineFloat(parser, textureOptions.bumpMultiplier);
-        } else if (parser.startsWith("-boost")) {
-            parser.remove(0, 7); // remove through "-boost "
-            float ignore;
-            parseTextureLineFloat(parser, ignore);
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -boost";
-            #endif
-        } else if (parser.startsWith("-cc")) {
-            int removeLength = parser[6] == 'f' ? 8 : 7;
-            parser.remove(0, removeLength); // remove through "-cc on " or "-cc off"
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -cc";
-            #endif
-        } else if (parser.startsWith("-clamp")) {
-            int removeLength = parser[9] == 'f' ? 11 : 10;
-            parser.remove(0, removeLength); // remove through "-clamp on " or "-clamp off"
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -clamp";
-            #endif
-        } else if (parser.startsWith("-imfchan")) {
-            parser.remove(0, 11); // remove through "-imfchan X "
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -imfchan";
-            #endif
-        } else if (parser.startsWith("-mm")) {
-            parser.remove(0, 4); // remove through "-mm "
-            float ignore, ignore2;
-            parseTextureLineFloat(parser, ignore);
-            parseTextureLineFloat(parser, ignore2);
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -mm";
-            #endif
-        } else if (parser.startsWith("-o ") || parser.startsWith("-s ") || parser.startsWith("-t ")) {
-            parser.remove(0, 3); // remove through "-o/-s/-t "
-            float ignore, ignore2, ignore3;
-            parseTextureLineFloat(parser, ignore);
-            parseTextureLineFloat(parser, ignore2);
-            parseTextureLineFloat(parser, ignore3);
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -o/-s/-t";
-            #endif
-        } else if (parser.startsWith("-texres")) {
-            parser.remove(0, 8); // remove through "-texres "
-            float ignore;
-            parseTextureLineFloat(parser, ignore);
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -texres";
-            #endif
-        } else if (parser.startsWith("-type")) {
-            parser.remove(0, 6); // remove through "-type "
-            QByteArray ignore;
-            parseTextureLineString(parser, ignore);
-            #ifdef WANT_DEBUG
-            qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option -type";
-            #endif
-        } else { // assume filename
-            parseTextureLineString(parser, filename);
+
+    std::istringstream iss(textureLine.toStdString());
+    const std::vector<std::string> parser(std::istream_iterator<std::string>{iss}, std::istream_iterator<std::string>());
+
+    int i = 0;
+    while (i < parser.size()) {
+        if (i + 1 < parser.size()) {
+            const std::string& option = parser[i++];
+            if (option == "-blendu" || option == "-blendv") {
+                #ifdef WANT_DEBUG
+                const std::string& onoff = parser[i++];
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << onoff.c_str();
+                #endif
+            } else if (option == "-bm") {
+                const std::string& bm = parser[i++];
+                textureOptions.bumpMultiplier = std::stof(bm);
+            } else if (option == "-boost") {
+                #ifdef WANT_DEBUG
+                const std::string& boost = parser[i++];
+                float boostFloat = std::stof(boost);
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << boost.c_str();
+                #endif
+            } else if (option == "-cc") {
+                #ifdef WANT_DEBUG
+                const std::string& onoff = parser[i++];
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << onoff.c_str();
+                #endif
+            } else if (option == "-clamp") {
+                #ifdef WANT_DEBUG
+                const std::string& onoff = parser[i++];
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << onoff.c_str();
+                #endif
+            } else if (option == "-imfchan") {
+                #ifdef WANT_DEBUG
+                const std::string& imfchan = parser[i++];
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << imfchan.c_str();
+                #endif
+            } else if (option == "-mm") {
+                if (i + 1 < parser.size()) {
+                    #ifdef WANT_DEBUG
+                    const std::string& mmBase = parser[i++];
+                    const std::string& mmGain = parser[i++];
+                    float mmBaseFloat = std::stof(mmBase);
+                    float mmGainFloat = std::stof(mmGain);
+                    qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << mmBase.c_str() << mmGain.c_str();
+                    #endif
+                }
+            } else if (option == "-o" || option == "-s" || option == "-t") {
+                if (i + 2 < parser.size()) {
+                    #ifdef WANT_DEBUG
+                    const std::string& u = parser[i++];
+                    const std::string& v = parser[i++];
+                    const std::string& w = parser[i++];
+                    float uFloat = std::stof(u);
+                    float vFloat = std::stof(v);
+                    float wFloat = std::stof(w);
+                    qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << u.c_str() << v.c_str() << w.c_str();
+                    #endif
+                }
+            } else if (option == "-texres") {
+                #ifdef WANT_DEBUG
+                const std::string& texres = parser[i++];
+                float texresFloat = std::stof(texres);
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << texres.c_str();
+                #endif
+            } else if (option == "-type") {
+                #ifdef WANT_DEBUG
+                const std::string& type = parser[i++];
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring texture option" << option.c_str() << type.c_str();
+                #endif
+            } else if (option[0] == '-') {
+                #ifdef WANT_DEBUG
+                qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring unsupported texture option" << option.c_str();
+                #endif
+            }
+        } else { // assume filename at end
+            filename = parser[i++].c_str();
         }
     }
 }
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 9083a69340..df356fada8 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -94,8 +94,6 @@ private:
     bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
-    bool parseTextureLineFloat(QString& parser, float& result);
-    bool parseTextureLineString(QString& parser, QByteArray& result);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
     bool isValidTexture(const QByteArray &filename); // true if the file exists. TODO?: check content-type header and that it is a supported format.
 

From 8748e98b5ea049450c6b344b6be1da247103890d Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Thu, 8 Feb 2018 10:23:25 -0800
Subject: [PATCH 148/569] Prevent deadlock crashes when building shaders at
 startup

---
 interface/src/Application.cpp | 45 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3e7dd3e223..eb04f58b6b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -318,7 +318,7 @@ static QTimer pingTimer;
 static bool DISABLE_WATCHDOG = true;
 #else
 static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
-static bool DISABLE_WATCHDOG = QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
+static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
 #endif
 
 #if defined(USE_GLES)
@@ -415,20 +415,26 @@ public:
         *crashTrigger = 0xDEAD10CC;
     }
 
+    static void withPause(const std::function<void()>& lambda) {
+        pause();
+        lambda();
+        resume();
+    }
     static void pause() {
         _paused = true;
     }
 
     static void resume() {
-        _paused = false;
+        // Update the heartbeat BEFORE resuming the checks
         updateHeartbeat();
+        _paused = false;
     }
 
     void run() override {
         while (!_quit) {
             QThread::sleep(HEARTBEAT_UPDATE_INTERVAL_SECS);
             // Don't do heartbeat detection under nsight
-            if (nsightActive() || _paused) {
+            if (_paused) {
                 continue;
             }
             uint64_t lastHeartbeat = _heartbeat; // sample atomic _heartbeat, because we could context switch away and have it updated on us
@@ -2283,29 +2289,22 @@ void Application::initializeGL() {
     initDisplay();
     qCDebug(interfaceapp, "Initialized Display.");
 
-#ifdef Q_OS_OSX
-    // FIXME: on mac os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread.
-    DeadlockWatchdogThread::pause();
-#endif
-
-    // Set up the render engine
-    render::CullFunctor cullFunctor = LODManager::shouldRender;
-    static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
-    _renderEngine->addJob<UpdateSceneTask>("UpdateScene");
+    // FIXME: on low end systems os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread.
+    DeadlockWatchdogThread::withPause([&] {
+        // Set up the render engine
+        render::CullFunctor cullFunctor = LODManager::shouldRender;
+        static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
+        _renderEngine->addJob<UpdateSceneTask>("UpdateScene");
 #ifndef Q_OS_ANDROID
-    _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED);
+        _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED);
 #endif
-    _renderEngine->addJob<RenderViewTask>("RenderMainView", cullFunctor, !DISABLE_DEFERRED, render::ItemKey::TAG_BITS_0, render::ItemKey::TAG_BITS_0);
+        _renderEngine->addJob<RenderViewTask>("RenderMainView", cullFunctor, !DISABLE_DEFERRED, render::ItemKey::TAG_BITS_0, render::ItemKey::TAG_BITS_0);
+        _renderEngine->load();
+        _renderEngine->registerScene(_main3DScene);
 
-    _renderEngine->load();
-    _renderEngine->registerScene(_main3DScene);
-
-    // Now that OpenGL is initialized, we are sure we have a valid context and can create the various pipeline shaders with success.
-    DependencyManager::get<GeometryCache>()->initializeShapePipelines();
-
-#ifdef Q_OS_OSX
-    DeadlockWatchdogThread::resume();
-#endif
+        // Now that OpenGL is initialized, we are sure we have a valid context and can create the various pipeline shaders with success.
+        DependencyManager::get<GeometryCache>()->initializeShapePipelines();
+    });
 
     _offscreenContext = new OffscreenGLCanvas();
     _offscreenContext->setObjectName("MainThreadContext");

From a92e614aff44c154566704e826d012a590226f60 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 8 Feb 2018 10:35:34 -0800
Subject: [PATCH 149/569] Bugfix.

---
 .../InspectionCertificate.qml                 | 149 ++++++++++--------
 .../ui/overlays/ContextOverlayInterface.cpp   | 142 ++++++++---------
 scripts/system/marketplaces/marketplaces.js   |   3 +-
 3 files changed, 153 insertions(+), 141 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index bef03bd4c1..f493747c5e 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -24,6 +24,7 @@ Rectangle {
 
     id: root;
     property string marketplaceUrl: "";
+    property string entityId: "";
     property string certificateId: "";
     property string itemName: "--";
     property string itemOwner: "--";
@@ -110,77 +111,81 @@ Rectangle {
         }
 
         onUpdateCertificateStatus: {
-            root.certificateStatus = certStatus;
-            if (root.certificateStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
-                root.useGoldCert = true;
-                root.certTitleTextColor = hifi.colors.darkGray;
-                root.certTextColor = hifi.colors.white;
-                root.infoTextColor = hifi.colors.blueAccent;
-                titleBarText.text = "Certificate";
-                popText.text = "PROOF OF PROVENANCE";
-                showInMarketplaceButton.visible = true;
-                root.certInfoReplaceMode = 5;
-                // "Item Name" text will be set in "onCertificateInfoResult()"
-                // "Edition" text will be set in "onCertificateInfoResult()"
-                // "Owner" text will be set in "onCertificateInfoResult()"
-                // "Purchase Date" text will be set in "onCertificateInfoResult()"
-                // "Purchase Price" text will be set in "onCertificateInfoResult()"
-                errorText.text = "";
-            } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
-                root.useGoldCert = false;
-                root.certTitleTextColor = hifi.colors.redHighlight;
-                root.certTextColor = hifi.colors.redHighlight;
-                root.infoTextColor = hifi.colors.redHighlight;
-                titleBarText.text = "Request Timed Out";
-                popText.text = "";
-                showInMarketplaceButton.visible = false;
-                root.certInfoReplaceMode = 0;
-                root.itemName = "";
-                root.itemEdition = "";
-                root.itemOwner = "";
-                root.dateOfPurchase = "";
-                root.itemCost = "";
-                errorText.text = "Your request to inspect this item timed out. Please try again later.";
-            } else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
-                root.useGoldCert = false;
-                root.certTitleTextColor = hifi.colors.redHighlight;
-                root.certTextColor = hifi.colors.redHighlight;
-                root.infoTextColor = hifi.colors.redHighlight;
-                titleBarText.text = "Certificate\nNo Longer Valid";
-                popText.text = "";
-                showInMarketplaceButton.visible = true;
-                root.certInfoReplaceMode = 5;
-                // "Item Name" text will be set in "onCertificateInfoResult()"
-                // "Edition" text will be set in "onCertificateInfoResult()"
-                // "Owner" text will be set in "onCertificateInfoResult()"
-                // "Purchase Date" text will be set in "onCertificateInfoResult()"
-                // "Purchase Price" text will be set in "onCertificateInfoResult()"
-                errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
-            } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
-                root.useGoldCert = false;
-                root.certTitleTextColor = hifi.colors.redHighlight;
-                root.certTextColor = hifi.colors.redHighlight;
-                root.infoTextColor = hifi.colors.redHighlight;
-                titleBarText.text = "Invalid Certificate";
-                popText.text = "";
-                showInMarketplaceButton.visible = true;
-                root.certInfoReplaceMode = 4;
-                // "Item Name" text will be set in "onCertificateInfoResult()"
-                root.itemEdition = "Uncertified Copy"
-                // "Owner" text will be set in "onCertificateInfoResult()"
-                // "Purchase Date" text will be set in "onCertificateInfoResult()"
-                // "Purchase Price" text will be set in "onCertificateInfoResult()"
-                // "Error Text" text will be set in "onCertificateInfoResult()"
-            } else {
-                console.log("Unknown certificate status received from ledger signal!");
-            }
-            
-            root.certificateStatusPending = false;
-            // We've gotten cert status - we are GO on getting the cert info
-            Commerce.certificateInfo(root.certificateId);
+            updateCertificateStatus(certStatus);
         }
     }
 
+    function updateCertificateStatus(status) {
+        root.certificateStatus = status;
+        if (root.certificateStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
+            root.useGoldCert = true;
+            root.certTitleTextColor = hifi.colors.darkGray;
+            root.certTextColor = hifi.colors.white;
+            root.infoTextColor = hifi.colors.blueAccent;
+            titleBarText.text = "Certificate";
+            popText.text = "PROOF OF PROVENANCE";
+            showInMarketplaceButton.visible = true;
+            root.certInfoReplaceMode = 5;
+            // "Item Name" text will be set in "onCertificateInfoResult()"
+            // "Edition" text will be set in "onCertificateInfoResult()"
+            // "Owner" text will be set in "onCertificateInfoResult()"
+            // "Purchase Date" text will be set in "onCertificateInfoResult()"
+            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            errorText.text = "";
+        } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
+            root.useGoldCert = false;
+            root.certTitleTextColor = hifi.colors.redHighlight;
+            root.certTextColor = hifi.colors.redHighlight;
+            root.infoTextColor = hifi.colors.redHighlight;
+            titleBarText.text = "Request Timed Out";
+            popText.text = "";
+            showInMarketplaceButton.visible = false;
+            root.certInfoReplaceMode = 0;
+            root.itemName = "";
+            root.itemEdition = "";
+            root.itemOwner = "";
+            root.dateOfPurchase = "";
+            root.itemCost = "";
+            errorText.text = "Your request to inspect this item timed out. Please try again later.";
+        } else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
+            root.useGoldCert = false;
+            root.certTitleTextColor = hifi.colors.redHighlight;
+            root.certTextColor = hifi.colors.redHighlight;
+            root.infoTextColor = hifi.colors.redHighlight;
+            titleBarText.text = "Certificate\nNo Longer Valid";
+            popText.text = "";
+            showInMarketplaceButton.visible = true;
+            root.certInfoReplaceMode = 5;
+            // "Item Name" text will be set in "onCertificateInfoResult()"
+            // "Edition" text will be set in "onCertificateInfoResult()"
+            // "Owner" text will be set in "onCertificateInfoResult()"
+            // "Purchase Date" text will be set in "onCertificateInfoResult()"
+            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
+        } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+            root.useGoldCert = false;
+            root.certTitleTextColor = hifi.colors.redHighlight;
+            root.certTextColor = hifi.colors.redHighlight;
+            root.infoTextColor = hifi.colors.redHighlight;
+            titleBarText.text = "Invalid Certificate";
+            popText.text = "";
+            showInMarketplaceButton.visible = true;
+            root.certInfoReplaceMode = 4;
+            // "Item Name" text will be set in "onCertificateInfoResult()"
+            root.itemEdition = "Uncertified Copy"
+            // "Owner" text will be set in "onCertificateInfoResult()"
+            // "Purchase Date" text will be set in "onCertificateInfoResult()"
+            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            // "Error Text" text will be set in "onCertificateInfoResult()"
+        } else {
+            console.log("Unknown certificate status received from ledger signal!");
+        }
+            
+        root.certificateStatusPending = false;
+        // We've gotten cert status - we are GO on getting the cert info
+        Commerce.certificateInfo(root.certificateId);
+    }
+
     // This object is always used in a popup.
     // This MouseArea is used to prevent a user from being
     //     able to click on a button/mouseArea underneath the popup.
@@ -563,7 +568,12 @@ Rectangle {
             case 'inspectionCertificate_setCertificateId':
                 resetCert(false);
                 root.certificateId = message.certificateId;
-                sendToScript({method: 'inspectionCertificate_requestOwnershipVerification', certificateId: root.certificateId});
+                if (message.entityId === "") {
+                    updateCertificateStatus(1); // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
+                } else {
+                    root.entityId = message.entityId;
+                    sendToScript({method: 'inspectionCertificate_requestOwnershipVerification', entity: root.entityId});
+                }
             break;
             case 'inspectionCertificate_resetCert':
                 resetCert(true);
@@ -576,6 +586,7 @@ Rectangle {
 
     function resetCert(alsoResetCertID) {
         if (alsoResetCertID) {
+            root.entityId = "";
             root.certificateId = "";
         }
         root.certInfoReplaceMode = 5;
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 4dacab8936..dd05e5c6a8 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -274,88 +274,88 @@ void ContextOverlayInterface::requestOwnershipVerification(const QUuid& entityID
 
     auto nodeList = DependencyManager::get<NodeList>();
 
-    if (entityProperties.getClientOnly()) {
-        if (entityProperties.verifyStaticCertificateProperties()) {
-            SharedNodePointer entityServer = nodeList->soloNodeOfType(NodeType::EntityServer);
+    if (entityProperties.verifyStaticCertificateProperties()) {
+        if (entityProperties.getClientOnly()) {
+                SharedNodePointer entityServer = nodeList->soloNodeOfType(NodeType::EntityServer);
 
-            if (entityServer) {
-                QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
-                QNetworkRequest networkRequest;
-                networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-                networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-                QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL();
-                requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/transfer");
-                QJsonObject request;
-                request["certificate_id"] = entityProperties.getCertificateID();
-                networkRequest.setUrl(requestURL);
+                if (entityServer) {
+                    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+                    QNetworkRequest networkRequest;
+                    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+                    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+                    QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL();
+                    requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/transfer");
+                    QJsonObject request;
+                    request["certificate_id"] = entityProperties.getCertificateID();
+                    networkRequest.setUrl(requestURL);
 
-                QNetworkReply* networkReply = NULL;
-                networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
+                    QNetworkReply* networkReply = NULL;
+                    networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
 
-                connect(networkReply, &QNetworkReply::finished, [=]() {
-                    QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
-                    jsonObject = jsonObject["data"].toObject();
+                    connect(networkReply, &QNetworkReply::finished, [=]() {
+                        QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
+                        jsonObject = jsonObject["data"].toObject();
 
-                    if (networkReply->error() == QNetworkReply::NoError) {
-                        if (!jsonObject["invalid_reason"].toString().isEmpty()) {
-                            qCDebug(entities) << "invalid_reason not empty";
-                        } else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
-                            qCDebug(entities) << "'transfer_status' is 'failed'";
-                        } else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
-                            qCDebug(entities) << "'transfer_status' is 'pending'";
-                        } else {
-                            QString ownerKey = jsonObject["transfer_recipient_key"].toString();
-
-                            QByteArray certID = entityProperties.getCertificateID().toUtf8();
-                            QByteArray text = DependencyManager::get<EntityTreeRenderer>()->getTree()->computeNonce(certID, ownerKey);
-                            QByteArray nodeToChallengeByteArray = entityProperties.getOwningAvatarID().toRfc4122();
-
-                            int certIDByteArraySize = certID.length();
-                            int textByteArraySize = text.length();
-                            int nodeToChallengeByteArraySize = nodeToChallengeByteArray.length();
-
-                            auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnershipRequest,
-                                certIDByteArraySize + textByteArraySize + nodeToChallengeByteArraySize + 3 * sizeof(int),
-                                true);
-                            challengeOwnershipPacket->writePrimitive(certIDByteArraySize);
-                            challengeOwnershipPacket->writePrimitive(textByteArraySize);
-                            challengeOwnershipPacket->writePrimitive(nodeToChallengeByteArraySize);
-                            challengeOwnershipPacket->write(certID);
-                            challengeOwnershipPacket->write(text);
-                            challengeOwnershipPacket->write(nodeToChallengeByteArray);
-                            nodeList->sendPacket(std::move(challengeOwnershipPacket), *entityServer);
-
-                            // Kickoff a 10-second timeout timer that marks the cert if we don't get an ownership response in time
-                            if (thread() != QThread::currentThread()) {
-                                QMetaObject::invokeMethod(this, "startChallengeOwnershipTimer");
-                                return;
+                        if (networkReply->error() == QNetworkReply::NoError) {
+                            if (!jsonObject["invalid_reason"].toString().isEmpty()) {
+                                qCDebug(entities) << "invalid_reason not empty";
+                            } else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
+                                qCDebug(entities) << "'transfer_status' is 'failed'";
+                            } else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
+                                qCDebug(entities) << "'transfer_status' is 'pending'";
                             } else {
-                                startChallengeOwnershipTimer();
-                            }
-                        }
-                    } else {
-                        qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() <<
-                            "More info:" << networkReply->readAll();
-                    }
+                                QString ownerKey = jsonObject["transfer_recipient_key"].toString();
 
-                    networkReply->deleteLater();
-                });
-            } else {
-                qCWarning(context_overlay) << "Couldn't get Entity Server!";
-            }
+                                QByteArray certID = entityProperties.getCertificateID().toUtf8();
+                                QByteArray text = DependencyManager::get<EntityTreeRenderer>()->getTree()->computeNonce(certID, ownerKey);
+                                QByteArray nodeToChallengeByteArray = entityProperties.getOwningAvatarID().toRfc4122();
+
+                                int certIDByteArraySize = certID.length();
+                                int textByteArraySize = text.length();
+                                int nodeToChallengeByteArraySize = nodeToChallengeByteArray.length();
+
+                                auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnershipRequest,
+                                    certIDByteArraySize + textByteArraySize + nodeToChallengeByteArraySize + 3 * sizeof(int),
+                                    true);
+                                challengeOwnershipPacket->writePrimitive(certIDByteArraySize);
+                                challengeOwnershipPacket->writePrimitive(textByteArraySize);
+                                challengeOwnershipPacket->writePrimitive(nodeToChallengeByteArraySize);
+                                challengeOwnershipPacket->write(certID);
+                                challengeOwnershipPacket->write(text);
+                                challengeOwnershipPacket->write(nodeToChallengeByteArray);
+                                nodeList->sendPacket(std::move(challengeOwnershipPacket), *entityServer);
+
+                                // Kickoff a 10-second timeout timer that marks the cert if we don't get an ownership response in time
+                                if (thread() != QThread::currentThread()) {
+                                    QMetaObject::invokeMethod(this, "startChallengeOwnershipTimer");
+                                    return;
+                                } else {
+                                    startChallengeOwnershipTimer();
+                                }
+                            }
+                        } else {
+                            qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() <<
+                                "More info:" << networkReply->readAll();
+                        }
+
+                        networkReply->deleteLater();
+                    });
+                } else {
+                    qCWarning(context_overlay) << "Couldn't get Entity Server!";
+                }
         } else {
+            // We don't currently verify ownership of entities that aren't Avatar Entities,
+            // so they always pass Ownership Verification. It's necessary to emit this signal
+            // so that the Inspection Certificate can continue its information-grabbing process.
             auto ledger = DependencyManager::get<Ledger>();
-            _challengeOwnershipTimeoutTimer.stop();
-            emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED));
-            emit DependencyManager::get<WalletScriptingInterface>()->ownershipVerificationFailed(_lastInspectedEntity);
-            qCDebug(context_overlay) << "Entity" << _lastInspectedEntity << "failed static certificate verification!";
+            emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_SUCCESS));
         }
     } else {
-        // We don't currently verify ownership of entities that aren't Avatar Entities,
-        // so they always pass Ownership Verification. It's necessary to emit this signal
-        // so that the Inspection Certificate can continue its information-grabbing process.
         auto ledger = DependencyManager::get<Ledger>();
-        emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_SUCCESS));
+        _challengeOwnershipTimeoutTimer.stop();
+        emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED));
+        emit DependencyManager::get<WalletScriptingInterface>()->ownershipVerificationFailed(_lastInspectedEntity);
+        qCDebug(context_overlay) << "Entity" << _lastInspectedEntity << "failed static certificate verification!";
     }
 }
 
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index cec139faae..fd1275a251 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -163,6 +163,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
         var certificateId = itemCertificateId || (Entities.getEntityProperties(currentEntityWithContextOverlay, ['certificateID']).certificateID);
         tablet.sendToQml({
             method: 'inspectionCertificate_setCertificateId',
+            entityId: currentEntityWithContextOverlay,
             certificateId: certificateId
         });
     }
@@ -584,7 +585,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 tablet.gotoHomeScreen();
                 break;
             case 'inspectionCertificate_requestOwnershipVerification':
-                ContextOverlay.requestOwnershipVerification(message.certificateId);
+                ContextOverlay.requestOwnershipVerification(message.entity);
                 break;
             case 'inspectionCertificate_showInMarketplaceClicked':
                 tablet.gotoWebScreen(message.marketplaceUrl, MARKETPLACES_INJECT_SCRIPT_URL);

From 14839bc5f480f307f239ac0cd845f1461f559772 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Tue, 23 Jan 2018 16:16:10 -0800
Subject: [PATCH 150/569] Some improvements to the log window

-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
---
 interface/resources/styles/log_dialog.qss     |  9 ++-
 interface/src/ui/BaseLogDialog.cpp            |  5 +-
 interface/src/ui/LogDialog.cpp                | 68 +++++++++++++++----
 interface/src/ui/LogDialog.h                  | 13 ++--
 .../src/shared/AbstractLoggerInterface.h      |  4 +-
 5 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/interface/resources/styles/log_dialog.qss b/interface/resources/styles/log_dialog.qss
index e0ec17549d..ebf2fc7318 100644
--- a/interface/resources/styles/log_dialog.qss
+++ b/interface/resources/styles/log_dialog.qss
@@ -67,7 +67,7 @@ QPushButton#revealLogButton {
     font-size: 11px;
 }
 
-QPushButton#showAllButton {
+QPushButton#allLogsButton {
     font-family: Helvetica, Arial, sans-serif;
     background-color: #333333;
     color: #BBBBBB;
@@ -112,4 +112,11 @@ QComboBox::drop-down {
 QComboBox::down-arrow {
     image: url(:/styles/filter.png);
     border-width: 0px;
+}
+
+QLabel#messageCount {
+    font-family: Helvetica, Arial, sans-serif;
+    text-align: center;
+    color: #3d3d3d;
+    font-size: 11px;
 }
\ No newline at end of file
diff --git a/interface/src/ui/BaseLogDialog.cpp b/interface/src/ui/BaseLogDialog.cpp
index 969f9895de..e27b622262 100644
--- a/interface/src/ui/BaseLogDialog.cpp
+++ b/interface/src/ui/BaseLogDialog.cpp
@@ -29,8 +29,8 @@ const int SEARCH_TOGGLE_BUTTON_WIDTH = 50;
 const int SEARCH_TEXT_WIDTH = 240;
 const int TIME_STAMP_LENGTH = 16;
 const int FONT_WEIGHT = 75;
-const QColor HIGHLIGHT_COLOR = QColor("#3366CC");
-const QColor BOLD_COLOR = QColor("#445c8c");
+const QColor HIGHLIGHT_COLOR = QColor("#00B4EF");
+const QColor BOLD_COLOR = QColor("#1080B8");
 const QString BOLD_PATTERN = "\\[\\d*\\/.*:\\d*:\\d*\\]";
 
 BaseLogDialog::BaseLogDialog(QWidget* parent) : QDialog(parent, Qt::Window) {
@@ -182,6 +182,7 @@ void BaseLogDialog::updateSelection() {
 Highlighter::Highlighter(QTextDocument* parent) : QSyntaxHighlighter(parent) {
     boldFormat.setFontWeight(FONT_WEIGHT);
     boldFormat.setForeground(BOLD_COLOR);
+    keywordFormat.setFontWeight(FONT_WEIGHT);
     keywordFormat.setForeground(HIGHLIGHT_COLOR);
 }
 
diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp
index 108edbfd39..ece95aea38 100644
--- a/interface/src/ui/LogDialog.cpp
+++ b/interface/src/ui/LogDialog.cpp
@@ -15,11 +15,12 @@
 #include <QPushButton>
 #include <QComboBox>
 #include <QPlainTextEdit>
+#include <Qlabel>
 
 #include <shared/AbstractLoggerInterface.h>
 
 const int REVEAL_BUTTON_WIDTH = 122;
-const int CLEAR_FILTER_BUTTON_WIDTH = 80;
+const int ALL_LOGS_BUTTON_WIDTH = 90;
 const int MARGIN_LEFT = 25;
 const int DEBUG_CHECKBOX_WIDTH = 70;
 const int INFO_CHECKBOX_WIDTH = 65;
@@ -142,6 +143,11 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog
     _filterDropdown->addItem("qml");
     connect(_filterDropdown, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &LogDialog::handleFilterDropdownChanged);
 
+    _leftPad += COMBOBOX_WIDTH + MARGIN_LEFT + MARGIN_LEFT;
+    _messageCount = new QLabel("", this);
+    _messageCount->setObjectName("messageCount");
+    _messageCount->show();
+
     _extraDebuggingBox = new QCheckBox("Extra debugging", this);
     if (_logger->extraDebugging()) {
         _extraDebuggingBox->setCheckState(Qt::Checked);
@@ -149,12 +155,13 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog
     _extraDebuggingBox->show();
     connect(_extraDebuggingBox, &QCheckBox::stateChanged, this, &LogDialog::handleExtraDebuggingCheckbox);
 
-    _clearFilterButton = new QPushButton("Clear Filters", this);
+    _allLogsButton = new QPushButton("All Messages", this);
     // set object name for css styling
-    _clearFilterButton->setObjectName("showAllButton");
-    _clearFilterButton->show();
-    connect(_clearFilterButton, &QPushButton::clicked, this, &LogDialog::handleClearFilterButton);
-    handleClearFilterButton();
+
+    _allLogsButton->setObjectName("allLogsButton");
+    _allLogsButton->show();
+    connect(_allLogsButton, &QPushButton::clicked, this, &LogDialog::handleAllLogsButton);
+    handleAllLogsButton();
 
     auto windowGeometry = _windowGeometry.get();
     if (windowGeometry.isValid()) {
@@ -168,11 +175,15 @@ void LogDialog::resizeEvent(QResizeEvent* event) {
         ELEMENT_MARGIN,
         REVEAL_BUTTON_WIDTH,
         ELEMENT_HEIGHT);
-    _clearFilterButton->setGeometry(width() - ELEMENT_MARGIN - CLEAR_FILTER_BUTTON_WIDTH,
+    _allLogsButton->setGeometry(width() - ELEMENT_MARGIN - ALL_LOGS_BUTTON_WIDTH,
         THIRD_ROW,
-        CLEAR_FILTER_BUTTON_WIDTH,
+        ALL_LOGS_BUTTON_WIDTH,
         ELEMENT_HEIGHT);
-    _extraDebuggingBox->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - CLEAR_FILTER_BUTTON_WIDTH,
+    _extraDebuggingBox->setGeometry(width() - ELEMENT_MARGIN - COMBOBOX_WIDTH - ELEMENT_MARGIN - ALL_LOGS_BUTTON_WIDTH,
+        THIRD_ROW,
+        COMBOBOX_WIDTH,
+        ELEMENT_HEIGHT);
+    _messageCount->setGeometry(_leftPad,
         THIRD_ROW,
         COMBOBOX_WIDTH,
         ELEMENT_HEIGHT);
@@ -187,13 +198,13 @@ void LogDialog::handleRevealButton() {
     _logger->locateLog();
 }
 
-void LogDialog::handleClearFilterButton() {
+void LogDialog::handleAllLogsButton() {
     _logger->setExtraDebugging(false);
     _extraDebuggingBox->setCheckState(Qt::Unchecked);
-    _logger->setDebugPrint(false);
-    _debugPrintBox->setCheckState(Qt::Unchecked);
-    _logger->setInfoPrint(false);
-    _infoPrintBox->setCheckState(Qt::Unchecked);
+    _logger->setDebugPrint(true);
+    _debugPrintBox->setCheckState(Qt::Checked);
+    _logger->setInfoPrint(true);
+    _infoPrintBox->setCheckState(Qt::Checked);
     _logger->setCriticalPrint(true);
     _criticalPrintBox->setCheckState(Qt::Checked);
     _logger->setWarningPrint(true);
@@ -270,40 +281,67 @@ void LogDialog::appendLogLine(QString logLine) {
         if (logLine.contains(DEBUG_TEXT, Qt::CaseSensitive)) {
             if (_logger->debugPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         } else if (logLine.contains(INFO_TEXT, Qt::CaseSensitive)) {
             if (_logger->infoPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             } 
         } else if (logLine.contains(CRITICAL_TEXT, Qt::CaseSensitive)) {
             if (_logger->criticalPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         } else if (logLine.contains(WARNING_TEXT, Qt::CaseSensitive)) {
             if (_logger->warningPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         } else if (logLine.contains(SUPPRESS_TEXT, Qt::CaseSensitive)) {
             if (_logger->suppressPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         } else if (logLine.contains(FATAL_TEXT, Qt::CaseSensitive)) {
             if (_logger->fatalPrint()) {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         } else {
-            if (_logger->unknownPrint()) {
+            if (_logger->unknownPrint() && logLine.trimmed() != "") {
                 _logTextBox->appendPlainText(logLine.trimmed());
+                _count++;
+                updateMessageCount();
             }
         }
     }
 }
 
 void LogDialog::printLogFile() {
+    _count = 0;
     _logTextBox->clear();
     QString log = getCurrentLog();
     QStringList logList = log.split('\n');
     for (const auto& message : logList) {
         appendLogLine(message);
     }
+    updateMessageCount();
+}
+
+void LogDialog::updateMessageCount() {
+    _countLabel = QString::number(_count);
+    if (_count != 1) {
+        _countLabel.append("  log messages");
+    }
+    else {
+        _countLabel.append("  log message");
+    }
+    _messageCount->setText(_countLabel);
 }
diff --git a/interface/src/ui/LogDialog.h b/interface/src/ui/LogDialog.h
index 3cc7584fe8..eb92d4b381 100644
--- a/interface/src/ui/LogDialog.h
+++ b/interface/src/ui/LogDialog.h
@@ -18,6 +18,7 @@
 class QCheckBox;
 class QPushButton;
 class QComboBox;
+class QLabel;
 class QResizeEvent;
 class AbstractLoggerInterface;
 
@@ -41,19 +42,21 @@ private slots:
     void handleFatalPrintBox(int);
     void handleUnknownPrintBox(int);
     void handleFilterDropdownChanged(int);
-    void handleClearFilterButton();
+    void handleAllLogsButton();
+    void printLogFile();
 
 protected:
     void resizeEvent(QResizeEvent* event) override;
     void closeEvent(QCloseEvent* event) override;
 
     QString getCurrentLog() override;
-    void printLogFile();
+    void updateMessageCount();
+    
 
 private:
     QCheckBox* _extraDebuggingBox;
     QPushButton* _revealLogButton;
-    QPushButton* _clearFilterButton;
+    QPushButton* _allLogsButton;
     QCheckBox* _debugPrintBox;
     QCheckBox* _infoPrintBox;
     QCheckBox* _criticalPrintBox;
@@ -62,10 +65,12 @@ private:
     QCheckBox* _fatalPrintBox;
     QCheckBox* _unknownPrintBox;
     QComboBox* _filterDropdown;
+    QLabel* _messageCount;
     QString _filterSelection;
-
+    QString _countLabel;
     AbstractLoggerInterface* _logger;
     Setting::Handle<QRect> _windowGeometry;
+    int _count = 0;
 };
 
 #endif // hifi_LogDialog_h
diff --git a/libraries/shared/src/shared/AbstractLoggerInterface.h b/libraries/shared/src/shared/AbstractLoggerInterface.h
index c202496103..f48496324b 100644
--- a/libraries/shared/src/shared/AbstractLoggerInterface.h
+++ b/libraries/shared/src/shared/AbstractLoggerInterface.h
@@ -50,8 +50,8 @@ signals:
 
 private:
     bool _extraDebugging{ false };
-    bool _debugPrint{ false };
-    bool _infoPrint{ false };
+    bool _debugPrint{ true };
+    bool _infoPrint{ true };
     bool _criticalPrint{ true };
     bool _warningPrint{ true };
     bool _suppressPrint{ true };

From 6a23eea6ee4bfdee671879e169b2c25d5ac3e522 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 8 Feb 2018 14:15:47 -0800
Subject: [PATCH 151/569] adjust shininess value

---
 libraries/fbx/src/OBJReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 603bf5b39e..3cc4efebf2 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -37,7 +37,7 @@ QHash<QString, float> COMMENT_SCALE_HINTS = {{"This file uses centimeters as uni
 const QString SMART_DEFAULT_MATERIAL_NAME = "High Fidelity smart default material name";
 
 const float ILLUMINATION_MODEL_MIN_OPACITY = 0.1f;
-const float ILLUMINATION_MODEL_APPLY_SHININESS = 0.25f;
+const float ILLUMINATION_MODEL_APPLY_SHININESS = 0.5f;
 const float ILLUMINATION_MODEL_APPLY_ROUGHNESS = 1.0f;
 const float ILLUMINATION_MODEL_APPLY_NON_METALLIC = 0.0f;
 

From f929fa3bcb6685b25cff6ac632e408ef4d0f3be6 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 8 Feb 2018 14:50:30 -0800
Subject: [PATCH 152/569] filename space fix

---
 libraries/fbx/src/OBJReader.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 3cc4efebf2..2386afe677 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -355,7 +355,7 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
 
     int i = 0;
     while (i < parser.size()) {
-        if (i + 1 < parser.size()) {
+        if (i + 1 < parser.size() && parser[i][0] == '-') {
             const std::string& option = parser[i++];
             if (option == "-blendu" || option == "-blendv") {
                 #ifdef WANT_DEBUG
@@ -424,8 +424,12 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
                 qCDebug(modelformat) << "OBJ Reader WARNING: Ignoring unsupported texture option" << option.c_str();
                 #endif
             }
-        } else { // assume filename at end
-            filename = parser[i++].c_str();
+        } else { // assume filename at end when no more options
+            std::string filenameString = parser[i++];
+            while (i < parser.size()) { // filename has space in it
+                filenameString += " " + parser[i++];
+            }
+            filename = filenameString.c_str();
         }
     }
 }

From 950a62f3f8a88d7a3f0b9e1d05b62c49207990d8 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Thu, 8 Feb 2018 15:52:20 -0800
Subject: [PATCH 153/569] Global graphics flag default to on. Added cast
 shadows flag to zone/keylight. Exit the RenderShadowMap job if current
 keylight doesn't cast shadows.

---
 .../src/RenderableZoneEntityItem.cpp          |  1 +
 .../entities/src/EntityItemProperties.cpp     |  2 ++
 libraries/entities/src/EntityPropertyFlags.h  |  9 ++---
 .../entities/src/KeyLightPropertyGroup.cpp    | 35 +++++++++++++++----
 .../entities/src/KeyLightPropertyGroup.h      |  2 ++
 libraries/graphics/src/graphics/Light.cpp     |  9 ++++-
 libraries/graphics/src/graphics/Light.h       |  5 +++
 .../networking/src/udt/PacketHeaders.cpp      |  2 +-
 libraries/networking/src/udt/PacketHeaders.h  |  3 +-
 .../src/DeferredLightingEffect.cpp            | 16 ++++++---
 .../render-utils/src/DeferredLightingEffect.h |  2 +-
 .../render-utils/src/RenderShadowTask.cpp     | 15 ++++++++
 libraries/render-utils/src/RenderShadowTask.h |  2 +-
 scripts/system/html/entityProperties.html     |  4 +++
 scripts/system/html/js/entityProperties.js    |  7 ++++
 15 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index 04f07c5bd3..c46409c4ee 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -330,6 +330,7 @@ void ZoneEntityRenderer::updateKeySunFromEntity(const TypedEntityPointer& entity
     sunLight->setColor(ColorUtils::toVec3(_keyLightProperties.getColor()));
     sunLight->setIntensity(_keyLightProperties.getIntensity());
     sunLight->setDirection(_keyLightProperties.getDirection());
+    sunLight->setCastShadows(_keyLightProperties.getCastShadows());
 }
 
 void ZoneEntityRenderer::updateAmbientLightFromEntity(const TypedEntityPointer& entity) {
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index e2a5ddf8b5..cca4e858fa 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1128,6 +1128,8 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_DIRECTION, KeyLightDirection, keyLightDirection, glm::vec3);
+        ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_CAST_SHADOWS, KeyLightCastShadows, keyLightCastShadows, bool);
+
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray);
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 90438ab01c..ffcd4f64cb 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -205,6 +205,11 @@ enum EntityPropertyList {
 
     PROP_HAZE_MODE,
 
+    PROP_KEYLIGHT_COLOR,
+    PROP_KEYLIGHT_INTENSITY,
+    PROP_KEYLIGHT_DIRECTION,
+    PROP_KEYLIGHT_CAST_SHADOWS,
+
     PROP_HAZE_RANGE,
     PROP_HAZE_COLOR,
     PROP_HAZE_GLARE_COLOR,
@@ -246,10 +251,6 @@ enum EntityPropertyList {
     // Aliases/Piggyback properties for Zones. These properties intentionally reuse the enum values for
     // other properties which will never overlap with each other. We do this so that we don't have to expand
     // the size of the properties bitflags mask
-    PROP_KEYLIGHT_COLOR = PROP_COLOR,
-    PROP_KEYLIGHT_INTENSITY = PROP_INTENSITY,
-    PROP_KEYLIGHT_DIRECTION = PROP_EXPONENT,
-
     PROP_SKYBOX_COLOR = PROP_ANIMATION_URL,
     PROP_SKYBOX_URL = PROP_ANIMATION_FPS,
 
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
index c476b4c23c..70b9a5395a 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.cpp
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -21,6 +21,7 @@ const xColor KeyLightPropertyGroup::DEFAULT_KEYLIGHT_COLOR = { 255, 255, 255 };
 const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_INTENSITY = 1.0f;
 const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_AMBIENT_INTENSITY = 0.5f;
 const glm::vec3 KeyLightPropertyGroup::DEFAULT_KEYLIGHT_DIRECTION = { 0.0f, -1.0f, 0.0f };
+const bool KeyLightPropertyGroup::DEFAULT_KEYLIGHT_CAST_SHADOWS { false };
 
 void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, 
     QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
@@ -28,23 +29,27 @@ void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desired
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_COLOR, KeyLight, keyLight, Color, color);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_INTENSITY, KeyLight, keyLight, Intensity, intensity);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_DIRECTION, KeyLight, keyLight, Direction, direction);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_CAST_SHADOWS, KeyLight, keyLight, CastShadows, castShadows);
 }
 
 void KeyLightPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, color, xColor, setColor);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, intensity, float, setIntensity);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, direction, glmVec3, setDirection);
-    
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, castShadows, bool, setCastShadows);
+
     // legacy property support
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightColor, xColor, setColor, getColor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightIntensity, float, setIntensity, getIntensity);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightDirection, glmVec3, setDirection, getDirection);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightCastShadows, bool, setCastShadows, getCastShadows);
 }
 
 void KeyLightPropertyGroup::merge(const KeyLightPropertyGroup& other) {
     COPY_PROPERTY_IF_CHANGED(color);
     COPY_PROPERTY_IF_CHANGED(intensity);
     COPY_PROPERTY_IF_CHANGED(direction);
+    COPY_PROPERTY_IF_CHANGED(castShadows);
 }
 
 void KeyLightPropertyGroup::debugDump() const {
@@ -52,6 +57,7 @@ void KeyLightPropertyGroup::debugDump() const {
     qCDebug(entities) << "        color:" << getColor(); // << "," << getColor()[1] << "," << getColor()[2];
     qCDebug(entities) << "        intensity:" << getIntensity();
     qCDebug(entities) << "        direction:" << getDirection();
+    qCDebug(entities) << "        castShadows:" << getCastShadows();
 }
 
 void KeyLightPropertyGroup::listChangedProperties(QList<QString>& out) {
@@ -64,6 +70,9 @@ void KeyLightPropertyGroup::listChangedProperties(QList<QString>& out) {
     if (directionChanged()) {
         out << "keyLight-direction";
     }
+    if (castShadowsChanged()) {
+        out << "keyLight-castShadows";
+    }
 }
 
 bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
@@ -71,19 +80,22 @@ bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
     EntityPropertyFlags& propertyFlags,
     EntityPropertyFlags& propertiesDidntFit,
     int& propertyCount, 
-    OctreeElement::AppendState& appendState) const {
+    OctreeElement::AppendState& appendState) const 
+{
 
     bool successPropertyFits = true;
     
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
-    
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, getCastShadows());
+
     return true;
 }
 
 bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt, 
-    int& processedBytes) {
+    int& processedBytes) 
+{
         
     int bytesRead = 0;
     bool overwriteLocalData = true;
@@ -92,11 +104,13 @@ bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFl
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
-   
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, bool, setCastShadows);
+
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_COLOR, Color);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_INTENSITY, Intensity);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_DIRECTION, Direction);
-    
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_CAST_SHADOWS, CastShadows);
+
     processedBytes += bytesRead;
 
     Q_UNUSED(somethingChanged);
@@ -108,6 +122,7 @@ void KeyLightPropertyGroup::markAllChanged() {
     _colorChanged = true;
     _intensityChanged = true;
     _directionChanged = true;
+    _castShadowsChanged = true;
 }
 
 EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
@@ -116,7 +131,8 @@ EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_COLOR, color);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_INTENSITY, intensity);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_DIRECTION, direction);
-    
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_CAST_SHADOWS, castShadows);
+
     return changedProperties;
 }
 
@@ -124,6 +140,7 @@ void KeyLightPropertyGroup::getProperties(EntityItemProperties& properties) cons
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Color, getColor);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Intensity, getIntensity);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Direction, getDirection);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, CastShadows, getCastShadows);
 }
 
 bool KeyLightPropertyGroup::setProperties(const EntityItemProperties& properties) {
@@ -132,6 +149,7 @@ bool KeyLightPropertyGroup::setProperties(const EntityItemProperties& properties
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Color, color, setColor);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Intensity, intensity, setIntensity);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Direction, direction, setDirection);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, CastShadows, castShadows, setCastShadows);
 
     return somethingChanged;
 }
@@ -142,6 +160,7 @@ EntityPropertyFlags KeyLightPropertyGroup::getEntityProperties(EncodeBitstreamPa
     requestedProperties += PROP_KEYLIGHT_COLOR;
     requestedProperties += PROP_KEYLIGHT_INTENSITY;
     requestedProperties += PROP_KEYLIGHT_DIRECTION;
+    requestedProperties += PROP_KEYLIGHT_CAST_SHADOWS;
 
     return requestedProperties;
 }
@@ -159,6 +178,7 @@ void KeyLightPropertyGroup::appendSubclassData(OctreePacketData* packetData, Enc
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, getCastShadows());
 }
 
 int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
@@ -172,6 +192,7 @@ int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char*
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, bool, setCastShadows);
 
     return bytesRead;
 }
diff --git a/libraries/entities/src/KeyLightPropertyGroup.h b/libraries/entities/src/KeyLightPropertyGroup.h
index f33ebb282d..d3c8597f95 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.h
+++ b/libraries/entities/src/KeyLightPropertyGroup.h
@@ -78,10 +78,12 @@ public:
     static const float DEFAULT_KEYLIGHT_INTENSITY;
     static const float DEFAULT_KEYLIGHT_AMBIENT_INTENSITY;
     static const glm::vec3 DEFAULT_KEYLIGHT_DIRECTION;
+    static const bool DEFAULT_KEYLIGHT_CAST_SHADOWS;
 
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_COLOR, Color, color, xColor, DEFAULT_KEYLIGHT_COLOR);
     DEFINE_PROPERTY(PROP_KEYLIGHT_INTENSITY, Intensity, intensity, float, DEFAULT_KEYLIGHT_INTENSITY);
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_DIRECTION, Direction, direction, glm::vec3, DEFAULT_KEYLIGHT_DIRECTION);
+    DEFINE_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, CastShadows, castShadows, bool, DEFAULT_KEYLIGHT_CAST_SHADOWS);
 };
 
 #endif // hifi_KeyLightPropertyGroup_h
diff --git a/libraries/graphics/src/graphics/Light.cpp b/libraries/graphics/src/graphics/Light.cpp
index cb5209d4cf..94ec3a376a 100755
--- a/libraries/graphics/src/graphics/Light.cpp
+++ b/libraries/graphics/src/graphics/Light.cpp
@@ -65,6 +65,14 @@ const Vec3& Light::getDirection() const {
     return _lightSchemaBuffer->volume.direction;
 }
 
+void Light::setCastShadows(const bool castShadows) {
+    _castShadows = castShadows;
+}
+
+const bool Light::getCastShadows() const {
+    return _castShadows;
+}
+
 void Light::setColor(const Color& color) {
     _lightSchemaBuffer.edit().irradiance.color = color;
     updateLightRadius();
@@ -132,7 +140,6 @@ void Light::setSpotExponent(float exponent) {
     _lightSchemaBuffer.edit().irradiance.falloffSpot = exponent;
 }
 
-
 void Light::setAmbientIntensity(float intensity) {
     _ambientSchemaBuffer.edit().intensity = intensity;
 }
diff --git a/libraries/graphics/src/graphics/Light.h b/libraries/graphics/src/graphics/Light.h
index 360e3f224e..7497691185 100755
--- a/libraries/graphics/src/graphics/Light.h
+++ b/libraries/graphics/src/graphics/Light.h
@@ -103,6 +103,9 @@ public:
     void setDirection(const Vec3& direction);
     const Vec3& getDirection() const;
 
+    void setCastShadows(const bool castShadows);
+    const bool getCastShadows() const;
+
     void setOrientation(const Quat& orientation);
     const glm::quat& getOrientation() const { return _transform.getRotation(); }
 
@@ -187,6 +190,8 @@ protected:
 
     void updateLightRadius();
 
+    bool _castShadows{ false };
+
 };
 typedef std::shared_ptr< Light > LightPointer;
 
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index c48c6bfc0b..5cafb4caa2 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -30,7 +30,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return static_cast<PacketVersion>(EntityVersion::SoftEntities);
+            return static_cast<PacketVersion>(EntityVersion::ShadowControl);
 
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::RemovedJurisdictions);
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index d186ed41c3..d996c2826f 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -206,7 +206,8 @@ enum class EntityVersion : PacketVersion {
     OwnershipChallengeFix,
     ZoneLightInheritModes = 82,
     ZoneStageRemoved,
-    SoftEntities
+    SoftEntities,
+    ShadowControl
 };
 
 enum class EntityScriptCallMethodVersion : PacketVersion {
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index d0d9708c04..c7e6ff1dcf 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -541,15 +541,23 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
         auto keyLight = lightAndShadow.first;
 
-        graphics::LightPointer keyAmbientLight;
+        graphics::LightPointer ambientLight;
         if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
-            keyAmbientLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
+            ambientLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
         }
-        bool hasAmbientMap = (keyAmbientLight != nullptr);
+        bool hasAmbientMap = (ambientLight != nullptr);
 
         // Setup the global directional pass pipeline
         {
-            if (deferredLightingEffect->_shadowMapEnabled) {
+            // Check if keylight casts shadows
+            bool keyLightCastShadows { false };
+
+            if (lightStage && lightStage->_currentFrame._sunLights.size()) {
+                graphics::LightPointer keyLight = lightStage->getLight(lightStage->_currentFrame._sunLights.front());
+                keyLightCastShadows = keyLight->getCastShadows();
+            }
+
+            if (deferredLightingEffect->_shadowMapEnabled && keyLightCastShadows) {
 
                 // If the keylight has an ambient Map then use the Skybox version of the pass
                 // otherwise use the ambient sphere version
diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h
index 1b776e6409..ce7ecacbbe 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.h
+++ b/libraries/render-utils/src/DeferredLightingEffect.h
@@ -61,7 +61,7 @@ public:
 private:
     DeferredLightingEffect() = default;
 
-    bool _shadowMapEnabled{ false };
+    bool _shadowMapEnabled{ true };  // note that this value is overwritten in the ::configure method
     bool _ambientOcclusionEnabled{ false };
 
     graphics::MeshPointer _pointLightMesh;
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index e8963c2e4e..c5bdcf03dd 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -120,6 +120,12 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
 
+	// Exit if current keylight does not cast shadows
+    bool castShadows = lightStage->getCurrentKeyLight()->getCastShadows();
+    if (!castShadows) {
+        return;
+    }
+
     auto shadow = lightStage->getCurrentKeyShadow();
     if (!shadow || _cascadeIndex >= shadow->getCascadeCount()) {
         return;
@@ -378,6 +384,15 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
+
+    // Exit if current keylight does not cast shadows
+    bool castShadows = lightStage->getCurrentKeyLight()->getCastShadows();
+    if (!castShadows) {
+        output.edit0() = ItemFilter::Builder::nothing();
+        output.edit1() = ViewFrustumPointer();
+        return;
+    }
+
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 7f127a558c..98b70c0c9f 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -38,7 +38,7 @@ class RenderShadowTaskConfig : public render::Task::Config::Persistent {
     Q_OBJECT
     Q_PROPERTY(bool enabled MEMBER enabled NOTIFY dirty)
 public:
-    RenderShadowTaskConfig() : render::Task::Config::Persistent(QStringList() << "Render" << "Engine" << "Shadows", false) {}
+    RenderShadowTaskConfig() : render::Task::Config::Persistent(QStringList() << "Render" << "Engine" << "Shadows", true) {}
 
 signals:
     void dirty();
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b93974ee77..856ca3c6e1 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -532,6 +532,10 @@
                         <div></div>
                     </div>
                 </div>
+				<div class="zone-group zone-section keylight-section property checkbox">
+					<input type="checkbox" id="property-zone-key-light-cast-shadows">
+					<label for="property-zone-key-light-cast-shadows">Cast Shadows</label>
+				</div>
             <fieldset class="minor">
                 <legend class="sub-section-header zone-group zone-section background-section">
                     Skybox
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7008d0df66..7e8827a9b5 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -652,6 +652,8 @@ function loaded() {
         var elZoneKeyLightDirectionX = document.getElementById("property-zone-key-light-direction-x");
         var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
 
+        var elZoneKeyLightCastShadows = document.getElementById("property-zone-key-light-cast-shadows");
+
         // Skybox
         var elZoneSkyboxModeInherit = document.getElementById("property-zone-skybox-mode-inherit");
         var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
@@ -1026,6 +1028,8 @@ function loaded() {
                             elZoneKeyLightDirectionX.value = properties.keyLight.direction.x.toFixed(2);
                             elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
 
+                            elZoneKeyLightCastShadows.checked = properties.keyLight.castShadows;
+
                             // Skybox
                             elZoneSkyboxModeInherit.checked = (properties.skyboxMode === 'inherit');
                             elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
@@ -1463,6 +1467,9 @@ function loaded() {
         elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
         elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
 
+        elZoneKeyLightCastShadows.addEventListener('change',
+            createEmitGroupCheckedPropertyUpdateFunction('keyLight', 'castShadows'));
+
         // Skybox
         var skyboxModeChanged = createZoneComponentModeChangedFunction('skyboxMode',
             elZoneSkyboxModeInherit, elZoneSkyboxModeDisabled, elZoneSkyboxModeEnabled);

From f137fadc98edf8afd6d56288ba56c335ce1d33a1 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 8 Feb 2018 16:56:13 -0800
Subject: [PATCH 154/569] fix uint warnings

---
 libraries/fbx/src/OBJReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 2386afe677..63fb93ae46 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -353,7 +353,7 @@ void OBJReader::parseTextureLine(const QByteArray& textureLine, QByteArray& file
     std::istringstream iss(textureLine.toStdString());
     const std::vector<std::string> parser(std::istream_iterator<std::string>{iss}, std::istream_iterator<std::string>());
 
-    int i = 0;
+    uint i = 0;
     while (i < parser.size()) {
         if (i + 1 < parser.size() && parser[i][0] == '-') {
             const std::string& option = parser[i++];

From 0dac851def394a01ad443c07dc4c0fe509f37dd0 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Thu, 8 Feb 2018 17:08:51 -0800
Subject: [PATCH 155/569] fixing case when grabbed target is destroyed

---
 .../controllerModules/farActionGrabEntity.js         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index 32bf7316a9..b72a38f986 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -208,7 +208,7 @@ Script.include("/~/system/libraries/Xform.js");
             var worldToSensorMat = Mat4.inverse(MyAvatar.getSensorToWorldMatrix());
             var roomControllerPosition = Mat4.transformPoint(worldToSensorMat, worldControllerPosition);
 
-            var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, ["position"]);
+            var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
             var now = Date.now();
             var deltaObjectTime = (now - this.currentObjectTime) / MSECS_PER_SEC; // convert to seconds
             this.currentObjectTime = now;
@@ -369,6 +369,14 @@ Script.include("/~/system/libraries/Xform.js");
             }
         };
 
+        this.targetIsNull = function() {
+            var properties = Entities.getEntityProperties(this.grabbedThingID);
+            if (Object.keys(properties).length === 0 && this.distanceHolding) {
+                return true;
+            }
+            return false;
+        }
+
         this.isReady = function (controllerData) {
             if (HMD.active) {
                 if (this.notPointingAtEntity(controllerData)) {
@@ -391,7 +399,7 @@ Script.include("/~/system/libraries/Xform.js");
 
         this.run = function (controllerData) {
             if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE ||
-                this.notPointingAtEntity(controllerData)) {
+                this.notPointingAtEntity(controllerData) || this.targetIsNull()) {
                 this.endNearGrabAction();
                 return makeRunningValues(false, [], []);
             }

From 5e16623c81203f447fc8c93978697202fbece5e8 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 8 Feb 2018 17:17:04 -0800
Subject: [PATCH 156/569] allow overlay children to follow avatar from one
 domain to another

---
 interface/src/ui/overlays/Base3DOverlay.cpp | 2 ++
 interface/src/ui/overlays/Line3DOverlay.cpp | 2 +-
 libraries/avatars/src/AvatarData.h          | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 23e09fe5ca..ff5a202910 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -181,6 +181,8 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
 
     if (properties["parentID"].isValid()) {
         setParentID(QUuid(properties["parentID"].toString()));
+        bool success;
+        getParentPointer(success); // call this to hook-up the parent's back-pointers to its child overlays
         needRenderItemUpdate = true;
     }
     if (properties["parentJointIndex"].isValid()) {
diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp
index 7200abf74e..c2e5ad1fb4 100644
--- a/interface/src/ui/overlays/Line3DOverlay.cpp
+++ b/interface/src/ui/overlays/Line3DOverlay.cpp
@@ -63,7 +63,7 @@ glm::vec3 Line3DOverlay::getEnd() const {
     localEnd = getLocalEnd();
     worldEnd = localToWorld(localEnd, getParentID(), getParentJointIndex(), getScalesWithParent(), success);
     if (!success) {
-        qDebug() << "Line3DOverlay::getEnd failed";
+        qDebug() << "Line3DOverlay::getEnd failed, parentID = " << getParentID();
     }
     return worldEnd;
 }
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index a363fb6d15..f24bd51bde 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -707,7 +707,11 @@ public slots:
     void setJointMappingsFromNetworkReply();
     void setSessionUUID(const QUuid& sessionUUID) {
         if (sessionUUID != getID()) {
-            setID(sessionUUID);
+            if (sessionUUID == QUuid()) {
+                setID(AVATAR_SELF_ID);
+            } else {
+                setID(sessionUUID);
+            }
             emit sessionUUIDChanged();
         }
     }

From a08770c816e46a2d0c2f13e1c4c92076ac130b91 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 9 Feb 2018 02:14:32 -0500
Subject: [PATCH 157/569] cleanup

---
 libraries/fbx/src/OBJWriter.cpp               |   6 +-
 .../graphics-scripting/BufferViewHelpers.cpp  |  55 ++
 .../graphics-scripting/BufferViewHelpers.h    |   9 +-
 .../ModelScriptingInterface.cpp               | 641 ++++--------------
 .../ModelScriptingInterface.h                 |  16 +-
 .../src/graphics-scripting/ScriptableMesh.cpp | 403 ++++++++++-
 .../src/graphics-scripting/ScriptableMesh.h   | 123 ++--
 .../src/graphics-scripting/ScriptableModel.h  |  67 +-
 libraries/render-utils/src/Model.cpp          |  58 +-
 9 files changed, 722 insertions(+), 656 deletions(-)

diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 37bced8458..5307f49f36 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -15,6 +15,9 @@
 #include "OBJWriter.h"
 #include "ModelFormatLogging.h"
 
+// FIXME: should this live in shared? (it depends on gpu/)
+#include <../graphics-scripting/src/graphics-scripting/BufferViewHelpers.h>
+
 static QString formatFloat(double n) {
     // limit precision to 6, but don't output trailing zeros.
     QString s = QString::number(n, 'f', 6);
@@ -91,7 +94,8 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
         for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
-            glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
+            glm::vec3 normal = glmVecFromVariant<glm::vec3>(bufferViewElementToVariant(normalsBufferView, i));
+            //glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
             out << "vn ";
             out << formatFloat(normal[0]) << " ";
             out << formatFloat(normal[1]) << " ";
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
index e865ed0e5a..d83322f360 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
@@ -8,9 +8,15 @@
 #include <gpu/Stream.h>
 
 #include <glm/gtc/packing.hpp>
+namespace glm {
+    using hvec2 = glm::tvec2<glm::detail::hdata>;
+    using hvec4 = glm::tvec4<glm::detail::hdata>;
+}
 
+//#define DEBUG_BUFFERVIEW_SCRIPTING
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
     #include "DebugNames.h"
+    QLoggingCategory bufferview_helpers{"hifi.bufferview"};
 #endif
 
 namespace {
@@ -61,6 +67,9 @@ bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, co
     const auto dataType = element.getType();
     const auto byteLength = element.getSize();
     const auto BYTES_PER_ELEMENT = byteLength / vecN;
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+    qCDebug(bufferview_helpers) << "bufferViewElementFromVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
+#endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
         case 2: setBufferViewElement<glm::u8vec2>(view, index, v); return true;
@@ -71,16 +80,25 @@ bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, co
                 glm::uint32 unused;
                 packNormalAndTangent(glmVecFromVariant<glm::vec3>(v), glm::vec3(), rawColor, unused);
                 view.edit<glm::uint32>(index) = rawColor;
+                return true;
             } else if (element == gpu::Element::VEC4F_NORMALIZED_XYZ10W2) {
                 glm::uint32 packedNormal;// = glm::packSnorm3x10_1x2(glm::vec4(glmVecFromVariant<glm::vec3>(v), 0.0f));
                 glm::uint32 unused;
                 packNormalAndTangent(glm::vec3(), glmVecFromVariant<glm::vec3>(v), unused, packedNormal);
                 view.edit<glm::uint32>(index) = packedNormal;
+                return true;
             }
             setBufferViewElement<glm::u8vec4>(view, index, v); return true;
         }
         }
     } else if (BYTES_PER_ELEMENT == 2) {
+        if (dataType == gpu::HALF) {
+            switch(vecN) {
+            case 2: view.edit<glm::int16>(index) = glm::packSnorm2x8(glmVecFromVariant<glm::vec2>(v)); return true;
+            case 4: view.edit<glm::int32>(index) = glm::packSnorm4x8(glmVecFromVariant<glm::vec4>(v)); return true;
+            default: return false;
+            }
+        }
         switch(vecN) {
         case 2: setBufferViewElement<glm::u16vec2>(view, index, v); return true;
         case 3: setBufferViewElement<glm::u16vec3>(view, index, v); return true;
@@ -112,6 +130,9 @@ QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index,
     const auto BYTES_PER_ELEMENT = byteLength / vecN;
     Q_ASSERT(index < view.getNumElements());
     Q_ASSERT(index * vecN * BYTES_PER_ELEMENT < (view._size - vecN * BYTES_PER_ELEMENT));
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+    qCDebug(bufferview_helpers) << "bufferViewElementToVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
+#endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
         case 2: return getBufferViewElement<glm::u8vec2>(view, index, asArray);
@@ -129,6 +150,12 @@ QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index,
         }
         }
     } else if (BYTES_PER_ELEMENT == 2) {
+        if (dataType == gpu::HALF) {
+            switch(vecN) {
+            case 2: return glmVecToVariant(glm::vec2(glm::unpackSnorm2x8(view.get<glm::int16>(index))));
+            case 4: return glmVecToVariant(glm::vec4(glm::unpackSnorm4x8(view.get<glm::int32>(index))));
+            }
+        }
         switch(vecN) {
         case 2: return getBufferViewElement<glm::u16vec2>(view, index, asArray);
         case 3: return getBufferViewElement<glm::u16vec3>(view, index, asArray);
@@ -193,3 +220,31 @@ const T glmVecFromVariant(const QVariant& v) {
     return result;
 }
 
+template <typename T>
+gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType) {
+    auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
+    return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
+}
+
+template<> gpu::BufferView bufferViewFromVector<unsigned int>(QVector<unsigned int> elements, gpu::Element elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView bufferViewFromVector<glm::vec3>(QVector<glm::vec3> elements, gpu::Element elementType) { return bufferViewFromVector(elements, elementType); }
+
+gpu::BufferView cloneBufferView(const gpu::BufferView& input) {
+    return gpu::BufferView(
+        std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
+        input._offset, input._size, input._stride, input._element
+        );
+}
+
+gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements) {
+    auto effectiveSize = input._buffer->getSize() / input.getNumElements();
+    qDebug() << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
+    auto vsize = input._element.getSize() * numElements;
+    gpu::Byte *data = new gpu::Byte[vsize];
+    memset(data, 0, vsize);
+    auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
+    delete[] data;
+    auto output = gpu::BufferView(buffer, input._element);
+    qDebug() << "resized output" << output.getNumElements() << output._buffer->getSize();
+    return output;
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
index 0fe2602f6c..d0d42ca419 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
@@ -8,11 +8,18 @@
 
 #include <QtCore>
 
-namespace gpu { class BufferView;  }
+namespace gpu {
+    class BufferView;
+    class Element;
+}
 
 template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
 template <typename T> const T glmVecFromVariant(const QVariant& v);
 QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
 bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v);
 
+template <typename T> gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType);
+
+gpu::BufferView cloneBufferView(const gpu::BufferView& input);
+gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements);
 
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
index 68a00bc02c..ab85fb8265 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
@@ -17,27 +17,16 @@
 #include "BaseScriptEngine.h"
 #include "ScriptEngineLogging.h"
 #include "OBJWriter.h"
-#include "OBJReader.h"
-//#include "ui/overlays/Base3DOverlay.h"
-//#include "EntityTreeRenderer.h"
-//#include "avatar/AvatarManager.h"
-//#include "RenderableEntityItem.h"
 
-#include <glm/gtx/string_cast.hpp>
 #include <GeometryUtil.h>
-
 #include <shared/QtHelpers.h>
 
-
 #include <graphics-scripting/DebugNames.h>
-
 #include <graphics-scripting/BufferViewHelpers.h>
+
 #include "BufferViewScripting.h"
-
 #include "ScriptableMesh.h"
 
-using ScriptableMesh = scriptable::ScriptableMesh;
-
 #include "ModelScriptingInterface.moc"
 
 namespace {
@@ -50,13 +39,56 @@ ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(pare
     }
 }
 
+void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName) {
+    auto handler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+    Q_ASSERT(handler.engine() == this->engine());
+    QPointer<BaseScriptEngine> engine = dynamic_cast<BaseScriptEngine*>(handler.engine());
+
+    scriptable::ScriptableModel* meshes{ nullptr };
+    bool success = false;
+    QString error;
+
+    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
+    qDebug() << "appProvider" << appProvider.data();
+    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
+    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
+    if (providerType.isEmpty()) {
+        providerType = "unknown";
+    }
+    if (provider) {
+        qCDebug(model_scripting) << "fetching meshes from " << providerType << "...";
+        auto scriptableMeshes = provider->getScriptableModel(&success);
+        qCDebug(model_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
+        if (success) {
+            meshes = new scriptable::ScriptableModel(scriptableMeshes);//SimpleModelProxy::fromScriptableModel(scriptableMeshes);
+            if (meshes->objectName().isEmpty()) {
+                meshes->setObjectName(providerType+"::meshes");
+            }
+            if (meshes->objectID.isNull()) {
+                meshes->objectID = uuid.toString();
+            }
+            meshes->metadata["provider"] = provider->metadata;
+        }
+    }
+    if (!success) {
+        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
+    }
+
+    if (!error.isEmpty()) {
+        qCWarning(model_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
+        callScopedHandlerObject(handler, engine->makeError(error), QScriptValue::NullValue);
+    } else {
+        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->newQObject(meshes, QScriptEngine::ScriptOwnership));
+    }
+}
+
 QString ModelScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
-    const auto& in = _in.getMeshes();
+    const auto& in = _in.getConstMeshes();
     qCDebug(model_scripting) << "meshToOBJ" << in.size();
     if (in.size()) {
         QList<scriptable::MeshPointer> meshes;
-        foreach (const auto meshProxy, in) {
-            qCDebug(model_scripting) << "meshToOBJ" << meshProxy.get();
+        foreach (auto meshProxy, in) {
+            qCDebug(model_scripting) << "meshToOBJ" << meshProxy;
             if (meshProxy) {
                 meshes.append(getMeshPointer(meshProxy));
             }
@@ -77,7 +109,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _
     size_t totalColorCount { 0 };
     size_t totalNormalCount { 0 };
     size_t totalIndexCount { 0 };
-    foreach (const scriptable::ScriptableMeshPointer meshProxy, in) {
+    foreach (auto& meshProxy, in) {
         scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
         totalVertexCount += mesh->getNumVertices();
 
@@ -113,7 +145,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _
 
     uint32_t indexStartOffset { 0 };
 
-    foreach (const scriptable::ScriptableMeshPointer meshProxy, in) {
+    foreach (const auto& meshProxy, in) {
         scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
         mesh->forEach(
             [&](glm::vec3 position){
@@ -175,8 +207,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _
                                                           (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
 
 
-    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, result));
-    return engine()->toScriptValue(result);
+    return engine()->toScriptValue(scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, result)));
 }
 
 QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform) {
@@ -189,7 +220,7 @@ QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPo
                                           [&](glm::vec3 color){ return color; },
                                           [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
                                           [&](uint32_t index){ return index; });
-    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, result));
+    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, result));
     return engine()->toScriptValue(resultProxy);
 }
 
@@ -201,8 +232,11 @@ QScriptValue ModelScriptingInterface::getVertexCount(scriptable::ScriptableMeshP
     return (uint32_t)mesh->getNumVertices();
 }
 
-QScriptValue ModelScriptingInterface::getVertex(scriptable::ScriptableMeshPointer meshProxy, mesh::uint32 vertexIndex) {
+QScriptValue ModelScriptingInterface::getVertex(scriptable::ScriptableMeshPointer meshProxy, quint32 vertexIndex) {
     auto mesh = getMeshPointer(meshProxy);
+    if (!mesh) {
+        return QScriptValue();
+    }
 
     const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
     auto numVertices = mesh->getNumVertices();
@@ -266,480 +300,46 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices
 
 
 
-    scriptable::ScriptableMeshPointer meshProxy = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, mesh));
+    scriptable::ScriptableMeshPointer meshProxy = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, mesh));
     return engine()->toScriptValue(meshProxy);
 }
 
-QScriptValue ModelScriptingInterface::mapAttributeValues(
-    QScriptValue _in,
-    QScriptValue scopeOrCallback,
-    QScriptValue methodOrName
-    ) {
-    qCInfo(model_scripting) << "mapAttributeValues" << _in.toVariant().typeName() << _in.toVariant().toString() << _in.toQObject();
-    auto in = qscriptvalue_cast<scriptable::ScriptableModel>(_in).getMeshes();
-    if (in.size()) {
-        foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
-            mapMeshAttributeValues(meshProxy, scopeOrCallback, methodOrName);
-        }
-        return thisObject();
-    } else if (auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(_in.toQObject())) {
-        return mapMeshAttributeValues(meshProxy->shared_from_this(), scopeOrCallback, methodOrName);
-    } else {
-        context()->throwError("invalid ModelProxy || MeshProxyPointer");
-    }
-    return false;
-}
-
-
-QScriptValue ModelScriptingInterface::unrollVertices(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals) {
-    auto mesh = getMeshPointer(meshProxy);
-    qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices" << !!mesh<< !!meshProxy;
-    if (!mesh) {
-        return QScriptValue();
-    }
-
-    auto positions = mesh->getVertexBuffer();
-    auto indices = mesh->getIndexBuffer();
-    quint32 numPoints = (quint32)indices.getNumElements();
-    auto buffer = new gpu::Buffer();
-    buffer->resize(numPoints * sizeof(uint32_t));
-    auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
-    qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices numPoints" << numPoints;
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto sz = view._element.getSize();
-        auto buffer = new gpu::Buffer();
-        buffer->resize(numPoints * sz);
-        auto points = gpu::BufferView(buffer, view._element);
-        auto src = (uint8_t*)view._buffer->getData();
-        auto dest = (uint8_t*)points._buffer->getData();
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices buffer" << a.first;
-        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices source" << view.getNumElements();
-        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices dest" << points.getNumElements();
-        qCInfo(model_scripting) << "ModelScriptingInterface::unrollVertices sz" << sz << src << dest << slot;
-        auto esize = indices._element.getSize();
-        const char* hint= a.first.toStdString().c_str();
-        for(quint32 i = 0; i < numPoints; i++) {
-            quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
-            newindices.edit<uint32_t>(i) = i;
-            bufferViewElementFromVariant(
-                points, i,
-                bufferViewElementToVariant(view, index, false, hint)
-                    );
-        }
-        if (slot == gpu::Stream::POSITION) {
-            mesh->setVertexBuffer(points);
-        } else {
-            mesh->addAttribute(slot, points);
-        }
-    }
-    mesh->setIndexBuffer(newindices);
-    if (recalcNormals) {
-        recalculateNormals(meshProxy);
-    }
-    return true;
-}
-
 namespace {
-    template <typename T>
-    gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType) {
-        auto vertexBuffer = std::make_shared<gpu::Buffer>(
-            elements.size() * sizeof(T),
-            (gpu::Byte*)elements.data()
-        );
-        return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
-    }
-
-    gpu::BufferView cloneBufferView(const gpu::BufferView& input) {
-        //qCInfo(model_scripting) << "input" << input.getNumElements() << input._buffer->getSize();
-        auto output = gpu::BufferView(
-            std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
-            input._offset,
-            input._size,
-            input._stride,
-            input._element
-            );
-        //qCInfo(model_scripting) << "after" << output.getNumElements() << output._buffer->getSize();
-        return output;
-    }
-
-    gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements) {
-        auto effectiveSize = input._buffer->getSize() / input.getNumElements();
-        qCInfo(model_scripting) << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
-        auto vsize = input._element.getSize() * numElements;
-        gpu::Byte *data = new gpu::Byte[vsize];
-        memset(data, 0, vsize);
-        auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
-        delete[] data;
-        auto output = gpu::BufferView(buffer, input._element);
-        qCInfo(model_scripting) << "resized output" << output.getNumElements() << output._buffer->getSize();
-        return output;
-    }
-}
-
-bool ModelScriptingInterface::replaceMeshData(scriptable::ScriptableMeshPointer dest, scriptable::ScriptableMeshPointer src, const QVector<QString>& attributeNames) {
-    auto target = getMeshPointer(dest);
-    auto source = getMeshPointer(src);
-    if (!target || !source) {
-        context()->throwError("ModelScriptingInterface::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
-        return false;
-    }
-
-    QVector<QString> attributes = attributeNames.isEmpty() ? src->getAttributeNames() : attributeNames;
-
-    //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData -- source:" << source->displayName << "target:" << target->displayName << "attributes:" << attributes;
-
-    // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
-    if (attributeNames.isEmpty()) {
-        auto attributeViews = ScriptableMesh::gatherBufferViews(target);
-        for (const auto& a : attributeViews) {
-            auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-            if (!attributes.contains(a.first)) {
-                //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData -- pruning target attribute" << a.first << slot;
-                target->removeAttribute(slot);
-            }
+    QScriptValue meshPointerToScriptValue(QScriptEngine* engine, scriptable::ScriptableMeshPointer const &in) {
+        if (!in) {
+            return QScriptValue::NullValue;
         }
+        return engine->newQObject(in, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
     }
 
-    target->setVertexBuffer(cloneBufferView(source->getVertexBuffer()));
-    target->setIndexBuffer(cloneBufferView(source->getIndexBuffer()));
-    target->setPartBuffer(cloneBufferView(source->getPartBuffer()));
-
-    for (const auto& a : attributes) {
-        auto slot = ScriptableMesh::ATTRIBUTES[a];
-        if (slot == gpu::Stream::POSITION) {
-            continue;
-        }
-        // auto& before = target->getAttributeBuffer(slot);
-        auto& input = source->getAttributeBuffer(slot);
-        if (input.getNumElements() == 0) {
-            //qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData buffer is empty -- pruning" << a << slot;
-            target->removeAttribute(slot);
-        } else {
-            // if (before.getNumElements() == 0) {
-            //     qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData target buffer is empty -- adding" << a << slot;
-            // } else {
-            //     qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData target buffer exists -- updating" << a << slot;
-            // }
-            target->addAttribute(slot, cloneBufferView(input));
-        }
-        // auto& after = target->getAttributeBuffer(slot);
-        // qCInfo(model_scripting) << "ModelScriptingInterface::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
-    }
-
-
-    return true;
-}
-
-bool ModelScriptingInterface::dedupeVertices(scriptable::ScriptableMeshPointer meshProxy, float epsilon) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return false;
-    }
-    auto positions = mesh->getVertexBuffer();
-    auto numPositions = positions.getNumElements();
-    const auto epsilon2 = epsilon*epsilon;
-
-    QVector<glm::vec3> uniqueVerts;
-    uniqueVerts.reserve((int)numPositions);
-    QMap<quint32,quint32> remapIndices;
-
-    for (quint32 i = 0; i < numPositions; i++) {
-        const quint32 numUnique = uniqueVerts.size();
-        const auto& position = positions.get<glm::vec3>(i);
-        bool unique = true;
-        for (quint32 j = 0; j < numUnique; j++) {
-            if (glm::length2(uniqueVerts[j] - position) <= epsilon2) {
-                remapIndices[i] = j;
-                unique = false;
-                break;
-            }
-        }
-        if (unique) {
-            uniqueVerts << position;
-            remapIndices[i] = numUnique;
-        }
-    }
-
-    qCInfo(model_scripting) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
-
-    auto indices = mesh->getIndexBuffer();
-    auto numIndices = indices.getNumElements();
-    auto esize = indices._element.getSize();
-    QVector<quint32> newIndices;
-    newIndices.reserve((int)numIndices);
-    for (quint32 i = 0; i < numIndices; i++) {
-        quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
-        if (remapIndices.contains(index)) {
-            //qCInfo(model_scripting) << i << index << "->" << remapIndices[index];
-            newIndices << remapIndices[index];
-        } else {
-            qCInfo(model_scripting) << i << index << "!remapIndices[index]";
-        }
-    }
-
-    mesh->setIndexBuffer(bufferViewFromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
-    mesh->setVertexBuffer(bufferViewFromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
-
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
-    quint32 numUniqueVerts = uniqueVerts.size();
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-        if (slot == gpu::Stream::POSITION) {
-            continue;
-        }
-        qCInfo(model_scripting) << "ModelScriptingInterface::dedupeVertices" << a.first << slot << view.getNumElements();
-        auto newView = resizedBufferView(view, numUniqueVerts);
-        qCInfo(model_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
-        quint32 numElements = (quint32)view.getNumElements();
-        for (quint32 i = 0; i < numElements; i++) {
-            quint32 fromVertexIndex = i;
-            quint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
-            bufferViewElementFromVariant(
-                newView, toVertexIndex,
-                bufferViewElementToVariant(view, fromVertexIndex, false, "dedupe")
-                );
-        }
-        mesh->addAttribute(slot, newView);
-    }
-    return true;
-}
-
-QScriptValue ModelScriptingInterface::cloneMesh(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return QScriptValue::NullValue;
-    }
-    graphics::MeshPointer clone(new graphics::Mesh());
-    clone->displayName = mesh->displayName + "-clone";
-    qCInfo(model_scripting) << "ModelScriptingInterface::cloneMesh" << !!mesh<< !!meshProxy;
-    if (!mesh) {
-        return QScriptValue::NullValue;
-    }
-
-    clone->setIndexBuffer(cloneBufferView(mesh->getIndexBuffer()));
-    clone->setPartBuffer(cloneBufferView(mesh->getPartBuffer()));
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices buffer" << a.first << slot;
-        auto points = cloneBufferView(view);
-        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices source" << view.getNumElements();
-        qCInfo(model_scripting) << "ModelScriptingInterface::cloneVertices dest" << points.getNumElements();
-        if (slot == gpu::Stream::POSITION) {
-            clone->setVertexBuffer(points);
-        } else {
-            clone->addAttribute(slot, points);
-        }
-    }
-
-    auto result = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, clone));
-    if (recalcNormals) {
-        recalculateNormals(result);
-    }
-    return engine()->toScriptValue(result);
-}
-
-bool ModelScriptingInterface::recalculateNormals(scriptable::ScriptableMeshPointer meshProxy) {
-    qCInfo(model_scripting) << "Recalculating normals" << !!meshProxy;
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return false;
-    }
-    ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
-    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
-    auto verts = mesh->getVertexBuffer();
-    auto indices = mesh->getIndexBuffer();
-    auto esize = indices._element.getSize();
-    auto numPoints = indices.getNumElements();
-    const auto TRIANGLE = 3;
-    quint32 numFaces = (quint32)numPoints / TRIANGLE;
-    //QVector<Triangle> faces;
-    QVector<glm::vec3> faceNormals;
-    QMap<QString,QVector<quint32>> vertexToFaces;
-    //faces.resize(numFaces);
-    faceNormals.resize(numFaces);
-    auto numNormals = normals.getNumElements();
-    qCInfo(model_scripting) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
-    if (normals.getNumElements() != verts.getNumElements()) {
-        return false;
-    }
-    for (quint32 i = 0; i < numFaces; i++) {
-        quint32 I = TRIANGLE * i;
-        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
-        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
-        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
-
-        Triangle face = {
-            verts.get<glm::vec3>(i1),
-            verts.get<glm::vec3>(i2),
-            verts.get<glm::vec3>(i0)
-        };
-        faceNormals[i] = face.getNormal();
-        if (glm::isnan(faceNormals[i].x)) {
-            qCInfo(model_scripting) << i << i0 << i1 << i2 << vec3toVariant(face.v0) << vec3toVariant(face.v1) << vec3toVariant(face.v2);
-            break;
-        }
-        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
-    }
-    for (quint32 j = 0; j < numNormals; j++) {
-        //auto v = verts.get<glm::vec3>(j);
-        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
-        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
-        const auto& faces = vertexToFaces.value(key);
-        if (faces.size()) {
-            for (const auto i : faces) {
-                normal += faceNormals[i];
-            }
-            normal *= 1.0f / (float)faces.size();
-        } else {
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(model_scripting) << "no faces for key!?" << key;
-            }
-            normal = verts.get<glm::vec3>(j);
-        }
-        if (glm::isnan(normal.x)) {
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(model_scripting) << "isnan(normal.x)" << j << vec3toVariant(normal);
-            }
-            break;
-        }
-        normals.edit<glm::vec3>(j) = glm::normalize(normal);
-    }
-    return true;
-}
-
-QScriptValue ModelScriptingInterface::mapMeshAttributeValues(
-    scriptable::ScriptableMeshPointer meshProxy, QScriptValue scopeOrCallback, QScriptValue methodOrName
-) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return false;
-    }
-    auto scopedHandler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
-
-    // input buffers
-    gpu::BufferView positions = mesh->getVertexBuffer();
-
-    const auto nPositions = positions.getNumElements();
-
-    // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
-    auto scope = scopedHandler.property("scope");
-    auto callback = scopedHandler.property("callback");
-    auto js = engine(); // cache value to avoid resolving each iteration
-    auto meshPart = js->toScriptValue(meshProxy);
-
-    auto obj = js->newObject();
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" });
-    for (uint32_t i=0; i < nPositions; i++) {
-        for (const auto& a : attributeViews) {
-            bool asArray = a.second._element.getType() != gpu::FLOAT;
-            obj.setProperty(a.first, bufferViewElementToScriptValue(js, a.second, i, asArray, a.first.toStdString().c_str()));
-        }
-        auto result = callback.call(scope, { obj, i, meshPart });
-        if (js->hasUncaughtException()) {
-            context()->throwValue(js->uncaughtException());
-            return false;
-        }
-
-        if (result.isBool() && !result.toBool()) {
-            // bail without modifying data if user explicitly returns false
-            continue;
-        }
-        if (result.isObject() && !result.strictlyEquals(obj)) {
-            // user returned a new object (ie: instead of modifying input properties)
-            obj = result;
-        }
-
-        for (const auto& a : attributeViews) {
-            const auto& attribute = obj.property(a.first);
-            auto& view = a.second;
-            if (attribute.isValid()) {
-                bufferViewElementFromScriptValue(attribute, view, i);
-            }
-        }
-    }
-    return thisObject();
-}
-
-void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName) {
-    auto handler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
-    Q_ASSERT(handler.engine() == this->engine());
-    QPointer<BaseScriptEngine> engine = dynamic_cast<BaseScriptEngine*>(handler.engine());
-
-    scriptable::ScriptableModel meshes;
-    bool success = false;
-    QString error;
-
-    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    qDebug() << "appProvider" << appProvider.data();
-    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
-    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
-    if (providerType.isEmpty()) {
-        providerType = "unknown";
-    }
-    if (provider) {
-        qCDebug(model_scripting) << "fetching meshes from " << providerType << "...";
-        auto scriptableMeshes = provider->getScriptableModel(&success);
-        qCDebug(model_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
-        if (success) {
-            meshes = scriptableMeshes;//SimpleModelProxy::fromScriptableModel(scriptableMeshes);
-        }
-    }
-    if (!success) {
-        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
-    }
-
-    if (!error.isEmpty()) {
-        qCWarning(model_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
-        callScopedHandlerObject(handler, engine->makeError(error), QScriptValue::NullValue);
-    } else {
-        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->toScriptValue(meshes));
-    }
-}
-
-namespace {
-    QScriptValue meshToScriptValue(QScriptEngine* engine, scriptable::ScriptableMeshPointer const &in) {
-        return engine->newQObject(in.get(), QScriptEngine::QtOwnership,
-            QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects
-        );
-    }
-
-    void meshFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
+    void meshPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
         auto obj = value.toQObject();
-        //qDebug() << "meshFromScriptValue" << obj;
+        qDebug() << "meshPointerFromScriptValue" << obj;
         if (auto tmp = qobject_cast<scriptable::ScriptableMesh*>(obj)) {
-            out = tmp->shared_from_this();
+            out = tmp;
         }
         // FIXME: Why does above cast not work on Win32!?
         if (!out) {
-            auto smp = static_cast<scriptable::ScriptableMesh*>(obj);
-            //qDebug() << "meshFromScriptValue2" << smp;
-            out = smp->shared_from_this();
+            if (auto smp = static_cast<scriptable::ScriptableMesh*>(obj)) {
+                qDebug() << "meshPointerFromScriptValue2" << smp;
+                out = smp;
+            }
         }
     }
 
-    QScriptValue meshesToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer &in) {
-        // QScriptValueList result;
-        QScriptValue result = engine->newArray();
-        int i = 0;
-        foreach(scriptable::ScriptableMeshPointer const meshProxy, in->getMeshes()) {
-            result.setProperty(i++, meshToScriptValue(engine, meshProxy));
-        }
-        return result;
+    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer &in) {
+        return engine->newQObject(in, QScriptEngine::QtOwnership,  QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
+        // QScriptValue result = engine->newArray();
+        // int i = 0;
+        // foreach(auto& mesh, in->getMeshes()) {
+        //     result.setProperty(i++, meshPointerToScriptValue(engine, mesh));
+        // }
+        // return result;
     }
 
-    void meshesFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
+    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
         const auto length = value.property("length").toInt32();
-        qCDebug(model_scripting) << "in meshesFromScriptValue, length =" << length;
+        qCDebug(model_scripting) << "in modelPointerFromScriptValue, length =" << length;
         for (int i = 0; i < length; i++) {
             if (const auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(value.property(i).toQObject())) {
                 out->meshes.append(meshProxy->getMeshPointer());
@@ -749,79 +349,64 @@ namespace {
         }
     }
 
-    void modelProxyFromScriptValue(const QScriptValue& object, scriptable::ScriptableModel &meshes) {
-        auto meshesProperty = object.property("meshes");
-        if (meshesProperty.property("length").toInt32() > 0) {
-            //meshes._meshes = qobject_cast<scriptable::ScriptableModelPointer>(meshesProperty.toQObject());
-            // qDebug() << "modelProxyFromScriptValue" << meshesProperty.property("length").toInt32() << meshesProperty.toVariant().typeName();
-            qScriptValueToSequence(meshesProperty, meshes.meshes);
-        } else if (auto mesh = qobject_cast<scriptable::ScriptableMesh*>(object.toQObject())) {
-            meshes.meshes << mesh->getMeshPointer();
-        } else {
-            qDebug() << "modelProxyFromScriptValue -- unrecognized input" << object.toVariant().toString();
-        }
+    // FIXME: MESHFACES:
+    // QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
+    //     QScriptValue obj = engine->newObject();
+    //     obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
+    //     return obj;
+    // }
+    // void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
+    //     qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
+    // }
+    // QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
+    //     return qScriptValueFromSequence(engine, vector);
+    // }
+    // void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
+    //     qScriptValueToSequence(array, result);
+    // }
 
-        meshes.metadata = object.property("metadata").toVariant().toMap();
-    }
-
-    QScriptValue modelProxyToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModel &in) {
-        QScriptValue obj = engine->newObject();
-        obj.setProperty("meshes", qScriptValueFromSequence(engine, in.meshes));
-        obj.setProperty("metadata", engine->toScriptValue(in.metadata));
-        return obj;
-    }
-
-    QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
-        QScriptValue obj = engine->newObject();
-        obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
-        return obj;
-    }
-
-    void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
-        qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
-    }
-
-    QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
+    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<quint32>& vector) {
         return qScriptValueFromSequence(engine, vector);
     }
 
-    void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
-        qScriptValueToSequence(array, result);
-    }
-
-    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<mesh::uint32>& vector) {
-        return qScriptValueFromSequence(engine, vector);
-    }
-
-    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<mesh::uint32>& result) {
+    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<quint32>& result) {
         qScriptValueToSequence(array, result);
     }
 }
 
-int meshUint32 = qRegisterMetaType<mesh::uint32>();
+int meshUint32 = qRegisterMetaType<quint32>();
 namespace mesh {
     int meshUint32 = qRegisterMetaType<uint32>();
 }
-int qVectorMeshUint32 = qRegisterMetaType<QVector<mesh::uint32>>();
+int qVectorMeshUint32 = qRegisterMetaType<QVector<quint32>>();
 
 void ModelScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
     qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
-    qScriptRegisterSequenceMetaType<mesh::MeshFaces>(engine);
-    qScriptRegisterSequenceMetaType<QVector<mesh::uint32>>(engine);
-    qScriptRegisterMetaType(engine, modelProxyToScriptValue, modelProxyFromScriptValue);
+    qScriptRegisterSequenceMetaType<QVector<quint32>>(engine);
 
     qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
-    qScriptRegisterMetaType(engine, meshToScriptValue, meshFromScriptValue);
-    qScriptRegisterMetaType(engine, meshesToScriptValue, meshesFromScriptValue);
-    qScriptRegisterMetaType(engine, meshFaceToScriptValue, meshFaceFromScriptValue);
-    qScriptRegisterMetaType(engine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
+    qScriptRegisterMetaType(engine, meshPointerToScriptValue, meshPointerFromScriptValue);
+    qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
+
+    // FIXME: MESHFACES: remove if MeshFace is not needed anywhere
+    // qScriptRegisterSequenceMetaType<mesh::MeshFaces>(engine);
+    // qScriptRegisterMetaType(engine, meshFaceToScriptValue, meshFaceFromScriptValue);
+    // qScriptRegisterMetaType(engine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
 }
 
+MeshPointer ModelScriptingInterface::getMeshPointer(const scriptable::ScriptableMesh& meshProxy) {
+    return meshProxy._mesh;//getMeshPointer(&meshProxy);
+}
+MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMesh& meshProxy) {
+    return getMeshPointer(&meshProxy);
+}
 MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPointer meshProxy) {
     MeshPointer result;
     if (!meshProxy) {
         if (context()){
             context()->throwError("expected meshProxy as first parameter");
+        } else {
+            qDebug() << "expected meshProxy as first parameter";
         }
         return result;
     }
@@ -829,6 +414,8 @@ MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPo
     if (!mesh) {
         if (context()) {
             context()->throwError("expected valid meshProxy as first parameter");
+        } else {
+            qDebug() << "expected valid meshProxy as first parameter";
         }
         return result;
     }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
index d10fd28170..eac4df3216 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
@@ -38,30 +38,20 @@ public slots:
      */
     void getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName = QScriptValue());
 
-    bool dedupeVertices(scriptable::ScriptableMeshPointer meshProxy, float epsilon = 1e-6);
-    bool recalculateNormals(scriptable::ScriptableMeshPointer meshProxy);
-    QScriptValue cloneMesh(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals = true);
-    QScriptValue unrollVertices(scriptable::ScriptableMeshPointer meshProxy, bool recalcNormals = true);
-    QScriptValue mapAttributeValues(QScriptValue in,
-                                                QScriptValue scopeOrCallback,
-                                                QScriptValue methodOrName = QScriptValue());
-    QScriptValue mapMeshAttributeValues(scriptable::ScriptableMeshPointer meshProxy,
-                                                QScriptValue scopeOrCallback,
-                                                QScriptValue methodOrName = QScriptValue());
-
     QString meshToOBJ(const scriptable::ScriptableModel& in);
 
-    bool replaceMeshData(scriptable::ScriptableMeshPointer dest, scriptable::ScriptableMeshPointer source, const QVector<QString>& attributeNames = QVector<QString>());
     QScriptValue appendMeshes(scriptable::ScriptableModel in);
     QScriptValue transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform);
     QScriptValue newMesh(const QVector<glm::vec3>& vertices,
                                      const QVector<glm::vec3>& normals,
                                      const QVector<mesh::MeshFace>& faces);
     QScriptValue getVertexCount(scriptable::ScriptableMeshPointer meshProxy);
-    QScriptValue getVertex(scriptable::ScriptableMeshPointer meshProxy, mesh::uint32 vertexIndex);
+    QScriptValue getVertex(scriptable::ScriptableMeshPointer meshProxy, quint32 vertexIndex);
 
 private:
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
+    scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
+    scriptable::MeshPointer getMeshPointer(const scriptable::ScriptableMesh& meshProxy);
 
 };
 
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 47d91e9e59..1b16a6d263 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -14,14 +14,20 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/norm.hpp>
+#include <glm/gtx/string_cast.hpp>
 #include <graphics/Geometry.h>
 #include <graphics-scripting/DebugNames.h>
 #include <graphics-scripting/BufferViewHelpers.h>
+#include <graphics-scripting/BufferViewScripting.h>
 #include <Extents.h>
 
 #include "ScriptableMesh.moc"
 
 #include <RegisteredMetaTypes.h>
+#include <BaseScriptEngine.h>
+#include <QtScript/QScriptValue>
+
+#include "OBJWriter.h"
 
 QLoggingCategory mesh_logging { "hifi.scripting.mesh" };
 
@@ -41,10 +47,26 @@ QMap<QString,int> ScriptableMesh::ATTRIBUTES{
     {"texcoord4", gpu::Stream::TEXCOORD4 },
 };
 
-QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() const {
+
+QString scriptable::ScriptableModel::toString() const {
+    return QString("[ScriptableModel%1%2]")
+        .arg(objectID.isNull() ? "" : " objectID="+objectID.toString())
+        .arg(objectName().isEmpty() ? "" : " name=" +objectName());
+}
+
+const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
+    QVector<scriptable::ScriptableMeshPointer> out;
+    for(const auto& mesh : meshes) {
+        const scriptable::ScriptableMeshPointer m = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(const_cast<scriptable::ScriptableModel*>(this), mesh));
+        out << m;
+    }
+    return out;
+}
+QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
     QVector<scriptable::ScriptableMeshPointer> out;
     for(auto& mesh : meshes) {
-        out << scriptable::ScriptableMeshPointer(new ScriptableMesh(std::const_pointer_cast<scriptable::ScriptableModel>(this->shared_from_this()), mesh));
+        scriptable::ScriptableMeshPointer m{new scriptable::ScriptableMesh(this, mesh)};
+        out << m;
     }
     return out;
 }
@@ -134,15 +156,16 @@ QVariantMap ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
 }
 
 bool ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
-    qDebug()  << "setVertexAttributes" << vertexIndex << attributes;
+    //qDebug()  << "setVertexAttributes" << vertexIndex << attributes;
     for (auto& a : gatherBufferViews(getMeshPointer())) {
         const auto& name = a.first;
         const auto& value = attributes.value(name);
         if (value.isValid()) {
             auto& view = a.second;
+            //qCDebug(mesh_logging) << "setVertexAttributes" << vertexIndex << name;
             bufferViewElementFromVariant(view, vertexIndex, value);
         } else {
-            qCDebug(mesh_logging) << "setVertexAttributes" << vertexIndex << name;
+            //qCDebug(mesh_logging) << "(skipping) setVertexAttributes" << vertexIndex << name;
         }
     }
     return true;
@@ -357,3 +380,375 @@ std::map<QString, gpu::BufferView> ScriptableMesh::gatherBufferViews(scriptable:
     }
     return attributeViews;
 }
+
+QScriptValue ScriptableModel::mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName) {
+    auto context = scopeOrCallback.engine()->currentContext();
+    auto _in = context->thisObject();
+    qCInfo(mesh_logging) << "mapAttributeValues" << _in.toVariant().typeName() << _in.toVariant().toString() << _in.toQObject();
+    auto model = qscriptvalue_cast<scriptable::ScriptableModel>(_in);
+    QVector<scriptable::ScriptableMeshPointer> in = model.getMeshes();
+    if (in.size()) {
+        foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
+            meshProxy->mapAttributeValues(scopeOrCallback, methodOrName);
+        }
+        return _in;
+    } else if (auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(_in.toQObject())) {
+        return meshProxy->mapAttributeValues(scopeOrCallback, methodOrName);
+    } else {
+        context->throwError("invalid ModelProxy || MeshProxyPointer");
+    }
+    return false;
+}
+
+
+
+QScriptValue ScriptableMesh::mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName) {
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return false;
+    }
+    auto scopedHandler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+
+    // input buffers
+    gpu::BufferView positions = mesh->getVertexBuffer();
+
+    const auto nPositions = positions.getNumElements();
+
+    // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
+    auto scope = scopedHandler.property("scope");
+    auto callback = scopedHandler.property("callback");
+    auto js = engine(); // cache value to avoid resolving each iteration
+    auto meshPart = thisObject();//js->toScriptValue(meshProxy);
+
+    auto obj = js->newObject();
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" });
+    for (uint32_t i=0; i < nPositions; i++) {
+        for (const auto& a : attributeViews) {
+            bool asArray = a.second._element.getType() != gpu::FLOAT;
+            obj.setProperty(a.first, bufferViewElementToScriptValue(js, a.second, i, asArray, a.first.toStdString().c_str()));
+        }
+        auto result = callback.call(scope, { obj, i, meshPart });
+        if (js->hasUncaughtException()) {
+            context()->throwValue(js->uncaughtException());
+            return false;
+        }
+
+        if (result.isBool() && !result.toBool()) {
+            // bail without modifying data if user explicitly returns false
+            continue;
+        }
+        if (result.isObject() && !result.strictlyEquals(obj)) {
+            // user returned a new object (ie: instead of modifying input properties)
+            obj = result;
+        }
+
+        for (const auto& a : attributeViews) {
+            const auto& attribute = obj.property(a.first);
+            auto& view = a.second;
+            if (attribute.isValid()) {
+                bufferViewElementFromScriptValue(attribute, view, i);
+            }
+        }
+    }
+    return thisObject();
+}
+
+QScriptValue ScriptableMesh::unrollVertices(bool recalcNormals) {
+    auto meshProxy = this;
+    auto mesh = getMeshPointer();
+    qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices" << !!mesh<< !!meshProxy;
+    if (!mesh) {
+        return QScriptValue();
+    }
+
+    auto positions = mesh->getVertexBuffer();
+    auto indices = mesh->getIndexBuffer();
+    quint32 numPoints = (quint32)indices.getNumElements();
+    auto buffer = new gpu::Buffer();
+    buffer->resize(numPoints * sizeof(uint32_t));
+    auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
+    qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices numPoints" << numPoints;
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto sz = view._element.getSize();
+        auto buffer = new gpu::Buffer();
+        buffer->resize(numPoints * sz);
+        auto points = gpu::BufferView(buffer, view._element);
+        auto src = (uint8_t*)view._buffer->getData();
+        auto dest = (uint8_t*)points._buffer->getData();
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices buffer" << a.first;
+        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices source" << view.getNumElements();
+        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices dest" << points.getNumElements();
+        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices sz" << sz << src << dest << slot;
+        auto esize = indices._element.getSize();
+        const char* hint= a.first.toStdString().c_str();
+        for(quint32 i = 0; i < numPoints; i++) {
+            quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
+            newindices.edit<uint32_t>(i) = i;
+            bufferViewElementFromVariant(
+                points, i,
+                bufferViewElementToVariant(view, index, false, hint)
+                    );
+        }
+        if (slot == gpu::Stream::POSITION) {
+            mesh->setVertexBuffer(points);
+        } else {
+            mesh->addAttribute(slot, points);
+        }
+    }
+    mesh->setIndexBuffer(newindices);
+    if (recalcNormals) {
+        recalculateNormals();
+    }
+    return true;
+}
+
+bool ScriptableMesh::replaceMeshData(scriptable::ScriptableMeshPointer src, const QVector<QString>& attributeNames) {
+    auto target = getMeshPointer();
+    auto source = src ? src->getMeshPointer() : nullptr;
+    if (!target || !source) {
+        context()->throwError("ScriptableMesh::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
+        return false;
+    }
+
+    QVector<QString> attributes = attributeNames.isEmpty() ? src->getAttributeNames() : attributeNames;
+
+    //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData -- source:" << source->displayName << "target:" << target->displayName << "attributes:" << attributes;
+
+    // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
+    if (attributeNames.isEmpty()) {
+        auto attributeViews = ScriptableMesh::gatherBufferViews(target);
+        for (const auto& a : attributeViews) {
+            auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+            if (!attributes.contains(a.first)) {
+                //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
+                target->removeAttribute(slot);
+            }
+        }
+    }
+
+    target->setVertexBuffer(cloneBufferView(source->getVertexBuffer()));
+    target->setIndexBuffer(cloneBufferView(source->getIndexBuffer()));
+    target->setPartBuffer(cloneBufferView(source->getPartBuffer()));
+
+    for (const auto& a : attributes) {
+        auto slot = ScriptableMesh::ATTRIBUTES[a];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+        // auto& before = target->getAttributeBuffer(slot);
+        auto& input = source->getAttributeBuffer(slot);
+        if (input.getNumElements() == 0) {
+            //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData buffer is empty -- pruning" << a << slot;
+            target->removeAttribute(slot);
+        } else {
+            // if (before.getNumElements() == 0) {
+            //     qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData target buffer is empty -- adding" << a << slot;
+            // } else {
+            //     qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData target buffer exists -- updating" << a << slot;
+            // }
+            target->addAttribute(slot, cloneBufferView(input));
+        }
+        // auto& after = target->getAttributeBuffer(slot);
+        // qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
+    }
+
+
+    return true;
+}
+
+bool ScriptableMesh::dedupeVertices(float epsilon) {
+    scriptable::ScriptableMeshPointer meshProxy = this;
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return false;
+    }
+    auto positions = mesh->getVertexBuffer();
+    auto numPositions = positions.getNumElements();
+    const auto epsilon2 = epsilon*epsilon;
+
+    QVector<glm::vec3> uniqueVerts;
+    uniqueVerts.reserve((int)numPositions);
+    QMap<quint32,quint32> remapIndices;
+
+    for (quint32 i = 0; i < numPositions; i++) {
+        const quint32 numUnique = uniqueVerts.size();
+        const auto& position = positions.get<glm::vec3>(i);
+        bool unique = true;
+        for (quint32 j = 0; j < numUnique; j++) {
+            if (glm::length2(uniqueVerts[j] - position) <= epsilon2) {
+                remapIndices[i] = j;
+                unique = false;
+                break;
+            }
+        }
+        if (unique) {
+            uniqueVerts << position;
+            remapIndices[i] = numUnique;
+        }
+    }
+
+    qCInfo(mesh_logging) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
+
+    auto indices = mesh->getIndexBuffer();
+    auto numIndices = indices.getNumElements();
+    auto esize = indices._element.getSize();
+    QVector<quint32> newIndices;
+    newIndices.reserve((int)numIndices);
+    for (quint32 i = 0; i < numIndices; i++) {
+        quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
+        if (remapIndices.contains(index)) {
+            //qCInfo(mesh_logging) << i << index << "->" << remapIndices[index];
+            newIndices << remapIndices[index];
+        } else {
+            qCInfo(mesh_logging) << i << index << "!remapIndices[index]";
+        }
+    }
+
+    mesh->setIndexBuffer(bufferViewFromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
+    mesh->setVertexBuffer(bufferViewFromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
+
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    quint32 numUniqueVerts = uniqueVerts.size();
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+        qCInfo(mesh_logging) << "ScriptableMesh::dedupeVertices" << a.first << slot << view.getNumElements();
+        auto newView = resizedBufferView(view, numUniqueVerts);
+        qCInfo(mesh_logging) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
+        quint32 numElements = (quint32)view.getNumElements();
+        for (quint32 i = 0; i < numElements; i++) {
+            quint32 fromVertexIndex = i;
+            quint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
+            bufferViewElementFromVariant(
+                newView, toVertexIndex,
+                bufferViewElementToVariant(view, fromVertexIndex, false, "dedupe")
+                );
+        }
+        mesh->addAttribute(slot, newView);
+    }
+    return true;
+}
+
+QScriptValue ScriptableMesh::cloneMesh(bool recalcNormals) {
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return QScriptValue::NullValue;
+    }
+    graphics::MeshPointer clone(new graphics::Mesh());
+    clone->displayName = mesh->displayName + "-clone";
+    qCInfo(mesh_logging) << "ScriptableMesh::cloneMesh" << !!mesh;
+    if (!mesh) {
+        return QScriptValue::NullValue;
+    }
+
+    clone->setIndexBuffer(cloneBufferView(mesh->getIndexBuffer()));
+    clone->setPartBuffer(cloneBufferView(mesh->getPartBuffer()));
+    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices buffer" << a.first << slot;
+        auto points = cloneBufferView(view);
+        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices source" << view.getNumElements();
+        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices dest" << points.getNumElements();
+        if (slot == gpu::Stream::POSITION) {
+            clone->setVertexBuffer(points);
+        } else {
+            clone->addAttribute(slot, points);
+        }
+    }
+
+    auto result = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, clone));
+    if (recalcNormals) {
+        result->recalculateNormals();
+    }
+    return engine()->toScriptValue(result);
+}
+
+bool ScriptableMesh::recalculateNormals() {
+    scriptable::ScriptableMeshPointer meshProxy = this;
+    qCInfo(mesh_logging) << "Recalculating normals" << !!meshProxy;
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return false;
+    }
+    ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
+    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
+    auto verts = mesh->getVertexBuffer();
+    auto indices = mesh->getIndexBuffer();
+    auto esize = indices._element.getSize();
+    auto numPoints = indices.getNumElements();
+    const auto TRIANGLE = 3;
+    quint32 numFaces = (quint32)numPoints / TRIANGLE;
+    //QVector<Triangle> faces;
+    QVector<glm::vec3> faceNormals;
+    QMap<QString,QVector<quint32>> vertexToFaces;
+    //faces.resize(numFaces);
+    faceNormals.resize(numFaces);
+    auto numNormals = normals.getNumElements();
+    qCInfo(mesh_logging) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
+    if (normals.getNumElements() != verts.getNumElements()) {
+        return false;
+    }
+    for (quint32 i = 0; i < numFaces; i++) {
+        quint32 I = TRIANGLE * i;
+        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
+        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
+        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
+
+        Triangle face = {
+            verts.get<glm::vec3>(i1),
+            verts.get<glm::vec3>(i2),
+            verts.get<glm::vec3>(i0)
+        };
+        faceNormals[i] = face.getNormal();
+        if (glm::isnan(faceNormals[i].x)) {
+            qCInfo(mesh_logging) << i << i0 << i1 << i2 << vec3toVariant(face.v0) << vec3toVariant(face.v1) << vec3toVariant(face.v2);
+            break;
+        }
+        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
+    }
+    for (quint32 j = 0; j < numNormals; j++) {
+        //auto v = verts.get<glm::vec3>(j);
+        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
+        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
+        const auto& faces = vertexToFaces.value(key);
+        if (faces.size()) {
+            for (const auto i : faces) {
+                normal += faceNormals[i];
+            }
+            normal *= 1.0f / (float)faces.size();
+        } else {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(mesh_logging) << "no faces for key!?" << key;
+            }
+            normal = verts.get<glm::vec3>(j);
+        }
+        if (glm::isnan(normal.x)) {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(mesh_logging) << "isnan(normal.x)" << j << vec3toVariant(normal);
+            }
+            break;
+        }
+        normals.edit<glm::vec3>(j) = glm::normalize(normal);
+    }
+    return true;
+}
+
+QString ScriptableMesh::toOBJ() {
+    if (!getMeshPointer()) {
+        context()->throwError(QString("null mesh"));
+    }
+    return writeOBJToString({ getMeshPointer() });
+}
+
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index da11002906..257285fa90 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -6,12 +6,16 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <QtCore/QUuid>
+#include <QPointer>
 #include <memory>
 
 #include <DependencyManager.h>
 
 #include <graphics-scripting/ScriptableModel.h>
 
+#include <QtScript/QScriptable>
+#include <QtScript/QScriptValue>
+
 namespace graphics {
     class Mesh;
 }
@@ -19,91 +23,112 @@ namespace gpu {
     class BufferView;
 }
 namespace scriptable {
-    class ScriptableMesh : public QObject, public std::enable_shared_from_this<ScriptableMesh> {
+    class ScriptableMeshPart;
+    using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
+    class ScriptableMesh : public QObject, QScriptable {
         Q_OBJECT
     public:
-        ScriptableModelPointer _model;
-        scriptable::MeshPointer _mesh;
-        QVariantMap _metadata;
-    ScriptableMesh() : QObject() {}
-    ScriptableMesh(ScriptableModelPointer parent, scriptable::MeshPointer mesh) : QObject(), _model(parent), _mesh(mesh) {}
-    ScriptableMesh(const ScriptableMesh& other) : QObject(), _model(other._model), _mesh(other._mesh), _metadata(other._metadata) {}
-        ~ScriptableMesh() { qDebug() << "~ScriptableMesh" << this; }
         Q_PROPERTY(quint32 numParts READ getNumParts)
         Q_PROPERTY(quint32 numAttributes READ getNumAttributes)
         Q_PROPERTY(quint32 numVertices READ getNumVertices)
         Q_PROPERTY(quint32 numIndices READ getNumIndices)
+        Q_PROPERTY(QVariantMap metadata MEMBER _metadata)
         Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
 
-        virtual scriptable::MeshPointer getMeshPointer() const { return _mesh; }
-        Q_INVOKABLE virtual quint32 getNumParts() const;
-        Q_INVOKABLE virtual quint32 getNumVertices() const;
-        Q_INVOKABLE virtual quint32 getNumAttributes() const;
-        Q_INVOKABLE virtual quint32 getNumIndices() const { return 0;  }
-        Q_INVOKABLE virtual QVector<QString> getAttributeNames() const;
-        Q_INVOKABLE virtual QVariantMap getVertexAttributes(quint32 vertexIndex) const;
-        Q_INVOKABLE virtual QVariantMap getVertexAttributes(quint32 vertexIndex, QVector<QString> attributes) const;
-        
-        Q_INVOKABLE virtual QVector<quint32> getIndices() const;
-        Q_INVOKABLE virtual QVector<quint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
-        Q_INVOKABLE virtual QVariantMap getMeshExtents() const;
-        Q_INVOKABLE virtual bool setVertexAttributes(quint32 vertexIndex, QVariantMap attributes);
-        Q_INVOKABLE virtual QVariantMap scaleToFit(float unitScale);
+        static QMap<QString,int> ATTRIBUTES;
+        static std::map<QString, gpu::BufferView> gatherBufferViews(MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
 
-    static QMap<QString,int> ATTRIBUTES;
-    static std::map<QString, gpu::BufferView> gatherBufferViews(MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
+        ScriptableMesh& operator=(const ScriptableMesh& other)  { _model=other._model; _mesh=other._mesh; _metadata=other._metadata; return *this; };
+        ScriptableMesh() : QObject(), _model(nullptr) {}
+        ScriptableMesh(ScriptableModelPointer parent, scriptable::MeshPointer mesh) : QObject(), _model(parent), _mesh(mesh) {}
+        ScriptableMesh(const ScriptableMesh& other) : QObject(), _model(other._model), _mesh(other._mesh), _metadata(other._metadata) {}
+        ~ScriptableMesh() { qDebug() << "~ScriptableMesh" << this; }
 
-    Q_INVOKABLE QVariantList getAttributeValues(const QString& attributeName) const;
+        scriptable::MeshPointer getMeshPointer() const { return _mesh; }
+   public slots:
+        quint32 getNumParts() const;
+        quint32 getNumVertices() const;
+        quint32 getNumAttributes() const;
+        quint32 getNumIndices() const { return 0;  }
+        QVector<QString> getAttributeNames() const;
 
-    Q_INVOKABLE int _getSlotNumber(const QString& attributeName) const;
+        QVariantMap getVertexAttributes(quint32 vertexIndex) const;
+        QVariantMap getVertexAttributes(quint32 vertexIndex, QVector<QString> attributes) const;
 
-    QVariantMap translate(const glm::vec3& translation);
-    QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
-    QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
-    QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
-    Q_INVOKABLE QVariantMap transform(const glm::mat4& transform);
+        QVector<quint32> getIndices() const;
+        QVector<quint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
+        QVariantMap getMeshExtents() const;
+        bool setVertexAttributes(quint32 vertexIndex, QVariantMap attributes);
+        QVariantMap scaleToFit(float unitScale);
+
+        QVariantList getAttributeValues(const QString& attributeName) const;
+
+        int _getSlotNumber(const QString& attributeName) const;
+
+        QVariantMap translate(const glm::vec3& translation);
+        QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap transform(const glm::mat4& transform);
+
+    public:
+        operator bool() const { return _mesh != nullptr; }
+        ScriptableModelPointer _model;
+        scriptable::MeshPointer _mesh;
+        QVariantMap _metadata;
+
+    public slots:
+        // QScriptEngine-specific wrappers
+        QScriptValue mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName = QScriptValue());
+        bool dedupeVertices(float epsilon = 1e-6);
+        bool recalculateNormals();
+        QScriptValue cloneMesh(bool recalcNormals = true);
+        QScriptValue unrollVertices(bool recalcNormals = true);
+        bool replaceMeshData(scriptable::ScriptableMeshPointer source, const QVector<QString>& attributeNames = QVector<QString>());
+        QString toOBJ();
     };
 
-    // TODO: for now this is a part-specific wrapper around ScriptableMesh
-    class ScriptableMeshPart : public ScriptableMesh {
+    // TODO: part-specific wrapper for working with raw geometries
+    class ScriptableMeshPart : public QObject {
         Q_OBJECT
     public:
-        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { _model=view._model; _mesh=view._mesh; return *this; };
-        ScriptableMeshPart(const ScriptableMeshPart& other) : ScriptableMesh(other._model, other._mesh) {}
-        ScriptableMeshPart() : ScriptableMesh(nullptr, nullptr) {}
-        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
-        ScriptableMeshPart(ScriptableMeshPointer mesh) : ScriptableMesh(mesh->_model, mesh->_mesh) {}
         Q_PROPERTY(QString topology READ getTopology)
         Q_PROPERTY(quint32 numFaces READ getNumFaces)
 
-        scriptable::MeshPointer parentMesh;
-        int partIndex;
-        QString getTopology() const { return "triangles"; }         
-        Q_INVOKABLE virtual quint32 getNumFaces() const { return getIndices().size() / 3; }
-        Q_INVOKABLE virtual QVector<quint32> getFace(quint32 faceIndex) const {
-            auto inds = getIndices();
+        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
+        ScriptableMeshPart(const ScriptableMeshPart& other) : parentMesh(other.parentMesh) {}
+        ScriptableMeshPart()  {}
+        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
+
+    public slots:
+        QString getTopology() const { return "triangles"; }
+        quint32 getNumFaces() const { return parentMesh.getIndices().size() / 3; }
+        QVector<quint32> getFace(quint32 faceIndex) const {
+            auto inds = parentMesh.getIndices();
             return faceIndex+2 < (quint32)inds.size() ? inds.mid(faceIndex*3, 3) : QVector<quint32>();
         }
+
+    public:
+        scriptable::ScriptableMesh parentMesh;
+        int partIndex;
     };
 
     class GraphicsScriptingInterface : public QObject {
         Q_OBJECT
     public:
         GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent) {}
-    GraphicsScriptingInterface(const GraphicsScriptingInterface& other) {}
+        GraphicsScriptingInterface(const GraphicsScriptingInterface& other) {}
         public slots:
             ScriptableMeshPart exportMeshPart(ScriptableMesh mesh, int part) { return {}; }
-        
     };
 }
 
-Q_DECLARE_METATYPE(scriptable::ScriptableMesh)
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
-Q_DECLARE_METATYPE(scriptable::ScriptableMeshPart)
+Q_DECLARE_METATYPE(scriptable::ScriptableMeshPartPointer)
 Q_DECLARE_METATYPE(scriptable::GraphicsScriptingInterface)
 
-// FIXME: faces were supported in the original Model.* API -- are they still needed/used/useful for anything yet?
+// FIXME: MESHFACES: faces were supported in the original Model.* API -- are they still needed/used/useful for anything yet?
 #include <memory>
 
 namespace mesh {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index e8cf6f1656..4ba5a993b1 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -6,6 +6,7 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <QtCore/QUuid>
+#include <QPointer>
 #include <memory>
 
 #include <DependencyManager.h>
@@ -16,50 +17,53 @@ namespace graphics {
 namespace gpu {
     class BufferView;
 }
+class QScriptValue;
+
 namespace scriptable {
     using Mesh = graphics::Mesh;
     using MeshPointer = std::shared_ptr<scriptable::Mesh>;
 
     class ScriptableModel;
+    using ScriptableModelPointer = QPointer<ScriptableModel>;
     class ScriptableMesh;
-    class ScriptableMeshPart;
-    using ScriptableModelPointer = std::shared_ptr<scriptable::ScriptableModel>;
-    using ScriptableMeshPointer = std::shared_ptr<scriptable::ScriptableMesh>;
-    using ScriptableMeshPartPointer = std::shared_ptr<scriptable::ScriptableMeshPart>;
-    class ScriptableModel : public QObject, public std::enable_shared_from_this<ScriptableModel> {
+    using ScriptableMeshPointer = QPointer<ScriptableMesh>;
+
+    // abstract container for holding one or more scriptable meshes
+    class ScriptableModel : public QObject {
         Q_OBJECT
     public:
-        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
-
-        Q_INVOKABLE QString toString() { return "[ScriptableModel " + objectName()+"]"; }
-        ScriptableModel(QObject* parent = nullptr) : QObject(parent) {}
-        ScriptableModel(const ScriptableModel& other) : objectID(other.objectID), metadata(other.metadata), meshes(other.meshes)  {}
-        ScriptableModel& operator=(const ScriptableModel& view) {
-            objectID = view.objectID;
-            metadata = view.metadata;
-            meshes = view.meshes;
-            return *this;
-        }
-        ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
-        void mixin(const ScriptableModel& other) {
-            for (const auto& key : other.metadata.keys()) {
-                metadata[key] = other.metadata[key];
-            }
-            for(const auto&mesh : other.meshes) {
-                meshes << mesh;
-            }
-        }
         QUuid objectID;
         QVariantMap metadata;
         QVector<scriptable::MeshPointer> meshes;
-        // TODO: in future accessors for these could go here
-        QVariantMap shapes;
-        QVariantMap materials;
-        QVariantMap armature;
 
-        QVector<scriptable::ScriptableMeshPointer> getMeshes() const;
+        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
+        Q_PROPERTY(QUuid objectID MEMBER objectID CONSTANT)
+        Q_PROPERTY(QVariantMap metadata MEMBER metadata CONSTANT)
+        Q_INVOKABLE QString toString() const;
+
+        ScriptableModel(QObject* parent = nullptr) : QObject(parent) {}
+        ScriptableModel(const ScriptableModel& other) : objectID(other.objectID), metadata(other.metadata), meshes(other.meshes)  {}
+        ScriptableModel& operator=(const ScriptableModel& view) { objectID = view.objectID; metadata = view.metadata; meshes = view.meshes; return *this; }
+        ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
+
+        void mixin(const ScriptableModel& other) {
+            for (const auto& key : other.metadata.keys()) { metadata[key] = other.metadata[key]; }
+            for (const auto& mesh : other.meshes) { meshes << mesh; }
+        }
+
+        // TODO: in future accessors for these could go here
+        // QVariantMap shapes;
+        // QVariantMap materials;
+        // QVariantMap armature;
+
+        QVector<scriptable::ScriptableMeshPointer> getMeshes();
+        const QVector<scriptable::ScriptableMeshPointer> getConstMeshes() const;
+
+        // QScriptEngine-specific wrappers
+        Q_INVOKABLE QScriptValue mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName);
     };
 
+    // mixin class for Avatar/Entity/Overlay Rendering that expose their in-memory graphics::Meshes
     class ModelProvider {
     public:
         QVariantMap metadata;
@@ -67,11 +71,12 @@ namespace scriptable {
         virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) = 0;
     };
     using ModelProviderPointer = std::shared_ptr<scriptable::ModelProvider>;
+
+    // mixin class for Application to resolve UUIDs into a corresponding ModelProvider
     class ModelProviderFactory : public Dependency {
     public:
         virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) = 0;
     };
-        
 }
 
 Q_DECLARE_METATYPE(scriptable::MeshPointer)
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index d595136c56..ae5ac5d61c 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -579,38 +579,9 @@ scriptable::ScriptableModel Model::getScriptableModel(bool* ok) {
 
     if (!isLoaded()) {
         qDebug() << "Model::getScriptableModel -- !isLoaded";
-        if (ok) {
-            *ok = false;
-        }
-        return result;
+        return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
-// TODO: remove -- this was an earlier approach using renderGeometry instead of FBXGeometry
-#if 0 // renderGeometry approach
-    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
-    Transform offset;
-    offset.setScale(_scale);
-    offset.postTranslate(_offset);
-    glm::mat4 offsetMat = offset.getMatrix();
-
-    for (std::shared_ptr<const graphics::Mesh> mesh : meshes) {
-        if (!mesh) {
-            continue;
-        }
-        qDebug() << "Model::getScriptableModel #" << i++ << mesh->displayName;
-        auto newmesh = mesh->map(
-            [=](glm::vec3 position) {
-                return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
-            },
-            [=](glm::vec3 color) { return color; },
-            [=](glm::vec3 normal) {
-                return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
-            },
-            [&](uint32_t index) { return index; });
-        newmesh->displayName = mesh->displayName;
-        result << newmesh;
-    }
-#endif
     const FBXGeometry& geometry = getFBXGeometry();
     auto mat4toVariant = [](const glm::mat4& mat4) -> QVariant {
         QVector<float> floats;
@@ -659,6 +630,33 @@ scriptable::ScriptableModel Model::getScriptableModel(bool* ok) {
     qDebug() << "//Model::getScriptableModel -- #" << result.meshes.size();
     result.metadata["submeshes"] = submeshes;
     return result;
+
+// TODO: remove -- this was an earlier approach using renderGeometry instead of FBXGeometry
+#if 0 // renderGeometry approach
+    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
+    Transform offset;
+    offset.setScale(_scale);
+    offset.postTranslate(_offset);
+    glm::mat4 offsetMat = offset.getMatrix();
+
+    for (std::shared_ptr<const graphics::Mesh> mesh : meshes) {
+        if (!mesh) {
+            continue;
+        }
+        qDebug() << "Model::getScriptableModel #" << i++ << mesh->displayName;
+        auto newmesh = mesh->map(
+            [=](glm::vec3 position) {
+                return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
+            },
+            [=](glm::vec3 color) { return color; },
+            [=](glm::vec3 normal) {
+                return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
+            },
+            [&](uint32_t index) { return index; });
+        newmesh->displayName = mesh->displayName;
+        result << newmesh;
+    }
+#endif
 }
 
 void Model::calculateTriangleSets() {

From 736115b12d4dcaeb14af9bf16eadc3b80987a13b Mon Sep 17 00:00:00 2001
From: RebeccaStankus <RebeccaStankus@users.noreply.github.com>
Date: Fri, 9 Feb 2018 09:30:25 -0800
Subject: [PATCH 158/569] fixed QLabel include

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

diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp
index ece95aea38..26a5a24de8 100644
--- a/interface/src/ui/LogDialog.cpp
+++ b/interface/src/ui/LogDialog.cpp
@@ -15,7 +15,7 @@
 #include <QPushButton>
 #include <QComboBox>
 #include <QPlainTextEdit>
-#include <Qlabel>
+#include <QLabel>
 
 #include <shared/AbstractLoggerInterface.h>
 

From beb41495d5428c5d8aba3cc417f54b7481124ac8 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 9 Feb 2018 09:35:24 -0800
Subject: [PATCH 159/569] save avatarUrl when setting new skeletonModelUrl

---
 interface/src/avatar/MyAvatar.cpp | 13 +++++++++++++
 interface/src/avatar/MyAvatar.h   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index d2a9e798f8..ba4d48fd3f 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -959,6 +959,18 @@ void MyAvatar::restoreRoleAnimation(const QString& role) {
     _skeletonModel->getRig().restoreRoleAnimation(role);
 }
 
+void MyAvatar::saveAvatarUrl() {
+    Settings settings;
+    settings.beginGroup("Avatar");
+    if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) {
+        settings.setValue("fullAvatarURL",
+                          _fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?
+                          "" :
+                          _fullAvatarURLFromPreferences.toString());
+    }
+    settings.endGroup();
+}
+
 void MyAvatar::saveData() {
     Settings settings;
     settings.beginGroup("Avatar");
@@ -1452,6 +1464,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
+    saveAvatarUrl();
     emit skeletonChanged();
 
 }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 97e82b87f5..124902a1b1 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -646,6 +646,7 @@ private:
 
     void simulate(float deltaTime);
     void updateFromTrackers(float deltaTime);
+    void saveAvatarUrl();
     virtual void render(RenderArgs* renderArgs) override;
     virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
     void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }

From dbc4b1533d04d74fe6f5b29115b773dbced0352d Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Fri, 9 Feb 2018 10:12:32 -0800
Subject: [PATCH 160/569] Fixing build warnings in minipromises

---
 libraries/shared/src/shared/MiniPromises.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/shared/MiniPromises.h b/libraries/shared/src/shared/MiniPromises.h
index 5983f135b7..30b57ad7b8 100644
--- a/libraries/shared/src/shared/MiniPromises.h
+++ b/libraries/shared/src/shared/MiniPromises.h
@@ -103,7 +103,7 @@ public:
         return self();
     }
     Promise fail(ErrorFunction errorOnly) {
-        return fail([this, errorOnly](QString error, QVariantMap result) {
+        return fail([errorOnly](QString error, QVariantMap result) {
             errorOnly(error);
         });
     }
@@ -122,7 +122,7 @@ public:
     }
 
     Promise then(SuccessFunction successOnly) {
-        return then([this, successOnly](QString error, QVariantMap result) {
+        return then([successOnly](QString error, QVariantMap result) {
             successOnly(result);
         });
     }

From 7102cf44b87cd54fa328f030d768d225b212da95 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Fri, 9 Feb 2018 10:30:57 -0800
Subject: [PATCH 161/569] Fixing merge errors

---
 interface/src/Application.cpp            | 8 +++-----
 libraries/gpu-gles/src/gpu/gl/GLShared.h | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7ab1df2dac..15c1cfd60d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2427,10 +2427,6 @@ void Application::initializeUi() {
     }
 
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    DeadlockWatchdogThread::withPause([&] {
-        offscreenUi->create();
-    });
-
     connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
         this, &Application::onDesktopRootContextCreated);
     connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
@@ -2439,7 +2435,9 @@ void Application::initializeUi() {
     offscreenUi->setProxyWindow(_window->windowHandle());
     // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
     // support the window management and scripting proxies for VR use
-    offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
+    DeadlockWatchdogThread::withPause([&] {
+        offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
+    });
     // FIXME either expose so that dialogs can set this themselves or
     // do better detection in the offscreen UI of what has focus
     offscreenUi->setNavigationFocused(false);
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShared.h b/libraries/gpu-gles/src/gpu/gl/GLShared.h
index dcce896a37..1341dd16fa 100644
--- a/libraries/gpu-gles/src/gpu/gl/GLShared.h
+++ b/libraries/gpu-gles/src/gpu/gl/GLShared.h
@@ -9,11 +9,14 @@
 #define hifi_gpu_GLShared_h
 
 #include <gl/Config.h>
+#include <gl/GLHelpers.h>
+
 #include <gpu/Forward.h>
 #include <gpu/Format.h>
 #include <gpu/Context.h>
 #include <QLoggingCategory>
 
+
 Q_DECLARE_LOGGING_CATEGORY(gpugllogging)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl)
 Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl_detail)
@@ -143,8 +146,6 @@ struct ShaderObject;
 
 } } // namespace gpu::gl 
 
-#define CHECK_GL_ERROR() gpu::gl::checkGLErrorDebug(__FUNCTION__)
-
 #endif
 
 

From 7ee5245aebeb645c03e2849cd57a235aebb1d96c Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim@highfidelity.io>
Date: Fri, 9 Feb 2018 10:45:29 -0800
Subject: [PATCH 162/569] Added shadow caster flag to filter.

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

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index c5bdcf03dd..e34f550def 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -224,7 +224,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withShadowCaster();
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
@@ -398,7 +398,7 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask);
+        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withShadowCaster();
 
         // Set the keylight render args
         auto& cascade = globalShadow->getCascade(_cascadeIndex);

From e64c029424c6a7cc023e49452790268fe71210db Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Fri, 9 Feb 2018 11:32:29 -0800
Subject: [PATCH 163/569] fixing the scattering bad ambient lighting

---
 libraries/render-utils/src/LightAmbient.slh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/render-utils/src/LightAmbient.slh b/libraries/render-utils/src/LightAmbient.slh
index 0502446db8..3f52760eff 100644
--- a/libraries/render-utils/src/LightAmbient.slh
+++ b/libraries/render-utils/src/LightAmbient.slh
@@ -75,10 +75,10 @@ void evalLightingAmbient(out vec3 diffuse, out vec3 specular, LightAmbient ambie
     ) {
 
     // Rotate surface normal and eye direction
-    vec3 ambientSpaceSurfaceNormal = (ambient.transform * vec4(surface.normal,   0.0)).xyz;
-    vec3 ambientSpaceSurfaceEyeDir = (ambient.transform * vec4(surface.eyeDir,   0.0)).xyz;
+    vec3 ambientSpaceSurfaceNormal = (ambient.transform * vec4(surface.normal, 0.0)).xyz;
+    vec3 ambientSpaceSurfaceEyeDir = (ambient.transform * vec4(surface.eyeDir, 0.0)).xyz;
 <@if supportScattering@>
-    vec3 ambientSpaceLowNormalCurvature = (ambient.transform * lowNormalCurvature).xyz;
+    vec3 ambientSpaceLowNormal = (ambient.transform * vec4(lowNormalCurvature.xyz, 0.0)).xyz;
 <@endif@>
 
     vec3 ambientFresnel = fresnelSchlickAmbient(fresnelF0, surface.ndotv, 1.0-surface.roughness);
@@ -99,7 +99,7 @@ void evalLightingAmbient(out vec3 diffuse, out vec3 specular, LightAmbient ambie
         obscurance = min(obscurance, ambientOcclusion);
 
         // Diffuse from ambient
-        diffuse = sphericalHarmonics_evalSphericalLight(getLightAmbientSphere(ambient), ambientSpaceLowNormalCurvature).xyz;
+        diffuse = sphericalHarmonics_evalSphericalLight(getLightAmbientSphere(ambient), ambientSpaceLowNormal).xyz;
 
         // Scattering ambient specular is the same as non scattering for now
         // TODO: we should use the same specular answer as for direct lighting

From 87f77b625784aac995379f76654b4b9e4c450317 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 22 Jan 2018 18:12:12 -0800
Subject: [PATCH 164/569] Asset Server Backup

---
 assignment-client/src/assets/AssetServer.cpp  |  58 ++-
 assignment-client/src/assets/AssetServer.h    |  20 +-
 .../src/assets/SendAssetTask.cpp              |   6 +-
 .../src/assets/UploadAssetTask.cpp            |  12 +-
 domain-server/src/BackupSupervisor.cpp        | 409 ++++++++++++++++++
 domain-server/src/BackupSupervisor.h          |  86 ++++
 domain-server/src/DomainServer.cpp            |  19 +-
 domain-server/src/DomainServer.h              |   5 +
 libraries/networking/src/AssetClient.cpp      |  22 +-
 libraries/networking/src/AssetUtils.h         |   7 +-
 libraries/networking/src/DomainHandler.h      |   2 +-
 libraries/networking/src/LimitedNodeList.cpp  |  32 +-
 libraries/networking/src/LimitedNodeList.h    |   4 +
 libraries/networking/src/MappingRequest.cpp   |   3 -
 libraries/networking/src/MappingRequest.h     |   8 +-
 libraries/networking/src/NodeList.h           |   4 +
 libraries/networking/src/PacketReceiver.cpp   | 112 ++---
 libraries/networking/src/udt/PacketHeaders.h  |  11 +
 18 files changed, 677 insertions(+), 143 deletions(-)
 create mode 100644 domain-server/src/BackupSupervisor.cpp
 create mode 100644 domain-server/src/BackupSupervisor.h

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 0a868737b0..1ae65290ff 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -464,32 +464,41 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
     auto replyPacket = NLPacketList::create(PacketType::AssetMappingOperationReply, QByteArray(), true, true);
     replyPacket->writePrimitive(messageID);
 
+    bool canWriteToAssetServer = true;
+    if (senderNode) {
+        canWriteToAssetServer = senderNode->getCanWriteToAssetServer();
+    }
+
     switch (operationType) {
         case AssetMappingOperationType::Get:
-            handleGetMappingOperation(*message, senderNode, *replyPacket);
+            handleGetMappingOperation(*message, *replyPacket);
             break;
         case AssetMappingOperationType::GetAll:
-            handleGetAllMappingOperation(*message, senderNode, *replyPacket);
+            handleGetAllMappingOperation(*replyPacket);
             break;
         case AssetMappingOperationType::Set:
-            handleSetMappingOperation(*message, senderNode, *replyPacket);
+            handleSetMappingOperation(*message, canWriteToAssetServer, *replyPacket);
             break;
         case AssetMappingOperationType::Delete:
-            handleDeleteMappingsOperation(*message, senderNode, *replyPacket);
+            handleDeleteMappingsOperation(*message, canWriteToAssetServer, *replyPacket);
             break;
         case AssetMappingOperationType::Rename:
-            handleRenameMappingOperation(*message, senderNode, *replyPacket);
+            handleRenameMappingOperation(*message, canWriteToAssetServer, *replyPacket);
             break;
         case AssetMappingOperationType::SetBakingEnabled:
-            handleSetBakingEnabledOperation(*message, senderNode, *replyPacket);
+            handleSetBakingEnabledOperation(*message, canWriteToAssetServer, *replyPacket);
             break;
     }
 
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->sendPacketList(std::move(replyPacket), *senderNode);
+    if (senderNode) {
+        nodeList->sendPacketList(std::move(replyPacket), *senderNode);
+    } else {
+        nodeList->sendPacketList(std::move(replyPacket), message->getSenderSockAddr());
+    }
 }
 
-void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+void AssetServer::handleGetMappingOperation(ReceivedMessage& message, NLPacketList& replyPacket) {
     QString assetPath = message.readString();
 
     QUrl url { assetPath };
@@ -568,7 +577,7 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
     }
 }
 
-void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+void AssetServer::handleGetAllMappingOperation(NLPacketList& replyPacket) {
     replyPacket.writePrimitive(AssetUtils::AssetServerError::NoError);
 
     uint32_t count = (uint32_t)_fileMappings.size();
@@ -591,8 +600,8 @@ void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedN
     }
 }
 
-void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
-    if (senderNode->getCanWriteToAssetServer()) {
+void AssetServer::handleSetMappingOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket) {
+    if (hasWriteAccess) {
         QString assetPath = message.readString();
 
         auto assetHash = message.read(AssetUtils::SHA256_HASH_LENGTH).toHex();
@@ -614,8 +623,8 @@ void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNode
     }
 }
 
-void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
-    if (senderNode->getCanWriteToAssetServer()) {
+void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket) {
+    if (hasWriteAccess) {
         int numberOfDeletedMappings { 0 };
         message.readPrimitive(&numberOfDeletedMappings);
 
@@ -642,8 +651,8 @@ void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, Shared
     }
 }
 
-void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
-    if (senderNode->getCanWriteToAssetServer()) {
+void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket) {
+    if (hasWriteAccess) {
         QString oldPath = message.readString();
         QString newPath = message.readString();
 
@@ -664,8 +673,8 @@ void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, SharedN
     }
 }
 
-void AssetServer::handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
-    if (senderNode->getCanWriteToAssetServer()) {
+void AssetServer::handleSetBakingEnabledOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket) {
+    if (hasWriteAccess) {
         bool enabled { true };
         message.readPrimitive(&enabled);
 
@@ -739,9 +748,14 @@ void AssetServer::handleAssetGet(QSharedPointer<ReceivedMessage> message, Shared
 }
 
 void AssetServer::handleAssetUpload(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
+    bool canWriteToAssetServer = true;
+    if (senderNode) {
+        canWriteToAssetServer = senderNode->getCanWriteToAssetServer();
+    }
 
-    if (senderNode->getCanWriteToAssetServer()) {
-        qCDebug(asset_server) << "Starting an UploadAssetTask for upload from" << uuidStringWithoutCurlyBraces(senderNode->getUUID());
+
+    if (canWriteToAssetServer) {
+        qCDebug(asset_server) << "Starting an UploadAssetTask for upload from" << uuidStringWithoutCurlyBraces(message->getSourceID());
 
         auto task = new UploadAssetTask(message, senderNode, _filesDirectory, _filesizeLimit);
         _transferTaskPool.start(task);
@@ -761,7 +775,11 @@ void AssetServer::handleAssetUpload(QSharedPointer<ReceivedMessage> message, Sha
 
         // send off the packet
         auto nodeList = DependencyManager::get<NodeList>();
-        nodeList->sendPacket(std::move(permissionErrorPacket), *senderNode);
+        if (senderNode) {
+            nodeList->sendPacket(std::move(permissionErrorPacket), *senderNode);
+        } else {
+            nodeList->sendPacket(std::move(permissionErrorPacket), message->getSenderSockAddr());
+        }
     }
 }
 
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index 5e7a3c1700..c6336a3a4d 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -29,9 +29,6 @@ namespace std {
 }
 
 struct AssetMeta {
-    AssetMeta() {
-    }
-
     int bakeVersion { 0 };
     bool failedLastBake { false };
     QString lastBakeErrors;
@@ -60,14 +57,15 @@ private slots:
     void sendStatsPacket() override;
 
 private:
-    using Mappings = std::unordered_map<QString, QString>;
+    void handleGetMappingOperation(ReceivedMessage& message, NLPacketList& replyPacket);
+    void handleGetAllMappingOperation(NLPacketList& replyPacket);
+    void handleSetMappingOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket);
+    void handleDeleteMappingsOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket);
+    void handleRenameMappingOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket);
+    void handleSetBakingEnabledOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket);
 
-    void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
-    void handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
-    void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
-    void handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
-    void handleRenameMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
-    void handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleAssetServerBackup(ReceivedMessage& message, NLPacketList& replyPacket);
+    void handleAssetServerRestore(ReceivedMessage& message, NLPacketList& replyPacket);
 
     // Mapping file operations must be called from main assignment thread only
     bool loadMappingsFromFile();
@@ -111,7 +109,7 @@ private:
     /// Remove baked paths when the original asset is deleteds
     void removeBakedPathsForDeletedAsset(AssetUtils::AssetHash originalAssetHash);
 
-    Mappings _fileMappings;
+    AssetUtils::Mappings _fileMappings;
 
     QDir _resourcesDirectory;
     QDir _filesDirectory;
diff --git a/assignment-client/src/assets/SendAssetTask.cpp b/assignment-client/src/assets/SendAssetTask.cpp
index 6da092357f..d17d254afd 100644
--- a/assignment-client/src/assets/SendAssetTask.cpp
+++ b/assignment-client/src/assets/SendAssetTask.cpp
@@ -112,5 +112,9 @@ void SendAssetTask::run() {
     }
 
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->sendPacketList(std::move(replyPacketList), *_senderNode);
+    if (_senderNode) {
+        nodeList->sendPacketList(std::move(replyPacketList), *_senderNode);
+    } else {
+        nodeList->sendPacketList(std::move(replyPacketList), _message->getSenderSockAddr());
+    }
 }
diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp
index 68bf4db5fd..f2ba431875 100644
--- a/assignment-client/src/assets/UploadAssetTask.cpp
+++ b/assignment-client/src/assets/UploadAssetTask.cpp
@@ -42,8 +42,7 @@ void UploadAssetTask::run() {
     uint64_t fileSize;
     buffer.read(reinterpret_cast<char*>(&fileSize), sizeof(fileSize));
     
-    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from"
-        << uuidStringWithoutCurlyBraces(_senderNode->getUUID());
+    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes.";
     
     auto replyPacket = NLPacket::create(PacketType::AssetUploadReply, -1, true);
     replyPacket->writePrimitive(messageID);
@@ -56,8 +55,7 @@ void UploadAssetTask::run() {
         auto hash = AssetUtils::hashData(fileData);
         auto hexHash = hash.toHex();
         
-        qDebug() << "Hash for uploaded file from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID())
-            << "is: (" << hexHash << ") ";
+        qDebug() << "Hash for uploaded file is: (" << hexHash << ") ";
         
         QFile file { _resourcesDir.filePath(QString(hexHash)) };
 
@@ -103,5 +101,9 @@ void UploadAssetTask::run() {
     }
     
     auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->sendPacket(std::move(replyPacket), *_senderNode);
+    if (_senderNode) {
+        nodeList->sendPacket(std::move(replyPacket), *_senderNode);
+    } else {
+        nodeList->sendPacket(std::move(replyPacket), _receivedMessage->getSenderSockAddr());
+    }
 }
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
new file mode 100644
index 0000000000..829208913f
--- /dev/null
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -0,0 +1,409 @@
+//
+//  BackupSupervisor.cpp
+//  assignment-client/src
+//
+//  Created by Clement Brisset on 1/12/18.
+//  Copyright 2018 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 "BackupSupervisor.h"
+
+#include <QJsonDocument>
+#include <QDate>
+
+#include <AssetClient.h>
+#include <AssetRequest.h>
+#include <AssetUpload.h>
+#include <MappingRequest.h>
+#include <PathUtils.h>
+
+const QString BACKUPS_DIR = "backups/";
+const QString ASSETS_DIR = "files/";
+const QString MAPPINGS_PREFIX = "mappings-";
+
+using namespace std;
+
+BackupSupervisor::BackupSupervisor() {
+    _backupsDirectory = PathUtils::getAppDataPath() + BACKUPS_DIR;
+    QDir backupDir { _backupsDirectory };
+    if (!backupDir.exists()) {
+        backupDir.mkpath(".");
+    }
+
+    _assetsDirectory = PathUtils::getAppDataPath() + BACKUPS_DIR + ASSETS_DIR;
+    QDir assetsDir { _assetsDirectory };
+    if (!assetsDir.exists()) {
+        assetsDir.mkpath(".");
+    }
+
+    loadAllBackups();
+}
+
+void BackupSupervisor::loadAllBackups() {
+    _backups.clear();
+    _assetsInBackups.clear();
+    _assetsOnDisk.clear();
+    _allBackupsLoadedSuccessfully = true;
+
+    QDir assetsDir { _assetsDirectory };
+    auto assetNames = assetsDir.entryList(QDir::Files);
+    qDebug() << "Loading" << assetNames.size() << "assets.";
+
+    // store all valid hashes
+    copy_if(begin(assetNames), end(assetNames),
+            inserter(_assetsOnDisk, begin(_assetsOnDisk)), AssetUtils::isValidHash);
+
+    QDir backupsDir { _backupsDirectory };
+    auto files = backupsDir.entryList({ MAPPINGS_PREFIX + "*.json" }, QDir::Files);
+    qDebug() << "Loading" << files.size() << "backups.";
+
+    for (const auto& fileName : files) {
+        auto filePath = backupsDir.filePath(fileName);
+        auto success = loadBackup(filePath);
+        if (!success) {
+            qCritical() << "Failed to load backup file" << filePath;
+            _allBackupsLoadedSuccessfully = false;
+        }
+    }
+
+    vector<AssetUtils::AssetHash> missingAssets;
+    set_difference(begin(_assetsInBackups), end(_assetsInBackups),
+                   begin(_assetsOnDisk), end(_assetsOnDisk),
+                   back_inserter(missingAssets));
+    if (missingAssets.size() > 0) {
+        qWarning() << "Found" << missingAssets.size() << "assets missing.";
+    }
+
+    vector<AssetUtils::AssetHash> deprecatedAssets;
+    set_difference(begin(_assetsOnDisk), end(_assetsOnDisk),
+                   begin(_assetsInBackups), end(_assetsInBackups),
+                   back_inserter(deprecatedAssets));
+
+    if (deprecatedAssets.size() > 0) {
+        qDebug() << "Found" << deprecatedAssets.size() << "assets to delete.";
+        if (_allBackupsLoadedSuccessfully) {
+            for (const auto& hash : deprecatedAssets) {
+                QFile::remove(_assetsDirectory + hash);
+            }
+        } else {
+            qWarning() << "Some backups did not load properly, aborting deleting for safety.";
+        }
+    }
+}
+
+bool BackupSupervisor::loadBackup(const QString& backupFile) {
+    _backups.push_back({ backupFile.toStdString(), {}, false });
+    auto& backup = _backups.back();
+
+    QFile file { backupFile };
+    if (!file.open(QFile::ReadOnly)) {
+        qCritical() << "Could not open backup file:" << backupFile;
+        backup.corruptedBackup = true;
+        return false;
+    }
+    QJsonParseError error;
+    auto document = QJsonDocument::fromJson(file.readAll(), &error);
+    if (document.isNull()) {
+        qCritical() << "Could not parse backup file:" << backupFile;
+        qCritical() << "    Error:" << error.errorString();
+        backup.corruptedBackup = true;
+        return false;
+    }
+
+    if (!document.isObject()) {
+        qCritical() << "Backup file corrupted" << backupFile;
+        backup.corruptedBackup = true;
+        return false;
+    }
+
+    auto jsonObject = document.object();
+    for (auto it = begin(jsonObject); it != end(jsonObject); ++it) {
+        if (!it.value().isString()) {
+            qCritical() << "Corrupted mapping in backup file" << backupFile << ":" << it.key();
+            backup.corruptedBackup = true;
+            return false;
+        }
+        const auto& assetPath = it.key();
+        const auto& assetHash = it.value().toString();
+
+        backup.mappings[assetPath] = assetHash;
+        _assetsInBackups.insert(assetHash);
+    }
+
+    _backups.push_back(backup);
+    return true;
+}
+
+void BackupSupervisor::backupAssetServer() {
+    if (backupInProgress() || restoreInProgress()) {
+        qWarning() << "There is already a backup/restore in progress.";
+        return;
+    }
+
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetAllMappingsRequest();
+
+    connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) {
+        qDebug() << "Got" << request->getMappings().size() << "mappings!";
+
+        if (request->getError() != MappingRequest::NoError) {
+            qCritical() << "Could not complete backup.";
+            qCritical() << "    Error:" << request->getErrorString();
+            finishBackup();
+            request->deleteLater();
+            return;
+        }
+
+        if (!writeBackupFile(request->getMappings())) {
+            finishBackup();
+            request->deleteLater();
+            return;
+        }
+
+        assert(!_backups.empty());
+        const auto& mappings = _backups.back().mappings;
+        backupMissingFiles(mappings);
+
+        request->deleteLater();
+    });
+
+    startBackup();
+    qDebug() << "Requesting mappings for backup!";
+    request->start();
+}
+
+void BackupSupervisor::backupMissingFiles(const AssetUtils::Mappings& mappings) {
+    _assetsLeftToRequest.reserve(mappings.size());
+    for (auto& mapping : mappings) {
+        const auto& hash = mapping.second;
+        if (_assetsOnDisk.find(hash) == end(_assetsOnDisk)) {
+            _assetsLeftToRequest.push_back(hash);
+        }
+    }
+
+    backupNextMissingFile();
+}
+
+void BackupSupervisor::backupNextMissingFile() {
+    if (_assetsLeftToRequest.empty()) {
+        finishBackup();
+        return;
+    }
+
+    auto hash = _assetsLeftToRequest.back();
+    _assetsLeftToRequest.pop_back();
+
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto assetRequest = assetClient->createRequest(hash);
+
+    connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) {
+        if (request->getError() == AssetRequest::NoError) {
+            qDebug() << "Got" << request->getHash();
+
+            bool success = writeAssetFile(request->getHash(),request->getData());
+            if (!success) {
+                qCritical() << "Failed to write asset file" << request->getHash();
+            }
+        } else {
+            qCritical() << "Failed to backup asset" << request->getHash();
+        }
+
+        backupNextMissingFile();
+
+        request->deleteLater();
+    });
+
+    assetRequest->start();
+}
+
+bool BackupSupervisor::writeBackupFile(const AssetUtils::AssetMappings& mappings) {
+    auto filename = MAPPINGS_PREFIX + QDateTime::currentDateTimeUtc().toString(Qt::ISODate) + ".json";
+    QFile file { PathUtils::getAppDataPath() + BACKUPS_DIR + filename };
+    if (!file.open(QFile::WriteOnly)) {
+        qCritical() << "Could not open backup file" << file.fileName();
+        return false;
+    }
+
+    AssetServerBackup backup;
+    QJsonObject jsonObject;
+    for (auto& mapping : mappings) {
+        backup.mappings[mapping.first] = mapping.second.hash;
+        _assetsInBackups.insert(mapping.second.hash);
+        jsonObject.insert(mapping.first, mapping.second.hash);
+    }
+
+    QJsonDocument document(jsonObject);
+    file.write(document.toJson());
+
+    backup.filePath = file.fileName().toStdString();
+    _backups.push_back(backup);
+
+    return true;
+}
+
+bool BackupSupervisor::writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data) {
+    QDir assetsDir { _assetsDirectory };
+    QFile file { assetsDir.filePath(hash) };
+    if (!file.open(QFile::WriteOnly)) {
+        qCritical() << "Could not open backup file" << file.fileName();
+        return false;
+    }
+
+    file.write(data);
+
+    _assetsOnDisk.insert(hash);
+
+    return true;
+}
+
+void BackupSupervisor::restoreAssetServer(int backupIndex) {
+    if (backupInProgress() || restoreInProgress()) {
+        qWarning() << "There is already a backup/restore in progress.";
+        return;
+    }
+
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetAllMappingsRequest();
+
+    connect(request, &GetAllMappingsRequest::finished, this, [this, backupIndex](GetAllMappingsRequest* request) {
+        qDebug() << "Got" << request->getMappings().size() << "mappings!";
+
+        if (request->getError() == MappingRequest::NoError) {
+            const auto& newMappings = _backups.at(backupIndex).mappings;
+            computeServerStateDifference(request->getMappings(), newMappings);
+
+            restoreAllAssets();
+        } else {
+            finishRestore();
+        }
+
+        request->deleteLater();
+    });
+
+    startRestore();
+    qDebug() << "Requesting mappings for restore!";
+    request->start();
+}
+
+void BackupSupervisor::computeServerStateDifference(const AssetUtils::AssetMappings& currentMappings,
+                                                    const AssetUtils::Mappings& newMappings) {
+    _mappingsLeftToSet.reserve((int)newMappings.size());
+    _assetsLeftToUpload.reserve((int)newMappings.size());
+    _mappingsLeftToDelete.reserve((int)currentMappings.size());
+
+    set<AssetUtils::AssetHash> currentAssets;
+    for (const auto& currentMapping : currentMappings) {
+        const auto& currentPath = currentMapping.first;
+        const auto& currentHash = currentMapping.second.hash;
+
+        if (newMappings.find(currentPath) == end(newMappings)) {
+            _mappingsLeftToDelete.push_back(currentPath);
+        }
+        currentAssets.insert(currentHash);
+    }
+
+    for (const auto& newMapping : newMappings) {
+        const auto& newPath = newMapping.first;
+        const auto& newHash = newMapping.second;
+
+        auto it = currentMappings.find(newPath);
+        if (it == end(currentMappings) || it->second.hash != newHash) {
+            _mappingsLeftToSet.push_back({ newPath, newHash });
+        }
+        if (currentAssets.find(newHash) == end(currentAssets)) {
+            _assetsLeftToUpload.push_back(newHash);
+        }
+    }
+
+    qDebug() << "Mappings to set:" << _mappingsLeftToSet.size();
+    qDebug() << "Mappings to del:" << _mappingsLeftToDelete.size();
+    qDebug() << "Assets to upload:" << _assetsLeftToUpload.size();
+}
+
+void BackupSupervisor::restoreAllAssets() {
+    restoreNextAsset();
+}
+
+void BackupSupervisor::restoreNextAsset() {
+    if (_assetsLeftToUpload.empty()) {
+        updateMappings();
+        return;
+    }
+
+    auto hash = _assetsLeftToUpload.back();
+    _assetsLeftToUpload.pop_back();
+
+    auto assetFilename = _assetsDirectory + hash;
+
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createUpload(assetFilename);
+
+    connect(request, &AssetUpload::finished, this, [this](AssetUpload* request) {
+        if (request->getError() != AssetUpload::NoError) {
+            qCritical() << "Failed to restore asset:" << request->getFilename();
+            qCritical() << "    Error:" << request->getErrorString();
+        }
+
+        restoreNextAsset();
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void BackupSupervisor::updateMappings() {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    for (const auto& mapping : _mappingsLeftToSet) {
+        auto request = assetClient->createSetMappingRequest(mapping.first, mapping.second);
+        connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) {
+            if (request->getError() != MappingRequest::NoError) {
+                qCritical() << "Failed to set mapping:" << request->getPath();
+                qCritical() << "    Error:" << request->getErrorString();
+            }
+
+            if (--_mappingRequestsInFlight == 0) {
+                finishRestore();
+            }
+
+            request->deleteLater();
+        });
+
+        request->start();
+        ++_mappingRequestsInFlight;
+    }
+    _mappingsLeftToSet.clear();
+
+    auto request = assetClient->createDeleteMappingsRequest(_mappingsLeftToDelete);
+    connect(request, &DeleteMappingsRequest::finished, this, [this](DeleteMappingsRequest* request) {
+        if (request->getError() != MappingRequest::NoError) {
+            qCritical() << "Failed to delete mappings";
+            qCritical() << "    Error:" << request->getErrorString();
+        }
+
+        if (--_mappingRequestsInFlight == 0) {
+            finishRestore();
+        }
+
+        request->deleteLater();
+    });
+    _mappingsLeftToDelete.clear();
+
+    request->start();
+    ++_mappingRequestsInFlight;
+}
+bool BackupSupervisor::deleteBackup(int backupIndex) {
+    if (backupInProgress() || restoreInProgress()) {
+        qWarning() << "There is a backup/restore in progress.";
+        return false;
+    }
+    const auto& filePath = _backups.at(backupIndex).filePath;
+    auto success = QFile::remove(filePath.c_str());
+
+    loadAllBackups();
+
+    return success;
+}
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
new file mode 100644
index 0000000000..a4129fca12
--- /dev/null
+++ b/domain-server/src/BackupSupervisor.h
@@ -0,0 +1,86 @@
+//
+//  BackupSupervisor.h
+//  assignment-client/src
+//
+//  Created by Clement Brisset on 1/12/18.
+//  Copyright 2018 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_BackupSupervisor_h
+#define hifi_BackupSupervisor_h
+
+#include <set>
+#include <map>
+
+#include <QObject>
+
+#include <AssetUtils.h>
+
+#include <ReceivedMessage.h>
+
+struct AssetServerBackup {
+    std::string filePath;
+    AssetUtils::Mappings mappings;
+    bool corruptedBackup;
+};
+
+class BackupSupervisor : public QObject {
+    Q_OBJECT
+
+public:
+    BackupSupervisor();
+
+    void backupAssetServer();
+    void restoreAssetServer(int backupIndex);
+    bool deleteBackup(int backupIndex);
+
+    const std::vector<AssetServerBackup>& getBackups() const { return _backups; };
+
+    bool backupInProgress() const { return _backupInProgress; }
+    bool restoreInProgress() const { return _restoreInProgress; }
+
+private:
+    void loadAllBackups();
+    bool loadBackup(const QString& backupFile);
+
+    void startBackup() { _backupInProgress = true; }
+    void finishBackup() { _backupInProgress = false; }
+    void backupMissingFiles(const AssetUtils::Mappings& mappings);
+    void backupNextMissingFile();
+    bool writeBackupFile(const AssetUtils::AssetMappings& mappings);
+    bool writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data);
+
+
+    void startRestore() { _restoreInProgress = true; }
+    void finishRestore() { _restoreInProgress = false; }
+    void computeServerStateDifference(const AssetUtils::AssetMappings& currentMappings,
+                                      const AssetUtils::Mappings& newMappings);
+    void restoreAllAssets();
+    void restoreNextAsset();
+    void updateMappings();
+
+    QString _backupsDirectory;
+    QString _assetsDirectory;
+
+    // Internal storage for backups on disk
+    bool _allBackupsLoadedSuccessfully { false };
+    std::vector<AssetServerBackup> _backups;
+    std::set<AssetUtils::AssetHash> _assetsInBackups;
+    std::set<AssetUtils::AssetHash> _assetsOnDisk;
+
+    // Internal storage for backup in progress
+    bool _backupInProgress { false };
+    std::vector<AssetUtils::AssetHash> _assetsLeftToRequest;
+
+    // Internal storage for restor in progress
+    bool _restoreInProgress { false };
+    std::vector<AssetUtils::AssetHash> _assetsLeftToUpload;
+    std::vector<std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash>> _mappingsLeftToSet;
+    AssetUtils::AssetPathList _mappingsLeftToDelete;
+    int _mappingRequestsInFlight { 0 };
+};
+
+#endif /* hifi_BackupSupervisor_h */
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 22273ae85f..65053b7366 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -26,6 +26,7 @@
 #include <QCommandLineParser>
 
 #include <AccountManager.h>
+#include <AssetClient.h>
 #include <BuildInfo.h>
 #include <DependencyManager.h>
 #include <HifiConfigVariantMap.h>
@@ -343,6 +344,12 @@ void DomainServer::parseCommandLine() {
 
 DomainServer::~DomainServer() {
     qInfo() << "Domain Server is shutting down.";
+
+    // cleanup the AssetClient thread
+    DependencyManager::destroy<AssetClient>();
+    _assetClientThread.quit();
+    _assetClientThread.wait();
+
     // destroy the LimitedNodeList before the DomainServer QCoreApplication is down
     DependencyManager::destroy<LimitedNodeList>();
 }
@@ -684,11 +691,17 @@ void DomainServer::setupNodeListAndAssignments() {
     packetReceiver.registerListener(PacketType::ICEServerHeartbeatDenied, this, "processICEServerHeartbeatDenialPacket");
     packetReceiver.registerListener(PacketType::ICEServerHeartbeatACK, this, "processICEServerHeartbeatACK");
 
-    // add whatever static assignments that have been parsed to the queue
-    addStaticAssignmentsToQueue();
-
     // set a custom packetVersionMatch as the verify packet operator for the udt::Socket
     nodeList->setPacketFilterOperator(&DomainServer::isPacketVerified);
+
+    _assetClientThread.setObjectName("AssetClient Thread");
+    auto assetClient = DependencyManager::set<AssetClient>();
+    assetClient->moveToThread(&_assetClientThread);
+    QObject::connect(&_assetClientThread, &QThread::started, assetClient.data(), &AssetClient::init);
+    _assetClientThread.start();
+
+    // add whatever static assignments that have been parsed to the queue
+    addStaticAssignmentsToQueue();
 }
 
 bool DomainServer::resetAccountManagerAccessToken() {
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index b45b8a4816..f84a47d457 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -18,6 +18,7 @@
 #include <QtCore/QQueue>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QStringList>
+#include <QtCore/QThread>
 #include <QtCore/QUrl>
 #include <QAbstractNativeEventFilter>
 
@@ -25,6 +26,7 @@
 #include <HTTPSConnection.h>
 #include <LimitedNodeList.h>
 
+#include "BackupSupervisor.h"
 #include "DomainGatekeeper.h"
 #include "DomainMetadata.h"
 #include "DomainServerSettingsManager.h"
@@ -251,6 +253,9 @@ private:
     bool _sendICEServerAddressToMetaverseAPIRedo { false };
 
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
+    BackupSupervisor _backupSupervisor;
+
+    QThread _assetClientThread;
 };
 
 
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index 1db93e8cb9..41d988eca4 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -40,7 +40,7 @@ AssetClient::AssetClient() {
         static_cast<AssetClient*>(dependency)->deleteLater();
     });
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();
 
     packetReceiver.registerListener(PacketType::AssetMappingOperationReply, this, "handleAssetMappingOperationReply");
@@ -308,7 +308,7 @@ void AssetClient::handleAssetMappingOperationReply(QSharedPointer<ReceivedMessag
 }
 
 bool haveAssetServer() {
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (!assetServer) {
@@ -402,7 +402,7 @@ MessageID AssetClient::getAsset(const QString& hash, AssetUtils::DataOffset star
         return false;
     }
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -435,7 +435,7 @@ MessageID AssetClient::getAsset(const QString& hash, AssetUtils::DataOffset star
 MessageID AssetClient::getAssetInfo(const QString& hash, GetInfoCallback callback) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -635,7 +635,7 @@ void AssetClient::handleCompleteCallback(const QWeakPointer<Node>& node, Message
 MessageID AssetClient::getAssetMapping(const AssetUtils::AssetPath& path, MappingOperationCallback callback) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -662,7 +662,7 @@ MessageID AssetClient::getAssetMapping(const AssetUtils::AssetPath& path, Mappin
 MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -685,7 +685,7 @@ MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {
 }
 
 MessageID AssetClient::deleteAssetMappings(const AssetUtils::AssetPathList& paths, MappingOperationCallback callback) {
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -716,7 +716,7 @@ MessageID AssetClient::deleteAssetMappings(const AssetUtils::AssetPathList& path
 MessageID AssetClient::setAssetMapping(const QString& path, const AssetUtils::AssetHash& hash, MappingOperationCallback callback) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -742,7 +742,7 @@ MessageID AssetClient::setAssetMapping(const QString& path, const AssetUtils::As
 }
 
 MessageID AssetClient::renameAssetMapping(const AssetUtils::AssetPath& oldPath, const AssetUtils::AssetPath& newPath, MappingOperationCallback callback) {
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -769,7 +769,7 @@ MessageID AssetClient::renameAssetMapping(const AssetUtils::AssetPath& oldPath,
 }
 
 MessageID AssetClient::setBakingEnabled(const AssetUtils::AssetPathList& paths, bool enabled, MappingOperationCallback callback) {
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
@@ -859,7 +859,7 @@ bool AssetClient::cancelUploadAssetRequest(MessageID id) {
 MessageID AssetClient::uploadAsset(const QByteArray& data, UploadResultCallback callback) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    auto nodeList = DependencyManager::get<NodeList>();
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h
index 42e8dfad62..6c84417aae 100644
--- a/libraries/networking/src/AssetUtils.h
+++ b/libraries/networking/src/AssetUtils.h
@@ -44,7 +44,9 @@ enum AssetServerError : uint8_t {
     AssetTooLarge,
     PermissionDenied,
     MappingOperationFailed,
-    FileOperationFailed
+    FileOperationFailed,
+    NoAssetServer,
+    LostConnection
 };
 
 enum AssetMappingOperationType : uint8_t {
@@ -71,7 +73,8 @@ struct MappingInfo {
     QString bakingErrors;
 };
 
-using AssetMapping = std::map<AssetPath, MappingInfo>;
+using AssetMappings = std::map<AssetPath, MappingInfo>;
+using Mappings = std::map<AssetPath, AssetHash>;
 
 QUrl getATPUrl(const QString& input);
 AssetHash extractAssetHash(const QString& input);
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index b72c172c3e..78f9798089 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -49,7 +49,7 @@ public:
     const QHostAddress& getIP() const { return _sockAddr.getAddress(); }
     void setIPToLocalhost() { _sockAddr.setAddress(QHostAddress(QHostAddress::LocalHost)); }
 
-    const HifiSockAddr& getSockAddr() { return _sockAddr; }
+    const HifiSockAddr& getSockAddr() const { return _sockAddr; }
     void setSockAddr(const HifiSockAddr& sockAddr, const QString& hostname);
 
     unsigned short getPort() const { return _sockAddr.getPort(); }
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 0950cb5556..2343695914 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -90,21 +90,16 @@ LimitedNodeList::LimitedNodeList(int socketListenPort, int dtlsListenPort) :
     updateLocalSocket();
 
     // set &PacketReceiver::handleVerifiedPacket as the verified packet callback for the udt::Socket
-    _nodeSocket.setPacketHandler(
-        [this](std::unique_ptr<udt::Packet> packet) {
+    _nodeSocket.setPacketHandler([this](std::unique_ptr<udt::Packet> packet) {
             _packetReceiver->handleVerifiedPacket(std::move(packet));
-        }
-    );
-    _nodeSocket.setMessageHandler(
-        [this](std::unique_ptr<udt::Packet> packet) {
+    });
+    _nodeSocket.setMessageHandler([this](std::unique_ptr<udt::Packet> packet) {
             _packetReceiver->handleVerifiedMessagePacket(std::move(packet));
-        }
-    );
-    _nodeSocket.setMessageFailureHandler(
-        [this](HifiSockAddr from, udt::Packet::MessageNumber messageNumber) {
+    });
+    _nodeSocket.setMessageFailureHandler([this](HifiSockAddr from,
+                                                udt::Packet::MessageNumber messageNumber) {
             _packetReceiver->handleMessageFailure(from, messageNumber);
-        }
-    );
+    });
 
     // set our isPacketVerified method as the verify operator for the udt::Socket
     using std::placeholders::_1;
@@ -309,8 +304,19 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
             sourceNode = matchingNode.data();
         }
 
+        if (!sourceNode &&
+            sourceID == getDomainUUID() &&
+            packet.getSenderSockAddr() == getDomainSockAddr() &&
+            PacketTypeEnum::getDomainSourcedPackets().contains(headerType)) {
+            // This is a packet sourced by the domain server
+
+            emit dataReceived(NodeType::Unassigned, packet.getPayloadSize());
+            return true;
+        }
+
         if (sourceNode) {
-            if (!PacketTypeEnum::getNonVerifiedPackets().contains(headerType)) {
+            if (!PacketTypeEnum::getNonVerifiedPackets().contains(headerType) &&
+                !isDomainServer()) {
 
                 QByteArray packetHeaderHash = NLPacket::verificationHashInHeader(packet);
                 QByteArray expectedHash = NLPacket::hashForPacketAndSecret(packet, sourceNode->getConnectionSecret());
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index e21f01a470..1b1c809279 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -124,6 +124,10 @@ public:
 
     PacketReceiver& getPacketReceiver() { return *_packetReceiver; }
 
+    virtual bool isDomainServer() const { return true; }
+    virtual QUuid getDomainUUID() const { assert(false); return QUuid(); }
+    virtual HifiSockAddr getDomainSockAddr() const { assert(false); return HifiSockAddr(); }
+
     // use sendUnreliablePacket to send an unrelaible packet (that you do not need to move)
     // either to a node (via its active socket) or to a manual sockaddr
     qint64 sendUnreliablePacket(const NLPacket& packet, const Node& destinationNode);
diff --git a/libraries/networking/src/MappingRequest.cpp b/libraries/networking/src/MappingRequest.cpp
index 07639d4994..96f4b63c59 100644
--- a/libraries/networking/src/MappingRequest.cpp
+++ b/libraries/networking/src/MappingRequest.cpp
@@ -106,9 +106,6 @@ void GetMappingRequest::doStart() {
     });
 };
 
-GetAllMappingsRequest::GetAllMappingsRequest() {
-};
-
 void GetAllMappingsRequest::doStart() {
     auto assetClient = DependencyManager::get<AssetClient>();
     _mappingRequestID = assetClient->getAllAssetMappings(
diff --git a/libraries/networking/src/MappingRequest.h b/libraries/networking/src/MappingRequest.h
index 5286849dd1..6af8552c1e 100644
--- a/libraries/networking/src/MappingRequest.h
+++ b/libraries/networking/src/MappingRequest.h
@@ -120,17 +120,15 @@ private:
 class GetAllMappingsRequest : public MappingRequest {
     Q_OBJECT
 public:
-    GetAllMappingsRequest();
-
-    AssetUtils::AssetMapping getMappings() const { return _mappings;  }
+    AssetUtils::AssetMappings getMappings() const { return _mappings;  }
 
 signals:
     void finished(GetAllMappingsRequest* thisRequest);
 
 private:
     virtual void doStart() override;
-    
-    AssetUtils::AssetMapping _mappings;
+
+    AssetUtils::AssetMappings _mappings;
 };
 
 class SetBakingEnabledRequest : public MappingRequest {
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 2dd9d3c869..a49cb7c3f5 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -92,6 +92,10 @@ public:
 
     void removeFromIgnoreMuteSets(const QUuid& nodeID);
 
+    virtual bool isDomainServer() const override { return false; }
+    virtual QUuid getDomainUUID() const override { return _domainHandler.getUUID(); }
+    virtual HifiSockAddr getDomainSockAddr() const override { return _domainHandler.getSockAddr(); }
+
 public slots:
     void reset(bool skipDomainHandlerReset = false);
     void resetFromDomainHandler() { reset(true); }
diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp
index 556e55beb2..0834a55148 100644
--- a/libraries/networking/src/PacketReceiver.cpp
+++ b/libraries/networking/src/PacketReceiver.cpp
@@ -267,10 +267,7 @@ void PacketReceiver::handleVerifiedMessage(QSharedPointer<ReceivedMessage> recei
     
     QMutexLocker packetListenerLocker(&_packetListenerLock);
     
-    bool listenerIsDead = false;
-    
     auto it = _messageListenerMap.find(receivedMessage->getType());
-            
     if (it != _messageListenerMap.end() && it->method.isValid()) {
          
         auto listener = it.value();
@@ -278,82 +275,61 @@ void PacketReceiver::handleVerifiedMessage(QSharedPointer<ReceivedMessage> recei
         if ((listener.deliverPending && !justReceived) || (!listener.deliverPending && !receivedMessage->isComplete())) {
             return;
         }
-    
-        if (listener.object) {
             
-            bool success = false;
+        bool success = false;
 
-            Qt::ConnectionType connectionType;
-            // check if this is a directly connected listener
-            {
-                QMutexLocker directConnectLocker(&_directConnectSetMutex);
- 
-                connectionType = _directlyConnectedObjects.contains(listener.object) ? Qt::DirectConnection : Qt::AutoConnection;
-            }
-            
-            PacketType packetType = receivedMessage->getType();
-            
-            if (matchingNode) {
-                matchingNode->recordBytesReceived(receivedMessage->getSize());
-
-                QMetaMethod metaMethod = listener.method;
-                
-                static const QByteArray QSHAREDPOINTER_NODE_NORMALIZED = QMetaObject::normalizedType("QSharedPointer<Node>");
-                static const QByteArray SHARED_NODE_NORMALIZED = QMetaObject::normalizedType("SharedNodePointer");
-                
-                // one final check on the QPointer before we go to invoke
-                if (listener.object) {
-                    if (metaMethod.parameterTypes().contains(SHARED_NODE_NORMALIZED)) {
-                        success = metaMethod.invoke(listener.object,
-                                                    connectionType,
-                                                    Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage),
-                                                    Q_ARG(SharedNodePointer, matchingNode));
-                        
-                    } else if (metaMethod.parameterTypes().contains(QSHAREDPOINTER_NODE_NORMALIZED)) {
-                        success = metaMethod.invoke(listener.object,
-                                                    connectionType,
-                                                    Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage),
-                                                    Q_ARG(QSharedPointer<Node>, matchingNode));
-                        
-                    } else {
-                        success = metaMethod.invoke(listener.object,
-                                                    connectionType,
-                                                    Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage));
-                    }
-                } else {
-                    listenerIsDead = true;
-                }
-            } else {
-                // one final check on the QPointer before we invoke
-                if (listener.object) {
-                    success = listener.method.invoke(listener.object,
-                                                     Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage));
-                } else {
-                    listenerIsDead = true;
-                }
-                
-            }
-            
-            if (!success) {
-                qCDebug(networking).nospace() << "Error delivering packet " << packetType << " to listener "
-                    << listener.object << "::" << qPrintable(listener.method.methodSignature());
-            }
-            
-        } else {
-            listenerIsDead = true;
+        Qt::ConnectionType connectionType;
+        // check if this is a directly connected listener
+        {
+            QMutexLocker directConnectLocker(&_directConnectSetMutex);
+            connectionType = _directlyConnectedObjects.contains(listener.object) ? Qt::DirectConnection : Qt::AutoConnection;
         }
-        
-        if (listenerIsDead) {
+
+        if (matchingNode) {
+            matchingNode->recordBytesReceived(receivedMessage->getSize());
+        }
+
+        QMetaMethod metaMethod = listener.method;
+
+        static const QByteArray QSHAREDPOINTER_NODE_NORMALIZED = QMetaObject::normalizedType("QSharedPointer<Node>");
+        static const QByteArray SHARED_NODE_NORMALIZED = QMetaObject::normalizedType("SharedNodePointer");
+
+        // one final check on the QPointer before we go to invoke
+        if (listener.object) {
+            if (metaMethod.parameterTypes().contains(SHARED_NODE_NORMALIZED)) {
+                success = metaMethod.invoke(listener.object,
+                                            connectionType,
+                                            Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage),
+                                            Q_ARG(SharedNodePointer, matchingNode));
+
+            } else if (metaMethod.parameterTypes().contains(QSHAREDPOINTER_NODE_NORMALIZED)) {
+                success = metaMethod.invoke(listener.object,
+                                            connectionType,
+                                            Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage),
+                                            Q_ARG(QSharedPointer<Node>, matchingNode));
+
+            } else {
+                success = metaMethod.invoke(listener.object,
+                                            connectionType,
+                                            Q_ARG(QSharedPointer<ReceivedMessage>, receivedMessage));
+            }
+        } else {
             qCDebug(networking).nospace() << "Listener for packet " << receivedMessage->getType()
-                << " has been destroyed. Removing from listener map.";
+            << " has been destroyed. Removing from listener map.";
             it = _messageListenerMap.erase(it);
-            
+
             // if it exists, remove the listener from _directlyConnectedObjects
             {
                 QMutexLocker directConnectLocker(&_directConnectSetMutex);
                 _directlyConnectedObjects.remove(listener.object);
             }
         }
+
+        if (!success) {
+            qCDebug(networking).nospace() << "Error delivering packet " << receivedMessage->getType() << " to listener "
+                << listener.object << "::" << qPrintable(listener.method.methodSignature());
+        }
+
     } else if (it == _messageListenerMap.end()) {
         qCWarning(networking) << "No listener found for packet type" << receivedMessage->getType();
         
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index d186ed41c3..5757cea496 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -177,6 +177,17 @@ public:
             << PacketTypeEnum::Value::ReplicatedKillAvatar << PacketTypeEnum::Value::ReplicatedBulkAvatarData;
         return NON_SOURCED_PACKETS;
     }
+
+    const static QSet<PacketTypeEnum::Value> getDomainSourcedPackets() {
+        const static QSet<PacketTypeEnum::Value> DOMAIN_SOURCED_PACKETS = QSet<PacketTypeEnum::Value>()
+        << PacketTypeEnum::Value::AssetMappingOperation
+        << PacketTypeEnum::Value::AssetMappingOperationReply
+        << PacketTypeEnum::Value::AssetGet
+        << PacketTypeEnum::Value::AssetGetReply
+        << PacketTypeEnum::Value::AssetUpload
+        << PacketTypeEnum::Value::AssetUploadReply;
+        return DOMAIN_SOURCED_PACKETS;
+    }
 };
 
 using PacketType = PacketTypeEnum::Value;

From 46449256ce26b905f145e214f23e16d0d580cdff Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 9 Feb 2018 11:32:54 -0800
Subject: [PATCH 165/569] CR

---
 .../src/assets/UploadAssetTask.cpp            | 16 +++++++++++----
 domain-server/src/BackupSupervisor.cpp        | 20 +++++++------------
 domain-server/src/BackupSupervisor.h          |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp
index f2ba431875..d3e755212a 100644
--- a/assignment-client/src/assets/UploadAssetTask.cpp
+++ b/assignment-client/src/assets/UploadAssetTask.cpp
@@ -41,8 +41,12 @@ void UploadAssetTask::run() {
     
     uint64_t fileSize;
     buffer.read(reinterpret_cast<char*>(&fileSize), sizeof(fileSize));
-    
-    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes.";
+
+    if (_senderNode) {
+        qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID());
+    } else {
+        qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from" << _receivedMessage->getSenderSockAddr();
+    }
     
     auto replyPacket = NLPacket::create(PacketType::AssetUploadReply, -1, true);
     replyPacket->writePrimitive(messageID);
@@ -54,8 +58,12 @@ void UploadAssetTask::run() {
         
         auto hash = AssetUtils::hashData(fileData);
         auto hexHash = hash.toHex();
-        
-        qDebug() << "Hash for uploaded file is: (" << hexHash << ") ";
+
+        if (_senderNode) {
+            qDebug() << "Hash for uploaded file from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID()) << "is: (" << hexHash << ")";
+        } else {
+            qDebug() << "Hash for uploaded file from" << _receivedMessage->getSenderSockAddr() << "is: (" << hexHash << ")";
+        }
         
         QFile file { _resourcesDir.filePath(QString(hexHash)) };
 
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 829208913f..1bf1e9e199 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -1,6 +1,6 @@
 //
 //  BackupSupervisor.cpp
-//  assignment-client/src
+//  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
 //  Copyright 2018 High Fidelity, Inc.
@@ -106,28 +106,22 @@ bool BackupSupervisor::loadBackup(const QString& backupFile) {
     }
     QJsonParseError error;
     auto document = QJsonDocument::fromJson(file.readAll(), &error);
-    if (document.isNull()) {
-        qCritical() << "Could not parse backup file:" << backupFile;
-        qCritical() << "    Error:" << error.errorString();
-        backup.corruptedBackup = true;
-        return false;
-    }
-
-    if (!document.isObject()) {
-        qCritical() << "Backup file corrupted" << backupFile;
+    if (document.isNull() || !document.isObject()) {
+        qCritical() << "Could not parse backup file to JSON object:" << backupFile;
         backup.corruptedBackup = true;
         return false;
     }
 
     auto jsonObject = document.object();
     for (auto it = begin(jsonObject); it != end(jsonObject); ++it) {
-        if (!it.value().isString()) {
+        const auto& assetPath = it.key();
+        const auto& assetHash = it.value().toString();
+
+        if (!AssetUtils::isValidHash(assetHash)) {
             qCritical() << "Corrupted mapping in backup file" << backupFile << ":" << it.key();
             backup.corruptedBackup = true;
             return false;
         }
-        const auto& assetPath = it.key();
-        const auto& assetHash = it.value().toString();
 
         backup.mappings[assetPath] = assetHash;
         _assetsInBackups.insert(assetHash);
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index a4129fca12..f01e389c39 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -1,6 +1,6 @@
 //
 //  BackupSupervisor.h
-//  assignment-client/src
+//  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
 //  Copyright 2018 High Fidelity, Inc.

From 2fc954909bf8b721f5aecbfa26aa37494da6409a Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Tue, 23 Jan 2018 14:41:46 -0500
Subject: [PATCH 166/569] [Case 4315] Fixes black color preview for color
 pickers (details below).

The original/starting color preview in the picker was black as opposed to
reflecting the entity's color upon clicking the color picker.

Known Issue(s)/TODO(s):

* Color preview restore color functionality isn't working.
    * Clicking the initial color preview doesn't restore the color.
    * The original color preview isn't being visually retained when the user
      changes the color via the picker.

Tested HMD & Desktop Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
---
 scripts/system/html/js/entityProperties.js | 94 +++++++++++++++++-----
 1 file changed, 74 insertions(+), 20 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7008d0df66..be9bba5f0d 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -29,7 +29,7 @@ var ICON_FOR_TYPE = {
 
 var EDITOR_TIMEOUT_DURATION = 1500;
 var KEY_P = 80; // Key code for letter p used for Parenting hotkey.
-var colorPickers = [];
+var colorPickers = {};
 var lastEntityID = null;
 
 function debugPrint(message) {
@@ -69,8 +69,8 @@ function enableProperties() {
 function disableProperties() {
     disableChildren(document.getElementById("properties-list"), "input, textarea, checkbox, .dropdown dl, .color-picker");
     disableChildren(document, ".colpick");
-    for (var i = 0; i < colorPickers.length; i++) {
-        colorPickers[i].colpickHide();
+    for (var pickKey in colorPickers) {
+        colorPickers[pickKey].colpickHide();
     }
     var elLocked = document.getElementById("property-locked");
 
@@ -83,7 +83,6 @@ function disableProperties() {
 function showElements(els, show) {
     for (var i = 0; i < els.length; i++) {
         els[i].style.display = (show) ? 'table' : 'none';
-
     }
 }
 
@@ -1304,13 +1303,19 @@ function loaded() {
         elColorRed.addEventListener('change', colorChangeFunction);
         elColorGreen.addEventListener('change', colorChangeFunction);
         elColorBlue.addEventListener('change', colorChangeFunction);
-        colorPickers.push($('#property-color-control2').colpick({
+        colorPickers['#property-color-control2'] = $('#property-color-control2').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-color-control2').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-color-control2'].colpickSetColor({ 
+                    "r": elColorRed.value, 
+                    "g": elColorGreen.value, 
+                    "b": elColorBlue.value});
             },
             onHide: function(colpick) {
                 $('#property-color-control2').attr('active', 'false');
@@ -1319,7 +1324,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
-        }));
+        });
 
         elLightSpotLight.addEventListener('change', createEmitCheckedPropertyUpdateFunction('isSpotlight'));
 
@@ -1328,13 +1333,20 @@ function loaded() {
         elLightColorRed.addEventListener('change', lightColorChangeFunction);
         elLightColorGreen.addEventListener('change', lightColorChangeFunction);
         elLightColorBlue.addEventListener('change', lightColorChangeFunction);
-        colorPickers.push($('#property-light-color').colpick({
+        colorPickers['#property-light-color'] = $('#property-light-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-light-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-light-color'].colpickSetColor({
+                    "r": elLightColorRed.value,
+                    "g": elLightColorGreen.value,
+                    "b": elLightColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-light-color').attr('active', 'false');
@@ -1343,7 +1355,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
             }
-        }));
+        });
 
         elLightIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('intensity', 1));
         elLightFalloffRadius.addEventListener('change', createEmitNumberPropertyUpdateFunction('falloffRadius', 1));
@@ -1383,13 +1395,20 @@ function loaded() {
         elTextTextColorRed.addEventListener('change', textTextColorChangeFunction);
         elTextTextColorGreen.addEventListener('change', textTextColorChangeFunction);
         elTextTextColorBlue.addEventListener('change', textTextColorChangeFunction);
-        colorPickers.push($('#property-text-text-color').colpick({
+        colorPickers['#property-text-text-color'] = $('#property-text-text-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-text-text-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-text-text-color'].colpickSetColor({
+                    "r": elTextTextColorRed.value,
+                    "g": elTextTextColorGreen.value,
+                    "b": elTextTextColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-text-text-color').attr('active', 'false');
@@ -1399,7 +1418,7 @@ function loaded() {
                 $(el).attr('active', 'false');
                 emitColorPropertyUpdate('textColor', rgb.r, rgb.g, rgb.b);
             }
-        }));
+        });
 
         var textBackgroundColorChangeFunction = createEmitColorPropertyUpdateFunction(
             'backgroundColor', elTextBackgroundColorRed, elTextBackgroundColorGreen, elTextBackgroundColorBlue);
@@ -1407,13 +1426,20 @@ function loaded() {
         elTextBackgroundColorRed.addEventListener('change', textBackgroundColorChangeFunction);
         elTextBackgroundColorGreen.addEventListener('change', textBackgroundColorChangeFunction);
         elTextBackgroundColorBlue.addEventListener('change', textBackgroundColorChangeFunction);
-        colorPickers.push($('#property-text-background-color').colpick({
+        colorPickers['#property-text-background-color'] = $('#property-text-background-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-text-background-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-text-background-color'].colpickSetColor({
+                    "r": elTextBackgroundColorRed.value,
+                    "g": elTextBackgroundColorGreen.value,
+                    "b": elTextBackgroundColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-text-background-color').attr('active', 'false');
@@ -1422,7 +1448,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('backgroundColor', rgb.r, rgb.g, rgb.b);
             }
-        }));
+        });
 
         // Key light
         var keyLightModeChanged = createZoneComponentModeChangedFunction('keyLightMode',
@@ -1432,13 +1458,20 @@ function loaded() {
         elZoneKeyLightModeDisabled.addEventListener('change', keyLightModeChanged);
         elZoneKeyLightModeEnabled.addEventListener('change', keyLightModeChanged);
 
-        colorPickers.push($('#property-zone-key-light-color').colpick({
+        colorPickers['#property-zone-key-light-color'] = $('#property-zone-key-light-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-zone-key-light-color'].colpickSetColor({
+                    "r": elZoneKeyLightColorRed.value,
+                    "g": elZoneKeyLightColorGreen.value,
+                    "b": elZoneKeyLightColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-zone-key-light-color').attr('active', 'false');
@@ -1447,7 +1480,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
             }
-        }));
+        });
         var zoneKeyLightColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('keyLight', 'color', 
             elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
 
@@ -1501,13 +1534,20 @@ function loaded() {
 
         elZoneHazeRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeRange'));
 
-        colorPickers.push($('#property-zone-haze-color').colpick({
+        colorPickers['#property-zone-haze-color'] = $('#property-zone-haze-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-zone-haze-color'].colpickSetColor({
+                    "r": elZoneHazeColorRed.value,
+                    "g": elZoneHazeColorGreen.value,
+                    "b": elZoneHazeColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-color').attr('active', 'false');
@@ -1516,7 +1556,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('hazeColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
-        }));
+        });
         var zoneHazeColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('haze', 'hazeColor', 
             elZoneHazeColorRed, 
             elZoneHazeColorGreen, 
@@ -1526,13 +1566,20 @@ function loaded() {
         elZoneHazeColorGreen.addEventListener('change', zoneHazeColorChangeFunction);
         elZoneHazeColorBlue.addEventListener('change', zoneHazeColorChangeFunction);
 
-        colorPickers.push($('#property-zone-haze-glare-color').colpick({
+        colorPickers['#property-zone-haze-glare-color'] = $('#property-zone-haze-glare-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-zone-haze-glare-color'].colpickSetColor({
+                    "r": elZoneHazeGlareColorRed.value,
+                    "g": elZoneHazeGlareColorGreen.value,
+                    "b": elZoneHazeGlareColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-zone-haze-glare-color').attr('active', 'false');
@@ -1541,7 +1588,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('hazeGlareColor', rgb.r, rgb.g, rgb.b, 'haze');
             }
-        }));
+        });
         var zoneHazeGlareColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('haze', 'hazeGlareColor', 
             elZoneHazeGlareColorRed, 
             elZoneHazeGlareColorGreen, 
@@ -1568,13 +1615,20 @@ function loaded() {
         elZoneSkyboxColorRed.addEventListener('change', zoneSkyboxColorChangeFunction);
         elZoneSkyboxColorGreen.addEventListener('change', zoneSkyboxColorChangeFunction);
         elZoneSkyboxColorBlue.addEventListener('change', zoneSkyboxColorChangeFunction);
-        colorPickers.push($('#property-zone-skybox-color').colpick({
+        colorPickers['#property-zone-skybox-color'] = $('#property-zone-skybox-color').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             submit: false, // We don't want to have a submission button
             onShow: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'true');
+                // The original color preview within the picker needs to be updated on show because
+                // prior to the picker being shown we don't have access to the selections' starting color.
+                colorPickers['#property-zone-skybox-color'].colpickSetColor({
+                    "r": elZoneSkyboxColorRed.value,
+                    "g": elZoneSkyboxColorGreen.value,
+                    "b": elZoneSkyboxColorBlue.value
+                });
             },
             onHide: function(colpick) {
                 $('#property-zone-skybox-color').attr('active', 'false');
@@ -1583,7 +1637,7 @@ function loaded() {
                 $(el).css('background-color', '#' + hex);
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox');
             }
-        }));
+        });
 
         elZoneSkyboxURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('skybox', 'url'));
 

From 6c5961820ca208f7e1396f555e9a3681281ba1fa Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Tue, 23 Jan 2018 15:12:53 -0500
Subject: [PATCH 167/569] [Case 4315] Fixes Color Picker preview restore
 functionality (details below).

* The original color preview is now visually retained when the user
  changes the color via the picker when using the Non-Submit configuration (No OK button).
* Clicking the initial old color preview section restores the original/initial color of
  the object.

Tested Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/css/colpick.css
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/css/colpick.css | 8 ++++----
 scripts/system/html/js/colpick.js   | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/css/colpick.css b/scripts/system/html/css/colpick.css
index 98417a5e9a..fc50c4b3fb 100644
--- a/scripts/system/html/css/colpick.css
+++ b/scripts/system/html/css/colpick.css
@@ -279,7 +279,7 @@ colpick Color Picker / colpick.com
 }
 
 /*full layout with no submit button*/
-.colpick_full_ns  .colpick_submit, .colpick_full_ns .colpick_current_color{
+.colpick_full_ns  .colpick_submit {
 	display:none;
 }
 .colpick_full_ns .colpick_new_color {
@@ -320,11 +320,11 @@ colpick Color Picker / colpick.com
 }
 
 /*rgbhex layout, no submit button*/
-.colpick_rgbhex_ns  .colpick_submit, .colpick_rgbhex_ns .colpick_current_color{
+.colpick_rgbhex_ns  .colpick_submit {
 	display:none;
 }
 .colpick_rgbhex_ns .colpick_new_color{
-	width:68px;
+	width:34px;
 	border: 1px solid #8f8f8f;
 }
 .colpick_rgbhex_ns .colpick_rgb_r {
@@ -379,7 +379,7 @@ colpick Color Picker / colpick.com
 }
 
 /*hex layout, no submit button*/
-.colpick_hex_ns  .colpick_submit, .colpick_hex_ns .colpick_current_color {
+.colpick_hex_ns  .colpick_submit {
 	display:none;
 }
 .colpick_hex_ns .colpick_hex_field {
diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index f808262e9e..99054c6103 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -302,6 +302,9 @@ For usage and examples: colpick.com/plugin
                 setSelector(col, cal.get(0));
                 setHue(col, cal.get(0));
                 setNewColor(col, cal.get(0));
+                // If the user triggered this behavior, then any prior color change should be negated.
+                cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), 
+                    hsbToRgb(col), cal.data('colpick').el, 0]);
             };
         return {
             init: function (opt) {

From 84cd0e15299d7bfd2d9132b6c6c1c17373ca7faa Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 5 Feb 2018 18:08:36 -0800
Subject: [PATCH 168/569] wip live material swapping on model entities, model
 overlays, avatars, and albedo swap on shape entities

---
 domain-server/CMakeLists.txt                  |   2 +
 .../icons/create-icons/126-material-01.svg    |   9 +
 .../resources/qml/hifi/tablet/EditTabView.qml |   2 +-
 interface/src/Application.cpp                 |  36 +++
 interface/src/ui/overlays/ModelOverlay.cpp    |  26 ++
 interface/src/ui/overlays/ModelOverlay.h      |   5 +
 interface/src/ui/overlays/Overlay.cpp         |  10 +
 interface/src/ui/overlays/Overlay.h           |   6 +
 .../src/avatars-renderer/Avatar.cpp           |  30 +++
 .../src/avatars-renderer/Avatar.h             |   8 +
 libraries/avatars/CMakeLists.txt              |   3 +-
 libraries/avatars/src/AvatarData.cpp          |   2 +-
 libraries/avatars/src/AvatarData.h            |   5 +
 .../src/RenderableEntityItem.cpp              |  13 +
 .../src/RenderableEntityItem.h                |   6 +
 .../src/RenderableMaterialEntityItem.cpp      |  26 +-
 .../src/RenderableMaterialEntityItem.h        |   5 +-
 .../src/RenderableModelEntityItem.cpp         |  26 ++
 .../src/RenderableModelEntityItem.h           |   7 +
 .../src/RenderableShapeEntityItem.cpp         |  29 +-
 .../src/RenderableShapeEntityItem.h           |   2 +-
 .../entities/src/DeleteEntityOperator.cpp     |   2 +-
 libraries/entities/src/EntityItem.cpp         |  39 ++-
 libraries/entities/src/EntityItem.h           |  22 +-
 .../entities/src/EntityItemProperties.cpp     |  52 ++--
 libraries/entities/src/EntityItemProperties.h |   8 +-
 .../entities/src/EntityItemPropertiesMacros.h |  43 ++-
 libraries/entities/src/EntityPropertyFlags.h  |   4 +-
 libraries/entities/src/EntityTree.cpp         |  48 +++-
 libraries/entities/src/EntityTree.h           |  15 ++
 libraries/entities/src/EntityTreeElement.cpp  |  26 +-
 libraries/entities/src/EntityTreeElement.h    |   3 +-
 libraries/entities/src/MaterialEntityItem.cpp | 253 +++++++++++++++---
 libraries/entities/src/MaterialEntityItem.h   |  43 ++-
 libraries/entities/src/ModelEntityItem.cpp    |   2 +-
 libraries/entities/src/ShapeEntityItem.cpp    |   7 +
 libraries/entities/src/ShapeEntityItem.h      |   6 +-
 libraries/graphics/src/graphics/Material.cpp  |  15 ++
 libraries/graphics/src/graphics/Material.h    |  36 +++
 .../src/model-networking/ModelCache.cpp       |   2 +-
 .../src/model-networking/ModelCache.h         |   6 +-
 libraries/octree/src/OctreePacketData.cpp     |  11 +
 libraries/octree/src/OctreePacketData.h       |   5 +-
 .../render-utils/src/MeshPartPayload.cpp      |  32 ++-
 libraries/render-utils/src/MeshPartPayload.h  |  13 +-
 libraries/render-utils/src/Model.cpp          |  44 +++
 libraries/render-utils/src/Model.h            |   3 +
 scripts/system/edit.js                        |  51 ++--
 scripts/system/html/css/edit-style.css        |  12 +-
 scripts/system/html/entityProperties.html     |  29 +-
 scripts/system/html/js/entityProperties.js    |  61 ++---
 tools/jsdoc/package-lock.json                 | 138 ++++++++++
 52 files changed, 1038 insertions(+), 251 deletions(-)
 create mode 100644 interface/resources/icons/create-icons/126-material-01.svg
 create mode 100644 tools/jsdoc/package-lock.json

diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index c1e275e4d3..f67be55b92 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -22,6 +22,8 @@ setup_memory_debugger()
 symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources")
 
 # link the shared hifi libraries
+include_hifi_library_headers(gpu)
+include_hifi_library_headers(graphics)
 link_hifi_libraries(embedded-webserver networking shared avatars)
 
 # find OpenSSL
diff --git a/interface/resources/icons/create-icons/126-material-01.svg b/interface/resources/icons/create-icons/126-material-01.svg
new file mode 100644
index 0000000000..9b6d92505f
--- /dev/null
+++ b/interface/resources/icons/create-icons/126-material-01.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path d="M348.5,162.5c1.7,0,3,1.4,3,3v181.4c0,1.7-1.3,3-3,3H167.2c-1.6,0-3-1.3-3-3V165.5c0-1.6,1.4-3,3-3H348.5 M348.5,145.5
+	H167.2c-11,0-20,9-20,20v181.4c0,11,9,20,20,20h181.4c11,0,20-9,20-20V165.5C368.5,154.5,359.6,145.5,348.5,145.5L348.5,145.5z"/>
+<rect x="161.6" y="253.6" width="96.3" height="96.3"/>
+<rect x="256.1" y="159.8" width="95.4" height="95.4"/>
+</svg>
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index 65dd871fb2..6f97664e06 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -135,7 +135,7 @@ TabView {
                 }
 
                 NewEntityButton {
-                    icon: "icons/create-icons/94-model-01.svg"
+                    icon: "icons/create-icons/126-material-01.svg"
                     text: "MATERIAL"
                     onClicked: {
                         editRoot.sendToScript({
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1a54c94d53..1cf8f0587f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1580,6 +1580,42 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
+    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        auto avatar = avatarManager->getAvatarBySessionID(avatarID);
+        if (avatar) {
+            avatar->addMaterial(material, shapeID);
+            return true;
+        }
+        return false;
+    });
+    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        auto avatar = avatarManager->getAvatarBySessionID(avatarID);
+        if (avatar) {
+            avatar->removeMaterial(material, shapeID);
+            return true;
+        }
+        return false;
+    });
+
+    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+        auto overlay = _overlays.getOverlay(overlayID);
+        if (overlay) {
+            overlay->addMaterial(material, shapeID);
+            return true;
+        }
+        return false;
+    });
+    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+        auto overlay = _overlays.getOverlay(overlayID);
+        if (overlay) {
+            overlay->removeMaterial(material, shapeID);
+            return true;
+        }
+        return false;
+    });
+
     // Keyboard focus handling for Web overlays.
     auto overlays = &(qApp->getOverlays());
     connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 4847650163..9e4835a76e 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -632,3 +632,29 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     }
     return 0;
 }
+
+void ModelOverlay::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    Parent::addMaterial(material, shapeID);
+    if (_model && _model->fetchRenderItemIDs().size() > 0) {
+        _model->addMaterial(material, shapeID);
+    }
+}
+
+void ModelOverlay::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    Parent::removeMaterial(material, shapeID);
+    if (_model && _model->fetchRenderItemIDs().size() > 0) {
+        _model->removeMaterial(material, shapeID);
+    }
+}
+
+void ModelOverlay::processMaterials() {
+    assert(_model);
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    for (auto& shapeMaterialPair : _materials) {
+        auto material = shapeMaterialPair.second;
+        while (!material.empty()) {
+            _model->addMaterial(material.top(), shapeMaterialPair.first);
+            material.pop();
+        }
+    }
+}
\ No newline at end of file
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 08c776c426..827f7f2d5b 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,6 +59,9 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
+    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+
 protected:
     Transform evalRenderTransform() override;
 
@@ -110,6 +113,8 @@ private:
     bool _drawInFrontDirty { false };
     bool _drawInHUDDirty { false };
 
+    void processMaterials();
+
 };
 
 #endif // hifi_ModelOverlay_h
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 3c952b8338..368ed04062 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -235,3 +235,13 @@ QVector<OverlayID> qVectorOverlayIDFromScriptValue(const QScriptValue& array) {
     }
     return newVector;
 }
+
+void Overlay::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].push(material);
+}
+
+void Overlay::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].remove(material);
+}
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index e9271f3c3f..4cb3f7c84d 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -91,6 +91,9 @@ public:
     unsigned int getStackOrder() const { return _stackOrder; }
     void setStackOrder(unsigned int stackOrder) { _stackOrder = stackOrder; }
 
+    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+
 protected:
     float updatePulse();
 
@@ -117,6 +120,9 @@ protected:
     static const xColor DEFAULT_OVERLAY_COLOR;
     static const float DEFAULT_ALPHA;
 
+    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::mutex _materialsLock;
+
 private:
     OverlayID _overlayID; // only used for non-3d overlays
 };
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 86635cd3bf..4cd9bbedd7 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -570,6 +570,7 @@ void Avatar::addToScene(AvatarSharedPointer self, const render::ScenePointer& sc
     }
     transaction.resetItem(_renderItemID, avatarPayloadPointer);
     _skeletonModel->addToScene(scene, transaction);
+    processMaterials();
     for (auto& attachmentModel : _attachmentModels) {
         attachmentModel->addToScene(scene, transaction);
     }
@@ -761,6 +762,7 @@ void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
     if (_skeletonModel->isRenderable() && _skeletonModel->needsFixupInScene()) {
         _skeletonModel->removeFromScene(scene, transaction);
         _skeletonModel->addToScene(scene, transaction);
+        processMaterials();
         canTryFade = true;
         _isAnimatingScale = true;
     }
@@ -1760,3 +1762,31 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
         return DEFAULT_AVATAR_EYE_HEIGHT;
     }
 }
+
+void Avatar::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].push(material);
+    if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
+        _skeletonModel->addMaterial(material, shapeID);
+    }
+}
+
+void Avatar::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].remove(material);
+    if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
+        _skeletonModel->removeMaterial(material, shapeID);
+    }
+}
+
+void Avatar::processMaterials() {
+    assert(_skeletonModel);
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    for (auto& shapeMaterialPair : _materials) {
+        auto material = shapeMaterialPair.second;
+        while (!material.empty()) {
+            _skeletonModel->addMaterial(material.top(), shapeMaterialPair.first);
+            material.pop();
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index c2b404a925..9c355159d8 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -272,6 +272,9 @@ public:
 
     virtual void setAvatarEntityDataChanged(bool value) override;
 
+    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
@@ -397,6 +400,11 @@ protected:
     float _displayNameAlpha { 1.0f };
 
     ThreadSafeValueCache<float> _unscaledEyeHeightCache { DEFAULT_AVATAR_EYE_HEIGHT };
+
+    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::mutex _materialsLock;
+
+    void processMaterials();
 };
 
 #endif // hifi_Avatar_h
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index fc6d15cced..13fda28f40 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME avatars)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared networking)
+include_hifi_library_headers(gpu)
+link_hifi_libraries(shared networking graphics)
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 74888283df..1bbc8cc1a5 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -2558,4 +2558,4 @@ void AvatarEntityMapFromScriptValue(const QScriptValue& object, AvatarEntityMap&
 
         value[EntityID] = binaryEntityProperties;
     }
-}
+}
\ No newline at end of file
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index a363fb6d15..b7d594f1dc 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -54,6 +54,8 @@
 #include "HeadData.h"
 #include "PathUtils.h"
 
+#include <graphics/Material.h>
+
 using AvatarSharedPointer = std::shared_ptr<AvatarData>;
 using AvatarWeakPointer = std::weak_ptr<AvatarData>;
 using AvatarHash = QHash<QUuid, AvatarSharedPointer>;
@@ -694,6 +696,9 @@ public:
 
     bool getIsReplicated() const { return _isReplicated; }
 
+    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID) {}
+    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {}
+
 signals:
     void displayNameChanged();
     void sessionDisplayNameChanged();
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 49ddf111c3..2f92790d18 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -146,6 +146,9 @@ EntityRenderer::EntityRenderer(const EntityItemPointer& entity) : _entity(entity
         _needsRenderUpdate = true;
         emit requestRenderUpdate();
     });
+    _materials = entity->getMaterials();
+    connect(entity.get(), &EntityItem::addMaterialToRenderItem, this, &EntityRenderer::addMaterial);
+    connect(entity.get(), &EntityItem::removeMaterialFromRenderItem, this, &EntityRenderer::removeMaterial);
 }
 
 EntityRenderer::~EntityRenderer() { }
@@ -399,4 +402,14 @@ void EntityRenderer::onAddToScene(const EntityItemPointer& entity) {
 void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) { 
     entity->deregisterChangeHandler(_changeHandlerId);
     QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
+}
+
+void EntityRenderer::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].push(material);
+}
+
+void EntityRenderer::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].remove(material);
 }
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index ce5bfb30a4..f58b540aef 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -101,6 +101,10 @@ protected:
         return result;
     }
 
+public slots:
+    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+
 signals:
     void requestRenderUpdate();
 
@@ -129,6 +133,8 @@ protected:
     // Only touched on the rendering thread
     bool _renderUpdateQueued{ false };
 
+    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::mutex _materialsLock;
 
 private:
     // The base class relies on comparing the model transform to the entity transform in order 
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
index 83754c1c16..d541d99c4c 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -15,12 +15,18 @@ bool MaterialEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityP
     if (entity->getMaterial() != _drawMaterial) {
         return true;
     }
+    if (entity->getParentID() != _parentID || entity->getClientOnly() != _clientOnly || entity->getOwningAvatarID() != _owningAvatarID) {
+        return true;
+    }
     return false;
 }
 
 void MaterialEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
     withWriteLock([&] {
         _drawMaterial = entity->getMaterial();
+        _parentID = entity->getParentID();
+        _clientOnly = entity->getClientOnly();
+        _owningAvatarID = entity->getOwningAvatarID();
         _renderTransform = getModelTransform();
         const float MATERIAL_ENTITY_SCALE = 0.5f;
         _renderTransform.postScale(MATERIAL_ENTITY_SCALE);
@@ -30,7 +36,7 @@ void MaterialEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&
 
 ItemKey MaterialEntityRenderer::getKey() {
     ItemKey::Builder builder;
-    builder.withTypeShape();
+    builder.withTypeShape().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
 
     if (!_visible) {
         builder.withInvisible();
@@ -215,13 +221,25 @@ void MaterialEntityRenderer::generateMesh() {
 void MaterialEntityRenderer::doRender(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableMaterialEntityItem::render");
     Q_ASSERT(args->_batch);
-
     gpu::Batch& batch = *args->_batch;
 
-    batch.setModelTransform(_renderTransform);
+    // Don't render if our parent is set or our material is null
+    QUuid parentID;
+    Transform renderTransform;
+    graphics::MaterialPointer drawMaterial;
+    withReadLock([&] {
+        parentID = _clientOnly ? _owningAvatarID : _parentID;
+        renderTransform = _renderTransform;
+        drawMaterial = _drawMaterial;
+    });
+    if (!parentID.isNull() || !drawMaterial) {
+        return;
+    }
+
+    batch.setModelTransform(renderTransform);
 
     // bind the material
-    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
+    args->_shapePipeline->bindMaterial(drawMaterial, batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
index 166ad762cc..af8cef9351 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
@@ -31,6 +31,9 @@ private:
     ItemKey getKey() override;
     ShapeKey getShapeKey() override;
 
+    QUuid _parentID;
+    bool _clientOnly;
+    QUuid _owningAvatarID;
     Transform _renderTransform;
 
     std::shared_ptr<NetworkMaterial> _drawMaterial;
@@ -47,7 +50,7 @@ private:
     static void addVertex(std::vector<float>& buffer, const glm::vec3& pos, const glm::vec3& tan, const glm::vec2 uv);
     const int SLICES = 15;
     const int STACKS = 9;
-    const float M_PI_TIMES_2 = 2.0f * M_PI;
+    const float M_PI_TIMES_2 = 2.0f * (float)M_PI;
 };
 
 } } 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 137203f475..739ccd9738 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1380,6 +1380,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
                 auto entityRenderer = static_cast<EntityRenderer*>(&data);
                 entityRenderer->setSubRenderItemIDs(newRenderItemIDs);
             });
+            processMaterials();
         }
     }
 
@@ -1466,3 +1467,28 @@ void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const QStr
     }
 }
 
+void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    Parent::addMaterial(material, shapeID);
+    if (_model && _model->fetchRenderItemIDs().size() > 0) {
+        _model->addMaterial(material, shapeID);
+    }
+}
+
+void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    Parent::removeMaterial(material, shapeID);
+    if (_model && _model->fetchRenderItemIDs().size() > 0) {
+        _model->removeMaterial(material, shapeID);
+    }
+}
+
+void ModelEntityRenderer::processMaterials() {
+    assert(_model);
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    for (auto& shapeMaterialPair : _materials) {
+        auto material = shapeMaterialPair.second;
+        while (!material.empty()) {
+            _model->addMaterial(material.top(), shapeMaterialPair.first);
+            material.pop();
+        }
+    }
+}
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 33fc9910a0..75c6639902 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -138,10 +138,15 @@ namespace render { namespace entities {
 class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem> {
     using Parent = TypedEntityRenderer<RenderableModelEntityItem>;
     friend class EntityRenderer;
+    Q_OBJECT
 
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
 
+public slots:
+    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
     virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) override;
@@ -194,6 +199,8 @@ private:
     uint64_t _lastAnimated { 0 };
 
     render::ItemKey _itemKey { render::ItemKey::Builder().withTypeMeta() };
+
+    void processMaterials();
 };
 
 } } // namespace 
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index cdee2c5ec9..8163b14608 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -54,8 +54,7 @@ bool ShapeEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPoin
     if (_lastUserData != entity->getUserData()) {
         return true;
     }
-    glm::vec4 newColor(toGlm(entity->getXColor()), entity->getLocalRenderAlpha());
-    if (newColor != _color) {
+    if (_material != entity->getMaterial()) {
         return true;
     }
 
@@ -78,7 +77,9 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
             _procedural.setProceduralData(ProceduralData::parse(_lastUserData));
         }
 
-        _color = vec4(toGlm(entity->getXColor()), entity->getLocalRenderAlpha());
+        removeMaterial(_material, 0);
+        _material = entity->getMaterial();
+        addMaterial(_material, 0);
 
         _shape = entity->getShape();
         _position = entity->getWorldPosition();
@@ -112,14 +113,13 @@ bool ShapeEntityRenderer::isTransparent() const {
     return Parent::isTransparent();
 }
 
-
-
 void ShapeEntityRenderer::doRender(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableShapeEntityItem::render");
     Q_ASSERT(args->_batch);
 
     gpu::Batch& batch = *args->_batch;
 
+    std::shared_ptr<graphics::Material> mat;
     auto geometryCache = DependencyManager::get<GeometryCache>();
     GeometryCache::Shape geometryShape;
     bool proceduralRender = false;
@@ -127,15 +127,22 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     withReadLock([&] {
         geometryShape = geometryCache->getShapeForEntityShape(_shape);
         batch.setModelTransform(_renderTransform); // use a transform with scale, rotation, registration point and translation
-        outColor = _color;
-        if (_procedural.isReady()) {
-            _procedural.prepare(batch, _position, _dimensions, _orientation);
-            outColor = _procedural.getColor(_color);
-            outColor.a *= _procedural.isFading() ? Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) : 1.0f;
-            proceduralRender = true;
+        mat = _materials[0].top();
+        if (mat) {
+            outColor = glm::vec4(mat->getAlbedo(), mat->getOpacity());
+            if (_procedural.isReady()) {
+                _procedural.prepare(batch, _position, _dimensions, _orientation);
+                outColor = _procedural.getColor(outColor);
+                outColor.a *= _procedural.isFading() ? Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) : 1.0f;
+                proceduralRender = true;
+            }
         }
     });
 
+    if (!mat) {
+        return;
+    }
+
     if (proceduralRender) {
         if (render::ShapeKey(args->_globalShapeKey).isWireframe()) {
             geometryCache->renderWireShape(batch, geometryShape, outColor);
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index 433cb41ad2..c913544255 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -34,7 +34,7 @@ private:
     QString _lastUserData;
     Transform _renderTransform;
     entity::Shape _shape { entity::Sphere };
-    glm::vec4 _color;
+    std::shared_ptr<graphics::Material> _material;
     glm::vec3 _position;
     glm::vec3 _dimensions;
     glm::quat _orientation;
diff --git a/libraries/entities/src/DeleteEntityOperator.cpp b/libraries/entities/src/DeleteEntityOperator.cpp
index cbd0ad7839..347d40ea49 100644
--- a/libraries/entities/src/DeleteEntityOperator.cpp
+++ b/libraries/entities/src/DeleteEntityOperator.cpp
@@ -93,7 +93,7 @@ bool DeleteEntityOperator::preRecursion(const OctreeElementPointer& element) {
             // and we can stop searching.
             if (entityTreeElement == details.containingElement) {
                 EntityItemPointer theEntity = details.entity;
-                bool entityDeleted = entityTreeElement->removeEntityItem(theEntity); // remove it from the element
+                bool entityDeleted = entityTreeElement->removeEntityItem(theEntity, true); // remove it from the element
                 assert(entityDeleted);
                 (void)entityDeleted; // quite warning
                 _tree->clearEntityMapEntry(details.entity->getEntityItemID());
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index ed13a46414..43510864ba 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -60,14 +60,6 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
 }
 
 EntityItem::~EntityItem() {
-    // clear out any left-over actions
-    EntityTreeElementPointer element = _element; // use local copy of _element for logic below
-    EntityTreePointer entityTree = element ? element->getTree() : nullptr;
-    EntitySimulationPointer simulation = entityTree ? entityTree->getSimulation() : nullptr;
-    if (simulation) {
-        clearActions(simulation);
-    }
-
     // these pointers MUST be correct at delete, else we probably have a dangling backpointer
     // to this EntityItem in the corresponding data structure.
     assert(!_simulated);
@@ -2937,3 +2929,34 @@ void EntityItem::retrieveMarketplacePublicKey() {
         networkReply->deleteLater();
     });
 }
+
+void EntityItem::preDelete() {
+    // clear out any left-over actions
+    EntityTreeElementPointer element = _element; // use local copy of _element for logic below
+    EntityTreePointer entityTree = element ? element->getTree() : nullptr;
+    EntitySimulationPointer simulation = entityTree ? entityTree->getSimulation() : nullptr;
+    if (simulation) {
+        clearActions(simulation);
+    }
+}
+
+void EntityItem::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].push(material);
+    emit addMaterialToRenderItem(material, shapeID);
+}
+
+void EntityItem::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    std::lock_guard<std::mutex> lock(_materialsLock);
+    _materials[shapeID].remove(material);
+    emit removeMaterialFromRenderItem(material, shapeID);
+}
+
+std::unordered_map<quint16, graphics::MultiMaterial> EntityItem::getMaterials() {
+    std::unordered_map<quint16, graphics::MultiMaterial> toReturn;
+    {
+        std::lock_guard<std::mutex> lock(_materialsLock);
+        toReturn = _materials;
+    }
+    return toReturn;
+}
\ No newline at end of file
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 5f84bcc311..b2804a2e86 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -36,6 +36,8 @@
 #include "SimulationFlags.h"
 #include "EntityDynamicInterface.h"
 
+#include "graphics/Material.h"
+
 class EntitySimulation;
 class EntityTreeElement;
 class EntityTreeElementExtraEncodeData;
@@ -49,7 +51,6 @@ typedef std::shared_ptr<EntityTreeElement> EntityTreeElementPointer;
 using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElementExtraEncodeData>;
 
 
-
 #define DONT_ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() = 0;
 #define ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() override { };
 
@@ -443,10 +444,10 @@ public:
     void scriptHasUnloaded() { _loadedScript = ""; _loadedScriptTimestamp = 0; }
 
     bool getClientOnly() const { return _clientOnly; }
-    void setClientOnly(bool clientOnly) { _clientOnly = clientOnly; }
+    virtual void setClientOnly(bool clientOnly) { _clientOnly = clientOnly; }
     // if this entity is client-only, which avatar is it associated with?
     QUuid getOwningAvatarID() const { return _owningAvatarID; }
-    void setOwningAvatarID(const QUuid& owningAvatarID) { _owningAvatarID = owningAvatarID; }
+    virtual void setOwningAvatarID(const QUuid& owningAvatarID) { _owningAvatarID = owningAvatarID; }
 
     virtual bool wantsHandControllerPointerEvents() const { return false; }
     virtual bool wantsKeyboardFocus() const { return false; }
@@ -477,8 +478,18 @@ public:
     void setCauterized(bool value) { _cauterized = value; }
     bool getCauterized() const { return _cauterized; }
 
+    virtual void postAdd() {}
+    virtual void preDelete();
+    virtual void postParentFixup() {}
+
+    void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    std::unordered_map<quint16, graphics::MultiMaterial> getMaterials();
+
 signals:
     void requestRenderUpdate();
+    void addMaterialToRenderItem(graphics::MaterialPointer material, quint16 shapeID);
+    void removeMaterialFromRenderItem(graphics::MaterialPointer material, quint16 shapeID);
 
 protected:
     QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
@@ -631,6 +642,11 @@ protected:
     quint64 _lastUpdatedQueryAACubeTimestamp { 0 };
 
     bool _cauterized { false }; // if true, don't draw because it would obscure 1st-person camera
+
+private:
+    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::mutex _materialsLock;
+
 };
 
 #endif // hifi_EntityItem_h
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 965252abf4..19aa6990db 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -360,7 +360,9 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_PRIORITY, priority);
     CHECK_PROPERTY_CHANGE(PROP_PARENT_SHAPE_ID, shapeID);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BOUNDS, materialBounds);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_POS, materialPos);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_SCALE, materialScale);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_ROT, materialRot);
 
     // Certifiable Properties
     CHECK_PROPERTY_CHANGE(PROP_ITEM_NAME, itemName);
@@ -664,7 +666,9 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_PRIORITY, priority);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_SHAPE_ID, shapeID);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BOUNDS, materialBounds);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_POS, materialPos);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_SCALE, materialScale);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_ROT, materialRot);
     }
 
     if (!skipDefaults && !strictSemantics) {
@@ -801,11 +805,13 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusFinish, float, setRadiusFinish);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(relayParentJoints, bool, setRelayParentJoints);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialURL, QString, setMaterialURL);
-    COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(materialMode, MaterialMode, setMaterialMode);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(materialMode, MaterialMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(blendFactor, float, setBlendFactor);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, int, setPriority);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(shapeID, int, setShapeID);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialBounds, glmVec4, setMaterialBounds);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, quint16, setPriority);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(shapeID, quint16, setShapeID);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialPos, glmVec2, setMaterialPos);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialScale, glmVec2, setMaterialScale);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialRot, float, setMaterialRot);
 
     // Certifiable Properties
     COPY_PROPERTY_FROM_QSCRIPTVALUE(itemName, QString, setItemName);
@@ -1163,9 +1169,11 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_URL, MaterialURL, materialURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_PRIORITY, Priority, priority, uint32_t);
-        ADD_PROPERTY_TO_MAP(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, uint32_t);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_BOUNDS, MaterialBounds, materialBounds, glmVec4);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_PRIORITY, Priority, priority, quint16);
+        ADD_PROPERTY_TO_MAP(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, quint16);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_ROT, MaterialRot, materialRot, float);
 
         // Certifiable Properties
         ADD_PROPERTY_TO_MAP(PROP_ITEM_NAME, ItemName, itemName, QString);
@@ -1557,7 +1565,9 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, properties.getBlendFactor());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, properties.getPriority());
                 APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, properties.getShapeID());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, properties.getMaterialBounds());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, properties.getMaterialPos());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, properties.getMaterialScale());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, properties.getMaterialRot());
             }
 
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
@@ -1921,9 +1931,11 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_URL, QString, setMaterialURL);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_PRIORITY, uint32_t, setPriority);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_SHAPE_ID, uint32_t, setShapeID);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_BOUNDS, glmVec4, setMaterialBounds);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_PRIORITY, quint16, setPriority);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_SHAPE_ID, quint16, setShapeID);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_POS, glmVec2, setMaterialPos);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_SCALE, glmVec2, setMaterialScale);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_ROT, float, setMaterialRot);
     }
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
@@ -2104,7 +2116,9 @@ void EntityItemProperties::markAllChanged() {
     _blendFactorChanged = true;
     _priorityChanged = true;
     _shapeIDChanged = true;
-    _materialBoundsChanged = true;
+    _materialPosChanged = true;
+    _materialScaleChanged = true;
+    _materialRotChanged = true;
 
     // Certifiable Properties
     _itemNameChanged = true;
@@ -2444,8 +2458,14 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (shapeIDChanged()) {
         out += "shapeID";
     }
-    if (materialBoundsChanged()) {
-        out += "materialBounds";
+    if (materialPosChanged()) {
+        out += "materialPos";
+    }
+    if (materialScaleChanged()) {
+        out += "materialScale";
+    }
+    if (materialRotChanged()) {
+        out += "materialRot";
     }
 
     // Certifiable Properties
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 9bedff41df..a8a79b6303 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -225,9 +225,11 @@ public:
     DEFINE_PROPERTY_REF(PROP_MATERIAL_URL, MaterialURL, materialURL, QString, "");
     DEFINE_PROPERTY_REF_ENUM(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode, UV);
     DEFINE_PROPERTY_REF(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float, 1.0f);
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_PRIORITY, Priority, priority, uint32_t, 0);
-    DEFINE_PROPERTY_REF(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, uint32_t, 0);
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_BOUNDS, MaterialBounds, materialBounds, glmVec4, glm::vec4(0, 0, 1, 1));
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_PRIORITY, Priority, priority, quint16, 0);
+    DEFINE_PROPERTY_REF(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, quint16, 0);
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2, glm::vec2(0, 0));
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2, glm::vec2(1, 1));
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_ROT, MaterialRot, materialRot, float, 0);
 
     // Certifiable Properties - related to Proof of Purchase certificates
     DEFINE_PROPERTY_REF(PROP_ITEM_NAME, ItemName, itemName, QString, ENTITY_ITEM_DEFAULT_ITEM_NAME);
diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index 2609fe237d..51a23b6867 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -101,6 +101,7 @@
         changedProperties += P;    \
     }
 
+inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::vec2& v) { return vec2toScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::vec3& v) { return vec3toScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, float v) { return QScriptValue(v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, int v) { return QScriptValue(v); }
@@ -183,8 +184,8 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const AACube& v) { retu
         properties.setProperty(#P, V); \
     }
 
+typedef glm::vec2 glmVec2;
 typedef glm::vec3 glmVec3;
-typedef glm::vec4 glmVec4;
 typedef glm::quat glmQuat;
 typedef QVector<glm::vec3> qVectorVec3;
 typedef QVector<glm::quat> qVectorQuat;
@@ -222,6 +223,23 @@ inline QByteArray QByteArray_convertFromScriptValue(const QScriptValue& v, bool&
     return QByteArray::fromBase64(b64.toUtf8());
 }
 
+inline glmVec2 glmVec2_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
+    isValid = false; /// assume it can't be converted
+    QScriptValue x = v.property("x");
+    QScriptValue y = v.property("y");
+    if (x.isValid() && y.isValid()) {
+        glm::vec4 newValue(0);
+        newValue.x = x.toVariant().toFloat();
+        newValue.y = y.toVariant().toFloat();
+        isValid = !glm::isnan(newValue.x) &&
+            !glm::isnan(newValue.y);
+        if (isValid) {
+            return newValue;
+        }
+    }
+    return glm::vec2(0);
+}
+
 inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isValid) { 
     isValid = false; /// assume it can't be converted
     QScriptValue x = v.property("x");
@@ -242,29 +260,6 @@ inline glmVec3 glmVec3_convertFromScriptValue(const QScriptValue& v, bool& isVal
     return glm::vec3(0);
 }
 
-inline glmVec4 glmVec4_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
-    isValid = false; /// assume it can't be converted
-    QScriptValue x = v.property("x");
-    QScriptValue y = v.property("y");
-    QScriptValue z = v.property("z");
-    QScriptValue w = v.property("w");
-    if (x.isValid() && y.isValid() && z.isValid() && w.isValid()) {
-        glm::vec4 newValue(0);
-        newValue.x = x.toVariant().toFloat();
-        newValue.y = y.toVariant().toFloat();
-        newValue.z = z.toVariant().toFloat();
-        newValue.w = w.toVariant().toFloat();
-        isValid = !glm::isnan(newValue.x) &&
-            !glm::isnan(newValue.y) &&
-            !glm::isnan(newValue.z) &&
-            !glm::isnan(newValue.w);
-        if (isValid) {
-            return newValue;
-        }
-    }
-    return glm::vec4(0);
-}
-
 inline AACube AACube_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
     isValid = true;
     AACube result;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index bd573423a3..17ebddbe9d 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -232,7 +232,9 @@ enum EntityPropertyList {
     PROP_MATERIAL_BLEND_FACTOR,
     PROP_MATERIAL_PRIORITY,
     PROP_PARENT_SHAPE_ID,
-    PROP_MATERIAL_BOUNDS,
+    PROP_MATERIAL_POS,
+    PROP_MATERIAL_SCALE,
+    PROP_MATERIAL_ROT,
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties to end of list just ABOVE this line
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index bf29f3bec9..775b3bd2f7 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1732,15 +1732,19 @@ void EntityTree::fixupNeedsParentFixups() {
                 }
             });
             entity->locationChanged(true);
-        } else if (getIsServer() && _avatarIDs.contains(entity->getParentID())) {
-            // this is a child of an avatar, which the entity server will never have
-            // a SpatiallyNestable object for.  Add it to a list for cleanup when the avatar leaves.
-            if (!_childrenOfAvatars.contains(entity->getParentID())) {
-                _childrenOfAvatars[entity->getParentID()] = QSet<EntityItemID>();
+            entity->postParentFixup();
+        } else if (_avatarIDs.contains(entity->getParentID())) {
+            if (getIsServer()) {
+                // this is a child of an avatar, which the entity server will never have
+                // a SpatiallyNestable object for.  Add it to a list for cleanup when the avatar leaves.
+                if (!_childrenOfAvatars.contains(entity->getParentID())) {
+                    _childrenOfAvatars[entity->getParentID()] = QSet<EntityItemID>();
+                }
+                _childrenOfAvatars[entity->getParentID()] += entity->getEntityItemID();
             }
-            _childrenOfAvatars[entity->getParentID()] += entity->getEntityItemID();
             doMove = true;
             iter.remove(); // and pull it out of the list
+            entity->postParentFixup();
         }
 
         if (queryAACubeSuccess && doMove) {
@@ -2378,3 +2382,35 @@ QStringList EntityTree::getJointNames(const QUuid& entityID) const {
     return entity->getJointNames();
 }
 
+std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_addMaterialToAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_removeMaterialFromAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_addMaterialToOverlayOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
+
+bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+    if (_addMaterialToAvatarOperator) {
+        return _addMaterialToAvatarOperator(avatarID, material, shapeID);
+    }
+    return false;
+}
+
+bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+    if (_removeMaterialFromAvatarOperator) {
+        return _removeMaterialFromAvatarOperator(avatarID, material, shapeID);
+    }
+    return false;
+}
+
+bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+    if (_addMaterialToOverlayOperator) {
+        return _addMaterialToOverlayOperator(overlayID, material, shapeID);
+    }
+    return false;
+}
+
+bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+    if (_removeMaterialFromOverlayOperator) {
+        return _removeMaterialFromOverlayOperator(overlayID, material, shapeID);
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 8cb89d6493..a02ce900ff 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -280,6 +280,16 @@ public:
 
     void setMyAvatar(std::shared_ptr<AvatarData> myAvatar) { _myAvatar = myAvatar; }
 
+    static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
+    static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
+    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID);
+    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID);
+
+    static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
+    static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
+    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID);
+    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID);
+
 signals:
     void deletingEntity(const EntityItemID& entityID);
     void deletingEntityPointer(EntityItem* entityID);
@@ -387,6 +397,11 @@ private:
     void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
 
     std::shared_ptr<AvatarData> _myAvatar{ nullptr };
+
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _addMaterialToAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _removeMaterialFromAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _addMaterialToOverlayOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _removeMaterialFromOverlayOperator;
 };
 
 #endif // hifi_EntityTree_h
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index c9e1ecc3f1..980ed1c104 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -896,6 +896,7 @@ EntityItemPointer EntityTreeElement::getEntityWithEntityItemID(const EntityItemI
 void EntityTreeElement::cleanupEntities() {
     withWriteLock([&] {
         foreach(EntityItemPointer entity, _entityItems) {
+            entity->preDelete();
             // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
             // NOTE: We explicitly don't delete the EntityItem here because since we only
             // access it by smart pointers, when we remove it from the _entityItems
@@ -907,26 +908,10 @@ void EntityTreeElement::cleanupEntities() {
     bumpChangedContent();
 }
 
-bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) {
-    bool foundEntity = false;
-    withWriteLock([&] {
-        uint16_t numberOfEntities = _entityItems.size();
-        for (uint16_t i = 0; i < numberOfEntities; i++) {
-            EntityItemPointer& entity = _entityItems[i];
-            if (entity->getEntityItemID() == id) {
-                foundEntity = true;
-                // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
-                entity->_element = NULL;
-                _entityItems.removeAt(i);
-                bumpChangedContent();
-                break;
-            }
-        }
-    });
-    return foundEntity;
-}
-
-bool EntityTreeElement::removeEntityItem(EntityItemPointer entity) {
+bool EntityTreeElement::removeEntityItem(EntityItemPointer entity, bool deletion) {
+    if (deletion) {
+        entity->preDelete();
+    }
     int numEntries = 0;
     withWriteLock([&] {
         numEntries = _entityItems.removeAll(entity);
@@ -955,6 +940,7 @@ void EntityTreeElement::addEntityItem(EntityItemPointer entity) {
     });
     bumpChangedContent();
     entity->_element = getThisPointer();
+    entity->postAdd();
 }
 
 // will average a "common reduced LOD view" from the the child elements...
diff --git a/libraries/entities/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h
index a524904c71..2313bde0c4 100644
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
@@ -210,8 +210,7 @@ public:
     void getEntitiesInside(const AACube& box, QVector<EntityItemPointer>& foundEntities);
 
     void cleanupEntities(); /// called by EntityTree on cleanup this will free all entities
-    bool removeEntityWithEntityItemID(const EntityItemID& id);
-    bool removeEntityItem(EntityItemPointer entity);
+    bool removeEntityItem(EntityItemPointer entity, bool deletion = false);
 
     bool containsEntityBounds(EntityItemPointer entity) const;
     bool bestFitEntityBounds(EntityItemPointer entity) const;
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index bbcc691879..7026da117c 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -16,6 +16,9 @@
 EntityItemPointer MaterialEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     Pointer entity(new MaterialEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
+    // When you reload content, setProperties doesn't have any of the propertiesChanged flags set, so it won't trigger a material add
+    entity->removeMaterial();
+    entity->applyMaterial();
     return entity;
 }
 
@@ -31,7 +34,9 @@ EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desir
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(blendFactor, getBlendFactor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(priority, getPriority);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeID, getShapeID);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialBounds, getMaterialBounds);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialPos, getMaterialPos);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialScale, getMaterialScale);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialRot, getMaterialRot);
     return properties;
 }
 
@@ -43,7 +48,9 @@ bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(blendFactor, setBlendFactor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(priority, setPriority);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeID, setShapeID);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialBounds, setMaterialBounds);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialPos, setMaterialPos);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialScale, setMaterialScale);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialRot, setMaterialRot);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -202,9 +209,11 @@ int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
     READ_ENTITY_PROPERTY(PROP_MATERIAL_URL, QString, setMaterialURL);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, uint32_t, setPriority);
-    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, uint32_t, setShapeID);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, glm::vec4, setMaterialBounds);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, quint16, setPriority);
+    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, quint16, setShapeID);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_POS, glm::vec2, setMaterialPos);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, glm::vec2, setMaterialScale);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_ROT, float, setMaterialRot);
 
     return bytesRead;
 }
@@ -218,7 +227,9 @@ EntityPropertyFlags MaterialEntityItem::getEntityProperties(EncodeBitstreamParam
     requestedProperties += PROP_MATERIAL_BLEND_FACTOR;
     requestedProperties += PROP_MATERIAL_PRIORITY;
     requestedProperties += PROP_PARENT_SHAPE_ID;
-    requestedProperties += PROP_MATERIAL_BOUNDS;
+    requestedProperties += PROP_MATERIAL_POS;
+    requestedProperties += PROP_MATERIAL_SCALE;
+    requestedProperties += PROP_MATERIAL_ROT;
     return requestedProperties;
 }
 
@@ -234,9 +245,11 @@ void MaterialEntityItem::appendSubclassData(OctreePacketData* packetData, Encode
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, getMaterialURL());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)getMaterialMode());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, getBlendFactor());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, (uint32_t)getPriority());
-    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, (uint32_t)getShapeID());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BOUNDS, getMaterialBounds());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, getPriority());
+    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, getShapeID());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, getMaterialPos());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, getMaterialScale());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, getMaterialRot());
 }
 
 void MaterialEntityItem::debugDump() const {
@@ -249,7 +262,9 @@ void MaterialEntityItem::debugDump() const {
     qCDebug(entities) << "           blend factor:" << _blendFactor;
     qCDebug(entities) << "               priority:" << _priority;
     qCDebug(entities) << "        parent shape ID:" << _shapeID;
-    qCDebug(entities) << "        material bounds:" << _materialBounds;
+    qCDebug(entities) << "           material pos:" << _materialPos;
+    qCDebug(entities) << "         material scale:" << _materialRot;
+    qCDebug(entities) << "           material rot:" << _materialScale;
     qCDebug(entities) << "               position:" << debugTreeVector(getWorldPosition());
     qCDebug(entities) << "             dimensions:" << debugTreeVector(getScaledDimensions());
     qCDebug(entities) << "          getLastEdited:" << debugTime(getLastEdited(), now);
@@ -269,30 +284,38 @@ std::shared_ptr<NetworkMaterial> MaterialEntityItem::getMaterial() const {
     }
 }
 
-void MaterialEntityItem::setMaterialURL(const QString& materialURLString) {
-    if (materialURLString.startsWith("userData")) {
-        QJsonDocument materialJSON = QJsonDocument::fromJson(getUserData().toUtf8());
-        _materials.clear();
-        _materialNames.clear();
-        if (!materialJSON.isNull()) {
-            if (materialJSON.isArray()) {
-                QJsonArray materials = materialJSON.array();
-                for (auto& material : materials) {
-                    if (!material.isNull() && material.isObject()) {
-                        parseJSONMaterial(material.toObject());
+void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool userDataChanged) {
+    bool usingUserData = materialURLString.startsWith("userData");
+    if (_materialURL != materialURLString || (usingUserData && userDataChanged)) {
+        removeMaterial();
+        _materialURL = materialURLString;
+
+        if (usingUserData) {
+            QJsonDocument materialJSON = QJsonDocument::fromJson(getUserData().toUtf8());
+            _materials.clear();
+            _materialNames.clear();
+            if (!materialJSON.isNull()) {
+                if (materialJSON.isArray()) {
+                    QJsonArray materials = materialJSON.array();
+                    for (auto material : materials) {
+                        if (!material.isNull() && material.isObject()) {
+                            parseJSONMaterial(material.toObject());
+                        }
                     }
+                } else if (materialJSON.isObject()) {
+                    parseJSONMaterial(materialJSON.object());
                 }
-            } else if (materialJSON.isObject()) {
-                parseJSONMaterial(materialJSON.object());
             }
+        } else {
+            // get material via network request
         }
+
+        // TODO: if URL ends with ?string, try to set _currentMaterialName = string
+
+        // Since our JSON changed, the current name might not be valid anymore, so we need to update
+        setCurrentMaterialName(_currentMaterialName);
+        applyMaterial();
     }
-    _materialURL = materialURLString;
-
-    // TODO: if URL ends with ?string, set _currentMaterialName = string
-
-    // Since our JSON changed, the current name might not be valid anymore, so we need to update
-    setCurrentMaterialName(_currentMaterialName);
 }
 
 void MaterialEntityItem::setCurrentMaterialName(const QString& currentMaterialName) {
@@ -300,14 +323,176 @@ void MaterialEntityItem::setCurrentMaterialName(const QString& currentMaterialNa
     if (material != _materials.end()) {
         _currentMaterialName = currentMaterialName;
     } else if (_materialNames.size() > 0) {
-        setCurrentMaterialName(_materialNames[0]);
+        _currentMaterialName = _materialNames[0];
     }
 }
 
 void MaterialEntityItem::setUserData(const QString& userData) {
-    EntityItem::setUserData(userData);
-    if (_materialURL.startsWith("userData")) {
-        // Trigger material update when user data changes
-        setMaterialURL(_materialURL);
+    if (_userData != userData) {
+        EntityItem::setUserData(userData);
+        if (_materialURL.startsWith("userData")) {
+            // Trigger material update when user data changes
+            setMaterialURL(_materialURL, true);
+        }
     }
+}
+
+void MaterialEntityItem::setMaterialPos(const glm::vec2& materialPos) {
+    if (_materialPos != materialPos) {
+        removeMaterial();
+        _materialPos = materialPos;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setMaterialScale(const glm::vec2& materialScale) {
+    if (_materialScale != materialScale) {
+        removeMaterial();
+        _materialScale = materialScale;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setMaterialRot(const float& materialRot) {
+    if (_materialRot != materialRot) {
+        removeMaterial();
+        _materialRot = materialRot;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setBlendFactor(float blendFactor) {
+    if (_blendFactor != blendFactor) {
+        removeMaterial();
+        _blendFactor = blendFactor;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setPriority(quint16 priority) {
+    if (_priority != priority) {
+        removeMaterial();
+        _priority = priority;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setShapeID(quint16 shapeID) {
+    if (_shapeID != shapeID) {
+        removeMaterial();
+        _shapeID = shapeID;
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setParentID(const QUuid& parentID) {
+    if (getParentID() != parentID) {
+        removeMaterial();
+        EntityItem::setParentID(parentID);
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setClientOnly(bool clientOnly) {
+    if (getClientOnly() != clientOnly) {
+        removeMaterial();
+        EntityItem::setClientOnly(clientOnly);
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::setOwningAvatarID(const QUuid& owningAvatarID) {
+    if (getOwningAvatarID() != owningAvatarID) {
+        removeMaterial();
+        EntityItem::setOwningAvatarID(owningAvatarID);
+        applyMaterial();
+    }
+}
+
+void MaterialEntityItem::removeMaterial() {
+    graphics::MaterialPointer material = getMaterial();
+    QUuid parentID = getClientOnly() ? getOwningAvatarID() : getParentID();
+    if (!material || parentID.isNull()) {
+        return;
+    }
+
+    // Our parent could be an entity, an avatar, or an overlay
+    EntityTreePointer tree = getTree();
+    if (tree) {
+        EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
+        if (entity) {
+            entity->removeMaterial(material, getShapeID());
+            return;
+        }
+    }
+
+    if (EntityTree::removeMaterialFromAvatar(parentID, material, getShapeID())) {
+        return;
+    }
+
+    if (EntityTree::removeMaterialFromOverlay(parentID, material, getShapeID())) {
+        return;
+    }
+
+    // if a remove fails, our parent is gone, so we don't need to retry
+}
+
+void MaterialEntityItem::applyMaterial() {
+    _retryApply = false;
+    graphics::MaterialPointer material = getMaterial();
+    QUuid parentID = getClientOnly() ? getOwningAvatarID() : getParentID();
+    if (!material || parentID.isNull()) {
+        return;
+    }
+    Transform textureTransform;
+    textureTransform.setTranslation(glm::vec3(_materialPos, 0));
+    textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialRot)));
+    textureTransform.setScale(glm::vec3(_materialScale, 1));
+    material->setTextureTransforms(textureTransform);
+    material->setBlendFactor(getBlendFactor());
+    material->setPriority(getPriority());
+
+    // Our parent could be an entity, an avatar, or an overlay
+    EntityTreePointer tree = getTree();
+    if (tree) {
+        EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
+        if (entity) {
+            entity->addMaterial(material, getShapeID());
+            return;
+        }
+    }
+
+    if (EntityTree::addMaterialToAvatar(parentID, material, getShapeID())) {
+        return;
+    }
+
+    if (EntityTree::addMaterialToOverlay(parentID, material, getShapeID())) {
+        return;
+    }
+
+    // if we've reached this point, we couldn't find our parent, so we need to try again later
+    _retryApply = true;
+}
+
+void MaterialEntityItem::postAdd() {
+    removeMaterial();
+    applyMaterial();
+}
+
+void MaterialEntityItem::preDelete() {
+    EntityItem::preDelete();
+    removeMaterial();
+}
+
+void MaterialEntityItem::postParentFixup() {
+    removeMaterial();
+    applyMaterial();
+}
+
+void MaterialEntityItem::update(const quint64& now) {
+    if (_retryApply) {
+        applyMaterial();
+    }
+
+    EntityItem::update(now);
 }
\ No newline at end of file
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index 80fe226b68..40137acf22 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -23,6 +23,9 @@ public:
 
     ALLOW_INSTANTIATION // This class can be instantiated
 
+    void update(const quint64& now) override;
+    bool needsToCallUpdate() const override { return true; }
+
     // methods for getting/setting all properties of an entity
     virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
     virtual bool setProperties(const EntityItemProperties& properties) override;
@@ -49,7 +52,7 @@ public:
     virtual void setUnscaledDimensions(const glm::vec3& value) override;
 
     QString getMaterialURL() const { return _materialURL; }
-    void setMaterialURL(const QString& materialURLString);
+    void setMaterialURL(const QString& materialURLString, bool userDataChanged = false);
 
     QString getCurrentMaterialName() const { return _currentMaterialName; }
     void setCurrentMaterialName(const QString& currentMaterialName);
@@ -58,33 +61,51 @@ public:
     void setMaterialMode(MaterialMode mode) { _materialMode = mode; }
 
     float getBlendFactor() const { return _blendFactor; }
-    void setBlendFactor(float blendFactor) { _blendFactor = blendFactor; }
+    void setBlendFactor(float blendFactor);
 
-    int getPriority() const { return _priority; }
-    void setPriority(int priority) { _priority = priority; }
+    quint16 getPriority() const { return _priority; }
+    void setPriority(quint16 priority);
 
-    int getShapeID() const { return _shapeID; }
-    void setShapeID(int shapeID) { _shapeID = shapeID; }
+    quint16 getShapeID() const { return _shapeID; }
+    void setShapeID(quint16 shapeID);
 
-    glm::vec4 getMaterialBounds() const { return _materialBounds; }
-    void setMaterialBounds(const glm::vec4& materialBounds) { _materialBounds = materialBounds; }
+    glm::vec2 getMaterialPos() const { return _materialPos; }
+    void setMaterialPos(const glm::vec2& materialPos);
+    glm::vec2 getMaterialScale() const { return _materialScale; }
+    void setMaterialScale(const glm::vec2& materialScale);
+    float getMaterialRot() const { return _materialRot; }
+    void setMaterialRot(const float& materialRot);
 
     std::shared_ptr<NetworkMaterial> getMaterial() const;
 
     void setUserData(const QString& userData) override;
+    void setParentID(const QUuid& parentID) override;
+    void setClientOnly(bool clientOnly) override;
+    void setOwningAvatarID(const QUuid& owningAvatarID) override;
+
+    void applyMaterial();
+    void removeMaterial();
+
+    void postAdd() override;
+    void preDelete() override;
+    void postParentFixup() override;
 
 private:
     QString _materialURL;
     MaterialMode _materialMode { UV };
     float _blendFactor { 1.0f };
-    int _priority { 0 };
-    int _shapeID { 0 };
-    glm::vec4 _materialBounds { 0, 0, 1, 1 };
+    quint16 _priority { 0 };
+    quint16 _shapeID { 0 };
+    glm::vec2 _materialPos { 0, 0 };
+    glm::vec2 _materialScale { 1, 1 };
+    float _materialRot { 0 };
     
     QHash<QString, std::shared_ptr<NetworkMaterial>> _materials;
     std::vector<QString> _materialNames;
     QString _currentMaterialName;
 
+    bool _retryApply { false };
+
     void parseJSONMaterial(const QJsonObject& materialJSON);
     static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
 
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 5d33e4c047..bec7bc1906 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -721,4 +721,4 @@ bool ModelEntityItem::isAnimatingSomething() const {
             _animationProperties.getRunning() &&
             (_animationProperties.getFPS() != 0.0f);
         });
-}
+}
\ No newline at end of file
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index cbcfcaaa1d..2425208a87 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -85,6 +85,7 @@ EntityItemPointer ShapeEntityItem::sphereFactory(const EntityItemID& entityID, c
 ShapeEntityItem::ShapeEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
     _type = EntityTypes::Shape;
     _volumeMultiplier *= PI / 6.0f;
+    _material = std::make_shared<graphics::Material>();
 }
 
 EntityItemProperties ShapeEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
@@ -184,6 +185,7 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
 void ShapeEntityItem::setColor(const rgbColor& value) {
     memcpy(_color, value, sizeof(rgbColor));
+    _material->setAlbedo(glm::vec3(_color[0], _color[1], _color[2]) / 255.0f);
 }
 
 xColor ShapeEntityItem::getXColor() const {
@@ -204,6 +206,11 @@ void ShapeEntityItem::setColor(const QColor& value) {
     setAlpha(value.alpha());
 }
 
+void ShapeEntityItem::setAlpha(float alpha) {
+    _alpha = alpha;
+    _material->setOpacity(alpha);
+}
+
 void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) {
     const float MAX_FLAT_DIMENSION = 0.0001f;
     if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) {
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 84ce1ce57e..7ad1b3c1c2 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -75,7 +75,7 @@ public:
     void setShape(const QString& shape) { setShape(entity::shapeFromString(shape)); }
 
     float getAlpha() const { return _alpha; };
-    void setAlpha(float alpha) { _alpha = alpha; }
+    void setAlpha(float alpha);
 
     const rgbColor& getColor() const { return _color; }
     void setColor(const rgbColor& value);
@@ -101,6 +101,8 @@ public:
     virtual void computeShapeInfo(ShapeInfo& info) override;
     virtual ShapeType getShapeType() const override;
 
+    std::shared_ptr<graphics::Material> getMaterial() { return _material; }
+
 protected:
 
     float _alpha { 1 };
@@ -111,6 +113,8 @@ protected:
     //! prior functionality where new or unsupported shapes are treated as
     //! ellipsoids.
     ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
+
+    std::shared_ptr<graphics::Material> _material;
 };
 
 #endif // hifi_ShapeEntityItem_h
diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp
index 6cc6b8472f..7c66c8ab07 100755
--- a/libraries/graphics/src/graphics/Material.cpp
+++ b/libraries/graphics/src/graphics/Material.cpp
@@ -12,9 +12,13 @@
 
 #include "TextureMap.h"
 
+#include <Transform.h>
+
 using namespace graphics;
 using namespace gpu;
 
+int materialPointerMetaID = qRegisterMetaType<MaterialPointer>("graphics::MaterialPointer");
+
 Material::Material() :
     _key(0),
     _schemaBuffer(),
@@ -221,4 +225,15 @@ bool Material::calculateMaterialInfo() const {
         _hasCalculatedTextureInfo = allTextures;
     }
     return _hasCalculatedTextureInfo;
+}
+
+void Material::setTextureTransforms(const Transform& transform) {
+    for (auto &textureMapItem : _textureMaps) {
+        if (textureMapItem.second) {
+            textureMapItem.second->setTextureTransform(transform);
+        }
+    }
+    for (int i = 0; i < NUM_TEXCOORD_TRANSFORMS; i++) {
+        _texMapArrayBuffer.edit<TexMapArraySchema>()._texcoordTransforms[i] = transform.getMatrix();
+    }
 }
\ No newline at end of file
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index cfbfaa61ea..b9eb881ed8 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -15,11 +15,14 @@
 
 #include <bitset>
 #include <map>
+#include <queue>
 
 #include <ColorUtils.h>
 
 #include <gpu/Resource.h>
 
+class Transform;
+
 namespace graphics {
 
 class TextureMap;
@@ -351,6 +354,14 @@ public:
     size_t getTextureSize()  const { calculateMaterialInfo(); return _textureSize; }
     bool hasTextureInfo() const { return _hasCalculatedTextureInfo; }
 
+    void setBlendFactor(float blendFactor) { _blendFactor = blendFactor; }
+    float getBlendFactor() { return _blendFactor; }
+
+    void setPriority(quint16 priority) { _priority = priority; }
+    quint16 getPriority() { return _priority; }
+
+    void setTextureTransforms(const Transform& transform);
+
 private:
     mutable MaterialKey _key;
     mutable UniformBufferView _schemaBuffer;
@@ -364,10 +375,35 @@ private:
     mutable bool _hasCalculatedTextureInfo { false };
     bool calculateMaterialInfo() const;
 
+    float _blendFactor { 1.0f };
+    quint16 _priority { 0 };
 
 };
 typedef std::shared_ptr< Material > MaterialPointer;
 
+Q_DECLARE_METATYPE(MaterialPointer)
+
+class MaterialCompare {
+public:
+    bool operator() (MaterialPointer left, MaterialPointer right) {
+        return left->getPriority() < right->getPriority();
+    }
+};
+
+class MultiMaterial : public std::priority_queue<MaterialPointer, std::vector<MaterialPointer>, MaterialCompare> {
+public:
+    bool remove(const MaterialPointer& value) {
+        auto it = std::find(c.begin(), c.end(), value);
+        if (it != c.end()) {
+            c.erase(it);
+            std::make_heap(c.begin(), c.end(), comp);
+            return true;
+        } else {
+            return false;
+        }
+    }
+};
+
 };
 
 #endif
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 1fe3648838..32deba3687 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -549,7 +549,6 @@ graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, im
         auto map = std::make_shared<graphics::TextureMap>();
         if (texture) {
             map->setTextureSource(texture->_textureSource);
-            emit textureFinished();
         }
 
         return map;
@@ -728,6 +727,7 @@ void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
 
     if (!occlusionName.isEmpty()) {
         auto url = textureMap.contains(occlusionName) ? textureMap[occlusionName].toUrl() : QUrl();
+        // FIXME: we need to handle the occlusion map transform here
         auto map = fetchTextureMap(url, image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
         setTextureMap(MapChannel::OCCLUSION_MAP, map);
     }
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 575f94f9bf..bbb00d72eb 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -156,8 +156,7 @@ private:
     virtual ~ModelCache() = default;
 };
 
-class NetworkMaterial : public QObject, public graphics::Material {
-    Q_OBJECT
+class NetworkMaterial : public graphics::Material {
 public:
     using MapChannel = graphics::Material::MapChannel;
 
@@ -174,9 +173,6 @@ public:
     void setScatteringMap(const QString& url);
     void setLightmapMap(const QString& url);
 
-signals:
-    void textureFinished();
-
 protected:
     friend class Geometry;
 
diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp
index a2aad33058..7108f9a4e4 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -381,6 +381,17 @@ bool OctreePacketData::appendValue(float value) {
     return success;
 }
 
+bool OctreePacketData::appendValue(const glm::vec2& value) {
+    const unsigned char* data = (const unsigned char*)&value;
+    int length = sizeof(value);
+    bool success = append(data, length);
+    if (success) {
+        _bytesOfValues += length;
+        _totalBytesOfValues += length;
+    }
+    return success;
+}
+
 bool OctreePacketData::appendValue(const glm::vec3& value) {
     const unsigned char* data = (const unsigned char*)&value;
     int length = sizeof(value);
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index 7f8eb49101..85100ec177 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -164,6 +164,9 @@ public:
     /// appends a float value to the end of the stream, may fail if new data stream is too long to fit in packet
     bool appendValue(float value);
 
+    /// appends a vec2 to the end of the stream, may fail if new data stream is too long to fit in packet
+    bool appendValue(const glm::vec2& value);
+
     /// appends a non-position vector to the end of the stream, may fail if new data stream is too long to fit in packet
     bool appendValue(const glm::vec3& value);
 
@@ -250,8 +253,8 @@ public:
     static quint64 getTotalBytesOfColor() { return _totalBytesOfColor; } /// total bytes of color
     
     static int unpackDataFromBytes(const unsigned char* dataBytes, float& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec2& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec3& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
-    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec4& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, bool& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, quint64& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, uint32_t& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index b80327cf14..d24843c87d 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -47,7 +47,7 @@ template <> void payloadRender(const MeshPartPayload::Pointer& payload, RenderAr
 
 MeshPartPayload::MeshPartPayload(const std::shared_ptr<const graphics::Mesh>& mesh, int partIndex, graphics::MaterialPointer material) {
     updateMeshPart(mesh, partIndex);
-    updateMaterial(material);
+    addMaterial(material);
 }
 
 void MeshPartPayload::updateMeshPart(const std::shared_ptr<const graphics::Mesh>& drawMesh, int partIndex) {
@@ -67,8 +67,12 @@ void MeshPartPayload::updateTransform(const Transform& transform, const Transfor
     _worldBound.transform(_drawTransform);
 }
 
-void MeshPartPayload::updateMaterial(graphics::MaterialPointer drawMaterial) {
-    _drawMaterial = drawMaterial;
+void MeshPartPayload::addMaterial(graphics::MaterialPointer material) {
+    _drawMaterials.push(material);
+}
+
+void MeshPartPayload::removeMaterial(graphics::MaterialPointer material) {
+    _drawMaterials.remove(material);
 }
 
 void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits) {
@@ -85,8 +89,8 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits)
         builder.withLayered();
     }
 
-    if (_drawMaterial) {
-        auto matKey = _drawMaterial->getKey();
+    if (_drawMaterials.top()) {
+        auto matKey = _drawMaterials.top()->getKey();
         if (matKey.isTranslucent()) {
             builder.withTransparent();
         }
@@ -105,8 +109,8 @@ Item::Bound MeshPartPayload::getBound() const {
 
 ShapeKey MeshPartPayload::getShapeKey() const {
     graphics::MaterialKey drawMaterialKey;
-    if (_drawMaterial) {
-        drawMaterialKey = _drawMaterial->getKey();
+    if (_drawMaterials.top()) {
+        drawMaterialKey = _drawMaterials.top()->getKey();
     }
 
     ShapeKey::Builder builder;
@@ -160,7 +164,7 @@ void MeshPartPayload::render(RenderArgs* args) {
     bindMesh(batch);
 
     // apply material properties
-    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
+    args->_shapePipeline->bindMaterial(_drawMaterials.top(), batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
@@ -252,7 +256,7 @@ void ModelMeshPartPayload::initCache(const ModelPointer& model) {
 
     auto networkMaterial = model->getGeometry()->getShapeMaterial(_shapeID);
     if (networkMaterial) {
-        _drawMaterial = networkMaterial;
+        addMaterial(networkMaterial);
     }
 }
 
@@ -298,8 +302,8 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
         builder.withDeformed();
     }
 
-    if (_drawMaterial) {
-        auto matKey = _drawMaterial->getKey();
+    if (_drawMaterials.top()) {
+        auto matKey = _drawMaterials.top()->getKey();
         if (matKey.isTranslucent()) {
             builder.withTransparent();
         }
@@ -329,8 +333,8 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe
     }
 
     graphics::MaterialKey drawMaterialKey;
-    if (_drawMaterial) {
-        drawMaterialKey = _drawMaterial->getKey();
+    if (_drawMaterials.top()) {
+        drawMaterialKey = _drawMaterials.top()->getKey();
     }
 
     bool isTranslucent = drawMaterialKey.isTranslucent();
@@ -411,7 +415,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     bindMesh(batch);
 
     // apply material properties
-    args->_shapePipeline->bindMaterial(_drawMaterial, batch, args->_enableTexturing);
+    args->_shapePipeline->bindMaterial(_drawMaterials.top(), batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index b9ae47fb6a..e6893f1ea7 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -39,8 +39,6 @@ public:
     virtual void notifyLocationChanged() {}
     void updateTransform(const Transform& transform, const Transform& offsetTransform);
 
-    virtual void updateMaterial(graphics::MaterialPointer drawMaterial);
-
     // Render Item interface
     virtual render::ItemKey getKey() const;
     virtual render::Item::Bound getBound() const;
@@ -63,13 +61,16 @@ public:
     mutable graphics::Box _worldBound;
     std::shared_ptr<const graphics::Mesh> _drawMesh;
 
-    std::shared_ptr<graphics::Material> _drawMaterial;
+    graphics::MultiMaterial _drawMaterials;
     graphics::Mesh::Part _drawPart;
 
     size_t getVerticesCount() const { return _drawMesh ? _drawMesh->getNumVertices() : 0; }
-    size_t getMaterialTextureSize() { return _drawMaterial ? _drawMaterial->getTextureSize() : 0; }
-    int getMaterialTextureCount() { return _drawMaterial ? _drawMaterial->getTextureCount() : 0; }
-    bool hasTextureInfo() const { return _drawMaterial ? _drawMaterial->hasTextureInfo() : false; }
+    size_t getMaterialTextureSize() { return _drawMaterials.top() ? _drawMaterials.top()->getTextureSize() : 0; }
+    int getMaterialTextureCount() { return _drawMaterials.top() ? _drawMaterials.top()->getTextureCount() : 0; }
+    bool hasTextureInfo() const { return _drawMaterials.top() ? _drawMaterials.top()->hasTextureInfo() : false; }
+
+    void addMaterial(graphics::MaterialPointer material);
+    void removeMaterial(graphics::MaterialPointer material);
 
 protected:
     render::ItemKey _itemKey{ render::ItemKey::Builder::opaqueShape().build() };
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b9ccc28c01..805995edfb 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1524,6 +1524,50 @@ bool Model::isRenderable() const {
     return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
 }
 
+void Model::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    if (shapeID < _modelMeshRenderItemIDs.size()) {
+        render::Transaction transaction;
+        auto itemID = _modelMeshRenderItemIDs[shapeID];
+        bool visible = isVisible();
+        uint8_t viewTagBits = getViewTagBits();
+        bool layeredInFront = isLayeredInFront();
+        bool layeredInHUD = isLayeredInHUD();
+        bool wireframe = isWireframe();
+        auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
+        bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+        transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
+            invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+            data.addMaterial(material);
+            // if the material changed, we might need to update our item key or shape key
+            data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+            data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+        });
+        AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+    }
+}
+
+void Model::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+    if (shapeID < _modelMeshRenderItemIDs.size()) {
+        render::Transaction transaction;
+        auto itemID = _modelMeshRenderItemIDs[shapeID];
+        bool visible = isVisible();
+        uint8_t viewTagBits = getViewTagBits();
+        bool layeredInFront = isLayeredInFront();
+        bool layeredInHUD = isLayeredInHUD();
+        bool wireframe = isWireframe();
+        auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
+        bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+        transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
+            invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+            data.removeMaterial(material);
+            // if the material changed, we might need to update our item key or shape key
+            data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+            data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+        });
+        AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+    }
+}
+
 class CollisionRenderGeometry : public Geometry {
 public:
     CollisionRenderGeometry(graphics::MeshPointer mesh) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index ca0904f334..80067aff2a 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -318,6 +318,9 @@ public:
 
     void scaleToFit();
 
+    void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+
 public slots:
     void loadURLFinished(bool success);
 
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 1763713831..6196a4c5d4 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -342,7 +342,7 @@ var toolBar = (function () {
 
     var buttonHandlers = {}; // only used to tablet mode
 
-    function addButton(name, image, handler) {
+    function addButton(name, handler) {
         buttonHandlers[name] = handler;
     }
 
@@ -399,7 +399,7 @@ var toolBar = (function () {
 
     function handleNewMaterialDialogResult(result) {
         if (result) {
-            var json = result.textInput;
+            var materialURL = result.textInput;
             var materialMode;
             switch (result.comboBox) {
                 case MATERIAL_MODE_PROJECTED:
@@ -409,11 +409,13 @@ var toolBar = (function () {
                     shapeType = "uv";
             }
 
-            if (json) {
+            var DEFAULT_LAYERED_MATERIAL_PRIORITY = 1;
+            if (materialURL) {
                 createNewEntity({
                     type: "Material",
-                    materialURL: json,
-                    materialMode: materialMode
+                    materialURL: materialURL,
+                    materialMode: materialMode,
+                    priority: DEFAULT_LAYERED_MATERIAL_PRIORITY
                 });
             }
         }
@@ -475,32 +477,22 @@ var toolBar = (function () {
             that.toggle();
         });
 
-        addButton("importEntitiesButton", "assets-01.svg", function() {
+        addButton("importEntitiesButton", function() {
             Window.browseChanged.connect(onFileOpenChanged);
             Window.browseAsync("Select Model to Import", "", "*.json");
         });
 
-        addButton("openAssetBrowserButton", "assets-01.svg", function() {
+        addButton("openAssetBrowserButton", function() {
             Window.showAssetServer();
         });
 
-        addButton("newModelButton", "model-01.svg", function () {
-
-            var SHAPE_TYPES = [];
-            SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
-            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
-            SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
-            SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
-            SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
-            SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
-            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
-
+        addButton("newModelButton", function () {
             // tablet version of new-model dialog
             var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
             tablet.pushOntoStack("hifi/tablet/NewModelDialog.qml");
         });
 
-        addButton("newCubeButton", "cube-01.svg", function () {
+        addButton("newCubeButton", function () {
             createNewEntity({
                 type: "Box",
                 dimensions: DEFAULT_DIMENSIONS,
@@ -512,7 +504,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newSphereButton", "sphere-01.svg", function () {
+        addButton("newSphereButton", function () {
             createNewEntity({
                 type: "Sphere",
                 dimensions: DEFAULT_DIMENSIONS,
@@ -524,7 +516,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newLightButton", "light-01.svg", function () {
+        addButton("newLightButton", function () {
             createNewEntity({
                 type: "Light",
                 dimensions: DEFAULT_LIGHT_DIMENSIONS,
@@ -543,7 +535,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newTextButton", "text-01.svg", function () {
+        addButton("newTextButton", function () {
             createNewEntity({
                 type: "Text",
                 dimensions: {
@@ -566,7 +558,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newWebButton", "web-01.svg", function () {
+        addButton("newWebButton", function () {
             createNewEntity({
                 type: "Web",
                 dimensions: {
@@ -578,7 +570,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newZoneButton", "zone-01.svg", function () {
+        addButton("newZoneButton", function () {
             createNewEntity({
                 type: "Zone",
                 dimensions: {
@@ -589,7 +581,7 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newParticleButton", "particle-01.svg", function () {
+        addButton("newParticleButton", function () {
             createNewEntity({
                 type: "ParticleEffect",
                 isEmitting: true,
@@ -642,15 +634,10 @@ var toolBar = (function () {
             });
         });
 
-        addButton("newMaterialButton", "model-01.svg", function () {
-            var MATERIAL_MODES = [];
-            MATERIAL_MODES[MATERIAL_MODE_UV] = "UV space material";
-            MATERIAL_MODES[MATERIAL_MODE_PROJECTED] = "3D projected material";
-            var MATERIAL_MODE_DEFAULT = MATERIAL_MODE_UV;
-
+        addButton("newMaterialButton", function () {
             // tablet version of new material dialog
             var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-            tablet.pushOntoStack("NewMaterialDialog.qml");
+            tablet.pushOntoStack("hifi/tablet/NewMaterialDialog.qml");
         });
 
         that.setActive(false);
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 96084f355f..dd266311ea 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -645,14 +645,14 @@ hr {
     margin-left: 10px;
 }
 
-.text label, .url label, .number label, .textarea label, .rgb label, .xyz label, .pyr label, .dropdown label, .gen label {
+.text label, .url label, .number label, .textarea label, .xy label, .wh label, .rgb label, .xyz label,.pyr label, .dropdown label, .gen label {
     float: left;
     margin-left: 1px;
     margin-bottom: 3px;
     margin-top: -2px;
 }
 
-.text legend, .url legend, .number legend, .textarea legend, .rgb legend, .xyz legend, .pyr legend, .dropdown legend, .gen legend {
+.text legend, .url legend, .number legend, .textarea legend, .xy legend, .wh legend, .rgb legend, .xyz legend, .pyr legend, .dropdown legend, .gen legend {
     float: left;
     margin-left: 1px;
     margin-bottom: 3px;
@@ -667,7 +667,7 @@ hr {
     clear: both;
     float: left;
 }
-.xyz > div, .pyr > div, .gen > div {
+.xy > div, .wh > div, .xyz > div, .pyr > div, .gen > div {
     clear: both;
 }
 
@@ -841,6 +841,12 @@ div.refresh input[type="button"] {
     margin-right: -6px;
 }
 
+.xy .tuple input {
+    padding-left: 25px;
+}
+.wh .tuple input {
+    padding-left: 45px;
+}
 .rgb .tuple input {
     padding-left: 65px;
 }
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 93d22180c9..348d93d589 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -787,7 +787,7 @@
 
                 <div class="material-group material-section property number">
                     <label>Priority </label>
-                    <input type="number" id="property-priority">
+                    <input type="number" id="property-priority" min="0">
                 </div>
 
                 <div class="material-group material-section property number">
@@ -795,13 +795,26 @@
                     <input type="number" id="property-shape-id" min="0">
                 </div>
 
-                <div class="material-group material-section property tuple">
-                    <label>Material Bounds </label>
-                    <div><input type="number" class="x" id="property-material-bounds-x" min="0" max="1" step="0.1"><label for="property-material-bounds-x">Left:</label></div>
-                    <div><input type="number" class="y" id="property-material-bounds-y" min="0" max="1" step="0.1"><label for="property-material-bounds-y">Top:</label></div>
-                    <div><input type="number" class="z" id="property-material-bounds-z" min="0" max="1" step="0.1"><label for="property-material-bounds-z">Right:</label></div>
-                    <div><input type="number" class="w" id="property-material-bounds-w" min="0" max="1" step="0.1"><label for="property-material-bounds-w">Bottom:</label></div>
-                </div>
+                <fieldset>
+                    <div class="material-group material-section property xy fstuple">
+                        <label>Material Position </label>
+                        <div class="tuple">
+                            <div><input type="number" class="x" id="property-material-pos-x" min="0" max="1" step="0.1"><label for="property-material-pos-x">X:</label></div>
+                            <div><input type="number" class="y" id="property-material-pos-y" min="0" max="1" step="0.1"><label for="property-material-pos-y">Y:</label></div>
+                    </div>
+
+                    <div class="material-group material-section property wh fstuple">
+                        <label>Material Scale </label>
+                        <div class="tuple">
+                            <div><input type="number" class="x" id="property-material-scale-x" min="0" step="0.1"><label for="property-material-scale-x">Width:</label></div>
+                            <div><input type="number" class="y" id="property-material-scale-y" min="0" step="0.1"><label for="property-material-scale-y">Height:</label></div>
+                    </div>
+
+                    <div class="material-group material-section property number">
+                        <label>Material Rotation <span class="unit">deg</span></label>
+                        <input type="number" id="property-material-rot" step="0.1">
+                    </div>
+                </fieldset>
 
             </fieldset>
         </fieldset>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 64f706ce1f..3558a36c04 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -25,7 +25,7 @@ var ICON_FOR_TYPE = {
     PolyVox: "&#xe005;",
     Multiple: "&#xe000;",
     PolyLine: "&#xe01b;",
-    Material: "&#xe008;"
+    Material: "&#xe00b;"
 };
 
 var EDITOR_TIMEOUT_DURATION = 1500;
@@ -167,6 +167,17 @@ function createEmitGroupTextPropertyUpdateFunction(group, propertyName) {
     };
 }
 
+function createEmitVec2PropertyUpdateFunction(property, elX, elY) {
+    return function () {
+        var properties = {};
+        properties[property] = {
+            x: elX.value,
+            y: elY.value
+        };
+        updateProperties(properties);
+    };
+}
+
 function createEmitVec3PropertyUpdateFunction(property, elX, elY, elZ) {
     return function() {
         var properties = {};
@@ -192,19 +203,6 @@ function createEmitGroupVec3PropertyUpdateFunction(group, property, elX, elY, el
     };
 }
 
-function createEmitVec4PropertyUpdateFunction(property, elX, elY, elZ, elW) {
-    return function () {
-        var properties = {};
-        properties[property] = {
-            x: elX.value,
-            y: elY.value,
-            z: elZ.value,
-            w: elW.value
-        };
-        updateProperties(properties);
-    };
-}
-
 function createEmitVec3PropertyUpdateFunctionWithMultiplier(property, elX, elY, elZ, multiplier) {
     return function() {
         var properties = {};
@@ -638,10 +636,11 @@ function loaded() {
         var elBlendFactor = document.getElementById("property-blend-factor");
         var elPriority = document.getElementById("property-priority");
         var elShapeID = document.getElementById("property-shape-id");
-        var elMaterialBoundsX = document.getElementById("property-material-bounds-x");
-        var elMaterialBoundsY = document.getElementById("property-material-bounds-y");
-        var elMaterialBoundsZ = document.getElementById("property-material-bounds-z");
-        var elMaterialBoundsW = document.getElementById("property-material-bounds-w");
+        var elMaterialPosX = document.getElementById("property-material-pos-x");
+        var elMaterialPosY = document.getElementById("property-material-pos-y");
+        var elMaterialScaleX = document.getElementById("property-material-scale-x");
+        var elMaterialScaleY = document.getElementById("property-material-scale-y");
+        var elMaterialRot = document.getElementById("property-material-rot");
 
         var elWebSourceURL = document.getElementById("property-web-source-url");
         var elWebDPI = document.getElementById("property-web-dpi");
@@ -1134,10 +1133,11 @@ function loaded() {
                             elBlendFactor.value = properties.blendFactor.toFixed(2);
                             elPriority.value = properties.priority;
                             elShapeID.value = properties.shapeID;
-                            elMaterialBoundsX.value = properties.materialBounds.x.toFixed(2);
-                            elMaterialBoundsY.value = properties.materialBounds.y.toFixed(2);
-                            elMaterialBoundsZ.value = properties.materialBounds.z.toFixed(2);
-                            //elMaterialBoundsW.value = properties.materialBounds.w.toFixed(2);
+                            elMaterialPosX.value = properties.materialPos.x.toFixed(4);
+                            elMaterialPosY.value = properties.materialPos.y.toFixed(4);
+                            elMaterialScaleX.value = properties.materialScale.x.toFixed(4);
+                            elMaterialScaleY.value = properties.materialScale.y.toFixed(4);
+                            elMaterialRot.value = properties.materialRot.toFixed(2);
                         }
 
                         if (properties.locked) {
@@ -1411,15 +1411,16 @@ function loaded() {
         elMaterialURL.addEventListener('change', createEmitTextPropertyUpdateFunction('materialURL'));
         elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
         elBlendFactor.addEventListener('change', createEmitNumberPropertyUpdateFunction('blendFactor', 2));
-        elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority'));
-        elShapeID.addEventListener('change', createEmitNumberPropertyUpdateFunction('shapeID'));
+        elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority', 0));
+        elShapeID.addEventListener('change', createEmitNumberPropertyUpdateFunction('shapeID', 0));
 
-        var materialBoundsChangeFunction = createEmitVec4PropertyUpdateFunction('materialBounds',
-            elMaterialBoundsX, elMaterialBoundsY, elMaterialBoundsZ, elMaterialBoundsW);
-        elMaterialBoundsX.addEventListener('change', materialBoundsChangeFunction);
-        elMaterialBoundsY.addEventListener('change', materialBoundsChangeFunction);
-        elMaterialBoundsZ.addEventListener('change', materialBoundsChangeFunction);
-        elMaterialBoundsW.addEventListener('change', materialBoundsChangeFunction);
+        var materialPosChangeFunction = createEmitVec2PropertyUpdateFunction('materialPos', elMaterialPosX, elMaterialPosY);
+        elMaterialPosX.addEventListener('change', materialPosChangeFunction);
+        elMaterialPosY.addEventListener('change', materialPosChangeFunction);
+        var materialScaleChangeFunction = createEmitVec2PropertyUpdateFunction('materialScale', elMaterialScaleX, elMaterialScaleY);
+        elMaterialScaleX.addEventListener('change', materialScaleChangeFunction);
+        elMaterialScaleY.addEventListener('change', materialScaleChangeFunction);
+        elMaterialRot.addEventListener('change', createEmitNumberPropertyUpdateFunction('materialRot', 2));
 
         elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text'));
         elTextFaceCamera.addEventListener('change', createEmitCheckedPropertyUpdateFunction('faceCamera'));
diff --git a/tools/jsdoc/package-lock.json b/tools/jsdoc/package-lock.json
new file mode 100644
index 0000000000..073bbf60f6
--- /dev/null
+++ b/tools/jsdoc/package-lock.json
@@ -0,0 +1,138 @@
+{
+  "name": "hifiJSDoc",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "babylon": {
+      "version": "7.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
+      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A=="
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+    },
+    "catharsis": {
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
+      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+      "requires": {
+        "underscore-contrib": "0.3.0"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "js2xmlparser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
+      "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
+      "requires": {
+        "xmlcreate": "1.0.2"
+      }
+    },
+    "jsdoc": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
+      "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
+      "requires": {
+        "babylon": "7.0.0-beta.19",
+        "bluebird": "3.5.1",
+        "catharsis": "0.8.9",
+        "escape-string-regexp": "1.0.5",
+        "js2xmlparser": "3.0.0",
+        "klaw": "2.0.0",
+        "marked": "0.3.12",
+        "mkdirp": "0.5.1",
+        "requizzle": "0.2.1",
+        "strip-json-comments": "2.0.1",
+        "taffydb": "2.6.2",
+        "underscore": "1.8.3"
+      }
+    },
+    "klaw": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
+      "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "marked": {
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
+      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA=="
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "requizzle": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
+      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+      "requires": {
+        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+        }
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg="
+    },
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+    },
+    "underscore-contrib": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+      "requires": {
+        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+        }
+      }
+    },
+    "xmlcreate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
+      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
+    }
+  }
+}

From 35bf8f1d01f6b1bb8172eb887cf354e08afa7558 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 16:24:54 -0500
Subject: [PATCH 169/569] [Case 4315] ESLint Pass; Simple errors addressed
 (details below).

Initial ESLint Pass on colpick.js.
Issue Count reduced from 185 to 100 via:
    eslint -c .eslintrc.js scripts/system/html/js/colpick.js --fix

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 149 +++++++++++++++++-------------
 1 file changed, 85 insertions(+), 64 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 99054c6103..b19cbe0bae 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -25,15 +25,15 @@ For usage and examples: colpick.com/plugin
                 submitText: 'OK',
                 height: 156
             },
-            //Fill the inputs of the plugin
-            fillRGBFields = function  (hsb, cal) {
+            // Fill the inputs of the plugin
+            fillRGBFields = function (hsb, cal) {
                 var rgb = hsbToRgb(hsb);
                 $(cal).data('colpick').fields
                     .eq(1).val(rgb.r).end()
                     .eq(2).val(rgb.g).end()
                     .eq(3).val(rgb.b).end();
             },
-            fillHSBFields = function  (hsb, cal) {
+            fillHSBFields = function (hsb, cal) {
                 $(cal).data('colpick').fields
                     .eq(4).val(Math.round(hsb.h)).end()
                     .eq(5).val(Math.round(hsb.s)).end()
@@ -42,7 +42,7 @@ For usage and examples: colpick.com/plugin
             fillHexFields = function (hsb, cal) {
                 $(cal).data('colpick').fields.eq(0).val(hsbToHex(hsb));
             },
-            //Set the round selector position
+            // Set the round selector position
             setSelector = function (hsb, cal) {
                 $(cal).data('colpick').selector.css('backgroundColor', '#' + hsbToHex({h: hsb.h, s: 100, b: 100}));
                 $(cal).data('colpick').selectorIndic.css({
@@ -50,18 +50,18 @@ For usage and examples: colpick.com/plugin
                     top: parseInt($(cal).data('colpick').height * (100-hsb.b)/100, 10)
                 });
             },
-            //Set the hue selector position
+            // Set the hue selector position
             setHue = function (hsb, cal) {
                 $(cal).data('colpick').hue.css('top', parseInt($(cal).data('colpick').height - $(cal).data('colpick').height * hsb.h/360, 10));
             },
-            //Set current and new colors
+            // Set current and new colors
             setCurrentColor = function (hsb, cal) {
                 $(cal).data('colpick').currentColor.css('backgroundColor', '#' + hsbToHex(hsb));
             },
             setNewColor = function (hsb, cal) {
                 $(cal).data('colpick').newColor.css('backgroundColor', '#' + hsbToHex(hsb));
             },
-            //Called when the new color is changed
+            // Called when the new color is changed
             change = function (ev) {
                 var cal = $(this).parent().parent(), col;
                 if (this.parentNode.className.indexOf('_hex') > 0) {
@@ -93,7 +93,7 @@ For usage and examples: colpick.com/plugin
                 setNewColor(col, cal.get(0));
                 cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 0]);
             },
-            //Change style on blur and on focus of inputs
+            // Change style on blur and on focus of inputs
             blur = function (ev) {
                 $(this).parent().removeClass('colpick_focus');
             },
@@ -101,7 +101,7 @@ For usage and examples: colpick.com/plugin
                 $(this).parent().parent().data('colpick').fields.parent().removeClass('colpick_focus');
                 $(this).parent().addClass('colpick_focus');
             },
-            //Increment/decrement arrows functions
+            // Increment/decrement arrows functions
             downIncrement = function (ev) {
                 ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
                 var field = $(this).parent().find('input').focus();
@@ -130,7 +130,7 @@ For usage and examples: colpick.com/plugin
                 $(document).off('mousemove', moveIncrement);
                 return false;
             },
-            //Hue slider functions
+            // Hue slider functions
             downHue = function (ev) {
                 ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
                 var current = {
@@ -143,7 +143,7 @@ For usage and examples: colpick.com/plugin
                 var pageY = ((ev.type == 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     current.cal.data('colpick')
-                    .fields.eq(4).val(parseInt(360*(current.cal.data('colpick').height - (pageY - current.y))/current.cal.data('colpick').height, 10))
+                        .fields.eq(4).val(parseInt(360*(current.cal.data('colpick').height - (pageY - current.y))/current.cal.data('colpick').height, 10))
                         .get(0),
                     [current.cal.data('colpick').livePreview]
                 );
@@ -153,7 +153,7 @@ For usage and examples: colpick.com/plugin
                 var pageY = ((ev.type == 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     ev.data.cal.data('colpick')
-                    .fields.eq(4).val(parseInt(360*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.y))))/ev.data.cal.data('colpick').height, 10))
+                        .fields.eq(4).val(parseInt(360*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.y))))/ev.data.cal.data('colpick').height, 10))
                         .get(0),
                     [ev.data.preview]
                 );
@@ -166,7 +166,7 @@ For usage and examples: colpick.com/plugin
                 $(document).off('mousemove touchmove',moveHue);
                 return false;
             },
-            //Color selector functions
+            // Color selector functions
             downSelector = function (ev) {
                 ev.preventDefault ? ev.preventDefault() : ev.returnValue = false;
                 var current = {
@@ -179,7 +179,7 @@ For usage and examples: colpick.com/plugin
                 $(document).on('mousemove touchmove',current,moveSelector);
 
                 var payeX,pageY;
-                if(ev.type == 'touchstart') {
+                if (ev.type == 'touchstart') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
                 } else {
@@ -189,16 +189,16 @@ For usage and examples: colpick.com/plugin
 
                 change.apply(
                     current.cal.data('colpick').fields
-                    .eq(6).val(parseInt(100*(current.cal.data('colpick').height - (pageY - current.pos.top))/current.cal.data('colpick').height, 10)).end()
-                    .eq(5).val(parseInt(100*(pageX - current.pos.left)/current.cal.data('colpick').height, 10))
-                    .get(0),
+                        .eq(6).val(parseInt(100*(current.cal.data('colpick').height - (pageY - current.pos.top))/current.cal.data('colpick').height, 10)).end()
+                        .eq(5).val(parseInt(100*(pageX - current.pos.left)/current.cal.data('colpick').height, 10))
+                        .get(0),
                     [current.preview]
                 );
                 return false;
             },
             moveSelector = function (ev) {
                 var payeX,pageY;
-                if(ev.type == 'touchmove') {
+                if (ev.type == 'touchmove') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
                 } else {
@@ -208,9 +208,9 @@ For usage and examples: colpick.com/plugin
 
                 change.apply(
                     ev.data.cal.data('colpick').fields
-                    .eq(6).val(parseInt(100*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.pos.top))))/ev.data.cal.data('colpick').height, 10)).end()
-                    .eq(5).val(parseInt(100*(Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageX - ev.data.pos.left))))/ev.data.cal.data('colpick').height, 10))
-                    .get(0),
+                        .eq(6).val(parseInt(100*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.pos.top))))/ev.data.cal.data('colpick').height, 10)).end()
+                        .eq(5).val(parseInt(100*(Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageX - ev.data.pos.left))))/ev.data.cal.data('colpick').height, 10))
+                        .get(0),
                     [ev.data.preview]
                 );
                 return false;
@@ -222,7 +222,7 @@ For usage and examples: colpick.com/plugin
                 $(document).off('mousemove touchmove',moveSelector);
                 return false;
             },
-            //Submit button
+            // Submit button
             clickSubmit = function (ev) {
                 var cal = $(this).parent();
                 var col = cal.data('colpick').color;
@@ -230,7 +230,7 @@ For usage and examples: colpick.com/plugin
                 setCurrentColor(col, cal.get(0));
                 cal.data('colpick').onSubmit(col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el);
             },
-            //Show/hide the color picker
+            // Show/hide the color picker
             show = function (ev) {
                 // Prevent the trigger of any direct parent
                 ev.stopPropagation();
@@ -248,9 +248,11 @@ For usage and examples: colpick.com/plugin
                 if (cal.data('colpick').onShow.apply(this, [cal.get(0)]) != false) {
                     cal.show();
                 }
-                //Hide when user clicks outside
+                // Hide when user clicks outside
                 $('html').mousedown({cal:cal}, hide);
-                cal.mousedown(function(ev){ev.stopPropagation();})
+                cal.mousedown(function(ev){
+                    ev.stopPropagation();
+                });
             },
             hide = function (ev) {
                 if (ev.data.cal.data('colpick').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
@@ -265,7 +267,7 @@ For usage and examples: colpick.com/plugin
                     w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth)
                 };
             },
-            //Fix the values if the user enters a negative or high value
+            // Fix the values if the user enters a negative or high value
             fixHSB = function (hsb) {
                 return {
                     h: Math.min(360, Math.max(0, hsb.h)),
@@ -309,8 +311,8 @@ For usage and examples: colpick.com/plugin
         return {
             init: function (opt) {
                 opt = $.extend({}, defaults, opt||{});
-                //Set color
-                if (typeof opt.color == 'string') {
+                // Set color
+                if (typeof opt.color === 'string') {
                     opt.color = hexToHsb(opt.color);
                 } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
                     opt.color = rgbToHsb(opt.color);
@@ -320,44 +322,44 @@ For usage and examples: colpick.com/plugin
                     return this;
                 }
                 
-                //For each selected DOM element
+                // For each selected DOM element
                 return this.each(function () {
-                    //If the element does not have an ID
+                    // If the element does not have an ID
                     if (!$(this).data('colpickId')) {
                         var options = $.extend({}, opt);
                         options.origColor = opt.color;
-                        //Generate and assign a random ID
+                        // Generate and assign a random ID
                         var id = 'collorpicker_' + parseInt(Math.random() * 1000);
                         $(this).data('colpickId', id);
-                        //Set the tpl's ID and get the HTML
+                        // Set the tpl's ID and get the HTML
                         var cal = $(tpl).attr('id', id);
-                        //Add class according to layout
+                        // Add class according to layout
                         cal.addClass('colpick_'+options.layout+(options.submit?'':' colpick_'+options.layout+'_ns'));
-                        //Add class if the color scheme is not default
-                        if(options.colorScheme != 'light') {
+                        // Add class if the color scheme is not default
+                        if (options.colorScheme != 'light') {
                             cal.addClass('colpick_'+options.colorScheme);
                         }
-                        //Setup submit button
+                        // Setup submit button
                         cal.find('div.colpick_submit').html(options.submitText).click(clickSubmit);
-                        //Setup input fields
+                        // Setup input fields
                         options.fields = cal.find('input').change(change).blur(blur).focus(focus);
                         cal.find('div.colpick_field_arrs').mousedown(downIncrement).end().find('div.colpick_current_color').click(restoreOriginal);
-                        //Setup hue selector
+                        // Setup hue selector
                         options.selector = cal.find('div.colpick_color').on('mousedown touchstart',downSelector);
                         options.selectorIndic = options.selector.find('div.colpick_selector_outer');
-                        //Store parts of the plugin
+                        // Store parts of the plugin
                         options.el = this;
                         options.hue = cal.find('div.colpick_hue_arrs');
                         huebar = options.hue.parent();
-                        //Paint the hue bar
+                        // Paint the hue bar
                         var UA = navigator.userAgent.toLowerCase();
                         var isIE = navigator.appName === 'Microsoft Internet Explorer';
                         var IEver = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
                         var ngIE = ( isIE && IEver < 10 );
                         var stops = ['#ff0000','#ff0080','#ff00ff','#8000ff','#0000ff','#0080ff','#00ffff','#00ff80','#00ff00','#80ff00','#ffff00','#ff8000','#ff0000'];
-                        if(ngIE) {
+                        if (ngIE) {
                             var i, div;
-                            for(i=0; i<=11; i++) {
+                            for (i=0; i<=11; i++) {
                                 div = $('<div></div>').attr('style','height:8.333333%; filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+')";');
                                 huebar.append(div);
                             }
@@ -368,7 +370,7 @@ For usage and examples: colpick.com/plugin
                         cal.find('div.colpick_hue').on('mousedown touchstart',downHue);
                         options.newColor = cal.find('div.colpick_new_color');
                         options.currentColor = cal.find('div.colpick_current_color');
-                        //Store options and fill with default color
+                        // Store options and fill with default color
                         cal.data('colpick', options);
                         fillRGBFields(options.color, cal.get(0));
                         fillHSBFields(options.color, cal.get(0));
@@ -377,7 +379,7 @@ For usage and examples: colpick.com/plugin
                         setSelector(options.color, cal.get(0));
                         setCurrentColor(options.color, cal.get(0));
                         setNewColor(options.color, cal.get(0));
-                        //Append to body if flat=false, else show in place
+                        // Append to body if flat=false, else show in place
                         if (options.flat) {
                             cal.appendTo(this).show();
                             cal.css({
@@ -394,7 +396,7 @@ For usage and examples: colpick.com/plugin
                     }
                 });
             },
-            //Shows the picker
+            // Shows the picker
             showPicker: function() {
                 return this.each( function () {
                     if ($(this).data('colpickId')) {
@@ -402,7 +404,7 @@ For usage and examples: colpick.com/plugin
                     }
                 });
             },
-            //Hides the picker
+            // Hides the picker
             hidePicker: function() {
                 return this.each( function () {
                     if ($(this).data('colpickId')) {
@@ -410,10 +412,10 @@ For usage and examples: colpick.com/plugin
                     }
                 });
             },
-            //Sets a color as new and current (default)
+            // Sets a color as new and current (default)
             setColor: function(col, setCurrent) {
                 setCurrent = (typeof setCurrent === "undefined") ? 1 : setCurrent;
-                if (typeof col == 'string') {
+                if (typeof col === 'string') {
                     col = hexToHsb(col);
                 } else if (col.r != undefined && col.g != undefined && col.b != undefined) {
                     col = rgbToHsb(col);
@@ -435,7 +437,7 @@ For usage and examples: colpick.com/plugin
                         
                         setNewColor(col, cal.get(0));
                         cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 1]);
-                        if(setCurrent) {
+                        if (setCurrent) {
                             setCurrentColor(col, cal.get(0));
                         }
                     }
@@ -443,7 +445,7 @@ For usage and examples: colpick.com/plugin
             }
         };
     }();
-    //Color space convertions
+    // Color space convertions
     var hexToRgb = function (hex) {
         var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
         return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
@@ -459,12 +461,20 @@ For usage and examples: colpick.com/plugin
         hsb.b = max;
         hsb.s = max != 0 ? 255 * delta / max : 0;
         if (hsb.s != 0) {
-            if (rgb.r == max) hsb.h = (rgb.g - rgb.b) / delta;
-            else if (rgb.g == max) hsb.h = 2 + (rgb.b - rgb.r) / delta;
-            else hsb.h = 4 + (rgb.r - rgb.g) / delta;
-        } else hsb.h = -1;
+            if (rgb.r == max) {
+                hsb.h = (rgb.g - rgb.b) / delta;
+            } else if (rgb.g == max) {
+                hsb.h = 2 + (rgb.b - rgb.r) / delta;
+            } else {
+                hsb.h = 4 + (rgb.r - rgb.g) / delta;
+            }
+        } else {
+            hsb.h = -1;
+        }
         hsb.h *= 60;
-        if (hsb.h < 0) hsb.h += 360;
+        if (hsb.h < 0) {
+            hsb.h += 360;
+        }
         hsb.s *= 100/255;
         hsb.b *= 100/255;
         return hsb;
@@ -474,20 +484,30 @@ For usage and examples: colpick.com/plugin
         var h = hsb.h;
         var s = hsb.s*255/100;
         var v = hsb.b*255/100;
-        if(s == 0) {
+        if (s == 0) {
             rgb.r = rgb.g = rgb.b = v;
         } else {
             var t1 = v;
             var t2 = (255-s)*v/255;
             var t3 = (t1-t2)*(h%60)/60;
-            if(h==360) h = 0;
-            if(h<60) {rgb.r=t1;    rgb.b=t2; rgb.g=t2+t3}
-            else if(h<120) {rgb.g=t1; rgb.b=t2;    rgb.r=t1-t3}
-            else if(h<180) {rgb.g=t1; rgb.r=t2;    rgb.b=t2+t3}
-            else if(h<240) {rgb.b=t1; rgb.r=t2;    rgb.g=t1-t3}
-            else if(h<300) {rgb.b=t1; rgb.g=t2;    rgb.r=t2+t3}
-            else if(h<360) {rgb.r=t1; rgb.g=t2;    rgb.b=t1-t3}
-            else {rgb.r=0; rgb.g=0;    rgb.b=0}
+            if (h==360) {
+                h = 0;
+            }
+            if (h<60) {
+                rgb.r=t1; rgb.b=t2; rgb.g=t2+t3;
+            } else if (h<120) {
+                rgb.g=t1; rgb.b=t2; rgb.r=t1-t3;
+            } else if (h<180) {
+                rgb.g=t1; rgb.r=t2; rgb.b=t2+t3;
+            } else if (h<240) {
+                rgb.b=t1; rgb.r=t2; rgb.g=t1-t3;
+            } else if (h<300) {
+                rgb.b=t1; rgb.g=t2; rgb.r=t2+t3;
+            } else if (h<360) {
+                rgb.r=t1; rgb.g=t2; rgb.b=t1-t3;
+            } else {
+                rgb.r=0; rgb.g=0; rgb.b=0;
+            }
         }
         return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
     };
@@ -524,3 +544,4 @@ For usage and examples: colpick.com/plugin
         }
     });
 })(jQuery);
+

From 691aafcf29e20ef2507cf71c3ea1b383fb0f2242 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 16:42:43 -0500
Subject: [PATCH 170/569] [Case 4315] ESLint Pass 2 for colpick.js (details
 below).

Resolves all error Line <x> exceeds the maximum line length of 128  max-len issues.
Issue Count reduced from 85 to 70.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 78 +++++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 15 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index b19cbe0bae..feb584aa1d 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -1,6 +1,7 @@
 /*
 colpick Color Picker
-Copyright 2013 Jose Vargas. Licensed under GPL license. Based on Stefan Petre's Color Picker www.eyecon.ro, dual licensed under the MIT and GPL licenses
+Copyright 2013 Jose Vargas. Licensed under GPL license. Based on Stefan Petre's Color Picker www.eyecon.ro, dual licensed 
+under the MIT and GPL licenses
 
 For usage and examples: colpick.com/plugin
  */
@@ -8,7 +9,31 @@ For usage and examples: colpick.com/plugin
 (function ($) {
     var colpick = function () {
         var
-            tpl = '<div class="colpick"><div class="colpick_color"><div class="colpick_color_overlay1"><div class="colpick_color_overlay2"><div class="colpick_selector_outer"><div class="colpick_selector_inner"></div></div></div></div></div><div class="colpick_hue"><div class="colpick_hue_arrs"><div class="colpick_hue_larr"></div><div class="colpick_hue_rarr"></div></div></div><div class="colpick_new_color"></div><div class="colpick_current_color"></div><div class="colpick_hex_field"><div class="colpick_field_letter">#</div><input type="text" maxlength="6" size="6" /></div><div class="colpick_rgb_r colpick_field"><div class="colpick_field_letter">R</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_rgb_g colpick_field"><div class="colpick_field_letter">G</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_rgb_b colpick_field"><div class="colpick_field_letter">B</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_h colpick_field"><div class="colpick_field_letter">H</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_s colpick_field"><div class="colpick_field_letter">S</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_hsb_b colpick_field"><div class="colpick_field_letter">B</div><input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div><div class="colpick_submit"></div></div>',
+            tpl = '<div class="colpick"><div class="colpick_color"><div class="colpick_color_overlay1">' +
+                '<div class="colpick_color_overlay2"><div class="colpick_selector_outer"><div class="colpick_selector_inner">' +
+                '</div></div></div></div></div><div class="colpick_hue"><div class="colpick_hue_arrs">' +
+                '<div class="colpick_hue_larr"></div><div class="colpick_hue_rarr"></div></div></div>' +
+                '<div class="colpick_new_color"></div><div class="colpick_current_color"></div>' +
+                '<div class="colpick_hex_field"><div class="colpick_field_letter">#</div>' +
+                '<input type="text" maxlength="6" size="6" /></div><div class="colpick_rgb_r colpick_field">' +
+                '<div class="colpick_field_letter">R</div><input type="text" maxlength="3" size="3" />' +
+                '<div class="colpick_field_arrs"><div class="colpick_field_uarr"></div>' +
+                '<div class="colpick_field_darr"></div></div></div><div class="colpick_rgb_g colpick_field">' +
+                '<div class="colpick_field_letter">G</div><input type="text" maxlength="3" size="3" />' +
+                '<div class="colpick_field_arrs"><div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div>' +
+                '</div></div><div class="colpick_rgb_b colpick_field"><div class="colpick_field_letter">B</div>' +
+                '<input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs">' +
+                '<div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div>' +
+                '<div class="colpick_hsb_h colpick_field"><div class="colpick_field_letter">H</div>' +
+                '<input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs">' +
+                '<div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div>' +
+                '<div class="colpick_hsb_s colpick_field"><div class="colpick_field_letter">S</div>' +
+                '<input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs">' +
+                '<div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div>' +
+                '<div class="colpick_hsb_b colpick_field"><div class="colpick_field_letter">B</div>' +
+                '<input type="text" maxlength="3" size="3" /><div class="colpick_field_arrs">' +
+                '<div class="colpick_field_uarr"></div><div class="colpick_field_darr"></div></div></div>' +
+                '<div class="colpick_submit"></div></div>',
             defaults = {
                 showEvent: 'click',
                 onShow: function () {},
@@ -52,7 +77,8 @@ For usage and examples: colpick.com/plugin
             },
             // Set the hue selector position
             setHue = function (hsb, cal) {
-                $(cal).data('colpick').hue.css('top', parseInt($(cal).data('colpick').height - $(cal).data('colpick').height * hsb.h/360, 10));
+                $(cal).data('colpick').hue.css('top',
+                    parseInt($(cal).data('colpick').height - $(cal).data('colpick').height * hsb.h / 360, 10));
             },
             // Set current and new colors
             setCurrentColor = function (hsb, cal) {
@@ -91,7 +117,8 @@ For usage and examples: colpick.com/plugin
                 setSelector(col, cal.get(0));
                 setHue(col, cal.get(0));
                 setNewColor(col, cal.get(0));
-                cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 0]);
+                cal.data('colpick').onChange.apply(cal.parent(),
+                    [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 0]);
             },
             // Change style on blur and on focus of inputs
             blur = function (ev) {
@@ -107,7 +134,8 @@ For usage and examples: colpick.com/plugin
                 var field = $(this).parent().find('input').focus();
                 var current = {
                     el: $(this).parent().addClass('colpick_slider'),
-                    max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
+                    max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 :
+                        (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
                     y: ev.pageY,
                     field: field,
                     val: parseInt(field.val(), 10),
@@ -143,7 +171,8 @@ For usage and examples: colpick.com/plugin
                 var pageY = ((ev.type == 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     current.cal.data('colpick')
-                        .fields.eq(4).val(parseInt(360*(current.cal.data('colpick').height - (pageY - current.y))/current.cal.data('colpick').height, 10))
+                        .fields.eq(4).val(parseInt(360 * (current.cal.data('colpick').height -
+                            (pageY - current.y)) / current.cal.data('colpick').height, 10))
                         .get(0),
                     [current.cal.data('colpick').livePreview]
                 );
@@ -153,7 +182,9 @@ For usage and examples: colpick.com/plugin
                 var pageY = ((ev.type == 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     ev.data.cal.data('colpick')
-                        .fields.eq(4).val(parseInt(360*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.y))))/ev.data.cal.data('colpick').height, 10))
+                        .fields.eq(4).val(parseInt(360 * (ev.data.cal.data('colpick').height -
+                            Math.max(0, Math.min(ev.data.cal.data('colpick').height, (pageY - ev.data.y)))) /
+                            ev.data.cal.data('colpick').height, 10))
                         .get(0),
                     [ev.data.preview]
                 );
@@ -189,7 +220,8 @@ For usage and examples: colpick.com/plugin
 
                 change.apply(
                     current.cal.data('colpick').fields
-                        .eq(6).val(parseInt(100*(current.cal.data('colpick').height - (pageY - current.pos.top))/current.cal.data('colpick').height, 10)).end()
+                        .eq(6).val(parseInt(100 * (current.cal.data('colpick').height - (pageY - current.pos.top)) /
+                            current.cal.data('colpick').height, 10)).end()
                         .eq(5).val(parseInt(100*(pageX - current.pos.left)/current.cal.data('colpick').height, 10))
                         .get(0),
                     [current.preview]
@@ -208,8 +240,11 @@ For usage and examples: colpick.com/plugin
 
                 change.apply(
                     ev.data.cal.data('colpick').fields
-                        .eq(6).val(parseInt(100*(ev.data.cal.data('colpick').height - Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageY - ev.data.pos.top))))/ev.data.cal.data('colpick').height, 10)).end()
-                        .eq(5).val(parseInt(100*(Math.max(0,Math.min(ev.data.cal.data('colpick').height,(pageX - ev.data.pos.left))))/ev.data.cal.data('colpick').height, 10))
+                        .eq(6).val(parseInt(100 * (ev.data.cal.data('colpick').height -
+                            Math.max(0, Math.min(ev.data.cal.data('colpick').height, (pageY - ev.data.pos.top)))) /
+                            ev.data.cal.data('colpick').height, 10)).end()
+                        .eq(5).val(parseInt(100 * (Math.max(0, Math.min(ev.data.cal.data('colpick').height,
+                            (pageX - ev.data.pos.left)))) / ev.data.cal.data('colpick').height, 10))
                         .get(0),
                     [ev.data.preview]
                 );
@@ -343,7 +378,8 @@ For usage and examples: colpick.com/plugin
                         cal.find('div.colpick_submit').html(options.submitText).click(clickSubmit);
                         // Setup input fields
                         options.fields = cal.find('input').change(change).blur(blur).focus(focus);
-                        cal.find('div.colpick_field_arrs').mousedown(downIncrement).end().find('div.colpick_current_color').click(restoreOriginal);
+                        cal.find('div.colpick_field_arrs').mousedown(downIncrement);
+                        cal.find('div.colpick_current_color').click(restoreOriginal);
                         // Setup hue selector
                         options.selector = cal.find('div.colpick_color').on('mousedown touchstart',downSelector);
                         options.selectorIndic = options.selector.find('div.colpick_selector_outer');
@@ -356,16 +392,27 @@ For usage and examples: colpick.com/plugin
                         var isIE = navigator.appName === 'Microsoft Internet Explorer';
                         var IEver = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
                         var ngIE = ( isIE && IEver < 10 );
-                        var stops = ['#ff0000','#ff0080','#ff00ff','#8000ff','#0000ff','#0080ff','#00ffff','#00ff80','#00ff00','#80ff00','#ffff00','#ff8000','#ff0000'];
+                        var stops = ['#ff0000', '#ff0080', '#ff00ff', '#8000ff', '#0000ff', '#0080ff', '#00ffff', '#00ff80',
+                            '#00ff00', '#80ff00', '#ffff00', '#ff8000', '#ff0000'];
                         if (ngIE) {
                             var i, div;
                             for (i=0; i<=11; i++) {
-                                div = $('<div></div>').attr('style','height:8.333333%; filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='+stops[i]+', endColorstr='+stops[i+1]+')";');
+                                div = $('<div></div>').attr('style',
+                                    'height:8.333333%; filter:progid:' +
+                                    'DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=' + stops[i] +
+                                    ', endColorstr=' + stops[i + 1] +
+                                    '); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=' +
+                                    stops[i] + ', endColorstr=' + stops[i + 1] + ')";');
                                 huebar.append(div);
                             }
                         } else {
                             stopList = stops.join(',');
-                            huebar.attr('style','background:-webkit-linear-gradient(top,'+stopList+'); background: -o-linear-gradient(top,'+stopList+'); background: -ms-linear-gradient(top,'+stopList+'); background:-moz-linear-gradient(top,'+stopList+'); -webkit-linear-gradient(top,'+stopList+'); background:linear-gradient(to bottom,'+stopList+'); ');
+                            huebar.attr('style', 'background:-webkit-linear-gradient(top,' + stopList +
+                                '); background: -o-linear-gradient(top,' + stopList +
+                                '); background: -ms-linear-gradient(top,' + stopList +
+                                '); background:-moz-linear-gradient(top,' + stopList +
+                                '); -webkit-linear-gradient(top,' + stopList +
+                                '); background:linear-gradient(to bottom,' + stopList + '); ');
                         }
                         cal.find('div.colpick_hue').on('mousedown touchstart',downHue);
                         options.newColor = cal.find('div.colpick_new_color');
@@ -436,7 +483,8 @@ For usage and examples: colpick.com/plugin
                         setSelector(col, cal.get(0));
                         
                         setNewColor(col, cal.get(0));
-                        cal.data('colpick').onChange.apply(cal.parent(), [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 1]);
+                        cal.data('colpick').onChange.apply(cal.parent(),
+                            [col, hsbToHex(col), hsbToRgb(col), cal.data('colpick').el, 1]);
                         if (setCurrent) {
                             setCurrentColor(col, cal.get(0));
                         }

From 0a1e05326eeea6fdbb95aaf9176f19792ff6580e Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 16:49:44 -0500
Subject: [PATCH 171/569] [Case 4315] ESLint Pass 3, adds global declarations
 (details below).

This resolves 23 error <x> is not defined no-undef errors related to global objects.
Issue Count reduced from 70 to 47.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index feb584aa1d..0ac6996bde 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -6,6 +6,8 @@ under the MIT and GPL licenses
 For usage and examples: colpick.com/plugin
  */
 
+/* global console, document, Element, EventBridge, jQuery, navigator, window, _ $ */
+
 (function ($) {
     var colpick = function () {
         var

From ef1fd19a982a67a5c1653671226d33f43c86f673 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 17:01:52 -0500
Subject: [PATCH 172/569] [Case 4315] ESLint Pass 4 for colpick.js (details
 below).

Resolved payeX vs pageX issues.
Resolved stopList & huebar undefined issues.

Issue Count reduced from 47 to 29.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 0ac6996bde..44e887056a 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -211,7 +211,7 @@ For usage and examples: colpick.com/plugin
                 $(document).on('mouseup touchend',current,upSelector);
                 $(document).on('mousemove touchmove',current,moveSelector);
 
-                var payeX,pageY;
+                var pageX,pageY;
                 if (ev.type == 'touchstart') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
@@ -231,7 +231,7 @@ For usage and examples: colpick.com/plugin
                 return false;
             },
             moveSelector = function (ev) {
-                var payeX,pageY;
+                var pageX,pageY;
                 if (ev.type == 'touchmove') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
@@ -388,7 +388,7 @@ For usage and examples: colpick.com/plugin
                         // Store parts of the plugin
                         options.el = this;
                         options.hue = cal.find('div.colpick_hue_arrs');
-                        huebar = options.hue.parent();
+                        var huebar = options.hue.parent();
                         // Paint the hue bar
                         var UA = navigator.userAgent.toLowerCase();
                         var isIE = navigator.appName === 'Microsoft Internet Explorer';
@@ -408,7 +408,7 @@ For usage and examples: colpick.com/plugin
                                 huebar.append(div);
                             }
                         } else {
-                            stopList = stops.join(',');
+                            var stopList = stops.join(',');
                             huebar.attr('style', 'background:-webkit-linear-gradient(top,' + stopList +
                                 '); background: -o-linear-gradient(top,' + stopList +
                                 '); background: -ms-linear-gradient(top,' + stopList +

From 83749b16c7811028e0e81aea69f6f34e9d08f8d7 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 17:35:03 -0500
Subject: [PATCH 173/569] [Case 4315] ESLint Pass 5 resolves hex already
 defined issue (details below).

* var hex was declared both the hexToRGB and hexToHsb functions.
    * hexToRGB was updated to have a more explicit var name
    * hexToRGB & hexToHSB also had the function param name updated to clarify the expected
      object type.  Also error statements and early returns were added should an unsupported
      object type be received.

* Issue Count is now 28

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 44e887056a..d748698cde 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -496,12 +496,22 @@ For usage and examples: colpick.com/plugin
         };
     }();
     // Color space convertions
-    var hexToRgb = function (hex) {
-        var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
-        return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
+    var hexToRgb = function (hexString) {
+        if (typeof hexString !== "string") {
+            print("Error - ColPick.js::hexToRgb expects string object.");
+            return;
+        }
+
+        var hexNumber = parseInt(((hexString.indexOf('#') > -1) ? hexString.substring(1) : hexString), 16);
+        return { r: hexNumber >> 16, g: (hexNumber & 0x00FF00) >> 8, b: (hexNumber & 0x0000FF)};
     };
-    var hexToHsb = function (hex) {
-        return rgbToHsb(hexToRgb(hex));
+    var hexToHsb = function (hexString) {
+        if (typeof hexString !== "string") {
+            print("Error - ColPick.js::hexToHsb expects string object.");
+            return;
+        }
+
+        return rgbToHsb(hexToRgb(hexString));
     };
     var rgbToHsb = function (rgb) {
         var hsb = {h: 0, s: 0, b: 0};

From 59e0b8476aeca4fe7501df96d2488da7175db023 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 17:57:42 -0500
Subject: [PATCH 174/569] [Case 4315] ESLint Pass 6 Pt 1 for colpick.js
 (details below).

First portion of vetted equality check fixes.
Issue Count reduced from 28 to 8.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index d748698cde..7c640633e3 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -170,7 +170,7 @@ For usage and examples: colpick.com/plugin
                 $(document).on('mouseup touchend',current,upHue);
                 $(document).on('mousemove touchmove',current,moveHue);
                 
-                var pageY = ((ev.type == 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
+                var pageY = ((ev.type === 'touchstart') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     current.cal.data('colpick')
                         .fields.eq(4).val(parseInt(360 * (current.cal.data('colpick').height -
@@ -181,7 +181,7 @@ For usage and examples: colpick.com/plugin
                 return false;
             },
             moveHue = function (ev) {
-                var pageY = ((ev.type == 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
+                var pageY = ((ev.type === 'touchmove') ? ev.originalEvent.changedTouches[0].pageY : ev.pageY );
                 change.apply(
                     ev.data.cal.data('colpick')
                         .fields.eq(4).val(parseInt(360 * (ev.data.cal.data('colpick').height -
@@ -212,7 +212,7 @@ For usage and examples: colpick.com/plugin
                 $(document).on('mousemove touchmove',current,moveSelector);
 
                 var pageX,pageY;
-                if (ev.type == 'touchstart') {
+                if (ev.type === 'touchstart') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
                 } else {
@@ -232,7 +232,7 @@ For usage and examples: colpick.com/plugin
             },
             moveSelector = function (ev) {
                 var pageX,pageY;
-                if (ev.type == 'touchmove') {
+                if (ev.type === 'touchmove') {
                     pageX = ev.originalEvent.changedTouches[0].pageX,
                     pageY = ev.originalEvent.changedTouches[0].pageY;
                 } else {
@@ -282,7 +282,7 @@ For usage and examples: colpick.com/plugin
                     left -= calW;
                 }
                 cal.css({left: left + 'px', top: top + 'px'});
-                if (cal.data('colpick').onShow.apply(this, [cal.get(0)]) != false) {
+                if (cal.data('colpick').onShow.apply(this, [cal.get(0)]) !== false) {
                     cal.show();
                 }
                 // Hide when user clicks outside
@@ -292,13 +292,13 @@ For usage and examples: colpick.com/plugin
                 });
             },
             hide = function (ev) {
-                if (ev.data.cal.data('colpick').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
+                if (ev.data.cal.data('colpick').onHide.apply(this, [ev.data.cal.get(0)]) !== false) {
                     ev.data.cal.hide();
                 }
                 $('html').off('mousedown', hide);
             },
             getViewport = function () {
-                var m = document.compatMode == 'CSS1Compat';
+                var m = document.compatMode === 'CSS1Compat';
                 return {
                     l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
                     w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth)
@@ -351,9 +351,9 @@ For usage and examples: colpick.com/plugin
                 // Set color
                 if (typeof opt.color === 'string') {
                     opt.color = hexToHsb(opt.color);
-                } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
+                } else if (opt.color.r !== undefined && opt.color.g !== undefined && opt.color.b !== undefined) {
                     opt.color = rgbToHsb(opt.color);
-                } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
+                } else if (opt.color.h !== undefined && opt.color.s !== undefined && opt.color.b !== undefined) {
                     opt.color = fixHSB(opt.color);
                 } else {
                     return this;
@@ -373,7 +373,7 @@ For usage and examples: colpick.com/plugin
                         // Add class according to layout
                         cal.addClass('colpick_'+options.layout+(options.submit?'':' colpick_'+options.layout+'_ns'));
                         // Add class if the color scheme is not default
-                        if (options.colorScheme != 'light') {
+                        if (options.colorScheme !== 'light') {
                             cal.addClass('colpick_'+options.colorScheme);
                         }
                         // Setup submit button
@@ -466,9 +466,9 @@ For usage and examples: colpick.com/plugin
                 setCurrent = (typeof setCurrent === "undefined") ? 1 : setCurrent;
                 if (typeof col === 'string') {
                     col = hexToHsb(col);
-                } else if (col.r != undefined && col.g != undefined && col.b != undefined) {
+                } else if (col.r !== undefined && col.g !== undefined && col.b !== undefined) {
                     col = rgbToHsb(col);
-                } else if (col.h != undefined && col.s != undefined && col.b != undefined) {
+                } else if (col.h !== undefined && col.s !== undefined && col.b !== undefined) {
                     col = fixHSB(col);
                 } else {
                     return this;

From fed85a7a5309200fca79e4dbdb28a3ec4a21effd Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 18:12:57 -0500
Subject: [PATCH 175/569] [Case 4315] ESLint Pass 6 Pt 2 for colpick equality
 checks (details below).

* Suppressing equality checking issues within color conversion helper functions.
    * These issues are suppressed as opposed to resolved because their resolution causes
      issues with the color picker's understanding of the color it's being set to along with
      the respective hue.  This is likely due to rounding issues; however, it may also be something
      related to the equality operator implicit conversions semantics of JavaScript.  It's something
      that can be looked into later if desired.
          * Bug Steps upon resolving check as opposed to suppressing them:
              - Select a shape entity for example.
              - Note the visual color and actual RGB values for that entity's color upon selection.
              - Click the Color Wheel.
              - Notice the automatic change of the color for the entity when the picker is shown.
                  - If the issue doesn't show itself right away, alter the color for the entity close the
                    picker, and repeat steps 2-3.

* Issue Count reduced from 8 to 1

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 7c640633e3..94b5d8521c 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -519,11 +519,11 @@ For usage and examples: colpick.com/plugin
         var max = Math.max(rgb.r, rgb.g, rgb.b);
         var delta = max - min;
         hsb.b = max;
-        hsb.s = max != 0 ? 255 * delta / max : 0;
-        if (hsb.s != 0) {
-            if (rgb.r == max) {
+        hsb.s = max != 0 ? 255 * delta / max : 0; // eslint-disable-line eqeqeq
+        if (hsb.s != 0) { // eslint-disable-line eqeqeq
+            if (rgb.r == max) { // eslint-disable-line eqeqeq
                 hsb.h = (rgb.g - rgb.b) / delta;
-            } else if (rgb.g == max) {
+            } else if (rgb.g == max) { // eslint-disable-line eqeqeq
                 hsb.h = 2 + (rgb.b - rgb.r) / delta;
             } else {
                 hsb.h = 4 + (rgb.r - rgb.g) / delta;
@@ -544,13 +544,13 @@ For usage and examples: colpick.com/plugin
         var h = hsb.h;
         var s = hsb.s*255/100;
         var v = hsb.b*255/100;
-        if (s == 0) {
+        if (s == 0) { // eslint-disable-line eqeqeq
             rgb.r = rgb.g = rgb.b = v;
         } else {
             var t1 = v;
             var t2 = (255-s)*v/255;
             var t3 = (t1-t2)*(h%60)/60;
-            if (h==360) {
+            if (h==360) { // eslint-disable-line eqeqeq
                 h = 0;
             }
             if (h<60) {
@@ -578,7 +578,7 @@ For usage and examples: colpick.com/plugin
             rgb.b.toString(16)
         ];
         $.each(hex, function (nr, val) {
-            if (val.length == 1) {
+            if (val.length == 1) { // eslint-disable-line eqeqeq
                 hex[nr] = '0' + val;
             }
         });

From b058b346bd2059395f2fdc3e29455413979777f1 Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Fri, 9 Feb 2018 18:25:50 -0500
Subject: [PATCH 176/569] [Case 4315] ESLint Pass 7 for colpick.js resolves
 regex error (details below).

Issue Count for colpick is now 0.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
---
 scripts/system/html/js/colpick.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 94b5d8521c..199c624bc5 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -392,7 +392,7 @@ For usage and examples: colpick.com/plugin
                         // Paint the hue bar
                         var UA = navigator.userAgent.toLowerCase();
                         var isIE = navigator.appName === 'Microsoft Internet Explorer';
-                        var IEver = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[\.0-9]{0,})/ )[1] ) : 0;
+                        var IEver = isIE ? parseFloat( UA.match( /msie ([0-9]{1,}[.0-9]{0,})/ )[1] ) : 0;
                         var ngIE = ( isIE && IEver < 10 );
                         var stops = ['#ff0000', '#ff0080', '#ff00ff', '#8000ff', '#0000ff', '#0080ff', '#00ffff', '#00ff80',
                             '#00ff00', '#80ff00', '#ffff00', '#ff8000', '#ff0000'];

From abdd50fb455feacb2c27306a6322c5e4387e5b14 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 9 Feb 2018 14:58:48 -0800
Subject: [PATCH 177/569] it's a start

---
 .gitignore                                    |   5 ++-
 .../hifi/commerce/common/FirstUseTutorial.qml |   4 +-
 .../hifi/commerce/purchases/PurchasedItem.qml |  42 ++++++++++--------
 .../qml/hifi/commerce/purchases/Purchases.qml |  24 ++++++----
 interface/resources/qml/js/Utils.jsc          | Bin 6516 -> 6596 bytes
 scripts/system/commerce/wallet.js             |   2 +-
 scripts/system/marketplaces/marketplaces.js   |   5 ++-
 7 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index f45572c388..1ffb93fe80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,4 +85,7 @@ npm-debug.log
 android/app/src/main/assets
 
 # Resource binary file
-interface/compiledResources
\ No newline at end of file
+interface/compiledResources
+
+# GPUCache
+interface/resources/GPUCache/*
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
index bcc641acd5..9944838e03 100644
--- a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
+++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
@@ -90,11 +90,11 @@ Rectangle {
             id: introText2;
             text: "My Purchases";
             // Text size
-            size: 28;
+            size: 22;
             // Anchors
             anchors.top: introText1.bottom;
             anchors.left: parent.left;
-            anchors.leftMargin: 12;
+            anchors.leftMargin: 24;
             anchors.right: parent.right;
             height: paintedHeight;
             // Style
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 05e280b839..361b9931a4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -39,7 +39,10 @@ Item {
     property int itemEdition;
     property int numberSold;
     property int limitedRun;
-    property bool isWearable;
+    property string itemType;
+    property var itemTypesArray: ["entity", "wearable", "contentSet", "app", "avatar"];
+    property var buttonTextNormal: ["REZ", "WEAR", "SWAP", "INSTALL", "WEAR"];
+    property var buttonTextClicked: ["REZZED", "WORN", "SWAPPED", "INSTALLED", "WORN"]
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -73,10 +76,10 @@ Item {
         color: hifi.colors.white;
         // Size
         anchors.left: parent.left;
-        anchors.leftMargin: 8;
+        anchors.leftMargin: 16;
         anchors.right: parent.right;
-        anchors.rightMargin: 8;
-        anchors.top: parent.top;
+        anchors.rightMargin: 16;
+        anchors.verticalCenter: parent.verticalCenter;
         height: root.height - 10;
 
         Image {
@@ -311,7 +314,7 @@ Item {
             id: rezzedNotifContainer;
             z: 998;
             visible: false;
-            color: hifi.colors.blueHighlight;
+            color: "#1FC6A6";
             anchors.fill: buttonContainer;
             MouseArea {
                 anchors.fill: parent;
@@ -321,7 +324,7 @@ Item {
 
             RalewayBold {
                 anchors.fill: parent;
-                text: "REZZED";
+                text: (root.buttonTextClicked)[itemTypesArray.indexOf(root.itemType)];
                 size: 18;
                 color: hifi.colors.white;
                 verticalAlignment: Text.AlignVCenter;
@@ -337,25 +340,28 @@ Item {
 
         Button {
             id: buttonContainer;
-            property int color: hifi.buttons.red;
+            property int color: hifi.buttons.blue;
             property int colorScheme: hifi.colorSchemes.light;
 
             anchors.top: parent.top;
+            anchors.topMargin: 4;
             anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 4;
             anchors.right: parent.right;
+            anchors.rightMargin: 4;
             width: height;
-            enabled: (root.canRezCertifiedItems || root.isWearable) && root.purchaseStatus !== "invalidated";
+            enabled: (root.canRezCertifiedItems || root.itemType === "wearable") && root.purchaseStatus !== "invalidated";
             
             onClicked: {
-                sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
+                sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                 rezzedNotifContainer.visible = true;
                 rezzedNotifContainerTimer.start();
-                UserActivityLogger.commerceEntityRezzed(root.itemId, "purchases", root.isWearable ? "rez" : "wear");
+                UserActivityLogger.commerceEntityRezzed(root.itemId, "purchases", root.itemType === "wearable" ? "rez" : "wear");
             }
 
             style: ButtonStyle {
-
                 background: Rectangle {
+                    radius: 4;
                     gradient: Gradient {
                         GradientStop {
                             position: 0.2
@@ -413,10 +419,10 @@ Item {
                         font.capitalization: Font.AllUppercase
                         color: enabled ? hifi.buttons.textColor[control.color]
                                        : hifi.buttons.disabledTextColor[control.colorScheme]
-                        size: 16;
+                        size: 15;
                         verticalAlignment: Text.AlignVCenter
                         horizontalAlignment: Text.AlignHCenter
-                        text: root.isWearable ? "Wear It" : "Rez It"
+                        text: (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]
                     }
                 }
             }
@@ -425,11 +431,11 @@ Item {
 
     DropShadow {
         anchors.fill: mainContainer;
-        horizontalOffset: 3;
-        verticalOffset: 3;
-        radius: 8.0;
-        samples: 17;
-        color: "#80000000";
+        horizontalOffset: 0;
+        verticalOffset: 4;
+        radius: 4.0;
+        samples: 9
+        color: Qt.rgba(0, 0, 0, 0.25);
         source: mainContainer;
     }
 
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 2743677683..922ba54822 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -308,11 +308,11 @@ Rectangle {
                 anchors.bottom: parent.bottom;
                 anchors.bottomMargin: 10;
                 anchors.left: parent.left;
-                anchors.leftMargin: 4;
+                anchors.leftMargin: 16;
                 width: paintedWidth;
                 text: isShowingMyItems ? "My Items" : "My Purchases";
                 color: hifi.colors.baseGray;
-                size: 28;
+                size: 22;
             }
 
             HifiControlsUit.TextField {
@@ -323,8 +323,8 @@ Rectangle {
                 hasRoundedBorder: true;
                 anchors.left: myText.right;
                 anchors.leftMargin: 16;
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
+                height: 39;
+                anchors.verticalCenter: parent.verticalCenter;
                 anchors.right: parent.right;
                 placeholderText: "filter items";
 
@@ -454,16 +454,24 @@ Rectangle {
                 numberSold: model.number_sold;
                 limitedRun: model.limited_run;
                 displayedItemCount: model.displayedItemCount;
-                isWearable: model.categories.indexOf("Wearables") > -1;
-                anchors.topMargin: 12;
-                anchors.bottomMargin: 12;
+                itemType: {
+                    if (model.download_url.indexOf(".fst") > -1) {
+                        "avatar";
+                    } else if (model.categories.indexOf("Wearables") > -1) {
+                        "wearable";
+                    } else {
+                        "entity";
+                    }
+                }
+                anchors.topMargin: 10;
+                anchors.bottomMargin: 10;
 
                 Connections {
                     onSendToPurchases: {
                         if (msg.method === 'purchases_itemInfoClicked') {
                             sendToScript({method: 'purchases_itemInfoClicked', itemId: itemId});
                         } else if (msg.method === "purchases_rezClicked") {
-                            sendToScript({method: 'purchases_rezClicked', itemHref: itemHref, isWearable: isWearable});
+                            sendToScript({method: 'purchases_rezClicked', itemHref: itemHref, itemType: itemType});
                         } else if (msg.method === 'purchases_itemCertificateClicked') {
                             inspectionCertificate.visible = true;
                             inspectionCertificate.isLightbox = true;
diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
index 8da68e4e192018ee2b4f3d835ec91f36f0161eca..ab20e996b9469915ac6a89901da175143e6b5024 100644
GIT binary patch
delta 604
zcmexjbi`Pvu*@VmC9xz?kb!}Lfs>VC&A*2iV;C72bXXY}mb_f{tI)LMb*EnX9J{G=
zWjE?fVPxWFpL~eXjmbb{GZ&K)lcEI!149}^CPNNGDuWe+J{UTKS<Vdk3@Hq$ljB)J
zH*aFu&CF=AIgjH$BcsJ;KQ0^QGy~6WCXa511kX+vl^MR>V!qu$P@xQv&;%5r0+3J#
zickeer~z51p@D&c!LzePrQ-kp|4@m^A9y8vAm%nqfJ$c|q`_`zm;seYK$lnmm56{y
zI39Phm>j})kdv7eWRZ)?jLG}?J(xDJOx`D`JXuG8Z}JL$VaC6c_wai&DZm7I_&)Iq
z-167~3SS0>5B8H41jOnE9)IGGd+4!a)=UuiXrJc6pLZgSU+*D*n>GUj15EV<2e8B^
z{<xbkp$`zXpZFs#zFhkM|Nk@({<<4JhA%+QS@4Np;L}TfBm)>2Kn8s9?FPGD3MA9~
zMq$_Fat`Uu69ftv87(F=3MGm|!vW+*kU5~R2l;h#rBDLn<OjmdOcuP8{kfDUcZgUp
qT5LWj@{$oGlFy+$`MelEqs8X?V&529EqECi7$!IJh)w<=(E<Pk1jkGO

delta 522
zcmX?N{KZJ8u*@VmC9xz?kb!}Lk&~5STcM<00wV*14l4u0rhn_zD^;ej?k>4g!mi%G
zd85u0My4%nlMgYvF+C98%*ABHq-@E+z>vm}$&ka4%3#Hy4~8yaRtiHBLn1>mL-yoY
zme9>xSavcq8f?zvxX;LFu-T8xhB-~cvzy7I+abZT(?w;5Z?~9lcMw!410*y7MW_HI
z)PW*Y0TOCJ7HVi<U|{g<Y*DHB|NlQ!V)6%G2_J~L4HKZ!83<{x8yaRnB@)mj7C<E;
zAQFzpoeU<2@Ew#`!veC%MP-J^4hASl^We|>FnI&N2cysApZo@sr}K+4E}OiT-<xR{
z^W<Or`lc|YAM8O&PkiDRxcP}c;$E5uf87Ni!xtdq7JT9t`26z3Kd|dTmPt*{=TP4K
zT%drF(O`0fP@*{0!5~{f8bE;rQn&enPy!<p1H)u(kq#yU-pT%4%9C%1STGuF78HHS
j2olNXP@XI=&d+GDSzr7cBdY-~0|Ue4Mjo-r4w5YZzM!b{

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 8cf5b72b9a..9ff7038c09 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -39,7 +39,7 @@
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            tablet.loadQMLSource(WALLET_QML_SOURCE);
+            tablet.loadQMLSource(MARKETPLACE_PURCHASES_QML_PATH);
         }
     }
 
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index edcd488a01..257f93d8df 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -231,7 +231,8 @@ var selectionDisplay = null; // for gridTool.js to ignore
         return position;
     }
 
-    function rezEntity(itemHref, isWearable) {
+    function rezEntity(itemHref, itemType) {
+        var isWearable = itemType === "wearable";
         var success = Clipboard.importEntities(itemHref);
         var wearableLocalPosition = null;
         var wearableLocalRotation = null;
@@ -543,7 +544,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 break;
             case 'checkout_rezClicked':
             case 'purchases_rezClicked':
-                rezEntity(message.itemHref, message.isWearable);
+                rezEntity(message.itemHref, message.itemType);
                 break;
             case 'header_marketplaceImageClicked':
             case 'purchases_backClicked':

From 5325b22b011cf8ad6b2b23dd350c1312d23fd807 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 9 Feb 2018 16:46:11 -0800
Subject: [PATCH 178/569] working on lambdas

---
 interface/src/avatar/MyAvatar.cpp | 28 +++++++++++++++-------------
 interface/src/avatar/MyAvatar.h   |  1 +
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 0ee409745f..5710dcc354 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1448,10 +1448,20 @@ void MyAvatar::clearJointsData() {
 }
 
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
-    if (skeletonModelURL != _skeletonModelURL) {
-        _shouldInitHeadBones = true;
-    }
-
+    _skeletonModelChangeCount++;
+     int skeletonModelChangeCount = _skeletonModelChangeCount;
+     std::shared_ptr<QMetaObject::Connection> skeletonConnection = std::make_shared<QMetaObject::Connection>();
+     *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() {
+            qDebug() << "checkingCount " << skeletonModelChangeCount << " -- " << _skeletonModelChangeCount;
+            if (skeletonModelChangeCount == _skeletonModelChangeCount && _skeletonModel->isLoaded()) {
+                qDebug() << "count is the same";
+                initHeadBones();
+                _skeletonModel->setCauterizeBoneSet(_headBoneSet);
+                _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
+                initAnimGraph();
+            }
+            QObject::disconnect(*skeletonConnection);
+    });
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
@@ -1878,6 +1888,7 @@ void MyAvatar::initAnimGraph() {
 
     _skeletonModel->getRig().initAnimGraph(graphUrl);
     _currentAnimGraphUrl.set(graphUrl);
+    qDebug() << "init anim graph";
     connect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
 }
 
@@ -1896,15 +1907,6 @@ void MyAvatar::animGraphLoaded() {
 void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     Avatar::postUpdate(deltaTime, scene);
-
-    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode() && _shouldInitHeadBones) {
-        initHeadBones();
-        _skeletonModel->setCauterizeBoneSet(_headBoneSet);
-        _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
-        initAnimGraph();
-        _shouldInitHeadBones = false;
-    }
-
     if (_enableDebugDrawDefaultPose || _enableDebugDrawAnimPose) {
 
         auto animSkeleton = _skeletonModel->getRig().getAnimSkeleton();
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 45dddb45a4..180cf04a18 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -654,6 +654,7 @@ private:
     bool isMyAvatar() const override { return true; }
     virtual int parseDataFromBuffer(const QByteArray& buffer) override;
     virtual glm::vec3 getSkeletonPosition() const override;
+    int _skeletonModelChangeCount { 0 };
 
     void saveAvatarScale();
 

From ff0b63297883a34624adaea0953078a13b3064b9 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 8 Feb 2018 19:31:24 -0800
Subject: [PATCH 179/569] get avatars in range

---
 libraries/avatars/src/AvatarHashMap.cpp | 14 ++++++++++++++
 libraries/avatars/src/AvatarHashMap.h   |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index 61b13d7749..c2e84f6e16 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -30,6 +30,20 @@ QVector<QUuid> AvatarHashMap::getAvatarIdentifiers() {
     return _avatarHash.keys().toVector();
 }
 
+QVector<QUuid> AvatarHashMap::getAvatarsInRange(const glm::vec3& position, float rangeMeters) const {
+    auto hashCopy = getHashCopy();
+    QVector<QUuid> avatarsInRange;
+    auto rangeMeters2 = rangeMeters * rangeMeters;
+    for (const AvatarSharedPointer& sharedAvatar : hashCopy) {
+        glm::vec3 avatarPosition = sharedAvatar->getWorldPosition();
+        auto distance2 = glm::distance2(avatarPosition, position);
+        if (distance2 < rangeMeters2) {
+            avatarsInRange.push_back(sharedAvatar->getSessionUUID());
+        }
+    }
+    return avatarsInRange;
+}
+
 bool AvatarHashMap::isAvatarInRange(const glm::vec3& position, const float range) {
     auto hashCopy = getHashCopy();
     foreach(const AvatarSharedPointer& sharedAvatar, hashCopy) {
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index 68fc232685..e4a485028f 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -35,10 +35,12 @@ class AvatarHashMap : public QObject, public Dependency {
 
 public:
     AvatarHash getHashCopy() { QReadLocker lock(&_hashLock); return _avatarHash; }
+    const AvatarHash getHashCopy() const { QReadLocker lock(&_hashLock); return _avatarHash; }
     int size() { return _avatarHash.size(); }
 
     // Currently, your own avatar will be included as the null avatar id.
     Q_INVOKABLE QVector<QUuid> getAvatarIdentifiers();
+    Q_INVOKABLE QVector<QUuid> getAvatarsInRange(const glm::vec3& position, float rangeMeters) const;
 
     // Null/Default-constructed QUuids will return MyAvatar
     Q_INVOKABLE virtual ScriptAvatarData* getAvatar(QUuid avatarID) { return new ScriptAvatarData(getAvatarBySessionID(avatarID)); }

From dc92250b1afc70233a272fdc8e135e8b1eec5673 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 9 Feb 2018 14:59:08 -0800
Subject: [PATCH 180/569] change var names

---
 libraries/avatars/src/AvatarHashMap.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index c2e84f6e16..b564ad6a3b 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -33,11 +33,11 @@ QVector<QUuid> AvatarHashMap::getAvatarIdentifiers() {
 QVector<QUuid> AvatarHashMap::getAvatarsInRange(const glm::vec3& position, float rangeMeters) const {
     auto hashCopy = getHashCopy();
     QVector<QUuid> avatarsInRange;
-    auto rangeMeters2 = rangeMeters * rangeMeters;
+    auto rangeMetersSquared = rangeMeters * rangeMeters;
     for (const AvatarSharedPointer& sharedAvatar : hashCopy) {
         glm::vec3 avatarPosition = sharedAvatar->getWorldPosition();
-        auto distance2 = glm::distance2(avatarPosition, position);
-        if (distance2 < rangeMeters2) {
+        auto distanceSquared = glm::distance2(avatarPosition, position);
+        if (distanceSquared < rangeMetersSquared) {
             avatarsInRange.push_back(sharedAvatar->getSessionUUID());
         }
     }

From d381beb2132c224c383ff797b5faf7081396dd3e Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 12 Feb 2018 10:53:42 -0800
Subject: [PATCH 181/569] cleaning up code

---
 interface/src/avatar/MyAvatar.cpp | 14 ++++++--------
 libraries/animation/src/Rig.cpp   |  4 +---
 libraries/animation/src/Rig.h     |  1 -
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 5710dcc354..67796bcc8b 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1450,11 +1450,14 @@ void MyAvatar::clearJointsData() {
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModelChangeCount++;
      int skeletonModelChangeCount = _skeletonModelChangeCount;
+    Avatar::setSkeletonModelURL(skeletonModelURL);
+    _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
+    _headBoneSet.clear();
+    _cauterizationNeedsUpdate = true;
+
      std::shared_ptr<QMetaObject::Connection> skeletonConnection = std::make_shared<QMetaObject::Connection>();
      *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() {
-            qDebug() << "checkingCount " << skeletonModelChangeCount << " -- " << _skeletonModelChangeCount;
-            if (skeletonModelChangeCount == _skeletonModelChangeCount && _skeletonModel->isLoaded()) {
-                qDebug() << "count is the same";
+            if (skeletonModelChangeCount == _skeletonModelChangeCount) {
                 initHeadBones();
                 _skeletonModel->setCauterizeBoneSet(_headBoneSet);
                 _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
@@ -1462,10 +1465,6 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
             }
             QObject::disconnect(*skeletonConnection);
     });
-    Avatar::setSkeletonModelURL(skeletonModelURL);
-    _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
-    _headBoneSet.clear();
-    _cauterizationNeedsUpdate = true;
     emit skeletonChanged();
 
 }
@@ -1888,7 +1887,6 @@ void MyAvatar::initAnimGraph() {
 
     _skeletonModel->getRig().initAnimGraph(graphUrl);
     _currentAnimGraphUrl.set(graphUrl);
-    qDebug() << "init anim graph";
     connect(&(_skeletonModel->getRig()), SIGNAL(onLoadComplete()), this, SLOT(animGraphLoaded()));
 }
 
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index ba496c5cd4..31151669c8 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1585,14 +1585,13 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
 }
 
 void Rig::initAnimGraph(const QUrl& url) {
-    if (_animGraphURL != url || (!_animNode && !_animLoading)) {
+    if (_animGraphURL != url || !_animNode) {
         _animGraphURL = url;
 
         _animNode.reset();
 
         // load the anim graph
         _animLoader.reset(new AnimNodeLoader(url));
-        _animLoading = true;
         std::weak_ptr<AnimSkeleton> weakSkeletonPtr = _animSkeleton;
         connect(_animLoader.get(), &AnimNodeLoader::success, [this, weakSkeletonPtr](AnimNode::Pointer nodeIn) {
             _animNode = nodeIn;
@@ -1617,7 +1616,6 @@ void Rig::initAnimGraph(const QUrl& url) {
                 auto roleState = roleAnimState.second;
                 overrideRoleAnimation(roleState.role, roleState.url, roleState.fps, roleState.loop, roleState.firstFrame, roleState.lastFrame);
             }
-            _animLoading = false;
 
             emit onLoadComplete();
         });
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index a7db86abf9..7230d05e2a 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -283,7 +283,6 @@ protected:
     std::shared_ptr<AnimNode> _animNode;
     std::shared_ptr<AnimSkeleton> _animSkeleton;
     std::unique_ptr<AnimNodeLoader> _animLoader;
-    bool _animLoading { false };
     AnimVariantMap _animVars;
     enum class RigRole {
         Idle = 0,

From 1a2533257574531b23c1af9994ca159d3ded2ffd Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 12 Feb 2018 10:59:25 -0800
Subject: [PATCH 182/569] fix indenting

---
 interface/src/avatar/MyAvatar.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 719a919721..d5cd7bdca1 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1469,13 +1469,13 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
     std::shared_ptr<QMetaObject::Connection> skeletonConnection = std::make_shared<QMetaObject::Connection>();
     *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() {
-            if (skeletonModelChangeCount == _skeletonModelChangeCount) {
-                initHeadBones();
-                _skeletonModel->setCauterizeBoneSet(_headBoneSet);
-                _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
-                initAnimGraph();
-            }
-            QObject::disconnect(*skeletonConnection);
+       if (skeletonModelChangeCount == _skeletonModelChangeCount) {
+           initHeadBones();
+           _skeletonModel->setCauterizeBoneSet(_headBoneSet);
+           _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
+           initAnimGraph();
+       }
+       QObject::disconnect(*skeletonConnection);
     });
     saveAvatarUrl();
     emit skeletonChanged();

From f95893f070a0552b1fd30ec7b5de1fea3018d8dc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 12 Feb 2018 11:09:10 -0800
Subject: [PATCH 183/569] updates to electron-packager and node-notifier for
 CVEs

---
 server-console/package-lock.json | 1288 ++++++++++++++++++++----------
 server-console/package.json      |    4 +-
 2 files changed, 851 insertions(+), 441 deletions(-)

diff --git a/server-console/package-lock.json b/server-console/package-lock.json
index 51b7f2c268..ba8ef3c720 100644
--- a/server-console/package-lock.json
+++ b/server-console/package-lock.json
@@ -5,11 +5,23 @@
   "requires": true,
   "dependencies": {
     "abbrev": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz",
-      "integrity": "sha1-W2A1su6dT7XPhZ8Iqb6BsghJGEM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
     "always-tail": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/always-tail/-/always-tail-0.2.0.tgz",
@@ -28,10 +40,11 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
-    "ansicolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz",
-      "integrity": "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8="
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
     },
     "array-find-index": {
       "version": "1.0.1",
@@ -40,20 +53,37 @@
       "dev": true
     },
     "asar": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-0.11.0.tgz",
-      "integrity": "sha1-uSbnksMV+MBIxDNx4yWwnJenZGQ=",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz",
+      "integrity": "sha512-eKo4ywQDq9dC/0Pu6UJsX4PxNi5ZlC4/NQ1JORUW4xkMRrEWpoLPpkngmQ6K7ZkioVjE2ZafLMmHPAQKMO0BdA==",
       "dev": true,
       "requires": {
-        "chromium-pickle-js": "0.1.0",
+        "chromium-pickle-js": "0.2.0",
         "commander": "2.9.0",
-        "cuint": "0.2.1",
+        "cuint": "0.2.2",
         "glob": "6.0.4",
-        "minimatch": "3.0.0",
+        "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
-        "mksnapshot": "0.3.0"
+        "mksnapshot": "0.3.1",
+        "tmp": "0.0.28"
       },
       "dependencies": {
+        "balanced-match": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
         "glob": {
           "version": "6.0.4",
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
@@ -62,10 +92,19 @@
           "requires": {
             "inflight": "1.0.4",
             "inherits": "2.0.1",
-            "minimatch": "3.0.0",
+            "minimatch": "3.0.4",
             "once": "1.3.3",
             "path-is-absolute": "1.0.0"
           }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
         }
       }
     },
@@ -84,6 +123,18 @@
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
       "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "author-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz",
+      "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=",
+      "dev": true
+    },
     "aws-sign2": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
@@ -103,9 +154,9 @@
       "integrity": "sha1-qRzdHr7xqGZZ5w/03vAWJfwtZ1Y="
     },
     "base64-js": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-      "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
+      "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
       "dev": true
     },
     "binary": {
@@ -147,9 +198,9 @@
       }
     },
     "bluebird": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz",
-      "integrity": "sha1-AkpVFylTCIV/FPkfEQb8O1VfRGs=",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
       "dev": true
     },
     "boolbase": {
@@ -201,15 +252,6 @@
         "map-obj": "1.0.1"
       }
     },
-    "cardinal": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.5.0.tgz",
-      "integrity": "sha1-ANX2YdvUqr/ffUHOSKWlm8o1opE=",
-      "requires": {
-        "ansicolors": "0.2.1",
-        "redeyed": "0.5.0"
-      }
-    },
     "caseless": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
@@ -249,36 +291,11 @@
       }
     },
     "chromium-pickle-js": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.1.0.tgz",
-      "integrity": "sha1-HUixB9ghJqLz4hHC6iX4A7pVGyE=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=",
       "dev": true
     },
-    "cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
-      "requires": {
-        "colors": "1.0.3"
-      }
-    },
-    "cli-usage": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/cli-usage/-/cli-usage-0.1.2.tgz",
-      "integrity": "sha1-SXwg6vEuwneTk6m/rCJcX2y5FS0=",
-      "requires": {
-        "marked": "0.3.5",
-        "marked-terminal": "1.6.1",
-        "minimist": "0.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784="
-        }
-      }
-    },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -289,6 +306,12 @@
         "wrap-ansi": "2.0.0"
       }
     },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
     "code-point-at": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz",
@@ -297,11 +320,6 @@
         "number-is-nan": "1.0.0"
       }
     },
-    "colors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
-    },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
@@ -318,6 +336,12 @@
         "graceful-readlink": "1.0.1"
       }
     },
+    "compare-version": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -385,16 +409,10 @@
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz",
       "integrity": "sha1-18wt9FGAZm+Z0rFEYmOUaeAPc2w="
     },
-    "ctype": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
-      "dev": true
-    },
     "cuint": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.1.tgz",
-      "integrity": "sha1-VlBFzoEnxwxr80D1kcAEin1M/rw=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
       "dev": true
     },
     "dashdash": {
@@ -432,7 +450,7 @@
         "graceful-fs": "4.1.3",
         "mkpath": "0.1.0",
         "nopt": "3.0.6",
-        "q": "1.4.1",
+        "q": "1.5.1",
         "readable-stream": "1.1.14",
         "touch": "0.0.3"
       }
@@ -527,37 +545,205 @@
       "integrity": "sha1-DboCXtM9DkW/j0DG6b487i+YbCg="
     },
     "electron-osx-sign": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.3.0.tgz",
-      "integrity": "sha1-SXIB38g1OMVLNPGkBexuIaAf904=",
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz",
+      "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=",
       "dev": true,
       "requires": {
+        "bluebird": "3.5.1",
+        "compare-version": "0.1.2",
+        "debug": "2.6.9",
+        "isbinaryfile": "3.0.2",
         "minimist": "1.2.0",
-        "run-series": "1.1.4"
+        "plist": "2.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
       }
     },
     "electron-packager": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-6.0.2.tgz",
-      "integrity": "sha1-juAGaf6KNjCVAnMvz+0RfX7prCk=",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.0.tgz",
+      "integrity": "sha512-ufyYMe3Gt6IEZm9RuG+KK3Nh+V2jZHWg9gihp8wylUNtleQihECIXtQdpPJxH9740XFERVPraNEaa7cZvDzpyw==",
       "dev": true,
       "requires": {
-        "asar": "0.11.0",
-        "electron-download": "2.1.1",
-        "electron-osx-sign": "0.3.0",
+        "asar": "0.14.2",
+        "debug": "3.1.0",
+        "electron-download": "4.1.0",
+        "electron-osx-sign": "0.4.8",
         "extract-zip": "1.5.0",
-        "fs-extra": "0.26.7",
-        "get-package-info": "0.0.2",
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "mv": "2.1.1",
-        "ncp": "2.0.0",
-        "object-assign": "4.0.1",
-        "plist": "1.2.0",
-        "rcedit": "0.5.0",
-        "resolve": "1.1.7",
-        "rimraf": "2.5.2",
-        "run-series": "1.1.4"
+        "fs-extra": "5.0.0",
+        "get-package-info": "1.0.0",
+        "mz": "2.7.0",
+        "nodeify": "1.0.1",
+        "parse-author": "2.0.0",
+        "pify": "3.0.0",
+        "plist": "2.1.0",
+        "pruner": "0.0.7",
+        "rcedit": "0.9.0",
+        "resolve": "1.5.0",
+        "sanitize-filename": "1.6.1",
+        "semver": "5.5.0",
+        "yargs-parser": "8.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "electron-download": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz",
+          "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "env-paths": "1.0.0",
+            "fs-extra": "2.1.2",
+            "minimist": "1.2.0",
+            "nugget": "2.0.1",
+            "path-exists": "3.0.0",
+            "rc": "1.1.6",
+            "semver": "5.5.0",
+            "sumchecker": "2.0.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "fs-extra": {
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+              "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+              "dev": true,
+              "requires": {
+                "graceful-fs": "4.1.3",
+                "jsonfile": "2.2.3"
+              }
+            }
+          }
+        },
+        "fs-extra": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.3",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
+          },
+          "dependencies": {
+            "jsonfile": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+              "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+              "dev": true,
+              "requires": {
+                "graceful-fs": "4.1.11"
+              },
+              "dependencies": {
+                "graceful-fs": {
+                  "version": "4.1.11",
+                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                  "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            }
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "nugget": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
+          "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "minimist": "1.2.0",
+            "pretty-bytes": "1.0.4",
+            "progress-stream": "1.2.0",
+            "request": "2.71.0",
+            "single-line-log": "1.1.2",
+            "throttleit": "0.0.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "dev": true
+        },
+        "single-line-log": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
+          "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.1"
+          }
+        },
+        "throttleit": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+          "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
+          "dev": true
+        }
       }
     },
     "electron-prebuilt": {
@@ -583,6 +769,12 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
       "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
     },
+    "env-paths": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "dev": true
+    },
     "error-ex": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
@@ -597,11 +789,6 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
-    "esprima-fb": {
-      "version": "12001.1.0-dev-harmony-fb",
-      "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz",
-      "integrity": "sha1-2EQAOEupXOJnjGF60kp/QICNqRU="
-    },
     "extend": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
@@ -641,6 +828,18 @@
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
       "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
     "fd-slicer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -712,20 +911,87 @@
       }
     },
     "get-package-info": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-0.0.2.tgz",
-      "integrity": "sha1-csOPvuLnZyhCSgDcFOJN0aKMI5E=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz",
+      "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=",
       "dev": true,
       "requires": {
-        "bluebird": "3.3.5",
-        "lodash.get": "4.2.1",
-        "resolve": "1.1.7"
+        "bluebird": "3.5.1",
+        "debug": "2.6.9",
+        "lodash.get": "4.4.2",
+        "read-pkg-up": "2.0.0"
       },
       "dependencies": {
-        "bluebird": {
-          "version": "3.3.5",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.5.tgz",
-          "integrity": "sha1-XudH8ce9lnZYtoOTZDCu51OVWjQ=",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.3",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.3.5",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         }
       }
@@ -763,6 +1029,12 @@
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
     },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
     "har-validator": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
@@ -893,14 +1165,6 @@
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
-    "is-absolute": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
-      "requires": {
-        "is-relative": "0.1.3"
-      }
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -944,16 +1208,17 @@
         "xtend": "4.0.1"
       }
     },
+    "is-promise": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+      "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=",
+      "dev": true
+    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
       "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
     },
-    "is-relative": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -970,10 +1235,16 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
       "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
     },
+    "isbinaryfile": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+      "dev": true
+    },
     "isexe": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz",
-      "integrity": "sha1-NvPiLmB1CSD15yQaR2qMakInWtA="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isstream": {
       "version": "0.1.2",
@@ -1000,6 +1271,12 @@
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz",
       "integrity": "sha1-UDVPGfYDkXxpX3C4Wvp3w7DyNQY="
     },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -1051,136 +1328,34 @@
         "strip-bom": "2.0.0"
       }
     },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
     "lodash": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
       "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
     },
-    "lodash._arraycopy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
-      "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE="
-    },
-    "lodash._arrayeach": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
-      "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754="
-    },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "requires": {
-        "lodash._basecopy": "3.0.1",
-        "lodash.keys": "3.1.2"
-      }
-    },
-    "lodash._baseclone": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz",
-      "integrity": "sha1-MDUZv2OT/n5C802LYw73eU41Qrc=",
-      "requires": {
-        "lodash._arraycopy": "3.0.0",
-        "lodash._arrayeach": "3.0.0",
-        "lodash._baseassign": "3.2.0",
-        "lodash._basefor": "3.0.3",
-        "lodash.isarray": "3.0.4",
-        "lodash.keys": "3.1.2"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "lodash._basefor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
-      "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI="
-    },
-    "lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
-    },
-    "lodash._createassigner": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-      "requires": {
-        "lodash._bindcallback": "3.0.1",
-        "lodash._isiterateecall": "3.0.9",
-        "lodash.restparam": "3.6.1"
-      }
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
-    },
-    "lodash._stringtopath": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.7.1.tgz",
-      "integrity": "sha1-1GYKFaWZeYj6WTAaO/2gXJpt494=",
-      "dev": true
-    },
-    "lodash.assign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-      "integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-      "requires": {
-        "lodash._baseassign": "3.2.0",
-        "lodash._createassigner": "3.1.1",
-        "lodash.keys": "3.1.2"
-      }
-    },
-    "lodash.clonedeep": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz",
-      "integrity": "sha1-oKHkDYKl6on/WxR7hETtY9koJ9s=",
-      "requires": {
-        "lodash._baseclone": "3.3.0",
-        "lodash._bindcallback": "3.0.1"
-      }
-    },
     "lodash.get": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.2.1.tgz",
-      "integrity": "sha1-bpr8h7imwCFgZnpw9sjOEHiusRs=",
-      "dev": true,
-      "requires": {
-        "lodash._stringtopath": "4.7.1"
-      }
-    },
-    "lodash.isarguments": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz",
-      "integrity": "sha1-W/jaiH8B8qnknAoXXNrrMYoOQ9w="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "requires": {
-        "lodash._getnative": "3.9.1",
-        "lodash.isarguments": "3.0.8",
-        "lodash.isarray": "3.0.4"
-      }
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
     },
     "loud-rejection": {
       "version": "1.3.0",
@@ -1207,23 +1382,6 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
-    "marked": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz",
-      "integrity": "sha1-QROhWsXXvKFYpargciRYe5+hW5Q="
-    },
-    "marked-terminal": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-1.6.1.tgz",
-      "integrity": "sha1-BM0cfIsO9I2z9oAQ1zpXqWYcbM8=",
-      "requires": {
-        "cardinal": "0.5.0",
-        "chalk": "1.1.3",
-        "cli-table": "0.3.1",
-        "lodash.assign": "3.2.0",
-        "node-emoji": "0.1.0"
-      }
-    },
     "meow": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -1266,7 +1424,8 @@
     "minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
     },
     "mkdirp": {
       "version": "0.5.1",
@@ -1290,180 +1449,214 @@
       "dev": true
     },
     "mksnapshot": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.0.tgz",
-      "integrity": "sha1-MuqYStb1MjJMaj+uZACHa4WChAc=",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz",
+      "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=",
       "dev": true,
       "requires": {
         "decompress-zip": "0.3.0",
         "fs-extra": "0.26.7",
-        "request": "2.55.0"
+        "request": "2.83.0"
       },
       "dependencies": {
-        "asn1": {
-          "version": "0.1.11",
-          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-          "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
-          "dev": true
-        },
         "assert-plus": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
-          "dev": true
-        },
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
           "dev": true
         },
         "aws-sign2": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-          "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
           "dev": true
         },
-        "bl": {
-          "version": "0.9.5",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
-          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+        "aws4": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+          "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+          "dev": true
+        },
+        "boom": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34"
+            "hoek": "4.2.0"
           }
         },
         "caseless": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz",
-          "integrity": "sha1-t7Zc5r8UE4hlOc/VM/CzDv+pz4g=",
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+          "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
           "dev": true
         },
-        "combined-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-          "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
           "dev": true,
           "requires": {
-            "delayed-stream": "0.0.5"
+            "boom": "5.2.0"
+          },
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "dev": true,
+              "requires": {
+                "hoek": "4.2.0"
+              }
+            }
           }
         },
-        "delayed-stream": {
-          "version": "0.0.5",
-          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-          "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+        "extend": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+          "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
           "dev": true
         },
         "form-data": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
-          "integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
           "dev": true,
           "requires": {
-            "async": "0.9.2",
-            "combined-stream": "0.0.7",
-            "mime-types": "2.0.14"
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
           }
         },
         "har-validator": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
-          "integrity": "sha1-2DhCsOtMQ1lgrrEIoGejqpTA7rI=",
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
           "dev": true,
           "requires": {
-            "bluebird": "2.10.2",
-            "chalk": "1.1.3",
-            "commander": "2.9.0",
-            "is-my-json-valid": "2.13.1"
+            "ajv": "5.5.2",
+            "har-schema": "2.0.0"
           }
         },
         "hawk": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
-          "integrity": "sha1-HnMc45RH+h0PbXB/e87r7A/R7B8=",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
           "dev": true,
           "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.1.0"
           }
         },
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+          "dev": true
+        },
         "http-signature": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-          "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
           "dev": true,
           "requires": {
-            "asn1": "0.1.11",
-            "assert-plus": "0.1.5",
-            "ctype": "0.5.3"
+            "assert-plus": "1.0.0",
+            "jsprim": "1.2.2",
+            "sshpk": "1.7.4"
           }
         },
         "mime-db": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
-          "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
           "dev": true
         },
         "mime-types": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
-          "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
           "dev": true,
           "requires": {
-            "mime-db": "1.12.0"
+            "mime-db": "1.30.0"
           }
         },
         "oauth-sign": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz",
-          "integrity": "sha1-fb6uRPbKRU4fFoRR1jB0ZzWBPOM=",
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
           "dev": true
         },
         "qs": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz",
-          "integrity": "sha1-9854jld33wtQENp/fE5zujJHD1o=",
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
           "dev": true
         },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
         "request": {
-          "version": "2.55.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
-          "integrity": "sha1-11wc32eddrsQD5v/4f5VG1wk6T0=",
+          "version": "2.83.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
           "dev": true,
           "requires": {
-            "aws-sign2": "0.5.0",
-            "bl": "0.9.5",
-            "caseless": "0.9.0",
-            "combined-stream": "0.0.7",
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
             "forever-agent": "0.6.1",
-            "form-data": "0.2.0",
-            "har-validator": "1.8.0",
-            "hawk": "2.3.1",
-            "http-signature": "0.10.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
             "isstream": "0.1.2",
             "json-stringify-safe": "5.0.1",
-            "mime-types": "2.0.14",
-            "node-uuid": "1.4.7",
-            "oauth-sign": "0.6.0",
-            "qs": "2.4.2",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.2.2",
-            "tunnel-agent": "0.4.2"
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.2.1"
           }
+        },
+        "sntp": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+          "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
+          "dev": true
         }
       }
     },
@@ -1508,29 +1701,39 @@
         }
       }
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0",
+        "object-assign": "4.0.1",
+        "thenify-all": "1.6.0"
+      }
+    },
     "ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
       "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
       "dev": true
     },
-    "node-emoji": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-0.1.0.tgz",
-      "integrity": "sha1-P0QkpVuo7VDCVKE4WLJEVPQYJgI="
-    },
     "node-notifier": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.5.0.tgz",
-      "integrity": "sha1-Ap7pjXqbxOlsnLUb6dTzYTI/6ps=",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
+      "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
       "requires": {
-        "cli-usage": "0.1.2",
         "growly": "1.3.0",
-        "lodash.clonedeep": "3.0.2",
-        "minimist": "1.2.0",
-        "semver": "5.1.0",
-        "shellwords": "0.1.0",
-        "which": "1.2.4"
+        "semver": "5.5.0",
+        "shellwords": "0.1.1",
+        "which": "1.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+        }
       }
     },
     "node-uuid": {
@@ -1538,13 +1741,23 @@
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz",
       "integrity": "sha1-baWhdmjEs91ZYjvaEc9/pMH2Cm8="
     },
+    "nodeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz",
+      "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
+      "dev": true,
+      "requires": {
+        "is-promise": "1.0.1",
+        "promise": "1.3.0"
+      }
+    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
-        "abbrev": "1.0.7"
+        "abbrev": "1.1.1"
       }
     },
     "normalize-package-data": {
@@ -1642,6 +1855,45 @@
         "lcid": "1.0.0"
       }
     },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "dev": true,
+      "requires": {
+        "p-try": "1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.2.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parse-author": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz",
+      "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=",
+      "dev": true,
+      "requires": {
+        "author-regex": "1.0.0"
+      }
+    },
     "parse-json": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -1662,6 +1914,12 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz",
       "integrity": "sha1-Jj2tpmqz8vsQv3+dJN2PPlcO+RI="
     },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
     "path-type": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -1679,6 +1937,12 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -1699,15 +1963,14 @@
       }
     },
     "plist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
-      "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
+      "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
       "dev": true,
       "requires": {
-        "base64-js": "0.0.8",
-        "util-deprecate": "1.0.2",
-        "xmlbuilder": "4.0.0",
-        "xmldom": "0.1.22"
+        "base64-js": "1.2.0",
+        "xmlbuilder": "8.2.2",
+        "xmldom": "0.1.27"
       }
     },
     "pretty-bytes": {
@@ -1735,6 +1998,55 @@
         "through2": "0.2.3"
       }
     },
+    "promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz",
+      "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
+      "dev": true,
+      "requires": {
+        "is-promise": "1.0.1"
+      }
+    },
+    "pruner": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz",
+      "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=",
+      "dev": true,
+      "requires": {
+        "fs-extra": "4.0.3"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+          "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.3",
+            "jsonfile": "4.0.0",
+            "universalify": "0.1.1"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11"
+          },
+          "dependencies": {
+            "graceful-fs": {
+              "version": "4.1.11",
+              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+              "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        }
+      }
+    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -1749,10 +2061,16 @@
         "once": "1.3.3"
       }
     },
-    "q": {
+    "punycode": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
     "qs": {
@@ -1773,9 +2091,9 @@
       }
     },
     "rcedit": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.5.0.tgz",
-      "integrity": "sha1-72a1p/AxB1IUGjTiLyPCJDPBzxU=",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.9.0.tgz",
+      "integrity": "sha1-ORDfVzRTmeKwMl9KUZAH+J5V7xw=",
       "dev": true
     },
     "read-pkg": {
@@ -1820,14 +2138,6 @@
         "strip-indent": "1.0.1"
       }
     },
-    "redeyed": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.5.0.tgz",
-      "integrity": "sha1-erAA5g7jh1rBFdKe2zLBQDxsJdE=",
-      "requires": {
-        "esprima-fb": "12001.1.0-dev-harmony-fb"
-      }
-    },
     "request": {
       "version": "2.71.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.71.0.tgz",
@@ -1865,10 +2175,13 @@
       }
     },
     "resolve": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
+      "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
     },
     "rimraf": {
       "version": "2.5.2",
@@ -1878,21 +2191,31 @@
         "glob": "7.0.3"
       }
     },
-    "run-series": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz",
-      "integrity": "sha1-iac93F51ye+KtjIMChYA1qQRebk=",
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
       "dev": true
     },
+    "sanitize-filename": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
+      "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+      "dev": true,
+      "requires": {
+        "truncate-utf8-bytes": "1.0.2"
+      }
+    },
     "semver": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-      "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
+      "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU=",
+      "dev": true
     },
     "shellwords": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.0.tgz",
-      "integrity": "sha1-Zq/Ue2oSky2Qccv9mKUueFzQuhQ="
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
     },
     "signal-exit": {
       "version": "2.1.2",
@@ -2017,6 +2340,32 @@
       "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
       "dev": true
     },
+    "sumchecker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
+      "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -2063,6 +2412,24 @@
         }
       }
     },
+    "thenify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": "3.3.0"
+      }
+    },
     "throttleit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
@@ -2089,6 +2456,15 @@
         }
       }
     },
+    "tmp": {
+      "version": "0.0.28",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
+      "integrity": "sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
     "touch": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz",
@@ -2104,7 +2480,7 @@
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
           "dev": true,
           "requires": {
-            "abbrev": "1.0.7"
+            "abbrev": "1.1.1"
           }
         }
       }
@@ -2126,6 +2502,15 @@
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
       "dev": true
     },
+    "truncate-utf8-bytes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
+      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+      "dev": true,
+      "requires": {
+        "utf8-byte-length": "1.0.4"
+      }
+    },
     "tunnel-agent": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz",
@@ -2143,6 +2528,18 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "dev": true
+    },
+    "utf8-byte-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
+      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+      "dev": true
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -2167,12 +2564,11 @@
       }
     },
     "which": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz",
-      "integrity": "sha1-FVf5YIBgTlsRs1meufRbUKnv1yI=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "requires": {
-        "is-absolute": "0.1.7",
-        "isexe": "1.1.2"
+        "isexe": "2.0.0"
       }
     },
     "window-size": {
@@ -2194,18 +2590,15 @@
       "integrity": "sha1-HmWWmWXMvC20VIxrhKbyxa7dRzk="
     },
     "xmlbuilder": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",
-      "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=",
-      "dev": true,
-      "requires": {
-        "lodash": "3.10.1"
-      }
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
+      "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
+      "dev": true
     },
     "xmldom": {
-      "version": "0.1.22",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz",
-      "integrity": "sha1-EN5OXpZJgfA8jMcvrcCNFLbDqiY=",
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
       "dev": true
     },
     "xtend": {
@@ -2237,6 +2630,23 @@
         "y18n": "3.2.1"
       }
     },
+    "yargs-parser": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
+      "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        }
+      }
+    },
     "yauzl": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
diff --git a/server-console/package.json b/server-console/package.json
index 8d2a177e0a..9f47d0e4cc 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -8,7 +8,7 @@
     ""
   ],
   "devDependencies": {
-    "electron-packager": "^6.0.2",
+    "electron-packager": "^11.0.0",
     "electron-prebuilt": "0.37.5"
   },
   "repository": {
@@ -27,7 +27,7 @@
     "cheerio": "^0.19.0",
     "extend": "^3.0.0",
     "fs-extra": "^0.26.4",
-    "node-notifier": "^4.4.0",
+    "node-notifier": "^5.2.1",
     "os-homedir": "^1.0.1",
     "request": "^2.67.0",
     "request-progress": "1.0.2",

From 9e8aa1898cc3c6ffe0b797b9d711effa72337aa0 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Fri, 9 Feb 2018 15:24:07 -0800
Subject: [PATCH 184/569] warnings, load material from URL, shapeID ->
 parentMaterialID

---
 assignment-client/src/assets/AssetServer.h    |   7 +-
 interface/src/Application.cpp                 |  16 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |  12 +-
 interface/src/ui/overlays/ModelOverlay.h      |   4 +-
 interface/src/ui/overlays/Overlay.cpp         |   8 +-
 interface/src/ui/overlays/Overlay.h           |   6 +-
 .../src/avatars-renderer/Avatar.cpp           |  12 +-
 .../src/avatars-renderer/Avatar.h             |   6 +-
 libraries/avatars/src/AvatarData.h            |   4 +-
 .../src/RenderableEntityItem.cpp              |   8 +-
 .../src/RenderableEntityItem.h                |   6 +-
 .../src/RenderableMaterialEntityItem.cpp      |   8 +-
 .../src/RenderableModelEntityItem.cpp         |  12 +-
 .../src/RenderableModelEntityItem.h           |   4 +-
 .../src/RenderableShapeEntityItem.cpp         |   6 +-
 libraries/entities/src/EntityItem.cpp         |  16 +-
 libraries/entities/src/EntityItem.h           |  12 +-
 .../entities/src/EntityItemProperties.cpp     |  28 +--
 libraries/entities/src/EntityItemProperties.h |   3 +-
 libraries/entities/src/EntityPropertyFlags.h  |   3 +-
 libraries/entities/src/EntityTree.cpp         |  24 +-
 libraries/entities/src/EntityTree.h           |  24 +-
 libraries/entities/src/MaterialEntityItem.cpp | 215 ++++--------------
 libraries/entities/src/MaterialEntityItem.h   |  15 +-
 libraries/graphics/src/graphics/Material.h    |   4 -
 .../src/model-networking/MaterialCache.cpp    | 175 ++++++++++++++
 .../src/model-networking/MaterialCache.h      |  46 ++++
 .../src/model-networking/ModelCache.cpp       |   2 +-
 libraries/networking/src/ResourceRequest.cpp  |   2 +-
 libraries/render-utils/src/Model.cpp          |  92 ++++----
 libraries/render-utils/src/Model.h            |   6 +-
 libraries/shared/src/RegisteredMetaTypes.h    |   7 +
 scripts/system/html/entityProperties.html     |  11 +-
 scripts/system/html/js/entityProperties.js    |   9 +-
 34 files changed, 447 insertions(+), 366 deletions(-)
 create mode 100644 libraries/model-networking/src/model-networking/MaterialCache.cpp
 create mode 100644 libraries/model-networking/src/model-networking/MaterialCache.h

diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index 5e7a3c1700..1470249bf3 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -21,12 +21,7 @@
 #include "AssetUtils.h"
 #include "ReceivedMessage.h"
 
-namespace std {
-    template <>
-    struct hash<QString> {
-        size_t operator()(const QString& v) const { return qHash(v); }
-    };
-}
+#include "RegisteredMetaTypes.h"
 
 struct AssetMeta {
     AssetMeta() {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f8fa8f9b17..ce4027945d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1587,37 +1587,37 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
-    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
-            avatar->addMaterial(material, shapeID);
+            avatar->addMaterial(material, parentMaterialID);
             return true;
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
-            avatar->removeMaterial(material, shapeID);
+            avatar->removeMaterial(material, parentMaterialID);
             return true;
         }
         return false;
     });
 
-    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
-            overlay->addMaterial(material, shapeID);
+            overlay->addMaterial(material, parentMaterialID);
             return true;
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
-            overlay->removeMaterial(material, shapeID);
+            overlay->removeMaterial(material, parentMaterialID);
             return true;
         }
         return false;
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index bf95494d19..ab7f55d6e7 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -633,17 +633,17 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     return 0;
 }
 
-void ModelOverlay::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    Overlay::addMaterial(material, shapeID);
+void ModelOverlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    Overlay::addMaterial(material, parentMaterialID);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->addMaterial(material, shapeID);
+        _model->addMaterial(material, parentMaterialID);
     }
 }
 
-void ModelOverlay::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    Overlay::removeMaterial(material, shapeID);
+void ModelOverlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    Overlay::removeMaterial(material, parentMaterialID);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->removeMaterial(material, shapeID);
+        _model->removeMaterial(material, parentMaterialID);
     }
 }
 
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 827f7f2d5b..6761b1508c 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,8 +59,8 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
-    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
-    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
 
 protected:
     Transform evalRenderTransform() override;
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 368ed04062..04d6c2fe4d 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -236,12 +236,12 @@ QVector<OverlayID> qVectorOverlayIDFromScriptValue(const QScriptValue& array) {
     return newVector;
 }
 
-void Overlay::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void Overlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].push(material);
+    _materials[parentMaterialID].push(material);
 }
 
-void Overlay::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void Overlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].remove(material);
+    _materials[parentMaterialID].remove(material);
 }
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index 4cb3f7c84d..bd9f7942fd 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -91,8 +91,8 @@ public:
     unsigned int getStackOrder() const { return _stackOrder; }
     void setStackOrder(unsigned int stackOrder) { _stackOrder = stackOrder; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
-    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
 
 protected:
     float updatePulse();
@@ -120,7 +120,7 @@ protected:
     static const xColor DEFAULT_OVERLAY_COLOR;
     static const float DEFAULT_ALPHA;
 
-    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::unordered_map<QString, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 private:
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 4cd9bbedd7..3276a8fe89 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1763,19 +1763,19 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
     }
 }
 
-void Avatar::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void Avatar::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].push(material);
+    _materials[parentMaterialID].push(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
-        _skeletonModel->addMaterial(material, shapeID);
+        _skeletonModel->addMaterial(material, parentMaterialID);
     }
 }
 
-void Avatar::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void Avatar::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].remove(material);
+    _materials[parentMaterialID].remove(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
-        _skeletonModel->removeMaterial(material, shapeID);
+        _skeletonModel->removeMaterial(material, parentMaterialID);
     }
 }
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 9c355159d8..49aa664a9f 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -272,8 +272,8 @@ public:
 
     virtual void setAvatarEntityDataChanged(bool value) override;
 
-    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
-    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
 
 public slots:
 
@@ -401,7 +401,7 @@ protected:
 
     ThreadSafeValueCache<float> _unscaledEyeHeightCache { DEFAULT_AVATAR_EYE_HEIGHT };
 
-    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::unordered_map<QString, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
     void processMaterials();
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index fbd586f153..832585a483 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -696,8 +696,8 @@ public:
 
     bool getIsReplicated() const { return _isReplicated; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID) {}
-    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {}
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {}
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {}
 
 signals:
     void displayNameChanged();
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 2f92790d18..81d7dceb0d 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -404,12 +404,12 @@ void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) {
     QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
 }
 
-void EntityRenderer::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void EntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].push(material);
+    _materials[parentMaterialID].push(material);
 }
 
-void EntityRenderer::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void EntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].remove(material);
+    _materials[parentMaterialID].remove(material);
 }
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index f58b540aef..6247a97c21 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -102,8 +102,8 @@ protected:
     }
 
 public slots:
-    virtual void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
-    virtual void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
 
 signals:
     void requestRenderUpdate();
@@ -133,7 +133,7 @@ protected:
     // Only touched on the rendering thread
     bool _renderUpdateQueued{ false };
 
-    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::unordered_map<QString, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 private:
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
index d541d99c4c..ad17202d8e 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -102,10 +102,10 @@ void MaterialEntityRenderer::addVertex(std::vector<float>& buffer, const glm::ve
 
 void MaterialEntityRenderer::addTriangleFan(std::vector<float>& buffer, int stack, int step) {
     float v1 = ((float)stack) / STACKS;
-    float theta1 = v1 * M_PI;
+    float theta1 = v1 * (float)M_PI;
     glm::vec3 tip = getVertexPos(0, theta1);
     float v2 = ((float)(stack + step)) / STACKS;
-    float theta2 = v2 * M_PI;
+    float theta2 = v2 * (float)M_PI;
     for (int i = 0; i < SLICES; i++) {
         float u1 = ((float)i) / SLICES;
         float u2 = ((float)(i + step)) / SLICES;
@@ -169,8 +169,8 @@ void MaterialEntityRenderer::generateMesh() {
     for (int j = 1; j < STACKS - 1; j++) {
         float v1 = ((float)j) / STACKS;
         float v2 = ((float)(j + 1)) / STACKS;
-        float theta1 = v1 * M_PI;
-        float theta2 = v2 * M_PI;
+        float theta1 = v1 * (float)M_PI;
+        float theta2 = v2 * (float)M_PI;
         for (int i = 0; i < SLICES; i++) {
             float u1 = ((float)i) / SLICES;
             float u2 = ((float)(i + 1)) / SLICES;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 739ccd9738..e28ba797d5 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1467,17 +1467,17 @@ void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const QStr
     }
 }
 
-void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    Parent::addMaterial(material, shapeID);
+void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    Parent::addMaterial(material, parentMaterialID);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->addMaterial(material, shapeID);
+        _model->addMaterial(material, parentMaterialID);
     }
 }
 
-void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    Parent::removeMaterial(material, shapeID);
+void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    Parent::removeMaterial(material, parentMaterialID);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->removeMaterial(material, shapeID);
+        _model->removeMaterial(material, parentMaterialID);
     }
 }
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 75c6639902..3951deaa2d 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -144,8 +144,8 @@ public:
     ModelEntityRenderer(const EntityItemPointer& entity);
 
 public slots:
-    void addMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
-    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
 
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 8bed9c70ee..5c5df38350 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -77,9 +77,9 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
             _procedural.setProceduralData(ProceduralData::parse(_lastUserData));
         }
 
-        removeMaterial(_material, 0);
+        removeMaterial(_material, "0");
         _material = entity->getMaterial();
-        addMaterial(_material, 0);
+        addMaterial(_material, "0");
 
         _shape = entity->getShape();
         _position = entity->getWorldPosition();
@@ -127,7 +127,7 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     withReadLock([&] {
         geometryShape = geometryCache->getShapeForEntityShape(_shape);
         batch.setModelTransform(_renderTransform); // use a transform with scale, rotation, registration point and translation
-        mat = _materials[0].top();
+        mat = _materials["0"].top();
         if (mat) {
             outColor = glm::vec4(mat->getAlbedo(), mat->getOpacity());
             if (_procedural.isReady()) {
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 43510864ba..3ea81e5a36 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2940,20 +2940,20 @@ void EntityItem::preDelete() {
     }
 }
 
-void EntityItem::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void EntityItem::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].push(material);
-    emit addMaterialToRenderItem(material, shapeID);
+    _materials[parentMaterialID].push(material);
+    emit addMaterialToRenderItem(material, parentMaterialID);
 }
 
-void EntityItem::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
+void EntityItem::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[shapeID].remove(material);
-    emit removeMaterialFromRenderItem(material, shapeID);
+    _materials[parentMaterialID].remove(material);
+    emit removeMaterialFromRenderItem(material, parentMaterialID);
 }
 
-std::unordered_map<quint16, graphics::MultiMaterial> EntityItem::getMaterials() {
-    std::unordered_map<quint16, graphics::MultiMaterial> toReturn;
+std::unordered_map<QString, graphics::MultiMaterial> EntityItem::getMaterials() {
+    std::unordered_map<QString, graphics::MultiMaterial> toReturn;
     {
         std::lock_guard<std::mutex> lock(_materialsLock);
         toReturn = _materials;
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index b2804a2e86..97d2f32a04 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -482,14 +482,14 @@ public:
     virtual void preDelete();
     virtual void postParentFixup() {}
 
-    void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
-    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
-    std::unordered_map<quint16, graphics::MultiMaterial> getMaterials();
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    std::unordered_map<QString, graphics::MultiMaterial> getMaterials();
 
 signals:
     void requestRenderUpdate();
-    void addMaterialToRenderItem(graphics::MaterialPointer material, quint16 shapeID);
-    void removeMaterialFromRenderItem(graphics::MaterialPointer material, quint16 shapeID);
+    void addMaterialToRenderItem(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void removeMaterialFromRenderItem(graphics::MaterialPointer material, const QString& parentMaterialID);
 
 protected:
     QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
@@ -644,7 +644,7 @@ protected:
     bool _cauterized { false }; // if true, don't draw because it would obscure 1st-person camera
 
 private:
-    std::unordered_map<quint16, graphics::MultiMaterial> _materials;
+    std::unordered_map<QString, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 };
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 19aa6990db..450d0727f9 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -357,9 +357,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_URL, materialURL);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_TYPE, materialMode);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_PRIORITY, priority);
-    CHECK_PROPERTY_CHANGE(PROP_PARENT_SHAPE_ID, shapeID);
+    CHECK_PROPERTY_CHANGE(PROP_PARENT_MATERIAL_ID, parentMaterialID);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_POS, materialPos);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_SCALE, materialScale);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_ROT, materialRot);
@@ -663,9 +662,8 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     if (_type == EntityTypes::Material) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_URL, materialURL);
         COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_MATERIAL_TYPE, materialMode, getMaterialModeAsString());
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_BLEND_FACTOR, blendFactor);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_PRIORITY, priority);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_SHAPE_ID, shapeID);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_MATERIAL_ID, parentMaterialID);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_POS, materialPos);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_SCALE, materialScale);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_ROT, materialRot);
@@ -806,9 +804,8 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(relayParentJoints, bool, setRelayParentJoints);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialURL, QString, setMaterialURL);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(materialMode, MaterialMode);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(blendFactor, float, setBlendFactor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, quint16, setPriority);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(shapeID, quint16, setShapeID);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(parentMaterialID, QString, setParentMaterialID);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialPos, glmVec2, setMaterialPos);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialScale, glmVec2, setMaterialScale);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialRot, float, setMaterialRot);
@@ -1168,9 +1165,8 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
 
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_URL, MaterialURL, materialURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_PRIORITY, Priority, priority, quint16);
-        ADD_PROPERTY_TO_MAP(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, quint16);
+        ADD_PROPERTY_TO_MAP(PROP_PARENT_MATERIAL_ID, ParentMaterialID, parentMaterialID, QString);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_ROT, MaterialRot, materialRot, float);
@@ -1562,9 +1558,8 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
             if (properties.getType() == EntityTypes::Material) {
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, properties.getMaterialURL());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)properties.getMaterialMode());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, properties.getBlendFactor());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, properties.getPriority());
-                APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, properties.getShapeID());
+                APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, properties.getParentMaterialID());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, properties.getMaterialPos());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, properties.getMaterialScale());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, properties.getMaterialRot());
@@ -1930,9 +1925,8 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     if (properties.getType() == EntityTypes::Material) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_URL, QString, setMaterialURL);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_PRIORITY, quint16, setPriority);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_SHAPE_ID, quint16, setShapeID);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_MATERIAL_ID, QString, setParentMaterialID);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_POS, glmVec2, setMaterialPos);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_SCALE, glmVec2, setMaterialScale);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_ROT, float, setMaterialRot);
@@ -2113,9 +2107,8 @@ void EntityItemProperties::markAllChanged() {
 
     _materialURLChanged = true;
     _materialModeChanged = true;
-    _blendFactorChanged = true;
     _priorityChanged = true;
-    _shapeIDChanged = true;
+    _parentMaterialIDChanged = true;
     _materialPosChanged = true;
     _materialScaleChanged = true;
     _materialRotChanged = true;
@@ -2449,14 +2442,11 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (materialModeChanged()) {
         out += "materialMode";
     }
-    if (blendFactorChanged()) {
-        out += "blendFactor";
-    }
     if (priorityChanged()) {
         out += "priority";
     }
-    if (shapeIDChanged()) {
-        out += "shapeID";
+    if (parentMaterialIDChanged()) {
+        out += "parentMaterialID";
     }
     if (materialPosChanged()) {
         out += "materialPos";
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index a8a79b6303..daa2272e36 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -224,9 +224,8 @@ public:
 
     DEFINE_PROPERTY_REF(PROP_MATERIAL_URL, MaterialURL, materialURL, QString, "");
     DEFINE_PROPERTY_REF_ENUM(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode, UV);
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_BLEND_FACTOR, BlendFactor, blendFactor, float, 1.0f);
     DEFINE_PROPERTY_REF(PROP_MATERIAL_PRIORITY, Priority, priority, quint16, 0);
-    DEFINE_PROPERTY_REF(PROP_PARENT_SHAPE_ID, ShapeID, shapeID, quint16, 0);
+    DEFINE_PROPERTY_REF(PROP_PARENT_MATERIAL_ID, ParentMaterialID, parentMaterialID, QString, "0");
     DEFINE_PROPERTY_REF(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2, glm::vec2(0, 0));
     DEFINE_PROPERTY_REF(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2, glm::vec2(1, 1));
     DEFINE_PROPERTY_REF(PROP_MATERIAL_ROT, MaterialRot, materialRot, float, 0);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 17ebddbe9d..6ed2186760 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -229,9 +229,8 @@ enum EntityPropertyList {
 
     PROP_MATERIAL_URL,
     PROP_MATERIAL_TYPE,
-    PROP_MATERIAL_BLEND_FACTOR,
     PROP_MATERIAL_PRIORITY,
-    PROP_PARENT_SHAPE_ID,
+    PROP_PARENT_MATERIAL_ID,
     PROP_MATERIAL_POS,
     PROP_MATERIAL_SCALE,
     PROP_MATERIAL_ROT,
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 775b3bd2f7..9935718568 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2382,35 +2382,35 @@ QStringList EntityTree::getJointNames(const QUuid& entityID) const {
     return entity->getJointNames();
 }
 
-std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_addMaterialToAvatarOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_removeMaterialFromAvatarOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_addMaterialToOverlayOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_addMaterialToAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_removeMaterialFromAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_addMaterialToOverlayOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
 
-bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
     if (_addMaterialToAvatarOperator) {
-        return _addMaterialToAvatarOperator(avatarID, material, shapeID);
+        return _addMaterialToAvatarOperator(avatarID, material, parentMaterialID);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID) {
+bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
     if (_removeMaterialFromAvatarOperator) {
-        return _removeMaterialFromAvatarOperator(avatarID, material, shapeID);
+        return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialID);
     }
     return false;
 }
 
-bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
     if (_addMaterialToOverlayOperator) {
-        return _addMaterialToOverlayOperator(overlayID, material, shapeID);
+        return _addMaterialToOverlayOperator(overlayID, material, parentMaterialID);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID) {
+bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
     if (_removeMaterialFromOverlayOperator) {
-        return _removeMaterialFromOverlayOperator(overlayID, material, shapeID);
+        return _removeMaterialFromOverlayOperator(overlayID, material, parentMaterialID);
     }
     return false;
 }
\ No newline at end of file
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index a02ce900ff..a532f64fc9 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -280,15 +280,15 @@ public:
 
     void setMyAvatar(std::shared_ptr<AvatarData> myAvatar) { _myAvatar = myAvatar; }
 
-    static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
-    static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
-    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID);
-    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, quint16 shapeID);
+    static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
+    static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
+    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID);
+    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID);
 
-    static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
-    static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
-    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID);
-    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, quint16 shapeID);
+    static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
+    static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
+    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID);
+    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID);
 
 signals:
     void deletingEntity(const EntityItemID& entityID);
@@ -398,10 +398,10 @@ private:
 
     std::shared_ptr<AvatarData> _myAvatar{ nullptr };
 
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _addMaterialToAvatarOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _removeMaterialFromAvatarOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _addMaterialToOverlayOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, quint16)> _removeMaterialFromOverlayOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _addMaterialToAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _removeMaterialFromAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _addMaterialToOverlayOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _removeMaterialFromOverlayOperator;
 };
 
 #endif // hifi_EntityTree_h
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index 7026da117c..1ebaa4f21a 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -31,9 +31,8 @@ EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desir
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMode, getMaterialMode);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(blendFactor, getBlendFactor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(priority, getPriority);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(shapeID, getShapeID);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(parentMaterialID, getParentMaterialID);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialPos, getMaterialPos);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialScale, getMaterialScale);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialRot, getMaterialRot);
@@ -45,9 +44,8 @@ bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialURL, setMaterialURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMode, setMaterialMode);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(blendFactor, setBlendFactor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(priority, setPriority);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(shapeID, setShapeID);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(parentMaterialID, setParentMaterialID);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialPos, setMaterialPos);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialScale, setMaterialScale);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialRot, setMaterialRot);
@@ -65,139 +63,6 @@ bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
     return somethingChanged;
 }
 
-bool MaterialEntityItem::parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB) {
-    if (array.isArray()) {
-        QJsonArray colorArray = array.toArray();
-        if (colorArray.size() >= 3 && colorArray[0].isDouble() && colorArray[1].isDouble() && colorArray[2].isDouble()) {
-            isSRGB = true;
-            if (colorArray.size() >= 4) {
-                if (colorArray[3].isBool()) {
-                    isSRGB = colorArray[3].toBool();
-                }
-            }
-            color = glm::vec3(colorArray[0].toDouble(), colorArray[1].toDouble(), colorArray[2].toDouble());
-            return true;
-        }
-    }
-    return false;
-}
-
-void MaterialEntityItem::parseJSONMaterial(const QJsonObject& materialJSON) {
-    QString name = "";
-    std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
-    for (auto& key : materialJSON.keys()) {
-        if (key == "name") {
-            auto nameJSON = materialJSON.value(key);
-            if (nameJSON.isString()) {
-                name = nameJSON.toString();
-            }
-        } else if (key == "emissive") {
-            glm::vec3 color;
-            bool isSRGB;
-            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
-            if (valid) {
-                material->setEmissive(color, isSRGB);
-            }
-        } else if (key == "opacity") {
-            auto value = materialJSON.value(key);
-            if (value.isDouble()) {
-                material->setOpacity(value.toDouble());
-            }
-        } else if (key == "albedo") {
-            glm::vec3 color;
-            bool isSRGB;
-            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
-            if (valid) {
-                material->setAlbedo(color, isSRGB);
-            }
-        } else if (key == "roughness") {
-            auto value = materialJSON.value(key);
-            if (value.isDouble()) {
-                material->setRoughness(value.toDouble());
-            }
-        } else if (key == "fresnel") {
-            glm::vec3 color;
-            bool isSRGB;
-            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
-            if (valid) {
-                material->setFresnel(color, isSRGB);
-            }
-        } else if (key == "metallic") {
-            auto value = materialJSON.value(key);
-            if (value.isDouble()) {
-                material->setMetallic(value.toDouble());
-            }
-        } else if (key == "scattering") {
-            auto value = materialJSON.value(key);
-            if (value.isDouble()) {
-                material->setScattering(value.toDouble());
-            }
-        } else if (key == "emissiveMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setEmissiveMap(value.toString());
-            }
-        } else if (key == "albedoMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                bool useAlphaChannel = false;
-                auto opacityMap = materialJSON.find("opacityMap");
-                if (opacityMap != materialJSON.end() && opacityMap->isString() && opacityMap->toString() == value.toString()) {
-                    useAlphaChannel = true;
-                }
-                material->setAlbedoMap(value.toString(), useAlphaChannel);
-            }
-        } else if (key == "roughnessMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setRoughnessMap(value.toString(), false);
-            }
-        } else if (key == "glossMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setRoughnessMap(value.toString(), true);
-            }
-        } else if (key == "metallicMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setMetallicMap(value.toString(), false);
-            }
-        } else if (key == "specularMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setMetallicMap(value.toString(), true);
-            }
-        } else if (key == "normalMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setNormalMap(value.toString(), false);
-            }
-        } else if (key == "bumpMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setNormalMap(value.toString(), true);
-            }
-        } else if (key == "occlusionMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setOcclusionMap(value.toString());
-            }
-        } else if (key == "scatteringMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setScatteringMap(value.toString());
-            }
-        } else if (key == "lightMap") {
-            auto value = materialJSON.value(key);
-            if (value.isString()) {
-                material->setLightmapMap(value.toString());
-            }
-        }
-    }
-    _materials[name] = material;
-    _materialNames.push_back(name);
-}
-
 int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
                                                 ReadBitstreamToTreeParams& args,
                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
@@ -208,9 +73,8 @@ int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
 
     READ_ENTITY_PROPERTY(PROP_MATERIAL_URL, QString, setMaterialURL);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, float, setBlendFactor);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, quint16, setPriority);
-    READ_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, quint16, setShapeID);
+    READ_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, QString, setParentMaterialID);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_POS, glm::vec2, setMaterialPos);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, glm::vec2, setMaterialScale);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_ROT, float, setMaterialRot);
@@ -224,9 +88,8 @@ EntityPropertyFlags MaterialEntityItem::getEntityProperties(EncodeBitstreamParam
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
     requestedProperties += PROP_MATERIAL_URL;
     requestedProperties += PROP_MATERIAL_TYPE;
-    requestedProperties += PROP_MATERIAL_BLEND_FACTOR;
     requestedProperties += PROP_MATERIAL_PRIORITY;
-    requestedProperties += PROP_PARENT_SHAPE_ID;
+    requestedProperties += PROP_PARENT_MATERIAL_ID;
     requestedProperties += PROP_MATERIAL_POS;
     requestedProperties += PROP_MATERIAL_SCALE;
     requestedProperties += PROP_MATERIAL_ROT;
@@ -244,9 +107,8 @@ void MaterialEntityItem::appendSubclassData(OctreePacketData* packetData, Encode
     bool successPropertyFits = true;
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, getMaterialURL());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)getMaterialMode());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_BLEND_FACTOR, getBlendFactor());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, getPriority());
-    APPEND_ENTITY_PROPERTY(PROP_PARENT_SHAPE_ID, getShapeID());
+    APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, getParentMaterialID());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, getMaterialPos());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, getMaterialScale());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, getMaterialRot());
@@ -259,9 +121,8 @@ void MaterialEntityItem::debugDump() const {
     qCDebug(entities) << "          material json:" << _materialURL;
     qCDebug(entities) << "  current material name:" << _currentMaterialName;
     qCDebug(entities) << "          material type:" << _materialMode;
-    qCDebug(entities) << "           blend factor:" << _blendFactor;
     qCDebug(entities) << "               priority:" << _priority;
-    qCDebug(entities) << "        parent shape ID:" << _shapeID;
+    qCDebug(entities) << "     parent material ID:" << _parentMaterialID;
     qCDebug(entities) << "           material pos:" << _materialPos;
     qCDebug(entities) << "         material scale:" << _materialRot;
     qCDebug(entities) << "           material rot:" << _materialScale;
@@ -290,6 +151,8 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
         removeMaterial();
         _materialURL = materialURLString;
 
+        // TODO: if URL ends with ?string, try to set _currentMaterialName = string
+
         if (usingUserData) {
             QJsonDocument materialJSON = QJsonDocument::fromJson(getUserData().toUtf8());
             _materials.clear();
@@ -299,22 +162,39 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
                     QJsonArray materials = materialJSON.array();
                     for (auto material : materials) {
                         if (!material.isNull() && material.isObject()) {
-                            parseJSONMaterial(material.toObject());
+                            auto networkMaterial = NetworkMaterialResource::parseJSONMaterial(material.toObject());
+                            _materials[networkMaterial.first] = networkMaterial.second;
+                            _materialNames.push_back(networkMaterial.first);
                         }
                     }
                 } else if (materialJSON.isObject()) {
-                    parseJSONMaterial(materialJSON.object());
+                    auto networkMaterial = NetworkMaterialResource::parseJSONMaterial(materialJSON.object());
+                    _materials[networkMaterial.first] = networkMaterial.second;
+                    _materialNames.push_back(networkMaterial.first);
                 }
             }
+            // Since our material changed, the current name might not be valid anymore, so we need to update
+            setCurrentMaterialName(_currentMaterialName);
+            applyMaterial();
         } else {
-            // get material via network request
+            _networkMaterial = MaterialCache::instance().getMaterial(materialURLString);
+            auto onMaterialRequestFinished = [&](bool success) {
+                if (success) {
+                    _materials[_networkMaterial->name] = _networkMaterial->networkMaterial;
+                    _materialNames.push_back(_networkMaterial->name);
+
+                    setCurrentMaterialName(_currentMaterialName);
+                    applyMaterial();
+                }
+            };
+            if (_networkMaterial) {
+                if (_networkMaterial->isLoaded()) {
+                    onMaterialRequestFinished(!_networkMaterial->isFailed());
+                } else {
+                    connect(_networkMaterial.data(), &Resource::finished, this, onMaterialRequestFinished);
+                }
+            }
         }
-
-        // TODO: if URL ends with ?string, try to set _currentMaterialName = string
-
-        // Since our JSON changed, the current name might not be valid anymore, so we need to update
-        setCurrentMaterialName(_currentMaterialName);
-        applyMaterial();
     }
 }
 
@@ -361,14 +241,6 @@ void MaterialEntityItem::setMaterialRot(const float& materialRot) {
     }
 }
 
-void MaterialEntityItem::setBlendFactor(float blendFactor) {
-    if (_blendFactor != blendFactor) {
-        removeMaterial();
-        _blendFactor = blendFactor;
-        applyMaterial();
-    }
-}
-
 void MaterialEntityItem::setPriority(quint16 priority) {
     if (_priority != priority) {
         removeMaterial();
@@ -377,10 +249,10 @@ void MaterialEntityItem::setPriority(quint16 priority) {
     }
 }
 
-void MaterialEntityItem::setShapeID(quint16 shapeID) {
-    if (_shapeID != shapeID) {
+void MaterialEntityItem::setParentMaterialID(const QString& parentMaterialID) {
+    if (_parentMaterialID != parentMaterialID) {
         removeMaterial();
-        _shapeID = shapeID;
+        _parentMaterialID = parentMaterialID;
         applyMaterial();
     }
 }
@@ -421,16 +293,16 @@ void MaterialEntityItem::removeMaterial() {
     if (tree) {
         EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
         if (entity) {
-            entity->removeMaterial(material, getShapeID());
+            entity->removeMaterial(material, getParentMaterialID());
             return;
         }
     }
 
-    if (EntityTree::removeMaterialFromAvatar(parentID, material, getShapeID())) {
+    if (EntityTree::removeMaterialFromAvatar(parentID, material, getParentMaterialID())) {
         return;
     }
 
-    if (EntityTree::removeMaterialFromOverlay(parentID, material, getShapeID())) {
+    if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialID())) {
         return;
     }
 
@@ -449,7 +321,6 @@ void MaterialEntityItem::applyMaterial() {
     textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialRot)));
     textureTransform.setScale(glm::vec3(_materialScale, 1));
     material->setTextureTransforms(textureTransform);
-    material->setBlendFactor(getBlendFactor());
     material->setPriority(getPriority());
 
     // Our parent could be an entity, an avatar, or an overlay
@@ -457,16 +328,16 @@ void MaterialEntityItem::applyMaterial() {
     if (tree) {
         EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
         if (entity) {
-            entity->addMaterial(material, getShapeID());
+            entity->addMaterial(material, getParentMaterialID());
             return;
         }
     }
 
-    if (EntityTree::addMaterialToAvatar(parentID, material, getShapeID())) {
+    if (EntityTree::addMaterialToAvatar(parentID, material, getParentMaterialID())) {
         return;
     }
 
-    if (EntityTree::addMaterialToOverlay(parentID, material, getShapeID())) {
+    if (EntityTree::addMaterialToOverlay(parentID, material, getParentMaterialID())) {
         return;
     }
 
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index 40137acf22..dde9b60da9 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -13,6 +13,7 @@
 
 #include "MaterialMode.h"
 #include <model-networking/ModelCache.h>
+#include <model-networking/MaterialCache.h>
 
 class MaterialEntityItem : public EntityItem {
     using Pointer = std::shared_ptr<MaterialEntityItem>;
@@ -60,14 +61,11 @@ public:
     MaterialMode getMaterialMode() const { return _materialMode; }
     void setMaterialMode(MaterialMode mode) { _materialMode = mode; }
 
-    float getBlendFactor() const { return _blendFactor; }
-    void setBlendFactor(float blendFactor);
-
     quint16 getPriority() const { return _priority; }
     void setPriority(quint16 priority);
 
-    quint16 getShapeID() const { return _shapeID; }
-    void setShapeID(quint16 shapeID);
+    QString getParentMaterialID() const { return _parentMaterialID; }
+    void setParentMaterialID(const QString& parentMaterialID);
 
     glm::vec2 getMaterialPos() const { return _materialPos; }
     void setMaterialPos(const glm::vec2& materialPos);
@@ -93,22 +91,19 @@ public:
 private:
     QString _materialURL;
     MaterialMode _materialMode { UV };
-    float _blendFactor { 1.0f };
     quint16 _priority { 0 };
-    quint16 _shapeID { 0 };
+    QString _parentMaterialID { "0" };
     glm::vec2 _materialPos { 0, 0 };
     glm::vec2 _materialScale { 1, 1 };
     float _materialRot { 0 };
     
+    NetworkMaterialResourcePointer _networkMaterial;
     QHash<QString, std::shared_ptr<NetworkMaterial>> _materials;
     std::vector<QString> _materialNames;
     QString _currentMaterialName;
 
     bool _retryApply { false };
 
-    void parseJSONMaterial(const QJsonObject& materialJSON);
-    static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
-
 };
 
 #endif // hifi_MaterialEntityItem_h
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index 6731d544b8..5b3396dfc5 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -354,9 +354,6 @@ public:
     size_t getTextureSize()  const { calculateMaterialInfo(); return _textureSize; }
     bool hasTextureInfo() const { return _hasCalculatedTextureInfo; }
 
-    void setBlendFactor(float blendFactor) { _blendFactor = blendFactor; }
-    float getBlendFactor() { return _blendFactor; }
-
     void setPriority(quint16 priority) { _priority = priority; }
     quint16 getPriority() { return _priority; }
 
@@ -375,7 +372,6 @@ private:
     mutable bool _hasCalculatedTextureInfo { false };
     bool calculateMaterialInfo() const;
 
-    float _blendFactor { 1.0f };
     quint16 _priority { 0 };
 
 };
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.cpp b/libraries/model-networking/src/model-networking/MaterialCache.cpp
new file mode 100644
index 0000000000..723448f65a
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/MaterialCache.cpp
@@ -0,0 +1,175 @@
+//
+//  Created by Sam Gondelman on 2/9/2018
+//  Copyright 2018 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 "MaterialCache.h"
+
+#include "QJsonObject"
+#include "QJsonDocument"
+#include "QJsonArray"
+
+NetworkMaterialResource::NetworkMaterialResource(const QUrl& url) :
+    Resource(url) {}
+
+void NetworkMaterialResource::downloadFinished(const QByteArray& data) {
+    if (_url.toString().endsWith(".json")) {
+        QJsonDocument materialJSON = QJsonDocument::fromJson(data);
+        if (!materialJSON.isNull() && materialJSON.isObject()) {
+            auto parsedMaterial = parseJSONMaterial(materialJSON.object());
+            name = parsedMaterial.first;
+            networkMaterial = parsedMaterial.second;
+        }
+    }
+
+    // TODO: parse other material types
+
+    finishedLoading(true);
+}
+
+bool NetworkMaterialResource::parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB) {
+    if (array.isArray()) {
+        QJsonArray colorArray = array.toArray();
+        if (colorArray.size() >= 3 && colorArray[0].isDouble() && colorArray[1].isDouble() && colorArray[2].isDouble()) {
+            isSRGB = true;
+            if (colorArray.size() >= 4) {
+                if (colorArray[3].isBool()) {
+                    isSRGB = colorArray[3].toBool();
+                }
+            }
+            color = glm::vec3(colorArray[0].toDouble(), colorArray[1].toDouble(), colorArray[2].toDouble());
+            return true;
+        }
+    }
+    return false;
+}
+
+std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::parseJSONMaterial(const QJsonObject& materialJSON) {
+    QString name = "";
+    std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
+    for (auto& key : materialJSON.keys()) {
+        if (key == "name") {
+            auto nameJSON = materialJSON.value(key);
+            if (nameJSON.isString()) {
+                name = nameJSON.toString();
+            }
+        } else if (key == "emissive") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setEmissive(color, isSRGB);
+            }
+        } else if (key == "opacity") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setOpacity(value.toDouble());
+            }
+        } else if (key == "albedo") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setAlbedo(color, isSRGB);
+            }
+        } else if (key == "roughness") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setRoughness(value.toDouble());
+            }
+        } else if (key == "fresnel") {
+            glm::vec3 color;
+            bool isSRGB;
+            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
+            if (valid) {
+                material->setFresnel(color, isSRGB);
+            }
+        } else if (key == "metallic") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setMetallic(value.toDouble());
+            }
+        } else if (key == "scattering") {
+            auto value = materialJSON.value(key);
+            if (value.isDouble()) {
+                material->setScattering(value.toDouble());
+            }
+        } else if (key == "emissiveMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setEmissiveMap(value.toString());
+            }
+        } else if (key == "albedoMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                bool useAlphaChannel = false;
+                auto opacityMap = materialJSON.find("opacityMap");
+                if (opacityMap != materialJSON.end() && opacityMap->isString() && opacityMap->toString() == value.toString()) {
+                    useAlphaChannel = true;
+                }
+                material->setAlbedoMap(value.toString(), useAlphaChannel);
+            }
+        } else if (key == "roughnessMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setRoughnessMap(value.toString(), false);
+            }
+        } else if (key == "glossMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setRoughnessMap(value.toString(), true);
+            }
+        } else if (key == "metallicMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setMetallicMap(value.toString(), false);
+            }
+        } else if (key == "specularMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setMetallicMap(value.toString(), true);
+            }
+        } else if (key == "normalMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setNormalMap(value.toString(), false);
+            }
+        } else if (key == "bumpMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setNormalMap(value.toString(), true);
+            }
+        } else if (key == "occlusionMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setOcclusionMap(value.toString());
+            }
+        } else if (key == "scatteringMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setScatteringMap(value.toString());
+            }
+        } else if (key == "lightMap") {
+            auto value = materialJSON.value(key);
+            if (value.isString()) {
+                material->setLightmapMap(value.toString());
+            }
+        }
+    }
+    return std::pair<QString, std::shared_ptr<NetworkMaterial>>(name, material);
+}
+
+MaterialCache& MaterialCache::instance() {
+    static MaterialCache _instance;
+    return _instance;
+}
+
+NetworkMaterialResourcePointer MaterialCache::getMaterial(const QUrl& url) {
+    return ResourceCache::getResource(url, QUrl(), nullptr).staticCast<NetworkMaterialResource>();
+}
+
+QSharedPointer<Resource> MaterialCache::createResource(const QUrl& url, const QSharedPointer<Resource>& fallback, const void* extra) {
+    return QSharedPointer<Resource>(new NetworkMaterialResource(url), &Resource::deleter);
+}
\ No newline at end of file
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.h b/libraries/model-networking/src/model-networking/MaterialCache.h
new file mode 100644
index 0000000000..1b0f1c577c
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/MaterialCache.h
@@ -0,0 +1,46 @@
+//
+//  Created by Sam Gondelman on 2/9/2018
+//  Copyright 2018 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_MaterialCache_h
+#define hifi_MaterialCache_h
+
+#include <ResourceCache.h>
+
+#include "glm/glm.hpp"
+
+#include "ModelCache.h"
+
+class NetworkMaterialResource : public Resource {
+public:
+    NetworkMaterialResource(const QUrl& url);
+
+    QString getType() const override { return "NetworkMaterial"; }
+
+    virtual void downloadFinished(const QByteArray& data) override;
+
+    QString name { "" };
+    std::shared_ptr<NetworkMaterial> networkMaterial { nullptr };
+
+    static std::pair<QString, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON);
+
+private:
+    static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
+};
+
+using NetworkMaterialResourcePointer = QSharedPointer<NetworkMaterialResource>;
+
+class MaterialCache : public ResourceCache {
+public:
+    static MaterialCache& instance();
+
+    NetworkMaterialResourcePointer getMaterial(const QUrl& url);
+
+protected:
+    virtual QSharedPointer<Resource> createResource(const QUrl& url, const QSharedPointer<Resource>& fallback, const void* extra) override;
+};
+
+#endif
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 32deba3687..739f401ee7 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -495,8 +495,8 @@ NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
     Material(m),
     _textures(m._textures),
     _albedoTransform(m._albedoTransform),
-    _lightmapParams(m._lightmapParams),
     _lightmapTransform(m._lightmapTransform),
+    _lightmapParams(m._lightmapParams),
     _isOriginal(m._isOriginal)
 {}
 
diff --git a/libraries/networking/src/ResourceRequest.cpp b/libraries/networking/src/ResourceRequest.cpp
index 5d39583c9e..115e665b77 100644
--- a/libraries/networking/src/ResourceRequest.cpp
+++ b/libraries/networking/src/ResourceRequest.cpp
@@ -23,7 +23,7 @@ void ResourceRequest::send() {
         QMetaObject::invokeMethod(this, "send", Qt::QueuedConnection);
         return;
     }
-    
+
     Q_ASSERT(_state == NotStarted);
 
     _state = InProgress;
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 805995edfb..3a9ea45d77 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1524,48 +1524,62 @@ bool Model::isRenderable() const {
     return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
 }
 
-void Model::addMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    if (shapeID < _modelMeshRenderItemIDs.size()) {
-        render::Transaction transaction;
-        auto itemID = _modelMeshRenderItemIDs[shapeID];
-        bool visible = isVisible();
-        uint8_t viewTagBits = getViewTagBits();
-        bool layeredInFront = isLayeredInFront();
-        bool layeredInHUD = isLayeredInHUD();
-        bool wireframe = isWireframe();
-        auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
-        bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
-        transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
-            invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
-            data.addMaterial(material);
-            // if the material changed, we might need to update our item key or shape key
-            data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
-            data.setShapeKey(invalidatePayloadShapeKey, wireframe);
-        });
-        AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
-    }
+std::vector<unsigned int> Model::getMeshIDsFromMaterialID(const QString& parentMaterialID) {
+    std::vector<unsigned int> toReturn;
+    // TODO: first, try to find all meshes with materials that match parentMaterialID as a string
+    // if none, return parentMaterialID as a uint
+    toReturn.push_back(parentMaterialID.toUInt());
+    return toReturn;
 }
 
-void Model::removeMaterial(graphics::MaterialPointer material, quint16 shapeID) {
-    if (shapeID < _modelMeshRenderItemIDs.size()) {
-        render::Transaction transaction;
-        auto itemID = _modelMeshRenderItemIDs[shapeID];
-        bool visible = isVisible();
-        uint8_t viewTagBits = getViewTagBits();
-        bool layeredInFront = isLayeredInFront();
-        bool layeredInHUD = isLayeredInHUD();
-        bool wireframe = isWireframe();
-        auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
-        bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
-        transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
-            invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
-            data.removeMaterial(material);
-            // if the material changed, we might need to update our item key or shape key
-            data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
-            data.setShapeKey(invalidatePayloadShapeKey, wireframe);
-        });
-        AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+void Model::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialID);
+    render::Transaction transaction;
+    for (auto shapeID : shapeIDs) {
+        if (shapeID < _modelMeshRenderItemIDs.size()) {
+            auto itemID = _modelMeshRenderItemIDs[shapeID];
+            bool visible = isVisible();
+            uint8_t viewTagBits = getViewTagBits();
+            bool layeredInFront = isLayeredInFront();
+            bool layeredInHUD = isLayeredInHUD();
+            bool wireframe = isWireframe();
+            auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
+            bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
+                invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+                data.addMaterial(material);
+                // if the material changed, we might need to update our item key or shape key
+                data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+                data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+            });
+        }
     }
+    AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+}
+
+void Model::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialID);
+    render::Transaction transaction;
+    for (auto shapeID : shapeIDs) {
+        if (shapeID < _modelMeshRenderItemIDs.size()) {
+            auto itemID = _modelMeshRenderItemIDs[shapeID];
+            bool visible = isVisible();
+            uint8_t viewTagBits = getViewTagBits();
+            bool layeredInFront = isLayeredInFront();
+            bool layeredInHUD = isLayeredInHUD();
+            bool wireframe = isWireframe();
+            auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
+            bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
+                invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+                data.removeMaterial(material);
+                // if the material changed, we might need to update our item key or shape key
+                data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+                data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+            });
+        }
+    }
+    AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
 }
 
 class CollisionRenderGeometry : public Geometry {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 80067aff2a..b4152324bc 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -318,8 +318,8 @@ public:
 
     void scaleToFit();
 
-    void addMaterial(graphics::MaterialPointer material, quint16 shapeID);
-    void removeMaterial(graphics::MaterialPointer material, quint16 shapeID);
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
 
 public slots:
     void loadURLFinished(bool success);
@@ -471,6 +471,8 @@ private:
     float _loadingPriority { 0.0f };
 
     void calculateTextureInfo();
+
+    std::vector<unsigned int> getMeshIDsFromMaterialID(const QString& parentMaterialID);
 };
 
 Q_DECLARE_METATYPE(ModelPointer)
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 25b2cec331..4dbbd190ff 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -256,6 +256,13 @@ namespace std {
             return result;
         }
     };
+
+    template <>
+    struct hash<QString> {
+        size_t operator()(const QString& a) const {
+            return qHash(a);
+        }
+    };
 }
 
 enum ContactEventType {
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 348d93d589..5eedd1c7e4 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -780,19 +780,14 @@
                     </select>
                 </div>
 
-                <div class="material-group material-section property number">
-                    <label>Blend Factor </label>
-                    <input type="number" id="property-blend-factor" min="0" max="1" step="0.1">
-                </div>
-
                 <div class="material-group material-section property number">
                     <label>Priority </label>
                     <input type="number" id="property-priority" min="0">
                 </div>
 
-                <div class="material-group material-section property number">
-                    <label>Shape ID </label>
-                    <input type="number" id="property-shape-id" min="0">
+                <div class="material-group material-section property text">
+                    <label>Parent Material ID </label>
+                    <input type="text" id="property-parent-material-id">
                 </div>
 
                 <fieldset>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 3558a36c04..01ec4ae283 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -633,9 +633,8 @@ function loaded() {
 
         var elMaterialURL = document.getElementById("property-material-url");
         var elMaterialMode = document.getElementById("property-material-mode");
-        var elBlendFactor = document.getElementById("property-blend-factor");
         var elPriority = document.getElementById("property-priority");
-        var elShapeID = document.getElementById("property-shape-id");
+        var elParentMaterialID = document.getElementById("property-parent-material-id");
         var elMaterialPosX = document.getElementById("property-material-pos-x");
         var elMaterialPosY = document.getElementById("property-material-pos-y");
         var elMaterialScaleX = document.getElementById("property-material-scale-x");
@@ -1130,9 +1129,8 @@ function loaded() {
                             elMaterialURL.value = properties.materialURL;
                             elMaterialMode.value = properties.materialMode;
                             setDropdownText(elMaterialMode);
-                            elBlendFactor.value = properties.blendFactor.toFixed(2);
                             elPriority.value = properties.priority;
-                            elShapeID.value = properties.shapeID;
+                            elParentMaterialID.value = properties.parentMaterialID;
                             elMaterialPosX.value = properties.materialPos.x.toFixed(4);
                             elMaterialPosY.value = properties.materialPos.y.toFixed(4);
                             elMaterialScaleX.value = properties.materialScale.x.toFixed(4);
@@ -1410,9 +1408,8 @@ function loaded() {
 
         elMaterialURL.addEventListener('change', createEmitTextPropertyUpdateFunction('materialURL'));
         elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
-        elBlendFactor.addEventListener('change', createEmitNumberPropertyUpdateFunction('blendFactor', 2));
         elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority', 0));
-        elShapeID.addEventListener('change', createEmitNumberPropertyUpdateFunction('shapeID', 0));
+        elParentMaterialID.addEventListener('change', createEmitTextPropertyUpdateFunction('parentMaterialID'));
 
         var materialPosChangeFunction = createEmitVec2PropertyUpdateFunction('materialPos', elMaterialPosX, elMaterialPosY);
         elMaterialPosX.addEventListener('change', materialPosChangeFunction);

From 4acd0a34f50ec1219a40ca82cea17df24acf0435 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Mon, 12 Feb 2018 12:55:14 -0800
Subject: [PATCH 185/569] Seems OK.  Before adding flag to entity.

---
 libraries/render-utils/src/RenderShadowTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index e34f550def..53c109dc9f 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -224,7 +224,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withShadowCaster();
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();

From 2ff78493dbf68bd3d988aebfef44614e4e5a6b36 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 13 Feb 2018 10:11:18 +1300
Subject: [PATCH 186/569] A further guard

---
 scripts/system/controllers/controllerDispatcher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index b2455b3f5a..345ab33c0d 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -479,7 +479,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
         };
     }
     function mouseReleaseOnOverlay(overlayID, event) {
-        if (overlayID === HMD.homeButtonID && event.button === "Primary") {
+        if (HMD.homeButtonID && overlayID === HMD.homeButtonID && event.button === "Primary") {
             Messages.sendLocalMessage("home", overlayID);
         }
     }

From e15ab2ca6c49478f1b7006b829e2dcad840aa418 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 12 Feb 2018 13:32:48 -0800
Subject: [PATCH 187/569] CR

---
 domain-server/src/BackupSupervisor.cpp      | 7 ++-----
 domain-server/src/BackupSupervisor.h        | 3 +--
 domain-server/src/DomainServer.h            | 1 -
 libraries/networking/src/PacketReceiver.cpp | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 1bf1e9e199..03ad5de558 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -108,6 +108,7 @@ bool BackupSupervisor::loadBackup(const QString& backupFile) {
     auto document = QJsonDocument::fromJson(file.readAll(), &error);
     if (document.isNull() || !document.isObject()) {
         qCritical() << "Could not parse backup file to JSON object:" << backupFile;
+        qCritical() << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
         return false;
     }
@@ -165,7 +166,6 @@ void BackupSupervisor::backupAssetServer() {
     });
 
     startBackup();
-    qDebug() << "Requesting mappings for backup!";
     request->start();
 }
 
@@ -197,7 +197,7 @@ void BackupSupervisor::backupNextMissingFile() {
         if (request->getError() == AssetRequest::NoError) {
             qDebug() << "Got" << request->getHash();
 
-            bool success = writeAssetFile(request->getHash(),request->getData());
+            bool success = writeAssetFile(request->getHash(), request->getData());
             if (!success) {
                 qCritical() << "Failed to write asset file" << request->getHash();
             }
@@ -263,8 +263,6 @@ void BackupSupervisor::restoreAssetServer(int backupIndex) {
     auto request = assetClient->createGetAllMappingsRequest();
 
     connect(request, &GetAllMappingsRequest::finished, this, [this, backupIndex](GetAllMappingsRequest* request) {
-        qDebug() << "Got" << request->getMappings().size() << "mappings!";
-
         if (request->getError() == MappingRequest::NoError) {
             const auto& newMappings = _backups.at(backupIndex).mappings;
             computeServerStateDifference(request->getMappings(), newMappings);
@@ -278,7 +276,6 @@ void BackupSupervisor::restoreAssetServer(int backupIndex) {
     });
 
     startRestore();
-    qDebug() << "Requesting mappings for restore!";
     request->start();
 }
 
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index f01e389c39..067abdc25c 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -53,7 +53,6 @@ private:
     bool writeBackupFile(const AssetUtils::AssetMappings& mappings);
     bool writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data);
 
-
     void startRestore() { _restoreInProgress = true; }
     void finishRestore() { _restoreInProgress = false; }
     void computeServerStateDifference(const AssetUtils::AssetMappings& currentMappings,
@@ -75,7 +74,7 @@ private:
     bool _backupInProgress { false };
     std::vector<AssetUtils::AssetHash> _assetsLeftToRequest;
 
-    // Internal storage for restor in progress
+    // Internal storage for restore in progress
     bool _restoreInProgress { false };
     std::vector<AssetUtils::AssetHash> _assetsLeftToUpload;
     std::vector<std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash>> _mappingsLeftToSet;
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index f84a47d457..c7d779b394 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -253,7 +253,6 @@ private:
     bool _sendICEServerAddressToMetaverseAPIRedo { false };
 
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
-    BackupSupervisor _backupSupervisor;
 
     QThread _assetClientThread;
 };
diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp
index 0834a55148..27b57ef26c 100644
--- a/libraries/networking/src/PacketReceiver.cpp
+++ b/libraries/networking/src/PacketReceiver.cpp
@@ -315,7 +315,7 @@ void PacketReceiver::handleVerifiedMessage(QSharedPointer<ReceivedMessage> recei
             }
         } else {
             qCDebug(networking).nospace() << "Listener for packet " << receivedMessage->getType()
-            << " has been destroyed. Removing from listener map.";
+                << " has been destroyed. Removing from listener map.";
             it = _messageListenerMap.erase(it);
 
             // if it exists, remove the listener from _directlyConnectedObjects

From ad409618640071ca84824765c656b7467a53ac19 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 12 Feb 2018 13:46:27 -0800
Subject: [PATCH 188/569] fix tangents (I think), update material rendering
 when transform changes

---
 .../src/RenderableMaterialEntityItem.cpp            | 13 ++++++++++++-
 .../src/RenderableMaterialEntityItem.h              |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
index ad17202d8e..529aa03124 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -18,6 +18,9 @@ bool MaterialEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityP
     if (entity->getParentID() != _parentID || entity->getClientOnly() != _clientOnly || entity->getOwningAvatarID() != _owningAvatarID) {
         return true;
     }
+    if (entity->getMaterialPos() != _materialPos || entity->getMaterialScale() != _materialScale || entity->getMaterialRot() != _materialRot) {
+        return true;
+    }
     return false;
 }
 
@@ -27,6 +30,9 @@ void MaterialEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&
         _parentID = entity->getParentID();
         _clientOnly = entity->getClientOnly();
         _owningAvatarID = entity->getOwningAvatarID();
+        _materialPos = entity->getMaterialPos();
+        _materialScale = entity->getMaterialScale();
+        _materialRot = entity->getMaterialRot();
         _renderTransform = getModelTransform();
         const float MATERIAL_ENTITY_SCALE = 0.5f;
         _renderTransform.postScale(MATERIAL_ENTITY_SCALE);
@@ -91,7 +97,7 @@ glm::vec3 MaterialEntityRenderer::getVertexPos(float phi, float theta) {
 }
 
 glm::vec3 MaterialEntityRenderer::getTangent(float phi, float theta) {
-    return glm::vec3(-glm::cos(theta) * glm::cos(phi), 0, -glm::cos(theta) * glm::sin(phi));
+    return glm::vec3(-glm::cos(theta) * glm::cos(phi), glm::sin(theta), -glm::cos(theta) * glm::sin(phi));
 }
 
 void MaterialEntityRenderer::addVertex(std::vector<float>& buffer, const glm::vec3& pos, const glm::vec3& tan, const glm::vec2 uv) {
@@ -227,16 +233,21 @@ void MaterialEntityRenderer::doRender(RenderArgs* args) {
     QUuid parentID;
     Transform renderTransform;
     graphics::MaterialPointer drawMaterial;
+    Transform textureTransform;
     withReadLock([&] {
         parentID = _clientOnly ? _owningAvatarID : _parentID;
         renderTransform = _renderTransform;
         drawMaterial = _drawMaterial;
+        textureTransform.setTranslation(glm::vec3(_materialPos, 0));
+        textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialRot)));
+        textureTransform.setScale(glm::vec3(_materialScale, 1));
     });
     if (!parentID.isNull() || !drawMaterial) {
         return;
     }
 
     batch.setModelTransform(renderTransform);
+    drawMaterial->setTextureTransforms(textureTransform);
 
     // bind the material
     args->_shapePipeline->bindMaterial(drawMaterial, batch, args->_enableTexturing);
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
index af8cef9351..4af21d84f6 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
@@ -34,6 +34,9 @@ private:
     QUuid _parentID;
     bool _clientOnly;
     QUuid _owningAvatarID;
+    glm::vec2 _materialPos;
+    glm::vec2 _materialScale;
+    float _materialRot;
     Transform _renderTransform;
 
     std::shared_ptr<NetworkMaterial> _drawMaterial;

From 5048bf16cb62260c03c7f47720ca63de61aaa8ba Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cdonaghey728@gmail.com>
Date: Mon, 12 Feb 2018 23:01:19 +0000
Subject: [PATCH 189/569] Fixed Async Prompts/Assets/Dialogs

---
 interface/src/scripting/WindowScriptingInterface.cpp | 11 +++++++----
 libraries/ui/src/OffscreenUi.cpp                     |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index fc45555bf9..d61823e9ee 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -120,16 +120,19 @@ QScriptValue WindowScriptingInterface::confirm(const QString& message) {
 /// \param const QString& defaultText default text in the text box
 /// \return QScriptValue string text value in text box if the dialog was accepted, `null` otherwise.
 QScriptValue WindowScriptingInterface::prompt(const QString& message, const QString& defaultText) {
-    bool ok = false;
-    QString result = OffscreenUi::getText(nullptr, "", message, QLineEdit::Normal, defaultText, &ok);
-    return ok ? QScriptValue(result) : QScriptValue::NullValue;
+    QString result = OffscreenUi::getText(nullptr, "", message, QLineEdit::Normal, defaultText);
+    if (QScriptValue(result).equals("")) {
+        return QScriptValue::NullValue;
+    }
+    return QScriptValue(result);
 }
 
 /// Display a prompt with a text box
 /// \param const QString& message message to display
 /// \param const QString& defaultText default text in the text box
 void WindowScriptingInterface::promptAsync(const QString& message, const QString& defaultText) {
-    ModalDialogListener* dlg = OffscreenUi::getTextAsync(nullptr, "", message, QLineEdit::Normal, defaultText);
+    bool ok = false;
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(nullptr, "", message, QLineEdit::Normal, defaultText, &ok);
     connect(dlg, &ModalDialogListener::response, this, [=] (QVariant result) {
         disconnect(dlg, &ModalDialogListener::response, this, nullptr);
         emit promptTextChanged(result.toString());
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 221f5013bf..2bea2bbd91 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -336,10 +336,11 @@ class InputDialogListener : public ModalDialogListener {
             return;
         }
         connect(_dialog, SIGNAL(selected(QVariant)), this, SLOT(onSelected(const QVariant&)));
+        connect(_dialog, SIGNAL(canceled()), this, SLOT(onSelected()));
     }
 
 private slots:
-    void onSelected(const QVariant& result) {
+    void onSelected(const QVariant& result = "") {
         _result = result;
         auto offscreenUi = DependencyManager::get<OffscreenUi>();
         emit response(_result);
@@ -700,10 +701,11 @@ class FileDialogListener : public ModalDialogListener {
             return;
         }
         connect(_dialog, SIGNAL(selectedFile(QVariant)), this, SLOT(onSelectedFile(QVariant)));
+        connect(_dialog, SIGNAL(canceled()), this, SLOT(onSelectedFile()));
     }
 
 private slots:
-    void onSelectedFile(QVariant file) {
+    void onSelectedFile(QVariant file = "") {
         _result = file.toUrl().toLocalFile();
         _finished = true;
         auto offscreenUi = DependencyManager::get<OffscreenUi>();
@@ -949,10 +951,11 @@ class AssetDialogListener : public ModalDialogListener {
             return;
         }
         connect(_dialog, SIGNAL(selectedAsset(QVariant)), this, SLOT(onSelectedAsset(QVariant)));
+        connect(_dialog, SIGNAL(canceled()), this, SLOT(onSelectedAsset()));
     }
 
     private slots:
-    void onSelectedAsset(QVariant asset) {
+    void onSelectedAsset(QVariant asset = "") {
         _result = asset;
         auto offscreenUi = DependencyManager::get<OffscreenUi>();
         emit response(_result);

From 95e9eb8e4abebbbaa919224a8f638a78fc91482a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 12 Feb 2018 17:06:57 -0800
Subject: [PATCH 190/569] Lots of progress

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 31232 -> 32536 bytes
 .../qml/hifi/commerce/checkout/Checkout.qml   |  69 +++++++++++++-----
 .../hifi/commerce/purchases/PurchasedItem.qml |  57 +++++++++++----
 .../qml/hifi/commerce/purchases/Purchases.qml |  16 +++-
 .../qml/styles-uit/HifiConstants.qml          |   4 +
 interface/src/Application.cpp                 |  34 +++++----
 interface/src/Application.h                   |   2 +
 interface/src/commerce/QmlCommerce.cpp        |  13 ++++
 interface/src/commerce/QmlCommerce.h          |   4 +
 .../entities/src/EntityScriptingInterface.cpp |   5 ++
 .../entities/src/EntityScriptingInterface.h   |   6 ++
 scripts/system/marketplaces/marketplaces.js   |  17 +++--
 12 files changed, 174 insertions(+), 53 deletions(-)

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 4cc5a0fe4f098a287c1df067c8bff37695f96d34..8db0377f88864810e7f893132449ad8e258e68cd 100644
GIT binary patch
delta 1778
zcmX|BYit}>6+Y+AoqK2QJl2nSB>S*;W_D-2b{(&GXJ_2H>o!qq1dW}@Z9){4lvT5h
zqu7p>-KGvdyya2)h89Z*g%o}O?VnUUtN=f%mWR~PN+2OYkx)Sq5&Ym!Bm`1H$U(EI
zxYE7fxku-Gy65UU=jngqH}<d(2ml5=4H6t(Tzq8d(lcN9I>7dS0U-a02OeC6w}Am{
ze+U4@BM;BikGyrb2Y@F4;P~U~?ahl1e$WOW9|Dk#Gwtr??b{#$Z2t}blrw9Wp0Lk-
z?+O6h1lW9TwbMRrK2iK70Hl2J>T0LorZv0)fEEChR@Zx5#n0{g5&-@H04LYZKi+=l
zzCWD;kPic3X}!I*3AgYR0M4Zk+GwwL{yul@IKah^0C0Ene79$>Tz&{(>nZ@77!-#9
z<3CKEc`S49zd$39t`EL*>*gIKw{Ct7TlnhE0)7T(cCTO)kG0@#ScG|49K=chgPk9c
z0j`2Hu<}6ha9SlOaEEpK#?0;8gB<S$d~CrWmch?<eQ6Z6m*7Qs8NLEvg;#bX>Jt$^
znvmp2b9C;3-4pEExjusyJc7T#t6)GGns5-7;5Yy_>bAqJ!1J5KQ3G2Tg@Na@0*RA&
z9GzqUa@}co^(3x@m5?*eDhrr|l`t^TwGxK~EUZLvQg=e1*_K<6Bg89Z#LC`#l`0;h
z#@=uBzN{(xM>AZvI$0~X_cy8%oG>J&S1V%3xyDQ}sVTa|T^*mr{OD+IaFj<3TNrq?
z{N-oE3FOtif1AHCsI0%KQ&}I$2qqeal{<}0(JNJr>nEuzTZ{{dkGS~8Xby8$$|UJ(
z-zK`1>hW$!@H)N=8sx!;DVT*A=HY($BpiWba1u5Ez-N}zaGML*jCe~9D{<mjJglVk
zJ1*lE4})f$I6O`qmsOgnFFh)8V*5NwoQCbE;R)lR>$s_9_tW&CAU7<R@vs@CnYi-Z
zC!bs)E8Sy6vG?zD?W{69l8=0|sEq}|xH#aCI9B=7<x$^pz0obJRGboCG0ce>uQ@i9
z%?_9DEe)>)_Q(RF@H4i%-x2t3@AV!c_EsJ~AtNH8L0%S<C;JncJoa2QpP6JG&tqFC
z2k-e+#%upr8lR*eEg_x!^W^x_@uDYhQSbSwOfh6Xua<^t++4~}lT(x+qFnH}65e%S
zLQpT2qY8_#h(E!%VHm0~3-`bw_|)JJw*ktPkf(APM{69Nek0XS(2N4VfPrsY^JrU*
zdJ7x%X5{+OJl3r#GC-R-ehZ^|0i%zR`<1YA00)Y69nR8wvOrRC4z7%|ICaH$JQ-vh
ze|%ICOR5lJi62$C=ri+Id0oqCT29mR+Jq3(Li}|?h^iouS(arjQ^Eut;+&gI;Y=z}
zi8CV0M4<{(I8|kZeoG-jA%>8c!sU#R&MhlsSyhF4MDS(ChHj+vx|Y|pyrw&rWeM?l
zbwU;4@6~<^B_a!Xh;e2rjC1MR5>p7HgfWG4E~`|buMwt5hC+oRs~JU32gE#lAK%9>
z!W7KFJpkpj0|Va<nrR36oN;@K4EoY_TxXtm^Q0a(;=yM(nn5#4;zr$d`Zm7L4MpQ*
zAIX*u9xCl8CgG-G%FG-Zp-e&y5eagVG4-|U*RR{zsF}5Yt#eB7;AC-ndVK1B!l+>|
zMi2?-dZ8eX<vcGp1_TzNgV*pf*l-s>>=)2VCq~@DD76F6f3$^(eMb&XqkbPQVC4X2
zuo?NE&DthbO*^aZ{Xu=r(-c*UWr;~KMJj2un7wH%o3?E(8^*G#F8}nKIaO%9CP_6(
zqZDcGvazdQ&~bPcYA_A;!LGq9%<WXWMRm3|U7xPkX6JS;cf*~n?pb_w_b=UjDDZiF
z0bj(I@a5hA^xmOm`Rsc8Oh@l*Ts(W>{Kk4`qt~TRwKq=Fr#kHm{Om@z*IrxOdFxUE
RU)lNNrJVNvNq_6+{{ZQFEu#Pc

delta 506
zcmX|-Pe>GT6vsbrW?a_PN=#T{p%p?1S=w31NpL;s+9A<OLW2HGy1BHwIkX}(2mjmx
zQv?^G!yZKNXcSY2Kro`C{kaq!I_x1rJB8@MixcyceDHYR_uzfs_xoNP$=troB0v*!
z=nQ4E!vpU8(JFYqfOvmzUzT@7!21X!25((X4{ly}Kt_Puqb1uJe)w%2w6CB&9=FR*
z5TJv%2}H+>-lJ#L?N1OHfx?@7&K_$jRKEZ}fzEtBH)|UysezmWF6K*<?uFN}vmmcP
z62*y8d#KB5gt~5!^CjDL_#^i~u7-l1*rnWF=H(rD+6dx16XnU9&dMT`-$UJ@GAHn(
zIQ{$nneGD`G{X4azOj2;wT<0n$;d*bNA608UzICzgV2G>xFSHt&=rbf$Ti>;Q8YrX
zncAgVM-V91wi+jx!~?Yv<pcQbdW-mdMw_OA??m1f{KKgRX|_mWVv;0H3KOf+>L%)~
zq-iG8DbuR-xJ$C&e|BTy|Mj+vesu*20yIT_8i=W3*y}t;FhB|8So(HmEqr(Ac;|op
E2i!<=3IG5A

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 809f48361d..c141b48d32 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -37,11 +37,14 @@ Rectangle {
     property double balanceAfterPurchase;
     property bool alreadyOwned: false;
     property int itemPrice: -1;
-    property bool itemIsJson: true;
+    property bool isCertified;
+    property string itemType;
+    property var itemTypesArray: ["entity", "wearable", "contentSet", "app", "avatar"];
+    property var buttonTextNormal: ["REZ IT", "WEAR IT", "SWAP CONTENT SET", "INSTALL IT", "WEAR IT"];
+    property var buttonTextClicked: ["REZZED", "WORN", "SWAPPED", "INSTALLED", "WORN"]
     property bool shouldBuyWithControlledFailure: false;
     property bool debugCheckoutSuccess: false;
     property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
-    property bool isWearable;
     property string referrer;
     // Style
     color: hifi.colors.white;
@@ -85,7 +88,9 @@ Rectangle {
                 UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned, result.message);
             } else {
                 root.itemHref = result.data.download_url;
-                root.isWearable = result.data.categories.indexOf("Wearables") > -1;
+                if (result.data.categories.indexOf("Wearables") > -1) {
+                    root.itemType = "wearable";
+                }
                 root.activeView = "checkoutSuccess";
                 UserActivityLogger.commercePurchaseSuccess(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned);
             }
@@ -122,7 +127,25 @@ Rectangle {
     }
 
     onItemHrefChanged: {
-        itemIsJson = root.itemHref.endsWith('.json');
+        if (root.itemHref.indexOf(".fst") > -1) {
+            root.itemType = "avatar";
+        } else if (root.itemHref.endsWith('.json.gz')) {
+            root.itemType = "contentSet";
+        } else if (root.itemHref.endsWith('.json')) {
+            root.itemType = "entity"; // "wearable" type handled later
+        } else if (root.itemHref.endsWith('.js')) {
+            root.itemType = "app";
+        } else {
+            root.itemType = "entity";
+        }
+    }
+
+    onItemTypeChanged: {
+        if (root.itemType === "entity" || root.itemType === "wearable" || root.itemType === "contentSet") {
+            root.isCertified = true;
+        } else {
+            root.isCertified = false;
+        }
     }
 
     onItemPriceChanged: {
@@ -464,7 +487,7 @@ Rectangle {
             // "Buy" button
             HifiControlsUit.Button {
                 id: buyButton;
-                enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || !itemIsJson;
+                enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || (!root.isCertified);
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: checkoutActionButtonsContainer.top;
@@ -472,9 +495,9 @@ Rectangle {
                 height: 40;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: (itemIsJson ? ((purchasesReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
+                text: ((root.isCertified) ? ((purchasesReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
                 onClicked: {
-                    if (itemIsJson) {
+                    if (root.isCertified) {
                         buyButton.enabled = false;
                         if (!root.shouldBuyWithControlledFailure) {
                             Commerce.buy(itemId, itemPrice);
@@ -576,7 +599,7 @@ Rectangle {
 
             RalewayBold {
                 anchors.fill: parent;
-                text: "REZZED";
+                text: (root.buttonTextClicked)[itemTypesArray.indexOf(root.itemType)];
                 size: 18;
                 color: hifi.colors.white;
                 verticalAlignment: Text.AlignVCenter;
@@ -592,7 +615,7 @@ Rectangle {
         // "Rez" button
         HifiControlsUit.Button {
             id: rezNowButton;
-            enabled: root.canRezCertifiedItems || root.isWearable;
+            enabled: root.canRezCertifiedItems || root.itemType === "wearable";
             buttonGlyph: hifi.glyphs.lightning;
             color: hifi.buttons.red;
             colorScheme: hifi.colorSchemes.light;
@@ -601,17 +624,27 @@ Rectangle {
             height: 50;
             anchors.left: parent.left;
             anchors.right: parent.right;
-            text: root.isWearable ? "Wear It" : "Rez It"
+            text: (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
             onClicked: {
-                sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
-                rezzedNotifContainer.visible = true;
-                rezzedNotifContainerTimer.start();
-                UserActivityLogger.commerceEntityRezzed(root.itemId, "checkout", root.isWearable ? "rez" : "wear");
+                if (root.itemType === "contentSet") {
+                    lightboxPopup.titleText = "Replace Content";
+                    lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain.";
+                    lightboxPopup.button1text = "CANCEL";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.button2text = "CONFIRM";
+                    lightboxPopup.button2method = "sendToScript({method: 'checkout_rezClicked', itemHref: " + root.itemHref + ", itemType: " + root.itemType + "});";
+                    lightboxPopup.visible = true;
+                } else {
+                    sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
+                    rezzedNotifContainer.visible = true;
+                    rezzedNotifContainerTimer.start();
+                    UserActivityLogger.commerceEntityRezzed(root.itemId, "checkout", root.itemType);
+                }
             }
         }
         RalewaySemiBold {
             id: noPermissionText;
-            visible: !root.canRezCertifiedItems && !root.isWearable;
+            visible: !root.canRezCertifiedItems && root.itemType !== "wearable";
             text: '<font color="' + hifi.colors.redAccent + '"><a href="#">You do not have Certified Rez permissions in this domain.</a></font>'
             // Text size
             size: 16;
@@ -640,7 +673,7 @@ Rectangle {
         }
         RalewaySemiBold {
             id: explainRezText;
-            visible: !root.isWearable;
+            visible: root.itemType === "entity";
             text: '<font color="' + hifi.colors.redAccent + '"><a href="#">What does "Rez" mean?</a></font>'
             // Text size
             size: 16;
@@ -851,7 +884,7 @@ Rectangle {
                 buyButton.color = hifi.buttons.red;
                 root.shouldBuyWithControlledFailure = true;
             } else {
-                buyButton.text = (itemIsJson ? ((purchasesReceived && balanceReceived) ? (root.alreadyOwned ? "Buy Another" : "Buy"): "--") : "Get Item");
+                buyButton.text = (root.isCertified ? ((purchasesReceived && balanceReceived) ? (root.alreadyOwned ? "Buy Another" : "Buy"): "--") : "Get Item");
                 buyButton.color = hifi.buttons.blue;
                 root.shouldBuyWithControlledFailure = false;
             }
@@ -901,7 +934,7 @@ Rectangle {
     }
 
     function setBuyText() {
-        if (root.itemIsJson) {
+        if (root.isCertified) {
             if (root.purchasesReceived && root.balanceReceived) {
                 if (root.balanceAfterPurchase < 0) {
                     if (root.alreadyOwned) {
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 361b9931a4..41f2d919cd 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -41,8 +41,11 @@ Item {
     property int limitedRun;
     property string itemType;
     property var itemTypesArray: ["entity", "wearable", "contentSet", "app", "avatar"];
-    property var buttonTextNormal: ["REZ", "WEAR", "SWAP", "INSTALL", "WEAR"];
-    property var buttonTextClicked: ["REZZED", "WORN", "SWAPPED", "INSTALLED", "WORN"]
+    property var buttonTextNormal: ["REZ", "WEAR", "REPLACE", "INSTALL", "WEAR"];
+    property var buttonTextClicked: ["REZZED", "WORN", "REPLACED", "INSTALLED", "WORN"]
+    property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar];
+    property bool showConfirmation: false;
+    property bool hasPermissionToRezThis;
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -50,6 +53,23 @@ Item {
     height: 110;
     width: parent.width;
 
+    Connections {
+        target: Commerce;
+        
+        onContentSetChanged: {
+            if (contentSetMarketplaceID === root.itemId) {
+                showConfirmation = true;
+            }
+        }
+    }
+
+    onItemTypeChanged: {
+        if ((itemType === "entity" && (!Entities.canRezCertified() && !Entities.canRezTmpCertified())) ||
+            (itemType === "contentSet" && !Entities.canReplaceContent())) {
+            root.hasPermissionToRezThis = false;
+        }
+    }
+
     onPurchaseStatusChangedChanged: {
         if (root.purchaseStatusChanged === true && root.purchaseStatus === "confirmed") {
             root.originalStatusText = statusText.text;
@@ -60,6 +80,15 @@ Item {
         }
     }
 
+    onShowConfirmationChanged: {
+        if (root.showConfirmation) {
+            rezzedNotifContainer.visible = true;
+            rezzedNotifContainerTimer.start();
+            UserActivityLogger.commerceEntityRezzed(root.itemId, "purchases", root.itemType);
+            root.showConfirmation = false;
+        }
+    }
+
     Timer {
         id: confirmedTimer;
         interval: 3000;
@@ -325,7 +354,7 @@ Item {
             RalewayBold {
                 anchors.fill: parent;
                 text: (root.buttonTextClicked)[itemTypesArray.indexOf(root.itemType)];
-                size: 18;
+                size: 15;
                 color: hifi.colors.white;
                 verticalAlignment: Text.AlignVCenter;
                 horizontalAlignment: Text.AlignHCenter;
@@ -353,10 +382,12 @@ Item {
             enabled: (root.canRezCertifiedItems || root.itemType === "wearable") && root.purchaseStatus !== "invalidated";
             
             onClicked: {
-                sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
-                rezzedNotifContainer.visible = true;
-                rezzedNotifContainerTimer.start();
-                UserActivityLogger.commerceEntityRezzed(root.itemId, "purchases", root.itemType === "wearable" ? "rez" : "wear");
+                if (root.itemType === "contentSet") {
+                    sendToPurchases({method: 'showReplaceContentLightbox', itemId: root.itemId, itemHref: root.itemHref});
+                } else {
+                    sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
+                    root.showConfirmation = true;
+                }
             }
 
             style: ButtonStyle {
@@ -396,13 +427,13 @@ Item {
 
                 label: Item {
                     HiFiGlyphs {
-                        id: lightningIcon;
-                        text: hifi.glyphs.lightning;
+                        id: rezIcon;
+                        text: (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)];
                         // Size
-                        size: 32;
+                        size: 60;
                         // Anchors
                         anchors.top: parent.top;
-                        anchors.topMargin: 12;
+                        anchors.topMargin: 0;
                         anchors.left: parent.left;
                         anchors.right: parent.right;
                         horizontalAlignment: Text.AlignHCenter;
@@ -411,8 +442,8 @@ Item {
                                        : hifi.buttons.disabledTextColor[control.colorScheme]
                     }
                     RalewayBold {
-                        anchors.top: lightningIcon.bottom;
-                        anchors.topMargin: -20;
+                        anchors.top: rezIcon.bottom;
+                        anchors.topMargin: -4;
                         anchors.right: parent.right;
                         anchors.left: parent.left;
                         anchors.bottom: parent.bottom;
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 922ba54822..956bfa7c26 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -455,10 +455,16 @@ Rectangle {
                 limitedRun: model.limited_run;
                 displayedItemCount: model.displayedItemCount;
                 itemType: {
-                    if (model.download_url.indexOf(".fst") > -1) {
+                    if (model.root_file_url.indexOf(".fst") > -1) {
                         "avatar";
                     } else if (model.categories.indexOf("Wearables") > -1) {
                         "wearable";
+                    } else if (model.root_file_url.endsWith('.json.gz')) {
+                        "contentSet";
+                    } else if (model.root_file_url.endsWith('.json')) {
+                        "entity";
+                    } else if (model.root_file_url.endsWith('.js')) {
+                        "app";
                     } else {
                         "entity";
                     }
@@ -490,6 +496,14 @@ Rectangle {
                             lightboxPopup.button1text = "CLOSE";
                             lightboxPopup.button1method = "root.visible = false;"
                             lightboxPopup.visible = true;
+                        } else if (msg.method === "showReplaceContentLightbox") {
+                            lightboxPopup.titleText = "Replace Content";
+                            lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain.";
+                            lightboxPopup.button1text = "CANCEL";
+                            lightboxPopup.button1method = "root.visible = false;"
+                            lightboxPopup.button2text = "CONFIRM";
+                            lightboxPopup.button2method = "Commerce.replaceContentSet('" + msg.itemId + "', '" + msg.itemHref + "'); root.visible = false;";
+                            lightboxPopup.visible = true;
                         } else if (msg.method === "setFilterText") {
                             filterBar.text = msg.filterText;
                         }
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 5da587ea57..16b74f6b54 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -354,5 +354,9 @@ Item {
         readonly property string wallet: "\ue027"
         readonly property string paperPlane: "\ue028"
         readonly property string passphrase: "\ue029"
+        readonly property string globe: "\ue02c"
+        readonly property string wand: "\ue02d"
+        readonly property string hat: "\ue02e"
+        readonly property string install: "\ue02f"
     }
 }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index be2a54b8e9..576d080947 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6176,6 +6176,24 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
     return true;
 }
 
+void Application::replaceDomainContent(const QString& url) {
+    qCDebug(interfaceapp) << "Attempting to replace domain content: " << url;
+    QByteArray urlData(url.toUtf8());
+    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
+    limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
+        return node->getType() == NodeType::EntityServer && node->getActiveSocket();
+    }, [&urlData, limitedNodeList](const SharedNodePointer& octreeNode) {
+        auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, urlData.size(), true);
+        octreeFilePacket->write(urlData);
+        limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
+    });
+    auto addressManager = DependencyManager::get<AddressManager>();
+    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
+    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
+    qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
+    DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
+}
+
 bool Application::askToReplaceDomainContent(const QString& url) {
     QString methodDetails;
     const int MAX_CHARACTERS_PER_LINE = 90;
@@ -6195,21 +6213,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
                 QString details;
                 if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
                     // Given confirmation, send request to domain server to replace content
-                    qCDebug(interfaceapp) << "Attempting to replace domain content: " << url;
-                    QByteArray urlData(url.toUtf8());
-                    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
-                    limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
-                            return node->getType() == NodeType::EntityServer && node->getActiveSocket();
-                        }, [&urlData, limitedNodeList](const SharedNodePointer& octreeNode) {
-                            auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, urlData.size(), true);
-                            octreeFilePacket->write(urlData);
-                            limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
-                        });
-                    auto addressManager = DependencyManager::get<AddressManager>();
-                    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
-                    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
-                    qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
-                    DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
+                    replaceDomainContent(url);
                     details = "SuccessfulRequestToReplaceContent";
                 } else {
                     details = "UserDeclinedToReplaceContent";
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ddb8ce11e5..2dd83f39eb 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -284,6 +284,8 @@ public:
     bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }
     void saveNextPhysicsStats(QString filename);
 
+    void replaceDomainContent(const QString& url);
+
 signals:
     void svoImportRequested(const QString& url);
 
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index c9caa393ce..ba52edba4f 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -15,6 +15,8 @@
 #include "Ledger.h"
 #include "Wallet.h"
 #include <AccountManager.h>
+#include <Application.h>
+#include <UserActivityLogger.h>
 
 QmlCommerce::QmlCommerce() {
     auto ledger = DependencyManager::get<Ledger>();
@@ -163,3 +165,14 @@ void QmlCommerce::transferHfcToUsername(const QString& username, const int& amou
     QString key = keys[0];
     ledger->transferHfcToUsername(key, username, amount, optionalMessage);
 }
+
+void QmlCommerce::replaceContentSet(const QString& id, const QString& url) {
+    qApp->replaceDomainContent(url);
+    QJsonObject messageProperties = {
+        { "status", "SuccessfulRequestToReplaceContent" },
+        { "content_set_url", url }
+    };
+    UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
+
+    emit contentSetChanged(id);
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index b261ee6de6..aa939a439d 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -48,6 +48,8 @@ signals:
     void transferHfcToNodeResult(QJsonObject result);
     void transferHfcToUsernameResult(QJsonObject result);
 
+    void contentSetChanged(const QString& contentSetMarketplaceID);
+
 protected:
     Q_INVOKABLE void getWalletStatus();
 
@@ -71,6 +73,8 @@ protected:
 
     Q_INVOKABLE void transferHfcToNode(const QString& nodeID, const int& amount, const QString& optionalMessage);
     Q_INVOKABLE void transferHfcToUsername(const QString& username, const int& amount, const QString& optionalMessage);
+
+    Q_INVOKABLE void replaceContentSet(const QString& id, const QString& url);
 };
 
 #endif // hifi_QmlCommerce_h
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 4342f0e683..f9449cca34 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -101,6 +101,11 @@ bool EntityScriptingInterface::canWriteAssets() {
     return nodeList->getThisNodeCanWriteAssets();
 }
 
+bool EntityScriptingInterface::canReplaceContent() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    return nodeList->getThisNodeCanReplaceContent();
+}
+
 void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
     if (_entityTree) {
         disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index d1b321dbca..30e1e6ce1c 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -144,6 +144,12 @@ public slots:
     */
     Q_INVOKABLE bool canWriteAssets();
 
+    /**jsdoc
+    * @function Entities.canReplaceContent
+    * @return {bool} `true` if the DomainServer will allow this Node/Avatar to replace the domain's content set
+    */
+    Q_INVOKABLE bool canReplaceContent();
+
     /**jsdoc
      * Add a new entity with the specified properties. If `clientOnly` is true, the entity will
      * not be sent to the server and will only be visible/accessible on the local client.
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index b43fe545fa..95d9294063 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -65,7 +65,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
     var onMarketplaceScreen = false;
     var onCommerceScreen = false;
 
-    var debugCheckout = false;
+    var debugCheckout = true;
     var debugError = false;
     function showMarketplace() {
         if (!debugCheckout) {
@@ -75,11 +75,11 @@ var selectionDisplay = null; // for gridTool.js to ignore
             tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
             tablet.sendToQml({
                 method: 'updateCheckoutQML', params: {
-                    itemId: '0d90d21c-ce7a-4990-ad18-e9d2cf991027',
-                    itemName: 'Test Flaregun',
-                    itemPrice: (debugError ? 10 : 17),
-                    itemHref: 'http://mpassets.highfidelity.com/0d90d21c-ce7a-4990-ad18-e9d2cf991027-v1/flaregun.json',
-                    categories: ["Wearables", "Miscellaneous"]
+                    itemId: 'e197e3d7-eafc-4aa5-9341-acee57174fe9',
+                    itemName: 'Oasis',
+                    itemPrice: (debugError ? 10 : 11),
+                    itemHref: 'http://mpassets-staging.highfidelity.com/e197e3d7-eafc-4aa5-9341-acee57174fe9-v1/oasis_Aug15.json.gz',
+                    categories: ["Miscellaneous"]
                 }
             });
         }
@@ -240,6 +240,11 @@ var selectionDisplay = null; // for gridTool.js to ignore
         var wearableLocalDimensions = null;
         var wearableDimensions = null;
 
+        if (itemType === "contentSet") {
+            console.log("Item is a content set; codepath shouldn't go here.")
+            return;
+        }
+
         if (isWearable) {
             var wearableTransforms = Settings.getValue("io.highfidelity.avatarStore.checkOut.transforms");
             if (!wearableTransforms) {

From cf5452313a01c8eab3404a4fccc9f2145d56fae7 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 12 Feb 2018 18:44:24 -0800
Subject: [PATCH 191/569] WIP check in of making the use of dq or mat dynamic
 per model

---
 .../src/CauterizedMeshPartPayload.cpp         |  30 ++++-
 .../src/CauterizedMeshPartPayload.h           |  12 +-
 .../render-utils/src/CauterizedModel.cpp      | 123 +++++++++++-------
 .../render-utils/src/MeshPartPayload.cpp      |  99 ++++++++------
 libraries/render-utils/src/MeshPartPayload.h  |  20 +--
 libraries/render-utils/src/Model.cpp          |  65 +++++----
 libraries/render-utils/src/Model.h            |  11 +-
 .../render-utils/src/SoftAttachmentModel.cpp  |  36 ++---
 8 files changed, 238 insertions(+), 158 deletions(-)

diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
index 3d213840dd..e7ea902adb 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
@@ -20,16 +20,32 @@ using namespace render;
 CauterizedMeshPartPayload::CauterizedMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform)
     : ModelMeshPartPayload(model, meshIndex, partIndex, shapeIndex, transform, offsetTransform) {}
 
-void CauterizedMeshPartPayload::updateClusterBuffer(const std::vector<TransformType>& clusterTransforms, const std::vector<TransformType>& cauterizedClusterTransforms) {
-    ModelMeshPartPayload::updateClusterBuffer(clusterTransforms);
+void CauterizedMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices,
+                                                    const std::vector<glm::mat4>& cauterizedClusterMatrices) {
+    ModelMeshPartPayload::updateClusterBuffer(clusterMatrices);
 
-    if (cauterizedClusterTransforms.size() > 1) {
+    if (cauterizedClusterMatrices.size() > 1) {
         if (!_cauterizedClusterBuffer) {
-            _cauterizedClusterBuffer = std::make_shared<gpu::Buffer>(cauterizedClusterTransforms.size() * sizeof(TransformType),
-                (const gpu::Byte*) cauterizedClusterTransforms.data());
+            _cauterizedClusterBuffer = std::make_shared<gpu::Buffer>(cauterizedClusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) cauterizedClusterMatrices.data());
         } else {
-            _cauterizedClusterBuffer->setSubData(0, cauterizedClusterTransforms.size() * sizeof(TransformType),
-                (const gpu::Byte*) cauterizedClusterTransforms.data());
+            _cauterizedClusterBuffer->setSubData(0, cauterizedClusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) cauterizedClusterMatrices.data());
+        }
+    }
+}
+
+void CauterizedMeshPartPayload::updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions,
+                                                    const std::vector<Model::TransformDualQuaternion>& cauterizedClusterDualQuaternions) {
+    ModelMeshPartPayload::updateClusterBuffer(clusterDualQuaternions);
+
+    if (cauterizedClusterDualQuaternions.size() > 1) {
+        if (!_cauterizedClusterBuffer) {
+            _cauterizedClusterBuffer = std::make_shared<gpu::Buffer>(cauterizedClusterDualQuaternions.size() * sizeof(Model::TransformDualQuaternion),
+                (const gpu::Byte*) cauterizedClusterDualQuaternions.data());
+        } else {
+            _cauterizedClusterBuffer->setSubData(0, cauterizedClusterDualQuaternions.size() * sizeof(Model::TransformDualQuaternion),
+                (const gpu::Byte*) cauterizedClusterDualQuaternions.data());
         }
     }
 }
diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.h b/libraries/render-utils/src/CauterizedMeshPartPayload.h
index 2337632047..3783bd1bf8 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.h
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.h
@@ -15,13 +15,13 @@ class CauterizedMeshPartPayload : public ModelMeshPartPayload {
 public:
     CauterizedMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform);
 
-#if defined(SKIN_DQ)
-    using TransformType = Model::TransformDualQuaternion;
-#else
-    using TransformType = glm::mat4;
-#endif
+    // matrix palette skinning
+    void updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices,
+                             const std::vector<glm::mat4>& cauterizedClusterMatrices);
 
-    void updateClusterBuffer(const std::vector<TransformType>& clusterTransforms, const std::vector<TransformType>& cauterizedClusterTransforms);
+    // dual quaternion skinning
+    void updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions,
+                             const std::vector<Model::TransformDualQuaternion>& cauterizedClusterQuaternions);
 
     void updateTransformForCauterizedMesh(const Transform& renderTransform);
 
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 54dfd96a00..f4a745278e 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -35,8 +35,13 @@ bool CauterizedModel::updateGeometry() {
         const FBXGeometry& fbxGeometry = getFBXGeometry();
         foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
             Model::MeshState state;
-            state.clusterTransforms.resize(mesh.clusters.size());
-            _cauterizeMeshStates.append(state);
+            if (_useDualQuaternionSkinning) {
+                state.clusterDualQuaternions.resize(mesh.clusters.size());
+                _cauterizeMeshStates.append(state);
+            } else {
+                state.clusterMatrices.resize(mesh.clusters.size());
+                _cauterizeMeshStates.append(state);
+            }
         }
     }
     return needsFullUpdate;
@@ -109,33 +114,33 @@ void CauterizedModel::updateClusterMatrices() {
         const FBXMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
             const FBXCluster& cluster = mesh.clusters.at(j);
-#if defined(SKIN_DQ)
-            auto jointPose = _rig.getJointPose(cluster.jointIndex);
-            Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
-            Transform clusterTransform;
-            Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
-            state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);
-            state.clusterTransforms[j].setCauterizationParameters(0.0f, jointPose.trans());
-#else
-            auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
-            glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
-#endif
+            if (_useDualQuaternionSkinning) {
+                auto jointPose = _rig.getJointPose(cluster.jointIndex);
+                Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
+                Transform clusterTransform;
+                Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
+                state.clusterDualQuaternions[j] = Model::TransformDualQuaternion(clusterTransform);
+                state.clusterDualQuaternions[j].setCauterizationParameters(0.0f, jointPose.trans());
+            } else {
+                auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
+                glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
+            }
         }
     }
 
     // as an optimization, don't build cautrizedClusterMatrices if the boneSet is empty.
     if (!_cauterizeBoneSet.empty()) {
-#if defined(SKIN_DQ)
+
         AnimPose cauterizePose = _rig.getJointPose(geometry.neckJointIndex);
         cauterizePose.scale() = glm::vec3(0.0001f, 0.0001f, 0.0001f);
-#else
+
         static const glm::mat4 zeroScale(
             glm::vec4(0.0001f, 0.0f, 0.0f, 0.0f),
             glm::vec4(0.0f, 0.0001f, 0.0f, 0.0f),
             glm::vec4(0.0f, 0.0f, 0.0001f, 0.0f),
             glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
         auto cauterizeMatrix = _rig.getJointTransform(geometry.neckJointIndex) * zeroScale;
-#endif
+
         for (int i = 0; i < _cauterizeMeshStates.size(); i++) {
             Model::MeshState& state = _cauterizeMeshStates[i];
             const FBXMesh& mesh = geometry.meshes.at(i);
@@ -143,19 +148,24 @@ void CauterizedModel::updateClusterMatrices() {
             for (int j = 0; j < mesh.clusters.size(); j++) {
                 const FBXCluster& cluster = mesh.clusters.at(j);
 
-                if (_cauterizeBoneSet.find(cluster.jointIndex) == _cauterizeBoneSet.end()) {
-                    // not cauterized so just copy the value from the non-cauterized version.
-                    state.clusterTransforms[j] = _meshStates[i].clusterTransforms[j];
+                if (_useDualQuaternionSkinning) {
+                    if (_cauterizeBoneSet.find(cluster.jointIndex) == _cauterizeBoneSet.end()) {
+                        // not cauterized so just copy the value from the non-cauterized version.
+                        state.clusterDualQuaternions[j] = _meshStates[i].clusterDualQuaternions[j];
+                    } else {
+                        Transform jointTransform(cauterizePose.rot(), cauterizePose.scale(), cauterizePose.trans());
+                        Transform clusterTransform;
+                        Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
+                        state.clusterDualQuaternions[j] = Model::TransformDualQuaternion(clusterTransform);
+                        state.clusterDualQuaternions[j].setCauterizationParameters(1.0f, cauterizePose.trans());
+                    }
                 } else {
-#if defined(SKIN_DQ)
-                    Transform jointTransform(cauterizePose.rot(), cauterizePose.scale(), cauterizePose.trans());
-                    Transform clusterTransform;
-                    Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
-                    state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);
-                    state.clusterTransforms[j].setCauterizationParameters(1.0f, cauterizePose.trans());
-#else
-                    glm_mat4u_mul(cauterizeMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
-#endif
+                    if (_cauterizeBoneSet.find(cluster.jointIndex) == _cauterizeBoneSet.end()) {
+                        // not cauterized so just copy the value from the non-cauterized version.
+                        state.clusterMatrices[j] = _meshStates[i].clusterMatrices[j];
+                    } else {
+                        glm_mat4u_mul(cauterizeMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
+                    }
                 }
             }
         }
@@ -213,38 +223,51 @@ void CauterizedModel::updateRenderItems() {
 
                 auto itemID = self->_modelMeshRenderItemIDs[i];
                 auto meshIndex = self->_modelMeshRenderItemShapes[i].meshIndex;
-                auto clusterTransforms(self->getMeshState(meshIndex).clusterTransforms);
-                auto clusterTransformsCauterized(self->getCauterizeMeshState(meshIndex).clusterTransforms);
+
+                const auto& meshState = self->getMeshState(meshIndex);
+                const auto& cauterizedMeshState = self->getCauterizeMeshState(meshIndex);
 
                 bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
 
-                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, clusterTransforms, clusterTransformsCauterized, invalidatePayloadShapeKey,
+                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, meshState, cauterizedMeshState, invalidatePayloadShapeKey,
                         isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, enableCauterization](CauterizedMeshPartPayload& data) {
-                    data.updateClusterBuffer(clusterTransforms, clusterTransformsCauterized);
+                    if (_useDualQuaternionSkinning) {
+                        data.updateClusterBuffer(meshState.clusterDualQuaternions,
+                                                 cauterizedMeshState.clusterDualQuaternions);
+                    } else {
+                        data.updateClusterBuffer(meshState.clusterMatrices,
+                                                 cauterizedMeshState.clusterMatrices);
+                    }
 
                     Transform renderTransform = modelTransform;
-                    if (clusterTransforms.size() == 1) {
-#if defined(SKIN_DQ)
-                        Transform transform(clusterTransforms[0].getRotation(),
-                                            clusterTransforms[0].getScale(),
-                                            clusterTransforms[0].getTranslation());
-                        renderTransform = modelTransform.worldTransform(transform);
-#else
-                        renderTransform = modelTransform.worldTransform(Transform(clusterTransforms[0]));
-#endif
+                    if (_useDualQuaternionSkinning) {
+                        if (meshState.clusterDualQuaternions.size() == 1) {
+                            const auto& dq = meshState.clusterDualQuaternions[0];
+                            Transform transform(dq.getRotation(),
+                                                dq.getScale(),
+                                                dq.getTranslation());
+                            renderTransform = modelTransform.worldTransform(transform);
+                        }
+                    } else {
+                        if (meshState.clusterMatrices.size() == 1) {
+                            renderTransform = modelTransform.worldTransform(Transform(meshState.clusterMatrices[0]));
+                        }
                     }
                     data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
                     renderTransform = modelTransform;
-                    if (clusterTransformsCauterized.size() == 1) {
-#if defined(SKIN_DQ)
-                        Transform transform(clusterTransformsCauterized[0].getRotation(),
-                                            clusterTransformsCauterized[0].getScale(),
-                                            clusterTransformsCauterized[0].getTranslation());
-                        renderTransform = modelTransform.worldTransform(Transform(transform));
-#else
-                        renderTransform = modelTransform.worldTransform(Transform(clusterTransformsCauterized[0]));
-#endif
+                    if (_useDualQuaternionSkinning) {
+                        if (cauterizedMeshState.clusterDualQuaternions.size() == 1) {
+                            const auto& dq = cauterizedMeshState.clusterDualQuaternions[0];
+                            Transform transform(dq.getRotation(),
+                                                dq.getScale(),
+                                                dq.getTranslation());
+                            renderTransform = modelTransform.worldTransform(Transform(transform));
+                        }
+                    } else {
+                        if (cauterizedMeshState.clusterMatrices.size() == 1) {
+                            renderTransform = modelTransform.worldTransform(Transform(cauterizedMeshState.clusterMatrices[0]));
+                        }
                     }
                     data.updateTransformForCauterizedMesh(renderTransform);
 
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 9655b60a78..595a4013f1 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -340,20 +340,27 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
     const Model::MeshState& state = model->getMeshState(_meshIndex);
 
     updateMeshPart(modelMesh, partIndex);
-    computeAdjustedLocalBound(state.clusterTransforms);
+
+    if (_useDualQuaternionSkinning) {
+        computeAdjustedLocalBound(state.clusterDualQuaternions);
+    } else {
+        computeAdjustedLocalBound(state.clusterMatrices);
+    }
 
     updateTransform(transform, offsetTransform);
     Transform renderTransform = transform;
-    if (state.clusterTransforms.size() == 1) {
-#if defined(SKIN_DQ)
-        Transform transform(state.clusterTransforms[0].getRotation(),
-                            state.clusterTransforms[0].getScale(),
-                            state.clusterTransforms[0].getTranslation());
-        renderTransform = transform.worldTransform(Transform(transform));
-#else
-        renderTransform = transform.worldTransform(Transform(state.clusterTransforms[0]));
-#endif
-
+    if (_useDualQuaternionSkinning) {
+        if (state.clusterDualQuaternions.size() == 1) {
+            const auto& dq = state.clusterDualQuaternions[0];
+            Transform transform(dq.getRotation(),
+                                dq.getScale(),
+                                dq.getTranslation());
+            renderTransform = transform.worldTransform(Transform(transform));
+        }
+    } else {
+        if (state.clusterMatrices.size() == 1) {
+            renderTransform = transform.worldTransform(Transform(state.clusterMatrices[0]));
+        }
     }
     updateTransformForSkinnedMesh(renderTransform, transform);
 
@@ -383,16 +390,30 @@ void ModelMeshPartPayload::notifyLocationChanged() {
 
 }
 
-void ModelMeshPartPayload::updateClusterBuffer(const std::vector<TransformType>& clusterTransforms) {
+void ModelMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices) {
     // Once computed the cluster matrices, update the buffer(s)
-    if (clusterTransforms.size() > 1) {
+    if (clusterMatrices.size() > 1) {
         if (!_clusterBuffer) {
-            _clusterBuffer = std::make_shared<gpu::Buffer>(clusterTransforms.size() * sizeof(TransformType),
-                (const gpu::Byte*) clusterTransforms.data());
+            _clusterBuffer = std::make_shared<gpu::Buffer>(clusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) clusterMatrices.data());
         }
         else {
-            _clusterBuffer->setSubData(0, clusterTransforms.size() * sizeof(TransformType),
-                (const gpu::Byte*) clusterTransforms.data());
+            _clusterBuffer->setSubData(0, clusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) clusterMatrices.data());
+        }
+    }
+}
+
+void ModelMeshPartPayload::updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions) {
+    // Once computed the cluster matrices, update the buffer(s)
+    if (clusterDualQuaternions.size() > 1) {
+        if (!_clusterBuffer) {
+            _clusterBuffer = std::make_shared<gpu::Buffer>(clusterDualQuaternions.size() * sizeof(Model::TransformDualQuaternion),
+                (const gpu::Byte*) clusterDualQuaternions.data());
+        }
+        else {
+            _clusterBuffer->setSubData(0, clusterDualQuaternions.size() * sizeof(Model::TransformDualQuaternion),
+                (const gpu::Byte*) clusterDualQuaternions.data());
         }
     }
 }
@@ -550,29 +571,33 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     args->_details._trianglesRendered += _drawPart._numIndices / INDICES_PER_TRIANGLE;
 }
 
-
-void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<TransformType>& clusterTransforms) {
+void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<glm::mat4>& clusterMatrices) {
     _adjustedLocalBound = _localBound;
-    if (clusterTransforms.size() > 0) {
-#if defined(SKIN_DQ)
-        Transform rootTransform(clusterTransforms[0].getRotation(),
-                                clusterTransforms[0].getScale(),
-                                clusterTransforms[0].getTranslation());
-        _adjustedLocalBound.transform(rootTransform);
-#else
-        _adjustedLocalBound.transform(clusterTransforms[0]);
-#endif
+    if (clusterMatrices.size() > 0) {
+        _adjustedLocalBound.transform(clusterMatrices[0]);
 
-        for (int i = 1; i < (int)clusterTransforms.size(); ++i) {
+        for (int i = 1; i < (int)clusterMatrices.size(); ++i) {
             AABox clusterBound = _localBound;
-#if defined(SKIN_DQ)
-            Transform transform(clusterTransforms[i].getRotation(),
-                                clusterTransforms[i].getScale(),
-                                clusterTransforms[i].getTranslation());
-            clusterBound.transform(transform);
-#else
-            clusterBound.transform(clusterTransforms[i]);
-#endif
+            clusterBound.transform(clusterMatrices[i]);
+            _adjustedLocalBound += clusterBound;
+        }
+    }
+}
+
+void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions) {
+    _adjustedLocalBound = _localBound;
+    if (clusterDualQuaternions.size() > 0) {
+        Transform rootTransform(clusterDualQuaternions[0].getRotation(),
+                                clusterDualQuaternions[0].getScale(),
+                                clusterDualQuaternions[0].getTranslation());
+        _adjustedLocalBound.transform(rootTransform);
+
+        for (int i = 1; i < (int)clusterDualQuaternions.size(); ++i) {
+            AABox clusterBound = _localBound;
+            Transform transform(clusterDualQuaternions[i].getRotation(),
+                                clusterDualQuaternions[i].getScale(),
+                                clusterDualQuaternions[i].getTranslation());
+            clusterBound.transform(transform);
             _adjustedLocalBound += clusterBound;
         }
     }
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 21f9dc2e68..7791390203 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -93,14 +93,14 @@ public:
 
     void notifyLocationChanged() override;
 
-#if defined(SKIN_DQ)
-    using TransformType = Model::TransformDualQuaternion;
-#else
-    using TransformType = glm::mat4;
-#endif
-
     void updateKey(bool isVisible, bool isLayered, uint8_t tagBits) override;
-    void updateClusterBuffer(const std::vector<TransformType>& clusterTransforms);
+
+    // matrix palette skinning
+    void updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices);
+
+    // dual quaternion skinning
+    void updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions);
+
     void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
     // Render Item interface
@@ -115,7 +115,11 @@ public:
     void bindMesh(gpu::Batch& batch) override;
     void bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const override;
 
-    void computeAdjustedLocalBound(const std::vector<TransformType>& clusterTransforms);
+    // matrix palette skinning
+    void computeAdjustedLocalBound(const std::vector<glm::mat4>& clusterMatrices);
+
+    // dual quaternion skinning
+    void computeAdjustedLocalBound(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions);
 
     gpu::BufferPointer _clusterBuffer;
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b9ccc28c01..92abac3520 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -277,26 +277,35 @@ void Model::updateRenderItems() {
 
             auto itemID = self->_modelMeshRenderItemIDs[i];
             auto meshIndex = self->_modelMeshRenderItemShapes[i].meshIndex;
-            auto clusterTransforms(self->getMeshState(meshIndex).clusterTransforms);
+
+            const auto& meshState = self->getMeshState(meshIndex);
 
             bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
 
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms,
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, meshState,
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
                                                                   viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateClusterBuffer(clusterTransforms);
+                if (_useDualQuaternions) {
+                    data.updateClusterBuffer(meshState.clusterDualQuaternions);
+                } else {
+                    data.updateClusterBuffer(meshState.clusterMatrices);
+                }
 
                 Transform renderTransform = modelTransform;
-                if (clusterTransforms.size() == 1) {
-#if defined(SKIN_DQ)
-                    Transform transform(clusterTransforms[0].getRotation(),
-                                        clusterTransforms[0].getScale(),
-                                        clusterTransforms[0].getTranslation());
-                    renderTransform = modelTransform.worldTransform(Transform(transform));
-#else
-                    renderTransform = modelTransform.worldTransform(Transform(clusterTransforms[0]));
-#endif
+
+                if (_useDualQuaternions) {
+                    if (meshState.clusterDualQuaternions.size() == 1) {
+                        const auto& dq = meshState.clusterDualQuaternions[0];
+                        Transform transform(dq.getRotation(),
+                                            dq.getScale(),
+                                            dq.getTranslation());
+                        renderTransform = modelTransform.worldTransform(Transform(transform));
+                    }
+                } else {
+                    if (meshState.clusterMatrices.size() == 1) {
+                        renderTransform = modelTransform.worldTransform(Transform(meshState.clusterMatrices[0]));
+                    }
                 }
                 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
@@ -377,7 +386,11 @@ bool Model::updateGeometry() {
         const FBXGeometry& fbxGeometry = getFBXGeometry();
         foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
             MeshState state;
-            state.clusterTransforms.resize(mesh.clusters.size());
+            if (_useDualQuaternions) {
+                state.clusterDualQuaternions.resize(mesh.clusters.size());
+            } else {
+                state.clusterMatrices.resize(mesh.clusters.size());
+            }
             _meshStates.push_back(state);
 
             // Note: we add empty buffers for meshes that lack blendshapes so we can access the buffers by index
@@ -1262,7 +1275,11 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
 void Model::computeMeshPartLocalBounds() {
     for (auto& part : _modelMeshRenderItems) {
         const Model::MeshState& state = _meshStates.at(part->_meshIndex);
-        part->computeAdjustedLocalBound(state.clusterTransforms);
+        if (_useDualQuaternions) {
+            part->computeAdjustedLocalBound(state.clusterDualQuaternions);
+        } else {
+            part->computeAdjustedLocalBound(state.clusterMatrices);
+        }
     }
 }
 
@@ -1281,16 +1298,16 @@ void Model::updateClusterMatrices() {
         const FBXMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
             const FBXCluster& cluster = mesh.clusters.at(j);
-#if defined(SKIN_DQ)
-            auto jointPose = _rig.getJointPose(cluster.jointIndex);
-            Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
-            Transform clusterTransform;
-            Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
-            state.clusterTransforms[j] = Model::TransformDualQuaternion(clusterTransform);
-#else
-            auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
-            glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
-#endif
+            if (_useDualQuaternionSkinning) {
+                auto jointPose = _rig.getJointPose(cluster.jointIndex);
+                Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
+                Transform clusterTransform;
+                Transform::mult(clusterTransform, jointTransform, cluster.inverseBindTransform);
+                state.clusterDualQuaternions[j] = Model::TransformDualQuaternion(clusterTransform);
+            } else {
+                auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
+                glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
+            }
         }
     }
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index ca0904f334..84d7dcb7cc 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -254,8 +254,6 @@ public:
     int getRenderInfoDrawCalls() const { return _renderInfoDrawCalls; }
     bool getRenderInfoHasTransparent() const { return _renderInfoHasTransparent; }
 
-
-#if defined(SKIN_DQ)
     class TransformDualQuaternion {
     public:
         TransformDualQuaternion() {}
@@ -293,15 +291,11 @@ public:
         DualQuaternion _dq;
         glm::vec4 _cauterizedPosition { 0.0f, 0.0f, 0.0f, 1.0f };
     };
-#endif
 
     class MeshState {
     public:
-#if defined(SKIN_DQ)
-        std::vector<TransformDualQuaternion> clusterTransforms;
-#else
-        std::vector<glm::mat4> clusterTransforms;
-#endif
+        std::vector<TransformDualQuaternion> clusterDualQuaternions;
+        std::vector<glm::mat4> clusterMatrices;
     };
 
     const MeshState& getMeshState(int index) { return _meshStates.at(index); }
@@ -420,6 +414,7 @@ protected:
     virtual void createCollisionRenderItemSet();
 
     bool _isWireframe;
+    bool _useDualQuaternionSkinning { false };
 
     // debug rendering support
     int _debugMeshBoxesID = GeometryCache::UNKNOWN_ID;
diff --git a/libraries/render-utils/src/SoftAttachmentModel.cpp b/libraries/render-utils/src/SoftAttachmentModel.cpp
index 0d0db7cbe3..079e6f75ef 100644
--- a/libraries/render-utils/src/SoftAttachmentModel.cpp
+++ b/libraries/render-utils/src/SoftAttachmentModel.cpp
@@ -52,27 +52,27 @@ void SoftAttachmentModel::updateClusterMatrices() {
 
             // TODO: cache these look-ups as an optimization
             int jointIndexOverride = getJointIndexOverride(cluster.jointIndex);
-#if defined(SKIN_DQ)
-            glm::mat4 jointMatrix;
-            if (jointIndexOverride >= 0 && jointIndexOverride < _rigOverride.getJointStateCount()) {
-                jointMatrix = _rigOverride.getJointTransform(jointIndexOverride);
-            } else {
-                jointMatrix = _rig.getJointTransform(cluster.jointIndex);
-            }
+            if (_useDualQuaternionSkinning) {
+                glm::mat4 jointMatrix;
+                if (jointIndexOverride >= 0 && jointIndexOverride < _rigOverride.getJointStateCount()) {
+                    jointMatrix = _rigOverride.getJointTransform(jointIndexOverride);
+                } else {
+                    jointMatrix = _rig.getJointTransform(cluster.jointIndex);
+                }
 
-            glm::mat4 m;
-            glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, m);
-            state.clusterTransforms[j] = Model::TransformDualQuaternion(m);
-#else
-            glm::mat4 jointMatrix;
-            if (jointIndexOverride >= 0 && jointIndexOverride < _rigOverride.getJointStateCount()) {
-                jointMatrix = _rigOverride.getJointTransform(jointIndexOverride);
+                glm::mat4 m;
+                glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, m);
+                state.clusterDualQuaternions[j] = Model::TransformDualQuaternion(m);
             } else {
-                jointMatrix = _rig.getJointTransform(cluster.jointIndex);
-            }
+                glm::mat4 jointMatrix;
+                if (jointIndexOverride >= 0 && jointIndexOverride < _rigOverride.getJointStateCount()) {
+                    jointMatrix = _rigOverride.getJointTransform(jointIndexOverride);
+                } else {
+                    jointMatrix = _rig.getJointTransform(cluster.jointIndex);
+                }
 
-            glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterTransforms[j]);
-#endif
+                glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
+            }
         }
     }
 

From be38a4bc71c6676b07a0a44028a20897d84bef3b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:12:33 -0800
Subject: [PATCH 192/569] creating workload lib

---
 interface/CMakeLists.txt                  |   1 +
 libraries/workload/CMakeLists.txt         |   5 +
 libraries/workload/src/workload/Space.cpp |  96 ++++++++
 libraries/workload/src/workload/Space.h   |  81 +++++++
 tests/workload/CMakeLists.txt             |   8 +
 tests/workload/src/SpaceTests.cpp         | 272 ++++++++++++++++++++++
 tests/workload/src/SpaceTests.h           |  29 +++
 7 files changed, 492 insertions(+)
 create mode 100644 libraries/workload/CMakeLists.txt
 create mode 100644 libraries/workload/src/workload/Space.cpp
 create mode 100644 libraries/workload/src/workload/Space.h
 create mode 100644 tests/workload/CMakeLists.txt
 create mode 100644 tests/workload/src/SpaceTests.cpp
 create mode 100644 tests/workload/src/SpaceTests.h

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 728f1467e0..c5800959f0 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -211,6 +211,7 @@ link_hifi_libraries(
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers
   ui-plugins display-plugins input-plugins
+  workload
   ${PLATFORM_GL_BACKEND}
 )
 
diff --git a/libraries/workload/CMakeLists.txt b/libraries/workload/CMakeLists.txt
new file mode 100644
index 0000000000..3fcf00e0e9
--- /dev/null
+++ b/libraries/workload/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(TARGET_NAME workload)
+setup_hifi_library()
+
+link_hifi_libraries(shared)
+
diff --git a/libraries/workload/src/workload/Space.cpp b/libraries/workload/src/workload/Space.cpp
new file mode 100644
index 0000000000..075f9fe477
--- /dev/null
+++ b/libraries/workload/src/workload/Space.cpp
@@ -0,0 +1,96 @@
+//
+//  Space.h
+//  libraries/shared/src/
+//
+//  Created by Andrew Meadows 2018.01.30
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Originally from lighthouse3d. Modified to utilize glm::vec3 and clean up to our coding standards
+//  Simple plane class.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "Space.h"
+
+#include <algorithm>
+
+#include <glm/gtx/quaternion.hpp>
+
+using namespace workload;
+
+int32_t Space::createProxy(const Space::Sphere& newSphere) {
+    if (_freeIndices.empty()) {
+        _proxies.emplace_back(Space::Proxy(newSphere));
+        return (int32_t)_proxies.size() - 1;
+    } else {
+        int32_t index = _freeIndices.back();
+        _freeIndices.pop_back();
+        _proxies[index].sphere = newSphere;
+        _proxies[index].region = Space::REGION_UNKNOWN;
+        _proxies[index].prevRegion = Space::REGION_UNKNOWN;
+        return index;
+    }
+}
+
+void Space::deleteProxy(int32_t proxyId) {
+    if (proxyId >= (int32_t)_proxies.size() || _proxies.empty()) {
+        return;
+    }
+    if (proxyId == (int32_t)_proxies.size() - 1) {
+        // remove proxy on back
+        _proxies.pop_back();
+        if (!_freeIndices.empty()) {
+            // remove any freeIndices on back
+            std::sort(_freeIndices.begin(), _freeIndices.end());
+            while(!_freeIndices.empty() && _freeIndices.back() == (int32_t)_proxies.size() - 1) {
+                _freeIndices.pop_back();
+                _proxies.pop_back();
+            }
+        }
+    } else {
+        _proxies[proxyId].region = Space::REGION_INVALID;
+        _freeIndices.push_back(proxyId);
+    }
+}
+
+void Space::updateProxy(int32_t proxyId, const Space::Sphere& newSphere) {
+    if (proxyId >= (int32_t)_proxies.size()) {
+        return;
+    }
+    _proxies[proxyId].sphere = newSphere;
+    // TODO: when view is not changing it would be faster to recategorize each Proxy that changes.
+    // Otherwise, we would want to just update all changed objects, adjust the view, and then comute changes.
+}
+
+void Space::setViews(const std::vector<Space::View>& views) {
+    _views = views;
+}
+
+void Space::recategorizeProxiesAndGetChanges(std::vector<Space::Change>& changes) {
+    uint32_t numProxies = _proxies.size();
+    uint32_t numViews = _views.size();
+    for (uint32_t i = 0; i < numProxies; ++i) {
+        Proxy& proxy = _proxies[i];
+        if (proxy.region < Space::REGION_INVALID) {
+            uint8_t region = Space::REGION_UNKNOWN;
+            for (uint32_t j = 0; j < numViews; ++j) {
+                float distance2 = glm::distance2(_views[j].center, glm::vec3(_proxies[i].sphere));
+                for (uint8_t c = 0; c < region; ++c) {
+                    float touchDistance = _views[j].radiuses[c] + _proxies[i].sphere.w;
+                    if (distance2 < touchDistance * touchDistance) {
+                        region = c;
+                        break;
+                    }
+                }
+            }
+            proxy.prevRegion = proxy.region;
+            proxy.region = region;
+            if (proxy.region != proxy.prevRegion) {
+                changes.emplace_back(Space::Change((int32_t)i, proxy.region, proxy.prevRegion));
+            }
+        }
+    }
+}
+
diff --git a/libraries/workload/src/workload/Space.h b/libraries/workload/src/workload/Space.h
new file mode 100644
index 0000000000..717c15e159
--- /dev/null
+++ b/libraries/workload/src/workload/Space.h
@@ -0,0 +1,81 @@
+//
+//  Space.h
+//  libraries/workload/src/workload
+//
+//  Created by Andrew Meadows 2018.01.30
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Originally from lighthouse3d. Modified to utilize glm::vec3 and clean up to our coding standards
+//  Simple plane class.
+//
+//  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_workload_Space_h
+#define hifi_workload_Space_h
+
+#include <vector>
+#include <glm/glm.hpp>
+
+namespace workload {
+
+class Space {
+public:
+    static const uint8_t REGION_NEAR = 0;
+    static const uint8_t REGION_MIDDLE = 1;
+    static const uint8_t REGION_FAR = 2;
+    static const uint8_t REGION_UNKNOWN = 3;
+    static const uint8_t REGION_INVALID = 4;
+
+    using Sphere = glm::vec4; // <x,y,z> = center, w = radius
+
+    class Proxy {
+    public:
+        Proxy(const Sphere& s) : sphere(s) {}
+        Sphere sphere;
+        uint8_t region { REGION_UNKNOWN };
+        uint8_t prevRegion { REGION_UNKNOWN };
+    };
+
+    class View {
+    public:
+        View(const glm::vec3& pos, float nearRadius, float midRadius, float farRadius) : center(pos) {
+            radiuses[0] = nearRadius;
+            radiuses[1] = midRadius;
+            radiuses[2] = farRadius;
+        }
+        glm::vec3 center { 0.0f, 0.0f, 0.0f }; // these init values are not important
+        float radiuses[3] { 1.0f, 2.0f, 3.0f }; // these init values are not important
+    };
+
+    class Change {
+    public:
+        Change(int32_t i, uint32_t c, uint32_t p) : proxyId(i), region(c), prevRegion(p) {}
+        int32_t proxyId { -1 };
+        uint8_t region { 0 };
+        uint8_t prevRegion { 0 };
+    };
+
+    Space() {}
+
+    int32_t createProxy(const Sphere& sphere);
+    void deleteProxy(int32_t proxyId);
+    void updateProxy(int32_t proxyId, const Sphere& sphere);
+    void setViews(const std::vector<View>& views);
+
+    uint32_t getNumObjects() const { return (uint32_t)(_proxies.size() - _freeIndices.size()); }
+
+    void recategorizeProxiesAndGetChanges(std::vector<Change>& changes);
+
+private:
+    // NOTE: double-buffering proxy.category and .prevRegion in their own arrays is NOT faster
+    // (performance is within the noise) than leaving them as data members of Proxy.
+    std::vector<Proxy> _proxies;
+    std::vector<View> _views;
+    std::vector<int32_t> _freeIndices;
+};
+
+} // namespace workload
+
+#endif // hifi_workload_Space_h
diff --git a/tests/workload/CMakeLists.txt b/tests/workload/CMakeLists.txt
new file mode 100644
index 0000000000..53ee7acba1
--- /dev/null
+++ b/tests/workload/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+# Declare dependencies
+macro (setup_testcase_dependencies)
+  link_hifi_libraries(shared workload)
+  package_libraries_for_deployment()
+endmacro ()
+
+setup_hifi_testcase()
diff --git a/tests/workload/src/SpaceTests.cpp b/tests/workload/src/SpaceTests.cpp
new file mode 100644
index 0000000000..17b6911899
--- /dev/null
+++ b/tests/workload/src/SpaceTests.cpp
@@ -0,0 +1,272 @@
+//
+//  SpaceTests.cpp
+//  tests/physics/src
+//
+//  Created by Andrew Meadows on 2017.01.26
+//  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
+//
+
+#include "SpaceTests.h"
+
+#include <iostream>
+
+#include <workload/Space.h>
+#include <StreamUtils.h>
+#include <SharedUtil.h>
+
+
+const float INV_SQRT_3 = 1.0f / sqrtf(3.0f);
+
+QTEST_MAIN(SpaceTests)
+
+void SpaceTests::testOverlaps() {
+    workload::Space space;
+    using Changes = std::vector<workload::Space::Change>;
+    using Views = std::vector<workload::Space::View>;
+
+    glm::vec3 viewCenter(0.0f, 0.0f, 0.0f);
+    float near = 1.0f;
+    float mid = 2.0f;
+    float far = 3.0f;
+
+    Views views;
+    views.push_back(workload::Space::View(viewCenter, near, mid, far));
+    space.setViews(views);
+
+    int32_t proxyId = 0;
+    const float DELTA = 0.001f;
+    float proxyRadius = 0.5f;
+    glm::vec3 proxyPosition = viewCenter + glm::vec3(0.0f, 0.0f, far + proxyRadius + DELTA);
+    workload::Space::Sphere proxySphere(proxyPosition, proxyRadius);
+
+    { // create very_far proxy
+        proxyId = space.createProxy(proxySphere);
+        QVERIFY(space.getNumObjects() == 1);
+
+        Changes changes;
+        space.recategorizeProxiesAndGetChanges(changes);
+        QVERIFY(changes.size() == 0);
+    }
+
+    { // move proxy far
+        float newRadius = 1.0f;
+        glm::vec3 newPosition = viewCenter + glm::vec3(0.0f, 0.0f, far + newRadius - DELTA);
+        workload::Space::Sphere newSphere(newPosition, newRadius);
+        space.updateProxy(proxyId, newSphere);
+        Changes changes;
+        space.recategorizeProxiesAndGetChanges(changes);
+        QVERIFY(changes.size() == 1);
+        QVERIFY(changes[0].proxyId == proxyId);
+        QVERIFY(changes[0].region == workload::Space::REGION_FAR);
+        QVERIFY(changes[0].prevRegion == workload::Space::REGION_UNKNOWN);
+    }
+
+    { // move proxy mid
+        float newRadius = 1.0f;
+        glm::vec3 newPosition = viewCenter + glm::vec3(0.0f, 0.0f, mid + newRadius - DELTA);
+        workload::Space::Sphere newSphere(newPosition, newRadius);
+        space.updateProxy(proxyId, newSphere);
+        Changes changes;
+        space.recategorizeProxiesAndGetChanges(changes);
+        QVERIFY(changes.size() == 1);
+        QVERIFY(changes[0].proxyId == proxyId);
+        QVERIFY(changes[0].region == workload::Space::REGION_MIDDLE);
+        QVERIFY(changes[0].prevRegion == workload::Space::REGION_FAR);
+    }
+
+    { // move proxy near
+        float newRadius = 1.0f;
+        glm::vec3 newPosition = viewCenter + glm::vec3(0.0f, 0.0f, near + newRadius - DELTA);
+        workload::Space::Sphere newSphere(newPosition, newRadius);
+        space.updateProxy(proxyId, newSphere);
+        Changes changes;
+        space.recategorizeProxiesAndGetChanges(changes);
+        QVERIFY(changes.size() == 1);
+        QVERIFY(changes[0].proxyId == proxyId);
+        QVERIFY(changes[0].region == workload::Space::REGION_NEAR);
+        QVERIFY(changes[0].prevRegion == workload::Space::REGION_MIDDLE);
+    }
+
+    { // delete proxy
+        // NOTE: atm deleting a proxy doesn't result in a "Change"
+        space.deleteProxy(proxyId);
+        Changes changes;
+        space.recategorizeProxiesAndGetChanges(changes);
+        QVERIFY(changes.size() == 0);
+        QVERIFY(space.getNumObjects() == 0);
+    }
+}
+
+#ifdef MANUAL_TEST
+
+const float WORLD_WIDTH = 1000.0f;
+const float MIN_RADIUS = 1.0f;
+const float MAX_RADIUS = 100.0f;
+
+float randomFloat() {
+    return 2.0f * ((float)rand() / (float)RAND_MAX) - 1.0f;
+}
+
+glm::vec3 randomVec3() {
+    glm::vec3 v(randomFloat(), randomFloat(), randomFloat());
+    return v;
+}
+
+void generateSpheres(uint32_t numProxies, std::vector<workload::Space::Sphere>& spheres) {
+    spheres.reserve(numProxies);
+    for (uint32_t i = 0; i < numProxies; ++i) {
+        workload::Space::Sphere sphere(
+                WORLD_WIDTH * randomFloat(),
+                WORLD_WIDTH * randomFloat(),
+                WORLD_WIDTH * randomFloat(),
+                (MIN_RADIUS + (MAX_RADIUS - MIN_RADIUS)) * randomFloat());
+        spheres.push_back(sphere);
+    }
+}
+
+void generatePositions(uint32_t numProxies, std::vector<glm::vec3>& positions) {
+    positions.reserve(numProxies);
+    for (uint32_t i = 0; i < numProxies; ++i) {
+        positions.push_back(WORLD_WIDTH * randomVec3());
+    }
+}
+
+void generateRadiuses(uint32_t numRadiuses, std::vector<float>& radiuses) {
+    radiuses.reserve(numRadiuses);
+    for (uint32_t i = 0; i < numRadiuses; ++i) {
+        radiuses.push_back(MIN_RADIUS + (MAX_RADIUS - MIN_RADIUS) * randomFloat());
+    }
+}
+
+void SpaceTests::benchmark() {
+    uint32_t numProxies[] = { 100, 1000, 10000, 100000 };
+    uint32_t numTests = 4;
+    std::vector<uint64_t> timeToAddAll;
+    std::vector<uint64_t> timeToRemoveAll;
+    std::vector<uint64_t> timeToMoveView;
+    std::vector<uint64_t> timeToMoveProxies;
+    for (uint32_t i = 0; i < numTests; ++i) {
+
+        workload::Space space;
+
+        { // build the views
+            std::vector<glm::vec3> viewPositions;
+            viewPositions.push_back(glm::vec3(0.0f, 0.0f, 0.0f));
+            viewPositions.push_back(glm::vec3(0.0f, 0.0f, 0.1f * WORLD_WIDTH));
+            float radius0 = 0.25f * WORLD_WIDTH;
+            float radius1 = 0.50f * WORLD_WIDTH;
+            float radius2 = 0.75f * WORLD_WIDTH;
+            std::vector<workload::Space::View> views;
+            views.push_back(workload::Space::View(viewPositions[0], radius0, radius1, radius2));
+            views.push_back(workload::Space::View(viewPositions[1], radius0, radius1, radius2));
+            space.setViews(views);
+        }
+
+        // build the proxies
+        uint32_t n = numProxies[i];
+        std::vector<workload::Space::Sphere> proxySpheres;
+        generateSpheres(n, proxySpheres);
+        std::vector<int32_t> proxyKeys;
+        proxyKeys.reserve(n);
+
+        // measure time to put proxies in the space
+        uint64_t startTime = usecTimestampNow();
+        for (uint32_t j = 0; j < n; ++j) {
+            int32_t key = space.createProxy(proxySpheres[j]);
+            proxyKeys.push_back(key);
+        }
+        uint64_t usec = usecTimestampNow() - startTime;
+        timeToAddAll.push_back(usec);
+
+        {
+            // build the views
+            std::vector<glm::vec3> viewPositions;
+            viewPositions.push_back(glm::vec3(1.0f, 2.0f, 3.0f));
+            viewPositions.push_back(glm::vec3(1.0f, 2.0f, 3.0f + 0.1f * WORLD_WIDTH));
+            float radius0 = 0.25f * WORLD_WIDTH;
+            float radius1 = 0.50f * WORLD_WIDTH;
+            float radius2 = 0.75f * WORLD_WIDTH;
+            std::vector<workload::Space::View> views;
+            views.push_back(workload::Space::View(viewPositions[0], radius0, radius1, radius2));
+            views.push_back(workload::Space::View(viewPositions[1], radius0, radius1, radius2));
+            space.setViews(views);
+        }
+
+        // measure time to recategorize everything
+        std::vector<workload::Space::Change> changes;
+        startTime = usecTimestampNow();
+        space.recategorizeProxiesAndGetChanges(changes);
+        usec = usecTimestampNow() - startTime;
+        timeToMoveView.push_back(usec);
+
+        // move every 10th proxy around
+        const float proxySpeed = 1.0f;
+        std::vector<workload::Space::Sphere> newSpheres;
+        uint32_t numMovingProxies = n / 10;
+        uint32_t jstep = n / numMovingProxies;
+        uint32_t maxJ = numMovingProxies * jstep - 1;
+        glm::vec3 direction;
+        for (uint32_t j = 0; j < maxJ - jstep; j += jstep) {
+            glm::vec3 position = (glm::vec3)proxySpheres[j];
+            glm::vec3 destination = (glm::vec3)proxySpheres[j + jstep];
+            direction = glm::normalize(destination - position);
+            glm::vec3 newPosition = position + proxySpeed * direction;
+            newSpheres.push_back(workload::Space::Sphere(newPosition, proxySpheres[j].w));
+        }
+        glm::vec3 position = (glm::vec3)proxySpheres[maxJ = jstep];
+        glm::vec3 destination = (glm::vec3)proxySpheres[0];
+        direction = glm::normalize(destination - position);
+        direction = position + proxySpeed * direction;
+        newSpheres.push_back(workload::Space::Sphere(direction, proxySpheres[0].w));
+        uint32_t k = 0;
+        startTime = usecTimestampNow();
+        for (uint32_t j = 0; j < maxJ; j += jstep) {
+            space.updateProxy(proxyKeys[j], newSpheres[k++]);
+        }
+        changes.clear();
+        space.recategorizeProxiesAndGetChanges(changes);
+        usec = usecTimestampNow() - startTime;
+        timeToMoveProxies.push_back(usec);
+
+        // measure time to remove proxies from space
+        startTime = usecTimestampNow();
+        for (uint32_t j = 0; j < n; ++j) {
+            space.deleteProxy(proxyKeys[j]);
+        }
+        usec = usecTimestampNow() - startTime;
+        timeToRemoveAll.push_back(usec);
+    }
+
+    std::cout << "[numProxies, timeToAddAll] = [" << std::endl;
+    for (uint32_t i = 0; i < timeToAddAll.size(); ++i) {
+        uint32_t n = numProxies[i];
+        std::cout << "    " << n << ", " << timeToAddAll[i] << std::endl;
+    }
+    std::cout << "];" << std::endl;
+
+    std::cout << "[numProxies, timeToMoveView] = [" << std::endl;
+    for (uint32_t i = 0; i < timeToMoveView.size(); ++i) {
+        uint32_t n = numProxies[i];
+        std::cout << "    " << n << ", " << timeToMoveView[i] << std::endl;
+    }
+    std::cout << "];" << std::endl;
+
+    std::cout << "[numProxies, timeToMoveProxies] = [" << std::endl;
+    for (uint32_t i = 0; i < timeToMoveProxies.size(); ++i) {
+        uint32_t n = numProxies[i];
+        std::cout << "    " << n << "/10, " << timeToMoveProxies[i] << std::endl;
+    }
+    std::cout << "];" << std::endl;
+
+    std::cout << "[numProxies, timeToRemoveAll] = [" << std::endl;
+    for (uint32_t i = 0; i < timeToRemoveAll.size(); ++i) {
+        uint32_t n = numProxies[i];
+        std::cout << "    " << n << ", " << timeToRemoveAll[i] << std::endl;
+    }
+    std::cout << "];" << std::endl;
+}
+
+#endif // MANUAL_TEST
diff --git a/tests/workload/src/SpaceTests.h b/tests/workload/src/SpaceTests.h
new file mode 100644
index 0000000000..153b89dfc5
--- /dev/null
+++ b/tests/workload/src/SpaceTests.h
@@ -0,0 +1,29 @@
+//
+//  SpaceTests.h
+//  tests/physics/src
+//
+//  Created by Andrew Meadows on 2017.01.26
+//  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
+//
+
+#ifndef hifi_workload_SpaceTests_h
+#define hifi_workload_SpaceTests_h
+
+#include <QtTest/QtTest>
+
+//#define MANUAL_TEST
+
+class SpaceTests : public QObject {
+    Q_OBJECT
+
+private slots:
+    void testOverlaps();
+#ifdef MANUAL_TEST
+    void benchmark();
+#endif // MANUAL_TEST
+};
+
+#endif // hifi_workload_SpaceTests_h

From a8ad846f2b27a1e54c11307cff9d87102222f1e0 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 7 Feb 2018 16:25:06 -0800
Subject: [PATCH 193/569] cleanup

---
 libraries/workload/src/workload/Space.cpp |  4 +---
 libraries/workload/src/workload/Space.h   |  8 +++-----
 tests/workload/src/SpaceTests.cpp         | 16 ++++++++--------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/libraries/workload/src/workload/Space.cpp b/libraries/workload/src/workload/Space.cpp
index 075f9fe477..6562f60ac7 100644
--- a/libraries/workload/src/workload/Space.cpp
+++ b/libraries/workload/src/workload/Space.cpp
@@ -60,15 +60,13 @@ void Space::updateProxy(int32_t proxyId, const Space::Sphere& newSphere) {
         return;
     }
     _proxies[proxyId].sphere = newSphere;
-    // TODO: when view is not changing it would be faster to recategorize each Proxy that changes.
-    // Otherwise, we would want to just update all changed objects, adjust the view, and then comute changes.
 }
 
 void Space::setViews(const std::vector<Space::View>& views) {
     _views = views;
 }
 
-void Space::recategorizeProxiesAndGetChanges(std::vector<Space::Change>& changes) {
+void Space::categorizeAndGetChanges(std::vector<Space::Change>& changes) {
     uint32_t numProxies = _proxies.size();
     uint32_t numViews = _views.size();
     for (uint32_t i = 0; i < numProxies; ++i) {
diff --git a/libraries/workload/src/workload/Space.h b/libraries/workload/src/workload/Space.h
index 717c15e159..be47cddc4e 100644
--- a/libraries/workload/src/workload/Space.h
+++ b/libraries/workload/src/workload/Space.h
@@ -45,8 +45,8 @@ public:
             radiuses[1] = midRadius;
             radiuses[2] = farRadius;
         }
-        glm::vec3 center { 0.0f, 0.0f, 0.0f }; // these init values are not important
-        float radiuses[3] { 1.0f, 2.0f, 3.0f }; // these init values are not important
+        glm::vec3 center { 0.0f, 0.0f, 0.0f };
+        float radiuses[3] { 0.0f, 0.0f, 0.0f };
     };
 
     class Change {
@@ -66,11 +66,9 @@ public:
 
     uint32_t getNumObjects() const { return (uint32_t)(_proxies.size() - _freeIndices.size()); }
 
-    void recategorizeProxiesAndGetChanges(std::vector<Change>& changes);
+    void categorizeAndGetChanges(std::vector<Change>& changes);
 
 private:
-    // NOTE: double-buffering proxy.category and .prevRegion in their own arrays is NOT faster
-    // (performance is within the noise) than leaving them as data members of Proxy.
     std::vector<Proxy> _proxies;
     std::vector<View> _views;
     std::vector<int32_t> _freeIndices;
diff --git a/tests/workload/src/SpaceTests.cpp b/tests/workload/src/SpaceTests.cpp
index 17b6911899..1c6b0491a7 100644
--- a/tests/workload/src/SpaceTests.cpp
+++ b/tests/workload/src/SpaceTests.cpp
@@ -47,7 +47,7 @@ void SpaceTests::testOverlaps() {
         QVERIFY(space.getNumObjects() == 1);
 
         Changes changes;
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         QVERIFY(changes.size() == 0);
     }
 
@@ -57,7 +57,7 @@ void SpaceTests::testOverlaps() {
         workload::Space::Sphere newSphere(newPosition, newRadius);
         space.updateProxy(proxyId, newSphere);
         Changes changes;
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         QVERIFY(changes.size() == 1);
         QVERIFY(changes[0].proxyId == proxyId);
         QVERIFY(changes[0].region == workload::Space::REGION_FAR);
@@ -70,7 +70,7 @@ void SpaceTests::testOverlaps() {
         workload::Space::Sphere newSphere(newPosition, newRadius);
         space.updateProxy(proxyId, newSphere);
         Changes changes;
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         QVERIFY(changes.size() == 1);
         QVERIFY(changes[0].proxyId == proxyId);
         QVERIFY(changes[0].region == workload::Space::REGION_MIDDLE);
@@ -83,7 +83,7 @@ void SpaceTests::testOverlaps() {
         workload::Space::Sphere newSphere(newPosition, newRadius);
         space.updateProxy(proxyId, newSphere);
         Changes changes;
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         QVERIFY(changes.size() == 1);
         QVERIFY(changes[0].proxyId == proxyId);
         QVERIFY(changes[0].region == workload::Space::REGION_NEAR);
@@ -94,7 +94,7 @@ void SpaceTests::testOverlaps() {
         // NOTE: atm deleting a proxy doesn't result in a "Change"
         space.deleteProxy(proxyId);
         Changes changes;
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         QVERIFY(changes.size() == 0);
         QVERIFY(space.getNumObjects() == 0);
     }
@@ -195,10 +195,10 @@ void SpaceTests::benchmark() {
             space.setViews(views);
         }
 
-        // measure time to recategorize everything
+        // measure time to categorizeAndGetChanges everything
         std::vector<workload::Space::Change> changes;
         startTime = usecTimestampNow();
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         usec = usecTimestampNow() - startTime;
         timeToMoveView.push_back(usec);
 
@@ -227,7 +227,7 @@ void SpaceTests::benchmark() {
             space.updateProxy(proxyKeys[j], newSpheres[k++]);
         }
         changes.clear();
-        space.recategorizeProxiesAndGetChanges(changes);
+        space.categorizeAndGetChanges(changes);
         usec = usecTimestampNow() - startTime;
         timeToMoveProxies.push_back(usec);
 

From 955af21aba0abbac34f08f5d48fb87f610ef79a4 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 8 Feb 2018 08:30:29 -0800
Subject: [PATCH 194/569] use explicit cast to avoid windows warning

---
 libraries/workload/src/workload/Space.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/workload/src/workload/Space.cpp b/libraries/workload/src/workload/Space.cpp
index 6562f60ac7..1e2bfb228a 100644
--- a/libraries/workload/src/workload/Space.cpp
+++ b/libraries/workload/src/workload/Space.cpp
@@ -67,8 +67,8 @@ void Space::setViews(const std::vector<Space::View>& views) {
 }
 
 void Space::categorizeAndGetChanges(std::vector<Space::Change>& changes) {
-    uint32_t numProxies = _proxies.size();
-    uint32_t numViews = _views.size();
+    uint32_t numProxies = (uint32_t)_proxies.size();
+    uint32_t numViews = (uint32_t)_views.size();
     for (uint32_t i = 0; i < numProxies; ++i) {
         Proxy& proxy = _proxies[i];
         if (proxy.region < Space::REGION_INVALID) {

From 8231a56b2299b33ce18e77e19e5f8e18f6a2df40 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 8 Feb 2018 14:19:19 -0800
Subject: [PATCH 195/569] pull task out of render and into its own lib

---
 interface/CMakeLists.txt                      |  2 +-
 libraries/avatars-renderer/CMakeLists.txt     |  1 +
 libraries/entities-renderer/CMakeLists.txt    |  1 +
 libraries/render-utils/CMakeLists.txt         |  4 +-
 libraries/render-utils/src/ZoneRenderer.h     |  2 +-
 libraries/render/CMakeLists.txt               |  1 +
 libraries/render/src/render/Engine.h          |  5 +-
 libraries/render/src/render/SortTask.h        |  2 +-
 .../{render => task}/src/task/Config.cpp      |  0
 libraries/{render => task}/src/task/Config.h  |  2 +-
 libraries/{render => task}/src/task/Task.h    | 58 +++++++++----------
 libraries/{render => task}/src/task/Varying.h |  0
 tests/gpu-test/CMakeLists.txt                 |  2 +-
 tests/render-perf/CMakeLists.txt              |  2 +-
 tests/render-texture-load/CMakeLists.txt      |  2 +-
 15 files changed, 44 insertions(+), 40 deletions(-)
 rename libraries/{render => task}/src/task/Config.cpp (100%)
 rename libraries/{render => task}/src/task/Config.h (99%)
 rename libraries/{render => task}/src/task/Task.h (88%)
 rename libraries/{render => task}/src/task/Varying.h (100%)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c5800959f0..85007f5f15 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -204,7 +204,7 @@ endif()
 
 # link required hifi libraries
 link_hifi_libraries(
-  shared octree ktx gpu gl procedural graphics render
+  shared task octree ktx gpu gl procedural graphics render
   pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt
index 1f740700c5..40e1607b2a 100644
--- a/libraries/avatars-renderer/CMakeLists.txt
+++ b/libraries/avatars-renderer/CMakeLists.txt
@@ -13,5 +13,6 @@ include_hifi_library_headers(entities-renderer)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(octree)
+include_hifi_library_headers(task)
 
 target_bullet()
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 4eaa16a107..0f33a73e40 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -13,6 +13,7 @@ include_hifi_library_headers(fbx)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(controllers)
+include_hifi_library_headers(task)
 
 target_bullet()
 target_polyvox()
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 57e3572012..3e01fd2643 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -3,10 +3,10 @@ AUTOSCRIBE_SHADER_LIB(gpu graphics render)
 # pull in the resources.qrc file
 qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
 setup_hifi_library(Gui Network Qml Quick Script)
-link_hifi_libraries(shared ktx gpu graphics model-networking render animation fbx image procedural)
+link_hifi_libraries(shared task ktx gpu graphics model-networking render animation fbx image procedural)
+include_hifi_library_headers(audio)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
-include_hifi_library_headers(audio)
 
 if (NOT ANDROID)
   target_nsight()
diff --git a/libraries/render-utils/src/ZoneRenderer.h b/libraries/render-utils/src/ZoneRenderer.h
index 5737499270..419db4ebe2 100644
--- a/libraries/render-utils/src/ZoneRenderer.h
+++ b/libraries/render-utils/src/ZoneRenderer.h
@@ -88,4 +88,4 @@ protected:
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index 1d88c3e5f5..08f0e07b8f 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -4,5 +4,6 @@ setup_hifi_library()
 
 # render needs octree only for getAccuracyAngle(float, int)
 link_hifi_libraries(shared ktx gpu graphics octree)
+include_hifi_library_headers(task)
 
 target_nsight()
diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 1650d09c5d..94102b4834 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -14,9 +14,10 @@
 
 #include <SettingHandle.h>
 
-#include "Scene.h"
-#include "../task/Task.h"
 #include <gpu/Batch.h>
+#include <task/Task.h>
+
+#include "Scene.h"
 
 namespace render {
 
diff --git a/libraries/render/src/render/SortTask.h b/libraries/render/src/render/SortTask.h
index de670b1676..8e4c58803e 100644
--- a/libraries/render/src/render/SortTask.h
+++ b/libraries/render/src/render/SortTask.h
@@ -55,4 +55,4 @@ namespace render {
     };
 }
 
-#endif // hifi_render_SortTask_h;
\ No newline at end of file
+#endif // hifi_render_SortTask_h;
diff --git a/libraries/render/src/task/Config.cpp b/libraries/task/src/task/Config.cpp
similarity index 100%
rename from libraries/render/src/task/Config.cpp
rename to libraries/task/src/task/Config.cpp
diff --git a/libraries/render/src/task/Config.h b/libraries/task/src/task/Config.h
similarity index 99%
rename from libraries/render/src/task/Config.h
rename to libraries/task/src/task/Config.h
index 7632d4e85d..8f23efe031 100644
--- a/libraries/render/src/task/Config.h
+++ b/libraries/task/src/task/Config.h
@@ -20,7 +20,7 @@
 
 #include "SettingHandle.h"
 
-#include "Logging.h"
+//#include "Logging.h"
 
 namespace task {
 
diff --git a/libraries/render/src/task/Task.h b/libraries/task/src/task/Task.h
similarity index 88%
rename from libraries/render/src/task/Task.h
rename to libraries/task/src/task/Task.h
index 63bda7bafa..3ac6614a09 100644
--- a/libraries/render/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -1,6 +1,6 @@
 //
 //  Task.h
-//  render/src/task
+//  task/src/task
 //
 //  Created by Zach Pomerantz on 1/6/2016.
 //  Copyright 2016 High Fidelity, Inc.
@@ -17,7 +17,7 @@
 
 #include "SettingHandle.h"
 
-#include "Logging.h"
+//#include "Logging.h"
 
 #include <Profile.h>
 #include <PerfStat.h>
@@ -25,8 +25,8 @@
 namespace task {
 
 class JobConcept;
-template <class RC> class JobT;
-template <class RC> class TaskT;
+template <class JC> class JobT;
+template <class JC> class TaskT;
 class JobNoIO {};
 
 class JobContext {
@@ -68,23 +68,23 @@ template<class T> void jobConfigure(T&, const TaskConfig&) {
     // nop, as the default TaskConfig was used, so the data does not need a configure method
 }
 
-template <class T, class RC> void jobRun(T& data, const RC& renderContext, const JobNoIO& input, JobNoIO& output) {
-    data.run(renderContext);
+template <class T, class JC> void jobRun(T& data, const JC& jobContext, const JobNoIO& input, JobNoIO& output) {
+    data.run(jobContext);
 }
-template <class T, class RC, class I> void jobRun(T& data, const RC& renderContext, const I& input, JobNoIO& output) {
-    data.run(renderContext, input);
+template <class T, class JC, class I> void jobRun(T& data, const JC& jobContext, const I& input, JobNoIO& output) {
+    data.run(jobContext, input);
 }
-template <class T, class RC, class O> void jobRun(T& data, const RC& renderContext, const JobNoIO& input, O& output) {
-    data.run(renderContext, output);
+template <class T, class JC, class O> void jobRun(T& data, const JC& jobContext, const JobNoIO& input, O& output) {
+    data.run(jobContext, output);
 }
-template <class T, class RC, class I, class O> void jobRun(T& data, const RC& renderContext, const I& input, O& output) {
-    data.run(renderContext, input, output);
+template <class T, class JC, class I, class O> void jobRun(T& data, const JC& jobContext, const I& input, O& output) {
+    data.run(jobContext, input, output);
 }
 
-template <class RC>
+template <class JC>
 class Job {
 public:
-    using Context = RC;
+    using Context = JC;
     using ContextPointer = std::shared_ptr<Context>;
     using Config = JobConfig;
     using None = JobNoIO;
@@ -94,7 +94,7 @@ public:
         Concept(QConfigPointer config) : JobConcept(config) {}
         virtual ~Concept() = default;
 
-        virtual void run(const ContextPointer& renderContext) = 0;
+        virtual void run(const ContextPointer& jobContext) = 0;
     };
     using ConceptPointer = std::shared_ptr<Concept>;
 
@@ -130,12 +130,12 @@ public:
             jobConfigure(_data, *std::static_pointer_cast<C>(Concept::_config));
         }
 
-        void run(const ContextPointer& renderContext) override {
-            renderContext->jobConfig = std::static_pointer_cast<Config>(Concept::_config);
-            if (renderContext->jobConfig->alwaysEnabled || renderContext->jobConfig->isEnabled()) {
-                jobRun(_data, renderContext, _input.get<I>(), _output.edit<O>());
+        void run(const ContextPointer& jobContext) override {
+            jobContext->jobConfig = std::static_pointer_cast<Config>(Concept::_config);
+            if (jobContext->jobConfig->alwaysEnabled || jobContext->jobConfig->isEnabled()) {
+                jobRun(_data, jobContext, _input.get<I>(), _output.edit<O>());
             }
-            renderContext->jobConfig.reset();
+            jobContext->jobConfig.reset();
         }
     };
     template <class T, class I, class C = Config> using ModelI = Model<T, C, I, None>;
@@ -161,12 +161,12 @@ public:
         return concept->_data;
     }
 
-    virtual void run(const ContextPointer& renderContext) {
+    virtual void run(const ContextPointer& jobContext) {
         PerformanceTimer perfTimer(_name.c_str());
-        PROFILE_RANGE(render, _name.c_str());
+        //PROFILE_RANGE(render, _name.c_str());
         auto start = usecTimestampNow();
 
-        _concept->run(renderContext);
+        _concept->run(jobContext);
 
         _concept->setCPURunTime((double)(usecTimestampNow() - start) / 1000.0);
     }
@@ -186,13 +186,13 @@ protected:
 // The build method is where child Jobs can be added internally to the task 
 // where the input of the task can be setup to feed the child jobs
 // and where the output of the task is defined
-template <class RC>
-class Task : public Job<RC> {
+template <class JC>
+class Task : public Job<JC> {
 public:
-    using Context = RC;
+    using Context = JC;
     using ContextPointer = std::shared_ptr<Context>;
     using Config = TaskConfig;
-    using JobType = Job<RC>;
+    using JobType = Job<JC>;
     using None = typename JobType::None;
     using Concept = typename JobType::Concept;
     using ConceptPointer = typename JobType::ConceptPointer;
@@ -300,11 +300,11 @@ public:
             }
         }
 
-        void run(const ContextPointer& renderContext) override {
+        void run(const ContextPointer& jobContext) override {
             auto config = std::static_pointer_cast<C>(Concept::_config);
             if (config->alwaysEnabled || config->enabled) {
                 for (auto job : TaskConcept::_jobs) {
-                    job.run(renderContext);
+                    job.run(jobContext);
                 }
             }
         }
diff --git a/libraries/render/src/task/Varying.h b/libraries/task/src/task/Varying.h
similarity index 100%
rename from libraries/render/src/task/Varying.h
rename to libraries/task/src/task/Varying.h
diff --git a/tests/gpu-test/CMakeLists.txt b/tests/gpu-test/CMakeLists.txt
index 7bc1349091..336dcf753c 100644
--- a/tests/gpu-test/CMakeLists.txt
+++ b/tests/gpu-test/CMakeLists.txt
@@ -5,7 +5,7 @@ setup_hifi_project(Quick Gui Script)
 setup_memory_debugger()
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 link_hifi_libraries(
-    shared networking gl 
+    shared task networking gl 
     ktx gpu procedural octree image 
     graphics model-networking fbx animation 
     script-engine render render-utils 
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index 57ae7dace7..7ad38c5795 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -13,7 +13,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
 # link in the shared libraries
 link_hifi_libraries(
-    shared networking animation 
+    shared task networking animation 
     ktx image octree gl gpu gpu-gl  
     render render-utils 
     graphics fbx model-networking 
diff --git a/tests/render-texture-load/CMakeLists.txt b/tests/render-texture-load/CMakeLists.txt
index 2ed905a3ef..b3e49d830b 100644
--- a/tests/render-texture-load/CMakeLists.txt
+++ b/tests/render-texture-load/CMakeLists.txt
@@ -13,7 +13,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
 # link in the shared libraries
 link_hifi_libraries(
-    shared networking octree 
+    shared task networking octree 
     gl gpu render ktx image animation 
     graphics fbx model-networking 
     render-utils 

From 724e2f7e660987def919ca9fa45b9c672175d76e Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 9 Feb 2018 10:00:32 -0800
Subject: [PATCH 196/569] add CMakeLists.txt for new 'task' library

---
 libraries/task/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 libraries/task/CMakeLists.txt

diff --git a/libraries/task/CMakeLists.txt b/libraries/task/CMakeLists.txt
new file mode 100644
index 0000000000..4c97f34acd
--- /dev/null
+++ b/libraries/task/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(TARGET_NAME task)
+setup_hifi_library()
+link_hifi_libraries(shared)

From 342ba5f8aa795b01429ced0442b4d3f6e5feba05 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 9 Feb 2018 11:50:41 -0800
Subject: [PATCH 197/569] add 'task' lib dependency to HMD plugins

---
 plugins/oculus/CMakeLists.txt | 2 +-
 plugins/openvr/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/oculus/CMakeLists.txt b/plugins/oculus/CMakeLists.txt
index 2a011a349a..638cadf574 100644
--- a/plugins/oculus/CMakeLists.txt
+++ b/plugins/oculus/CMakeLists.txt
@@ -19,7 +19,7 @@ if (WIN32 AND (NOT USE_GLES))
   set(TARGET_NAME oculus)
   setup_hifi_plugin(Multimedia)
   link_hifi_libraries(
-    shared gl gpu gpu-gl controllers ui qml
+    shared task gl gpu gpu-gl controllers ui qml
     plugins ui-plugins display-plugins input-plugins
     audio-client networking render-utils
     ${PLATFORM_GL_BACKEND}
diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt
index a6e90aa5a6..ff94152d57 100644
--- a/plugins/openvr/CMakeLists.txt
+++ b/plugins/openvr/CMakeLists.txt
@@ -11,7 +11,7 @@ if (WIN32 AND (NOT USE_GLES))
     add_definitions(-DGLEW_STATIC)
     set(TARGET_NAME openvr)
     setup_hifi_plugin(Gui Qml Multimedia)
-    link_hifi_libraries(shared gl qml networking controllers ui 
+    link_hifi_libraries(shared task gl qml networking controllers ui 
         plugins display-plugins ui-plugins input-plugins script-engine
         audio-client render-utils graphics gpu render model-networking fbx ktx image procedural ${PLATFORM_GL_BACKEND})
 

From cfb64ad6938c4dec228216c3fd5d6bdc1584e932 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 9 Feb 2018 11:58:36 -0800
Subject: [PATCH 198/569] add LoggingCategory data member to JobContext

---
 libraries/render/src/render/Engine.h | 3 ++-
 libraries/task/src/task/Task.h       | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 94102b4834..0271c71529 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -25,6 +25,7 @@ namespace render {
 
     class RenderContext : public task::JobContext {
     public:
+        RenderContext() : task::JobContext(trace_render()) {}
         virtual ~RenderContext() {}
 
         RenderArgs* args;
@@ -101,7 +102,7 @@ namespace render {
 
     protected:
         RenderContextPointer _renderContext;
-    
+
         void run(const RenderContextPointer& context) override { assert(_renderContext);  Task::run(_renderContext); }
     };
     using EnginePointer = std::shared_ptr<Engine>;
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 3ac6614a09..2ab90411c1 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -31,9 +31,13 @@ class JobNoIO {};
 
 class JobContext {
 public:
+    JobContext(const QLoggingCategory& category) : profileCategory(category) {
+        assert(category);
+    }
     virtual ~JobContext() {}
 
     std::shared_ptr<JobConfig> jobConfig { nullptr };
+    const QLoggingCategory& profileCategory;
 };
 using JobContextPointer = std::shared_ptr<JobContext>;
 
@@ -163,7 +167,9 @@ public:
 
     virtual void run(const ContextPointer& jobContext) {
         PerformanceTimer perfTimer(_name.c_str());
-        //PROFILE_RANGE(render, _name.c_str());
+        //PROFILE_RANGE(foo, _name);
+        //Duration profileRangeThis(trace_foo(), name);
+        Duration profileRange(jobContext->profileCategory, _name.c_str());
         auto start = usecTimestampNow();
 
         _concept->run(jobContext);

From d59c3898dcebde9a2492daa93761bcd3e2a658ac Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 9 Feb 2018 11:59:50 -0800
Subject: [PATCH 199/569] add 'workload' logging profile

---
 libraries/shared/src/Profile.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h
index fc6a2a52cb..f2a747afa3 100644
--- a/libraries/shared/src/Profile.h
+++ b/libraries/shared/src/Profile.h
@@ -32,6 +32,7 @@ Q_DECLARE_LOGGING_CATEGORY(trace_simulation_animation)
 Q_DECLARE_LOGGING_CATEGORY(trace_simulation_animation_detail)
 Q_DECLARE_LOGGING_CATEGORY(trace_simulation_physics)
 Q_DECLARE_LOGGING_CATEGORY(trace_simulation_physics_detail)
+Q_DECLARE_LOGGING_CATEGORY(trace_workload)
 
 class Duration {
 public:

From 2b1b75450d83378d58858fa697bc5479bd45db04 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 9 Feb 2018 15:47:38 -0800
Subject: [PATCH 200/569] fix assert

---
 libraries/task/src/task/Task.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 2ab90411c1..3c9895d1a6 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -32,7 +32,7 @@ class JobNoIO {};
 class JobContext {
 public:
     JobContext(const QLoggingCategory& category) : profileCategory(category) {
-        assert(category);
+        assert(&category);
     }
     virtual ~JobContext() {}
 
@@ -167,8 +167,7 @@ public:
 
     virtual void run(const ContextPointer& jobContext) {
         PerformanceTimer perfTimer(_name.c_str());
-        //PROFILE_RANGE(foo, _name);
-        //Duration profileRangeThis(trace_foo(), name);
+        // NOTE: rather than use the PROFILE_RANGE macro, we create a Duration manually
         Duration profileRange(jobContext->profileCategory, _name.c_str());
         auto start = usecTimestampNow();
 
@@ -189,7 +188,7 @@ protected:
 // It can be created on any type T by aliasing the type JobModel in the class T
 // using JobModel = Task::Model<T>
 // The class T is expected to have a "build" method acting as a constructor.
-// The build method is where child Jobs can be added internally to the task 
+// The build method is where child Jobs can be added internally to the task
 // where the input of the task can be setup to feed the child jobs
 // and where the output of the task is defined
 template <class JC>

From a1c540fc85b6725d135258dc5ebba1797450319c Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 12 Feb 2018 08:05:51 -0800
Subject: [PATCH 201/569] instantiate trace_workload logging category

---
 libraries/shared/src/Profile.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/shared/src/Profile.cpp b/libraries/shared/src/Profile.cpp
index eb7440f4b3..97def2015a 100644
--- a/libraries/shared/src/Profile.cpp
+++ b/libraries/shared/src/Profile.cpp
@@ -27,6 +27,7 @@ Q_LOGGING_CATEGORY(trace_simulation_animation, "trace.simulation.animation")
 Q_LOGGING_CATEGORY(trace_simulation_animation_detail, "trace.simulation.animation.detail")
 Q_LOGGING_CATEGORY(trace_simulation_physics, "trace.simulation.physics")
 Q_LOGGING_CATEGORY(trace_simulation_physics_detail, "trace.simulation.physics.detail")
+Q_LOGGING_CATEGORY(trace_workload, "trace.workload")
 
 #if defined(NSIGHT_FOUND)
 #include "nvToolsExt.h"

From b6f81a8131dd3f84a7e7f30a80e246891bccb65b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 12 Feb 2018 08:09:08 -0800
Subject: [PATCH 202/569] android app depends on task lib

---
 android/app/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index 0ef1427306..d24a84c6a5 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared task networking gl gpu qml image fbx render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 

From f1495d27f65d669629e3f3ea1b81c2762c58a7f3 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 12 Feb 2018 08:56:04 -0800
Subject: [PATCH 203/569] try task link dependency rather than include

---
 libraries/render/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index 08f0e07b8f..2a888a5b18 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -3,7 +3,6 @@ AUTOSCRIBE_SHADER_LIB(gpu graphics)
 setup_hifi_library()
 
 # render needs octree only for getAccuracyAngle(float, int)
-link_hifi_libraries(shared ktx gpu graphics octree)
-include_hifi_library_headers(task)
+link_hifi_libraries(shared task ktx gpu graphics octree)
 
 target_nsight()

From 95b34cf112fbaf42fc5c7968c74b0cf69c3f1425 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 12 Feb 2018 10:32:19 -0800
Subject: [PATCH 204/569] remove cruft and extra whitespace

---
 libraries/task/src/task/Config.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/task/src/task/Config.h b/libraries/task/src/task/Config.h
index 8f23efe031..36dfb35f25 100644
--- a/libraries/task/src/task/Config.h
+++ b/libraries/task/src/task/Config.h
@@ -20,8 +20,6 @@
 
 #include "SettingHandle.h"
 
-//#include "Logging.h"
-
 namespace task {
 
 class JobConcept;
@@ -140,12 +138,12 @@ public:
     TaskConfig(bool enabled) : JobConfig(enabled) {}
 
 
-    
+
     // Get a sub job config through task.getConfig(path)
     // where path can be:
     // - <job_name> search for the first job named job_name traversing the the sub graph of task and jobs (from this task as root)
     // - <parent_name>.[<sub_parent_names>.]<job_name>
-    //    Allowing to first look for the parent_name job (from this task as root) and then search from there for the 
+    //    Allowing to first look for the parent_name job (from this task as root) and then search from there for the
     //    optional sub_parent_names and finally from there looking for the job_name (assuming every job in the path were found)
     //
     // getter for qml integration, prefer the templated getter
@@ -174,7 +172,7 @@ public:
 
     void connectChildConfig(QConfigPointer childConfig, const std::string& name);
     void transferChildrenConfigs(QConfigPointer source);
-     
+
     JobConcept* _task;
 
 public slots:
@@ -182,7 +180,7 @@ public slots:
 };
 
 using QConfigPointer = std::shared_ptr<QObject>;
-    
+
 }
 
 #endif // hifi_task_Config_h

From 01fb8f336956527fbe68a29f8c71a44d1e557c1b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 12 Feb 2018 10:41:54 -0800
Subject: [PATCH 205/569] remove cruft

---
 libraries/task/src/task/Task.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 3c9895d1a6..b75f6d7321 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -17,8 +17,6 @@
 
 #include "SettingHandle.h"
 
-//#include "Logging.h"
-
 #include <Profile.h>
 #include <PerfStat.h>
 

From ddcee05b14637a342dd286c93482fba289300a0f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 13 Feb 2018 09:41:00 -0800
Subject: [PATCH 206/569] added control button for controller API

---
 interface/resources/controllers/keyboardMouse.json       | 4 ++--
 .../src/input-plugins/KeyboardMouseDevice.cpp            | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 54d2467f78..b3f16a115e 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -88,8 +88,8 @@
             ]
         },
 
-        { "from": "Keyboard.W", "to": "Actions.LONGITUDINAL_FORWARD" },
-        { "from": "Keyboard.S", "to": "Actions.LONGITUDINAL_BACKWARD" },
+        { "from": "Keyboard.W", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_FORWARD" },
+        { "from": "Keyboard.S", "when": "!Keyboard.Control", "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.C", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.E", "to": "Actions.VERTICAL_UP" },
         { "from": "Keyboard.Left", "when": "Keyboard.RightMouseButton", "to": "Actions.LATERAL_LEFT" },
diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index e9ec6d8910..ef7f482e44 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -54,11 +54,9 @@ void KeyboardMouseDevice::InputDevice::focusOutEvent() {
 
 void KeyboardMouseDevice::keyPressEvent(QKeyEvent* event) {
     auto input = _inputDevice->makeInput((Qt::Key) event->key());
-    if (!(event->modifiers() & Qt::KeyboardModifier::ControlModifier)) {
-        auto result = _inputDevice->_buttonPressedMap.insert(input.getChannel());
-        if (result.second) {
-            // key pressed again ? without catching the release event ?
-        }
+    auto result = _inputDevice->_buttonPressedMap.insert(input.getChannel());
+    if (result.second) {
+        // key pressed again ? without catching the release event ?
     }
 }
 
@@ -237,6 +235,7 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageUp), QKeySequence(Qt::Key_PageUp).toString()));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageDown), QKeySequence(Qt::Key_PageDown).toString()));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Tab), QKeySequence(Qt::Key_Tab).toString()));
+        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Control), "Control"));
 
         availableInputs.append(Input::NamedPair(makeInput(Qt::LeftButton), "LeftMouseButton"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::MiddleButton), "MiddleMouseButton"));

From 45f09dde96c55e8982840bdb7bea57f61dcdb21f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 13 Feb 2018 10:32:15 -0800
Subject: [PATCH 207/569] address tony's requests

---
 interface/src/avatar/MyAvatar.cpp | 2 +-
 interface/src/avatar/MyAvatar.h   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index d5cd7bdca1..15ae1584f6 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1461,7 +1461,7 @@ void MyAvatar::clearJointsData() {
 
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModelChangeCount++;
-     int skeletonModelChangeCount = _skeletonModelChangeCount;
+    int skeletonModelChangeCount = _skeletonModelChangeCount;
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
     _headBoneSet.clear();
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 3e063547d0..28af8b62fd 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -819,7 +819,6 @@ private:
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
     bool _enableDebugDrawDetailedCollision { false };
-    bool _shouldInitHeadBones { true };
 
     mutable bool _cauterizationNeedsUpdate; // do we need to scan children and update their "cauterized" state?
 

From cf3d8e446376e4a4f4b9c3b637b8b835533c8892 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 13 Feb 2018 11:07:15 -0800
Subject: [PATCH 208/569] remove cached file

---
 interface/resources/qml/js/Utils.jsc | Bin 6516 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 interface/resources/qml/js/Utils.jsc

diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
deleted file mode 100644
index 8da68e4e192018ee2b4f3d835ec91f36f0161eca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6516
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


From 0809210dc3cb92948f0173828e244d405681b743 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 11:16:48 -0800
Subject: [PATCH 209/569] No permission card

---
 .../hifi/commerce/purchases/PurchasedItem.qml | 100 +++++++++++++++++-
 .../qml/hifi/commerce/purchases/Purchases.qml |  84 +++------------
 .../AccountServicesScriptingInterface.h       |   2 +-
 3 files changed, 113 insertions(+), 73 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 41f2d919cd..9db847eada 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -29,7 +29,6 @@ Item {
     id: root;
     property string purchaseStatus;
     property bool purchaseStatusChanged;
-    property bool canRezCertifiedItems: false;
     property string itemName;
     property string itemId;
     property string itemPreviewImageUrl;
@@ -67,6 +66,8 @@ Item {
         if ((itemType === "entity" && (!Entities.canRezCertified() && !Entities.canRezTmpCertified())) ||
             (itemType === "contentSet" && !Entities.canReplaceContent())) {
             root.hasPermissionToRezThis = false;
+        } else {
+            root.hasPermissionToRezThis = true;
         }
     }
 
@@ -128,15 +129,19 @@ Item {
             }
         }
 
-    
+        TextMetrics {
+            id:     itemNameTextMetrics;
+            font:   itemName.font;
+            text:   itemName.text;
+        }
         RalewaySemiBold {
             id: itemName;
             anchors.top: itemPreviewImage.top;
             anchors.topMargin: 4;
             anchors.left: itemPreviewImage.right;
             anchors.leftMargin: 8;
-            anchors.right: buttonContainer.left;
-            anchors.rightMargin: 8;
+            width: root.hasPermissionToRezThis ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width) :
+                Math.min(itemNameTextMetrics.tightBoundingRect.width + 2, buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - noPermissionGlyph.width + 2);
             height: paintedHeight;
             // Text size
             size: 24;
@@ -162,6 +167,91 @@ Item {
                 }
             }
         }
+        HiFiGlyphs {
+            id: noPermissionGlyph;
+            visible: !root.hasPermissionToRezThis;
+            anchors.verticalCenter: itemName.verticalCenter;
+            anchors.left: itemName.right;
+            anchors.leftMargin: itemName.truncated ? -14 : -2;
+            text: hifi.glyphs.info;
+            // Size
+            size: 40;
+            width: 32;
+            // Style
+            color: hifi.colors.redAccent;
+            
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: true;
+
+                onEntered: {
+                    noPermissionGlyph.color = hifi.colors.redHighlight;
+                }
+                onExited: {
+                    noPermissionGlyph.color = hifi.colors.redAccent;
+                }
+                onClicked: {
+                    permissionExplanationCard.visible = true;
+                }
+            }
+        }
+        Rectangle {
+            id: permissionExplanationCard;
+            z: 995;
+            visible: false;
+            anchors.fill: parent;
+            color: hifi.colors.white;
+
+            RalewayRegular {
+                id: permissionExplanationText;
+                text: {
+                    if (root.itemType === "contentSet") {
+                        "You do not have 'Replace Content' permissions in this domain. <a href='#replaceContentPermission'>Learn more</a>";
+                    } else if (root.itemType === "entity") {
+                        "You do not have 'Rez Certified' permissions in this domain. <a href='#rezCertifiedPermission'>Learn more</a>";
+                    }
+                }
+                size: 16;
+                anchors.left: parent.left;
+                anchors.leftMargin: 30;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: permissionExplanationGlyph.left;
+                color: hifi.colors.baseGray;
+                wrapMode: Text.WordWrap;
+                verticalAlignment: Text.AlignVCenter;
+
+                onLinkActivated: {
+                    sendToPurchases({method: 'showPermissionsExplanation', itemType: root.itemType});
+                }
+            }
+            // "Close" button
+            HiFiGlyphs {
+                id: permissionExplanationGlyph;
+                text: hifi.glyphs.close;
+                color: hifi.colors.baseGray;
+                size: 26;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                width: 77;
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignVCenter;
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: {
+                        parent.text = hifi.glyphs.closeInverted;
+                    }
+                    onExited: {
+                        parent.text = hifi.glyphs.close;
+                    }
+                    onClicked: {
+                        permissionExplanationCard.visible = false;
+                    }
+                }
+            }
+        }
 
         Item {
             id: certificateContainer;
@@ -379,7 +469,7 @@ Item {
             anchors.right: parent.right;
             anchors.rightMargin: 4;
             width: height;
-            enabled: (root.canRezCertifiedItems || root.itemType === "wearable") && root.purchaseStatus !== "invalidated";
+            enabled: root.hasPermissionToRezThis && root.purchaseStatus !== "invalidated";
             
             onClicked: {
                 if (root.itemType === "contentSet") {
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 956bfa7c26..daa23d29c8 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -32,7 +32,6 @@ Rectangle {
     property bool securityImageResultReceived: false;
     property bool purchasesReceived: false;
     property bool punctuationMode: false;
-    property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
     property bool pendingInventoryReply: true;
     property bool isShowingMyItems: false;
     property bool isDebuggingFirstUseTutorial: false;
@@ -365,69 +364,6 @@ Rectangle {
             id: filteredPurchasesModel;
         }
 
-        Rectangle {
-            id: cantRezCertified;
-            visible: !root.canRezCertifiedItems;
-            color: "#FFC3CD";
-            radius: 4;
-            border.color: hifi.colors.redAccent;
-            border.width: 1;
-            anchors.top: separator.bottom;
-            anchors.topMargin: 12;
-            anchors.left: parent.left;
-            anchors.leftMargin: 16;
-            anchors.right: parent.right;
-            anchors.rightMargin: 16;
-            height: 80;
-
-            HiFiGlyphs {
-                id: lightningIcon;
-                text: hifi.glyphs.lightning;
-                // Size
-                size: 36;
-                // Anchors
-                anchors.top: parent.top;
-                anchors.topMargin: 18;
-                anchors.left: parent.left;
-                anchors.leftMargin: 12;
-                horizontalAlignment: Text.AlignHCenter;
-                // Style
-                color: hifi.colors.lightGray;
-            }
-
-            RalewayRegular {
-                text: "You don't have permission to rez certified items in this domain. " +
-                '<b><font color="' + hifi.colors.blueAccent + '"><a href="#">Learn More</a></font></b>';
-                // Text size
-                size: 18;
-                // Anchors
-                anchors.top: parent.top;
-                anchors.topMargin: 4;
-                anchors.left: lightningIcon.right;
-                anchors.leftMargin: 8;
-                anchors.right: parent.right;
-                anchors.rightMargin: 8;
-                anchors.bottom: parent.bottom;
-                anchors.bottomMargin: 4;
-                // Style
-                color: hifi.colors.baseGray;
-                wrapMode: Text.WordWrap;
-                // Alignment
-                verticalAlignment: Text.AlignVCenter;
-                
-                onLinkActivated: {
-                    lightboxPopup.titleText = "Rez Permission Required";
-                    lightboxPopup.bodyText = "You don't have permission to rez certified items in this domain.<br><br>" +
-                        "Use the <b>GOTO app</b> to visit another domain or <b>go to your own sandbox.</b>";
-                    lightboxPopup.button1text = "CLOSE";
-                    lightboxPopup.button1method = "root.visible = false;"
-                    lightboxPopup.button2text = "OPEN GOTO";
-                    lightboxPopup.button2method = "sendToParent({method: 'purchases_openGoTo'});";
-                    lightboxPopup.visible = true;
-                }
-            }
-        }
-
         ListView {
             id: purchasesContentsList;
             visible: (root.isShowingMyItems && filteredPurchasesModel.count !== 0) || (!root.isShowingMyItems && filteredPurchasesModel.count !== 0);
@@ -436,13 +372,12 @@ Rectangle {
             snapMode: ListView.SnapToItem;
             highlightRangeMode: ListView.StrictlyEnforceRange;
             // Anchors
-            anchors.top: root.canRezCertifiedItems ? separator.bottom : cantRezCertified.bottom;
+            anchors.top: separator.bottom;
             anchors.topMargin: 12;
             anchors.left: parent.left;
             anchors.bottom: parent.bottom;
             width: parent.width;
             delegate: PurchasedItem {
-                canRezCertifiedItems: root.canRezCertifiedItems;
                 itemName: title;
                 itemId: id;
                 itemPreviewImageUrl: preview;
@@ -466,7 +401,7 @@ Rectangle {
                     } else if (model.root_file_url.endsWith('.js')) {
                         "app";
                     } else {
-                        "entity";
+                        "unknown";
                     }
                 }
                 anchors.topMargin: 10;
@@ -504,6 +439,21 @@ Rectangle {
                             lightboxPopup.button2text = "CONFIRM";
                             lightboxPopup.button2method = "Commerce.replaceContentSet('" + msg.itemId + "', '" + msg.itemHref + "'); root.visible = false;";
                             lightboxPopup.visible = true;
+                        } else if (msg.method === "showPermissionsExplanation") {
+                            if (msg.itemType === "entity") {
+                                lightboxPopup.titleText = "Rez Certified Permission";
+                                lightboxPopup.bodyText = "You don't have permission to rez certified items in this domain.<br><br>" +
+                                    "Use the <b>GOTO app</b> to visit another domain or <b>go to your own sandbox.</b>";
+                                lightboxPopup.button2text = "OPEN GOTO";
+                                lightboxPopup.button2method = "sendToParent({method: 'purchases_openGoTo'});";
+                            } else if (msg.itemType === "contentSet") {
+                                lightboxPopup.titleText = "Replace Content Permission";
+                                lightboxPopup.bodyText = "You do not have the permission 'Replace Content' in this <b>domain's server settings</b>. The domain owner " +
+                                    "must enable it for you before you can replace content sets in this domain.";
+                            }
+                            lightboxPopup.button1text = "CLOSE";
+                            lightboxPopup.button1method = "root.visible = false;"
+                            lightboxPopup.visible = true;
                         } else if (msg.method === "setFilterText") {
                             filterBar.text = msg.filterText;
                         }
diff --git a/interface/src/scripting/AccountServicesScriptingInterface.h b/interface/src/scripting/AccountServicesScriptingInterface.h
index 012c37305d..cfa51697af 100644
--- a/interface/src/scripting/AccountServicesScriptingInterface.h
+++ b/interface/src/scripting/AccountServicesScriptingInterface.h
@@ -38,7 +38,7 @@ class AccountServicesScriptingInterface : public QObject {
     Q_PROPERTY(QString username READ getUsername NOTIFY myUsernameChanged)
     Q_PROPERTY(bool loggedIn READ loggedIn NOTIFY loggedInChanged)
     Q_PROPERTY(QString findableBy READ getFindableBy WRITE setFindableBy NOTIFY findableByChanged)
-    Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL)
+    Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL CONSTANT)
     
 public:
     static AccountServicesScriptingInterface* getInstance();

From 38bc3120042a61e0a15a5e02a82f489af71b25df Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 13 Feb 2018 11:25:34 -0800
Subject: [PATCH 210/569] faster and const EntityTree::findByID()

---
 libraries/entities/src/EntityTree.cpp      | 21 ++++++++++++++-------
 libraries/entities/src/EntityTree.h        |  6 +++---
 libraries/shared/src/SpatialParentFinder.h |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index bf29f3bec9..60bcc85575 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -913,18 +913,25 @@ void EntityTree::findEntities(RecurseOctreeOperation& elementFilter,
     recurseTreeWithOperation(elementFilter, nullptr);
 }
 
-EntityItemPointer EntityTree::findEntityByID(const QUuid& id) {
+EntityItemPointer EntityTree::findEntityByID(const QUuid& id) const {
     EntityItemID entityID(id);
     return findEntityByEntityItemID(entityID);
 }
 
-EntityItemPointer EntityTree::findEntityByEntityItemID(const EntityItemID& entityID) /*const*/ {
-    EntityItemPointer foundEntity = NULL;
-    EntityTreeElementPointer containingElement = getContainingElement(entityID);
-    if (containingElement) {
-        foundEntity = containingElement->getEntityWithEntityItemID(entityID);
+EntityItemPointer EntityTree::findEntityByEntityItemID(const EntityItemID& entityID) const {
+    EntityItemPointer foundEntity = nullptr;
+    {
+        QReadLocker locker(&_entityMapLock);
+        foundEntity = _entityMap.value(entityID);
+    }
+    if (foundEntity && !foundEntity->getElement()) {
+        // special case to maintain legacy behavior:
+        // if the entity is in the map but not in the tree
+        // then pretend the entity doesn't exist
+        return EntityItemPointer(nullptr);
+    } else {
+        return foundEntity;
     }
-    return foundEntity;
 }
 
 void EntityTree::fixupTerseEditLogging(EntityItemProperties& properties, QList<QString>& changedProperties) {
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 8cb89d6493..90fe342f57 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -132,9 +132,9 @@ public:
     /// \param position point of query in world-frame (meters)
     /// \param targetRadius radius of query (meters)
     EntityItemPointer findClosestEntity(const glm::vec3& position, float targetRadius);
-    EntityItemPointer findEntityByID(const QUuid& id);
-    EntityItemPointer findEntityByEntityItemID(const EntityItemID& entityID);
-    virtual SpatiallyNestablePointer findByID(const QUuid& id) override { return findEntityByID(id); }
+    EntityItemPointer findEntityByID(const QUuid& id) const;
+    EntityItemPointer findEntityByEntityItemID(const EntityItemID& entityID) const;
+    virtual SpatiallyNestablePointer findByID(const QUuid& id) const override { return findEntityByID(id); }
 
     EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID
 
diff --git a/libraries/shared/src/SpatialParentFinder.h b/libraries/shared/src/SpatialParentFinder.h
index aae7d9f040..c19babbc7f 100644
--- a/libraries/shared/src/SpatialParentFinder.h
+++ b/libraries/shared/src/SpatialParentFinder.h
@@ -21,7 +21,7 @@ using SpatiallyNestableWeakPointer = std::weak_ptr<SpatiallyNestable>;
 using SpatiallyNestablePointer = std::shared_ptr<SpatiallyNestable>;
 class SpatialParentTree {
 public:
-    virtual SpatiallyNestablePointer findByID(const QUuid& id) { return nullptr; }
+    virtual SpatiallyNestablePointer findByID(const QUuid& id) const { return nullptr; }
 };
 class SpatialParentFinder : public Dependency {
 

From 7f5f48bca9ad7a3a9f85934888da314d5f91720a Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 13 Feb 2018 11:37:14 -0800
Subject: [PATCH 211/569] Models can now switch between dual quats and matrix
 palette skinning.

but not dynamically, because we still only compile one version of the shader.
---
 libraries/render-utils/src/CauterizedModel.cpp |  9 +++++----
 libraries/render-utils/src/MeshPartPayload.cpp |  3 +++
 libraries/render-utils/src/MeshPartPayload.h   |  1 +
 libraries/render-utils/src/Model.cpp           | 11 ++++++-----
 libraries/render-utils/src/Model.h             |  3 ++-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index f4a745278e..fb1d31d273 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -228,10 +228,11 @@ void CauterizedModel::updateRenderItems() {
                 const auto& cauterizedMeshState = self->getCauterizeMeshState(meshIndex);
 
                 bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
+                bool useDualQuaternionSkinning = self->getUseDualQuaternionSkinning();
 
-                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, meshState, cauterizedMeshState, invalidatePayloadShapeKey,
+                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, meshState, useDualQuaternionSkinning, cauterizedMeshState, invalidatePayloadShapeKey,
                         isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, enableCauterization](CauterizedMeshPartPayload& data) {
-                    if (_useDualQuaternionSkinning) {
+                    if (useDualQuaternionSkinning) {
                         data.updateClusterBuffer(meshState.clusterDualQuaternions,
                                                  cauterizedMeshState.clusterDualQuaternions);
                     } else {
@@ -240,7 +241,7 @@ void CauterizedModel::updateRenderItems() {
                     }
 
                     Transform renderTransform = modelTransform;
-                    if (_useDualQuaternionSkinning) {
+                    if (useDualQuaternionSkinning) {
                         if (meshState.clusterDualQuaternions.size() == 1) {
                             const auto& dq = meshState.clusterDualQuaternions[0];
                             Transform transform(dq.getRotation(),
@@ -256,7 +257,7 @@ void CauterizedModel::updateRenderItems() {
                     data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
                     renderTransform = modelTransform;
-                    if (_useDualQuaternionSkinning) {
+                    if (useDualQuaternionSkinning) {
                         if (cauterizedMeshState.clusterDualQuaternions.size() == 1) {
                             const auto& dq = cauterizedMeshState.clusterDualQuaternions[0];
                             Transform transform(dq.getRotation(),
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 595a4013f1..1585a075f5 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -335,6 +335,9 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
     _shapeID(shapeIndex) {
 
     assert(model && model->isLoaded());
+
+    _useDualQuaternionSkinning = model->getUseDualQuaternionSkinning();
+
     _blendedVertexBuffer = model->_blendedVertexBuffers[_meshIndex];
     auto& modelMesh = model->getGeometry()->getMeshes().at(_meshIndex);
     const Model::MeshState& state = model->getMeshState(_meshIndex);
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 7791390203..220a0bc48c 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -136,6 +136,7 @@ private:
     gpu::BufferPointer _blendedVertexBuffer;
     render::ShapeKey _shapeKey { render::ShapeKey::Builder::invalid() };
     int _layer { render::Item::LAYER_3D };
+    bool _useDualQuaternionSkinning { false };
 };
 
 namespace render {
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 92abac3520..1318299f43 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -281,12 +281,13 @@ void Model::updateRenderItems() {
             const auto& meshState = self->getMeshState(meshIndex);
 
             bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
+            bool useDualQuaternionSkinning = self->getUseDualQuaternionSkinning();
 
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, meshState,
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, meshState, useDualQuaternionSkinning,
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
                                                                   viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD](ModelMeshPartPayload& data) {
-                if (_useDualQuaternions) {
+                if (useDualQuaternionSkinning) {
                     data.updateClusterBuffer(meshState.clusterDualQuaternions);
                 } else {
                     data.updateClusterBuffer(meshState.clusterMatrices);
@@ -294,7 +295,7 @@ void Model::updateRenderItems() {
 
                 Transform renderTransform = modelTransform;
 
-                if (_useDualQuaternions) {
+                if (useDualQuaternionSkinning) {
                     if (meshState.clusterDualQuaternions.size() == 1) {
                         const auto& dq = meshState.clusterDualQuaternions[0];
                         Transform transform(dq.getRotation(),
@@ -386,7 +387,7 @@ bool Model::updateGeometry() {
         const FBXGeometry& fbxGeometry = getFBXGeometry();
         foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
             MeshState state;
-            if (_useDualQuaternions) {
+            if (_useDualQuaternionSkinning) {
                 state.clusterDualQuaternions.resize(mesh.clusters.size());
             } else {
                 state.clusterMatrices.resize(mesh.clusters.size());
@@ -1275,7 +1276,7 @@ void Model::updateRig(float deltaTime, glm::mat4 parentTransform) {
 void Model::computeMeshPartLocalBounds() {
     for (auto& part : _modelMeshRenderItems) {
         const Model::MeshState& state = _meshStates.at(part->_meshIndex);
-        if (_useDualQuaternions) {
+        if (_useDualQuaternionSkinning) {
             part->computeAdjustedLocalBound(state.clusterDualQuaternions);
         } else {
             part->computeAdjustedLocalBound(state.clusterMatrices);
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 84d7dcb7cc..46dbc90324 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -311,6 +311,7 @@ public:
     Q_INVOKABLE MeshProxyList getMeshes() const;
 
     void scaleToFit();
+    bool getUseDualQuaternionSkinning() const { return _useDualQuaternionSkinning; }
 
 public slots:
     void loadURLFinished(bool success);
@@ -414,7 +415,7 @@ protected:
     virtual void createCollisionRenderItemSet();
 
     bool _isWireframe;
-    bool _useDualQuaternionSkinning { false };
+    bool _useDualQuaternionSkinning { true };
 
     // debug rendering support
     int _debugMeshBoxesID = GeometryCache::UNKNOWN_ID;

From f64e5f2444343bd15a05dc0fee9fdb65477efc61 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 13 Feb 2018 13:06:26 -0800
Subject: [PATCH 212/569] Introducing the cull group

---
 .../src/avatars-renderer/Avatar.cpp           |  2 +-
 libraries/render/src/render/CullTask.cpp      | 24 +++++++++++++++++++
 libraries/render/src/render/Item.cpp          | 10 ++++++++
 libraries/render/src/render/Item.h            | 19 +++++++++++++++
 .../src/render/RenderFetchCullSortTask.cpp    |  4 ++--
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 86635cd3bf..9cdd4e2d00 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -50,7 +50,7 @@ const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);
 
 namespace render {
     template <> const ItemKey payloadGetKey(const AvatarSharedPointer& avatar) {
-        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1);
+        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1).withCullGroup();
     }
     template <> const Item::Bound payloadGetBound(const AvatarSharedPointer& avatar) {
         return static_pointer_cast<Avatar>(avatar)->getBounds();
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 4dec3030ef..467cf5adbf 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -227,6 +227,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
+                        if (item.getKey().isCullGroup()) {
+                            item.fetchMetaSubItemBounds(outItems, (*scene));
+                        }
                     }
                 }
             }
@@ -239,6 +242,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
+                        if (item.getKey().isCullGroup()) {
+                            item.fetchMetaSubItemBounds(outItems, (*scene));
+                        }
                     }
                 }
             }
@@ -251,6 +257,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
+                        if (item.getKey().isCullGroup()) {
+                            item.fetchMetaSubItemBounds(outItems, (*scene));
+                        }
                     }
                 }
             }
@@ -263,6 +272,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
+                        if (item.getKey().isCullGroup()) {
+                            item.fetchMetaSubItemBounds(outItems, (*scene));
+                        }
                     }
                 }
             }
@@ -277,6 +289,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
+                        if (item.getKey().isCullGroup()) {
+                            item.fetchMetaSubItemBounds(outItems, (*scene));
+                        }
                     }
                 }
             }
@@ -290,6 +305,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         ItemBound itemBound(id, item.getBound());
                         if (test.solidAngleTest(itemBound.bound)) {
                             outItems.emplace_back(itemBound);
+                            if (item.getKey().isCullGroup()) {
+                                item.fetchMetaSubItemBounds(outItems, (*scene));
+                            }
                         }
                     }
                 }
@@ -304,6 +322,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         ItemBound itemBound(id, item.getBound());
                         if (test.frustumTest(itemBound.bound)) {
                             outItems.emplace_back(itemBound);
+                            if (item.getKey().isCullGroup()) {
+                                item.fetchMetaSubItemBounds(outItems, (*scene));
+                            }
                         }
                     }
                 }
@@ -319,6 +340,9 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         if (test.frustumTest(itemBound.bound)) {
                             if (test.solidAngleTest(itemBound.bound)) {
                                 outItems.emplace_back(itemBound);
+                                if (item.getKey().isCullGroup()) {
+                                    item.fetchMetaSubItemBounds(outItems, (*scene));
+                                }
                             }
                         }
                     }
diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp
index 612dba076b..b8ca091c40 100644
--- a/libraries/render/src/render/Item.cpp
+++ b/libraries/render/src/render/Item.cpp
@@ -113,6 +113,16 @@ const ShapeKey Item::getShapeKey() const {
     return shapeKey;
 }
 
+uint32_t Item::fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) const {
+    ItemIDs subItems;
+    auto numSubs = fetchMetaSubItems(subItems);
+
+    for (auto id : subItems) {
+        subItemBounds.emplace_back(id, scene.getItem(id).getBound());
+    }
+    return numSubs;
+}
+
 namespace render {
     template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload) {
         if (!payload) {
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index ff4b3a0458..3c82e49e8d 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -78,11 +78,13 @@ public:
         INVISIBLE,        // Visible or not in the scene?
         SHADOW_CASTER,    // Item cast shadows
         LAYERED,          // Item belongs to one of the layers different from the default layer
+        CULL_GROUP,       // As a meta item, the culling of my sub items is based solely on my bounding box and my visibility in the
 
         FIRST_TAG_BIT, // 8 Tags available to organize the items and filter them against
         LAST_TAG_BIT = FIRST_TAG_BIT + NUM_TAGS,
 
         __SMALLER,        // Reserved bit for spatialized item to indicate that it is smaller than expected in the cell in which it belongs (probably because it overlaps over several smaller cells)
+        __META_CULLED,    // Reserved bit for sub item of a meta render item to indicate that the culling is tied to the culling of the meta render item, not this one
 
         NUM_FLAGS,      // Not a valid flag
     };
@@ -122,6 +124,7 @@ public:
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
+        Builder& withCullGroup() { _flags.set(CULL_GROUP); return (*this); }
 
         Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
         // Set ALL the tags in one call using the Tag bits
@@ -132,6 +135,9 @@ public:
         static Builder transparentShape() { return Builder().withTypeShape().withTransparent(); }
         static Builder light() { return Builder().withTypeLight(); }
         static Builder background() { return Builder().withViewSpace().withLayered(); }
+
+        // Not meant to be public, part of the inner item / key  / filter system
+        Builder& __withMetaCulled() { _flags.set(__META_CULLED); return (*this); }
     };
     ItemKey(const Builder& builder) : ItemKey(builder._flags) {}
 
@@ -159,6 +165,9 @@ public:
     bool isLayered() const { return _flags[LAYERED]; }
     bool isSpatial() const { return !isLayered(); }
 
+    bool isCullGroup() const { return _flags[CULL_GROUP]; }
+    void setCullGroup(bool cullGroup) { (cullGroup ? _flags.set(CULL_GROUP) : _flags.reset(CULL_GROUP)); }
+
     bool isTag(Tag tag) const { return _flags[FIRST_TAG_BIT + tag]; }
     uint8_t getTagBits() const { return ((_flags.to_ulong() & KEY_TAG_BITS_MASK) >> FIRST_TAG_BIT); }
 
@@ -166,6 +175,9 @@ public:
     bool isSmall() const { return _flags[__SMALLER]; }
     void setSmaller(bool smaller) { (smaller ? _flags.set(__SMALLER) : _flags.reset(__SMALLER)); }
 
+    bool isMetaCulled() const { return _flags[__META_CULLED]; }
+    void setMetaCulled(bool metaCulled) { (metaCulled ? _flags.set(__META_CULLED) : _flags.reset(__META_CULLED)); }
+
     bool operator==(const ItemKey& key) { return (_flags == key._flags); }
     bool operator!=(const ItemKey& key) { return (_flags != key._flags); }
 };
@@ -221,6 +233,12 @@ public:
         Builder& withoutLayered()       { _value.reset(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }
         Builder& withLayered()          { _value.set(ItemKey::LAYERED);  _mask.set(ItemKey::LAYERED); return (*this); }
 
+        Builder& withoutCullGroup() { _value.reset(ItemKey::CULL_GROUP); _mask.set(ItemKey::CULL_GROUP); return (*this); }
+        Builder& withCullGroup() { _value.set(ItemKey::CULL_GROUP);  _mask.set(ItemKey::CULL_GROUP); return (*this); }
+
+        Builder& withoutMetaCulled() { _value.reset(ItemKey::__META_CULLED); _mask.set(ItemKey::__META_CULLED); return (*this); }
+        Builder& withMetaCulled() { _value.set(ItemKey::__META_CULLED);  _mask.set(ItemKey::__META_CULLED); return (*this); }
+
         Builder& withoutTag(ItemKey::Tag tagIndex)    { _value.reset(ItemKey::FIRST_TAG_BIT + tagIndex);  _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
         Builder& withTag(ItemKey::Tag tagIndex)       { _value.set(ItemKey::FIRST_TAG_BIT + tagIndex);  _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
         // Set ALL the tags in one call using the Tag bits and the Tag bits touched
@@ -420,6 +438,7 @@ public:
 
     // Meta Type Interface
     uint32_t fetchMetaSubItems(ItemIDs& subItems) const { return _payload->fetchMetaSubItems(subItems); }
+    uint32_t fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) const;
 
     // Access the status
     const StatusPointer& getStatus() const { return _payload->getStatus(); }
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index 6fb9ba88aa..4fe5e2f1be 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -22,7 +22,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
 
     // CPU jobs:
     // Fetch and cull the items from the scene
-    const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered().withTagBits(tagBits, tagMask);
+    const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered().withoutMetaCulled().withTagBits(tagBits, tagMask);
     const auto spatialFilter = render::Varying(filter);
     const auto fetchInput = FetchSpatialTree::Inputs(filter, glm::ivec2(0,0)).asVarying();
     const auto spatialSelection = task.addJob<FetchSpatialTree>("FetchSceneSelection", fetchInput);
@@ -30,7 +30,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
     const auto culledSpatialSelection = task.addJob<CullSpatialSelection>("CullSceneSelection", cullInputs, cullFunctor, RenderDetails::ITEM);
 
     // Overlays are not culled
-    const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withTagBits(tagBits, tagMask);
+    const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withoutMetaCulled().withTagBits(tagBits, tagMask);
     const auto nonspatialFilter = render::Varying(overlayfilter);
     const auto nonspatialSelection = task.addJob<FetchNonspatialItems>("FetchOverlaySelection", nonspatialFilter);
 

From 8cd00c49d6bf9820a4814bf3afd3edc4b7f56dee Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 13:21:40 -0800
Subject: [PATCH 213/569] PAL: Prevent opening of Availability from WebView

---
 interface/resources/qml/hifi/Pal.qml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 02971cc984..bb54ba9e57 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -48,7 +48,7 @@ Rectangle {
     // The letterbox used for popup messages
     LetterboxMessage {
         id: letterboxMessage;
-        z: 999; // Force the popup on top of everything else
+        z: 998; // Force the popup on top of everything else
     }
     Connections {
         target: GlobalServices
@@ -60,7 +60,7 @@ Rectangle {
     // The ComboDialog used for setting availability
     ComboDialog {
         id: comboDialog;
-        z: 999; // Force the ComboDialog on top of everything else
+        z: 998; // Force the ComboDialog on top of everything else
         dialogWidth: parent.width - 50;
         dialogHeight: parent.height - 100;
     }
@@ -1013,7 +1013,7 @@ Rectangle {
                 }
                 MouseArea {
                     anchors.fill: parent;
-                    enabled: myData.userName !== "Unknown user";
+                    enabled: myData.userName !== "Unknown user" && !userInfoViewer.visible;
                     hoverEnabled: true;
                     onClicked: {
                         popupComboDialog("Set your availability:",
@@ -1044,6 +1044,7 @@ Rectangle {
 
         HifiControls.TabletWebView {
             id: userInfoViewer;
+            z: 999;
             anchors {
                 top: parent.top;
                 bottom: parent.bottom;

From 38290064c1c6510f2d3dd6b2333c03ef7dd2b6a8 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 13 Feb 2018 13:24:08 -0800
Subject: [PATCH 214/569] replace materials by name, hide material mode for now

---
 libraries/entities/src/MaterialEntityItem.cpp |  8 ++-
 libraries/entities/src/MaterialEntityItem.h   | 29 +++++++++--
 libraries/graphics/src/graphics/Material.cpp  |  3 ++
 libraries/graphics/src/graphics/Material.h    |  5 ++
 .../src/model-networking/ModelCache.cpp       |  1 +
 libraries/render-utils/src/Model.cpp          | 24 +++++++--
 libraries/render-utils/src/Model.h            |  3 +-
 scripts/system/html/entityProperties.html     | 34 ++++++++-----
 scripts/system/html/js/entityProperties.js    | 49 ++++++++++++++++---
 9 files changed, 126 insertions(+), 30 deletions(-)

diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index 1ebaa4f21a..fcca2d9803 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -346,8 +346,12 @@ void MaterialEntityItem::applyMaterial() {
 }
 
 void MaterialEntityItem::postAdd() {
-    removeMaterial();
-    applyMaterial();
+    // postAdd is called every time we are added to a new octree cell, but we only need to update the material the first time
+    if (!_hasBeenAddedToOctree) {
+        removeMaterial();
+        applyMaterial();
+        _hasBeenAddedToOctree = true;
+    }
 }
 
 void MaterialEntityItem::preDelete() {
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index dde9b60da9..d015bae681 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -19,7 +19,7 @@ class MaterialEntityItem : public EntityItem {
     using Pointer = std::shared_ptr<MaterialEntityItem>;
 public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    
+
     MaterialEntityItem(const EntityItemID& entityItemID);
 
     ALLOW_INSTANTIATION // This class can be instantiated
@@ -44,9 +44,9 @@ public:
 
 
     virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-                                                ReadBitstreamToTreeParams& args,
-                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-                                                bool& somethingChanged) override;
+                                                 ReadBitstreamToTreeParams& args,
+                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                                 bool& somethingChanged) override;
 
     void debugDump() const override;
 
@@ -89,20 +89,39 @@ public:
     void postParentFixup() override;
 
 private:
+    // URL for this material.  Currently, only JSON format is supported.  Set to "userData" to use the user data to live edit a material.
+    // The following fields are supported in the JSON:
+    // strings:
+    //   name (NOT YET USED)
+    // floats:
+    //   opacity, roughness, metallic, scattering
+    // colors (arrays of 3 floats 0-1.  Optional fourth value in array can be a boolean isSRGB):
+    //   emissive, albedo, fresnel
+    // urls to textures:
+    //   emissiveMap, albedoMap, metallicMap, roughnessMap, normalMap, occlusionMap, lightmapMap, scatteringMap
     QString _materialURL;
+    // Type of material.  "uv" or "projected".  NOT YET IMPLEMENTED, only UV is used
     MaterialMode _materialMode { UV };
+    // Priority for this material when applying it to its parent.  Only the highest priority material will be used.  Materials with the same priority are (essentially) randomly sorted.
+    // Base materials that come with models always have priority 0.
     quint16 _priority { 0 };
+    // An identifier for choosing a submesh or submeshes within a parent.  If in the format "mat::<string>", all submeshes with material name "<string>" will be replaced.  Otherwise,
+    // parentMaterialID will be parsed as an unsigned int (strings not starting with "mat::" will parse to 0), representing the mesh index to modify.
     QString _parentMaterialID { "0" };
+    // Offset position in UV-space of top left of material, (0, 0) to (1, 1)
     glm::vec2 _materialPos { 0, 0 };
+    // How much to scale this material within its parent's UV-space
     glm::vec2 _materialScale { 1, 1 };
+    // How much to rotate this material within its parent's UV-space (degrees)
     float _materialRot { 0 };
-    
+
     NetworkMaterialResourcePointer _networkMaterial;
     QHash<QString, std::shared_ptr<NetworkMaterial>> _materials;
     std::vector<QString> _materialNames;
     QString _currentMaterialName;
 
     bool _retryApply { false };
+    bool _hasBeenAddedToOctree { false };
 
 };
 
diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp
index 7c66c8ab07..2bf58bc6fb 100755
--- a/libraries/graphics/src/graphics/Material.cpp
+++ b/libraries/graphics/src/graphics/Material.cpp
@@ -34,6 +34,7 @@ Material::Material() :
 }
 
 Material::Material(const Material& material) :
+    _name(material._name),
     _key(material._key),
     _textureMaps(material._textureMaps)
 {
@@ -50,6 +51,8 @@ Material::Material(const Material& material) :
 Material& Material::operator= (const Material& material) {
     QMutexLocker locker(&_textureMapsMutex);
 
+    _name = material._name;
+
     _key = (material._key);
     _textureMaps = (material._textureMaps);
     _hasCalculatedTextureInfo = false;
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index 5b3396dfc5..5abc090be3 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -359,6 +359,11 @@ public:
 
     void setTextureTransforms(const Transform& transform);
 
+    const QString& getName() { return _name; }
+
+protected:
+    QString _name { "" };
+
 private:
     mutable MaterialKey _key;
     mutable UniformBufferView _schemaBuffer;
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 739f401ee7..19ee05d1e2 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -619,6 +619,7 @@ NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textur
     graphics::Material(*material._material),
     _textures(MapChannel::NUM_MAP_CHANNELS)
 {
+    _name = material.name;
     if (!material.albedoTexture.filename.isEmpty()) {
         auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
         _albedoTransform = material.albedoTexture.transform;
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 3a9ea45d77..84687a46d0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -828,6 +828,7 @@ void Model::removeFromScene(const render::ScenePointer& scene, render::Transacti
     _modelMeshRenderItemIDs.clear();
     _modelMeshRenderItemsMap.clear();
     _modelMeshRenderItems.clear();
+    _modelMeshMaterialNames.clear();
     _modelMeshRenderItemShapes.clear();
 
     foreach(auto item, _collisionRenderItemsMap.keys()) {
@@ -1456,6 +1457,7 @@ void Model::createVisibleRenderItemSet() {
     Q_ASSERT(_modelMeshRenderItems.isEmpty());
 
     _modelMeshRenderItems.clear();
+    _modelMeshMaterialNames.clear();
     _modelMeshRenderItemShapes.clear();
 
     Transform transform;
@@ -1479,6 +1481,7 @@ void Model::createVisibleRenderItemSet() {
         int numParts = (int)mesh->getNumParts();
         for (int partIndex = 0; partIndex < numParts; partIndex++) {
             _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
+            _modelMeshMaterialNames.push_back(getGeometry()->getShapeMaterial(shapeID)->getName());
             _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i });
             shapeID++;
         }
@@ -1524,11 +1527,24 @@ bool Model::isRenderable() const {
     return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
 }
 
-std::vector<unsigned int> Model::getMeshIDsFromMaterialID(const QString& parentMaterialID) {
-    std::vector<unsigned int> toReturn;
-    // TODO: first, try to find all meshes with materials that match parentMaterialID as a string
+std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterialID) {
+    // try to find all meshes with materials that match parentMaterialID as a string
     // if none, return parentMaterialID as a uint
-    toReturn.push_back(parentMaterialID.toUInt());
+    std::vector<unsigned int> toReturn;
+    const QString MATERIAL_NAME_PREFIX = "mat::";
+    if (parentMaterialID.startsWith(MATERIAL_NAME_PREFIX)) {
+        parentMaterialID.replace(0, MATERIAL_NAME_PREFIX.size(), QString(""));
+        for (int i = 0; i < _modelMeshMaterialNames.size(); i++) {
+            if (_modelMeshMaterialNames[i] == parentMaterialID) {
+                toReturn.push_back(i);
+            }
+        }
+    }
+
+    if (toReturn.empty()) {
+        toReturn.push_back(parentMaterialID.toUInt());
+    }
+
     return toReturn;
 }
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index b4152324bc..67bc646473 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -438,6 +438,7 @@ protected:
     render::ItemIDs _modelMeshRenderItemIDs;
     using ShapeInfo = struct { int meshIndex; };
     std::vector<ShapeInfo> _modelMeshRenderItemShapes;
+    std::vector<QString> _modelMeshMaterialNames;
 
     bool _addedToScene { false }; // has been added to scene
     bool _needsFixupInScene { true }; // needs to be removed/re-added to scene
@@ -472,7 +473,7 @@ private:
 
     void calculateTextureInfo();
 
-    std::vector<unsigned int> getMeshIDsFromMaterialID(const QString& parentMaterialID);
+    std::vector<unsigned int> getMeshIDsFromMaterialID(QString parentMaterialID);
 };
 
 Q_DECLARE_METATYPE(ModelPointer)
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 5eedd1c7e4..a70e42a7e1 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -772,12 +772,19 @@
                 </div>
             </fieldset>
             <fieldset class="minor">
-                <div class="material-group material-section property dropdown">
-                    <label>Material mode </label>
-                    <select name="SelectMaterialMode" id="property-material-mode">
-                        <option value="uv">UV space material</option>
-                        <option value="projected">3D projected material</option>
-                    </select>
+                <div class="material-group material-section property text" id="property-parent-material-id-string-container">
+                    <label for="property-parent-material-id-string">Material Name to Replace </label>
+                    <input type="text" id="property-parent-material-id-string">
+                </div>
+
+                <div class="material-group material-section property number" id="property-parent-material-id-number-container">
+                    <label for="property-parent-material-id-number">Submesh to Replace </label>
+                    <input type="number" min="0" step="1" value="0" id="property-parent-material-id-number">
+                </div>
+
+                <div class="material-group material-section property checkbox">
+                    <input type="checkbox" id="property-parent-material-id-checkbox">
+                    <label for="property-parent-material-id-checkbox">Select Submesh</label>
                 </div>
 
                 <div class="material-group material-section property number">
@@ -785,12 +792,17 @@
                     <input type="number" id="property-priority" min="0">
                 </div>
 
-                <div class="material-group material-section property text">
-                    <label>Parent Material ID </label>
-                    <input type="text" id="property-parent-material-id">
-                </div>
-
                 <fieldset>
+                    <!-- TODO: support 3D projected materials
+                    <div class="material-group material-section property dropdown">
+                        <label>Material mode </label>
+                        <select name="SelectMaterialMode" id="property-material-mode">
+                            <option value="uv">UV space material</option>
+                            <option value="projected">3D projected material</option>
+                        </select>
+                    </div>
+                    -->
+
                     <div class="material-group material-section property xy fstuple">
                         <label>Material Position </label>
                         <div class="tuple">
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 01ec4ae283..d6acf4d353 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -33,6 +33,8 @@ var KEY_P = 80; // Key code for letter p used for Parenting hotkey.
 var colorPickers = [];
 var lastEntityID = null;
 
+var MATERIAL_PREFIX_STRING = "mat::";
+
 function debugPrint(message) {
     EventBridge.emitWebEvent(
         JSON.stringify({
@@ -509,6 +511,18 @@ function clearSelection() {
     }
 }
 
+function showParentMaterialIDBox(number, elNumber, elString) {
+    if (number) {
+        $('#property-parent-material-id-number-container').show();
+        $('#property-parent-material-id-string-container').hide();
+        elString.value = "";
+    } else {
+        $('#property-parent-material-id-string-container').show();
+        $('#property-parent-material-id-number-container').hide();
+        elNumber.value = 0;
+    }
+}
+
 function loaded() {
     openEventBridge(function() {
 
@@ -632,9 +646,11 @@ function loaded() {
         var elModelOriginalTextures = document.getElementById("property-model-original-textures");
 
         var elMaterialURL = document.getElementById("property-material-url");
-        var elMaterialMode = document.getElementById("property-material-mode");
+        //var elMaterialMode = document.getElementById("property-material-mode");
         var elPriority = document.getElementById("property-priority");
-        var elParentMaterialID = document.getElementById("property-parent-material-id");
+        var elParentMaterialIDString = document.getElementById("property-parent-material-id-string");
+        var elParentMaterialIDNumber = document.getElementById("property-parent-material-id-number");
+        var elParentMaterialIDCheckbox = document.getElementById("property-parent-material-id-checkbox");
         var elMaterialPosX = document.getElementById("property-material-pos-x");
         var elMaterialPosY = document.getElementById("property-material-pos-y");
         var elMaterialScaleX = document.getElementById("property-material-scale-x");
@@ -1127,10 +1143,18 @@ function loaded() {
                             elZTextureURL.value = properties.zTextureURL;
                         } else if (properties.type === "Material") {
                             elMaterialURL.value = properties.materialURL;
-                            elMaterialMode.value = properties.materialMode;
-                            setDropdownText(elMaterialMode);
+                            //elMaterialMode.value = properties.materialMode;
+                            //setDropdownText(elMaterialMode);
                             elPriority.value = properties.priority;
-                            elParentMaterialID.value = properties.parentMaterialID;
+                            if (properties.parentMaterialID.startsWith(MATERIAL_PREFIX_STRING)) {
+                                elParentMaterialIDString.value = properties.parentMaterialID.replace(MATERIAL_PREFIX_STRING, "");
+                                showParentMaterialIDBox(false, elParentMaterialIDNumber, elParentMaterialIDString);
+                                elParentMaterialIDCheckbox.checked = false;
+                            } else {
+                                elParentMaterialIDNumber.value = parseInt(properties.parentMaterialID);
+                                showParentMaterialIDBox(true, elParentMaterialIDNumber, elParentMaterialIDString);
+                                elParentMaterialIDCheckbox.checked = true;
+                            }
                             elMaterialPosX.value = properties.materialPos.x.toFixed(4);
                             elMaterialPosY.value = properties.materialPos.y.toFixed(4);
                             elMaterialScaleX.value = properties.materialScale.x.toFixed(4);
@@ -1407,9 +1431,20 @@ function loaded() {
         elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
 
         elMaterialURL.addEventListener('change', createEmitTextPropertyUpdateFunction('materialURL'));
-        elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
+        //elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
         elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority', 0));
-        elParentMaterialID.addEventListener('change', createEmitTextPropertyUpdateFunction('parentMaterialID'));
+
+        elParentMaterialIDString.addEventListener('change', function () { updateProperty("parentMaterialID", MATERIAL_PREFIX_STRING + this.value); });
+        elParentMaterialIDNumber.addEventListener('change', function () { updateProperty("parentMaterialID", this.value); });
+        elParentMaterialIDCheckbox.addEventListener('change', function () {
+            if (this.checked) {
+                updateProperty("parentMaterialID", elParentMaterialIDNumber.value);
+                showParentMaterialIDBox(true, elParentMaterialIDNumber, elParentMaterialIDString);
+            } else {
+                updateProperty("parentMaterialID", MATERIAL_PREFIX_STRING + elParentMaterialIDString.value);
+                showParentMaterialIDBox(false, elParentMaterialIDNumber, elParentMaterialIDString);
+            }
+        });
 
         var materialPosChangeFunction = createEmitVec2PropertyUpdateFunction('materialPos', elMaterialPosX, elMaterialPosY);
         elMaterialPosX.addEventListener('change', materialPosChangeFunction);

From 3e41229e8c674c1a568c16b4b199c5a0f1d8632f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 13:30:17 -0800
Subject: [PATCH 215/569] Commerce: Fix wrap mode for very long P2P memos

---
 interface/resources/qml/hifi/commerce/wallet/WalletHome.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index b980c13e3c..83c1a2035d 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -391,7 +391,7 @@ Item {
                             anchors.topMargin: 15;
                             width: 118;
                             height: paintedHeight;
-                            wrapMode: Text.WordWrap;
+                            wrapMode: Text.Wrap;
                             // Alignment
                             horizontalAlignment: Text.AlignRight;
                         }
@@ -408,7 +408,7 @@ Item {
                             height: paintedHeight;
                             color: model.status === "invalidated" ? hifi.colors.redAccent : hifi.colors.baseGrayHighlight;
                             linkColor: hifi.colors.blueAccent;
-                            wrapMode: Text.WordWrap;
+                            wrapMode: Text.Wrap;
                             font.strikeout: model.status === "invalidated";
 
                             onLinkActivated: {

From 1b7253dc7f8d20d8e2acc5a66c1d752cf556061f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 13:54:50 -0800
Subject: [PATCH 216/569] Already Owned endpoint

---
 interface/src/commerce/Ledger.cpp | 11 +++++++++++
 interface/src/commerce/Ledger.h   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 10ddd4c110..f319881035 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -336,3 +336,14 @@ void Ledger::transferHfcToUsername(const QString& hfc_key, const QString& userna
     auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
     signedSend("transaction", transactionString, hfc_key, "transfer_hfc_to_user", "transferHfcToUsernameSuccess", "transferHfcToUsernameFailure");
 }
+
+void Ledger::alreadyOwnedSuccess(QNetworkReply& reply) { apiResponse("alreadyOwned", reply); }
+void Ledger::alreadyOwnedFailure(QNetworkReply& reply) { failResponse("alreadyOwned", reply); }
+void Ledger::alreadyOwned(const QString& marketplaceId) {
+    auto wallet = DependencyManager::get<Wallet>();
+    QString endpoint = "already_owned";
+    QJsonObject request;
+    request["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
+    request["marketplace_item_id"] = marketplaceId;
+    send(endpoint, "alreadyOwnedSuccess", "alreadyOwnedFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::None, request);
+}
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 1b56c893ab..ac9fe950d9 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -35,6 +35,7 @@ public:
     void certificateInfo(const QString& certificateId);
     void transferHfcToNode(const QString& hfc_key, const QString& nodeID, const int& amount, const QString& optionalMessage);
     void transferHfcToUsername(const QString& hfc_key, const QString& username, const int& amount, const QString& optionalMessage);
+    void alreadyOwned(const QString& marketplaceId);
 
     enum CertificateStatus {
         CERTIFICATE_STATUS_UNKNOWN = 0,
@@ -55,6 +56,7 @@ signals:
     void certificateInfoResult(QJsonObject result);
     void transferHfcToNodeResult(QJsonObject result);
     void transferHfcToUsernameResult(QJsonObject result);
+    void alreadyOwnedResult(QJsonObject result);
 
     void updateCertificateStatus(const QString& certID, uint certStatus);
 
@@ -79,6 +81,8 @@ public slots:
     void transferHfcToNodeFailure(QNetworkReply& reply);
     void transferHfcToUsernameSuccess(QNetworkReply& reply);
     void transferHfcToUsernameFailure(QNetworkReply& reply);
+    void alreadyOwnedSuccess(QNetworkReply& reply);
+    void alreadyOwnedFailure(QNetworkReply& reply);
 
 private:
     QJsonObject apiResponse(const QString& label, QNetworkReply& reply);

From 119a7554ee663cb8a01675d7f62fd9a875791354 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 13 Feb 2018 14:33:15 -0800
Subject: [PATCH 217/569] Prevent add the same tablet url app to the tabletApps
 list

---
 .../resources/qml/hifi/tablet/TabletRoot.qml  | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index e7614e11b7..8406f23ab2 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -18,7 +18,7 @@ Item {
     signal showDesktop();
     property bool shown: true
     property int currentApp: -1;
-    property alias tabletApps: tabletApps 
+    property alias tabletApps: tabletApps
 
     function setOption(value) {
         option = value;
@@ -44,7 +44,7 @@ Item {
     Component { id: fileDialogBuilder; TabletFileDialog { } }
     function fileDialog(properties) {
         openModal = fileDialogBuilder.createObject(tabletRoot, properties);
-        return openModal; 
+        return openModal;
     }
 
     Component { id: assetDialogBuilder; TabletAssetDialog { } }
@@ -66,6 +66,16 @@ Item {
         return false;
     }
 
+    function isUrlLoaded(url) {
+        if (currentApp >= 0) {
+            var currentAppUrl = tabletApps.get(currentApp).appUrl;
+            if (currentAppUrl === url) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     function loadSource(url) {
         tabletApps.clear();
         tabletApps.append({"appUrl": url, "isWebUrl": false, "scriptUrl": "", "appWebUrl": ""});
@@ -73,23 +83,27 @@ Item {
     }
 
     function loadQMLOnTop(url) {
-        tabletApps.append({"appUrl": url, "isWebUrl": false, "scriptUrl": "", "appWebUrl": ""});
-        loader.load(tabletApps.get(currentApp).appUrl, function(){
-	        if (loader.item.hasOwnProperty("gotoPreviousApp")) {
-	            loader.item.gotoPreviousApp = true;
-	        }
-        }) 
+        if (!isUrlLoaded(url)) {
+            tabletApps.append({"appUrl": url, "isWebUrl": false, "scriptUrl": "", "appWebUrl": ""});
+            loader.load(tabletApps.get(currentApp).appUrl, function(){
+	            if (loader.item.hasOwnProperty("gotoPreviousApp")) {
+	                loader.item.gotoPreviousApp = true;
+	            }
+            });
+        }
     }
 
     function loadWebContent(source, url, injectJavaScriptUrl) {
-        tabletApps.append({"appUrl": source, "isWebUrl": true, "scriptUrl": injectJavaScriptUrl, "appWebUrl": url});
-        loader.load(source, function() {
-            loader.item.scriptURL = injectJavaScriptUrl;
-            loader.item.url = url;
-            if (loader.item.hasOwnProperty("gotoPreviousApp")) {
-                loader.item.gotoPreviousApp = true;
-            }
-        });
+        if (!isUrlLoaded(url)) {
+            tabletApps.append({"appUrl": source, "isWebUrl": true, "scriptUrl": injectJavaScriptUrl, "appWebUrl": url});
+            loader.load(source, function() {
+                loader.item.scriptURL = injectJavaScriptUrl;
+                loader.item.url = url;
+                if (loader.item.hasOwnProperty("gotoPreviousApp")) {
+                    loader.item.gotoPreviousApp = true;
+                }
+            });
+        }
     }
 
     function loadWebBase(url, injectJavaScriptUrl) {
@@ -99,7 +113,7 @@ Item {
     function loadTabletWebBase(url, injectJavaScriptUrl) {
         loadWebContent("hifi/tablet/BlocksWebView.qml", url, injectJavaScriptUrl);
     }
-        
+
     function returnToPreviousApp() {
         tabletApps.remove(currentApp);
         var isWebPage = tabletApps.get(currentApp).isWebUrl;
@@ -190,19 +204,19 @@ Item {
     	property string source: "";
     	property var item: null;
     	signal loaded;
-    	
+
 		onWidthChanged: {
     		if (loader.item) {
 	        	loader.item.width = loader.width;
     		}
 		}
-    	
+
     	onHeightChanged: {
     		if (loader.item) {
 	        	loader.item.height = loader.height;
     		}
 		}
-    	
+
     	function load(newSource, callback) {
             if (loader.source == newSource) {
                 loader.loaded();
@@ -226,18 +240,18 @@ Item {
 	                loader.item.setRootMenu(tabletRoot.rootMenu, tabletRoot.subMenu);
 	            }
 	            loader.item.forceActiveFocus();
-	
+
 	            if (openModal) {
 	                openModal.canceled();
 	                openModal.destroy();
 	                openModal = null;
 	            }
-	
+
 	            if (openBrowser) {
 	                openBrowser.destroy();
 	                openBrowser = null;
 	            }
-	            
+
 	            if (callback) {
 	            	callback();
 	            }

From 69a06bf1b75ebecc57d61899b509e7fbd86325da Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 14:42:03 -0800
Subject: [PATCH 218/569] Wrong fonts file

---
 interface/resources/fonts/hifi-glyphs.ttf | Bin 31500 -> 32536 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 8907cf7858dd304cdad024bfa1ff4ca5cd94caf9..8db0377f88864810e7f893132449ad8e258e68cd 100644
GIT binary patch
delta 1476
zcmXw3TWl0n82<h<XU>_O*-HyEv#{Om?#?c=y-?cjWd<lMmq3k53l>2_BDjG<32kZU
z0)>aJHxg7(5MvC2Cf=S*R2sY_24jqXMB|I%3mOul55AC?Xm~JSX2Fx3|Cay%a{mAP
z`A+;pZ``Fi2tWi+L&3(u!N-S=9DDY4VD?`C$%odi8^k3DVD<)p%!W<f#SLGsuK~0b
zz?Pj8)u}`4u2%te17MSTs?$^V?m+=&e*&QG89%by+V}oBKuiHs$HzviyP~@@-v9{k
zys@#-dX@LkO@K@Q`LT)GOy=l<=K=Z{ppNnVJF8!<{B=8^t_LVTQJtB>ZQ2gd(%?ap
z)rrwRmtNcg9J&M0+|>T*nl*CvQDEjnK(sZQBOv{We{4r=#osU(f^+@d+qdp(cKg<=
z)K90+4A7I*J$H_LTDA;>=)+(mQvn(`*?<C#L1|b?a9SVq2o3i!XK!}Taiy2!NxY0#
zaB8m1^Gx%Ze_<(Kx^`}>_+q>s!7})Cg)YND5)L}i3lDu*g@>^Lo3Ra(032c3rFdn4
zDrMQPx&_a-P3acAf?KfTLYmUeRXpF8o^QuRp%TObQSf}rk!9a5Sx%7d3+cw~cwkvU
zbuLv`OJ-b1w^9x&Y2>|w2S?b*^k$}63m3$#gw{MSS$3isqcxXH>r0$@wz=quMe`jy
zo}E8q<};moHsiMF-PuZOQzFrvUy*Mf&sp;Zh;%1r#TVK-U9NplBcj^KrmZRwF`i4R
zddIdlLv20YUQfn4#Ar4vW=PF_=d=si^Vd+igWnk<-tk*UdT2`~tIqK33!SlyE52^e
zH}%NqP_m0{=ZuKdR90&4;w5c5&jz0p!XO6eGrELkw4)cxu?CMcW;hEhD!8)XN|7cr
zO?Ij1dxc!RQqDOk$~l(VN0wPC_EV`?DaW019~I3`*3g!)oqj48Q&fJSrBiSVOUU=q
zWXEkO0^c8CzUO-lS4iOnA@6=9Mncl38#R3>r0e>S+^9)iM6V{pM!m%_T8wbgXw&sB
zUH`pJ*V}cr!!%8Em@}dCCMji9Xi_LCu1LXDm1$fPn&cr><8Nt9*H}bXgeKLPuIwAu
z*l;MMhc@VPScs;Z0esj<8b;Cx+ooyi`ZJ-nknaB6ka<>Db+t)I5!Hm0%G-+2nBYtZ
zO-iYTxW>;jp(zoK>zW#hX=<?gefWs3(R1iTH<km7Tq$JEv2qo+;N~1Dq}9pXV9;?p
zZuhZlA1it#FPL_vRLND!zE>*7ZHunSh*mcwTfh?e)obz#S(M3WB&v#N(>yK|BA1Af
zWU**?{K}OpR-#-<SU-d%XSBK_)76#kT*U;BM1){OOv-R7rM9+Yvn{P)7{n-Dq_eQF
z81S4FnRY2#^!lkB*tx9JPrg-fw*>28mx?QCfC@_}MwPPjRKki<d(=vV?*0-wpEb0Q
z;i-yHJWgCOcqVZxG90z6=x`)5910D8{$@)^H)M~Z^e6`B#9Pir=9;F%Bzw_=E)>t?
zY8||{r>l78vD#~NdhU-}f;4)OUZN9p^1`8Sc{)5gd1&u}{gV@;leKAnxH`FuA0Dk9
nkb5VmYt`}bGgptM3a3EezyoRtC>r1Qzw_gL&ibFbZr}P3tv~vd

delta 456
zcmYL`ze^hd6vsdB?ivGWt%HPM4=mM1Mf4Q>MRcjgr6GbPb*Xy9=nXkNNR&$k^$&<k
zBeX*&|AN9{NsmsYLWfcvs#6EYf*>vx3S#6gf)5_=7w`MNU*3mXsb0$t0z6?CmAO>v
zb-HZFZ=iAo=(E!^DSRSOIRTz$<_Cr{Utc*O3qUq!o6cs>=>RCdL0Mfhi%z3~3Y8x~
zbgfWct-r~%Kx6?5bt`YKw5AVxfIq;9W#xBFZBWiZ+JSD%F1ekTi8hc=ATJ6VIdg8@
zw%}0`M7K@X;X)Qc#sWg?rk%f-_?(4eu;V!!#nQ^lLmf)rAtIqTfoI>cf0v#n{}EFN
z?CiZCZ$`zBzmrMXt4+yU>GM9ys2IUSy>~r?K$cO%Oh=RHKpRn-Slj1)-ec7eZ$|4<
zJSXy{;Qil<Ny{(>{TQ{F+p7&5{YGuv-IqP@m)jxURryGp4VfT~21*Fs3M9g2P^(lC
UG`K$#yosNa2ggBt;P1!p0BG@JE&u=k


From a477a3da7004f3c3d3a0b14ffb1f95536f8bccad Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 13 Feb 2018 15:04:31 -0800
Subject: [PATCH 219/569] Done with My Purchases flow for now

---
 .../qml/hifi/commerce/common/CommerceLightbox.qml    |  4 ++++
 .../qml/hifi/commerce/purchases/Purchases.qml        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 8b0ec17232..b24af716ad 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -100,6 +100,10 @@ Rectangle {
             size: 20;
             verticalAlignment: Text.AlignTop;
             wrapMode: Text.WordWrap;
+
+            onLinkActivated: {
+                sendToParent({ method: 'commerceLightboxLinkClicked', linkUrl: link });
+            }
         }
 
         Item {
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index daa23d29c8..91fed207bc 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -147,7 +147,11 @@ Rectangle {
 
         Connections {
             onSendToParent: {
-                sendToScript(msg);
+                if (msg.method === 'commerceLightboxLinkClicked') {
+                    Qt.openUrlExternally(msg.linkUrl);
+                } else {
+                    sendToScript(msg);
+                }
             }
         }
     }
@@ -433,7 +437,11 @@ Rectangle {
                             lightboxPopup.visible = true;
                         } else if (msg.method === "showReplaceContentLightbox") {
                             lightboxPopup.titleText = "Replace Content";
-                            lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain.";
+                            lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
+                                "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
+                                "For more information about backing up and restoring content, " +
+                                "<a href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content'>" +
+                                "click here to open info on your desktop browser.";
                             lightboxPopup.button1text = "CANCEL";
                             lightboxPopup.button1method = "root.visible = false;"
                             lightboxPopup.button2text = "CONFIRM";

From 23a29b8d4b18b07f44a667542f20c210131be1d8 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Tue, 13 Feb 2018 16:16:04 -0800
Subject: [PATCH 220/569] Added don't castr shadow flag to entity and shape
 classes.

---
 libraries/entities/src/EntityItemProperties.h |  1 +
 .../src/EntityItemPropertiesDefaults.h        |  1 +
 libraries/entities/src/EntityPropertyFlags.h  |  1 +
 libraries/entities/src/ModelEntityItem.cpp    | 35 +++++++++++++++++--
 libraries/entities/src/ModelEntityItem.h      |  5 +++
 libraries/entities/src/ShapeEntityItem.cpp    | 29 +++++++++++++++
 libraries/entities/src/ShapeEntityItem.h      |  5 +++
 .../render-utils/src/RenderShadowTask.cpp     |  4 +--
 libraries/render/src/render/Item.h            |  4 +++
 9 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 3e0770f386..731bb9390e 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -128,6 +128,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
+    DEFINE_PROPERTY(PROP_DONT_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW);
     DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
     DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
     DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index eb09a64628..181ba9bbf2 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,6 +46,7 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
+const bool ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW { false };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
 const quint64 ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP = 0;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index ffcd4f64cb..fbc4199097 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -31,6 +31,7 @@ enum EntityPropertyList {
     PROP_SCRIPT,
 
     // these properties are supported by some derived classes
+    PROP_DONT_CAST_SHADOW,
     PROP_COLOR,
 
     // these are used by models only
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 5d33e4c047..73cf29bce1 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -53,6 +53,8 @@ void ModelEntityItem::setTextures(const QString& textures) {
 
 EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
+
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(modelURL, getModelURL);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL);
@@ -64,6 +66,7 @@ EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredP
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(jointTranslations, getJointTranslations);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(relayParentJoints, getRelayParentJoints);
     _animationProperties.getProperties(properties);
+
     return properties;
 }
 
@@ -71,6 +74,7 @@ bool ModelEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = false;
     somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(modelURL, setModelURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL);
@@ -112,6 +116,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     const unsigned char* dataAt = data;
     bool animationPropertiesChanged = false;
 
+    READ_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_MODEL_URL, QString, setModelURL);
     READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
@@ -148,6 +153,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
+    requestedProperties += PROP_DONT_CAST_SHADOW;
     requestedProperties += PROP_MODEL_URL;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_TEXTURES;
@@ -172,6 +178,7 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
     bool successPropertyFits = true;
 
+    APPEND_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, getCanCastShadow());
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_MODEL_URL, getModelURL());
     APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, getCompoundShapeURL());
@@ -191,8 +198,6 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_JOINT_TRANSLATIONS, getJointTranslations());
 }
 
-
-
 // added update function back for property fix
 void ModelEntityItem::update(const quint64& now) {
 
@@ -290,6 +295,7 @@ void ModelEntityItem::updateFrameCount() {
 }
 
 void ModelEntityItem::debugDump() const {
+    qCDebug(entities) << "    can cast shadow" << getCanCastShadow();
     qCDebug(entities) << "ModelEntityItem id:" << getEntityItemID();
     qCDebug(entities) << "    edited ago:" << getEditedAgo();
     qCDebug(entities) << "    position:" << getWorldPosition();
@@ -571,15 +577,16 @@ QVector<bool> ModelEntityItem::getJointTranslationsSet() const {
     return result;
 }
 
-
 xColor ModelEntityItem::getXColor() const { 
     xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; 
 }
+
 bool ModelEntityItem::hasModel() const { 
     return resultWithReadLock<bool>([&] {
         return !_modelURL.isEmpty();
     });
 }
+
 bool ModelEntityItem::hasCompoundShapeURL() const {
     return !_compoundShapeURL.get().isEmpty();
 }
@@ -722,3 +729,25 @@ bool ModelEntityItem::isAnimatingSomething() const {
             (_animationProperties.getFPS() != 0.0f);
         });
 }
+
+bool ModelEntityItem::getCanCastShadow() const {
+    bool result;
+    withReadLock([&] {
+        result = _canCastShadow;
+    });
+    return result;
+}
+
+void ModelEntityItem::setCanCastShadow(bool value) {
+    bool changed = false;
+    withWriteLock([&] {
+        if (_canCastShadow != value) {
+            changed = true;
+            _canCastShadow = value;
+        }
+    });
+
+    if (changed) {
+        emit requestRenderUpdate();
+    }
+}
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index c2109ba51f..ec65876d84 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -131,6 +131,9 @@ public:
     QVector<glm::vec3> getJointTranslations() const;
     QVector<bool> getJointTranslationsSet() const;
 
+    bool getCanCastShadow() const;
+    void setCanCastShadow(bool value);
+
 private:
     void setAnimationSettings(const QString& value); // only called for old bitstream format
     ShapeType computeTrueShapeType() const;
@@ -171,6 +174,8 @@ protected:
 
     ShapeType _shapeType = SHAPE_TYPE_NONE;
 
+    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW };
+
 private:
     uint64_t _lastAnimated{ 0 };
     AnimationPropertyGroup _previousAnimationProperties;
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index cbcfcaaa1d..2fbb6702f2 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -91,6 +91,8 @@ EntityItemProperties ShapeEntityItem::getProperties(EntityPropertyFlags desiredP
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     properties.setColor(getXColor());
     properties.setShape(entity::stringFromShape(getShape()));
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
+    
     return properties;
 }
 
@@ -129,6 +131,7 @@ bool ShapeEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(alpha, setAlpha);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -154,6 +157,7 @@ int ShapeEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_SHAPE, QString, setShape);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
+    READ_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, bool, setCanCastShadow);
 
     return bytesRead;
 }
@@ -165,6 +169,8 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_SHAPE;
     requestedProperties += PROP_COLOR;
     requestedProperties += PROP_ALPHA;
+    requestedProperties += PROP_DONT_CAST_SHADOW;
+
     return requestedProperties;
 }
 
@@ -180,6 +186,7 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
+    APPEND_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, getCanCastShadow());
 }
 
 void ShapeEntityItem::setColor(const rgbColor& value) {
@@ -259,6 +266,7 @@ void ShapeEntityItem::debugDump() const {
     qCDebug(entities) << "         dimensions:" << debugTreeVector(getScaledDimensions());
     qCDebug(entities) << "      getLastEdited:" << debugTime(getLastEdited(), now);
     qCDebug(entities) << "SHAPE EntityItem Ptr:" << this;
+    qCDebug(entities) << "     can cast shadow" << getCanCastShadow();
 }
 
 void ShapeEntityItem::computeShapeInfo(ShapeInfo& info) {
@@ -362,3 +370,24 @@ ShapeType ShapeEntityItem::getShapeType() const {
     return _collisionShapeType;
 }
 
+bool ShapeEntityItem::getCanCastShadow() const {
+    bool result;
+    withReadLock([&] {
+        result = _canCastShadow;
+    });
+    return result;
+}
+
+void ShapeEntityItem::setCanCastShadow(bool value) {
+    bool changed = false;
+    withWriteLock([&] {
+        if (_canCastShadow != value) {
+            changed = true;
+            _canCastShadow = value;
+        }
+    });
+
+    if (changed) {
+        emit requestRenderUpdate();
+    }
+}
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 84ce1ce57e..63c4eb58c5 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -101,6 +101,9 @@ public:
     virtual void computeShapeInfo(ShapeInfo& info) override;
     virtual ShapeType getShapeType() const override;
 
+    bool getCanCastShadow() const;
+    void setCanCastShadow(bool value);
+
 protected:
 
     float _alpha { 1 };
@@ -111,6 +114,8 @@ protected:
     //! prior functionality where new or unsupported shapes are treated as
     //! ellipsoids.
     ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
+
+    bool _canCastShadow { ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW };
 };
 
 #endif // hifi_ShapeEntityItem_h
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 53c109dc9f..eef641e369 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -224,7 +224,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withNoShadowCaster();
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
@@ -398,7 +398,7 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withShadowCaster();
+        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withNoShadowCaster();
 
         // Set the keylight render args
         auto& cascade = globalShadow->getCascade(_cascadeIndex);
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index ff4b3a0458..7713c1ea7e 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -120,7 +120,10 @@ public:
         Builder& withDynamic() { _flags.set(DYNAMIC); return (*this); }
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
+
+        Builder& withNoShadowCaster() { _flags.reset(SHADOW_CASTER); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
+
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
 
         Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
@@ -155,6 +158,7 @@ public:
     bool isInvisible() const { return _flags[INVISIBLE]; }
 
     bool isShadowCaster() const { return _flags[SHADOW_CASTER]; }
+    bool isNotShadowCaster() const { return !_flags[SHADOW_CASTER]; }
 
     bool isLayered() const { return _flags[LAYERED]; }
     bool isSpatial() const { return !isLayered(); }

From d2c199104e715b33b4ef59922c1e52a010e425b7 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Tue, 13 Feb 2018 17:47:49 -0800
Subject: [PATCH 221/569] Avatars use Dual Quaternion Skinning and Model
 Entities do not.

---
 .../src/avatars-renderer/SkeletonModel.cpp    |  2 +
 .../render-utils/src/MeshPartPayload.cpp      |  4 +
 libraries/render-utils/src/MeshPartPayload.h  |  2 +-
 libraries/render-utils/src/Model.h            |  2 +-
 .../render-utils/src/RenderPipelines.cpp      | 79 ++++++++++++++++++-
 libraries/render-utils/src/Skinning.slh       | 14 ++--
 libraries/render-utils/src/skin_model.slv     |  1 +
 libraries/render-utils/src/skin_model_dq.slv  | 52 ++++++++++++
 .../render-utils/src/skin_model_fade.slv      |  1 +
 .../render-utils/src/skin_model_fade_dq.slv   | 54 +++++++++++++
 .../src/skin_model_normal_map.slv             |  1 +
 .../src/skin_model_normal_map_dq.slv          | 61 ++++++++++++++
 .../src/skin_model_normal_map_fade.slv        |  1 +
 .../src/skin_model_normal_map_fade_dq.slv     | 61 ++++++++++++++
 .../render-utils/src/skin_model_shadow.slv    |  1 +
 .../render-utils/src/skin_model_shadow_dq.slv | 30 +++++++
 .../src/skin_model_shadow_fade.slv            |  1 +
 .../src/skin_model_shadow_fade_dq.slv         | 33 ++++++++
 libraries/render/src/render/ShapePipeline.h   |  5 ++
 19 files changed, 392 insertions(+), 13 deletions(-)
 create mode 100644 libraries/render-utils/src/skin_model_dq.slv
 create mode 100644 libraries/render-utils/src/skin_model_fade_dq.slv
 create mode 100644 libraries/render-utils/src/skin_model_normal_map_dq.slv
 create mode 100644 libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
 create mode 100644 libraries/render-utils/src/skin_model_shadow_dq.slv
 create mode 100644 libraries/render-utils/src/skin_model_shadow_fade_dq.slv

diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 1112ccde60..b2a494230b 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -31,6 +31,8 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) :
     _defaultEyeModelPosition(glm::vec3(0.0f, 0.0f, 0.0f)),
     _headClipDistance(DEFAULT_NEAR_CLIP)
 {
+    // SkeletonModels, and by extention Avatars, use Dual Quaternion skinning.
+    _useDualQuaternionSkinning = true;
     assert(_owningAvatar);
 }
 
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 1585a075f5..da3a6d80dd 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -516,6 +516,10 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe
     if (isWireframe) {
         builder.withWireframe();
     }
+    if (_useDualQuaternionSkinning) {
+        builder.withDualQuatSkinned();
+    }
+
     _shapeKey = builder.build();
 }
 
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 220a0bc48c..cd4d390b1e 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -129,6 +129,7 @@ public:
     bool _isSkinned{ false };
     bool _isBlendShaped { false };
     bool _hasTangents { false };
+    bool _useDualQuaternionSkinning { false };
 
 private:
     void initCache(const ModelPointer& model);
@@ -136,7 +137,6 @@ private:
     gpu::BufferPointer _blendedVertexBuffer;
     render::ShapeKey _shapeKey { render::ShapeKey::Builder::invalid() };
     int _layer { render::Item::LAYER_3D };
-    bool _useDualQuaternionSkinning { false };
 };
 
 namespace render {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 46dbc90324..9aa4aa6b97 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -415,7 +415,7 @@ protected:
     virtual void createCollisionRenderItemSet();
 
     bool _isWireframe;
-    bool _useDualQuaternionSkinning { true };
+    bool _useDualQuaternionSkinning { false };
 
     // debug rendering support
     int _debugMeshBoxesID = GeometryCache::UNKNOWN_ID;
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index ad7409b731..68c1918044 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -26,6 +26,8 @@
 #include "model_lightmap_normal_map_vert.h"
 #include "skin_model_vert.h"
 #include "skin_model_normal_map_vert.h"
+#include "skin_model_dq_vert.h"
+#include "skin_model_normal_map_dq_vert.h"
 
 #include "model_lightmap_fade_vert.h"
 #include "model_lightmap_normal_map_fade_vert.h"
@@ -33,6 +35,8 @@
 #include "model_translucent_normal_map_vert.h"
 #include "skin_model_fade_vert.h"
 #include "skin_model_normal_map_fade_vert.h"
+#include "skin_model_fade_dq_vert.h"
+#include "skin_model_normal_map_fade_dq_vert.h"
 
 #include "simple_vert.h"
 #include "simple_textured_frag.h"
@@ -95,6 +99,7 @@
 
 #include "model_shadow_vert.h"
 #include "skin_model_shadow_vert.h"
+#include "skin_model_shadow_dq_vert.h"
 
 #include "model_shadow_frag.h"
 #include "skin_model_shadow_frag.h"
@@ -195,16 +200,28 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     auto modelTranslucentVertex = model_translucent_vert::getShader();
     auto modelTranslucentNormalMapVertex = model_translucent_normal_map_vert::getShader();
     auto modelShadowVertex = model_shadow_vert::getShader();
+
+    auto modelLightmapFadeVertex = model_lightmap_fade_vert::getShader();
+    auto modelLightmapNormalMapFadeVertex = model_lightmap_normal_map_fade_vert::getShader();
+
+    // matrix palette skinned
     auto skinModelVertex = skin_model_vert::getShader();
     auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
     auto skinModelShadowVertex = skin_model_shadow_vert::getShader();
-    auto modelLightmapFadeVertex = model_lightmap_fade_vert::getShader();
-    auto modelLightmapNormalMapFadeVertex = model_lightmap_normal_map_fade_vert::getShader();
     auto skinModelFadeVertex = skin_model_fade_vert::getShader();
     auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
     auto skinModelTranslucentVertex = skinModelFadeVertex;  // We use the same because it ouputs world position per vertex
     auto skinModelNormalMapTranslucentVertex = skinModelNormalMapFadeVertex;  // We use the same because it ouputs world position per vertex
 
+    // dual quaternion skinned
+    auto skinModelDualQuatVertex = skin_model_dq_vert::getShader();
+    auto skinModelNormalMapDualQuatVertex = skin_model_normal_map_dq_vert::getShader();
+    auto skinModelShadowDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    auto skinModelFadeDualQuatVertex = skin_model_fade_dq_vert::getShader();
+    auto skinModelNormalMapFadeDualQuatVertex = skin_model_normal_map_fade_dq_vert::getShader();
+    auto skinModelTranslucentDualQuatVertex = skinModelFadeDualQuatVertex;  // We use the same because it ouputs world position per vertex
+    auto skinModelNormalMapTranslucentDualQuatVertex = skinModelNormalMapFadeDualQuatVertex;  // We use the same because it ouputs world position per vertex
+
     auto modelFadeVertex = model_fade_vert::getShader();
     auto modelNormalMapFadeVertex = model_normal_map_fade_vert::getShader();
     auto simpleFadeVertex = simple_fade_vert::getShader();
@@ -376,7 +393,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
         Key::Builder().withMaterial().withLightmap().withTangents().withSpecular().withFade(),
         modelLightmapNormalMapFadeVertex, modelLightmapNormalSpecularMapFadePixel, batchSetter, itemSetter);
 
-    // Skinned
+    // matrix palette skinned
     addPipeline(
         Key::Builder().withMaterial().withSkinned(),
         skinModelVertex, modelPixel, nullptr, nullptr);
@@ -403,7 +420,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
         Key::Builder().withMaterial().withSkinned().withTangents().withSpecular().withFade(),
         skinModelNormalMapFadeVertex, modelNormalSpecularMapFadePixel, batchSetter, itemSetter);
 
-    // Skinned and Translucent
+    // matrix palette skinned and translucent
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent(),
         skinModelTranslucentVertex, modelTranslucentPixel, nullptr, nullptr);
@@ -430,6 +447,60 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withSpecular().withFade(),
         skinModelNormalMapFadeVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter);
 
+    // dual quatenion skinned
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(),
+        skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents(),
+        skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withSpecular(),
+        skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents().withSpecular(),
+        skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withFade(),
+        skinModelFadeDualQuatVertex, modelFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents().withFade(),
+        skinModelNormalMapFadeDualQuatVertex, modelNormalMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withSpecular().withFade(),
+        skinModelFadeDualQuatVertex, modelSpecularMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents().withSpecular().withFade(),
+        skinModelNormalMapFadeDualQuatVertex, modelNormalSpecularMapFadePixel, batchSetter, itemSetter);
+
+    // dual quaternion skinned and translucent
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent(),
+        skinModelTranslucentDualQuatVertex, modelTranslucentPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents(),
+        skinModelNormalMapTranslucentDualQuatVertex, modelTranslucentNormalMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withSpecular(),
+        skinModelTranslucentDualQuatVertex, modelTranslucentPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents().withSpecular(),
+        skinModelNormalMapTranslucentDualQuatVertex, modelTranslucentNormalMapPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withFade(),
+        skinModelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents().withFade(),
+        skinModelNormalMapFadeDualQuatVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withSpecular().withFade(),
+        skinModelFadeDualQuatVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents().withSpecular().withFade(),
+        skinModelNormalMapFadeDualQuatVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter);
+
     // Depth-only
     addPipeline(
         Key::Builder().withDepthOnly(),
diff --git a/libraries/render-utils/src/Skinning.slh b/libraries/render-utils/src/Skinning.slh
index 6048ba4ade..fbfe6b7185 100644
--- a/libraries/render-utils/src/Skinning.slh
+++ b/libraries/render-utils/src/Skinning.slh
@@ -11,18 +11,16 @@
 <@if not SKINNING_SLH@>
 <@def SKINNING_SLH@>
 
-// Use dual quaternion skinning
-// Must match #define SKIN_DQ in Model.h
-<@def SKIN_DQ@>
-
 const int MAX_CLUSTERS = 128;
 const int INDICES_PER_VERTEX = 4;
 
+<@func declareUseDualQuaternionSkinning(USE_DUAL_QUATERNION_SKINNING)@>
+
 layout(std140) uniform skinClusterBuffer {
     mat4 clusterMatrices[MAX_CLUSTERS];
 };
 
-<@if SKIN_DQ@>
+<@if USE_DUAL_QUATERNION_SKINNING@>
 
 mat4 dualQuatToMat4(vec4 real, vec4 dual) {
     float twoRealXSq = 2.0 * real.x * real.x;
@@ -211,7 +209,7 @@ void skinPositionNormalTangent(ivec4 skinClusterIndex, vec4 skinClusterWeight, v
     skinnedTangent = vec3(m * vec4(inTangent, 0));
 }
 
-<@else@>  // SKIN_DQ
+<@else@>  // USE_DUAL_QUATERNION_SKINNING
 
 void skinPosition(ivec4 skinClusterIndex, vec4 skinClusterWeight, vec4 inPosition, out vec4 skinnedPosition) {
     vec4 newPosition = vec4(0.0, 0.0, 0.0, 0.0);
@@ -260,6 +258,8 @@ void skinPositionNormalTangent(ivec4 skinClusterIndex, vec4 skinClusterWeight, v
     skinnedTangent = newTangent.xyz;
 }
 
-<@endif@> // if SKIN_DQ
+<@endif@> // if USE_DUAL_QUATERNION_SKINNING
+
+<@endfunc@> // func declareUseDualQuaternionSkinning(USE_DUAL_QUATERNION_SKINNING)
 
 <@endif@> // if not SKINNING_SLH
diff --git a/libraries/render-utils/src/skin_model.slv b/libraries/render-utils/src/skin_model.slv
index 4236508edb..bd1655fc40 100644
--- a/libraries/render-utils/src/skin_model.slv
+++ b/libraries/render-utils/src/skin_model.slv
@@ -18,6 +18,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTexMapArrayBuffer()$>
diff --git a/libraries/render-utils/src/skin_model_dq.slv b/libraries/render-utils/src/skin_model_dq.slv
new file mode 100644
index 0000000000..96f9b4a713
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_dq.slv
@@ -0,0 +1,52 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 10/14/13.
+//  Copyright 2013 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 gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _color;
+out float _alpha;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec3 interpolatedNormal = vec3(0.0, 0.0, 0.0);
+
+    skinPositionNormal(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, position, interpolatedNormal);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, _normal.xyz)$>
+}
diff --git a/libraries/render-utils/src/skin_model_fade.slv b/libraries/render-utils/src/skin_model_fade.slv
index fa8e1f8991..b14bf1532e 100644
--- a/libraries/render-utils/src/skin_model_fade.slv
+++ b/libraries/render-utils/src/skin_model_fade.slv
@@ -18,6 +18,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTexMapArrayBuffer()$>
diff --git a/libraries/render-utils/src/skin_model_fade_dq.slv b/libraries/render-utils/src/skin_model_fade_dq.slv
new file mode 100644
index 0000000000..4f8a923a03
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_fade_dq.slv
@@ -0,0 +1,54 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  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
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _color;
+out float _alpha;
+out vec4 _worldPosition;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec3 interpolatedNormal = vec3(0.0, 0.0, 0.0);
+
+    skinPositionNormal(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, position, interpolatedNormal);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, _normal.xyz)$>
+}
diff --git a/libraries/render-utils/src/skin_model_normal_map.slv b/libraries/render-utils/src/skin_model_normal_map.slv
index 9f1087f87a..666bdf865f 100644
--- a/libraries/render-utils/src/skin_model_normal_map.slv
+++ b/libraries/render-utils/src/skin_model_normal_map.slv
@@ -18,6 +18,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTexMapArrayBuffer()$>
diff --git a/libraries/render-utils/src/skin_model_normal_map_dq.slv b/libraries/render-utils/src/skin_model_normal_map_dq.slv
new file mode 100644
index 0000000000..02b3742f6f
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_normal_map_dq.slv
@@ -0,0 +1,61 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_normal_map.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 10/29/13.
+//  Copyright 2013 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 gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _tangent;
+out vec3 _color;
+out float _alpha;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedNormal = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedTangent = vec4(0.0, 0.0, 0.0, 0.0);
+
+    skinPositionNormalTangent(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, inTangent.xyz, position, interpolatedNormal.xyz, interpolatedTangent.xyz);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    interpolatedNormal = vec4(normalize(interpolatedNormal.xyz), 0.0);
+    interpolatedTangent = vec4(normalize(interpolatedTangent.xyz), 0.0);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, interpolatedNormal.xyz)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedTangent.xyz, interpolatedTangent.xyz)$>
+
+    _normal = interpolatedNormal.xyz;
+    _tangent = interpolatedTangent.xyz;
+}
diff --git a/libraries/render-utils/src/skin_model_normal_map_fade.slv b/libraries/render-utils/src/skin_model_normal_map_fade.slv
index 4e638866fc..d72e47702d 100644
--- a/libraries/render-utils/src/skin_model_normal_map_fade.slv
+++ b/libraries/render-utils/src/skin_model_normal_map_fade.slv
@@ -18,6 +18,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTexMapArrayBuffer()$>
diff --git a/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv b/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
new file mode 100644
index 0000000000..02b3742f6f
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
@@ -0,0 +1,61 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_normal_map.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 10/29/13.
+//  Copyright 2013 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 gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _tangent;
+out vec3 _color;
+out float _alpha;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedNormal = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedTangent = vec4(0.0, 0.0, 0.0, 0.0);
+
+    skinPositionNormalTangent(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, inTangent.xyz, position, interpolatedNormal.xyz, interpolatedTangent.xyz);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    interpolatedNormal = vec4(normalize(interpolatedNormal.xyz), 0.0);
+    interpolatedTangent = vec4(normalize(interpolatedTangent.xyz), 0.0);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, interpolatedNormal.xyz)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedTangent.xyz, interpolatedTangent.xyz)$>
+
+    _normal = interpolatedNormal.xyz;
+    _tangent = interpolatedTangent.xyz;
+}
diff --git a/libraries/render-utils/src/skin_model_shadow.slv b/libraries/render-utils/src/skin_model_shadow.slv
index 6684cfea80..03da2e074e 100644
--- a/libraries/render-utils/src/skin_model_shadow.slv
+++ b/libraries/render-utils/src/skin_model_shadow.slv
@@ -17,6 +17,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 void main(void) {
     vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
diff --git a/libraries/render-utils/src/skin_model_shadow_dq.slv b/libraries/render-utils/src/skin_model_shadow_dq.slv
new file mode 100644
index 0000000000..74cd4076bc
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_shadow_dq.slv
@@ -0,0 +1,30 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_shadow.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 3/24/14.
+//  Copyright 2014 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 gpu/Inputs.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    skinPosition(inSkinClusterIndex, inSkinClusterWeight, inPosition, position);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, position, gl_Position)$>
+}
diff --git a/libraries/render-utils/src/skin_model_shadow_fade.slv b/libraries/render-utils/src/skin_model_shadow_fade.slv
index 7b27263569..d2e79f9d74 100644
--- a/libraries/render-utils/src/skin_model_shadow_fade.slv
+++ b/libraries/render-utils/src/skin_model_shadow_fade.slv
@@ -17,6 +17,7 @@
 <$declareStandardTransform()$>
 
 <@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning()$>
 
 out vec4 _worldPosition;
 
diff --git a/libraries/render-utils/src/skin_model_shadow_fade_dq.slv b/libraries/render-utils/src/skin_model_shadow_fade_dq.slv
new file mode 100644
index 0000000000..fb9c60eefd
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_shadow_fade_dq.slv
@@ -0,0 +1,33 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_shadow_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  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
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+<$declareUseDualQuaternionSkinning(1)$>
+
+out vec4 _worldPosition;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    skinPosition(inSkinClusterIndex, inSkinClusterWeight, inPosition, position);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
+}
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index 1dd9f5da49..f175bab99a 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -32,6 +32,7 @@ public:
         SPECULAR,
         UNLIT,
         SKINNED,
+        DUAL_QUAT_SKINNED,
         DEPTH_ONLY,
         DEPTH_BIAS,
         WIREFRAME,
@@ -80,6 +81,7 @@ public:
         Builder& withSpecular() { _flags.set(SPECULAR); return (*this); }
         Builder& withUnlit() { _flags.set(UNLIT); return (*this); }
         Builder& withSkinned() { _flags.set(SKINNED); return (*this); }
+        Builder& withDualQuatSkinned() { _flags.set(DUAL_QUAT_SKINNED); return (*this); }
         Builder& withDepthOnly() { _flags.set(DEPTH_ONLY); return (*this); }
         Builder& withDepthBias() { _flags.set(DEPTH_BIAS); return (*this); }
         Builder& withWireframe() { _flags.set(WIREFRAME); return (*this); }
@@ -133,6 +135,9 @@ public:
             Builder& withSkinned() { _flags.set(SKINNED); _mask.set(SKINNED); return (*this); }
             Builder& withoutSkinned() { _flags.reset(SKINNED); _mask.set(SKINNED); return (*this); }
 
+            Builder& withDualQuatSkinned() { _flags.set(DUAL_QUAT_SKINNED); _mask.set(SKINNED); return (*this); }
+            Builder& withoutDualQuatSkinned() { _flags.reset(DUAL_QUAT_SKINNED); _mask.set(SKINNED); return (*this); }
+
             Builder& withDepthOnly() { _flags.set(DEPTH_ONLY); _mask.set(DEPTH_ONLY); return (*this); }
             Builder& withoutDepthOnly() { _flags.reset(DEPTH_ONLY); _mask.set(DEPTH_ONLY); return (*this); }
 

From 1d3ae1b187cad4b2a48e5823ccfde3476e2106a1 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 13 Feb 2018 17:50:01 -0800
Subject: [PATCH 222/569] Work in progress to get the render items beeing
 tagged correctly for groupCulled

---
 interface/src/avatar/MyAvatar.cpp             |  8 ++---
 interface/src/ui/overlays/ModelOverlay.cpp    |  2 +-
 .../src/RenderableModelEntityItem.cpp         |  2 +-
 .../render-utils/src/MeshPartPayload.cpp      | 12 +++++--
 libraries/render-utils/src/MeshPartPayload.h  |  4 +--
 libraries/render-utils/src/Model.cpp          | 36 ++++++++++---------
 libraries/render-utils/src/Model.h            |  6 +++-
 libraries/render/src/render/CullTask.cpp      |  9 ++---
 libraries/render/src/render/Item.cpp          |  7 +++-
 libraries/render/src/render/Item.h            |  5 ++-
 .../src/render/RenderFetchCullSortTask.cpp    |  2 +-
 11 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index ba4d48fd3f..9c063b69fb 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1111,7 +1111,7 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
 }
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
-    _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
+    _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
 }
 
 void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -1461,7 +1461,7 @@ void MyAvatar::clearJointsData() {
 
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     Avatar::setSkeletonModelURL(skeletonModelURL);
-    _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE);
+    _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
     saveAvatarUrl();
@@ -1808,7 +1808,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName,
 
 void MyAvatar::setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visible) {
     if (model->isActive() && model->isRenderable()) {
-        model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE);
+        model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE, true);
     }
 }
 
@@ -2008,7 +2008,7 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
                 _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
                 _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
                 _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene(),
-                                                        render::ItemKey::TAG_BITS_NONE);
+                                                        render::ItemKey::TAG_BITS_NONE, true);
             }
         }
     }
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 4847650163..2b2c1403ff 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -87,7 +87,7 @@ void ModelOverlay::update(float deltatime) {
     if (_visibleDirty) {
         _visibleDirty = false;
         // don't show overlays in mirrors
-        _model->setVisibleInScene(getVisible(), scene, render::ItemKey::TAG_BITS_0);
+        _model->setVisibleInScene(getVisible(), scene, render::ItemKey::TAG_BITS_0, false);
     }
     if (_drawInFrontDirty) {
         _drawInFrontDirty = false;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 137203f475..f477283843 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1343,7 +1343,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
         // FIXME: this seems like it could be optimized if we tracked our last known visible state in
         //        the renderable item. As it stands now the model checks it's visible/invisible state
         //        so most of the time we don't do anything in this function.
-        model->setVisibleInScene(_visible, scene, viewTaskBits);
+        model->setVisibleInScene(_visible, scene, viewTaskBits, false);
     }
     // TODO? early exit here when not visible?
 
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 9655b60a78..e3d4818ec5 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -71,7 +71,7 @@ void MeshPartPayload::updateMaterial(graphics::MaterialPointer drawMaterial) {
     _drawMaterial = drawMaterial;
 }
 
-void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits) {
+void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 
@@ -85,6 +85,10 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits)
         builder.withLayered();
     }
 
+    if (isGroupCulled) {
+        builder.withMetaCulled();
+    }
+
     if (_drawMaterial) {
         auto matKey = _drawMaterial->getKey();
         if (matKey.isTranslucent()) {
@@ -403,7 +407,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
     _worldBound.transform(boundTransform);
 }
 
-void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits) {
+void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 
@@ -417,6 +421,10 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
         builder.withLayered();
     }
 
+    if (isGroupCulled) {
+        builder.withMetaCulled();
+    }
+
     if (_isBlendShaped || _isSkinned) {
         builder.withDeformed();
     }
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 21f9dc2e68..40efc67572 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -33,7 +33,7 @@ public:
     typedef render::Payload<MeshPartPayload> Payload;
     typedef Payload::DataPointer Pointer;
 
-    virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits);
+    virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false);
 
     virtual void updateMeshPart(const std::shared_ptr<const graphics::Mesh>& drawMesh, int partIndex);
 
@@ -99,7 +99,7 @@ public:
     using TransformType = glm::mat4;
 #endif
 
-    void updateKey(bool isVisible, bool isLayered, uint8_t tagBits) override;
+    void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false) override;
     void updateClusterBuffer(const std::vector<TransformType>& clusterTransforms);
     void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b9ccc28c01..bb8353c746 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -271,6 +271,7 @@ void Model::updateRenderItems() {
         uint8_t viewTagBits = self->getViewTagBits();
         bool isLayeredInFront = self->isLayeredInFront();
         bool isLayeredInHUD = self->isLayeredInHUD();
+        bool isGroupCulled = self->isGroupCulled();
 
         render::Transaction transaction;
         for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) {
@@ -284,7 +285,7 @@ void Model::updateRenderItems() {
             transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms,
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
                                                                   viewTagBits, isLayeredInFront,
-                                                                  isLayeredInHUD](ModelMeshPartPayload& data) {
+                                                                  isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
                 data.updateClusterBuffer(clusterTransforms);
 
                 Transform renderTransform = modelTransform;
@@ -300,7 +301,7 @@ void Model::updateRenderItems() {
                 }
                 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
                 data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
             });
@@ -684,10 +685,11 @@ void Model::calculateTriangleSets() {
     }
 }
 
-void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits) {
-    if (_isVisible != isVisible || _viewTagBits != viewTagBits) {
+void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) {
+    if (_isVisible != isVisible || _viewTagBits != viewTagBits || _isGroupCulled != isGroupCulled) {
         _isVisible = isVisible;
         _viewTagBits = viewTagBits;
+        _isGroupCulled = isGroupCulled;
 
         bool isLayeredInFront = _isLayeredInFront;
         bool isLayeredInHUD = _isLayeredInHUD;
@@ -695,14 +697,14 @@ void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene,
         render::Transaction transaction;
         foreach (auto item, _modelMeshRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
             });
         }
         scene->enqueueTransaction(transaction);
@@ -717,19 +719,20 @@ void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer&
         bool isVisible = _isVisible;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInHUD = _isLayeredInHUD;
+        bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
@@ -744,19 +747,20 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce
         bool isVisible = _isVisible;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInFront = _isLayeredInFront;
+        bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
             transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
-                                                                isLayeredInHUD](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits);
+                                                                isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index ca0904f334..57d2798a66 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -86,7 +86,7 @@ public:
     const QUrl& getURL() const { return _url; }
 
     // new Scene/Engine rendering support
-    void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits);
+    void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
     void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
     void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);
     bool needsFixupInScene() const;
@@ -109,6 +109,8 @@ public:
     bool isLayeredInFront() const { return _isLayeredInFront; }
     bool isLayeredInHUD() const { return _isLayeredInHUD; }
 
+    bool isGroupCulled() const { return _isGroupCulled; }
+
     virtual void updateRenderItems();
     void setRenderItemsNeedUpdate();
     bool getRenderItemsNeedUpdate() { return _renderItemsNeedUpdate; }
@@ -462,6 +464,8 @@ protected:
     bool _isLayeredInFront { false };
     bool _isLayeredInHUD { false };
 
+    bool _isGroupCulled{ false };
+
     bool shouldInvalidatePayloadShapeKey(int meshIndex);
 
 private:
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 467cf5adbf..b5ee251b5d 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -211,13 +211,14 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
     outItems.clear();
     outItems.reserve(inSelection.numItems());
 
-    const auto filter = inputs.get1();
-    if (!filter.selectsNothing()) {
-        // Now get the bound, and
+    const auto srcFilter = inputs.get1();
+    if (!srcFilter.selectsNothing()) {
+        auto filter = render::ItemFilter::Builder(srcFilter).withoutMetaCulled().build();
+
+            // Now get the bound, and
         // filter individually against the _filter
         // visibility cull if partially selected ( octree cell contianing it was partial)
         // distance cull if was a subcell item ( octree cell is way bigger than the item bound itself, so now need to test per item)
-
         if (_skipCulling) {
             // inside & fit items: filter only, culling is disabled
             {
diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp
index b8ca091c40..ed052adf6e 100644
--- a/libraries/render/src/render/Item.cpp
+++ b/libraries/render/src/render/Item.cpp
@@ -118,7 +118,12 @@ uint32_t Item::fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) c
     auto numSubs = fetchMetaSubItems(subItems);
 
     for (auto id : subItems) {
-        subItemBounds.emplace_back(id, scene.getItem(id).getBound());
+        auto& item = scene.getItem(id);
+        if (item.exist()) {
+            subItemBounds.emplace_back(id, item.getBound());
+        } else {
+            numSubs--;
+        }
     }
     return numSubs;
 }
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index 3c82e49e8d..87ad25f4b2 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -125,6 +125,7 @@ public:
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
         Builder& withCullGroup() { _flags.set(CULL_GROUP); return (*this); }
+        Builder& withMetaCulled() { _flags.set(__META_CULLED); return (*this); }
 
         Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
         // Set ALL the tags in one call using the Tag bits
@@ -135,9 +136,6 @@ public:
         static Builder transparentShape() { return Builder().withTypeShape().withTransparent(); }
         static Builder light() { return Builder().withTypeLight(); }
         static Builder background() { return Builder().withViewSpace().withLayered(); }
-
-        // Not meant to be public, part of the inner item / key  / filter system
-        Builder& __withMetaCulled() { _flags.set(__META_CULLED); return (*this); }
     };
     ItemKey(const Builder& builder) : ItemKey(builder._flags) {}
 
@@ -205,6 +203,7 @@ public:
         ItemKey::Flags _mask{ 0 };
     public:
         Builder() {}
+        Builder(const ItemFilter& srcFilter) : _value(srcFilter._value), _mask(srcFilter._mask) {}
 
         ItemFilter build() const { return ItemFilter(_value, _mask); }
 
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index 4fe5e2f1be..14a5a632ad 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -22,7 +22,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
 
     // CPU jobs:
     // Fetch and cull the items from the scene
-    const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered().withoutMetaCulled().withTagBits(tagBits, tagMask);
+    const ItemFilter filter = ItemFilter::Builder::visibleWorldItems().withoutLayered().withTagBits(tagBits, tagMask);
     const auto spatialFilter = render::Varying(filter);
     const auto fetchInput = FetchSpatialTree::Inputs(filter, glm::ivec2(0,0)).asVarying();
     const auto spatialSelection = task.addJob<FetchSpatialTree>("FetchSceneSelection", fetchInput);

From 1632ab9782cd4ed566ca3b9e417994ec657e6a7a Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Tue, 13 Feb 2018 18:27:36 -0800
Subject: [PATCH 223/569] Changed flag to "cast shadow" instead of "don't cast
 shadow".

---
 libraries/entities/src/EntityItemProperties.h         | 2 +-
 libraries/entities/src/EntityItemPropertiesDefaults.h | 2 +-
 libraries/entities/src/EntityPropertyFlags.h          | 2 +-
 libraries/entities/src/ModelEntityItem.cpp            | 6 +++---
 libraries/entities/src/ModelEntityItem.h              | 2 +-
 libraries/entities/src/ShapeEntityItem.cpp            | 6 +++---
 libraries/entities/src/ShapeEntityItem.h              | 2 +-
 libraries/render-utils/src/RenderShadowTask.cpp       | 4 ++--
 libraries/render/src/render/Item.h                    | 4 ----
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 731bb9390e..8feebd3979 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -128,7 +128,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
-    DEFINE_PROPERTY(PROP_DONT_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW);
+    DEFINE_PROPERTY(PROP_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAST_SHADOW);
     DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
     DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
     DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index 181ba9bbf2..f85d55dc3a 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,7 +46,7 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
-const bool ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW { false };
+const bool ENTITY_ITEM_DEFAULT_CAST_SHADOW { true };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
 const quint64 ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP = 0;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index fbc4199097..d2de67735c 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -31,7 +31,7 @@ enum EntityPropertyList {
     PROP_SCRIPT,
 
     // these properties are supported by some derived classes
-    PROP_DONT_CAST_SHADOW,
+    PROP_CAST_SHADOW,
     PROP_COLOR,
 
     // these are used by models only
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 73cf29bce1..6d15fded31 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -116,7 +116,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     const unsigned char* dataAt = data;
     bool animationPropertiesChanged = false;
 
-    READ_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, bool, setCanCastShadow);
+    READ_ENTITY_PROPERTY(PROP_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_MODEL_URL, QString, setModelURL);
     READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
@@ -153,7 +153,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
-    requestedProperties += PROP_DONT_CAST_SHADOW;
+    requestedProperties += PROP_CAST_SHADOW;
     requestedProperties += PROP_MODEL_URL;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_TEXTURES;
@@ -178,7 +178,7 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
     bool successPropertyFits = true;
 
-    APPEND_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, getCanCastShadow());
+    APPEND_ENTITY_PROPERTY(PROP_CAST_SHADOW, getCanCastShadow());
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_MODEL_URL, getModelURL());
     APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, getCompoundShapeURL());
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index ec65876d84..49f20c48e2 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -174,7 +174,7 @@ protected:
 
     ShapeType _shapeType = SHAPE_TYPE_NONE;
 
-    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW };
+    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAST_SHADOW };
 
 private:
     uint64_t _lastAnimated{ 0 };
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 2fbb6702f2..22c3bab4f3 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -157,7 +157,7 @@ int ShapeEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_SHAPE, QString, setShape);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
-    READ_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, bool, setCanCastShadow);
+    READ_ENTITY_PROPERTY(PROP_CAST_SHADOW, bool, setCanCastShadow);
 
     return bytesRead;
 }
@@ -169,7 +169,7 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_SHAPE;
     requestedProperties += PROP_COLOR;
     requestedProperties += PROP_ALPHA;
-    requestedProperties += PROP_DONT_CAST_SHADOW;
+    requestedProperties += PROP_CAST_SHADOW;
 
     return requestedProperties;
 }
@@ -186,7 +186,7 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
-    APPEND_ENTITY_PROPERTY(PROP_DONT_CAST_SHADOW, getCanCastShadow());
+    APPEND_ENTITY_PROPERTY(PROP_CAST_SHADOW, getCanCastShadow());
 }
 
 void ShapeEntityItem::setColor(const rgbColor& value) {
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 63c4eb58c5..4a08936bce 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -115,7 +115,7 @@ protected:
     //! ellipsoids.
     ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
 
-    bool _canCastShadow { ENTITY_ITEM_DEFAULT_DONT_CAST_SHADOW };
+    bool _canCastShadow { ENTITY_ITEM_DEFAULT_CAST_SHADOW };
 };
 
 #endif // hifi_ShapeEntityItem_h
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index eef641e369..e34f550def 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -224,7 +224,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withNoShadowCaster();
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withShadowCaster();
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
@@ -398,7 +398,7 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withNoShadowCaster();
+        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withShadowCaster();
 
         // Set the keylight render args
         auto& cascade = globalShadow->getCascade(_cascadeIndex);
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index 7713c1ea7e..ff4b3a0458 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -120,10 +120,7 @@ public:
         Builder& withDynamic() { _flags.set(DYNAMIC); return (*this); }
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
-
-        Builder& withNoShadowCaster() { _flags.reset(SHADOW_CASTER); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
-
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
 
         Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
@@ -158,7 +155,6 @@ public:
     bool isInvisible() const { return _flags[INVISIBLE]; }
 
     bool isShadowCaster() const { return _flags[SHADOW_CASTER]; }
-    bool isNotShadowCaster() const { return !_flags[SHADOW_CASTER]; }
 
     bool isLayered() const { return _flags[LAYERED]; }
     bool isSpatial() const { return !isLayered(); }

From 6f27d1e5a92a20726c9aeffe5f5c0c5d255e2a93 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Wed, 14 Feb 2018 09:19:14 -0800
Subject: [PATCH 224/569] add additional example

---
 ...e-or-edit-of-entities-with-name-of-zone.js | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 scripts/tutorials/entity_edit_filters/prevent-add-delete-or-edit-of-entities-with-name-of-zone.js

diff --git a/scripts/tutorials/entity_edit_filters/prevent-add-delete-or-edit-of-entities-with-name-of-zone.js b/scripts/tutorials/entity_edit_filters/prevent-add-delete-or-edit-of-entities-with-name-of-zone.js
new file mode 100644
index 0000000000..0da03b822d
--- /dev/null
+++ b/scripts/tutorials/entity_edit_filters/prevent-add-delete-or-edit-of-entities-with-name-of-zone.js
@@ -0,0 +1,40 @@
+//
+// prevent-add-delete-or-edit-of-entities-with-name-of-zone.js
+// 
+//
+// Created by Brad Hefta-Gaub to use Entities on Feb. 14, 2018
+// Copyright 2018 High Fidelity, Inc.
+//
+// This sample entity edit filter script will get all edits, adds, physcis, and deletes, but will only block
+// deletes, and will pass through all others.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+function filter(properties, type, originalProperties, zoneProperties) {
+
+    // for adds, check the new properties, if the name is the same as the zone, prevent the add
+    // note: this case tests the example where originalProperties will be unknown, since as an
+    // add message, there is no existing entity to get proprties from. But we need to make sure
+    // zoneProperties is still set in the correct 4th parameter.
+    if (type == Entities.ADD_FILTER_TYPE) {
+        if (properties.name == zoneProperties.name) {
+            return false;
+        }
+    } else {
+        // for edits or deletes, check the "original" property for the entity against the zone's name
+        if (originalProperties.name == zoneProperties.name) {
+            return false;
+        }
+    }
+    return properties;
+}
+
+filter.wantsToFilterAdd = true;  // do run on add
+filter.wantsToFilterEdit = true;  // do not run on edit
+filter.wantsToFilterPhysics = false;  // do not run on physics
+filter.wantsToFilterDelete = true;  // do not run on delete
+filter.wantsOriginalProperties = "name";
+filter.wantsZoneProperties = "name";
+filter;
\ No newline at end of file

From 0fca843667fa1f5723849674ce3da22d4561c999 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 14 Feb 2018 10:24:34 -0800
Subject: [PATCH 225/569] Integrate 'alreadyOwned' endpoint

---
 .../qml/hifi/commerce/checkout/Checkout.qml   | 38 ++++++++-----------
 interface/src/commerce/QmlCommerce.cpp        |  7 ++++
 interface/src/commerce/QmlCommerce.h          |  3 ++
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index c141b48d32..bd3f706004 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -28,7 +28,7 @@ Rectangle {
     id: root;
     objectName: "checkout"
     property string activeView: "initialize";
-    property bool purchasesReceived: false;
+    property bool ownershipStatusReceived: false;
     property bool balanceReceived: false;
     property string itemName;
     property string itemId;
@@ -106,14 +106,15 @@ Rectangle {
             }
         }
 
-        onInventoryResult: {
+        onAlreadyOwnedResult: {
             if (result.status !== 'success') {
-                console.log("Failed to get purchases", result.data.message);
+                console.log("Failed to get Already Owned status", result.data.message);
             } else {
-                root.purchasesReceived = true;
-                if (purchasesContains(result.data.assets, itemId)) {
-                    root.alreadyOwned = true;
+                root.ownershipStatusReceived = true;
+                if (result.data.marketplace_item_id === root.itemId) {
+                    root.alreadyOwned = result.data.already_owned;
                 } else {
+                    console.log("WARNING - Received 'Already Owned' status about different Marketplace ID!");
                     root.alreadyOwned = false;
                 }
                 root.setBuyText();
@@ -122,7 +123,8 @@ Rectangle {
     }
 
     onItemIdChanged: {
-        Commerce.inventory();
+        root.ownershipStatusReceived = false;
+        Commerce.alreadyOwned(root.itemId);
         itemPreviewImage.source = "https://hifi-metaverse.s3-us-west-1.amazonaws.com/marketplace/previews/" + itemId + "/thumbnail/hifi-mp-" + itemId + ".jpg";
     }
 
@@ -136,6 +138,7 @@ Rectangle {
         } else if (root.itemHref.endsWith('.js')) {
             root.itemType = "app";
         } else {
+            console.log("WARNING - Item type is UNKNOWN!");
             root.itemType = "entity";
         }
     }
@@ -226,7 +229,7 @@ Rectangle {
         color: hifi.colors.white;
 
         Component.onCompleted: {
-            purchasesReceived = false;
+            ownershipStatusReceived = false;
             balanceReceived = false;
             Commerce.getWalletStatus();
         }
@@ -487,7 +490,7 @@ Rectangle {
             // "Buy" button
             HifiControlsUit.Button {
                 id: buyButton;
-                enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || (!root.isCertified);
+                enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived) || (!root.isCertified);
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: checkoutActionButtonsContainer.top;
@@ -495,7 +498,7 @@ Rectangle {
                 height: 40;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: ((root.isCertified) ? ((purchasesReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
+                text: ((root.isCertified) ? ((ownershipStatusReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
                 onClicked: {
                     if (root.isCertified) {
                         buyButton.enabled = false;
@@ -884,7 +887,7 @@ Rectangle {
                 buyButton.color = hifi.buttons.red;
                 root.shouldBuyWithControlledFailure = true;
             } else {
-                buyButton.text = (root.isCertified ? ((purchasesReceived && balanceReceived) ? (root.alreadyOwned ? "Buy Another" : "Buy"): "--") : "Get Item");
+                buyButton.text = (root.isCertified ? ((ownershipStatusReceived && balanceReceived) ? (root.alreadyOwned ? "Buy Another" : "Buy"): "--") : "Get Item");
                 buyButton.color = hifi.buttons.blue;
                 root.shouldBuyWithControlledFailure = false;
             }
@@ -924,18 +927,9 @@ Rectangle {
     }
     signal sendToScript(var message);
 
-    function purchasesContains(purchasesJson, id) {
-        for (var idx = 0; idx < purchasesJson.length; idx++) {
-            if(purchasesJson[idx].id === id) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     function setBuyText() {
         if (root.isCertified) {
-            if (root.purchasesReceived && root.balanceReceived) {
+            if (root.ownershipStatusReceived && root.balanceReceived) {
                 if (root.balanceAfterPurchase < 0) {
                     if (root.alreadyOwned) {
                         buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item again.<br>" +
@@ -978,7 +972,7 @@ Rectangle {
             root.activeView = "checkoutSuccess";
         }
         root.balanceReceived = false;
-        root.purchasesReceived = false;
+        root.ownershipStatusReceived = false;
         Commerce.inventory();
         Commerce.balance();
     }
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index ba52edba4f..5458925d55 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -30,9 +30,11 @@ QmlCommerce::QmlCommerce() {
     connect(ledger.data(), &Ledger::accountResult, this, &QmlCommerce::accountResult);
     connect(wallet.data(), &Wallet::walletStatusResult, this, &QmlCommerce::walletStatusResult);
     connect(ledger.data(), &Ledger::certificateInfoResult, this, &QmlCommerce::certificateInfoResult);
+    connect(ledger.data(), &Ledger::alreadyOwnedResult, this, &QmlCommerce::alreadyOwnedResult);
     connect(ledger.data(), &Ledger::updateCertificateStatus, this, &QmlCommerce::updateCertificateStatus);
     connect(ledger.data(), &Ledger::transferHfcToNodeResult, this, &QmlCommerce::transferHfcToNodeResult);
     connect(ledger.data(), &Ledger::transferHfcToUsernameResult, this, &QmlCommerce::transferHfcToUsernameResult);
+    connect(ledger.data(), &Ledger::transferHfcToUsernameResult, this, &QmlCommerce::transferHfcToUsernameResult);
     
     auto accountManager = DependencyManager::get<AccountManager>();
     connect(accountManager.data(), &AccountManager::usernameChanged, this, [&]() {
@@ -176,3 +178,8 @@ void QmlCommerce::replaceContentSet(const QString& id, const QString& url) {
 
     emit contentSetChanged(id);
 }
+
+void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->alreadyOwned(marketplaceId);
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index aa939a439d..dc38dcad19 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -42,6 +42,7 @@ signals:
     void historyResult(QJsonObject result);
     void accountResult(QJsonObject result);
     void certificateInfoResult(QJsonObject result);
+    void alreadyOwnedResult(QJsonObject result);
 
     void updateCertificateStatus(const QString& certID, uint certStatus);
 
@@ -70,10 +71,12 @@ protected:
     Q_INVOKABLE void account();
 
     Q_INVOKABLE void certificateInfo(const QString& certificateId);
+    Q_INVOKABLE void alreadyOwned(const QString& marketplaceId);
 
     Q_INVOKABLE void transferHfcToNode(const QString& nodeID, const int& amount, const QString& optionalMessage);
     Q_INVOKABLE void transferHfcToUsername(const QString& username, const int& amount, const QString& optionalMessage);
 
+
     Q_INVOKABLE void replaceContentSet(const QString& id, const QString& url);
 };
 

From 6357f36a97b4475c0d87fe69853f4d34837f26a1 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 14 Feb 2018 10:39:14 -0800
Subject: [PATCH 226/569] Fixing names

---
 .../src/avatars-renderer/Avatar.cpp           |  2 +-
 .../render-utils/src/MeshPartPayload.cpp      |  4 +--
 libraries/render/src/render/CullTask.cpp      | 18 ++++++-------
 libraries/render/src/render/Item.h            | 26 +++++++++----------
 .../src/render/RenderFetchCullSortTask.cpp    |  2 +-
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 9cdd4e2d00..a2a23f2508 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -50,7 +50,7 @@ const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);
 
 namespace render {
     template <> const ItemKey payloadGetKey(const AvatarSharedPointer& avatar) {
-        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1).withCullGroup();
+        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1).withMetaCullGroup();
     }
     template <> const Item::Bound payloadGetBound(const AvatarSharedPointer& avatar) {
         return static_pointer_cast<Avatar>(avatar)->getBounds();
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index e3d4818ec5..da11535396 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -86,7 +86,7 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits,
     }
 
     if (isGroupCulled) {
-        builder.withMetaCulled();
+        builder.withSubMetaCulled();
     }
 
     if (_drawMaterial) {
@@ -422,7 +422,7 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
     }
 
     if (isGroupCulled) {
-        builder.withMetaCulled();
+        builder.withSubMetaCulled();
     }
 
     if (_isBlendShaped || _isSkinned) {
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index b5ee251b5d..f04427540a 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -213,7 +213,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
 
     const auto srcFilter = inputs.get1();
     if (!srcFilter.selectsNothing()) {
-        auto filter = render::ItemFilter::Builder(srcFilter).withoutMetaCulled().build();
+        auto filter = render::ItemFilter::Builder(srcFilter).withoutSubMetaCulled().build();
 
             // Now get the bound, and
         // filter individually against the _filter
@@ -228,7 +228,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
-                        if (item.getKey().isCullGroup()) {
+                        if (item.getKey().isMetaCullGroup()) {
                             item.fetchMetaSubItemBounds(outItems, (*scene));
                         }
                     }
@@ -243,7 +243,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
-                        if (item.getKey().isCullGroup()) {
+                        if (item.getKey().isMetaCullGroup()) {
                             item.fetchMetaSubItemBounds(outItems, (*scene));
                         }
                     }
@@ -258,7 +258,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
-                        if (item.getKey().isCullGroup()) {
+                        if (item.getKey().isMetaCullGroup()) {
                             item.fetchMetaSubItemBounds(outItems, (*scene));
                         }
                     }
@@ -273,7 +273,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
-                        if (item.getKey().isCullGroup()) {
+                        if (item.getKey().isMetaCullGroup()) {
                             item.fetchMetaSubItemBounds(outItems, (*scene));
                         }
                     }
@@ -290,7 +290,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                     if (filter.test(item.getKey())) {
                         ItemBound itemBound(id, item.getBound());
                         outItems.emplace_back(itemBound);
-                        if (item.getKey().isCullGroup()) {
+                        if (item.getKey().isMetaCullGroup()) {
                             item.fetchMetaSubItemBounds(outItems, (*scene));
                         }
                     }
@@ -306,7 +306,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         ItemBound itemBound(id, item.getBound());
                         if (test.solidAngleTest(itemBound.bound)) {
                             outItems.emplace_back(itemBound);
-                            if (item.getKey().isCullGroup()) {
+                            if (item.getKey().isMetaCullGroup()) {
                                 item.fetchMetaSubItemBounds(outItems, (*scene));
                             }
                         }
@@ -323,7 +323,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         ItemBound itemBound(id, item.getBound());
                         if (test.frustumTest(itemBound.bound)) {
                             outItems.emplace_back(itemBound);
-                            if (item.getKey().isCullGroup()) {
+                            if (item.getKey().isMetaCullGroup()) {
                                 item.fetchMetaSubItemBounds(outItems, (*scene));
                             }
                         }
@@ -341,7 +341,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                         if (test.frustumTest(itemBound.bound)) {
                             if (test.solidAngleTest(itemBound.bound)) {
                                 outItems.emplace_back(itemBound);
-                                if (item.getKey().isCullGroup()) {
+                                if (item.getKey().isMetaCullGroup()) {
                                     item.fetchMetaSubItemBounds(outItems, (*scene));
                                 }
                             }
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index 87ad25f4b2..e4dcc7ee03 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -78,13 +78,13 @@ public:
         INVISIBLE,        // Visible or not in the scene?
         SHADOW_CASTER,    // Item cast shadows
         LAYERED,          // Item belongs to one of the layers different from the default layer
-        CULL_GROUP,       // As a meta item, the culling of my sub items is based solely on my bounding box and my visibility in the
+        META_CULL_GROUP,  // As a meta item, the culling of my sub items is based solely on my bounding box and my visibility in the view
+        SUB_META_CULLED,  // As a sub item of a meta render item set as cull group, need to be set to my culling to the meta render it
 
         FIRST_TAG_BIT, // 8 Tags available to organize the items and filter them against
         LAST_TAG_BIT = FIRST_TAG_BIT + NUM_TAGS,
 
         __SMALLER,        // Reserved bit for spatialized item to indicate that it is smaller than expected in the cell in which it belongs (probably because it overlaps over several smaller cells)
-        __META_CULLED,    // Reserved bit for sub item of a meta render item to indicate that the culling is tied to the culling of the meta render item, not this one
 
         NUM_FLAGS,      // Not a valid flag
     };
@@ -124,8 +124,8 @@ public:
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
-        Builder& withCullGroup() { _flags.set(CULL_GROUP); return (*this); }
-        Builder& withMetaCulled() { _flags.set(__META_CULLED); return (*this); }
+        Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
+        Builder& withSubMetaCulled() { _flags.set(SUB_META_CULLED); return (*this); }
 
         Builder& withTag(Tag tag) { _flags.set(FIRST_TAG_BIT + tag); return (*this); }
         // Set ALL the tags in one call using the Tag bits
@@ -163,8 +163,11 @@ public:
     bool isLayered() const { return _flags[LAYERED]; }
     bool isSpatial() const { return !isLayered(); }
 
-    bool isCullGroup() const { return _flags[CULL_GROUP]; }
-    void setCullGroup(bool cullGroup) { (cullGroup ? _flags.set(CULL_GROUP) : _flags.reset(CULL_GROUP)); }
+    bool isMetaCullGroup() const { return _flags[META_CULL_GROUP]; }
+    void setMetaCullGroup(bool cullGroup) { (cullGroup ? _flags.set(META_CULL_GROUP) : _flags.reset(META_CULL_GROUP)); }
+
+    bool isSubMetaCulled() const { return _flags[SUB_META_CULLED]; }
+    void setSubMetaCulled(bool metaCulled) { (metaCulled ? _flags.set(SUB_META_CULLED) : _flags.reset(SUB_META_CULLED)); }
 
     bool isTag(Tag tag) const { return _flags[FIRST_TAG_BIT + tag]; }
     uint8_t getTagBits() const { return ((_flags.to_ulong() & KEY_TAG_BITS_MASK) >> FIRST_TAG_BIT); }
@@ -173,9 +176,6 @@ public:
     bool isSmall() const { return _flags[__SMALLER]; }
     void setSmaller(bool smaller) { (smaller ? _flags.set(__SMALLER) : _flags.reset(__SMALLER)); }
 
-    bool isMetaCulled() const { return _flags[__META_CULLED]; }
-    void setMetaCulled(bool metaCulled) { (metaCulled ? _flags.set(__META_CULLED) : _flags.reset(__META_CULLED)); }
-
     bool operator==(const ItemKey& key) { return (_flags == key._flags); }
     bool operator!=(const ItemKey& key) { return (_flags != key._flags); }
 };
@@ -232,11 +232,11 @@ public:
         Builder& withoutLayered()       { _value.reset(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }
         Builder& withLayered()          { _value.set(ItemKey::LAYERED);  _mask.set(ItemKey::LAYERED); return (*this); }
 
-        Builder& withoutCullGroup() { _value.reset(ItemKey::CULL_GROUP); _mask.set(ItemKey::CULL_GROUP); return (*this); }
-        Builder& withCullGroup() { _value.set(ItemKey::CULL_GROUP);  _mask.set(ItemKey::CULL_GROUP); return (*this); }
+        Builder& withoutMetaCullGroup() { _value.reset(ItemKey::META_CULL_GROUP); _mask.set(ItemKey::META_CULL_GROUP); return (*this); }
+        Builder& withMetaCullGroup() { _value.set(ItemKey::META_CULL_GROUP);  _mask.set(ItemKey::META_CULL_GROUP); return (*this); }
 
-        Builder& withoutMetaCulled() { _value.reset(ItemKey::__META_CULLED); _mask.set(ItemKey::__META_CULLED); return (*this); }
-        Builder& withMetaCulled() { _value.set(ItemKey::__META_CULLED);  _mask.set(ItemKey::__META_CULLED); return (*this); }
+        Builder& withoutSubMetaCulled() { _value.reset(ItemKey::SUB_META_CULLED); _mask.set(ItemKey::SUB_META_CULLED); return (*this); }
+        Builder& withSubMetaCulled() { _value.set(ItemKey::SUB_META_CULLED);  _mask.set(ItemKey::SUB_META_CULLED); return (*this); }
 
         Builder& withoutTag(ItemKey::Tag tagIndex)    { _value.reset(ItemKey::FIRST_TAG_BIT + tagIndex);  _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
         Builder& withTag(ItemKey::Tag tagIndex)       { _value.set(ItemKey::FIRST_TAG_BIT + tagIndex);  _mask.set(ItemKey::FIRST_TAG_BIT + tagIndex); return (*this); }
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index 14a5a632ad..7b9765dca1 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -30,7 +30,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
     const auto culledSpatialSelection = task.addJob<CullSpatialSelection>("CullSceneSelection", cullInputs, cullFunctor, RenderDetails::ITEM);
 
     // Overlays are not culled
-    const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withoutMetaCulled().withTagBits(tagBits, tagMask);
+    const ItemFilter overlayfilter = ItemFilter::Builder().withVisible().withoutSubMetaCulled().withTagBits(tagBits, tagMask);
     const auto nonspatialFilter = render::Varying(overlayfilter);
     const auto nonspatialSelection = task.addJob<FetchNonspatialItems>("FetchOverlaySelection", nonspatialFilter);
 

From 8853bd63884450383ed3a5aeed6f310c3d54ca49 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 14 Feb 2018 11:11:28 -0800
Subject: [PATCH 227/569] Fix spectator camera crash

---
 interface/src/Application.cpp                 |  1 +
 .../display-plugins/OpenGLDisplayPlugin.cpp   | 43 +++++++++++--------
 .../src/display-plugins/OpenGLDisplayPlugin.h |  2 +-
 libraries/gl/src/gl/OffscreenGLCanvas.cpp     | 27 ++++++++++++
 libraries/gl/src/gl/OffscreenGLCanvas.h       |  3 ++
 .../qml/src/qml/impl/RenderEventHandler.cpp   |  1 +
 plugins/openvr/src/OpenVrDisplayPlugin.cpp    |  2 +-
 7 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0eb36173c2..5a340f471e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2338,6 +2338,7 @@ void Application::initializeGL() {
         qFatal("Unable to make offscreen context current");
     }
     _offscreenContext->doneCurrent();
+    _offscreenContext->setThreadContext();
     _renderEventHandler = new RenderEventHandler(_glWidget->qglContext());
 
     // The UI can't be created until the primary OpenGL
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 40dcf1b8c7..9bd7d89634 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -27,6 +27,7 @@
 #include <gl/GLWidget.h>
 #include <gl/GLEscrow.h>
 #include <gl/Context.h>
+#include <gl/OffscreenGLCanvas.h>
 
 #include <gpu/Texture.h>
 #include <gpu/StandardShaderLib.h>
@@ -130,14 +131,14 @@ public:
         CHECK_GL_ERROR();
         _context->doneCurrent();
         while (!_shutdown) {
-            if (_pendingMainThreadOperation) {
+            if (_pendingOtherThreadOperation) {
                 PROFILE_RANGE(render, "MainThreadOp")
                 {
                     Lock lock(_mutex);
                     _context->doneCurrent();
                     // Move the context to the main thread
-                    _context->moveToThread(qApp->thread());
-                    _pendingMainThreadOperation = false;
+                    _context->moveToThread(_targetOperationThread);
+                    _pendingOtherThreadOperation = false;
                     // Release the main thread to do it's action
                     _condition.notify_one();
                 }
@@ -146,7 +147,7 @@ public:
                 {
                     // Main thread does it's thing while we wait on the lock to release
                     Lock lock(_mutex);
-                    _condition.wait(lock, [&] { return _finishedMainThreadOperation; });
+                    _condition.wait(lock, [&] { return _finishedOtherThreadOperation; });
                 }
             }
 
@@ -214,23 +215,25 @@ public:
         _condition.notify_one();
     }
 
-    void withMainThreadContext(std::function<void()> f) {
+    void withOtherThreadContext(std::function<void()> f) {
         // Signal to the thread that there is work to be done on the main thread
         Lock lock(_mutex);
-        _pendingMainThreadOperation = true;
-        _finishedMainThreadOperation = false;
-        _condition.wait(lock, [&] { return !_pendingMainThreadOperation; });
+        _targetOperationThread = QThread::currentThread();
+        _pendingOtherThreadOperation = true;
+        _finishedOtherThreadOperation = false;
+        _condition.wait(lock, [&] { return !_pendingOtherThreadOperation; });
 
         _context->makeCurrent();
         f();
         _context->doneCurrent();
 
+        _targetOperationThread = nullptr;
         // Move the context back to the presentation thread
         _context->moveToThread(this);
 
         // restore control of the context to the presentation thread and signal
         // the end of the operation
-        _finishedMainThreadOperation = true;
+        _finishedOtherThreadOperation = true;
         lock.unlock();
         _condition.notify_one();
     }
@@ -244,9 +247,11 @@ private:
     Mutex _mutex;
     // Used to allow the main thread to perform context operations
     Condition _condition;
-    bool _pendingMainThreadOperation { false };
-    bool _finishedMainThreadOperation { false };
-    QThread* _mainThread { nullptr };
+
+
+    QThread* _targetOperationThread { nullptr };
+    bool _pendingOtherThreadOperation { false };
+    bool _finishedOtherThreadOperation { false };
     std::queue<OpenGLDisplayPlugin*> _newPluginQueue;
     gl::Context* _context { nullptr };
 };
@@ -744,10 +749,12 @@ void OpenGLDisplayPlugin::swapBuffers() {
     context->swapBuffers();
 }
 
-void OpenGLDisplayPlugin::withMainThreadContext(std::function<void()> f) const {
+void OpenGLDisplayPlugin::withOtherThreadContext(std::function<void()> f) const {
     static auto presentThread = DependencyManager::get<PresentThread>();
-    presentThread->withMainThreadContext(f);
-    _container->makeRenderingContextCurrent();
+    presentThread->withOtherThreadContext(f);
+    if (!OffscreenGLCanvas::restoreThreadContext()) {
+        qWarning("Unable to restore original OpenGL context");
+    }
 }
 
 bool OpenGLDisplayPlugin::setDisplayTexture(const QString& name) {
@@ -784,7 +791,7 @@ QImage OpenGLDisplayPlugin::getScreenshot(float aspectRatio) const {
     }
     auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
     QImage screenshot(bestSize.x, bestSize.y, QImage::Format_ARGB32);
-    withMainThreadContext([&] {
+    withOtherThreadContext([&] {
         glBackend->downloadFramebuffer(_compositeFramebuffer, ivec4(corner, bestSize), screenshot);
     });
     return screenshot.mirrored(false, true);
@@ -797,7 +804,7 @@ QImage OpenGLDisplayPlugin::getSecondaryCameraScreenshot() const {
 
     auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
     QImage screenshot(region.z, region.w, QImage::Format_ARGB32);
-    withMainThreadContext([&] {
+    withOtherThreadContext([&] {
         glBackend->downloadFramebuffer(secondaryCameraFramebuffer, region, screenshot);
     });
     return screenshot.mirrored(false, true);
@@ -886,7 +893,7 @@ void OpenGLDisplayPlugin::updateCompositeFramebuffer() {
 void OpenGLDisplayPlugin::copyTextureToQuickFramebuffer(NetworkTexturePointer networkTexture, QOpenGLFramebufferObject* target, GLsync* fenceSync) {
 #if !defined(USE_GLES)
     auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
-    withMainThreadContext([&] {
+    withOtherThreadContext([&] {
         GLuint sourceTexture = glBackend->getTextureID(networkTexture->getGPUTexture());
         GLuint targetTexture = target->texture();
         GLuint fbo[2] {0, 0};
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 1176471b40..bf06486095 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -119,7 +119,7 @@ protected:
     void renderFromTexture(gpu::Batch& batch, const gpu::TexturePointer texture, glm::ivec4 viewport, const glm::ivec4 scissor);
     virtual void updateFrameData();
 
-    void withMainThreadContext(std::function<void()> f) const;
+    void withOtherThreadContext(std::function<void()> f) const;
 
     void present();
     virtual void swapBuffers();
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index 380ba085cc..1bde9e289e 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -16,6 +16,7 @@
 
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QDebug>
+#include <QtCore/QThread>
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLDebugLogger>
@@ -119,3 +120,29 @@ void OffscreenGLCanvas::moveToThreadWithContext(QThread* thread) {
     moveToThread(thread);
     _context->moveToThread(thread);
 }
+
+static const char* THREAD_CONTEXT_PROPERTY = "offscreenGlCanvas";
+
+void OffscreenGLCanvas::setThreadContext() {
+    QThread::currentThread()->setProperty(THREAD_CONTEXT_PROPERTY, QVariant::fromValue<QObject*>(this));
+}
+
+bool OffscreenGLCanvas::restoreThreadContext() {
+    // Restore the rendering context for this thread
+    auto threadCanvasVariant = QThread::currentThread()->property(THREAD_CONTEXT_PROPERTY);
+    if (!threadCanvasVariant.isValid()) {
+        return false;
+    }
+
+    auto threadCanvasObject = qvariant_cast<QObject*>(threadCanvasVariant);
+    auto threadCanvas = static_cast<OffscreenGLCanvas*>(threadCanvasObject);
+    if (!threadCanvas) {
+        return false;
+    }
+
+    if (!threadCanvas->makeCurrent()) {
+        qFatal("Unable to restore Offscreen rendering context");
+    }
+
+    return true;
+}
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.h b/libraries/gl/src/gl/OffscreenGLCanvas.h
index be0e0d9678..ed644b98fb 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.h
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.h
@@ -32,6 +32,9 @@ public:
     }
     QObject* getContextObject();
     
+    void setThreadContext();
+    static bool restoreThreadContext();
+
 private slots:
     void onMessageLogged(const QOpenGLDebugMessage &debugMessage);
 
diff --git a/libraries/qml/src/qml/impl/RenderEventHandler.cpp b/libraries/qml/src/qml/impl/RenderEventHandler.cpp
index cce1b68da9..6b66ce9314 100644
--- a/libraries/qml/src/qml/impl/RenderEventHandler.cpp
+++ b/libraries/qml/src/qml/impl/RenderEventHandler.cpp
@@ -58,6 +58,7 @@ void RenderEventHandler::onInitalize() {
         return;
     }
 
+    _canvas.setThreadContext();
     if (!_canvas.makeCurrent()) {
         qFatal("Unable to make QML rendering context current on render thread");
     }
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index 4b5f0e6517..2949e72c74 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -485,7 +485,7 @@ bool OpenVrDisplayPlugin::internalActivate() {
     if (_threadedSubmit) {
         _submitThread = std::make_shared<OpenVrSubmitThread>(*this);
         if (!_submitCanvas) {
-            withMainThreadContext([&] {
+            withOtherThreadContext([&] {
                 _submitCanvas = std::make_shared<gl::OffscreenContext>();
                 _submitCanvas->create();
                 _submitCanvas->doneCurrent();

From a92765a83a3578572c1ce9951c807d417b6744f5 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 12:01:30 -0800
Subject: [PATCH 228/569] Adding can cast shadow property.

---
 .../entities/src/EntityItemProperties.cpp     |  9 +++++
 libraries/entities/src/EntityItemProperties.h |  2 +-
 libraries/entities/src/EntityPropertyFlags.h  |  2 +-
 libraries/entities/src/ModelEntityItem.cpp    |  8 ++--
 libraries/entities/src/ShapeEntityItem.cpp    |  6 +--
 scripts/system/html/entityProperties.html     | 38 +++++++++----------
 scripts/system/html/js/entityProperties.js    | 29 ++++++++++++--
 7 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index cca4e858fa..79c36180d6 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -290,6 +290,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_MODEL_URL, modelURL);
     CHECK_PROPERTY_CHANGE(PROP_COMPOUND_SHAPE_URL, compoundShapeURL);
     CHECK_PROPERTY_CHANGE(PROP_VISIBLE, visible);
+    CHECK_PROPERTY_CHANGE(PROP_CAN_CAST_SHADOW, canCastShadow);
     CHECK_PROPERTY_CHANGE(PROP_REGISTRATION_POINT, registrationPoint);
     CHECK_PROPERTY_CHANGE(PROP_ANGULAR_VELOCITY, angularVelocity);
     CHECK_PROPERTY_CHANGE(PROP_ANGULAR_DAMPING, angularDamping);
@@ -625,6 +626,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IS_UV_MODE_STRETCH, isUVModeStretch);
     }
 
+    // Models and Shapes
+    if (_type == EntityTypes::Model || _type == EntityTypes::Shape || _type == EntityTypes::Box || _type == EntityTypes::Sphere) {
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CAN_CAST_SHADOW, canCastShadow);
+    }
+
     if (!skipDefaults && !strictSemantics) {
         AABox aaBox = getAABox();
         QScriptValue boundingBox = engine->newObject();
@@ -707,6 +713,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(angularVelocity, glmVec3, setAngularVelocity);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(angularDamping, float, setAngularDamping);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(visible, bool, setVisible);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(canCastShadow, bool, setCanCastShadow);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(color, xColor, setColor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(colorSpread, xColor, setColorSpread);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(colorStart, xColor, setColorStart);
@@ -1851,6 +1858,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         properties.getType() == EntityTypes::Box ||
         properties.getType() == EntityTypes::Sphere) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE, QString, setShape);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     }
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
@@ -1974,6 +1982,7 @@ void EntityItemProperties::markAllChanged() {
     _angularDampingChanged = true;
     _nameChanged = true;
     _visibleChanged = true;
+    _canCastShadowChanged = true;
     _colorChanged = true;
     _alphaChanged = true;
     _modelURLChanged = true;
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 8feebd3979..ec10910092 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -128,7 +128,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
-    DEFINE_PROPERTY(PROP_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAST_SHADOW);
+    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAST_SHADOW);
     DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
     DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
     DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index d2de67735c..ab17f2a873 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -31,7 +31,7 @@ enum EntityPropertyList {
     PROP_SCRIPT,
 
     // these properties are supported by some derived classes
-    PROP_CAST_SHADOW,
+    PROP_CAN_CAST_SHADOW,
     PROP_COLOR,
 
     // these are used by models only
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 6d15fded31..7c14d8a4a0 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -116,7 +116,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     const unsigned char* dataAt = data;
     bool animationPropertiesChanged = false;
 
-    READ_ENTITY_PROPERTY(PROP_CAST_SHADOW, bool, setCanCastShadow);
+    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_MODEL_URL, QString, setModelURL);
     READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
@@ -153,7 +153,7 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
-    requestedProperties += PROP_CAST_SHADOW;
+    requestedProperties += PROP_CAN_CAST_SHADOW;
     requestedProperties += PROP_MODEL_URL;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_TEXTURES;
@@ -178,7 +178,7 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
     bool successPropertyFits = true;
 
-    APPEND_ENTITY_PROPERTY(PROP_CAST_SHADOW, getCanCastShadow());
+    APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_MODEL_URL, getModelURL());
     APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, getCompoundShapeURL());
@@ -619,6 +619,7 @@ void ModelEntityItem::setColor(const rgbColor& value) {
     });
 }
 
+#pragma optimize("", off)
 void ModelEntityItem::setColor(const xColor& value) {
     withWriteLock([&] {
         _color[RED_INDEX] = value.red;
@@ -666,7 +667,6 @@ bool ModelEntityItem::getAnimationLoop() const {
     });
 }
 
-
 void ModelEntityItem::setAnimationHold(bool hold) { 
     withWriteLock([&] {
         _animationProperties.setHold(hold);
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 22c3bab4f3..9d81e850df 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -157,7 +157,7 @@ int ShapeEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_SHAPE, QString, setShape);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
-    READ_ENTITY_PROPERTY(PROP_CAST_SHADOW, bool, setCanCastShadow);
+    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
 
     return bytesRead;
 }
@@ -169,7 +169,7 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_SHAPE;
     requestedProperties += PROP_COLOR;
     requestedProperties += PROP_ALPHA;
-    requestedProperties += PROP_CAST_SHADOW;
+    requestedProperties += PROP_CAN_CAST_SHADOW;
 
     return requestedProperties;
 }
@@ -186,7 +186,7 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
-    APPEND_ENTITY_PROPERTY(PROP_CAST_SHADOW, getCanCastShadow());
+    APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
 }
 
 void ShapeEntityItem::setColor(const rgbColor& value) {
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 856ca3c6e1..1420e85b11 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -42,25 +42,28 @@
             </div>
         </fieldset>
 
-
         <fieldset id="general" class="major">
             <div class="shape-group shape-section property dropdown" id="shape-list">
                 <label for="property-shape">Shape</label>
                 <select name="SelectShape" id="property-shape">
-                        <option value="Cube">Box</option>
-                        <option value="Sphere">Sphere</option>
-                        <option value="Tetrahedron">Tetrahedron</option>
-                        <option value="Octahedron">Octahedron</option>
-                        <option value="Icosahedron">Icosahedron</option>
-                        <option value="Dodecahedron">Dodecahedron</option>
-                        <option value="Hexagon">Hexagon</option>
-                        <option value="Triangle">Triangle</option>
-                        <option value="Octagon">Octagon</option>
-                        <option value="Cylinder">Cylinder</option>
-                        <option value="Cone">Cone</option>
-                        <option value="Circle">Circle</option>
-                        <option value="Quad">Quad</option>
-                    </select>
+                    <option value="Cube">Box</option>
+                    <option value="Sphere">Sphere</option>
+                    <option value="Tetrahedron">Tetrahedron</option>
+                    <option value="Octahedron">Octahedron</option>
+                    <option value="Icosahedron">Icosahedron</option>
+                    <option value="Dodecahedron">Dodecahedron</option>
+                    <option value="Hexagon">Hexagon</option>
+                    <option value="Triangle">Triangle</option>
+                    <option value="Octagon">Octagon</option>
+                    <option value="Cylinder">Cylinder</option>
+                    <option value="Cone">Cone</option>
+                    <option value="Circle">Circle</option>
+                    <option value="Quad">Quad</option>
+                </select>
+            </div>
+            <div class="can-cast-shadow-section property checkbox">
+                <input type="checkbox" id="property-can-cast-shadow">
+                <label for="property-can-cast-shadow">Can cast shadow</label>
             </div>
             <div class="property text">
                 <label for="property-name">Name</label>
@@ -293,7 +296,6 @@
             </div>
         </fieldset>
 
-
         <fieldset id="behavior" class="major">
             <legend class="section-header behavior-group">
                 Behavior<span>M</span>
@@ -365,8 +367,6 @@
             </div>
         </fieldset>
 
-
-
         <fieldset id="light" class="major">
             <legend class="section-header light-group light-section">
                 Light<span>M</span>
@@ -400,7 +400,6 @@
             </fieldset>
         </fieldset>
 
-
         <fieldset id="model" class="major">
             <legend class="section-header model-group model-section zone-section">
                 Model<span>M</span>
@@ -484,7 +483,6 @@
             </fieldset>
         </fieldset>
 
-
         <fieldset id="zone" class="major">
             <legend class="section-header zone-group zone-section">
                 Zone<span>M</span>
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 7e8827a9b5..846a1da21a 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -595,6 +595,8 @@ function loaded() {
 
         var elShape = document.getElementById("property-shape");
 
+        var elCanCastShadow = document.getElementById("property-can-cast-shadow");
+
         var elLightSpotLight = document.getElementById("property-light-spot-light");
         var elLightColor = document.getElementById("property-light-color");
         var elLightColorRed = document.getElementById("property-light-color-red");
@@ -799,7 +801,6 @@ function loaded() {
 
                         elLocked.checked = properties.locked;
 
-
                         elName.value = properties.name;
 
                         elVisible.checked = properties.visible;
@@ -966,6 +967,12 @@ function loaded() {
                                                                      properties.color.green + "," + properties.color.blue + ")";
                         }
 
+                        if (properties.type === "Model" ||
+                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
+
+                            elCanCastShadow = properties.canCastShadow;
+                        }
+
                         if (properties.type === "Model") {
                             elModelURL.value = properties.modelURL;
                             elShapeType.value = properties.shapeType;
@@ -1012,7 +1019,6 @@ function loaded() {
                             elLightFalloffRadius.value = properties.falloffRadius.toFixed(1);
                             elLightExponent.value = properties.exponent.toFixed(2);
                             elLightCutoff.value = properties.cutoff.toFixed(2);
-
                         } else if (properties.type === "Zone") {
                             // Key light
                             elZoneKeyLightModeInherit.checked = (properties.keyLightMode === 'inherit');
@@ -1093,13 +1099,15 @@ function loaded() {
                             // Show/hide sections as required
                             showElements(document.getElementsByClassName('skybox-section'),
                                 elZoneSkyboxModeEnabled.checked);
+
                             showElements(document.getElementsByClassName('keylight-section'),
                                 elZoneKeyLightModeEnabled.checked);
+
                             showElements(document.getElementsByClassName('ambient-section'),
                                 elZoneAmbientLightModeEnabled.checked);
+
                             showElements(document.getElementsByClassName('haze-section'),
                                 elZoneHazeModeEnabled.checked);
-
                         } else if (properties.type === "PolyVox") {
                             elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2);
                             elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2);
@@ -1111,6 +1119,15 @@ function loaded() {
                             elZTextureURL.value = properties.zTextureURL;
                         }
 
+                        // Only these types can cast a shadow
+                        if (properties.type === "Model" ||
+                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
+
+                            showElements(document.getElementsByClassName('can-cast-shadow-section'), true);
+                        } else {
+                            showElements(document.getElementsByClassName('can-cast-shadow-section'), false);
+                        }
+
                         if (properties.locked) {
                             disableProperties();
                             elLocked.removeAttribute('disabled');
@@ -1356,6 +1373,12 @@ function loaded() {
 
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
+        if (properties.type === "Model" ||
+            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
+
+            elCanCastShadow.addEventListener('change', createEmitTextPropertyUpdateFunction('canCastShadow'));
+        }
+
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));
         elWebDPI.addEventListener('change', createEmitNumberPropertyUpdateFunction('dpi', 0));
 

From 624018147494aabe6a234af110985719e4b8eb88 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 15:37:10 -0800
Subject: [PATCH 229/569] initial separation of content settings and domain
 settings

---
 .../resources/describe-settings.json          |    4 +
 .../resources/web/base-settings-scripts.html  |    7 +
 .../resources/web/base-settings.html          |   51 +
 .../resources/web/content/index.shtml         |   52 +-
 .../resources/web/content/js/content.js       |    2 +
 domain-server/resources/web/css/style.css     |   80 +
 domain-server/resources/web/header.html       |   45 +-
 .../resources/web/images/hmd-w-eyes.svg       |   10 +
 .../resources/web/js/base-settings.js         | 1140 +++++++
 .../{settings => }/js/bootstrap-switch.min.js |    0
 .../resources/web/js/domain-server.js         |   41 +-
 .../web/{settings => }/js/form2js.min.js      |    0
 domain-server/resources/web/js/shared.js      |    6 +-
 .../resources/web/js/underscore-min.js        |    1 -
 .../resources/web/settings/index.shtml        |  111 +-
 .../resources/web/settings/js/settings.js     | 2955 +++++------------
 domain-server/src/DomainServer.cpp            |    2 +-
 .../src/DomainServerSettingsManager.cpp       |  194 +-
 .../src/DomainServerSettingsManager.h         |   19 +-
 .../embedded-webserver/src/HTTPManager.cpp    |    2 +-
 20 files changed, 2485 insertions(+), 2237 deletions(-)
 create mode 100644 domain-server/resources/web/base-settings-scripts.html
 create mode 100644 domain-server/resources/web/base-settings.html
 create mode 100644 domain-server/resources/web/images/hmd-w-eyes.svg
 create mode 100644 domain-server/resources/web/js/base-settings.js
 rename domain-server/resources/web/{settings => }/js/bootstrap-switch.min.js (100%)
 rename domain-server/resources/web/{settings => }/js/form2js.min.js (100%)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index c6d118a87b..705d110542 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -935,6 +935,7 @@
           "name": "persistent_scripts",
           "type": "table",
           "label": "Persistent Scripts",
+          "content_setting": true,
           "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
           "can_add_new_rows": true,
           "columns": [
@@ -1105,6 +1106,7 @@
           "label": "Zones",
           "help": "In this table you can define a set of zones in which you can specify various audio properties.",
           "numbered": false,
+          "content_setting": true,
           "can_add_new_rows": true,
           "key": {
             "name": "name",
@@ -1155,6 +1157,7 @@
           "type": "table",
           "label": "Attenuation Coefficients",
           "help": "In this table you can set custom attenuation coefficients between audio zones",
+          "content_setting": true,
           "numbered": true,
           "can_order": true,
           "can_add_new_rows": true,
@@ -1185,6 +1188,7 @@
           "label": "Reverb Settings",
           "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet/dry mix of 25%. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet/dry mix of 50%.",
           "numbered": true,
+          "content_setting": true,
           "can_add_new_rows": true,
           "columns": [
             {
diff --git a/domain-server/resources/web/base-settings-scripts.html b/domain-server/resources/web/base-settings-scripts.html
new file mode 100644
index 0000000000..fe370c4675
--- /dev/null
+++ b/domain-server/resources/web/base-settings-scripts.html
@@ -0,0 +1,7 @@
+<script src='/js/underscore-min.js'></script>
+<script src='/js/underscore-keypath.min.js'></script>
+<script src='/js/bootbox.min.js'></script>
+<script src='/js/form2js.min.js'></script>
+<script src='/js/bootstrap-switch.min.js'></script>
+<script src='/js/shared.js'></script>
+<script src='/js/base-settings.js'></script>
diff --git a/domain-server/resources/web/base-settings.html b/domain-server/resources/web/base-settings.html
new file mode 100644
index 0000000000..13787b5fbe
--- /dev/null
+++ b/domain-server/resources/web/base-settings.html
@@ -0,0 +1,51 @@
+<div class="col-md-10 col-md-offset-1 col-xs-12">
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="alert" style="display:none;"></div>
+    </div>
+  </div>
+
+  <div class="row">
+
+    <div class="col-xs-12">
+      <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <span class="alert-link">
+          <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains
+        </span>
+      </div>
+
+      <form id="settings-form" role="form">
+        <script id="panels-template" type="text/template">
+          <% _.each(descriptions, function(group){ %>
+            <% if (!group.hidden) { %>
+
+              <% var settings = _.partition(group.settings, function(value, index) { %>
+                <% return !value.deprecated %>
+              <% })[0] %>
+
+              <% isGrouped = !!group.name %>
+              <% panelID = isGrouped ? group.name : group.html_id %>
+
+              <div id="<%- panelID %>_group" class="anchor"></div>
+              <div class="panel panel-default<%- (isGrouped) ? ' grouped' : '' %>"
+                   id="<%- panelID %>">
+                <div class="panel-heading">
+                  <h3 class="panel-title"><%- group.label %></h3>
+                  <span class="badge"></span>
+                </div>
+                <div class="panel-body">
+                  <% _.each(settings, function(setting) { %>
+                    <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
+                    <%= getFormGroup(keypath, setting, values, false) %>
+                  <% }); %>
+                </div>
+              </div>
+            <% } %>
+          <% }); %>
+        </script>
+        <div id="panels"></div>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/domain-server/resources/web/content/index.shtml b/domain-server/resources/web/content/index.shtml
index 0e48c1eff8..9b507f7826 100644
--- a/domain-server/resources/web/content/index.shtml
+++ b/domain-server/resources/web/content/index.shtml
@@ -1,45 +1,19 @@
 <!--#include virtual="header.html"-->
 
-<div class="col-md-10 col-md-offset-1">
-  <div class="row">
-    <div class="col-xs-12">
-      <div class="alert" style="display:none;"></div>
-    </div>
-  </div>
+<script type="text/javascript">
+   var Settings = {
+      content_settings: true,
+      endpoint: "/content-settings.json",
+      path: "/content/"
+   };
+</script>
 
-  <div class="row">
-    <div class="col-xs-12">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-title">Upload Entities File</h3>
-        </div>
-        <form id="upload-form" action="upload" enctype="multipart/form-data" method="post">
-          <div class="panel-body">
-            <p>
-              Upload an entities file (e.g.: models.json.gz) to replace the content of this domain.<br>
-              Note: <strong>Your domain's content will be replaced by the content you upload</strong>, but the backup files of your domain's content will not immediately be changed.
-            </p>
-            <p>If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:</p>
-            <label class="control-label">Windows</label>
-            <pre>C:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz</pre>
-            <label class="control-label">OSX</label>
-            <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
-            <label class="control-label">Linux</label>
-            <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
-            <br>
-            <input type="file" name="entities-file" class="form-control-file" accept=".json, .gz">
-            <br>
-          </div>
-          <div class="panel-footer">
-            <input type="submit" class="btn btn-info" value="Upload">
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
+<!--#include virtual="base-settings.html"-->
 
 <!--#include virtual="footer.html"-->
-<script src='js/content.js'></script>
-<script src='/js/sweetalert.min.js'></script>
+
+<!--#include virtual="base-settings-scripts.html"-->
+
+<script src="js/content.js"></script>
+
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 2e6e084164..7b2ed37b15 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -1,5 +1,7 @@
 $(document).ready(function(){
 
+  Settings.afterReloadActions = function() {};
+
   function showSpinnerAlert(title) {
     swal({
       title: title,
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 158008fc2b..22de75a778 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -18,6 +18,14 @@ body {
   margin-top: 70px;
 }
 
+/* unfortunate hack so that anchors go to the right place with fixed navbar */
+:target:before {
+  content: " ";
+  display: block;
+  height: 70px;
+  margin-top: -70px;
+}
+
 [hidden] {
   display: none !important;
 }
@@ -345,3 +353,75 @@ table .headers + .headers td {
   text-align: center;
   margin-top: 20px;
 }
+
+@media (min-width: 768px) {
+  ul.nav li.dropdown-on-hover:hover ul.dropdown-menu {
+    display: block;
+  }
+}
+
+ul.nav li.dropdown ul.dropdown-menu {
+  padding: 0px 0px;
+}
+
+ul.nav li.dropdown li a {
+  padding-top: 7px;
+  padding-bottom: 7px;
+}
+
+ul.nav li.dropdown li a:hover {
+  color: white;
+  background-color: #337ab7;
+}
+
+ul.nav li.dropdown ul.dropdown-menu .divider {
+  margin: 0px 0;
+}
+
+#visit-domain-link {
+  background-color: transparent;
+}
+
+.navbar-btn {
+  margin-left: 10px;
+}
+
+#save-settings-xs-button {
+  float: right;
+  margin-right: 10px;
+}
+
+#button-bars {
+  display: inline-block;
+  float: left;
+}
+
+#hamburger-badge {
+  position: relative;
+  top: -2px;
+  float: left;
+  margin-right: 10px;
+  margin-left: 0px;
+}
+
+#restart-server {
+  margin-left: 0px;
+}
+
+#restart-server:hover {
+  text-decoration: none;
+}
+
+.badge {
+  margin-left: 5px;
+}
+
+.panel-title {
+  display: inline-block;
+}
+
+#visit-hmd-icon {
+  width: 25px;
+  position: relative;
+  top: -1px;
+}
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 1e32e9f02f..aff82d557e 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -17,30 +17,47 @@
       <div class="container-fluid">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#collapsed-navbar">
             <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
+            <span id="hamburger-badge" class="badge"></span>
+
+            <div id="button-bars">
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </div>
           </button>
+
+          <button id="save-settings-xs-button" class="save-button btn btn-success navbar-btn hidden-sm hidden-md hidden-lg" role="button" style="display: none;" disabled>Save</button>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+        <div class="collapse navbar-collapse" id="collapsed-navbar">
           <ul class="nav navbar-nav">
             <li><a href="/">Nodes</a></li>
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Assignments <span class="caret"></span></a>
-                <ul class="dropdown-menu" role="menu">
-                  <li><a href="/assignment">New Assignment</a></li>
-                </ul>
+            <li><a href="/assignment">Assignment</a></li>
+
+            <li class="dropdown dropdown-on-hover">
+              <a href="/content/" class="hidden-xs">Content <span class="content-settings-badge badge"></span> <span class="caret"></span></a>
+              <a href="#" class="dropdown-toggle hidden-sm hidden-md hidden-lg" data-toggle="dropdown">Content <span class="content-badge badge"></span> <span class="caret"></span></a>
+              <ul id="content-settings-nav-dropdown" class="dropdown-menu" role="menu">
+              </ul>
+            </li>
+
+            <li class="dropdown dropdown-on-hover">
+              <a href="/settings/" class="hidden-xs">Settings <span class="domain-settings-badge badge"></span> <span class="caret"></span></a>
+              <a href="#" class="dropdown-toggle hidden-sm hidden-md hidden-lg" data-toggle="dropdown">Settings <span class="domain-settings-badge badge"></span> <span class="caret"></span></a>
+              <ul id="domain-settings-nav-dropdown" class="dropdown-menu" role="menu">
+              </ul>
             </li>
-            <li><a href="/content/">Content</a></li>
-            <li><a href="/settings/">Settings</a></li>
           </ul>
           <ul class="nav navbar-right navbar-nav">
-            <li><a id="visit-domain-link" class="blue-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
-            <li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
+            <a id="visit-domain-link" class="btn btn-default navbar-btn" role="button" target="_blank" style="display: none;">
+              <img id="visit-hmd-icon" src="/images/hmd-w-eyes.svg" alt="Head-mounted display" />
+              Visit in VR
+            </a>
+            <button id="save-settings-button" class="save-button btn btn-success navbar-btn hidden-xs" role="button" style="display: none;" disabled>Save</button>
+            <a href="#" id="restart-server" class="navbar-btn btn btn-link"><span class="glyphicon glyphicon-refresh"></span> Restart</a>
           </ul>
         </div>
       </div><!-- /.container-fluid -->
diff --git a/domain-server/resources/web/images/hmd-w-eyes.svg b/domain-server/resources/web/images/hmd-w-eyes.svg
new file mode 100644
index 0000000000..c100de2f4e
--- /dev/null
+++ b/domain-server/resources/web/images/hmd-w-eyes.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 456 244" style="enable-background:new 0 0 456 244;" xml:space="preserve">
+<path d="M352.8,3.4h-250C49.6,3.4,6.3,46.2,6.3,98.9v44.9c0,52.7,43.3,95.5,96.5,95.5h67.6c19.4,0,31.9-17.9,42.9-33.6
+	c4.2-6.1,11.1-15.9,14.8-17.9c3.6,2.1,10.4,12.2,14.5,18.4c10.4,15.5,22.1,33.1,40.3,33.1h69.9c53.3,0,96.5-42.9,96.5-95.5V98.9
+	C449.3,46.2,406,3.4,352.8,3.4z M129.6,157.6c-22.4,0-40.6-18.2-40.6-40.6s18.2-40.6,40.6-40.6c22.4,0,40.6,18.2,40.6,40.6
+	S151.9,157.6,129.6,157.6z M328.4,157.6c-22.4,0-40.6-18.2-40.6-40.6s18.2-40.6,40.6-40.6c22.4,0,40.6,18.2,40.6,40.6
+	S350.8,157.6,328.4,157.6z"/>
+</svg>
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
new file mode 100644
index 0000000000..5e32463d61
--- /dev/null
+++ b/domain-server/resources/web/js/base-settings.js
@@ -0,0 +1,1140 @@
+var DomainInfo = null;
+
+var viewHelpers = {
+  getFormGroup: function(keypath, setting, values, isAdvanced) {
+    form_group = "<div class='form-group " +
+        (isAdvanced ? Settings.ADVANCED_CLASS : "") + " " +
+        (setting.deprecated ? Settings.DEPRECATED_CLASS : "" ) + "' " +
+        "data-keypath='" + keypath + "'>";
+    setting_value = _(values).valueForKeyPath(keypath);
+
+    if (_.isUndefined(setting_value) || _.isNull(setting_value)) {
+      if (_.has(setting, 'default')) {
+        setting_value = setting.default;
+      } else {
+        setting_value = "";
+      }
+    }
+
+    label_class = 'control-label';
+
+    function common_attrs(extra_classes) {
+      extra_classes = (!_.isUndefined(extra_classes) ? extra_classes : "");
+      return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
+        + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
+        + setting.name + "' name='" + keypath + "' "
+        + "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "'";
+    }
+
+    if (setting.type === 'checkbox') {
+      if (setting.label) {
+        form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
+      }
+
+      form_group += "<div class='toggle-checkbox-container'>"
+      form_group += "<input type='checkbox'" + common_attrs('toggle-checkbox') + (setting_value ? "checked" : "") + "/>"
+
+      if (setting.help) {
+        form_group += "<span class='help-block checkbox-help'>" + setting.help + "</span>";
+      }
+
+      form_group += "</div>"
+    } else {
+      input_type = _.has(setting, 'type') ? setting.type : "text"
+
+      if (setting.label) {
+        form_group += "<label for='" + keypath + "' class='" + label_class + "'>" + setting.label + "</label>";
+      }
+
+      if (input_type === 'table') {
+        form_group += makeTable(setting, keypath, setting_value)
+      } else {
+        if (input_type === 'select') {
+          form_group += "<select class='form-control' data-hidden-input='" + keypath + "'>'"
+          _.each(setting.options, function(option) {
+            form_group += "<option value='" + option.value + "'" +
+            (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
+          });
+
+          form_group += "</select>"
+
+          form_group += "<input type='hidden'" + common_attrs() + "value='" + setting_value + "'>"
+        } else if (input_type === 'button') {
+          // Is this a button that should link to something directly?
+          // If so, we use an anchor tag instead of a button tag
+
+          if (setting.href) {
+            form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
+              + common_attrs("btn " + setting.classes) + " target='_blank'>"
+              + setting.button_label + "</a>";
+          } else {
+            form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
+              + setting.button_label + "</button>";
+          }
+
+        } else {
+
+          if (input_type == 'integer') {
+            input_type = "text"
+          }
+
+          form_group += "<input type='" + input_type + "'" +  common_attrs() +
+            "placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
+            "' value='" + (_.has(setting, 'password_placeholder') ? setting.password_placeholder : setting_value) + "'/>"
+        }
+
+        form_group += "<span class='help-block'>" + setting.help + "</span>"
+      }
+    }
+
+    form_group += "</div>"
+    return form_group
+  }
+}
+
+function reloadSettings(callback) {
+  $.getJSON(Settings.endpoint, function(data){
+    _.extend(data, viewHelpers)
+
+    $('#panels').html(Settings.panelsTemplate(data))
+
+    Settings.data = data;
+    Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+    Settings.afterReloadActions();
+
+    // setup any bootstrap switches
+    $('.toggle-checkbox').bootstrapSwitch();
+
+    $('[data-toggle="tooltip"]').tooltip();
+
+    // call the callback now that settings are loaded
+    callback(true);
+  }).fail(function() {
+    // call the failure object since settings load faild
+    callback(false)
+  });
+}
+
+function postSettings(jsonSettings) {
+  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+  $.ajax(Settings.endpoint, {
+    data: JSON.stringify(jsonSettings),
+    contentType: 'application/json',
+    type: 'POST'
+  }).done(function(data){
+    if (data.status == "success") {
+      if ($(".save-button").html() === SAVE_BUTTON_LABEL_RESTART) {
+        showRestartModal();
+      } else {
+        location.reload(true);
+      }
+    } else {
+      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+      reloadSettings();
+    }
+  }).fail(function(){
+    showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+    reloadSettings();
+  });
+}
+
+$(document).ready(function(){
+
+  $('.save-button.navbar-btn').show();
+
+  $.ajaxSetup({
+    timeout: 20000,
+  });
+
+  reloadSettings(function(success){
+    if (success) {
+      // if there was a hash in the URL, jump to it now
+      if (location.hash) {
+        location.href = location.hash;
+      }
+    } else {
+      swal({
+        title: '',
+        type: 'error',
+        text: Strings.LOADING_SETTINGS_ERROR
+      });
+    }
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
+    addTableRow($(this).closest('tr'));
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
+    deleteTableRow($(this).closest('tr'));
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_CATEGORY_BUTTON_CLASS, function(){
+    addTableCategory($(this).closest('tr'));
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_CATEGORY_BUTTON_CLASS, function(){
+    deleteTableCategory($(this).closest('tr'));
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.TOGGLE_CATEGORY_COLUMN_CLASS, function(){
+    toggleTableCategory($(this).closest('tr'));
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
+    moveTableRow($(this).closest('tr'), true);
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
+    moveTableRow($(this).closest('tr'), false);
+  });
+
+  $('#' + Settings.FORM_ID).on('keyup', function(e){
+    var $target = $(e.target);
+    if (e.keyCode == 13) {
+      if ($target.is('table input')) {
+        // capture enter in table input
+        // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
+        sibling = $target.parent('td').next();
+
+        if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
+          // set focus to next input
+          sibling.find('input').focus();
+        } else {
+
+          // jump over the re-order row, if that's what we're on
+          if (sibling.hasClass(Settings.REORDER_BUTTONS_CLASS)) {
+            sibling = sibling.next();
+          }
+
+          // for tables with categories we add the entry and setup the new row on enter
+          if (sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).length) {
+            sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).click();
+
+            // set focus to the first input in the new row
+            $target.closest('table').find('tr.inputs input:first').focus();
+          }
+
+          var tableRows = sibling.parent();
+          var tableBody = tableRows.parent();
+
+          // if theres no more siblings, we should jump to a new row
+          if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
+              tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
+          }
+        }
+
+      } else if ($target.is('input')) {
+        $target.change().blur();
+      }
+
+      e.preventDefault();
+    }
+  });
+
+  $('#' + Settings.FORM_ID).on('keypress', function(e){
+    if (e.keyCode == 13) {
+
+      e.preventDefault();
+    }
+  });
+
+  $('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
+    // this input was changed, add the changed data attribute to it
+    $(this).attr('data-changed', true);
+
+    badgeForDifferences($(this));
+  });
+
+  $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
+    // this checkbox was changed, add the changed data attribute to it
+    $(this).attr('data-changed', true);
+
+    badgeForDifferences($(this));
+  });
+
+  // Bootstrap switch in table
+  $('#' + Settings.FORM_ID).on('change', 'input.table-checkbox', function () {
+    // Bootstrap switches in table: set the changed data attribute for all rows in table.
+    var row = $(this).closest('tr');
+    if (row.hasClass("value-row")) {  // Don't set attribute on input row switches prior to it being added to table.
+      row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
+      updateDataChangedForSiblingRows(row, true);
+      badgeForDifferences($(this));
+    }
+  });
+
+  $('#' + Settings.FORM_ID).on('change', 'input.table-time', function() {
+    // Bootstrap switches in table: set the changed data attribute for all rows in table.
+    var row = $(this).closest('tr');
+    if (row.hasClass("value-row")) {  // Don't set attribute on input row switches prior to it being added to table.
+      row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
+      updateDataChangedForSiblingRows(row, true);
+      badgeForDifferences($(this));
+    }
+  });
+
+  $('#' + Settings.FORM_ID).on('change', 'select', function(){
+    $("input[name='" +  $(this).attr('data-hidden-input') + "']").val($(this).val()).change();
+  });
+
+  var panelsSource = $('#panels-template').html();
+  Settings.panelsTemplate = _.template(panelsSource);
+});
+
+function dynamicButton(button_id, text) {
+  return $("<button type='button' id='" + button_id + "' class='btn btn-primary'>" + text + "</button>");
+}
+
+function showSpinnerAlert(title) {
+  swal({
+    title: title,
+    text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
+    html: true,
+    showConfirmButton: false,
+    allowEscapeKey: false
+  });
+}
+
+function parseJSONResponse(xhr) {
+  try {
+    return JSON.parse(xhr.responseText);
+  } catch (e) {
+  }
+  return null;
+}
+
+function validateInputs() {
+  // check if any new values are bad
+  var tables = $('table');
+
+  var inputsValid = true;
+
+  var tables = $('table');
+
+  // clear any current invalid rows
+  $('tr.' + Settings.INVALID_ROW_CLASS).removeClass(Settings.INVALID_ROW_CLASS);
+
+  function markParentRowInvalid(rowChild) {
+    $(rowChild).closest('tr').addClass(Settings.INVALID_ROW_CLASS);
+  }
+
+  _.each(tables, function(table) {
+    // validate keys specificially for spaces and equality to an existing key
+    var newKeys = $(table).find('tr.' + Settings.NEW_ROW_CLASS + ' td.key');
+
+    var keyWithSpaces = false;
+    var empty = false;
+    var duplicateKey = false;
+
+    _.each(newKeys, function(keyCell) {
+      var keyVal = $(keyCell).children('input').val();
+
+      if (keyVal.indexOf(' ') !== -1) {
+        keyWithSpaces = true;
+        markParentRowInvalid(keyCell);
+        return;
+      }
+
+      // make sure the key isn't empty
+      if (keyVal.length === 0) {
+        empty = true
+
+        markParentRowInvalid(input);
+        return;
+      }
+
+      // make sure we don't have duplicate keys in the table
+      var otherKeys = $(table).find('td.key').not(keyCell);
+      _.each(otherKeys, function(otherKeyCell) {
+        var keyInput = $(otherKeyCell).children('input');
+
+        if (keyInput.length) {
+          if ($(keyInput).val() == keyVal) {
+            duplicateKey = true;
+          }
+        } else if ($(otherKeyCell).html() == keyVal) {
+            duplicateKey = true;
+        }
+
+        if (duplicateKey) {
+          markParentRowInvalid(keyCell);
+          return;
+        }
+      });
+
+    });
+
+    if (keyWithSpaces) {
+      showErrorMessage("Error", "Key contains spaces");
+      inputsValid = false;
+      return
+    }
+
+    if (empty) {
+      showErrorMessage("Error", "Empty field(s)");
+      inputsValid = false;
+      return
+    }
+
+    if (duplicateKey) {
+      showErrorMessage("Error", "Two keys cannot be identical");
+      inputsValid = false;
+      return;
+    }
+  });
+
+  return inputsValid;
+}
+
+var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
+
+function saveSettings() {
+
+  if (validateInputs()) {
+    // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+    var canPost = true;
+
+    // disable any inputs not changed
+    $("input:not([data-changed])").each(function () {
+      $(this).prop('disabled', true);
+    });
+
+    // grab a JSON representation of the form via form2js
+    var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+    // re-enable all inputs
+    $("input").each(function () {
+      $(this).prop('disabled', false);
+    });
+
+    // remove focus from the button
+    $(this).blur();
+
+    if (Settings.handlePostSettings === undefined) {
+      console.log("----- saveSettings() called ------");
+      console.log(formJSON);
+
+      // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+      postSettings(formJSON);
+    } else {
+      Settings.handlePostSettings(formJSON)
+    }
+  }
+}
+
+$('body').on('click', '.save-button', function(e){
+  saveSettings();
+  return false;
+});
+
+function makeTable(setting, keypath, setting_value) {
+  var isArray = !_.has(setting, 'key');
+  var categoryKey = setting.categorize_by_key;
+  var isCategorized = !!categoryKey && isArray;
+
+  if (!isArray && setting.can_order) {
+    setting.can_order = false;
+  }
+
+  var html = "";
+
+  if (setting.help) {
+    html += "<span class='help-block'>" + setting.help + "</span>"
+  }
+
+  var nonDeletableRowKey = setting["non-deletable-row-key"];
+  var nonDeletableRowValues = setting["non-deletable-row-values"];
+
+  html += "<table class='table table-bordered' " +
+                 "data-short-name='" + setting.name + "' name='" + keypath + "' " +
+                 "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "' " +
+                 "data-setting-type='" + (isArray ? 'array' : 'hash') + "'>";
+
+  if (setting.caption) {
+    html += "<caption>" + setting.caption + "</caption>"
+  }
+
+  // Column groups
+  if (setting.groups) {
+    html += "<tr class='headers'>"
+    _.each(setting.groups, function (group) {
+        html += "<td colspan='" + group.span  + "'><strong>" + group.label + "</strong></td>"
+    })
+    if (!setting.read_only) {
+        if (setting.can_order) {
+            html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES +
+                    "'><a href='javascript:void(0);' class='glyphicon glyphicon-sort'></a></td>";
+        }
+        html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'></td></tr>"
+    }
+    html += "</tr>"
+  }
+
+  // Column names
+  html += "<tr class='headers'>"
+
+  if (setting.numbered === true) {
+    html += "<td class='number'><strong>#</strong></td>" // Row number
+  }
+
+  if (setting.key) {
+    html += "<td class='key'><strong>" + setting.key.label + "</strong></td>" // Key
+  }
+
+  var numVisibleColumns = 0;
+  _.each(setting.columns, function(col) {
+    if (!col.hidden) numVisibleColumns++;
+    html += "<td " + (col.hidden ? "style='display: none;'" : "") + "class='data " +
+      (col.class ? col.class : '') + "'><strong>" + col.label + "</strong></td>" // Data
+  })
+
+  if (!setting.read_only) {
+    if (setting.can_order) {
+      numVisibleColumns++;
+      html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES +
+              "'><a href='javascript:void(0);' class='glyphicon glyphicon-sort'></a></td>";
+    }
+    numVisibleColumns++;
+    html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'></td></tr>";
+  }
+
+  // populate rows in the table from existing values
+  var row_num = 1;
+
+  if (keypath.length > 0 && _.size(setting_value) > 0) {
+    var rowIsObject = setting.columns.length > 1;
+
+    _.each(setting_value, function(row, rowIndexOrName) {
+      var categoryPair = {};
+      var categoryValue = "";
+      if (isCategorized) {
+        categoryValue = rowIsObject ? row[categoryKey] : row;
+        categoryPair[categoryKey] = categoryValue;
+        if (_.findIndex(setting_value, categoryPair) === rowIndexOrName) {
+          html += makeTableCategoryHeader(categoryKey, categoryValue, numVisibleColumns, setting.can_add_new_categories, "");
+        }
+      }
+
+      html += "<tr class='" + Settings.DATA_ROW_CLASS + "' " +
+        (isCategorized ? ("data-category='" + categoryValue + "'") : "") + " " +
+        (isArray ? "" : "name='" + keypath + "." + rowIndexOrName + "'") +
+        (isArray ? Settings.DATA_ROW_INDEX + "='" + (row_num - 1) + "'" : "" ) + ">";
+
+      if (setting.numbered === true) {
+        html += "<td class='numbered'>" + row_num + "</td>"
+      }
+
+      if (setting.key) {
+          html += "<td class='key'>" + rowIndexOrName + "</td>"
+      }
+
+      var isNonDeletableRow = !setting.can_add_new_rows;
+
+      _.each(setting.columns, function(col) {
+
+        var colValue, colName;
+        if (isArray) {
+          colValue = rowIsObject ? row[col.name] : row;
+          colName = keypath + "[" + rowIndexOrName + "]" + (rowIsObject ? "." + col.name : "");
+        } else {
+          colValue = row[col.name];
+          colName = keypath + "." + rowIndexOrName + "." + col.name;
+        }
+
+        isNonDeletableRow = isNonDeletableRow
+          || (nonDeletableRowKey === col.name && nonDeletableRowValues.indexOf(colValue) !== -1);
+
+        if (isArray && col.type === "checkbox" && col.editable) {
+          html +=
+            "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
+              "<input type='checkbox' class='form-control table-checkbox' " +
+                     "name='" + colName + "'" + (colValue ? " checked" : "") + "/>" +
+            "</td>";
+        } else if (isArray && col.type === "time" && col.editable) {
+          html +=
+            "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
+              "<input type='time' class='form-control table-time' name='" + colName + "' " +
+                     "value='" + (colValue || col.default || "00:00") + "'/>" +
+            "</td>";
+        } else {
+          // Use a hidden input so that the values are posted.
+          html +=
+            "<td class='" + Settings.DATA_COL_CLASS + "' " + (col.hidden ? "style='display: none;'" : "") +
+                "name='" + colName + "'>" +
+              colValue +
+              "<input type='hidden' name='" + colName + "' value='" + colValue + "'/>" +
+            "</td>";
+        }
+
+      });
+
+      if (!setting.read_only) {
+        if (setting.can_order) {
+          html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES+
+                  "'><a href='javascript:void(0);' class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a>"
+                  + "<a href='javascript:void(0);' class='" + Settings.MOVE_DOWN_SPAN_CLASSES + "'></a></td>"
+        }
+        if (isNonDeletableRow) {
+          html += "<td></td>";
+        } else {
+          html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES
+                  + "'><a href='javascript:void(0);' class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></a></td>";
+        }
+      }
+
+      html += "</tr>"
+
+      if (isCategorized && setting.can_add_new_rows && _.findLastIndex(setting_value, categoryPair) === rowIndexOrName) {
+        html += makeTableInputs(setting, categoryPair, categoryValue);
+      }
+
+      row_num++
+    });
+  }
+
+  // populate inputs in the table for new values
+  if (!setting.read_only) {
+    if (setting.can_add_new_categories) {
+      html += makeTableCategoryInput(setting, numVisibleColumns);
+    }
+
+    if (setting.can_add_new_rows || setting.can_add_new_categories) {
+      html += makeTableHiddenInputs(setting, {}, "");
+    }
+  }
+  html += "</table>"
+
+  return html;
+}
+
+function makeTableCategoryHeader(categoryKey, categoryValue, numVisibleColumns, canRemove, message) {
+  var html =
+    "<tr class='" + Settings.DATA_CATEGORY_CLASS + "' data-key='" + categoryKey + "' data-category='" + categoryValue + "'>" +
+      "<td colspan='" + (numVisibleColumns - 1) + "' class='" + Settings.TOGGLE_CATEGORY_COLUMN_CLASS + "'>" +
+        "<span class='" + Settings.TOGGLE_CATEGORY_SPAN_CLASSES + " " + Settings.TOGGLE_CATEGORY_EXPANDED_CLASS + "'></span>" +
+        "<span message='" + message + "'>" + categoryValue + "</span>" +
+      "</td>" +
+      ((canRemove) ? (
+        "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'>" +
+          "<a href='javascript:void(0);' class='" + Settings.DEL_CATEGORY_SPAN_CLASSES + "'></a>" +
+        "</td>"
+      ) : (
+        "<td></td>"
+      )) +
+    "</tr>";
+  return html;
+}
+
+function makeTableHiddenInputs(setting, initialValues, categoryValue) {
+  var html = "<tr class='inputs'" + (setting.can_add_new_categories && !categoryValue ? " hidden" : "") + " " +
+                  (categoryValue ? ("data-category='" + categoryValue + "'") : "") + " " +
+                  (setting.categorize_by_key ? ("data-keep-field='" + setting.categorize_by_key + "'") : "") + ">";
+
+  if (setting.numbered === true) {
+    html += "<td class='numbered'></td>";
+  }
+
+  if (setting.key) {
+    html += "<td class='key' name='" + setting.key.name + "'>\
+             <input type='text' style='display: none;' class='form-control' placeholder='" + (_.has(setting.key, 'placeholder') ? setting.key.placeholder : "") + "' value=''>\
+             </td>"
+  }
+
+  _.each(setting.columns, function(col) {
+    var defaultValue = _.has(initialValues, col.name) ? initialValues[col.name] : col.default;
+    if (col.type === "checkbox") {
+      html +=
+        "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
+          "<input type='checkbox' style='display: none;' class='form-control table-checkbox' " +
+                 "name='" + col.name + "'" + (defaultValue ? " checked" : "") + "/>" +
+        "</td>";
+    } else if (col.type === "select") {
+        html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>"
+        html += "<select style='display: none;' class='form-control' data-hidden-input='" + col.name + "'>'"
+
+        for (var i in col.options) {
+            var option = col.options[i];
+            html += "<option value='" + option.value + "' " + (option.value == defaultValue ? 'selected' : '') + ">" + option.label + "</option>";
+        }
+
+        html += "</select>";
+        html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" +  defaultValue + "'></td>";
+    } else {
+      html +=
+        "<td " + (col.hidden ? "style='display: none;'" : "") + " class='" + Settings.DATA_COL_CLASS + "' " +
+            "name='" + col.name + "'>" +
+          "<input type='text' style='display: none;' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "' " +
+                 "value='" + (defaultValue || "") + "' data-default='" + (defaultValue || "") + "'" +
+                 (col.readonly ? " readonly" : "") + ">" +
+        "</td>";
+    }
+  })
+
+  if (setting.can_order) {
+    html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'></td>"
+  }
+  html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
+    "'><a href='javascript:void(0);' class='" + Settings.ADD_ROW_SPAN_CLASSES + "'></a></td>"
+  html += "</tr>"
+
+  return html
+}
+
+function makeTableCategoryInput(setting, numVisibleColumns) {
+  var canAddRows = setting.can_add_new_rows;
+  var categoryKey = setting.categorize_by_key;
+  var placeholder = setting.new_category_placeholder || "";
+  var message = setting.new_category_message || "";
+  var html =
+    "<tr class='" + Settings.DATA_CATEGORY_CLASS + " inputs' data-can-add-rows='" + canAddRows + "' " +
+        "data-key='" + categoryKey + "' data-message='" + message + "'>" +
+      "<td colspan='" + (numVisibleColumns - 1) + "'>" +
+        "<input type='text' class='form-control' placeholder='" + placeholder + "'/>" +
+      "</td>" +
+      "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'>" +
+        "<a href='javascript:void(0);' class='" + Settings.ADD_CATEGORY_SPAN_CLASSES + "'></a>" +
+      "</td>" +
+    "</tr>";
+  return html;
+}
+
+function getDescriptionForKey(key) {
+  for (var i in Settings.data.descriptions) {
+    if (Settings.data.descriptions[i].name === key) {
+      return Settings.data.descriptions[i];
+    }
+  }
+}
+
+var SAVE_BUTTON_LABEL_SAVE = "Save";
+var SAVE_BUTTON_LABEL_RESTART = "Save and restart";
+var reasonsForRestart = [];
+var numChangesBySection = {};
+
+function badgeForDifferences(changedElement) {
+  // figure out which group this input is in
+  var panelParentID = changedElement.closest('.panel').attr('id');
+
+  // if the panel contains non-grouped settings, the initial value is Settings.initialValues
+  var isGrouped = $('#' + panelParentID).hasClass('grouped');
+
+  if (isGrouped) {
+    var initialPanelJSON = Settings.initialValues[panelParentID]
+      ? Settings.initialValues[panelParentID]
+      : {};
+
+    // get a JSON representation of that section
+    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID];
+  } else {
+    var initialPanelJSON = Settings.initialValues;
+
+    // get a JSON representation of that section
+    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
+  }
+
+  var badgeValue = 0
+  var description = getDescriptionForKey(panelParentID);
+
+  // badge for any settings we have that are not the same or are not present in initialValues
+  for (var setting in panelJSON) {
+    if ((!_.has(initialPanelJSON, setting) && panelJSON[setting] !== "") ||
+      (!_.isEqual(panelJSON[setting], initialPanelJSON[setting])
+      && (panelJSON[setting] !== "" || _.has(initialPanelJSON, setting)))) {
+      badgeValue += 1;
+
+      // add a reason to restart
+      if (description && description.restart != false) {
+        reasonsForRestart.push(setting);
+      }
+    } else {
+        // remove a reason to restart
+        if (description && description.restart != false) {
+          reasonsForRestart = $.grep(reasonsForRestart, function(v) { return v != setting; });
+      }
+    }
+  }
+
+  // update the list-group-item badge to have the new value
+  if (badgeValue == 0) {
+    badgeValue = ""
+  }
+
+  numChangesBySection[panelParentID] = badgeValue;
+
+  var hasChanges = badgeValue > 0;
+
+  if (!hasChanges) {
+    for (var key in numChangesBySection) {
+      if (numChangesBySection[key] > 0) {
+        hasChanges = true;
+        break;
+      }
+    }
+  }
+
+  $(".save-button").prop("disabled", !hasChanges);
+  $(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
+
+  // add the badge to the navbar item and the panel header
+  $("a[href='" + settingsGroupAnchor(Settings.path, panelParentID) + "'] .badge").html(badgeValue);
+  $("#" + panelParentID + " .panel-heading .badge").html(badgeValue);
+
+  // make the navbar dropdown show a badge that is the total of the badges of all groups
+  var totalChanges = 0;
+  $('.panel-heading .badge').each(function(index){
+    if (this.innerHTML.length > 0) {
+      totalChanges += parseInt(this.innerHTML);
+    }
+  });
+
+  if (totalChanges == 0) {
+    totalChanges = ""
+  }
+
+  var totalBadgeClass = Settings.content_settings ? '.content-settings-badge' : '.domain-settings-badge';
+
+  $(totalBadgeClass).html(totalChanges);
+  $('#hamburger-badge').html(totalChanges);
+}
+
+function addTableRow(row) {
+  var table = row.parents('table');
+  var isArray = table.data('setting-type') === 'array';
+  var keepField = row.data("keep-field");
+
+  var columns = row.parent().children('.' + Settings.DATA_ROW_CLASS);
+
+  var input_clone = row.clone();
+
+  // Change input row to data row
+  var table = row.parents("table");
+  var setting_name = table.attr("name");
+  row.addClass(Settings.DATA_ROW_CLASS + " " + Settings.NEW_ROW_CLASS);
+
+  if (!isArray) {
+    // show the key input
+    var keyInput = row.children(".key").children("input");
+
+    // whenever the keyInput changes, re-badge for differences
+    keyInput.on('change keyup paste', function(){
+      // update siblings in the row to have the correct name
+      var currentKey = $(this).val();
+
+      $(this).closest('tr').find('.value-col input').each(function(index){
+        var input = $(this);
+
+        if (currentKey.length > 0) {
+          input.attr("name", setting_name + "." +  currentKey + "." + input.parent().attr('name'));
+        } else {
+          input.removeAttr("name");
+        }
+      })
+
+      badgeForDifferences($(this));
+    });
+  }
+
+  // if this is an array, add the row index (which is the index of the last row + 1)
+  // as a data attribute to the row
+  var row_index = 0;
+  if (isArray) {
+    var previous_row = row.siblings('.' + Settings.DATA_ROW_CLASS + ':last');
+
+    if (previous_row.length > 0) {
+      row_index = parseInt(previous_row.attr(Settings.DATA_ROW_INDEX), 10) + 1;
+    } else {
+      row_index = 0;
+    }
+
+    row.attr(Settings.DATA_ROW_INDEX, row_index);
+  }
+
+  var focusChanged = false;
+
+  _.each(row.children(), function(element) {
+    if ($(element).hasClass("numbered")) {
+      // Index row
+      var numbers = columns.children(".numbered")
+      if (numbers.length > 0) {
+        $(element).html(parseInt(numbers.last().text()) + 1)
+      } else {
+        $(element).html(1)
+      }
+    } else if ($(element).hasClass(Settings.REORDER_BUTTONS_CLASS)) {
+      $(element).html("<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'><a href='javascript:void(0);'"
+                      + " class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a><a href='javascript:void(0);' class='"
+                      + Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>")
+    } else if ($(element).hasClass(Settings.ADD_DEL_BUTTONS_CLASS)) {
+      // Change buttons
+      var anchor = $(element).children("a")
+      anchor.removeClass(Settings.ADD_ROW_SPAN_CLASSES)
+      anchor.addClass(Settings.DEL_ROW_SPAN_CLASSES)
+    } else if ($(element).hasClass("key")) {
+      var input = $(element).children("input")
+      input.show();
+    } else if ($(element).hasClass(Settings.DATA_COL_CLASS)) {
+      // show inputs
+      var input = $(element).find("input");
+      input.show();
+
+      var isCheckbox = input.hasClass("table-checkbox");
+      var isDropdown = input.hasClass("table-dropdown");
+
+      if (isArray) {
+        var key = $(element).attr('name');
+
+        // are there multiple columns or just one?
+        // with multiple we have an array of Objects, with one we have an array of whatever the value type is
+        var num_columns = row.children('.' + Settings.DATA_COL_CLASS).length
+        var newName = setting_name + "[" + row_index + "]" + (num_columns > 1 ? "." + key : "");
+
+        input.attr("name", newName);
+
+        if (isDropdown) {
+          // default values for hidden inputs inside child selects gets cleared so we need to remind it
+          var selectElement = $(element).children("select");
+          selectElement.attr("data-hidden-input", newName);
+          $(element).children("input").val(selectElement.val());
+        }
+      }
+
+      if (isArray && !focusChanged) {
+          input.focus();
+          focusChanged = true;
+      }
+
+      // if we are adding a dropdown, we should go ahead and make its select
+      // element is visible
+      if (isDropdown) {
+          $(element).children("select").attr("style", "");
+      }
+
+      if (isCheckbox) {
+        $(input).find("input").attr("data-changed", "true");
+      } else {
+        input.attr("data-changed", "true");
+      }
+    } else {
+      console.log("Unknown table element");
+    }
+  });
+
+  if (!isArray) {
+    keyInput.focus();
+  }
+
+  input_clone.children('td').each(function () {
+    if ($(this).attr("name") !== keepField) {
+      $(this).find("input").val($(this).children('input').attr('data-default'));
+    }
+  });
+
+  if (isArray) {
+    updateDataChangedForSiblingRows(row, true)
+
+    // the addition of any table row should remove the empty-array-row
+    row.siblings('.empty-array-row').remove()
+  }
+
+  badgeForDifferences($(table))
+
+  row.after(input_clone)
+}
+
+function deleteTableRow($row) {
+  var $table = $row.closest('table');
+  var categoryName = $row.data("category");
+  var isArray = $table.data('setting-type') === 'array';
+
+  $row.empty();
+
+  if (!isArray) {
+    if ($row.attr('name')) {
+      $row.html("<input type='hidden' class='form-control' name='" + $row.attr('name') + "' data-changed='true' value=''>");
+    } else {
+      // for rows that didn't have a key, simply remove the row
+      $row.remove();
+    }
+  } else {
+    if ($table.find('.' + Settings.DATA_ROW_CLASS + "[data-category='" + categoryName + "']").length <= 1) {
+      // This is the last row of the category, so delete the header
+      $table.find('.' + Settings.DATA_CATEGORY_CLASS + "[data-category='" + categoryName + "']").remove();
+    }
+
+    if ($table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
+      updateDataChangedForSiblingRows($row);
+
+      // this isn't the last row - we can just remove it
+      $row.remove();
+    } else {
+      // this is the last row, we can't remove it completely since we need to post an empty array
+      $row
+        .removeClass(Settings.DATA_ROW_CLASS)
+        .removeClass(Settings.NEW_ROW_CLASS)
+        .removeAttr("data-category")
+        .addClass('empty-array-row')
+        .html("<input type='hidden' class='form-control' name='" + $table.attr("name").replace('[]', '') + "' " +
+              "data-changed='true' value=''>");
+    }
+  }
+
+  // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
+  badgeForDifferences($table);
+}
+
+function addTableCategory($categoryInputRow) {
+  var $input = $categoryInputRow.find("input").first();
+  var categoryValue = $input.prop("value");
+  if (!categoryValue || $categoryInputRow.closest("table").find("tr[data-category='" + categoryValue + "']").length !== 0) {
+    $categoryInputRow.addClass("has-warning");
+
+    setTimeout(function () {
+      $categoryInputRow.removeClass("has-warning");
+    }, 400);
+
+    return;
+  }
+
+  var $rowInput = $categoryInputRow.next(".inputs").clone();
+  if (!$rowInput) {
+    console.error("Error cloning inputs");
+  }
+
+  var canAddRows = $categoryInputRow.data("can-add-rows");
+  var message = $categoryInputRow.data("message");
+  var categoryKey = $categoryInputRow.data("key");
+  var width = 0;
+  $categoryInputRow
+    .children("td")
+    .each(function () {
+      width += $(this).prop("colSpan") || 1;
+    });
+
+  $input
+    .prop("value", "")
+    .focus();
+
+  $rowInput.find("td[name='" + categoryKey + "'] > input").first()
+    .prop("value", categoryValue);
+  $rowInput
+    .attr("data-category", categoryValue)
+    .addClass(Settings.NEW_ROW_CLASS);
+
+  var $newCategoryRow = $(makeTableCategoryHeader(categoryKey, categoryValue, width, true, " - " + message));
+  $newCategoryRow.addClass(Settings.NEW_ROW_CLASS);
+
+  $categoryInputRow
+    .before($newCategoryRow)
+    .before($rowInput);
+
+  if (canAddRows) {
+    $rowInput.removeAttr("hidden");
+  } else {
+    addTableRow($rowInput);
+  }
+}
+
+function deleteTableCategory($categoryHeaderRow) {
+  var categoryName = $categoryHeaderRow.data("category");
+
+  $categoryHeaderRow
+    .closest("table")
+    .find("tr[data-category='" + categoryName + "']")
+    .each(function () {
+      if ($(this).hasClass(Settings.DATA_ROW_CLASS)) {
+        deleteTableRow($(this));
+      } else {
+        $(this).remove();
+      }
+    });
+}
+
+function toggleTableCategory($categoryHeaderRow) {
+  var $icon = $categoryHeaderRow.find("." + Settings.TOGGLE_CATEGORY_SPAN_CLASS).first();
+  var categoryName = $categoryHeaderRow.data("category");
+  var wasExpanded = $icon.hasClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
+  if (wasExpanded) {
+    $icon
+      .addClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS)
+      .removeClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
+  } else {
+    $icon
+      .addClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS)
+      .removeClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS);
+  }
+  $categoryHeaderRow
+    .closest("table")
+    .find("tr[data-category='" + categoryName + "']")
+    .toggleClass("contracted", wasExpanded);
+}
+
+function moveTableRow(row, move_up) {
+  var table = $(row).closest('table')
+  var isArray = table.data('setting-type') === 'array'
+  if (!isArray) {
+    return;
+  }
+
+  if (move_up) {
+    var prev_row = row.prev()
+    if (prev_row.hasClass(Settings.DATA_ROW_CLASS)) {
+      prev_row.before(row)
+    }
+  } else {
+    var next_row = row.next()
+    if (next_row.hasClass(Settings.DATA_ROW_CLASS)) {
+      next_row.after(row)
+    }
+  }
+
+  // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
+  badgeForDifferences($(table))
+}
+
+function updateDataChangedForSiblingRows(row, forceTrue) {
+  // anytime a new row is added to an array we need to set data-changed for all sibling row inputs to true
+  // unless it matches the inital set of values
+
+  if (!forceTrue) {
+    // figure out which group this row is in
+    var panelParentID = row.closest('.panel').attr('id')
+    // get the short name for the setting from the table
+    var tableShortName = row.closest('table').data('short-name')
+
+    // get a JSON representation of that section
+    var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName]
+    if (Settings.initialValues[panelParentID]) {
+      var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName]
+    } else {
+      var initialPanelSettingJSON = {};
+    }
+
+    // if they are equal, we don't need data-changed
+    isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON)
+  } else {
+    isTrue = true
+  }
+
+  row.siblings('.' + Settings.DATA_ROW_CLASS).each(function(){
+    var hiddenInput = $(this).find('td.' + Settings.DATA_COL_CLASS + ' input')
+    if (isTrue) {
+      hiddenInput.attr('data-changed', isTrue)
+    } else {
+      hiddenInput.removeAttr('data-changed')
+    }
+  })
+}
+
+function cleanupFormValues(node) {
+  if (node.type && node.type === 'checkbox') {
+    return { name: node.name, value: node.checked ? true : false };
+  } else {
+    return false;
+  }
+}
+
+function showErrorMessage(title, message) {
+  swal(title, message)
+}
diff --git a/domain-server/resources/web/settings/js/bootstrap-switch.min.js b/domain-server/resources/web/js/bootstrap-switch.min.js
similarity index 100%
rename from domain-server/resources/web/settings/js/bootstrap-switch.min.js
rename to domain-server/resources/web/js/bootstrap-switch.min.js
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index ad1509b038..aa658bce3f 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -23,16 +23,22 @@ function showRestartModal() {
   }, 1000);
 }
 
+function settingsGroupAnchor(base, html_id) {
+  return base + "#" + html_id + "_group"
+}
+
 $(document).ready(function(){
   var url = window.location;
+
   // Will only work if string in href matches with location
   $('ul.nav a[href="'+ url +'"]').parent().addClass('active');
 
   // Will also work for relative and absolute hrefs
   $('ul.nav a').filter(function() {
       return this.href == url;
-  }).parent().addClass('active');  
-  $('body').on('click', '#restart-server', function(e) {    
+  }).parent().addClass('active');
+
+  $('body').on('click', '#restart-server', function(e) {
     swal( {
       title: "Are you sure?",
       text: "This will restart your domain server, causing your domain to be briefly offline.",
@@ -45,4 +51,35 @@ $(document).ready(function(){
     });
     return false;
   });
+
+  var $contentDropdown = $('#content-settings-nav-dropdown');
+  var $settingsDropdown = $('#domain-settings-nav-dropdown');
+
+  // for pages that have the settings dropdowns
+  if ($contentDropdown.length && $settingsDropdown.length) {
+    // make a JSON request to get the dropdown menus for content and settings
+    // we don't error handle here because the top level menu is still clickable and usables if this fails
+    $.getJSON('/settings-menu-groups.json', function(data){
+      function makeGroupDropdownElement(group, base) {
+        var html_id = group.html_id ? group.html_id : group.name;
+        return "<li class='setting-group'><a href='" + settingsGroupAnchor(base, html_id) + "'>" + group.label + "<span class='badge'></span></a></li>";
+      }
+
+      $.each(data.content_settings, function(index, group){
+        if (index > 0) {
+          $contentDropdown.append("<li role='separator' class='divider'></li>");
+        }
+
+        $contentDropdown.append(makeGroupDropdownElement(group, "/content/"));
+      });
+
+      $.each(data.domain_settings, function(index, group){
+        if (index > 0) {
+          $settingsDropdown.append("<li role='separator' class='divider'></li>");
+        }
+
+        $settingsDropdown.append(makeGroupDropdownElement(group, "/settings/"));
+      });
+    });
+  }
 });
diff --git a/domain-server/resources/web/settings/js/form2js.min.js b/domain-server/resources/web/js/form2js.min.js
similarity index 100%
rename from domain-server/resources/web/settings/js/form2js.min.js
rename to domain-server/resources/web/js/form2js.min.js
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 00f699fa4e..e1870a2fa8 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -1,6 +1,4 @@
-var Settings = {
-  showAdvanced: false,
-  ADVANCED_CLASS: 'advanced-setting',
+Object.assign(Settings, {
   DEPRECATED_CLASS: 'deprecated-setting',
   TRIGGER_CHANGE_CLASS: 'trigger-change',
   DATA_ROW_CLASS: 'value-row',
@@ -41,7 +39,7 @@ var Settings = {
   FORM_ID: 'settings-form',
   INVALID_ROW_CLASS: 'invalid-input',
   DATA_ROW_INDEX: 'data-row-index'
-};
+});
 
 var URLs = {
   // STABLE METAVERSE_URL: https://metaverse.highfidelity.com
diff --git a/domain-server/resources/web/js/underscore-min.js b/domain-server/resources/web/js/underscore-min.js
index f01025b7bc..3c3eec027b 100644
--- a/domain-server/resources/web/js/underscore-min.js
+++ b/domain-server/resources/web/js/underscore-min.js
@@ -3,4 +3,3 @@
 //     (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
 (function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a=i>=0?Math.min(i+1,a):i+a+1;else if(r&&i&&a)return i=r(e,u),e[i]===u?i:-1;if(u!==u)return i=t(l.call(e,o,a),m.isNaN),i>=0?i+o:-1;for(i=n>0?o:a-1;i>=0&&a>i;i+=n)if(e[i]===u)return i;return-1}}function e(n,t){var r=I.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||a,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=I[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var u=this,i=u._,o=Array.prototype,a=Object.prototype,c=Function.prototype,f=o.push,l=o.slice,s=a.toString,p=a.hasOwnProperty,h=Array.isArray,v=Object.keys,g=c.bind,y=Object.create,d=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):u._=m,m.VERSION="1.8.3";var b=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},x=function(n,t,r){return null==n?m.identity:m.isFunction(n)?b(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return x(n,t,1/0)};var _=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var f=o[c];t&&r[f]!==void 0||(r[f]=i[f])}return r}},j=function(n){if(!m.isObject(n))return{};if(y)return y(n);d.prototype=n;var t=new d;return d.prototype=null,t},w=function(n){return function(t){return null==t?void 0:t[n]}},A=Math.pow(2,53)-1,O=w("length"),k=function(n){var t=O(n);return"number"==typeof t&&t>=0&&A>=t};m.each=m.forEach=function(n,t,r){t=b(t,r);var e,u;if(k(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=k(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=x(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(x(t)),r)},m.every=m.all=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r,e){return k(n)||(n=m.values(n)),("number"!=typeof r||e)&&(r=0),m.indexOf(n,t,r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=k(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(k(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=x(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={};return r=x(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=F(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=F(function(n,t,r){n[r]=t}),m.countBy=F(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):k(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:k(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=x(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var S=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=O(n);a>o;o++){var c=n[o];if(k(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=S(c,t,r));var f=0,l=c.length;for(u.length+=l;l>f;)u[i++]=c[f++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return S(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=x(r,e));for(var u=[],i=[],o=0,a=O(n);a>o;o++){var c=n[o],f=r?r(c,o,n):c;t?(o&&i===f||u.push(c),i=f):r?m.contains(i,f)||(i.push(f),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(S(arguments,!0,!0))},m.intersection=function(n){for(var t=[],r=arguments.length,e=0,u=O(n);u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=S(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,O).length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=O(n);u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=x(r,e,1);for(var u=r(t),i=0,o=O(n);o>i;){var a=Math.floor((i+o)/2);r(n[a])<u?i=a+1:o=a}return i},m.indexOf=r(1,m.findIndex,m.sortedIndex),m.lastIndexOf=r(-1,m.findLastIndex),m.range=function(n,t,r){null==t&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var E=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=j(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(g&&n.bind===g)return g.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return E(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e<arguments.length;)i.push(arguments[e++]);return E(n,r,this,this,i)};return r},m.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var f=m.now();a||r.leading!==!1||(a=f);var l=t-(f-a);return e=this,u=arguments,0>=l||l>t?(o&&(clearTimeout(o),o=null),a=f,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,l)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var f=m.now()-o;t>f&&f>=0?e=setTimeout(c,t-f):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var f=r&&!e;return e||(e=setTimeout(c,t)),f&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var M=!{toString:null}.propertyIsEnumerable("toString"),I=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(v)return v(n);var t=[];for(var r in n)m.has(n,r)&&t.push(r);return M&&e(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var r in n)t.push(r);return M&&e(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=_(m.allKeys),m.extendOwn=m.assign=_(m.keys),m.findKey=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=b(t,r)):(u=S(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var f=u[a],l=o[f];e(l,f,o)&&(i[f]=l)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(S(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=_(m.allKeys,!0),m.create=function(n,t){var r=j(n);return t&&m.extendOwn(r,t),r},m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var N=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=s.call(n);if(u!==s.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!N(n[c],t[c],r,e))return!1}else{var f,l=m.keys(n);if(c=l.length,m.keys(t).length!==c)return!1;for(;c--;)if(f=l[c],!m.has(t,f)||!N(n[f],t[f],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return N(n,t)},m.isEmpty=function(n){return null==n?!0:k(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=h||function(n){return"[object Array]"===s.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return s.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===s.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&p.call(n,t)},m.noConflict=function(){return u._=i,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=w,m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=b(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var B={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},T=m.invert(B),R=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=R(B),m.unescape=R(T),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var q=0;m.uniqueId=function(n){var t=++q+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var K=/(.)^/,z={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\u2028|\u2029/g,L=function(n){return"\\"+z[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||K).source,(t.interpolate||K).source,(t.evaluate||K).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(D,L),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},f=t.variable||"obj";return c.source="function("+f+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var P=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return f.apply(n,arguments),P(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=o[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],P(this,r)}}),m.each(["concat","join","slice"],function(n){var t=o[n];m.prototype[n]=function(){return P(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this);
-//# sourceMappingURL=underscore-min.map
\ No newline at end of file
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index d36330375a..d71692523a 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -1,104 +1,21 @@
 <!--#include virtual="header.html"-->
 
-<div class="col-md-10 col-md-offset-1">
-  <div class="row">
-    <div class="col-md-12">
-      <div class="alert" style="display:none;"></div>
-    </div>
-  </div>
+<script type="text/javascript">
+   var Settings = {
+      content_settings: false,
+      endpoint: "/settings.json",
+      path: "/settings/"
+   };
+</script>
 
-  <div class="row">
-    <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
-      <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col">
-        <script id="list-group-template" type="text/template">
-          <% _.each(descriptions, function(group){ %>
-            <% if (!group.hidden) { %>
-              <% panelID = group.name ? group.name : group.html_id %>
-              <li>
-                <a href="#<%- panelID %>" class="list-group-item">
-                  <span class="badge"></span>
-                  <%- group.label %>
-                </a>
-              </li>
-            <% } %>
-          <% }); %>
-        </script>
-
-        <ul class="nav nav-pills nav-stacked">
-        </ul>
-
-        <button id="advanced-toggle-button" class="btn btn-info advanced-toggle">Show advanced</button>
-        <button class="btn btn-success save-button" disabled>Save</button>
-        <div id="manage-cloud-domains-link" style="display: none;">
-          <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Manage Cloud Hosted Domains</a>
-        </div>
-      </div>
-    </div>
-
-    <div class="col-md-9 col-sm-9 col-xs-12">
-      <div class="col-xs-12">
-
-        <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          <span class="alert-link">
-            <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains
-          </span>
-        </div>
-
-        <form id="settings-form" role="form">
-
-        <script id="panels-template" type="text/template">
-          <% _.each(descriptions, function(group){ %>
-            <% if (!group.hidden) { %>
-              <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
-              <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
-              <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
-              <% if (isAdvanced) { %>
-                <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
-              <% } %>
-
-              <% isGrouped = !!group.name %>
-              <% panelID = isGrouped ? group.name : group.html_id %>
-
-              <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
-                   id="<%- panelID %>">
-                <div class="panel-heading">
-                  <h3 class="panel-title"><%- group.label %></h3>
-                </div>
-                <div class="panel-body">
-                  <% _.each(split_settings[0], function(setting) { %>
-                    <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                    <%= getFormGroup(keypath, setting, values, false) %>
-                  <% }); %>
-                  <% if (!_.isEmpty(split_settings[1])) { %>
-                    <% $("#advanced-toggle-button").show() %>
-                    <% _.each(split_settings[1], function(setting) { %>
-                      <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                      <%= getFormGroup(keypath, setting, values, true) %>
-                    <% }); %>
-                  <% }%>
-                </div>
-              </div>
-            <% } %>
-          <% }); %>
-        </script>
-        <div id="panels"></div>
-      </form>
-    </div>
-  </div>
-
-  <div class="col-xs-12 hidden-sm hidden-md hidden-lg">
-    <button class="btn btn-success save-button" id="small-save-button">Save</button>
-  </div>
-</div>
+<!--#include virtual="base-settings.html"-->
 
 <!--#include virtual="footer.html"-->
-<script src='/js/underscore-min.js'></script>
-<script src='/js/underscore-keypath.min.js'></script>
-<script src='/js/bootbox.min.js'></script>
+
 <script src='/js/sha256.js'></script>
-<script src='js/form2js.min.js'></script>
-<script src='js/bootstrap-switch.min.js'></script>
-<script src='/js/shared.js'></script>
-<script src='js/settings.js'></script>
+
+<!--#include virtual="base-settings-scripts.html"-->
+
+<script src="js/settings.js"></script>
+
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 3faeff4482..9a31b766a6 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1,1262 +1,20 @@
-var DomainInfo = null;
-
-var viewHelpers = {
-  getFormGroup: function(keypath, setting, values, isAdvanced) {
-    form_group = "<div class='form-group " +
-        (isAdvanced ? Settings.ADVANCED_CLASS : "") + " " +
-        (setting.deprecated ? Settings.DEPRECATED_CLASS : "" ) + "' " +
-        "data-keypath='" + keypath + "'>";
-    setting_value = _(values).valueForKeyPath(keypath);
-
-    if (_.isUndefined(setting_value) || _.isNull(setting_value)) {
-      if (_.has(setting, 'default')) {
-        setting_value = setting.default;
-      } else {
-        setting_value = "";
-      }
-    }
-
-    label_class = 'control-label';
-
-    function common_attrs(extra_classes) {
-      extra_classes = (!_.isUndefined(extra_classes) ? extra_classes : "");
-      return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
-        + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
-        + setting.name + "' name='" + keypath + "' "
-        + "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "'";
-    }
-
-    if (setting.type === 'checkbox') {
-      if (setting.label) {
-        form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
-      }
-
-      form_group += "<div class='toggle-checkbox-container'>"
-      form_group += "<input type='checkbox'" + common_attrs('toggle-checkbox') + (setting_value ? "checked" : "") + "/>"
-
-      if (setting.help) {
-        form_group += "<span class='help-block checkbox-help'>" + setting.help + "</span>";
-      }
-
-      form_group += "</div>"
-    } else {
-      input_type = _.has(setting, 'type') ? setting.type : "text"
-
-      if (setting.label) {
-        form_group += "<label for='" + keypath + "' class='" + label_class + "'>" + setting.label + "</label>";
-      }
-
-      if (input_type === 'table') {
-        form_group += makeTable(setting, keypath, setting_value)
-      } else {
-        if (input_type === 'select') {
-          form_group += "<select class='form-control' data-hidden-input='" + keypath + "'>'"
-          _.each(setting.options, function(option) {
-            form_group += "<option value='" + option.value + "'" +
-            (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
-          });
-
-          form_group += "</select>"
-
-          form_group += "<input type='hidden'" + common_attrs() + "value='" + setting_value + "'>"
-        } else if (input_type === 'button') {
-          // Is this a button that should link to something directly?
-          // If so, we use an anchor tag instead of a button tag
-
-          if (setting.href) {
-            form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
-              + common_attrs("btn " + setting.classes) + " target='_blank'>"
-              + setting.button_label + "</a>";
-          } else {
-            form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
-              + setting.button_label + "</button>";
-          }
-
-        } else {
-
-          if (input_type == 'integer') {
-            input_type = "text"
-          }
-
-          form_group += "<input type='" + input_type + "'" +  common_attrs() +
-            "placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
-            "' value='" + (_.has(setting, 'password_placeholder') ? setting.password_placeholder : setting_value) + "'/>"
-        }
-
-        form_group += "<span class='help-block'>" + setting.help + "</span>"
-      }
-    }
-
-    form_group += "</div>"
-    return form_group
-  }
-}
-
-var qs = (function(a) {
-    if (a == "") return {};
-    var b = {};
-    for (var i = 0; i < a.length; ++i)
-    {
-      var p=a[i].split('=', 2);
-      if (p.length == 1) {
-        b[p[0]] = "";
-      } else {
-        b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
-      }
-    }
-    return b;
-})(window.location.search.substr(1).split('&'));
-
 $(document).ready(function(){
-  /*
-  * Clamped-width.
-  * Usage:
-  *  <div data-clampedwidth=".myParent">This long content will force clamped width</div>
-  *
-  * Author: LV
-  */
-
-  $.ajaxSetup({
-    timeout: 20000,
-  });
-
-  $('[data-clampedwidth]').each(function () {
-    var elem = $(this);
-    var parentPanel = elem.data('clampedwidth');
-    var resizeFn = function () {
-      var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
-      elem.css('width', sideBarNavWidth);
-    };
-
-    resizeFn();
-    $(window).resize(resizeFn);
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
-    addTableRow($(this).closest('tr'));
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
-    deleteTableRow($(this).closest('tr'));
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_CATEGORY_BUTTON_CLASS, function(){
-    addTableCategory($(this).closest('tr'));
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_CATEGORY_BUTTON_CLASS, function(){
-    deleteTableCategory($(this).closest('tr'));
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.TOGGLE_CATEGORY_COLUMN_CLASS, function(){
-    toggleTableCategory($(this).closest('tr'));
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
-    moveTableRow($(this).closest('tr'), true);
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
-    moveTableRow($(this).closest('tr'), false);
-  });
-
-  $('#' + Settings.FORM_ID).on('keyup', function(e){
-    var $target = $(e.target);
-    if (e.keyCode == 13) {
-      if ($target.is('table input')) {
-        // capture enter in table input
-        // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
-        sibling = $target.parent('td').next();
-
-        if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
-          // set focus to next input
-          sibling.find('input').focus();
-        } else {
-
-          // jump over the re-order row, if that's what we're on
-          if (sibling.hasClass(Settings.REORDER_BUTTONS_CLASS)) {
-            sibling = sibling.next();
-          }
-
-          // for tables with categories we add the entry and setup the new row on enter
-          if (sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).length) {
-            sibling.find("." + Settings.ADD_CATEGORY_BUTTON_CLASS).click();
-
-            // set focus to the first input in the new row
-            $target.closest('table').find('tr.inputs input:first').focus();
-          }
-
-          var tableRows = sibling.parent();
-          var tableBody = tableRows.parent();
-
-          // if theres no more siblings, we should jump to a new row
-          if (sibling.next().length == 0 && tableRows.nextAll().length == 1) {
-              tableBody.find("." + Settings.ADD_ROW_BUTTON_CLASS).click();
-          }
-        }
-
-      } else if ($target.is('input')) {
-        $target.change().blur();
-      }
-
-      e.preventDefault();
-    }
-  });
-
-  $('#' + Settings.FORM_ID).on('keypress', function(e){
-    if (e.keyCode == 13) {
-
-      e.preventDefault();
-    }
-  });
-
-  $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
-    // this input was changed, add the changed data attribute to it
-    $(this).attr('data-changed', true);
-
-    badgeSidebarForDifferences($(this));
-  });
-
-  $('#' + Settings.FORM_ID).on('switchChange.bootstrapSwitch', 'input.toggle-checkbox', function(){
-    // this checkbox was changed, add the changed data attribute to it
-    $(this).attr('data-changed', true);
-
-    badgeSidebarForDifferences($(this));
-  });
-
-  // Bootstrap switch in table
-  $('#' + Settings.FORM_ID).on('change', 'input.table-checkbox', function () {
-    // Bootstrap switches in table: set the changed data attribute for all rows in table.
-    var row = $(this).closest('tr');
-    if (row.hasClass("value-row")) {  // Don't set attribute on input row switches prior to it being added to table.
-      row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
-      updateDataChangedForSiblingRows(row, true);
-      badgeSidebarForDifferences($(this));
-    }
-  });
-
-  $('#' + Settings.FORM_ID).on('change', 'input.table-time', function() {
-    // Bootstrap switches in table: set the changed data attribute for all rows in table.
-    var row = $(this).closest('tr');
-    if (row.hasClass("value-row")) {  // Don't set attribute on input row switches prior to it being added to table.
-      row.find('td.' + Settings.DATA_COL_CLASS + ' input').attr('data-changed', true);
-      updateDataChangedForSiblingRows(row, true);
-      badgeSidebarForDifferences($(this));
-    }
-  });
-
-  $('.advanced-toggle').click(function(){
-    Settings.showAdvanced = !Settings.showAdvanced
-    var advancedSelector = $('.' + Settings.ADVANCED_CLASS)
-
-    if (Settings.showAdvanced) {
-      advancedSelector.show();
-      $(this).html("Hide advanced")
-    } else {
-      advancedSelector.hide();
-      $(this).html("Show advanced")
-    }
-
-    $(this).blur();
-  })
-
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
-    $(this).blur();
-    showDomainCreationAlert(false);
-  })
-
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
-    $(this).blur();
-    chooseFromHighFidelityDomains($(this))
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_BTN_ID, function(){
-    $(this).blur();
-    createTemporaryDomain();
-  });
-
-
-  $('#' + Settings.FORM_ID).on('change', 'select', function(){
-    $("input[name='" +  $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
-    $(this).blur();
-    disonnectHighFidelityAccount();
-    e.preventDefault();
-  });
-
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
-    $(this).blur();
-    prepareAccessTokenPrompt(function(accessToken) {
-      // we have an access token - set the access token input with this and save settings
-      $(Settings.ACCESS_TOKEN_SELECTOR).val(accessToken).change();
-      saveSettings();
-    });
-  });
-
-  var panelsSource = $('#panels-template').html()
-  Settings.panelsTemplate = _.template(panelsSource)
-
-  var sidebarTemplate = $('#list-group-template').html()
-  Settings.sidebarTemplate = _.template(sidebarTemplate)
-
-  var navbarHeight = $('.navbar').outerHeight(true);
-
-  $('#setup-sidebar').affix({
-    offset: {
-      top: 1,
-      bottom: navbarHeight
-    }
-  });
-
-  reloadSettings(function(success){
-    if (success) {
-      handleAction();
-    } else {
-      swal({
-        title: '',
-        type: 'error',
-        text: Strings.LOADING_SETTINGS_ERROR
-      });
-    }
-    $('body').scrollspy({
-      target: '#setup-sidebar',
-      offset: navbarHeight
-    });
-  });
-});
-
-function getShareName(callback) {
-  getDomainFromAPI(function(data){
-    // check if we have owner_places (for a real domain) or a name (for a temporary domain)
-    if (data && data.status == "success") {
-      var shareName;
-      if (data.domain.default_place_name) {
-        shareName = data.domain.default_place_name;
-      } else if (data.domain.name) {
-        shareName = data.domain.name;
-      } else if (data.domain.network_address) {
-        shareName = data.domain.network_address;
-        if (data.domain.network_port !== 40102) {
-          shareName += ':' + data.domain.network_port;
-        }
-      }
-
-      callback(true, shareName);
-    } else {
-      callback(false);
-    }
-  })
-}
-
-function handleAction() {
-  // check if we were passed an action to handle
-  var action = qs["action"];
-
-  if (action == "share") {
-    // figure out if we already have a stored domain ID
-    if (Settings.data.values.metaverse.id.length > 0) {
-      // we need to ask the API what a shareable name for this domain is
-      getShareName(function(success, shareName){
-        if (success) {
-          var shareLink = "hifi://" + shareName;
-
-          console.log(shareLink);
-
-          // show a dialog with a copiable share URL
-          swal({
-            title: "Share",
-            type: "input",
-            inputPlaceholder: shareLink,
-            inputValue: shareLink,
-            text: "Copy this URL to invite friends to your domain.",
-            closeOnConfirm: true
-          });
-
-          $('.sweet-alert input').select();
-
-        } else {
-          // show an error alert
-          swal({
-            title: '',
-            type: 'error',
-            text: "There was a problem retreiving domain information from High Fidelity API.",
-            confirmButtonText: 'Try again',
-            showCancelButton: true,
-            closeOnConfirm: false
-          }, function(isConfirm){
-            if (isConfirm) {
-              // they want to try getting domain share info again
-              showSpinnerAlert("Requesting domain information...")
-              handleAction();
-            } else {
-              swal.close();
-            }
-          });
-        }
-      });
-    } else {
-      // no domain ID present, just show the share dialog
-      createTemporaryDomain();
-    }
-  }
-}
-
-function dynamicButton(button_id, text) {
-  return $("<button type='button' id='" + button_id + "' class='btn btn-primary'>" + text + "</button>");
-}
-
-function postSettings(jsonSettings) {
-  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-  $.ajax('/settings.json', {
-    data: JSON.stringify(jsonSettings),
-    contentType: 'application/json',
-    type: 'POST'
-  }).done(function(data){
-    if (data.status == "success") {
-      if ($(".save-button").html() === SAVE_BUTTON_LABEL_RESTART) {
-        showRestartModal();
-      } else {
-        location.reload(true);
-      }
-    } else {
-      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-      reloadSettings();
-    }
-  }).fail(function(){
-    showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-    reloadSettings();
-  });
-}
-
-function accessTokenIsSet() {
-  return Settings.data.values.metaverse.access_token.length > 0;
-}
-
-function setupHFAccountButton() {
-
-  var hasAccessToken = accessTokenIsSet();
-  var el;
-
-  if (hasAccessToken) {
-    el = "<p>";
-    el += "<span class='account-connected-header'>High Fidelity Account Connected</span>";
-    el += "<button id='" + Settings.DISCONNECT_ACCOUNT_BTN_ID + "' class='btn'>Disconnect</button>";
-    el += "</p>";
-    el = $(el);
-  } else {
-    // setup an object for the settings we want our button to have
-    var buttonSetting = {
-      type: 'button',
-      name: 'connected_account',
-      label: 'Connected Account',
-    }
-    buttonSetting.help = "";
-    buttonSetting.classes = "btn-primary";
-    buttonSetting.button_label = "Connect High Fidelity Account";
-    buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;
-
-    buttonSetting.href = URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
-
-    // since we do not have an access token we change hide domain ID and auto networking settings
-    // without an access token niether of them can do anything
-    $("[data-keypath='metaverse.id']").hide();
-
-    // use the existing getFormGroup helper to ask for a button
-    el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values);
-  }
-
-  // add the button group to the top of the metaverse panel
-  $('#metaverse .panel-body').prepend(el);
-}
-
-function disonnectHighFidelityAccount() {
-  // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
-  swal({
-    title: "Are you sure?",
-    text: "This will remove your domain-server OAuth access token."
-      + "</br></br>This could cause your domain to appear offline and no longer be reachable via any place names.",
-    type: "warning",
-    html: true,
-    showCancelButton: true
-  }, function(){
-    // we need to post to settings to clear the access-token
-    $(Settings.ACCESS_TOKEN_SELECTOR).val('').change();
-    // reset the domain id to get a new temporary name
-    $(Settings.DOMAIN_ID_SELECTOR).val('').change();
-    saveSettings();
-  });
-}
-
-function showSpinnerAlert(title) {
-  swal({
-    title: title,
-    text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
-    html: true,
-    showConfirmButton: false,
-    allowEscapeKey: false
-  });
-}
-
-function showDomainCreationAlert(justConnected) {
-  swal({
-    title: 'Create new domain ID',
-    type: 'input',
-    text: 'Enter a label this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
-    showCancelButton: true,
-    confirmButtonText: "Create",
-    closeOnConfirm: false,
-    html: true
-  }, function(inputValue){
-    if (inputValue === false) {
-      swal.close();
-
-      // user cancelled domain ID creation - if we're supposed to save after cancel then save here
-      if (justConnected) {
-        saveSettings();
-      }
-    } else {
-      // we're going to change the alert to a new one with a spinner while we create this domain
-      showSpinnerAlert('Creating domain ID');
-      createNewDomainID(inputValue, justConnected);
-    }
-  });
-}
-
-function createNewDomainID(label, justConnected) {
-  // get the JSON object ready that we'll use to create a new domain
-  var domainJSON = {
-    "label": label
-  }
-
-  $.post("/api/domains", domainJSON, function(data){
-    // we successfully created a domain ID, set it on that field
-    var domainID = data.domain.id;
-    console.log("Setting domain id to ", data, domainID);
-    $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
-
-    if (justConnected) {
-      var successText = Strings.CREATE_DOMAIN_SUCCESS_JUST_CONNECTED
-    } else {
-      var successText = Strings.CREATE_DOMAIN_SUCCESS;
-    }
-
-    successText += "</br></br>Click the button below to save your new settings and restart your domain-server.";
-
-    // show a sweet alert to say we are all finished up and that we need to save
-    swal({
-      title: 'Success!',
-      type: 'success',
-      text: successText,
-      html: true,
-      confirmButtonText: 'Save'
-    }, function(){
-      saveSettings();
-    });
-  }, 'json').fail(function(){
-
-    var errorText = "There was a problem creating your new domain ID. Do you want to try again or";
-
-    if (justConnected) {
-      errorText += " just save your new access token?</br></br>You can always create a new domain ID later.";
-    } else {
-      errorText += " cancel?"
-    }
-
-    // we failed to create the new domain ID, show a sweet-alert that lets them try again or cancel
-    swal({
-      title: '',
-      type: 'error',
-      text: errorText,
-      html: true,
-      confirmButtonText: 'Try again',
-      showCancelButton: true,
-      closeOnConfirm: false
-    }, function(isConfirm){
-      if (isConfirm) {
-        // they want to try creating a domain ID again
-        showDomainCreationAlert(justConnected);
-      } else {
-        // they want to cancel
-        if (justConnected) {
-          // since they just connected we need to save the access token here
-          saveSettings();
-        }
-      }
-    });
-  });
-}
-
-function createDomainSpinner() {
-  var spinner = '<p class="loading-domain-info-spinner text-center" style="display: none">';
-  spinner += 'Loading  <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>';
-  spinner += '</p>';
-  return spinner;
-}
-
-function createDomainLoadingError(message) {
-  var errorEl = $("<div class='domain-loading-error alert alert-warning' style='display: none'></div>");
-  errorEl.append(message + "  ");
-
-  var retryLink = $("<a href='#'>Please click here to try again.</a>");
-  retryLink.click(function(ev) {
-    ev.preventDefault();
-    reloadDomainInfo();
-  });
-  errorEl.append(retryLink);
-
-  return errorEl;
-}
-
-function parseJSONResponse(xhr) {
-  try {
-    return JSON.parse(xhr.responseText);
-  } catch (e) {
-  }
-  return null;
-}
-
-function showOrHideLabel() {
-  var type = getCurrentDomainIDType();
-  var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN);
-  $(".panel#label").toggle(shouldShow);
-  $("li a[href='#label']").parent().toggle(shouldShow);
-  return shouldShow;
-}
-
-function setupDomainLabelSetting() {
-  showOrHideLabel();
-
-  var html = "<div>"
-  html += "<label class='control-label'>Specify a label for your domain</label> <a class='domain-loading-hide' href='#'>Edit</a>";
-  html += "<input id='network-label' type='text' class='form-control domain-loading-hide' disabled></input>";
-  html += "</div>";
-
-  html = $(html);
-
-  html.find('a').click(function(ev) {
-    ev.preventDefault();
-
-    var label = DomainInfo.label === null ? "" : DomainInfo.label;
-    var modal_body = "<div class='form'>";
-    modal_body += "<label class='control-label'>Label</label>";
-    modal_body += "<input type='text' id='domain-label-input' class='form-control' value='" + label + "'>";
-    modal_body += "<div id='domain-label-error' class='error-message' data-property='label'></div>";
-    modal_body += "</div>";
-
-    var dialog = bootbox.dialog({
-      title: 'Edit Label',
-      message: modal_body,
-      closeButton: false,
-      onEscape: true,
-      buttons: [
-        {
-          label: 'Cancel',
-          className: 'edit-label-cancel-btn',
-          callback: function() {
-            dialog.modal('hide');
-          }
-        },
-        {
-          label: 'Save',
-          className: 'edit-label-save-btn btn btn-primary',
-          callback: function() {
-            var data = {
-              label: $('#domain-label-input').val()
-            };
-
-            $('.edit-label-cancel-btn').attr('disabled', 'disabled');
-            $('.edit-label-save-btn').attr('disabled', 'disabled');
-            $('.edit-label-save-btn').html("Saving...");
-
-            $('.error-message').hide();
-
-            $.ajax({
-              url: '/api/domains',
-              type: 'PUT',
-              data: data,
-              success: function(xhr) {
-                dialog.modal('hide');
-                reloadDomainInfo();
-              },
-              error: function(xhr) {
-                var data = parseJSONResponse(xhr);
-                console.log(data, data.status, data.data);
-                if (data.status === "fail") {
-                  for (var key in data.data) {
-                    var errorMsg = data.data[key];
-                    var errorEl = $('.error-message[data-property="' + key + '"');
-                    errorEl.html(errorMsg);
-                    errorEl.show();
-                  }
-                }
-                $('.edit-label-cancel-btn').removeAttr('disabled');
-                $('.edit-label-save-btn').removeAttr('disabled');
-                $('.edit-label-save-btn').html("Save");
-              }
-            });
-            return false;
-          }
-        }
-      ],
-      callback: function(result) {
-        console.log("result: ", result);
-      }
-    });
-  });
-
-  var spinner = createDomainSpinner();
-  var errorEl = createDomainLoadingError("Error loading label.");
-
-  html.append(spinner);
-  html.append(errorEl);
-
-  $('div#label .panel-body').append(html);
-}
-
-function showOrHideAutomaticNetworking() {
-  var type = getCurrentDomainIDType();
-  if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
-    $("[data-keypath='metaverse.automatic_networking']").hide();
-    return false;
-  }
-  $("[data-keypath='metaverse.automatic_networking']").show();
-  return true;
-}
-
-function setupDomainNetworkingSettings() {
-  if (!showOrHideAutomaticNetworking()) {
-    return;
-  }
-
-  var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
-  if (autoNetworkingSetting === 'full') {
-    return;
-  }
-
-  var includeAddress = autoNetworkingSetting === 'disabled';
-
-  if (includeAddress) {
-    var label = "Network Address:Port";
-  } else {
-    var label = "Network Port";
-  }
-
-  var lowerName = name.toLowerCase();
-  var form = '<div id="network-address-port">';
-  form += '<label class="control-label">' + label + '</label>';
-  form += ' <a id="edit-network-address-port" class="domain-loading-hide" href="#">Edit</a>';
-  form += '<input type="text" class="domain-loading-hide form-control" disabled></input>';
-  form += '<div class="domain-loading-hide help-block">This defines how nodes will connect to your domain. You can read more about automatic networking <a href="">here</a>.</div>';
-  form += '</div>';
-
-  form = $(form);
-
-  form.find('#edit-network-address-port').click(function(ev) {
-    ev.preventDefault();
-
-    var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address;
-    var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port;
-    var modal_body = "<div class='form-group'>";
-    if (includeAddress) {
-      modal_body += "<label class='control-label'>Address</label>";
-      modal_body += "<input type='text' id='network-address-input' class='form-control' value='" + address + "'>";
-      modal_body += "<div id='network-address-error' class='error-message' data-property='network_address'></div>";
-    }
-    modal_body += "<label class='control-label'>Port</label>";
-    modal_body += "<input type='text' id='network-port-input' class='form-control' value='" + port + "'>";
-    modal_body += "<div id='network-port-error' class='error-message' data-property='network_port'></div>";
-    modal_body += "</div>";
-
-    var dialog = bootbox.dialog({
-      title: 'Edit Network',
-      message: modal_body,
-      closeButton: false,
-      onEscape: true,
-      buttons: [
-        {
-          label: 'Cancel',
-          className: 'edit-network-cancel-btn',
-          callback: function() {
-            dialog.modal('hide');
-          }
-        },
-        {
-          label: 'Save',
-          className: 'edit-network-save-btn btn btn-primary',
-          callback: function() {
-            var data = {
-              network_port: $('#network-port-input').val()
-            };
-            if (includeAddress) {
-              data.network_address = $('#network-address-input').val();
-            }
-
-            $('.edit-network-cancel-btn').attr('disabled', 'disabled');
-            $('.edit-network-save-btn').attr('disabled', 'disabled');
-            $('.edit-network-save-btn').html("Saving...");
-
-            console.log('data', data);
-
-            $('.error-message').hide();
-
-            $.ajax({
-              url: '/api/domains',
-              type: 'PUT',
-              data: data,
-              success: function(xhr) {
-                console.log(xhr, parseJSONResponse(xhr));
-                dialog.modal('hide');
-                reloadDomainInfo();
-              },
-              error:function(xhr) {
-                var data = parseJSONResponse(xhr);
-                console.log(data, data.status, data.data);
-                if (data.status === "fail") {
-                  for (var key in data.data) {
-                    var errorMsg = data.data[key];
-                    console.log(key, errorMsg);
-                    var errorEl = $('.error-message[data-property="' + key + '"');
-                    console.log(errorEl);
-                    errorEl.html(errorMsg);
-                    errorEl.show();
-                  }
-                }
-                $('.edit-network-cancel-btn').removeAttr('disabled');
-                $('.edit-network-save-btn').removeAttr('disabled');
-                $('.edit-network-save-btn').html("Save");
-              }
-            });
-            return false;
-          }
-        }
-      ],
-      callback: function(result) {
-        console.log("result: ", result);
-      }
-    });
-  });
-
-  var spinner = createDomainSpinner();
-
-  var errorMessage = ''
-  if (includeAddress) {
-    errorMessage = "We were unable to load the network address and port.";
-  } else {
-    errorMessage = "We were unable to load the network port."
-  }
-  var errorEl = createDomainLoadingError(errorMessage);
-
-  var autoNetworkingEl = $('div[data-keypath="metaverse.automatic_networking"]');
-  autoNetworkingEl.after(spinner);
-  autoNetworkingEl.after(errorEl);
-  autoNetworkingEl.after(form);
-}
-
-
-function setupPlacesTable() {
-  // create a dummy table using our view helper
-  var placesTableSetting = {
-    type: 'table',
-    name: 'places',
-    label: 'Places',
-    html_id: Settings.PLACES_TABLE_ID,
-    help: "The following places currently point to this domain.</br>To point places to this domain, "
-      + " go to the <a href='" + URLs.METAVERSE_URL + "/user/places'>My Places</a> "
-      + "page in your High Fidelity Metaverse account.",
-    read_only: true,
-    can_add_new_rows: false,
-    columns: [
+  var qs = (function(a) {
+      if (a == "") return {};
+      var b = {};
+      for (var i = 0; i < a.length; ++i)
       {
-        "name": "name",
-        "label": "Name"
-      },
-      {
-        "name": "path",
-        "label": "Viewpoint or Path"
-      },
-      {
-        "name": "remove",
-        "label": "",
-        "class": "buttons"
-      }
-    ]
-  }
-
-  // get a table for the places
-  var placesTableGroup = viewHelpers.getFormGroup('', placesTableSetting, Settings.data.values);
-
-  // append the places table in the right place
-  $('#places_paths .panel-body').prepend(placesTableGroup);
-  //$('#' + Settings.PLACES_TABLE_ID).append("<tr><td colspan=3></td></tr>");
-
-  var spinner = createDomainSpinner();
-  $('#' + Settings.PLACES_TABLE_ID).after($(spinner));
-
-  var errorEl = createDomainLoadingError("There was an error retreiving your places.");
-  $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
-
-  // do we have a domain ID?
-  if (Settings.data.values.metaverse.id.length == 0) {
-    // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
-    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
-    $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
-  }
-  if (accessTokenIsSet()) {
-    appendAddButtonToPlacesTable();
-  }
-}
-
-function placeTableRow(name, path, isTemporary, placeID) {
-  var name_link = "<a href='hifi://" + name + "'>" + (isTemporary ? name + " (temporary)" : name) + "</a>";
-
-  function placeEditClicked() {
-    editHighFidelityPlace(placeID, name, path);
-  }
-
-  function placeDeleteClicked() {
-    var el = $(this);
-    var confirmString = Strings.REMOVE_PLACE_TITLE.replace("{{place}}", name);
-    var dialog = bootbox.dialog({
-      message: confirmString,
-      closeButton: false,
-      onEscape: true,
-      buttons: [
-        {
-          label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
-          className: "delete-place-cancel-btn",
-          callback: function() {
-            dialog.modal('hide');
-          }
-        },
-        {
-          label: Strings.REMOVE_PLACE_DELETE_BUTTON,
-          className: "delete-place-confirm-btn btn btn-danger",
-          callback: function() {
-            $('.delete-place-cancel-btn').attr('disabled', 'disabled');
-            $('.delete-place-confirm-btn').attr('disabled', 'disabled');
-            $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON_PENDING);
-            sendUpdatePlaceRequest(
-              placeID,
-              '',
-              null,
-              true,
-              function() {
-                reloadDomainInfo();
-                dialog.modal('hide');
-              }, function() {
-                $('.delete-place-cancel-btn').removeAttr('disabled');
-                $('.delete-place-confirm-btn').removeAttr('disabled');
-                $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON);
-                bootbox.alert(Strings.REMOVE_PLACE_ERROR);
-              });
-            return false;
-          }
-        },
-      ]
-    });
-  }
-
-  if (isTemporary) {
-    var editLink = "";
-    var deleteColumn = "<td class='buttons'></td>";
-  } else {
-    var editLink = " <a class='place-edit' href='javascript:void(0);'>Edit</a>";
-    var deleteColumn = "<td class='buttons'><a class='place-delete glyphicon glyphicon-remove'></a></td>";
-  }
-
-  var row = $("<tr><td>" + name_link + "</td><td>" + path + editLink + "</td>" + deleteColumn + "</tr>");
-  row.find(".place-edit").click(placeEditClicked);
-  row.find(".place-delete").click(placeDeleteClicked);
-
-  return row;
-}
-
-function placeTableRowForPlaceObject(place) {
-  var placePathOrIndex = (place.path ? place.path : "/");
-  return placeTableRow(place.name, placePathOrIndex, false, place.id);
-}
-
-function reloadDomainInfo() {
-  $('#' + Settings.PLACES_TABLE_ID + " tbody tr").not('.headers').remove();
-
-  $('.domain-loading-show').show();
-  $('.domain-loading-hide').hide();
-  $('.domain-loading-error').hide();
-  $('.loading-domain-info-spinner').show();
-  $('#' + Settings.PLACES_TABLE_ID).append("<tr colspan=3>Hello</tr>");
-
-  getDomainFromAPI(function(data){
-    $('.loading-domain-info-spinner').hide();
-    $('.domain-loading-show').hide();
-
-    // check if we have owner_places (for a real domain) or a name (for a temporary domain)
-    if (data.status == "success") {
-      $('.domain-loading-hide').show();
-      if (data.domain.owner_places) {
-        // add a table row for each of these names
-        _.each(data.domain.owner_places, function(place){
-          $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRowForPlaceObject(place));
-        });
-      } else if (data.domain.name) {
-        // add a table row for this temporary domain name
-        $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name, '/', true));
-      }
-
-      // Update label
-      if (showOrHideLabel()) {
-        var label = data.domain.label;
-        label = label === null ? '' : label;
-        $('#network-label').val(label);
-      }
-
-      // Update automatic networking
-      if (showOrHideAutomaticNetworking()) {
-        var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
-        var address = data.domain.network_address === null ? "" : data.domain.network_address;
-        var port = data.domain.network_port === null ? "" : data.domain.network_port;
-        if (autoNetworkingSetting === 'disabled') {
-          $('#network-address-port input').val(address + ":" + port);
-        } else if (autoNetworkingSetting === 'ip') {
-          $('#network-address-port input').val(port);
-        }
-      }
-
-      if (accessTokenIsSet()) {
-        appendAddButtonToPlacesTable();
-      }
-
-    } else {
-      $('.domain-loading-error').show();
-    }
-  })
-}
-
-function appendDomainIDButtons() {
-  var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR);
-
-  var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, Strings.CREATE_DOMAIN_BUTTON);
-  createButton.css('margin-top', '10px');
-  var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, Strings.CHOOSE_DOMAIN_BUTTON);
-  chooseButton.css('margin', '10px 0px 0px 10px');
-
-  domainIDInput.after(chooseButton);
-  domainIDInput.after(createButton);
-}
-
-function editHighFidelityPlace(placeID, name, path) {
-  var dialog;
-
-  var modal_body = "<div class='form-group'>";
-  modal_body += "<input type='text' id='place-path-input' class='form-control' value='" + path + "'>";
-  modal_body += "</div>";
-
-  var modal_buttons = [
-    {
-      label: Strings.EDIT_PLACE_CANCEL_BUTTON,
-      className: "edit-place-cancel-button",
-      callback: function() {
-        dialog.modal('hide');
-      }
-    },
-    {
-      label: Strings.EDIT_PLACE_CONFIRM_BUTTON,
-      className: 'edit-place-save-button btn btn-primary',
-      callback: function() {
-        var placePath = $('#place-path-input').val();
-
-        if (path == placePath) {
-          return true;
-        }
-
-        $('.edit-place-cancel-button').attr('disabled', 'disabled');
-        $('.edit-place-save-button').attr('disabled', 'disabled');
-        $('.edit-place-save-button').html(Strings.EDIT_PLACE_BUTTON_PENDING);
-
-        sendUpdatePlaceRequest(
-          placeID,
-          placePath,
-          null,
-          false,
-          function() {
-            dialog.modal('hide')
-            reloadDomainInfo();
-          },
-          function() {
-            $('.edit-place-cancel-button').removeAttr('disabled');
-            $('.edit-place-save-button').removeAttr('disabled');
-            $('.edit-place-save-button').html(Strings.EDIT_PLACE_CONFIRM_BUTTON);
-          }
-        );
-
-        return false;
-      }
-    }
-  ];
-
-  dialog = bootbox.dialog({
-    title: Strings.EDIT_PLACE_TITLE,
-    closeButton: false,
-    onEscape: true,
-    message: modal_body,
-    buttons: modal_buttons
-  })
-}
-
-function appendAddButtonToPlacesTable() {
-    var addRow = $("<tr> <td></td> <td></td> <td class='buttons'><a href='#' class='place-add glyphicon glyphicon-plus'></a></td> </tr>");
-    addRow.find(".place-add").click(function(ev) {
-      ev.preventDefault();
-      chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
-        if (newDomainID) {
-          Settings.data.values.metaverse.id = newDomainID;
-          var domainIDEl = $("[data-keypath='metaverse.id']");
-          domainIDEl.val(newDomainID);
-          Settings.initialValues.metaverse.id = newDomainID;
-          badgeSidebarForDifferences(domainIDEl);
-        }
-        reloadDomainInfo();
-      });
-    });
-    $('#' + Settings.PLACES_TABLE_ID + " tbody").append(addRow);
-}
-
-function chooseFromHighFidelityDomains(clickedButton) {
-  // setup the modal to help user pick their domain
-  if (Settings.initialValues.metaverse.access_token) {
-
-    // add a spinner to the choose button
-    clickedButton.html("Loading domains...");
-    clickedButton.attr('disabled', 'disabled');
-
-    // get a list of user domains from data-web
-    $.ajax({
-      url: "/api/domains",
-      dataType: 'json',
-      jsonp: false,
-      success: function(data){
-
-        var modal_buttons = {
-          cancel: {
-            label: 'Cancel',
-            className: 'btn-default'
-          }
-        }
-
-        if (data.data.domains.length) {
-          // setup a select box for the returned domains
-          modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
-          domain_select = $("<select id='domain-name-select' class='form-control'></select>");
-          _.each(data.data.domains, function(domain){
-            var domainString = "";
-
-            if (domain.label) {
-              domainString += '"' + domain.label+ '" - ';
-            }
-
-            domainString += domain.id;
-
-            domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
-          })
-          modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
-          modal_buttons["success"] = {
-            label: 'Choose domain',
-            callback: function() {
-              domainID = $('#domain-name-select').val()
-              // set the domain ID on the form
-              $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
-            }
-          }
+        var p=a[i].split('=', 2);
+        if (p.length == 1) {
+          b[p[0]] = "";
         } else {
-          modal_buttons["success"] = {
-            label: 'Create new domain',
-            callback: function() {
-              window.open(URLs.METAVERSE_URL + "/user/domains", '_blank');
-            }
-          }
-          modal_body = "<p>You do not have any domains in your High Fidelity account." +
-            "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+          b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
         }
-
-        bootbox.dialog({
-          title: "Choose matching domain",
-          onEscape: true,
-          message: modal_body,
-          buttons: modal_buttons
-        })
-      },
-      error: function() {
-        bootbox.alert("Failed to retrieve your domains from the High Fidelity Metaverse");
-      },
-      complete: function() {
-        // remove the spinner from the choose button
-        clickedButton.html("Choose from my domains")
-        clickedButton.removeAttr('disabled')
       }
-    });
-
-    } else {
-      bootbox.alert({
-        message: "You must have an access token to query your High Fidelity domains.<br><br>" +
-        "Please follow the instructions on the settings page to add an access token.",
-        title: "Access token required"
-      })
-    }
-  }
-
-function createTemporaryDomain() {
-  swal({
-    title: 'Create temporary place name',
-    text: "This will create a temporary place name and domain ID"
-      + " so other users can easily connect to your domain.</br></br>"
-      + "In order to make your domain reachable, this will also enable full automatic networking.",
-    showCancelButton: true,
-    confirmButtonText: 'Create',
-    closeOnConfirm: false,
-    html: true
-  }, function(isConfirm){
-    if (isConfirm) {
-      showSpinnerAlert('Creating temporary place name');
-
-      // make a get request to get a temporary domain
-      $.post(URLs.METAVERSE_URL + '/api/v1/domains/temporary', function(data){
-        if (data.status == "success") {
-          var domain = data.data.domain;
-
-          // we should have a new domain ID - set it on the domain ID value
-          $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change();
-
-          // we also need to make sure auto networking is set to full
-          $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change();
-
-          swal({
-            type: 'success',
-            title: 'Success!',
-            text: "We have created a temporary name and domain ID for you.</br></br>"
-              + "Your temporary place name is <strong>" + domain.name + "</strong>.</br></br>"
-              + "Press the button below to save your new settings and restart your domain-server.",
-            confirmButtonText: 'Save',
-            html: true
-          }, function(){
-            saveSettings();
-          });
-        }
-      });
-    }
-  });
-}
-
-function reloadSettings(callback) {
-  $.getJSON('/settings.json', function(data){
-    _.extend(data, viewHelpers)
-
-    $('.nav-stacked').html(Settings.sidebarTemplate(data))
-    $('#panels').html(Settings.panelsTemplate(data))
-
-    Settings.data = data;
-    Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
+      return b;
+  })(window.location.search.substr(1).split('&'));
 
+  Settings.afterReloadActions = function() {
     // append the domain selection modal
     appendDomainIDButtons();
 
@@ -1291,117 +49,10 @@ function reloadSettings(callback) {
       }
     }
 
-    // setup any bootstrap switches
-    $('.toggle-checkbox').bootstrapSwitch();
-
-    $('[data-toggle="tooltip"]').tooltip();
-
-    // call the callback now that settings are loaded
-    callback(true);
-  }).fail(function() {
-    // call the failure object since settings load faild
-    callback(false)
-  });
-}
-
-function validateInputs() {
-  // check if any new values are bad
-  var tables = $('table');
-
-  var inputsValid = true;
-
-  var tables = $('table');
-
-  // clear any current invalid rows
-  $('tr.' + Settings.INVALID_ROW_CLASS).removeClass(Settings.INVALID_ROW_CLASS);
-
-  function markParentRowInvalid(rowChild) {
-    $(rowChild).closest('tr').addClass(Settings.INVALID_ROW_CLASS);
+    handleAction();
   }
 
-  _.each(tables, function(table) {
-    // validate keys specificially for spaces and equality to an existing key
-    var newKeys = $(table).find('tr.' + Settings.NEW_ROW_CLASS + ' td.key');
-
-    var keyWithSpaces = false;
-    var empty = false;
-    var duplicateKey = false;
-
-    _.each(newKeys, function(keyCell) {
-      var keyVal = $(keyCell).children('input').val();
-
-      if (keyVal.indexOf(' ') !== -1) {
-        keyWithSpaces = true;
-        markParentRowInvalid(keyCell);
-        return;
-      }
-
-      // make sure the key isn't empty
-      if (keyVal.length === 0) {
-        empty = true
-
-        markParentRowInvalid(input);
-        return;
-      }
-
-      // make sure we don't have duplicate keys in the table
-      var otherKeys = $(table).find('td.key').not(keyCell);
-      _.each(otherKeys, function(otherKeyCell) {
-        var keyInput = $(otherKeyCell).children('input');
-
-        if (keyInput.length) {
-          if ($(keyInput).val() == keyVal) {
-            duplicateKey = true;
-          }
-        } else if ($(otherKeyCell).html() == keyVal) {
-            duplicateKey = true;
-        }
-
-        if (duplicateKey) {
-          markParentRowInvalid(keyCell);
-          return;
-        }
-      });
-
-    });
-
-    if (keyWithSpaces) {
-      showErrorMessage("Error", "Key contains spaces");
-      inputsValid = false;
-      return
-    }
-
-    if (empty) {
-      showErrorMessage("Error", "Empty field(s)");
-      inputsValid = false;
-      return
-    }
-
-    if (duplicateKey) {
-      showErrorMessage("Error", "Two keys cannot be identical");
-      inputsValid = false;
-      return;
-    }
-  });
-
-  return inputsValid;
-}
-
-var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
-
-function saveSettings() {
-
-  if (validateInputs()) {
-    // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-    var canPost = true;
-
-    // disable any inputs not changed
-    $("input:not([data-changed])").each(function () {
-      $(this).prop('disabled', true);
-    });
-
-    // grab a JSON representation of the form via form2js
-    var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true);
+  Settings.handlePostSettings = function(formJSON) {
 
     // check if we've set the basic http password
     if (formJSON["security"]) {
@@ -1424,727 +75,945 @@ function saveSettings() {
           delete formJSON["security"]["verify_http_password"];
         } else {
           bootbox.alert({ "message": "Passwords must match!", "title": "Password Error" });
-          canPost = false;
+          return false;
         }
       }
     }
 
-    console.log("----- SAVING ------");
+    console.log("----- handlePostSettings() called ------");
     console.log(formJSON);
 
-    // re-enable all inputs
-    $("input").each(function () {
-      $(this).prop('disabled', false);
-    });
+    if (formJSON["security"]) {
+      var username = formJSON["security"]["http_username"];
 
-    // remove focus from the button
-    $(this).blur();
+      var password = formJSON["security"]["http_password"];
 
-    if (canPost) {
-      if (formJSON["security"]) {
-        var username = formJSON["security"]["http_username"];
+      if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) {
+        swal({
+          title: "Are you sure?",
+          text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?",
+          type: "warning",
+          showCancelButton: true,
+          confirmButtonColor: "#5cb85c",
+          confirmButtonText: "Yes!",
+          closeOnConfirm: true
+        },
+        function () {
+            formJSON["security"]["http_password"] = "";
 
-        var password = formJSON["security"]["http_password"];
+            postSettings(formJSON);
+        });
 
-        if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) {
-          swal({
-            title: "Are you sure?",
-            text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?",
-            type: "warning",
-            showCancelButton: true,
-            confirmButtonColor: "#5cb85c",
-            confirmButtonText: "Yes!",
-            closeOnConfirm: true
-          },
-          function () {
-              formJSON["security"]["http_password"] = "";
-              postSettings(formJSON);
-          });
-          return;
-        }
+        return;
       }
-      // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-      postSettings(formJSON);
     }
-  }
-}
 
-$('body').on('click', '.save-button', function(e){
-  saveSettings();
-  return false;
-});
+    postSettings(formJSON);
+  };
 
-function makeTable(setting, keypath, setting_value) {
-  var isArray = !_.has(setting, 'key');
-  var categoryKey = setting.categorize_by_key;
-  var isCategorized = !!categoryKey && isArray;
-
-  if (!isArray && setting.can_order) {
-    setting.can_order = false;
-  }
-
-  var html = "";
-
-  if (setting.help) {
-    html += "<span class='help-block'>" + setting.help + "</span>"
-  }
-
-  var nonDeletableRowKey = setting["non-deletable-row-key"];
-  var nonDeletableRowValues = setting["non-deletable-row-values"];
-
-  html += "<table class='table table-bordered' " +
-                 "data-short-name='" + setting.name + "' name='" + keypath + "' " +
-                 "id='" + (!_.isUndefined(setting.html_id) ? setting.html_id : keypath) + "' " +
-                 "data-setting-type='" + (isArray ? 'array' : 'hash') + "'>";
-
-  if (setting.caption) {
-    html += "<caption>" + setting.caption + "</caption>"
-  }
-
-  // Column groups
-  if (setting.groups) {
-    html += "<tr class='headers'>"
-    _.each(setting.groups, function (group) {
-        html += "<td colspan='" + group.span  + "'><strong>" + group.label + "</strong></td>"
-    })
-    if (!setting.read_only) {
-        if (setting.can_order) {
-            html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES +
-                    "'><a href='javascript:void(0);' class='glyphicon glyphicon-sort'></a></td>";
-        }
-        html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'></td></tr>"
-    }
-    html += "</tr>"
-  }
-
-  // Column names
-  html += "<tr class='headers'>"
-
-  if (setting.numbered === true) {
-    html += "<td class='number'><strong>#</strong></td>" // Row number
-  }
-
-  if (setting.key) {
-    html += "<td class='key'><strong>" + setting.key.label + "</strong></td>" // Key
-  }
-
-  var numVisibleColumns = 0;
-  _.each(setting.columns, function(col) {
-    if (!col.hidden) numVisibleColumns++;
-    html += "<td " + (col.hidden ? "style='display: none;'" : "") + "class='data " +
-      (col.class ? col.class : '') + "'><strong>" + col.label + "</strong></td>" // Data
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
+    $(this).blur();
+    showDomainCreationAlert(false);
   })
 
-  if (!setting.read_only) {
-    if (setting.can_order) {
-      numVisibleColumns++;
-      html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES +
-              "'><a href='javascript:void(0);' class='glyphicon glyphicon-sort'></a></td>";
-    }
-    numVisibleColumns++;
-    html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'></td></tr>";
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
+    $(this).blur();
+    chooseFromHighFidelityDomains($(this))
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_BTN_ID, function(){
+    $(this).blur();
+    createTemporaryDomain();
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
+    $(this).blur();
+    disonnectHighFidelityAccount();
+    e.preventDefault();
+  });
+
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
+    $(this).blur();
+    prepareAccessTokenPrompt(function(accessToken) {
+      // we have an access token - set the access token input with this and save settings
+      $(Settings.ACCESS_TOKEN_SELECTOR).val(accessToken).change();
+      saveSettings();
+    });
+  });
+
+  function accessTokenIsSet() {
+    return Settings.data.values.metaverse.access_token.length > 0;
   }
 
-  // populate rows in the table from existing values
-  var row_num = 1;
-
-  if (keypath.length > 0 && _.size(setting_value) > 0) {
-    var rowIsObject = setting.columns.length > 1;
-
-    _.each(setting_value, function(row, rowIndexOrName) {
-      var categoryPair = {};
-      var categoryValue = "";
-      if (isCategorized) {
-        categoryValue = rowIsObject ? row[categoryKey] : row;
-        categoryPair[categoryKey] = categoryValue;
-        if (_.findIndex(setting_value, categoryPair) === rowIndexOrName) {
-          html += makeTableCategoryHeader(categoryKey, categoryValue, numVisibleColumns, setting.can_add_new_categories, "");
+  function getShareName(callback) {
+    getDomainFromAPI(function(data){
+      // check if we have owner_places (for a real domain) or a name (for a temporary domain)
+      if (data && data.status == "success") {
+        var shareName;
+        if (data.domain.default_place_name) {
+          shareName = data.domain.default_place_name;
+        } else if (data.domain.name) {
+          shareName = data.domain.name;
+        } else if (data.domain.network_address) {
+          shareName = data.domain.network_address;
+          if (data.domain.network_port !== 40102) {
+            shareName += ':' + data.domain.network_port;
+          }
         }
+
+        callback(true, shareName);
+      } else {
+        callback(false);
+      }
+    })
+  }
+
+  function handleAction() {
+    // check if we were passed an action to handle
+    var action = qs["action"];
+
+    if (action == "share") {
+      // figure out if we already have a stored domain ID
+      if (Settings.data.values.metaverse.id.length > 0) {
+        // we need to ask the API what a shareable name for this domain is
+        getShareName(function(success, shareName){
+          if (success) {
+            var shareLink = "hifi://" + shareName;
+
+            console.log(shareLink);
+
+            // show a dialog with a copiable share URL
+            swal({
+              title: "Share",
+              type: "input",
+              inputPlaceholder: shareLink,
+              inputValue: shareLink,
+              text: "Copy this URL to invite friends to your domain.",
+              closeOnConfirm: true
+            });
+
+            $('.sweet-alert input').select();
+
+          } else {
+            // show an error alert
+            swal({
+              title: '',
+              type: 'error',
+              text: "There was a problem retreiving domain information from High Fidelity API.",
+              confirmButtonText: 'Try again',
+              showCancelButton: true,
+              closeOnConfirm: false
+            }, function(isConfirm){
+              if (isConfirm) {
+                // they want to try getting domain share info again
+                showSpinnerAlert("Requesting domain information...")
+                handleAction();
+              } else {
+                swal.close();
+              }
+            });
+          }
+        });
+      } else {
+        // no domain ID present, just show the share dialog
+        createTemporaryDomain();
+      }
+    }
+  }
+
+  function setupHFAccountButton() {
+
+    var hasAccessToken = accessTokenIsSet();
+    var el;
+
+    if (hasAccessToken) {
+      el = "<p>";
+      el += "<span class='account-connected-header'>High Fidelity Account Connected</span>";
+      el += "<button id='" + Settings.DISCONNECT_ACCOUNT_BTN_ID + "' class='btn'>Disconnect</button>";
+      el += "</p>";
+      el = $(el);
+    } else {
+      // setup an object for the settings we want our button to have
+      var buttonSetting = {
+        type: 'button',
+        name: 'connected_account',
+        label: 'Connected Account',
+      }
+      buttonSetting.help = "";
+      buttonSetting.classes = "btn-primary";
+      buttonSetting.button_label = "Connect High Fidelity Account";
+      buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;
+
+      buttonSetting.href = URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
+
+      // since we do not have an access token we change hide domain ID and auto networking settings
+      // without an access token niether of them can do anything
+      $("[data-keypath='metaverse.id']").hide();
+
+      // use the existing getFormGroup helper to ask for a button
+      el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values);
+    }
+
+    // add the button group to the top of the metaverse panel
+    $('#metaverse .panel-body').prepend(el);
+  }
+
+  function disonnectHighFidelityAccount() {
+    // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
+    swal({
+      title: "Are you sure?",
+      text: "This will remove your domain-server OAuth access token."
+        + "</br></br>This could cause your domain to appear offline and no longer be reachable via any place names.",
+      type: "warning",
+      html: true,
+      showCancelButton: true
+    }, function(){
+      // we need to post to settings to clear the access-token
+      $(Settings.ACCESS_TOKEN_SELECTOR).val('').change();
+      // reset the domain id to get a new temporary name
+      $(Settings.DOMAIN_ID_SELECTOR).val('').change();
+      saveSettings();
+    });
+  }
+
+  function showDomainCreationAlert(justConnected) {
+    swal({
+      title: 'Create new domain ID',
+      type: 'input',
+      text: 'Enter a label this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
+      showCancelButton: true,
+      confirmButtonText: "Create",
+      closeOnConfirm: false,
+      html: true
+    }, function(inputValue){
+      if (inputValue === false) {
+        swal.close();
+
+        // user cancelled domain ID creation - if we're supposed to save after cancel then save here
+        if (justConnected) {
+          saveSettings();
+        }
+      } else {
+        // we're going to change the alert to a new one with a spinner while we create this domain
+        showSpinnerAlert('Creating domain ID');
+        createNewDomainID(inputValue, justConnected);
+      }
+    });
+  }
+
+  function createNewDomainID(label, justConnected) {
+    // get the JSON object ready that we'll use to create a new domain
+    var domainJSON = {
+      "label": label
+    }
+
+    $.post("/api/domains", domainJSON, function(data){
+      // we successfully created a domain ID, set it on that field
+      var domainID = data.domain.id;
+      console.log("Setting domain id to ", data, domainID);
+      $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+
+      if (justConnected) {
+        var successText = Strings.CREATE_DOMAIN_SUCCESS_JUST_CONNECTED
+      } else {
+        var successText = Strings.CREATE_DOMAIN_SUCCESS;
       }
 
-      html += "<tr class='" + Settings.DATA_ROW_CLASS + "' " +
-        (isCategorized ? ("data-category='" + categoryValue + "'") : "") + " " +
-        (isArray ? "" : "name='" + keypath + "." + rowIndexOrName + "'") +
-        (isArray ? Settings.DATA_ROW_INDEX + "='" + (row_num - 1) + "'" : "" ) + ">";
+      successText += "</br></br>Click the button below to save your new settings and restart your domain-server.";
 
-      if (setting.numbered === true) {
-        html += "<td class='numbered'>" + row_num + "</td>"
+      // show a sweet alert to say we are all finished up and that we need to save
+      swal({
+        title: 'Success!',
+        type: 'success',
+        text: successText,
+        html: true,
+        confirmButtonText: 'Save'
+      }, function(){
+        saveSettings();
+      });
+    }, 'json').fail(function(){
+
+      var errorText = "There was a problem creating your new domain ID. Do you want to try again or";
+
+      if (justConnected) {
+        errorText += " just save your new access token?</br></br>You can always create a new domain ID later.";
+      } else {
+        errorText += " cancel?"
       }
 
-      if (setting.key) {
-          html += "<td class='key'>" + rowIndexOrName + "</td>"
-      }
-
-      var isNonDeletableRow = !setting.can_add_new_rows;
-
-      _.each(setting.columns, function(col) {
-
-        var colValue, colName;
-        if (isArray) {
-          colValue = rowIsObject ? row[col.name] : row;
-          colName = keypath + "[" + rowIndexOrName + "]" + (rowIsObject ? "." + col.name : "");
+      // we failed to create the new domain ID, show a sweet-alert that lets them try again or cancel
+      swal({
+        title: '',
+        type: 'error',
+        text: errorText,
+        html: true,
+        confirmButtonText: 'Try again',
+        showCancelButton: true,
+        closeOnConfirm: false
+      }, function(isConfirm){
+        if (isConfirm) {
+          // they want to try creating a domain ID again
+          showDomainCreationAlert(justConnected);
         } else {
-          colValue = row[col.name];
-          colName = keypath + "." + rowIndexOrName + "." + col.name;
+          // they want to cancel
+          if (justConnected) {
+            // since they just connected we need to save the access token here
+            saveSettings();
+          }
+        }
+      });
+    });
+  }
+
+  function createDomainSpinner() {
+    var spinner = '<p class="loading-domain-info-spinner text-center" style="display: none">';
+    spinner += 'Loading  <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>';
+    spinner += '</p>';
+    return spinner;
+  }
+
+  function createDomainLoadingError(message) {
+    var errorEl = $("<div class='domain-loading-error alert alert-warning' style='display: none'></div>");
+    errorEl.append(message + "  ");
+
+    var retryLink = $("<a href='#'>Please click here to try again.</a>");
+    retryLink.click(function(ev) {
+      ev.preventDefault();
+      reloadDomainInfo();
+    });
+    errorEl.append(retryLink);
+
+    return errorEl;
+  }
+
+  function showOrHideLabel() {
+    var type = getCurrentDomainIDType();
+    var shouldShow = accessTokenIsSet() && (type === DOMAIN_ID_TYPE_FULL || type === DOMAIN_ID_TYPE_UNKNOWN);
+    $(".panel#label").toggle(shouldShow);
+    $("li a[href='#label']").parent().toggle(shouldShow);
+    return shouldShow;
+  }
+
+  function setupDomainLabelSetting() {
+    showOrHideLabel();
+
+    var html = "<div>"
+    html += "<label class='control-label'>Specify a label for your domain</label> <a class='domain-loading-hide' href='#'>Edit</a>";
+    html += "<input id='network-label' type='text' class='form-control domain-loading-hide' disabled></input>";
+    html += "</div>";
+
+    html = $(html);
+
+    html.find('a').click(function(ev) {
+      ev.preventDefault();
+
+      var label = DomainInfo.label === null ? "" : DomainInfo.label;
+      var modal_body = "<div class='form'>";
+      modal_body += "<label class='control-label'>Label</label>";
+      modal_body += "<input type='text' id='domain-label-input' class='form-control' value='" + label + "'>";
+      modal_body += "<div id='domain-label-error' class='error-message' data-property='label'></div>";
+      modal_body += "</div>";
+
+      var dialog = bootbox.dialog({
+        title: 'Edit Label',
+        message: modal_body,
+        closeButton: false,
+        onEscape: true,
+        buttons: [
+          {
+            label: 'Cancel',
+            className: 'edit-label-cancel-btn',
+            callback: function() {
+              dialog.modal('hide');
+            }
+          },
+          {
+            label: 'Save',
+            className: 'edit-label-save-btn btn btn-primary',
+            callback: function() {
+              var data = {
+                label: $('#domain-label-input').val()
+              };
+
+              $('.edit-label-cancel-btn').attr('disabled', 'disabled');
+              $('.edit-label-save-btn').attr('disabled', 'disabled');
+              $('.edit-label-save-btn').html("Saving...");
+
+              $('.error-message').hide();
+
+              $.ajax({
+                url: '/api/domains',
+                type: 'PUT',
+                data: data,
+                success: function(xhr) {
+                  dialog.modal('hide');
+                  reloadDomainInfo();
+                },
+                error: function(xhr) {
+                  var data = parseJSONResponse(xhr);
+                  console.log(data, data.status, data.data);
+                  if (data.status === "fail") {
+                    for (var key in data.data) {
+                      var errorMsg = data.data[key];
+                      var errorEl = $('.error-message[data-property="' + key + '"');
+                      errorEl.html(errorMsg);
+                      errorEl.show();
+                    }
+                  }
+                  $('.edit-label-cancel-btn').removeAttr('disabled');
+                  $('.edit-label-save-btn').removeAttr('disabled');
+                  $('.edit-label-save-btn').html("Save");
+                }
+              });
+              return false;
+            }
+          }
+        ],
+        callback: function(result) {
+          console.log("result: ", result);
+        }
+      });
+    });
+
+    var spinner = createDomainSpinner();
+    var errorEl = createDomainLoadingError("Error loading label.");
+
+    html.append(spinner);
+    html.append(errorEl);
+
+    $('div#label .panel-body').append(html);
+  }
+
+  function showOrHideAutomaticNetworking() {
+    var type = getCurrentDomainIDType();
+    if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
+      $("[data-keypath='metaverse.automatic_networking']").hide();
+      return false;
+    }
+    $("[data-keypath='metaverse.automatic_networking']").show();
+    return true;
+  }
+
+  function setupDomainNetworkingSettings() {
+    if (!showOrHideAutomaticNetworking()) {
+      return;
+    }
+
+    var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
+    if (autoNetworkingSetting === 'full') {
+      return;
+    }
+
+    var includeAddress = autoNetworkingSetting === 'disabled';
+
+    if (includeAddress) {
+      var label = "Network Address:Port";
+    } else {
+      var label = "Network Port";
+    }
+
+    var lowerName = name.toLowerCase();
+    var form = '<div id="network-address-port">';
+    form += '<label class="control-label">' + label + '</label>';
+    form += ' <a id="edit-network-address-port" class="domain-loading-hide" href="#">Edit</a>';
+    form += '<input type="text" class="domain-loading-hide form-control" disabled></input>';
+    form += '<div class="domain-loading-hide help-block">This defines how nodes will connect to your domain. You can read more about automatic networking <a href="">here</a>.</div>';
+    form += '</div>';
+
+    form = $(form);
+
+    form.find('#edit-network-address-port').click(function(ev) {
+      ev.preventDefault();
+
+      var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address;
+      var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port;
+      var modal_body = "<div class='form-group'>";
+      if (includeAddress) {
+        modal_body += "<label class='control-label'>Address</label>";
+        modal_body += "<input type='text' id='network-address-input' class='form-control' value='" + address + "'>";
+        modal_body += "<div id='network-address-error' class='error-message' data-property='network_address'></div>";
+      }
+      modal_body += "<label class='control-label'>Port</label>";
+      modal_body += "<input type='text' id='network-port-input' class='form-control' value='" + port + "'>";
+      modal_body += "<div id='network-port-error' class='error-message' data-property='network_port'></div>";
+      modal_body += "</div>";
+
+      var dialog = bootbox.dialog({
+        title: 'Edit Network',
+        message: modal_body,
+        closeButton: false,
+        onEscape: true,
+        buttons: [
+          {
+            label: 'Cancel',
+            className: 'edit-network-cancel-btn',
+            callback: function() {
+              dialog.modal('hide');
+            }
+          },
+          {
+            label: 'Save',
+            className: 'edit-network-save-btn btn btn-primary',
+            callback: function() {
+              var data = {
+                network_port: $('#network-port-input').val()
+              };
+              if (includeAddress) {
+                data.network_address = $('#network-address-input').val();
+              }
+
+              $('.edit-network-cancel-btn').attr('disabled', 'disabled');
+              $('.edit-network-save-btn').attr('disabled', 'disabled');
+              $('.edit-network-save-btn').html("Saving...");
+
+              console.log('data', data);
+
+              $('.error-message').hide();
+
+              $.ajax({
+                url: '/api/domains',
+                type: 'PUT',
+                data: data,
+                success: function(xhr) {
+                  console.log(xhr, parseJSONResponse(xhr));
+                  dialog.modal('hide');
+                  reloadDomainInfo();
+                },
+                error:function(xhr) {
+                  var data = parseJSONResponse(xhr);
+                  console.log(data, data.status, data.data);
+                  if (data.status === "fail") {
+                    for (var key in data.data) {
+                      var errorMsg = data.data[key];
+                      console.log(key, errorMsg);
+                      var errorEl = $('.error-message[data-property="' + key + '"');
+                      console.log(errorEl);
+                      errorEl.html(errorMsg);
+                      errorEl.show();
+                    }
+                  }
+                  $('.edit-network-cancel-btn').removeAttr('disabled');
+                  $('.edit-network-save-btn').removeAttr('disabled');
+                  $('.edit-network-save-btn').html("Save");
+                }
+              });
+              return false;
+            }
+          }
+        ],
+        callback: function(result) {
+          console.log("result: ", result);
+        }
+      });
+    });
+
+    var spinner = createDomainSpinner();
+
+    var errorMessage = ''
+    if (includeAddress) {
+      errorMessage = "We were unable to load the network address and port.";
+    } else {
+      errorMessage = "We were unable to load the network port."
+    }
+    var errorEl = createDomainLoadingError(errorMessage);
+
+    var autoNetworkingEl = $('div[data-keypath="metaverse.automatic_networking"]');
+    autoNetworkingEl.after(spinner);
+    autoNetworkingEl.after(errorEl);
+    autoNetworkingEl.after(form);
+  }
+
+
+  function setupPlacesTable() {
+    // create a dummy table using our view helper
+    var placesTableSetting = {
+      type: 'table',
+      name: 'places',
+      label: 'Places',
+      html_id: Settings.PLACES_TABLE_ID,
+      help: "The following places currently point to this domain.</br>To point places to this domain, "
+        + " go to the <a href='" + URLs.METAVERSE_URL + "/user/places'>My Places</a> "
+        + "page in your High Fidelity Metaverse account.",
+      read_only: true,
+      can_add_new_rows: false,
+      columns: [
+        {
+          "name": "name",
+          "label": "Name"
+        },
+        {
+          "name": "path",
+          "label": "Viewpoint or Path"
+        },
+        {
+          "name": "remove",
+          "label": "",
+          "class": "buttons"
+        }
+      ]
+    }
+
+    // get a table for the places
+    var placesTableGroup = viewHelpers.getFormGroup('', placesTableSetting, Settings.data.values);
+
+    // append the places table in the right place
+    $('#places_paths .panel-body').prepend(placesTableGroup);
+    //$('#' + Settings.PLACES_TABLE_ID).append("<tr><td colspan=3></td></tr>");
+
+    var spinner = createDomainSpinner();
+    $('#' + Settings.PLACES_TABLE_ID).after($(spinner));
+
+    var errorEl = createDomainLoadingError("There was an error retreiving your places.");
+    $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
+
+    // do we have a domain ID?
+    if (Settings.data.values.metaverse.id.length == 0) {
+      // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
+      var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
+      $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
+    }
+    if (accessTokenIsSet()) {
+      appendAddButtonToPlacesTable();
+    }
+  }
+
+  function placeTableRow(name, path, isTemporary, placeID) {
+    var name_link = "<a href='hifi://" + name + "'>" + (isTemporary ? name + " (temporary)" : name) + "</a>";
+
+    function placeEditClicked() {
+      editHighFidelityPlace(placeID, name, path);
+    }
+
+    function placeDeleteClicked() {
+      var el = $(this);
+      var confirmString = Strings.REMOVE_PLACE_TITLE.replace("{{place}}", name);
+      var dialog = bootbox.dialog({
+        message: confirmString,
+        closeButton: false,
+        onEscape: true,
+        buttons: [
+          {
+            label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
+            className: "delete-place-cancel-btn",
+            callback: function() {
+              dialog.modal('hide');
+            }
+          },
+          {
+            label: Strings.REMOVE_PLACE_DELETE_BUTTON,
+            className: "delete-place-confirm-btn btn btn-danger",
+            callback: function() {
+              $('.delete-place-cancel-btn').attr('disabled', 'disabled');
+              $('.delete-place-confirm-btn').attr('disabled', 'disabled');
+              $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON_PENDING);
+              sendUpdatePlaceRequest(
+                placeID,
+                '',
+                null,
+                true,
+                function() {
+                  reloadDomainInfo();
+                  dialog.modal('hide');
+                }, function() {
+                  $('.delete-place-cancel-btn').removeAttr('disabled');
+                  $('.delete-place-confirm-btn').removeAttr('disabled');
+                  $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON);
+                  bootbox.alert(Strings.REMOVE_PLACE_ERROR);
+                });
+              return false;
+            }
+          },
+        ]
+      });
+    }
+
+    if (isTemporary) {
+      var editLink = "";
+      var deleteColumn = "<td class='buttons'></td>";
+    } else {
+      var editLink = " <a class='place-edit' href='javascript:void(0);'>Edit</a>";
+      var deleteColumn = "<td class='buttons'><a class='place-delete glyphicon glyphicon-remove'></a></td>";
+    }
+
+    var row = $("<tr><td>" + name_link + "</td><td>" + path + editLink + "</td>" + deleteColumn + "</tr>");
+    row.find(".place-edit").click(placeEditClicked);
+    row.find(".place-delete").click(placeDeleteClicked);
+
+    return row;
+  }
+
+  function placeTableRowForPlaceObject(place) {
+    var placePathOrIndex = (place.path ? place.path : "/");
+    return placeTableRow(place.name, placePathOrIndex, false, place.id);
+  }
+
+  function reloadDomainInfo() {
+    $('#' + Settings.PLACES_TABLE_ID + " tbody tr").not('.headers').remove();
+
+    $('.domain-loading-show').show();
+    $('.domain-loading-hide').hide();
+    $('.domain-loading-error').hide();
+    $('.loading-domain-info-spinner').show();
+    $('#' + Settings.PLACES_TABLE_ID).append("<tr colspan=3>Hello</tr>");
+
+    getDomainFromAPI(function(data){
+      $('.loading-domain-info-spinner').hide();
+      $('.domain-loading-show').hide();
+
+      // check if we have owner_places (for a real domain) or a name (for a temporary domain)
+      if (data.status == "success") {
+        $('.domain-loading-hide').show();
+        if (data.domain.owner_places) {
+          // add a table row for each of these names
+          _.each(data.domain.owner_places, function(place){
+            $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRowForPlaceObject(place));
+          });
+        } else if (data.domain.name) {
+          // add a table row for this temporary domain name
+          $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name, '/', true));
         }
 
-        isNonDeletableRow = isNonDeletableRow
-          || (nonDeletableRowKey === col.name && nonDeletableRowValues.indexOf(colValue) !== -1);
-
-        if (isArray && col.type === "checkbox" && col.editable) {
-          html +=
-            "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
-              "<input type='checkbox' class='form-control table-checkbox' " +
-                     "name='" + colName + "'" + (colValue ? " checked" : "") + "/>" +
-            "</td>";
-        } else if (isArray && col.type === "time" && col.editable) {
-          html +=
-            "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
-              "<input type='time' class='form-control table-time' name='" + colName + "' " +
-                     "value='" + (colValue || col.default || "00:00") + "'/>" +
-            "</td>";
-        } else {
-          // Use a hidden input so that the values are posted.
-          html +=
-            "<td class='" + Settings.DATA_COL_CLASS + "' " + (col.hidden ? "style='display: none;'" : "") +
-                "name='" + colName + "'>" +
-              colValue +
-              "<input type='hidden' name='" + colName + "' value='" + colValue + "'/>" +
-            "</td>";
+        // Update label
+        if (showOrHideLabel()) {
+          var label = data.domain.label;
+          label = label === null ? '' : label;
+          $('#network-label').val(label);
         }
 
+        // Update automatic networking
+        if (showOrHideAutomaticNetworking()) {
+          var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
+          var address = data.domain.network_address === null ? "" : data.domain.network_address;
+          var port = data.domain.network_port === null ? "" : data.domain.network_port;
+          if (autoNetworkingSetting === 'disabled') {
+            $('#network-address-port input').val(address + ":" + port);
+          } else if (autoNetworkingSetting === 'ip') {
+            $('#network-address-port input').val(port);
+          }
+        }
+
+        if (accessTokenIsSet()) {
+          appendAddButtonToPlacesTable();
+        }
+
+      } else {
+        $('.domain-loading-error').show();
+      }
+    })
+  }
+
+  function appendDomainIDButtons() {
+    var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR);
+
+    var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, Strings.CREATE_DOMAIN_BUTTON);
+    createButton.css('margin-top', '10px');
+    var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, Strings.CHOOSE_DOMAIN_BUTTON);
+    chooseButton.css('margin', '10px 0px 0px 10px');
+
+    domainIDInput.after(chooseButton);
+    domainIDInput.after(createButton);
+  }
+
+  function editHighFidelityPlace(placeID, name, path) {
+    var dialog;
+
+    var modal_body = "<div class='form-group'>";
+    modal_body += "<input type='text' id='place-path-input' class='form-control' value='" + path + "'>";
+    modal_body += "</div>";
+
+    var modal_buttons = [
+      {
+        label: Strings.EDIT_PLACE_CANCEL_BUTTON,
+        className: "edit-place-cancel-button",
+        callback: function() {
+          dialog.modal('hide');
+        }
+      },
+      {
+        label: Strings.EDIT_PLACE_CONFIRM_BUTTON,
+        className: 'edit-place-save-button btn btn-primary',
+        callback: function() {
+          var placePath = $('#place-path-input').val();
+
+          if (path == placePath) {
+            return true;
+          }
+
+          $('.edit-place-cancel-button').attr('disabled', 'disabled');
+          $('.edit-place-save-button').attr('disabled', 'disabled');
+          $('.edit-place-save-button').html(Strings.EDIT_PLACE_BUTTON_PENDING);
+
+          sendUpdatePlaceRequest(
+            placeID,
+            placePath,
+            null,
+            false,
+            function() {
+              dialog.modal('hide')
+              reloadDomainInfo();
+            },
+            function() {
+              $('.edit-place-cancel-button').removeAttr('disabled');
+              $('.edit-place-save-button').removeAttr('disabled');
+              $('.edit-place-save-button').html(Strings.EDIT_PLACE_CONFIRM_BUTTON);
+            }
+          );
+
+          return false;
+        }
+      }
+    ];
+
+    dialog = bootbox.dialog({
+      title: Strings.EDIT_PLACE_TITLE,
+      closeButton: false,
+      onEscape: true,
+      message: modal_body,
+      buttons: modal_buttons
+    })
+  }
+
+  function appendAddButtonToPlacesTable() {
+      var addRow = $("<tr> <td></td> <td></td> <td class='buttons'><a href='#' class='place-add glyphicon glyphicon-plus'></a></td> </tr>");
+      addRow.find(".place-add").click(function(ev) {
+        ev.preventDefault();
+        chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
+          if (newDomainID) {
+            Settings.data.values.metaverse.id = newDomainID;
+            var domainIDEl = $("[data-keypath='metaverse.id']");
+            domainIDEl.val(newDomainID);
+            Settings.initialValues.metaverse.id = newDomainID;
+            badgeForDifferences(domainIDEl);
+          }
+          reloadDomainInfo();
+        });
+      });
+      $('#' + Settings.PLACES_TABLE_ID + " tbody").append(addRow);
+  }
+
+  function chooseFromHighFidelityDomains(clickedButton) {
+    // setup the modal to help user pick their domain
+    if (Settings.initialValues.metaverse.access_token) {
+
+      // add a spinner to the choose button
+      clickedButton.html("Loading domains...");
+      clickedButton.attr('disabled', 'disabled');
+
+      // get a list of user domains from data-web
+      $.ajax({
+        url: "/api/domains",
+        dataType: 'json',
+        jsonp: false,
+        success: function(data){
+
+          var modal_buttons = {
+            cancel: {
+              label: 'Cancel',
+              className: 'btn-default'
+            }
+          }
+
+          if (data.data.domains.length) {
+            // setup a select box for the returned domains
+            modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
+            domain_select = $("<select id='domain-name-select' class='form-control'></select>");
+            _.each(data.data.domains, function(domain){
+              var domainString = "";
+
+              if (domain.label) {
+                domainString += '"' + domain.label+ '" - ';
+              }
+
+              domainString += domain.id;
+
+              domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
+            })
+            modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
+            modal_buttons["success"] = {
+              label: 'Choose domain',
+              callback: function() {
+                domainID = $('#domain-name-select').val()
+                // set the domain ID on the form
+                $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+              }
+            }
+          } else {
+            modal_buttons["success"] = {
+              label: 'Create new domain',
+              callback: function() {
+                window.open(URLs.METAVERSE_URL + "/user/domains", '_blank');
+              }
+            }
+            modal_body = "<p>You do not have any domains in your High Fidelity account." +
+              "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+          }
+
+          bootbox.dialog({
+            title: "Choose matching domain",
+            onEscape: true,
+            message: modal_body,
+            buttons: modal_buttons
+          })
+        },
+        error: function() {
+          bootbox.alert("Failed to retrieve your domains from the High Fidelity Metaverse");
+        },
+        complete: function() {
+          // remove the spinner from the choose button
+          clickedButton.html("Choose from my domains")
+          clickedButton.removeAttr('disabled')
+        }
       });
 
-      if (!setting.read_only) {
-        if (setting.can_order) {
-          html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES+
-                  "'><a href='javascript:void(0);' class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a>"
-                  + "<a href='javascript:void(0);' class='" + Settings.MOVE_DOWN_SPAN_CLASSES + "'></a></td>"
-        }
-        if (isNonDeletableRow) {
-          html += "<td></td>";
-        } else {
-          html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES
-                  + "'><a href='javascript:void(0);' class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></a></td>";
-        }
-      }
-
-      html += "</tr>"
-
-      if (isCategorized && setting.can_add_new_rows && _.findLastIndex(setting_value, categoryPair) === rowIndexOrName) {
-        html += makeTableInputs(setting, categoryPair, categoryValue);
-      }
-
-      row_num++
-    });
-  }
-
-  // populate inputs in the table for new values
-  if (!setting.read_only) {
-    if (setting.can_add_new_categories) {
-      html += makeTableCategoryInput(setting, numVisibleColumns);
-    }
-
-    if (setting.can_add_new_rows || setting.can_add_new_categories) {
-      html += makeTableHiddenInputs(setting, {}, "");
-    }
-  }
-  html += "</table>"
-
-  return html;
-}
-
-function makeTableCategoryHeader(categoryKey, categoryValue, numVisibleColumns, canRemove, message) {
-  var html =
-    "<tr class='" + Settings.DATA_CATEGORY_CLASS + "' data-key='" + categoryKey + "' data-category='" + categoryValue + "'>" +
-      "<td colspan='" + (numVisibleColumns - 1) + "' class='" + Settings.TOGGLE_CATEGORY_COLUMN_CLASS + "'>" +
-        "<span class='" + Settings.TOGGLE_CATEGORY_SPAN_CLASSES + " " + Settings.TOGGLE_CATEGORY_EXPANDED_CLASS + "'></span>" +
-        "<span message='" + message + "'>" + categoryValue + "</span>" +
-      "</td>" +
-      ((canRemove) ? (
-        "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'>" +
-          "<a href='javascript:void(0);' class='" + Settings.DEL_CATEGORY_SPAN_CLASSES + "'></a>" +
-        "</td>"
-      ) : (
-        "<td></td>"
-      )) +
-    "</tr>";
-  return html;
-}
-
-function makeTableHiddenInputs(setting, initialValues, categoryValue) {
-  var html = "<tr class='inputs'" + (setting.can_add_new_categories && !categoryValue ? " hidden" : "") + " " +
-                  (categoryValue ? ("data-category='" + categoryValue + "'") : "") + " " +
-                  (setting.categorize_by_key ? ("data-keep-field='" + setting.categorize_by_key + "'") : "") + ">";
-
-  if (setting.numbered === true) {
-    html += "<td class='numbered'></td>";
-  }
-
-  if (setting.key) {
-    html += "<td class='key' name='" + setting.key.name + "'>\
-             <input type='text' style='display: none;' class='form-control' placeholder='" + (_.has(setting.key, 'placeholder') ? setting.key.placeholder : "") + "' value=''>\
-             </td>"
-  }
-
-  _.each(setting.columns, function(col) {
-    var defaultValue = _.has(initialValues, col.name) ? initialValues[col.name] : col.default;
-    if (col.type === "checkbox") {
-      html +=
-        "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" +
-          "<input type='checkbox' style='display: none;' class='form-control table-checkbox' " +
-                 "name='" + col.name + "'" + (defaultValue ? " checked" : "") + "/>" +
-        "</td>";
-    } else if (col.type === "select") {
-        html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>"
-        html += "<select style='display: none;' class='form-control' data-hidden-input='" + col.name + "'>'"
-
-        for (var i in col.options) {
-            var option = col.options[i];
-            html += "<option value='" + option.value + "' " + (option.value == defaultValue ? 'selected' : '') + ">" + option.label + "</option>";
-        }
-
-        html += "</select>";
-        html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" +  defaultValue + "'></td>";
-    } else {
-      html +=
-        "<td " + (col.hidden ? "style='display: none;'" : "") + " class='" + Settings.DATA_COL_CLASS + "' " +
-            "name='" + col.name + "'>" +
-          "<input type='text' style='display: none;' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "' " +
-                 "value='" + (defaultValue || "") + "' data-default='" + (defaultValue || "") + "'" +
-                 (col.readonly ? " readonly" : "") + ">" +
-        "</td>";
-    }
-  })
-
-  if (setting.can_order) {
-    html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'></td>"
-  }
-  html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
-    "'><a href='javascript:void(0);' class='" + Settings.ADD_ROW_SPAN_CLASSES + "'></a></td>"
-  html += "</tr>"
-
-  return html
-}
-
-function makeTableCategoryInput(setting, numVisibleColumns) {
-  var canAddRows = setting.can_add_new_rows;
-  var categoryKey = setting.categorize_by_key;
-  var placeholder = setting.new_category_placeholder || "";
-  var message = setting.new_category_message || "";
-  var html =
-    "<tr class='" + Settings.DATA_CATEGORY_CLASS + " inputs' data-can-add-rows='" + canAddRows + "' " +
-        "data-key='" + categoryKey + "' data-message='" + message + "'>" +
-      "<td colspan='" + (numVisibleColumns - 1) + "'>" +
-        "<input type='text' class='form-control' placeholder='" + placeholder + "'/>" +
-      "</td>" +
-      "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'>" +
-        "<a href='javascript:void(0);' class='" + Settings.ADD_CATEGORY_SPAN_CLASSES + "'></a>" +
-      "</td>" +
-    "</tr>";
-  return html;
-}
-
-function getDescriptionForKey(key) {
-  for (var i in Settings.data.descriptions) {
-    if (Settings.data.descriptions[i].name === key) {
-      return Settings.data.descriptions[i];
-    }
-  }
-}
-
-var SAVE_BUTTON_LABEL_SAVE = "Save";
-var SAVE_BUTTON_LABEL_RESTART = "Save and restart";
-var reasonsForRestart = [];
-var numChangesBySection = {};
-
-function badgeSidebarForDifferences(changedElement) {
-  // figure out which group this input is in
-  var panelParentID = changedElement.closest('.panel').attr('id');
-
-  // if the panel contains non-grouped settings, the initial value is Settings.initialValues
-  var isGrouped = $('#' + panelParentID).hasClass('grouped');
-
-  if (isGrouped) {
-    var initialPanelJSON = Settings.initialValues[panelParentID]
-      ? Settings.initialValues[panelParentID]
-      : {};
-
-    // get a JSON representation of that section
-    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID];
-  } else {
-    var initialPanelJSON = Settings.initialValues;
-
-    // get a JSON representation of that section
-    var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
-  }
-
-  var badgeValue = 0
-  var description = getDescriptionForKey(panelParentID);
-
-  // badge for any settings we have that are not the same or are not present in initialValues
-  for (var setting in panelJSON) {
-    if ((!_.has(initialPanelJSON, setting) && panelJSON[setting] !== "") ||
-      (!_.isEqual(panelJSON[setting], initialPanelJSON[setting])
-      && (panelJSON[setting] !== "" || _.has(initialPanelJSON, setting)))) {
-      badgeValue += 1;
-
-      // add a reason to restart
-      if (description && description.restart != false) {
-        reasonsForRestart.push(setting);
-      }
-    } else {
-        // remove a reason to restart
-        if (description && description.restart != false) {
-          reasonsForRestart = $.grep(reasonsForRestart, function(v) { return v != setting; });
-      }
-    }
-  }
-
-  // update the list-group-item badge to have the new value
-  if (badgeValue == 0) {
-    badgeValue = ""
-  }
-
-  numChangesBySection[panelParentID] = badgeValue;
-
-  var hasChanges = badgeValue > 0;
-
-  if (!hasChanges) {
-    for (var key in numChangesBySection) {
-      if (numChangesBySection[key] > 0) {
-        hasChanges = true;
-        break;
-      }
-    }
-  }
-
-  $(".save-button").prop("disabled", !hasChanges);
-  $(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
-  $("a[href='#" + panelParentID + "'] .badge").html(badgeValue);
-}
-
-function addTableRow(row) {
-  var table = row.parents('table');
-  var isArray = table.data('setting-type') === 'array';
-  var keepField = row.data("keep-field");
-
-  var columns = row.parent().children('.' + Settings.DATA_ROW_CLASS);
-
-  var input_clone = row.clone();
-
-  if (!isArray) {
-    // show the key input
-    var keyInput = row.children(".key").children("input");
-  }
-
-  // Change input row to data row
-  var table = row.parents("table");
-  var setting_name = table.attr("name");
-  row.addClass(Settings.DATA_ROW_CLASS + " " + Settings.NEW_ROW_CLASS);
-
-  // if this is an array, add the row index (which is the index of the last row + 1)
-  // as a data attribute to the row
-  var row_index = 0;
-  if (isArray) {
-    var previous_row = row.siblings('.' + Settings.DATA_ROW_CLASS + ':last');
-
-    if (previous_row.length > 0) {
-      row_index = parseInt(previous_row.attr(Settings.DATA_ROW_INDEX), 10) + 1;
-    } else {
-      row_index = 0;
-    }
-
-    row.attr(Settings.DATA_ROW_INDEX, row_index);
-  }
-
-  var focusChanged = false;
-
-  _.each(row.children(), function(element) {
-    if ($(element).hasClass("numbered")) {
-      // Index row
-      var numbers = columns.children(".numbered")
-      if (numbers.length > 0) {
-        $(element).html(parseInt(numbers.last().text()) + 1)
       } else {
-        $(element).html(1)
+        bootbox.alert({
+          message: "You must have an access token to query your High Fidelity domains.<br><br>" +
+          "Please follow the instructions on the settings page to add an access token.",
+          title: "Access token required"
+        })
       }
-    } else if ($(element).hasClass(Settings.REORDER_BUTTONS_CLASS)) {
-      $(element).html("<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'><a href='javascript:void(0);'"
-                      + " class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a><a href='javascript:void(0);' class='"
-                      + Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>")
-    } else if ($(element).hasClass(Settings.ADD_DEL_BUTTONS_CLASS)) {
-      // Change buttons
-      var anchor = $(element).children("a")
-      anchor.removeClass(Settings.ADD_ROW_SPAN_CLASSES)
-      anchor.addClass(Settings.DEL_ROW_SPAN_CLASSES)
-    } else if ($(element).hasClass("key")) {
-      var input = $(element).children("input")
-      input.show();
-    } else if ($(element).hasClass(Settings.DATA_COL_CLASS)) {
-      // show inputs
-      var input = $(element).find("input");
-      input.show();
+    }
 
-      var isCheckbox = input.hasClass("table-checkbox");
-      var isDropdown = input.hasClass("table-dropdown");
+  function createTemporaryDomain() {
+    swal({
+      title: 'Create temporary place name',
+      text: "This will create a temporary place name and domain ID"
+        + " so other users can easily connect to your domain.</br></br>"
+        + "In order to make your domain reachable, this will also enable full automatic networking.",
+      showCancelButton: true,
+      confirmButtonText: 'Create',
+      closeOnConfirm: false,
+      html: true
+    }, function(isConfirm){
+      if (isConfirm) {
+        showSpinnerAlert('Creating temporary place name');
 
-      if (isArray) {
-        var key = $(element).attr('name');
+        // make a get request to get a temporary domain
+        $.post(URLs.METAVERSE_URL + '/api/v1/domains/temporary', function(data){
+          if (data.status == "success") {
+            var domain = data.data.domain;
 
-        // are there multiple columns or just one?
-        // with multiple we have an array of Objects, with one we have an array of whatever the value type is
-        var num_columns = row.children('.' + Settings.DATA_COL_CLASS).length
-        var newName = setting_name + "[" + row_index + "]" + (num_columns > 1 ? "." + key : "");
+            // we should have a new domain ID - set it on the domain ID value
+            $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change();
 
-        input.attr("name", newName);
+            // we also need to make sure auto networking is set to full
+            $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change();
 
-        if (isDropdown) {
-          // default values for hidden inputs inside child selects gets cleared so we need to remind it
-          var selectElement = $(element).children("select");
-          selectElement.attr("data-hidden-input", newName);
-          $(element).children("input").val(selectElement.val());
-        }
-      } else {
-        // because the name of the setting in question requires the key
-        // setup a hook to change the HTML name of the element whenever the key changes
-        var colName = $(element).attr("name");
-        keyInput.on('change', function(){
-          input.attr("name", setting_name + "." +  $(this).val() + "." + colName);
+            swal({
+              type: 'success',
+              title: 'Success!',
+              text: "We have created a temporary name and domain ID for you.</br></br>"
+                + "Your temporary place name is <strong>" + domain.name + "</strong>.</br></br>"
+                + "Press the button below to save your new settings and restart your domain-server.",
+              confirmButtonText: 'Save',
+              html: true
+            }, function(){
+              saveSettings();
+            });
+          }
         });
       }
-
-      if (!focusChanged) {
-          input.focus();
-          focusChanged = true;
-      }
-
-      // if we are adding a dropdown, we should go ahead and make its select
-      // element is visible
-      if (isDropdown) {
-          $(element).children("select").attr("style", "");
-      }
-
-      if (isCheckbox) {
-        $(input).find("input").attr("data-changed", "true");
-      } else {
-        input.attr("data-changed", "true");
-      }
-    } else {
-      console.log("Unknown table element");
-    }
-  });
-
-  input_clone.children('td').each(function () {
-    if ($(this).attr("name") !== keepField) {
-      $(this).find("input").val($(this).children('input').attr('data-default'));
-    }
-  });
-
-  if (isArray) {
-    updateDataChangedForSiblingRows(row, true)
-
-    // the addition of any table row should remove the empty-array-row
-    row.siblings('.empty-array-row').remove()
-  }
-
-  badgeSidebarForDifferences($(table))
-
-  row.after(input_clone)
-}
-
-function deleteTableRow($row) {
-  var $table = $row.closest('table');
-  var categoryName = $row.data("category");
-  var isArray = $table.data('setting-type') === 'array';
-
-  $row.empty();
-
-  if (!isArray) {
-    if ($row.attr('name')) {
-      $row.html("<input type='hidden' class='form-control' name='" + $row.attr('name') + "' data-changed='true' value=''>");
-    } else {
-      // for rows that didn't have a key, simply remove the row
-      $row.remove();
-    }
-  } else {
-    if ($table.find('.' + Settings.DATA_ROW_CLASS + "[data-category='" + categoryName + "']").length <= 1) {
-      // This is the last row of the category, so delete the header
-      $table.find('.' + Settings.DATA_CATEGORY_CLASS + "[data-category='" + categoryName + "']").remove();
-    }
-
-    if ($table.find('.' + Settings.DATA_ROW_CLASS).length > 1) {
-      updateDataChangedForSiblingRows($row);
-
-      // this isn't the last row - we can just remove it
-      $row.remove();
-    } else {
-      // this is the last row, we can't remove it completely since we need to post an empty array
-      $row
-        .removeClass(Settings.DATA_ROW_CLASS)
-        .removeClass(Settings.NEW_ROW_CLASS)
-        .removeAttr("data-category")
-        .addClass('empty-array-row')
-        .html("<input type='hidden' class='form-control' name='" + $table.attr("name").replace('[]', '') + "' " +
-              "data-changed='true' value=''>");
-    }
-  }
-
-  // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
-  badgeSidebarForDifferences($table);
-}
-
-function addTableCategory($categoryInputRow) {
-  var $input = $categoryInputRow.find("input").first();
-  var categoryValue = $input.prop("value");
-  if (!categoryValue || $categoryInputRow.closest("table").find("tr[data-category='" + categoryValue + "']").length !== 0) {
-    $categoryInputRow.addClass("has-warning");
-
-    setTimeout(function () {
-      $categoryInputRow.removeClass("has-warning");
-    }, 400);
-
-    return;
-  }
-
-  var $rowInput = $categoryInputRow.next(".inputs").clone();
-  if (!$rowInput) {
-    console.error("Error cloning inputs");
-  }
-
-  var canAddRows = $categoryInputRow.data("can-add-rows");
-  var message = $categoryInputRow.data("message");
-  var categoryKey = $categoryInputRow.data("key");
-  var width = 0;
-  $categoryInputRow
-    .children("td")
-    .each(function () {
-      width += $(this).prop("colSpan") || 1;
     });
-
-  $input
-    .prop("value", "")
-    .focus();
-
-  $rowInput.find("td[name='" + categoryKey + "'] > input").first()
-    .prop("value", categoryValue);
-  $rowInput
-    .attr("data-category", categoryValue)
-    .addClass(Settings.NEW_ROW_CLASS);
-
-  var $newCategoryRow = $(makeTableCategoryHeader(categoryKey, categoryValue, width, true, " - " + message));
-  $newCategoryRow.addClass(Settings.NEW_ROW_CLASS);
-
-  $categoryInputRow
-    .before($newCategoryRow)
-    .before($rowInput);
-
-  if (canAddRows) {
-    $rowInput.removeAttr("hidden");
-  } else {
-    addTableRow($rowInput);
-  }
-}
-
-function deleteTableCategory($categoryHeaderRow) {
-  var categoryName = $categoryHeaderRow.data("category");
-
-  $categoryHeaderRow
-    .closest("table")
-    .find("tr[data-category='" + categoryName + "']")
-    .each(function () {
-      if ($(this).hasClass(Settings.DATA_ROW_CLASS)) {
-        deleteTableRow($(this));
-      } else {
-        $(this).remove();
-      }
-    });
-}
-
-function toggleTableCategory($categoryHeaderRow) {
-  var $icon = $categoryHeaderRow.find("." + Settings.TOGGLE_CATEGORY_SPAN_CLASS).first();
-  var categoryName = $categoryHeaderRow.data("category");
-  var wasExpanded = $icon.hasClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
-  if (wasExpanded) {
-    $icon
-      .addClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS)
-      .removeClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS);
-  } else {
-    $icon
-      .addClass(Settings.TOGGLE_CATEGORY_EXPANDED_CLASS)
-      .removeClass(Settings.TOGGLE_CATEGORY_CONTRACTED_CLASS);
-  }
-  $categoryHeaderRow
-    .closest("table")
-    .find("tr[data-category='" + categoryName + "']")
-    .toggleClass("contracted", wasExpanded);
-}
-
-function moveTableRow(row, move_up) {
-  var table = $(row).closest('table')
-  var isArray = table.data('setting-type') === 'array'
-  if (!isArray) {
-    return;
   }
 
-  if (move_up) {
-    var prev_row = row.prev()
-    if (prev_row.hasClass(Settings.DATA_ROW_CLASS)) {
-      prev_row.before(row)
-    }
-  } else {
-    var next_row = row.next()
-    if (next_row.hasClass(Settings.DATA_ROW_CLASS)) {
-      next_row.after(row)
-    }
-  }
-
-  // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
-  badgeSidebarForDifferences($(table))
-}
-
-function updateDataChangedForSiblingRows(row, forceTrue) {
-  // anytime a new row is added to an array we need to set data-changed for all sibling row inputs to true
-  // unless it matches the inital set of values
-
-  if (!forceTrue) {
-    // figure out which group this row is in
-    var panelParentID = row.closest('.panel').attr('id')
-    // get the short name for the setting from the table
-    var tableShortName = row.closest('table').data('short-name')
-
-    // get a JSON representation of that section
-    var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName]
-    if (Settings.initialValues[panelParentID]) {
-      var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName]
-    } else {
-      var initialPanelSettingJSON = {};
-    }
-
-    // if they are equal, we don't need data-changed
-    isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON)
-  } else {
-    isTrue = true
-  }
-
-  row.siblings('.' + Settings.DATA_ROW_CLASS).each(function(){
-    var hiddenInput = $(this).find('td.' + Settings.DATA_COL_CLASS + ' input')
-    if (isTrue) {
-      hiddenInput.attr('data-changed', isTrue)
-    } else {
-      hiddenInput.removeAttr('data-changed')
-    }
-  })
-}
-
-function cleanupFormValues(node) {
-  if (node.type && node.type === 'checkbox') {
-    return { name: node.name, value: node.checked ? true : false };
-  } else {
-    return false;
-  }
-}
-
-function showErrorMessage(title, message) {
-  swal(title, message)
-}
+});
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 65053b7366..68a36195d9 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -501,7 +501,7 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
         // store the new domain ID and auto network setting immediately
         QString newSettingsJSON = QString("{\"metaverse\": { \"id\": \"%1\", \"automatic_networking\": \"full\"}}").arg(id);
         auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8());
-        _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object());
+        _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings);
 
         // store the new ID and auto networking setting on disk
         _settingsManager.persistToFile();
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 05227d35b7..52754babb3 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -39,8 +39,10 @@ const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings
 const QString DESCRIPTION_SETTINGS_KEY = "settings";
 const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
+const QString DESCRIPTION_GROUP_LABEL_KEY = "label";
 const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 const QString DESCRIPTION_COLUMNS_KEY = "columns";
+const QString CONTENT_SETTING_FLAG_KEY = "content_setting";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
@@ -63,6 +65,8 @@ DomainServerSettingsManager::DomainServerSettingsManager() {
 
             if (descriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
                 _descriptionArray = descriptionDocument.object()[DESCRIPTION_SETTINGS_KEY].toArray();
+                splitSettingsDescription();
+
                 return;
             }
         }
@@ -78,6 +82,91 @@ DomainServerSettingsManager::DomainServerSettingsManager() {
                               Q_ARG(int, MISSING_SETTINGS_DESC_ERROR_CODE));
 }
 
+void DomainServerSettingsManager::splitSettingsDescription() {
+    // construct separate description arrays for domain settings and content settings
+    // since they are displayed on different pages
+
+    // along the way we also construct one object that holds the groups separated by domain settings
+    // and content settings, so that the DS can setup dropdown menus below "Content" and "Settings"
+    // headers to jump directly to a settings group on the page of either
+    QJsonArray domainSettingsMenuGroups;
+    QJsonArray contentSettingsMenuGroups;
+
+    foreach(const QJsonValue& group, _descriptionArray) {
+        QJsonObject groupObject = group.toObject();
+
+        static const QString HIDDEN_GROUP_KEY = "hidden";
+        bool groupHidden = groupObject.contains(HIDDEN_GROUP_KEY) && groupObject[HIDDEN_GROUP_KEY].toBool();
+
+        QJsonArray domainSettingArray;
+        QJsonArray contentSettingArray;
+
+        foreach(const QJsonValue& settingDescription, groupObject[DESCRIPTION_SETTINGS_KEY].toArray()) {
+            QJsonObject settingDescriptionObject = settingDescription.toObject();
+
+            bool isContentSetting = settingDescriptionObject.contains(CONTENT_SETTING_FLAG_KEY)
+                && settingDescriptionObject[CONTENT_SETTING_FLAG_KEY].toBool();
+
+            if (isContentSetting) {
+                // push the setting description to the pending content setting array
+                contentSettingArray.push_back(settingDescriptionObject);
+            } else {
+                // push the setting description to the pending domain setting array
+                domainSettingArray.push_back(settingDescriptionObject);
+            }
+        }
+
+        if (!domainSettingArray.isEmpty() || !contentSettingArray.isEmpty()) {
+
+            // we know for sure we'll have something to add to our settings menu groups
+            // so setup that object for the group now, as long as the group isn't hidden alltogether
+            QJsonObject settingsDropdownGroup;
+
+            if (!groupHidden) {
+                settingsDropdownGroup[DESCRIPTION_NAME_KEY] = groupObject[DESCRIPTION_NAME_KEY];
+                settingsDropdownGroup[DESCRIPTION_GROUP_LABEL_KEY] = groupObject[DESCRIPTION_GROUP_LABEL_KEY];
+
+                static const QString DESCRIPTION_GROUP_HTML_ID_KEY = "html_id";
+                if (groupObject.contains(DESCRIPTION_GROUP_HTML_ID_KEY)) {
+                    settingsDropdownGroup[DESCRIPTION_GROUP_HTML_ID_KEY] = groupObject[DESCRIPTION_GROUP_HTML_ID_KEY];
+                }
+            }
+
+            if (!domainSettingArray.isEmpty()) {
+                // we have some domain settings from this group, add the group with the filtered settings
+                QJsonObject filteredGroupObject = groupObject;
+                filteredGroupObject[DESCRIPTION_SETTINGS_KEY] = domainSettingArray;
+                _domainSettingsDescription.push_back(filteredGroupObject);
+
+                // if the group isn't hidden, add its information to the domain settings menu groups
+                if (!groupHidden) {
+                    domainSettingsMenuGroups.push_back(settingsDropdownGroup);
+                }
+            }
+
+            if (!contentSettingArray.isEmpty()) {
+                // we have some content settings from this group, add the group with the filtered settings
+                QJsonObject filteredGroupObject = groupObject;
+                filteredGroupObject[DESCRIPTION_SETTINGS_KEY] = contentSettingArray;
+                _contentSettingsDescription.push_back(filteredGroupObject);
+
+                // if the group isn't hidden, add its information to the content settings menu groups
+                if (!groupHidden) {
+                    contentSettingsMenuGroups.push_back(settingsDropdownGroup);
+                }
+            }
+        }
+    }
+
+    // populate the settings menu groups with what we've collected
+
+    static const QString SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY = "domain_settings";
+    static const QString SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY = "content_settings";
+
+    _settingsMenuGroups[SPLIT_MENU_GROUPS_DOMAIN_SETTINGS_KEY] = domainSettingsMenuGroups;
+    _settingsMenuGroups[SPLIT_MENU_GROUPS_CONTENT_SETTINGS_KEY] = contentSettingsMenuGroups;
+}
+
 void DomainServerSettingsManager::processSettingsRequestPacket(QSharedPointer<ReceivedMessage> message) {
     Assignment::Type type;
     message->readPrimitive(&type);
@@ -986,48 +1075,72 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
 }
 
 bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection *connection, const QUrl &url) {
-    if (connection->requestOperation() == QNetworkAccessManager::PostOperation && url.path() == SETTINGS_PATH_JSON) {
-        // this is a POST operation to change one or more settings
-        QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
-        QJsonObject postedObject = postedDocument.object();
+    if (connection->requestOperation() == QNetworkAccessManager::PostOperation) {
+        if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
+            // this is a POST operation to change one or more settings
+            QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
+            QJsonObject postedObject = postedDocument.object();
 
-        // we recurse one level deep below each group for the appropriate setting
-        bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject);
+            SettingsType endpointType = url.path() == SETTINGS_PATH_JSON ? DomainSettings : ContentSettings;
 
-        // store whatever the current _settingsMap is to file
-        persistToFile();
+            // we recurse one level deep below each group for the appropriate setting
+            bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject, endpointType);
 
-        // return success to the caller
-        QString jsonSuccess = "{\"status\": \"success\"}";
-        connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+            // store whatever the current _settingsMap is to file
+            persistToFile();
 
-        // defer a restart to the domain-server, this gives our HTTPConnection enough time to respond
-        if (restartRequired) {
-            const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
-            QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
-        } else {
-            unpackPermissions();
-            apiRefreshGroupInformation();
-            emit updateNodePermissions();
-            emit settingsUpdated();
+            // return success to the caller
+            QString jsonSuccess = "{\"status\": \"success\"}";
+            connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+
+            // defer a restart to the domain-server, this gives our HTTPConnection enough time to respond
+            if (restartRequired) {
+                const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
+                QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
+            } else {
+                unpackPermissions();
+                apiRefreshGroupInformation();
+                emit updateNodePermissions();
+                emit settingsUpdated();
+            }
+
+            return true;
         }
+    }   else if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
+        static const QString SETTINGS_MENU_GROUPS_PATH = "/settings-menu-groups.json";
 
-        return true;
-    } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH_JSON) {
-        // setup a JSON Object with descriptions and non-omitted settings
-        const QString SETTINGS_RESPONSE_DESCRIPTION_KEY = "descriptions";
-        const QString SETTINGS_RESPONSE_VALUE_KEY = "values";
+        if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
 
-        QJsonObject rootObject;
-        rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = _descriptionArray;
-        rootObject[SETTINGS_RESPONSE_VALUE_KEY] = responseObjectForType("", true);
-        connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
+            // setup a JSON Object with descriptions and non-omitted settings
+            const QString SETTINGS_RESPONSE_DESCRIPTION_KEY = "descriptions";
+            const QString SETTINGS_RESPONSE_VALUE_KEY = "values";
+
+            QJsonObject rootObject;
+
+            bool forDomainSettings = (url.path() == SETTINGS_PATH_JSON);
+            bool forContentSettings = (url.path() == CONTENT_SETTINGS_PATH_JSON);;
+
+            rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = forDomainSettings
+                ? _domainSettingsDescription : _contentSettingsDescription;
+
+            // grab a domain settings object for all types, filtered for the right class of settings
+            rootObject[SETTINGS_RESPONSE_VALUE_KEY] = responseObjectForType("", true, forDomainSettings, forContentSettings);
+
+            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
+
+            return true;
+        } else if (url.path() == SETTINGS_MENU_GROUPS_PATH) {
+            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(_settingsMenuGroups).toJson(), "application/json");
+
+            return true;
+        }
     }
 
     return false;
 }
 
-QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated) {
+QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated,
+                                                               bool includeDomainSettings, bool includeContentSettings) {
     QJsonObject responseObject;
 
     if (!typeValue.isEmpty() || isAuthenticated) {
@@ -1036,8 +1149,15 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
 
         const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
 
+        QJsonArray& filteredDescriptionArray = _descriptionArray;
+        if (includeDomainSettings && !includeContentSettings) {
+            filteredDescriptionArray = _domainSettingsDescription;
+        } else if (includeContentSettings && !includeDomainSettings) {
+            filteredDescriptionArray = _contentSettingsDescription;
+        }
+
         // enumerate the groups in the description object to find which settings to pass
-        foreach(const QJsonValue& groupValue, _descriptionArray) {
+        foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
             QJsonObject groupObject = groupValue.toObject();
             QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
             QJsonArray groupSettingsArray = groupObject[DESCRIPTION_SETTINGS_KEY].toArray();
@@ -1045,10 +1165,13 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
             QJsonObject groupResponseObject;
 
             foreach(const QJsonValue& settingValue, groupSettingsArray) {
+
                 const QString VALUE_HIDDEN_FLAG_KEY = "value-hidden";
 
                 QJsonObject settingObject = settingValue.toObject();
 
+                // consider this setting as long as it isn't hidden
+                // and we've been asked to include this type (domain setting or content setting)
                 if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
@@ -1212,7 +1335,8 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson
     return QJsonObject();
 }
 
-bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject) {
+bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
+                                                                        SettingsType settingsType) {
     static const QString SECURITY_ROOT_KEY = "security";
     static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist";
     static const QString BROADCASTING_KEY = "broadcasting";
@@ -1222,6 +1346,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
     auto& settingsVariant = _configMap.getConfig();
     bool needRestart = false;
 
+    auto& filteredDescriptionArray = settingsType == DomainSettings ? _domainSettingsDescription : _contentSettingsDescription;
+
     // Iterate on the setting groups
     foreach(const QString& rootKey, postedObject.keys()) {
         const QJsonValue& rootValue = postedObject[rootKey];
@@ -1236,7 +1362,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
         QJsonObject groupDescriptionObject;
 
         // we need to check the description array to see if this is a root setting or a group setting
-        foreach(const QJsonValue& groupValue, _descriptionArray) {
+        foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
             if (groupValue.toObject()[DESCRIPTION_NAME_KEY] == rootKey) {
                 // we matched a group - keep this since we'll use it below to update the settings
                 groupDescriptionObject = groupValue.toObject();
@@ -1269,6 +1395,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
 
             if (!matchingDescriptionObject.isEmpty()) {
                 updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject);
+
                 if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
                     rootKey != SETTINGS_PATHS_KEY && rootKey != WIZARD_KEY) {
                     needRestart = true;
@@ -1286,6 +1413,7 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
                 if (!matchingDescriptionObject.isEmpty()) {
                     const QJsonValue& settingValue = rootValue.toObject()[settingKey];
                     updateSetting(settingKey, settingValue, *thisMap, matchingDescriptionObject);
+
                     if ((rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
                          rootKey != DESCRIPTION_ROOT_KEY && rootKey != WIZARD_KEY) ||
                         settingKey == AC_SUBNET_WHITELIST_KEY) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index d2f6d1e526..5e13c9f28a 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -13,6 +13,7 @@
 #define hifi_DomainServerSettingsManager_h
 
 #include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 #include <QtCore/QJsonDocument>
 #include <QtNetwork/QNetworkReply>
 
@@ -28,6 +29,7 @@ const QString SETTINGS_PATHS_KEY = "paths";
 
 const QString SETTINGS_PATH = "/settings";
 const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
+const QString CONTENT_SETTINGS_PATH_JSON = "/content-settings.json";
 const QString AGENT_STANDARD_PERMISSIONS_KEYPATH = "security.standard_permissions";
 const QString AGENT_PERMISSIONS_KEYPATH = "security.permissions";
 const QString IP_PERMISSIONS_KEYPATH = "security.ip_permissions";
@@ -38,6 +40,10 @@ const QString GROUP_FORBIDDENS_KEYPATH = "security.group_forbiddens";
 
 using GroupByUUIDKey = QPair<QUuid, QUuid>; // groupID, rankID
 
+enum SettingsType {
+    DomainSettings,
+    ContentSettings
+};
 
 class DomainServerSettingsManager : public QObject {
     Q_OBJECT
@@ -123,8 +129,10 @@ private slots:
 private:
     QStringList _argumentList;
 
-    QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
-    bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject);
+    QJsonArray filteredDescriptionArray(bool isContentSettings);
+    QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+                                      bool includeDomainSettings = true, bool includeContentSettings = true);
+    bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
 
     void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
                        const QJsonObject& settingDescription);
@@ -132,8 +140,15 @@ private:
     void sortPermissions();
     void persistToFile();
 
+    void splitSettingsDescription();
+
     double _descriptionVersion;
+
     QJsonArray _descriptionArray;
+    QJsonArray _domainSettingsDescription;
+    QJsonArray _contentSettingsDescription;
+    QJsonObject _settingsMenuGroups;
+
     HifiConfigVariantMap _configMap;
 
     friend class DomainServer;
diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index bd256578d8..fd127a2e92 100644
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -79,7 +79,7 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
             QHash<QByteArray, QByteArray> redirectHeader;
             redirectHeader.insert(QByteArray("Location"), redirectLocation.toUtf8());
             
-            connection->respond(HTTPConnection::StatusCode301, "", HTTPConnection::DefaultContentType, redirectHeader);
+            connection->respond(HTTPConnection::StatusCode302, "", HTTPConnection::DefaultContentType, redirectHeader);
         }
         
         // if the last thing is a trailing slash then we want to look for index file

From b0967dfc3a188fb799f0c82fd42d41f3e7272a39 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 16:38:32 -0800
Subject: [PATCH 230/569] move some more settings to content, leave places in
 domain settings

---
 domain-server/resources/describe-settings.json      |  7 +++++--
 domain-server/resources/web/js/base-settings.js     |  8 ++++++--
 domain-server/resources/web/js/domain-server.js     |  7 +++++++
 domain-server/resources/web/settings/js/settings.js | 11 +++++++++--
 domain-server/src/DomainServerSettingsManager.cpp   |  7 ++++++-
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 705d110542..b9a4246895 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -55,8 +55,8 @@
       ]
     },
     {
-      "label": "Places / Paths",
-      "html_id": "places_paths",
+      "label": "Paths",
+      "html_id": "paths",
       "restart": false,
       "settings": [
         {
@@ -64,6 +64,7 @@
           "label": "Paths",
           "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
           "type": "table",
+          "content_setting": true,
           "can_add_new_rows": true,
           "key": {
             "name": "path",
@@ -1081,6 +1082,7 @@
           "name": "attenuation_per_doubling_in_distance",
           "label": "Default Domain Attenuation",
           "help": "Factor between 0 and 1.0 (0: No attenuation, 1.0: extreme attenuation)",
+          "content_setting": true,
           "placeholder": "0.5",
           "default": "0.5",
           "advanced": false
@@ -1313,6 +1315,7 @@
           "name": "entityEditFilter",
           "label": "Filter Entity Edits",
           "help": "Check all entity edits against this filter function.",
+          "content_setting": true,
           "placeholder": "url whose content is like: function filter(properties) { return properties; }",
           "default": "",
           "advanced": true
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 5e32463d61..aad342da63 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -94,9 +94,13 @@ var viewHelpers = {
 
 function reloadSettings(callback) {
   $.getJSON(Settings.endpoint, function(data){
-    _.extend(data, viewHelpers)
+    _.extend(data, viewHelpers);
 
-    $('#panels').html(Settings.panelsTemplate(data))
+    for (var spliceIndex in Settings.extraGroups) {
+      data.descriptions.splice(spliceIndex, 0, Settings.extraGroups[spliceIndex]);
+    }
+
+    $('#panels').html(Settings.panelsTemplate(data));
 
     Settings.data = data;
     Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index aa658bce3f..a7c8c3a4d1 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -79,6 +79,13 @@ $(document).ready(function(){
         }
 
         $settingsDropdown.append(makeGroupDropdownElement(group, "/settings/"));
+
+        // for domain settings, we add a dummy "Places" group that we fill
+        // via the API - add it to the dropdown menu in the right spot
+        if (index == 1) {
+          $settingsDropdown.append("<li role='separator' class='divider'></li>");
+          $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
+        }
       });
     });
   }
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 9a31b766a6..d10d1304c3 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -14,6 +14,14 @@ $(document).ready(function(){
       return b;
   })(window.location.search.substr(1).split('&'));
 
+  // define extra groups to add to description, with their splice index
+  Settings.extraGroups = {
+    1: {
+      html_id: 'places',
+      label: 'Places'
+    }
+  }
+
   Settings.afterReloadActions = function() {
     // append the domain selection modal
     appendDomainIDButtons();
@@ -657,8 +665,7 @@ $(document).ready(function(){
     var placesTableGroup = viewHelpers.getFormGroup('', placesTableSetting, Settings.data.values);
 
     // append the places table in the right place
-    $('#places_paths .panel-body').prepend(placesTableGroup);
-    //$('#' + Settings.PLACES_TABLE_ID).append("<tr><td colspan=3></td></tr>");
+    $('#places .panel-body').prepend(placesTableGroup);
 
     var spinner = createDomainSpinner();
     $('#' + Settings.PLACES_TABLE_ID).after($(spinner));
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 52754babb3..f91c5af06f 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -123,7 +123,10 @@ void DomainServerSettingsManager::splitSettingsDescription() {
             QJsonObject settingsDropdownGroup;
 
             if (!groupHidden) {
-                settingsDropdownGroup[DESCRIPTION_NAME_KEY] = groupObject[DESCRIPTION_NAME_KEY];
+                if (groupObject.contains(DESCRIPTION_NAME_KEY)) {
+                    settingsDropdownGroup[DESCRIPTION_NAME_KEY] = groupObject[DESCRIPTION_NAME_KEY];
+                }
+
                 settingsDropdownGroup[DESCRIPTION_GROUP_LABEL_KEY] = groupObject[DESCRIPTION_GROUP_LABEL_KEY];
 
                 static const QString DESCRIPTION_GROUP_HTML_ID_KEY = "html_id";
@@ -1383,7 +1386,9 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
             foreach(const QJsonValue& groupValue, _descriptionArray) {
                 // find groups with root values (they don't have a group name)
                 QJsonObject groupObject = groupValue.toObject();
+
                 if (!groupObject.contains(DESCRIPTION_NAME_KEY)) {
+
                     // this is a group with root values - check if our setting is in here
                     matchingDescriptionObject = settingDescriptionFromGroup(groupObject, rootKey);
 

From 8c924ea1065f6f7e3eea80b2f92b13c6e3573710 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 17:13:03 -0800
Subject: [PATCH 231/569] update badge colour

---
 domain-server/resources/web/css/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 22de75a778..5155ab2330 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -414,6 +414,7 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
 
 .badge {
   margin-left: 5px;
+  background-color: #00B4EF !important;
 }
 
 .panel-title {

From 2c2a6d5c603342099c8edddc5fed026d1ac1b3f5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 17:24:56 -0800
Subject: [PATCH 232/569] add the empty label group to domain extra groups

---
 domain-server/resources/describe-settings.json      | 6 ------
 domain-server/resources/web/settings/js/settings.js | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index b9a4246895..bd351eb173 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,12 +1,6 @@
 {
   "version": 2.1,
   "settings": [
-    {
-      "name": "label",
-      "label": "Label",
-      "settings": [
-      ]
-    },
     {
       "name": "metaverse",
       "label": "Metaverse / Networking",
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index d10d1304c3..39d776af8b 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -16,7 +16,11 @@ $(document).ready(function(){
 
   // define extra groups to add to description, with their splice index
   Settings.extraGroups = {
-    1: {
+    0: {
+      html_id: 'label',
+      label: 'Label'
+    },
+    2: {
       html_id: 'places',
       label: 'Places'
     }

From 6e93eb5dfa5b28da904c840ba7070323d9f513f7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 17:27:52 -0800
Subject: [PATCH 233/569] update SVG icon for HMD with new colour

---
 domain-server/resources/web/images/hmd-w-eyes.svg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/images/hmd-w-eyes.svg b/domain-server/resources/web/images/hmd-w-eyes.svg
index c100de2f4e..0e9081c10c 100644
--- a/domain-server/resources/web/images/hmd-w-eyes.svg
+++ b/domain-server/resources/web/images/hmd-w-eyes.svg
@@ -2,7 +2,10 @@
 <!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 456 244" style="enable-background:new 0 0 456 244;" xml:space="preserve">
-<path d="M352.8,3.4h-250C49.6,3.4,6.3,46.2,6.3,98.9v44.9c0,52.7,43.3,95.5,96.5,95.5h67.6c19.4,0,31.9-17.9,42.9-33.6
+<style type="text/css">
+	.st0{fill:#666666;}
+</style>
+<path class="st0" d="M352.8,3.4h-250C49.6,3.4,6.3,46.2,6.3,98.9v44.9c0,52.7,43.3,95.5,96.5,95.5h67.6c19.4,0,31.9-17.9,42.9-33.6
 	c4.2-6.1,11.1-15.9,14.8-17.9c3.6,2.1,10.4,12.2,14.5,18.4c10.4,15.5,22.1,33.1,40.3,33.1h69.9c53.3,0,96.5-42.9,96.5-95.5V98.9
 	C449.3,46.2,406,3.4,352.8,3.4z M129.6,157.6c-22.4,0-40.6-18.2-40.6-40.6s18.2-40.6,40.6-40.6c22.4,0,40.6,18.2,40.6,40.6
 	S151.9,157.6,129.6,157.6z M328.4,157.6c-22.4,0-40.6-18.2-40.6-40.6s18.2-40.6,40.6-40.6c22.4,0,40.6,18.2,40.6,40.6

From b650753e438ae67d91f3515f7d979bf109af43a4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 30 Jan 2018 17:41:37 -0800
Subject: [PATCH 234/569] hide confusing label from domain settings for now

---
 domain-server/resources/web/settings/js/settings.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 39d776af8b..aa312228e6 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -16,11 +16,7 @@ $(document).ready(function(){
 
   // define extra groups to add to description, with their splice index
   Settings.extraGroups = {
-    0: {
-      html_id: 'label',
-      label: 'Label'
-    },
-    2: {
+    1: {
       html_id: 'places',
       label: 'Places'
     }
@@ -37,7 +33,7 @@ $(document).ready(function(){
     setupPlacesTable();
 
     setupDomainNetworkingSettings();
-    setupDomainLabelSetting();
+    // setupDomainLabelSetting();
 
     if (Settings.data.values.metaverse.id.length > 0) {
       // now, ask the API for what places, if any, point to this domain

From 3969288996b0217c89160deba589040884619c7c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jan 2018 15:26:54 -0800
Subject: [PATCH 235/569] re-hide advanced settings and show with collapsible

---
 domain-server/resources/web/base-settings.html | 16 +++++++++++++++-
 domain-server/resources/web/css/style.css      |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/base-settings.html b/domain-server/resources/web/base-settings.html
index 13787b5fbe..2f0fcbe73b 100644
--- a/domain-server/resources/web/base-settings.html
+++ b/domain-server/resources/web/base-settings.html
@@ -24,6 +24,10 @@
                 <% return !value.deprecated %>
               <% })[0] %>
 
+              <% var split_settings = _.partition(group.settings, function(value, index) { %>
+                <% return !value.advanced %>
+              <% }) %>
+
               <% isGrouped = !!group.name %>
               <% panelID = isGrouped ? group.name : group.html_id %>
 
@@ -35,10 +39,20 @@
                   <span class="badge"></span>
                 </div>
                 <div class="panel-body">
-                  <% _.each(settings, function(setting) { %>
+                  <% _.each(split_settings[0], function(setting) { %>
                     <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
                     <%= getFormGroup(keypath, setting, values, false) %>
                   <% }); %>
+
+                  <% if (split_settings[1].length > 0) { %>
+                    <button type="button" class="btn btn-default" data-toggle="collapse" data-target="#<%- panelID %>-advanced">Advanced Settings <span class="caret"></span></button>
+                    <div id="<%- panelID %>-advanced" class="collapse advanced-settings-section">
+                      <% _.each(split_settings[1], function(setting) { %>
+                        <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
+                        <%= getFormGroup(keypath, setting, values, true) %>
+                      <% }); %>
+                    </div>
+                  <% } %>
                 </div>
               </div>
             <% } %>
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 5155ab2330..8090c9f450 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -426,3 +426,7 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
   position: relative;
   top: -1px;
 }
+
+.advanced-settings-section {
+  margin-top: 20px;
+}

From bb2df1eb37f30fda8a8f71be18a1b941836ebfca Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jan 2018 15:27:29 -0800
Subject: [PATCH 236/569] rename entity server section to remove settings

---
 domain-server/resources/describe-settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index bd351eb173..cf3321f831 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1268,7 +1268,7 @@
     },
     {
       "name": "entity_server_settings",
-      "label": "Entity Server Settings",
+      "label": "Entity Server",
       "assignment-types": [
         6
       ],

From 0ace92798d66c95987396f1b7c2d4d8989e3a42f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jan 2018 17:18:49 -0800
Subject: [PATCH 237/569] repair 2.1 settings migration code for avatar height

---
 domain-server/src/DomainServerSettingsManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index f91c5af06f..874e543a08 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -406,14 +406,14 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
             QVariant* avatarMinScale = _configMap.valueForKeyPath(AVATAR_MIN_SCALE_KEYPATH);
             if (avatarMinScale) {
-                float scale = avatarMinScale->toFloat();
-                _configMap.valueForKeyPath(AVATAR_MIN_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+                auto newMinScaleVariant = _configMap.valueForKeyPath(AVATAR_MIN_HEIGHT_KEYPATH, true);
+                *newMinScaleVariant = avatarMinScale->toFloat() * DEFAULT_AVATAR_HEIGHT;
             }
 
             QVariant* avatarMaxScale = _configMap.valueForKeyPath(AVATAR_MAX_SCALE_KEYPATH);
             if (avatarMaxScale) {
-                float scale = avatarMaxScale->toFloat();
-                _configMap.valueForKeyPath(AVATAR_MAX_HEIGHT_KEYPATH, scale * DEFAULT_AVATAR_HEIGHT);
+                auto newMaxScaleVariant = _configMap.valueForKeyPath(AVATAR_MAX_HEIGHT_KEYPATH, true);
+                *newMaxScaleVariant = avatarMaxScale->toFloat() * DEFAULT_AVATAR_HEIGHT;
             }
         }
 

From 2f6b079d80dc618bb8208d644c2d9dadb79069f9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Jan 2018 17:19:07 -0800
Subject: [PATCH 238/569] quick re-organization of settings groups

---
 .../resources/describe-settings.json          | 234 +++++++++---------
 .../resources/web/js/domain-server.js         |   2 +-
 domain-server/resources/web/js/shared.js      |   4 +
 3 files changed, 122 insertions(+), 118 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index cf3321f831..103c045516 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -951,99 +951,6 @@
         }
       ]
     },
-    {
-      "name": "asset_server",
-      "label": "Asset Server (ATP)",
-      "assignment-types": [ 3 ],
-      "settings": [
-        {
-          "name": "enabled",
-          "type": "checkbox",
-          "label": "Enabled",
-          "help": "Assigns an asset-server in your domain to serve files to clients via the ATP protocol (over UDP)",
-          "default": true,
-          "advanced": true
-        },
-        {
-          "name": "assets_path",
-          "type": "string",
-          "label": "Assets Path",
-          "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
-          "default": "",
-          "advanced": true
-        },
-        {
-          "name": "assets_filesize_limit",
-          "type": "int",
-          "label": "File Size Limit",
-          "help": "The file size limit of an asset that can be imported into the asset server in MBytes. 0 (default) means no limit on file size.",
-          "default": 0,
-          "advanced": true
-        }
-      ]
-    },
-    {
-      "name": "entity_script_server",
-      "label": "Entity Script Server (ESS)",
-      "assignment-types": [ 5 ],
-      "settings": [
-        {
-          "name": "entity_pps_per_script",
-          "label": "Entity PPS per script",
-          "help": "The number of packets per second (PPS) that can be sent to the entity server for each server entity script. This contributes to a total overall amount.<br/>Example: 1000 PPS with 5 entites gives a total PPS of 5000 that is shared among the entity scripts. A single could use 4000 PPS, leaving 1000 for the rest, for example.",
-          "default": 900,
-          "type": "int",
-          "advanced": true
-        },
-        {
-          "name": "max_total_entity_pps",
-          "label": "Maximum Total Entity PPS",
-          "help": "The maximum total packets per seconds (PPS) that can be sent to the entity server.<br/>Example: 5 scripts @ 1000 PPS per script = 5000 total PPS. A maximum total PPS of 4000 would cap this 5000 total PPS to 4000.",
-          "default": 9000,
-          "type": "int",
-          "advanced": true
-        }
-      ]
-    },
-    {
-      "name": "avatars",
-      "label": "Avatars",
-      "assignment-types": [ 1, 2 ],
-      "settings": [
-        {
-          "name": "min_avatar_height",
-          "type": "double",
-          "label": "Minimum Avatar Height (meters)",
-          "help": "Limits the height of avatars in your domain. Must be at least 0.009.",
-          "placeholder": 0.4,
-          "default": 0.4
-        },
-        {
-          "name": "max_avatar_height",
-          "type": "double",
-          "label": "Maximum Avatar Height (meters)",
-          "help": "Limits the scale of avatars in your domain. Cannot be greater than 1755.",
-          "placeholder": 5.2,
-          "default": 5.2
-        },
-        {
-          "name": "avatar_whitelist",
-          "label": "Avatars Allowed from:",
-          "help": "Comma separated list of URLs (with optional paths) that avatar .fst files are allowed from. If someone attempts to use an avatar with a different domain, it will be rejected and the replacement avatar will be used. If left blank, any domain is allowed.",
-          "placeholder": "",
-          "default": "",
-          "advanced": true
-        },
-        {
-          "name": "replacement_avatar",
-          "label": "Replacement Avatar for disallowed avatars",
-          "help": "A URL for an avatar .fst to be used when someone tries to use an avatar that is not allowed. If left blank, the generic default avatar is used.",
-          "placeholder": "",
-          "default": "",
-          "advanced": true
-        }
-      ]
-    },
     {
       "name": "audio_threading",
       "label": "Audio Threading",
@@ -1266,9 +1173,82 @@
         }
       ]
     },
+    {
+      "name": "avatars",
+      "label": "Avatars",
+      "assignment-types": [ 1, 2 ],
+      "settings": [
+        {
+          "name": "min_avatar_height",
+          "type": "double",
+          "label": "Minimum Avatar Height (meters)",
+          "help": "Limits the height of avatars in your domain. Must be at least 0.009.",
+          "placeholder": 0.4,
+          "default": 0.4
+        },
+        {
+          "name": "max_avatar_height",
+          "type": "double",
+          "label": "Maximum Avatar Height (meters)",
+          "help": "Limits the scale of avatars in your domain. Cannot be greater than 1755.",
+          "placeholder": 5.2,
+          "default": 5.2
+        },
+        {
+          "name": "avatar_whitelist",
+          "label": "Avatars Allowed from:",
+          "help": "Comma separated list of URLs (with optional paths) that avatar .fst files are allowed from. If someone attempts to use an avatar with a different domain, it will be rejected and the replacement avatar will be used. If left blank, any domain is allowed.",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "replacement_avatar",
+          "label": "Replacement Avatar for disallowed avatars",
+          "help": "A URL for an avatar .fst to be used when someone tries to use an avatar that is not allowed. If left blank, the generic default avatar is used.",
+          "placeholder": "",
+          "default": "",
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "avatar_mixer",
+      "label": "Avatar Mixer",
+      "assignment-types": [
+        1
+      ],
+      "settings": [
+        {
+          "name": "max_node_send_bandwidth",
+          "type": "double",
+          "label": "Per-Node Bandwidth",
+          "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
+          "placeholder": 5.0,
+          "default": 5.0,
+          "advanced": true
+        },
+        {
+          "name": "auto_threads",
+          "label": "Automatically determine thread count",
+          "type": "checkbox",
+          "help": "Allow system to determine number of threads (recommended)",
+          "default": false,
+          "advanced": true
+        },
+        {
+          "name": "num_threads",
+          "label": "Number of Threads",
+          "help": "Threads to spin up for avatar mixing (if not automatically set)",
+          "placeholder": "1",
+          "default": "1",
+          "advanced": true
+        }
+      ]
+    },
     {
       "name": "entity_server_settings",
-      "label": "Entity Server",
+      "label": "Entities",
       "assignment-types": [
         6
       ],
@@ -1504,35 +1484,55 @@
       ]
     },
     {
-      "name": "avatar_mixer",
-      "label": "Avatar Mixer",
-      "assignment-types": [
-        1
-      ],
+      "name": "asset_server",
+      "label": "Asset Server (ATP)",
+      "assignment-types": [ 3 ],
       "settings": [
         {
-          "name": "max_node_send_bandwidth",
-          "type": "double",
-          "label": "Per-Node Bandwidth",
-          "help": "Desired maximum send bandwidth (in Megabits per second) to each node",
-          "placeholder": 5.0,
-          "default": 5.0,
-          "advanced": true
-        },
-        {
-          "name": "auto_threads",
-          "label": "Automatically determine thread count",
+          "name": "enabled",
           "type": "checkbox",
-          "help": "Allow system to determine number of threads (recommended)",
-          "default": false,
+          "label": "Enabled",
+          "help": "Assigns an asset-server in your domain to serve files to clients via the ATP protocol (over UDP)",
+          "default": true,
           "advanced": true
         },
         {
-          "name": "num_threads",
-          "label": "Number of Threads",
-          "help": "Threads to spin up for avatar mixing (if not automatically set)",
-          "placeholder": "1",
-          "default": "1",
+          "name": "assets_path",
+          "type": "string",
+          "label": "Assets Path",
+          "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
+          "default": "",
+          "advanced": true
+        },
+        {
+          "name": "assets_filesize_limit",
+          "type": "int",
+          "label": "File Size Limit",
+          "help": "The file size limit of an asset that can be imported into the asset server in MBytes. 0 (default) means no limit on file size.",
+          "default": 0,
+          "advanced": true
+        }
+      ]
+    },
+    {
+      "name": "entity_script_server",
+      "label": "Entity Script Server (ESS)",
+      "assignment-types": [ 5 ],
+      "settings": [
+        {
+          "name": "entity_pps_per_script",
+          "label": "Entity PPS per script",
+          "help": "The number of packets per second (PPS) that can be sent to the entity server for each server entity script. This contributes to a total overall amount.<br/>Example: 1000 PPS with 5 entites gives a total PPS of 5000 that is shared among the entity scripts. A single could use 4000 PPS, leaving 1000 for the rest, for example.",
+          "default": 900,
+          "type": "int",
+          "advanced": true
+        },
+        {
+          "name": "max_total_entity_pps",
+          "label": "Maximum Total Entity PPS",
+          "help": "The maximum total packets per seconds (PPS) that can be sent to the entity server.<br/>Example: 5 scripts @ 1000 PPS per script = 5000 total PPS. A maximum total PPS of 4000 would cap this 5000 total PPS to 4000.",
+          "default": 9000,
+          "type": "int",
           "advanced": true
         }
       ]
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index a7c8c3a4d1..ae5a452ec9 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -82,7 +82,7 @@ $(document).ready(function(){
 
         // for domain settings, we add a dummy "Places" group that we fill
         // via the API - add it to the dropdown menu in the right spot
-        if (index == 1) {
+        if (index == 0) {
           $settingsDropdown.append("<li role='separator' class='divider'></li>");
           $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
         }
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index e1870a2fa8..e7fc77b707 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -1,3 +1,7 @@
+if (typeof Settings === "undefined") {
+  Settings = {};
+}
+
 Object.assign(Settings, {
   DEPRECATED_CLASS: 'deprecated-setting',
   TRIGGER_CHANGE_CLASS: 'trigger-change',

From 11fe279f6f976a878a3140875ea25132e725ede7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 1 Feb 2018 15:47:12 -0800
Subject: [PATCH 239/569] add domain settings backup and restore to web
 interface

---
 .../resources/web/content/js/content.js       |  10 -
 domain-server/resources/web/css/style.css     |   4 +
 domain-server/resources/web/header.html       |   2 +-
 .../resources/web/js/base-settings.js         |  10 +
 .../resources/web/js/domain-server.js         |   7 +-
 domain-server/resources/web/js/shared.js      |   8 +-
 .../resources/web/settings/js/settings.js     |  86 ++++++-
 .../src/DomainServerSettingsManager.cpp       | 227 ++++++++++++++++--
 .../src/DomainServerSettingsManager.h         |   7 +-
 9 files changed, 316 insertions(+), 45 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 7b2ed37b15..e448952c65 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -2,16 +2,6 @@ $(document).ready(function(){
 
   Settings.afterReloadActions = function() {};
 
-  function showSpinnerAlert(title) {
-    swal({
-      title: title,
-      text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
-      html: true,
-      showConfirmButton: false,
-      allowEscapeKey: false
-    });
-  }
-
   var frm = $('#upload-form');
   frm.submit(function (ev) {
     $.ajax({
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 8090c9f450..ed19d46fb5 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -430,3 +430,7 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
 .advanced-settings-section {
   margin-top: 20px;
 }
+
+#restore-settings-button {
+  margin-top: 10px;
+}
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index aff82d557e..a9a477c7fb 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -67,7 +67,7 @@
       <div class="modal-dialog">
         <div class="modal-content">
           <div class="modal-header">
-            <h4 class="modal-title">domain-server is restarting</h4>
+            <h4 class="modal-title">Domain Server is restarting</h4>
           </div>
           <div class="modal-body">
             <h5>This page will automatically refresh in <span id="refresh-time">3 seconds</span>.</h5>
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index aad342da63..f6069a3c40 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -92,6 +92,16 @@ var viewHelpers = {
   }
 }
 
+function showSpinnerAlert(title) {
+  swal({
+    title: title,
+    text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
+    html: true,
+    showConfirmButton: false,
+    allowEscapeKey: false
+  });
+}
+
 function reloadSettings(callback) {
   $.getJSON(Settings.endpoint, function(data){
     _.extend(data, viewHelpers);
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index ae5a452ec9..2f75794786 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -82,11 +82,16 @@ $(document).ready(function(){
 
         // for domain settings, we add a dummy "Places" group that we fill
         // via the API - add it to the dropdown menu in the right spot
-        if (index == 0) {
+        // which is after "Metaverse / Networking"
+        if (group.name == "metaverse") {
           $settingsDropdown.append("<li role='separator' class='divider'></li>");
           $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
         }
       });
+
+      // append a link for the "Settings Backup" panel
+      $settingsDropdown.append("<li role='separator' class='divider'></li>");
+      $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'settings_backup', label: 'Settings Backup'}, "/settings"));
     });
   }
 });
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index e7fc77b707..f5346ce024 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -97,7 +97,13 @@ var DOMAIN_ID_TYPE_FULL = 2;
 var DOMAIN_ID_TYPE_UNKNOWN = 3;
 
 function domainIDIsSet() {
-  return Settings.data.values.metaverse.id.length > 0;
+  if (typeof Settings.data.values.metaverse !== 'undefined' &&
+    typeof Settings.data.values.metaverse.id !== 'undefined') {
+
+    return Settings.data.values.metaverse.id.length > 0;
+  } else {
+    return false;
+  }
 }
 
 function getCurrentDomainIDType() {
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index aa312228e6..68684c9106 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -19,6 +19,10 @@ $(document).ready(function(){
     1: {
       html_id: 'places',
       label: 'Places'
+    },
+    "-1": {
+      html_id: 'settings_backup',
+      label: 'Settings Backup'
     }
   }
 
@@ -35,7 +39,9 @@ $(document).ready(function(){
     setupDomainNetworkingSettings();
     // setupDomainLabelSetting();
 
-    if (Settings.data.values.metaverse.id.length > 0) {
+    setupSettingsBackup();
+
+    if (domainIDIsSet()) {
       // now, ask the API for what places, if any, point to this domain
       reloadDomainInfo();
 
@@ -150,7 +156,13 @@ $(document).ready(function(){
   });
 
   function accessTokenIsSet() {
-    return Settings.data.values.metaverse.access_token.length > 0;
+    if (typeof Settings.data.values.metaverse !== 'undefined' &&
+      typeof Settings.data.values.metaverse.access_token !== 'undefined') {
+
+      return Settings.data.values.metaverse.access_token.length > 0;
+    } else {
+      return false;
+    }
   }
 
   function getShareName(callback) {
@@ -182,7 +194,7 @@ $(document).ready(function(){
 
     if (action == "share") {
       // figure out if we already have a stored domain ID
-      if (Settings.data.values.metaverse.id.length > 0) {
+      if (domainIDIsSet()) {
         // we need to ask the API what a shareable name for this domain is
         getShareName(function(success, shareName){
           if (success) {
@@ -674,7 +686,7 @@ $(document).ready(function(){
     $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
 
     // do we have a domain ID?
-    if (Settings.data.values.metaverse.id.length == 0) {
+    if (!domainIDIsSet()) {
       // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
       var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
       $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
@@ -1023,4 +1035,70 @@ $(document).ready(function(){
     });
   }
 
+  var RESTORE_SETTINGS_UPLOAD_ID = 'restore-settings-button';
+  var RESTORE_SETTINGS_FILE_ID = 'restore-settings-file';
+
+  // when the restore button is clicked, AJAX send the settings file to DS
+  // to restore its settings
+  $('body').on('click', '#' + RESTORE_SETTINGS_UPLOAD_ID, function(e){
+    e.preventDefault();
+
+    var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
+
+    var fileFormData = new FormData();
+    fileFormData.append('restore-file', files[0]);
+
+    showSpinnerAlert("Restoring Settings");
+
+    $.ajax({
+      url: '/settings/restore',
+      type: 'POST',
+      processData: false,
+      contentType: false,
+      dataType: 'json',
+      data: fileFormData
+    }).done(function(data, textStatus, jqXHR) {
+      swal.close();
+      showRestartModal();
+    }).fail(function(jqXHR, textStatus, errorThrown) {
+      showErrorMessage(
+        "Error",
+        "There was a problem restoring domain settings.\n"
+        + "Please ensure that your current domain settings are valid and try again."
+      );
+
+      reloadSettings();
+    });
+  });
+
+  $('body').on('change', '#' + RESTORE_SETTINGS_FILE_ID, function() {
+    if ($(this).val()) {
+        $('#' + RESTORE_SETTINGS_UPLOAD_ID).attr('disabled', false);
+    }
+  });
+
+  function setupSettingsBackup() {
+    // construct the HTML needed for the settings backup panel
+    var html = "<div class='form-group'>";
+
+    html += "<label class='control-label'>Save Your Settings Configuration</label>";
+    html += "<span class='help-block'>Download this domain's settings to quickly configure another domain or to restore them later</span>";
+    html += "<a href='/settings/backup.json' class='btn btn-primary'>Download Domain Settings</a>";
+    html += "</div>";
+
+    html += "<div class='form-group'>";
+    html += "<label class='control-label'>Upload a Settings Configuration</label>";
+    html += "<span class='help-block'>Upload a settings configuration to quickly configure this domain";
+    html += "<br/>Note: Your domain's settings will be replaced by the settings you upload</span>";
+
+    html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
+    html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Domain Settings</button>";
+
+    html += "</div>";
+
+    $('#settings_backup .panel-body').html(html);
+
+    // add an upload button to the footer to kick off the upload form
+
+  }
 });
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 874e543a08..401b322502 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -174,7 +174,7 @@ void DomainServerSettingsManager::processSettingsRequestPacket(QSharedPointer<Re
     Assignment::Type type;
     message->readPrimitive(&type);
 
-    QJsonObject responseObject = responseObjectForType(QString::number(type));
+    QJsonObject responseObject = settingsResponseObjectForType(QString::number(type));
     auto json = QJsonDocument(responseObject).toJson();
 
     auto packetList = NLPacketList::create(PacketType::DomainSettings, QByteArray(), true, true);
@@ -1079,6 +1079,8 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
 
 bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection *connection, const QUrl &url) {
     if (connection->requestOperation() == QNetworkAccessManager::PostOperation) {
+        static const QString SETTINGS_RESTORE_PATH = "/settings/restore";
+
         if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
             // this is a POST operation to change one or more settings
             QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
@@ -1107,10 +1109,39 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
                 emit settingsUpdated();
             }
 
+            return true;
+        } else if (url.path() == SETTINGS_RESTORE_PATH) {
+            // this is an JSON settings file restore, ask the HTTPConnection to parse the data
+            QList<FormData> formData = connection->parseFormData();
+
+            bool wasRestoreSuccessful = false;
+
+            if (formData.size() > 0 && formData[0].second.size() > 0) {
+                // take the posted file and convert it to a QJsonObject
+                auto postedDocument = QJsonDocument::fromJson(formData[0].second);
+                if (postedDocument.isObject()) {
+                    wasRestoreSuccessful = restoreSettingsFromObject(postedDocument.object(), DomainSettings);
+                }
+            }
+
+            if (wasRestoreSuccessful) {
+                // respond with a 200 for success
+                QString jsonSuccess = "{\"status\": \"success\"}";
+                connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
+
+                // defer a restart to the domain-server, this gives our HTTPConnection enough time to respond
+                const int DOMAIN_SERVER_RESTART_TIMER_MSECS = 1000;
+                QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
+            } else {
+                // respond with a 400 for failure
+                connection->respond(HTTPConnection::StatusCode400);
+            }
+
             return true;
         }
     }   else if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
         static const QString SETTINGS_MENU_GROUPS_PATH = "/settings-menu-groups.json";
+        static const QString SETTINGS_BACKUP_PATH = "/settings/backup.json";
 
         if (url.path() == SETTINGS_PATH_JSON || url.path() == CONTENT_SETTINGS_PATH_JSON) {
 
@@ -1127,7 +1158,10 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
                 ? _domainSettingsDescription : _contentSettingsDescription;
 
             // grab a domain settings object for all types, filtered for the right class of settings
-            rootObject[SETTINGS_RESPONSE_VALUE_KEY] = responseObjectForType("", true, forDomainSettings, forContentSettings);
+            // and exclude default values
+            rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
+                                                                                    forDomainSettings, forContentSettings,
+                                                                                    false);
 
             connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
 
@@ -1136,14 +1170,152 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
             connection->respond(HTTPConnection::StatusCode200, QJsonDocument(_settingsMenuGroups).toJson(), "application/json");
 
             return true;
+        } else if (url.path() == SETTINGS_BACKUP_PATH) {
+            // grab the settings backup as an authenticated user
+            // for the domain settings type only, excluding hidden and default values
+            auto currentDomainSettingsJSON = settingsResponseObjectForType("", true, true, false, false);
+
+            // setup headers that tell the client to download the file wth a special name
+            Headers downloadHeaders;
+            downloadHeaders.insert("Content-Transfer-Encoding", "binary");
+
+            // create a timestamped filename for the backup
+            const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
+            auto backupFilename = "ds-settings-" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
+
+            downloadHeaders.insert("Content-Disposition",
+                                   QString("attachment; filename=\"%1\"").arg(backupFilename).toLocal8Bit());
+
+            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(currentDomainSettingsJSON).toJson(),
+                                "application/force-download", downloadHeaders);
         }
     }
 
     return false;
 }
 
-QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& typeValue, bool isAuthenticated,
-                                                               bool includeDomainSettings, bool includeContentSettings) {
+bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
+    QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
+        ? _domainSettingsDescription : _contentSettingsDescription;
+
+    // grab a copy of the current config before restore, so that we can back out if something bad happens during
+    QVariantMap preRestoreConfig = _configMap.getConfig();
+
+    bool shouldCancelRestore = false;
+
+    // enumerate through the settings in the description
+    // if we have one in the restore then use it, otherwise clear it from current settings
+    foreach(const QJsonValue& descriptionGroupValue, filteredDescriptionArray) {
+        QJsonObject descriptionGroupObject = descriptionGroupValue.toObject();
+        QString groupKey = descriptionGroupObject[DESCRIPTION_NAME_KEY].toString();
+        QJsonArray descriptionGroupSettings = descriptionGroupObject[DESCRIPTION_SETTINGS_KEY].toArray();
+
+        // grab the matching group from the restore so we can look at its settings
+        QJsonObject restoreGroup;
+        QVariantMap* configGroupMap = nullptr;
+
+        if (groupKey.isEmpty()) {
+            // this is for a setting at the root, use the full object as our restore group
+            restoreGroup = settingsToRestore;
+
+            // the variant map for this "group" is just the config map since there's no group
+            configGroupMap = &_configMap.getConfig();
+        } else {
+            if (settingsToRestore.contains(groupKey)) {
+                restoreGroup = settingsToRestore[groupKey].toObject();
+            }
+
+            // grab the variant for the group
+            auto groupMapVariant = _configMap.valueForKeyPath(groupKey);
+
+            // if it existed, double check that it is a map - any other value is unexpected and should cancel a restore
+            if (groupMapVariant) {
+                if (groupMapVariant->canConvert<QVariantMap>()) {
+                    configGroupMap = static_cast<QVariantMap*>(groupMapVariant->data());
+                } else {
+                    shouldCancelRestore = true;
+                    break;
+                }
+            }
+        }
+
+        foreach(const QJsonValue& descriptionSettingValue, descriptionGroupSettings) {
+            const QString VALUE_HIDDEN_FLAG_KEY = "value-hidden";
+
+            QJsonObject descriptionSettingObject = descriptionSettingValue.toObject();
+
+            // we'll override this setting with the default or what is in the restore as long as it isn't hidden
+            if (!descriptionSettingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
+
+                QString settingName = descriptionSettingObject[DESCRIPTION_NAME_KEY].toString();
+
+                // check if we have a matching setting for this in the restore
+                QJsonValue restoreValue;
+                if (restoreGroup.contains(settingName)) {
+                    restoreValue = restoreGroup[settingName];
+                }
+
+                // we should create the value for this key path in our current config map
+                // if we had value in the restore file
+                bool shouldCreateIfMissing = !restoreValue.isNull();
+
+                // get a QVariant pointer to this setting in our config map
+                QString fullSettingKey = !groupKey.isEmpty()
+                    ? groupKey + "." + settingName : settingName;
+
+                QVariant* variantValue = _configMap.valueForKeyPath(fullSettingKey, shouldCreateIfMissing);
+
+                if (restoreValue.isNull()) {
+                    if (variantValue && !variantValue->isNull() && configGroupMap) {
+                        // we didn't have a value to restore, but there might be a value in the config map
+                        // so we need to remove the value in the config map which will set it back to the default
+                        qDebug() << "Removing" << fullSettingKey << "from settings since it is not in the restored JSON";
+                        configGroupMap->remove(settingName);
+                    }
+                } else {
+                    // we have a value to restore, use update setting to set it
+
+                    // we might need to re-grab config group map in case it didn't exist when we looked for it before
+                    // but was created by the call to valueForKeyPath before
+                    if (!configGroupMap) {
+                        auto groupMapVariant = _configMap.valueForKeyPath(groupKey);
+                        if (groupMapVariant && groupMapVariant->canConvert<QVariantMap>()) {
+                            configGroupMap = static_cast<QVariantMap*>(groupMapVariant->data());
+                        } else {
+                            shouldCancelRestore = true;
+                            break;
+                        }
+                    }
+
+                    qDebug() << "Updating setting" << fullSettingKey << "from restored JSON";
+
+                    updateSetting(settingName, restoreValue, *configGroupMap, descriptionSettingObject);
+                }
+            }
+        }
+
+        if (shouldCancelRestore) {
+            break;
+        }
+    }
+
+    if (shouldCancelRestore) {
+        // if we cancelled the restore, go back to our state before and return false
+        qDebug() << "Restore cancelled, settings have not been changed";
+        _configMap.getConfig() = preRestoreConfig;
+        return false;
+    } else {
+        // restore completed, persist the new settings
+        qDebug() << "Restore completed, persisting restored settings to file";
+        persistToFile();
+        return true;
+    }
+}
+
+QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated,
+                                                                       bool includeDomainSettings,
+                                                                       bool includeContentSettings,
+                                                                       bool includeDefaults) {
     QJsonObject responseObject;
 
     if (!typeValue.isEmpty() || isAuthenticated) {
@@ -1152,6 +1324,7 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
 
         const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
 
+        // only enumerate the requested settings type (domain setting or content setting)
         QJsonArray& filteredDescriptionArray = _descriptionArray;
         if (includeDomainSettings && !includeContentSettings) {
             filteredDescriptionArray = _domainSettingsDescription;
@@ -1159,7 +1332,7 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
             filteredDescriptionArray = _contentSettingsDescription;
         }
 
-        // enumerate the groups in the description object to find which settings to pass
+        // enumerate the groups in the potentially filtered object to find which settings to pass
         foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
             QJsonObject groupObject = groupValue.toObject();
             QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
@@ -1174,7 +1347,6 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
                 QJsonObject settingObject = settingValue.toObject();
 
                 // consider this setting as long as it isn't hidden
-                // and we've been asked to include this type (domain setting or content setting)
                 if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
@@ -1183,8 +1355,6 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
 
                     if (affectedTypesArray.contains(queryType) ||
                         (queryType.isNull() && isAuthenticated)) {
-                        // this is a setting we should include in the responseObject
-
                         QString settingName = settingObject[DESCRIPTION_NAME_KEY].toString();
 
                         // we need to check if the settings map has a value for this setting
@@ -1200,28 +1370,31 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
                             variantValue = _configMap.value(settingName);
                         }
 
-                        QJsonValue result;
+                        // final check for inclusion, either we include default values
+                        // or we don't but this isn't a default value
+                        if (includeDefaults || !variantValue.isNull()) {
+                            QJsonValue result;
 
-                        if (variantValue.isNull()) {
-                            // no value for this setting, pass the default
-                            if (settingObject.contains(SETTING_DEFAULT_KEY)) {
-                                result = settingObject[SETTING_DEFAULT_KEY];
+                            if (variantValue.isNull()) {
+                                // no value for this setting, pass the default
+                                if (settingObject.contains(SETTING_DEFAULT_KEY)) {
+                                    result = settingObject[SETTING_DEFAULT_KEY];
+                                } else {
+                                    // users are allowed not to provide a default for string values
+                                    // if so we set to the empty string
+                                    result = QString("");
+                                }
                             } else {
-                                // users are allowed not to provide a default for string values
-                                // if so we set to the empty string
-                                result = QString("");
+                                result = QJsonValue::fromVariant(variantValue);
                             }
 
-                        } else {
-                            result = QJsonValue::fromVariant(variantValue);
-                        }
-
-                        if (!groupKey.isEmpty()) {
-                            // this belongs in the group object
-                            groupResponseObject[settingName] = result;
-                        } else {
-                            // this is a value that should be at the root
-                            responseObject[settingName] = result;
+                            if (!groupKey.isEmpty()) {
+                                // this belongs in the group object
+                                groupResponseObject[settingName] = result;
+                            } else {
+                                // this is a value that should be at the root
+                                responseObject[settingName] = result;
+                            }
                         }
                     }
                 }
@@ -1266,6 +1439,8 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
                 settingMap[key] = sanitizedValue;
             }
         }
+    } else if (newValue.isDouble()) {
+        settingMap[key] = newValue.toDouble();
     } else if (newValue.isBool()) {
         settingMap[key] = newValue.toBool();
     } else if (newValue.isObject()) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 5e13c9f28a..00707c33e3 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -130,8 +130,9 @@ private:
     QStringList _argumentList;
 
     QJsonArray filteredDescriptionArray(bool isContentSettings);
-    QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false,
-                                      bool includeDomainSettings = true, bool includeContentSettings = true);
+    QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+                                              bool includeDomainSettings = true, bool includeContentSettings = true,
+                                              bool includeDefaults = true);
     bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
 
     void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
@@ -142,6 +143,8 @@ private:
 
     void splitSettingsDescription();
 
+    bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
+
     double _descriptionVersion;
 
     QJsonArray _descriptionArray;

From 09c2390db45b78849565302d4086e24bd215315b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 1 Feb 2018 18:06:40 -0800
Subject: [PATCH 240/569] change backup file name, fix safari button click bug

---
 domain-server/resources/web/css/style.css     | 10 +++++-----
 domain-server/resources/web/header.html       |  4 ++--
 .../resources/web/js/base-settings.js         | 20 +++++++++----------
 .../src/DomainServerSettingsManager.cpp       |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index ed19d46fb5..5121b85a42 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -126,11 +126,6 @@ span.port {
   margin-top: 10px;
 }
 
-#small-save-button {
-  width: 100%;
-  margin-bottom: 15px;
-}
-
 td.buttons {
   width: 30px;
 }
@@ -434,3 +429,8 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
 #restore-settings-button {
   margin-top: 10px;
 }
+
+/* fix for https://bugs.webkit.org/show_bug.cgi?id=39620 */
+.save-button-text {
+  pointer-events: none;
+}
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index a9a477c7fb..1b7b306fff 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -28,7 +28,7 @@
             </div>
           </button>
 
-          <button id="save-settings-xs-button" class="save-button btn btn-success navbar-btn hidden-sm hidden-md hidden-lg" role="button" style="display: none;" disabled>Save</button>
+          <button id="save-settings-xs-button" class="save-button btn btn-success navbar-btn hidden-sm hidden-md hidden-lg" disabled="true"><span class="save-button-text">Save</span></button>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
@@ -56,7 +56,7 @@
               <img id="visit-hmd-icon" src="/images/hmd-w-eyes.svg" alt="Head-mounted display" />
               Visit in VR
             </a>
-            <button id="save-settings-button" class="save-button btn btn-success navbar-btn hidden-xs" role="button" style="display: none;" disabled>Save</button>
+            <button id="save-settings-button" class="save-button btn btn-success navbar-btn hidden-xs" disabled="true"><span class="save-button-text">Save</span></button>
             <a href="#" id="restart-server" class="navbar-btn btn btn-link"><span class="glyphicon glyphicon-refresh"></span> Restart</a>
           </ul>
         </div>
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index f6069a3c40..3f410d4e2c 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -155,7 +155,10 @@ function postSettings(jsonSettings) {
 
 $(document).ready(function(){
 
-  $('.save-button.navbar-btn').show();
+  $(document).on('click', '.save-button', function(e){
+    saveSettings();
+    e.preventDefault();
+  });
 
   $.ajaxSetup({
     timeout: 20000,
@@ -254,7 +257,7 @@ $(document).ready(function(){
     }
   });
 
-  $('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
+  $('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true);
 
@@ -438,11 +441,6 @@ function saveSettings() {
   }
 }
 
-$('body').on('click', '.save-button', function(e){
-  saveSettings();
-  return false;
-});
-
 function makeTable(setting, keypath, setting_value) {
   var isArray = !_.has(setting, 'key');
   var categoryKey = setting.categorize_by_key;
@@ -788,8 +786,8 @@ function badgeForDifferences(changedElement) {
     }
   }
 
-  $(".save-button").prop("disabled", !hasChanges);
-  $(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
+  $('.save-button').prop("disabled", !hasChanges);
+  $('.save-button-text').html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
 
   // add the badge to the navbar item and the panel header
   $("a[href='" + settingsGroupAnchor(Settings.path, panelParentID) + "'] .badge").html(badgeValue);
@@ -832,7 +830,7 @@ function addTableRow(row) {
     var keyInput = row.children(".key").children("input");
 
     // whenever the keyInput changes, re-badge for differences
-    keyInput.on('change keyup paste', function(){
+    keyInput.on('change keyup paste', function(e){
       // update siblings in the row to have the correct name
       var currentKey = $(this).val();
 
@@ -844,7 +842,7 @@ function addTableRow(row) {
         } else {
           input.removeAttr("name");
         }
-      })
+      });
 
       badgeForDifferences($(this));
     });
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 401b322502..131670d221 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1181,7 +1181,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 
             // create a timestamped filename for the backup
             const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
-            auto backupFilename = "ds-settings-" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
+            auto backupFilename = "domain-settings_" + QDateTime::currentDateTime().toString(DATETIME_FORMAT) + ".json";
 
             downloadHeaders.insert("Content-Disposition",
                                    QString("attachment; filename=\"%1\"").arg(backupFilename).toLocal8Bit());

From 9f2015ba469737c9d2e59f4e646d306050a4d739 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 5 Feb 2018 16:58:18 -0800
Subject: [PATCH 241/569] check correct element to determine if restart is
 required

---
 domain-server/resources/web/js/base-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 3f410d4e2c..17f06f3ad1 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -138,7 +138,7 @@ function postSettings(jsonSettings) {
     type: 'POST'
   }).done(function(data){
     if (data.status == "success") {
-      if ($(".save-button").html() === SAVE_BUTTON_LABEL_RESTART) {
+      if ($(".save-button-text").html() === SAVE_BUTTON_LABEL_RESTART) {
         showRestartModal();
       } else {
         location.reload(true);

From 3516a8939a23f821f3d1dfb407e1e964fad807b4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 6 Feb 2018 16:44:51 -0800
Subject: [PATCH 242/569] flag settings in description as being excluded from
 backups

---
 .../resources/describe-settings.json          |  9 ++++---
 .../src/DomainServerSettingsManager.cpp       | 24 ++++++++++++-------
 .../src/DomainServerSettingsManager.h         |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 103c045516..93d703c8b3 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -9,7 +9,8 @@
           "name": "access_token",
           "label": "Access Token",
           "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
-          "advanced": true
+          "advanced": true,
+          "backup": false
         },
         {
           "name": "id",
@@ -159,7 +160,8 @@
         {
           "name": "http_username",
           "label": "HTTP Username",
-          "help": "Username used for basic HTTP authentication."
+          "help": "Username used for basic HTTP authentication.",
+          "backup": false
         },
         {
           "name": "http_password",
@@ -167,7 +169,8 @@
           "type": "password",
           "help": "Password used for basic HTTP authentication. Leave this alone if you do not want to change it.",
           "password_placeholder": "******",
-          "value-hidden": true
+          "value-hidden": true,
+          "backup": false
         },
         {
           "name": "verify_http_password",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 131670d221..b8d4a07238 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -40,6 +40,7 @@ const QString DESCRIPTION_SETTINGS_KEY = "settings";
 const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
 const QString DESCRIPTION_GROUP_LABEL_KEY = "label";
+const QString DESCRIPTION_BACKUP_FLAG_KEY = "backup";
 const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 const QString DESCRIPTION_COLUMNS_KEY = "columns";
 const QString CONTENT_SETTING_FLAG_KEY = "content_setting";
@@ -1173,7 +1174,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
         } else if (url.path() == SETTINGS_BACKUP_PATH) {
             // grab the settings backup as an authenticated user
             // for the domain settings type only, excluding hidden and default values
-            auto currentDomainSettingsJSON = settingsResponseObjectForType("", true, true, false, false);
+            auto currentDomainSettingsJSON = settingsResponseObjectForType("", true, true, false, false, true);
 
             // setup headers that tell the client to download the file wth a special name
             Headers downloadHeaders;
@@ -1240,13 +1241,15 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
         }
 
         foreach(const QJsonValue& descriptionSettingValue, descriptionGroupSettings) {
-            const QString VALUE_HIDDEN_FLAG_KEY = "value-hidden";
 
             QJsonObject descriptionSettingObject = descriptionSettingValue.toObject();
 
-            // we'll override this setting with the default or what is in the restore as long as it isn't hidden
-            if (!descriptionSettingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
+            // we'll override this setting with the default or what is in the restore as long as
+            // it isn't specifically excluded from backups
+            bool isBackedUpSetting = !descriptionSettingObject.contains(DESCRIPTION_BACKUP_FLAG_KEY)
+                || descriptionSettingObject[DESCRIPTION_BACKUP_FLAG_KEY].toBool();
 
+            if (isBackedUpSetting) {
                 QString settingName = descriptionSettingObject[DESCRIPTION_NAME_KEY].toString();
 
                 // check if we have a matching setting for this in the restore
@@ -1315,7 +1318,7 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
 QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated,
                                                                        bool includeDomainSettings,
                                                                        bool includeContentSettings,
-                                                                       bool includeDefaults) {
+                                                                       bool includeDefaults, bool isForBackup) {
     QJsonObject responseObject;
 
     if (!typeValue.isEmpty() || isAuthenticated) {
@@ -1347,7 +1350,11 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                 QJsonObject settingObject = settingValue.toObject();
 
                 // consider this setting as long as it isn't hidden
-                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
+                // and either this isn't for a backup or it's a value included in backups
+                bool includedInBackups = !settingObject.contains(DESCRIPTION_BACKUP_FLAG_KEY)
+                    || settingObject[DESCRIPTION_BACKUP_FLAG_KEY].toBool();
+
+                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && (!isForBackup || includedInBackups)) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
                         affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();
@@ -1370,8 +1377,8 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                             variantValue = _configMap.value(settingName);
                         }
 
-                        // final check for inclusion, either we include default values
-                        // or we don't but this isn't a default value
+                        // final check for inclusion
+                        // either we include default values or we don't but this isn't a default value
                         if (includeDefaults || !variantValue.isNull()) {
                             QJsonValue result;
 
@@ -1407,7 +1414,6 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
         }
     }
 
-
     return responseObject;
 }
 
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 00707c33e3..9b2427b344 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -132,7 +132,7 @@ private:
     QJsonArray filteredDescriptionArray(bool isContentSettings);
     QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
                                               bool includeDomainSettings = true, bool includeContentSettings = true,
-                                              bool includeDefaults = true);
+                                              bool includeDefaults = true, bool isForBackup = false);
     bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
 
     void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,

From 37b8fa2c0c84af04bb259d969c9a89c3d5c708ff Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 7 Feb 2018 15:22:33 -0800
Subject: [PATCH 243/569] put back default values in settings response

---
 domain-server/resources/web/js/shared.js          | 7 ++++---
 domain-server/src/DomainServerSettingsManager.cpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index f5346ce024..69721ee924 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -164,11 +164,12 @@ function getDomainFromAPI(callback) {
   if (callback === undefined) {
     callback = function() {};
   }
-
-  var domainID = Settings.data.values.metaverse.id;
-  if (domainID === null || domainID === undefined || domainID === '') {
+  
+  if (!domainIDIsSet()) {
     callback({ status: 'fail' });
     return null;
+  } else {
+    var domainID = Settings.data.values.metaverse.id;
   }
 
   pendingDomainRequest = $.ajax({
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index b8d4a07238..8febbd5769 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1162,7 +1162,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
             // and exclude default values
             rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
                                                                                     forDomainSettings, forContentSettings,
-                                                                                    false);
+                                                                                    true);
 
             connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
 

From e14f46101b47c55a4bd540060655ae8e9cadeed8 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 14 Feb 2018 13:49:43 -0800
Subject: [PATCH 244/569] fix tablet rotation when switching into and out of
 create mode

---
 scripts/system/libraries/WebTablet.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 05b4963280..a28de5abc2 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -47,7 +47,7 @@ function calcSpawnInfo(hand, landscape) {
     var headPos = (HMD.active && Camera.mode === "first person") ? HMD.position : Camera.position;
     var headRot = (HMD.active && Camera.mode === "first person") ? HMD.orientation : Camera.orientation;
 
-    var forward = Quat.getForward(headRot);
+    var forward = Quat.getForward(Quat.cancelOutRollAndPitch(headRot));
     var FORWARD_OFFSET = 0.5 * MyAvatar.sensorToWorldScale;
     finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward));
     var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
@@ -269,8 +269,9 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
     }
 
     this.landscape = newLandscapeValue;
+    var cameraOrientation = Quat.cancelOutRollAndPitch(Camera.orientation);
     Overlays.editOverlay(this.tabletEntityID,
-                         { rotation: Quat.multiply(Camera.orientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
+                         { rotation: Quat.multiply(cameraOrientation, this.landscape ? ROT_LANDSCAPE : ROT_Y_180) });
 
     var tabletWidth = getTabletWidthFromSettings() * MyAvatar.sensorToWorldScale;
     var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
@@ -278,7 +279,7 @@ WebTablet.prototype.setLandscape = function(newLandscapeValue) {
     var screenWidth = 0.82 * tabletWidth;
     var screenHeight = 0.81 * tabletHeight;
     Overlays.editOverlay(this.webOverlayID, {
-        rotation: Quat.multiply(Camera.orientation, ROT_LANDSCAPE_WINDOW),
+        rotation: Quat.multiply(cameraOrientation, ROT_LANDSCAPE_WINDOW),
         dimensions: {x: this.landscape ? screenHeight : screenWidth, y: this.landscape ? screenWidth : screenHeight, z: 0.1}
     });
 };

From d466c079a4c4a89738ae9d045bcb946953861e7c Mon Sep 17 00:00:00 2001
From: LaShonda Hopper <lashonda@1stplayable.com>
Date: Wed, 14 Feb 2018 17:00:52 -0500
Subject: [PATCH 245/569] Simple fix for 801 Uncaught TypeError (details
 below).

entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined

This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
---
 scripts/system/html/js/entityProperties.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 35235634e9..b27c852974 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -798,10 +798,13 @@ function loaded() {
 
                         // HTML workaround since image is not yet a separate entity type
                         var IMAGE_MODEL_NAME = 'default-image-model.fbx';
-                        var urlParts = properties.modelURL.split('/')
-                        var propsFilename = urlParts[urlParts.length - 1];
-                        if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) {
-                            properties.type = "Image";
+                        if (properties.type === "Model") {
+                            var urlParts = properties.modelURL.split('/');
+                            var propsFilename = urlParts[urlParts.length - 1];
+
+                            if (propsFilename === IMAGE_MODEL_NAME) {
+                                properties.type = "Image";
+                            }
                         }
 
                         // Create class name for css ruleset filtering

From 4d4b42848b2b12adb53954cac675391978ee2b71 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 16:31:28 -0800
Subject: [PATCH 246/569] add alert for moved content settings

---
 domain-server/resources/web/base-settings.html   | 6 ------
 domain-server/resources/web/settings/index.shtml | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/domain-server/resources/web/base-settings.html b/domain-server/resources/web/base-settings.html
index 2f0fcbe73b..da5561d03d 100644
--- a/domain-server/resources/web/base-settings.html
+++ b/domain-server/resources/web/base-settings.html
@@ -1,10 +1,4 @@
 <div class="col-md-10 col-md-offset-1 col-xs-12">
-  <div class="row">
-    <div class="col-xs-12">
-      <div class="alert" style="display:none;"></div>
-    </div>
-  </div>
-
   <div class="row">
 
     <div class="col-xs-12">
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index d71692523a..bdc02c5dcc 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -8,6 +8,14 @@
    };
 </script>
 
+<div class="col-md-10 col-md-offset-1 col-xs-12">
+   <div class="row">
+      <div class="col-xs-12">
+         <div class="alert alert-info">Your domain content settings are now available in <a href='/content/'>Content</a></div>
+      </div>
+   </div>
+</div>
+
 <!--#include virtual="base-settings.html"-->
 
 <!--#include virtual="footer.html"-->

From 5a8b8d4ac84068c47d5a06d66632cb3fd21aaa4c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 14 Feb 2018 16:44:02 -0800
Subject: [PATCH 247/569] Lots of changes

---
 .../qml/hifi/commerce/checkout/Checkout.qml   | 132 +++++++++++++-----
 .../InspectionCertificate.qml                 |   1 +
 .../hifi/commerce/purchases/PurchasedItem.qml |   2 +
 interface/src/commerce/Ledger.cpp             |   5 +-
 4 files changed, 105 insertions(+), 35 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index bd3f706004..981d5c5b9a 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -40,8 +40,9 @@ Rectangle {
     property bool isCertified;
     property string itemType;
     property var itemTypesArray: ["entity", "wearable", "contentSet", "app", "avatar"];
-    property var buttonTextNormal: ["REZ IT", "WEAR IT", "SWAP CONTENT SET", "INSTALL IT", "WEAR IT"];
-    property var buttonTextClicked: ["REZZED", "WORN", "SWAPPED", "INSTALLED", "WORN"]
+    property var buttonTextNormal: ["REZ IT", "WEAR IT", "REPLACE CONTENT SET", "INSTALL IT", "WEAR IT"];
+    property var buttonTextClicked: ["REZZED", "WORN", "CONTENT SET REPLACED!", "INSTALLED", "WORN"]
+    property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar];
     property bool shouldBuyWithControlledFailure: false;
     property bool debugCheckoutSuccess: false;
     property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
@@ -102,7 +103,7 @@ Rectangle {
             } else {
                 root.balanceReceived = true;
                 root.balanceAfterPurchase = result.data.balance - root.itemPrice;
-                root.setBuyText();
+                root.refreshBuyUI();
             }
         }
 
@@ -117,7 +118,7 @@ Rectangle {
                     console.log("WARNING - Received 'Already Owned' status about different Marketplace ID!");
                     root.alreadyOwned = false;
                 }
-                root.setBuyText();
+                root.refreshBuyUI();
             }
         }
     }
@@ -131,11 +132,11 @@ Rectangle {
     onItemHrefChanged: {
         if (root.itemHref.indexOf(".fst") > -1) {
             root.itemType = "avatar";
-        } else if (root.itemHref.endsWith('.json.gz')) {
+        } else if (root.itemHref.indexOf('.json.gz') > -1) {
             root.itemType = "contentSet";
-        } else if (root.itemHref.endsWith('.json')) {
+        } else if (root.itemHref.indexOf('.json') > -1) {
             root.itemType = "entity"; // "wearable" type handled later
-        } else if (root.itemHref.endsWith('.js')) {
+        } else if (root.itemHref.indexOf('.js') > -1) {
             root.itemType = "app";
         } else {
             console.log("WARNING - Item type is UNKNOWN!");
@@ -304,6 +305,31 @@ Rectangle {
         anchors.left: parent.left;
         anchors.right: parent.right;
 
+        Rectangle {
+            id: loading;
+            z: 997;
+            visible: !root.ownershipStatusReceived || !root.balanceReceived;
+            anchors.fill: parent;
+            color: Qt.rgba(0.0, 0.0, 0.0, 0.7);
+
+            // This object is always used in a popup.
+            // This MouseArea is used to prevent a user from being
+            //     able to click on a button/mouseArea underneath the popup/section.
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: true;
+                propagateComposedEvents: false;
+            }
+                
+            AnimatedImage {
+                source: "../common/images/loader.gif"
+                width: 96;
+                height: width;
+                anchors.verticalCenter: parent.verticalCenter;
+                anchors.horizontalCenter: parent.horizontalCenter;
+            }
+        }
+
         RalewayRegular {
             id: confirmPurchaseText;
             anchors.top: parent.top;
@@ -437,7 +463,7 @@ Rectangle {
             Rectangle {
                 id: buyTextContainer;
                 visible: buyText.text !== "";
-                anchors.top: cancelPurchaseButton.bottom;
+                anchors.top: parent.top;
                 anchors.topMargin: 16;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
@@ -480,10 +506,23 @@ Rectangle {
                     // Alignment
                     horizontalAlignment: Text.AlignLeft;
                     verticalAlignment: Text.AlignVCenter;
+                }
+            }
 
-                    onLinkActivated: {
-                        sendToScript({method: 'checkout_goToPurchases', filterText: root.itemName});
-                    }
+            // "View in My Purchases" button
+            HifiControlsUit.Button {
+                id: viewInMyPurchasesButton;
+                visible: false;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top;
+                anchors.topMargin: 16;
+                height: 40;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                text: "VIEW THIS ITEM IN MY PURCHASES";
+                onClicked: {
+                    sendToScript({method: 'checkout_goToPurchases', filterText: root.itemName});
                 }
             }
 
@@ -491,21 +530,38 @@ Rectangle {
             HifiControlsUit.Button {
                 id: buyButton;
                 enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived) || (!root.isCertified);
-                color: hifi.buttons.blue;
+                color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
-                anchors.top: checkoutActionButtonsContainer.top;
+                anchors.top: viewInMyPurchasesButton.visible ? viewInMyPurchasesButton.bottom :
+                    (buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top);
                 anchors.topMargin: 16;
                 height: 40;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: ((root.isCertified) ? ((ownershipStatusReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
+                text: ((root.isCertified) ? ((ownershipStatusReceived && balanceReceived) ?
+                    (viewInMyPurchasesButton.visible ? "Buy It Again" : "Confirm Purchase") : "--") : "Get Item");
                 onClicked: {
                     if (root.isCertified) {
-                        buyButton.enabled = false;
                         if (!root.shouldBuyWithControlledFailure) {
-                            Commerce.buy(itemId, itemPrice);
+                            if (root.itemType === "contentSet" && !Entities.canReplaceContent()) {
+                                lightboxPopup.titleText = "Purchase Content Set";
+                                lightboxPopup.bodyText = "You will not be able to replace this domain's content with <b>" + root.itemName +
+                                    " </b>until the server owner gives you 'Replace Content' permissions.<br><br>Are you sure you want to purchase this content set?";
+                                lightboxPopup.button1text = "CANCEL";
+                                lightboxPopup.button1method = "root.visible = false;"
+                                lightboxPopup.button2text = "CONFIRM";
+                                lightboxPopup.button2method = "Commerce.buy('" + root.itemId + "', " + root.itemPrice + ");" +
+                                    "root.visible = false; buyButton.enabled = false; loading.visible = true;";
+                                lightboxPopup.visible = true;
+                            } else {
+                                buyButton.enabled = false;
+                                loading.visible = true;
+                                Commerce.buy(root.itemId, root.itemPrice);
+                            }
                         } else {
-                            Commerce.buy(itemId, itemPrice, true);
+                            buyButton.enabled = false;
+                            loading.visible = true;
+                            Commerce.buy(root.itemId, root.itemPrice, true);
                         }
                     } else {
                         if (urlHandler.canHandleUrl(itemHref)) {
@@ -618,8 +674,10 @@ Rectangle {
         // "Rez" button
         HifiControlsUit.Button {
             id: rezNowButton;
-            enabled: root.canRezCertifiedItems || root.itemType === "wearable";
-            buttonGlyph: hifi.glyphs.lightning;
+            enabled: (root.itemType === "entity" && root.canRezCertifiedItems) ||
+                (root.itemType === "contentSet" && Entities.canReplaceContent()) ||
+                root.itemType === "wearable";
+            buttonGlyph: (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)];
             color: hifi.buttons.red;
             colorScheme: hifi.colorSchemes.light;
             anchors.top: completeText2.bottom;
@@ -631,11 +689,17 @@ Rectangle {
             onClicked: {
                 if (root.itemType === "contentSet") {
                     lightboxPopup.titleText = "Replace Content";
-                    lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain.";
+                    lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
+                        "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
+                        "For more information about backing up and restoring content, " +
+                        "<a href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content'>" +
+                        "click here to open info on your desktop browser.";
                     lightboxPopup.button1text = "CANCEL";
                     lightboxPopup.button1method = "root.visible = false;"
                     lightboxPopup.button2text = "CONFIRM";
-                    lightboxPopup.button2method = "sendToScript({method: 'checkout_rezClicked', itemHref: " + root.itemHref + ", itemType: " + root.itemType + "});";
+                    lightboxPopup.button2method = "Commerce.replaceContentSet('" + root.itemId + "', '" + root.itemHref + "');" + 
+                    "root.visible = false;rezzedNotifContainer.visible = true; rezzedNotifContainerTimer.start();" + 
+                    "UserActivityLogger.commerceEntityRezzed('" + root.itemId + "', 'checkout', '" + root.itemType + "');";
                     lightboxPopup.visible = true;
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
@@ -919,7 +983,7 @@ Rectangle {
                 itemHref = message.params.itemHref;
                 referrer = message.params.referrer;
                 itemAuthor = message.params.itemAuthor;
-                setBuyText();
+                refreshBuyUI();
             break;
             default:
                 console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
@@ -927,13 +991,13 @@ Rectangle {
     }
     signal sendToScript(var message);
 
-    function setBuyText() {
+    function refreshBuyUI() {
         if (root.isCertified) {
             if (root.ownershipStatusReceived && root.balanceReceived) {
                 if (root.balanceAfterPurchase < 0) {
                     if (root.alreadyOwned) {
-                        buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item again.<br>" +
-                        '<font color="' + hifi.colors.blueAccent + '"><a href="#">View the copy you own in My Purchases</a></font></b>';
+                        buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item again.</b>";
+                        viewInMyPurchasesButton.visible = true;
                     } else {
                         buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item.</b>";
                     }
@@ -943,15 +1007,19 @@ Rectangle {
                     buyGlyph.size = 54;
                 } else {
                     if (root.alreadyOwned) {
-                        buyText.text = '<b>You already own this item.<br>Purchasing it will buy another copy.<br><font color="'
-                        + hifi.colors.blueAccent + '"><a href="#">View this item in My Purchases</a></font></b>';
-                        buyTextContainer.color = "#FFD6AD";
-                        buyTextContainer.border.color = "#FAC07D";
-                        buyGlyph.text = hifi.glyphs.alert;
-                        buyGlyph.size = 46;
+                        viewInMyPurchasesButton.visible = true;
                     } else {
                         buyText.text = "";
                     }
+
+                    if (root.itemType === "contentSet" && !Entities.canReplaceContent()) {
+                        buyText.text = "The domain owner must enable 'Replace Content' permissions for you in this " +
+                            "<b>domain's server settings</b> before you can replace this domain's content with <b>" + root.itemName + "</b>";
+                        buyTextContainer.color = "#FFC3CD";
+                        buyTextContainer.border.color = "#F3808F";
+                        buyGlyph.text = hifi.glyphs.alert;
+                        buyGlyph.size = 54;
+                    }
                 }
             } else {
                 buyText.text = "";
@@ -973,7 +1041,7 @@ Rectangle {
         }
         root.balanceReceived = false;
         root.ownershipStatusReceived = false;
-        Commerce.inventory();
+        Commerce.alreadyOwned(root.itemId);
         Commerce.balance();
     }
 
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index f493747c5e..a622349d00 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -208,6 +208,7 @@ Rectangle {
         //     able to click on a button/mouseArea underneath the popup/section.
         MouseArea {
             anchors.fill: parent;
+            hoverEnabled: true;
             propagateComposedEvents: false;
         }
                 
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 9db847eada..d19a16e74e 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -209,6 +209,8 @@ Item {
                         "You do not have 'Replace Content' permissions in this domain. <a href='#replaceContentPermission'>Learn more</a>";
                     } else if (root.itemType === "entity") {
                         "You do not have 'Rez Certified' permissions in this domain. <a href='#rezCertifiedPermission'>Learn more</a>";
+                    } else {
+                        ""
                     }
                 }
                 size: 16;
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index f319881035..dff441f840 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -49,6 +49,7 @@ Handler(balance)
 Handler(inventory)
 Handler(transferHfcToNode)
 Handler(transferHfcToUsername)
+Handler(alreadyOwned)
 
 void Ledger::send(const QString& endpoint, const QString& success, const QString& fail, QNetworkAccessManager::Operation method, AccountManagerAuth::Type authType, QJsonObject request) {
     auto accountManager = DependencyManager::get<AccountManager>();
@@ -337,13 +338,11 @@ void Ledger::transferHfcToUsername(const QString& hfc_key, const QString& userna
     signedSend("transaction", transactionString, hfc_key, "transfer_hfc_to_user", "transferHfcToUsernameSuccess", "transferHfcToUsernameFailure");
 }
 
-void Ledger::alreadyOwnedSuccess(QNetworkReply& reply) { apiResponse("alreadyOwned", reply); }
-void Ledger::alreadyOwnedFailure(QNetworkReply& reply) { failResponse("alreadyOwned", reply); }
 void Ledger::alreadyOwned(const QString& marketplaceId) {
     auto wallet = DependencyManager::get<Wallet>();
     QString endpoint = "already_owned";
     QJsonObject request;
     request["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
     request["marketplace_item_id"] = marketplaceId;
-    send(endpoint, "alreadyOwnedSuccess", "alreadyOwnedFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::None, request);
+    send(endpoint, "alreadyOwnedSuccess", "alreadyOwnedFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, request);
 }

From 324eefc9146d0933ceb819145b2d206dafa38288 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 14 Feb 2018 12:56:34 -0800
Subject: [PATCH 248/569] remove fresnel, add unlit, fix overlays, cleanup

---
 .../qml/hifi/tablet/NewMaterialDialog.qml     |   4 +-
 interface/src/Application.cpp                 |  16 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |  14 +-
 interface/src/ui/overlays/ModelOverlay.h      |   4 +-
 interface/src/ui/overlays/Overlay.cpp         |   8 +-
 interface/src/ui/overlays/Overlay.h           |   4 +-
 .../src/avatars-renderer/Avatar.cpp           |  12 +-
 .../src/avatars-renderer/Avatar.h             |   4 +-
 libraries/avatars/src/AvatarData.h            |   4 +-
 .../src/RenderableEntityItem.cpp              |   8 +-
 .../src/RenderableEntityItem.h                |   4 +-
 .../src/RenderableMaterialEntityItem.cpp      |  14 +-
 .../src/RenderableMaterialEntityItem.h        |   6 +-
 .../src/RenderableModelEntityItem.cpp         |  12 +-
 .../src/RenderableModelEntityItem.h           |   4 +-
 libraries/entities/src/EntityItem.cpp         |  12 +-
 libraries/entities/src/EntityItem.h           |   8 +-
 .../entities/src/EntityItemProperties.cpp     | 120 +++++++--------
 libraries/entities/src/EntityItemProperties.h |  12 +-
 libraries/entities/src/EntityPropertyFlags.h  |  10 +-
 libraries/entities/src/EntityTree.cpp         |  31 ++--
 libraries/entities/src/EntityTree.h           |   8 +-
 libraries/entities/src/MaterialEntityItem.cpp | 145 ++++++++----------
 libraries/entities/src/MaterialEntityItem.h   |  58 +++----
 libraries/graphics/src/graphics/Material.h    |   4 +
 .../src/model-networking/MaterialCache.cpp    |  61 ++++++--
 .../src/model-networking/MaterialCache.h      |  17 +-
 libraries/octree/src/OctreePacketData.h       |   4 +-
 libraries/render-utils/src/Model.cpp          |  24 +--
 libraries/render-utils/src/Model.h            |   6 +-
 libraries/shared/src/MaterialMappingMode.cpp  |  24 +++
 .../{MaterialMode.h => MaterialMappingMode.h} |  12 +-
 libraries/shared/src/MaterialMode.cpp         |  24 ---
 scripts/developer/tests/toolbarTest.js        |   2 +-
 scripts/system/edit.js                        |   6 +-
 scripts/system/html/entityProperties.html     |  12 +-
 scripts/system/html/js/entityProperties.js    |  78 +++++-----
 37 files changed, 417 insertions(+), 379 deletions(-)
 create mode 100644 libraries/shared/src/MaterialMappingMode.cpp
 rename libraries/shared/src/{MaterialMode.h => MaterialMappingMode.h} (54%)
 delete mode 100644 libraries/shared/src/MaterialMode.cpp

diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
index d0bbd79a95..226c17e8e2 100644
--- a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
@@ -114,7 +114,7 @@ Rectangle {
                 }
 
                 ComboBox {
-                    id: materialMode
+                    id: materialMappingMode
                     property var materialArray: ["UV space material",
                                                  "3D projected material"]
 
@@ -142,7 +142,7 @@ Rectangle {
                                 method: "newMaterialDialogAdd",
                                 params: {
                                     textInput: materialURL.text,
-                                    //comboBox: materialMode.currentIndex
+                                    //comboBox: materialMappingMode.currentIndex
                                 }
                             });
                         }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 717efa6e5a..70b94443ea 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1593,37 +1593,37 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
-    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
-            avatar->addMaterial(material, parentMaterialID);
+            avatar->addMaterial(material, parentMaterialName);
             return true;
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
-            avatar->removeMaterial(material, parentMaterialID);
+            avatar->removeMaterial(material, parentMaterialName);
             return true;
         }
         return false;
     });
 
-    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
-            overlay->addMaterial(material, parentMaterialID);
+            overlay->addMaterial(material, parentMaterialName);
             return true;
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
-            overlay->removeMaterial(material, parentMaterialID);
+            overlay->removeMaterial(material, parentMaterialName);
             return true;
         }
         return false;
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index ab7f55d6e7..e4ee889307 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -83,6 +83,7 @@ void ModelOverlay::update(float deltatime) {
             auto modelOverlay = static_cast<ModelOverlay*>(&data);
             modelOverlay->setSubRenderItemIDs(newRenderItemIDs);
         });
+        processMaterials();
     }
     if (_visibleDirty) {
         _visibleDirty = false;
@@ -108,6 +109,7 @@ void ModelOverlay::update(float deltatime) {
 bool ModelOverlay::addToScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
     Volume3DOverlay::addToScene(overlay, scene, transaction);
     _model->addToScene(scene, transaction);
+    processMaterials();
     return true;
 }
 
@@ -633,17 +635,17 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     return 0;
 }
 
-void ModelOverlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    Overlay::addMaterial(material, parentMaterialID);
+void ModelOverlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    Overlay::addMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->addMaterial(material, parentMaterialID);
+        _model->addMaterial(material, parentMaterialName);
     }
 }
 
-void ModelOverlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    Overlay::removeMaterial(material, parentMaterialID);
+void ModelOverlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    Overlay::removeMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->removeMaterial(material, parentMaterialID);
+        _model->removeMaterial(material, parentMaterialName);
     }
 }
 
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 6761b1508c..5735854b3b 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,8 +59,8 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
 
 protected:
     Transform evalRenderTransform() override;
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 04d6c2fe4d..766177e3a6 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -236,12 +236,12 @@ QVector<OverlayID> qVectorOverlayIDFromScriptValue(const QScriptValue& array) {
     return newVector;
 }
 
-void Overlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void Overlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].push(material);
+    _materials[parentMaterialName].push(material);
 }
 
-void Overlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void Overlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].remove(material);
+    _materials[parentMaterialName].remove(material);
 }
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index bd9f7942fd..ff45acddcf 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -91,8 +91,8 @@ public:
     unsigned int getStackOrder() const { return _stackOrder; }
     void setStackOrder(unsigned int stackOrder) { _stackOrder = stackOrder; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
 
 protected:
     float updatePulse();
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 3276a8fe89..796e73fcbc 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1763,19 +1763,19 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
     }
 }
 
-void Avatar::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void Avatar::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].push(material);
+    _materials[parentMaterialName].push(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
-        _skeletonModel->addMaterial(material, parentMaterialID);
+        _skeletonModel->addMaterial(material, parentMaterialName);
     }
 }
 
-void Avatar::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void Avatar::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].remove(material);
+    _materials[parentMaterialName].remove(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
-        _skeletonModel->removeMaterial(material, parentMaterialID);
+        _skeletonModel->removeMaterial(material, parentMaterialName);
     }
 }
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 49aa664a9f..14283a9188 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -272,8 +272,8 @@ public:
 
     virtual void setAvatarEntityDataChanged(bool value) override;
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
 
 public slots:
 
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 832585a483..48f7e19146 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -696,8 +696,8 @@ public:
 
     bool getIsReplicated() const { return _isReplicated; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {}
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {}
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {}
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {}
 
 signals:
     void displayNameChanged();
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 81d7dceb0d..9ccf58c04c 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -404,12 +404,12 @@ void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) {
     QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
 }
 
-void EntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void EntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].push(material);
+    _materials[parentMaterialName].push(material);
 }
 
-void EntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void EntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].remove(material);
+    _materials[parentMaterialName].remove(material);
 }
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 6247a97c21..4fc50ccc9a 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -102,8 +102,8 @@ protected:
     }
 
 public slots:
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
 
 signals:
     void requestRenderUpdate();
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
index 529aa03124..70d0234732 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -18,7 +18,7 @@ bool MaterialEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityP
     if (entity->getParentID() != _parentID || entity->getClientOnly() != _clientOnly || entity->getOwningAvatarID() != _owningAvatarID) {
         return true;
     }
-    if (entity->getMaterialPos() != _materialPos || entity->getMaterialScale() != _materialScale || entity->getMaterialRot() != _materialRot) {
+    if (entity->getMaterialMappingPos() != _materialMappingPos || entity->getMaterialMappingScale() != _materialMappingScale || entity->getMaterialMappingRot() != _materialMappingRot) {
         return true;
     }
     return false;
@@ -30,9 +30,9 @@ void MaterialEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&
         _parentID = entity->getParentID();
         _clientOnly = entity->getClientOnly();
         _owningAvatarID = entity->getOwningAvatarID();
-        _materialPos = entity->getMaterialPos();
-        _materialScale = entity->getMaterialScale();
-        _materialRot = entity->getMaterialRot();
+        _materialMappingPos = entity->getMaterialMappingPos();
+        _materialMappingScale = entity->getMaterialMappingScale();
+        _materialMappingRot = entity->getMaterialMappingRot();
         _renderTransform = getModelTransform();
         const float MATERIAL_ENTITY_SCALE = 0.5f;
         _renderTransform.postScale(MATERIAL_ENTITY_SCALE);
@@ -238,9 +238,9 @@ void MaterialEntityRenderer::doRender(RenderArgs* args) {
         parentID = _clientOnly ? _owningAvatarID : _parentID;
         renderTransform = _renderTransform;
         drawMaterial = _drawMaterial;
-        textureTransform.setTranslation(glm::vec3(_materialPos, 0));
-        textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialRot)));
-        textureTransform.setScale(glm::vec3(_materialScale, 1));
+        textureTransform.setTranslation(glm::vec3(_materialMappingPos, 0));
+        textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialMappingRot)));
+        textureTransform.setScale(glm::vec3(_materialMappingScale, 1));
     });
     if (!parentID.isNull() || !drawMaterial) {
         return;
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
index 4af21d84f6..fef1a41138 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h
@@ -34,9 +34,9 @@ private:
     QUuid _parentID;
     bool _clientOnly;
     QUuid _owningAvatarID;
-    glm::vec2 _materialPos;
-    glm::vec2 _materialScale;
-    float _materialRot;
+    glm::vec2 _materialMappingPos;
+    glm::vec2 _materialMappingScale;
+    float _materialMappingRot;
     Transform _renderTransform;
 
     std::shared_ptr<NetworkMaterial> _drawMaterial;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index e28ba797d5..3205d68513 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1467,17 +1467,17 @@ void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const QStr
     }
 }
 
-void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    Parent::addMaterial(material, parentMaterialID);
+void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    Parent::addMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->addMaterial(material, parentMaterialID);
+        _model->addMaterial(material, parentMaterialName);
     }
 }
 
-void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    Parent::removeMaterial(material, parentMaterialID);
+void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    Parent::removeMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
-        _model->removeMaterial(material, parentMaterialID);
+        _model->removeMaterial(material, parentMaterialName);
     }
 }
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 3951deaa2d..9d9b98ba98 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -144,8 +144,8 @@ public:
     ModelEntityRenderer(const EntityItemPointer& entity);
 
 public slots:
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) override;
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
 
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 3ea81e5a36..3bb1406252 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2940,16 +2940,16 @@ void EntityItem::preDelete() {
     }
 }
 
-void EntityItem::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void EntityItem::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].push(material);
-    emit addMaterialToRenderItem(material, parentMaterialID);
+    _materials[parentMaterialName].push(material);
+    emit addMaterialToRenderItem(material, parentMaterialName);
 }
 
-void EntityItem::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
+void EntityItem::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
-    _materials[parentMaterialID].remove(material);
-    emit removeMaterialFromRenderItem(material, parentMaterialID);
+    _materials[parentMaterialName].remove(material);
+    emit removeMaterialFromRenderItem(material, parentMaterialName);
 }
 
 std::unordered_map<QString, graphics::MultiMaterial> EntityItem::getMaterials() {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 97d2f32a04..203b513a76 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -482,14 +482,14 @@ public:
     virtual void preDelete();
     virtual void postParentFixup() {}
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
     std::unordered_map<QString, graphics::MultiMaterial> getMaterials();
 
 signals:
     void requestRenderUpdate();
-    void addMaterialToRenderItem(graphics::MaterialPointer material, const QString& parentMaterialID);
-    void removeMaterialFromRenderItem(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void addMaterialToRenderItem(graphics::MaterialPointer material, const QString& parentMaterialName);
+    void removeMaterialFromRenderItem(graphics::MaterialPointer material, const QString& parentMaterialName);
 
 protected:
     QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 450d0727f9..a2724c4cbf 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -115,15 +115,15 @@ void buildStringToShapeTypeLookup() {
     addShapeType(SHAPE_TYPE_STATIC_MESH);
 }
 
-QHash<QString, MaterialMode> stringToMaterialModeLookup;
+QHash<QString, MaterialMappingMode> stringToMaterialMappingModeLookup;
 
-void addMaterialMode(MaterialMode mode) {
-    stringToMaterialModeLookup[MaterialModeHelpers::getNameForMaterialMode(mode)] = mode;
+void addMaterialMappingMode(MaterialMappingMode mode) {
+    stringToMaterialMappingModeLookup[MaterialMappingModeHelpers::getNameForMaterialMappingMode(mode)] = mode;
 }
 
-void buildStringToMaterialModeLookup() {
-    addMaterialMode(UV);
-    addMaterialMode(PROJECTED);
+void buildStringToMaterialMappingModeLookup() {
+    addMaterialMappingMode(UV);
+    addMaterialMappingMode(PROJECTED);
 }
 
 QString getCollisionGroupAsString(uint8_t group) {
@@ -270,18 +270,18 @@ void EntityItemProperties::setSkyboxModeFromString(const QString& skyboxMode) {
     }
 }
 
-QString EntityItemProperties::getMaterialModeAsString() const {
-    return MaterialModeHelpers::getNameForMaterialMode(_materialMode);
+QString EntityItemProperties::getMaterialMappingModeAsString() const {
+    return MaterialMappingModeHelpers::getNameForMaterialMappingMode(_materialMappingMode);
 }
 
-void EntityItemProperties::setMaterialModeFromString(const QString& materialMode) {
-    if (stringToMaterialModeLookup.empty()) {
-        buildStringToMaterialModeLookup();
+void EntityItemProperties::setMaterialMappingModeFromString(const QString& materialMappingMode) {
+    if (stringToMaterialMappingModeLookup.empty()) {
+        buildStringToMaterialMappingModeLookup();
     }
-    auto materialModeItr = stringToMaterialModeLookup.find(materialMode.toLower());
-    if (materialModeItr != stringToMaterialModeLookup.end()) {
-        _materialMode = materialModeItr.value();
-        _materialModeChanged = true;
+    auto materialMappingModeItr = stringToMaterialMappingModeLookup.find(materialMappingMode.toLower());
+    if (materialMappingModeItr != stringToMaterialMappingModeLookup.end()) {
+        _materialMappingMode = materialMappingModeItr.value();
+        _materialMappingModeChanged = true;
     }
 }
 
@@ -356,12 +356,12 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_START, radiusStart);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_URL, materialURL);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_TYPE, materialMode);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_MAPPING_MODE, materialMappingMode);
     CHECK_PROPERTY_CHANGE(PROP_MATERIAL_PRIORITY, priority);
-    CHECK_PROPERTY_CHANGE(PROP_PARENT_MATERIAL_ID, parentMaterialID);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_POS, materialPos);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_SCALE, materialScale);
-    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_ROT, materialRot);
+    CHECK_PROPERTY_CHANGE(PROP_PARENT_MATERIAL_NAME, parentMaterialName);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_MAPPING_POS, materialMappingPos);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_MAPPING_SCALE, materialMappingScale);
+    CHECK_PROPERTY_CHANGE(PROP_MATERIAL_MAPPING_ROT, materialMappingRot);
 
     // Certifiable Properties
     CHECK_PROPERTY_CHANGE(PROP_ITEM_NAME, itemName);
@@ -661,12 +661,12 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     // Materials
     if (_type == EntityTypes::Material) {
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_URL, materialURL);
-        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_MATERIAL_TYPE, materialMode, getMaterialModeAsString());
+        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_MATERIAL_MAPPING_MODE, materialMappingMode, getMaterialMappingModeAsString());
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_PRIORITY, priority);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_MATERIAL_ID, parentMaterialID);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_POS, materialPos);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_SCALE, materialScale);
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_ROT, materialRot);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_PARENT_MATERIAL_NAME, parentMaterialName);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_MAPPING_POS, materialMappingPos);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_MAPPING_SCALE, materialMappingScale);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MATERIAL_MAPPING_ROT, materialMappingRot);
     }
 
     if (!skipDefaults && !strictSemantics) {
@@ -803,12 +803,12 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusFinish, float, setRadiusFinish);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(relayParentJoints, bool, setRelayParentJoints);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(materialURL, QString, setMaterialURL);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(materialMode, MaterialMode);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(materialMappingMode, MaterialMappingMode);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(priority, quint16, setPriority);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(parentMaterialID, QString, setParentMaterialID);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialPos, glmVec2, setMaterialPos);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialScale, glmVec2, setMaterialScale);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialRot, float, setMaterialRot);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(parentMaterialName, QString, setParentMaterialName);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialMappingPos, glmVec2, setMaterialMappingPos);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialMappingScale, glmVec2, setMaterialMappingScale);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(materialMappingRot, float, setMaterialMappingRot);
 
     // Certifiable Properties
     COPY_PROPERTY_FROM_QSCRIPTVALUE(itemName, QString, setItemName);
@@ -1164,12 +1164,12 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float);
 
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_URL, MaterialURL, materialURL, QString);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_MAPPING_MODE, MaterialMappingMode, materialMappingMode, MaterialMappingMode);
         ADD_PROPERTY_TO_MAP(PROP_MATERIAL_PRIORITY, Priority, priority, quint16);
-        ADD_PROPERTY_TO_MAP(PROP_PARENT_MATERIAL_ID, ParentMaterialID, parentMaterialID, QString);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2);
-        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_ROT, MaterialRot, materialRot, float);
+        ADD_PROPERTY_TO_MAP(PROP_PARENT_MATERIAL_NAME, ParentMaterialName, parentMaterialName, QString);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_MAPPING_POS, MaterialMappingPos, materialMappingPos, glmVec2);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_MAPPING_SCALE, MaterialMappingScale, materialMappingScale, glmVec2);
+        ADD_PROPERTY_TO_MAP(PROP_MATERIAL_MAPPING_ROT, MaterialMappingRot, materialMappingRot, float);
 
         // Certifiable Properties
         ADD_PROPERTY_TO_MAP(PROP_ITEM_NAME, ItemName, itemName, QString);
@@ -1557,12 +1557,12 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
             // Materials
             if (properties.getType() == EntityTypes::Material) {
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, properties.getMaterialURL());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)properties.getMaterialMode());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_MODE, (uint32_t)properties.getMaterialMappingMode());
                 APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, properties.getPriority());
-                APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, properties.getParentMaterialID());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, properties.getMaterialPos());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, properties.getMaterialScale());
-                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, properties.getMaterialRot());
+                APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_NAME, properties.getParentMaterialName());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_POS, properties.getMaterialMappingPos());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_SCALE, properties.getMaterialMappingScale());
+                APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_ROT, properties.getMaterialMappingRot());
             }
 
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
@@ -1924,12 +1924,12 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     // Materials
     if (properties.getType() == EntityTypes::Material) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_URL, QString, setMaterialURL);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_MAPPING_MODE, MaterialMappingMode, setMaterialMappingMode);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_PRIORITY, quint16, setPriority);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_MATERIAL_ID, QString, setParentMaterialID);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_POS, glmVec2, setMaterialPos);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_SCALE, glmVec2, setMaterialScale);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_ROT, float, setMaterialRot);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PARENT_MATERIAL_NAME, QString, setParentMaterialName);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_MAPPING_POS, glmVec2, setMaterialMappingPos);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_MAPPING_SCALE, glmVec2, setMaterialMappingScale);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MATERIAL_MAPPING_ROT, float, setMaterialMappingRot);
     }
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
@@ -2106,12 +2106,12 @@ void EntityItemProperties::markAllChanged() {
     //_alphaFinishChanged = true;
 
     _materialURLChanged = true;
-    _materialModeChanged = true;
+    _materialMappingModeChanged = true;
     _priorityChanged = true;
-    _parentMaterialIDChanged = true;
-    _materialPosChanged = true;
-    _materialScaleChanged = true;
-    _materialRotChanged = true;
+    _parentMaterialNameChanged = true;
+    _materialMappingPosChanged = true;
+    _materialMappingScaleChanged = true;
+    _materialMappingRotChanged = true;
 
     // Certifiable Properties
     _itemNameChanged = true;
@@ -2439,23 +2439,23 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (materialURLChanged()) {
         out += "materialURL";
     }
-    if (materialModeChanged()) {
-        out += "materialMode";
+    if (materialMappingModeChanged()) {
+        out += "materialMappingMode";
     }
     if (priorityChanged()) {
         out += "priority";
     }
-    if (parentMaterialIDChanged()) {
-        out += "parentMaterialID";
+    if (parentMaterialNameChanged()) {
+        out += "parentMaterialName";
     }
-    if (materialPosChanged()) {
-        out += "materialPos";
+    if (materialMappingPosChanged()) {
+        out += "materialMappingPos";
     }
-    if (materialScaleChanged()) {
-        out += "materialScale";
+    if (materialMappingScaleChanged()) {
+        out += "materialMappingScale";
     }
-    if (materialRotChanged()) {
-        out += "materialRot";
+    if (materialMappingRotChanged()) {
+        out += "materialMappingRot";
     }
 
     // Certifiable Properties
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index daa2272e36..36ca47291c 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -44,7 +44,7 @@
 #include "TextEntityItem.h"
 #include "ZoneEntityItem.h"
 
-#include "MaterialMode.h"
+#include "MaterialMappingMode.h"
 
 const quint64 UNKNOWN_CREATED_TIME = 0;
 
@@ -223,12 +223,12 @@ public:
     DEFINE_PROPERTY_REF(PROP_SHAPE, Shape, shape, QString, "Sphere");
 
     DEFINE_PROPERTY_REF(PROP_MATERIAL_URL, MaterialURL, materialURL, QString, "");
-    DEFINE_PROPERTY_REF_ENUM(PROP_MATERIAL_TYPE, MaterialMode, materialMode, MaterialMode, UV);
+    DEFINE_PROPERTY_REF_ENUM(PROP_MATERIAL_MAPPING_MODE, MaterialMappingMode, materialMappingMode, MaterialMappingMode, UV);
     DEFINE_PROPERTY_REF(PROP_MATERIAL_PRIORITY, Priority, priority, quint16, 0);
-    DEFINE_PROPERTY_REF(PROP_PARENT_MATERIAL_ID, ParentMaterialID, parentMaterialID, QString, "0");
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_POS, MaterialPos, materialPos, glmVec2, glm::vec2(0, 0));
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_SCALE, MaterialScale, materialScale, glmVec2, glm::vec2(1, 1));
-    DEFINE_PROPERTY_REF(PROP_MATERIAL_ROT, MaterialRot, materialRot, float, 0);
+    DEFINE_PROPERTY_REF(PROP_PARENT_MATERIAL_NAME, ParentMaterialName, parentMaterialName, QString, "0");
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_MAPPING_POS, MaterialMappingPos, materialMappingPos, glmVec2, glm::vec2(0, 0));
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_MAPPING_SCALE, MaterialMappingScale, materialMappingScale, glmVec2, glm::vec2(1, 1));
+    DEFINE_PROPERTY_REF(PROP_MATERIAL_MAPPING_ROT, MaterialMappingRot, materialMappingRot, float, 0);
 
     // Certifiable Properties - related to Proof of Purchase certificates
     DEFINE_PROPERTY_REF(PROP_ITEM_NAME, ItemName, itemName, QString, ENTITY_ITEM_DEFAULT_ITEM_NAME);
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 6ed2186760..b65d5d1a3f 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -228,12 +228,12 @@ enum EntityPropertyList {
     PROP_LOCAL_DIMENSIONS, // only used to convert values to and from scripts
 
     PROP_MATERIAL_URL,
-    PROP_MATERIAL_TYPE,
+    PROP_MATERIAL_MAPPING_MODE,
     PROP_MATERIAL_PRIORITY,
-    PROP_PARENT_MATERIAL_ID,
-    PROP_MATERIAL_POS,
-    PROP_MATERIAL_SCALE,
-    PROP_MATERIAL_ROT,
+    PROP_PARENT_MATERIAL_NAME,
+    PROP_MATERIAL_MAPPING_POS,
+    PROP_MATERIAL_MAPPING_SCALE,
+    PROP_MATERIAL_MAPPING_ROT,
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties to end of list just ABOVE this line
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index d8a4d2799e..8abd5efc13 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1740,18 +1740,15 @@ void EntityTree::fixupNeedsParentFixups() {
             });
             entity->locationChanged(true);
             entity->postParentFixup();
-        } else if (_avatarIDs.contains(entity->getParentID())) {
-            if (getIsServer()) {
-                // this is a child of an avatar, which the entity server will never have
-                // a SpatiallyNestable object for.  Add it to a list for cleanup when the avatar leaves.
-                if (!_childrenOfAvatars.contains(entity->getParentID())) {
-                    _childrenOfAvatars[entity->getParentID()] = QSet<EntityItemID>();
-                }
-                _childrenOfAvatars[entity->getParentID()] += entity->getEntityItemID();
+        } else if (getIsServer() || _avatarIDs.contains(entity->getParentID())) {
+            // this is a child of an avatar, which the entity server will never have
+            // a SpatiallyNestable object for.  Add it to a list for cleanup when the avatar leaves.
+            if (!_childrenOfAvatars.contains(entity->getParentID())) {
+                _childrenOfAvatars[entity->getParentID()] = QSet<EntityItemID>();
             }
+            _childrenOfAvatars[entity->getParentID()] += entity->getEntityItemID();
             doMove = true;
             iter.remove(); // and pull it out of the list
-            entity->postParentFixup();
         }
 
         if (queryAACubeSuccess && doMove) {
@@ -2394,30 +2391,30 @@ std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> Ent
 std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_addMaterialToOverlayOperator = nullptr;
 std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
 
-bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
     if (_addMaterialToAvatarOperator) {
-        return _addMaterialToAvatarOperator(avatarID, material, parentMaterialID);
+        return _addMaterialToAvatarOperator(avatarID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
     if (_removeMaterialFromAvatarOperator) {
-        return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialID);
+        return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
     if (_addMaterialToOverlayOperator) {
-        return _addMaterialToOverlayOperator(overlayID, material, parentMaterialID);
+        return _addMaterialToOverlayOperator(overlayID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID) {
+bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
     if (_removeMaterialFromOverlayOperator) {
-        return _removeMaterialFromOverlayOperator(overlayID, material, parentMaterialID);
+        return _removeMaterialFromOverlayOperator(overlayID, material, parentMaterialName);
     }
     return false;
 }
\ No newline at end of file
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index c37b6c8a81..568d552d8d 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -282,13 +282,13 @@ public:
 
     static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
     static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
-    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID);
-    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialID);
+    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName);
+    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName);
 
     static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
     static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
-    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID);
-    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialID);
+    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName);
+    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName);
 
 signals:
     void deletingEntity(const EntityItemID& entityID);
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index fcca2d9803..91333e6e80 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -30,12 +30,12 @@ MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : Entit
 EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMode, getMaterialMode);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMappingMode, getMaterialMappingMode);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(priority, getPriority);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(parentMaterialID, getParentMaterialID);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialPos, getMaterialPos);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialScale, getMaterialScale);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialRot, getMaterialRot);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(parentMaterialName, getParentMaterialName);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMappingPos, getMaterialMappingPos);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMappingScale, getMaterialMappingScale);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialMappingRot, getMaterialMappingRot);
     return properties;
 }
 
@@ -43,12 +43,12 @@ bool MaterialEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialURL, setMaterialURL);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMode, setMaterialMode);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMappingMode, setMaterialMappingMode);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(priority, setPriority);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(parentMaterialID, setParentMaterialID);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialPos, setMaterialPos);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialScale, setMaterialScale);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialRot, setMaterialRot);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(parentMaterialName, setParentMaterialName);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMappingPos, setMaterialMappingPos);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMappingScale, setMaterialMappingScale);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(materialMappingRot, setMaterialMappingRot);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -72,12 +72,12 @@ int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
     const unsigned char* dataAt = data;
 
     READ_ENTITY_PROPERTY(PROP_MATERIAL_URL, QString, setMaterialURL);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, MaterialMode, setMaterialMode);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_MODE, MaterialMappingMode, setMaterialMappingMode);
     READ_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, quint16, setPriority);
-    READ_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, QString, setParentMaterialID);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_POS, glm::vec2, setMaterialPos);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, glm::vec2, setMaterialScale);
-    READ_ENTITY_PROPERTY(PROP_MATERIAL_ROT, float, setMaterialRot);
+    READ_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_NAME, QString, setParentMaterialName);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_POS, glm::vec2, setMaterialMappingPos);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_SCALE, glm::vec2, setMaterialMappingScale);
+    READ_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_ROT, float, setMaterialMappingRot);
 
     return bytesRead;
 }
@@ -87,12 +87,12 @@ int MaterialEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
 EntityPropertyFlags MaterialEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
     requestedProperties += PROP_MATERIAL_URL;
-    requestedProperties += PROP_MATERIAL_TYPE;
+    requestedProperties += PROP_MATERIAL_MAPPING_MODE;
     requestedProperties += PROP_MATERIAL_PRIORITY;
-    requestedProperties += PROP_PARENT_MATERIAL_ID;
-    requestedProperties += PROP_MATERIAL_POS;
-    requestedProperties += PROP_MATERIAL_SCALE;
-    requestedProperties += PROP_MATERIAL_ROT;
+    requestedProperties += PROP_PARENT_MATERIAL_NAME;
+    requestedProperties += PROP_MATERIAL_MAPPING_POS;
+    requestedProperties += PROP_MATERIAL_MAPPING_SCALE;
+    requestedProperties += PROP_MATERIAL_MAPPING_ROT;
     return requestedProperties;
 }
 
@@ -106,26 +106,26 @@ void MaterialEntityItem::appendSubclassData(OctreePacketData* packetData, Encode
 
     bool successPropertyFits = true;
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_URL, getMaterialURL());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_TYPE, (uint32_t)getMaterialMode());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_MODE, (uint32_t)getMaterialMappingMode());
     APPEND_ENTITY_PROPERTY(PROP_MATERIAL_PRIORITY, getPriority());
-    APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_ID, getParentMaterialID());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_POS, getMaterialPos());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_SCALE, getMaterialScale());
-    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_ROT, getMaterialRot());
+    APPEND_ENTITY_PROPERTY(PROP_PARENT_MATERIAL_NAME, getParentMaterialName());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_POS, getMaterialMappingPos());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_SCALE, getMaterialMappingScale());
+    APPEND_ENTITY_PROPERTY(PROP_MATERIAL_MAPPING_ROT, getMaterialMappingRot());
 }
 
 void MaterialEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
     qCDebug(entities) << " MATERIAL EntityItem id:" << getEntityItemID() << "---------------------------------------------";
     qCDebug(entities) << "                   name:" << _name;
-    qCDebug(entities) << "          material json:" << _materialURL;
+    qCDebug(entities) << "           material url:" << _materialURL;
     qCDebug(entities) << "  current material name:" << _currentMaterialName;
-    qCDebug(entities) << "          material type:" << _materialMode;
+    qCDebug(entities) << "  material mapping mode:" << _materialMappingMode;
     qCDebug(entities) << "               priority:" << _priority;
-    qCDebug(entities) << "     parent material ID:" << _parentMaterialID;
-    qCDebug(entities) << "           material pos:" << _materialPos;
-    qCDebug(entities) << "         material scale:" << _materialRot;
-    qCDebug(entities) << "           material rot:" << _materialScale;
+    qCDebug(entities) << "   parent material name:" << _parentMaterialName;
+    qCDebug(entities) << "   material mapping pos:" << _materialMappingPos;
+    qCDebug(entities) << " material mapping scale:" << _materialMappingRot;
+    qCDebug(entities) << "   material mapping rot:" << _materialMappingScale;
     qCDebug(entities) << "               position:" << debugTreeVector(getWorldPosition());
     qCDebug(entities) << "             dimensions:" << debugTreeVector(getScaledDimensions());
     qCDebug(entities) << "          getLastEdited:" << debugTime(getLastEdited(), now);
@@ -137,8 +137,8 @@ void MaterialEntityItem::setUnscaledDimensions(const glm::vec3& value) {
 }
 
 std::shared_ptr<NetworkMaterial> MaterialEntityItem::getMaterial() const {
-    auto material = _materials.find(_currentMaterialName);
-    if (material != _materials.end()) {
+    auto material = _parsedMaterials.networkMaterials.find(_currentMaterialName);
+    if (material != _parsedMaterials.networkMaterials.end()) {
         return material.value();
     } else {
         return nullptr;
@@ -151,28 +151,14 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
         removeMaterial();
         _materialURL = materialURLString;
 
-        // TODO: if URL ends with ?string, try to set _currentMaterialName = string
+        if (materialURLString.contains("?")) {
+            auto split = materialURLString.split("?");
+            _currentMaterialName = split.last();
+        }
 
         if (usingUserData) {
-            QJsonDocument materialJSON = QJsonDocument::fromJson(getUserData().toUtf8());
-            _materials.clear();
-            _materialNames.clear();
-            if (!materialJSON.isNull()) {
-                if (materialJSON.isArray()) {
-                    QJsonArray materials = materialJSON.array();
-                    for (auto material : materials) {
-                        if (!material.isNull() && material.isObject()) {
-                            auto networkMaterial = NetworkMaterialResource::parseJSONMaterial(material.toObject());
-                            _materials[networkMaterial.first] = networkMaterial.second;
-                            _materialNames.push_back(networkMaterial.first);
-                        }
-                    }
-                } else if (materialJSON.isObject()) {
-                    auto networkMaterial = NetworkMaterialResource::parseJSONMaterial(materialJSON.object());
-                    _materials[networkMaterial.first] = networkMaterial.second;
-                    _materialNames.push_back(networkMaterial.first);
-                }
-            }
+            _parsedMaterials = NetworkMaterialResource::parseJSONMaterials(QJsonDocument::fromJson(getUserData().toUtf8()));
+
             // Since our material changed, the current name might not be valid anymore, so we need to update
             setCurrentMaterialName(_currentMaterialName);
             applyMaterial();
@@ -180,8 +166,7 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
             _networkMaterial = MaterialCache::instance().getMaterial(materialURLString);
             auto onMaterialRequestFinished = [&](bool success) {
                 if (success) {
-                    _materials[_networkMaterial->name] = _networkMaterial->networkMaterial;
-                    _materialNames.push_back(_networkMaterial->name);
+                    _parsedMaterials = _networkMaterial->parsedMaterials;
 
                     setCurrentMaterialName(_currentMaterialName);
                     applyMaterial();
@@ -199,11 +184,11 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
 }
 
 void MaterialEntityItem::setCurrentMaterialName(const QString& currentMaterialName) {
-    auto material = _materials.find(currentMaterialName);
-    if (material != _materials.end()) {
+    auto material = _parsedMaterials.networkMaterials.find(currentMaterialName);
+    if (material != _parsedMaterials.networkMaterials.end()) {
         _currentMaterialName = currentMaterialName;
-    } else if (_materialNames.size() > 0) {
-        _currentMaterialName = _materialNames[0];
+    } else if (_parsedMaterials.names.size() > 0) {
+        _currentMaterialName = _parsedMaterials.names[0];
     }
 }
 
@@ -217,26 +202,26 @@ void MaterialEntityItem::setUserData(const QString& userData) {
     }
 }
 
-void MaterialEntityItem::setMaterialPos(const glm::vec2& materialPos) {
-    if (_materialPos != materialPos) {
+void MaterialEntityItem::setMaterialMappingPos(const glm::vec2& materialMappingPos) {
+    if (_materialMappingPos != materialMappingPos) {
         removeMaterial();
-        _materialPos = materialPos;
+        _materialMappingPos = materialMappingPos;
         applyMaterial();
     }
 }
 
-void MaterialEntityItem::setMaterialScale(const glm::vec2& materialScale) {
-    if (_materialScale != materialScale) {
+void MaterialEntityItem::setMaterialMappingScale(const glm::vec2& materialMappingScale) {
+    if (_materialMappingScale != materialMappingScale) {
         removeMaterial();
-        _materialScale = materialScale;
+        _materialMappingScale = materialMappingScale;
         applyMaterial();
     }
 }
 
-void MaterialEntityItem::setMaterialRot(const float& materialRot) {
-    if (_materialRot != materialRot) {
+void MaterialEntityItem::setMaterialMappingRot(const float& materialMappingRot) {
+    if (_materialMappingRot != materialMappingRot) {
         removeMaterial();
-        _materialRot = materialRot;
+        _materialMappingRot = materialMappingRot;
         applyMaterial();
     }
 }
@@ -249,10 +234,10 @@ void MaterialEntityItem::setPriority(quint16 priority) {
     }
 }
 
-void MaterialEntityItem::setParentMaterialID(const QString& parentMaterialID) {
-    if (_parentMaterialID != parentMaterialID) {
+void MaterialEntityItem::setParentMaterialName(const QString& parentMaterialName) {
+    if (_parentMaterialName != parentMaterialName) {
         removeMaterial();
-        _parentMaterialID = parentMaterialID;
+        _parentMaterialName = parentMaterialName;
         applyMaterial();
     }
 }
@@ -293,16 +278,16 @@ void MaterialEntityItem::removeMaterial() {
     if (tree) {
         EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
         if (entity) {
-            entity->removeMaterial(material, getParentMaterialID());
+            entity->removeMaterial(material, getParentMaterialName());
             return;
         }
     }
 
-    if (EntityTree::removeMaterialFromAvatar(parentID, material, getParentMaterialID())) {
+    if (EntityTree::removeMaterialFromAvatar(parentID, material, getParentMaterialName())) {
         return;
     }
 
-    if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialID())) {
+    if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialName())) {
         return;
     }
 
@@ -317,9 +302,9 @@ void MaterialEntityItem::applyMaterial() {
         return;
     }
     Transform textureTransform;
-    textureTransform.setTranslation(glm::vec3(_materialPos, 0));
-    textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialRot)));
-    textureTransform.setScale(glm::vec3(_materialScale, 1));
+    textureTransform.setTranslation(glm::vec3(_materialMappingPos, 0));
+    textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialMappingRot)));
+    textureTransform.setScale(glm::vec3(_materialMappingScale, 1));
     material->setTextureTransforms(textureTransform);
     material->setPriority(getPriority());
 
@@ -328,16 +313,16 @@ void MaterialEntityItem::applyMaterial() {
     if (tree) {
         EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
         if (entity) {
-            entity->addMaterial(material, getParentMaterialID());
+            entity->addMaterial(material, getParentMaterialName());
             return;
         }
     }
 
-    if (EntityTree::addMaterialToAvatar(parentID, material, getParentMaterialID())) {
+    if (EntityTree::addMaterialToAvatar(parentID, material, getParentMaterialName())) {
         return;
     }
 
-    if (EntityTree::addMaterialToOverlay(parentID, material, getParentMaterialID())) {
+    if (EntityTree::addMaterialToOverlay(parentID, material, getParentMaterialName())) {
         return;
     }
 
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index d015bae681..3c8df190bf 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -11,7 +11,7 @@
 
 #include "EntityItem.h"
 
-#include "MaterialMode.h"
+#include "MaterialMappingMode.h"
 #include <model-networking/ModelCache.h>
 #include <model-networking/MaterialCache.h>
 
@@ -58,21 +58,21 @@ public:
     QString getCurrentMaterialName() const { return _currentMaterialName; }
     void setCurrentMaterialName(const QString& currentMaterialName);
 
-    MaterialMode getMaterialMode() const { return _materialMode; }
-    void setMaterialMode(MaterialMode mode) { _materialMode = mode; }
+    MaterialMappingMode getMaterialMappingMode() const { return _materialMappingMode; }
+    void setMaterialMappingMode(MaterialMappingMode mode) { _materialMappingMode = mode; }
 
     quint16 getPriority() const { return _priority; }
     void setPriority(quint16 priority);
 
-    QString getParentMaterialID() const { return _parentMaterialID; }
-    void setParentMaterialID(const QString& parentMaterialID);
+    QString getParentMaterialName() const { return _parentMaterialName; }
+    void setParentMaterialName(const QString& parentMaterialName);
 
-    glm::vec2 getMaterialPos() const { return _materialPos; }
-    void setMaterialPos(const glm::vec2& materialPos);
-    glm::vec2 getMaterialScale() const { return _materialScale; }
-    void setMaterialScale(const glm::vec2& materialScale);
-    float getMaterialRot() const { return _materialRot; }
-    void setMaterialRot(const float& materialRot);
+    glm::vec2 getMaterialMappingPos() const { return _materialMappingPos; }
+    void setMaterialMappingPos(const glm::vec2& materialMappingPos);
+    glm::vec2 getMaterialMappingScale() const { return _materialMappingScale; }
+    void setMaterialMappingScale(const glm::vec2& materialMappingScale);
+    float getMaterialMappingRot() const { return _materialMappingRot; }
+    void setMaterialMappingRot(const float& materialMappingRot);
 
     std::shared_ptr<NetworkMaterial> getMaterial() const;
 
@@ -91,33 +91,37 @@ public:
 private:
     // URL for this material.  Currently, only JSON format is supported.  Set to "userData" to use the user data to live edit a material.
     // The following fields are supported in the JSON:
-    // strings:
-    //   name (NOT YET USED)
-    // floats:
-    //   opacity, roughness, metallic, scattering
-    // colors (arrays of 3 floats 0-1.  Optional fourth value in array can be a boolean isSRGB):
-    //   emissive, albedo, fresnel
-    // urls to textures:
-    //   emissiveMap, albedoMap, metallicMap, roughnessMap, normalMap, occlusionMap, lightmapMap, scatteringMap
+    // materialVersion: a uint for the version of this network material (currently, only 1 is supported)
+    // materials, which is either an object or an array of objects, each with the following properties:
+    //   strings:
+    //     name (NOT YET USED), model (NOT YET USED, should use "hifi_pbr")
+    //   floats:
+    //     opacity, roughness, metallic, scattering
+    //   bool:
+    //     unlit
+    //   colors (arrays of 3 floats 0-1.  Optional fourth value in array can be a boolean isSRGB):
+    //     emissive, albedo
+    //   urls to textures:
+    //     emissiveMap, albedoMap (set opacityMap = albedoMap for transparency), metallicMap or specularMap, roughnessMap or glossMap,
+    //     normalMap or bumpMap, occlusionMap, lightmapMap (broken, FIXME), scatteringMap (only works if normal mapped)
     QString _materialURL;
     // Type of material.  "uv" or "projected".  NOT YET IMPLEMENTED, only UV is used
-    MaterialMode _materialMode { UV };
+    MaterialMappingMode _materialMappingMode { UV };
     // Priority for this material when applying it to its parent.  Only the highest priority material will be used.  Materials with the same priority are (essentially) randomly sorted.
     // Base materials that come with models always have priority 0.
     quint16 _priority { 0 };
     // An identifier for choosing a submesh or submeshes within a parent.  If in the format "mat::<string>", all submeshes with material name "<string>" will be replaced.  Otherwise,
-    // parentMaterialID will be parsed as an unsigned int (strings not starting with "mat::" will parse to 0), representing the mesh index to modify.
-    QString _parentMaterialID { "0" };
+    // parentMaterialName will be parsed as an unsigned int (strings not starting with "mat::" will parse to 0), representing the mesh index to modify.
+    QString _parentMaterialName { "0" };
     // Offset position in UV-space of top left of material, (0, 0) to (1, 1)
-    glm::vec2 _materialPos { 0, 0 };
+    glm::vec2 _materialMappingPos { 0, 0 };
     // How much to scale this material within its parent's UV-space
-    glm::vec2 _materialScale { 1, 1 };
+    glm::vec2 _materialMappingScale { 1, 1 };
     // How much to rotate this material within its parent's UV-space (degrees)
-    float _materialRot { 0 };
+    float _materialMappingRot { 0 };
 
     NetworkMaterialResourcePointer _networkMaterial;
-    QHash<QString, std::shared_ptr<NetworkMaterial>> _materials;
-    std::vector<QString> _materialNames;
+    NetworkMaterialResource::ParsedMaterials _parsedMaterials;
     QString _currentMaterialName;
 
     bool _retryApply { false };
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index 5abc090be3..4b1e7c82c1 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -361,6 +361,8 @@ public:
 
     const QString& getName() { return _name; }
 
+    void setModel(const QString& model) { _model = model; }
+
 protected:
     QString _name { "" };
 
@@ -379,6 +381,8 @@ private:
 
     quint16 _priority { 0 };
 
+    QString _model { "hifi_pbr" };
+
 };
 typedef std::shared_ptr< Material > MaterialPointer;
 
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.cpp b/libraries/model-networking/src/model-networking/MaterialCache.cpp
index 723448f65a..ef1d071d86 100644
--- a/libraries/model-networking/src/model-networking/MaterialCache.cpp
+++ b/libraries/model-networking/src/model-networking/MaterialCache.cpp
@@ -15,13 +15,10 @@ NetworkMaterialResource::NetworkMaterialResource(const QUrl& url) :
     Resource(url) {}
 
 void NetworkMaterialResource::downloadFinished(const QByteArray& data) {
-    if (_url.toString().endsWith(".json")) {
-        QJsonDocument materialJSON = QJsonDocument::fromJson(data);
-        if (!materialJSON.isNull() && materialJSON.isObject()) {
-            auto parsedMaterial = parseJSONMaterial(materialJSON.object());
-            name = parsedMaterial.first;
-            networkMaterial = parsedMaterial.second;
-        }
+    parsedMaterials.reset();
+
+    if (_url.toString().contains(".json")) {
+        parsedMaterials = parseJSONMaterials(QJsonDocument::fromJson(data));
     }
 
     // TODO: parse other material types
@@ -46,6 +43,39 @@ bool NetworkMaterialResource::parseJSONColor(const QJsonValue& array, glm::vec3&
     return false;
 }
 
+NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMaterials(const QJsonDocument& materialJSON) {
+    ParsedMaterials toReturn;
+    if (!materialJSON.isNull() && materialJSON.isObject()) {
+        QJsonObject materialJSONObject = materialJSON.object();
+        for (auto& key : materialJSONObject.keys()) {
+            if (key == "materialVersion") {
+                auto value = materialJSONObject.value(key);
+                if (value.isDouble()) {
+                    toReturn.version = (uint)value.toInt();
+                }
+            } else if (key == "materials") {
+                auto materialsValue = materialJSONObject.value(key);
+                if (materialsValue.isArray()) {
+                    QJsonArray materials = materialsValue.toArray();
+                    for (auto material : materials) {
+                        if (!material.isNull() && material.isObject()) {
+                            auto parsedMaterial = parseJSONMaterial(material.toObject());
+                            toReturn.networkMaterials[parsedMaterial.first] = parsedMaterial.second;
+                            toReturn.names.push_back(parsedMaterial.first);
+                        }
+                    }
+                } else if (materialsValue.isObject()) {
+                    auto parsedMaterial = parseJSONMaterial(materialsValue.toObject());
+                    toReturn.networkMaterials[parsedMaterial.first] = parsedMaterial.second;
+                    toReturn.names.push_back(parsedMaterial.first);
+                }
+            }
+        }
+    }
+
+    return toReturn;;
+}
+
 std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::parseJSONMaterial(const QJsonObject& materialJSON) {
     QString name = "";
     std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
@@ -55,6 +85,11 @@ std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::pa
             if (nameJSON.isString()) {
                 name = nameJSON.toString();
             }
+        } else if (key == "model") {
+            auto modelJSON = materialJSON.value(key);
+            if (modelJSON.isString()) {
+                material->setModel(modelJSON.toString());
+            }
         } else if (key == "emissive") {
             glm::vec3 color;
             bool isSRGB;
@@ -67,6 +102,11 @@ std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::pa
             if (value.isDouble()) {
                 material->setOpacity(value.toDouble());
             }
+        } else if (key == "unlit") {
+            auto value = materialJSON.value(key);
+            if (value.isBool()) {
+                material->setUnlit(value.toBool());
+            }
         } else if (key == "albedo") {
             glm::vec3 color;
             bool isSRGB;
@@ -79,13 +119,6 @@ std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::pa
             if (value.isDouble()) {
                 material->setRoughness(value.toDouble());
             }
-        } else if (key == "fresnel") {
-            glm::vec3 color;
-            bool isSRGB;
-            bool valid = parseJSONColor(materialJSON.value(key), color, isSRGB);
-            if (valid) {
-                material->setFresnel(color, isSRGB);
-            }
         } else if (key == "metallic") {
             auto value = materialJSON.value(key);
             if (value.isDouble()) {
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.h b/libraries/model-networking/src/model-networking/MaterialCache.h
index 1b0f1c577c..3188fd0094 100644
--- a/libraries/model-networking/src/model-networking/MaterialCache.h
+++ b/libraries/model-networking/src/model-networking/MaterialCache.h
@@ -22,9 +22,22 @@ public:
 
     virtual void downloadFinished(const QByteArray& data) override;
 
-    QString name { "" };
-    std::shared_ptr<NetworkMaterial> networkMaterial { nullptr };
+    typedef struct ParsedMaterials {
+        uint version { 1 };
+        std::vector<QString> names;
+        QHash<QString, std::shared_ptr<NetworkMaterial>> networkMaterials;
 
+        void reset() {
+            version = 1;
+            names.clear();
+            networkMaterials.clear();
+        }
+
+    } ParsedMaterials;
+
+    ParsedMaterials parsedMaterials;
+
+    static ParsedMaterials parseJSONMaterials(const QJsonDocument& materialJSON);
     static std::pair<QString, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON);
 
 private:
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index 85100ec177..8d8f599fea 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -33,7 +33,7 @@
 #include <NLPacket.h>
 #include <udt/PacketHeaders.h>
 
-#include "MaterialMode.h"
+#include "MaterialMappingMode.h"
 
 #include "OctreeConstants.h"
 #include "OctreeElement.h"
@@ -263,7 +263,7 @@ public:
     static int unpackDataFromBytes(const unsigned char* dataBytes, rgbColor& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, glm::quat& result) { int bytes = unpackOrientationQuatFromBytes(dataBytes, result); return bytes; }
     static int unpackDataFromBytes(const unsigned char* dataBytes, ShapeType& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
-    static int unpackDataFromBytes(const unsigned char* dataBytes, MaterialMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, MaterialMappingMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
     static int unpackDataFromBytes(const unsigned char* dataBytes, QString& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, QUuid& result);
     static int unpackDataFromBytes(const unsigned char* dataBytes, xColor& result);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 84687a46d0..15cab065f3 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1527,29 +1527,29 @@ bool Model::isRenderable() const {
     return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
 }
 
-std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterialID) {
-    // try to find all meshes with materials that match parentMaterialID as a string
-    // if none, return parentMaterialID as a uint
+std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterialName) {
+    // try to find all meshes with materials that match parentMaterialName as a string
+    // if none, return parentMaterialName as a uint
     std::vector<unsigned int> toReturn;
     const QString MATERIAL_NAME_PREFIX = "mat::";
-    if (parentMaterialID.startsWith(MATERIAL_NAME_PREFIX)) {
-        parentMaterialID.replace(0, MATERIAL_NAME_PREFIX.size(), QString(""));
-        for (int i = 0; i < _modelMeshMaterialNames.size(); i++) {
-            if (_modelMeshMaterialNames[i] == parentMaterialID) {
+    if (parentMaterialName.startsWith(MATERIAL_NAME_PREFIX)) {
+        parentMaterialName.replace(0, MATERIAL_NAME_PREFIX.size(), QString(""));
+        for (unsigned int i = 0; i < (unsigned int)_modelMeshMaterialNames.size(); i++) {
+            if (_modelMeshMaterialNames[i] == parentMaterialName) {
                 toReturn.push_back(i);
             }
         }
     }
 
     if (toReturn.empty()) {
-        toReturn.push_back(parentMaterialID.toUInt());
+        toReturn.push_back(parentMaterialName.toUInt());
     }
 
     return toReturn;
 }
 
-void Model::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialID);
+void Model::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialName);
     render::Transaction transaction;
     for (auto shapeID : shapeIDs) {
         if (shapeID < _modelMeshRenderItemIDs.size()) {
@@ -1573,8 +1573,8 @@ void Model::addMaterial(graphics::MaterialPointer material, const QString& paren
     AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
 }
 
-void Model::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID) {
-    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialID);
+void Model::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialName);
     render::Transaction transaction;
     for (auto shapeID : shapeIDs) {
         if (shapeID < _modelMeshRenderItemIDs.size()) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 67bc646473..6b59b62046 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -318,8 +318,8 @@ public:
 
     void scaleToFit();
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialID);
+    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
 
 public slots:
     void loadURLFinished(bool success);
@@ -473,7 +473,7 @@ private:
 
     void calculateTextureInfo();
 
-    std::vector<unsigned int> getMeshIDsFromMaterialID(QString parentMaterialID);
+    std::vector<unsigned int> getMeshIDsFromMaterialID(QString parentMaterialName);
 };
 
 Q_DECLARE_METATYPE(ModelPointer)
diff --git a/libraries/shared/src/MaterialMappingMode.cpp b/libraries/shared/src/MaterialMappingMode.cpp
new file mode 100644
index 0000000000..1ddad178a2
--- /dev/null
+++ b/libraries/shared/src/MaterialMappingMode.cpp
@@ -0,0 +1,24 @@
+//
+//  Created by Sam Gondelman on 1/17/2018
+//  Copyright 2018 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 "MaterialMappingMode.h"
+
+const char* materialMappingModeNames[] = {
+    "uv",
+    "projected"
+};
+
+static const size_t MATERIAL_MODE_NAMES = (sizeof(materialMappingModeNames) / sizeof((materialMappingModeNames)[0]));
+
+QString MaterialMappingModeHelpers::getNameForMaterialMappingMode(MaterialMappingMode mode) {
+    if (((int)mode <= 0) || ((int)mode >= (int)MATERIAL_MODE_NAMES)) {
+        mode = (MaterialMappingMode)0;
+    }
+
+    return materialMappingModeNames[(int)mode];
+}
\ No newline at end of file
diff --git a/libraries/shared/src/MaterialMode.h b/libraries/shared/src/MaterialMappingMode.h
similarity index 54%
rename from libraries/shared/src/MaterialMode.h
rename to libraries/shared/src/MaterialMappingMode.h
index a933693f75..848c2aa28c 100644
--- a/libraries/shared/src/MaterialMode.h
+++ b/libraries/shared/src/MaterialMappingMode.h
@@ -6,20 +6,20 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_MaterialMode_h
-#define hifi_MaterialMode_h
+#ifndef hifi_MaterialMappingMode_h
+#define hifi_MaterialMappingMode_h
 
 #include "QString"
 
-enum MaterialMode {
+enum MaterialMappingMode {
     UV = 0,
     PROJECTED
 };
 
-class MaterialModeHelpers {
+class MaterialMappingModeHelpers {
 public:
-    static QString getNameForMaterialMode(MaterialMode mode);
+    static QString getNameForMaterialMappingMode(MaterialMappingMode mode);
 };
 
-#endif // hifi_MaterialMode_h
+#endif // hifi_MaterialMappingMode_h
 
diff --git a/libraries/shared/src/MaterialMode.cpp b/libraries/shared/src/MaterialMode.cpp
deleted file mode 100644
index cb656a7bf7..0000000000
--- a/libraries/shared/src/MaterialMode.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  Created by Sam Gondelman on 1/17/2018
-//  Copyright 2018 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 "MaterialMode.h"
-
-const char* materialModeNames[] = {
-    "uv",
-    "projected"
-};
-
-static const size_t MATERIAL_MODE_NAMES = (sizeof(materialModeNames) / sizeof((materialModeNames)[0]));
-
-QString MaterialModeHelpers::getNameForMaterialMode(MaterialMode mode) {
-    if (((int)mode <= 0) || ((int)mode >= (int)MATERIAL_MODE_NAMES)) {
-        mode = (MaterialMode)0;
-    }
-
-    return materialModeNames[(int)mode];
-}
\ No newline at end of file
diff --git a/scripts/developer/tests/toolbarTest.js b/scripts/developer/tests/toolbarTest.js
index dfc97ebe39..b713445927 100644
--- a/scripts/developer/tests/toolbarTest.js
+++ b/scripts/developer/tests/toolbarTest.js
@@ -92,7 +92,7 @@ var toolBar = (function() {
 
         newMaterialButton = toolBar.addButton({
             objectName: "newMaterialButton",
-            imageURL: toolIconUrl + "model-01.svg",
+            imageURL: toolIconUrl + "material-01.svg",
             alpha: 0.9,
             visible: false
         });
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 15d4759a8a..0167b55810 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -400,10 +400,10 @@ var toolBar = (function () {
     function handleNewMaterialDialogResult(result) {
         if (result) {
             var materialURL = result.textInput;
-            //var materialMode;
+            //var materialMappingMode;
             //switch (result.comboBox) {
             //    case MATERIAL_MODE_PROJECTED:
-            //        materialMode = "projected";
+            //        materialMappingMode = "projected";
             //        break;
             //    default:
             //        shapeType = "uv";
@@ -414,7 +414,7 @@ var toolBar = (function () {
                 createNewEntity({
                     type: "Material",
                     materialURL: materialURL,
-                    //materialMode: materialMode,
+                    //materialMappingMode: materialMappingMode,
                     priority: DEFAULT_LAYERED_MATERIAL_PRIORITY
                 });
             }
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 2ca0107d19..c53a2fa5bd 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -805,7 +805,7 @@
                     <!-- TODO: support 3D projected materials
                     <div class="material-group material-section property dropdown">
                         <label>Material mode </label>
-                        <select name="SelectMaterialMode" id="property-material-mode">
+                        <select name="SelectMaterialMode" id="property-material-mapping-mode">
                             <option value="uv">UV space material</option>
                             <option value="projected">3D projected material</option>
                         </select>
@@ -815,20 +815,20 @@
                     <div class="material-group material-section property xy fstuple">
                         <label>Material Position </label>
                         <div class="tuple">
-                            <div><input type="number" class="x" id="property-material-pos-x" min="0" max="1" step="0.1"><label for="property-material-pos-x">X:</label></div>
-                            <div><input type="number" class="y" id="property-material-pos-y" min="0" max="1" step="0.1"><label for="property-material-pos-y">Y:</label></div>
+                            <div><input type="number" class="x" id="property-material-mapping-pos-x" min="0" max="1" step="0.1"><label for="property-material-mapping-pos-x">X:</label></div>
+                            <div><input type="number" class="y" id="property-material-mapping-pos-y" min="0" max="1" step="0.1"><label for="property-material-mapping-pos-y">Y:</label></div>
                     </div>
 
                     <div class="material-group material-section property wh fstuple">
                         <label>Material Scale </label>
                         <div class="tuple">
-                            <div><input type="number" class="x" id="property-material-scale-x" min="0" step="0.1"><label for="property-material-scale-x">Width:</label></div>
-                            <div><input type="number" class="y" id="property-material-scale-y" min="0" step="0.1"><label for="property-material-scale-y">Height:</label></div>
+                            <div><input type="number" class="x" id="property-material-mapping-scale-x" min="0" step="0.1"><label for="property-material-mapping-scale-x">Width:</label></div>
+                            <div><input type="number" class="y" id="property-material-mapping-scale-y" min="0" step="0.1"><label for="property-material-mapping-scale-y">Height:</label></div>
                     </div>
 
                     <div class="material-group material-section property number">
                         <label>Material Rotation <span class="unit">deg</span></label>
-                        <input type="number" id="property-material-rot" step="0.1">
+                        <input type="number" id="property-material-mapping-rot" step="0.1">
                     </div>
                 </fieldset>
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 981572517a..1a4b04ef5d 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -518,7 +518,7 @@ function clearSelection() {
     }
 }
 
-function showParentMaterialIDBox(number, elNumber, elString) {
+function showParentMaterialNameBox(number, elNumber, elString) {
     if (number) {
         $('#property-parent-material-id-number-container').show();
         $('#property-parent-material-id-string-container').hide();
@@ -653,16 +653,16 @@ function loaded() {
         var elModelOriginalTextures = document.getElementById("property-model-original-textures");
 
         var elMaterialURL = document.getElementById("property-material-url");
-        //var elMaterialMode = document.getElementById("property-material-mode");
+        //var elMaterialMappingMode = document.getElementById("property-material-mapping-mode");
         var elPriority = document.getElementById("property-priority");
-        var elParentMaterialIDString = document.getElementById("property-parent-material-id-string");
-        var elParentMaterialIDNumber = document.getElementById("property-parent-material-id-number");
-        var elParentMaterialIDCheckbox = document.getElementById("property-parent-material-id-checkbox");
-        var elMaterialPosX = document.getElementById("property-material-pos-x");
-        var elMaterialPosY = document.getElementById("property-material-pos-y");
-        var elMaterialScaleX = document.getElementById("property-material-scale-x");
-        var elMaterialScaleY = document.getElementById("property-material-scale-y");
-        var elMaterialRot = document.getElementById("property-material-rot");
+        var elParentMaterialNameString = document.getElementById("property-parent-material-id-string");
+        var elParentMaterialNameNumber = document.getElementById("property-parent-material-id-number");
+        var elParentMaterialNameCheckbox = document.getElementById("property-parent-material-id-checkbox");
+        var elMaterialMappingPosX = document.getElementById("property-material-mapping-pos-x");
+        var elMaterialMappingPosY = document.getElementById("property-material-mapping-pos-y");
+        var elMaterialMappingScaleX = document.getElementById("property-material-mapping-scale-x");
+        var elMaterialMappingScaleY = document.getElementById("property-material-mapping-scale-y");
+        var elMaterialMappingRot = document.getElementById("property-material-mapping-rot");
 
         var elImageURL = document.getElementById("property-image-url");
 
@@ -1164,23 +1164,23 @@ function loaded() {
                             elZTextureURL.value = properties.zTextureURL;
                         } else if (properties.type === "Material") {
                             elMaterialURL.value = properties.materialURL;
-                            //elMaterialMode.value = properties.materialMode;
-                            //setDropdownText(elMaterialMode);
+                            //elMaterialMappingMode.value = properties.materialMappingMode;
+                            //setDropdownText(elMaterialMappingMode);
                             elPriority.value = properties.priority;
-                            if (properties.parentMaterialID.startsWith(MATERIAL_PREFIX_STRING)) {
-                                elParentMaterialIDString.value = properties.parentMaterialID.replace(MATERIAL_PREFIX_STRING, "");
-                                showParentMaterialIDBox(false, elParentMaterialIDNumber, elParentMaterialIDString);
-                                elParentMaterialIDCheckbox.checked = false;
+                            if (properties.parentMaterialName.startsWith(MATERIAL_PREFIX_STRING)) {
+                                elParentMaterialNameString.value = properties.parentMaterialName.replace(MATERIAL_PREFIX_STRING, "");
+                                showParentMaterialNameBox(false, elParentMaterialNameNumber, elParentMaterialNameString);
+                                elParentMaterialNameCheckbox.checked = false;
                             } else {
-                                elParentMaterialIDNumber.value = parseInt(properties.parentMaterialID);
-                                showParentMaterialIDBox(true, elParentMaterialIDNumber, elParentMaterialIDString);
-                                elParentMaterialIDCheckbox.checked = true;
+                                elParentMaterialNameNumber.value = parseInt(properties.parentMaterialName);
+                                showParentMaterialNameBox(true, elParentMaterialNameNumber, elParentMaterialNameString);
+                                elParentMaterialNameCheckbox.checked = true;
                             }
-                            elMaterialPosX.value = properties.materialPos.x.toFixed(4);
-                            elMaterialPosY.value = properties.materialPos.y.toFixed(4);
-                            elMaterialScaleX.value = properties.materialScale.x.toFixed(4);
-                            elMaterialScaleY.value = properties.materialScale.y.toFixed(4);
-                            elMaterialRot.value = properties.materialRot.toFixed(2);
+                            elMaterialMappingPosX.value = properties.materialMappingPos.x.toFixed(4);
+                            elMaterialMappingPosY.value = properties.materialMappingPos.y.toFixed(4);
+                            elMaterialMappingScaleX.value = properties.materialMappingScale.x.toFixed(4);
+                            elMaterialMappingScaleY.value = properties.materialMappingScale.y.toFixed(4);
+                            elMaterialMappingRot.value = properties.materialMappingRot.toFixed(2);
                         }
 
                         if (properties.locked) {
@@ -1454,28 +1454,28 @@ function loaded() {
         elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
 
         elMaterialURL.addEventListener('change', createEmitTextPropertyUpdateFunction('materialURL'));
-        //elMaterialMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMode'));
+        //elMaterialMappingMode.addEventListener('change', createEmitTextPropertyUpdateFunction('materialMappingMode'));
         elPriority.addEventListener('change', createEmitNumberPropertyUpdateFunction('priority', 0));
 
-        elParentMaterialIDString.addEventListener('change', function () { updateProperty("parentMaterialID", MATERIAL_PREFIX_STRING + this.value); });
-        elParentMaterialIDNumber.addEventListener('change', function () { updateProperty("parentMaterialID", this.value); });
-        elParentMaterialIDCheckbox.addEventListener('change', function () {
+        elParentMaterialNameString.addEventListener('change', function () { updateProperty("parentMaterialName", MATERIAL_PREFIX_STRING + this.value); });
+        elParentMaterialNameNumber.addEventListener('change', function () { updateProperty("parentMaterialName", this.value); });
+        elParentMaterialNameCheckbox.addEventListener('change', function () {
             if (this.checked) {
-                updateProperty("parentMaterialID", elParentMaterialIDNumber.value);
-                showParentMaterialIDBox(true, elParentMaterialIDNumber, elParentMaterialIDString);
+                updateProperty("parentMaterialName", elParentMaterialNameNumber.value);
+                showParentMaterialNameBox(true, elParentMaterialNameNumber, elParentMaterialNameString);
             } else {
-                updateProperty("parentMaterialID", MATERIAL_PREFIX_STRING + elParentMaterialIDString.value);
-                showParentMaterialIDBox(false, elParentMaterialIDNumber, elParentMaterialIDString);
+                updateProperty("parentMaterialName", MATERIAL_PREFIX_STRING + elParentMaterialNameString.value);
+                showParentMaterialNameBox(false, elParentMaterialNameNumber, elParentMaterialNameString);
             }
         });
 
-        var materialPosChangeFunction = createEmitVec2PropertyUpdateFunction('materialPos', elMaterialPosX, elMaterialPosY);
-        elMaterialPosX.addEventListener('change', materialPosChangeFunction);
-        elMaterialPosY.addEventListener('change', materialPosChangeFunction);
-        var materialScaleChangeFunction = createEmitVec2PropertyUpdateFunction('materialScale', elMaterialScaleX, elMaterialScaleY);
-        elMaterialScaleX.addEventListener('change', materialScaleChangeFunction);
-        elMaterialScaleY.addEventListener('change', materialScaleChangeFunction);
-        elMaterialRot.addEventListener('change', createEmitNumberPropertyUpdateFunction('materialRot', 2));
+        var materialMappingPosChangeFunction = createEmitVec2PropertyUpdateFunction('materialMappingPos', elMaterialMappingPosX, elMaterialMappingPosY);
+        elMaterialMappingPosX.addEventListener('change', materialMappingPosChangeFunction);
+        elMaterialMappingPosY.addEventListener('change', materialMappingPosChangeFunction);
+        var materialMappingScaleChangeFunction = createEmitVec2PropertyUpdateFunction('materialMappingScale', elMaterialMappingScaleX, elMaterialMappingScaleY);
+        elMaterialMappingScaleX.addEventListener('change', materialMappingScaleChangeFunction);
+        elMaterialMappingScaleY.addEventListener('change', materialMappingScaleChangeFunction);
+        elMaterialMappingRot.addEventListener('change', createEmitNumberPropertyUpdateFunction('materialMappingRot', 2));
 
         elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text'));
         elTextFaceCamera.addEventListener('change', createEmitCheckedPropertyUpdateFunction('faceCamera'));

From 246ac25d0ab0b6fc5afdc48048e31d5d085f9d9b Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 14 Feb 2018 17:36:46 -0800
Subject: [PATCH 249/569] Introducing a way to abort a task from one of its
 job, using it to skip highlight tasks if nothing to highlight

---
 .../render-utils/src/HighlightEffect.cpp      |  4 +++
 libraries/task/src/task/Task.cpp              | 35 +++++++++++++++++++
 libraries/task/src/task/Task.h                | 20 ++++++++---
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 libraries/task/src/task/Task.cpp

diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index 9501a74d52..de13188733 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -453,6 +453,10 @@ void SelectionToHighlight::run(const render::RenderContextPointer& renderContext
             }
         }
     }
+
+    if (numLayers == 0) {
+        renderContext->abortTask();
+    }
 }
 
 void ExtractSelectionName::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
diff --git a/libraries/task/src/task/Task.cpp b/libraries/task/src/task/Task.cpp
new file mode 100644
index 0000000000..bb65f15b7c
--- /dev/null
+++ b/libraries/task/src/task/Task.cpp
@@ -0,0 +1,35 @@
+//
+//  Task.cpp
+//  task/src/task
+//
+//  Created by Sam Gateau on 2/14/2018.
+//  Copyright 2018 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 "Task.h"
+
+using namespace task;
+
+JobContext::JobContext(const QLoggingCategory& category) :
+    profileCategory(category) {
+    assert(&category);
+}
+
+JobContext::~JobContext() {
+}
+
+void JobContext::resetTaskFlow() {
+    _doAbortTask = false;
+}
+
+void JobContext::abortTask() {
+    _doAbortTask = true;
+}
+
+bool JobContext::doAbortTask() const {
+    return _doAbortTask;
+}
+
+
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index b75f6d7321..1f1fb79ee1 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -29,13 +29,21 @@ class JobNoIO {};
 
 class JobContext {
 public:
-    JobContext(const QLoggingCategory& category) : profileCategory(category) {
-        assert(&category);
-    }
-    virtual ~JobContext() {}
+    JobContext(const QLoggingCategory& category);
+    virtual ~JobContext();
 
     std::shared_ptr<JobConfig> jobConfig { nullptr };
     const QLoggingCategory& profileCategory;
+
+    // control flow commands
+    void resetTaskFlow();
+    void abortTask();
+
+    // Check command flow
+    bool doAbortTask() const;
+
+protected:
+    bool _doAbortTask{ false };
 };
 using JobContextPointer = std::shared_ptr<JobContext>;
 
@@ -308,6 +316,10 @@ public:
             if (config->alwaysEnabled || config->enabled) {
                 for (auto job : TaskConcept::_jobs) {
                     job.run(jobContext);
+                    if (jobContext->doAbortTask()) {
+                        jobContext->resetTaskFlow();
+                        return;
+                    }
                 }
             }
         }

From a679b6f82841b701c06c313b57d18de1c3d1c672 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 18:55:04 -0800
Subject: [PATCH 250/569] Fixed possible crash.

---
 libraries/render-utils/src/DeferredLightingEffect.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 2e77d702c6..665e767c7c 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -550,7 +550,9 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
             if (lightStage && lightStage->_currentFrame._sunLights.size()) {
                 graphics::LightPointer keyLight = lightStage->getLight(lightStage->_currentFrame._sunLights.front());
-                keyLightCastShadows = keyLight->getCastShadows();
+                if (keyLight) {
+                    keyLightCastShadows = keyLight->getCastShadows();
+                }
             }
 
             if (deferredLightingEffect->_shadowMapEnabled && keyLightCastShadows) {

From ef771b6db49ff48655fe772d01b9f6683e1e3234 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 19:11:13 -0800
Subject: [PATCH 251/569] Minor indentation correction.

---
 scripts/system/html/entityProperties.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 1cfa5c3899..7dbeae067c 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -678,7 +678,7 @@
                         min="-1000" max="50000" step="10"></div>
                     </div>
                 </fieldset-->
-           </fieldset>
+            </fieldset>
         </fieldset>
         <fieldset id="text" class="major">
             <legend class="section-header text-group text-section">

From 12f4b8dbb19321c74c7b967b569627b87b8c23aa Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 19:12:24 -0800
Subject: [PATCH 252/569] Corrected event listener for canCastShadow - still
 bad.

---
 scripts/system/html/js/entityProperties.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 9502e9f4d4..8868159848 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1392,12 +1392,8 @@ function loaded() {
 
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
-        if (properties.type === "Model" ||
-            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
-
-            elCanCastShadow.addEventListener('change', createEmitTextPropertyUpdateFunction('canCastShadow'));
-        }
-
+        elCanCastShadow.addEventListener('change', createEmitCheckedPropertyUpdateFunction('canCastShadow'));
+ 
         elImageURL.addEventListener('change', createImageURLUpdateFunction('textures'));
 
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));

From 26e7a85a955db374b526f8a117585ff6c47ccbd2 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 21:15:29 -0800
Subject: [PATCH 253/569] Fixed possible crash.

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

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index e34f550def..24a14a697c 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -386,6 +386,10 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     assert(lightStage);
 
     // Exit if current keylight does not cast shadows
+    if (!lightStage->getCurrentKeyLight()) {
+        return;
+    }
+
     bool castShadows = lightStage->getCurrentKeyLight()->getCastShadows();
     if (!castShadows) {
         output.edit0() = ItemFilter::Builder::nothing();

From adb02d69f9c50721d9e186870ae8ca6cf201a413 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 14 Feb 2018 21:45:56 -0800
Subject: [PATCH 254/569] WIP -adding canCastShadow flag.

---
 libraries/entities/src/EntityItemProperties.cpp  |  5 +++++
 libraries/entities/src/EntityItemProperties.h    |  3 ++-
 .../entities/src/EntityItemPropertiesDefaults.h  |  3 ++-
 libraries/entities/src/ModelEntityItem.h         |  2 +-
 libraries/entities/src/ShapeEntityItem.h         |  2 +-
 scripts/system/html/js/entityProperties.js       | 16 ++++++++--------
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 79c36180d6..3c3c0742da 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -878,6 +878,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(angularVelocity);
     COPY_PROPERTY_IF_CHANGED(angularDamping);
     COPY_PROPERTY_IF_CHANGED(visible);
+    COPY_PROPERTY_IF_CHANGED(canCastShadow);
     COPY_PROPERTY_IF_CHANGED(color);
     COPY_PROPERTY_IF_CHANGED(colorSpread);
     COPY_PROPERTY_IF_CHANGED(colorStart);
@@ -1050,6 +1051,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
 
     std::call_once(initMap, [](){
         ADD_PROPERTY_TO_MAP(PROP_VISIBLE, Visible, visible, bool);
+        ADD_PROPERTY_TO_MAP(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool);
         ADD_PROPERTY_TO_MAP(PROP_POSITION, Position, position, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_DIMENSIONS, Dimensions, dimensions, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_ROTATION, Rotation, rotation, glm::quat);
@@ -2172,6 +2174,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (visibleChanged()) {
         out += "visible";
     }
+    if (canCastShadowChanged()) {
+        out += "canCastShadow";
+    }
     if (rotationChanged()) {
         out += "rotation";
     }
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index ec10910092..dcec1a1f81 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -128,7 +128,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
-    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAST_SHADOW);
+    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW);
     DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
     DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
     DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
@@ -415,6 +415,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Velocity, velocity, "in meters");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Name, name, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Visible, visible, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, CanCastShadow, canCastShadow, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Rotation, rotation, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Density, density, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Gravity, gravity, "");
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index f85d55dc3a..efbf45ce8d 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,7 +46,8 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
-const bool ENTITY_ITEM_DEFAULT_CAST_SHADOW { true };
+const bool ENTITY_ITEM_DEFAULT_CAST_SHADOWS { true };
+const bool ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW { false };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
 const quint64 ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP = 0;
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 49f20c48e2..791eebb7d9 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -174,7 +174,7 @@ protected:
 
     ShapeType _shapeType = SHAPE_TYPE_NONE;
 
-    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAST_SHADOW };
+    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
 
 private:
     uint64_t _lastAnimated{ 0 };
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 4a08936bce..4bc008f761 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -115,7 +115,7 @@ protected:
     //! ellipsoids.
     ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
 
-    bool _canCastShadow { ENTITY_ITEM_DEFAULT_CAST_SHADOW };
+    bool _canCastShadow { ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
 };
 
 #endif // hifi_ShapeEntityItem_h
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 8868159848..fca43c4665 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -802,11 +802,11 @@ function loaded() {
 
                         // HTML workaround since image is not yet a separate entity type
                         var IMAGE_MODEL_NAME = 'default-image-model.fbx';
-                        var urlParts = properties.modelURL.split('/')
-                        var propsFilename = urlParts[urlParts.length - 1];
-                        if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) {
-                            properties.type = "Image";
-                        }
+////                        var urlParts = properties.modelURL.split('/')
+////                        var propsFilename = urlParts[urlParts.length - 1];
+////                        if (properties.type === "Model" && propsFilename === IMAGE_MODEL_NAME) {
+////                            properties.type = "Image";
+////                        }
 
                         // Create class name for css ruleset filtering
                         elPropertiesList.className = properties.type + 'Menu';
@@ -983,11 +983,11 @@ function loaded() {
                                                                      properties.color.green + "," + properties.color.blue + ")";
                         }
 
-                        if (properties.type === "Model" ||
-                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
+                        //if (properties.type === "Model" ||
+                        //    properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
 
                             elCanCastShadow = properties.canCastShadow;
-                        }
+                        //}
 
                         if (properties.type === "Model") {
                             elModelURL.value = properties.modelURL;

From 7e99570824418cc1a57b72cad44ddd8c386a1bff Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 15 Feb 2018 07:54:55 -0800
Subject: [PATCH 255/569] Fixed Ubuntu warnings.

---
 libraries/entities/src/ModelEntityItem.cpp | 1 -
 libraries/graphics/src/graphics/Light.cpp  | 2 +-
 libraries/graphics/src/graphics/Light.h    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 7c14d8a4a0..b1edd47a67 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -619,7 +619,6 @@ void ModelEntityItem::setColor(const rgbColor& value) {
     });
 }
 
-#pragma optimize("", off)
 void ModelEntityItem::setColor(const xColor& value) {
     withWriteLock([&] {
         _color[RED_INDEX] = value.red;
diff --git a/libraries/graphics/src/graphics/Light.cpp b/libraries/graphics/src/graphics/Light.cpp
index 50601299dd..76d8a6030a 100755
--- a/libraries/graphics/src/graphics/Light.cpp
+++ b/libraries/graphics/src/graphics/Light.cpp
@@ -69,7 +69,7 @@ void Light::setCastShadows(const bool castShadows) {
     _castShadows = castShadows;
 }
 
-const bool Light::getCastShadows() const {
+bool Light::getCastShadows() const {
     return _castShadows;
 }
 
diff --git a/libraries/graphics/src/graphics/Light.h b/libraries/graphics/src/graphics/Light.h
index ebe22d5593..bb9fb3e5b9 100755
--- a/libraries/graphics/src/graphics/Light.h
+++ b/libraries/graphics/src/graphics/Light.h
@@ -104,7 +104,7 @@ public:
     const Vec3& getDirection() const;
 
     void setCastShadows(const bool castShadows);
-    const bool getCastShadows() const;
+    bool getCastShadows() const;
 
     void setOrientation(const Quat& orientation);
     const glm::quat& getOrientation() const { return _transform.getRotation(); }

From cb9327e03020b7cd6965c73cf7db2177eb46e7d9 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 10 Jan 2018 13:09:22 -0800
Subject: [PATCH 256/569] Add entity file sync and domain content backups

---
 .clang-format                                 |  10 +-
 assignment-client/CMakeLists.txt              |   1 +
 assignment-client/src/Agent.cpp               |   1 -
 .../src/entities/EntityServer.cpp             |   2 -
 assignment-client/src/entities/EntityServer.h |  13 +-
 assignment-client/src/octree/OctreeServer.cpp | 201 ++++++------
 assignment-client/src/octree/OctreeServer.h   |  21 +-
 .../src/scripts/EntityScriptServer.cpp        |   2 +-
 domain-server/CMakeLists.txt                  |  12 +-
 .../src/DomainContentBackupManager.cpp        | 303 ++++++++++++++++++
 .../src/DomainContentBackupManager.h          |  88 +++++
 domain-server/src/DomainServer.cpp            | 213 +++++++++++-
 domain-server/src/DomainServer.h              |  28 +-
 interface/src/Application.cpp                 |   8 +-
 interface/src/ui/DomainConnectionModel.cpp    |   2 +-
 libraries/entities/src/EntityTree.cpp         |  10 +
 libraries/image/CMakeLists.txt                |   3 +-
 libraries/networking/src/LimitedNodeList.cpp  |   1 +
 libraries/networking/src/ThreadedAssignment.h |   6 +-
 libraries/networking/src/udt/PacketHeaders.h  |   7 +
 libraries/networking/src/udt/Socket.cpp       |   4 +-
 libraries/octree/CMakeLists.txt               |   1 +
 libraries/octree/src/Octree.cpp               |  54 +++-
 libraries/octree/src/Octree.h                 |  14 +-
 libraries/octree/src/OctreePersistThread.cpp  | 102 +++---
 libraries/octree/src/OctreePersistThread.h    |  11 +-
 libraries/octree/src/OctreeUtils.cpp          |  77 +++++
 libraries/octree/src/OctreeUtils.h            |  23 ++
 libraries/shared/src/SharedUtil.cpp           |   6 +-
 libraries/shared/src/SharedUtil.h             |   1 +
 30 files changed, 1026 insertions(+), 199 deletions(-)
 create mode 100644 domain-server/src/DomainContentBackupManager.cpp
 create mode 100644 domain-server/src/DomainContentBackupManager.h

diff --git a/.clang-format b/.clang-format
index f000a27017..507b1eb232 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,12 +1,12 @@
 Language: Cpp
 Standard: Cpp11
-BasedOnStyle: "Chromium" 
+BasedOnStyle: "Chromium"
 ColumnLimit: 128
 IndentWidth: 4
 UseTab: Never
 
 BreakBeforeBraces: Custom
-BraceWrapping:   
+BraceWrapping:
   AfterEnum: true
   AfterClass: false
   AfterControlStatement: false
@@ -21,11 +21,11 @@ BraceWrapping:
 
 
 AccessModifierOffset: -4
-AllowShortFunctionsOnASingleLine: InlineOnly  
-BreakConstructorInitializers: BeforeColon 
+AllowShortFunctionsOnASingleLine: InlineOnly
+BreakConstructorInitializers: BeforeColon
 BreakConstructorInitializersBeforeComma: true
 IndentCaseLabels: true
-ReflowComments: false 
+ReflowComments: false
 Cpp11BracedListStyle: false
 ContinuationIndentWidth: 4
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index c73e8e1d34..3de4c5fd3f 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -6,6 +6,7 @@ setup_hifi_project(Core Gui Network Script Quick WebSockets)
 if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
+set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "/testing/")
 
 setup_memory_debugger()
 
diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index a42b78a6fa..10b8d44545 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -340,7 +340,6 @@ void Agent::scriptRequestFinished() {
     request->deleteLater();
 }
 
-
 void Agent::executeScript() {
     _scriptEngine = scriptEngineFactory(ScriptEngine::AGENT_SCRIPT, _scriptContents, _payload);
 
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index f72832f902..e394884dc2 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -116,7 +116,6 @@ void EntityServer::beforeRun() {
 void EntityServer::entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) {
 }
 
-
 // EntityServer will use the "special packets" to send list of recently deleted entities
 bool EntityServer::hasSpecialPacketsToSend(const SharedNodePointer& node) {
     bool shouldSendDeletedEntities = false;
@@ -277,7 +276,6 @@ int EntityServer::sendSpecialPackets(const SharedNodePointer& node, OctreeQueryN
     return totalBytes;
 }
 
-
 void EntityServer::pruneDeletedEntities() {
     EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
     if (tree->hasAnyDeletedEntities()) {
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 05404b28c8..4d3f1ee89f 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -30,7 +30,6 @@ struct ViewerSendingStats {
 class SimpleEntitySimulation;
 using SimpleEntitySimulationPointer = std::shared_ptr<SimpleEntitySimulation>;
 
-
 class EntityServer : public OctreeServer, public NewlyCreatedEntityHook {
     Q_OBJECT
 public:
@@ -38,7 +37,7 @@ public:
     ~EntityServer();
 
     // Subclasses must implement these methods
-    virtual std::unique_ptr<OctreeQueryNode> createOctreeQueryNode() override ;
+    virtual std::unique_ptr<OctreeQueryNode> createOctreeQueryNode() override;
     virtual char getMyNodeType() const override { return NodeType::EntityServer; }
     virtual PacketType getMyQueryMessageType() const override { return PacketType::EntityQuery; }
     virtual const char* getMyServerName() const override { return MODEL_SERVER_NAME; }
@@ -82,12 +81,12 @@ private:
     QReadWriteLock _viewerSendingStatsLock;
     QMap<QUuid, QMap<QUuid, ViewerSendingStats>> _viewerSendingStats;
 
-    static const int DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 45 * 60 * 1000; // 45m
-    static const int DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 60 * 60 * 1000; // 1h
-    int _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS; // 45m
-    int _MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS; // 1h
+    static const int DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 45 * 60 * 1000;                    // 45m
+    static const int DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 60 * 60 * 1000;                    // 1h
+    int _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS;  // 45m
+    int _MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS;  // 1h
     QTimer _dynamicDomainVerificationTimer;
     void startDynamicDomainVerification();
 };
 
-#endif // hifi_EntityServer_h
+#endif  // hifi_EntityServer_h
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 42494ea7ee..e78f9f108b 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -33,6 +33,10 @@
 #include <PathUtils.h>
 #include <QtCore/QDir>
 
+#include <OctreeUtils.h>
+
+Q_LOGGING_CATEGORY(octree_server, "hifi.octree-server")
+
 int OctreeServer::_clientCount = 0;
 const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000;
 
@@ -84,6 +88,8 @@ int OctreeServer::_longProcessWait = 0;
 int OctreeServer::_shortProcessWait = 0;
 int OctreeServer::_noProcessWait = 0;
 
+static const QString PERSIST_FILE_DOWNLOAD_PATH = "/models.json.gz";
+
 
 void OctreeServer::resetSendingStats() {
     _averageLoopTime.reset();
@@ -202,7 +208,6 @@ void OctreeServer::trackPacketSendingTime(float time) {
     }
 }
 
-
 void OctreeServer::trackProcessWaitTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
@@ -283,8 +288,6 @@ void OctreeServer::initHTTPManager(int port) {
     _httpManager = new HTTPManager(QHostAddress::AnyIPv4, port, documentRoot, this, this);
 }
 
-const QString PERSIST_FILE_DOWNLOAD_PATH = "/models.json.gz";
-
 bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
 
 #ifdef FORCE_CRASH
@@ -922,87 +925,6 @@ void OctreeServer::handleOctreeDataNackPacket(QSharedPointer<ReceivedMessage> me
     }
 }
 
-void OctreeServer::handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message) {
-    if (!_isFinished && !_isShuttingDown) {
-        // these messages are only allowed to come from the domain server, so make sure that is the case
-        auto nodeList = DependencyManager::get<NodeList>();
-        if (message->getSenderSockAddr() == nodeList->getDomainHandler().getSockAddr()) {
-            // it's far cleaner to load up the new content upon server startup
-            // so here we just store a special file at our persist path
-            // and then force a stop of the server so that it can pick it up when it relaunches
-            if (!_persistAbsoluteFilePath.isEmpty()) {
-                replaceContentFromMessageData(message->getMessage());
-            } else {
-                qDebug() << "Cannot perform octree file replacement since current persist file path is not yet known";
-            }
-        } else {
-            qDebug() << "Received an octree file replacement that was not from our domain server - refusing to process";
-        }
-    }
-}
-
-// Message->getMessage() contains a QByteArray representation of the URL to download from
-void OctreeServer::handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message) {
-    qInfo() << "Received request to replace content from a url";
-    if (!_isFinished && !_isShuttingDown) {
-        // This call comes from Interface, so we skip our domain server check
-        // but confirm that we have permissions to replace content sets
-        if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
-            if (!_persistAbsoluteFilePath.isEmpty()) {
-                // Convert message data into our URL
-                QString url(message->getMessage());
-                QUrl modelsURL = QUrl(url, QUrl::StrictMode);
-                QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
-                QNetworkRequest request(modelsURL);
-                QNetworkReply* reply = networkAccessManager.get(request);
-                connect(reply, &QNetworkReply::finished, [this, reply, modelsURL]() {
-                    QNetworkReply::NetworkError networkError = reply->error();
-                    if (networkError == QNetworkReply::NoError) {
-                        QByteArray contents = reply->readAll();
-                        replaceContentFromMessageData(contents);
-                    } else {
-                        qDebug() << "Error downloading JSON from specified file";
-                    }
-                });
-            } else {
-                qDebug() << "Cannot perform octree file replacement since current persist file path is not yet known";
-            }
-        }
-    }
-}
-
-void OctreeServer::replaceContentFromMessageData(QByteArray content) {
-    //Assume we have compressed data
-    auto compressedOctree = content;
-    QByteArray jsonOctree;
-
-    bool wasCompressed = gunzip(compressedOctree, jsonOctree);
-    if (!wasCompressed) {
-        // the source was not compressed, assume we were sent regular JSON data
-        jsonOctree = compressedOctree;
-    }
-    // check the JSON data to verify it is an object
-    if (QJsonDocument::fromJson(jsonOctree).isObject()) {
-        if (!wasCompressed) {
-            // source was not compressed, we compress it before we write it locally
-            gzip(jsonOctree, compressedOctree);
-        }
-        // write the compressed octree data to a special file
-        auto replacementFilePath = _persistAbsoluteFilePath.append(OctreePersistThread::REPLACEMENT_FILE_EXTENSION);
-        QFile replacementFile(replacementFilePath);
-        if (replacementFile.open(QIODevice::WriteOnly) && replacementFile.write(compressedOctree) != -1) {
-            // we've now written our replacement file, time to take the server down so it can
-            // process it when it comes back up
-            qInfo() << "Wrote octree replacement file to" << replacementFilePath << "- stopping server";
-            setFinished(true);
-        } else {
-            qWarning() << "Could not write replacement octree data to file - refusing to process";
-        }
-    } else {
-        qDebug() << "Received replacement octree file that is invalid - refusing to process";
-    }
-}
-
 bool OctreeServer::readOptionBool(const QString& optionName, const QJsonObject& settingsSectionObject, bool& result) {
     result = false; // assume it doesn't exist
     bool optionAvailable = false;
@@ -1119,7 +1041,19 @@ void OctreeServer::readConfiguration() {
             _persistFilePath = getMyDefaultPersistFilename();
         }
 
+        // If persist filename does not exist, let's see if there is one beside the application binary
+        // If there is, let's copy it over to our target persist directory
+        QDir persistPath { _persistFilePath };
+        _persistAbsoluteFilePath = persistPath.absolutePath();
+
+        if (persistPath.isRelative()) {
+            // if the domain settings passed us a relative path, make an absolute path that is relative to the
+            // default data directory
+            _persistAbsoluteFilePath = QDir(PathUtils::getAppDataFilePath("entities/")).absoluteFilePath(_persistFilePath);
+        }
+
         qDebug() << "persistFilePath=" << _persistFilePath;
+        qDebug() << "persisAbsoluteFilePath=" << _persistAbsoluteFilePath;
 
         _persistAsFileType = "json.gz";
 
@@ -1200,20 +1134,90 @@ void OctreeServer::run() {
 }
 
 void OctreeServer::domainSettingsRequestComplete() {
+    if (_state != OctreeServerState::WaitingForDomainSettings) {
+        qCWarning(octree_server) << "Received domain settings after they have already been received";
+        return;
+    }
+
+    auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
+    packetReceiver.registerListener(getMyQueryMessageType(), this, "handleOctreeQueryPacket");
+    packetReceiver.registerListener(PacketType::OctreeDataNack, this, "handleOctreeDataNackPacket");
+
+    packetReceiver.registerListener(PacketType::OctreeDataFileReply, this, "handleOctreeDataFileReply");
+
+    qDebug(octree_server) << "Received domain settings";
+
+    readConfiguration();
+
+    _state = OctreeServerState::WaitingForOctreeDataNegotation;
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+
+    auto packet = NLPacket::create(PacketType::OctreeDataFileRequest, -1, true, false);
+
+    OctreeUtils::RawOctreeData data;
+    qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
+    if (OctreeUtils::readOctreeDataInfoFromFile(_persistAbsoluteFilePath, &data)) {
+        qCDebug(octree_server) << "Current octree data: ID(" << data.id << ") DataVersion(" << data.version << ")";
+        packet->writePrimitive(true);
+        auto id = data.id.toRfc4122();
+        packet->write(id);
+        packet->writePrimitive(data.version);
+    } else {
+        qCWarning(octree_server) << "No octree data found";
+        packet->writePrimitive(false);
+    }
+
+    qCDebug(octree_server) << "Sending request for octree data to DS";
+    nodeList->sendPacket(std::move(packet), domainHandler.getSockAddr());
+} 
+
+void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message) {
+    bool includesNewData;
+    message->readPrimitive(&includesNewData);
+    QByteArray replaceData;
+    if (includesNewData) {
+        replaceData = message->readAll();
+        qDebug() << "Got reply to octree data file request, new data sent";
+    } else {
+        qDebug() << "Got reply to octree data file request, current entity data is sufficient";
+        
+        OctreeUtils::RawOctreeData data;
+        qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
+        if (OctreeUtils::readOctreeDataInfoFromFile(_persistAbsoluteFilePath, &data)) {
+            if (data.id.isNull()) {
+                qCDebug(octree_server) << "Current octree data has a null id, updating";
+                data.id = QUuid::createUuid();
+                data.version = 0;
+
+                QFile file(_persistAbsoluteFilePath);
+                if (file.open(QIODevice::WriteOnly)) {
+                    auto entityData = data.toByteArray();
+                    file.write(entityData);
+                    file.close();
+                } else {
+                    qCDebug(octree_server) << "Failed to update octree data";
+                }
+            }
+        }
+    }
+    beginRunning(replaceData);
+}
+
+void OctreeServer::beginRunning(QByteArray replaceData) {
+    if (_state == OctreeServerState::Running) {
+        qCWarning(octree_server) << "Server is already running";
+        return;
+    }
+
+    _state = OctreeServerState::Running;
 
     auto nodeList = DependencyManager::get<NodeList>();
 
     // we need to ask the DS about agents so we can ping/reply with them
     nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
 
-    auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(getMyQueryMessageType(), this, "handleOctreeQueryPacket");
-    packetReceiver.registerListener(PacketType::OctreeDataNack, this, "handleOctreeDataNackPacket");
-    packetReceiver.registerListener(PacketType::OctreeFileReplacement, this, "handleOctreeFileReplacement");
-    packetReceiver.registerListener(PacketType::OctreeFileReplacementFromUrl, this, "handleOctreeFileReplacementFromURL");
-
-    readConfiguration();
-
     beforeRun(); // after payload has been processed
 
     connect(nodeList.data(), SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer)));
@@ -1233,17 +1237,6 @@ void OctreeServer::domainSettingsRequestComplete() {
 
     // if we want Persistence, set up the local file and persist thread
     if (_wantPersist) {
-        // If persist filename does not exist, let's see if there is one beside the application binary
-        // If there is, let's copy it over to our target persist directory
-        QDir persistPath { _persistFilePath };
-        _persistAbsoluteFilePath = persistPath.absolutePath();
-
-        if (persistPath.isRelative()) {
-            // if the domain settings passed us a relative path, make an absolute path that is relative to the
-            // default data directory
-            _persistAbsoluteFilePath = QDir(PathUtils::getAppDataFilePath("entities/")).absoluteFilePath(_persistFilePath);
-        }
-
         static const QString ENTITY_PERSIST_EXTENSION = ".json.gz";
 
         // force the persist file to end with .json.gz
@@ -1328,7 +1321,7 @@ void OctreeServer::domainSettingsRequestComplete() {
 
         // now set up PersistThread
         _persistThread = new OctreePersistThread(_tree, _persistAbsoluteFilePath, _backupDirectoryPath, _persistInterval,
-                                                 _wantBackup, _settings, _debugTimestampNow, _persistAsFileType);
+                                                 _wantBackup, _settings, _debugTimestampNow, _persistAsFileType, replaceData);
         _persistThread->initialize(true);
     }
 
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index 0eba914064..6f77920ee0 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -27,8 +27,18 @@
 #include "OctreeServerConsts.h"
 #include "OctreeInboundPacketProcessor.h"
 
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(octree_server)
+
 const int DEFAULT_PACKETS_PER_INTERVAL = 2000; // some 120,000 packets per second total
 
+enum class OctreeServerState {
+    WaitingForDomainSettings,
+    WaitingForOctreeDataNegotation,
+    Running
+};
+
 /// Handles assignments of type OctreeServer - sending octrees to various clients.
 class OctreeServer : public ThreadedAssignment, public HTTPRequestHandler {
     Q_OBJECT
@@ -36,6 +46,8 @@ public:
     OctreeServer(ReceivedMessage& message);
     ~OctreeServer();
 
+    OctreeServerState _state { OctreeServerState::WaitingForDomainSettings };
+
     /// allows setting of run arguments
     void setArguments(int argc, char** argv);
 
@@ -137,8 +149,9 @@ private slots:
     void domainSettingsRequestComplete();
     void handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleOctreeDataNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-    void handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message);
-    void handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message);
+    //void handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message);
+    //void handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message);
+    void handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message);
     void removeSendThread();
 
 protected:
@@ -159,11 +172,13 @@ protected:
     QString getFileLoadTime();
     QString getConfiguration();
     QString getStatusLink();
+
+    void beginRunning(QByteArray replaceData);
     
     UniqueSendThread createSendThread(const SharedNodePointer& node);
     virtual UniqueSendThread newSendThread(const SharedNodePointer& node);
 
-    void replaceContentFromMessageData(QByteArray content);
+    //void replaceContentFromMessageData(QByteArray content);
 
     int _argc;
     const char** _argv;
diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index b4a6b3af93..60cb1e349b 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -178,7 +178,7 @@ void EntityScriptServer::updateEntityPPS() {
     int numRunningScripts = _entitiesScriptEngine->getNumRunningEntityScripts();
     int pps;
     if (std::numeric_limits<int>::max() / _entityPPSPerScript < numRunningScripts) {
-        qWarning() << QString("Integer multiplaction would overflow, clamping to maxint: %1 * %2").arg(numRunningScripts).arg(_entityPPSPerScript);
+        qWarning() << QString("Integer multiplication would overflow, clamping to maxint: %1 * %2").arg(numRunningScripts).arg(_entityPPSPerScript);
         pps = std::numeric_limits<int>::max();
         pps = std::min(_maxEntityPPS, pps);
     } else {
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index c1e275e4d3..0e958b9537 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -22,7 +22,17 @@ setup_memory_debugger()
 symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources")
 
 # link the shared hifi libraries
-link_hifi_libraries(embedded-webserver networking shared avatars)
+link_hifi_libraries(embedded-webserver networking shared avatars octree)
+
+add_dependency_external_projects(quazip)
+
+find_package(QuaZip REQUIRED)
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${QUAZIP_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${QUAZIP_LIBRARIES})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${QUAZIP_DLL_PATH})
+endif ()
 
 # find OpenSSL
 find_package(OpenSSL REQUIRED)
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
new file mode 100644
index 0000000000..0eca10f8af
--- /dev/null
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -0,0 +1,303 @@
+//
+//  DomainContentBackupManager.cpp
+//  libraries/octree/src
+//
+//  Created by Brad Hefta-Gaub on 8/21/13.
+//  Copyright 2013 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 <chrono>
+#include <thread>
+
+#include <cstdio>
+#include <fstream>
+#include <time.h>
+
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QDirIterator>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
+
+#include <NumericalConstants.h>
+#include <PerfStat.h>
+#include <PathUtils.h>
+
+#include "DomainServer.h"
+#include "DomainContentBackupManager.h"
+const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  // every 30 seconds
+
+// Backup format looks like: daily_backup-TIMESTAMP.zip
+const static QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
+const static QString DATETIME_FORMAT_RE("\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}");
+
+void DomainContentBackupManager::addCreateBackupHandler(CreateBackupHandler handler) {
+    _backupHandlers.push_back(handler);
+}
+
+DomainContentBackupManager::DomainContentBackupManager(const QString& backupDirectory,
+                                                       const QJsonObject& settings,
+                                                       int persistInterval,
+                                                       bool debugTimestampNow)
+    : _backupDirectory(backupDirectory),
+    _persistInterval(persistInterval),
+    _initialLoadComplete(false),
+    _loadTimeUSecs(0),
+    _lastCheck(0),
+    _debugTimestampNow(debugTimestampNow),
+    _lastTimeDebug(0) {
+    parseSettings(settings);
+}
+
+void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
+    qDebug() << settings << settings["backups"] << settings["backups"].isArray();
+    if (settings["backups"].isArray()) {
+        const QJsonArray& backupRules = settings["backups"].toArray();
+        qCDebug(domain_server) << "BACKUP RULES:";
+
+        for (const QJsonValue& value : backupRules) {
+            QJsonObject obj = value.toObject();
+
+            int interval = 0;
+            int count = 0;
+
+            QJsonValue intervalVal = obj["backupInterval"];
+            if (intervalVal.isString()) {
+                interval = intervalVal.toString().toInt();
+            } else {
+                interval = intervalVal.toInt();
+            }
+
+            QJsonValue countVal = obj["maxBackupVersions"];
+            if (countVal.isString()) {
+                count = countVal.toString().toInt();
+            } else {
+                count = countVal.toInt();
+            }
+
+            auto name = obj["Name"].toString();
+            auto format = obj["format"].toString();
+            format = name.replace(" ", "_").toLower() + "-";
+
+            qCDebug(domain_server) << "    Name:" << name;
+            qCDebug(domain_server) << "        format:" << format;
+            qCDebug(domain_server) << "        interval:" << interval;
+            qCDebug(domain_server) << "        count:" << count;
+
+            BackupRule newRule = { name, interval, format, count, 0 };
+
+            newRule.lastBackupSeconds = getMostRecentBackupTimeInSecs(format);
+
+            if (newRule.lastBackupSeconds > 0) {
+                auto now = QDateTime::currentSecsSinceEpoch();
+                auto sinceLastBackup = now - newRule.lastBackupSeconds;
+                qCDebug(domain_server).noquote() << "        lastBackup:" <<  formatSecTime(sinceLastBackup) << "ago";
+            } else {
+                qCDebug(domain_server) << "        lastBackup: NEVER";
+            }
+
+            _backupRules << newRule;
+        }
+    } else {
+        qCDebug(domain_server) << "BACKUP RULES: NONE";
+    }
+}
+
+int64_t DomainContentBackupManager::getMostRecentBackupTimeInSecs(const QString& format) {
+    int64_t mostRecentBackupInSecs = 0;
+
+    QString mostRecentBackupFileName;
+    QDateTime mostRecentBackupTime;
+
+    bool recentBackup = getMostRecentBackup(format, mostRecentBackupFileName, mostRecentBackupTime);
+
+    if (recentBackup) {
+        mostRecentBackupInSecs = mostRecentBackupTime.toSecsSinceEpoch();
+    }
+
+    return mostRecentBackupInSecs;
+}
+
+bool DomainContentBackupManager::process() {
+    if (isStillRunning()) {
+        constexpr int64_t MSECS_TO_USECS = 1000;
+        constexpr int64_t USECS_TO_SLEEP = 10 * MSECS_TO_USECS;  // every 10ms
+        std::this_thread::sleep_for(std::chrono::microseconds(USECS_TO_SLEEP));
+
+        int64_t now = usecTimestampNow();
+        int64_t sinceLastSave = now - _lastCheck;
+        int64_t intervalToCheck = _persistInterval * MSECS_TO_USECS;
+
+        if (sinceLastSave > intervalToCheck) {
+            _lastCheck = now;
+            persist();
+        }
+    }
+
+    // if we were asked to debugTimestampNow do that now...
+    if (_debugTimestampNow) {
+
+        quint64 now = usecTimestampNow();
+        quint64 sinceLastDebug = now - _lastTimeDebug;
+        quint64 DEBUG_TIMESTAMP_INTERVAL = 600000000;  // every 10 minutes
+
+        if (sinceLastDebug > DEBUG_TIMESTAMP_INTERVAL) {
+            _lastTimeDebug = usecTimestampNow(true);  // ask for debug output
+        }
+    }
+
+    return isStillRunning();
+}
+
+void DomainContentBackupManager::aboutToFinish() {
+    qCDebug(domain_server) << "Persist thread about to finish...";
+    persist();
+}
+
+void DomainContentBackupManager::persist() {
+    QDir backupDir { _backupDirectory };
+    backupDir.mkpath(".");
+
+    // create our "lock" file to indicate we're saving.
+    QString lockFileName = _backupDirectory + "/running.lock";
+
+    std::ofstream lockFile(qPrintable(lockFileName), std::ios::out | std::ios::binary);
+    if (lockFile.is_open()) {
+        backup();
+
+        lockFile.close();
+        remove(qPrintable(lockFileName));
+    }
+}
+
+bool DomainContentBackupManager::getMostRecentBackup(const QString& format,
+                                                     QString& mostRecentBackupFileName,
+                                                     QDateTime& mostRecentBackupTime) {
+    QRegExp formatRE { QRegExp::escape(format) + "(" + DATETIME_FORMAT_RE + ")" + "\\.zip" };
+
+    QStringList filters;
+    filters << format + "*.zip";
+
+    bool bestBackupFound = false;
+    QString bestBackupFile;
+    QDateTime bestBackupFileTime;
+
+    // Iterate over all of the backup files in the persist location
+    QDirIterator dirIterator(_backupDirectory, filters, QDir::Files | QDir::NoSymLinks, QDirIterator::NoIteratorFlags);
+    while (dirIterator.hasNext()) {
+        dirIterator.next();
+        auto fileName = dirIterator.fileInfo().fileName();
+
+        if (formatRE.exactMatch(fileName)) {
+            auto datetime = formatRE.cap(1);
+            auto createdAt = QDateTime::fromString(datetime, DATETIME_FORMAT);
+
+            if (!createdAt.isValid()) {
+                qDebug() << "Skipping backup with invalid timestamp: " << datetime;
+                continue;
+            }
+
+            qDebug() << "Checking " << dirIterator.fileInfo().filePath();
+
+            // Based on last modified date, track the most recently modified file as the best backup
+            if (createdAt > bestBackupFileTime) {
+                bestBackupFound = true;
+                bestBackupFile = dirIterator.filePath();
+                bestBackupFileTime = createdAt;
+            }
+        } else {
+            qDebug() << "NO match: " << fileName << formatRE;
+        }
+    }
+
+    // If we found a backup then return the results
+    if (bestBackupFound) {
+        mostRecentBackupFileName = bestBackupFile;
+        mostRecentBackupTime = bestBackupFileTime;
+    }
+    return bestBackupFound;
+}
+
+void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule) {
+    QDir backupDir { _backupDirectory };
+    if (backupDir.exists() && rule.maxBackupVersions > 0) {
+        qCDebug(domain_server) << "Rolling old backup versions for rule" << rule.name << "...";
+
+        auto matchingFiles =
+                backupDir.entryInfoList({ rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
+
+        int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions;
+        for (int i = 0; i < backupsToDelete; ++i) {
+            auto fileInfo = matchingFiles[i].absoluteFilePath();
+            QFile backupFile(fileInfo);
+            if (backupFile.remove()) {
+                qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName();
+            } else {
+                qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName();
+            }
+        }
+
+        qCDebug(domain_server) << "Done rolling old backup versions...";
+    } else {
+        qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "."
+                                << " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."
+                                << " No need to roll backups...";
+    }
+}
+
+void DomainContentBackupManager::backup() {
+    auto nowDateTime = QDateTime::currentDateTime();
+    auto nowSeconds = nowDateTime.toSecsSinceEpoch();
+
+    for (BackupRule& rule : _backupRules) {
+        auto secondsSinceLastBackup = nowSeconds - rule.lastBackupSeconds;
+
+        qCDebug(domain_server) << "Checking [" << rule.name << "] - Time since last backup [" << secondsSinceLastBackup
+                                << "] "
+                                << "compared to backup interval [" << rule.intervalSeconds << "]...";
+
+        if (secondsSinceLastBackup > rule.intervalSeconds) {
+            qCDebug(domain_server) << "Time since last backup [" << secondsSinceLastBackup << "] for rule [" << rule.name
+                                    << "] exceeds backup interval [" << rule.intervalSeconds << "] doing backup now...";
+
+            auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
+            auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
+            auto zip = new QuaZip(_backupDirectory + "/" + fileName);
+            zip->open(QuaZip::mdAdd);
+
+            for (auto& handler : _backupHandlers) {
+                handler(zip);
+            }
+
+            zip->close();
+
+            qDebug() << "Created backup: " << fileName;
+
+            removeOldBackupVersions(rule);
+
+            if (rule.maxBackupVersions > 0) {
+                // Execute backup
+                auto result = true;
+                if (result) {
+                    qCDebug(domain_server) << "DONE backing up persist file...";
+                    rule.lastBackupSeconds = nowSeconds;
+                } else {
+                    qCDebug(domain_server) << "ERROR in backing up persist file...";
+                    perror("ERROR in backing up persist file");
+                }
+            } else {
+                qCDebug(domain_server) << "This backup rule" << rule.name << " has Max Rolled Backup Versions less than 1 ["
+                                        << rule.maxBackupVersions << "]."
+                                        << " There are no backups to be done...";
+            }
+        } else {
+            qCDebug(domain_server) << "Backup not needed for this rule [" << rule.name << "]...";
+        }
+    }
+}
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
new file mode 100644
index 0000000000..20408fe486
--- /dev/null
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -0,0 +1,88 @@
+//
+//  DomainContentBackupManager.h
+//  libraries/octree/src
+//
+//  Created by Brad Hefta-Gaub on 8/21/13.
+//  Copyright 2013 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_DomainContentBackupManager_h
+#define hifi_DomainContentBackupManager_h
+
+#include <QString>
+#include <GenericThread.h>
+#include <QVector>
+
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+
+#include <functional>
+
+using BackupResult = std::vector<QString>;
+using CreateBackupHandler = std::function<void(QuaZip* quazip)>;
+using RecoverBackupHandler = std::function<void()>;
+
+class DomainContentBackupManager : public GenericThread {
+    Q_OBJECT
+public:
+    class BackupRule {
+    public:
+        QString name;
+        int intervalSeconds;
+        QString extensionFormat;
+        int maxBackupVersions;
+        qint64 lastBackupSeconds;
+    };
+
+    static const int DEFAULT_PERSIST_INTERVAL;
+
+    DomainContentBackupManager(const QString& rootBackupDirectory,
+                               const QJsonObject& settings,
+                               int persistInterval = DEFAULT_PERSIST_INTERVAL,
+                               bool debugTimestampNow = false);
+
+    void addCreateBackupHandler(CreateBackupHandler handler);
+    bool isInitialLoadComplete() const { return _initialLoadComplete; }
+    int64_t getLoadElapsedTime() const { return _loadTimeUSecs; }
+
+    void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
+
+    void replaceData(QByteArray data);
+
+signals:
+    void loadCompleted();
+
+protected:
+    /// Implements generic processing behavior for this thread.
+    bool process() override;
+
+    void persist();
+    void backup();
+    void removeOldBackupVersions(const BackupRule& rule);
+    bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
+    int64_t getMostRecentBackupTimeInSecs(const QString& format);
+    void parseSettings(const QJsonObject& settings);
+
+private:
+    QString _backupDirectory;
+    std::vector<CreateBackupHandler> _backupHandlers;
+    int _persistInterval;
+    bool _initialLoadComplete;
+
+    int64_t _loadTimeUSecs;
+
+    time_t _lastPersistTime;
+    int64_t _lastCheck;
+    bool _wantBackup{ true };
+    QVector<BackupRule> _backupRules;
+
+    bool _debugTimestampNow;
+    int64_t _lastTimeDebug;
+};
+
+#endif  // hifi_DomainContentBackupManager_h
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 68a36195d9..e083710d35 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -24,6 +24,7 @@
 #include <QTimer>
 #include <QUrlQuery>
 #include <QCommandLineParser>
+#include <QUuid>
 
 #include <AccountManager.h>
 #include <AssetClient.h>
@@ -47,7 +48,14 @@
 #include "DomainServerNodeData.h"
 #include "NodeConnectionData.h"
 
+#include <Gzip.h>
+
+#include <OctreeUtils.h>
+
+Q_LOGGING_CATEGORY(domain_server, "hifi.domain_server")
+
 const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
+const QString DomainServer::REPLACEMENT_FILE_EXTENSION = ".replace";
 
 int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
@@ -280,6 +288,30 @@ DomainServer::DomainServer(int argc, char* argv[]) :
             qDebug() << "Ignoring subnet in whitelist, invalid ip portion: " << subnet;
         }
     }
+
+    qDebug() << "Starting persist thread";
+    if (QDir(getEntitiesDirPath()).mkpath(".")) {
+        qCDebug(domain_server) << "Created entities data directory";
+    }
+    maybeHandleReplacementEntityFile();
+    auto entitiesFilePath = getEntitiesFilePath();
+    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.responseObjectForType("6")["entity_server_settings"].toObject()));
+    _contentManager->addCreateBackupHandler([entitiesFilePath](QuaZip* zip) {
+        qDebug() << "Creating a backup from handler";
+
+        QFile entitiesFile { entitiesFilePath };
+
+        if (entitiesFile.open(QIODevice::ReadOnly)) {
+            QuaZipFile zipFile { zip };
+            zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", entitiesFilePath));
+            zipFile.write(entitiesFile.readAll());
+            zipFile.close();
+            if (zipFile.getZipError() != UNZ_OK) {
+                qDebug() << "Failed to write entities file to backup:" << zipFile.getZipError();
+            }
+        }
+    });
+    _contentManager->initialize(true);
 }
 
 void DomainServer::parseCommandLine() {
@@ -352,6 +384,11 @@ DomainServer::~DomainServer() {
 
     // destroy the LimitedNodeList before the DomainServer QCoreApplication is down
     DependencyManager::destroy<LimitedNodeList>();
+
+    if (_contentManager) {
+        _contentManager->aboutToFinish();
+        _contentManager->terminating();
+    }
 }
 
 void DomainServer::queuedQuit(QString quitMessage, int exitCode) {
@@ -691,6 +728,12 @@ void DomainServer::setupNodeListAndAssignments() {
     packetReceiver.registerListener(PacketType::ICEServerHeartbeatDenied, this, "processICEServerHeartbeatDenialPacket");
     packetReceiver.registerListener(PacketType::ICEServerHeartbeatACK, this, "processICEServerHeartbeatACK");
 
+    packetReceiver.registerListener(PacketType::OctreeDataFileRequest, this, "processOctreeDataRequestMessage");
+    packetReceiver.registerListener(PacketType::OctreeDataPersist, this, "processOctreeDataPersistMessage");
+
+    packetReceiver.registerListener(PacketType::OctreeFileReplacement, this, "handleOctreeFileReplacementRequest");
+    packetReceiver.registerListener(PacketType::OctreeFileReplacementFromUrl, this, "handleOctreeFileReplacementFromURLRequest");
+
     // set a custom packetVersionMatch as the verify packet operator for the udt::Socket
     nodeList->setPacketFilterOperator(&DomainServer::isPacketVerified);
 
@@ -1605,6 +1648,7 @@ void DomainServer::sendHeartbeatToIceServer() {
             qWarning() << "Waiting for keypair generation to complete before sending ICE heartbeat.";
 
             if (!limitedNodeList->getSessionUUID().isNull()) {
+                qDebug() << "generating keypair";
                 accountManager->generateNewDomainKeypair(limitedNodeList->getSessionUUID());
             } else {
                 qWarning() << "Attempting to send ICE server heartbeat with no domain ID. This is not supported";
@@ -1695,10 +1739,88 @@ void DomainServer::sendHeartbeatToIceServer() {
     } else {
         qDebug() << "Not sending ice-server heartbeat since there is no selected ice-server.";
         qDebug() << "Waiting for" << _iceServerAddr << "host lookup response";
-
     }
 }
 
+void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessage> message) {
+    qDebug() << "Received octree data persist message";
+    auto data = message->readAll();
+    auto filePath = getEntitiesFilePath();
+
+    QFile f(filePath);
+    if (f.open(QIODevice::WriteOnly)) {
+        f.write(data);
+        OctreeUtils::RawOctreeData octreeData;
+        if (OctreeUtils::readOctreeDataInfoFromData(data, &octreeData)) {
+            qCDebug(domain_server) << "Wrote new entiteis file" << octreeData.id << octreeData.version;
+        } else {
+            qCDebug(domain_server) << "Failed to read new octree data info";
+        }
+    } else {
+        qCDebug(domain_server) << "Failed to write new entities file";
+    }
+}
+
+QString DomainServer::getContentBackupDir() {
+    return PathUtils::getAppDataFilePath("backup");
+}
+
+QString DomainServer::getEntitiesDirPath() {
+    return PathUtils::getAppDataFilePath("entities");
+}
+
+QString DomainServer::getEntitiesFilePath() {
+    return PathUtils::getAppDataFilePath("entities/models.json.gz");
+}
+
+QString DomainServer::getEntitiesReplacementFilePath() {
+    return getEntitiesFilePath().append(REPLACEMENT_FILE_EXTENSION);
+}
+
+void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message) {
+    qDebug() << "Got request for octree data from " << message->getSenderSockAddr();
+
+    bool remoteHasExistingData { false };
+    QUuid id;
+    int version;
+    message->readPrimitive(&remoteHasExistingData);
+    if (remoteHasExistingData) {
+        auto idData = message->read(16);
+        id = QUuid::fromRfc4122(idData);
+        message->readPrimitive(&version);
+        qCDebug(domain_server) << "Entity server does have existing data: ID(" << id << ") DataVersion(" << version << ")";
+    } else {
+        qCDebug(domain_server) << "Entity server does not have existing data";
+    }
+    auto entityFilePath = getEntitiesFilePath();
+
+    //QFile file(entityFilePath);
+    auto reply = NLPacketList::create(PacketType::OctreeDataFileReply, QByteArray(), true, true);
+    OctreeUtils::RawOctreeData data;
+    if (OctreeUtils::readOctreeDataInfoFromFile(entityFilePath, &data)) {
+        if (data.id == id && data.version <= version) {
+            qCDebug(domain_server) << "ES has sufficient octree data, not sending data";
+            reply->writePrimitive(false);
+        } else {
+            qCDebug(domain_server) << "Sending newer octree data to ES";
+            QFile file(entityFilePath);
+            if (file.open(QIODevice::ReadOnly)) {
+                reply->writePrimitive(true);
+                reply->write(file.readAll());
+            } else {
+                qCDebug(domain_server) << "Unable to load entity file";
+                reply->writePrimitive(false);
+            }
+        }
+    } else {
+        qCDebug(domain_server) << "Domain server does not have valid octree data";
+        reply->writePrimitive(false);
+    }
+
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
+    nodeList->sendPacketList(std::move(reply), message->getSenderSockAddr());
+}
+
 void DomainServer::processNodeJSONStatsPacket(QSharedPointer<ReceivedMessage> packetList, SharedNodePointer sendingNode) {
     auto nodeData = static_cast<DomainServerNodeData*>(sendingNode->getLinkedData());
     if (nodeData) {
@@ -3105,9 +3227,64 @@ void DomainServer::setupGroupCacheRefresh() {
     }
 }
 
+void DomainServer::maybeHandleReplacementEntityFile() {
+    QFile replacementFile(getEntitiesReplacementFilePath());
+    if (replacementFile.exists()) {
+        qCDebug(domain_server) << "Replacing existing entity date with replacement file";
+        QFile currentFile(getEntitiesFilePath());
+        if (currentFile.exists()) {
+            if (currentFile.remove()) {
+                qCDebug(domain_server) << "Removed existing entity file";
+            } else {
+                qCWarning(domain_server) << "Failled to remove existing entity file";
+            }
+        }
+        if (replacementFile.rename(getEntitiesFilePath())) {
+            qCDebug(domain_server) << "Successfully updated entities data file with replacement file";
+        } else {
+            qCWarning(domain_server) << "Failed to update entities data file with replacement file";
+        }
+    }
+}
+
 void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
     // enumerate the nodes and find any octree type servers with active sockets
 
+    //Assume we have compressed data
+    auto compressedOctree = octreeFile;
+    QByteArray jsonOctree;
+
+    bool wasCompressed = gunzip(compressedOctree, jsonOctree);
+    if (!wasCompressed) {
+        // the source was not compressed, assume we were sent regular JSON data
+        jsonOctree = compressedOctree;
+    }
+
+    OctreeUtils::RawOctreeData data;
+    if (OctreeUtils::readOctreeDataInfoFromData(jsonOctree, &data)) {
+        data.id = QUuid::createUuid();
+        data.version = 0;
+
+        gzip(data.toByteArray(), compressedOctree);
+
+        // write the compressed octree data to a special file
+        auto replacementFilePath = getEntitiesReplacementFilePath();
+        QFile replacementFile(replacementFilePath);
+        if (replacementFile.open(QIODevice::WriteOnly) && replacementFile.write(compressedOctree) != -1) {
+            // we've now written our replacement file, time to take the server down so it can
+            // process it when it comes back up
+            qInfo() << "Wrote octree replacement file to" << replacementFilePath << "- stopping server";
+
+            QMetaObject::invokeMethod(this, "restart", Qt::QueuedConnection);
+        } else {
+            qWarning() << "Could not write replacement octree data to file - refusing to process";
+        }
+    } else {
+        qDebug() << "Received replacement octree file that is invalid - refusing to process";
+    }
+
+
+    return;
     auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
     limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
         return node->getType() == NodeType::EntityServer && node->getActiveSocket();
@@ -3121,3 +3298,37 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
         limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode);
     });
 }
+
+void DomainServer::handleOctreeFileReplacementFromURLRequest(QSharedPointer<ReceivedMessage> message) {
+    qInfo() << "Received request to replace content from a url";
+    auto node = DependencyManager::get<LimitedNodeList>()->findNodeWithAddr(message->getSenderSockAddr());
+    if (node) {
+        qDebug() << "Found node: " << node->getCanReplaceContent();
+    }
+    if (node->getCanReplaceContent()) {
+        // Convert message data into our URL
+        QString url(message->getMessage());
+        QUrl modelsURL = QUrl(url, QUrl::StrictMode);
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkRequest request(modelsURL);
+        QNetworkReply* reply = networkAccessManager.get(request);
+        connect(reply, &QNetworkReply::finished, [this, reply, modelsURL]() {
+            QNetworkReply::NetworkError networkError = reply->error();
+            if (networkError == QNetworkReply::NoError) {
+                handleOctreeFileReplacement(reply->readAll());
+            } else {
+                qDebug() << "Error downloading JSON from specified file: " << modelsURL;
+            }
+        });
+    }
+}
+
+
+
+
+void DomainServer::handleOctreeFileReplacementRequest(QSharedPointer<ReceivedMessage> message) {
+    auto node = DependencyManager::get<NodeList>()->nodeWithUUID(message->getSourceID());
+    if (node->getCanReplaceContent()) {
+        handleOctreeFileReplacement(message->readAll());
+    }
+}
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index c7d779b394..ee0350665e 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -32,9 +32,14 @@
 #include "DomainServerSettingsManager.h"
 #include "DomainServerWebSessionData.h"
 #include "WalletTransaction.h"
+#include "DomainContentBackupManager.h"
 
 #include "PendingAssignedNodeData.h"
 
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(domain_server)
+
 typedef QSharedPointer<Assignment> SharedAssignmentPointer;
 typedef QMultiHash<QUuid, WalletTransaction*> TransactionHash;
 
@@ -65,6 +70,8 @@ public:
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false) override;
     bool handleHTTPSRequest(HTTPSConnection* connection, const QUrl& url, bool skipSubHandler = false) override;
 
+    static const QString REPLACEMENT_FILE_EXTENSION;
+
 public slots:
     /// Called by NodeList to inform us a node has been added
     void nodeAdded(SharedNodePointer node);
@@ -84,6 +91,13 @@ private slots:
     void processICEServerHeartbeatDenialPacket(QSharedPointer<ReceivedMessage> message);
     void processICEServerHeartbeatACK(QSharedPointer<ReceivedMessage> message);
 
+    void handleOctreeFileReplacementFromURLRequest(QSharedPointer<ReceivedMessage> message);
+    void handleOctreeFileReplacementRequest(QSharedPointer<ReceivedMessage> message);
+    void handleOctreeFileReplacement(QByteArray octreeFile);
+
+    void processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message);
+    void processOctreeDataPersistMessage(QSharedPointer<ReceivedMessage> message);
+
     void setupPendingAssignmentCredits();
     void sendPendingTransactionsToServer();
 
@@ -91,8 +105,7 @@ private slots:
     void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString()); }
     void sendHeartbeatToIceServer();
 
-    void handleConnectedNode(SharedNodePointer newNode);
-
+    void handleConnectedNode(SharedNodePointer newNode); 
     void handleTempDomainSuccess(QNetworkReply& requestReply);
     void handleTempDomainError(QNetworkReply& requestReply);
 
@@ -109,8 +122,6 @@ private slots:
     void handleSuccessfulICEServerAddressUpdate(QNetworkReply& requestReply);
     void handleFailedICEServerAddressUpdate(QNetworkReply& requestReply);
 
-    void handleOctreeFileReplacement(QByteArray octreeFile);
-
     void updateReplicatedNodes();
     void updateDownstreamNodes();
     void updateUpstreamNodes();
@@ -127,6 +138,13 @@ private:
     const QUuid& getID();
     void parseCommandLine();
 
+    QString getContentBackupDir();
+    QString getEntitiesDirPath();
+    QString getEntitiesFilePath();
+    QString getEntitiesReplacementFilePath();
+
+    void maybeHandleReplacementEntityFile();
+
     void setupNodeListAndAssignments();
     bool optionallySetupOAuth();
     bool optionallyReadX509KeyAndCertificate();
@@ -252,6 +270,8 @@ private:
     bool _sendICEServerAddressToMetaverseAPIInProgress { false };
     bool _sendICEServerAddressToMetaverseAPIRedo { false };
 
+    std::unique_ptr<DomainContentBackupManager> _contentManager { nullptr };
+
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
 
     QThread _assetClientThread;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5a340f471e..c031c0e8d4 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6240,13 +6240,15 @@ bool Application::askToReplaceDomainContent(const QString& url) {
                     // Given confirmation, send request to domain server to replace content
                     qCDebug(interfaceapp) << "Attempting to replace domain content: " << url;
                     QByteArray urlData(url.toUtf8());
-                    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
+                    auto limitedNodeList = DependencyManager::get<NodeList>();
+                    const auto& domainHandler = limitedNodeList->getDomainHandler();
                     limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
                             return node->getType() == NodeType::EntityServer && node->getActiveSocket();
-                        }, [&urlData, limitedNodeList](const SharedNodePointer& octreeNode) {
+                        }, [&urlData, limitedNodeList, &domainHandler](const SharedNodePointer& octreeNode) {
                             auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, urlData.size(), true);
                             octreeFilePacket->write(urlData);
-                            limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
+                            qDebug() << "WRiting url data: " << urlData;
+                            limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
                         });
                     auto addressManager = DependencyManager::get<AddressManager>();
                     addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
diff --git a/interface/src/ui/DomainConnectionModel.cpp b/interface/src/ui/DomainConnectionModel.cpp
index b9e4c1348e..83aa18420c 100644
--- a/interface/src/ui/DomainConnectionModel.cpp
+++ b/interface/src/ui/DomainConnectionModel.cpp
@@ -98,4 +98,4 @@ void DomainConnectionModel::refresh() {
     //inform view that we want refresh data
     beginResetModel();
     endResetModel();
-}
\ No newline at end of file
+}
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 60bcc85575..4f96a6d072 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2244,6 +2244,8 @@ bool EntityTree::writeToMap(QVariantMap& entityDescription, OctreeElementPointer
     if (! entityDescription.contains("Entities")) {
         entityDescription["Entities"] = QVariantList();
     }
+    entityDescription["DataVersion"] = ++_persistDataVersion;
+    entityDescription["Id"] = _persistID;
     QScriptEngine scriptEngine;
     RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues,
                                             skipThoseWithBadParents, _myAvatar);
@@ -2256,6 +2258,14 @@ bool EntityTree::readFromMap(QVariantMap& map) {
     int contentVersion = map["Version"].toInt();
     bool needsConversion = (contentVersion < (int)EntityVersion::ZoneLightInheritModes);
 
+    if (map.contains("Id")) {
+        _persistID = map["Id"].toUuid();
+    }
+
+    if (map.contains("DataVersion")) {
+        _persistDataVersion = map["DataVersion"].toInt();
+    }
+
     // map will have a top-level list keyed as "Entities".  This will be extracted
     // and iterated over.  Each member of this list is converted to a QVariantMap, then
     // to a QScriptValue, and then to EntityItemProperties.  These properties are used
diff --git a/libraries/image/CMakeLists.txt b/libraries/image/CMakeLists.txt
index 442fa714b3..e6a1856327 100644
--- a/libraries/image/CMakeLists.txt
+++ b/libraries/image/CMakeLists.txt
@@ -5,7 +5,8 @@ link_hifi_libraries(shared gpu)
 if (NOT ANDROID)
     add_dependency_external_projects(nvtt)
     find_package(NVTT REQUIRED)
+
     target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARIES})
     add_paths_to_fixup_libs(${NVTT_DLL_PATH})
-endif()
\ No newline at end of file
+endif()
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 2343695914..3516fe948a 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -326,6 +326,7 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
                     static QMultiMap<QUuid, PacketType> hashDebugSuppressMap;
 
                     if (!hashDebugSuppressMap.contains(sourceID, headerType)) {
+                        qCDebug(networking) << packetHeaderHash << expectedHash;
                         qCDebug(networking) << "Packet hash mismatch on" << headerType << "- Sender" << sourceID;
 
                         hashDebugSuppressMap.insert(sourceID, headerType);
diff --git a/libraries/networking/src/ThreadedAssignment.h b/libraries/networking/src/ThreadedAssignment.h
index 8b35acaac5..007e41a543 100644
--- a/libraries/networking/src/ThreadedAssignment.h
+++ b/libraries/networking/src/ThreadedAssignment.h
@@ -18,8 +18,6 @@
 
 #include "Assignment.h"
 
-using DownstreamNodeFoundCallback = std::function<void(Node& downstreamNode)>;
-
 class ThreadedAssignment : public Assignment {
     Q_OBJECT
 public:
@@ -47,10 +45,10 @@ protected:
     QTimer _domainServerTimer;
     QTimer _statsTimer;
     int _numQueuedCheckIns { 0 };
-    
+
 protected slots:
     void domainSettingsRequestFailed();
-    
+
 private slots:
     void checkInWithDomainServerOrExit();
 };
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 5757cea496..7cd02608a1 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -126,6 +126,11 @@ public:
         EntityScriptCallMethod,
         ChallengeOwnershipRequest,
         ChallengeOwnershipReply,
+
+        OctreeDataFileRequest,
+        OctreeDataFileReply,
+        OctreeDataPersist,
+
         NUM_PACKET_TYPE
     };
 
@@ -165,6 +170,8 @@ public:
             << PacketTypeEnum::Value::DomainConnectionDenied << PacketTypeEnum::Value::DomainServerPathQuery
             << PacketTypeEnum::Value::DomainServerPathResponse << PacketTypeEnum::Value::DomainServerAddedNode
             << PacketTypeEnum::Value::DomainServerConnectionToken << PacketTypeEnum::Value::DomainSettingsRequest
+            << PacketTypeEnum::Value::OctreeDataFileRequest << PacketTypeEnum::Value::OctreeDataFileReply
+            << PacketTypeEnum::Value::OctreeDataPersist << PacketTypeEnum::Value::OctreeFileReplacementFromUrl
             << PacketTypeEnum::Value::DomainSettings << PacketTypeEnum::Value::ICEServerPeerInformation
             << PacketTypeEnum::Value::ICEServerQuery << PacketTypeEnum::Value::ICEServerHeartbeat
             << PacketTypeEnum::Value::ICEServerHeartbeatACK << PacketTypeEnum::Value::ICEPing
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 55643985c8..019ae07c16 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -328,7 +328,7 @@ void Socket::checkForReadyReadBackup() {
 void Socket::readPendingDatagrams() {
     int packetSizeWithHeader = -1;
 
-    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
+    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) > 0) {
 
         // we're reading a packet so re-start the readyRead backup timer
         _readyReadBackupTimer->start();
@@ -517,7 +517,7 @@ void Socket::handleSocketError(QAbstractSocket::SocketError socketError) {
     static QString repeatedMessage
         = LogHandler::getInstance().addRepeatedMessageRegex(SOCKET_REGEX);
 
-    qCDebug(networking) << "udt::Socket error - " << socketError;
+    qCDebug(networking) << "udt::Socket error - " << socketError << _udpSocket.errorString();
 }
 
 void Socket::handleStateChanged(QAbstractSocket::SocketState socketState) {
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index bea036add3..228779dbba 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME octree)
+include_directories(system /usr/local/Cellar/qt5/5.9.1/include)
 setup_hifi_library()
 link_hifi_libraries(shared networking)
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index c63ff2f560..23352a548c 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1757,6 +1757,19 @@ bool Octree::readJSONFromStream(uint64_t streamLength, QDataStream& inputStream,
     QVariant asVariant = asDocument.toVariant();
     QVariantMap asMap = asVariant.toMap();
     bool success = readFromMap(asMap);
+    /*
+    if (success) {
+        if (asMap.contains("DataVersion") && asMap.contains("Id")) {
+            bool versionOk;
+            auto dataVersion = asMap["DataVersion"].toLongLong(&versionOk);
+            if (versionOk) {
+                auto id = asMap["Id"].toUuid();
+                _persistDataVersion = dataVersion;
+                _persistID = id;
+            }
+        }
+    }
+    */
     delete[] rawData;
     return success;
 }
@@ -1778,11 +1791,9 @@ bool Octree::writeToFile(const char* fileName, const OctreeElementPointer& eleme
     return success;
 }
 
-bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& element, bool doGzip) {
+bool Octree::toJSON(QJsonDocument* doc, const OctreeElementPointer& element) {
     QVariantMap entityDescription;
 
-    qCDebug(octree, "Saving JSON SVO to file %s...", fileName);
-
     OctreeElementPointer top;
     if (element) {
         top = element;
@@ -1802,17 +1813,35 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
         return false;
     }
 
-    // convert the QVariantMap to JSON
-    QByteArray jsonData = QJsonDocument::fromVariant(entityDescription).toJson();
-    QByteArray jsonDataForFile;
+    *doc = QJsonDocument::fromVariant(entityDescription);
+    return true;
+}
 
-    if (doGzip) {
-        if (!gzip(jsonData, jsonDataForFile, -1)) {
-            qCritical("unable to gzip data while saving to json.");
-            return false;
-        }
+bool Octree::toGzippedJSON(QByteArray* data, const OctreeElementPointer& element) {
+    QJsonDocument doc;
+    if (!toJSON(&doc, element)) {
+        qCritical("Failed to convert Entities to QVariantMap while converting to json.");
+        return false;
+    }
+
+    QByteArray jsonData = doc.toJson();
+
+    if (!gzip(jsonData, *data, -1)) {
+        qCritical("Unable to gzip data while saving to json.");
+        return false;
     } else {
-        jsonDataForFile = jsonData;
+        qDebug() <<"Did gzip!";
+    }
+
+    return true;
+}
+
+bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& element, bool doGzip) {
+    qCDebug(octree, "Saving JSON SVO to file %s...", fileName);
+
+    QByteArray jsonDataForFile;
+    if (!toGzippedJSON(&jsonDataForFile)) {
+        return false;
     }
 
     QFile persistFile(fileName);
@@ -1823,6 +1852,7 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
         qCritical("Could not write to JSON description of entities.");
     }
 
+
     return success;
 }
 
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 1648cb0f47..1b9495717b 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -283,8 +283,10 @@ public:
     void loadOctreeFile(const char* fileName);
 
     // Octree exporters
-    bool writeToFile(const char* filename, const OctreeElementPointer& element = NULL, QString persistAsFileType = "json.gz");
-    bool writeToJSONFile(const char* filename, const OctreeElementPointer& element = NULL, bool doGzip = false);
+    bool toJSON(QJsonDocument* doc, const OctreeElementPointer& element = nullptr);
+    bool toGzippedJSON(QByteArray* data, const OctreeElementPointer& element = nullptr);
+    bool writeToFile(const char* filename, const OctreeElementPointer& element = nullptr, QString persistAsFileType = "json.gz");
+    bool writeToJSONFile(const char* filename, const OctreeElementPointer& element = nullptr, bool doGzip = false);
     virtual bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues,
                             bool skipThoseWithBadParents) = 0;
 
@@ -326,6 +328,11 @@ public:
     virtual void dumpTree() { }
     virtual void pruneTree() { }
 
+    void setEntityVersionInfo(QUuid id, int64_t dataVersion) {
+        _persistID = id;
+        _persistDataVersion = dataVersion;
+    }
+
     virtual void resetEditStats() { }
     virtual quint64 getAverageDecodeTime() const { return 0; }
     virtual quint64 getAverageLookupTime() const { return 0;  }
@@ -359,6 +366,9 @@ protected:
 
     OctreeElementPointer _rootElement = nullptr;
 
+    QUuid _persistID { QUuid::createUuid() };
+    int _persistDataVersion { 0 };
+
     bool _isDirty;
     bool _shouldReaverage;
     bool _stopImport;
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index ea6bd28fc4..9c9a4d40db 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -31,18 +31,19 @@
 
 #include "OctreeLogging.h"
 #include "OctreePersistThread.h"
+#include "OctreeUtils.h"
 
 const int OctreePersistThread::DEFAULT_PERSIST_INTERVAL = 1000 * 30; // every 30 seconds
-const QString OctreePersistThread::REPLACEMENT_FILE_EXTENSION = ".replace";
 
 OctreePersistThread::OctreePersistThread(OctreePointer tree, const QString& filename, const QString& backupDirectory, int persistInterval,
                                          bool wantBackup, const QJsonObject& settings, bool debugTimestampNow,
-                                         QString persistAsFileType) :
+                                         QString persistAsFileType, const QByteArray& replacementData) :
     _tree(tree),
     _filename(filename),
     _backupDirectory(backupDirectory),
     _persistInterval(persistInterval),
     _initialLoadComplete(false),
+    _replacementData(replacementData),
     _loadTimeUSecs(0),
     _lastCheck(0),
     _wantBackup(wantBackup),
@@ -52,6 +53,7 @@ OctreePersistThread::OctreePersistThread(OctreePointer tree, const QString& file
 {
     parseSettings(settings);
 
+
     // in case the persist filename has an extension that doesn't match the file type
     QString sansExt = fileNameWithoutExtension(_filename, PERSIST_EXTENSIONS);
     _filename = sansExt + "." + _persistAsFileType;
@@ -132,51 +134,56 @@ quint64 OctreePersistThread::getMostRecentBackupTimeInUsecs(const QString& forma
     return mostRecentBackupInUsecs;
 }
 
-void OctreePersistThread::possiblyReplaceContent() {
-    // before we load the normal file, check if there's a pending replacement file
-    auto replacementFileName = _filename + REPLACEMENT_FILE_EXTENSION;
+void OctreePersistThread::replaceData(QByteArray data) {
+    backupCurrentFile();
 
-    QFile replacementFile { replacementFileName };
-    if (replacementFile.exists()) {
-        // we have a replacement file to process
-        qDebug() << "Replacing models file with" << replacementFileName;
-
-        // first take the current models file and move it to a different filename, appended with the timestamp
-        QFile currentFile { _filename };
-        if (currentFile.exists()) {
-            static const QString FILENAME_TIMESTAMP_FORMAT = "yyyyMMdd-hhmmss";
-            auto backupFileName = _filename + ".backup." + QDateTime::currentDateTime().toString(FILENAME_TIMESTAMP_FORMAT);
-
-            if (currentFile.rename(backupFileName)) {
-                qDebug() << "Moved previous models file to" << backupFileName;
-            } else {
-                qWarning() << "Could not backup previous models file to" << backupFileName << "- removing replacement models file";
-
-                if (!replacementFile.remove()) {
-                    qWarning() << "Could not remove replacement models file from" << replacementFileName
-                        << "- replacement will be re-attempted on next server restart";
-                    return;
-                }
-            }
-        }
-
-        // rename the replacement file to match what the persist thread is just about to read
-        if (!replacementFile.rename(_filename)) {
-            qWarning() << "Could not replace models file with" << replacementFileName << "- starting with empty models file";
-        }
+    QFile currentFile { _filename };
+    if (currentFile.open(QIODevice::WriteOnly)) {
+        currentFile.write(data);
+        qDebug() << "Wrote replacement data";
+    } else {
+        qWarning() << "Failed to write replacement data";
     }
 }
 
+// Return true if current file is backed up successfully or doesn't exist.
+bool OctreePersistThread::backupCurrentFile() {
+    // first take the current models file and move it to a different filename, appended with the timestamp
+    QFile currentFile { _filename };
+    if (currentFile.exists()) {
+        static const QString FILENAME_TIMESTAMP_FORMAT = "yyyyMMdd-hhmmss";
+        auto backupFileName = _filename + ".backup." + QDateTime::currentDateTime().toString(FILENAME_TIMESTAMP_FORMAT);
+
+        if (currentFile.rename(backupFileName)) {
+            qDebug() << "Moved previous models file to" << backupFileName;
+            return true;
+        } else {
+            qWarning() << "Could not backup previous models file to" << backupFileName << "- removing replacement models file";
+            return false;
+        }
+    }
+    return true;
+}
 
 bool OctreePersistThread::process() {
 
     if (!_initialLoadComplete) {
-        possiblyReplaceContent();
-
         quint64 loadStarted = usecTimestampNow();
         qCDebug(octree) << "loading Octrees from file: " << _filename << "...";
 
-        bool persistantFileRead;
+        if (_replacementData.isNull()) {
+            sendLatestEntityDataToDS();
+        } else {
+            replaceData(_replacementData);
+            _replacementData.clear();
+        }
+
+        OctreeUtils::RawOctreeData data;
+        if (OctreeUtils::readOctreeDataInfoFromFile(_filename, &data)) {
+            _tree->setEntityVersionInfo(data.id, data.version);
+        }
+
+        bool persistentFileRead;
 
         _tree->withWriteLock([&] {
             PerformanceWarning warn(true, "Loading Octree File", true);
@@ -199,7 +206,7 @@ bool OctreePersistThread::process() {
                 qCDebug(octree) << "Loading Octree... lock file removed:" << lockFileName;
             }
 
-            persistantFileRead = _tree->readFromFile(qPrintable(_filename.toLocal8Bit()));
+            persistentFileRead = _tree->readFromFile(qPrintable(_filename.toLocal8Bit()));
             _tree->pruneTree();
         });
 
@@ -207,7 +214,7 @@ bool OctreePersistThread::process() {
         _loadTimeUSecs = loadDone - loadStarted;
 
         _tree->clearDirtyBit(); // the tree is clean since we just loaded it
-        qCDebug(octree, "DONE loading Octrees from file... fileRead=%s", debug::valueOf(persistantFileRead));
+        qCDebug(octree, "DONE loading Octrees from file... fileRead=%s", debug::valueOf(persistentFileRead));
 
         unsigned long nodeCount = OctreeElement::getNodeCount();
         unsigned long internalNodeCount = OctreeElement::getInternalNodeCount();
@@ -272,7 +279,6 @@ bool OctreePersistThread::process() {
     return isStillRunning();  // keep running till they terminate us
 }
 
-
 void OctreePersistThread::aboutToFinish() {
     qCDebug(octree) << "Persist thread about to finish...";
     persist();
@@ -319,6 +325,23 @@ void OctreePersistThread::persist() {
             remove(qPrintable(lockFileName));
             qCDebug(octree) << "saving Octree lock file removed:" << lockFileName;
         }
+
+        sendLatestEntityDataToDS();
+    }
+}
+
+void OctreePersistThread::sendLatestEntityDataToDS() {
+    qDebug() << "Sending latest entity data to DS";
+    auto nodeList = DependencyManager::get<NodeList>();
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+
+    QByteArray data;
+    if (_tree->toGzippedJSON(&data)) {
+        auto message = NLPacketList::create(PacketType::OctreeDataPersist, QByteArray(), true, true);
+        message->write(data);
+        nodeList->sendPacketList(std::move(message), domainHandler.getSockAddr());
+    } else {
+        qCWarning(octree) << "Failed to persist octree to DS";
     }
 }
 
@@ -453,7 +476,6 @@ void OctreePersistThread::rollOldBackupVersions(const BackupRule& rule) {
     }
 }
 
-
 void OctreePersistThread::backup() {
     qCDebug(octree) << "backup operation wantBackup:" << _wantBackup;
     if (_wantBackup) {
diff --git a/libraries/octree/src/OctreePersistThread.h b/libraries/octree/src/OctreePersistThread.h
index 2441223467..3fdad2c3f7 100644
--- a/libraries/octree/src/OctreePersistThread.h
+++ b/libraries/octree/src/OctreePersistThread.h
@@ -18,7 +18,6 @@
 #include <GenericThread.h>
 #include "Octree.h"
 
-/// Generalized threaded processor for handling received inbound packets.
 class OctreePersistThread : public GenericThread {
     Q_OBJECT
 public:
@@ -32,11 +31,11 @@ public:
     };
 
     static const int DEFAULT_PERSIST_INTERVAL;
-    static const QString REPLACEMENT_FILE_EXTENSION;
 
     OctreePersistThread(OctreePointer tree, const QString& filename, const QString& backupDirectory,
                         int persistInterval = DEFAULT_PERSIST_INTERVAL, bool wantBackup = false,
-                        const QJsonObject& settings = QJsonObject(), bool debugTimestampNow = false, QString persistAsFileType="json.gz");
+                        const QJsonObject& settings = QJsonObject(), bool debugTimestampNow = false,
+                        QString persistAsFileType="json.gz", const QByteArray& replacementData = QByteArray());
 
     bool isInitialLoadComplete() const { return _initialLoadComplete; }
     quint64 getLoadElapsedTime() const { return _loadTimeUSecs; }
@@ -61,7 +60,10 @@ protected:
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
     quint64 getMostRecentBackupTimeInUsecs(const QString& format);
     void parseSettings(const QJsonObject& settings);
-    void possiblyReplaceContent();
+    bool backupCurrentFile();
+
+    void replaceData(QByteArray data);
+    void sendLatestEntityDataToDS();
 
 private:
     OctreePointer _tree;
@@ -69,6 +71,7 @@ private:
     QString _backupDirectory;
     int _persistInterval;
     bool _initialLoadComplete;
+    QByteArray _replacementData;
 
     quint64 _loadTimeUSecs;
 
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index ca15324d4e..d8925a10ca 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -16,7 +16,11 @@
 #include <glm/glm.hpp>
 
 #include <AABox.h>
+#include <Gzip.h>
 
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QFile>
 
 float calculateRenderAccuracy(const glm::vec3& position,
         const AABox& bounds,
@@ -75,3 +79,76 @@ float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust
     const float smallestSize = 0.01f;
     return (smallestSize * MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT) / boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale);
 }
+
+bool OctreeUtils::readOctreeFile(QString path, QJsonDocument* doc) {
+    QFile file(path);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCritical() << "Cannot open json file for reading: " << path;
+        return false;
+    }
+
+    QByteArray data = file.readAll();
+    QByteArray jsonData;
+
+    if (path.endsWith(".json.gz")) {
+        if (!gunzip(data, jsonData)) {
+            qCritical() << "json File not in gzip format: " << path;
+            return false;
+        }
+    } else {
+        jsonData = data;
+    }
+
+    *doc = QJsonDocument::fromJson(jsonData);
+    return !doc->isNull();
+}
+
+bool readOctreeDataInfoFromJSON(QJsonObject root, OctreeUtils::RawOctreeData* octreeData) {
+    if (root.contains("Id") && root.contains("DataVersion")) {
+        octreeData->id = root["Id"].toVariant().toUuid();
+        octreeData->version = root["DataVersion"].toInt();
+    }
+    if (root.contains("Entities")) {
+        octreeData->octreeData = root["Entities"].toArray();
+    }
+    return true;
+}
+
+bool OctreeUtils::readOctreeDataInfoFromData(QByteArray data, OctreeUtils::RawOctreeData* octreeData) {
+    QByteArray jsonData;
+    if (gunzip(data, jsonData)) {
+        data = jsonData;
+    }
+
+    auto doc = QJsonDocument::fromJson(data);
+    if (doc.isNull()) {
+        return false;
+    }
+
+    auto root = doc.object();
+    return readOctreeDataInfoFromJSON(root, octreeData);
+}
+
+bool OctreeUtils::readOctreeDataInfoFromFile(QString path, OctreeUtils::RawOctreeData* octreeData) {
+    QJsonDocument doc;
+    if (!OctreeUtils::readOctreeFile(path, &doc)) {
+        return false;
+    }
+
+    auto root = doc.object();
+    return readOctreeDataInfoFromJSON(root, octreeData);
+}
+
+QByteArray OctreeUtils::RawOctreeData::toByteArray() {
+    QJsonObject obj {
+        { "DataVersion", QJsonValue((qint64)version) },
+        { "Id", QJsonValue(id.toString()) },
+        { "Version", QJsonValue(5) },
+        { "Entities", octreeData }
+    };
+
+    QJsonDocument doc;
+    doc.setObject(obj);
+
+    return doc.toJson();
+}
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index 0f87bb6f68..e5c7b617cd 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -14,7 +14,30 @@
 
 #include "OctreeConstants.h"
 
+#include <QUuid>
+#include <QJsonArray>
+
 class AABox;
+class QJsonDocument;
+
+namespace OctreeUtils {
+
+// RawOctreeData is an intermediate format between JSON and a fully deserialized Octree.
+class RawOctreeData {
+public:
+    QUuid id { QUuid() };
+    int64_t version { -1 };
+
+    QJsonArray octreeData;
+
+    QByteArray toByteArray();
+};
+
+bool readOctreeFile(QString path, QJsonDocument* doc);
+bool readOctreeDataInfoFromData(QByteArray data, RawOctreeData* octreeData);
+bool readOctreeDataInfoFromFile(QString path, RawOctreeData* octreeData);
+
+}
 
 /// renderAccuracy represents a floating point "visibility" of an object based on it's view from the camera. At a simple
 /// level it returns 0.0f for things that are so small for the current settings that they could not be visible.
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 8e5c30711c..f46d0768c1 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -105,7 +105,7 @@ void usecTimestampNowForceClockSkew(qint64 clockSkew) {
     ::usecTimestampNowAdjust = clockSkew;
 }
 
-static qint64 TIME_REFERENCE = 0; // in usec
+static std::atomic<qint64> TIME_REFERENCE { 0 }; // in usec
 static std::once_flag usecTimestampNowIsInitialized;
 static QElapsedTimer timestampTimer;
 
@@ -771,6 +771,10 @@ QString formatUsecTime(double usecs) {
     return formatUsecTime<double>(usecs);
 }
 
+QString formatSecTime(qint64 secs) {
+    return formatUsecTime(secs * 1000000);
+}
+
 
 QString formatSecondsElapsed(float seconds) {
     QString result;
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 5a1e48d9c0..7f9fb026f8 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -216,6 +216,7 @@ QString formatUsecTime(float usecs);
 QString formatUsecTime(double usecs);
 QString formatUsecTime(quint64 usecs);
 QString formatUsecTime(qint64 usecs);
+QString formatSecTime(qint64 secs);
 
 QString formatSecondsElapsed(float seconds);
 bool similarStrings(const QString& stringA, const QString& stringB);

From fc8e7a0841a875a2b7886784aa407547834326da Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 6 Feb 2018 14:33:01 -0800
Subject: [PATCH 257/569] Add target_zlib to DS CMakeLists.txt

---
 domain-server/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 0e958b9537..a578be5ff6 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -24,6 +24,8 @@ symlink_or_copy_directory_beside_target(${_SHOULD_SYMLINK_RESOURCES} "${CMAKE_CU
 # link the shared hifi libraries
 link_hifi_libraries(embedded-webserver networking shared avatars octree)
 
+target_zlib()
+
 add_dependency_external_projects(quazip)
 
 find_package(QuaZip REQUIRED)

From ff5be2d690c9cbe3e5bd313daad68976f091d83f Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Feb 2018 09:27:51 -0800
Subject: [PATCH 258/569] Fix entity data ID sometimes being reset

---
 domain-server/src/DomainServer.cpp           |  5 ++++-
 libraries/octree/src/OctreePersistThread.cpp | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index e083710d35..edb3fe77dd 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1802,7 +1802,7 @@ void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessag
             qCDebug(domain_server) << "ES has sufficient octree data, not sending data";
             reply->writePrimitive(false);
         } else {
-            qCDebug(domain_server) << "Sending newer octree data to ES";
+            qCDebug(domain_server) << "Sending newer octree data to ES: ID(" << data.id << ") DataVersion(" << data.version << ")";
             QFile file(entityFilePath);
             if (file.open(QIODevice::ReadOnly)) {
                 reply->writePrimitive(true);
@@ -3312,6 +3312,9 @@ void DomainServer::handleOctreeFileReplacementFromURLRequest(QSharedPointer<Rece
         QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkRequest request(modelsURL);
         QNetworkReply* reply = networkAccessManager.get(request);
+
+        qDebug() << "Downloading JSON from: " << modelsURL;
+
         connect(reply, &QNetworkReply::finished, [this, reply, modelsURL]() {
             QNetworkReply::NetworkError networkError = reply->error();
             if (networkError == QNetworkReply::NoError) {
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index 9c9a4d40db..d51bd540bc 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -171,15 +171,13 @@ bool OctreePersistThread::process() {
         quint64 loadStarted = usecTimestampNow();
         qCDebug(octree) << "loading Octrees from file: " << _filename << "...";
 
-        if (_replacementData.isNull()) {
-            sendLatestEntityDataToDS();
-        } else {
+        if (!_replacementData.isNull()) {
             replaceData(_replacementData);
-            _replacementData.clear();
         }
 
         OctreeUtils::RawOctreeData data;
         if (OctreeUtils::readOctreeDataInfoFromFile(_filename, &data)) {
+            qDebug() << "Setting entity version info to: " << data.id << data.version;
             _tree->setEntityVersionInfo(data.id, data.version);
         }
 
@@ -244,6 +242,11 @@ bool OctreePersistThread::process() {
         // want an uninitialized value for this, so we set it to the current time (startup of the server)
         time(&_lastPersistTime);
 
+        if (_replacementData.isNull()) {
+            sendLatestEntityDataToDS();
+        }
+        _replacementData.clear();
+
         emit loadCompleted();
     }
 

From 1b7b4eee50064fbeaf062fe810225993dc417fed Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 12 Feb 2018 11:46:45 -0800
Subject: [PATCH 259/569] Fix entity data not being gzipped when adding
 id+version

---
 assignment-client/src/octree/OctreeServer.cpp |  2 +-
 libraries/octree/src/OctreeUtils.cpp          | 12 ++++++++++++
 libraries/octree/src/OctreeUtils.h            |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index e78f9f108b..6704786c36 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -1193,7 +1193,7 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
 
                 QFile file(_persistAbsoluteFilePath);
                 if (file.open(QIODevice::WriteOnly)) {
-                    auto entityData = data.toByteArray();
+                    auto entityData = data.toGzippedByteArray();
                     file.write(entityData);
                     file.close();
                 } else {
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index d8925a10ca..e068e83b23 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -152,3 +152,15 @@ QByteArray OctreeUtils::RawOctreeData::toByteArray() {
 
     return doc.toJson();
 }
+
+QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
+    auto data = toByteArray();
+    QByteArray gzData;
+
+    if (!gzip(data, gzData, -1)) {
+        qCritical("Unable to gzip data while converting json.");
+        return QByteArray();
+    }
+
+    return gzData;
+}
\ No newline at end of file
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index e5c7b617cd..18b0d27883 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -31,6 +31,7 @@ public:
     QJsonArray octreeData;
 
     QByteArray toByteArray();
+    QByteArray toGzippedByteArray();
 };
 
 bool readOctreeFile(QString path, QJsonDocument* doc);

From 2a667fcd60271c6a55147968aec8e0bae70d1bfe Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 13 Feb 2018 11:36:22 -0800
Subject: [PATCH 260/569] Cleanup entity -> ds persist

---
 assignment-client/CMakeLists.txt              |  1 -
 assignment-client/src/octree/OctreeServer.cpp | 19 +++++---
 assignment-client/src/octree/OctreeServer.h   |  2 -
 .../src/DomainContentBackupManager.cpp        | 18 +------
 domain-server/src/DomainServer.cpp            | 48 +++++++------------
 interface/src/Application.cpp                 |  1 -
 libraries/entities/src/EntityTree.cpp         |  2 +-
 libraries/octree/CMakeLists.txt               |  1 -
 libraries/octree/src/Octree.cpp               | 13 -----
 libraries/octree/src/Octree.h                 |  2 +
 libraries/octree/src/OctreePersistThread.cpp  |  1 +
 libraries/octree/src/OctreeUtils.cpp          | 10 ++++
 libraries/octree/src/OctreeUtils.h            |  6 ++-
 13 files changed, 49 insertions(+), 75 deletions(-)

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 3de4c5fd3f..c73e8e1d34 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -6,7 +6,6 @@ setup_hifi_project(Core Gui Network Script Quick WebSockets)
 if (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif ()
-set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "/testing/")
 
 setup_memory_debugger()
 
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 6704786c36..05d070606a 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -1044,12 +1044,13 @@ void OctreeServer::readConfiguration() {
         // If persist filename does not exist, let's see if there is one beside the application binary
         // If there is, let's copy it over to our target persist directory
         QDir persistPath { _persistFilePath };
-        _persistAbsoluteFilePath = persistPath.absolutePath();
 
         if (persistPath.isRelative()) {
             // if the domain settings passed us a relative path, make an absolute path that is relative to the
             // default data directory
             _persistAbsoluteFilePath = QDir(PathUtils::getAppDataFilePath("entities/")).absoluteFilePath(_persistFilePath);
+        } else {
+            _persistAbsoluteFilePath = persistPath.absolutePath();
         }
 
         qDebug() << "persistFilePath=" << _persistFilePath;
@@ -1174,6 +1175,11 @@ void OctreeServer::domainSettingsRequestComplete() {
 } 
 
 void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message) {
+    if (_state != OctreeServerState::WaitingForOctreeDataNegotation) {
+        qCWarning(octree_server) << "Server received ocree data file reply but is not currently negotiating.";
+        return;
+    }
+
     bool includesNewData;
     message->readPrimitive(&includesNewData);
     QByteArray replaceData;
@@ -1188,8 +1194,7 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
         if (OctreeUtils::readOctreeDataInfoFromFile(_persistAbsoluteFilePath, &data)) {
             if (data.id.isNull()) {
                 qCDebug(octree_server) << "Current octree data has a null id, updating";
-                data.id = QUuid::createUuid();
-                data.version = 0;
+                data.resetIdAndVersion();
 
                 QFile file(_persistAbsoluteFilePath);
                 if (file.open(QIODevice::WriteOnly)) {
@@ -1202,17 +1207,17 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
             }
         }
     }
+
+    _state = OctreeServerState::Running;
     beginRunning(replaceData);
 }
 
 void OctreeServer::beginRunning(QByteArray replaceData) {
-    if (_state == OctreeServerState::Running) {
-        qCWarning(octree_server) << "Server is already running";
+    if (_state != OctreeServerState::Running) {
+        qCWarning(octree_server) << "Server is not running";
         return;
     }
 
-    _state = OctreeServerState::Running;
-
     auto nodeList = DependencyManager::get<NodeList>();
 
     // we need to ask the DS about agents so we can ping/reply with them
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index 6f77920ee0..eab71647e3 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -149,8 +149,6 @@ private slots:
     void domainSettingsRequestComplete();
     void handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleOctreeDataNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-    //void handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message);
-    //void handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message);
     void handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> message);
     void removeSendThread();
 
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 0eca10f8af..4f544d7011 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -279,23 +279,9 @@ void DomainContentBackupManager::backup() {
 
             qDebug() << "Created backup: " << fileName;
 
-            removeOldBackupVersions(rule);
+            rule.lastBackupSeconds = nowSeconds;
 
-            if (rule.maxBackupVersions > 0) {
-                // Execute backup
-                auto result = true;
-                if (result) {
-                    qCDebug(domain_server) << "DONE backing up persist file...";
-                    rule.lastBackupSeconds = nowSeconds;
-                } else {
-                    qCDebug(domain_server) << "ERROR in backing up persist file...";
-                    perror("ERROR in backing up persist file");
-                }
-            } else {
-                qCDebug(domain_server) << "This backup rule" << rule.name << " has Max Rolled Backup Versions less than 1 ["
-                                        << rule.maxBackupVersions << "]."
-                                        << " There are no backups to be done...";
-            }
+            removeOldBackupVersions(rule);
         } else {
             qCDebug(domain_server) << "Backup not needed for this rule [" << rule.name << "]...";
         }
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index edb3fe77dd..8f0e26375e 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -289,7 +289,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         }
     }
 
-    qDebug() << "Starting persist thread";
     if (QDir(getEntitiesDirPath()).mkpath(".")) {
         qCDebug(domain_server) << "Created entities data directory";
     }
@@ -1785,7 +1784,8 @@ void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessag
     int version;
     message->readPrimitive(&remoteHasExistingData);
     if (remoteHasExistingData) {
-        auto idData = message->read(16);
+        constexpr size_t UUID_SIZE_BYTES = 16;
+        auto idData = message->read(UUID_SIZE_BYTES);
         id = QUuid::fromRfc4122(idData);
         message->readPrimitive(&version);
         qCDebug(domain_server) << "Entity server does have existing data: ID(" << id << ") DataVersion(" << version << ")";
@@ -1794,7 +1794,6 @@ void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessag
     }
     auto entityFilePath = getEntitiesFilePath();
 
-    //QFile file(entityFilePath);
     auto reply = NLPacketList::create(PacketType::OctreeDataFileReply, QByteArray(), true, true);
     OctreeUtils::RawOctreeData data;
     if (OctreeUtils::readOctreeDataInfoFromFile(entityFilePath, &data)) {
@@ -3228,21 +3227,22 @@ void DomainServer::setupGroupCacheRefresh() {
 }
 
 void DomainServer::maybeHandleReplacementEntityFile() {
-    QFile replacementFile(getEntitiesReplacementFilePath());
-    if (replacementFile.exists()) {
+    const auto replacementFilePath = getEntitiesReplacementFilePath();
+    OctreeUtils::RawOctreeData data;
+    if (!OctreeUtils::readOctreeDataInfoFromFile(replacementFilePath, &data)) {
+        qCWarning(domain_server) << "Replacement file could not be read, it either doesn't exist or is invalid.";
+    } else {
         qCDebug(domain_server) << "Replacing existing entity date with replacement file";
+
+        data.resetIdAndVersion();
+        auto gzippedData = data.toGzippedByteArray();
+
         QFile currentFile(getEntitiesFilePath());
-        if (currentFile.exists()) {
-            if (currentFile.remove()) {
-                qCDebug(domain_server) << "Removed existing entity file";
-            } else {
-                qCWarning(domain_server) << "Failled to remove existing entity file";
-            }
-        }
-        if (replacementFile.rename(getEntitiesFilePath())) {
-            qCDebug(domain_server) << "Successfully updated entities data file with replacement file";
+        if (!currentFile.open(QIODevice::WriteOnly)) {
+            qCWarning(domain_server)
+                << "Failed to update entities data file with replacement file, unable to open entities file for writing";
         } else {
-            qCWarning(domain_server) << "Failed to update entities data file with replacement file";
+            currentFile.write(gzippedData);
         }
     }
 }
@@ -3262,8 +3262,7 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
 
     OctreeUtils::RawOctreeData data;
     if (OctreeUtils::readOctreeDataInfoFromData(jsonOctree, &data)) {
-        data.id = QUuid::createUuid();
-        data.version = 0;
+        data.resetIdAndVersion();
 
         gzip(data.toByteArray(), compressedOctree);
 
@@ -3282,21 +3281,6 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
     } else {
         qDebug() << "Received replacement octree file that is invalid - refusing to process";
     }
-
-
-    return;
-    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
-    limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
-        return node->getType() == NodeType::EntityServer && node->getActiveSocket();
-    }, [&octreeFile, limitedNodeList](const SharedNodePointer& octreeNode) {
-        // setup a packet to send to this octree server with the new octree file data
-        auto octreeFilePacketList = NLPacketList::create(PacketType::OctreeFileReplacement, QByteArray(), true, true);
-        octreeFilePacketList->write(octreeFile);
-
-        qDebug() << "Sending an octree file replacement of" << octreeFile.size() << "bytes to" << octreeNode;
-
-        limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode);
-    });
 }
 
 void DomainServer::handleOctreeFileReplacementFromURLRequest(QSharedPointer<ReceivedMessage> message) {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c031c0e8d4..bc44bb4cf0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6247,7 +6247,6 @@ bool Application::askToReplaceDomainContent(const QString& url) {
                         }, [&urlData, limitedNodeList, &domainHandler](const SharedNodePointer& octreeNode) {
                             auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, urlData.size(), true);
                             octreeFilePacket->write(urlData);
-                            qDebug() << "WRiting url data: " << urlData;
                             limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
                         });
                     auto addressManager = DependencyManager::get<AddressManager>();
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 4f96a6d072..f632bcf140 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2244,7 +2244,7 @@ bool EntityTree::writeToMap(QVariantMap& entityDescription, OctreeElementPointer
     if (! entityDescription.contains("Entities")) {
         entityDescription["Entities"] = QVariantList();
     }
-    entityDescription["DataVersion"] = ++_persistDataVersion;
+    entityDescription["DataVersion"] = _persistDataVersion;
     entityDescription["Id"] = _persistID;
     QScriptEngine scriptEngine;
     RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues,
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 228779dbba..bea036add3 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -1,4 +1,3 @@
 set(TARGET_NAME octree)
-include_directories(system /usr/local/Cellar/qt5/5.9.1/include)
 setup_hifi_library()
 link_hifi_libraries(shared networking)
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index 23352a548c..d62cbad765 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1757,19 +1757,6 @@ bool Octree::readJSONFromStream(uint64_t streamLength, QDataStream& inputStream,
     QVariant asVariant = asDocument.toVariant();
     QVariantMap asMap = asVariant.toMap();
     bool success = readFromMap(asMap);
-    /*
-    if (success) {
-        if (asMap.contains("DataVersion") && asMap.contains("Id")) {
-            bool versionOk;
-            auto dataVersion = asMap["DataVersion"].toLongLong(&versionOk);
-            if (versionOk) {
-                auto id = asMap["Id"].toUuid();
-                _persistDataVersion = dataVersion;
-                _persistID = id;
-            }
-        }
-    }
-    */
     delete[] rawData;
     return success;
 }
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 1b9495717b..8954e53f8b 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -341,6 +341,8 @@ public:
     virtual quint64 getAverageLoggingTime() const { return 0;  }
     virtual quint64 getAverageFilterTime() const { return 0; }
 
+    void incrementPersistDataVersion() { _persistDataVersion++; }
+
 signals:
     void importSize(float x, float y, float z);
     void importProgress(int progress);
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index d51bd540bc..a669b7d3bb 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -311,6 +311,7 @@ void OctreePersistThread::persist() {
         backup(); // handle backup if requested        
         qCDebug(octree) << "persist operation DONE with backup...";
 
+        _tree->incrementPersistDataVersion();
 
         // create our "lock" file to indicate we're saving.
         QString lockFileName = _filename + ".lock";
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index e068e83b23..85ea3beb86 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -80,6 +80,9 @@ float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust
     return (smallestSize * MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT) / boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale);
 }
 
+// Reads octree file and parses it into a QJsonDocument. Handles both gzipped and non-gzipped files.
+// Returns true if the file was successfully opened and parsed, otherwise false.
+// Example failures: file does not exist, gzipped file cannot be unzipped, invalid JSON.
 bool OctreeUtils::readOctreeFile(QString path, QJsonDocument* doc) {
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
@@ -129,6 +132,8 @@ bool OctreeUtils::readOctreeDataInfoFromData(QByteArray data, OctreeUtils::RawOc
     return readOctreeDataInfoFromJSON(root, octreeData);
 }
 
+// Reads octree file and parses it into a RawOctreeData object.
+// Returns false if readOctreeFile fails.
 bool OctreeUtils::readOctreeDataInfoFromFile(QString path, OctreeUtils::RawOctreeData* octreeData) {
     QJsonDocument doc;
     if (!OctreeUtils::readOctreeFile(path, &doc)) {
@@ -163,4 +168,9 @@ QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
     }
 
     return gzData;
+}
+
+void OctreeUtils::RawOctreeData::resetIdAndVersion() {
+    id = QUuid::createUuid();
+    version = OctreeUtils::INITIAL_VERSION;
 }
\ No newline at end of file
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index 18b0d27883..6fb0e62bcb 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -22,14 +22,18 @@ class QJsonDocument;
 
 namespace OctreeUtils {
 
+using Version = int64_t;
+constexpr Version INITIAL_VERSION = 0;
+
 // RawOctreeData is an intermediate format between JSON and a fully deserialized Octree.
 class RawOctreeData {
 public:
     QUuid id { QUuid() };
-    int64_t version { -1 };
+    Version version { -1 };
 
     QJsonArray octreeData;
 
+    void resetIdAndVersion();
     QByteArray toByteArray();
     QByteArray toGzippedByteArray();
 };

From 0bbbff95cd2bd33bd6a0cad70ce351d9e14454c6 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 11:38:18 -0800
Subject: [PATCH 261/569] Fix replacement octree data not working

---
 assignment-client/src/octree/OctreeServer.h |  2 --
 domain-server/src/DomainServer.cpp          | 22 ++++++++++++++-------
 libraries/octree/src/OctreeUtils.cpp        |  8 ++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index eab71647e3..e7efc731f2 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -176,8 +176,6 @@ protected:
     UniqueSendThread createSendThread(const SharedNodePointer& node);
     virtual UniqueSendThread newSendThread(const SharedNodePointer& node);
 
-    //void replaceContentFromMessageData(QByteArray content);
-
     int _argc;
     const char** _argv;
     char** _parsedArgV;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 8f0e26375e..3eb1f21da0 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -3234,15 +3234,23 @@ void DomainServer::maybeHandleReplacementEntityFile() {
     } else {
         qCDebug(domain_server) << "Replacing existing entity date with replacement file";
 
-        data.resetIdAndVersion();
-        auto gzippedData = data.toGzippedByteArray();
-
-        QFile currentFile(getEntitiesFilePath());
-        if (!currentFile.open(QIODevice::WriteOnly)) {
+        QFile replacementFile(replacementFilePath);
+        if (!replacementFile.remove()) {
+            // If we can't remove the replacement file, we are at risk of getting into a state where
+            // we continually replace the primary entity file with the replacement entity file.
             qCWarning(domain_server)
-                << "Failed to update entities data file with replacement file, unable to open entities file for writing";
+                << "Unable to remove replacement file, bailing";
         } else {
-            currentFile.write(gzippedData);
+            data.resetIdAndVersion();
+            auto gzippedData = data.toGzippedByteArray();
+
+            QFile currentFile(getEntitiesFilePath());
+            if (!currentFile.open(QIODevice::WriteOnly)) {
+                qCWarning(domain_server)
+                    << "Failed to update entities data file with replacement file, unable to open entities file for writing";
+            } else {
+                currentFile.write(gzippedData);
+            }
         }
     }
 }
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index 85ea3beb86..739c2661b3 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -93,12 +93,7 @@ bool OctreeUtils::readOctreeFile(QString path, QJsonDocument* doc) {
     QByteArray data = file.readAll();
     QByteArray jsonData;
 
-    if (path.endsWith(".json.gz")) {
-        if (!gunzip(data, jsonData)) {
-            qCritical() << "json File not in gzip format: " << path;
-            return false;
-        }
-    } else {
+    if (!gunzip(data, jsonData)) {
         jsonData = data;
     }
 
@@ -173,4 +168,5 @@ QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
 void OctreeUtils::RawOctreeData::resetIdAndVersion() {
     id = QUuid::createUuid();
     version = OctreeUtils::INITIAL_VERSION;
+    qDebug() << "Reset octree data to: " << id << version;
 }
\ No newline at end of file

From 11b7fb89a903f044356b275f45cfeda21e883665 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 6 Feb 2018 15:37:48 -0800
Subject: [PATCH 262/569] Integrate new backup systems

---
 domain-server/src/BackupHandler.h             | 110 ++++++++++++++++++
 domain-server/src/BackupSupervisor.cpp        |  94 +++++++++------
 domain-server/src/BackupSupervisor.h          |  66 ++++++++++-
 .../src/DomainContentBackupManager.cpp        |  15 ++-
 .../src/DomainContentBackupManager.h          |  17 +--
 domain-server/src/DomainServer.cpp            |  20 +---
 domain-server/src/DomainServer.h              |   2 +
 7 files changed, 251 insertions(+), 73 deletions(-)
 create mode 100644 domain-server/src/BackupHandler.h

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
new file mode 100644
index 0000000000..c8e90025f8
--- /dev/null
+++ b/domain-server/src/BackupHandler.h
@@ -0,0 +1,110 @@
+//
+//  BackupHandler.h
+//  assignment-client
+//
+//  Created by Clement Brisset on 2/5/18.
+//  Copyright 2018 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_BackupHandler_h
+#define hifi_BackupHandler_h
+
+#include <memory>
+
+#include <QDebug>
+
+#include <quazip5/quazip.h>
+
+class BackupHandler {
+public:
+    template <typename T>
+    BackupHandler(T x) : _self(std::make_shared<Model<T>>(std::move(x))) {}
+
+    void loadBackup(const QuaZip& zip) {
+        _self->loadBackup(zip);
+    }
+    void createBackup(QuaZip& zip) const {
+        _self->createBackup(zip);
+    }
+    void recoverBackup(const QuaZip& zip) const {
+        _self->recoverBackup(zip);
+    }
+    void deleteBackup(const QuaZip& zip) {
+        _self->deleteBackup(zip);
+    }
+    void consolidateBackup(QuaZip& zip) const {
+        _self->consolidateBackup(zip);
+    }
+
+private:
+    struct Concept {
+        virtual ~Concept() = default;
+
+        virtual void loadBackup(const QuaZip& zip) = 0;
+        virtual void createBackup(QuaZip& zip) const = 0;
+        virtual void recoverBackup(const QuaZip& zip) const = 0;
+        virtual void deleteBackup(const QuaZip& zip) = 0;
+        virtual void consolidateBackup(QuaZip& zip) const = 0;
+    };
+
+    template <typename T>
+    struct Model : Concept {
+        Model(T x) : data(std::move(x)) {}
+
+        void loadBackup(const QuaZip& zip) {
+            data.loadBackup(zip);
+        }
+        void createBackup(QuaZip& zip) const {
+            data.createBackup(zip);
+        }
+        void recoverBackup(const QuaZip& zip) const {
+            data.recoverBackup(zip);
+        }
+        void deleteBackup(const QuaZip& zip) {
+            data.deleteBackup(zip);
+        }
+        void consolidateBackup(QuaZip& zip) const {
+            data.consolidateBackup(zip);
+        }
+
+        T data;
+    };
+
+    std::shared_ptr<Concept> _self;
+};
+
+#include <quazip5/quazipfile.h>
+class EntitiesBackupHandler {
+public:
+    EntitiesBackupHandler(QString entitiesFilePath) : _entitiesFilePath(entitiesFilePath) {}
+
+    void loadBackup(const QuaZip& zip) {}
+
+    void createBackup(QuaZip& zip) const {
+        qDebug() << "Creating a backup from handler";
+
+        QFile entitiesFile { _entitiesFilePath };
+
+        if (entitiesFile.open(QIODevice::ReadOnly)) {
+            QuaZipFile zipFile { &zip };
+            zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", _entitiesFilePath));
+            zipFile.write(entitiesFile.readAll());
+            zipFile.close();
+            if (zipFile.getZipError() != UNZ_OK) {
+                qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
+            }
+        }
+    }
+
+    void recoverBackup(const QuaZip& zip) const {}
+    void deleteBackup(const QuaZip& zip) {}
+    void consolidateBackup(QuaZip& zip) const {}
+
+private:
+    QString _entitiesFilePath;
+};
+
+#endif /* hifi_BackupHandler_h */
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 03ad5de558..95fb1c6a6d 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -40,6 +40,39 @@ BackupSupervisor::BackupSupervisor() {
     }
 
     loadAllBackups();
+
+    static constexpr int MAPPINGS_REFRESH_INTERVAL = 30 * 1000;
+    _mappingsRefreshTimer.setInterval(MAPPINGS_REFRESH_INTERVAL);
+    _mappingsRefreshTimer.setTimerType(Qt::CoarseTimer);
+    _mappingsRefreshTimer.setSingleShot(false);
+    QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &BackupSupervisor::refreshMappings);
+    _mappingsRefreshTimer.start();
+}
+
+void BackupSupervisor::refreshMappings() {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetAllMappingsRequest();
+
+    QObject::connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) {
+        if (request->getError() == MappingRequest::NoError) {
+            const auto& mappings = request->getMappings();
+
+            qDebug() << "Refreshed" << mappings.size() << "asset mappings!";
+
+            _currentMappings.clear();
+            for (const auto& mapping : mappings) {
+                _currentMappings.insert({ mapping.first, mapping.second.hash });
+            }
+            _lastMappingsRefresh = usecTimestampNow();
+        } else {
+            qCritical() << "Could not refresh asset server mappings.";
+            qCritical() << "    Error:" << request->getErrorString();
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
 }
 
 void BackupSupervisor::loadAllBackups() {
@@ -138,35 +171,26 @@ void BackupSupervisor::backupAssetServer() {
         return;
     }
 
-    auto assetClient = DependencyManager::get<AssetClient>();
-    auto request = assetClient->createGetAllMappingsRequest();
+    if (_lastMappingsRefresh == 0) {
+        qWarning() << "Current mappings not yet loaded, ";
+        return;
+    }
 
-    connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) {
-        qDebug() << "Got" << request->getMappings().size() << "mappings!";
-
-        if (request->getError() != MappingRequest::NoError) {
-            qCritical() << "Could not complete backup.";
-            qCritical() << "    Error:" << request->getErrorString();
-            finishBackup();
-            request->deleteLater();
-            return;
-        }
-
-        if (!writeBackupFile(request->getMappings())) {
-            finishBackup();
-            request->deleteLater();
-            return;
-        }
-
-        assert(!_backups.empty());
-        const auto& mappings = _backups.back().mappings;
-        backupMissingFiles(mappings);
-
-        request->deleteLater();
-    });
+    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
+    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
+        qWarning() << "Backing up asset mappings that appear old.";
+    }
 
     startBackup();
-    request->start();
+
+    if (!writeBackupFile(_currentMappings)) {
+        finishBackup();
+        return;
+    }
+
+    assert(!_backups.empty());
+    const auto& mappings = _backups.back().mappings;
+    backupMissingFiles(mappings);
 }
 
 void BackupSupervisor::backupMissingFiles(const AssetUtils::Mappings& mappings) {
@@ -193,7 +217,7 @@ void BackupSupervisor::backupNextMissingFile() {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto assetRequest = assetClient->createRequest(hash);
 
-    connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) {
+    QObject::connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) {
         if (request->getError() == AssetRequest::NoError) {
             qDebug() << "Got" << request->getHash();
 
@@ -213,7 +237,7 @@ void BackupSupervisor::backupNextMissingFile() {
     assetRequest->start();
 }
 
-bool BackupSupervisor::writeBackupFile(const AssetUtils::AssetMappings& mappings) {
+bool BackupSupervisor::writeBackupFile(const AssetUtils::Mappings& mappings) {
     auto filename = MAPPINGS_PREFIX + QDateTime::currentDateTimeUtc().toString(Qt::ISODate) + ".json";
     QFile file { PathUtils::getAppDataPath() + BACKUPS_DIR + filename };
     if (!file.open(QFile::WriteOnly)) {
@@ -224,9 +248,9 @@ bool BackupSupervisor::writeBackupFile(const AssetUtils::AssetMappings& mappings
     AssetServerBackup backup;
     QJsonObject jsonObject;
     for (auto& mapping : mappings) {
-        backup.mappings[mapping.first] = mapping.second.hash;
-        _assetsInBackups.insert(mapping.second.hash);
-        jsonObject.insert(mapping.first, mapping.second.hash);
+        backup.mappings[mapping.first] = mapping.second;
+        _assetsInBackups.insert(mapping.second);
+        jsonObject.insert(mapping.first, mapping.second);
     }
 
     QJsonDocument document(jsonObject);
@@ -262,7 +286,7 @@ void BackupSupervisor::restoreAssetServer(int backupIndex) {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createGetAllMappingsRequest();
 
-    connect(request, &GetAllMappingsRequest::finished, this, [this, backupIndex](GetAllMappingsRequest* request) {
+    QObject::connect(request, &GetAllMappingsRequest::finished, this, [this, backupIndex](GetAllMappingsRequest* request) {
         if (request->getError() == MappingRequest::NoError) {
             const auto& newMappings = _backups.at(backupIndex).mappings;
             computeServerStateDifference(request->getMappings(), newMappings);
@@ -332,7 +356,7 @@ void BackupSupervisor::restoreNextAsset() {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createUpload(assetFilename);
 
-    connect(request, &AssetUpload::finished, this, [this](AssetUpload* request) {
+    QObject::connect(request, &AssetUpload::finished, this, [this](AssetUpload* request) {
         if (request->getError() != AssetUpload::NoError) {
             qCritical() << "Failed to restore asset:" << request->getFilename();
             qCritical() << "    Error:" << request->getErrorString();
@@ -350,7 +374,7 @@ void BackupSupervisor::updateMappings() {
     auto assetClient = DependencyManager::get<AssetClient>();
     for (const auto& mapping : _mappingsLeftToSet) {
         auto request = assetClient->createSetMappingRequest(mapping.first, mapping.second);
-        connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) {
+        QObject::connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) {
             if (request->getError() != MappingRequest::NoError) {
                 qCritical() << "Failed to set mapping:" << request->getPath();
                 qCritical() << "    Error:" << request->getErrorString();
@@ -369,7 +393,7 @@ void BackupSupervisor::updateMappings() {
     _mappingsLeftToSet.clear();
 
     auto request = assetClient->createDeleteMappingsRequest(_mappingsLeftToDelete);
-    connect(request, &DeleteMappingsRequest::finished, this, [this](DeleteMappingsRequest* request) {
+    QObject::connect(request, &DeleteMappingsRequest::finished, this, [this](DeleteMappingsRequest* request) {
         if (request->getError() != MappingRequest::NoError) {
             qCritical() << "Failed to delete mappings";
             qCritical() << "    Error:" << request->getErrorString();
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index 067abdc25c..dd293c7fd5 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -16,11 +16,17 @@
 #include <map>
 
 #include <QObject>
+#include <QTimer>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 #include <AssetUtils.h>
+#include <SharedUtil.h>
 
 #include <ReceivedMessage.h>
 
+class QuaZip;
+
 struct AssetServerBackup {
     std::string filePath;
     AssetUtils::Mappings mappings;
@@ -42,7 +48,12 @@ public:
     bool backupInProgress() const { return _backupInProgress; }
     bool restoreInProgress() const { return _restoreInProgress; }
 
+    AssetUtils::Mappings getCurrentMappings() const { return _currentMappings; }
+    quint64 getLastRefreshTimestamp() const { return _lastMappingsRefresh; }
+
 private:
+    void refreshMappings();
+
     void loadAllBackups();
     bool loadBackup(const QString& backupFile);
 
@@ -50,7 +61,7 @@ private:
     void finishBackup() { _backupInProgress = false; }
     void backupMissingFiles(const AssetUtils::Mappings& mappings);
     void backupNextMissingFile();
-    bool writeBackupFile(const AssetUtils::AssetMappings& mappings);
+    bool writeBackupFile(const AssetUtils::Mappings& mappings);
     bool writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data);
 
     void startRestore() { _restoreInProgress = true; }
@@ -64,6 +75,10 @@ private:
     QString _backupsDirectory;
     QString _assetsDirectory;
 
+
+    quint64 _lastMappingsRefresh { 0 };
+    AssetUtils::Mappings _currentMappings;
+
     // Internal storage for backups on disk
     bool _allBackupsLoadedSuccessfully { false };
     std::vector<AssetServerBackup> _backups;
@@ -80,6 +95,55 @@ private:
     std::vector<std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash>> _mappingsLeftToSet;
     AssetUtils::AssetPathList _mappingsLeftToDelete;
     int _mappingRequestsInFlight { 0 };
+
+    QTimer _mappingsRefreshTimer;
+};
+
+
+#include <quazip5/quazipfile.h>
+class AssetsBackupHandler {
+public:
+    AssetsBackupHandler(BackupSupervisor* backupSupervisor) : _backupSupervisor(backupSupervisor) {}
+
+    void loadBackup(const QuaZip& zip) {}
+
+    void createBackup(QuaZip& zip) const {
+        quint64 lastRefreshTimestamp = _backupSupervisor->getLastRefreshTimestamp();
+        AssetUtils::Mappings mappings = _backupSupervisor->getCurrentMappings();
+
+        if (lastRefreshTimestamp == 0) {
+            qWarning() << "Current mappings not yet loaded, ";
+            return;
+        }
+
+        static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
+        if (usecTimestampNow() - lastRefreshTimestamp > MAX_REFRESH_TIME) {
+            qWarning() << "Backing up asset mappings that appear old.";
+        }
+
+        QJsonObject jsonObject;
+        for (const auto& mapping : mappings) {
+            jsonObject.insert(mapping.first, mapping.second);
+        }
+        QJsonDocument document(jsonObject);
+
+        QuaZipFile zipFile { &zip };
+        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("mappings.json"))) {
+            qDebug() << "testCreate(): outFile.open()";
+        }
+        zipFile.write(document.toJson());
+        zipFile.close();
+        if (zipFile.getZipError() != UNZ_OK) {
+            qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
+        }
+    }
+
+    void recoverBackup(const QuaZip& zip) const {}
+    void deleteBackup(const QuaZip& zip) {}
+    void consolidateBackup(QuaZip& zip) const {}
+
+private:
+    BackupSupervisor* _backupSupervisor;
 };
 
 #endif /* hifi_BackupSupervisor_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 4f544d7011..39ae63bc16 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -37,8 +37,8 @@ const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  //
 const static QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 const static QString DATETIME_FORMAT_RE("\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}");
 
-void DomainContentBackupManager::addCreateBackupHandler(CreateBackupHandler handler) {
-    _backupHandlers.push_back(handler);
+void DomainContentBackupManager::addBackupHandler(BackupHandler handler) {
+    _backupHandlers.push_back(std::move(handler));
 }
 
 DomainContentBackupManager::DomainContentBackupManager(const QString& backupDirectory,
@@ -48,7 +48,6 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
     : _backupDirectory(backupDirectory),
     _persistInterval(persistInterval),
     _initialLoadComplete(false),
-    _loadTimeUSecs(0),
     _lastCheck(0),
     _debugTimestampNow(debugTimestampNow),
     _lastTimeDebug(0) {
@@ -268,14 +267,14 @@ void DomainContentBackupManager::backup() {
 
             auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
             auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
-            auto zip = new QuaZip(_backupDirectory + "/" + fileName);
-            zip->open(QuaZip::mdAdd);
+            QuaZip zip(_backupDirectory + "/" + fileName);
+            zip.open(QuaZip::mdAdd);
 
-            for (auto& handler : _backupHandlers) {
-                handler(zip);
+            for (const auto& handler : _backupHandlers) {
+                handler.createBackup(zip);
             }
 
-            zip->close();
+            zip.close();
 
             qDebug() << "Created backup: " << fileName;
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 20408fe486..67fc51f8f3 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -15,17 +15,11 @@
 #define hifi_DomainContentBackupManager_h
 
 #include <QString>
-#include <GenericThread.h>
 #include <QVector>
 
-#include <quazip5/quazip.h>
-#include <quazip5/quazipfile.h>
+#include <GenericThread.h>
 
-#include <functional>
-
-using BackupResult = std::vector<QString>;
-using CreateBackupHandler = std::function<void(QuaZip* quazip)>;
-using RecoverBackupHandler = std::function<void()>;
+#include "BackupHandler.h"
 
 class DomainContentBackupManager : public GenericThread {
     Q_OBJECT
@@ -46,9 +40,8 @@ public:
                                int persistInterval = DEFAULT_PERSIST_INTERVAL,
                                bool debugTimestampNow = false);
 
-    void addCreateBackupHandler(CreateBackupHandler handler);
+    void addBackupHandler(BackupHandler handler);
     bool isInitialLoadComplete() const { return _initialLoadComplete; }
-    int64_t getLoadElapsedTime() const { return _loadTimeUSecs; }
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
 
@@ -70,12 +63,10 @@ protected:
 
 private:
     QString _backupDirectory;
-    std::vector<CreateBackupHandler> _backupHandlers;
+    std::vector<BackupHandler> _backupHandlers;
     int _persistInterval;
     bool _initialLoadComplete;
 
-    int64_t _loadTimeUSecs;
-
     time_t _lastPersistTime;
     int64_t _lastCheck;
     bool _wantBackup{ true };
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 3eb1f21da0..ed14bf3bdc 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -45,6 +45,7 @@
 #include <Trace.h>
 #include <StatTracker.h>
 
+#include "BackupSupervisor.h"
 #include "DomainServerNodeData.h"
 #include "NodeConnectionData.h"
 
@@ -293,23 +294,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         qCDebug(domain_server) << "Created entities data directory";
     }
     maybeHandleReplacementEntityFile();
-    auto entitiesFilePath = getEntitiesFilePath();
+
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.responseObjectForType("6")["entity_server_settings"].toObject()));
-    _contentManager->addCreateBackupHandler([entitiesFilePath](QuaZip* zip) {
-        qDebug() << "Creating a backup from handler";
-
-        QFile entitiesFile { entitiesFilePath };
-
-        if (entitiesFile.open(QIODevice::ReadOnly)) {
-            QuaZipFile zipFile { zip };
-            zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", entitiesFilePath));
-            zipFile.write(entitiesFile.readAll());
-            zipFile.close();
-            if (zipFile.getZipError() != UNZ_OK) {
-                qDebug() << "Failed to write entities file to backup:" << zipFile.getZipError();
-            }
-        }
-    });
+    _contentManager->addBackupHandler(EntitiesBackupHandler(getEntitiesFilePath()));
+    _contentManager->addBackupHandler(AssetsBackupHandler(&_backupSupervisor));
     _contentManager->initialize(true);
 }
 
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index ee0350665e..645327225b 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -275,6 +275,8 @@ private:
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
 
     QThread _assetClientThread;
+
+    BackupSupervisor _backupSupervisor;
 };
 
 

From a6447da64c6fcc0b950564c2fac16cfbbefb611a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 12 Feb 2018 16:11:42 -0800
Subject: [PATCH 263/569] More Asset Backup work

---
 domain-server/src/BackupHandler.h             |  55 +-
 domain-server/src/BackupSupervisor.cpp        | 489 ++++++++++--------
 domain-server/src/BackupSupervisor.h          |  96 +---
 .../src/DomainContentBackupManager.cpp        |  60 ++-
 .../src/DomainContentBackupManager.h          |  20 +-
 domain-server/src/DomainServer.cpp            |   4 +-
 domain-server/src/DomainServer.h              |   2 -
 7 files changed, 359 insertions(+), 367 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index c8e90025f8..5c859165b7 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -21,21 +21,21 @@
 class BackupHandler {
 public:
     template <typename T>
-    BackupHandler(T x) : _self(std::make_shared<Model<T>>(std::move(x))) {}
+    BackupHandler(T* x) : _self(new Model<T>(x)) {}
 
-    void loadBackup(const QuaZip& zip) {
+    void loadBackup(QuaZip& zip) {
         _self->loadBackup(zip);
     }
-    void createBackup(QuaZip& zip) const {
+    void createBackup(QuaZip& zip) {
         _self->createBackup(zip);
     }
-    void recoverBackup(const QuaZip& zip) const {
+    void recoverBackup(QuaZip& zip) {
         _self->recoverBackup(zip);
     }
-    void deleteBackup(const QuaZip& zip) {
+    void deleteBackup(QuaZip& zip) {
         _self->deleteBackup(zip);
     }
-    void consolidateBackup(QuaZip& zip) const {
+    void consolidateBackup(QuaZip& zip) {
         _self->consolidateBackup(zip);
     }
 
@@ -43,37 +43,37 @@ private:
     struct Concept {
         virtual ~Concept() = default;
 
-        virtual void loadBackup(const QuaZip& zip) = 0;
-        virtual void createBackup(QuaZip& zip) const = 0;
-        virtual void recoverBackup(const QuaZip& zip) const = 0;
-        virtual void deleteBackup(const QuaZip& zip) = 0;
-        virtual void consolidateBackup(QuaZip& zip) const = 0;
+        virtual void loadBackup(QuaZip& zip) = 0;
+        virtual void createBackup(QuaZip& zip) = 0;
+        virtual void recoverBackup(QuaZip& zip) = 0;
+        virtual void deleteBackup(QuaZip& zip) = 0;
+        virtual void consolidateBackup(QuaZip& zip) = 0;
     };
 
     template <typename T>
     struct Model : Concept {
-        Model(T x) : data(std::move(x)) {}
+        Model(T* x) : data(x) {}
 
-        void loadBackup(const QuaZip& zip) {
-            data.loadBackup(zip);
+        void loadBackup(QuaZip& zip) {
+            data->loadBackup(zip);
         }
-        void createBackup(QuaZip& zip) const {
-            data.createBackup(zip);
+        void createBackup(QuaZip& zip) {
+            data->createBackup(zip);
         }
-        void recoverBackup(const QuaZip& zip) const {
-            data.recoverBackup(zip);
+        void recoverBackup(QuaZip& zip) {
+            data->recoverBackup(zip);
         }
-        void deleteBackup(const QuaZip& zip) {
-            data.deleteBackup(zip);
+        void deleteBackup(QuaZip& zip) {
+            data->deleteBackup(zip);
         }
-        void consolidateBackup(QuaZip& zip) const {
-            data.consolidateBackup(zip);
+        void consolidateBackup(QuaZip& zip) {
+            data->consolidateBackup(zip);
         }
 
-        T data;
+        std::unique_ptr<T> data;
     };
 
-    std::shared_ptr<Concept> _self;
+    std::unique_ptr<Concept> _self;
 };
 
 #include <quazip5/quazipfile.h>
@@ -81,12 +81,13 @@ class EntitiesBackupHandler {
 public:
     EntitiesBackupHandler(QString entitiesFilePath) : _entitiesFilePath(entitiesFilePath) {}
 
-    void loadBackup(const QuaZip& zip) {}
+    void loadBackup(QuaZip& zip) {}
 
     void createBackup(QuaZip& zip) const {
         qDebug() << "Creating a backup from handler";
 
         QFile entitiesFile { _entitiesFilePath };
+        qDebug() << entitiesFile.size();
 
         if (entitiesFile.open(QIODevice::ReadOnly)) {
             QuaZipFile zipFile { &zip };
@@ -99,8 +100,8 @@ public:
         }
     }
 
-    void recoverBackup(const QuaZip& zip) const {}
-    void deleteBackup(const QuaZip& zip) {}
+    void recoverBackup(QuaZip& zip) const {}
+    void deleteBackup(QuaZip& zip) {}
     void consolidateBackup(QuaZip& zip) const {}
 
 private:
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 95fb1c6a6d..e0f0378fd4 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -13,6 +13,9 @@
 
 #include <QJsonDocument>
 #include <QDate>
+#include <QtCore/QLoggingCategory>
+
+#include <quazip5/quazipfile.h>
 
 #include <AssetClient.h>
 #include <AssetRequest.h>
@@ -20,33 +23,231 @@
 #include <MappingRequest.h>
 #include <PathUtils.h>
 
-const QString BACKUPS_DIR = "backups/";
-const QString ASSETS_DIR = "files/";
-const QString MAPPINGS_PREFIX = "mappings-";
+const QString ASSETS_DIR = "/assets/";
+const QString MAPPINGS_FILE = "mappings.json";
 
 using namespace std;
 
-BackupSupervisor::BackupSupervisor() {
-    _backupsDirectory = PathUtils::getAppDataPath() + BACKUPS_DIR;
-    QDir backupDir { _backupsDirectory };
-    if (!backupDir.exists()) {
-        backupDir.mkpath(".");
-    }
+Q_DECLARE_LOGGING_CATEGORY(backup_supervisor)
+Q_LOGGING_CATEGORY(backup_supervisor, "hifi.backup-supervisor");
 
-    _assetsDirectory = PathUtils::getAppDataPath() + BACKUPS_DIR + ASSETS_DIR;
+BackupSupervisor::BackupSupervisor(const QString& backupDirectory) {
+    _assetsDirectory = backupDirectory + ASSETS_DIR;
     QDir assetsDir { _assetsDirectory };
     if (!assetsDir.exists()) {
         assetsDir.mkpath(".");
     }
 
-    loadAllBackups();
+    refreshAssetsOnDisk();
 
-    static constexpr int MAPPINGS_REFRESH_INTERVAL = 30 * 1000;
-    _mappingsRefreshTimer.setInterval(MAPPINGS_REFRESH_INTERVAL);
     _mappingsRefreshTimer.setTimerType(Qt::CoarseTimer);
-    _mappingsRefreshTimer.setSingleShot(false);
+    _mappingsRefreshTimer.setSingleShot(true);
     QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &BackupSupervisor::refreshMappings);
-    _mappingsRefreshTimer.start();
+
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
+    QObject::connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, [this](SharedNodePointer node) {
+        if (node->getType() == NodeType::AssetServer) {
+            // Give the Asset Server some time to bootup.
+            static constexpr int ASSET_SERVER_BOOTUP_MARGIN = 1 * 1000;
+            _mappingsRefreshTimer.start(ASSET_SERVER_BOOTUP_MARGIN);
+        }
+    });
+}
+
+
+void BackupSupervisor::refreshAssetsOnDisk() {
+    QDir assetsDir { _assetsDirectory };
+    auto assetNames = assetsDir.entryList(QDir::Files);
+
+    // store all valid hashes
+    copy_if(begin(assetNames), end(assetNames),
+            inserter(_assetsOnDisk, begin(_assetsOnDisk)),
+            AssetUtils::isValidHash);
+
+}
+
+void BackupSupervisor::refreshAssetsInBackups() {
+    _assetsInBackups.clear();
+    for (const auto& backup : _backups) {
+        for (const auto& mapping : backup.mappings) {
+            _assetsInBackups.insert(mapping.second);
+        }
+    }
+}
+
+void BackupSupervisor::checkForMissingAssets() {
+    vector<AssetUtils::AssetHash> missingAssets;
+    set_difference(begin(_assetsInBackups), end(_assetsInBackups),
+                   begin(_assetsOnDisk), end(_assetsOnDisk),
+                   back_inserter(missingAssets));
+    if (missingAssets.size() > 0) {
+        qCWarning(backup_supervisor) << "Found" << missingAssets.size() << "assets missing.";
+    }
+}
+
+void BackupSupervisor::checkForAssetsToDelete() {
+    vector<AssetUtils::AssetHash> deprecatedAssets;
+    set_difference(begin(_assetsOnDisk), end(_assetsOnDisk),
+                   begin(_assetsInBackups), end(_assetsInBackups),
+                   back_inserter(deprecatedAssets));
+
+    if (deprecatedAssets.size() > 0) {
+        qCDebug(backup_supervisor) << "Found" << deprecatedAssets.size() << "assets to delete.";
+        if (_allBackupsLoadedSuccessfully) {
+            for (const auto& hash : deprecatedAssets) {
+                QFile::remove(_assetsDirectory + hash);
+            }
+        } else {
+            qCWarning(backup_supervisor) << "Some backups did not load properly, aborting deleting for safety.";
+        }
+    }
+}
+
+void BackupSupervisor::loadBackup(QuaZip& zip) {
+    _backups.push_back({ zip.getZipName().toStdString(), {}, false });
+    auto& backup = _backups.back();
+
+    if (!zip.setCurrentFile(MAPPINGS_FILE)) {
+        qCCritical(backup_supervisor) << "Failed to find" << MAPPINGS_FILE << "while recovering backup";
+        qCCritical(backup_supervisor) << "    Error:" << zip.getZipError();
+        backup.corruptedBackup = true;
+        _allBackupsLoadedSuccessfully = false;
+        return;
+    }
+
+    QuaZipFile zipFile { &zip };
+    if (!zipFile.open(QFile::ReadOnly)) {
+        qCCritical(backup_supervisor) << "Could not open backup file:" << zip.getZipName();
+        qCCritical(backup_supervisor) << "    Error:" << zip.getZipError();
+        backup.corruptedBackup = true;
+        _allBackupsLoadedSuccessfully = false;
+        return;
+    }
+
+    QJsonParseError error;
+    auto document = QJsonDocument::fromJson(zipFile.readAll(), &error);
+    if (document.isNull() || !document.isObject()) {
+        qCCritical(backup_supervisor) << "Could not parse backup file to JSON object:" << zip.getZipName();
+        qCCritical(backup_supervisor) << "    Error:" << error.errorString();
+        backup.corruptedBackup = true;
+        _allBackupsLoadedSuccessfully = false;
+        return;
+    }
+
+    auto jsonObject = document.object();
+    for (auto it = begin(jsonObject); it != end(jsonObject); ++it) {
+        const auto& assetPath = it.key();
+        const auto& assetHash = it.value().toString();
+
+        if (!AssetUtils::isValidHash(assetHash)) {
+            qCCritical(backup_supervisor) << "Corrupted mapping in backup file" << zip.getZipName() << ":" << it.key();
+            backup.corruptedBackup = true;
+            _allBackupsLoadedSuccessfully = false;
+            return;
+        }
+
+        backup.mappings[assetPath] = assetHash;
+        _assetsInBackups.insert(assetHash);
+    }
+
+    return;
+}
+
+void BackupSupervisor::createBackup(QuaZip& zip) {
+    qDebug() << Q_FUNC_INFO;
+    if (operationInProgress()) {
+        qCWarning(backup_supervisor) << "There is already an operation in progress.";
+        return;
+    }
+
+    if (_lastMappingsRefresh == 0) {
+        qCWarning(backup_supervisor) << "Current mappings not yet loaded.";
+        return;
+    }
+
+    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
+    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
+        qCWarning(backup_supervisor) << "Backing up asset mappings that appear old.";
+    }
+
+    AssetServerBackup backup;
+    backup.filePath = zip.getZipName().toStdString();
+
+    QJsonObject jsonObject;
+    for (const auto& mapping : _currentMappings) {
+        backup.mappings[mapping.first] = mapping.second;
+        _assetsInBackups.insert(mapping.second);
+        jsonObject.insert(mapping.first, mapping.second);
+    }
+    QJsonDocument document(jsonObject);
+
+    QuaZipFile zipFile { &zip };
+    if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(MAPPINGS_FILE))) {
+        qCDebug(backup_supervisor) << "testCreate(): outFile.open()";
+        return;
+    }
+    zipFile.write(document.toJson());
+    zipFile.close();
+    if (zipFile.getZipError() != UNZ_OK) {
+        qCDebug(backup_supervisor) << "testCreate(): outFile.close(): " << zipFile.getZipError();
+        return;
+    }
+    _backups.push_back(backup);
+}
+
+void BackupSupervisor::recoverBackup(QuaZip& zip) {
+    if (operationInProgress()) {
+        qCWarning(backup_supervisor) << "There is already a backup/restore in progress.";
+        return;
+    }
+
+    if (_lastMappingsRefresh == 0) {
+        qCWarning(backup_supervisor) << "Current mappings not yet loaded.";
+        return;
+    }
+
+    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
+    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
+        qCWarning(backup_supervisor) << "Backing up asset mappings that appear old.";
+    }
+
+    startOperation();
+
+    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+        return value.filePath == zip.getZipName().toStdString();
+    });
+    if (it == end(_backups)) {
+        qCDebug(backup_supervisor) << "Could not find backup";
+        stopOperation();
+        return;
+    }
+
+    const auto& newMappings = it->mappings;
+    computeServerStateDifference(_currentMappings, newMappings);
+
+    restoreAllAssets();
+}
+
+void BackupSupervisor::deleteBackup(QuaZip& zip) {
+    if (operationInProgress()) {
+        qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
+        return;
+    }
+
+    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+        return value.filePath == zip.getZipName().toStdString();
+    });
+    if (it == end(_backups)) {
+        qCDebug(backup_supervisor) << "Could not find backup";
+        return;
+    }
+
+    refreshAssetsInBackups();
+    checkForAssetsToDelete();
+}
+
+void BackupSupervisor::consolidateBackup(QuaZip& zip) {
+
 }
 
 void BackupSupervisor::refreshMappings() {
@@ -57,179 +258,69 @@ void BackupSupervisor::refreshMappings() {
         if (request->getError() == MappingRequest::NoError) {
             const auto& mappings = request->getMappings();
 
-            qDebug() << "Refreshed" << mappings.size() << "asset mappings!";
+            qCDebug(backup_supervisor) << "Refreshed" << mappings.size() << "asset mappings!";
 
             _currentMappings.clear();
             for (const auto& mapping : mappings) {
                 _currentMappings.insert({ mapping.first, mapping.second.hash });
             }
             _lastMappingsRefresh = usecTimestampNow();
+
+            downloadMissingFiles(_currentMappings);
         } else {
-            qCritical() << "Could not refresh asset server mappings.";
-            qCritical() << "    Error:" << request->getErrorString();
+            qCCritical(backup_supervisor) << "Could not refresh asset server mappings.";
+            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
         }
 
         request->deleteLater();
+
+        // Launch next mappings request
+        static constexpr int MAPPINGS_REFRESH_INTERVAL = 30 * 1000;
+        _mappingsRefreshTimer.start(MAPPINGS_REFRESH_INTERVAL);
     });
 
     request->start();
 }
 
-void BackupSupervisor::loadAllBackups() {
-    _backups.clear();
-    _assetsInBackups.clear();
-    _assetsOnDisk.clear();
-    _allBackupsLoadedSuccessfully = true;
+void BackupSupervisor::downloadMissingFiles(const AssetUtils::Mappings& mappings) {
+    auto wasEmpty = _assetsLeftToRequest.empty();
 
-    QDir assetsDir { _assetsDirectory };
-    auto assetNames = assetsDir.entryList(QDir::Files);
-    qDebug() << "Loading" << assetNames.size() << "assets.";
-
-    // store all valid hashes
-    copy_if(begin(assetNames), end(assetNames),
-            inserter(_assetsOnDisk, begin(_assetsOnDisk)), AssetUtils::isValidHash);
-
-    QDir backupsDir { _backupsDirectory };
-    auto files = backupsDir.entryList({ MAPPINGS_PREFIX + "*.json" }, QDir::Files);
-    qDebug() << "Loading" << files.size() << "backups.";
-
-    for (const auto& fileName : files) {
-        auto filePath = backupsDir.filePath(fileName);
-        auto success = loadBackup(filePath);
-        if (!success) {
-            qCritical() << "Failed to load backup file" << filePath;
-            _allBackupsLoadedSuccessfully = false;
-        }
-    }
-
-    vector<AssetUtils::AssetHash> missingAssets;
-    set_difference(begin(_assetsInBackups), end(_assetsInBackups),
-                   begin(_assetsOnDisk), end(_assetsOnDisk),
-                   back_inserter(missingAssets));
-    if (missingAssets.size() > 0) {
-        qWarning() << "Found" << missingAssets.size() << "assets missing.";
-    }
-
-    vector<AssetUtils::AssetHash> deprecatedAssets;
-    set_difference(begin(_assetsOnDisk), end(_assetsOnDisk),
-                   begin(_assetsInBackups), end(_assetsInBackups),
-                   back_inserter(deprecatedAssets));
-
-    if (deprecatedAssets.size() > 0) {
-        qDebug() << "Found" << deprecatedAssets.size() << "assets to delete.";
-        if (_allBackupsLoadedSuccessfully) {
-            for (const auto& hash : deprecatedAssets) {
-                QFile::remove(_assetsDirectory + hash);
-            }
-        } else {
-            qWarning() << "Some backups did not load properly, aborting deleting for safety.";
-        }
-    }
-}
-
-bool BackupSupervisor::loadBackup(const QString& backupFile) {
-    _backups.push_back({ backupFile.toStdString(), {}, false });
-    auto& backup = _backups.back();
-
-    QFile file { backupFile };
-    if (!file.open(QFile::ReadOnly)) {
-        qCritical() << "Could not open backup file:" << backupFile;
-        backup.corruptedBackup = true;
-        return false;
-    }
-    QJsonParseError error;
-    auto document = QJsonDocument::fromJson(file.readAll(), &error);
-    if (document.isNull() || !document.isObject()) {
-        qCritical() << "Could not parse backup file to JSON object:" << backupFile;
-        qCritical() << "    Error:" << error.errorString();
-        backup.corruptedBackup = true;
-        return false;
-    }
-
-    auto jsonObject = document.object();
-    for (auto it = begin(jsonObject); it != end(jsonObject); ++it) {
-        const auto& assetPath = it.key();
-        const auto& assetHash = it.value().toString();
-
-        if (!AssetUtils::isValidHash(assetHash)) {
-            qCritical() << "Corrupted mapping in backup file" << backupFile << ":" << it.key();
-            backup.corruptedBackup = true;
-            return false;
-        }
-
-        backup.mappings[assetPath] = assetHash;
-        _assetsInBackups.insert(assetHash);
-    }
-
-    _backups.push_back(backup);
-    return true;
-}
-
-void BackupSupervisor::backupAssetServer() {
-    if (backupInProgress() || restoreInProgress()) {
-        qWarning() << "There is already a backup/restore in progress.";
-        return;
-    }
-
-    if (_lastMappingsRefresh == 0) {
-        qWarning() << "Current mappings not yet loaded, ";
-        return;
-    }
-
-    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
-    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qWarning() << "Backing up asset mappings that appear old.";
-    }
-
-    startBackup();
-
-    if (!writeBackupFile(_currentMappings)) {
-        finishBackup();
-        return;
-    }
-
-    assert(!_backups.empty());
-    const auto& mappings = _backups.back().mappings;
-    backupMissingFiles(mappings);
-}
-
-void BackupSupervisor::backupMissingFiles(const AssetUtils::Mappings& mappings) {
-    _assetsLeftToRequest.reserve(mappings.size());
-    for (auto& mapping : mappings) {
+    for (const auto& mapping : mappings) {
         const auto& hash = mapping.second;
         if (_assetsOnDisk.find(hash) == end(_assetsOnDisk)) {
-            _assetsLeftToRequest.push_back(hash);
+            _assetsLeftToRequest.insert(hash);
         }
     }
 
-    backupNextMissingFile();
+    // If we were empty, that means no download chain was already going, start one.
+    if (wasEmpty) {
+        downloadNextMissingFile();
+    }
 }
 
-void BackupSupervisor::backupNextMissingFile() {
+void BackupSupervisor::downloadNextMissingFile() {
     if (_assetsLeftToRequest.empty()) {
-        finishBackup();
         return;
     }
-
-    auto hash = _assetsLeftToRequest.back();
-    _assetsLeftToRequest.pop_back();
+    auto hash = *begin(_assetsLeftToRequest);
 
     auto assetClient = DependencyManager::get<AssetClient>();
     auto assetRequest = assetClient->createRequest(hash);
 
     QObject::connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) {
         if (request->getError() == AssetRequest::NoError) {
-            qDebug() << "Got" << request->getHash();
+            qCDebug(backup_supervisor) << "Backing up asset" << request->getHash();
 
             bool success = writeAssetFile(request->getHash(), request->getData());
             if (!success) {
-                qCritical() << "Failed to write asset file" << request->getHash();
+                qCCritical(backup_supervisor) << "Failed to write asset file" << request->getHash();
             }
         } else {
-            qCritical() << "Failed to backup asset" << request->getHash();
+            qCCritical(backup_supervisor) << "Failed to backup asset" << request->getHash();
         }
 
-        backupNextMissingFile();
+        _assetsLeftToRequest.erase(request->getHash());
+        downloadNextMissingFile();
 
         request->deleteLater();
     });
@@ -237,73 +328,27 @@ void BackupSupervisor::backupNextMissingFile() {
     assetRequest->start();
 }
 
-bool BackupSupervisor::writeBackupFile(const AssetUtils::Mappings& mappings) {
-    auto filename = MAPPINGS_PREFIX + QDateTime::currentDateTimeUtc().toString(Qt::ISODate) + ".json";
-    QFile file { PathUtils::getAppDataPath() + BACKUPS_DIR + filename };
-    if (!file.open(QFile::WriteOnly)) {
-        qCritical() << "Could not open backup file" << file.fileName();
-        return false;
-    }
-
-    AssetServerBackup backup;
-    QJsonObject jsonObject;
-    for (auto& mapping : mappings) {
-        backup.mappings[mapping.first] = mapping.second;
-        _assetsInBackups.insert(mapping.second);
-        jsonObject.insert(mapping.first, mapping.second);
-    }
-
-    QJsonDocument document(jsonObject);
-    file.write(document.toJson());
-
-    backup.filePath = file.fileName().toStdString();
-    _backups.push_back(backup);
-
-    return true;
-}
-
 bool BackupSupervisor::writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data) {
     QDir assetsDir { _assetsDirectory };
     QFile file { assetsDir.filePath(hash) };
     if (!file.open(QFile::WriteOnly)) {
-        qCritical() << "Could not open backup file" << file.fileName();
+        qCCritical(backup_supervisor) << "Could not open backup file" << file.fileName();
         return false;
     }
 
-    file.write(data);
+    auto bytesWritten = file.write(data);
+    if (bytesWritten != data.size()) {
+        qCCritical(backup_supervisor) << "Could not write data to file" << file.fileName();
+        file.remove();
+        return false;
+    }
 
     _assetsOnDisk.insert(hash);
 
     return true;
 }
 
-void BackupSupervisor::restoreAssetServer(int backupIndex) {
-    if (backupInProgress() || restoreInProgress()) {
-        qWarning() << "There is already a backup/restore in progress.";
-        return;
-    }
-
-    auto assetClient = DependencyManager::get<AssetClient>();
-    auto request = assetClient->createGetAllMappingsRequest();
-
-    QObject::connect(request, &GetAllMappingsRequest::finished, this, [this, backupIndex](GetAllMappingsRequest* request) {
-        if (request->getError() == MappingRequest::NoError) {
-            const auto& newMappings = _backups.at(backupIndex).mappings;
-            computeServerStateDifference(request->getMappings(), newMappings);
-
-            restoreAllAssets();
-        } else {
-            finishRestore();
-        }
-
-        request->deleteLater();
-    });
-
-    startRestore();
-    request->start();
-}
-
-void BackupSupervisor::computeServerStateDifference(const AssetUtils::AssetMappings& currentMappings,
+void BackupSupervisor::computeServerStateDifference(const AssetUtils::Mappings& currentMappings,
                                                     const AssetUtils::Mappings& newMappings) {
     _mappingsLeftToSet.reserve((int)newMappings.size());
     _assetsLeftToUpload.reserve((int)newMappings.size());
@@ -312,7 +357,7 @@ void BackupSupervisor::computeServerStateDifference(const AssetUtils::AssetMappi
     set<AssetUtils::AssetHash> currentAssets;
     for (const auto& currentMapping : currentMappings) {
         const auto& currentPath = currentMapping.first;
-        const auto& currentHash = currentMapping.second.hash;
+        const auto& currentHash = currentMapping.second;
 
         if (newMappings.find(currentPath) == end(newMappings)) {
             _mappingsLeftToDelete.push_back(currentPath);
@@ -325,7 +370,7 @@ void BackupSupervisor::computeServerStateDifference(const AssetUtils::AssetMappi
         const auto& newHash = newMapping.second;
 
         auto it = currentMappings.find(newPath);
-        if (it == end(currentMappings) || it->second.hash != newHash) {
+        if (it == end(currentMappings) || it->second != newHash) {
             _mappingsLeftToSet.push_back({ newPath, newHash });
         }
         if (currentAssets.find(newHash) == end(currentAssets)) {
@@ -333,9 +378,9 @@ void BackupSupervisor::computeServerStateDifference(const AssetUtils::AssetMappi
         }
     }
 
-    qDebug() << "Mappings to set:" << _mappingsLeftToSet.size();
-    qDebug() << "Mappings to del:" << _mappingsLeftToDelete.size();
-    qDebug() << "Assets to upload:" << _assetsLeftToUpload.size();
+    qCDebug(backup_supervisor) << "Mappings to set:" << _mappingsLeftToSet.size();
+    qCDebug(backup_supervisor) << "Mappings to del:" << _mappingsLeftToDelete.size();
+    qCDebug(backup_supervisor) << "Assets to upload:" << _assetsLeftToUpload.size();
 }
 
 void BackupSupervisor::restoreAllAssets() {
@@ -358,8 +403,8 @@ void BackupSupervisor::restoreNextAsset() {
 
     QObject::connect(request, &AssetUpload::finished, this, [this](AssetUpload* request) {
         if (request->getError() != AssetUpload::NoError) {
-            qCritical() << "Failed to restore asset:" << request->getFilename();
-            qCritical() << "    Error:" << request->getErrorString();
+            qCCritical(backup_supervisor) << "Failed to restore asset:" << request->getFilename();
+            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
         }
 
         restoreNextAsset();
@@ -376,12 +421,12 @@ void BackupSupervisor::updateMappings() {
         auto request = assetClient->createSetMappingRequest(mapping.first, mapping.second);
         QObject::connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) {
             if (request->getError() != MappingRequest::NoError) {
-                qCritical() << "Failed to set mapping:" << request->getPath();
-                qCritical() << "    Error:" << request->getErrorString();
+                qCCritical(backup_supervisor) << "Failed to set mapping:" << request->getPath();
+                qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
             }
 
             if (--_mappingRequestsInFlight == 0) {
-                finishRestore();
+                stopOperation();
             }
 
             request->deleteLater();
@@ -395,12 +440,12 @@ void BackupSupervisor::updateMappings() {
     auto request = assetClient->createDeleteMappingsRequest(_mappingsLeftToDelete);
     QObject::connect(request, &DeleteMappingsRequest::finished, this, [this](DeleteMappingsRequest* request) {
         if (request->getError() != MappingRequest::NoError) {
-            qCritical() << "Failed to delete mappings";
-            qCritical() << "    Error:" << request->getErrorString();
+            qCCritical(backup_supervisor) << "Failed to delete mappings";
+            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
         }
 
         if (--_mappingRequestsInFlight == 0) {
-            finishRestore();
+            stopOperation();
         }
 
         request->deleteLater();
@@ -410,15 +455,3 @@ void BackupSupervisor::updateMappings() {
     request->start();
     ++_mappingRequestsInFlight;
 }
-bool BackupSupervisor::deleteBackup(int backupIndex) {
-    if (backupInProgress() || restoreInProgress()) {
-        qWarning() << "There is a backup/restore in progress.";
-        return false;
-    }
-    const auto& filePath = _backups.at(backupIndex).filePath;
-    auto success = QFile::remove(filePath.c_str());
-
-    loadAllBackups();
-
-    return success;
-}
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index dd293c7fd5..a89be66742 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -37,48 +37,45 @@ class BackupSupervisor : public QObject {
     Q_OBJECT
 
 public:
-    BackupSupervisor();
+    BackupSupervisor(const QString& backupDirectory);
 
-    void backupAssetServer();
-    void restoreAssetServer(int backupIndex);
-    bool deleteBackup(int backupIndex);
+    void loadBackup(QuaZip& zip);
+    void createBackup(QuaZip& zip);
+    void recoverBackup(QuaZip& zip);
+    void deleteBackup(QuaZip& zip);
+    void consolidateBackup(QuaZip& zip);
 
-    const std::vector<AssetServerBackup>& getBackups() const { return _backups; };
-
-    bool backupInProgress() const { return _backupInProgress; }
-    bool restoreInProgress() const { return _restoreInProgress; }
-
-    AssetUtils::Mappings getCurrentMappings() const { return _currentMappings; }
-    quint64 getLastRefreshTimestamp() const { return _lastMappingsRefresh; }
+    bool operationInProgress() const { return _operationInProgress; }
 
 private:
     void refreshMappings();
 
-    void loadAllBackups();
-    bool loadBackup(const QString& backupFile);
+    void refreshAssetsInBackups();
+    void refreshAssetsOnDisk();
+    void checkForMissingAssets();
+    void checkForAssetsToDelete();
 
-    void startBackup() { _backupInProgress = true; }
-    void finishBackup() { _backupInProgress = false; }
-    void backupMissingFiles(const AssetUtils::Mappings& mappings);
-    void backupNextMissingFile();
-    bool writeBackupFile(const AssetUtils::Mappings& mappings);
+    void startOperation() { _operationInProgress = true; }
+    void stopOperation() { _operationInProgress = false; }
+
+    void downloadMissingFiles(const AssetUtils::Mappings& mappings);
+    void downloadNextMissingFile();
     bool writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data);
 
-    void startRestore() { _restoreInProgress = true; }
-    void finishRestore() { _restoreInProgress = false; }
-    void computeServerStateDifference(const AssetUtils::AssetMappings& currentMappings,
+    void computeServerStateDifference(const AssetUtils::Mappings& currentMappings,
                                       const AssetUtils::Mappings& newMappings);
     void restoreAllAssets();
     void restoreNextAsset();
     void updateMappings();
 
-    QString _backupsDirectory;
     QString _assetsDirectory;
 
-
+    QTimer _mappingsRefreshTimer;
     quint64 _lastMappingsRefresh { 0 };
     AssetUtils::Mappings _currentMappings;
 
+    bool _operationInProgress { false };
+
     // Internal storage for backups on disk
     bool _allBackupsLoadedSuccessfully { false };
     std::vector<AssetServerBackup> _backups;
@@ -86,64 +83,13 @@ private:
     std::set<AssetUtils::AssetHash> _assetsOnDisk;
 
     // Internal storage for backup in progress
-    bool _backupInProgress { false };
-    std::vector<AssetUtils::AssetHash> _assetsLeftToRequest;
+    std::set<AssetUtils::AssetHash> _assetsLeftToRequest;
 
     // Internal storage for restore in progress
-    bool _restoreInProgress { false };
     std::vector<AssetUtils::AssetHash> _assetsLeftToUpload;
     std::vector<std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash>> _mappingsLeftToSet;
     AssetUtils::AssetPathList _mappingsLeftToDelete;
     int _mappingRequestsInFlight { 0 };
-
-    QTimer _mappingsRefreshTimer;
-};
-
-
-#include <quazip5/quazipfile.h>
-class AssetsBackupHandler {
-public:
-    AssetsBackupHandler(BackupSupervisor* backupSupervisor) : _backupSupervisor(backupSupervisor) {}
-
-    void loadBackup(const QuaZip& zip) {}
-
-    void createBackup(QuaZip& zip) const {
-        quint64 lastRefreshTimestamp = _backupSupervisor->getLastRefreshTimestamp();
-        AssetUtils::Mappings mappings = _backupSupervisor->getCurrentMappings();
-
-        if (lastRefreshTimestamp == 0) {
-            qWarning() << "Current mappings not yet loaded, ";
-            return;
-        }
-
-        static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
-        if (usecTimestampNow() - lastRefreshTimestamp > MAX_REFRESH_TIME) {
-            qWarning() << "Backing up asset mappings that appear old.";
-        }
-
-        QJsonObject jsonObject;
-        for (const auto& mapping : mappings) {
-            jsonObject.insert(mapping.first, mapping.second);
-        }
-        QJsonDocument document(jsonObject);
-
-        QuaZipFile zipFile { &zip };
-        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("mappings.json"))) {
-            qDebug() << "testCreate(): outFile.open()";
-        }
-        zipFile.write(document.toJson());
-        zipFile.close();
-        if (zipFile.getZipError() != UNZ_OK) {
-            qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
-        }
-    }
-
-    void recoverBackup(const QuaZip& zip) const {}
-    void deleteBackup(const QuaZip& zip) {}
-    void consolidateBackup(QuaZip& zip) const {}
-
-private:
-    BackupSupervisor* _backupSupervisor;
 };
 
 #endif /* hifi_BackupSupervisor_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 39ae63bc16..7c1c7f2cd7 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -47,10 +47,7 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
                                                        bool debugTimestampNow)
     : _backupDirectory(backupDirectory),
     _persistInterval(persistInterval),
-    _initialLoadComplete(false),
-    _lastCheck(0),
-    _debugTimestampNow(debugTimestampNow),
-    _lastTimeDebug(0) {
+    _lastCheck(usecTimestampNow()) {
     parseSettings(settings);
 }
 
@@ -101,7 +98,7 @@ void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
                 qCDebug(domain_server) << "        lastBackup: NEVER";
             }
 
-            _backupRules << newRule;
+            _backupRules.push_back(newRule);
         }
     } else {
         qCDebug(domain_server) << "BACKUP RULES: NONE";
@@ -123,6 +120,10 @@ int64_t DomainContentBackupManager::getMostRecentBackupTimeInSecs(const QString&
     return mostRecentBackupInSecs;
 }
 
+void DomainContentBackupManager::setup() {
+    load();
+}
+
 bool DomainContentBackupManager::process() {
     if (isStillRunning()) {
         constexpr int64_t MSECS_TO_USECS = 1000;
@@ -139,18 +140,6 @@ bool DomainContentBackupManager::process() {
         }
     }
 
-    // if we were asked to debugTimestampNow do that now...
-    if (_debugTimestampNow) {
-
-        quint64 now = usecTimestampNow();
-        quint64 sinceLastDebug = now - _lastTimeDebug;
-        quint64 DEBUG_TIMESTAMP_INTERVAL = 600000000;  // every 10 minutes
-
-        if (sinceLastDebug > DEBUG_TIMESTAMP_INTERVAL) {
-            _lastTimeDebug = usecTimestampNow(true);  // ask for debug output
-        }
-    }
-
     return isStillRunning();
 }
 
@@ -250,6 +239,36 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
     }
 }
 
+void DomainContentBackupManager::load() {
+    QDir backupDir { _backupDirectory };
+    if (backupDir.exists()) {
+
+        auto matchingFiles = backupDir.entryInfoList({ "backup-*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
+
+        for (const auto& file : matchingFiles) {
+            QFile backupFile { file.absoluteFilePath() };
+            if (!backupFile.open(QIODevice::ReadOnly)) {
+                qCritical() << "Could not open file:" << file.absoluteFilePath();
+                qCritical() << "    ERROR:" << backupFile.errorString();
+                continue;
+            }
+
+            QuaZip zip { &backupFile };
+            if (!zip.open(QuaZip::mdUnzip)) {
+                qCritical() << "Could not open backup archive:" << file.absoluteFilePath();
+                qCritical() << "    ERROR:" << zip.getZipError();
+                continue;
+            }
+
+            for (auto& handler : _backupHandlers) {
+                handler.loadBackup(zip);
+            }
+
+            zip.close();
+        }
+    }
+}
+
 void DomainContentBackupManager::backup() {
     auto nowDateTime = QDateTime::currentDateTime();
     auto nowSeconds = nowDateTime.toSecsSinceEpoch();
@@ -268,9 +287,12 @@ void DomainContentBackupManager::backup() {
             auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
             auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
             QuaZip zip(_backupDirectory + "/" + fileName);
-            zip.open(QuaZip::mdAdd);
+            if (!zip.open(QuaZip::mdAdd)) {
+                qDebug() << "Could not open archive";
+            }
 
-            for (const auto& handler : _backupHandlers) {
+            for (auto& handler : _backupHandlers) {
+                qDebug() << "Backup handler";
                 handler.createBackup(zip);
             }
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 67fc51f8f3..bb1d4f0116 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -41,20 +41,18 @@ public:
                                bool debugTimestampNow = false);
 
     void addBackupHandler(BackupHandler handler);
-    bool isInitialLoadComplete() const { return _initialLoadComplete; }
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
 
     void replaceData(QByteArray data);
 
-signals:
-    void loadCompleted();
-
 protected:
     /// Implements generic processing behavior for this thread.
-    bool process() override;
+    virtual void setup() override;
+    virtual bool process() override;
 
     void persist();
+    void load();
     void backup();
     void removeOldBackupVersions(const BackupRule& rule);
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
@@ -64,16 +62,10 @@ protected:
 private:
     QString _backupDirectory;
     std::vector<BackupHandler> _backupHandlers;
-    int _persistInterval;
-    bool _initialLoadComplete;
+    int _persistInterval { 0 };
 
-    time_t _lastPersistTime;
-    int64_t _lastCheck;
-    bool _wantBackup{ true };
-    QVector<BackupRule> _backupRules;
-
-    bool _debugTimestampNow;
-    int64_t _lastTimeDebug;
+    int64_t _lastCheck { 0 };
+    std::vector<BackupRule> _backupRules;
 };
 
 #endif  // hifi_DomainContentBackupManager_h
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index ed14bf3bdc..06d3549ff8 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -296,8 +296,8 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     maybeHandleReplacementEntityFile();
 
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.responseObjectForType("6")["entity_server_settings"].toObject()));
-    _contentManager->addBackupHandler(EntitiesBackupHandler(getEntitiesFilePath()));
-    _contentManager->addBackupHandler(AssetsBackupHandler(&_backupSupervisor));
+    _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath()));
+    _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
     _contentManager->initialize(true);
 }
 
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 645327225b..ee0350665e 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -275,8 +275,6 @@ private:
     QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
 
     QThread _assetClientThread;
-
-    BackupSupervisor _backupSupervisor;
 };
 
 

From 272f95efa294f24ddf91cc1b36af5cf278557925 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 13 Feb 2018 18:13:07 -0800
Subject: [PATCH 264/569] Specify wich packet can ignore verification at DS
 level

---
 libraries/networking/src/LimitedNodeList.cpp |  6 ++++--
 libraries/networking/src/udt/PacketHeaders.h | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 3516fe948a..9dbbc570dd 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -315,8 +315,10 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
         }
 
         if (sourceNode) {
-            if (!PacketTypeEnum::getNonVerifiedPackets().contains(headerType) &&
-                !isDomainServer()) {
+            bool verifiedPacket = !PacketTypeEnum::getNonVerifiedPackets().contains(headerType);
+            bool ignoreVerification = isDomainServer() && PacketTypeEnum::getDomainIgnoredVerificationPackets().contains(headerType);
+
+            if (verifiedPacket && !ignoreVerification) {
 
                 QByteArray packetHeaderHash = NLPacket::verificationHashInHeader(packet);
                 QByteArray expectedHash = NLPacket::hashForPacketAndSecret(packet, sourceNode->getConnectionSecret());
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 7cd02608a1..b263823fa4 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -187,14 +187,19 @@ public:
 
     const static QSet<PacketTypeEnum::Value> getDomainSourcedPackets() {
         const static QSet<PacketTypeEnum::Value> DOMAIN_SOURCED_PACKETS = QSet<PacketTypeEnum::Value>()
-        << PacketTypeEnum::Value::AssetMappingOperation
-        << PacketTypeEnum::Value::AssetMappingOperationReply
-        << PacketTypeEnum::Value::AssetGet
-        << PacketTypeEnum::Value::AssetGetReply
-        << PacketTypeEnum::Value::AssetUpload
-        << PacketTypeEnum::Value::AssetUploadReply;
+            << PacketTypeEnum::Value::AssetMappingOperation
+            << PacketTypeEnum::Value::AssetGet
+            << PacketTypeEnum::Value::AssetUpload;
         return DOMAIN_SOURCED_PACKETS;
     }
+
+    const static QSet<PacketTypeEnum::Value> getDomainIgnoredVerificationPackets() {
+        const static QSet<PacketTypeEnum::Value> DOMAIN_IGNORED_VERIFICATION_PACKETS = QSet<PacketTypeEnum::Value>()
+            << PacketTypeEnum::Value::AssetMappingOperationReply
+            << PacketTypeEnum::Value::AssetGetReply
+            << PacketTypeEnum::Value::AssetUploadReply;
+        return DOMAIN_IGNORED_VERIFICATION_PACKETS;
+    }
 };
 
 using PacketType = PacketTypeEnum::Value;

From c41ad1a699c79f6e9a1ec2bd7b6dbe7a2a0ba33f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 13 Feb 2018 15:59:51 -0800
Subject: [PATCH 265/569] Add consolidate

---
 domain-server/src/BackupSupervisor.cpp        | 46 +++++++++++++++++--
 domain-server/src/BackupSupervisor.h          |  2 +-
 .../src/DomainContentBackupManager.cpp        | 28 +++++++++++
 .../src/DomainContentBackupManager.h          |  1 +
 4 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index e0f0378fd4..4cb42787ba 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -104,7 +104,7 @@ void BackupSupervisor::checkForAssetsToDelete() {
 }
 
 void BackupSupervisor::loadBackup(QuaZip& zip) {
-    _backups.push_back({ zip.getZipName().toStdString(), {}, false });
+    _backups.push_back({ zip.getZipName(), {}, false });
     auto& backup = _backups.back();
 
     if (!zip.setCurrentFile(MAPPINGS_FILE)) {
@@ -171,7 +171,7 @@ void BackupSupervisor::createBackup(QuaZip& zip) {
     }
 
     AssetServerBackup backup;
-    backup.filePath = zip.getZipName().toStdString();
+    backup.filePath = zip.getZipName();
 
     QJsonObject jsonObject;
     for (const auto& mapping : _currentMappings) {
@@ -214,7 +214,7 @@ void BackupSupervisor::recoverBackup(QuaZip& zip) {
     startOperation();
 
     auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
-        return value.filePath == zip.getZipName().toStdString();
+        return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
         qCDebug(backup_supervisor) << "Could not find backup";
@@ -235,7 +235,7 @@ void BackupSupervisor::deleteBackup(QuaZip& zip) {
     }
 
     auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
-        return value.filePath == zip.getZipName().toStdString();
+        return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
         qCDebug(backup_supervisor) << "Could not find backup";
@@ -247,6 +247,44 @@ void BackupSupervisor::deleteBackup(QuaZip& zip) {
 }
 
 void BackupSupervisor::consolidateBackup(QuaZip& zip) {
+    if (operationInProgress()) {
+        qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
+        return;
+    }
+    QFileInfo zipInfo(zip.getZipName());
+
+    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+        QFileInfo info(value.filePath);
+        return info.fileName() == zipInfo.fileName();
+    });
+    if (it == end(_backups)) {
+        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName();
+        return;
+    }
+
+    for (const auto& mapping : it->mappings) {
+        const auto& hash = mapping.second;
+
+        QDir assetsDir { _assetsDirectory };
+        QFile file { assetsDir.filePath(hash) };
+        if (!file.open(QFile::ReadOnly)) {
+            qCCritical(backup_supervisor) << "Could not open asset file" << file.fileName();
+            continue;
+        }
+
+        QuaZipFile zipFile { &zip };
+        static const QString ZIP_ASSETS_FOLDER = "files/";
+        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ZIP_ASSETS_FOLDER + hash))) {
+            qCDebug(backup_supervisor) << "testCreate(): outFile.open()";
+            continue;
+        }
+        zipFile.write(file.readAll());
+        zipFile.close();
+        if (zipFile.getZipError() != UNZ_OK) {
+            qCDebug(backup_supervisor) << "testCreate(): outFile.close(): " << zipFile.getZipError();
+            continue;
+        }
+    }
 
 }
 
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index a89be66742..d0f6e52ac6 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -28,7 +28,7 @@
 class QuaZip;
 
 struct AssetServerBackup {
-    std::string filePath;
+    QString filePath;
     AssetUtils::Mappings mappings;
     bool corruptedBackup;
 };
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 7c1c7f2cd7..3f9b3f20d8 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -308,3 +308,31 @@ void DomainContentBackupManager::backup() {
         }
     }
 }
+
+void DomainContentBackupManager::consolidate(QString fileName) {
+    QDir backupDir { _backupDirectory };
+    if (backupDir.exists()) {
+        auto filePath = backupDir.absoluteFilePath(fileName);
+
+        auto copyFilePath = QDir::tempPath() + "/" + fileName;
+
+        auto copySuccess = QFile::copy(filePath, copyFilePath);
+        if (!copySuccess) {
+            qCritical() << "Failed to create full backup.";
+            return;
+        }
+
+        QuaZip zip(copyFilePath);
+        if (!zip.open(QuaZip::mdAdd)) {
+            qCritical() << "Could not open backup archive:" << filePath;
+            qCritical() << "    ERROR:" << zip.getZipError();
+            return;
+        }
+
+        for (auto& handler : _backupHandlers) {
+            handler.consolidateBackup(zip);
+        }
+
+        zip.close();
+    }
+}
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index bb1d4f0116..69163b4ead 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -54,6 +54,7 @@ protected:
     void persist();
     void load();
     void backup();
+    void consolidate(QString fileName);
     void removeOldBackupVersions(const BackupRule& rule);
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
     int64_t getMostRecentBackupTimeInSecs(const QString& format);

From d4b4c55673744e144dcb54938ff75cdb0e9e169f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 13 Feb 2018 18:38:13 -0800
Subject: [PATCH 266/569] Remove unecessary debug

---
 domain-server/src/BackupHandler.h                | 3 ---
 domain-server/src/BackupSupervisor.cpp           | 1 -
 domain-server/src/DomainContentBackupManager.cpp | 1 -
 3 files changed, 5 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 5c859165b7..332afe22f7 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -84,10 +84,7 @@ public:
     void loadBackup(QuaZip& zip) {}
 
     void createBackup(QuaZip& zip) const {
-        qDebug() << "Creating a backup from handler";
-
         QFile entitiesFile { _entitiesFilePath };
-        qDebug() << entitiesFile.size();
 
         if (entitiesFile.open(QIODevice::ReadOnly)) {
             QuaZipFile zipFile { &zip };
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 4cb42787ba..832fc8a3ff 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -154,7 +154,6 @@ void BackupSupervisor::loadBackup(QuaZip& zip) {
 }
 
 void BackupSupervisor::createBackup(QuaZip& zip) {
-    qDebug() << Q_FUNC_INFO;
     if (operationInProgress()) {
         qCWarning(backup_supervisor) << "There is already an operation in progress.";
         return;
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 3f9b3f20d8..56571f1b8c 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -292,7 +292,6 @@ void DomainContentBackupManager::backup() {
             }
 
             for (auto& handler : _backupHandlers) {
-                qDebug() << "Backup handler";
                 handler.createBackup(zip);
             }
 

From 69298246c4726a80aef6eda423024cc0a4ec4d22 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 15:44:51 -0800
Subject: [PATCH 267/569] CR

---
 domain-server/src/BackupHandler.h             |  2 +-
 domain-server/src/BackupSupervisor.cpp        | 32 ++++++++-----------
 domain-server/src/BackupSupervisor.h          |  1 -
 .../src/DomainContentBackupManager.cpp        |  9 ++++--
 domain-server/src/DomainServer.cpp            |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 332afe22f7..4643d183b2 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -1,6 +1,6 @@
 //
 //  BackupHandler.h
-//  assignment-client
+//  domain-server/src
 //
 //  Created by Clement Brisset on 2/5/18.
 //  Copyright 2018 High Fidelity, Inc.
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 832fc8a3ff..869f85c6cc 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -31,12 +31,11 @@ using namespace std;
 Q_DECLARE_LOGGING_CATEGORY(backup_supervisor)
 Q_LOGGING_CATEGORY(backup_supervisor, "hifi.backup-supervisor");
 
-BackupSupervisor::BackupSupervisor(const QString& backupDirectory) {
-    _assetsDirectory = backupDirectory + ASSETS_DIR;
-    QDir assetsDir { _assetsDirectory };
-    if (!assetsDir.exists()) {
-        assetsDir.mkpath(".");
-    }
+BackupSupervisor::BackupSupervisor(const QString& backupDirectory) :
+    _assetsDirectory(backupDirectory + ASSETS_DIR)
+{
+    // Make sure the asset directory exists.
+    QDir(_assetsDirectory).mkpath(".");
 
     refreshAssetsOnDisk();
 
@@ -166,7 +165,7 @@ void BackupSupervisor::createBackup(QuaZip& zip) {
 
     static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
     if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qCWarning(backup_supervisor) << "Backing up asset mappings that appear old.";
+        qCWarning(backup_supervisor) << "Backing up asset mappings that might be stale.";
     }
 
     AssetServerBackup backup;
@@ -182,13 +181,13 @@ void BackupSupervisor::createBackup(QuaZip& zip) {
 
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(MAPPINGS_FILE))) {
-        qCDebug(backup_supervisor) << "testCreate(): outFile.open()";
+        qCDebug(backup_supervisor) << "Could not open zip file:" << zipFile.getZipError();
         return;
     }
     zipFile.write(document.toJson());
     zipFile.close();
     if (zipFile.getZipError() != UNZ_OK) {
-        qCDebug(backup_supervisor) << "testCreate(): outFile.close(): " << zipFile.getZipError();
+        qCDebug(backup_supervisor) << "Could not close zip file: " << zipFile.getZipError();
         return;
     }
     _backups.push_back(backup);
@@ -207,7 +206,7 @@ void BackupSupervisor::recoverBackup(QuaZip& zip) {
 
     static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
     if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qCWarning(backup_supervisor) << "Backing up asset mappings that appear old.";
+        qCWarning(backup_supervisor) << "Current asset mappings that might be stale.";
     }
 
     startOperation();
@@ -216,7 +215,7 @@ void BackupSupervisor::recoverBackup(QuaZip& zip) {
         return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup";
+        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to restore.";
         stopOperation();
         return;
     }
@@ -237,7 +236,7 @@ void BackupSupervisor::deleteBackup(QuaZip& zip) {
         return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup";
+        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to delete.";
         return;
     }
 
@@ -257,7 +256,7 @@ void BackupSupervisor::consolidateBackup(QuaZip& zip) {
         return info.fileName() == zipInfo.fileName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName();
+        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to consolidate.";
         return;
     }
 
@@ -274,13 +273,13 @@ void BackupSupervisor::consolidateBackup(QuaZip& zip) {
         QuaZipFile zipFile { &zip };
         static const QString ZIP_ASSETS_FOLDER = "files/";
         if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ZIP_ASSETS_FOLDER + hash))) {
-            qCDebug(backup_supervisor) << "testCreate(): outFile.open()";
+            qCDebug(backup_supervisor) << "Could not open zip file:" << zipFile.getZipError();
             continue;
         }
         zipFile.write(file.readAll());
         zipFile.close();
         if (zipFile.getZipError() != UNZ_OK) {
-            qCDebug(backup_supervisor) << "testCreate(): outFile.close(): " << zipFile.getZipError();
+            qCDebug(backup_supervisor) << "Could not close zip file: " << zipFile.getZipError();
             continue;
         }
     }
@@ -294,9 +293,6 @@ void BackupSupervisor::refreshMappings() {
     QObject::connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) {
         if (request->getError() == MappingRequest::NoError) {
             const auto& mappings = request->getMappings();
-
-            qCDebug(backup_supervisor) << "Refreshed" << mappings.size() << "asset mappings!";
-
             _currentMappings.clear();
             for (const auto& mapping : mappings) {
                 _currentMappings.insert({ mapping.first, mapping.second.hash });
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index d0f6e52ac6..9fedcca19b 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -21,7 +21,6 @@
 #include <QJsonObject>
 
 #include <AssetUtils.h>
-#include <SharedUtil.h>
 
 #include <ReceivedMessage.h>
 
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 56571f1b8c..ed5d99f927 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -47,7 +47,11 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
                                                        bool debugTimestampNow)
     : _backupDirectory(backupDirectory),
     _persistInterval(persistInterval),
-    _lastCheck(usecTimestampNow()) {
+    _lastCheck(usecTimestampNow())
+{
+    // Make sure the backup directory exists.
+    QDir(_backupDirectory).mkpath(".");
+
     parseSettings(settings);
 }
 
@@ -288,7 +292,8 @@ void DomainContentBackupManager::backup() {
             auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
             QuaZip zip(_backupDirectory + "/" + fileName);
             if (!zip.open(QuaZip::mdAdd)) {
-                qDebug() << "Could not open archive";
+                qDebug() << "Could not open backup archive:" << zip.getZipName();
+                qDebug() << "    ERROR:" << zip.getZipError();
             }
 
             for (auto& handler : _backupHandlers) {
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 06d3549ff8..8ccba3d942 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -295,7 +295,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     }
     maybeHandleReplacementEntityFile();
 
-    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.responseObjectForType("6")["entity_server_settings"].toObject()));
+    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
     _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath()));
     _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
     _contentManager->initialize(true);

From e63b692d80f584eac5d70751b9e01d2a1a8b8cf9 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 7 Feb 2018 16:53:29 -0800
Subject: [PATCH 268/569] Add BackupHandler for entity file backups

---
 domain-server/src/BackupHandler.h             | 34 ++++++++++++--
 domain-server/src/BackupSupervisor.h          | 47 +++++++++++++++++++
 .../src/DomainContentBackupManager.cpp        | 31 ++++++++++--
 .../src/DomainContentBackupManager.h          |  5 ++
 domain-server/src/DomainServer.cpp            |  2 +
 libraries/entities/src/EntityTree.cpp         |  1 +
 6 files changed, 113 insertions(+), 7 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 4643d183b2..b790591bea 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -83,7 +83,10 @@ public:
 
     void loadBackup(QuaZip& zip) {}
 
-    void createBackup(QuaZip& zip) const {
+    // Create a skeleton backup
+    void createBackup(QuaZip& zip) {
+        qDebug() << "Creating a backup from handler";
+
         QFile entitiesFile { _entitiesFilePath };
 
         if (entitiesFile.open(QIODevice::ReadOnly)) {
@@ -97,9 +100,32 @@ public:
         }
     }
 
-    void recoverBackup(QuaZip& zip) const {}
-    void deleteBackup(QuaZip& zip) {}
-    void consolidateBackup(QuaZip& zip) const {}
+    // Recover from a full backup
+    void recoverBackup(QuaZip& zip) {
+        if (!zip.setCurrentFile("models.json.gz")) {
+            qWarning() << "Failed to find models.json.gz while recovering backup";
+            return;
+        }
+        QuaZipFile zipFile { &zip };
+        zipFile.open(QIODevice::ReadOnly);
+        auto data = zipFile.readAll();
+
+        QFile entitiesFile { _entitiesFilePath };
+
+        if (entitiesFile.open(QIODevice::WriteOnly)) {
+            entitiesFile.write(data);
+        }
+
+        zipFile.close();
+    }
+
+    // Delete a skeleton backup
+    void deleteBackup(QuaZip& zip) {
+    }
+
+    // Create a full backup
+    void consolidateBackup(QuaZip& zip) {
+    }
 
 private:
     QString _entitiesFilePath;
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index 9fedcca19b..1023622971 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -91,4 +91,51 @@ private:
     int _mappingRequestsInFlight { 0 };
 };
 
+
+#include <quazip5/quazipfile.h>
+class AssetsBackupHandler {
+public:
+    AssetsBackupHandler(BackupSupervisor* backupSupervisor) : _backupSupervisor(backupSupervisor) {}
+
+    void loadBackup(QuaZip& zip) {}
+
+    void createBackup(QuaZip& zip) {
+        quint64 lastRefreshTimestamp = _backupSupervisor->getLastRefreshTimestamp();
+        AssetUtils::Mappings mappings = _backupSupervisor->getCurrentMappings();
+
+        if (lastRefreshTimestamp == 0) {
+            qWarning() << "Current mappings not yet loaded, ";
+            return;
+        }
+
+        static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
+        if (usecTimestampNow() - lastRefreshTimestamp > MAX_REFRESH_TIME) {
+            qWarning() << "Backing up asset mappings that appear old.";
+        }
+
+        QJsonObject jsonObject;
+        for (const auto& mapping : mappings) {
+            jsonObject.insert(mapping.first, mapping.second);
+        }
+        QJsonDocument document(jsonObject);
+
+        QuaZipFile zipFile { &zip };
+        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("mappings.json"))) {
+            qDebug() << "testCreate(): outFile.open()";
+        }
+        zipFile.write(document.toJson());
+        zipFile.close();
+        if (zipFile.getZipError() != UNZ_OK) {
+            qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
+        }
+    }
+
+    void recoverBackup(QuaZip& zip) {}
+    void deleteBackup(QuaZip& zip) {}
+    void consolidateBackup(QuaZip& zip) {}
+
+private:
+    BackupSupervisor* _backupSupervisor;
+};
+
 #endif /* hifi_BackupSupervisor_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index ed5d99f927..b0a80531f8 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -216,10 +216,35 @@ bool DomainContentBackupManager::getMostRecentBackup(const QString& format,
     return bestBackupFound;
 }
 
+bool DomainContentBackupManager::recoverFromBackup(const QString& backupName) {
+    qDebug() << "Recoving from" << backupName;
+
+    QDir backupDir { _backupDirectory };
+    QFile backupFile { backupDir.filePath(backupName) };
+    if (backupFile.open(QIODevice::ReadOnly)) {
+        QuaZip zip { &backupFile };
+        if (!zip.open(QuaZip::Mode::mdUnzip)) {
+            qWarning() << "Failed to unzip file: " << backupName;
+            backupFile.close();
+            return false;
+        }
+
+        for (auto& handler : _backupHandlers) {
+            handler.recoverBackup(zip);
+        }
+        
+        backupFile.close();
+    }
+
+    qDebug() << "Successfully recovered from " << backupName;
+
+    return true;
+}
+
 void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule) {
     QDir backupDir { _backupDirectory };
     if (backupDir.exists() && rule.maxBackupVersions > 0) {
-        qCDebug(domain_server) << "Rolling old backup versions for rule" << rule.name << "...";
+        qCDebug(domain_server) << "Rolling old backup versions for rule" << rule.name;
 
         auto matchingFiles =
                 backupDir.entryInfoList({ rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
@@ -235,11 +260,11 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
             }
         }
 
-        qCDebug(domain_server) << "Done rolling old backup versions...";
+        qCDebug(domain_server) << "Done removing old backup versions";
     } else {
         qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "."
                                 << " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."
-                                << " No need to roll backups...";
+                                << " No need to roll backups";
     }
 }
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 69163b4ead..d0dd9cf2c6 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -46,6 +46,11 @@ public:
 
     void replaceData(QByteArray data);
 
+    bool recoverFromBackup(const QString& backupName);
+
+signals:
+    void loadCompleted();
+
 protected:
     /// Implements generic processing behavior for this thread.
     virtual void setup() override;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 8ccba3d942..fe6a303e08 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -299,6 +299,8 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath()));
     _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
     _contentManager->initialize(true);
+
+    _contentManager->recoverFromBackup("backup-daily_rolling-2018-02-06_15-13-50.zip");
 }
 
 void DomainServer::parseCommandLine() {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index f632bcf140..fc3e793b45 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2246,6 +2246,7 @@ bool EntityTree::writeToMap(QVariantMap& entityDescription, OctreeElementPointer
     }
     entityDescription["DataVersion"] = _persistDataVersion;
     entityDescription["Id"] = _persistID;
+    qDebug() << "Writing to map: " << _persistDataVersion << _persistID;
     QScriptEngine scriptEngine;
     RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues,
                                             skipThoseWithBadParents, _myAvatar);

From 8b07e7e28ff8eea62fb60bf81c73bdb05c10fc36 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 8 Feb 2018 22:13:52 -0800
Subject: [PATCH 269/569] Add backup DS APIs

Add backup apis
---
 domain-server/src/BackupHandler.h             |  11 +-
 domain-server/src/BackupSupervisor.h          |  47 ------
 .../src/DomainContentBackupManager.cpp        | 144 ++++++++++++++----
 .../src/DomainContentBackupManager.h          |  18 ++-
 domain-server/src/DomainServer.cpp            |  72 ++++++++-
 .../embedded-webserver/src/HTTPConnection.cpp |  53 ++++++-
 .../embedded-webserver/src/HTTPConnection.h   |   6 +
 .../embedded-webserver/src/HTTPManager.cpp    |  15 +-
 8 files changed, 270 insertions(+), 96 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index b790591bea..ad1fc6b793 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -95,7 +95,7 @@ public:
             zipFile.write(entitiesFile.readAll());
             zipFile.close();
             if (zipFile.getZipError() != UNZ_OK) {
-                qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
+                qDebug() << "Failed to zip models.json.gz: " << zipFile.getZipError();
             }
         }
     }
@@ -107,7 +107,10 @@ public:
             return;
         }
         QuaZipFile zipFile { &zip };
-        zipFile.open(QIODevice::ReadOnly);
+        if (!zipFile.open(QIODevice::ReadOnly)) {
+            qWarning() << "Failed to open models.json.gz in backup";
+            return;
+        }
         auto data = zipFile.readAll();
 
         QFile entitiesFile { _entitiesFilePath };
@@ -117,6 +120,10 @@ public:
         }
 
         zipFile.close();
+
+        if (zipFile.getZipError() != UNZ_OK) {
+            qDebug() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+        }
     }
 
     // Delete a skeleton backup
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index 1023622971..9fedcca19b 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -91,51 +91,4 @@ private:
     int _mappingRequestsInFlight { 0 };
 };
 
-
-#include <quazip5/quazipfile.h>
-class AssetsBackupHandler {
-public:
-    AssetsBackupHandler(BackupSupervisor* backupSupervisor) : _backupSupervisor(backupSupervisor) {}
-
-    void loadBackup(QuaZip& zip) {}
-
-    void createBackup(QuaZip& zip) {
-        quint64 lastRefreshTimestamp = _backupSupervisor->getLastRefreshTimestamp();
-        AssetUtils::Mappings mappings = _backupSupervisor->getCurrentMappings();
-
-        if (lastRefreshTimestamp == 0) {
-            qWarning() << "Current mappings not yet loaded, ";
-            return;
-        }
-
-        static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
-        if (usecTimestampNow() - lastRefreshTimestamp > MAX_REFRESH_TIME) {
-            qWarning() << "Backing up asset mappings that appear old.";
-        }
-
-        QJsonObject jsonObject;
-        for (const auto& mapping : mappings) {
-            jsonObject.insert(mapping.first, mapping.second);
-        }
-        QJsonDocument document(jsonObject);
-
-        QuaZipFile zipFile { &zip };
-        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("mappings.json"))) {
-            qDebug() << "testCreate(): outFile.open()";
-        }
-        zipFile.write(document.toJson());
-        zipFile.close();
-        if (zipFile.getZipError() != UNZ_OK) {
-            qDebug() << "testCreate(): outFile.close(): " << zipFile.getZipError();
-        }
-    }
-
-    void recoverBackup(QuaZip& zip) {}
-    void deleteBackup(QuaZip& zip) {}
-    void consolidateBackup(QuaZip& zip) {}
-
-private:
-    BackupSupervisor* _backupSupervisor;
-};
-
 #endif /* hifi_BackupSupervisor_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index b0a80531f8..29f6b7948f 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -28,6 +28,7 @@
 #include <NumericalConstants.h>
 #include <PerfStat.h>
 #include <PathUtils.h>
+#include <shared/QtHelpers.h>
 
 #include "DomainServer.h"
 #include "DomainContentBackupManager.h"
@@ -36,7 +37,8 @@ const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  //
 // Backup format looks like: daily_backup-TIMESTAMP.zip
 const static QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 const static QString DATETIME_FORMAT_RE("\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}");
-
+static const QString AUTOMATIC_BACKUP_PREFIX{ "autobackup-" };
+static const QString MANUAL_BACKUP_PREFIX{ "backup-" };
 void DomainContentBackupManager::addBackupHandler(BackupHandler handler) {
     _backupHandlers.push_back(std::move(handler));
 }
@@ -83,7 +85,7 @@ void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
 
             auto name = obj["Name"].toString();
             auto format = obj["format"].toString();
-            format = name.replace(" ", "_").toLower() + "-";
+            format = name.replace(" ", "_").toLower();
 
             qCDebug(domain_server) << "    Name:" << name;
             qCDebug(domain_server) << "        format:" << format;
@@ -129,6 +131,14 @@ void DomainContentBackupManager::setup() {
 }
 
 bool DomainContentBackupManager::process() {
+    if (!_initialLoadComplete) {
+        QDir backupDir { _backupDirectory };
+        if (!backupDir.exists()) {
+            backupDir.mkpath(".");
+        }
+        _initialLoadComplete = true;
+    }
+
     if (isStillRunning()) {
         constexpr int64_t MSECS_TO_USECS = 1000;
         constexpr int64_t USECS_TO_SLEEP = 10 * MSECS_TO_USECS;  // every 10ms
@@ -140,7 +150,7 @@ bool DomainContentBackupManager::process() {
 
         if (sinceLastSave > intervalToCheck) {
             _lastCheck = now;
-            persist();
+            backup();
         }
     }
 
@@ -149,32 +159,18 @@ bool DomainContentBackupManager::process() {
 
 void DomainContentBackupManager::aboutToFinish() {
     qCDebug(domain_server) << "Persist thread about to finish...";
-    persist();
-}
-
-void DomainContentBackupManager::persist() {
-    QDir backupDir { _backupDirectory };
-    backupDir.mkpath(".");
-
-    // create our "lock" file to indicate we're saving.
-    QString lockFileName = _backupDirectory + "/running.lock";
-
-    std::ofstream lockFile(qPrintable(lockFileName), std::ios::out | std::ios::binary);
-    if (lockFile.is_open()) {
-        backup();
-
-        lockFile.close();
-        remove(qPrintable(lockFileName));
-    }
+    backup();
+    qCDebug(domain_server) << "Persist thread done with about to finish...";
+    _stopThread = true;
 }
 
 bool DomainContentBackupManager::getMostRecentBackup(const QString& format,
                                                      QString& mostRecentBackupFileName,
                                                      QDateTime& mostRecentBackupTime) {
-    QRegExp formatRE { QRegExp::escape(format) + "(" + DATETIME_FORMAT_RE + ")" + "\\.zip" };
+    QRegExp formatRE { AUTOMATIC_BACKUP_PREFIX + QRegExp::escape(format) + "\\-(" + DATETIME_FORMAT_RE + ")" + "\\.zip" };
 
     QStringList filters;
-    filters << format + "*.zip";
+    filters << AUTOMATIC_BACKUP_PREFIX + format + "*.zip";
 
     bool bestBackupFound = false;
     QString bestBackupFile;
@@ -216,7 +212,32 @@ bool DomainContentBackupManager::getMostRecentBackup(const QString& format,
     return bestBackupFound;
 }
 
+bool DomainContentBackupManager::deleteBackup(const QString& backupName) {
+    if (QThread::currentThread() != thread()) {
+        bool result{ false };
+        BLOCKING_INVOKE_METHOD(this, "deleteBackup",
+                               Q_RETURN_ARG(bool, result),
+                               Q_ARG(const QString&, backupName));
+        return result;
+    }
+
+    QDir backupDir { _backupDirectory };
+    QFile backupFile { backupDir.filePath(backupName) };
+    if (backupFile.remove()) {
+        return true;
+    }
+    return false;
+}
+
 bool DomainContentBackupManager::recoverFromBackup(const QString& backupName) {
+    if (QThread::currentThread() != thread()) {
+        bool result{ false };
+        BLOCKING_INVOKE_METHOD(this, "recoverFromBackup",
+                               Q_RETURN_ARG(bool, result),
+                               Q_ARG(const QString&, backupName));
+        return result;
+    }
+
     qDebug() << "Recoving from" << backupName;
 
     QDir backupDir { _backupDirectory };
@@ -226,7 +247,6 @@ bool DomainContentBackupManager::recoverFromBackup(const QString& backupName) {
         if (!zip.open(QuaZip::Mode::mdUnzip)) {
             qWarning() << "Failed to unzip file: " << backupName;
             backupFile.close();
-            return false;
         }
 
         for (auto& handler : _backupHandlers) {
@@ -234,11 +254,43 @@ bool DomainContentBackupManager::recoverFromBackup(const QString& backupName) {
         }
         
         backupFile.close();
+        qDebug() << "Successfully recovered from " << backupName;
+        return true;
+    } else {
+        qWarning() << "Invalid id: " << backupName;
+        return false;
+    }
+}
+
+std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
+    std::vector<BackupItemInfo> backups;
+
+    QDir backupDir { _backupDirectory };
+    auto matchingFiles =
+            backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" },
+                                    QDir::Files | QDir::NoSymLinks, QDir::Name);
+    QString prefixFormat = "(" + QRegExp::escape(AUTOMATIC_BACKUP_PREFIX) + "|" + QRegExp::escape(MANUAL_BACKUP_PREFIX) + ")";
+    QString nameFormat = "(.+)";
+    QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")";
+    QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" };
+
+    for (const auto& fileInfo : matchingFiles) {
+        auto fileName = fileInfo.fileName();
+        if (backupNameFormat.exactMatch(fileName)) {
+            auto type = backupNameFormat.cap(1);
+            auto name = backupNameFormat.cap(2);
+            auto dateTime = backupNameFormat.cap(3);
+            auto createdAt = QDateTime::fromString(dateTime, DATETIME_FORMAT);
+            if (!createdAt.isValid()) {
+                continue;
+            }
+
+            BackupItemInfo backup { fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt, type == MANUAL_BACKUP_PREFIX };
+            backups.push_back(backup);
+        }
     }
 
-    qDebug() << "Successfully recovered from " << backupName;
-
-    return true;
+    return backups;
 }
 
 void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule) {
@@ -247,9 +299,10 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
         qCDebug(domain_server) << "Rolling old backup versions for rule" << rule.name;
 
         auto matchingFiles =
-                backupDir.entryInfoList({ rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
+                backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
 
         int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions;
+        qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)";
         for (int i = 0; i < backupsToDelete; ++i) {
             auto fileInfo = matchingFiles[i].absoluteFilePath();
             QFile backupFile(fileInfo);
@@ -313,6 +366,7 @@ void DomainContentBackupManager::backup() {
             qCDebug(domain_server) << "Time since last backup [" << secondsSinceLastBackup << "] for rule [" << rule.name
                                     << "] exceeds backup interval [" << rule.intervalSeconds << "] doing backup now...";
 
+<<<<<<< HEAD
             auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
             auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
             QuaZip zip(_backupDirectory + "/" + fileName);
@@ -323,11 +377,17 @@ void DomainContentBackupManager::backup() {
 
             for (auto& handler : _backupHandlers) {
                 handler.createBackup(zip);
+=======
+            bool success;
+            QString path;
+            std::tie(success, path) =  createBackup(AUTOMATIC_BACKUP_PREFIX, rule.extensionFormat);
+            if (!success) {
+                qCWarning(domain_server) << "Failed to create backup for" << rule.name << "at" << path;
+                continue;
+>>>>>>> dd86471a42... Add backup DS APIs
             }
 
-            zip.close();
-
-            qDebug() << "Created backup: " << fileName;
+            qDebug() << "Created backup: " << path;
 
             rule.lastBackupSeconds = nowSeconds;
 
@@ -365,3 +425,27 @@ void DomainContentBackupManager::consolidate(QString fileName) {
         zip.close();
     }
 }
+
+void DomainContentBackupManager::createManualBackup(const QString& name) {
+    createBackup(MANUAL_BACKUP_PREFIX, name);
+}
+
+std::pair<bool, QString> DomainContentBackupManager::createBackup(const QString& prefix, const QString& name) {
+    auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
+    auto fileName = prefix + name + "-" + timestamp + ".zip";
+    auto path = _backupDirectory + "/" + fileName;
+    QuaZip zip(path);
+    if (!zip.open(QuaZip::mdAdd)) {
+        qCWarning(domain_server) << "Failed to open zip file at " << path;
+        qCWarning(domain_server) << "    ERROR:" << zip.getZipError();
+        return { false, path };
+    }
+
+    for (auto& handler : _backupHandlers) {
+        handler.createBackup(zip);
+    }
+
+    zip.close();
+
+    return { true, path };
+}
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index d0dd9cf2c6..461d4dd794 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -21,6 +21,14 @@
 
 #include "BackupHandler.h"
 
+struct BackupItemInfo {
+    QString id;
+    QString name;
+    QString absolutePath;
+    QDateTime createdAt;
+    bool isManualBackup;
+};
+
 class DomainContentBackupManager : public GenericThread {
     Q_OBJECT
 public:
@@ -41,12 +49,18 @@ public:
                                bool debugTimestampNow = false);
 
     void addBackupHandler(BackupHandler handler);
+    bool isInitialLoadComplete() const { return _initialLoadComplete; }
+    std::vector<BackupItemInfo> getAllBackups();
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
 
     void replaceData(QByteArray data);
 
+    void createManualBackup(const QString& name);
+
+public slots:
     bool recoverFromBackup(const QString& backupName);
+    bool deleteBackup(const QString& backupName);
 
 signals:
     void loadCompleted();
@@ -56,7 +70,6 @@ protected:
     virtual void setup() override;
     virtual bool process() override;
 
-    void persist();
     void load();
     void backup();
     void consolidate(QString fileName);
@@ -65,10 +78,13 @@ protected:
     int64_t getMostRecentBackupTimeInSecs(const QString& format);
     void parseSettings(const QJsonObject& settings);
 
+    std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
+
 private:
     QString _backupDirectory;
     std::vector<BackupHandler> _backupHandlers;
     int _persistInterval { 0 };
+    bool _initialLoadComplete { false };
 
     int64_t _lastCheck { 0 };
     std::vector<BackupRule> _backupRules;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index fe6a303e08..1949c40566 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -300,7 +300,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
     _contentManager->initialize(true);
 
-    _contentManager->recoverFromBackup("backup-daily_rolling-2018-02-06_15-13-50.zip");
+    qDebug() << "Existing backups:";
+    for (auto& backup : _contentManager->getAllBackups()) {
+        qDebug() << "  Backup: " << backup.name << backup.createdAt;
+    }
 }
 
 void DomainServer::parseCommandLine() {
@@ -1736,6 +1739,12 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
     auto data = message->readAll();
     auto filePath = getEntitiesFilePath();
 
+    QDir dir(getEntitiesDirPath());
+    if (!dir.exists()) {
+        qCDebug(domain_server) << "Creating entities content directory:" << dir.absolutePath();
+        dir.mkpath(".");
+    }
+
     QFile f(filePath);
     if (f.open(QIODevice::WriteOnly)) {
         f.write(data);
@@ -1746,12 +1755,12 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
             qCDebug(domain_server) << "Failed to read new octree data info";
         }
     } else {
-        qCDebug(domain_server) << "Failed to write new entities file";
+        qCDebug(domain_server) << "Failed to write new entities file:" << filePath;
     }
 }
 
 QString DomainServer::getContentBackupDir() {
-    return PathUtils::getAppDataFilePath("backup");
+    return PathUtils::getAppDataFilePath("backups");
 }
 
 QString DomainServer::getEntitiesDirPath() {
@@ -1924,6 +1933,10 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     const QString URI_API_PLACES = "/api/places";
     const QString URI_API_DOMAINS = "/api/domains";
     const QString URI_API_DOMAINS_ID = "/api/domains/";
+    const QString URI_API_BACKUPS = "/api/backups";
+    const QString URI_API_BACKUPS_ID = "/api/backups/";
+    const QString URI_API_BACKUPS_RECOVER = "/api/backups/recover/";
+    //const QString URI_API_BACKUPS_CREATE = "/api/backups";
 
     const QString UUID_REGEX_STRING = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 
@@ -2108,6 +2121,34 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             // send the response
             connection->respond(HTTPConnection::StatusCode200, nodesDocument.toJson(), qPrintable(JSON_MIME_TYPE));
 
+            return true;
+        } else if (url.path().startsWith(URI_API_BACKUPS_RECOVER)) {
+            auto id = url.path().mid(QString(URI_API_BACKUPS_RECOVER).length());
+            _contentManager->recoverFromBackup(id);
+            QJsonObject rootJSON;
+            rootJSON["success"] = true;
+            QJsonDocument docJSON(rootJSON);
+            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            return true;
+        } else if (url.path() == URI_API_BACKUPS) {
+            QJsonObject rootJSON;
+            QJsonArray backupsJSON;
+
+            auto backups = _contentManager->getAllBackups();
+
+            for (const auto& backup : backups) {
+                QJsonObject obj;
+                obj["id"] = backup.id;
+                obj["name"] = backup.name;
+                obj["createdAtMillis"] = backup.createdAt.toMSecsSinceEpoch();
+                obj["isManualBackup"] = backup.isManualBackup;
+                backupsJSON.push_back(obj);
+            }
+
+            rootJSON["backups"] = backupsJSON;
+            QJsonDocument docJSON(rootJSON);
+
+            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
             return true;
         } else if (url.path() == URI_RESTART) {
             connection->respond(HTTPConnection::StatusCode200);
@@ -2213,6 +2254,20 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
             return true;
 
+        } else if (url.path() == URI_API_BACKUPS) {
+            qDebug() << "GOt request to create a backup:";
+            auto params = connection->parseUrlEncodedForm();
+            auto it = params.find("name");
+            if (it == params.end()) {
+                connection->respond(HTTPConnection::StatusCode400, "Bad request, missing `name`");
+                return true;
+            }
+
+            _contentManager->createManualBackup(it.value());
+
+            connection->respond(HTTPConnection::StatusCode200);
+            return true;
+
         } else if (url.path() == "/domain_settings") {
             auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
             if (!accessTokenVariant) {
@@ -2311,7 +2366,16 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         QRegExp allNodesDeleteRegex(ALL_NODE_DELETE_REGEX_STRING);
         QRegExp nodeDeleteRegex(NODE_DELETE_REGEX_STRING);
 
-        if (nodeDeleteRegex.indexIn(url.path()) != -1) {
+        if (url.path().startsWith(URI_API_BACKUPS_ID)) {
+            auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());
+            auto success = _contentManager->deleteBackup(id);
+            QJsonObject rootJSON;
+            rootJSON["success"] = success;
+            QJsonDocument docJSON(rootJSON);
+            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            return true;
+
+        } else if (nodeDeleteRegex.indexIn(url.path()) != -1) {
             // this is a request to DELETE one node by UUID
 
             // pull the captured string, if it exists
diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index a61bc95f8b..6496cc3f68 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -133,12 +133,33 @@ QList<FormData> HTTPConnection::parseFormData() const {
 }
 
 void HTTPConnection::respond(const char* code, const QByteArray& content, const char* contentType, const Headers& headers) {
+    QByteArray data(content);
+    auto device { std::unique_ptr<QBuffer>(new QBuffer()) };
+    device->setBuffer(new QByteArray(content));
+    if (device->open(QIODevice::ReadOnly)) {
+        respond(code, std::move(device), contentType, headers);
+    } else {
+        qCritical() << "Error opening QBuffer to respond to " << _requestUrl.path();
+    }
+}
+
+void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device, const char* contentType, const Headers& headers) {
+    _responseDevice = std::move(device);
+
     _socket->write("HTTP/1.1 ");
+
+    if (_responseDevice->isSequential()) {
+        qWarning() << "Error responding to HTTPConnection: sequential IO devices not supported";
+        _socket->write(StatusCode500);
+        _socket->write("\r\n");
+        _socket->disconnect(SIGNAL(readyRead()), this);
+        _socket->disconnectFromHost();
+        return;
+    }
+
     _socket->write(code);
     _socket->write("\r\n");
 
-    int csize = content.size();
-
     for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
             it != end; it++) {
         _socket->write(it.key());
@@ -146,6 +167,8 @@ void HTTPConnection::respond(const char* code, const QByteArray& content, const
         _socket->write(it.value());
         _socket->write("\r\n");
     }
+
+    int csize = _responseDevice->size();
     if (csize > 0) {
         _socket->write("Content-Length: ");
         _socket->write(QByteArray::number(csize));
@@ -157,20 +180,35 @@ void HTTPConnection::respond(const char* code, const QByteArray& content, const
     }
     _socket->write("Connection: close\r\n\r\n");
 
-    if (csize > 0) {
-        _socket->write(content);
+    if (_responseDevice->atEnd()) {
+        _socket->disconnectFromHost();
+    } else {
+        constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
+        int totalToBeWritten = csize;
+        connect(_socket, &QTcpSocket::bytesWritten, this, [this, totalToBeWritten](size_t bytes) mutable {
+            if (!_responseDevice->atEnd()) {
+                totalToBeWritten -= _socket->write(_responseDevice->read(HTTP_RESPONSE_CHUNK_SIZE));
+                if (_responseDevice->atEnd()) {
+                    _socket->disconnectFromHost();
+                    disconnect(_socket, &QTcpSocket::bytesWritten, this, nullptr);
+                }
+            }
+        });
+
     }
 
     // make sure we receive no further read notifications
-    _socket->disconnect(SIGNAL(readyRead()), this);
-
-    _socket->disconnectFromHost();
+    disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
 void HTTPConnection::readRequest() {
     if (!_socket->canReadLine()) {
         return;
     }
+    if (!_requestUrl.isEmpty()) {
+        qDebug() << "Request URL was already set";
+        return;
+    }
     // parse out the method and resource
     QByteArray line = _socket->readLine().trimmed();
     if (line.startsWith("HEAD")) {
@@ -249,6 +287,7 @@ void HTTPConnection::readContent() {
     if (_socket->bytesAvailable() < size) {
         return;
     }
+    qDebug() << "Reading content";
     _socket->read(_requestContent.data(), size);
     _socket->disconnect(this, SLOT(readContent()));
 
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index 966fc26949..9c435b14a0 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -87,6 +87,9 @@ public:
     void respond (const char* code, const QByteArray& content = QByteArray(),
         const char* contentType = DefaultContentType,
         const Headers& headers = Headers());
+    void respond (const char* code, std::unique_ptr<QIODevice> device,
+        const char* contentType = DefaultContentType,
+        const Headers& headers = Headers());
 
 protected slots:
 
@@ -127,6 +130,9 @@ protected:
 
     /// The content of the request.
     QByteArray _requestContent;
+
+    /// Response content
+    std::unique_ptr<QIODevice> _responseDevice;
 };
 
 #endif // hifi_HTTPConnection_h
diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index fd127a2e92..bd1b545412 100644
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -98,13 +98,14 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
             // file exists, serve it
             static QMimeDatabase mimeDatabase;
             
-            QFile localFile(filePath);
-            localFile.open(QIODevice::ReadOnly);
-            QByteArray localFileData = localFile.readAll();
+            auto localFile = std::unique_ptr<QFile>(new QFile(filePath));
+            localFile->open(QIODevice::ReadOnly);
+            QByteArray localFileData;
             
             QFileInfo localFileInfo(filePath);
             
             if (localFileInfo.completeSuffix() == "shtml") {
+                localFileData = localFile->readAll();
                 // this is a file that may have some SSI statements
                 // the only thing we support is the include directive, but check the contents for that
                 
@@ -153,8 +154,12 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QUrl& url,
                 ? QString { "text/html" }
                 : mimeDatabase.mimeTypeForFile(filePath).name();
 
-            connection->respond(HTTPConnection::StatusCode200, localFileData, qPrintable(mimeType));
-            
+            if (localFileData.isNull()) {
+                connection->respond(HTTPConnection::StatusCode200, std::move(localFile), qPrintable(mimeType));
+            } else {
+                connection->respond(HTTPConnection::StatusCode200, localFileData, qPrintable(mimeType));
+            }
+
             return true;
         }
     }

From dd398da2e0baa1306ce754edd73a70e49144be6e Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 15:36:50 -0800
Subject: [PATCH 270/569] Update DS to use promises for backup APIs

---
 .../src/DomainContentBackupManager.cpp        | 50 ++++++++++---------
 .../src/DomainContentBackupManager.h          |  6 ++-
 domain-server/src/DomainServer.cpp            | 29 ++++++-----
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 29f6b7948f..5c4d70d7ad 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -212,54 +212,58 @@ bool DomainContentBackupManager::getMostRecentBackup(const QString& format,
     return bestBackupFound;
 }
 
-bool DomainContentBackupManager::deleteBackup(const QString& backupName) {
+void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, const QString& backupName) {
     if (QThread::currentThread() != thread()) {
-        bool result{ false };
-        BLOCKING_INVOKE_METHOD(this, "deleteBackup",
-                               Q_RETURN_ARG(bool, result),
-                               Q_ARG(const QString&, backupName));
-        return result;
+        QMetaObject::invokeMethod(this, "deleteBackup", Q_ARG(MiniPromise::Promise, promise),
+                                  Q_ARG(const QString&, backupName));
+        return;
     }
 
+    bool success { false };
     QDir backupDir { _backupDirectory };
     QFile backupFile { backupDir.filePath(backupName) };
     if (backupFile.remove()) {
-        return true;
+        success = true;
     }
-    return false;
+    promise->resolve({
+        { "success", success }
+    });
 }
 
-bool DomainContentBackupManager::recoverFromBackup(const QString& backupName) {
+void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise, const QString& backupName) {
     if (QThread::currentThread() != thread()) {
-        bool result{ false };
-        BLOCKING_INVOKE_METHOD(this, "recoverFromBackup",
-                               Q_RETURN_ARG(bool, result),
-                               Q_ARG(const QString&, backupName));
-        return result;
+        QMetaObject::invokeMethod(this, "recoverFromBackup", Q_ARG(MiniPromise::Promise, promise),
+                                  Q_ARG(const QString&, backupName));
+        return;
     }
 
     qDebug() << "Recoving from" << backupName;
 
+    bool success { false };
     QDir backupDir { _backupDirectory };
     QFile backupFile { backupDir.filePath(backupName) };
     if (backupFile.open(QIODevice::ReadOnly)) {
         QuaZip zip { &backupFile };
         if (!zip.open(QuaZip::Mode::mdUnzip)) {
             qWarning() << "Failed to unzip file: " << backupName;
-            backupFile.close();
+            success = false;
+        } else {
+            for (auto& handler : _backupHandlers) {
+                handler.recoverBackup(zip);
+            }
+            
+            qDebug() << "Successfully recovered from " << backupName;
+            success = true;
         }
-
-        for (auto& handler : _backupHandlers) {
-            handler.recoverBackup(zip);
-        }
-        
         backupFile.close();
-        qDebug() << "Successfully recovered from " << backupName;
-        return true;
     } else {
+        success = false;
         qWarning() << "Invalid id: " << backupName;
-        return false;
     }
+
+    promise->resolve({
+        { "success", success }
+    });
 }
 
 std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 461d4dd794..6d6f07a19e 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -21,6 +21,8 @@
 
 #include "BackupHandler.h"
 
+#include <shared/MiniPromises.h>
+
 struct BackupItemInfo {
     QString id;
     QString name;
@@ -59,8 +61,8 @@ public:
     void createManualBackup(const QString& name);
 
 public slots:
-    bool recoverFromBackup(const QString& backupName);
-    bool deleteBackup(const QString& backupName);
+    void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
+    void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
 
 signals:
     void loadCompleted();
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 1949c40566..0e057972ca 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2124,11 +2124,14 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             return true;
         } else if (url.path().startsWith(URI_API_BACKUPS_RECOVER)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_RECOVER).length());
-            _contentManager->recoverFromBackup(id);
-            QJsonObject rootJSON;
-            rootJSON["success"] = true;
-            QJsonDocument docJSON(rootJSON);
-            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            auto deferred = makePromise("recoverFromBackup");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonObject rootJSON;
+                rootJSON["success"] = result["success"].toBool();
+                QJsonDocument docJSON(rootJSON);
+                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            });
+            _contentManager->recoverFromBackup(deferred, id);
             return true;
         } else if (url.path() == URI_API_BACKUPS) {
             QJsonObject rootJSON;
@@ -2368,11 +2371,15 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
         if (url.path().startsWith(URI_API_BACKUPS_ID)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());
-            auto success = _contentManager->deleteBackup(id);
-            QJsonObject rootJSON;
-            rootJSON["success"] = success;
-            QJsonDocument docJSON(rootJSON);
-            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            auto deferred = makePromise("deleteBackup");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonObject rootJSON;
+                rootJSON["success"] = result["success"].toBool();
+                QJsonDocument docJSON(rootJSON);
+                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            });
+            _contentManager->deleteBackup(deferred, id);
+
             return true;
 
         } else if (nodeDeleteRegex.indexIn(url.path()) != -1) {
@@ -3310,8 +3317,6 @@ void DomainServer::maybeHandleReplacementEntityFile() {
 }
 
 void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
-    // enumerate the nodes and find any octree type servers with active sockets
-
     //Assume we have compressed data
     auto compressedOctree = octreeFile;
     QByteArray jsonOctree;

From 80b03b904610911577d58d21d4d59de0cc93b39a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 16:09:16 -0800
Subject: [PATCH 271/569] Make backup directory in content manager const

---
 domain-server/src/DomainContentBackupManager.cpp | 13 -------------
 domain-server/src/DomainContentBackupManager.h   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 5c4d70d7ad..159d6d6e95 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -370,25 +370,12 @@ void DomainContentBackupManager::backup() {
             qCDebug(domain_server) << "Time since last backup [" << secondsSinceLastBackup << "] for rule [" << rule.name
                                     << "] exceeds backup interval [" << rule.intervalSeconds << "] doing backup now...";
 
-<<<<<<< HEAD
-            auto timestamp = QDateTime::currentDateTime().toString(DATETIME_FORMAT);
-            auto fileName = "backup-" + rule.extensionFormat + timestamp + ".zip";
-            QuaZip zip(_backupDirectory + "/" + fileName);
-            if (!zip.open(QuaZip::mdAdd)) {
-                qDebug() << "Could not open backup archive:" << zip.getZipName();
-                qDebug() << "    ERROR:" << zip.getZipError();
-            }
-
-            for (auto& handler : _backupHandlers) {
-                handler.createBackup(zip);
-=======
             bool success;
             QString path;
             std::tie(success, path) =  createBackup(AUTOMATIC_BACKUP_PREFIX, rule.extensionFormat);
             if (!success) {
                 qCWarning(domain_server) << "Failed to create backup for" << rule.name << "at" << path;
                 continue;
->>>>>>> dd86471a42... Add backup DS APIs
             }
 
             qDebug() << "Created backup: " << path;
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 6d6f07a19e..792695acce 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -83,7 +83,7 @@ protected:
     std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
 
 private:
-    QString _backupDirectory;
+    const QString _backupDirectory;
     std::vector<BackupHandler> _backupHandlers;
     int _persistInterval { 0 };
     bool _initialLoadComplete { false };

From 8a69c69bec02016ebdea92ea19e50d15cf9e1b74 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 16:49:23 -0800
Subject: [PATCH 272/569] CR

---
 domain-server/src/BackupHandler.h             | 15 ++++++------
 .../src/DomainContentBackupManager.cpp        | 23 +++++--------------
 .../src/DomainContentBackupManager.h          |  2 --
 domain-server/src/DomainServer.cpp            | 16 +++++++------
 .../embedded-webserver/src/HTTPConnection.cpp |  1 -
 libraries/entities/src/EntityTree.cpp         |  1 -
 6 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index ad1fc6b793..3e25af83e8 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -79,14 +79,14 @@ private:
 #include <quazip5/quazipfile.h>
 class EntitiesBackupHandler {
 public:
-    EntitiesBackupHandler(QString entitiesFilePath) : _entitiesFilePath(entitiesFilePath) {}
+    EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath)
+        : _entitiesFilePath(entitiesFilePath)
+        , _entitiesReplacementFilePath {}
 
     void loadBackup(QuaZip& zip) {}
 
     // Create a skeleton backup
     void createBackup(QuaZip& zip) {
-        qDebug() << "Creating a backup from handler";
-
         QFile entitiesFile { _entitiesFilePath };
 
         if (entitiesFile.open(QIODevice::ReadOnly)) {
@@ -95,7 +95,7 @@ public:
             zipFile.write(entitiesFile.readAll());
             zipFile.close();
             if (zipFile.getZipError() != UNZ_OK) {
-                qDebug() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+                qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
             }
         }
     }
@@ -108,12 +108,12 @@ public:
         }
         QuaZipFile zipFile { &zip };
         if (!zipFile.open(QIODevice::ReadOnly)) {
-            qWarning() << "Failed to open models.json.gz in backup";
+            qCritical() << "Failed to open models.json.gz in backup";
             return;
         }
         auto data = zipFile.readAll();
 
-        QFile entitiesFile { _entitiesFilePath };
+        QFile entitiesFile { _entitiesReplacementFilePath };
 
         if (entitiesFile.open(QIODevice::WriteOnly)) {
             entitiesFile.write(data);
@@ -122,7 +122,7 @@ public:
         zipFile.close();
 
         if (zipFile.getZipError() != UNZ_OK) {
-            qDebug() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+            qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
         }
     }
 
@@ -136,6 +136,7 @@ public:
 
 private:
     QString _entitiesFilePath;
+    QString _entitiesReplacementFilePath;
 };
 
 #endif /* hifi_BackupHandler_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 159d6d6e95..6f311613d5 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -35,10 +35,10 @@
 const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  // every 30 seconds
 
 // Backup format looks like: daily_backup-TIMESTAMP.zip
-const static QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
-const static QString DATETIME_FORMAT_RE("\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}");
-static const QString AUTOMATIC_BACKUP_PREFIX{ "autobackup-" };
-static const QString MANUAL_BACKUP_PREFIX{ "backup-" };
+static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
+static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
+static const QString AUTOMATIC_BACKUP_PREFIX { "autobackup-" };
+static const QString MANUAL_BACKUP_PREFIX { "backup-" };
 void DomainContentBackupManager::addBackupHandler(BackupHandler handler) {
     _backupHandlers.push_back(std::move(handler));
 }
@@ -131,14 +131,6 @@ void DomainContentBackupManager::setup() {
 }
 
 bool DomainContentBackupManager::process() {
-    if (!_initialLoadComplete) {
-        QDir backupDir { _backupDirectory };
-        if (!backupDir.exists()) {
-            backupDir.mkpath(".");
-        }
-        _initialLoadComplete = true;
-    }
-
     if (isStillRunning()) {
         constexpr int64_t MSECS_TO_USECS = 1000;
         constexpr int64_t USECS_TO_SLEEP = 10 * MSECS_TO_USECS;  // every 10ms
@@ -219,12 +211,9 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
         return;
     }
 
-    bool success { false };
     QDir backupDir { _backupDirectory };
     QFile backupFile { backupDir.filePath(backupName) };
-    if (backupFile.remove()) {
-        success = true;
-    }
+    auto success = backupFile.remove();
     promise->resolve({
         { "success", success }
     });
@@ -237,7 +226,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
         return;
     }
 
-    qDebug() << "Recoving from" << backupName;
+    qDebug() << "Recovering from" << backupName;
 
     bool success { false };
     QDir backupDir { _backupDirectory };
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 792695acce..cfeae9c8b9 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -51,7 +51,6 @@ public:
                                bool debugTimestampNow = false);
 
     void addBackupHandler(BackupHandler handler);
-    bool isInitialLoadComplete() const { return _initialLoadComplete; }
     std::vector<BackupItemInfo> getAllBackups();
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
@@ -86,7 +85,6 @@ private:
     const QString _backupDirectory;
     std::vector<BackupHandler> _backupHandlers;
     int _persistInterval { 0 };
-    bool _initialLoadComplete { false };
 
     int64_t _lastCheck { 0 };
     std::vector<BackupRule> _backupRules;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 0e057972ca..718c5ff402 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -296,7 +296,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     maybeHandleReplacementEntityFile();
 
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
-    _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath()));
+    _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath()));
     _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
     _contentManager->initialize(true);
 
@@ -1936,7 +1936,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     const QString URI_API_BACKUPS = "/api/backups";
     const QString URI_API_BACKUPS_ID = "/api/backups/";
     const QString URI_API_BACKUPS_RECOVER = "/api/backups/recover/";
-    //const QString URI_API_BACKUPS_CREATE = "/api/backups";
 
     const QString UUID_REGEX_STRING = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 
@@ -2127,9 +2126,11 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             auto deferred = makePromise("recoverFromBackup");
             deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
                 QJsonObject rootJSON;
-                rootJSON["success"] = result["success"].toBool();
+                auto success = result["success"].toBool();
+                rootJSON["success"] = success;
                 QJsonDocument docJSON(rootJSON);
-                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                                    JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->recoverFromBackup(deferred, id);
             return true;
@@ -2258,7 +2259,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             return true;
 
         } else if (url.path() == URI_API_BACKUPS) {
-            qDebug() << "GOt request to create a backup:";
             auto params = connection->parseUrlEncodedForm();
             auto it = params.find("name");
             if (it == params.end()) {
@@ -2374,9 +2374,11 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             auto deferred = makePromise("deleteBackup");
             deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
                 QJsonObject rootJSON;
-                rootJSON["success"] = result["success"].toBool();
+                auto success = result["success"].toBool();
+                rootJSON["success"] = success;
                 QJsonDocument docJSON(rootJSON);
-                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                                    JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->deleteBackup(deferred, id);
 
diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 6496cc3f68..1368a9f54c 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -287,7 +287,6 @@ void HTTPConnection::readContent() {
     if (_socket->bytesAvailable() < size) {
         return;
     }
-    qDebug() << "Reading content";
     _socket->read(_requestContent.data(), size);
     _socket->disconnect(this, SLOT(readContent()));
 
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index fc3e793b45..f632bcf140 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2246,7 +2246,6 @@ bool EntityTree::writeToMap(QVariantMap& entityDescription, OctreeElementPointer
     }
     entityDescription["DataVersion"] = _persistDataVersion;
     entityDescription["Id"] = _persistID;
-    qDebug() << "Writing to map: " << _persistDataVersion << _persistID;
     QScriptEngine scriptEngine;
     RecurseOctreeToMapOperator theOperator(entityDescription, element, &scriptEngine, skipDefaultValues,
                                             skipThoseWithBadParents, _myAvatar);

From b6240e8622c8591ee57972abc5a2c719b608395b Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 14 Feb 2018 17:02:11 -0800
Subject: [PATCH 273/569] Move backup recover API to POST

---
 domain-server/src/DomainServer.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 718c5ff402..416c8e39b6 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2120,19 +2120,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             // send the response
             connection->respond(HTTPConnection::StatusCode200, nodesDocument.toJson(), qPrintable(JSON_MIME_TYPE));
 
-            return true;
-        } else if (url.path().startsWith(URI_API_BACKUPS_RECOVER)) {
-            auto id = url.path().mid(QString(URI_API_BACKUPS_RECOVER).length());
-            auto deferred = makePromise("recoverFromBackup");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
-                QJsonObject rootJSON;
-                auto success = result["success"].toBool();
-                rootJSON["success"] = success;
-                QJsonDocument docJSON(rootJSON);
-                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
-                                    JSON_MIME_TYPE.toUtf8());
-            });
-            _contentManager->recoverFromBackup(deferred, id);
             return true;
         } else if (url.path() == URI_API_BACKUPS) {
             QJsonObject rootJSON;
@@ -2279,8 +2266,21 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             }
 
         } else if (url.path() == URI_API_DOMAINS) {
-
             return forwardMetaverseAPIRequest(connection, "/api/v1/domains", "domain", { "label" });
+
+        } else if (url.path().startsWith(URI_API_BACKUPS_RECOVER)) {
+            auto id = url.path().mid(QString(URI_API_BACKUPS_RECOVER).length());
+            auto deferred = makePromise("recoverFromBackup");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonObject rootJSON;
+                auto success = result["success"].toBool();
+                rootJSON["success"] = success;
+                QJsonDocument docJSON(rootJSON);
+                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                                    JSON_MIME_TYPE.toUtf8());
+            });
+            _contentManager->recoverFromBackup(deferred, id);
+            return true;
         }
     } else if (connection->requestOperation() == QNetworkAccessManager::PutOperation) {
         if (url.path() == URI_API_DOMAINS) {

From f2b6823748cf0c257aa421a3cbf1718c65788245 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 08:20:19 -0800
Subject: [PATCH 274/569] Fix initializer in EntitiesBackupHandler

---
 domain-server/src/BackupHandler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 3e25af83e8..7d1a0bdb24 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -81,7 +81,7 @@ class EntitiesBackupHandler {
 public:
     EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath)
         : _entitiesFilePath(entitiesFilePath)
-        , _entitiesReplacementFilePath {}
+        , _entitiesReplacementFilePath(entitiesReplacementFilePath) {}
 
     void loadBackup(QuaZip& zip) {}
 

From 2cfa91be0688ead85dd702b6e43f1fd534727900 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 08:48:43 -0800
Subject: [PATCH 275/569] Add memory include to HTTPConnection

---
 libraries/embedded-webserver/src/HTTPConnection.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index 9c435b14a0..a020dfdca9 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -26,6 +26,8 @@
 #include <QPair>
 #include <QUrl>
 
+#include <memory>
+
 class QTcpSocket;
 class HTTPManager;
 class MaskFilter;

From b832e118cc0adec0392949fcfee1b880de76af45 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 09:14:20 -0800
Subject: [PATCH 276/569] Add 'override' to BackupHandler methods

---
 domain-server/src/BackupHandler.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 7d1a0bdb24..045fcedc71 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -54,19 +54,19 @@ private:
     struct Model : Concept {
         Model(T* x) : data(x) {}
 
-        void loadBackup(QuaZip& zip) {
+        void loadBackup(QuaZip& zip) override {
             data->loadBackup(zip);
         }
-        void createBackup(QuaZip& zip) {
+        void createBackup(QuaZip& zip) override {
             data->createBackup(zip);
         }
-        void recoverBackup(QuaZip& zip) {
+        void recoverBackup(QuaZip& zip) override {
             data->recoverBackup(zip);
         }
-        void deleteBackup(QuaZip& zip) {
+        void deleteBackup(QuaZip& zip) override {
             data->deleteBackup(zip);
         }
-        void consolidateBackup(QuaZip& zip) {
+        void consolidateBackup(QuaZip& zip) override {
             data->consolidateBackup(zip);
         }
 

From 145a8b385b7432dc906c9f1faefd9f12ebbd4435 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 09:36:59 -0800
Subject: [PATCH 277/569] Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http
 response

---
 libraries/embedded-webserver/src/HTTPConnection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 1368a9f54c..6d0126b3d1 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -183,9 +183,9 @@ void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device
     if (_responseDevice->atEnd()) {
         _socket->disconnectFromHost();
     } else {
-        constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
         int totalToBeWritten = csize;
         connect(_socket, &QTcpSocket::bytesWritten, this, [this, totalToBeWritten](size_t bytes) mutable {
+            constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
             if (!_responseDevice->atEnd()) {
                 totalToBeWritten -= _socket->write(_responseDevice->read(HTTP_RESPONSE_CHUNK_SIZE));
                 if (_responseDevice->atEnd()) {

From 1aba89b908cc29565b600beff5d4539f27496d19 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 09:38:47 -0800
Subject: [PATCH 278/569] Fix style of init list

---
 domain-server/src/BackupHandler.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 045fcedc71..5fea3be6af 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -79,9 +79,9 @@ private:
 #include <quazip5/quazipfile.h>
 class EntitiesBackupHandler {
 public:
-    EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath)
-        : _entitiesFilePath(entitiesFilePath)
-        , _entitiesReplacementFilePath(entitiesReplacementFilePath) {}
+    EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
+        _entitiesFilePath(entitiesFilePath),
+        _entitiesReplacementFilePath(entitiesReplacementFilePath) {}
 
     void loadBackup(QuaZip& zip) {}
 

From beb595266df7c23f50f6a1aa663dd353cb4468c1 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Thu, 15 Feb 2018 21:45:35 +0300
Subject: [PATCH 279/569] fix 4x 'fromQml' slots execution

note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
---
 libraries/qml/src/qml/OffscreenSurface.cpp  | 2 +-
 libraries/ui/src/ui/OffscreenQmlSurface.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
index 87fc8a3025..a84f3feb4d 100644
--- a/libraries/qml/src/qml/OffscreenSurface.cpp
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -331,9 +331,9 @@ void OffscreenSurface::finishQmlLoad(QQmlComponent* qmlComponent,
     qmlComponent->deleteLater();
 
     onItemCreated(qmlContext, newItem);
-    connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
 
     if (!rootCreated) {
+        connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
         onRootCreated();
         emit rootItemCreated(newItem);
         // Call this callback after rootitem is set, otherwise VrMenu wont work
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index ea34f3de76..749a60a578 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -305,7 +305,6 @@ void OffscreenQmlSurface::onItemCreated(QQmlContext* qmlContext, QQuickItem* new
         qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(eventBridge, qmlContext));
     }
 
-    connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
 }
 
 void OffscreenQmlSurface::onRootCreated() {

From 4b2e907ada0ce5b64606d9fbf2e4c42b793e4d0c Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 11:02:14 -0800
Subject: [PATCH 280/569] Update entities recover backup to reset id and
 version

---
 domain-server/src/BackupHandler.h | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 5fea3be6af..f2735e5adf 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -77,6 +77,8 @@ private:
 };
 
 #include <quazip5/quazipfile.h>
+#include <OctreeUtils.h>
+
 class EntitiesBackupHandler {
 public:
     EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
@@ -111,18 +113,27 @@ public:
             qCritical() << "Failed to open models.json.gz in backup";
             return;
         }
-        auto data = zipFile.readAll();
+        auto rawData = zipFile.readAll();
+
+        zipFile.close();
+
+        OctreeUtils::RawOctreeData data;
+        if (!OctreeUtils::readOctreeDataInfoFromData(rawData, &data)) {
+            qCritical() << "Unable to parse octree data during backup recovery";
+            return;
+        }
+
+        data.resetIdAndVersion();
+
+        if (zipFile.getZipError() != UNZ_OK) {
+            qCritical() << "Failed to unzip models.json.gz: " << zipFile.getZipError();
+            return;
+        }
 
         QFile entitiesFile { _entitiesReplacementFilePath };
 
         if (entitiesFile.open(QIODevice::WriteOnly)) {
-            entitiesFile.write(data);
-        }
-
-        zipFile.close();
-
-        if (zipFile.getZipError() != UNZ_OK) {
-            qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+            entitiesFile.write(data.toGzippedByteArray());
         }
     }
 

From df809f5a3eb2b80bc73f39789554bf60dde3332a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 11:02:29 -0800
Subject: [PATCH 281/569] Cleanup logging for backup cleanup

---
 .../src/DomainContentBackupManager.cpp        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 6f311613d5..347923a282 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -295,18 +295,21 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
                 backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
 
         int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions;
-        qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)";
-        for (int i = 0; i < backupsToDelete; ++i) {
-            auto fileInfo = matchingFiles[i].absoluteFilePath();
-            QFile backupFile(fileInfo);
-            if (backupFile.remove()) {
-                qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName();
-            } else {
-                qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName();
+        if (backupsToDelete <= 0) {
+            qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, no backups need to be deleted";
+        } else {
+            qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)";
+            for (int i = 0; i < backupsToDelete; ++i) {
+                auto fileInfo = matchingFiles[i].absoluteFilePath();
+                QFile backupFile(fileInfo);
+                if (backupFile.remove()) {
+                    qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName();
+                } else {
+                    qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName();
+                }
             }
+            qCDebug(domain_server) << "Done removing old backup versions";
         }
-
-        qCDebug(domain_server) << "Done removing old backup versions";
     } else {
         qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "."
                                 << " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."

From efb2473fcf19737f63032331a632f8cca9672337 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 11:02:55 -0800
Subject: [PATCH 282/569] Updaet createManualBackup to defer response until
 creation is done

---
 domain-server/src/DomainContentBackupManager.cpp | 16 ++++++++++++++--
 domain-server/src/DomainContentBackupManager.h   |  3 +--
 domain-server/src/DomainServer.cpp               | 12 ++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 347923a282..66655ea966 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -409,8 +409,20 @@ void DomainContentBackupManager::consolidate(QString fileName) {
     }
 }
 
-void DomainContentBackupManager::createManualBackup(const QString& name) {
-    createBackup(MANUAL_BACKUP_PREFIX, name);
+void DomainContentBackupManager::createManualBackup(MiniPromise::Promise promise, const QString& name) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "createManualBackup", Q_ARG(MiniPromise::Promise, promise),
+                                  Q_ARG(const QString&, name));
+        return;
+    }
+
+    bool success;
+    QString path;
+    std::tie(success, path) = createBackup(MANUAL_BACKUP_PREFIX, name);
+
+    promise->resolve({
+        { "success", success }
+    });
 }
 
 std::pair<bool, QString> DomainContentBackupManager::createBackup(const QString& prefix, const QString& name) {
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index cfeae9c8b9..5cf8d4698f 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -57,9 +57,8 @@ public:
 
     void replaceData(QByteArray data);
 
-    void createManualBackup(const QString& name);
-
 public slots:
+    void createManualBackup(MiniPromise::Promise promise, const QString& name);
     void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
     void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 416c8e39b6..da8527bf16 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2253,9 +2253,17 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 return true;
             }
 
-            _contentManager->createManualBackup(it.value());
+            auto deferred = makePromise("createManualBackup");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonObject rootJSON;
+                auto success = result["success"].toBool();
+                rootJSON["success"] = success;
+                QJsonDocument docJSON(rootJSON);
+                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                                    JSON_MIME_TYPE.toUtf8());
+            });
+            _contentManager->createManualBackup(deferred, it.value());
 
-            connection->respond(HTTPConnection::StatusCode200);
             return true;
 
         } else if (url.path() == "/domain_settings") {

From 145a0df082654b960a225c276ff1328ccac67a29 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 15 Feb 2018 14:14:07 -0500
Subject: [PATCH 283/569] interim checkin

---
 interface/src/Application.cpp                 |   4 +-
 interface/src/ui/overlays/Base3DOverlay.h     |   4 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |   2 +-
 interface/src/ui/overlays/ModelOverlay.h      |   2 +-
 interface/src/ui/overlays/Shape3DOverlay.cpp  |   6 +-
 interface/src/ui/overlays/Shape3DOverlay.h    |   2 +-
 libraries/entities-renderer/CMakeLists.txt    |   2 +-
 .../src/RenderableEntityItem.h                |   4 +-
 .../src/RenderableModelEntityItem.cpp         |  19 +-
 .../src/RenderableModelEntityItem.h           |   3 +-
 .../graphics-scripting/BufferViewHelpers.cpp  | 416 +++++++++-
 .../graphics-scripting/BufferViewHelpers.h    |  35 +-
 .../BufferViewScripting.cpp                   |   4 +-
 .../src/graphics-scripting/Forward.h          | 107 +++
 .../GraphicsScriptingUtil.cpp                 |   3 +
 .../GraphicsScriptingUtil.h                   |  85 +++
 .../ModelScriptingInterface.cpp               | 152 ++--
 .../ModelScriptingInterface.h                 |  10 +-
 .../src/graphics-scripting/ScriptableMesh.cpp | 714 +++++++++---------
 .../src/graphics-scripting/ScriptableMesh.h   | 198 +++--
 .../src/graphics-scripting/ScriptableModel.h  |  81 +-
 21 files changed, 1219 insertions(+), 634 deletions(-)
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/Forward.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f24969ce60..bdef2f456b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -600,7 +600,9 @@ public:
         QString error;
 
         scriptable::ModelProviderPointer provider;
-        if (auto entityInterface = getEntityModelProvider(static_cast<EntityItemID>(uuid))) {
+        if (uuid.isNull()) {
+            provider = nullptr;
+        } else if (auto entityInterface = getEntityModelProvider(static_cast<EntityItemID>(uuid))) {
             provider = entityInterface;
         } else if (auto overlayInterface = getOverlayModelProvider(static_cast<OverlayID>(uuid))) {
             provider = overlayInterface;
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index 0c8bc5aacb..6ccad338c9 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -13,7 +13,7 @@
 
 #include <Transform.h>
 #include <SpatiallyNestable.h>
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 #include "Overlay.h"
 
 namespace model { class Mesh; }
@@ -37,7 +37,7 @@ public:
     virtual bool is3D() const override { return true; }
 
     virtual uint32_t fetchMetaSubItems(render::ItemIDs& subItems) const override { subItems.push_back(getRenderItemID()); return (uint32_t) subItems.size(); }
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
 
     // TODO: consider implementing registration points in this class
     glm::vec3 getCenter() const { return getWorldPosition(); }
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 5a80ca1abf..e007591ce0 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -630,7 +630,7 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     return 0;
 }
 
-scriptable::ScriptableModel ModelOverlay::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase ModelOverlay::getScriptableModel(bool* ok) {
     if (!_model || !_model->isLoaded()) {
         return Base3DOverlay::getScriptableModel(ok);
     }
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 32d9a08c70..8dc386c733 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,7 +59,7 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 8bb3d16888..54423feef6 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -180,15 +180,15 @@ Transform Shape3DOverlay::evalRenderTransform() {
     return transform;
 }
 
-scriptable::ScriptableModel Shape3DOverlay::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase Shape3DOverlay::getScriptableModel(bool* ok) {
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto vertexColor = ColorUtils::toVec3(_color);
-    scriptable::ScriptableModel result;
+    scriptable::ScriptableModelBase result;
     result.metadata = {
         { "origin", "Shape3DOverlay::"+shapeStrings[_shape] },
         { "overlayID", getID() },
     };
-    result.meshes << geometryCache->meshFromShape(_shape, vertexColor);
+    result.append(geometryCache->meshFromShape(_shape, vertexColor), {{ "shape", shapeStrings[_shape] }});
     if (ok) {
         *ok = true;
     }
diff --git a/interface/src/ui/overlays/Shape3DOverlay.h b/interface/src/ui/overlays/Shape3DOverlay.h
index 34f82af278..f5246d95ac 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.h
+++ b/interface/src/ui/overlays/Shape3DOverlay.h
@@ -37,7 +37,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt
index 27ea04f642..3aa561f927 100644
--- a/libraries/entities-renderer/CMakeLists.txt
+++ b/libraries/entities-renderer/CMakeLists.txt
@@ -13,7 +13,7 @@ include_hifi_library_headers(fbx)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(controllers)
-include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
+include_hifi_library_headers(graphics-scripting) # for Forward.h
 
 target_bullet()
 target_polyvox()
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index f07b67fbd0..74759f4fe4 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -17,7 +17,7 @@
 #include <Sound.h>
 #include "AbstractViewStateInterface.h"
 #include "EntitiesRendererLogging.h"
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 
 class EntityTreeRenderer;
 
@@ -55,7 +55,7 @@ public:
 
     const uint64_t& getUpdateTime() const { return _updateTime; }
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
 protected:
     virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
     virtual void onAddToScene(const EntityItemPointer& entity);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 7b022fefac..3d6714a400 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -950,12 +950,9 @@ QStringList RenderableModelEntityItem::getJointNames() const {
     return result;
 }
 
-
-scriptable::ScriptableModel render::entities::ModelEntityRenderer::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel(bool* ok) {
     ModelPointer model;
-    withReadLock([&] {
-        model = _model;
-    });
+    withReadLock([&] { model = _model; });
 
     if (!model || !model->isLoaded()) {
         return scriptable::ModelProvider::modelUnavailableError(ok);
@@ -964,6 +961,18 @@ scriptable::ScriptableModel render::entities::ModelEntityRenderer::getScriptable
     return _model->getScriptableModel(ok);
 }
 
+bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
+    qCDebug(entitiesrenderer) << "REPLACING RenderableModelEntityItem" << newModel->objectName();
+    ModelPointer model;
+    withReadLock([&] { model = _model; });
+
+    if (!model || !model->isLoaded()) {
+        return false;
+    }
+
+   return _model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
+}
+
 void RenderableModelEntityItem::simulateRelayedJoints() {
     ModelPointer model = getModel();
     if (model && model->isLoaded()) {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 3e952cb9a7..ffb83d3609 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -140,7 +140,8 @@ class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem
 
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
index d83322f360..68cebe2d78 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
@@ -7,23 +7,48 @@
 #include <gpu/Format.h>
 #include <gpu/Stream.h>
 
+#include <graphics/Geometry.h>
+
+#include <Extents.h>
+#include <AABox.h>
+
+#include <glm/gtx/string_cast.hpp>
 #include <glm/gtc/packing.hpp>
+#include <glm/detail/type_vec.hpp>
 namespace glm {
     using hvec2 = glm::tvec2<glm::detail::hdata>;
     using hvec4 = glm::tvec4<glm::detail::hdata>;
 }
 
 //#define DEBUG_BUFFERVIEW_SCRIPTING
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+//#ifdef DEBUG_BUFFERVIEW_SCRIPTING
     #include "DebugNames.h"
-    QLoggingCategory bufferview_helpers{"hifi.bufferview"};
-#endif
+//#endif
 
 namespace {
+    QLoggingCategory bufferhelper_logging{"hifi.bufferview"};
     const std::array<const char*, 4> XYZW = {{ "x", "y", "z", "w" }};
     const std::array<const char*, 4> ZERO123 = {{ "0", "1", "2", "3" }};
 }
 
+gpu::BufferView buffer_helpers::getBufferView(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
+    return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
+}
+QMap<QString,int> buffer_helpers::ATTRIBUTES{
+    {"position", gpu::Stream::POSITION },
+    {"normal", gpu::Stream::NORMAL },
+    {"color", gpu::Stream::COLOR },
+    {"tangent", gpu::Stream::TEXCOORD0 },
+    {"skin_cluster_index", gpu::Stream::SKIN_CLUSTER_INDEX },
+    {"skin_cluster_weight", gpu::Stream::SKIN_CLUSTER_WEIGHT },
+    {"texcoord0", gpu::Stream::TEXCOORD0 },
+    {"texcoord1", gpu::Stream::TEXCOORD1 },
+    {"texcoord2", gpu::Stream::TEXCOORD2 },
+    {"texcoord3", gpu::Stream::TEXCOORD3 },
+    {"texcoord4", gpu::Stream::TEXCOORD4 },
+};
+
+
 template <typename T>
 QVariant getBufferViewElement(const gpu::BufferView& view, quint32 index, bool asArray = false) {
     return glmVecToVariant(view.get<T>(index), asArray);
@@ -61,14 +86,14 @@ static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint3
     packedTangent = tangentStruct.pack;
 }
 
-bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v) {
+bool buffer_helpers::fromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v) {
     const auto& element = view._element;
     const auto vecN = element.getScalarCount();
     const auto dataType = element.getType();
     const auto byteLength = element.getSize();
     const auto BYTES_PER_ELEMENT = byteLength / vecN;
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    qCDebug(bufferview_helpers) << "bufferViewElementFromVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
+    qCDebug(bufferhelper_logging) << "bufferViewElementFromVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
 #endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
@@ -122,16 +147,34 @@ bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, co
     return false;
 }
 
-QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
+bool boundsCheck(const gpu::BufferView& view, quint32 index) {
+    const auto byteLength = view._element.getSize();
+    return (
+        index < view.getNumElements() &&
+        index * byteLength < (view._size - 1) * byteLength
+     );
+}
+    
+QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
     const auto& element = view._element;
     const auto vecN = element.getScalarCount();
     const auto dataType = element.getType();
     const auto byteLength = element.getSize();
     const auto BYTES_PER_ELEMENT = byteLength / vecN;
     Q_ASSERT(index < view.getNumElements());
-    Q_ASSERT(index * vecN * BYTES_PER_ELEMENT < (view._size - vecN * BYTES_PER_ELEMENT));
+    if (!boundsCheck(view, index)) {
+        // sanity checks
+        auto byteOffset = index * vecN * BYTES_PER_ELEMENT;
+        auto maxByteOffset = (view._size - 1) * vecN * BYTES_PER_ELEMENT;
+        if (byteOffset > maxByteOffset) {
+            qDebug() << "bufferViewElementToVariant -- byteOffset out of range " << byteOffset << " < " << maxByteOffset << DebugNames::stringFrom(dataType);
+            qDebug() << "bufferViewElementToVariant -- index: " << index << "numElements" << view.getNumElements();
+            qDebug() << "bufferViewElementToVariant -- vecN: " << vecN << "byteLength" << byteLength << "BYTES_PER_ELEMENT" << BYTES_PER_ELEMENT;
+        }
+        Q_ASSERT(byteOffset <= maxByteOffset);
+    }
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    qCDebug(bufferview_helpers) << "bufferViewElementToVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
+    qCDebug(bufferhelper_logging) << "bufferViewElementToVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
 #endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
@@ -221,22 +264,137 @@ const T glmVecFromVariant(const QVariant& v) {
 }
 
 template <typename T>
-gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType) {
+gpu::BufferView buffer_helpers::fromVector(const QVector<T>& elements, const gpu::Element& elementType) {
     auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
     return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
+template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
 
-template<> gpu::BufferView bufferViewFromVector<unsigned int>(QVector<unsigned int> elements, gpu::Element elementType) { return bufferViewFromVector(elements, elementType); }
-template<> gpu::BufferView bufferViewFromVector<glm::vec3>(QVector<glm::vec3> elements, gpu::Element elementType) { return bufferViewFromVector(elements, elementType); }
+template <typename T> struct getVec4;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
+template <typename T> struct getScalar;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
 
-gpu::BufferView cloneBufferView(const gpu::BufferView& input) {
+struct gotter {
+    static float error(const QString& name, const gpu::BufferView& view, quint32 index, const char *hint) {
+        qDebug() << QString("gotter:: unhandled type=%1(element=%2(%3)) size=%4(per=%5) vec%6 hint=%7 #%8")
+            .arg(name)
+            .arg(DebugNames::stringFrom(view._element.getType()))
+            .arg(view._element.getType())
+            .arg(view._element.getSize())
+            .arg(view._element.getSize() / view._element.getScalarCount())
+            .arg(view._element.getScalarCount())
+            .arg(hint)
+            .arg(view.getNumElements());
+        Q_ASSERT(false);
+        assert(false);
+        return NAN;
+    }        
+};
+template <typename T> struct getScalar : gotter {
+    static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+        case gpu::UINT32: return view.get<glm::uint32>(index);
+        case gpu::UINT16: return view.get<glm::uint16>(index);
+        case gpu::UINT8: return view.get<glm::uint8>(index);
+        case gpu::INT32: return view.get<glm::int32>(index);
+        case gpu::INT16: return view.get<glm::int16>(index);
+        case gpu::INT8: return view.get<glm::int8>(index);
+        case gpu::FLOAT: return view.get<glm::float32>(index);
+        case gpu::HALF: return T(glm::unpackSnorm1x8(view.get<glm::int8>(index)));
+        default: break;
+        } return T(error("getScalar", view, index, hint));
+    }
+};
+
+template <typename T> struct getVec2 : gotter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+        case gpu::UINT32: return view.get<glm::u32vec2>(index);
+        case gpu::UINT16: return view.get<glm::u16vec2>(index);
+        case gpu::UINT8: return view.get<glm::u8vec2>(index);
+        case gpu::INT32: return view.get<glm::i32vec2>(index);
+        case gpu::INT16: return view.get<glm::i16vec2>(index);
+        case gpu::INT8: return view.get<glm::i8vec2>(index);
+        case gpu::FLOAT: return view.get<glm::fvec2>(index);
+        case gpu::HALF: return glm::unpackSnorm2x8(view.get<glm::int16>(index));
+        default: break;
+        } return T(error("getVec2", view, index, hint)); }};
+
+
+template <typename T> struct getVec3  : gotter  { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+        case gpu::UINT32: return view.get<glm::u32vec3>(index);
+        case gpu::UINT16: return view.get<glm::u16vec3>(index);
+        case gpu::UINT8: return view.get<glm::u8vec3>(index);
+        case gpu::INT32: return view.get<glm::i32vec3>(index);
+        case gpu::INT16: return view.get<glm::i16vec3>(index);
+        case gpu::INT8: return view.get<glm::i8vec3>(index);
+        case gpu::FLOAT: return view.get<glm::fvec3>(index);
+        case gpu::HALF:
+        case gpu::NUINT8:
+        case gpu::NINT2_10_10_10:
+            if (view._element.getSize() == sizeof(glm::int32)) {
+                return getVec4<T>::get(view, index, hint);
+            }
+        default: break;
+        } return T(error("getVec3", view, index, hint)); }};
+
+template <typename T> struct getVec4 : gotter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) {
+    assert(view._element.getSize() == sizeof(glm::int32));
+    switch(view._element.getType()) {
+    case gpu::UINT32: return view.get<glm::u32vec4>(index);
+    case gpu::UINT16: return view.get<glm::u16vec4>(index);
+    case gpu::UINT8: return view.get<glm::u8vec4>(index);
+    case gpu::INT32: return view.get<glm::i32vec4>(index);
+    case gpu::INT16: return view.get<glm::i16vec4>(index);
+    case gpu::INT8: return view.get<glm::i8vec4>(index);
+    case gpu::NUINT32: break;
+    case gpu::NUINT16: break;
+    case gpu::NUINT8: return glm::unpackUnorm4x8(view.get<glm::uint32>(index)); 
+    case gpu::NUINT2: break;
+    case gpu::NINT32: break;
+    case gpu::NINT16: break;
+    case gpu::NINT8: break;
+    case gpu::COMPRESSED: break;
+    case gpu::NUM_TYPES: break;
+    case gpu::FLOAT: return view.get<glm::fvec4>(index);
+    case gpu::HALF: return glm::unpackSnorm4x8(view.get<glm::int32>(index));
+    case gpu::NINT2_10_10_10: return glm::unpackSnorm3x10_1x2(view.get<glm::uint32>(index));
+    } return T(error("getVec4", view, index, hint)); }};
+
+
+template <typename FUNC, typename T>
+struct getVec {
+    static QVector<T> __to_vector__(const gpu::BufferView& view, const char *hint) {
+        QVector<T> result;
+        const quint32 count = (quint32)view.getNumElements();
+        result.resize(count);
+        for (quint32 i = 0; i < count; i++) {
+            result[i] = FUNC::get(view, i, hint);
+        }
+        return result;
+    }
+    static T __to_scalar__(const gpu::BufferView& view, quint32 index, const char *hint) {
+        assert(boundsCheck(view, index));
+        return FUNC::get(view, index, hint);
+    }
+};
+
+template <> QVector<int> buffer_helpers::toVector<int>(const gpu::BufferView& view, const char *hint) { return getVec<getScalar<int>,int>::__to_vector__(view, hint); }
+template <> QVector<glm::vec2> buffer_helpers::toVector<glm::vec2>(const gpu::BufferView& view, const char *hint) { return getVec<getVec2<glm::vec2>,glm::vec2>::__to_vector__(view, hint); }
+template <> QVector<glm::vec3> buffer_helpers::toVector<glm::vec3>(const gpu::BufferView& view, const char *hint) { return getVec<getVec3<glm::vec3>,glm::vec3>::__to_vector__(view, hint); }
+template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::BufferView& view, const char *hint) { return getVec<getVec4<glm::vec4>,glm::vec4>::__to_vector__(view, hint); }
+
+
+template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getScalar<int>,int>::__to_scalar__(view, index, hint); }
+template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec2<glm::vec2>,glm::vec2>::__to_scalar__(view, index, hint); }
+template <> glm::vec3 buffer_helpers::convert<glm::vec3>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec3<glm::vec3>,glm::vec3>::__to_scalar__(view, index, hint); }
+template <> glm::vec4 buffer_helpers::convert<glm::vec4>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec4<glm::vec4>,glm::vec4>::__to_scalar__(view, index, hint); }
+
+gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
     return gpu::BufferView(
         std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
         input._offset, input._size, input._stride, input._element
         );
 }
 
-gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements) {
+gpu::BufferView buffer_helpers::resize(const gpu::BufferView& input, quint32 numElements) {
     auto effectiveSize = input._buffer->getSize() / input.getNumElements();
     qDebug() << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
     auto vsize = input._element.getSize() * numElements;
@@ -248,3 +406,235 @@ gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numEleme
     qDebug() << "resized output" << output.getNumElements() << output._buffer->getSize();
     return output;
 }
+
+graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
+    auto clone = std::make_shared<graphics::Mesh>();
+    //[](graphics::Mesh* blah) {
+        //qCDebug(bufferhelper_logging) << "--- DELETING MESH POINTER" << blah;
+    //  delete blah;
+    //});
+    clone->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
+    //qCInfo(bufferhelper_logging) << "+++ ALLOCATED MESH POINTER ScriptableMesh::cloneMesh" << clone->displayName << clone.get() << !!mesh;
+    clone->setIndexBuffer(buffer_helpers::clone(mesh->getIndexBuffer()));
+    clone->setPartBuffer(buffer_helpers::clone(mesh->getPartBuffer()));
+    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = buffer_helpers::ATTRIBUTES[a.first];
+        auto points = buffer_helpers::clone(view);
+        if (slot == gpu::Stream::POSITION) {
+            clone->setVertexBuffer(points);
+        } else {
+            clone->addAttribute(slot, points);
+        }
+    }
+    return clone;
+}
+
+
+/// --- buffer view <-> variant helpers
+
+namespace {
+    // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
+    gpu::BufferView _expandedAttributeBuffer(const graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
+        gpu::BufferView bufferView = buffer_helpers::getBufferView(mesh, slot);        
+        const auto& elementType = bufferView._element;
+        //auto vecN = element.getScalarCount();
+        //auto type = element.getType();
+        //gpu::Element elementType = getVecNElement(type, vecN);
+        
+        gpu::Size elementSize = elementType.getSize();
+        auto nPositions = mesh->getNumVertices();
+        auto vsize = nPositions * elementSize;
+        auto diffTypes = (elementType.getType() != bufferView._element.getType()  ||
+                          elementType.getSize() > bufferView._element.getSize() ||
+                          elementType.getScalarCount() > bufferView._element.getScalarCount() ||
+                          vsize > bufferView._size
+            );
+        QString hint = QString("%1").arg(slot);
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+        hint = DebugNames::stringFrom(slot);
+#endif
+#ifdef DEV_BUILD
+        auto beforeCount = bufferView.getNumElements();
+        auto beforeTotal = bufferView._size;
+#endif
+        if (bufferView.getNumElements() < nPositions || diffTypes) {
+            if (!bufferView._buffer || bufferView.getNumElements() == 0) {
+                qCInfo(bufferhelper_logging).nospace() << "ScriptableMesh -- adding missing mesh attribute '" << hint << "' for BufferView";
+                gpu::Byte *data = new gpu::Byte[vsize];
+                memset(data, 0, vsize);
+                auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
+                delete[] data;
+                bufferView = gpu::BufferView(buffer, elementType);
+                mesh->addAttribute(slot, bufferView);
+            } else {
+                qCInfo(bufferhelper_logging) << "ScriptableMesh -- resizing Buffer current:" << hint << bufferView._buffer->getSize() << "wanted:" << vsize;
+                bufferView._element = elementType;
+                bufferView._buffer->resize(vsize);
+                bufferView._size = bufferView._buffer->getSize();
+            }
+        }
+#ifdef DEV_BUILD
+        auto afterCount = bufferView.getNumElements();
+        auto afterTotal = bufferView._size;
+        if (beforeTotal != afterTotal || beforeCount != afterCount) {
+            QString typeName = QString("%1").arg(bufferView._element.getType());
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+            typeName = DebugNames::stringFrom(bufferView._element.getType());
+#endif
+            qCDebug(bufferhelper_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
+                          hint.toStdString().c_str(), bufferView._element.getScalarCount(),
+                          typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+        }
+#endif
+        return bufferView;
+    }
+
+    gpu::BufferView expandAttributeToMatchPositions(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
+        if (slot == gpu::Stream::POSITION) {
+            return buffer_helpers::getBufferView(mesh, slot);
+        }
+        return _expandedAttributeBuffer(mesh, slot);
+    }
+}
+
+std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::MeshPointer mesh, const QStringList& expandToMatchPositions) {
+    std::map<QString, gpu::BufferView> attributeViews;
+    if (!mesh) {
+        return attributeViews;
+    }
+    for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
+        auto name = a.first;
+        auto slot = a.second;
+        auto view = getBufferView(mesh, slot);
+        auto beforeCount = view.getNumElements();
+        auto beforeTotal = view._size;
+        if (expandToMatchPositions.contains(name)) {
+            expandAttributeToMatchPositions(mesh, slot);
+        }
+        if (beforeCount > 0) {
+            auto element = view._element;
+            auto vecN = element.getScalarCount();
+            //auto type = element.getType();
+            QString typeName = QString("%1").arg(element.getType());
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+            typeName = DebugNames::stringFrom(element.getType());
+#endif
+
+            attributeViews[name] = getBufferView(mesh, slot);
+
+#if DEV_BUILD
+            auto afterTotal = attributeViews[name]._size;
+            auto afterCount = attributeViews[name].getNumElements();
+            if (beforeTotal != afterTotal || beforeCount != afterCount) {
+                qCDebug(bufferhelper_logging, "NOTE:: gatherBufferViews.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
+                              name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+            }
+#endif
+        }
+    }
+    return attributeViews;
+}
+
+
+bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {    
+    qCInfo(bufferhelper_logging) << "Recalculating normals" << !!mesh;
+    if (!mesh) {
+        return false;
+    }
+    buffer_helpers::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
+    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
+    auto verts = mesh->getVertexBuffer();
+    auto indices = mesh->getIndexBuffer();
+    auto esize = indices._element.getSize();
+    auto numPoints = indices.getNumElements();
+    const auto TRIANGLE = 3;
+    quint32 numFaces = (quint32)numPoints / TRIANGLE;
+    //QVector<Triangle> faces;
+    QVector<glm::vec3> faceNormals;
+    QMap<QString,QVector<quint32>> vertexToFaces;
+    //faces.resize(numFaces);
+    faceNormals.resize(numFaces);
+    auto numNormals = normals.getNumElements();
+    qCInfo(bufferhelper_logging) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
+    if (normals.getNumElements() != verts.getNumElements()) {
+        return false;
+    }
+    for (quint32 i = 0; i < numFaces; i++) {
+        quint32 I = TRIANGLE * i;
+        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
+        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
+        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
+
+        Triangle face = {
+            verts.get<glm::vec3>(i1),
+            verts.get<glm::vec3>(i2),
+            verts.get<glm::vec3>(i0)
+        };
+        faceNormals[i] = face.getNormal();
+        if (glm::isnan(faceNormals[i].x)) {
+            qCInfo(bufferhelper_logging) << i << i0 << i1 << i2 << glmVecToVariant(face.v0) << glmVecToVariant(face.v1) << glmVecToVariant(face.v2);
+            break;
+        }
+        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
+        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
+    }
+    for (quint32 j = 0; j < numNormals; j++) {
+        //auto v = verts.get<glm::vec3>(j);
+        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
+        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
+        const auto& faces = vertexToFaces.value(key);
+        if (faces.size()) {
+            for (const auto i : faces) {
+                normal += faceNormals[i];
+            }
+            normal *= 1.0f / (float)faces.size();
+        } else {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(bufferhelper_logging) << "no faces for key!?" << key;
+            }
+            normal = verts.get<glm::vec3>(j);
+        }
+        if (glm::isnan(normal.x)) {
+            static int logged = 0;
+            if (logged++ < 10) {
+                qCInfo(bufferhelper_logging) << "isnan(normal.x)" << j << glmVecToVariant(normal);
+            }
+            break;
+        }
+        normals.edit<glm::vec3>(j) = glm::normalize(normal);
+    }
+    return true;
+}
+
+QVariant buffer_helpers::toVariant(const glm::mat4& mat4) {
+    QVector<float> floats;
+    floats.resize(16);
+    memcpy(floats.data(), &mat4, sizeof(glm::mat4));
+    QVariant v;
+    v.setValue<QVector<float>>(floats);
+    return v;
+};
+
+QVariant buffer_helpers::toVariant(const Extents& box) {
+    return QVariantMap{
+        { "center", glmVecToVariant(box.minimum + (box.size() / 2.0f)) },
+        { "minimum", glmVecToVariant(box.minimum) },
+        { "maximum", glmVecToVariant(box.maximum) },
+        { "dimensions", glmVecToVariant(box.size()) },
+    };
+}
+
+QVariant buffer_helpers::toVariant(const AABox& box) {
+    return QVariantMap{
+        { "brn", glmVecToVariant(box.getCorner()) },
+        { "tfl", glmVecToVariant(box.calcTopFarLeft()) },
+        { "center", glmVecToVariant(box.calcCenter()) },
+        { "minimum", glmVecToVariant(box.getMinimumPoint()) },
+        { "maximum", glmVecToVariant(box.getMaximumPoint()) },
+        { "dimensions", glmVecToVariant(box.getDimensions()) },
+    };
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
index d0d42ca419..d963fd4b22 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
@@ -7,6 +7,8 @@
 #pragma once
 
 #include <QtCore>
+#include <memory>
+#include <glm/glm.hpp>
 
 namespace gpu {
     class BufferView;
@@ -15,11 +17,34 @@ namespace gpu {
 
 template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
 template <typename T> const T glmVecFromVariant(const QVariant& v);
-QVariant bufferViewElementToVariant(const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
-bool bufferViewElementFromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v);
 
-template <typename T> gpu::BufferView bufferViewFromVector(QVector<T> elements, gpu::Element elementType);
+namespace graphics {
+    class Mesh;
+    using MeshPointer = std::shared_ptr<Mesh>;
+}
 
-gpu::BufferView cloneBufferView(const gpu::BufferView& input);
-gpu::BufferView resizedBufferView(const gpu::BufferView& input, quint32 numElements);
+class Extents;
+class AABox;
 
+struct buffer_helpers {
+    static graphics::MeshPointer cloneMesh(graphics::MeshPointer mesh);
+    static QMap<QString,int> ATTRIBUTES;
+    static std::map<QString, gpu::BufferView> gatherBufferViews(graphics::MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
+    static bool recalculateNormals(graphics::MeshPointer meshProxy);
+    static gpu::BufferView getBufferView(graphics::MeshPointer mesh, quint8 slot);
+
+    static QVariant toVariant(const Extents& box);
+    static QVariant toVariant(const AABox& box);
+    static QVariant toVariant(const glm::mat4& mat4);
+    static QVariant toVariant(const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
+
+    static bool fromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v);
+
+    template <typename T> static gpu::BufferView fromVector(const QVector<T>& elements, const gpu::Element& elementType);
+
+    template <typename T> static QVector<T> toVector(const gpu::BufferView& view, const char *hint = "");    
+    template <typename T> static T convert(const gpu::BufferView& view, quint32 index, const char* hint = "");
+    
+    static gpu::BufferView clone(const gpu::BufferView& input);
+    static gpu::BufferView resize(const gpu::BufferView& input, quint32 numElements);    
+};
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
index 367c0589e9..ab6f2c92be 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
@@ -26,7 +26,7 @@ QScriptValue getBufferViewElement(QScriptEngine* js, const gpu::BufferView& view
 }
 
 QScriptValue bufferViewElementToScriptValue(QScriptEngine* engine, const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
-    QVariant result = bufferViewElementToVariant(view, index, asArray, hint);
+    QVariant result = buffer_helpers::toVariant(view, index, asArray, hint);
     if (!result.isValid()) {
         return QScriptValue::NullValue;
     }
@@ -39,7 +39,7 @@ void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QScr
 }
 
 bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferView& view, quint32 index) {
-    return bufferViewElementFromVariant(view, index, v.toVariant());
+    return buffer_helpers::fromVariant(view, index, v.toVariant());
 }
 
 //
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
new file mode 100644
index 0000000000..15973b5852
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -0,0 +1,107 @@
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtCore/QVariant>
+#include <QtCore/QUuid>
+#include <QPointer>
+#include <memory>
+
+#include <DependencyManager.h>
+
+namespace graphics {
+    class Mesh;
+}
+namespace gpu {
+    class BufferView;
+}
+class QScriptEngine;
+
+namespace scriptable {
+    using Mesh = graphics::Mesh;
+    using MeshPointer = std::shared_ptr<scriptable::Mesh>;
+    using WeakMeshPointer = std::weak_ptr<scriptable::Mesh>;
+
+    class ScriptableModelBase;
+    using ScriptableModelBasePointer = QPointer<ScriptableModelBase>;
+
+    class ModelProvider;
+    using ModelProviderPointer = std::shared_ptr<scriptable::ModelProvider>;
+    using WeakModelProviderPointer = std::weak_ptr<scriptable::ModelProvider>;
+
+    class ScriptableMeshBase : public QObject {
+        Q_OBJECT
+    public:
+        WeakModelProviderPointer provider;
+        ScriptableModelBasePointer model;
+        WeakMeshPointer mesh;
+        MeshPointer ownedMesh;
+        QVariantMap metadata;
+        ScriptableMeshBase(WeakModelProviderPointer provider, ScriptableModelBasePointer model, WeakMeshPointer mesh, const QVariantMap& metadata);
+        ScriptableMeshBase(WeakMeshPointer mesh = WeakMeshPointer());
+        ScriptableMeshBase(MeshPointer mesh, const QVariantMap& metadata);
+        ScriptableMeshBase(const ScriptableMeshBase& other) { *this = other; }
+        ScriptableMeshBase& operator=(const ScriptableMeshBase& view);
+        virtual ~ScriptableMeshBase();
+        Q_INVOKABLE const scriptable::MeshPointer getMeshPointer() const { return mesh.lock(); }
+        Q_INVOKABLE const scriptable::ModelProviderPointer getModelProviderPointer() const { return provider.lock(); }
+        Q_INVOKABLE const scriptable::ScriptableModelBasePointer getModelBasePointer() const { return model; }
+    };
+    
+    // abstract container for holding one or more references to mesh pointers
+    class ScriptableModelBase : public QObject {
+        Q_OBJECT
+    public:
+        WeakModelProviderPointer provider;
+        QUuid objectID; // spatially nestable ID
+        QVariantMap metadata;
+        QVector<scriptable::ScriptableMeshBase> meshes;
+
+        ScriptableModelBase(QObject* parent = nullptr) : QObject(parent) {}
+        ScriptableModelBase(const ScriptableModelBase& other) { *this = other; }
+        ScriptableModelBase& operator=(const ScriptableModelBase& other) {
+            provider = other.provider;
+            objectID = other.objectID;
+            metadata = other.metadata;
+            for (auto& mesh : other.meshes) {
+                append(mesh);
+            }
+            return *this;
+        }
+        virtual ~ScriptableModelBase();
+
+        void mixin(const QVariantMap& other);
+        void append(const ScriptableModelBase& other, const QVariantMap& modelMetadata = QVariantMap());
+        void append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata = QVariantMap());
+        void append(const ScriptableMeshBase& mesh, const QVariantMap& metadata = QVariantMap());
+        // TODO: in future containers for these could go here
+        // QVariantMap shapes;
+        // QVariantMap materials;
+        // QVariantMap armature;
+    };
+
+    // mixin class for Avatar/Entity/Overlay Rendering that expose their in-memory graphics::Meshes
+    class ModelProvider {
+    public:
+        QVariantMap metadata{ { "providerType", "unknown" } };
+        static scriptable::ScriptableModelBase modelUnavailableError(bool* ok) { if (ok) { *ok = false; } return {}; }
+        virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) = 0;
+
+        virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) { return false; }
+    };
+
+    // mixin class for resolving UUIDs into a corresponding ModelProvider
+    class ModelProviderFactory : public Dependency {
+    public:
+        virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) = 0;
+    };
+
+    using uint32 = quint32;
+    class ScriptableModel;
+    using ScriptableModelPointer = QPointer<ScriptableModel>;
+    class ScriptableMesh;
+    using ScriptableMeshPointer = QPointer<ScriptableMesh>;
+    class ScriptableMeshPart;
+    using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
+    bool registerMetaTypes(QScriptEngine* engine);
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
new file mode 100644
index 0000000000..aabf83ff66
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
@@ -0,0 +1,3 @@
+#include "GraphicsScriptingUtil.h"
+
+Q_LOGGING_CATEGORY(graphics_scripting, "hifi.scripting.graphics")
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
new file mode 100644
index 0000000000..a536fc413c
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
@@ -0,0 +1,85 @@
+#pragma once
+
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
+#include <QtCore/QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QLoggingCategory>
+#include <QDebug>
+#include <memory>
+#include <functional>
+Q_DECLARE_LOGGING_CATEGORY(graphics_scripting)
+
+namespace scriptable {
+    // derive current context's C++ QObject (based on current JS "this" value)
+    template <typename T> T this_qobject_cast(QScriptEngine* engine) {
+        auto context = engine ? engine->currentContext() : nullptr;
+        return qscriptvalue_cast<T>(context ? context->thisObject() : QScriptValue::NullValue);
+    }
+    // JS => QPointer<QObject>
+    template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value) {
+        auto obj = value.toQObject();
+        qCInfo(graphics_scripting) << "qpointer_qobject_cast" << obj << value.toString();
+        if (auto tmp = qobject_cast<T*>(obj)) {
+            return QPointer<T>(tmp);
+        }
+        if (auto tmp = static_cast<T*>(obj)) {
+            return QPointer<T>(tmp);
+        }
+        return nullptr;
+    }
+    inline QString toDebugString(QObject* tmp) {
+        return QString("%0 (0x%1%2)")
+            .arg(tmp ? tmp->metaObject()->className() : "QObject")
+            .arg(qulonglong(tmp), 16, 16, QChar('0'))
+            .arg(tmp && tmp->objectName().size() ? " name=" + tmp->objectName() : "");
+    }
+    template <typename T> QString toDebugString(std::shared_ptr<T> tmp) {
+        return toDebugString(qobject_cast<QObject*>(tmp.get()));
+    }
+
+    // C++ > QtOwned instance
+    template <typename T, class... Rest> std::shared_ptr<T> make_qtowned(Rest... rest) {
+        T* tmp = new T(rest...);
+        qCInfo(graphics_scripting) << "scriptable::make_qtowned" << toDebugString(tmp);
+        QString debug = toDebugString(tmp);
+        if (tmp) {
+            tmp->metadata["__ownership__"] = QScriptEngine::QtOwnership;
+            QObject::connect(tmp, &QObject::destroyed, [=]() {  qCInfo(graphics_scripting) << "-------- ~scriptable::make_qtowned" << debug; });
+            auto ptr = std::shared_ptr<T>(tmp, [debug](T* tmp) {
+                    //qDebug() << "~std::shared_ptr<T>" << debug;
+                delete tmp;
+            });
+            return ptr;
+        } else {
+            return std::shared_ptr<T>(tmp);
+        }
+    }
+    // C++ > ScriptOwned JS instance
+    template <typename T, class... Rest> QPointer<T> make_scriptowned(Rest... rest) {
+        T* tmp = new T(rest...);
+        qCInfo(graphics_scripting) << "scriptable::make_scriptowned" << toDebugString(tmp);
+        if (tmp) {
+            tmp->metadata["__ownership__"] = QScriptEngine::ScriptOwnership;
+            //auto blah = (DeleterFunction)[](void* delme) { };
+            return add_scriptowned_destructor(tmp);
+        } else {
+            return QPointer<T>(tmp);
+        }
+    }
+    // C++ > ScriptOwned JS instance
+    template <typename T> QPointer<T> add_scriptowned_destructor(T* tmp) {
+        QString debug = toDebugString(tmp);
+        if (tmp) {
+            QObject::connect(tmp, &QObject::destroyed, [=]() {
+                    qCInfo(graphics_scripting) << "-------- ~scriptable::make_scriptowned" << debug;// << !!customDeleter;
+                //if (customDeleter) {
+                    // customDeleter(tmp);
+                //}
+            });
+        } else {
+            qCInfo(graphics_scripting) << "add_scriptowned_destructor -- not connecting to null value" << debug;
+        }
+        return QPointer<T>(tmp);
+    }
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
index ab85fb8265..ab9403a8ed 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
@@ -26,12 +26,11 @@
 
 #include "BufferViewScripting.h"
 #include "ScriptableMesh.h"
+#include "GraphicsScriptingUtil.h"
 
 #include "ModelScriptingInterface.moc"
 
-namespace {
-    QLoggingCategory model_scripting { "hifi.model.scripting" };
-}
+#include "RegisteredMetaTypes.h"
 
 ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
     if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
@@ -39,8 +38,51 @@ ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(pare
     }
 }
 
-void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName) {
-    auto handler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex, int partIndex) {
+    auto model = scriptable::make_qtowned<scriptable::ScriptableModel>();
+    if (mesh) {
+        model->append(*mesh);
+    }
+    return updateMeshes(uuid, model.get());
+}
+
+bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model) {
+    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
+    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
+    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
+    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
+    if (providerType.isEmpty()) {
+        providerType = "unknown";
+    }
+    bool success = false;
+    if (provider) {
+        qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
+        auto scriptableMeshes = provider->getScriptableModel(&success);
+        qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
+        if (success) {
+            const scriptable::ScriptableModelBasePointer base = model->operator scriptable::ScriptableModelBasePointer();
+            qCDebug(graphics_scripting) << "as base" << base;
+            if (base) {
+                //auto meshes = model->getConstMeshes();
+                success = provider->replaceScriptableModelMeshPart(base, -1, -1);
+                
+                // for (uint32_t m = 0; success && m < meshes.size(); m++) {
+                //     const auto& mesh = meshes.at(m);
+                //     for (int p = 0; success && p < mesh->getNumParts(); p++) {
+                //         qCDebug(graphics_scripting) << "provider->replaceScriptableModelMeshPart" << "meshIndex" << m << "partIndex" << p;
+                //         success = provider->replaceScriptableModelMeshPart(base, m, p);
+                //         //if (!success) {
+                //         qCDebug(graphics_scripting) << "//provider->replaceScriptableModelMeshPart" << "meshIndex" << m << "partIndex" << p << success;
+                //     }
+                // }
+            }
+        }
+    }
+    return success;
+}
+
+void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue callback) {
+    auto handler = scriptable::jsBindCallback(callback);
     Q_ASSERT(handler.engine() == this->engine());
     QPointer<BaseScriptEngine> engine = dynamic_cast<BaseScriptEngine*>(handler.engine());
 
@@ -49,18 +91,23 @@ void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback
     QString error;
 
     auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    qDebug() << "appProvider" << appProvider.data();
+    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
     scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
     QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
     if (providerType.isEmpty()) {
         providerType = "unknown";
     }
     if (provider) {
-        qCDebug(model_scripting) << "fetching meshes from " << providerType << "...";
+        qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
         auto scriptableMeshes = provider->getScriptableModel(&success);
-        qCDebug(model_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
+        qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
         if (success) {
-            meshes = new scriptable::ScriptableModel(scriptableMeshes);//SimpleModelProxy::fromScriptableModel(scriptableMeshes);
+            meshes = scriptable::make_scriptowned<scriptable::ScriptableModel>(scriptableMeshes);
+        QString debugString = scriptable::toDebugString(meshes);
+        QObject::connect(meshes, &QObject::destroyed, this, [=]() {
+                qCDebug(graphics_scripting) << "///fetched meshes" << debugString;
+            });
+        
             if (meshes->objectName().isEmpty()) {
                 meshes->setObjectName(providerType+"::meshes");
             }
@@ -75,20 +122,20 @@ void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue scopeOrCallback
     }
 
     if (!error.isEmpty()) {
-        qCWarning(model_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
+        qCWarning(graphics_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
         callScopedHandlerObject(handler, engine->makeError(error), QScriptValue::NullValue);
     } else {
-        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->newQObject(meshes, QScriptEngine::ScriptOwnership));
+        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->toScriptValue(meshes));
     }
 }
 
 QString ModelScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
     const auto& in = _in.getConstMeshes();
-    qCDebug(model_scripting) << "meshToOBJ" << in.size();
+    qCDebug(graphics_scripting) << "meshToOBJ" << in.size();
     if (in.size()) {
         QList<scriptable::MeshPointer> meshes;
         foreach (auto meshProxy, in) {
-            qCDebug(model_scripting) << "meshToOBJ" << meshProxy;
+            qCDebug(graphics_scripting) << "meshToOBJ" << meshProxy;
             if (meshProxy) {
                 meshes.append(getMeshPointer(meshProxy));
             }
@@ -207,7 +254,7 @@ QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _
                                                           (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
 
 
-    return engine()->toScriptValue(scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, result)));
+    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(result));
 }
 
 QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform) {
@@ -220,8 +267,7 @@ QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPo
                                           [&](glm::vec3 color){ return color; },
                                           [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
                                           [&](uint32_t index){ return index; });
-    scriptable::ScriptableMeshPointer resultProxy = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, result));
-    return engine()->toScriptValue(resultProxy);
+    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(result));
 }
 
 QScriptValue ModelScriptingInterface::getVertexCount(scriptable::ScriptableMeshPointer meshProxy) {
@@ -270,7 +316,7 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices
                                          sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
         mesh->addAttribute(gpu::Stream::NORMAL, normalBufferView);
     } else {
-        qCWarning(model_scripting, "ModelScriptingInterface::newMesh normals must be same length as vertices");
+        qCWarning(graphics_scripting, "ModelScriptingInterface::newMesh normals must be same length as vertices");
     }
 
     // indices (faces)
@@ -300,54 +346,10 @@ QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices
 
 
 
-    scriptable::ScriptableMeshPointer meshProxy = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(nullptr, mesh));
-    return engine()->toScriptValue(meshProxy);
+    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh));
 }
 
 namespace {
-    QScriptValue meshPointerToScriptValue(QScriptEngine* engine, scriptable::ScriptableMeshPointer const &in) {
-        if (!in) {
-            return QScriptValue::NullValue;
-        }
-        return engine->newQObject(in, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
-    }
-
-    void meshPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
-        auto obj = value.toQObject();
-        qDebug() << "meshPointerFromScriptValue" << obj;
-        if (auto tmp = qobject_cast<scriptable::ScriptableMesh*>(obj)) {
-            out = tmp;
-        }
-        // FIXME: Why does above cast not work on Win32!?
-        if (!out) {
-            if (auto smp = static_cast<scriptable::ScriptableMesh*>(obj)) {
-                qDebug() << "meshPointerFromScriptValue2" << smp;
-                out = smp;
-            }
-        }
-    }
-
-    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer &in) {
-        return engine->newQObject(in, QScriptEngine::QtOwnership,  QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
-        // QScriptValue result = engine->newArray();
-        // int i = 0;
-        // foreach(auto& mesh, in->getMeshes()) {
-        //     result.setProperty(i++, meshPointerToScriptValue(engine, mesh));
-        // }
-        // return result;
-    }
-
-    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
-        const auto length = value.property("length").toInt32();
-        qCDebug(model_scripting) << "in modelPointerFromScriptValue, length =" << length;
-        for (int i = 0; i < length; i++) {
-            if (const auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(value.property(i).toQObject())) {
-                out->meshes.append(meshProxy->getMeshPointer());
-            } else {
-                qCDebug(model_scripting) << "null meshProxy" << i;
-            }
-        }
-    }
 
     // FIXME: MESHFACES:
     // QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
@@ -365,29 +367,11 @@ namespace {
     //     qScriptValueToSequence(array, result);
     // }
 
-    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<quint32>& vector) {
-        return qScriptValueFromSequence(engine, vector);
-    }
-
-    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<quint32>& result) {
-        qScriptValueToSequence(array, result);
-    }
 }
 
-int meshUint32 = qRegisterMetaType<quint32>();
-namespace mesh {
-    int meshUint32 = qRegisterMetaType<uint32>();
-}
-int qVectorMeshUint32 = qRegisterMetaType<QVector<quint32>>();
 
 void ModelScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
-    qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
-    qScriptRegisterSequenceMetaType<QVector<quint32>>(engine);
-
-    qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
-    qScriptRegisterMetaType(engine, meshPointerToScriptValue, meshPointerFromScriptValue);
-    qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
-
+    scriptable::registerMetaTypes(engine);
     // FIXME: MESHFACES: remove if MeshFace is not needed anywhere
     // qScriptRegisterSequenceMetaType<mesh::MeshFaces>(engine);
     // qScriptRegisterMetaType(engine, meshFaceToScriptValue, meshFaceFromScriptValue);
@@ -395,7 +379,7 @@ void ModelScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
 }
 
 MeshPointer ModelScriptingInterface::getMeshPointer(const scriptable::ScriptableMesh& meshProxy) {
-    return meshProxy._mesh;//getMeshPointer(&meshProxy);
+    return meshProxy.getMeshPointer();
 }
 MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMesh& meshProxy) {
     return getMeshPointer(&meshProxy);
@@ -406,7 +390,7 @@ MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPo
         if (context()){
             context()->throwError("expected meshProxy as first parameter");
         } else {
-            qDebug() << "expected meshProxy as first parameter";
+            qCDebug(graphics_scripting) << "expected meshProxy as first parameter";
         }
         return result;
     }
@@ -415,7 +399,7 @@ MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPo
         if (context()) {
             context()->throwError("expected valid meshProxy as first parameter");
         } else {
-            qDebug() << "expected valid meshProxy as first parameter";
+            qCDebug(graphics_scripting) << "expected valid meshProxy as first parameter";
         }
         return result;
     }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
index eac4df3216..fa7b885014 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
@@ -15,19 +15,17 @@
 #include <QtCore/QObject>
 #include <QUrl>
 
-#include <RegisteredMetaTypes.h>
-
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptable>
 
 #include "ScriptableMesh.h"
 #include <DependencyManager.h>
+
 class ModelScriptingInterface : public QObject, public QScriptable, public Dependency {
     Q_OBJECT
 
 public:
     ModelScriptingInterface(QObject* parent = nullptr);
-    static void registerMetaTypes(QScriptEngine* engine);
 
 public slots:
     /**jsdoc
@@ -36,7 +34,9 @@ public slots:
      * @function ModelScriptingInterface.getMeshes
      * @param {EntityID} entityID The ID of the entity whose meshes are to be retrieve
      */
-    void getMeshes(QUuid uuid, QScriptValue scopeOrCallback, QScriptValue methodOrName = QScriptValue());
+    void getMeshes(QUuid uuid, QScriptValue callback);
+    bool updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model);
+    bool updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex=0, int partIndex=0);
 
     QString meshToOBJ(const scriptable::ScriptableModel& in);
 
@@ -48,6 +48,8 @@ public slots:
     QScriptValue getVertexCount(scriptable::ScriptableMeshPointer meshProxy);
     QScriptValue getVertex(scriptable::ScriptableMeshPointer meshProxy, quint32 vertexIndex);
 
+    static void registerMetaTypes(QScriptEngine* engine);
+    
 private:
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 1b16a6d263..b83b901acd 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -9,17 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GraphicsScriptingUtil.h"
 #include "ScriptableMesh.h"
 
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/norm.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include <graphics/Geometry.h>
 #include <graphics-scripting/DebugNames.h>
 #include <graphics-scripting/BufferViewHelpers.h>
 #include <graphics-scripting/BufferViewScripting.h>
-#include <Extents.h>
 
 #include "ScriptableMesh.moc"
 
@@ -29,49 +28,45 @@
 
 #include "OBJWriter.h"
 
-QLoggingCategory mesh_logging { "hifi.scripting.mesh" };
-
-// FIXME: unroll/resolve before PR
-using namespace scriptable;
-QMap<QString,int> ScriptableMesh::ATTRIBUTES{
-    {"position", gpu::Stream::POSITION },
-    {"normal", gpu::Stream::NORMAL },
-    {"color", gpu::Stream::COLOR },
-    {"tangent", gpu::Stream::TEXCOORD0 },
-    {"skin_cluster_index", gpu::Stream::SKIN_CLUSTER_INDEX },
-    {"skin_cluster_weight", gpu::Stream::SKIN_CLUSTER_WEIGHT },
-    {"texcoord0", gpu::Stream::TEXCOORD0 },
-    {"texcoord1", gpu::Stream::TEXCOORD1 },
-    {"texcoord2", gpu::Stream::TEXCOORD2 },
-    {"texcoord3", gpu::Stream::TEXCOORD3 },
-    {"texcoord4", gpu::Stream::TEXCOORD4 },
-};
-
-
-QString scriptable::ScriptableModel::toString() const {
-    return QString("[ScriptableModel%1%2]")
-        .arg(objectID.isNull() ? "" : " objectID="+objectID.toString())
-        .arg(objectName().isEmpty() ? "" : " name=" +objectName());
+namespace scriptable {
+    // QScriptValue jsBindCallback(QScriptValue callback);
+    // template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value);
+    // template <typename T> T this_qobject_cast(QScriptEngine* engine);
+    // template <typename T, class... Rest> QPointer<T> make_scriptowned(Rest... rest);
 }
 
-const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
-    QVector<scriptable::ScriptableMeshPointer> out;
-    for(const auto& mesh : meshes) {
-        const scriptable::ScriptableMeshPointer m = scriptable::ScriptableMeshPointer(new scriptable::ScriptableMesh(const_cast<scriptable::ScriptableModel*>(this), mesh));
-        out << m;
+scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
+    : parentMesh(parentMesh), partIndex(partIndex)  {
+    setObjectName(QString("%1.part[%2]").arg(parentMesh ? parentMesh->objectName() : "").arg(partIndex));
+}
+
+scriptable::ScriptableMesh::ScriptableMesh(const ScriptableMeshBase& other)
+    : ScriptableMeshBase(other) {
+    auto mesh = getMeshPointer();
+    QString name = mesh ? QString::fromStdString(mesh->modelName) : "";
+    if (name.isEmpty()) {
+        name = mesh ? QString::fromStdString(mesh->displayName) : "";
     }
-    return out;
+    auto parentModel = getParentModel();
+    setObjectName(QString("%1#%2").arg(parentModel ? parentModel->objectName() : "").arg(name));
 }
-QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
-    QVector<scriptable::ScriptableMeshPointer> out;
-    for(auto& mesh : meshes) {
-        scriptable::ScriptableMeshPointer m{new scriptable::ScriptableMesh(this, mesh)};
-        out << m;
+
+QVector<scriptable::ScriptableMeshPartPointer> scriptable::ScriptableMesh::getMeshParts() const {
+    QVector<scriptable::ScriptableMeshPartPointer> out;
+    for (quint32 i = 0; i < getNumParts(); i++) {
+        out << scriptable::make_scriptowned<scriptable::ScriptableMeshPart>(getSelf(), i);
     }
     return out;
 }
 
-quint32 ScriptableMesh::getNumVertices() const {
+quint32 scriptable::ScriptableMesh::getNumIndices() const {
+    if (auto mesh = getMeshPointer()) {
+        return (quint32)mesh->getNumIndices();
+    }
+    return 0;
+}
+
+quint32 scriptable::ScriptableMesh::getNumVertices() const {
     if (auto mesh = getMeshPointer()) {
         return (quint32)mesh->getNumVertices();
     }
@@ -87,16 +82,10 @@ quint32 ScriptableMesh::getNumVertices() const {
 //     return glm::vec3(NAN);
 // }
 
-namespace {
-    gpu::BufferView getBufferView(scriptable::MeshPointer mesh, gpu::Stream::Slot slot) {
-        return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
-    }
-}
-
-QVector<quint32> ScriptableMesh::findNearbyIndices(const glm::vec3& origin, float epsilon) const {
+QVector<quint32> scriptable::ScriptableMesh::findNearbyIndices(const glm::vec3& origin, float epsilon) const {
     QVector<quint32> result;
     if (auto mesh = getMeshPointer()) {
-        const auto& pos = getBufferView(mesh, gpu::Stream::POSITION);
+        const auto& pos = buffer_helpers::getBufferView(mesh, gpu::Stream::POSITION);
         const uint32_t num = (uint32_t)pos.getNumElements();
         for (uint32_t i = 0; i < num; i++) {
             const auto& position = pos.get<glm::vec3>(i);
@@ -108,40 +97,45 @@ QVector<quint32> ScriptableMesh::findNearbyIndices(const glm::vec3& origin, floa
     return result;
 }
 
-QVector<quint32> ScriptableMesh::getIndices() const {
+QVector<quint32> scriptable::ScriptableMesh::getIndices() const {
     QVector<quint32> result;
     if (auto mesh = getMeshPointer()) {
-        qCDebug(mesh_logging, "getTriangleIndices mesh %p", mesh.get());
+        qCDebug(graphics_scripting, "getTriangleIndices mesh %p", mesh.get());
         gpu::BufferView indexBufferView = mesh->getIndexBuffer();
         if (quint32 count = (quint32)indexBufferView.getNumElements()) {
             result.resize(count);
-            auto buffer = indexBufferView._buffer;
-            if (indexBufferView._element.getSize() == 4) {
+            switch(indexBufferView._element.getType()) {
+            case gpu::UINT32:
                 // memcpy(result.data(), buffer->getData(), result.size()*sizeof(quint32));
                 for (quint32 i = 0; i < count; i++) {
                     result[i] = indexBufferView.get<quint32>(i);
                 }
-            } else {
+                break;
+            case gpu::UINT16:
                 for (quint32 i = 0; i < count; i++) {
                     result[i] = indexBufferView.get<quint16>(i);
                 }
+                break;
+            default:
+                assert(false);
+                Q_ASSERT(false);
             }
         }
     }
     return result;
 }
 
-quint32 ScriptableMesh::getNumAttributes() const {
+quint32 scriptable::ScriptableMesh::getNumAttributes() const {
     if (auto mesh = getMeshPointer()) {
         return (quint32)mesh->getNumAttributes();
     }
     return 0;
 }
-QVector<QString> ScriptableMesh::getAttributeNames() const {
+QVector<QString> scriptable::ScriptableMesh::getAttributeNames() const {
     QVector<QString> result;
     if (auto mesh = getMeshPointer()) {
-        for (const auto& a : ATTRIBUTES.toStdMap()) {
-            auto bufferView = getBufferView(mesh, a.second);
+        for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
+            auto bufferView = buffer_helpers::getBufferView(mesh, a.second);
             if (bufferView.getNumElements() > 0) {
                 result << a.first;
             }
@@ -151,55 +145,49 @@ QVector<QString> ScriptableMesh::getAttributeNames() const {
 }
 
 // override
-QVariantMap ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
+QVariantMap scriptable::ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
     return getVertexAttributes(vertexIndex, getAttributeNames());
 }
 
-bool ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
-    //qDebug()  << "setVertexAttributes" << vertexIndex << attributes;
-    for (auto& a : gatherBufferViews(getMeshPointer())) {
+bool scriptable::ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
+    //qCInfo(graphics_scripting)  << "setVertexAttributes" << vertexIndex << attributes;
+    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    for (auto& a : buffer_helpers::gatherBufferViews(getMeshPointer())) {
         const auto& name = a.first;
         const auto& value = attributes.value(name);
         if (value.isValid()) {
             auto& view = a.second;
-            //qCDebug(mesh_logging) << "setVertexAttributes" << vertexIndex << name;
-            bufferViewElementFromVariant(view, vertexIndex, value);
+            //qCDebug(graphics_scripting) << "setVertexAttributes" << vertexIndex << name;
+            buffer_helpers::fromVariant(view, vertexIndex, value);
         } else {
-            //qCDebug(mesh_logging) << "(skipping) setVertexAttributes" << vertexIndex << name;
+            //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
         }
     }
     return true;
 }
 
-int ScriptableMesh::_getSlotNumber(const QString& attributeName) const {
+int scriptable::ScriptableMesh::_getSlotNumber(const QString& attributeName) const {
     if (auto mesh = getMeshPointer()) {
-        return ATTRIBUTES.value(attributeName, -1);
+        return buffer_helpers::ATTRIBUTES.value(attributeName, -1);
     }
     return -1;
 }
 
 
-QVariantMap ScriptableMesh::getMeshExtents() const {
+QVariantMap scriptable::ScriptableMesh::getMeshExtents() const {
     auto mesh = getMeshPointer();
     auto box = mesh ? mesh->evalPartsBound(0, (int)mesh->getNumParts()) : AABox();
-    return {
-        { "brn", glmVecToVariant(box.getCorner()) },
-        { "tfl", glmVecToVariant(box.calcTopFarLeft()) },
-        { "center", glmVecToVariant(box.calcCenter()) },
-        { "min", glmVecToVariant(box.getMinimumPoint()) },
-        { "max", glmVecToVariant(box.getMaximumPoint()) },
-        { "dimensions", glmVecToVariant(box.getDimensions()) },
-    };
+    return buffer_helpers::toVariant(box).toMap();
 }
 
-quint32 ScriptableMesh::getNumParts() const {
+quint32 scriptable::ScriptableMesh::getNumParts() const {
     if (auto mesh = getMeshPointer()) {
         return (quint32)mesh->getNumParts();
     }
     return 0;
 }
 
-QVariantMap ScriptableMesh::scaleToFit(float unitScale) {
+QVariantMap scriptable::ScriptableMeshPart::scaleToFit(float unitScale) {
     if (auto mesh = getMeshPointer()) {
         auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
         auto center = box.calcCenter();
@@ -208,10 +196,10 @@ QVariantMap ScriptableMesh::scaleToFit(float unitScale) {
     }
     return {};
 }
-QVariantMap ScriptableMesh::translate(const glm::vec3& translation) {
+QVariantMap scriptable::ScriptableMeshPart::translate(const glm::vec3& translation) {
     return transform(glm::translate(translation));
 }
-QVariantMap ScriptableMesh::scale(const glm::vec3& scale, const glm::vec3& origin) {
+QVariantMap scriptable::ScriptableMeshPart::scale(const glm::vec3& scale, const glm::vec3& origin) {
     if (auto mesh = getMeshPointer()) {
         auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
         glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
@@ -219,10 +207,10 @@ QVariantMap ScriptableMesh::scale(const glm::vec3& scale, const glm::vec3& origi
     }
     return {};
 }
-QVariantMap ScriptableMesh::rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin) {
+QVariantMap scriptable::ScriptableMeshPart::rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin) {
     return rotate(glm::quat(glm::radians(eulerAngles)), origin);
 }
-QVariantMap ScriptableMesh::rotate(const glm::quat& rotation, const glm::vec3& origin) {
+QVariantMap scriptable::ScriptableMeshPart::rotate(const glm::quat& rotation, const glm::vec3& origin) {
     if (auto mesh = getMeshPointer()) {
         auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
         glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
@@ -230,184 +218,61 @@ QVariantMap ScriptableMesh::rotate(const glm::quat& rotation, const glm::vec3& o
     }
     return {};
 }
-QVariantMap ScriptableMesh::transform(const glm::mat4& transform) {
+QVariantMap scriptable::ScriptableMeshPart::transform(const glm::mat4& transform) {
     if (auto mesh = getMeshPointer()) {
-        const auto& pos = getBufferView(mesh, gpu::Stream::POSITION);
+        const auto& pos = buffer_helpers::getBufferView(mesh, gpu::Stream::POSITION);
         const uint32_t num = (uint32_t)pos.getNumElements();
         for (uint32_t i = 0; i < num; i++) {
             auto& position = pos.edit<glm::vec3>(i);
             position = transform * glm::vec4(position, 1.0f);
         }
+        return parentMesh->getMeshExtents();
     }
-    return getMeshExtents();
+    return {};
 }
 
-QVariantList ScriptableMesh::getAttributeValues(const QString& attributeName) const {
+QVariantList scriptable::ScriptableMesh::getAttributeValues(const QString& attributeName) const {
     QVariantList result;
     auto slotNum = _getSlotNumber(attributeName);
     if (slotNum >= 0) {
         auto slot = (gpu::Stream::Slot)slotNum;
-        const auto& bufferView = getBufferView(getMeshPointer(), slot);
+        const auto& bufferView = buffer_helpers::getBufferView(getMeshPointer(), slot);
         if (auto len = bufferView.getNumElements()) {
             bool asArray = bufferView._element.getType() != gpu::FLOAT;
             for (quint32 i = 0; i < len; i++) {
-                result << bufferViewElementToVariant(bufferView, i, asArray, attributeName.toStdString().c_str());
+                result << buffer_helpers::toVariant(bufferView, i, asArray, attributeName.toStdString().c_str());
             }
         }
     }
     return result;
 }
-QVariantMap ScriptableMesh::getVertexAttributes(quint32 vertexIndex, QVector<QString> names) const {
+QVariantMap scriptable::ScriptableMesh::getVertexAttributes(quint32 vertexIndex, QVector<QString> names) const {
     QVariantMap result;
     auto mesh = getMeshPointer();
     if (!mesh || vertexIndex >= getNumVertices()) {
         return result;
     }
-    for (const auto& a : ATTRIBUTES.toStdMap()) {
+    for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
         auto name = a.first;
         if (!names.contains(name)) {
             continue;
         }
         auto slot = a.second;
-        const gpu::BufferView& bufferView = getBufferView(mesh, slot);
+        const gpu::BufferView& bufferView = buffer_helpers::getBufferView(mesh, slot);
         if (vertexIndex < bufferView.getNumElements()) {
             bool asArray = bufferView._element.getType() != gpu::FLOAT;
-            result[name] = bufferViewElementToVariant(bufferView, vertexIndex, asArray, name.toStdString().c_str());
+            result[name] = buffer_helpers::toVariant(bufferView, vertexIndex, asArray, name.toStdString().c_str());
         }
     }
     return result;
 }
 
-/// --- buffer view <-> variant helpers
-
-namespace {
-    // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
-    gpu::BufferView _expandedAttributeBuffer(const scriptable::MeshPointer mesh, gpu::Stream::Slot slot, const gpu::Element& elementType) {
-        gpu::Size elementSize = elementType.getSize();
-        gpu::BufferView bufferView = getBufferView(mesh, slot);
-        auto nPositions = mesh->getNumVertices();
-        auto vsize = nPositions * elementSize;
-        auto diffTypes = (elementType.getType() != bufferView._element.getType()  ||
-                          elementType.getSize() > bufferView._element.getSize() ||
-                          elementType.getScalarCount() > bufferView._element.getScalarCount() ||
-                          vsize > bufferView._size
-            );
-        auto hint = DebugNames::stringFrom(slot);
-
-#ifdef DEV_BUILD
-        auto beforeCount = bufferView.getNumElements();
-        auto beforeTotal = bufferView._size;
-#endif
-        if (bufferView.getNumElements() < nPositions || diffTypes) {
-            if (!bufferView._buffer || bufferView.getNumElements() == 0) {
-                qCInfo(mesh_logging).nospace() << "ScriptableMesh -- adding missing mesh attribute '" << hint << "' for BufferView";
-                gpu::Byte *data = new gpu::Byte[vsize];
-                memset(data, 0, vsize);
-                auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
-                delete[] data;
-                bufferView = gpu::BufferView(buffer, elementType);
-                mesh->addAttribute(slot, bufferView);
-            } else {
-                qCInfo(mesh_logging) << "ScriptableMesh -- resizing Buffer current:" << hint << bufferView._buffer->getSize() << "wanted:" << vsize;
-                bufferView._element = elementType;
-                bufferView._buffer->resize(vsize);
-                bufferView._size = bufferView._buffer->getSize();
-            }
-        }
-#ifdef DEV_BUILD
-        auto afterCount = bufferView.getNumElements();
-        auto afterTotal = bufferView._size;
-        if (beforeTotal != afterTotal || beforeCount != afterCount) {
-            auto typeName = DebugNames::stringFrom(bufferView._element.getType());
-            qCDebug(mesh_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                          hint.toStdString().c_str(), bufferView._element.getScalarCount(),
-                          typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
-        }
-#endif
-        return bufferView;
-    }
-    const gpu::Element UNUSED{ gpu::SCALAR, gpu::UINT8, gpu::RAW };
-
-    gpu::Element getVecNElement(gpu::Type T, int N) {
-        switch(N) {
-        case 2: return { gpu::VEC2, T, gpu::XY };
-        case 3: return { gpu::VEC3, T, gpu::XYZ };
-        case 4: return { gpu::VEC4, T, gpu::XYZW };
-        }
-        Q_ASSERT(false);
-        return UNUSED;
-    }
-
-    gpu::BufferView expandAttributeToMatchPositions(scriptable::MeshPointer mesh, gpu::Stream::Slot slot) {
-        if (slot == gpu::Stream::POSITION) {
-            return getBufferView(mesh, slot);
-        }
-        return _expandedAttributeBuffer(mesh, slot, getVecNElement(gpu::FLOAT, 3));
-    }
-}
-
-std::map<QString, gpu::BufferView> ScriptableMesh::gatherBufferViews(scriptable::MeshPointer mesh, const QStringList& expandToMatchPositions) {
-    std::map<QString, gpu::BufferView> attributeViews;
-    if (!mesh) {
-        return attributeViews;
-    }
-    for (const auto& a : ScriptableMesh::ATTRIBUTES.toStdMap()) {
-        auto name = a.first;
-        auto slot = a.second;
-        if (expandToMatchPositions.contains(name)) {
-            expandAttributeToMatchPositions(mesh, slot);
-        }
-        auto view = getBufferView(mesh, slot);
-        auto beforeCount = view.getNumElements();
-        if (beforeCount > 0) {
-            auto element = view._element;
-            auto vecN = element.getScalarCount();
-            auto type = element.getType();
-            QString typeName = DebugNames::stringFrom(element.getType());
-            auto beforeTotal = view._size;
-
-            attributeViews[name] = _expandedAttributeBuffer(mesh, slot, getVecNElement(type, vecN));
-
-#if DEV_BUILD
-            auto afterTotal = attributeViews[name]._size;
-            auto afterCount = attributeViews[name].getNumElements();
-            if (beforeTotal != afterTotal || beforeCount != afterCount) {
-                qCDebug(mesh_logging, "NOTE:: gatherBufferViews.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                              name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
-            }
-#endif
-        }
-    }
-    return attributeViews;
-}
-
-QScriptValue ScriptableModel::mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName) {
-    auto context = scopeOrCallback.engine()->currentContext();
-    auto _in = context->thisObject();
-    qCInfo(mesh_logging) << "mapAttributeValues" << _in.toVariant().typeName() << _in.toVariant().toString() << _in.toQObject();
-    auto model = qscriptvalue_cast<scriptable::ScriptableModel>(_in);
-    QVector<scriptable::ScriptableMeshPointer> in = model.getMeshes();
-    if (in.size()) {
-        foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
-            meshProxy->mapAttributeValues(scopeOrCallback, methodOrName);
-        }
-        return _in;
-    } else if (auto meshProxy = qobject_cast<scriptable::ScriptableMesh*>(_in.toQObject())) {
-        return meshProxy->mapAttributeValues(scopeOrCallback, methodOrName);
-    } else {
-        context->throwError("invalid ModelProxy || MeshProxyPointer");
-    }
-    return false;
-}
-
-
-
-QScriptValue ScriptableMesh::mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName) {
+quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
     auto mesh = getMeshPointer();
     if (!mesh) {
-        return false;
+        return 0;
     }
-    auto scopedHandler = makeScopedHandlerObject(scopeOrCallback, methodOrName);
+    auto scopedHandler = jsBindCallback(_callback);
 
     // input buffers
     gpu::BufferView positions = mesh->getVertexBuffer();
@@ -417,20 +282,25 @@ QScriptValue ScriptableMesh::mapAttributeValues(QScriptValue scopeOrCallback, QS
     // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
     auto scope = scopedHandler.property("scope");
     auto callback = scopedHandler.property("callback");
-    auto js = engine(); // cache value to avoid resolving each iteration
-    auto meshPart = thisObject();//js->toScriptValue(meshProxy);
-
+    auto js = engine() ? engine() : scopedHandler.engine(); // cache value to avoid resolving each iteration
+    if (!js) {
+        return 0;
+    }
+    auto meshPart = js ? js->toScriptValue(getSelf()) : QScriptValue::NullValue;
+    qCInfo(graphics_scripting) << "mapAttributeValues" << mesh.get() << js->currentContext()->thisObject().toQObject();
     auto obj = js->newObject();
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" });
-    for (uint32_t i=0; i < nPositions; i++) {
+    auto attributeViews = buffer_helpers::gatherBufferViews(mesh, { "normal", "color" });
+    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    uint32_t i = 0;
+    for (; i < nPositions; i++) {
         for (const auto& a : attributeViews) {
             bool asArray = a.second._element.getType() != gpu::FLOAT;
             obj.setProperty(a.first, bufferViewElementToScriptValue(js, a.second, i, asArray, a.first.toStdString().c_str()));
         }
         auto result = callback.call(scope, { obj, i, meshPart });
         if (js->hasUncaughtException()) {
-            context()->throwValue(js->uncaughtException());
-            return false;
+            js->currentContext()->throwValue(js->uncaughtException());
+            return i;
         }
 
         if (result.isBool() && !result.toBool()) {
@@ -450,15 +320,19 @@ QScriptValue ScriptableMesh::mapAttributeValues(QScriptValue scopeOrCallback, QS
             }
         }
     }
-    return thisObject();
+    return i;
 }
 
-QScriptValue ScriptableMesh::unrollVertices(bool recalcNormals) {
+quint32 scriptable::ScriptableMeshPart::mapAttributeValues(QScriptValue callback) {
+    return parentMesh ? parentMesh->mapAttributeValues(callback) : 0; 
+}
+
+bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
     auto meshProxy = this;
     auto mesh = getMeshPointer();
-    qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices" << !!mesh<< !!meshProxy;
+    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices" << !!mesh<< !!meshProxy;
     if (!mesh) {
-        return QScriptValue();
+        return false;
     }
 
     auto positions = mesh->getVertexBuffer();
@@ -467,8 +341,9 @@ QScriptValue ScriptableMesh::unrollVertices(bool recalcNormals) {
     auto buffer = new gpu::Buffer();
     buffer->resize(numPoints * sizeof(uint32_t));
     auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
-    qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices numPoints" << numPoints;
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices numPoints" << numPoints;
+    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
     for (const auto& a : attributeViews) {
         auto& view = a.second;
         auto sz = view._element.getSize();
@@ -477,19 +352,21 @@ QScriptValue ScriptableMesh::unrollVertices(bool recalcNormals) {
         auto points = gpu::BufferView(buffer, view._element);
         auto src = (uint8_t*)view._buffer->getData();
         auto dest = (uint8_t*)points._buffer->getData();
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices buffer" << a.first;
-        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices source" << view.getNumElements();
-        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices dest" << points.getNumElements();
-        qCInfo(mesh_logging) << "ScriptableMesh::unrollVertices sz" << sz << src << dest << slot;
+        auto slot = buffer_helpers::ATTRIBUTES[a.first];
+        if (0) {
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices buffer" << a.first;
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices source" << view.getNumElements();
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices dest" << points.getNumElements();
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices sz" << sz << src << dest << slot;
+        }
         auto esize = indices._element.getSize();
         const char* hint= a.first.toStdString().c_str();
         for(quint32 i = 0; i < numPoints; i++) {
             quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
             newindices.edit<uint32_t>(i) = i;
-            bufferViewElementFromVariant(
+            buffer_helpers::fromVariant(
                 points, i,
-                bufferViewElementToVariant(view, index, false, hint)
+                buffer_helpers::toVariant(view, index, false, hint)
                     );
         }
         if (slot == gpu::Stream::POSITION) {
@@ -505,62 +382,70 @@ QScriptValue ScriptableMesh::unrollVertices(bool recalcNormals) {
     return true;
 }
 
-bool ScriptableMesh::replaceMeshData(scriptable::ScriptableMeshPointer src, const QVector<QString>& attributeNames) {
+bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshPartPointer src, const QVector<QString>& attributeNames) {
     auto target = getMeshPointer();
     auto source = src ? src->getMeshPointer() : nullptr;
     if (!target || !source) {
-        context()->throwError("ScriptableMesh::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
+        if (context()) {
+            context()->throwError("ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
+        } else {
+            qCWarning(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers";
+        }
         return false;
     }
 
-    QVector<QString> attributes = attributeNames.isEmpty() ? src->getAttributeNames() : attributeNames;
+    QVector<QString> attributes = attributeNames.isEmpty() ? src->parentMesh->getAttributeNames() : attributeNames;
 
-    //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData -- source:" << source->displayName << "target:" << target->displayName << "attributes:" << attributes;
+    qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- " <<
+        "source:" << QString::fromStdString(source->displayName) <<
+        "target:" << QString::fromStdString(target->displayName) <<
+        "attributes:" << attributes;
+
+    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
 
     // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
     if (attributeNames.isEmpty()) {
-        auto attributeViews = ScriptableMesh::gatherBufferViews(target);
+        auto attributeViews = buffer_helpers::gatherBufferViews(target);
         for (const auto& a : attributeViews) {
-            auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+            auto slot = buffer_helpers::ATTRIBUTES[a.first];
             if (!attributes.contains(a.first)) {
-                //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
+                qCInfo(graphics_scripting) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
                 target->removeAttribute(slot);
             }
         }
     }
 
-    target->setVertexBuffer(cloneBufferView(source->getVertexBuffer()));
-    target->setIndexBuffer(cloneBufferView(source->getIndexBuffer()));
-    target->setPartBuffer(cloneBufferView(source->getPartBuffer()));
+    target->setVertexBuffer(buffer_helpers::clone(source->getVertexBuffer()));
+    target->setIndexBuffer(buffer_helpers::clone(source->getIndexBuffer()));
+    target->setPartBuffer(buffer_helpers::clone(source->getPartBuffer()));
 
     for (const auto& a : attributes) {
-        auto slot = ScriptableMesh::ATTRIBUTES[a];
+        auto slot = buffer_helpers::ATTRIBUTES[a];
         if (slot == gpu::Stream::POSITION) {
             continue;
         }
-        // auto& before = target->getAttributeBuffer(slot);
+        auto& before = target->getAttributeBuffer(slot);
         auto& input = source->getAttributeBuffer(slot);
         if (input.getNumElements() == 0) {
-            //qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData buffer is empty -- pruning" << a << slot;
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData buffer is empty -- pruning" << a << slot;
             target->removeAttribute(slot);
         } else {
-            // if (before.getNumElements() == 0) {
-            //     qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData target buffer is empty -- adding" << a << slot;
-            // } else {
-            //     qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData target buffer exists -- updating" << a << slot;
-            // }
-            target->addAttribute(slot, cloneBufferView(input));
+            if (before.getNumElements() == 0) {
+                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer is empty -- adding" << a << slot;
+            } else {
+                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer exists -- updating" << a << slot;
+            }
+            target->addAttribute(slot, buffer_helpers::clone(input));
         }
-        // auto& after = target->getAttributeBuffer(slot);
-        // qCInfo(mesh_logging) << "ScriptableMesh::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
+        auto& after = target->getAttributeBuffer(slot);
+        qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
     }
 
 
     return true;
 }
 
-bool ScriptableMesh::dedupeVertices(float epsilon) {
-    scriptable::ScriptableMeshPointer meshProxy = this;
+bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
     auto mesh = getMeshPointer();
     if (!mesh) {
         return false;
@@ -573,6 +458,7 @@ bool ScriptableMesh::dedupeVertices(float epsilon) {
     uniqueVerts.reserve((int)numPositions);
     QMap<quint32,quint32> remapIndices;
 
+    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
     for (quint32 i = 0; i < numPositions; i++) {
         const quint32 numUnique = uniqueVerts.size();
         const auto& position = positions.get<glm::vec3>(i);
@@ -590,7 +476,7 @@ bool ScriptableMesh::dedupeVertices(float epsilon) {
         }
     }
 
-    qCInfo(mesh_logging) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
+    qCInfo(graphics_scripting) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
 
     auto indices = mesh->getIndexBuffer();
     auto numIndices = indices.getNumElements();
@@ -600,34 +486,34 @@ bool ScriptableMesh::dedupeVertices(float epsilon) {
     for (quint32 i = 0; i < numIndices; i++) {
         quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
         if (remapIndices.contains(index)) {
-            //qCInfo(mesh_logging) << i << index << "->" << remapIndices[index];
+            //qCInfo(graphics_scripting) << i << index << "->" << remapIndices[index];
             newIndices << remapIndices[index];
         } else {
-            qCInfo(mesh_logging) << i << index << "!remapIndices[index]";
+            qCInfo(graphics_scripting) << i << index << "!remapIndices[index]";
         }
     }
 
-    mesh->setIndexBuffer(bufferViewFromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
-    mesh->setVertexBuffer(bufferViewFromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
+    mesh->setIndexBuffer(buffer_helpers::fromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
+    mesh->setVertexBuffer(buffer_helpers::fromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
 
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
+    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
     quint32 numUniqueVerts = uniqueVerts.size();
     for (const auto& a : attributeViews) {
         auto& view = a.second;
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
+        auto slot = buffer_helpers::ATTRIBUTES[a.first];
         if (slot == gpu::Stream::POSITION) {
             continue;
         }
-        qCInfo(mesh_logging) << "ScriptableMesh::dedupeVertices" << a.first << slot << view.getNumElements();
-        auto newView = resizedBufferView(view, numUniqueVerts);
-        qCInfo(mesh_logging) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
+        qCInfo(graphics_scripting) << "ScriptableMeshPart::dedupeVertices" << a.first << slot << view.getNumElements();
+        auto newView = buffer_helpers::resize(view, numUniqueVerts);
+        qCInfo(graphics_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
         quint32 numElements = (quint32)view.getNumElements();
         for (quint32 i = 0; i < numElements; i++) {
             quint32 fromVertexIndex = i;
             quint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
-            bufferViewElementFromVariant(
+            buffer_helpers::fromVariant(
                 newView, toVertexIndex,
-                bufferViewElementToVariant(view, fromVertexIndex, false, "dedupe")
+                buffer_helpers::toVariant(view, fromVertexIndex, false, "dedupe")
                 );
         }
         mesh->addAttribute(slot, newView);
@@ -635,120 +521,202 @@ bool ScriptableMesh::dedupeVertices(float epsilon) {
     return true;
 }
 
-QScriptValue ScriptableMesh::cloneMesh(bool recalcNormals) {
+scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool recalcNormals) {
     auto mesh = getMeshPointer();
     if (!mesh) {
-        return QScriptValue::NullValue;
+        qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh -- !meshPointer";
+        return nullptr;
     }
-    graphics::MeshPointer clone(new graphics::Mesh());
-    clone->displayName = mesh->displayName + "-clone";
-    qCInfo(mesh_logging) << "ScriptableMesh::cloneMesh" << !!mesh;
-    if (!mesh) {
-        return QScriptValue::NullValue;
-    }
-
-    clone->setIndexBuffer(cloneBufferView(mesh->getIndexBuffer()));
-    clone->setPartBuffer(cloneBufferView(mesh->getPartBuffer()));
-    auto attributeViews = ScriptableMesh::gatherBufferViews(mesh);
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto slot = ScriptableMesh::ATTRIBUTES[a.first];
-        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices buffer" << a.first << slot;
-        auto points = cloneBufferView(view);
-        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices source" << view.getNumElements();
-        qCInfo(mesh_logging) << "ScriptableMesh::cloneVertices dest" << points.getNumElements();
-        if (slot == gpu::Stream::POSITION) {
-            clone->setVertexBuffer(points);
-        } else {
-            clone->addAttribute(slot, points);
-        }
-    }
-
-    auto result = scriptable::ScriptableMeshPointer(new ScriptableMesh(nullptr, clone));
+    qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
+    auto clone = buffer_helpers::cloneMesh(mesh);
+    
+    qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
     if (recalcNormals) {
-        result->recalculateNormals();
+        buffer_helpers::recalculateNormals(clone);
     }
-    return engine()->toScriptValue(result);
+    qCDebug(graphics_scripting) << clone.get();// << metadata;
+    auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, metadata);
+    clone.reset(); // free local reference
+    qCInfo(graphics_scripting) << "========= ScriptableMesh::cloneMesh..." << meshPointer << meshPointer->ownedMesh.use_count();
+    //scriptable::MeshPointer* ppMesh = new scriptable::MeshPointer();
+    //*ppMesh = clone;
+
+    if (meshPointer) {
+        scriptable::WeakMeshPointer delme = meshPointer->mesh;
+        QString debugString = scriptable::toDebugString(meshPointer);
+        QObject::connect(meshPointer, &QObject::destroyed, meshPointer, [=]() {
+            qCWarning(graphics_scripting) << "*************** cloneMesh/Destroy";
+            qCWarning(graphics_scripting) << "*************** " << debugString << delme.lock().get();
+            if (!delme.expired()) {
+                qCWarning(graphics_scripting) << "cloneMesh -- potential memory leak..." << debugString << delme.lock().get();
+            }
+        });
+    }
+            
+    meshPointer->metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    return scriptable::ScriptableMeshPointer(meshPointer);
 }
 
-bool ScriptableMesh::recalculateNormals() {
-    scriptable::ScriptableMeshPointer meshProxy = this;
-    qCInfo(mesh_logging) << "Recalculating normals" << !!meshProxy;
-    auto mesh = getMeshPointer();
-    if (!mesh) {
-        return false;
-    }
-    ScriptableMesh::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
-    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
-    auto verts = mesh->getVertexBuffer();
-    auto indices = mesh->getIndexBuffer();
-    auto esize = indices._element.getSize();
-    auto numPoints = indices.getNumElements();
-    const auto TRIANGLE = 3;
-    quint32 numFaces = (quint32)numPoints / TRIANGLE;
-    //QVector<Triangle> faces;
-    QVector<glm::vec3> faceNormals;
-    QMap<QString,QVector<quint32>> vertexToFaces;
-    //faces.resize(numFaces);
-    faceNormals.resize(numFaces);
-    auto numNormals = normals.getNumElements();
-    qCInfo(mesh_logging) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
-    if (normals.getNumElements() != verts.getNumElements()) {
-        return false;
-    }
-    for (quint32 i = 0; i < numFaces; i++) {
-        quint32 I = TRIANGLE * i;
-        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
-        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
-        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
-
-        Triangle face = {
-            verts.get<glm::vec3>(i1),
-            verts.get<glm::vec3>(i2),
-            verts.get<glm::vec3>(i0)
-        };
-        faceNormals[i] = face.getNormal();
-        if (glm::isnan(faceNormals[i].x)) {
-            qCInfo(mesh_logging) << i << i0 << i1 << i2 << vec3toVariant(face.v0) << vec3toVariant(face.v1) << vec3toVariant(face.v2);
-            break;
-        }
-        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
-    }
-    for (quint32 j = 0; j < numNormals; j++) {
-        //auto v = verts.get<glm::vec3>(j);
-        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
-        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
-        const auto& faces = vertexToFaces.value(key);
-        if (faces.size()) {
-            for (const auto i : faces) {
-                normal += faceNormals[i];
-            }
-            normal *= 1.0f / (float)faces.size();
-        } else {
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(mesh_logging) << "no faces for key!?" << key;
-            }
-            normal = verts.get<glm::vec3>(j);
-        }
-        if (glm::isnan(normal.x)) {
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(mesh_logging) << "isnan(normal.x)" << j << vec3toVariant(normal);
-            }
-            break;
-        }
-        normals.edit<glm::vec3>(j) = glm::normalize(normal);
-    }
-    return true;
+scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::WeakModelProviderPointer provider, scriptable::ScriptableModelBasePointer model, scriptable::WeakMeshPointer mesh, const QVariantMap& metadata)
+    : provider(provider), model(model), mesh(mesh), metadata(metadata) {}
+scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::WeakMeshPointer mesh) : scriptable::ScriptableMeshBase(scriptable::WeakModelProviderPointer(), nullptr, mesh, QVariantMap()) { }
+scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::MeshPointer mesh, const QVariantMap& metadata)
+    : ScriptableMeshBase(WeakModelProviderPointer(), nullptr, mesh, metadata) {
+    ownedMesh = mesh;
+}
+//scriptable::ScriptableMeshBase::ScriptableMeshBase(const scriptable::ScriptableMeshBase& other) { *this = other; }
+scriptable::ScriptableMeshBase& scriptable::ScriptableMeshBase::operator=(const scriptable::ScriptableMeshBase& view) {
+    provider = view.provider;
+    model = view.model;
+    mesh = view.mesh;
+    ownedMesh = view.ownedMesh;
+    metadata = view.metadata;
+    return *this;
+}
+                                                                                                                                                                                               scriptable::ScriptableMeshBase::~ScriptableMeshBase() {
+    ownedMesh.reset();
+    qCInfo(graphics_scripting) << "//~ScriptableMeshBase" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
 }
 
-QString ScriptableMesh::toOBJ() {
+scriptable::ScriptableMesh::~ScriptableMesh() {
+    ownedMesh.reset();
+    qCInfo(graphics_scripting) << "//~ScriptableMesh" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
+}
+
+QString scriptable::ScriptableMeshPart::toOBJ() {
     if (!getMeshPointer()) {
-        context()->throwError(QString("null mesh"));
+        if (context()) {
+            context()->throwError(QString("null mesh"));
+        } else {
+            qCWarning(graphics_scripting) << "null mesh";
+        }            
+        return QString();
     }
     return writeOBJToString({ getMeshPointer() });
 }
 
+namespace {
+    template <typename T>
+    QScriptValue qObjectToScriptValue(QScriptEngine* engine, const T& object) {
+        if (!object) {
+            return QScriptValue::NullValue;
+        }
+        auto ownership = object->metadata.value("__ownership__");
+        return engine->newQObject(
+            object,
+            ownership.isValid() ? static_cast<QScriptEngine::ValueOwnership>(ownership.toInt()) : QScriptEngine::QtOwnership
+            //, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects
+        );
+    }
+
+    QScriptValue meshPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableMeshPointer& in) {
+        return qObjectToScriptValue(engine, in);
+    }
+    QScriptValue meshPartPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableMeshPartPointer& in) {
+        return qObjectToScriptValue(engine, in);
+    }
+    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer& in) {
+        return qObjectToScriptValue(engine, in);
+    }
+
+    void meshPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
+        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableMesh>(value);
+    }
+    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
+        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableModel>(value);
+    }
+    void meshPartPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPartPointer &out) {
+        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableMeshPart>(value);
+    }
+    
+    // FIXME: MESHFACES:
+    // QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
+    //     QScriptValue obj = engine->newObject();
+    //     obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
+    //     return obj;
+    // }
+    // void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
+    //     qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
+    // }
+    // QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
+    //     return qScriptValueFromSequence(engine, vector);
+    // }
+    // void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
+    //     qScriptValueToSequence(array, result);
+    // }
+
+    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<scriptable::uint32>& vector) {
+        return qScriptValueFromSequence(engine, vector);
+    }
+
+    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<scriptable::uint32>& result) {
+        qScriptValueToSequence(array, result);
+    }
+
+    QVector<int> metaTypeIds{
+        qRegisterMetaType<scriptable::uint32>("uint32"),
+        qRegisterMetaType<scriptable::uint32>("scriptable::uint32"),
+        qRegisterMetaType<QVector<scriptable::uint32>>(),
+        qRegisterMetaType<QVector<scriptable::uint32>>("QVector<uint32>"),
+        qRegisterMetaType<scriptable::ScriptableMeshPointer>(),
+        qRegisterMetaType<scriptable::ScriptableModelPointer>(),
+        qRegisterMetaType<scriptable::ScriptableMeshPartPointer>(),
+    };
+}
+
+namespace scriptable {
+    bool registerMetaTypes(QScriptEngine* engine) {
+        qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPartPointer>>(engine);
+        qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
+        qScriptRegisterSequenceMetaType<QVector<scriptable::uint32>>(engine);
+        
+        qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
+        qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
+        qScriptRegisterMetaType(engine, meshPointerToScriptValue, meshPointerFromScriptValue);
+        qScriptRegisterMetaType(engine, meshPartPointerToScriptValue, meshPartPointerFromScriptValue);
+
+        return metaTypeIds.size();
+    }
+    // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
+    // still supporting extended Qt signal-like (scope, "methodName") and (scope, function(){}) "this" binding conventions
+    QScriptValue jsBindCallback(QScriptValue callback) {
+        if (callback.isObject() && callback.property("callback").isFunction()) {
+            return callback;
+        }
+        auto engine = callback.engine();
+        auto context = engine ? engine->currentContext() : nullptr;
+        auto length = context ? context->argumentCount() : 0;
+        QScriptValue scope = context ? context->thisObject() : QScriptValue::NullValue;
+        QScriptValue method;
+        qCInfo(graphics_scripting) << "jsBindCallback" << engine << length << scope.toQObject() << method.toString();
+        int i = 0;
+        for (; context && i < length; i++) {
+            if (context->argument(i).strictlyEquals(callback)) {
+                method = context->argument(i+1);
+            }
+        }
+        if (method.isFunction() || method.isString()) {
+            scope = callback;
+        } else {
+            method = callback;
+        }
+        qCInfo(graphics_scripting) << "scope:" << scope.toQObject() << "method:" << method.toString();
+        return ::makeScopedHandlerObject(scope,  method);
+    }
+}
+
+bool scriptable::GraphicsScriptingInterface::updateMeshPart(ScriptableMeshPointer mesh, ScriptableMeshPartPointer part) {
+    Q_ASSERT(mesh);
+    Q_ASSERT(part);
+    Q_ASSERT(part->parentMesh);
+    auto tmp = exportMeshPart(mesh, part->partIndex);
+    if (part->parentMesh == mesh) {
+        qCInfo(graphics_scripting) << "updateMeshPart -- update via clone" << mesh << part;
+        tmp->replaceMeshData(part->cloneMeshPart());
+        return false;
+    } else {
+        qCInfo(graphics_scripting) << "updateMeshPart -- update via inplace" << mesh << part;
+        tmp->replaceMeshData(part);
+        return true;
+    }
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 257285fa90..c655167c2b 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -11,142 +11,188 @@
 
 #include <DependencyManager.h>
 
+//#include <graphics-scriping/Forward.h>
 #include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/BufferViewHelpers.h>
 
 #include <QtScript/QScriptable>
 #include <QtScript/QScriptValue>
 
-namespace graphics {
-    class Mesh;
-}
-namespace gpu {
-    class BufferView;
-}
 namespace scriptable {
-    class ScriptableMeshPart;
-    using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
-    class ScriptableMesh : public QObject, QScriptable {
+
+    QScriptValue jsBindCallback(QScriptValue callback);
+    class ScriptableMesh : public ScriptableMeshBase, QScriptable {
         Q_OBJECT
     public:
-        Q_PROPERTY(quint32 numParts READ getNumParts)
-        Q_PROPERTY(quint32 numAttributes READ getNumAttributes)
-        Q_PROPERTY(quint32 numVertices READ getNumVertices)
-        Q_PROPERTY(quint32 numIndices READ getNumIndices)
-        Q_PROPERTY(QVariantMap metadata MEMBER _metadata)
+        Q_PROPERTY(uint32 numParts READ getNumParts)
+        Q_PROPERTY(uint32 numAttributes READ getNumAttributes)
+        Q_PROPERTY(uint32 numVertices READ getNumVertices)
+        Q_PROPERTY(uint32 numIndices READ getNumIndices)
+        Q_PROPERTY(QVariantMap metadata MEMBER metadata)
         Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
+        Q_PROPERTY(QVector<scriptable::ScriptableMeshPartPointer> parts READ getMeshParts)
+        Q_PROPERTY(bool valid READ hasValidMesh)
+        bool hasValidMesh() const { return (bool)getMeshPointer(); }
+        Q_PROPERTY(bool validOwned READ hasValidOwnedMesh)
+        bool hasValidOwnedMesh() const { return (bool)getOwnedMeshPointer(); }
 
-        static QMap<QString,int> ATTRIBUTES;
-        static std::map<QString, gpu::BufferView> gatherBufferViews(MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
+        operator const ScriptableMeshBase*() const { return (qobject_cast<const scriptable::ScriptableMeshBase*>(this)); }
+        ScriptableMesh(scriptable::MeshPointer mesh) : ScriptableMeshBase(mesh) { ownedMesh = mesh; }
+        ScriptableMesh(WeakModelProviderPointer provider, ScriptableModelBasePointer model, MeshPointer mesh, const QVariantMap& metadata)
+            : ScriptableMeshBase(provider, model, mesh, metadata) { ownedMesh = mesh; }
+        //ScriptableMesh& operator=(const ScriptableMesh& other)  { model=other.model; mesh=other.mesh; metadata=other.metadata; return *this; };
+        //ScriptableMesh() : QObject(), model(nullptr) {}
+        //ScriptableMesh(const ScriptableMesh& other) : QObject(), model(other.model), mesh(other.mesh), metadata(other.metadata) {}
+        ScriptableMesh(const ScriptableMeshBase& other);
+        ScriptableMesh(const ScriptableMesh& other) : ScriptableMeshBase(other) {};
+        virtual ~ScriptableMesh();
 
-        ScriptableMesh& operator=(const ScriptableMesh& other)  { _model=other._model; _mesh=other._mesh; _metadata=other._metadata; return *this; };
-        ScriptableMesh() : QObject(), _model(nullptr) {}
-        ScriptableMesh(ScriptableModelPointer parent, scriptable::MeshPointer mesh) : QObject(), _model(parent), _mesh(mesh) {}
-        ScriptableMesh(const ScriptableMesh& other) : QObject(), _model(other._model), _mesh(other._mesh), _metadata(other._metadata) {}
-        ~ScriptableMesh() { qDebug() << "~ScriptableMesh" << this; }
-
-        scriptable::MeshPointer getMeshPointer() const { return _mesh; }
+        Q_INVOKABLE const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
+        Q_INVOKABLE const scriptable::MeshPointer getOwnedMeshPointer() const { return ownedMesh; }
+        scriptable::ScriptableMeshPointer getSelf() const { return const_cast<scriptable::ScriptableMesh*>(this); }
    public slots:
-        quint32 getNumParts() const;
-        quint32 getNumVertices() const;
-        quint32 getNumAttributes() const;
-        quint32 getNumIndices() const { return 0;  }
+        uint32 getNumParts() const;
+        uint32 getNumVertices() const;
+        uint32 getNumAttributes() const;
+        uint32 getNumIndices() const;
         QVector<QString> getAttributeNames() const;
+        QVector<scriptable::ScriptableMeshPartPointer> getMeshParts() const;
 
-        QVariantMap getVertexAttributes(quint32 vertexIndex) const;
-        QVariantMap getVertexAttributes(quint32 vertexIndex, QVector<QString> attributes) const;
+        QVariantMap getVertexAttributes(uint32 vertexIndex) const;
+        QVariantMap getVertexAttributes(uint32 vertexIndex, QVector<QString> attributes) const;
 
-        QVector<quint32> getIndices() const;
-        QVector<quint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
+        QVector<uint32> getIndices() const;
+        QVector<uint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
         QVariantMap getMeshExtents() const;
-        bool setVertexAttributes(quint32 vertexIndex, QVariantMap attributes);
-        QVariantMap scaleToFit(float unitScale);
+        bool setVertexAttributes(uint32 vertexIndex, QVariantMap attributes);
 
         QVariantList getAttributeValues(const QString& attributeName) const;
 
         int _getSlotNumber(const QString& attributeName) const;
 
+        scriptable::ScriptableMeshPointer cloneMesh(bool recalcNormals = false);        
+    public:
+        operator bool() const { return !mesh.expired(); }
+
+    public slots:
+        // QScriptEngine-specific wrappers
+        uint32 mapAttributeValues(QScriptValue callback);
+    };
+
+    // TODO: part-specific wrapper for working with raw geometries
+    class ScriptableMeshPart : public QObject, QScriptable {
+        Q_OBJECT
+    public:
+        Q_PROPERTY(uint32 partIndex MEMBER partIndex CONSTANT)
+        Q_PROPERTY(int numElementsPerFace MEMBER _elementsPerFace CONSTANT)
+        Q_PROPERTY(QString topology MEMBER _topology CONSTANT)
+
+        Q_PROPERTY(uint32 numFaces READ getNumFaces)
+        Q_PROPERTY(uint32 numAttributes READ getNumAttributes)
+        Q_PROPERTY(uint32 numVertices READ getNumVertices)
+        Q_PROPERTY(uint32 numIndices READ getNumIndices)
+        Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
+
+        Q_PROPERTY(QVariantMap metadata MEMBER metadata)
+
+        //Q_PROPERTY(scriptable::ScriptableMeshPointer parentMesh MEMBER parentMesh CONSTANT HIDE)
+
+        ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
+        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
+        ScriptableMeshPart(const ScriptableMeshPart& other) : parentMesh(other.parentMesh), partIndex(other.partIndex) {}
+        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
+
+    public slots:
+        scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
+        uint32 getNumAttributes() const { return parentMesh ? parentMesh->getNumAttributes() : 0; }
+        uint32 getNumVertices() const { return parentMesh ? parentMesh->getNumVertices() : 0; }
+        uint32 getNumIndices() const { return parentMesh ? parentMesh->getNumIndices() : 0; }
+        uint32 getNumFaces() const { return parentMesh ? parentMesh->getNumIndices() / _elementsPerFace : 0; }
+        QVector<QString> getAttributeNames() const { return parentMesh ? parentMesh->getAttributeNames() : QVector<QString>(); }
+        QVector<uint32> getFace(uint32 faceIndex) const {
+            auto inds = parentMesh ? parentMesh->getIndices() : QVector<uint32>();
+            return faceIndex+2 < (uint32)inds.size() ? inds.mid(faceIndex*3, 3) : QVector<uint32>();
+        }
+        QVariantMap scaleToFit(float unitScale);
         QVariantMap translate(const glm::vec3& translation);
         QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
         QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
         QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
         QVariantMap transform(const glm::mat4& transform);
 
-    public:
-        operator bool() const { return _mesh != nullptr; }
-        ScriptableModelPointer _model;
-        scriptable::MeshPointer _mesh;
-        QVariantMap _metadata;
+        bool unrollVertices(bool recalcNormals = false);
+        bool dedupeVertices(float epsilon = 1e-6);
+        bool recalculateNormals() { return buffer_helpers::recalculateNormals(getMeshPointer()); }
+
+        bool replaceMeshData(scriptable::ScriptableMeshPartPointer source, const QVector<QString>& attributeNames = QVector<QString>());
+        scriptable::ScriptableMeshPartPointer cloneMeshPart(bool recalcNormals = false) {
+            if (parentMesh) {
+                if (auto clone = parentMesh->cloneMesh(recalcNormals)) {
+                    return clone->getMeshParts().value(partIndex);
+                }
+            }
+            return nullptr;
+        }
+        QString toOBJ();
 
     public slots:
         // QScriptEngine-specific wrappers
-        QScriptValue mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName = QScriptValue());
-        bool dedupeVertices(float epsilon = 1e-6);
-        bool recalculateNormals();
-        QScriptValue cloneMesh(bool recalcNormals = true);
-        QScriptValue unrollVertices(bool recalcNormals = true);
-        bool replaceMeshData(scriptable::ScriptableMeshPointer source, const QVector<QString>& attributeNames = QVector<QString>());
-        QString toOBJ();
-    };
-
-    // TODO: part-specific wrapper for working with raw geometries
-    class ScriptableMeshPart : public QObject {
-        Q_OBJECT
-    public:
-        Q_PROPERTY(QString topology READ getTopology)
-        Q_PROPERTY(quint32 numFaces READ getNumFaces)
-
-        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
-        ScriptableMeshPart(const ScriptableMeshPart& other) : parentMesh(other.parentMesh) {}
-        ScriptableMeshPart()  {}
-        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
-
-    public slots:
-        QString getTopology() const { return "triangles"; }
-        quint32 getNumFaces() const { return parentMesh.getIndices().size() / 3; }
-        QVector<quint32> getFace(quint32 faceIndex) const {
-            auto inds = parentMesh.getIndices();
-            return faceIndex+2 < (quint32)inds.size() ? inds.mid(faceIndex*3, 3) : QVector<quint32>();
-        }
+        uint32 mapAttributeValues(QScriptValue callback);
 
     public:
-        scriptable::ScriptableMesh parentMesh;
-        int partIndex;
+        scriptable::ScriptableMeshPointer parentMesh;
+        uint32 partIndex;
+        QVariantMap metadata;
+    protected:
+        int _elementsPerFace{ 3 };
+        QString _topology{ "triangles" };
+        scriptable::MeshPointer getMeshPointer() const { return parentMesh ? parentMesh->getMeshPointer() : nullptr; }    
     };
 
-    class GraphicsScriptingInterface : public QObject {
+    class GraphicsScriptingInterface : public QObject, QScriptable {
         Q_OBJECT
     public:
         GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent) {}
         GraphicsScriptingInterface(const GraphicsScriptingInterface& other) {}
-        public slots:
-            ScriptableMeshPart exportMeshPart(ScriptableMesh mesh, int part) { return {}; }
+    public slots:
+        ScriptableMeshPartPointer exportMeshPart(ScriptableMeshPointer mesh, int part=0) {
+            return ScriptableMeshPartPointer(new ScriptableMeshPart(mesh, part));
+        }
+        bool updateMeshPart(ScriptableMeshPointer mesh, ScriptableMeshPartPointer part);
     };
+
+    // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
+    // still supporting extended Qt signal-like (scope, "methodName") and (scope, function(){}) "this" binding conventions
+    QScriptValue jsBindCallback(QScriptValue callback);
+
+    // derive a corresponding C++ class instance from the current script engine's thisObject
+    template <typename T> T this_qobject_cast(QScriptEngine* engine);
 }
 
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPartPointer)
+Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPartPointer>)
 Q_DECLARE_METATYPE(scriptable::GraphicsScriptingInterface)
 
 // FIXME: MESHFACES: faces were supported in the original Model.* API -- are they still needed/used/useful for anything yet?
 #include <memory>
 
 namespace mesh {
-    using uint32 = quint32;
     class MeshFace;
     using MeshFaces = QVector<mesh::MeshFace>;
     class MeshFace {
     public:
         MeshFace() {}
-        MeshFace(QVector<mesh::uint32> vertexIndices) : vertexIndices(vertexIndices) {}
+        MeshFace(QVector<scriptable::uint32> vertexIndices) : vertexIndices(vertexIndices) {}
         ~MeshFace() {}
 
-        QVector<mesh::uint32> vertexIndices;
+        QVector<scriptable::uint32> vertexIndices;
         // TODO -- material...
     };
 };
 
 Q_DECLARE_METATYPE(mesh::MeshFace)
 Q_DECLARE_METATYPE(QVector<mesh::MeshFace>)
-Q_DECLARE_METATYPE(mesh::uint32)
-Q_DECLARE_METATYPE(QVector<mesh::uint32>)
+Q_DECLARE_METATYPE(scriptable::uint32)
+Q_DECLARE_METATYPE(QVector<scriptable::uint32>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index 4ba5a993b1..97a73ddd61 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -1,56 +1,24 @@
 #pragma once
 
-#include <glm/glm.hpp>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QUuid>
-#include <QPointer>
-#include <memory>
+#include "Forward.h"
 
-#include <DependencyManager.h>
-
-namespace graphics {
-    class Mesh;
-}
-namespace gpu {
-    class BufferView;
-}
 class QScriptValue;
-
 namespace scriptable {
-    using Mesh = graphics::Mesh;
-    using MeshPointer = std::shared_ptr<scriptable::Mesh>;
-
-    class ScriptableModel;
-    using ScriptableModelPointer = QPointer<ScriptableModel>;
-    class ScriptableMesh;
-    using ScriptableMeshPointer = QPointer<ScriptableMesh>;
-
-    // abstract container for holding one or more scriptable meshes
-    class ScriptableModel : public QObject {
+    class ScriptableModel : public ScriptableModelBase {
         Q_OBJECT
     public:
-        QUuid objectID;
-        QVariantMap metadata;
-        QVector<scriptable::MeshPointer> meshes;
-
-        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
         Q_PROPERTY(QUuid objectID MEMBER objectID CONSTANT)
         Q_PROPERTY(QVariantMap metadata MEMBER metadata CONSTANT)
-        Q_INVOKABLE QString toString() const;
+        Q_PROPERTY(uint32 numMeshes READ getNumMeshes)
+        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
 
-        ScriptableModel(QObject* parent = nullptr) : QObject(parent) {}
-        ScriptableModel(const ScriptableModel& other) : objectID(other.objectID), metadata(other.metadata), meshes(other.meshes)  {}
-        ScriptableModel& operator=(const ScriptableModel& view) { objectID = view.objectID; metadata = view.metadata; meshes = view.meshes; return *this; }
-        ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
-
-        void mixin(const ScriptableModel& other) {
-            for (const auto& key : other.metadata.keys()) { metadata[key] = other.metadata[key]; }
-            for (const auto& mesh : other.meshes) { meshes << mesh; }
-        }
+        ScriptableModel(QObject* parent = nullptr) : ScriptableModelBase(parent) {}
+        ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
+        ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
+        ScriptableModel& operator=(const ScriptableModelBase& view) {  ScriptableModelBase::operator=(view); return *this; }
+        virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
 
+        Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
         // TODO: in future accessors for these could go here
         // QVariantMap shapes;
         // QVariantMap materials;
@@ -58,28 +26,23 @@ namespace scriptable {
 
         QVector<scriptable::ScriptableMeshPointer> getMeshes();
         const QVector<scriptable::ScriptableMeshPointer> getConstMeshes() const;
+        operator scriptable::ScriptableModelBasePointer() {
+            QPointer<scriptable::ScriptableModelBase> p;
+            p = qobject_cast<scriptable::ScriptableModelBase*>(this);
+            return p;
+        }
+        
 
         // QScriptEngine-specific wrappers
-        Q_INVOKABLE QScriptValue mapAttributeValues(QScriptValue scopeOrCallback, QScriptValue methodOrName);
+        Q_INVOKABLE uint32 mapAttributeValues(QScriptValue callback);
+        Q_INVOKABLE QString toString() const;
+        Q_INVOKABLE uint32 getNumMeshes() { return meshes.size(); }
     };
 
-    // mixin class for Avatar/Entity/Overlay Rendering that expose their in-memory graphics::Meshes
-    class ModelProvider {
-    public:
-        QVariantMap metadata;
-        static scriptable::ScriptableModel modelUnavailableError(bool* ok) { if (ok) { *ok = false; } return {}; }
-        virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) = 0;
-    };
-    using ModelProviderPointer = std::shared_ptr<scriptable::ModelProvider>;
-
-    // mixin class for Application to resolve UUIDs into a corresponding ModelProvider
-    class ModelProviderFactory : public Dependency {
-    public:
-        virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) = 0;
-    };
 }
 
 Q_DECLARE_METATYPE(scriptable::MeshPointer)
-Q_DECLARE_METATYPE(scriptable::ScriptableModel)
+Q_DECLARE_METATYPE(scriptable::WeakMeshPointer)
 Q_DECLARE_METATYPE(scriptable::ScriptableModelPointer)
-
+Q_DECLARE_METATYPE(scriptable::ScriptableModelBase)
+Q_DECLARE_METATYPE(scriptable::ScriptableModelBasePointer)

From b21b98c81066a85be556dec87a238650729dfe00 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 15 Feb 2018 11:24:20 -0800
Subject: [PATCH 284/569] Add a way to early abort a task from a Job, apply
 that to the highlight effect to shave unecessary work

---
 .../render-utils/src/HighlightEffect.cpp      |  2 +-
 libraries/task/src/task/Task.cpp              |  6 ++--
 libraries/task/src/task/Task.h                | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index de13188733..0bf8e7fa71 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -455,7 +455,7 @@ void SelectionToHighlight::run(const render::RenderContextPointer& renderContext
     }
 
     if (numLayers == 0) {
-        renderContext->abortTask();
+        renderContext->taskFlow.abortTask();
     }
 }
 
diff --git a/libraries/task/src/task/Task.cpp b/libraries/task/src/task/Task.cpp
index bb65f15b7c..621d77d7bf 100644
--- a/libraries/task/src/task/Task.cpp
+++ b/libraries/task/src/task/Task.cpp
@@ -20,15 +20,15 @@ JobContext::JobContext(const QLoggingCategory& category) :
 JobContext::~JobContext() {
 }
 
-void JobContext::resetTaskFlow() {
+void TaskFlow::reset() {
     _doAbortTask = false;
 }
 
-void JobContext::abortTask() {
+void TaskFlow::abortTask() {
     _doAbortTask = true;
 }
 
-bool JobContext::doAbortTask() const {
+bool TaskFlow::doAbortTask() const {
     return _doAbortTask;
 }
 
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 1f1fb79ee1..34cdbb5439 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -27,6 +27,21 @@ template <class JC> class JobT;
 template <class JC> class TaskT;
 class JobNoIO {};
 
+class TaskFlow {
+public:
+    TaskFlow() = default;
+    ~TaskFlow() = default;
+
+    // called after each job 
+    void reset();
+
+    void abortTask();
+    bool doAbortTask() const;
+
+protected:
+    bool _doAbortTask{ false };
+};
+
 class JobContext {
 public:
     JobContext(const QLoggingCategory& category);
@@ -35,15 +50,10 @@ public:
     std::shared_ptr<JobConfig> jobConfig { nullptr };
     const QLoggingCategory& profileCategory;
 
-    // control flow commands
-    void resetTaskFlow();
-    void abortTask();
-
-    // Check command flow
-    bool doAbortTask() const;
+    // Task flow control
+    TaskFlow taskFlow{};
 
 protected:
-    bool _doAbortTask{ false };
 };
 using JobContextPointer = std::shared_ptr<JobContext>;
 
@@ -316,8 +326,8 @@ public:
             if (config->alwaysEnabled || config->enabled) {
                 for (auto job : TaskConcept::_jobs) {
                     job.run(jobContext);
-                    if (jobContext->doAbortTask()) {
-                        jobContext->resetTaskFlow();
+                    if (jobContext->taskFlow.doAbortTask()) {
+                        jobContext->taskFlow.reset();
                         return;
                     }
                 }

From b8fb08dc74d80cd43469338640a579680637fe2e Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 15 Feb 2018 11:24:22 -0800
Subject: [PATCH 285/569] Avatar support

---
 .../qml/hifi/commerce/checkout/Checkout.qml       | 15 ++++++++++-----
 .../qml/hifi/commerce/purchases/PurchasedItem.qml |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 981d5c5b9a..916e67e37f 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -40,8 +40,9 @@ Rectangle {
     property bool isCertified;
     property string itemType;
     property var itemTypesArray: ["entity", "wearable", "contentSet", "app", "avatar"];
-    property var buttonTextNormal: ["REZ IT", "WEAR IT", "REPLACE CONTENT SET", "INSTALL IT", "WEAR IT"];
-    property var buttonTextClicked: ["REZZED", "WORN", "CONTENT SET REPLACED!", "INSTALLED", "WORN"]
+    property var itemTypesText: ["entity", "wearable", "content set", "app", "avatar"];
+    property var buttonTextNormal: ["REZ", "WEAR", "REPLACE CONTENT SET", "INSTALL", "WEAR"];
+    property var buttonTextClicked: ["REZZED!", "WORN!", "CONTENT SET REPLACED!", "INSTALLED!", "AVATAR CHANGED!"]
     property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar];
     property bool shouldBuyWithControlledFailure: false;
     property bool debugCheckoutSuccess: false;
@@ -529,6 +530,7 @@ Rectangle {
             // "Buy" button
             HifiControlsUit.Button {
                 id: buyButton;
+                visible: !(root.itemType === "avatar" && viewInMyPurchasesButton.visible)
                 enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived) || (!root.isCertified);
                 color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
@@ -576,7 +578,7 @@ Rectangle {
                 id: cancelPurchaseButton;
                 color: hifi.buttons.noneBorderlessGray;
                 colorScheme: hifi.colorSchemes.light;
-                anchors.top: buyButton.bottom;
+                anchors.top: buyButton.visible ? buyButton.bottom : viewInMyPurchasesButton.bottom;
                 anchors.topMargin: 16;
                 height: 40;
                 anchors.left: parent.left;
@@ -622,8 +624,9 @@ Rectangle {
 
         RalewaySemiBold {
             id: completeText2;
-            text: "The item " + '<font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
-            " has been added to your Purchases and a receipt will appear in your Wallet's transaction history.";
+            text: "The " + (root.itemTypesText)[itemTypesArray.indexOf(root.itemType)] +
+                '<font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
+                " has been added to your Purchases and a receipt will appear in your Wallet's transaction history.";
             // Text size
             size: 20;
             // Anchors
@@ -701,6 +704,8 @@ Rectangle {
                     "root.visible = false;rezzedNotifContainer.visible = true; rezzedNotifContainerTimer.start();" + 
                     "UserActivityLogger.commerceEntityRezzed('" + root.itemId + "', 'checkout', '" + root.itemType + "');";
                     lightboxPopup.visible = true;
+                } else if (root.itemType === "avatar") {
+                    Avatar.skeletonModelURL = root.itemHref;
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     rezzedNotifContainer.visible = true;
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index d19a16e74e..7b2cae5188 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -476,6 +476,8 @@ Item {
             onClicked: {
                 if (root.itemType === "contentSet") {
                     sendToPurchases({method: 'showReplaceContentLightbox', itemId: root.itemId, itemHref: root.itemHref});
+                } else if (root.itemType === "avatar") {
+                    Avatar.skeletonModelURL = root.itemHref;
                 } else {
                     sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     root.showConfirmation = true;

From ce93b9a1f4ea001587a0d8ecc39d4473326e1cf8 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 16:48:37 -0800
Subject: [PATCH 286/569] Simplify BackupHandler pattern

---
 domain-server/src/BackupHandler.h             | 64 +++----------------
 domain-server/src/BackupSupervisor.h          |  4 +-
 .../src/DomainContentBackupManager.cpp        | 11 ++--
 .../src/DomainContentBackupManager.h          |  4 +-
 domain-server/src/DomainServer.cpp            |  4 +-
 5 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index f2735e5adf..eb9c35f236 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -18,68 +18,22 @@
 
 #include <quazip5/quazip.h>
 
-class BackupHandler {
+class BackupHandlerInterface {
 public:
-    template <typename T>
-    BackupHandler(T* x) : _self(new Model<T>(x)) {}
+    virtual ~BackupHandlerInterface() = default;
 
-    void loadBackup(QuaZip& zip) {
-        _self->loadBackup(zip);
-    }
-    void createBackup(QuaZip& zip) {
-        _self->createBackup(zip);
-    }
-    void recoverBackup(QuaZip& zip) {
-        _self->recoverBackup(zip);
-    }
-    void deleteBackup(QuaZip& zip) {
-        _self->deleteBackup(zip);
-    }
-    void consolidateBackup(QuaZip& zip) {
-        _self->consolidateBackup(zip);
-    }
-
-private:
-    struct Concept {
-        virtual ~Concept() = default;
-
-        virtual void loadBackup(QuaZip& zip) = 0;
-        virtual void createBackup(QuaZip& zip) = 0;
-        virtual void recoverBackup(QuaZip& zip) = 0;
-        virtual void deleteBackup(QuaZip& zip) = 0;
-        virtual void consolidateBackup(QuaZip& zip) = 0;
-    };
-
-    template <typename T>
-    struct Model : Concept {
-        Model(T* x) : data(x) {}
-
-        void loadBackup(QuaZip& zip) override {
-            data->loadBackup(zip);
-        }
-        void createBackup(QuaZip& zip) override {
-            data->createBackup(zip);
-        }
-        void recoverBackup(QuaZip& zip) override {
-            data->recoverBackup(zip);
-        }
-        void deleteBackup(QuaZip& zip) override {
-            data->deleteBackup(zip);
-        }
-        void consolidateBackup(QuaZip& zip) override {
-            data->consolidateBackup(zip);
-        }
-
-        std::unique_ptr<T> data;
-    };
-
-    std::unique_ptr<Concept> _self;
+    virtual void loadBackup(QuaZip& zip) = 0;
+    virtual void createBackup(QuaZip& zip) = 0;
+    virtual void recoverBackup(QuaZip& zip) = 0;
+    virtual void deleteBackup(QuaZip& zip) = 0;
+    virtual void consolidateBackup(QuaZip& zip) = 0;
 };
+using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
 #include <quazip5/quazipfile.h>
 #include <OctreeUtils.h>
 
-class EntitiesBackupHandler {
+class EntitiesBackupHandler : public BackupHandlerInterface {
 public:
     EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
         _entitiesFilePath(entitiesFilePath),
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/BackupSupervisor.h
index 9fedcca19b..0d0d21a174 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/BackupSupervisor.h
@@ -24,6 +24,8 @@
 
 #include <ReceivedMessage.h>
 
+#include "BackupHandler.h"
+
 class QuaZip;
 
 struct AssetServerBackup {
@@ -32,7 +34,7 @@ struct AssetServerBackup {
     bool corruptedBackup;
 };
 
-class BackupSupervisor : public QObject {
+class BackupSupervisor : public QObject, public BackupHandlerInterface {
     Q_OBJECT
 
 public:
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 66655ea966..2b990b170e 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -39,7 +39,8 @@ static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
 static const QString AUTOMATIC_BACKUP_PREFIX { "autobackup-" };
 static const QString MANUAL_BACKUP_PREFIX { "backup-" };
-void DomainContentBackupManager::addBackupHandler(BackupHandler handler) {
+
+void DomainContentBackupManager::addBackupHandler(BackupHandlerPointer handler) {
     _backupHandlers.push_back(std::move(handler));
 }
 
@@ -238,7 +239,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
             success = false;
         } else {
             for (auto& handler : _backupHandlers) {
-                handler.recoverBackup(zip);
+                handler->recoverBackup(zip);
             }
             
             qDebug() << "Successfully recovered from " << backupName;
@@ -339,7 +340,7 @@ void DomainContentBackupManager::load() {
             }
 
             for (auto& handler : _backupHandlers) {
-                handler.loadBackup(zip);
+                handler->loadBackup(zip);
             }
 
             zip.close();
@@ -402,7 +403,7 @@ void DomainContentBackupManager::consolidate(QString fileName) {
         }
 
         for (auto& handler : _backupHandlers) {
-            handler.consolidateBackup(zip);
+            handler->consolidateBackup(zip);
         }
 
         zip.close();
@@ -437,7 +438,7 @@ std::pair<bool, QString> DomainContentBackupManager::createBackup(const QString&
     }
 
     for (auto& handler : _backupHandlers) {
-        handler.createBackup(zip);
+        handler->createBackup(zip);
     }
 
     zip.close();
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 5cf8d4698f..a3606929d5 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -50,7 +50,7 @@ public:
                                int persistInterval = DEFAULT_PERSIST_INTERVAL,
                                bool debugTimestampNow = false);
 
-    void addBackupHandler(BackupHandler handler);
+    void addBackupHandler(BackupHandlerPointer handler);
     std::vector<BackupItemInfo> getAllBackups();
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
@@ -82,7 +82,7 @@ protected:
 
 private:
     const QString _backupDirectory;
-    std::vector<BackupHandler> _backupHandlers;
+    std::vector<BackupHandlerPointer> _backupHandlers;
     int _persistInterval { 0 };
 
     int64_t _lastCheck { 0 };
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index da8527bf16..a8ceebd6e7 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -296,8 +296,8 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     maybeHandleReplacementEntityFile();
 
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
-    _contentManager->addBackupHandler(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath()));
-    _contentManager->addBackupHandler(new BackupSupervisor(getContentBackupDir()));
+    _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
+    _contentManager->addBackupHandler(BackupHandlerPointer(new BackupSupervisor(getContentBackupDir())));
     _contentManager->initialize(true);
 
     qDebug() << "Existing backups:";

From 4482f9c83c67def4fef5444a52f6d85e531ce53f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 16:49:12 -0800
Subject: [PATCH 287/569] Queue all requests until the AS is fully setup

---
 assignment-client/src/assets/AssetServer.cpp | 45 +++++++++++++++++---
 assignment-client/src/assets/AssetServer.h   |  5 +++
 domain-server/src/BackupSupervisor.cpp       |  5 +--
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 1ae65290ff..0be557bccd 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -257,12 +257,10 @@ AssetServer::AssetServer(ReceivedMessage& message) :
     _transferTaskPool.setMaxThreadCount(TASK_POOL_THREAD_COUNT);
     _bakingTaskPool.setMaxThreadCount(1);
 
+    // Queue all requests until the Asset Server is fully setup
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
-    packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
-    packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
-    packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation");
-    
+    packetReceiver.registerListenerForTypes({ PacketType::AssetGet, PacketType::AssetGetInfo, PacketType::AssetUpload, PacketType::AssetMappingOperation }, this, "queueRequests");
+
 #ifdef Q_OS_WIN
     updateConsumedCores();
     QTimer* timer = new QTimer(this);
@@ -417,6 +415,43 @@ void AssetServer::completeSetup() {
 
     PathUtils::removeTemporaryApplicationDirs();
     PathUtils::removeTemporaryApplicationDirs("Oven");
+
+    // We're fully setup, remove the request queueing and replay all requests
+    auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
+    packetReceiver.unregisterListener(this);
+    packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
+    packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
+    packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
+    packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation");
+
+    replayRequests();
+}
+
+void AssetServer::queueRequests(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode) {
+    _queuedRequests.push_back({ packet, senderNode });
+}
+
+void AssetServer::replayRequests() {
+    for (const auto& request : _queuedRequests) {
+        switch (request.first->getType()) {
+            case PacketType::AssetGet:
+                handleAssetGet(request.first, request.second);
+                break;
+            case PacketType::AssetGetInfo:
+                handleAssetGetInfo(request.first, request.second);
+                break;
+            case PacketType::AssetUpload:
+                handleAssetUpload(request.first, request.second);
+                break;
+            case PacketType::AssetMappingOperation:
+                handleAssetMappingOperation(request.first, request.second);
+                break;
+            default:
+                qWarning() << "Unknown queued request type:" << request.first->getType();
+                break;
+        }
+    }
+    _queuedRequests.clear();
 }
 
 void AssetServer::cleanupUnmappedFiles() {
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index c6336a3a4d..b8aac800ed 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -49,6 +49,7 @@ public slots:
 private slots:
     void completeSetup();
 
+    void queueRequests(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode);
     void handleAssetGetInfo(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode);
     void handleAssetGet(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode);
     void handleAssetUpload(QSharedPointer<ReceivedMessage> packetList, SharedNodePointer senderNode);
@@ -57,6 +58,8 @@ private slots:
     void sendStatsPacket() override;
 
 private:
+    void replayRequests();
+
     void handleGetMappingOperation(ReceivedMessage& message, NLPacketList& replyPacket);
     void handleGetAllMappingOperation(NLPacketList& replyPacket);
     void handleSetMappingOperation(ReceivedMessage& message, bool hasWriteAccess, NLPacketList& replyPacket);
@@ -120,6 +123,8 @@ private:
     QHash<AssetUtils::AssetHash, std::shared_ptr<BakeAssetTask>> _pendingBakes;
     QThreadPool _bakingTaskPool;
 
+    QVector<QPair<QSharedPointer<ReceivedMessage>, SharedNodePointer>> _queuedRequests;
+
     bool _wasColorTextureCompressionEnabled { false };
     bool _wasGrayscaleTextureCompressionEnabled { false  };
     bool _wasNormalTextureCompressionEnabled { false };
diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/BackupSupervisor.cpp
index 869f85c6cc..0cbded4e43 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/BackupSupervisor.cpp
@@ -46,9 +46,8 @@ BackupSupervisor::BackupSupervisor(const QString& backupDirectory) :
     auto nodeList = DependencyManager::get<LimitedNodeList>();
     QObject::connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, [this](SharedNodePointer node) {
         if (node->getType() == NodeType::AssetServer) {
-            // Give the Asset Server some time to bootup.
-            static constexpr int ASSET_SERVER_BOOTUP_MARGIN = 1 * 1000;
-            _mappingsRefreshTimer.start(ASSET_SERVER_BOOTUP_MARGIN);
+            // run immediately for the first time.
+            _mappingsRefreshTimer.start(0);
         }
     });
 }

From d8d05fe0456831cd9dadde546c3635f09eafa46c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 17:24:00 -0800
Subject: [PATCH 288/569] Rename backup supervisor

---
 ...Supervisor.cpp => AssetsBackupHandler.cpp} | 42 +++++++++----------
 ...ckupSupervisor.h => AssetsBackupHandler.h} | 24 +++++------
 domain-server/src/DomainServer.cpp            |  4 +-
 domain-server/src/DomainServer.h              |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)
 rename domain-server/src/{BackupSupervisor.cpp => AssetsBackupHandler.cpp} (93%)
 rename domain-server/src/{BackupSupervisor.h => AssetsBackupHandler.h} (85%)

diff --git a/domain-server/src/BackupSupervisor.cpp b/domain-server/src/AssetsBackupHandler.cpp
similarity index 93%
rename from domain-server/src/BackupSupervisor.cpp
rename to domain-server/src/AssetsBackupHandler.cpp
index 0cbded4e43..3dc4851762 100644
--- a/domain-server/src/BackupSupervisor.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -1,5 +1,5 @@
 //
-//  BackupSupervisor.cpp
+//  AssetsBackupHandler.cpp
 //  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "BackupSupervisor.h"
+#include "AssetsBackupHandler.h"
 
 #include <QJsonDocument>
 #include <QDate>
@@ -31,7 +31,7 @@ using namespace std;
 Q_DECLARE_LOGGING_CATEGORY(backup_supervisor)
 Q_LOGGING_CATEGORY(backup_supervisor, "hifi.backup-supervisor");
 
-BackupSupervisor::BackupSupervisor(const QString& backupDirectory) :
+AssetsBackupHandler::AssetsBackupHandler(const QString& backupDirectory) :
     _assetsDirectory(backupDirectory + ASSETS_DIR)
 {
     // Make sure the asset directory exists.
@@ -41,7 +41,7 @@ BackupSupervisor::BackupSupervisor(const QString& backupDirectory) :
 
     _mappingsRefreshTimer.setTimerType(Qt::CoarseTimer);
     _mappingsRefreshTimer.setSingleShot(true);
-    QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &BackupSupervisor::refreshMappings);
+    QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &AssetsBackupHandler::refreshMappings);
 
     auto nodeList = DependencyManager::get<LimitedNodeList>();
     QObject::connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, [this](SharedNodePointer node) {
@@ -53,7 +53,7 @@ BackupSupervisor::BackupSupervisor(const QString& backupDirectory) :
 }
 
 
-void BackupSupervisor::refreshAssetsOnDisk() {
+void AssetsBackupHandler::refreshAssetsOnDisk() {
     QDir assetsDir { _assetsDirectory };
     auto assetNames = assetsDir.entryList(QDir::Files);
 
@@ -64,7 +64,7 @@ void BackupSupervisor::refreshAssetsOnDisk() {
 
 }
 
-void BackupSupervisor::refreshAssetsInBackups() {
+void AssetsBackupHandler::refreshAssetsInBackups() {
     _assetsInBackups.clear();
     for (const auto& backup : _backups) {
         for (const auto& mapping : backup.mappings) {
@@ -73,7 +73,7 @@ void BackupSupervisor::refreshAssetsInBackups() {
     }
 }
 
-void BackupSupervisor::checkForMissingAssets() {
+void AssetsBackupHandler::checkForMissingAssets() {
     vector<AssetUtils::AssetHash> missingAssets;
     set_difference(begin(_assetsInBackups), end(_assetsInBackups),
                    begin(_assetsOnDisk), end(_assetsOnDisk),
@@ -83,7 +83,7 @@ void BackupSupervisor::checkForMissingAssets() {
     }
 }
 
-void BackupSupervisor::checkForAssetsToDelete() {
+void AssetsBackupHandler::checkForAssetsToDelete() {
     vector<AssetUtils::AssetHash> deprecatedAssets;
     set_difference(begin(_assetsOnDisk), end(_assetsOnDisk),
                    begin(_assetsInBackups), end(_assetsInBackups),
@@ -101,7 +101,7 @@ void BackupSupervisor::checkForAssetsToDelete() {
     }
 }
 
-void BackupSupervisor::loadBackup(QuaZip& zip) {
+void AssetsBackupHandler::loadBackup(QuaZip& zip) {
     _backups.push_back({ zip.getZipName(), {}, false });
     auto& backup = _backups.back();
 
@@ -151,7 +151,7 @@ void BackupSupervisor::loadBackup(QuaZip& zip) {
     return;
 }
 
-void BackupSupervisor::createBackup(QuaZip& zip) {
+void AssetsBackupHandler::createBackup(QuaZip& zip) {
     if (operationInProgress()) {
         qCWarning(backup_supervisor) << "There is already an operation in progress.";
         return;
@@ -192,7 +192,7 @@ void BackupSupervisor::createBackup(QuaZip& zip) {
     _backups.push_back(backup);
 }
 
-void BackupSupervisor::recoverBackup(QuaZip& zip) {
+void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
     if (operationInProgress()) {
         qCWarning(backup_supervisor) << "There is already a backup/restore in progress.";
         return;
@@ -225,7 +225,7 @@ void BackupSupervisor::recoverBackup(QuaZip& zip) {
     restoreAllAssets();
 }
 
-void BackupSupervisor::deleteBackup(QuaZip& zip) {
+void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
     if (operationInProgress()) {
         qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
         return;
@@ -243,7 +243,7 @@ void BackupSupervisor::deleteBackup(QuaZip& zip) {
     checkForAssetsToDelete();
 }
 
-void BackupSupervisor::consolidateBackup(QuaZip& zip) {
+void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
     if (operationInProgress()) {
         qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
         return;
@@ -285,7 +285,7 @@ void BackupSupervisor::consolidateBackup(QuaZip& zip) {
 
 }
 
-void BackupSupervisor::refreshMappings() {
+void AssetsBackupHandler::refreshMappings() {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createGetAllMappingsRequest();
 
@@ -314,7 +314,7 @@ void BackupSupervisor::refreshMappings() {
     request->start();
 }
 
-void BackupSupervisor::downloadMissingFiles(const AssetUtils::Mappings& mappings) {
+void AssetsBackupHandler::downloadMissingFiles(const AssetUtils::Mappings& mappings) {
     auto wasEmpty = _assetsLeftToRequest.empty();
 
     for (const auto& mapping : mappings) {
@@ -330,7 +330,7 @@ void BackupSupervisor::downloadMissingFiles(const AssetUtils::Mappings& mappings
     }
 }
 
-void BackupSupervisor::downloadNextMissingFile() {
+void AssetsBackupHandler::downloadNextMissingFile() {
     if (_assetsLeftToRequest.empty()) {
         return;
     }
@@ -360,7 +360,7 @@ void BackupSupervisor::downloadNextMissingFile() {
     assetRequest->start();
 }
 
-bool BackupSupervisor::writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data) {
+bool AssetsBackupHandler::writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data) {
     QDir assetsDir { _assetsDirectory };
     QFile file { assetsDir.filePath(hash) };
     if (!file.open(QFile::WriteOnly)) {
@@ -380,7 +380,7 @@ bool BackupSupervisor::writeAssetFile(const AssetUtils::AssetHash& hash, const Q
     return true;
 }
 
-void BackupSupervisor::computeServerStateDifference(const AssetUtils::Mappings& currentMappings,
+void AssetsBackupHandler::computeServerStateDifference(const AssetUtils::Mappings& currentMappings,
                                                     const AssetUtils::Mappings& newMappings) {
     _mappingsLeftToSet.reserve((int)newMappings.size());
     _assetsLeftToUpload.reserve((int)newMappings.size());
@@ -415,11 +415,11 @@ void BackupSupervisor::computeServerStateDifference(const AssetUtils::Mappings&
     qCDebug(backup_supervisor) << "Assets to upload:" << _assetsLeftToUpload.size();
 }
 
-void BackupSupervisor::restoreAllAssets() {
+void AssetsBackupHandler::restoreAllAssets() {
     restoreNextAsset();
 }
 
-void BackupSupervisor::restoreNextAsset() {
+void AssetsBackupHandler::restoreNextAsset() {
     if (_assetsLeftToUpload.empty()) {
         updateMappings();
         return;
@@ -447,7 +447,7 @@ void BackupSupervisor::restoreNextAsset() {
     request->start();
 }
 
-void BackupSupervisor::updateMappings() {
+void AssetsBackupHandler::updateMappings() {
     auto assetClient = DependencyManager::get<AssetClient>();
     for (const auto& mapping : _mappingsLeftToSet) {
         auto request = assetClient->createSetMappingRequest(mapping.first, mapping.second);
diff --git a/domain-server/src/BackupSupervisor.h b/domain-server/src/AssetsBackupHandler.h
similarity index 85%
rename from domain-server/src/BackupSupervisor.h
rename to domain-server/src/AssetsBackupHandler.h
index 0d0d21a174..184f30ab9b 100644
--- a/domain-server/src/BackupSupervisor.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -1,5 +1,5 @@
 //
-//  BackupSupervisor.h
+//  AssetsBackupHandler.h
 //  domain-server/src
 //
 //  Created by Clement Brisset on 1/12/18.
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_BackupSupervisor_h
-#define hifi_BackupSupervisor_h
+#ifndef hifi_AssetsBackupHandler_h
+#define hifi_AssetsBackupHandler_h
 
 #include <set>
 #include <map>
@@ -28,17 +28,11 @@
 
 class QuaZip;
 
-struct AssetServerBackup {
-    QString filePath;
-    AssetUtils::Mappings mappings;
-    bool corruptedBackup;
-};
-
-class BackupSupervisor : public QObject, public BackupHandlerInterface {
+class AssetsBackupHandler : public QObject, public BackupHandlerInterface {
     Q_OBJECT
 
 public:
-    BackupSupervisor(const QString& backupDirectory);
+    AssetsBackupHandler(const QString& backupDirectory);
 
     void loadBackup(QuaZip& zip);
     void createBackup(QuaZip& zip);
@@ -75,6 +69,12 @@ private:
     quint64 _lastMappingsRefresh { 0 };
     AssetUtils::Mappings _currentMappings;
 
+    struct AssetServerBackup {
+        QString filePath;
+        AssetUtils::Mappings mappings;
+        bool corruptedBackup;
+    };
+
     bool _operationInProgress { false };
 
     // Internal storage for backups on disk
@@ -93,4 +93,4 @@ private:
     int _mappingRequestsInFlight { 0 };
 };
 
-#endif /* hifi_BackupSupervisor_h */
+#endif /* hifi_AssetsBackupHandler_h */
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index a8ceebd6e7..11b6a2d441 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -45,7 +45,7 @@
 #include <Trace.h>
 #include <StatTracker.h>
 
-#include "BackupSupervisor.h"
+#include "AssetsBackupHandler.h"
 #include "DomainServerNodeData.h"
 #include "NodeConnectionData.h"
 
@@ -297,7 +297,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
     _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
-    _contentManager->addBackupHandler(BackupHandlerPointer(new BackupSupervisor(getContentBackupDir())));
+    _contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
     _contentManager->initialize(true);
 
     qDebug() << "Existing backups:";
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index ee0350665e..afe2a1cc7c 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -26,7 +26,7 @@
 #include <HTTPSConnection.h>
 #include <LimitedNodeList.h>
 
-#include "BackupSupervisor.h"
+#include "AssetsBackupHandler.h"
 #include "DomainGatekeeper.h"
 #include "DomainMetadata.h"
 #include "DomainServerSettingsManager.h"

From 9fca92facd27f12a0daff1455b0dc560fda4db46 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 18:11:55 -0800
Subject: [PATCH 289/569] Move EntitiesBackupHandler to its own file

---
 domain-server/src/AssetsBackupHandler.h       |  3 -
 domain-server/src/BackupHandler.h             | 79 +------------------
 .../src/DomainContentBackupManager.cpp        |  6 +-
 .../src/DomainContentBackupManager.h          |  1 +
 domain-server/src/DomainServer.cpp            |  1 +
 domain-server/src/EntitiesBackupHandler.cpp   | 73 +++++++++++++++++
 domain-server/src/EntitiesBackupHandler.h     | 42 ++++++++++
 7 files changed, 124 insertions(+), 81 deletions(-)
 create mode 100644 domain-server/src/EntitiesBackupHandler.cpp
 create mode 100644 domain-server/src/EntitiesBackupHandler.h

diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index 184f30ab9b..b78206b7b1 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -21,13 +21,10 @@
 #include <QJsonObject>
 
 #include <AssetUtils.h>
-
 #include <ReceivedMessage.h>
 
 #include "BackupHandler.h"
 
-class QuaZip;
-
 class AssetsBackupHandler : public QObject, public BackupHandlerInterface {
     Q_OBJECT
 
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index eb9c35f236..8599dafb29 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -14,9 +14,7 @@
 
 #include <memory>
 
-#include <QDebug>
-
-#include <quazip5/quazip.h>
+class QuaZip;
 
 class BackupHandlerInterface {
 public:
@@ -28,80 +26,7 @@ public:
     virtual void deleteBackup(QuaZip& zip) = 0;
     virtual void consolidateBackup(QuaZip& zip) = 0;
 };
+
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
-#include <quazip5/quazipfile.h>
-#include <OctreeUtils.h>
-
-class EntitiesBackupHandler : public BackupHandlerInterface {
-public:
-    EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
-        _entitiesFilePath(entitiesFilePath),
-        _entitiesReplacementFilePath(entitiesReplacementFilePath) {}
-
-    void loadBackup(QuaZip& zip) {}
-
-    // Create a skeleton backup
-    void createBackup(QuaZip& zip) {
-        QFile entitiesFile { _entitiesFilePath };
-
-        if (entitiesFile.open(QIODevice::ReadOnly)) {
-            QuaZipFile zipFile { &zip };
-            zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", _entitiesFilePath));
-            zipFile.write(entitiesFile.readAll());
-            zipFile.close();
-            if (zipFile.getZipError() != UNZ_OK) {
-                qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
-            }
-        }
-    }
-
-    // Recover from a full backup
-    void recoverBackup(QuaZip& zip) {
-        if (!zip.setCurrentFile("models.json.gz")) {
-            qWarning() << "Failed to find models.json.gz while recovering backup";
-            return;
-        }
-        QuaZipFile zipFile { &zip };
-        if (!zipFile.open(QIODevice::ReadOnly)) {
-            qCritical() << "Failed to open models.json.gz in backup";
-            return;
-        }
-        auto rawData = zipFile.readAll();
-
-        zipFile.close();
-
-        OctreeUtils::RawOctreeData data;
-        if (!OctreeUtils::readOctreeDataInfoFromData(rawData, &data)) {
-            qCritical() << "Unable to parse octree data during backup recovery";
-            return;
-        }
-
-        data.resetIdAndVersion();
-
-        if (zipFile.getZipError() != UNZ_OK) {
-            qCritical() << "Failed to unzip models.json.gz: " << zipFile.getZipError();
-            return;
-        }
-
-        QFile entitiesFile { _entitiesReplacementFilePath };
-
-        if (entitiesFile.open(QIODevice::WriteOnly)) {
-            entitiesFile.write(data.toGzippedByteArray());
-        }
-    }
-
-    // Delete a skeleton backup
-    void deleteBackup(QuaZip& zip) {
-    }
-
-    // Create a full backup
-    void consolidateBackup(QuaZip& zip) {
-    }
-
-private:
-    QString _entitiesFilePath;
-    QString _entitiesReplacementFilePath;
-};
-
 #endif /* hifi_BackupHandler_h */
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 2b990b170e..f39737c92e 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainContentBackupManager.h"
+
 #include <chrono>
 #include <thread>
 
@@ -25,13 +27,15 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
+#include <quazip5/quazip.h>
+
 #include <NumericalConstants.h>
 #include <PerfStat.h>
 #include <PathUtils.h>
 #include <shared/QtHelpers.h>
 
 #include "DomainServer.h"
-#include "DomainContentBackupManager.h"
+
 const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  // every 30 seconds
 
 // Backup format looks like: daily_backup-TIMESTAMP.zip
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index a3606929d5..1e1b2360a8 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -16,6 +16,7 @@
 
 #include <QString>
 #include <QVector>
+#include <QDateTime>
 
 #include <GenericThread.h>
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 11b6a2d441..4c72423f74 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -47,6 +47,7 @@
 
 #include "AssetsBackupHandler.h"
 #include "DomainServerNodeData.h"
+#include "EntitiesBackupHandler.h"
 #include "NodeConnectionData.h"
 
 #include <Gzip.h>
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
new file mode 100644
index 0000000000..a95d68b007
--- /dev/null
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -0,0 +1,73 @@
+//
+//  EntitiesBackupHandler.cpp
+//  domain-server/src
+//
+//  Created by Clement Brisset on 2/14/18.
+//  Copyright 2018 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 "EntitiesBackupHandler.h"
+
+#include <QDebug>
+
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+
+#include <OctreeUtils.h>
+
+EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
+    _entitiesFilePath(entitiesFilePath),
+    _entitiesReplacementFilePath(entitiesReplacementFilePath)
+{
+}
+
+void EntitiesBackupHandler::createBackup(QuaZip& zip) {
+    QFile entitiesFile { _entitiesFilePath };
+
+    if (entitiesFile.open(QIODevice::ReadOnly)) {
+        QuaZipFile zipFile { &zip };
+        zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", _entitiesFilePath));
+        zipFile.write(entitiesFile.readAll());
+        zipFile.close();
+        if (zipFile.getZipError() != UNZ_OK) {
+            qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+        }
+    }
+}
+
+void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
+    if (!zip.setCurrentFile("models.json.gz")) {
+        qWarning() << "Failed to find models.json.gz while recovering backup";
+        return;
+    }
+    QuaZipFile zipFile { &zip };
+    if (!zipFile.open(QIODevice::ReadOnly)) {
+        qCritical() << "Failed to open models.json.gz in backup";
+        return;
+    }
+    auto rawData = zipFile.readAll();
+
+    zipFile.close();
+
+    OctreeUtils::RawOctreeData data;
+    if (!OctreeUtils::readOctreeDataInfoFromData(rawData, &data)) {
+        qCritical() << "Unable to parse octree data during backup recovery";
+        return;
+    }
+
+    data.resetIdAndVersion();
+
+    if (zipFile.getZipError() != UNZ_OK) {
+        qCritical() << "Failed to unzip models.json.gz: " << zipFile.getZipError();
+        return;
+    }
+
+    QFile entitiesFile { _entitiesReplacementFilePath };
+
+    if (entitiesFile.open(QIODevice::WriteOnly)) {
+        entitiesFile.write(data.toGzippedByteArray());
+    }
+}
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
new file mode 100644
index 0000000000..6f66483a87
--- /dev/null
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -0,0 +1,42 @@
+//
+//  EntitiesBackupHandler.h
+//  domain-server/src
+//
+//  Created by Clement Brisset on 2/14/18.
+//  Copyright 2018 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_EntitiesBackupHandler_h
+#define hifi_EntitiesBackupHandler_h
+
+#include <QString>
+
+#include "BackupHandler.h"
+
+class EntitiesBackupHandler : public BackupHandlerInterface {
+public:
+    EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath);
+
+    void loadBackup(QuaZip& zip) {}
+
+    // Create a skeleton backup
+    void createBackup(QuaZip& zip);
+
+    // Recover from a full backup
+    void recoverBackup(QuaZip& zip);
+
+    // Delete a skeleton backup
+    void deleteBackup(QuaZip& zip) {}
+
+    // Create a full backup
+    void consolidateBackup(QuaZip& zip) {}
+
+private:
+    QString _entitiesFilePath;
+    QString _entitiesReplacementFilePath;
+};
+
+#endif /* hifi_EntitiesBackupHandler_h */

From d6e281408144f0db5bb102ca4a0b99dd460cd63f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 11:25:07 -0800
Subject: [PATCH 290/569] Write assets to disk when recovering full backup

---
 domain-server/src/AssetsBackupHandler.cpp | 152 ++++++++++++++--------
 domain-server/src/AssetsBackupHandler.h   |   1 +
 2 files changed, 99 insertions(+), 54 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 3dc4851762..a9f56a0c5b 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -16,6 +16,7 @@
 #include <QtCore/QLoggingCategory>
 
 #include <quazip5/quazipfile.h>
+#include <quazip5/quazipdir.h>
 
 #include <AssetClient.h>
 #include <AssetRequest.h>
@@ -23,13 +24,14 @@
 #include <MappingRequest.h>
 #include <PathUtils.h>
 
-const QString ASSETS_DIR = "/assets/";
-const QString MAPPINGS_FILE = "mappings.json";
+static const QString ASSETS_DIR = "/assets/";
+static const QString MAPPINGS_FILE = "mappings.json";
+static const QString ZIP_ASSETS_FOLDER = "files";
 
 using namespace std;
 
-Q_DECLARE_LOGGING_CATEGORY(backup_supervisor)
-Q_LOGGING_CATEGORY(backup_supervisor, "hifi.backup-supervisor");
+Q_DECLARE_LOGGING_CATEGORY(asset_backup)
+Q_LOGGING_CATEGORY(asset_backup, "hifi.asset-backup");
 
 AssetsBackupHandler::AssetsBackupHandler(const QString& backupDirectory) :
     _assetsDirectory(backupDirectory + ASSETS_DIR)
@@ -39,6 +41,10 @@ AssetsBackupHandler::AssetsBackupHandler(const QString& backupDirectory) :
 
     refreshAssetsOnDisk();
 
+    setupRefreshTimer();
+}
+
+void AssetsBackupHandler::setupRefreshTimer() {
     _mappingsRefreshTimer.setTimerType(Qt::CoarseTimer);
     _mappingsRefreshTimer.setSingleShot(true);
     QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &AssetsBackupHandler::refreshMappings);
@@ -50,9 +56,14 @@ AssetsBackupHandler::AssetsBackupHandler(const QString& backupDirectory) :
             _mappingsRefreshTimer.start(0);
         }
     });
+    QObject::connect(nodeList.data(), &LimitedNodeList::nodeKilled, this, [this](SharedNodePointer node) {
+        if (node->getType() == NodeType::AssetServer) {
+            // run immediately for the first time.
+            _mappingsRefreshTimer.stop();
+        }
+    });
 }
 
-
 void AssetsBackupHandler::refreshAssetsOnDisk() {
     QDir assetsDir { _assetsDirectory };
     auto assetNames = assetsDir.entryList(QDir::Files);
@@ -79,7 +90,7 @@ void AssetsBackupHandler::checkForMissingAssets() {
                    begin(_assetsOnDisk), end(_assetsOnDisk),
                    back_inserter(missingAssets));
     if (missingAssets.size() > 0) {
-        qCWarning(backup_supervisor) << "Found" << missingAssets.size() << "assets missing.";
+        qCWarning(asset_backup) << "Found" << missingAssets.size() << "backup assets missing from disk.";
     }
 }
 
@@ -90,24 +101,26 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
                    back_inserter(deprecatedAssets));
 
     if (deprecatedAssets.size() > 0) {
-        qCDebug(backup_supervisor) << "Found" << deprecatedAssets.size() << "assets to delete.";
+        qCDebug(asset_backup) << "Found" << deprecatedAssets.size() << "backup assets to delete from disk.";
         if (_allBackupsLoadedSuccessfully) {
             for (const auto& hash : deprecatedAssets) {
                 QFile::remove(_assetsDirectory + hash);
             }
         } else {
-            qCWarning(backup_supervisor) << "Some backups did not load properly, aborting deleting for safety.";
+            qCWarning(asset_backup) << "Some backups did not load properly, aborting delete operation for safety.";
         }
     }
 }
 
 void AssetsBackupHandler::loadBackup(QuaZip& zip) {
+    Q_ASSERT(QThread::currentThread() == thread());
+
     _backups.push_back({ zip.getZipName(), {}, false });
     auto& backup = _backups.back();
 
     if (!zip.setCurrentFile(MAPPINGS_FILE)) {
-        qCCritical(backup_supervisor) << "Failed to find" << MAPPINGS_FILE << "while recovering backup";
-        qCCritical(backup_supervisor) << "    Error:" << zip.getZipError();
+        qCCritical(asset_backup) << "Failed to find" << MAPPINGS_FILE << "while loading backup";
+        qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
         _allBackupsLoadedSuccessfully = false;
         return;
@@ -115,8 +128,8 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
 
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QFile::ReadOnly)) {
-        qCCritical(backup_supervisor) << "Could not open backup file:" << zip.getZipName();
-        qCCritical(backup_supervisor) << "    Error:" << zip.getZipError();
+        qCCritical(asset_backup) << "Could not unzip backup file for load:" << zip.getZipName();
+        qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
         _allBackupsLoadedSuccessfully = false;
         return;
@@ -125,8 +138,8 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
     QJsonParseError error;
     auto document = QJsonDocument::fromJson(zipFile.readAll(), &error);
     if (document.isNull() || !document.isObject()) {
-        qCCritical(backup_supervisor) << "Could not parse backup file to JSON object:" << zip.getZipName();
-        qCCritical(backup_supervisor) << "    Error:" << error.errorString();
+        qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << zip.getZipName();
+        qCCritical(asset_backup) << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
         _allBackupsLoadedSuccessfully = false;
         return;
@@ -138,33 +151,37 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
         const auto& assetHash = it.value().toString();
 
         if (!AssetUtils::isValidHash(assetHash)) {
-            qCCritical(backup_supervisor) << "Corrupted mapping in backup file" << zip.getZipName() << ":" << it.key();
+            qCCritical(asset_backup) << "Corrupted mapping in loading backup file" << zip.getZipName() << ":" << it.key();
             backup.corruptedBackup = true;
             _allBackupsLoadedSuccessfully = false;
-            return;
+            continue;
         }
 
         backup.mappings[assetPath] = assetHash;
         _assetsInBackups.insert(assetHash);
     }
 
+    checkForMissingAssets();
+    checkForAssetsToDelete();
     return;
 }
 
 void AssetsBackupHandler::createBackup(QuaZip& zip) {
+    Q_ASSERT(QThread::currentThread() == thread());
+
     if (operationInProgress()) {
-        qCWarning(backup_supervisor) << "There is already an operation in progress.";
+        qCWarning(asset_backup) << "There is already an operation in progress.";
         return;
     }
 
     if (_lastMappingsRefresh == 0) {
-        qCWarning(backup_supervisor) << "Current mappings not yet loaded.";
+        qCWarning(asset_backup) << "Current mappings not yet loaded.";
         return;
     }
 
     static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
     if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qCWarning(backup_supervisor) << "Backing up asset mappings that might be stale.";
+        qCWarning(asset_backup) << "Backing up asset mappings that might be stale.";
     }
 
     AssetServerBackup backup;
@@ -180,43 +197,65 @@ void AssetsBackupHandler::createBackup(QuaZip& zip) {
 
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(MAPPINGS_FILE))) {
-        qCDebug(backup_supervisor) << "Could not open zip file:" << zipFile.getZipError();
+        qCDebug(asset_backup) << "Could not open zip file:" << zipFile.getZipError();
         return;
     }
     zipFile.write(document.toJson());
     zipFile.close();
     if (zipFile.getZipError() != UNZ_OK) {
-        qCDebug(backup_supervisor) << "Could not close zip file: " << zipFile.getZipError();
+        qCDebug(asset_backup) << "Could not close zip file: " << zipFile.getZipError();
         return;
     }
     _backups.push_back(backup);
 }
 
 void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
+    Q_ASSERT(QThread::currentThread() == thread());
+
     if (operationInProgress()) {
-        qCWarning(backup_supervisor) << "There is already a backup/restore in progress.";
+        qCWarning(asset_backup) << "There is already a backup/restore in progress.";
         return;
     }
 
     if (_lastMappingsRefresh == 0) {
-        qCWarning(backup_supervisor) << "Current mappings not yet loaded.";
+        qCWarning(asset_backup) << "Current mappings not yet loaded.";
         return;
     }
 
     static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
     if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qCWarning(backup_supervisor) << "Current asset mappings that might be stale.";
+        qCWarning(asset_backup) << "Current asset mappings that might be stale.";
     }
 
-    startOperation();
-
     auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
         return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to restore.";
-        stopOperation();
-        return;
+        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to restore.";
+
+        loadBackup(zip);
+
+        QuaZipDir zipDir { &zip, ZIP_ASSETS_FOLDER };
+
+        auto assetNames = zipDir.entryList(QDir::Files);
+        for (const auto& asset : assetNames) {
+            if (AssetUtils::isValidHash(asset)) {
+                if (!zip.setCurrentFile(MAPPINGS_FILE)) {
+                    qCCritical(asset_backup) << "Failed to find" << asset << "while recovering backup";
+                    qCCritical(asset_backup) << "    Error:" << zip.getZipError();
+                    continue;
+                }
+
+                QuaZipFile zipFile { &zip };
+                if (!zipFile.open(QFile::ReadOnly)) {
+                    qCCritical(asset_backup) << "Could not unzip asset file:" << asset;
+                    qCCritical(asset_backup) << "    Error:" << zip.getZipError();
+                    continue;
+                }
+
+                writeAssetFile(asset, zipFile.readAll());
+            }
+        }
     }
 
     const auto& newMappings = it->mappings;
@@ -226,8 +265,10 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
 }
 
 void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
+    Q_ASSERT(QThread::currentThread() == thread());
+
     if (operationInProgress()) {
-        qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
+        qCWarning(asset_backup) << "There is a backup/restore in progress.";
         return;
     }
 
@@ -235,7 +276,7 @@ void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
         return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to delete.";
+        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to delete.";
         return;
     }
 
@@ -244,8 +285,10 @@ void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
 }
 
 void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
+    Q_ASSERT(QThread::currentThread() == thread());
+
     if (operationInProgress()) {
-        qCWarning(backup_supervisor) << "There is a backup/restore in progress.";
+        qCWarning(asset_backup) << "There is a backup/restore in progress.";
         return;
     }
     QFileInfo zipInfo(zip.getZipName());
@@ -255,7 +298,7 @@ void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
         return info.fileName() == zipInfo.fileName();
     });
     if (it == end(_backups)) {
-        qCDebug(backup_supervisor) << "Could not find backup" << zip.getZipName() << "to consolidate.";
+        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to consolidate.";
         return;
     }
 
@@ -265,20 +308,19 @@ void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
         QDir assetsDir { _assetsDirectory };
         QFile file { assetsDir.filePath(hash) };
         if (!file.open(QFile::ReadOnly)) {
-            qCCritical(backup_supervisor) << "Could not open asset file" << file.fileName();
+            qCCritical(asset_backup) << "Could not open asset file" << file.fileName();
             continue;
         }
 
         QuaZipFile zipFile { &zip };
-        static const QString ZIP_ASSETS_FOLDER = "files/";
-        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ZIP_ASSETS_FOLDER + hash))) {
-            qCDebug(backup_supervisor) << "Could not open zip file:" << zipFile.getZipError();
+        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ZIP_ASSETS_FOLDER + "/" + hash))) {
+            qCDebug(asset_backup) << "Could not open zip file:" << zipFile.getZipError();
             continue;
         }
         zipFile.write(file.readAll());
         zipFile.close();
         if (zipFile.getZipError() != UNZ_OK) {
-            qCDebug(backup_supervisor) << "Could not close zip file: " << zipFile.getZipError();
+            qCDebug(asset_backup) << "Could not close zip file: " << zipFile.getZipError();
             continue;
         }
     }
@@ -300,8 +342,8 @@ void AssetsBackupHandler::refreshMappings() {
 
             downloadMissingFiles(_currentMappings);
         } else {
-            qCCritical(backup_supervisor) << "Could not refresh asset server mappings.";
-            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
+            qCCritical(asset_backup) << "Could not refresh asset server mappings.";
+            qCCritical(asset_backup) << "    Error:" << request->getErrorString();
         }
 
         request->deleteLater();
@@ -341,14 +383,14 @@ void AssetsBackupHandler::downloadNextMissingFile() {
 
     QObject::connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) {
         if (request->getError() == AssetRequest::NoError) {
-            qCDebug(backup_supervisor) << "Backing up asset" << request->getHash();
+            qCDebug(asset_backup) << "Backing up asset" << request->getHash();
 
             bool success = writeAssetFile(request->getHash(), request->getData());
             if (!success) {
-                qCCritical(backup_supervisor) << "Failed to write asset file" << request->getHash();
+                qCCritical(asset_backup) << "Failed to write asset file" << request->getHash();
             }
         } else {
-            qCCritical(backup_supervisor) << "Failed to backup asset" << request->getHash();
+            qCCritical(asset_backup) << "Failed to backup asset" << request->getHash();
         }
 
         _assetsLeftToRequest.erase(request->getHash());
@@ -364,13 +406,13 @@ bool AssetsBackupHandler::writeAssetFile(const AssetUtils::AssetHash& hash, cons
     QDir assetsDir { _assetsDirectory };
     QFile file { assetsDir.filePath(hash) };
     if (!file.open(QFile::WriteOnly)) {
-        qCCritical(backup_supervisor) << "Could not open backup file" << file.fileName();
+        qCCritical(asset_backup) << "Could not open asset file for write:" << file.fileName();
         return false;
     }
 
     auto bytesWritten = file.write(data);
     if (bytesWritten != data.size()) {
-        qCCritical(backup_supervisor) << "Could not write data to file" << file.fileName();
+        qCCritical(asset_backup) << "Could not write data to file" << file.fileName();
         file.remove();
         return false;
     }
@@ -410,9 +452,9 @@ void AssetsBackupHandler::computeServerStateDifference(const AssetUtils::Mapping
         }
     }
 
-    qCDebug(backup_supervisor) << "Mappings to set:" << _mappingsLeftToSet.size();
-    qCDebug(backup_supervisor) << "Mappings to del:" << _mappingsLeftToDelete.size();
-    qCDebug(backup_supervisor) << "Assets to upload:" << _assetsLeftToUpload.size();
+    qCDebug(asset_backup) << "Mappings to set:" << _mappingsLeftToSet.size();
+    qCDebug(asset_backup) << "Mappings to del:" << _mappingsLeftToDelete.size();
+    qCDebug(asset_backup) << "Assets to upload:" << _assetsLeftToUpload.size();
 }
 
 void AssetsBackupHandler::restoreAllAssets() {
@@ -420,6 +462,8 @@ void AssetsBackupHandler::restoreAllAssets() {
 }
 
 void AssetsBackupHandler::restoreNextAsset() {
+    startOperation();
+
     if (_assetsLeftToUpload.empty()) {
         updateMappings();
         return;
@@ -435,8 +479,8 @@ void AssetsBackupHandler::restoreNextAsset() {
 
     QObject::connect(request, &AssetUpload::finished, this, [this](AssetUpload* request) {
         if (request->getError() != AssetUpload::NoError) {
-            qCCritical(backup_supervisor) << "Failed to restore asset:" << request->getFilename();
-            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
+            qCCritical(asset_backup) << "Failed to restore asset:" << request->getFilename();
+            qCCritical(asset_backup) << "    Error:" << request->getErrorString();
         }
 
         restoreNextAsset();
@@ -453,8 +497,8 @@ void AssetsBackupHandler::updateMappings() {
         auto request = assetClient->createSetMappingRequest(mapping.first, mapping.second);
         QObject::connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) {
             if (request->getError() != MappingRequest::NoError) {
-                qCCritical(backup_supervisor) << "Failed to set mapping:" << request->getPath();
-                qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
+                qCCritical(asset_backup) << "Failed to set mapping:" << request->getPath();
+                qCCritical(asset_backup) << "    Error:" << request->getErrorString();
             }
 
             if (--_mappingRequestsInFlight == 0) {
@@ -472,8 +516,8 @@ void AssetsBackupHandler::updateMappings() {
     auto request = assetClient->createDeleteMappingsRequest(_mappingsLeftToDelete);
     QObject::connect(request, &DeleteMappingsRequest::finished, this, [this](DeleteMappingsRequest* request) {
         if (request->getError() != MappingRequest::NoError) {
-            qCCritical(backup_supervisor) << "Failed to delete mappings";
-            qCCritical(backup_supervisor) << "    Error:" << request->getErrorString();
+            qCCritical(asset_backup) << "Failed to delete mappings";
+            qCCritical(asset_backup) << "    Error:" << request->getErrorString();
         }
 
         if (--_mappingRequestsInFlight == 0) {
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index b78206b7b1..2ef454998e 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -40,6 +40,7 @@ public:
     bool operationInProgress() const { return _operationInProgress; }
 
 private:
+    void setupRefreshTimer();
     void refreshMappings();
 
     void refreshAssetsInBackups();

From f07b1fa4c52af97f9adab2ba6e9678a75fe6aa2b Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 15 Feb 2018 11:32:29 -0800
Subject: [PATCH 291/569] Revert "FBX node IDs aren't alphanumerically ordered
 per logical structure"

This reverts commit a7ec4501e65396d4c7bf2316dd73188cea7a3c7d.

Because remainingModels is a QSet, the order is not guaranteed.
Therefore the same code iterating over the same items will sometimes have a different ordering.
See docs for QSet, http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same.  When they are not the avatar's appear scrambled.
---
 libraries/fbx/src/FBXReader.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 4ed1ca38dc..14f12b5d1b 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1481,6 +1481,11 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     }
     while (!remainingModels.isEmpty()) {
         QString first = *remainingModels.constBegin();
+        foreach (const QString& id, remainingModels) {
+            if (id < first) {
+                first = id;
+            }
+        }
         QString topID = getTopModelID(_connectionParentMap, models, first, url);
         appendModelIDs(_connectionParentMap.value(topID), _connectionChildMap, models, remainingModels, modelIDs, true);
     }

From 777862f253c32afcfa1bd0988a986da0d5b7c7da Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 15 Feb 2018 11:50:38 -0800
Subject: [PATCH 292/569] can cast shadow flag now works correctly (UI/JS
 aspects).

---
 libraries/entities/src/EntityItemProperties.cpp | 9 +++++++++
 libraries/entities/src/EntityItemProperties.h   | 2 +-
 scripts/system/html/js/entityProperties.js      | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 3c3c0742da..86404c6504 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1506,6 +1506,15 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_SHAPE, properties.getShape());
             }
 
+            // Only models and shapes (including cubes and spheres) can cast shadows
+            if (properties.getType() == EntityTypes::Model ||
+                properties.getType() == EntityTypes::Shape ||
+                properties.getType() == EntityTypes::Box ||
+                properties.getType() == EntityTypes::Sphere) {
+                
+                APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, properties.getCanCastShadow());
+            }
+
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, properties.getCollisionSoundURL());
             APPEND_ENTITY_PROPERTY(PROP_ACTION_DATA, properties.getActionData());
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index dcec1a1f81..349d32f806 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -113,6 +113,7 @@ public:
     // bool _fooChanged { false };
 
     DEFINE_PROPERTY(PROP_VISIBLE, Visible, visible, bool, ENTITY_ITEM_DEFAULT_VISIBLE);
+    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW);
     DEFINE_PROPERTY_REF_WITH_SETTER(PROP_POSITION, Position, position, glm::vec3, ENTITY_ITEM_ZERO_VEC3);
     DEFINE_PROPERTY_REF(PROP_DIMENSIONS, Dimensions, dimensions, glm::vec3, ENTITY_ITEM_DEFAULT_DIMENSIONS);
     DEFINE_PROPERTY_REF(PROP_ROTATION, Rotation, rotation, glm::quat, ENTITY_ITEM_DEFAULT_ROTATION);
@@ -128,7 +129,6 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
-    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW);
     DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
     DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
     DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index fca43c4665..1b4df84f40 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -983,11 +983,11 @@ function loaded() {
                                                                      properties.color.green + "," + properties.color.blue + ")";
                         }
 
-                        //if (properties.type === "Model" ||
-                        //    properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
+                        if (properties.type === "Model" ||
+                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
 
-                            elCanCastShadow = properties.canCastShadow;
-                        //}
+                            elCanCastShadow.checked = properties.canCastShadow;
+                        }
 
                         if (properties.type === "Model") {
                             elModelURL.value = properties.modelURL;

From df7a8389b3102c9c4dc4b0bb74168f97a16343ab Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 15 Feb 2018 11:51:06 -0800
Subject: [PATCH 293/569] Fixed possible crash.

---
 libraries/render-utils/src/RenderShadowTask.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 24a14a697c..7806c95330 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -121,8 +121,7 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
     assert(lightStage);
 
 	// Exit if current keylight does not cast shadows
-    bool castShadows = lightStage->getCurrentKeyLight()->getCastShadows();
-    if (!castShadows) {
+    if (!lightStage->getCurrentKeyLight() || !lightStage->getCurrentKeyLight()->getCastShadows()) {
         return;
     }
 

From c70b655fbc5a170e180e9d99f800fb39d73c6af2 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 15 Feb 2018 11:55:16 -0800
Subject: [PATCH 294/569] A bit more explanations to the Task  Flow class

---
 libraries/task/src/task/Task.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index 34cdbb5439..08df55dddd 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -27,21 +27,32 @@ template <class JC> class JobT;
 template <class JC> class TaskT;
 class JobNoIO {};
 
+// Task Flow control class is a simple per value object used to communicate flow control commands trhough the graph of tasks.
+// From within the Job::Run function, you can access it from the JobCOntext and  issue commands which   will be picked up by the Task calling for the Job run.
+// This is first introduced to provide a way to abort all the work from within a task job. see the "abortTask" call
 class TaskFlow {
 public:
+    // A job that wants to abort the rest of the other jobs execution in a task would issue that call "abortTask" and let the task early exit for this run.
+    // All the varyings produced by the aborted branch of jobs are left unmodified.
+    void abortTask();
+
+    // called by the task::run to perform flow control
+    // This should be considered private but still need to be accessible from the Task<T> class
     TaskFlow() = default;
     ~TaskFlow() = default;
-
-    // called after each job 
     void reset();
-
-    void abortTask();
     bool doAbortTask() const;
 
 protected:
     bool _doAbortTask{ false };
 };
 
+// JobContext class is the base calss for the context object which is passed through all the Job::run calls thoughout the graph of jobs
+// It is used to communicate to the job::run its context and various state information the job relies on.
+// It specifically provide access to:
+// - The taskFlow object allowing for messaging control flow commands from within a Job::run
+// - The current Config object attached to the Job::run currently called.
+// The JobContext can be derived to add more global state to it that Jobs can access
 class JobContext {
 public:
     JobContext(const QLoggingCategory& category);

From 807237282263e941235ab48b525a4079c712259d Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 15 Feb 2018 13:14:56 -0800
Subject: [PATCH 295/569] Lots of changes

---
 .../resources/qml/controls-uit/Separator.qml  |  4 +-
 .../qml/hifi/commerce/checkout/Checkout.qml   | 69 ++++++++++---------
 .../hifi/commerce/purchases/PurchasedItem.qml | 62 +++++++++++++----
 .../qml/hifi/commerce/purchases/Purchases.qml | 16 +++--
 interface/src/commerce/QmlCommerce.cpp        |  8 +--
 interface/src/commerce/QmlCommerce.h          |  4 +-
 libraries/avatars/src/AvatarData.h            |  3 +-
 libraries/avatars/src/ScriptAvatarData.cpp    |  1 +
 libraries/avatars/src/ScriptAvatarData.h      |  3 +-
 9 files changed, 109 insertions(+), 61 deletions(-)

diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controls-uit/Separator.qml
index 5e2d278454..3350764ae9 100644
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controls-uit/Separator.qml
@@ -14,8 +14,8 @@ import "../styles-uit"
 Item {
     property int colorScheme: 0;
     
-    readonly property var topColor: [ hifi.colors.baseGrayShadow, hifi.colors.faintGray ];
-    readonly property var bottomColor: [ hifi.colors.baseGrayHighlight, hifi.colors.faintGray ];
+    readonly property var topColor: [ hifi.colors.baseGrayShadow, hifi.colors.faintGray, "#89858C" ];
+    readonly property var bottomColor: [ hifi.colors.baseGrayHighlight, hifi.colors.faintGray, "#89858C" ];
 
     // Size
     height: colorScheme === 0 ? 2 : 1;
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 916e67e37f..08b100a64c 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -339,8 +339,8 @@ Rectangle {
             anchors.leftMargin: 16;
             width: paintedWidth;
             height: paintedHeight;
-            text: "Confirm Purchase:";
-            color: hifi.colors.baseGray;
+            text: "Review Purchase:";
+            color: hifi.colors.black;
             size: 28;
         }
         
@@ -453,7 +453,7 @@ Rectangle {
             width: root.width;
             // Anchors
             anchors.top: separator2.bottom;
-            anchors.topMargin: 16;
+            anchors.topMargin: 0;
             anchors.left: parent.left;
             anchors.leftMargin: 16;
             anchors.right: parent.right;
@@ -465,7 +465,7 @@ Rectangle {
                 id: buyTextContainer;
                 visible: buyText.text !== "";
                 anchors.top: parent.top;
-                anchors.topMargin: 16;
+                anchors.topMargin: 10;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 height: buyText.height + 30;
@@ -517,8 +517,8 @@ Rectangle {
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top;
-                anchors.topMargin: 16;
-                height: 40;
+                anchors.topMargin: 10;
+                height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 text: "VIEW THIS ITEM IN MY PURCHASES";
@@ -536,8 +536,8 @@ Rectangle {
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: viewInMyPurchasesButton.visible ? viewInMyPurchasesButton.bottom :
                     (buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top);
-                anchors.topMargin: 16;
-                height: 40;
+                anchors.topMargin: 10;
+                height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 text: ((root.isCertified) ? ((ownershipStatusReceived && balanceReceived) ?
@@ -579,8 +579,8 @@ Rectangle {
                 color: hifi.buttons.noneBorderlessGray;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: buyButton.visible ? buyButton.bottom : viewInMyPurchasesButton.bottom;
-                anchors.topMargin: 16;
-                height: 40;
+                anchors.topMargin: 10;
+                height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 text: "Cancel"
@@ -606,32 +606,32 @@ Rectangle {
         anchors.top: titleBarContainer.bottom;
         anchors.bottom: root.bottom;
         anchors.left: parent.left;
-        anchors.leftMargin: 16;
+        anchors.leftMargin: 20;
         anchors.right: parent.right;
-        anchors.rightMargin: 16;
+        anchors.rightMargin: 20;
 
         RalewayRegular {
             id: completeText;
             anchors.top: parent.top;
-            anchors.topMargin: 30;
+            anchors.topMargin: 18;
             anchors.left: parent.left;
             width: paintedWidth;
             height: paintedHeight;
             text: "Thank you for your order!";
             color: hifi.colors.baseGray;
-            size: 28;
+            size: 36;
         }
 
         RalewaySemiBold {
             id: completeText2;
             text: "The " + (root.itemTypesText)[itemTypesArray.indexOf(root.itemType)] +
-                '<font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
+                ' <font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
                 " has been added to your Purchases and a receipt will appear in your Wallet's transaction history.";
             // Text size
-            size: 20;
+            size: 18;
             // Anchors
             anchors.top: completeText.bottom;
-            anchors.topMargin: 10;
+            anchors.topMargin: 15;
             height: paintedHeight;
             anchors.left: parent.left;
             anchors.right: parent.right;
@@ -684,7 +684,7 @@ Rectangle {
             color: hifi.buttons.red;
             colorScheme: hifi.colorSchemes.light;
             anchors.top: completeText2.bottom;
-            anchors.topMargin: 30;
+            anchors.topMargin: 27;
             height: 50;
             anchors.left: parent.left;
             anchors.right: parent.right;
@@ -700,12 +700,18 @@ Rectangle {
                     lightboxPopup.button1text = "CANCEL";
                     lightboxPopup.button1method = "root.visible = false;"
                     lightboxPopup.button2text = "CONFIRM";
-                    lightboxPopup.button2method = "Commerce.replaceContentSet('" + root.itemId + "', '" + root.itemHref + "');" + 
+                    lightboxPopup.button2method = "Commerce.replaceContentSet('" + root.itemHref + "');" + 
                     "root.visible = false;rezzedNotifContainer.visible = true; rezzedNotifContainerTimer.start();" + 
                     "UserActivityLogger.commerceEntityRezzed('" + root.itemId + "', 'checkout', '" + root.itemType + "');";
                     lightboxPopup.visible = true;
                 } else if (root.itemType === "avatar") {
-                    Avatar.skeletonModelURL = root.itemHref;
+                    lightboxPopup.titleText = "Change Avatar";
+                    lightboxPopup.bodyText = "This will change your current avatar to " + root.itemName + " while retaining your wearables.";
+                    lightboxPopup.button1text = "CANCEL";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.button2text = "CONFIRM";
+                    lightboxPopup.button2method = "Avatar.skeletonModelURL('" + root.itemHref + "'); root.visible = false;";
+                    lightboxPopup.visible = true;
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     rezzedNotifContainer.visible = true;
@@ -768,9 +774,9 @@ Rectangle {
 
         RalewaySemiBold {
             id: myPurchasesLink;
-            text: '<font color="' + hifi.colors.blueAccent + '"><a href="#">View this item in My Purchases</a></font>';
+            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View this item in My Purchases</a></font>';
             // Text size
-            size: 20;
+            size: 18;
             // Anchors
             anchors.top: explainRezText.visible ? explainRezText.bottom : (noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom);
             anchors.topMargin: 40;
@@ -790,12 +796,12 @@ Rectangle {
 
         RalewaySemiBold {
             id: walletLink;
-            text: '<font color="' + hifi.colors.blueAccent + '"><a href="#">View receipt in Wallet</a></font>';
+            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View receipt in Wallet</a></font>';
             // Text size
-            size: 20;
+            size: 18;
             // Anchors
             anchors.top: myPurchasesLink.bottom;
-            anchors.topMargin: 20;
+            anchors.topMargin: 16;
             height: paintedHeight;
             anchors.left: parent.left;
             anchors.right: parent.right;
@@ -813,12 +819,12 @@ Rectangle {
         RalewayRegular {
             id: pendingText;
             text: 'Your item is marked "pending" while your purchase is being confirmed. ' +
-            '<font color="' + hifi.colors.blueAccent + '"><a href="#">Learn More</a></font>';
+            '<b><font color="' + hifi.colors.primaryHighlight + '"><a href="#">Learn More</a></font></b>';
             // Text size
-            size: 20;
+            size: 18;
             // Anchors
             anchors.top: walletLink.bottom;
-            anchors.topMargin: 60;
+            anchors.topMargin: 32;
             height: paintedHeight;
             anchors.left: parent.left;
             anchors.right: parent.right;
@@ -844,11 +850,10 @@ Rectangle {
             color: hifi.buttons.noneBorderlessGray;
             colorScheme: hifi.colorSchemes.light;
             anchors.bottom: parent.bottom;
-            anchors.bottomMargin: 20;
+            anchors.bottomMargin: 54;
             anchors.right: parent.right;
-            anchors.rightMargin: 14;
-            width: parent.width/2 - anchors.rightMargin;
-            height: 60;
+            width: 193;
+            height: 44;
             text: "Continue Shopping";
             onClicked: {
                 sendToScript({method: 'checkout_continueShopping', itemId: itemId});
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 7b2cae5188..be460ea4ef 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -20,6 +20,7 @@ import "../../../styles-uit"
 import "../../../controls-uit" as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
+import TabletScriptingInterface 1.0
 
 // references XXX from root context
 
@@ -56,7 +57,17 @@ Item {
         target: Commerce;
         
         onContentSetChanged: {
-            if (contentSetMarketplaceID === root.itemId) {
+            if (contentSetHref === root.itemHref) {
+                showConfirmation = true;
+            }
+        }
+    }
+
+    Connections {
+        target: MyAvatar;
+
+        onSkeletonModelURLChanged: {
+            if (skeletonModelURL === root.itemHref) {
                 showConfirmation = true;
             }
         }
@@ -275,19 +286,19 @@ Item {
                 anchors.bottom: parent.bottom;
                 width: 32;
                 // Style
-                color: hifi.colors.lightGray;
+                color: hifi.colors.black;
             }
 
             RalewayRegular {
                 id: viewCertificateText;
                 text: "VIEW CERTIFICATE";
-                size: 14;
+                size: 13;
                 anchors.left: certificateIcon.right;
                 anchors.leftMargin: 4;
                 anchors.top: parent.top;
                 anchors.bottom: parent.bottom;
                 anchors.right: parent.right;
-                color: hifi.colors.lightGray;
+                color: hifi.colors.black;
             }
 
             MouseArea {
@@ -297,13 +308,13 @@ Item {
                     sendToPurchases({method: 'purchases_itemCertificateClicked', itemCertificateId: root.certificateId});
                 }
                 onEntered: {
-                    certificateIcon.color = hifi.colors.black;
-                    viewCertificateText.color = hifi.colors.black;
-                }
-                onExited: {
                     certificateIcon.color = hifi.colors.lightGray;
                     viewCertificateText.color = hifi.colors.lightGray;
                 }
+                onExited: {
+                    certificateIcon.color = hifi.colors.black;
+                    viewCertificateText.color = hifi.colors.black;
+                }
             }
         }
 
@@ -317,14 +328,14 @@ Item {
             anchors.right: buttonContainer.left;
             anchors.rightMargin: 2;
 
-            FiraSansRegular {
+            RalewayRegular {
                 anchors.left: parent.left;
                 anchors.top: parent.top;
                 anchors.bottom: parent.bottom;
                 width: paintedWidth;
                 text: "#" + root.itemEdition;
-                size: 15;
-                color: "#cc6a6a6a";
+                size: 13;
+                color: hifi.colors.black;
                 verticalAlignment: Text.AlignTop;
             }
         }
@@ -471,13 +482,28 @@ Item {
             anchors.right: parent.right;
             anchors.rightMargin: 4;
             width: height;
-            enabled: root.hasPermissionToRezThis && root.purchaseStatus !== "invalidated";
+            enabled: root.hasPermissionToRezThis &&
+                root.purchaseStatus !== "invalidated" &&
+                MyAvatar.skeletonModelURL !== root.itemHref;
+
+            onHoveredChanged: {
+                if (hovered) {
+                    Tablet.playSound(TabletEnums.ButtonHover);
+                }
+            }
+    
+            onFocusChanged: {
+                if (focus) {
+                    Tablet.playSound(TabletEnums.ButtonHover);
+                }
+            }
             
             onClicked: {
+                Tablet.playSound(TabletEnums.ButtonClick);
                 if (root.itemType === "contentSet") {
-                    sendToPurchases({method: 'showReplaceContentLightbox', itemId: root.itemId, itemHref: root.itemHref});
+                    sendToPurchases({method: 'showReplaceContentLightbox', itemHref: root.itemHref});
                 } else if (root.itemType === "avatar") {
-                    Avatar.skeletonModelURL = root.itemHref;
+                    sendToPurchases({method: 'showChangeAvatarLightbox', itemName: root.itemName, itemHref: root.itemHref});
                 } else {
                     sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     root.showConfirmation = true;
@@ -547,7 +573,13 @@ Item {
                         size: 15;
                         verticalAlignment: Text.AlignVCenter
                         horizontalAlignment: Text.AlignHCenter
-                        text: (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]
+                        text: {
+                            if (MyAvatar.skeletonModelURL === root.itemHref) {
+                                "CURRENT";
+                            } else {
+                                (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
+                            }
+                        }
                     }
                 }
             }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 91fed207bc..df65a0a1ac 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -300,7 +300,7 @@ Rectangle {
             anchors.left: parent.left;
             anchors.leftMargin: 8;
             anchors.right: parent.right;
-            anchors.rightMargin: 12;
+            anchors.rightMargin: 16;
             anchors.top: parent.top;
             anchors.topMargin: 4;
 
@@ -314,7 +314,7 @@ Rectangle {
                 anchors.leftMargin: 16;
                 width: paintedWidth;
                 text: isShowingMyItems ? "My Items" : "My Purchases";
-                color: hifi.colors.baseGray;
+                color: hifi.colors.black;
                 size: 22;
             }
 
@@ -348,7 +348,7 @@ Rectangle {
 
         HifiControlsUit.Separator {
             id: separator;
-            colorScheme: 1;
+            colorScheme: 2;
             anchors.left: parent.left;
             anchors.right: parent.right;
             anchors.top: filterBarContainer.bottom;
@@ -445,7 +445,15 @@ Rectangle {
                             lightboxPopup.button1text = "CANCEL";
                             lightboxPopup.button1method = "root.visible = false;"
                             lightboxPopup.button2text = "CONFIRM";
-                            lightboxPopup.button2method = "Commerce.replaceContentSet('" + msg.itemId + "', '" + msg.itemHref + "'); root.visible = false;";
+                            lightboxPopup.button2method = "Commerce.replaceContentSet('" + msg.itemHref + "'); root.visible = false;";
+                            lightboxPopup.visible = true;
+                        } else if (msg.method === "showChangeAvatarLightbox") {
+                            lightboxPopup.titleText = "Change Avatar";
+                            lightboxPopup.bodyText = "This will change your current avatar to " + msg.itemName + " while retaining your wearables.";
+                            lightboxPopup.button1text = "CANCEL";
+                            lightboxPopup.button1method = "root.visible = false;"
+                            lightboxPopup.button2text = "CONFIRM";
+                            lightboxPopup.button2method = "MyAvatar.skeletonModelURL('" + msg.itemHref + "'); root.visible = false;";
                             lightboxPopup.visible = true;
                         } else if (msg.method === "showPermissionsExplanation") {
                             if (msg.itemType === "entity") {
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 5458925d55..36c1e422c5 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -168,15 +168,15 @@ void QmlCommerce::transferHfcToUsername(const QString& username, const int& amou
     ledger->transferHfcToUsername(key, username, amount, optionalMessage);
 }
 
-void QmlCommerce::replaceContentSet(const QString& id, const QString& url) {
-    qApp->replaceDomainContent(url);
+void QmlCommerce::replaceContentSet(const QString& itemHref) {
+    qApp->replaceDomainContent(itemHref);
     QJsonObject messageProperties = {
         { "status", "SuccessfulRequestToReplaceContent" },
-        { "content_set_url", url }
+        { "content_set_url", itemHref }
     };
     UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
 
-    emit contentSetChanged(id);
+    emit contentSetChanged(itemHref);
 }
 
 void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index dc38dcad19..b621608190 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -49,7 +49,7 @@ signals:
     void transferHfcToNodeResult(QJsonObject result);
     void transferHfcToUsernameResult(QJsonObject result);
 
-    void contentSetChanged(const QString& contentSetMarketplaceID);
+    void contentSetChanged(const QString& contentSetHref);
 
 protected:
     Q_INVOKABLE void getWalletStatus();
@@ -77,7 +77,7 @@ protected:
     Q_INVOKABLE void transferHfcToUsername(const QString& username, const int& amount, const QString& optionalMessage);
 
 
-    Q_INVOKABLE void replaceContentSet(const QString& id, const QString& url);
+    Q_INVOKABLE void replaceContentSet(const QString& itemHref);
 };
 
 #endif // hifi_QmlCommerce_h
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index f24bd51bde..6d9a13decf 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -371,7 +371,7 @@ class AvatarData : public QObject, public SpatiallyNestable {
     // The result is unique among all avatars present at the time.
     Q_PROPERTY(QString sessionDisplayName READ getSessionDisplayName WRITE setSessionDisplayName NOTIFY sessionDisplayNameChanged)
     Q_PROPERTY(bool lookAtSnappingEnabled MEMBER _lookAtSnappingEnabled NOTIFY lookAtSnappingChanged)
-    Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript)
+    Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript NOTIFY skeletonModelURLChanged)
     Q_PROPERTY(QVector<AttachmentData> attachmentData READ getAttachmentData WRITE setAttachmentData)
 
     Q_PROPERTY(QStringList jointNames READ getJointNames)
@@ -697,6 +697,7 @@ public:
 signals:
     void displayNameChanged();
     void sessionDisplayNameChanged();
+    void skeletonModelURLChanged();
     void lookAtSnappingChanged(bool enabled);
     void sessionUUIDChanged();
 
diff --git a/libraries/avatars/src/ScriptAvatarData.cpp b/libraries/avatars/src/ScriptAvatarData.cpp
index 1fd001e536..8491e5368b 100644
--- a/libraries/avatars/src/ScriptAvatarData.cpp
+++ b/libraries/avatars/src/ScriptAvatarData.cpp
@@ -16,6 +16,7 @@ ScriptAvatarData::ScriptAvatarData(AvatarSharedPointer avatarData) :
 {
     QObject::connect(avatarData.get(), &AvatarData::displayNameChanged, this, &ScriptAvatarData::displayNameChanged);
     QObject::connect(avatarData.get(), &AvatarData::sessionDisplayNameChanged, this, &ScriptAvatarData::sessionDisplayNameChanged);
+    QObject::connect(avatarData.get(), &AvatarData::skeletonModelURLChanged, this, &ScriptAvatarData::skeletonModelURLChanged);
     QObject::connect(avatarData.get(), &AvatarData::lookAtSnappingChanged, this, &ScriptAvatarData::lookAtSnappingChanged);
 }
 
diff --git a/libraries/avatars/src/ScriptAvatarData.h b/libraries/avatars/src/ScriptAvatarData.h
index 68074b838d..13713ff15f 100644
--- a/libraries/avatars/src/ScriptAvatarData.h
+++ b/libraries/avatars/src/ScriptAvatarData.h
@@ -51,7 +51,7 @@ class ScriptAvatarData : public QObject {
     //
     // ATTACHMENT AND JOINT PROPERTIES
     //
-    Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript)
+    Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript NOTIFY skeletonModelURLChanged)
     Q_PROPERTY(QVector<AttachmentData> attachmentData READ getAttachmentData)
     Q_PROPERTY(QStringList jointNames READ getJointNames)
 
@@ -132,6 +132,7 @@ public:
 signals:
     void displayNameChanged();
     void sessionDisplayNameChanged();
+    void skeletonModelURLChanged();
     void lookAtSnappingChanged(bool enabled);
 
 public slots:

From 3297e39c144581788015b5ea4cd5bc52505fda0a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 13:39:18 -0800
Subject: [PATCH 296/569] CR

---
 domain-server/src/AssetsBackupHandler.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index a9f56a0c5b..ae9cb58343 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -58,7 +58,6 @@ void AssetsBackupHandler::setupRefreshTimer() {
     });
     QObject::connect(nodeList.data(), &LimitedNodeList::nodeKilled, this, [this](SharedNodePointer node) {
         if (node->getType() == NodeType::AssetServer) {
-            // run immediately for the first time.
             _mappingsRefreshTimer.stop();
         }
     });
@@ -240,7 +239,7 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
         auto assetNames = zipDir.entryList(QDir::Files);
         for (const auto& asset : assetNames) {
             if (AssetUtils::isValidHash(asset)) {
-                if (!zip.setCurrentFile(MAPPINGS_FILE)) {
+                if (!zip.setCurrentFile(zipDir.filePath(asset))) {
                     qCCritical(asset_backup) << "Failed to find" << asset << "while recovering backup";
                     qCCritical(asset_backup) << "    Error:" << zip.getZipError();
                     continue;

From 72e89851f3c2936bbf3da1f065fb3bc4fb4b919e Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 15 Feb 2018 14:16:56 -0800
Subject: [PATCH 297/569] Added READ_ENTITY_PROPERTY_TO_PROPERTIES

---
 libraries/entities/src/EntityItemProperties.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 86404c6504..78c6c6a6b3 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1869,6 +1869,14 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         properties.getType() == EntityTypes::Box ||
         properties.getType() == EntityTypes::Sphere) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE, QString, setShape);
+    }
+
+    // Can cast shadow flag
+    if (properties.getType() == EntityTypes::Model || 
+        properties.getType() == EntityTypes::Shape ||
+        properties.getType() == EntityTypes::Box ||
+        properties.getType() == EntityTypes::Sphere) {
+
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     }
 

From 811ecf9db8341428ecbf5bba66c7e7a87aeb61ee Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 15 Feb 2018 14:11:01 -0800
Subject: [PATCH 298/569] Fix

---
 .../resources/qml/hifi/commerce/checkout/Checkout.qml     | 6 +++---
 .../qml/hifi/commerce/purchases/PurchasedItem.qml         | 5 +++--
 .../resources/qml/hifi/commerce/purchases/Purchases.qml   | 2 +-
 scripts/system/marketplaces/marketplaces.js               | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 08b100a64c..891c8142bf 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -146,7 +146,7 @@ Rectangle {
     }
 
     onItemTypeChanged: {
-        if (root.itemType === "entity" || root.itemType === "wearable" || root.itemType === "contentSet") {
+        if (root.itemType === "entity" || root.itemType === "wearable" || root.itemType === "contentSet" || root.itemType === "avatar") {
             root.isCertified = true;
         } else {
             root.isCertified = false;
@@ -679,7 +679,7 @@ Rectangle {
             id: rezNowButton;
             enabled: (root.itemType === "entity" && root.canRezCertifiedItems) ||
                 (root.itemType === "contentSet" && Entities.canReplaceContent()) ||
-                root.itemType === "wearable";
+                root.itemType === "wearable" || root.itemType === "avatar";
             buttonGlyph: (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)];
             color: hifi.buttons.red;
             colorScheme: hifi.colorSchemes.light;
@@ -710,7 +710,7 @@ Rectangle {
                     lightboxPopup.button1text = "CANCEL";
                     lightboxPopup.button1method = "root.visible = false;"
                     lightboxPopup.button2text = "CONFIRM";
-                    lightboxPopup.button2method = "Avatar.skeletonModelURL('" + root.itemHref + "'); root.visible = false;";
+                    lightboxPopup.button2method = "MyAvatar.useFullAvatarURL('" + root.itemHref + "'); root.visible = false;";
                     lightboxPopup.visible = true;
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index be460ea4ef..50ac34cd51 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -151,8 +151,9 @@ Item {
             anchors.topMargin: 4;
             anchors.left: itemPreviewImage.right;
             anchors.leftMargin: 8;
-            width: root.hasPermissionToRezThis ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width) :
-                Math.min(itemNameTextMetrics.tightBoundingRect.width + 2, buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - noPermissionGlyph.width + 2);
+            width: root.hasPermissionToRezThis ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin) :
+                Math.min(itemNameTextMetrics.tightBoundingRect.width + 2,
+                buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin - noPermissionGlyph.width + 2);
             height: paintedHeight;
             // Text size
             size: 24;
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index df65a0a1ac..5593883e00 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -453,7 +453,7 @@ Rectangle {
                             lightboxPopup.button1text = "CANCEL";
                             lightboxPopup.button1method = "root.visible = false;"
                             lightboxPopup.button2text = "CONFIRM";
-                            lightboxPopup.button2method = "MyAvatar.skeletonModelURL('" + msg.itemHref + "'); root.visible = false;";
+                            lightboxPopup.button2method = "MyAvatar.useFullAvatarURL('" + msg.itemHref + "'); root.visible = false;";
                             lightboxPopup.visible = true;
                         } else if (msg.method === "showPermissionsExplanation") {
                             if (msg.itemType === "entity") {
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 95d9294063..c61272119d 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -75,10 +75,10 @@ var selectionDisplay = null; // for gridTool.js to ignore
             tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
             tablet.sendToQml({
                 method: 'updateCheckoutQML', params: {
-                    itemId: 'e197e3d7-eafc-4aa5-9341-acee57174fe9',
-                    itemName: 'Oasis',
-                    itemPrice: (debugError ? 10 : 11),
-                    itemHref: 'http://mpassets-staging.highfidelity.com/e197e3d7-eafc-4aa5-9341-acee57174fe9-v1/oasis_Aug15.json.gz',
+                    itemId: '424611a2-73d0-4c03-9087-26a6a279257b',
+                    itemName: '2018-02-15 Finnegon',
+                    itemPrice: (debugError ? 10 : 3),
+                    itemHref: 'http://devmpassets.highfidelity.com/424611a2-73d0-4c03-9087-26a6a279257b-v1/finnigon.fst',
                     categories: ["Miscellaneous"]
                 }
             });

From e4db09fef8845c10b8e9872d00c5d8e56e67e75e Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Thu, 15 Feb 2018 15:02:45 -0800
Subject: [PATCH 299/569] don't update avatar entities if the avatars ID is
 AVATAR_SELF_ID

---
 libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 86635cd3bf..1b1511e2c6 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -219,7 +219,7 @@ void Avatar::updateAvatarEntities() {
         return;
     }
 
-    if (getID() == QUuid()) {
+    if (getID() == QUuid() || getID() == AVATAR_SELF_ID) {
         return; // wait until MyAvatar gets an ID before doing this.
     }
 

From f624e1b464bd17755058f516e4ae114cc759041f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 15:10:51 -0800
Subject: [PATCH 300/569] add a content settings backup handler

---
 .../src/ContentSettingsBackupHandler.cpp      | 66 +++++++++++++++++++
 .../src/ContentSettingsBackupHandler.h        | 35 ++++++++++
 domain-server/src/DomainServer.cpp            |  2 +
 .../src/DomainServerSettingsManager.h         | 10 +--
 domain-server/src/EntitiesBackupHandler.cpp   | 14 ++--
 5 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 domain-server/src/ContentSettingsBackupHandler.cpp
 create mode 100644 domain-server/src/ContentSettingsBackupHandler.h

diff --git a/domain-server/src/ContentSettingsBackupHandler.cpp b/domain-server/src/ContentSettingsBackupHandler.cpp
new file mode 100644
index 0000000000..be470bdd9f
--- /dev/null
+++ b/domain-server/src/ContentSettingsBackupHandler.cpp
@@ -0,0 +1,66 @@
+//
+//  ContentSettingsBackupHandler.cpp
+//  domain-server/src
+//
+//  Created by Stephen Birarda on 2/15/18.
+//  Copyright 2018 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 "ContentSettingsBackupHandler.h"
+
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+
+ContentSettingsBackupHandler::ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager) :
+    _settingsManager(domainServerSettingsManager)
+{
+
+}
+
+static const QString CONTENT_SETTINGS_BACKUP_FILENAME = "content-settings.json";
+
+void ContentSettingsBackupHandler::createBackup(QuaZip& zip) {
+
+    // grab the content settings as JSON,excluding default values and values hidden from backup
+    QJsonObject contentSettingsJSON = _settingsManager.settingsResponseObjectForType("", true, false, true, false, true);
+
+    // make a QJSonDocument using the object
+    QJsonDocument contentSettingsDocument { contentSettingsJSON };
+
+    QuaZipFile zipFile { &zip };
+
+    zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(CONTENT_SETTINGS_BACKUP_FILENAME));
+    zipFile.write(contentSettingsDocument.toJson());
+    zipFile.close();
+
+    if (zipFile.getZipError() != UNZ_OK) {
+        qCritical().nospace() << "Failed to zip " << CONTENT_SETTINGS_BACKUP_FILENAME << ": " << zipFile.getZipError();
+    }
+}
+
+void ContentSettingsBackupHandler::recoverBackup(QuaZip& zip) {
+    if (!zip.setCurrentFile(CONTENT_SETTINGS_BACKUP_FILENAME)) {
+        qWarning() << "Failed to find" << CONTENT_SETTINGS_BACKUP_FILENAME << "while recovering backup";
+        return;
+    }
+
+    QuaZipFile zipFile { &zip };
+    if (!zipFile.open(QIODevice::ReadOnly)) {
+        qCritical() << "Failed to open" << CONTENT_SETTINGS_BACKUP_FILENAME << "in backup";
+        return;
+    }
+
+    auto rawData = zipFile.readAll();
+    zipFile.close();
+
+    QJsonDocument jsonDocument = QJsonDocument::fromJson(rawData);
+
+    if (!_settingsManager.restoreSettingsFromObject(jsonDocument.object(), ContentSettings)) {
+        qCritical() << "Failed to restore settings from" << CONTENT_SETTINGS_BACKUP_FILENAME << "in content archive";
+        return;
+    }
+
+}
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
new file mode 100644
index 0000000000..932b7c0c3f
--- /dev/null
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -0,0 +1,35 @@
+//
+//  ContentSettingsBackupHandler.h
+//  domain-server/src
+//
+//  Created by Stephen Birarda on 2/15/18.
+//  Copyright 2018 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_ContentSettingsBackupHandler_h
+#define hifi_ContentSettingsBackupHandler_h
+
+#include "BackupHandler.h"
+#include "DomainServerSettingsManager.h"
+
+class ContentSettingsBackupHandler : public BackupHandlerInterface {
+public:
+    ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager);
+
+    void loadBackup(QuaZip& zip) {};
+
+    void createBackup(QuaZip& zip);
+
+    void recoverBackup(QuaZip& zip);
+
+    void deleteBackup(QuaZip& zip) {};
+
+    void consolidateBackup(QuaZip& zip) {};
+private:
+    DomainServerSettingsManager& _settingsManager;
+};
+
+#endif // hifi_ContentSettingsBackupHandler_h
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 4c72423f74..d3bc5fdff1 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -46,6 +46,7 @@
 #include <StatTracker.h>
 
 #include "AssetsBackupHandler.h"
+#include "ContentSettingsBackupHandler.h"
 #include "DomainServerNodeData.h"
 #include "EntitiesBackupHandler.h"
 #include "NodeConnectionData.h"
@@ -299,6 +300,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
     _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
     _contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
+    _contentManager->addBackupHandler(BackupHandlerPointer(new ContentSettingsBackupHandler(_settingsManager)));
     _contentManager->initialize(true);
 
     qDebug() << "Existing backups:";
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 9b2427b344..4316534685 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -111,6 +111,11 @@ public:
 
     void debugDumpGroupsState();
 
+    QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+                                              bool includeDomainSettings = true, bool includeContentSettings = true,
+                                              bool includeDefaults = true, bool isForBackup = false);
+    bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
+
 signals:
     void updateNodePermissions();
     void settingsUpdated();
@@ -130,9 +135,6 @@ private:
     QStringList _argumentList;
 
     QJsonArray filteredDescriptionArray(bool isContentSettings);
-    QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
-                                              bool includeDomainSettings = true, bool includeContentSettings = true,
-                                              bool includeDefaults = true, bool isForBackup = false);
     bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
 
     void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
@@ -143,8 +145,6 @@ private:
 
     void splitSettingsDescription();
 
-    bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
-
     double _descriptionVersion;
 
     QJsonArray _descriptionArray;
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index a95d68b007..6ad00d01c8 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -24,28 +24,30 @@ EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString e
 {
 }
 
+static const QString ENTITIES_BACKUP_FILENAME = "models.json.gz";
+
 void EntitiesBackupHandler::createBackup(QuaZip& zip) {
     QFile entitiesFile { _entitiesFilePath };
 
     if (entitiesFile.open(QIODevice::ReadOnly)) {
         QuaZipFile zipFile { &zip };
-        zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo("models.json.gz", _entitiesFilePath));
+        zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ENTITIES_BACKUP_FILENAME, _entitiesFilePath));
         zipFile.write(entitiesFile.readAll());
         zipFile.close();
         if (zipFile.getZipError() != UNZ_OK) {
-            qCritical() << "Failed to zip models.json.gz: " << zipFile.getZipError();
+            qCritical().nospace() << "Failed to zip " << ENTITIES_BACKUP_FILENAME << ": " << zipFile.getZipError();
         }
     }
 }
 
 void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
-    if (!zip.setCurrentFile("models.json.gz")) {
-        qWarning() << "Failed to find models.json.gz while recovering backup";
+    if (!zip.setCurrentFile(ENTITIES_BACKUP_FILENAME)) {
+        qWarning() << "Failed to find" << ENTITIES_BACKUP_FILENAME << "while recovering backup";
         return;
     }
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QIODevice::ReadOnly)) {
-        qCritical() << "Failed to open models.json.gz in backup";
+        qCritical() << "Failed to open" << ENTITIES_BACKUP_FILENAME << "in backup";
         return;
     }
     auto rawData = zipFile.readAll();
@@ -61,7 +63,7 @@ void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
     data.resetIdAndVersion();
 
     if (zipFile.getZipError() != UNZ_OK) {
-        qCritical() << "Failed to unzip models.json.gz: " << zipFile.getZipError();
+        qCritical().nospace() << "Failed to unzip " << ENTITIES_BACKUP_FILENAME << ": " << zipFile.getZipError();
         return;
     }
 

From f5cad5683dbb4028c76beafbdafddb249655d0b7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 15:39:25 -0800
Subject: [PATCH 301/569] make sure backup handlers end up on the correct
 thread

---
 domain-server/src/DomainContentBackupManager.cpp |  3 ---
 domain-server/src/DomainServer.cpp               | 12 ++++++++----
 libraries/shared/src/GenericThread.cpp           |  2 ++
 libraries/shared/src/GenericThread.h             |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index f39737c92e..c68ff0c6ea 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -155,9 +155,6 @@ bool DomainContentBackupManager::process() {
 }
 
 void DomainContentBackupManager::aboutToFinish() {
-    qCDebug(domain_server) << "Persist thread about to finish...";
-    backup();
-    qCDebug(domain_server) << "Persist thread done with about to finish...";
     _stopThread = true;
 }
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index d3bc5fdff1..599f09ae94 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -298,9 +298,13 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     maybeHandleReplacementEntityFile();
 
     _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
-    _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
-    _contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
-    _contentManager->addBackupHandler(BackupHandlerPointer(new ContentSettingsBackupHandler(_settingsManager)));
+
+    connect(_contentManager.get(), &DomainContentBackupManager::started, _contentManager.get(), [this](){
+        _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
+        _contentManager->addBackupHandler(BackupHandlerPointer(new AssetsBackupHandler(getContentBackupDir())));
+        _contentManager->addBackupHandler(BackupHandlerPointer(new ContentSettingsBackupHandler(_settingsManager)));
+    });
+
     _contentManager->initialize(true);
 
     qDebug() << "Existing backups:";
@@ -382,7 +386,7 @@ DomainServer::~DomainServer() {
 
     if (_contentManager) {
         _contentManager->aboutToFinish();
-        _contentManager->terminating();
+        _contentManager->terminate();
     }
 }
 
diff --git a/libraries/shared/src/GenericThread.cpp b/libraries/shared/src/GenericThread.cpp
index 2e126f12c9..50655820af 100644
--- a/libraries/shared/src/GenericThread.cpp
+++ b/libraries/shared/src/GenericThread.cpp
@@ -38,6 +38,8 @@ void GenericThread::initialize(bool isThreaded, QThread::Priority priority) {
         _thread->setObjectName(objectName());
 
         // when the worker thread is started, call our engine's run..
+        
+        connect(_thread, &QThread::started, this, &GenericThread::started);
         connect(_thread, &QThread::started, this, &GenericThread::threadRoutine);
         connect(_thread, &QThread::finished, this, &GenericThread::finished);
 
diff --git a/libraries/shared/src/GenericThread.h b/libraries/shared/src/GenericThread.h
index 09872b32cd..c1f946d6aa 100644
--- a/libraries/shared/src/GenericThread.h
+++ b/libraries/shared/src/GenericThread.h
@@ -47,6 +47,7 @@ public slots:
     void threadRoutine();
 
 signals:
+    void started();
     void finished();
 
 protected:

From 2d754edf741a6dfd3957f92535e694272776f5f5 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 15 Feb 2018 15:48:41 -0800
Subject: [PATCH 302/569] CR

---
 interface/src/Application.cpp                 |  39 +++++-
 interface/src/ui/overlays/ModelOverlay.cpp    |   4 +-
 interface/src/ui/overlays/ModelOverlay.h      |   4 +-
 interface/src/ui/overlays/Overlay.cpp         |   4 +-
 interface/src/ui/overlays/Overlay.h           |   6 +-
 .../src/avatars-renderer/Avatar.cpp           |   4 +-
 .../src/avatars-renderer/Avatar.h             |   6 +-
 libraries/avatars/src/AvatarData.h            |   4 +-
 .../src/RenderableEntityItem.cpp              |   6 +-
 .../src/RenderableEntityItem.h                |   9 +-
 .../src/RenderableMaterialEntityItem.cpp      |   4 +-
 .../src/RenderableModelEntityItem.cpp         |   4 +-
 .../src/RenderableModelEntityItem.h           |   5 +-
 .../src/RenderableShapeEntityItem.cpp         |   4 +-
 libraries/entities/src/EntityItem.cpp         |  10 +-
 libraries/entities/src/EntityItem.h           |  11 +-
 libraries/entities/src/EntityTree.cpp         |  32 +++--
 libraries/entities/src/EntityTree.h           |  31 +++--
 libraries/entities/src/EntityTreeElement.cpp  |   1 -
 libraries/entities/src/MaterialEntityItem.cpp |  66 ++++------
 libraries/entities/src/MaterialEntityItem.h   |   9 +-
 libraries/graphics/src/graphics/Material.cpp  |   2 -
 libraries/graphics/src/graphics/Material.h    |  39 +++---
 .../src/model-networking/MaterialCache.cpp    |  12 +-
 .../src/model-networking/MaterialCache.h      |   6 +-
 .../src/model-networking/ModelCache.cpp       |   2 +-
 .../render-utils/src/MeshPartPayload.cpp      |  28 ++--
 libraries/render-utils/src/MeshPartPayload.h  |   8 +-
 libraries/render-utils/src/Model.cpp          |  10 +-
 libraries/render-utils/src/Model.h            |   6 +-
 .../render-utils/src/RenderPipelines.cpp      | 122 +++++++++++++++++
 libraries/render-utils/src/RenderPipelines.h  |  22 ++++
 libraries/render/CMakeLists.txt               |   6 +-
 libraries/render/src/render/ShapePipeline.cpp | 123 +-----------------
 libraries/render/src/render/ShapePipeline.h   |   4 -
 35 files changed, 350 insertions(+), 303 deletions(-)
 create mode 100644 libraries/render-utils/src/RenderPipelines.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 70b94443ea..9fb2bdb684 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1593,7 +1593,38 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
-    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+    EntityTree::setAddMaterialToEntityOperator([&](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
+        // try to find the renderable
+        auto renderable = getEntities()->renderableForEntityId(entityID);
+        if (renderable) {
+            renderable->addMaterial(material, parentMaterialName);
+        }
+
+        // even if we don't find it, try to find the entity
+        auto entity = getEntities()->getEntity(entityID);
+        if (entity) {
+            entity->addMaterial(material, parentMaterialName);
+            return true;
+        }
+        return false;
+    });
+    EntityTree::setRemoveMaterialFromEntityOperator([&](const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
+        // try to find the renderable
+        auto renderable = getEntities()->renderableForEntityId(entityID);
+        if (renderable) {
+            renderable->removeMaterial(material, parentMaterialName);
+        }
+
+        // even if we don't find it, try to find the entity
+        auto entity = getEntities()->getEntity(entityID);
+        if (entity) {
+            entity->removeMaterial(material, parentMaterialName);
+            return true;
+        }
+        return false;
+    });
+
+    EntityTree::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
@@ -1602,7 +1633,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+    EntityTree::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
         auto avatarManager = DependencyManager::get<AvatarManager>();
         auto avatar = avatarManager->getAvatarBySessionID(avatarID);
         if (avatar) {
@@ -1612,7 +1643,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         return false;
     });
 
-    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+    EntityTree::setAddMaterialToOverlayOperator([&](const QUuid& overlayID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
             overlay->addMaterial(material, parentMaterialName);
@@ -1620,7 +1651,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
         return false;
     });
-    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+    EntityTree::setRemoveMaterialFromOverlayOperator([&](const QUuid& overlayID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
         auto overlay = _overlays.getOverlay(overlayID);
         if (overlay) {
             overlay->removeMaterial(material, parentMaterialName);
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index e4ee889307..d23a0eb7ef 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -635,14 +635,14 @@ uint32_t ModelOverlay::fetchMetaSubItems(render::ItemIDs& subItems) const {
     return 0;
 }
 
-void ModelOverlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void ModelOverlay::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     Overlay::addMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
         _model->addMaterial(material, parentMaterialName);
     }
 }
 
-void ModelOverlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void ModelOverlay::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     Overlay::removeMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
         _model->removeMaterial(material, parentMaterialName);
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 5735854b3b..b38d5cd6d9 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -59,8 +59,8 @@ public:
     void setDrawInFront(bool drawInFront) override;
     void setDrawHUDLayer(bool drawHUDLayer) override;
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
 protected:
     Transform evalRenderTransform() override;
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 766177e3a6..2c0c7c71b6 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -236,12 +236,12 @@ QVector<OverlayID> qVectorOverlayIDFromScriptValue(const QScriptValue& array) {
     return newVector;
 }
 
-void Overlay::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void Overlay::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].push(material);
 }
 
-void Overlay::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void Overlay::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].remove(material);
 }
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index ff45acddcf..f1be23ed39 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -91,8 +91,8 @@ public:
     unsigned int getStackOrder() const { return _stackOrder; }
     void setStackOrder(unsigned int stackOrder) { _stackOrder = stackOrder; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    virtual void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
+    virtual void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
 
 protected:
     float updatePulse();
@@ -120,7 +120,7 @@ protected:
     static const xColor DEFAULT_OVERLAY_COLOR;
     static const float DEFAULT_ALPHA;
 
-    std::unordered_map<QString, graphics::MultiMaterial> _materials;
+    std::unordered_map<std::string, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 private:
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 796e73fcbc..9888150558 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1763,7 +1763,7 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
     }
 }
 
-void Avatar::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void Avatar::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].push(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
@@ -1771,7 +1771,7 @@ void Avatar::addMaterial(graphics::MaterialPointer material, const QString& pare
     }
 }
 
-void Avatar::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void Avatar::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].remove(material);
     if (_skeletonModel && _skeletonModel->fetchRenderItemIDs().size() > 0) {
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 14283a9188..b24fbeaef2 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -272,8 +272,8 @@ public:
 
     virtual void setAvatarEntityDataChanged(bool value) override;
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
 public slots:
 
@@ -401,7 +401,7 @@ protected:
 
     ThreadSafeValueCache<float> _unscaledEyeHeightCache { DEFAULT_AVATAR_EYE_HEIGHT };
 
-    std::unordered_map<QString, graphics::MultiMaterial> _materials;
+    std::unordered_map<std::string, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
     void processMaterials();
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 48f7e19146..033756bfd2 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -696,8 +696,8 @@ public:
 
     bool getIsReplicated() const { return _isReplicated; }
 
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {}
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {}
+    virtual void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {}
+    virtual void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {}
 
 signals:
     void displayNameChanged();
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 9ccf58c04c..d3c9f3d4bd 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -147,8 +147,6 @@ EntityRenderer::EntityRenderer(const EntityItemPointer& entity) : _entity(entity
         emit requestRenderUpdate();
     });
     _materials = entity->getMaterials();
-    connect(entity.get(), &EntityItem::addMaterialToRenderItem, this, &EntityRenderer::addMaterial);
-    connect(entity.get(), &EntityItem::removeMaterialFromRenderItem, this, &EntityRenderer::removeMaterial);
 }
 
 EntityRenderer::~EntityRenderer() { }
@@ -404,12 +402,12 @@ void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) {
     QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
 }
 
-void EntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void EntityRenderer::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].push(material);
 }
 
-void EntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void EntityRenderer::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].remove(material);
 }
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 4fc50ccc9a..ce652a758c 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -54,6 +54,9 @@ public:
 
     const uint64_t& getUpdateTime() const { return _updateTime; }
 
+    virtual void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
+    virtual void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
+
 protected:
     virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
     virtual void onAddToScene(const EntityItemPointer& entity);
@@ -101,10 +104,6 @@ protected:
         return result;
     }
 
-public slots:
-    virtual void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-    virtual void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-
 signals:
     void requestRenderUpdate();
 
@@ -133,7 +132,7 @@ protected:
     // Only touched on the rendering thread
     bool _renderUpdateQueued{ false };
 
-    std::unordered_map<QString, graphics::MultiMaterial> _materials;
+    std::unordered_map<std::string, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 private:
diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
index 70d0234732..090891fe62 100644
--- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
@@ -8,6 +8,8 @@
 
 #include "RenderableMaterialEntityItem.h"
 
+#include "RenderPipelines.h"
+
 using namespace render;
 using namespace render::entities;
 
@@ -250,7 +252,7 @@ void MaterialEntityRenderer::doRender(RenderArgs* args) {
     drawMaterial->setTextureTransforms(textureTransform);
 
     // bind the material
-    args->_shapePipeline->bindMaterial(drawMaterial, batch, args->_enableTexturing);
+    RenderPipelines::bindMaterial(drawMaterial, batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 3205d68513..e395787462 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1467,14 +1467,14 @@ void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const QStr
     }
 }
 
-void ModelEntityRenderer::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void ModelEntityRenderer::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     Parent::addMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
         _model->addMaterial(material, parentMaterialName);
     }
 }
 
-void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void ModelEntityRenderer::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     Parent::removeMaterial(material, parentMaterialName);
     if (_model && _model->fetchRenderItemIDs().size() > 0) {
         _model->removeMaterial(material, parentMaterialName);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 9d9b98ba98..25ae668a8e 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -143,9 +143,8 @@ class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
 
-public slots:
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) override;
+    void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
+    void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
 protected:
     virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 5c5df38350..d561e8d5e8 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -79,7 +79,7 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
 
         removeMaterial(_material, "0");
         _material = entity->getMaterial();
-        addMaterial(_material, "0");
+        addMaterial(graphics::MaterialLayer(_material, 0), "0");
 
         _shape = entity->getShape();
         _position = entity->getWorldPosition();
@@ -127,7 +127,7 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     withReadLock([&] {
         geometryShape = geometryCache->getShapeForEntityShape(_shape);
         batch.setModelTransform(_renderTransform); // use a transform with scale, rotation, registration point and translation
-        mat = _materials["0"].top();
+        mat = _materials["0"].top().material;
         if (mat) {
             outColor = glm::vec4(mat->getAlbedo(), mat->getOpacity());
             if (_procedural.isReady()) {
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 3bb1406252..ec0bdbd2ae 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -2940,20 +2940,18 @@ void EntityItem::preDelete() {
     }
 }
 
-void EntityItem::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void EntityItem::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].push(material);
-    emit addMaterialToRenderItem(material, parentMaterialName);
 }
 
-void EntityItem::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
+void EntityItem::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
     std::lock_guard<std::mutex> lock(_materialsLock);
     _materials[parentMaterialName].remove(material);
-    emit removeMaterialFromRenderItem(material, parentMaterialName);
 }
 
-std::unordered_map<QString, graphics::MultiMaterial> EntityItem::getMaterials() {
-    std::unordered_map<QString, graphics::MultiMaterial> toReturn;
+std::unordered_map<std::string, graphics::MultiMaterial> EntityItem::getMaterials() {
+    std::unordered_map<std::string, graphics::MultiMaterial> toReturn;
     {
         std::lock_guard<std::mutex> lock(_materialsLock);
         toReturn = _materials;
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 203b513a76..b12417c496 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -478,18 +478,15 @@ public:
     void setCauterized(bool value) { _cauterized = value; }
     bool getCauterized() const { return _cauterized; }
 
-    virtual void postAdd() {}
     virtual void preDelete();
     virtual void postParentFixup() {}
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-    std::unordered_map<QString, graphics::MultiMaterial> getMaterials();
+    void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
+    void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
+    std::unordered_map<std::string, graphics::MultiMaterial> getMaterials();
 
 signals:
     void requestRenderUpdate();
-    void addMaterialToRenderItem(graphics::MaterialPointer material, const QString& parentMaterialName);
-    void removeMaterialFromRenderItem(graphics::MaterialPointer material, const QString& parentMaterialName);
 
 protected:
     QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
@@ -644,7 +641,7 @@ protected:
     bool _cauterized { false }; // if true, don't draw because it would obscure 1st-person camera
 
 private:
-    std::unordered_map<QString, graphics::MultiMaterial> _materials;
+    std::unordered_map<std::string, graphics::MultiMaterial> _materials;
     std::mutex _materialsLock;
 
 };
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 8abd5efc13..ad0066af4a 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2386,33 +2386,49 @@ QStringList EntityTree::getJointNames(const QUuid& entityID) const {
     return entity->getJointNames();
 }
 
-std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_addMaterialToAvatarOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_removeMaterialFromAvatarOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_addMaterialToOverlayOperator = nullptr;
-std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> EntityTree::_addMaterialToEntityOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> EntityTree::_removeMaterialFromEntityOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> EntityTree::_addMaterialToAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> EntityTree::_removeMaterialFromAvatarOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> EntityTree::_addMaterialToOverlayOperator = nullptr;
+std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> EntityTree::_removeMaterialFromOverlayOperator = nullptr;
 
-bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+bool EntityTree::addMaterialToEntity(const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
+    if (_addMaterialToEntityOperator) {
+        return _addMaterialToEntityOperator(entityID, material, parentMaterialName);
+    }
+    return false;
+}
+
+bool EntityTree::removeMaterialFromEntity(const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
+    if (_removeMaterialFromEntityOperator) {
+        return _removeMaterialFromEntityOperator(entityID, material, parentMaterialName);
+    }
+    return false;
+}
+
+bool EntityTree::addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
     if (_addMaterialToAvatarOperator) {
         return _addMaterialToAvatarOperator(avatarID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+bool EntityTree::removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
     if (_removeMaterialFromAvatarOperator) {
         return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+bool EntityTree::addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
     if (_addMaterialToOverlayOperator) {
         return _addMaterialToOverlayOperator(overlayID, material, parentMaterialName);
     }
     return false;
 }
 
-bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName) {
+bool EntityTree::removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
     if (_removeMaterialFromOverlayOperator) {
         return _removeMaterialFromOverlayOperator(overlayID, material, parentMaterialName);
     }
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 568d552d8d..1dea98ded6 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -280,15 +280,20 @@ public:
 
     void setMyAvatar(std::shared_ptr<AvatarData> myAvatar) { _myAvatar = myAvatar; }
 
-    static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
-    static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
-    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName);
-    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const QString& parentMaterialName);
+    static void setAddMaterialToEntityOperator(std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> addMaterialToEntityOperator) { _addMaterialToEntityOperator = addMaterialToEntityOperator; }
+    static void setRemoveMaterialFromEntityOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> removeMaterialFromEntityOperator) { _removeMaterialFromEntityOperator = removeMaterialFromEntityOperator; }
+    static bool addMaterialToEntity(const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName);
+    static bool removeMaterialFromEntity(const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName);
 
-    static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
-    static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
-    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName);
-    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const QString& parentMaterialName);
+    static void setAddMaterialToAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> addMaterialToAvatarOperator) { _addMaterialToAvatarOperator = addMaterialToAvatarOperator; }
+    static void setRemoveMaterialFromAvatarOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> removeMaterialFromAvatarOperator) { _removeMaterialFromAvatarOperator = removeMaterialFromAvatarOperator; }
+    static bool addMaterialToAvatar(const QUuid& avatarID, graphics::MaterialLayer material, const std::string& parentMaterialName);
+    static bool removeMaterialFromAvatar(const QUuid& avatarID, graphics::MaterialPointer material, const std::string& parentMaterialName);
+
+    static void setAddMaterialToOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> addMaterialToOverlayOperator) { _addMaterialToOverlayOperator = addMaterialToOverlayOperator; }
+    static void setRemoveMaterialFromOverlayOperator(std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> removeMaterialFromOverlayOperator) { _removeMaterialFromOverlayOperator = removeMaterialFromOverlayOperator; }
+    static bool addMaterialToOverlay(const QUuid& overlayID, graphics::MaterialLayer material, const std::string& parentMaterialName);
+    static bool removeMaterialFromOverlay(const QUuid& overlayID, graphics::MaterialPointer material, const std::string& parentMaterialName);
 
 signals:
     void deletingEntity(const EntityItemID& entityID);
@@ -398,10 +403,12 @@ private:
 
     std::shared_ptr<AvatarData> _myAvatar{ nullptr };
 
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _addMaterialToAvatarOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _removeMaterialFromAvatarOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _addMaterialToOverlayOperator;
-    static std::function<bool(const QUuid&, graphics::MaterialPointer, const QString&)> _removeMaterialFromOverlayOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> _addMaterialToEntityOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> _removeMaterialFromEntityOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> _addMaterialToAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> _removeMaterialFromAvatarOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialLayer, const std::string&)> _addMaterialToOverlayOperator;
+    static std::function<bool(const QUuid&, graphics::MaterialPointer, const std::string&)> _removeMaterialFromOverlayOperator;
 };
 
 #endif // hifi_EntityTree_h
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 980ed1c104..9e32bc3346 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -940,7 +940,6 @@ void EntityTreeElement::addEntityItem(EntityItemPointer entity) {
     });
     bumpChangedContent();
     entity->_element = getThisPointer();
-    entity->postAdd();
 }
 
 // will average a "common reduced LOD view" from the the child elements...
diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index 91333e6e80..e3e3390449 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -27,6 +27,10 @@ MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : Entit
     _type = EntityTypes::Material;
 }
 
+MaterialEntityItem::~MaterialEntityItem() {
+    removeMaterial();
+}
+
 EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
@@ -119,7 +123,7 @@ void MaterialEntityItem::debugDump() const {
     qCDebug(entities) << " MATERIAL EntityItem id:" << getEntityItemID() << "---------------------------------------------";
     qCDebug(entities) << "                   name:" << _name;
     qCDebug(entities) << "           material url:" << _materialURL;
-    qCDebug(entities) << "  current material name:" << _currentMaterialName;
+    qCDebug(entities) << "  current material name:" << _currentMaterialName.c_str();
     qCDebug(entities) << "  material mapping mode:" << _materialMappingMode;
     qCDebug(entities) << "               priority:" << _priority;
     qCDebug(entities) << "   parent material name:" << _parentMaterialName;
@@ -139,7 +143,7 @@ void MaterialEntityItem::setUnscaledDimensions(const glm::vec3& value) {
 std::shared_ptr<NetworkMaterial> MaterialEntityItem::getMaterial() const {
     auto material = _parsedMaterials.networkMaterials.find(_currentMaterialName);
     if (material != _parsedMaterials.networkMaterials.end()) {
-        return material.value();
+        return material->second;
     } else {
         return nullptr;
     }
@@ -153,7 +157,7 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
 
         if (materialURLString.contains("?")) {
             auto split = materialURLString.split("?");
-            _currentMaterialName = split.last();
+            _currentMaterialName = split.last().toStdString();
         }
 
         if (usingUserData) {
@@ -183,9 +187,8 @@ void MaterialEntityItem::setMaterialURL(const QString& materialURLString, bool u
     }
 }
 
-void MaterialEntityItem::setCurrentMaterialName(const QString& currentMaterialName) {
-    auto material = _parsedMaterials.networkMaterials.find(currentMaterialName);
-    if (material != _parsedMaterials.networkMaterials.end()) {
+void MaterialEntityItem::setCurrentMaterialName(const std::string& currentMaterialName) {
+    if (_parsedMaterials.networkMaterials.find(currentMaterialName) != _parsedMaterials.networkMaterials.end()) {
         _currentMaterialName = currentMaterialName;
     } else if (_parsedMaterials.names.size() > 0) {
         _currentMaterialName = _parsedMaterials.names[0];
@@ -274,20 +277,15 @@ void MaterialEntityItem::removeMaterial() {
     }
 
     // Our parent could be an entity, an avatar, or an overlay
-    EntityTreePointer tree = getTree();
-    if (tree) {
-        EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
-        if (entity) {
-            entity->removeMaterial(material, getParentMaterialName());
-            return;
-        }
-    }
-
-    if (EntityTree::removeMaterialFromAvatar(parentID, material, getParentMaterialName())) {
+    if (EntityTree::removeMaterialFromEntity(parentID, material, getParentMaterialName().toStdString())) {
         return;
     }
 
-    if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialName())) {
+    if (EntityTree::removeMaterialFromAvatar(parentID, material, getParentMaterialName().toStdString())) {
+        return;
+    }
+
+    if (EntityTree::removeMaterialFromOverlay(parentID, material, getParentMaterialName().toStdString())) {
         return;
     }
 
@@ -306,23 +304,19 @@ void MaterialEntityItem::applyMaterial() {
     textureTransform.setRotation(glm::vec3(0, 0, glm::radians(_materialMappingRot)));
     textureTransform.setScale(glm::vec3(_materialMappingScale, 1));
     material->setTextureTransforms(textureTransform);
-    material->setPriority(getPriority());
+
+    graphics::MaterialLayer materialLayer = graphics::MaterialLayer(material, getPriority());
 
     // Our parent could be an entity, an avatar, or an overlay
-    EntityTreePointer tree = getTree();
-    if (tree) {
-        EntityItemPointer entity = tree->findEntityByEntityItemID(parentID);
-        if (entity) {
-            entity->addMaterial(material, getParentMaterialName());
-            return;
-        }
-    }
-
-    if (EntityTree::addMaterialToAvatar(parentID, material, getParentMaterialName())) {
+    if (EntityTree::addMaterialToEntity(parentID, materialLayer, getParentMaterialName().toStdString())) {
         return;
     }
 
-    if (EntityTree::addMaterialToOverlay(parentID, material, getParentMaterialName())) {
+    if (EntityTree::addMaterialToAvatar(parentID, materialLayer, getParentMaterialName().toStdString())) {
+        return;
+    }
+
+    if (EntityTree::addMaterialToOverlay(parentID, materialLayer, getParentMaterialName().toStdString())) {
         return;
     }
 
@@ -330,20 +324,6 @@ void MaterialEntityItem::applyMaterial() {
     _retryApply = true;
 }
 
-void MaterialEntityItem::postAdd() {
-    // postAdd is called every time we are added to a new octree cell, but we only need to update the material the first time
-    if (!_hasBeenAddedToOctree) {
-        removeMaterial();
-        applyMaterial();
-        _hasBeenAddedToOctree = true;
-    }
-}
-
-void MaterialEntityItem::preDelete() {
-    EntityItem::preDelete();
-    removeMaterial();
-}
-
 void MaterialEntityItem::postParentFixup() {
     removeMaterial();
     applyMaterial();
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index 3c8df190bf..e203b707cc 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -21,6 +21,7 @@ public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
     MaterialEntityItem(const EntityItemID& entityItemID);
+    ~MaterialEntityItem();
 
     ALLOW_INSTANTIATION // This class can be instantiated
 
@@ -55,8 +56,7 @@ public:
     QString getMaterialURL() const { return _materialURL; }
     void setMaterialURL(const QString& materialURLString, bool userDataChanged = false);
 
-    QString getCurrentMaterialName() const { return _currentMaterialName; }
-    void setCurrentMaterialName(const QString& currentMaterialName);
+    void setCurrentMaterialName(const std::string& currentMaterialName);
 
     MaterialMappingMode getMaterialMappingMode() const { return _materialMappingMode; }
     void setMaterialMappingMode(MaterialMappingMode mode) { _materialMappingMode = mode; }
@@ -84,8 +84,6 @@ public:
     void applyMaterial();
     void removeMaterial();
 
-    void postAdd() override;
-    void preDelete() override;
     void postParentFixup() override;
 
 private:
@@ -122,10 +120,9 @@ private:
 
     NetworkMaterialResourcePointer _networkMaterial;
     NetworkMaterialResource::ParsedMaterials _parsedMaterials;
-    QString _currentMaterialName;
+    std::string _currentMaterialName;
 
     bool _retryApply { false };
-    bool _hasBeenAddedToOctree { false };
 
 };
 
diff --git a/libraries/graphics/src/graphics/Material.cpp b/libraries/graphics/src/graphics/Material.cpp
index 2bf58bc6fb..2300bc5098 100755
--- a/libraries/graphics/src/graphics/Material.cpp
+++ b/libraries/graphics/src/graphics/Material.cpp
@@ -17,8 +17,6 @@
 using namespace graphics;
 using namespace gpu;
 
-int materialPointerMetaID = qRegisterMetaType<MaterialPointer>("graphics::MaterialPointer");
-
 Material::Material() :
     _key(0),
     _schemaBuffer(),
diff --git a/libraries/graphics/src/graphics/Material.h b/libraries/graphics/src/graphics/Material.h
index 4b1e7c82c1..632cf99391 100755
--- a/libraries/graphics/src/graphics/Material.h
+++ b/libraries/graphics/src/graphics/Material.h
@@ -354,17 +354,14 @@ public:
     size_t getTextureSize()  const { calculateMaterialInfo(); return _textureSize; }
     bool hasTextureInfo() const { return _hasCalculatedTextureInfo; }
 
-    void setPriority(quint16 priority) { _priority = priority; }
-    quint16 getPriority() { return _priority; }
-
     void setTextureTransforms(const Transform& transform);
 
-    const QString& getName() { return _name; }
+    const std::string& getName() { return _name; }
 
-    void setModel(const QString& model) { _model = model; }
+    void setModel(const std::string& model) { _model = model; }
 
 protected:
-    QString _name { "" };
+    std::string _name { "" };
 
 private:
     mutable MaterialKey _key;
@@ -379,24 +376,36 @@ private:
     mutable bool _hasCalculatedTextureInfo { false };
     bool calculateMaterialInfo() const;
 
-    quint16 _priority { 0 };
-
-    QString _model { "hifi_pbr" };
+    std::string _model { "hifi_pbr" };
 
 };
 typedef std::shared_ptr< Material > MaterialPointer;
 
-class MaterialCompare {
+class MaterialLayer {
 public:
-    bool operator() (MaterialPointer left, MaterialPointer right) {
-        return left->getPriority() < right->getPriority();
+    MaterialLayer(MaterialPointer material, quint16 priority) : material(material), priority(priority) {}
+
+    MaterialPointer material { nullptr };
+    quint16 priority { 0 };
+};
+
+class MaterialLayerCompare {
+public:
+    bool operator() (MaterialLayer left, MaterialLayer right) {
+        return left.priority < right.priority;
     }
 };
 
-class MultiMaterial : public std::priority_queue<MaterialPointer, std::vector<MaterialPointer>, MaterialCompare> {
+class MultiMaterial : public std::priority_queue<MaterialLayer, std::vector<MaterialLayer>, MaterialLayerCompare> {
 public:
     bool remove(const MaterialPointer& value) {
-        auto it = std::find(c.begin(), c.end(), value);
+        auto it = c.begin();
+        while (it != c.end()) {
+            if (it->material == value) {
+                break;
+            }
+            it++;
+        }
         if (it != c.end()) {
             c.erase(it);
             std::make_heap(c.begin(), c.end(), comp);
@@ -409,6 +418,4 @@ public:
 
 };
 
-Q_DECLARE_METATYPE(graphics::MaterialPointer)
-
 #endif
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.cpp b/libraries/model-networking/src/model-networking/MaterialCache.cpp
index ef1d071d86..8d9d6571f8 100644
--- a/libraries/model-networking/src/model-networking/MaterialCache.cpp
+++ b/libraries/model-networking/src/model-networking/MaterialCache.cpp
@@ -73,22 +73,22 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater
         }
     }
 
-    return toReturn;;
+    return toReturn;
 }
 
-std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::parseJSONMaterial(const QJsonObject& materialJSON) {
-    QString name = "";
+std::pair<std::string, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::parseJSONMaterial(const QJsonObject& materialJSON) {
+    std::string name = "";
     std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
     for (auto& key : materialJSON.keys()) {
         if (key == "name") {
             auto nameJSON = materialJSON.value(key);
             if (nameJSON.isString()) {
-                name = nameJSON.toString();
+                name = nameJSON.toString().toStdString();
             }
         } else if (key == "model") {
             auto modelJSON = materialJSON.value(key);
             if (modelJSON.isString()) {
-                material->setModel(modelJSON.toString());
+                material->setModel(modelJSON.toString().toStdString());
             }
         } else if (key == "emissive") {
             glm::vec3 color;
@@ -191,7 +191,7 @@ std::pair<QString, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource::pa
             }
         }
     }
-    return std::pair<QString, std::shared_ptr<NetworkMaterial>>(name, material);
+    return std::pair<std::string, std::shared_ptr<NetworkMaterial>>(name, material);
 }
 
 MaterialCache& MaterialCache::instance() {
diff --git a/libraries/model-networking/src/model-networking/MaterialCache.h b/libraries/model-networking/src/model-networking/MaterialCache.h
index 3188fd0094..468a12c677 100644
--- a/libraries/model-networking/src/model-networking/MaterialCache.h
+++ b/libraries/model-networking/src/model-networking/MaterialCache.h
@@ -24,8 +24,8 @@ public:
 
     typedef struct ParsedMaterials {
         uint version { 1 };
-        std::vector<QString> names;
-        QHash<QString, std::shared_ptr<NetworkMaterial>> networkMaterials;
+        std::vector<std::string> names;
+        std::unordered_map<std::string, std::shared_ptr<NetworkMaterial>> networkMaterials;
 
         void reset() {
             version = 1;
@@ -38,7 +38,7 @@ public:
     ParsedMaterials parsedMaterials;
 
     static ParsedMaterials parseJSONMaterials(const QJsonDocument& materialJSON);
-    static std::pair<QString, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON);
+    static std::pair<std::string, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON);
 
 private:
     static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 19ee05d1e2..d21e942581 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -619,7 +619,7 @@ NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textur
     graphics::Material(*material._material),
     _textures(MapChannel::NUM_MAP_CHANNELS)
 {
-    _name = material.name;
+    _name = material.name.toStdString();
     if (!material.albedoTexture.filename.isEmpty()) {
         auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
         _albedoTransform = material.albedoTexture.transform;
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index d24843c87d..c31cfed6f4 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -16,6 +16,8 @@
 
 #include "DeferredLightingEffect.h"
 
+#include "RenderPipelines.h"
+
 using namespace render;
 
 namespace render {
@@ -47,7 +49,7 @@ template <> void payloadRender(const MeshPartPayload::Pointer& payload, RenderAr
 
 MeshPartPayload::MeshPartPayload(const std::shared_ptr<const graphics::Mesh>& mesh, int partIndex, graphics::MaterialPointer material) {
     updateMeshPart(mesh, partIndex);
-    addMaterial(material);
+    addMaterial(graphics::MaterialLayer(material, 0));
 }
 
 void MeshPartPayload::updateMeshPart(const std::shared_ptr<const graphics::Mesh>& drawMesh, int partIndex) {
@@ -67,7 +69,7 @@ void MeshPartPayload::updateTransform(const Transform& transform, const Transfor
     _worldBound.transform(_drawTransform);
 }
 
-void MeshPartPayload::addMaterial(graphics::MaterialPointer material) {
+void MeshPartPayload::addMaterial(graphics::MaterialLayer material) {
     _drawMaterials.push(material);
 }
 
@@ -89,8 +91,8 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits)
         builder.withLayered();
     }
 
-    if (_drawMaterials.top()) {
-        auto matKey = _drawMaterials.top()->getKey();
+    if (_drawMaterials.top().material) {
+        auto matKey = _drawMaterials.top().material->getKey();
         if (matKey.isTranslucent()) {
             builder.withTransparent();
         }
@@ -109,8 +111,8 @@ Item::Bound MeshPartPayload::getBound() const {
 
 ShapeKey MeshPartPayload::getShapeKey() const {
     graphics::MaterialKey drawMaterialKey;
-    if (_drawMaterials.top()) {
-        drawMaterialKey = _drawMaterials.top()->getKey();
+    if (_drawMaterials.top().material) {
+        drawMaterialKey = _drawMaterials.top().material->getKey();
     }
 
     ShapeKey::Builder builder;
@@ -164,7 +166,7 @@ void MeshPartPayload::render(RenderArgs* args) {
     bindMesh(batch);
 
     // apply material properties
-    args->_shapePipeline->bindMaterial(_drawMaterials.top(), batch, args->_enableTexturing);
+    RenderPipelines::bindMaterial(_drawMaterials.top().material, batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
@@ -256,7 +258,7 @@ void ModelMeshPartPayload::initCache(const ModelPointer& model) {
 
     auto networkMaterial = model->getGeometry()->getShapeMaterial(_shapeID);
     if (networkMaterial) {
-        addMaterial(networkMaterial);
+        addMaterial(graphics::MaterialLayer(networkMaterial, 0));
     }
 }
 
@@ -302,8 +304,8 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
         builder.withDeformed();
     }
 
-    if (_drawMaterials.top()) {
-        auto matKey = _drawMaterials.top()->getKey();
+    if (_drawMaterials.top().material) {
+        auto matKey = _drawMaterials.top().material->getKey();
         if (matKey.isTranslucent()) {
             builder.withTransparent();
         }
@@ -333,8 +335,8 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe
     }
 
     graphics::MaterialKey drawMaterialKey;
-    if (_drawMaterials.top()) {
-        drawMaterialKey = _drawMaterials.top()->getKey();
+    if (_drawMaterials.top().material) {
+        drawMaterialKey = _drawMaterials.top().material->getKey();
     }
 
     bool isTranslucent = drawMaterialKey.isTranslucent();
@@ -415,7 +417,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     bindMesh(batch);
 
     // apply material properties
-    args->_shapePipeline->bindMaterial(_drawMaterials.top(), batch, args->_enableTexturing);
+    RenderPipelines::bindMaterial(_drawMaterials.top().material, batch, args->_enableTexturing);
     args->_details._materialSwitches++;
 
     // Draw!
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index e6893f1ea7..78ce12d695 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -65,11 +65,11 @@ public:
     graphics::Mesh::Part _drawPart;
 
     size_t getVerticesCount() const { return _drawMesh ? _drawMesh->getNumVertices() : 0; }
-    size_t getMaterialTextureSize() { return _drawMaterials.top() ? _drawMaterials.top()->getTextureSize() : 0; }
-    int getMaterialTextureCount() { return _drawMaterials.top() ? _drawMaterials.top()->getTextureCount() : 0; }
-    bool hasTextureInfo() const { return _drawMaterials.top() ? _drawMaterials.top()->hasTextureInfo() : false; }
+    size_t getMaterialTextureSize() { return _drawMaterials.top().material ? _drawMaterials.top().material->getTextureSize() : 0; }
+    int getMaterialTextureCount() { return _drawMaterials.top().material ? _drawMaterials.top().material->getTextureCount() : 0; }
+    bool hasTextureInfo() const { return _drawMaterials.top().material ? _drawMaterials.top().material->hasTextureInfo() : false; }
 
-    void addMaterial(graphics::MaterialPointer material);
+    void addMaterial(graphics::MaterialLayer material);
     void removeMaterial(graphics::MaterialPointer material);
 
 protected:
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 15cab065f3..3cc99c869f 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1535,7 +1535,7 @@ std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterial
     if (parentMaterialName.startsWith(MATERIAL_NAME_PREFIX)) {
         parentMaterialName.replace(0, MATERIAL_NAME_PREFIX.size(), QString(""));
         for (unsigned int i = 0; i < (unsigned int)_modelMeshMaterialNames.size(); i++) {
-            if (_modelMeshMaterialNames[i] == parentMaterialName) {
+            if (_modelMeshMaterialNames[i] == parentMaterialName.toStdString()) {
                 toReturn.push_back(i);
             }
         }
@@ -1548,8 +1548,8 @@ std::vector<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterial
     return toReturn;
 }
 
-void Model::addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
-    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialName);
+void Model::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(parentMaterialName.c_str()));
     render::Transaction transaction;
     for (auto shapeID : shapeIDs) {
         if (shapeID < _modelMeshRenderItemIDs.size()) {
@@ -1573,8 +1573,8 @@ void Model::addMaterial(graphics::MaterialPointer material, const QString& paren
     AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
 }
 
-void Model::removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName) {
-    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(parentMaterialName);
+void Model::removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) {
+    std::vector<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(parentMaterialName.c_str()));
     render::Transaction transaction;
     for (auto shapeID : shapeIDs) {
         if (shapeID < _modelMeshRenderItemIDs.size()) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 6b59b62046..63e9aacb3d 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -318,8 +318,8 @@ public:
 
     void scaleToFit();
 
-    void addMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
-    void removeMaterial(graphics::MaterialPointer material, const QString& parentMaterialName);
+    void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
+    void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
 
 public slots:
     void loadURLFinished(bool success);
@@ -438,7 +438,7 @@ protected:
     render::ItemIDs _modelMeshRenderItemIDs;
     using ShapeInfo = struct { int meshIndex; };
     std::vector<ShapeInfo> _modelMeshRenderItemShapes;
-    std::vector<QString> _modelMeshMaterialNames;
+    std::vector<std::string> _modelMeshMaterialNames;
 
     bool _addedToScene { false }; // has been added to scene
     bool _needsFixupInScene { true }; // needs to be removed/re-added to scene
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index ad7409b731..3c80a2d14c 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -618,3 +618,125 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
         ShapeKey::Filter::Builder().withSkinned().withFade(),
         skinFadeProgram, state);
 }
+
+#include "RenderPipelines.h"
+#include <model-networking/TextureCache.h>
+
+void RenderPipelines::bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures) {
+    if (!material) {
+        return;
+    }
+
+    auto textureCache = DependencyManager::get<TextureCache>();
+
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, material->getSchemaBuffer());
+    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::TEXMAPARRAY, material->getTexMapArrayBuffer());
+
+    const auto& materialKey = material->getKey();
+    const auto& textureMaps = material->getTextureMaps();
+
+    int numUnlit = 0;
+    if (materialKey.isUnlit()) {
+        numUnlit++;
+    }
+
+    if (!enableTextures) {
+        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
+        batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
+        return;
+    }
+
+    // Albedo
+    if (materialKey.isAlbedoMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::ALBEDO_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getGrayTexture());
+        }
+    }
+
+    // Roughness map
+    if (materialKey.isRoughnessMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::ROUGHNESS_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Normal map
+    if (materialKey.isNormalMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::NORMAL_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
+        }
+    }
+
+    // Metallic map
+    if (materialKey.isMetallicMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::METALLIC_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
+        }
+    }
+
+    // Occlusion map
+    if (materialKey.isOcclusionMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::OCCLUSION_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Scattering map
+    if (materialKey.isScatteringMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::SCATTERING_MAP);
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, itr->second->getTextureView());
+
+            // texcoord are assumed to be the same has albedo
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
+        }
+    }
+
+    // Emissive / Lightmap
+    if (materialKey.isLightmapMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::LIGHTMAP_MAP);
+
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getGrayTexture());
+        }
+    } else if (materialKey.isEmissiveMap()) {
+        auto itr = textureMaps.find(graphics::MaterialKey::EMISSIVE_MAP);
+
+        if (itr != textureMaps.end() && itr->second->isDefined()) {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
+        } else {
+            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
+        }
+    }
+}
diff --git a/libraries/render-utils/src/RenderPipelines.h b/libraries/render-utils/src/RenderPipelines.h
new file mode 100644
index 0000000000..9b9ad2c001
--- /dev/null
+++ b/libraries/render-utils/src/RenderPipelines.h
@@ -0,0 +1,22 @@
+//
+//  RenderPipelines.h
+//  render-utils/src/
+//
+//  Created by Sam Gondelman on 2/15/18
+//  Copyright 2018 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_RenderPipelines_h
+#define hifi_RenderPipelines_h
+
+#include <graphics/Material.h>
+
+class RenderPipelines {
+public:
+    static void bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures);
+};
+
+
+#endif // hifi_RenderPipelines_h
diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index b0136028f6..2a888a5b18 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -2,9 +2,7 @@ set(TARGET_NAME render)
 AUTOSCRIBE_SHADER_LIB(gpu graphics)
 setup_hifi_library()
 
-# render needs octree only for getAccuracyAngle(float, int), and model-networking for TextureCache
-link_hifi_libraries(shared task ktx gpu graphics octree model-networking)
-include_hifi_library_headers(networking)
-include_hifi_library_headers(image)
+# render needs octree only for getAccuracyAngle(float, int)
+link_hifi_libraries(shared task ktx gpu graphics octree)
 
 target_nsight()
diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp
index 1e8c26c7f6..92e22d86f6 100644
--- a/libraries/render/src/render/ShapePipeline.cpp
+++ b/libraries/render/src/render/ShapePipeline.cpp
@@ -15,8 +15,6 @@
 
 #include <PerfStat.h>
 
-#include <model-networking/TextureCache.h>
-
 using namespace render;
 
 ShapePipeline::CustomFactoryMap ShapePipeline::_globalCustomFactoryMap;
@@ -181,123 +179,4 @@ const ShapePipelinePointer ShapePlumber::pickPipeline(RenderArgs* args, const Ke
     }
 
     return shapePipeline;
-}
-
-void ShapePipeline::bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures) const {
-    if (!material) {
-        return;
-    }
-
-    auto textureCache = DependencyManager::get<TextureCache>();
-
-    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::MATERIAL, material->getSchemaBuffer());
-    batch.setUniformBuffer(ShapePipeline::Slot::BUFFER::TEXMAPARRAY, material->getTexMapArrayBuffer());
-
-    const auto& materialKey = material->getKey();
-    const auto& textureMaps = material->getTextureMaps();
-
-    int numUnlit = 0;
-    if (materialKey.isUnlit()) {
-        numUnlit++;
-    }
-
-    if (!enableTextures) {
-        batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
-        batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
-        return;
-    }
-
-    // Albedo
-    if (materialKey.isAlbedoMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::ALBEDO_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::ALBEDO, textureCache->getGrayTexture());
-        }
-    }
-
-    // Roughness map
-    if (materialKey.isRoughnessMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::ROUGHNESS_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::ROUGHNESS, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Normal map
-    if (materialKey.isNormalMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::NORMAL_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::NORMAL, textureCache->getBlueTexture());
-        }
-    }
-
-    // Metallic map
-    if (materialKey.isMetallicMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::METALLIC_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::METALLIC, textureCache->getBlackTexture());
-        }
-    }
-
-    // Occlusion map
-    if (materialKey.isOcclusionMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::OCCLUSION_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::OCCLUSION, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Scattering map
-    if (materialKey.isScatteringMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::SCATTERING_MAP);
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, itr->second->getTextureView());
-
-            // texcoord are assumed to be the same has albedo
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::SCATTERING, textureCache->getWhiteTexture());
-        }
-    }
-
-    // Emissive / Lightmap
-    if (materialKey.isLightmapMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::LIGHTMAP_MAP);
-
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getGrayTexture());
-        }
-    } else if (materialKey.isEmissiveMap()) {
-        auto itr = textureMaps.find(graphics::MaterialKey::EMISSIVE_MAP);
-
-        if (itr != textureMaps.end() && itr->second->isDefined()) {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, itr->second->getTextureView());
-        } else {
-            batch.setResourceTexture(ShapePipeline::Slot::MAP::EMISSIVE_LIGHTMAP, textureCache->getBlackTexture());
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index af485cc298..1dd9f5da49 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -18,8 +18,6 @@
 
 #include "Args.h"
 
-#include <graphics/Material.h>
-
 namespace render {
 class Item;
 class ShapePlumber;
@@ -305,8 +303,6 @@ public:
 
     void prepareShapeItem(Args* args, const ShapeKey& key, const Item& shape);
 
-    void bindMaterial(graphics::MaterialPointer material, gpu::Batch& batch, bool enableTextures) const;
-
 protected:
     friend class ShapePlumber;
 

From 175532c444ea0dfd8b807c9e1ce91b72c85529cc Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Thu, 15 Feb 2018 15:51:54 -0800
Subject: [PATCH 303/569] show outline for zones when rotating

---
 scripts/system/libraries/entitySelectionTool.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 24ec12a2c8..44325d4a12 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1018,6 +1018,7 @@ SelectionDisplay = (function() {
             return;
         }
 
+
         if (SelectionManager.hasSelection()) {
             var position = SelectionManager.worldPosition;
             var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
@@ -1317,8 +1318,12 @@ SelectionDisplay = (function() {
                                        isActiveTool(handleScaleRTNCube) || isActiveTool(handleScaleLTFCube) || 
                                        isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
                                        isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
-        that.setHandleScaleEdgeVisible(!isActiveTool(handleRotatePitchRing) && !isActiveTool(handleRotateYawRing) && 
-                                       !isActiveTool(handleRotateRollRing));
+
+        var showOutlineForZone = (SelectionManager.selections.length === 1 &&
+                                  SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
+        that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
+                                                              !isActiveTool(handleRotateYawRing) &&
+                                                              !isActiveTool(handleRotateRollRing)));
 
         //keep cloner always hidden for now since you can hold Alt to clone while  
         //translating an entity - we may bring cloner back for HMD only later

From e06c95f5863d3aeb67f1c18d624acc25743e605f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 15:51:49 -0800
Subject: [PATCH 304/569] make settings manager methods used for backup/restore
 thread safe

---
 .../src/DomainServerSettingsManager.cpp       | 24 +++++++++++++++++++
 .../src/DomainServerSettingsManager.h         |  6 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 8febbd5769..5e3c8e9cee 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -19,6 +19,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtCore/QStandardPaths>
+#include <QtCore/QThread>
 #include <QtCore/QUrl>
 #include <QtCore/QUrlQuery>
 
@@ -1196,6 +1197,16 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 }
 
 bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
+
+    if (thread() != QThread::currentThread()) {
+        bool success;
+        QMetaObject::invokeMethod(this, "restoreSettingsFromObject", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(bool, success),
+                                  Q_ARG(QJsonObject, settingsToRestore),
+                                  Q_ARG(SettingsType, settingsType));
+        return success;
+    }
+
     QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
         ? _domainSettingsDescription : _contentSettingsDescription;
 
@@ -1321,6 +1332,19 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                                                                        bool includeDefaults, bool isForBackup) {
     QJsonObject responseObject;
 
+    if (thread() != QThread::currentThread()) {
+        QMetaObject::invokeMethod(this, "settingsResponseObjectForType", Qt::BlockingQueuedConnection,
+                                  Q_RETURN_ARG(QJsonObject, responseObject),
+                                  Q_ARG(const QString&, typeValue),
+                                  Q_ARG(bool, isAuthenticated),
+                                  Q_ARG(bool, includeDomainSettings),
+                                  Q_ARG(bool, includeContentSettings),
+                                  Q_ARG(bool, includeDefaults),
+                                  Q_ARG(bool, isForBackup));
+
+        return responseObject;
+    }
+
     if (!typeValue.isEmpty() || isAuthenticated) {
         // convert the string type value to a QJsonValue
         QJsonValue queryType = typeValue.isEmpty() ? QJsonValue() : QJsonValue(typeValue.toInt());
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 4316534685..abc70751a8 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -111,10 +111,12 @@ public:
 
     void debugDumpGroupsState();
 
-    QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
+    /// thread safe method to retrieve a JSON representation of settings
+    Q_INVOKABLE QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
                                               bool includeDomainSettings = true, bool includeContentSettings = true,
                                               bool includeDefaults = true, bool isForBackup = false);
-    bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
+    /// thread safe method to restore settings from a JSON object
+    Q_INVOKABLE bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
 
 signals:
     void updateNodePermissions();

From e71f2fa38788c8f74f5ede92749eab7f296a5743 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 16:03:03 -0800
Subject: [PATCH 305/569] use QtHelpers macro for blocking invoke

---
 .../src/DomainServerSettingsManager.cpp       | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 5e3c8e9cee..5f71890898 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -33,6 +33,8 @@
 #include <SettingHelpers.h>
 #include <AvatarData.h> //for KillAvatarReason
 #include <FingerprintUtils.h>
+#include <shared/QtHelpers.h>
+
 #include "DomainServerNodeData.h"
 
 const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings.json";
@@ -1200,10 +1202,11 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
 
     if (thread() != QThread::currentThread()) {
         bool success;
-        QMetaObject::invokeMethod(this, "restoreSettingsFromObject", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(bool, success),
-                                  Q_ARG(QJsonObject, settingsToRestore),
-                                  Q_ARG(SettingsType, settingsType));
+
+        BLOCKING_INVOKE_METHOD(this, "restoreSettingsFromObject",
+                               Q_RETURN_ARG(bool, success),
+                               Q_ARG(QJsonObject, settingsToRestore),
+                               Q_ARG(SettingsType, settingsType));
         return success;
     }
 
@@ -1333,14 +1336,15 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
     QJsonObject responseObject;
 
     if (thread() != QThread::currentThread()) {
-        QMetaObject::invokeMethod(this, "settingsResponseObjectForType", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(QJsonObject, responseObject),
-                                  Q_ARG(const QString&, typeValue),
-                                  Q_ARG(bool, isAuthenticated),
-                                  Q_ARG(bool, includeDomainSettings),
-                                  Q_ARG(bool, includeContentSettings),
-                                  Q_ARG(bool, includeDefaults),
-                                  Q_ARG(bool, isForBackup));
+
+        BLOCKING_INVOKE_METHOD(this, "settingsResponseObjectForType",
+                               Q_RETURN_ARG(QJsonObject, responseObject),
+                               Q_ARG(const QString&, typeValue),
+                               Q_ARG(bool, isAuthenticated),
+                               Q_ARG(bool, includeDomainSettings),
+                               Q_ARG(bool, includeContentSettings),
+                               Q_ARG(bool, includeDefaults),
+                               Q_ARG(bool, isForBackup));
 
         return responseObject;
     }

From c4e9c762582b027553d4113e72dcabafb9cb69f5 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 15 Feb 2018 15:14:54 -0800
Subject: [PATCH 306/569] Small UIT tweaks

---
 interface/resources/qml/controls-uit/TextField.qml    |  5 ++---
 .../qml/hifi/commerce/purchases/PurchasedItem.qml     | 11 ++++++-----
 .../qml/hifi/commerce/purchases/Purchases.qml         | 10 ++++++++++
 interface/resources/qml/styles-uit/HifiConstants.qml  |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index a21d1f8efd..3fc5d83129 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -34,11 +34,10 @@ TextField {
 
     placeholderText: textField.placeholderText
 
-    FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
+    FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
     FontLoader { id: hifiGlyphs; source: "../../fonts/hifi-glyphs.ttf"; }
-    font.family: firaSansSemiBold.name
+    font.family: firaSansRegular.name
     font.pixelSize: hifi.fontSizes.textFieldInput
-    font.italic: textField.text == ""
     height: implicitHeight + 3  // Make surrounding box higher so that highlight is vertically centered.
     property alias textFieldLabel: textFieldLabel
 
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 50ac34cd51..272c542fde 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -46,6 +46,7 @@ Item {
     property var buttonGlyph: [hifi.glyphs.wand, hifi.glyphs.hat, hifi.glyphs.globe, hifi.glyphs.install, hifi.glyphs.avatar];
     property bool showConfirmation: false;
     property bool hasPermissionToRezThis;
+    property bool permissionExplanationCardVisible;
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -151,7 +152,7 @@ Item {
             anchors.topMargin: 4;
             anchors.left: itemPreviewImage.right;
             anchors.leftMargin: 8;
-            width: root.hasPermissionToRezThis ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin) :
+            width: !noPermissionGlyph.visible ? (buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin) :
                 Math.min(itemNameTextMetrics.tightBoundingRect.width + 2,
                 buttonContainer.x - itemPreviewImage.x - itemPreviewImage.width - anchors.leftMargin - noPermissionGlyph.width + 2);
             height: paintedHeight;
@@ -181,7 +182,7 @@ Item {
         }
         HiFiGlyphs {
             id: noPermissionGlyph;
-            visible: !root.hasPermissionToRezThis;
+            visible: true// !root.hasPermissionToRezThis;
             anchors.verticalCenter: itemName.verticalCenter;
             anchors.left: itemName.right;
             anchors.leftMargin: itemName.truncated ? -14 : -2;
@@ -203,14 +204,14 @@ Item {
                     noPermissionGlyph.color = hifi.colors.redAccent;
                 }
                 onClicked: {
-                    permissionExplanationCard.visible = true;
+                    root.sendToPurchases({ method: 'openPermissionExplanationCard' });
                 }
             }
         }
         Rectangle {
             id: permissionExplanationCard;
             z: 995;
-            visible: false;
+            visible: root.permissionExplanationCardVisible;
             anchors.fill: parent;
             color: hifi.colors.white;
 
@@ -261,7 +262,7 @@ Item {
                         parent.text = hifi.glyphs.close;
                     }
                     onClicked: {
-                        permissionExplanationCard.visible = false;
+                        root.sendToPurchases({ method: 'openPermissionExplanationCard', closeAll: true });
                     }
                 }
             }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 5593883e00..b01dfcfce3 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -393,6 +393,7 @@ Rectangle {
                 numberSold: model.number_sold;
                 limitedRun: model.limited_run;
                 displayedItemCount: model.displayedItemCount;
+                permissionExplanationCardVisible: model.permissionExplanationCardVisible;
                 itemType: {
                     if (model.root_file_url.indexOf(".fst") > -1) {
                         "avatar";
@@ -472,6 +473,14 @@ Rectangle {
                             lightboxPopup.visible = true;
                         } else if (msg.method === "setFilterText") {
                             filterBar.text = msg.filterText;
+                        } else if (msg.method === "openPermissionExplanationCard") {
+                            for (var i = 0; i < filteredPurchasesModel.count; i++) {
+                                if (i !== index || msg.closeAll) {
+                                    filteredPurchasesModel.setProperty(i, "permissionExplanationCardVisible", false);
+                                } else {
+                                    filteredPurchasesModel.setProperty(i, "permissionExplanationCardVisible", true);
+                                }
+                            }
                         }
                     }
                 }
@@ -673,6 +682,7 @@ Rectangle {
             filteredPurchasesModel.clear();
             for (var i = 0; i < tempPurchasesModel.count; i++) {
                 filteredPurchasesModel.append(tempPurchasesModel.get(i));
+                filteredPurchasesModel.setProperty(i, 'permissionExplanationCardVisible', false);
             }
 
             populateDisplayedItemCounts();
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index 16b74f6b54..43de8333af 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -218,7 +218,7 @@ Item {
         readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434", Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
         readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black, Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
         readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
-        readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
+        readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colors.lightGrayText ]
         readonly property var focusedColor: [ colors.lightGray50, colors.blueAccent, colors.redAccent, colors.darkGray, colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
         readonly property var disabledColorStart: [ colorStart[white], colors.baseGrayHighlight]
         readonly property var disabledColorFinish: [ colorFinish[white], colors.baseGrayShadow]

From 9e99c5c744ea7621b37e4c0b7e36d84906ea82f4 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 11:49:05 -0800
Subject: [PATCH 307/569] Add restart of ES during backup recovery

---
 domain-server/src/DomainServer.cpp          | 2 ++
 domain-server/src/EntitiesBackupHandler.cpp | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 599f09ae94..2f8d8f6d03 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1785,6 +1785,8 @@ QString DomainServer::getEntitiesReplacementFilePath() {
 void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessage> message) {
     qDebug() << "Got request for octree data from " << message->getSenderSockAddr();
 
+    maybeHandleReplacementEntityFile();
+
     bool remoteHasExistingData { false };
     QUuid id;
     int version;
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index 6ad00d01c8..deb92ee0f6 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -16,6 +16,7 @@
 #include <quazip5/quazip.h>
 #include <quazip5/quazipfile.h>
 
+#include <LimitedNodeList.h>
 #include <OctreeUtils.h>
 
 EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
@@ -71,5 +72,13 @@ void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
 
     if (entitiesFile.open(QIODevice::WriteOnly)) {
         entitiesFile.write(data.toGzippedByteArray());
+        entitiesFile.close();
+
+        auto nodeList = DependencyManager::get<LimitedNodeList>();
+        nodeList->eachMatchingNode([](const SharedNodePointer& otherNode) -> bool {
+            return otherNode->getType() == NodeType::EntityServer;
+        }, [nodeList](const SharedNodePointer& otherNode) {
+            QMetaObject::invokeMethod(nodeList.data(), "killNodeWithUUID", Q_ARG(const QUuid&, otherNode->getUUID()));
+        });
     }
 }

From dd0b8a0c2fd3a22a82857c06e6027c56735222be Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 14:17:32 -0800
Subject: [PATCH 308/569] Add backup download API to DS

---
 .../src/DomainContentBackupManager.cpp        | 78 +++++++++++++------
 .../src/DomainContentBackupManager.h          |  2 +-
 domain-server/src/DomainServer.cpp            | 22 ++++++
 3 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index c68ff0c6ea..f56c41dacd 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -383,32 +383,60 @@ void DomainContentBackupManager::backup() {
     }
 }
 
-void DomainContentBackupManager::consolidate(QString fileName) {
-    QDir backupDir { _backupDirectory };
-    if (backupDir.exists()) {
-        auto filePath = backupDir.absoluteFilePath(fileName);
-
-        auto copyFilePath = QDir::tempPath() + "/" + fileName;
-
-        auto copySuccess = QFile::copy(filePath, copyFilePath);
-        if (!copySuccess) {
-            qCritical() << "Failed to create full backup.";
-            return;
-        }
-
-        QuaZip zip(copyFilePath);
-        if (!zip.open(QuaZip::mdAdd)) {
-            qCritical() << "Could not open backup archive:" << filePath;
-            qCritical() << "    ERROR:" << zip.getZipError();
-            return;
-        }
-
-        for (auto& handler : _backupHandlers) {
-            handler->consolidateBackup(zip);
-        }
-
-        zip.close();
+void DomainContentBackupManager::consolidateBackup(MiniPromise::Promise promise, QString fileName) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "consolidateBackup", Q_ARG(MiniPromise::Promise, promise),
+                                  Q_ARG(const QString&, fileName));
+        return;
     }
+
+    QDir backupDir { _backupDirectory };
+    if (!backupDir.exists()) {
+        qCritical() << "Backup directory does not exist, bailing consolidation of backup";
+        promise->resolve({ { "success", false } });
+        return;
+    }
+
+    auto filePath = backupDir.absoluteFilePath(fileName);
+
+    auto copyFilePath = QDir::tempPath() + "/" + fileName;
+
+    {
+        QFile copyFile(copyFilePath);
+        copyFile.remove();
+        copyFile.close();
+    }
+    auto copySuccess = QFile::copy(filePath, copyFilePath);
+    if (!copySuccess) {
+        qCritical() << "Failed to create copy of backup.";
+        promise->resolve({ { "success", false } });
+        return;
+    }
+
+    QuaZip zip(copyFilePath);
+    if (!zip.open(QuaZip::mdAdd)) {
+        qCritical() << "Could not open backup archive:" << filePath;
+        qCritical() << "    ERROR:" << zip.getZipError();
+        promise->resolve({ { "success", false } });
+        return;
+    }
+
+    for (auto& handler : _backupHandlers) {
+        handler->consolidateBackup(zip);
+    }
+
+    zip.close();
+
+    if (zip.getZipError() != UNZ_OK) {
+        qCritical() << "Failed to consolidate backup: " << zip.getZipError();
+        promise->resolve({ { "success", false } });
+        return;
+    }
+
+    promise->resolve({
+        { "success", true },
+        { "backupFilePath", copyFilePath }
+    });
 }
 
 void DomainContentBackupManager::createManualBackup(MiniPromise::Promise promise, const QString& name) {
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 1e1b2360a8..9ec7eb9950 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -62,6 +62,7 @@ public slots:
     void createManualBackup(MiniPromise::Promise promise, const QString& name);
     void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
     void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
+    void consolidateBackup(MiniPromise::Promise promise, QString fileName);
 
 signals:
     void loadCompleted();
@@ -73,7 +74,6 @@ protected:
 
     void load();
     void backup();
-    void consolidate(QString fileName);
     void removeOldBackupVersions(const BackupRule& rule);
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
     int64_t getMostRecentBackupTimeInSecs(const QString& format);
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 2f8d8f6d03..b91e12a9cf 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2149,6 +2149,28 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             QJsonDocument docJSON(rootJSON);
 
             connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            return true;
+        } else if (url.path().startsWith(URI_API_BACKUPS_ID)) {
+            auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());
+            auto deferred = makePromise("consolidateBackup");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonObject rootJSON;
+                auto success = result["success"].toBool();
+                if (success) {
+                    auto path = result["backupFilePath"].toString();
+                    auto file { std::unique_ptr<QFile>(new QFile(path)) };
+                    if (file->open(QIODevice::ReadOnly)) {
+                        connection->respond(HTTPConnection::StatusCode200, std::move(file));
+                    } else {
+                        qCritical(domain_server) << "Unable to load consolidated backup at:" << path << result;
+                        connection->respond(HTTPConnection::StatusCode500, "Error opening backup");
+                    }
+                } else {
+                    connection->respond(HTTPConnection::StatusCode400);
+                }
+            });
+            _contentManager->consolidateBackup(deferred, id);
+
             return true;
         } else if (url.path() == URI_RESTART) {
             connection->respond(HTTPConnection::StatusCode200);

From 2942a53a1d51b488d7e8818e180c25abb335f0a2 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 15:55:14 -0800
Subject: [PATCH 309/569] Add recovery mode and full backup information to DS

---
 .../src/DomainContentBackupManager.cpp        | 91 +++++++++++++++++--
 .../src/DomainContentBackupManager.h          | 14 +--
 domain-server/src/DomainServer.cpp            | 28 ++----
 3 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index f56c41dacd..54ea7e23d5 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -147,7 +147,24 @@ bool DomainContentBackupManager::process() {
 
         if (sinceLastSave > intervalToCheck) {
             _lastCheck = now;
-            backup();
+            if (_isRecovering) {
+                bool anyHandlerIsRecovering { false };
+                for (auto& handler : _backupHandlers) {
+                    bool handlerIsRecovering { false };
+                    float progress { 0.0f };
+                    //std::tie<handlerIsRecovering, progress> = handler->getRecoveryStatus();
+                    if (handlerIsRecovering) {
+                        anyHandlerIsRecovering = true;
+                        emit recoveryCompleted();
+                        break;
+                    }
+                }
+                _isRecovering = anyHandlerIsRecovering;
+            }
+
+            if (!_isRecovering) {
+                backup();
+            }
         }
     }
 
@@ -213,6 +230,13 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
         return;
     }
 
+    if (_isRecovering && backupName == _recoveryFilename) {
+        promise->resolve({
+            { "success", false }
+        });
+        return;
+    }
+
     QDir backupDir { _backupDirectory };
     QFile backupFile { backupDir.filePath(backupName) };
     auto success = backupFile.remove();
@@ -222,6 +246,13 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
 }
 
 void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise, const QString& backupName) {
+    if (_isRecovering) {
+        promise->resolve({
+            { "success", false }
+        });
+        return;
+    };
+
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "recoverFromBackup", Q_ARG(MiniPromise::Promise, promise),
                                   Q_ARG(const QString&, backupName));
@@ -239,11 +270,12 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
             qWarning() << "Failed to unzip file: " << backupName;
             success = false;
         } else {
+            _isRecovering = true;
             for (auto& handler : _backupHandlers) {
                 handler->recoverBackup(zip);
             }
             
-            qDebug() << "Successfully recovered from " << backupName;
+            qDebug() << "Successfully started recovering from " << backupName;
             success = true;
         }
         backupFile.close();
@@ -257,8 +289,11 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     });
 }
 
-std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
-    std::vector<BackupItemInfo> backups;
+void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise promise) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "getAllBackupInformation", Q_ARG(MiniPromise::Promise, promise));
+        return;
+    }
 
     QDir backupDir { _backupDirectory };
     auto matchingFiles =
@@ -269,6 +304,8 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
     QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")";
     QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" };
 
+    QVariantList backups;
+
     for (const auto& fileInfo : matchingFiles) {
         auto fileName = fileInfo.fileName();
         if (backupNameFormat.exactMatch(fileName)) {
@@ -280,12 +317,50 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
                 continue;
             }
 
-            BackupItemInfo backup { fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt, type == MANUAL_BACKUP_PREFIX };
-            backups.push_back(backup);
+            bool isAvailable { true };
+            float availabilityProgress { 0.0f };
+            for (auto& handler : _backupHandlers) {
+                bool handlerIsAvailable { false };
+                float progress { 0.0f };
+                //std::tie<handlerIsAvailable, progress> = handler->isAvailable();
+                //isAvailable = isAvailable && !handlerIsAvailable);
+                //availabilityProgress += progress / _backupHandlers.size();
+            }
+
+            backups.push_back(QVariantMap({
+                { "id", fileInfo.fileName() },
+                { "name", name },
+                { "createdAtMillis", createdAt.toMSecsSinceEpoch() },
+                { "isAvailable", isAvailable },
+                { "availabilityProgress", availabilityProgress },
+                { "isManualBackup", type == MANUAL_BACKUP_PREFIX }
+            }));
         }
     }
 
-    return backups;
+    float recoveryProgress = 0.0f;
+    bool isRecovering = _isRecovering.load();
+    if (_isRecovering) {
+        for (auto& handler : _backupHandlers) {
+            bool handlerIsRecovering { false };
+            float progress { 0.0f };
+            //std::tie<handlerIsRecovering, progress> = handler->getRecoveryStatus();
+            recoveryProgress += progress / _backupHandlers.size();
+        }
+    }
+
+    QVariantMap status { 
+        { "isRecovering", isRecovering },
+        { "recoveringBackupId", _recoveryFilename },
+        { "recoveryProgress", recoveryProgress }
+    };
+
+    QVariantMap info {
+        { "backups", backups },
+        { "status", status }
+    };
+
+    promise->resolve(info);
 }
 
 void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule) {
@@ -433,6 +508,8 @@ void DomainContentBackupManager::consolidateBackup(MiniPromise::Promise promise,
         return;
     }
 
+    qDebug() << "copyFilePath" << copyFilePath;
+
     promise->resolve({
         { "success", true },
         { "backupFilePath", copyFilePath }
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 9ec7eb9950..790dff0fb4 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -24,14 +24,6 @@
 
 #include <shared/MiniPromises.h>
 
-struct BackupItemInfo {
-    QString id;
-    QString name;
-    QString absolutePath;
-    QDateTime createdAt;
-    bool isManualBackup;
-};
-
 class DomainContentBackupManager : public GenericThread {
     Q_OBJECT
 public:
@@ -52,13 +44,13 @@ public:
                                bool debugTimestampNow = false);
 
     void addBackupHandler(BackupHandlerPointer handler);
-    std::vector<BackupItemInfo> getAllBackups();
 
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
 
     void replaceData(QByteArray data);
 
 public slots:
+    void getAllBackupInformation(MiniPromise::Promise promise);
     void createManualBackup(MiniPromise::Promise promise, const QString& name);
     void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
     void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
@@ -66,6 +58,7 @@ public slots:
 
 signals:
     void loadCompleted();
+    void recoveryCompleted();
 
 protected:
     /// Implements generic processing behavior for this thread.
@@ -86,6 +79,9 @@ private:
     std::vector<BackupHandlerPointer> _backupHandlers;
     int _persistInterval { 0 };
 
+    std::atomic<bool> _isRecovering { false };
+    QString _recoveryFilename { };
+
     int64_t _lastCheck { 0 };
     std::vector<BackupRule> _backupRules;
 };
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index b91e12a9cf..fe145b341b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -307,10 +307,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     _contentManager->initialize(true);
 
-    qDebug() << "Existing backups:";
-    for (auto& backup : _contentManager->getAllBackups()) {
-        qDebug() << "  Backup: " << backup.name << backup.createdAt;
-    }
+    connect(_contentManager.get(), &DomainContentBackupManager::recoveryCompleted, this, &DomainServer::restart);
 }
 
 void DomainServer::parseCommandLine() {
@@ -2131,24 +2128,13 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
             return true;
         } else if (url.path() == URI_API_BACKUPS) {
-            QJsonObject rootJSON;
-            QJsonArray backupsJSON;
+            auto deferred = makePromise("getAllBackupInformation");
+            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                QJsonDocument docJSON(QJsonObject::fromVariantMap(result));
 
-            auto backups = _contentManager->getAllBackups();
-
-            for (const auto& backup : backups) {
-                QJsonObject obj;
-                obj["id"] = backup.id;
-                obj["name"] = backup.name;
-                obj["createdAtMillis"] = backup.createdAt.toMSecsSinceEpoch();
-                obj["isManualBackup"] = backup.isManualBackup;
-                backupsJSON.push_back(obj);
-            }
-
-            rootJSON["backups"] = backupsJSON;
-            QJsonDocument docJSON(rootJSON);
-
-            connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+            });
+            _contentManager->getAllBackupInformation(deferred);
             return true;
         } else if (url.path().startsWith(URI_API_BACKUPS_ID)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());

From 1120b12b8cb758578e16912961744a81a12b1880 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 15 Feb 2018 15:58:39 -0800
Subject: [PATCH 310/569] Fix argument to isAvailable

---
 domain-server/src/DomainContentBackupManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 54ea7e23d5..eccc3e904d 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -322,7 +322,7 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
             for (auto& handler : _backupHandlers) {
                 bool handlerIsAvailable { false };
                 float progress { 0.0f };
-                //std::tie<handlerIsAvailable, progress> = handler->isAvailable();
+                //std::tie<handlerIsAvailable, progress> = handler->isAvailable(fileInfo.absoluteFilePath());
                 //isAvailable = isAvailable && !handlerIsAvailable);
                 //availabilityProgress += progress / _backupHandlers.size();
             }

From a7ca5398990a9328856f1a1aca75e4397a78db3a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 14 Feb 2018 16:48:37 -0800
Subject: [PATCH 311/569] Simplify BackupHandler pattern

---
 domain-server/src/BackupHandler.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 8599dafb29..960dde9b45 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -26,7 +26,6 @@ public:
     virtual void deleteBackup(QuaZip& zip) = 0;
     virtual void consolidateBackup(QuaZip& zip) = 0;
 };
-
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
 #endif /* hifi_BackupHandler_h */

From b76e1b9750973416aa2a316e601e2c36057b829e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 15:46:35 -0800
Subject: [PATCH 312/569] Add backup status getters

---
 domain-server/src/AssetsBackupHandler.cpp | 51 +++++++++++++++++++----
 domain-server/src/AssetsBackupHandler.h   | 21 +++++-----
 domain-server/src/BackupHandler.h         |  5 +++
 domain-server/src/EntitiesBackupHandler.h | 13 +++---
 4 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index ae9cb58343..e683c626ea 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -111,6 +111,42 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
     }
 }
 
+
+std::pair<bool, float> AssetsBackupHandler::isAvailable(QString filePath) {
+    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+        return value.filePath == filePath;
+    });
+    if (it == end(_backups)) {
+        return { true, 1.0f };
+    }
+
+    float progress = (float)it->mappings.size();
+    for (const auto& mapping : it->mappings) {
+        if (_assetsLeftToRequest.find(mapping.second) != end(_assetsLeftToRequest)) {
+            progress -= 1.0f;
+        }
+    }
+    progress /= (float)it->mappings.size();
+
+    return { false, progress };
+}
+
+std::pair<bool, float> AssetsBackupHandler::getRecoveryStatus() {
+    if (_assetsLeftToUpload.empty() &&
+        _mappingsLeftToSet.empty() &&
+        _mappingsLeftToDelete.empty() &&
+        _mappingRequestsInFlight == 0) {
+        return { false, 1.0f };
+    }
+
+    float progress = (float)_numRestoreOperations;
+    progress -= (float)_assetsLeftToUpload.size();
+    progress -= (float)_mappingRequestsInFlight;
+    progress /= (float)_numRestoreOperations;
+
+    return { true, progress };
+}
+
 void AssetsBackupHandler::loadBackup(QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
@@ -451,6 +487,11 @@ void AssetsBackupHandler::computeServerStateDifference(const AssetUtils::Mapping
         }
     }
 
+    _numRestoreOperations = _assetsLeftToUpload.size() + _mappingsLeftToSet.size();
+    if (!_mappingsLeftToDelete.empty()) {
+        ++_numRestoreOperations;
+    }
+
     qCDebug(asset_backup) << "Mappings to set:" << _mappingsLeftToSet.size();
     qCDebug(asset_backup) << "Mappings to del:" << _mappingsLeftToDelete.size();
     qCDebug(asset_backup) << "Assets to upload:" << _assetsLeftToUpload.size();
@@ -461,8 +502,6 @@ void AssetsBackupHandler::restoreAllAssets() {
 }
 
 void AssetsBackupHandler::restoreNextAsset() {
-    startOperation();
-
     if (_assetsLeftToUpload.empty()) {
         updateMappings();
         return;
@@ -500,9 +539,7 @@ void AssetsBackupHandler::updateMappings() {
                 qCCritical(asset_backup) << "    Error:" << request->getErrorString();
             }
 
-            if (--_mappingRequestsInFlight == 0) {
-                stopOperation();
-            }
+            --_mappingRequestsInFlight;
 
             request->deleteLater();
         });
@@ -519,9 +556,7 @@ void AssetsBackupHandler::updateMappings() {
             qCCritical(asset_backup) << "    Error:" << request->getErrorString();
         }
 
-        if (--_mappingRequestsInFlight == 0) {
-            stopOperation();
-        }
+        --_mappingRequestsInFlight;
 
         request->deleteLater();
     });
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index 2ef454998e..1421ddd400 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -31,13 +31,16 @@ class AssetsBackupHandler : public QObject, public BackupHandlerInterface {
 public:
     AssetsBackupHandler(const QString& backupDirectory);
 
-    void loadBackup(QuaZip& zip);
-    void createBackup(QuaZip& zip);
-    void recoverBackup(QuaZip& zip);
-    void deleteBackup(QuaZip& zip);
-    void consolidateBackup(QuaZip& zip);
+    std::pair<bool, float> isAvailable(QString filePath) override;
+    std::pair<bool, float> getRecoveryStatus() override;
 
-    bool operationInProgress() const { return _operationInProgress; }
+    void loadBackup(QuaZip& zip) override;
+    void createBackup(QuaZip& zip) override;
+    void recoverBackup(QuaZip& zip) override;
+    void deleteBackup(QuaZip& zip) override;
+    void consolidateBackup(QuaZip& zip) override;
+
+    bool operationInProgress() { return getRecoveryStatus().first; }
 
 private:
     void setupRefreshTimer();
@@ -48,9 +51,6 @@ private:
     void checkForMissingAssets();
     void checkForAssetsToDelete();
 
-    void startOperation() { _operationInProgress = true; }
-    void stopOperation() { _operationInProgress = false; }
-
     void downloadMissingFiles(const AssetUtils::Mappings& mappings);
     void downloadNextMissingFile();
     bool writeAssetFile(const AssetUtils::AssetHash& hash, const QByteArray& data);
@@ -73,8 +73,6 @@ private:
         bool corruptedBackup;
     };
 
-    bool _operationInProgress { false };
-
     // Internal storage for backups on disk
     bool _allBackupsLoadedSuccessfully { false };
     std::vector<AssetServerBackup> _backups;
@@ -89,6 +87,7 @@ private:
     std::vector<std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash>> _mappingsLeftToSet;
     AssetUtils::AssetPathList _mappingsLeftToDelete;
     int _mappingRequestsInFlight { 0 };
+    int _numRestoreOperations { 0 }; // Used to compute a restore progress.
 };
 
 #endif /* hifi_AssetsBackupHandler_h */
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 960dde9b45..d513820000 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -20,6 +20,11 @@ class BackupHandlerInterface {
 public:
     virtual ~BackupHandlerInterface() = default;
 
+    virtual std::pair<bool, float> isAvailable(QString filePath) = 0;
+
+    // Returns whether a recovery is ongoing and a progress between 0 and 1 if one is.
+    virtual std::pair<bool, float> getRecoveryStatus() = 0;
+
     virtual void loadBackup(QuaZip& zip) = 0;
     virtual void createBackup(QuaZip& zip) = 0;
     virtual void recoverBackup(QuaZip& zip) = 0;
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 6f66483a87..4cff7b6a33 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -20,19 +20,22 @@ class EntitiesBackupHandler : public BackupHandlerInterface {
 public:
     EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath);
 
-    void loadBackup(QuaZip& zip) {}
+    std::pair<bool, float> isAvailable(QString filePath) override { return { true, 1.0f }; }
+    std::pair<bool, float> getRecoveryStatus() override { return { false, 1.0f }; }
+
+    void loadBackup(QuaZip& zip) override {}
 
     // Create a skeleton backup
-    void createBackup(QuaZip& zip);
+    void createBackup(QuaZip& zip) override;
 
     // Recover from a full backup
-    void recoverBackup(QuaZip& zip);
+    void recoverBackup(QuaZip& zip) override;
 
     // Delete a skeleton backup
-    void deleteBackup(QuaZip& zip) {}
+    void deleteBackup(QuaZip& zip) override {}
 
     // Create a full backup
-    void consolidateBackup(QuaZip& zip) {}
+    void consolidateBackup(QuaZip& zip) override {}
 
 private:
     QString _entitiesFilePath;

From 57410e4f1cc017c5aa23220fa96f6a445899d62a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 16:22:06 -0800
Subject: [PATCH 313/569] Remove ES restart after restore

---
 domain-server/src/EntitiesBackupHandler.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index deb92ee0f6..6ad00d01c8 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -16,7 +16,6 @@
 #include <quazip5/quazip.h>
 #include <quazip5/quazipfile.h>
 
-#include <LimitedNodeList.h>
 #include <OctreeUtils.h>
 
 EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
@@ -72,13 +71,5 @@ void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
 
     if (entitiesFile.open(QIODevice::WriteOnly)) {
         entitiesFile.write(data.toGzippedByteArray());
-        entitiesFile.close();
-
-        auto nodeList = DependencyManager::get<LimitedNodeList>();
-        nodeList->eachMatchingNode([](const SharedNodePointer& otherNode) -> bool {
-            return otherNode->getType() == NodeType::EntityServer;
-        }, [nodeList](const SharedNodePointer& otherNode) {
-            QMetaObject::invokeMethod(nodeList.data(), "killNodeWithUUID", Q_ARG(const QUuid&, otherNode->getUUID()));
-        });
     }
 }

From 771e4cd9f4d5e8324813f41011717ea423327525 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 16:45:29 -0800
Subject: [PATCH 314/569] Hook up status and progress

---
 .../src/DomainContentBackupManager.cpp        | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index eccc3e904d..37a8ecfce2 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -148,18 +148,15 @@ bool DomainContentBackupManager::process() {
         if (sinceLastSave > intervalToCheck) {
             _lastCheck = now;
             if (_isRecovering) {
-                bool anyHandlerIsRecovering { false };
-                for (auto& handler : _backupHandlers) {
-                    bool handlerIsRecovering { false };
-                    float progress { 0.0f };
-                    //std::tie<handlerIsRecovering, progress> = handler->getRecoveryStatus();
-                    if (handlerIsRecovering) {
-                        anyHandlerIsRecovering = true;
-                        emit recoveryCompleted();
-                        break;
-                    }
+                using Value = std::vector<BackupHandlerPointer>::value_type;
+                bool isStillRecovering = std::any_of(begin(_backupHandlers), end(_backupHandlers), [](const Value& handler) {
+                    return handler->getRecoveryStatus().first;
+                });
+
+                if (!isStillRecovering) {
+                    _isRecovering = false;
+                    emit recoveryCompleted();
                 }
-                _isRecovering = anyHandlerIsRecovering;
             }
 
             if (!_isRecovering) {
@@ -320,11 +317,11 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
             bool isAvailable { true };
             float availabilityProgress { 0.0f };
             for (auto& handler : _backupHandlers) {
-                bool handlerIsAvailable { false };
+                bool handlerIsAvailable { true };
                 float progress { 0.0f };
-                //std::tie<handlerIsAvailable, progress> = handler->isAvailable(fileInfo.absoluteFilePath());
-                //isAvailable = isAvailable && !handlerIsAvailable);
-                //availabilityProgress += progress / _backupHandlers.size();
+                std::tie(handlerIsAvailable, progress) = handler->isAvailable(fileInfo.absoluteFilePath());
+                isAvailable &= handlerIsAvailable;
+                availabilityProgress += progress / _backupHandlers.size();
             }
 
             backups.push_back(QVariantMap({
@@ -342,9 +339,7 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
     bool isRecovering = _isRecovering.load();
     if (_isRecovering) {
         for (auto& handler : _backupHandlers) {
-            bool handlerIsRecovering { false };
-            float progress { 0.0f };
-            //std::tie<handlerIsRecovering, progress> = handler->getRecoveryStatus();
+            float progress = handler->getRecoveryStatus().second;
             recoveryProgress += progress / _backupHandlers.size();
         }
     }

From cae3e0a9dcceff2e182a012a6381743ca85905ba Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 16:59:17 -0800
Subject: [PATCH 315/569] Add status func to ContentSettingsBackupHandler

---
 domain-server/src/ContentSettingsBackupHandler.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index 932b7c0c3f..8a81392513 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -19,15 +19,18 @@ class ContentSettingsBackupHandler : public BackupHandlerInterface {
 public:
     ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager);
 
-    void loadBackup(QuaZip& zip) {};
+    std::pair<bool, float> isAvailable(QString filePath) override { return { true, 1.0f }; }
+    std::pair<bool, float> getRecoveryStatus() override { return { false, 1.0f }; }
 
-    void createBackup(QuaZip& zip);
+    void loadBackup(QuaZip& zip) override {}
 
-    void recoverBackup(QuaZip& zip);
+    void createBackup(QuaZip& zip) override;
 
-    void deleteBackup(QuaZip& zip) {};
+    void recoverBackup(QuaZip& zip) override;
 
-    void consolidateBackup(QuaZip& zip) {};
+    void deleteBackup(QuaZip& zip) override {}
+
+    void consolidateBackup(QuaZip& zip) override {}
 private:
     DomainServerSettingsManager& _settingsManager;
 };

From 2b85634a21abec80f8f689013c2696afb19e2dc9 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 17:03:55 -0800
Subject: [PATCH 316/569] Fix build error

---
 domain-server/src/BackupHandler.h         | 2 ++
 domain-server/src/EntitiesBackupHandler.h | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index d513820000..1bd40cd9e4 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -14,6 +14,8 @@
 
 #include <memory>
 
+#include <QString>
+
 class QuaZip;
 
 class BackupHandlerInterface {
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 4cff7b6a33..1a6110f1cd 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -12,8 +12,6 @@
 #ifndef hifi_EntitiesBackupHandler_h
 #define hifi_EntitiesBackupHandler_h
 
-#include <QString>
-
 #include "BackupHandler.h"
 
 class EntitiesBackupHandler : public BackupHandlerInterface {

From 2d0b85af724ba640b9caf6ebca260df5c910e120 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 15 Feb 2018 17:28:59 -0800
Subject: [PATCH 317/569] workaround bug

---
 libraries/entities/src/MaterialEntityItem.cpp | 9 +++++----
 libraries/entities/src/MaterialEntityItem.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/MaterialEntityItem.cpp b/libraries/entities/src/MaterialEntityItem.cpp
index e3e3390449..44ef34a3a4 100644
--- a/libraries/entities/src/MaterialEntityItem.cpp
+++ b/libraries/entities/src/MaterialEntityItem.cpp
@@ -27,10 +27,6 @@ MaterialEntityItem::MaterialEntityItem(const EntityItemID& entityItemID) : Entit
     _type = EntityTypes::Material;
 }
 
-MaterialEntityItem::~MaterialEntityItem() {
-    removeMaterial();
-}
-
 EntityItemProperties MaterialEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(materialURL, getMaterialURL);
@@ -329,6 +325,11 @@ void MaterialEntityItem::postParentFixup() {
     applyMaterial();
 }
 
+void MaterialEntityItem::preDelete() {
+    EntityItem::preDelete();
+    removeMaterial();
+}
+
 void MaterialEntityItem::update(const quint64& now) {
     if (_retryApply) {
         applyMaterial();
diff --git a/libraries/entities/src/MaterialEntityItem.h b/libraries/entities/src/MaterialEntityItem.h
index e203b707cc..f77077a782 100644
--- a/libraries/entities/src/MaterialEntityItem.h
+++ b/libraries/entities/src/MaterialEntityItem.h
@@ -21,7 +21,6 @@ public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
     MaterialEntityItem(const EntityItemID& entityItemID);
-    ~MaterialEntityItem();
 
     ALLOW_INSTANTIATION // This class can be instantiated
 
@@ -85,6 +84,7 @@ public:
     void removeMaterial();
 
     void postParentFixup() override;
+    void preDelete() override;
 
 private:
     // URL for this material.  Currently, only JSON format is supported.  Set to "userData" to use the user data to live edit a material.

From 697f0c443cb0f3606ca2facc53dc35bd5ca98ae0 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 17:43:02 -0800
Subject: [PATCH 318/569] Fix warning

---
 domain-server/src/AssetsBackupHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index e683c626ea..db39f2a731 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -487,7 +487,7 @@ void AssetsBackupHandler::computeServerStateDifference(const AssetUtils::Mapping
         }
     }
 
-    _numRestoreOperations = _assetsLeftToUpload.size() + _mappingsLeftToSet.size();
+    _numRestoreOperations = (int)_assetsLeftToUpload.size() + (int)_mappingsLeftToSet.size();
     if (!_mappingsLeftToDelete.empty()) {
         ++_numRestoreOperations;
     }

From f6e9d2c6dd05358d3053795f81705c43bbde02b3 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 18:16:30 -0800
Subject: [PATCH 319/569] Fix race condition in Asset Server

---
 assignment-client/src/assets/AssetServer.cpp | 28 ++++++++++++++++----
 assignment-client/src/assets/AssetServer.h   |  5 +++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 0be557bccd..4c6cba2e74 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -416,9 +416,9 @@ void AssetServer::completeSetup() {
     PathUtils::removeTemporaryApplicationDirs();
     PathUtils::removeTemporaryApplicationDirs("Oven");
 
-    // We're fully setup, remove the request queueing and replay all requests
+    qCDebug(asset_server) << "Overriding temporary queuing packet handler.";
+    // We're fully setup, override the request queueing handler and replay all requests
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.unregisterListener(this);
     packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
     packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
     packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
@@ -428,11 +428,30 @@ void AssetServer::completeSetup() {
 }
 
 void AssetServer::queueRequests(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode) {
+    qCDebug(asset_server) << "Queuing requests until fully setup";
+
+    QMutexLocker lock { &_queuedRequestsMutex };
     _queuedRequests.push_back({ packet, senderNode });
+
+    // If we've stopped queueing but the callback was already in flight,
+    // then replay it immediately.
+    if (!_isQueueingRequests) {
+        lock.unlock();
+        replayRequests();
+    }
 }
 
 void AssetServer::replayRequests() {
-    for (const auto& request : _queuedRequests) {
+    RequestQueue queue;
+    {
+        QMutexLocker lock { &_queuedRequestsMutex };
+        qSwap(queue, _queuedRequests);
+        _isQueueingRequests = false;
+    }
+
+    qCDebug(asset_server) << "Replaying" << queue.size() << "requests.";
+
+    for (const auto& request : queue) {
         switch (request.first->getType()) {
             case PacketType::AssetGet:
                 handleAssetGet(request.first, request.second);
@@ -447,11 +466,10 @@ void AssetServer::replayRequests() {
                 handleAssetMappingOperation(request.first, request.second);
                 break;
             default:
-                qWarning() << "Unknown queued request type:" << request.first->getType();
+                qCWarning(asset_server) << "Unknown queued request type:" << request.first->getType();
                 break;
         }
     }
-    _queuedRequests.clear();
 }
 
 void AssetServer::cleanupUnmappedFiles() {
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index b8aac800ed..c85fb89175 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -123,7 +123,10 @@ private:
     QHash<AssetUtils::AssetHash, std::shared_ptr<BakeAssetTask>> _pendingBakes;
     QThreadPool _bakingTaskPool;
 
-    QVector<QPair<QSharedPointer<ReceivedMessage>, SharedNodePointer>> _queuedRequests;
+    QMutex _queuedRequestsMutex;
+    bool _isQueueingRequests { true };
+    using RequestQueue = QVector<QPair<QSharedPointer<ReceivedMessage>, SharedNodePointer>>;
+    RequestQueue _queuedRequests;
 
     bool _wasColorTextureCompressionEnabled { false };
     bool _wasGrayscaleTextureCompressionEnabled { false  };

From b30f98d5414759a1eae88505812cb481bb813844 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 15 Feb 2018 18:20:14 -0800
Subject: [PATCH 320/569] CR

---
 domain-server/src/DomainContentBackupManager.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 37a8ecfce2..5eb4e7627f 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -503,8 +503,6 @@ void DomainContentBackupManager::consolidateBackup(MiniPromise::Promise promise,
         return;
     }
 
-    qDebug() << "copyFilePath" << copyFilePath;
-
     promise->resolve({
         { "success", true },
         { "backupFilePath", copyFilePath }

From 81662b5edc3180e1ae2221c27374bd16437aaae1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 19:14:14 -0800
Subject: [PATCH 321/569] don't overwrite general description object with
 filtered one

---
 domain-server/src/DomainServerSettingsManager.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 8febbd5769..3fa36ceb90 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1196,8 +1196,8 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 }
 
 bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
-    QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
-        ? _domainSettingsDescription : _contentSettingsDescription;
+    QJsonArray* filteredDescriptionArray = settingsType == DomainSettings
+        ? &_domainSettingsDescription : &_contentSettingsDescription;
 
     // grab a copy of the current config before restore, so that we can back out if something bad happens during
     QVariantMap preRestoreConfig = _configMap.getConfig();
@@ -1206,7 +1206,7 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
 
     // enumerate through the settings in the description
     // if we have one in the restore then use it, otherwise clear it from current settings
-    foreach(const QJsonValue& descriptionGroupValue, filteredDescriptionArray) {
+    foreach(const QJsonValue& descriptionGroupValue, *filteredDescriptionArray) {
         QJsonObject descriptionGroupObject = descriptionGroupValue.toObject();
         QString groupKey = descriptionGroupObject[DESCRIPTION_NAME_KEY].toString();
         QJsonArray descriptionGroupSettings = descriptionGroupObject[DESCRIPTION_SETTINGS_KEY].toArray();
@@ -1328,15 +1328,15 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
         const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
 
         // only enumerate the requested settings type (domain setting or content setting)
-        QJsonArray& filteredDescriptionArray = _descriptionArray;
+        QJsonArray* filteredDescriptionArray = &_descriptionArray;
         if (includeDomainSettings && !includeContentSettings) {
-            filteredDescriptionArray = _domainSettingsDescription;
+            filteredDescriptionArray = &_domainSettingsDescription;
         } else if (includeContentSettings && !includeDomainSettings) {
-            filteredDescriptionArray = _contentSettingsDescription;
+            filteredDescriptionArray = &_contentSettingsDescription;
         }
 
         // enumerate the groups in the potentially filtered object to find which settings to pass
-        foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
+        foreach(const QJsonValue& groupValue, *filteredDescriptionArray) {
             QJsonObject groupObject = groupValue.toObject();
             QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
             QJsonArray groupSettingsArray = groupObject[DESCRIPTION_SETTINGS_KEY].toArray();

From 4bb8435ef884e760ca7374d25574a115ce1fa488 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 19:14:14 -0800
Subject: [PATCH 322/569] don't overwrite general description object with
 filtered one

---
 .../src/DomainServerSettingsManager.cpp          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 5f71890898..85d6a046b5 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1199,7 +1199,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 }
 
 bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
-
+    
     if (thread() != QThread::currentThread()) {
         bool success;
 
@@ -1210,8 +1210,8 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
         return success;
     }
 
-    QJsonArray& filteredDescriptionArray = settingsType == DomainSettings
-        ? _domainSettingsDescription : _contentSettingsDescription;
+    QJsonArray* filteredDescriptionArray = settingsType == DomainSettings
+        ? &_domainSettingsDescription : &_contentSettingsDescription;
 
     // grab a copy of the current config before restore, so that we can back out if something bad happens during
     QVariantMap preRestoreConfig = _configMap.getConfig();
@@ -1220,7 +1220,7 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
 
     // enumerate through the settings in the description
     // if we have one in the restore then use it, otherwise clear it from current settings
-    foreach(const QJsonValue& descriptionGroupValue, filteredDescriptionArray) {
+    foreach(const QJsonValue& descriptionGroupValue, *filteredDescriptionArray) {
         QJsonObject descriptionGroupObject = descriptionGroupValue.toObject();
         QString groupKey = descriptionGroupObject[DESCRIPTION_NAME_KEY].toString();
         QJsonArray descriptionGroupSettings = descriptionGroupObject[DESCRIPTION_SETTINGS_KEY].toArray();
@@ -1356,15 +1356,15 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
         const QString AFFECTED_TYPES_JSON_KEY = "assignment-types";
 
         // only enumerate the requested settings type (domain setting or content setting)
-        QJsonArray& filteredDescriptionArray = _descriptionArray;
+        QJsonArray* filteredDescriptionArray = &_descriptionArray;
         if (includeDomainSettings && !includeContentSettings) {
-            filteredDescriptionArray = _domainSettingsDescription;
+            filteredDescriptionArray = &_domainSettingsDescription;
         } else if (includeContentSettings && !includeDomainSettings) {
-            filteredDescriptionArray = _contentSettingsDescription;
+            filteredDescriptionArray = &_contentSettingsDescription;
         }
 
         // enumerate the groups in the potentially filtered object to find which settings to pass
-        foreach(const QJsonValue& groupValue, filteredDescriptionArray) {
+        foreach(const QJsonValue& groupValue, *filteredDescriptionArray) {
             QJsonObject groupObject = groupValue.toObject();
             QString groupKey = groupObject[DESCRIPTION_NAME_KEY].toString();
             QJsonArray groupSettingsArray = groupObject[DESCRIPTION_SETTINGS_KEY].toArray();

From 29349d7bb2c198e859038c542af794161e5cba16 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 19:18:51 -0800
Subject: [PATCH 323/569] fix for isAvailable boolean in AssetsBackupHandler

---
 domain-server/src/AssetsBackupHandler.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index db39f2a731..c365b942af 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -120,13 +120,20 @@ std::pair<bool, float> AssetsBackupHandler::isAvailable(QString filePath) {
         return { true, 1.0f };
     }
 
-    float progress = (float)it->mappings.size();
+    int mappingsMissing = 0;
     for (const auto& mapping : it->mappings) {
         if (_assetsLeftToRequest.find(mapping.second) != end(_assetsLeftToRequest)) {
-            progress -= 1.0f;
+            ++mappingsMissing;
         }
     }
-    progress /= (float)it->mappings.size();
+
+    if (mappingsMissing == 0) {
+        return { true, 1.0f };
+    }
+
+    float progress = (float)it->mappings.size();
+    progress -= (float)mappingsMissing;
+    progress /= it->mappings.size();
 
     return { false, progress };
 }

From 2eb8ebcdbcf0a50fed1acda630398bad547d5e27 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Fri, 16 Feb 2018 19:59:42 +0300
Subject: [PATCH 324/569] FB11508 - toolbar slowly sides downward

---
 interface/resources/qml/windows/Window.qml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/windows/Window.qml b/interface/resources/qml/windows/Window.qml
index a0ef73290a..4ed765db4b 100644
--- a/interface/resources/qml/windows/Window.qml
+++ b/interface/resources/qml/windows/Window.qml
@@ -89,6 +89,15 @@ Fadable {
         window.shown = value;
     }
 
+    // used to snap window content to pixel by translating content by negative fractional part of the x/y
+    // thus if x was 5.41, snapper's x will be -0.41
+    // avoiding fractional window position is to avoid artifacts in text rendering when the fractional positions are present.
+    transform: Translate {
+        id: snapper
+        x: 0;
+        y: 0;
+    }
+
     property var rectifier: Timer {
         property bool executing: false;
         interval: 100
@@ -97,8 +106,8 @@ Fadable {
 
         onTriggered: {
             executing = true;
-            x = Math.floor(x);
-            y = Math.floor(y);
+            snapper.x = Math.floor(x) - x;
+            snapper.y = Math.floor(y) - y;
             executing = false;
         }
 

From 194c7f41015575a91b4aa64f1775cc533689b5ec Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 16 Feb 2018 09:28:15 -0800
Subject: [PATCH 325/569] WIP - for review.

---
 interface/src/avatar/MyAvatar.cpp             |  8 +--
 interface/src/avatar/MyAvatar.h               |  2 -
 .../src/RenderableEntityItem.h                |  1 +
 .../src/RenderableModelEntityItem.cpp         |  4 ++
 .../render-utils/src/CauterizedModel.cpp      |  5 +-
 .../render-utils/src/MeshPartPayload.cpp      | 10 +++-
 libraries/render-utils/src/MeshPartPayload.h  |  4 +-
 libraries/render-utils/src/Model.cpp          | 55 ++++++++++++++-----
 libraries/render-utils/src/Model.h            |  6 ++
 9 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c25aaeeecd..97b8c71a32 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1112,6 +1112,7 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
     _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
+    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene());
 }
 
 void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -1464,6 +1465,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     int skeletonModelChangeCount = _skeletonModelChangeCount;
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
+    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene());
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
 
@@ -1819,12 +1821,6 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName,
     Avatar::attach(modelURL, jointName, translation, rotation, scale, isSoft, allowDuplicates, useSaved);
 }
 
-void MyAvatar::setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visible) {
-    if (model->isActive() && model->isRenderable()) {
-        model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE, true);
-    }
-}
-
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
     if (_skeletonModel->isLoaded()) {
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 28af8b62fd..a62bc1a109 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -677,8 +677,6 @@ private:
     // These are made private for MyAvatar so that you will use the "use" methods instead
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
 
-    void setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visiblity);
-
     virtual void updatePalms() override {}
     void lateUpdatePalms();
 
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index f8685df5da..a9bb12d087 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -124,6 +124,7 @@ protected:
     bool _isFading{ _entitiesShouldFadeFunction() };
     bool _prevIsTransparent { false };
     bool _visible { false };
+    bool _canCastShadow { false };
     bool _cauterized { false };
     bool _moving { false };
     bool _needsRenderUpdate { false };
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 56e3f96014..d3e1b62f5a 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1356,6 +1356,10 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     }
     // TODO? early exit here when not visible?
 
+    if (model->canCastShadow() != _canCastShadow) {
+        model->setCanCastShadow(_canCastShadow, scene);
+    }
+
     if (_needsCollisionGeometryUpdate) {
         setCollisionMeshKey(entity->getCollisionMeshKey());
         _needsCollisionGeometryUpdate = false;
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 54dfd96a00..74b278c2c1 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -204,6 +204,7 @@ void CauterizedModel::updateRenderItems() {
 
             bool isWireframe = self->isWireframe();
             bool isVisible = self->isVisible();
+            bool canCastShadow = self->canCastShadow();
             bool isLayeredInFront = self->isLayeredInFront();
             bool isLayeredInHUD = self->isLayeredInHUD();
             bool enableCauterization = self->getEnableCauterization();
@@ -219,7 +220,7 @@ void CauterizedModel::updateRenderItems() {
                 bool invalidatePayloadShapeKey = self->shouldInvalidatePayloadShapeKey(meshIndex);
 
                 transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, clusterTransforms, clusterTransformsCauterized, invalidatePayloadShapeKey,
-                        isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, enableCauterization](CauterizedMeshPartPayload& data) {
+                        isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, canCastShadow, enableCauterization](CauterizedMeshPartPayload& data) {
                     data.updateClusterBuffer(clusterTransforms, clusterTransformsCauterized);
 
                     Transform renderTransform = modelTransform;
@@ -249,7 +250,7 @@ void CauterizedModel::updateRenderItems() {
                     data.updateTransformForCauterizedMesh(renderTransform);
 
                     data.setEnableCauterization(enableCauterization);
-                    data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, render::ItemKey::TAG_BITS_ALL);
+                    data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, render::ItemKey::TAG_BITS_ALL);
                     data.setLayer(isLayeredInFront, isLayeredInHUD);
                     data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
                 });
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index da11535396..84f6c6aca3 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -71,7 +71,7 @@ void MeshPartPayload::updateMaterial(graphics::MaterialPointer drawMaterial) {
     _drawMaterial = drawMaterial;
 }
 
-void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
+void MeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 
@@ -85,6 +85,10 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits,
         builder.withLayered();
     }
 
+    if (canCastShadow) {
+        builder.withShadowCaster();
+    }
+
     if (isGroupCulled) {
         builder.withSubMetaCulled();
     }
@@ -421,6 +425,10 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tag
         builder.withLayered();
     }
 
+    if (canCastShadow) {
+        builder.withShadowCaster();
+    }
+
     if (isGroupCulled) {
         builder.withSubMetaCulled();
     }
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 40efc67572..e7996e94dc 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -33,7 +33,7 @@ public:
     typedef render::Payload<MeshPartPayload> Payload;
     typedef Payload::DataPointer Pointer;
 
-    virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false);
+    virtual void updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled = false);
 
     virtual void updateMeshPart(const std::shared_ptr<const graphics::Mesh>& drawMesh, int partIndex);
 
@@ -99,7 +99,7 @@ public:
     using TransformType = glm::mat4;
 #endif
 
-    void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false) override;
+    void updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled = false) override;
     void updateClusterBuffer(const std::vector<TransformType>& clusterTransforms);
     void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index bb8353c746..197008fc94 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -102,6 +102,7 @@ Model::Model(QObject* parent, SpatiallyNestable* spatiallyNestableOverride) :
     _snappedToRegistrationPoint(false),
     _url(HTTP_INVALID_COM),
     _isVisible(true),
+    _canCastShadow(false),
     _blendNumber(0),
     _appliedBlendNumber(0),
     _isWireframe(false)
@@ -268,6 +269,7 @@ void Model::updateRenderItems() {
 
         bool isWireframe = self->isWireframe();
         bool isVisible = self->isVisible();
+        bool canCastShadow = self->canCastShadow();
         uint8_t viewTagBits = self->getViewTagBits();
         bool isLayeredInFront = self->isLayeredInFront();
         bool isLayeredInHUD = self->isLayeredInHUD();
@@ -284,7 +286,7 @@ void Model::updateRenderItems() {
 
             transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterTransforms,
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
-                                                                  viewTagBits, isLayeredInFront,
+                                                                  canCastShadow, viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
                 data.updateClusterBuffer(clusterTransforms);
 
@@ -301,7 +303,7 @@ void Model::updateRenderItems() {
                 }
                 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
                 data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
             });
@@ -693,46 +695,68 @@ void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene,
 
         bool isLayeredInFront = _isLayeredInFront;
         bool isLayeredInHUD = _isLayeredInHUD;
-
+        bool canCastShadow = _canCastShadow;
         render::Transaction transaction;
         foreach (auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
             });
         }
         scene->enqueueTransaction(transaction);
     }
 }
 
+void Model::setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene) {
+    if (_canCastShadow != canCastShadow) {
+        _canCastShadow = canCastShadow;
+
+        bool isVisible = _isVisible;
+        bool viewTagBits = _viewTagBits;
+        bool isLayeredInFront = _isLayeredInFront;
+        bool isLayeredInHUD = _isLayeredInHUD;
+        bool isGroupCulled = _isGroupCulled;
+
+        render::Transaction transaction;
+        foreach (auto item, _modelMeshRenderItemsMap.keys()) {
+            transaction.updateItem<ModelMeshPartPayload>(item, 
+                [isVisible, viewTagBits, canCastShadow, isLayeredInFront, isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                    data.updateKey(isVisible, viewTagBits, canCastShadow, isLayeredInFront || isLayeredInHUD, isGroupCulled);
+                });
+        }
+
+        scene->enqueueTransaction(transaction);
+    }
+}
 
 void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene) {
     if (_isLayeredInFront != isLayeredInFront) {
         _isLayeredInFront = isLayeredInFront;
 
         bool isVisible = _isVisible;
+        bool canCastShadow = _canCastShadow;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInHUD = _isLayeredInHUD;
         bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
@@ -745,22 +769,23 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce
         _isLayeredInHUD = isLayeredInHUD;
 
         bool isVisible = _isVisible;
+        bool canCastShadow = _canCastShadow;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInFront = _isLayeredInFront;
         bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 57d2798a66..c0d2c32f8f 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -87,6 +87,10 @@ public:
 
     // new Scene/Engine rendering support
     void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
+
+    bool canCastShadow() const { return _canCastShadow; }
+    void setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene);
+
     void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
     void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);
     bool needsFixupInScene() const;
@@ -401,6 +405,8 @@ protected:
     bool _isVisible;
     uint8_t _viewTagBits{ render::ItemKey::TAG_BITS_ALL };
 
+    bool _canCastShadow;
+
     gpu::Buffers _blendedVertexBuffers;
 
     QVector<QVector<QSharedPointer<Texture> > > _dilatedTextures;

From 47924a58f9732e62ef79efa065bd944781193ebd Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 16 Feb 2018 10:14:46 -0800
Subject: [PATCH 326/569] WIP - for review.

---
 libraries/render-utils/src/MeshPartPayload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 84f6c6aca3..178f5782dd 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -411,7 +411,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
     _worldBound.transform(boundTransform);
 }
 
-void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
+void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 

From efa55c0a63d09b4f484c9248c59854924ba56b4e Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:07:17 -0800
Subject: [PATCH 327/569] Update backup delete to not break rolling backups and
 remove unused asset files

---
 domain-server/src/AssetsBackupHandler.cpp     |  6 +++---
 domain-server/src/AssetsBackupHandler.h       |  2 +-
 domain-server/src/BackupHandler.h             |  2 +-
 .../src/ContentSettingsBackupHandler.h        |  2 +-
 .../src/DomainContentBackupManager.cpp        | 19 ++++++++++++++++---
 .../src/DomainContentBackupManager.h          |  1 +
 domain-server/src/EntitiesBackupHandler.h     |  2 +-
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index c365b942af..694277910f 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -306,7 +306,7 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
     restoreAllAssets();
 }
 
-void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
+void AssetsBackupHandler::deleteBackup(const QString& absoluteFilePath) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
@@ -315,10 +315,10 @@ void AssetsBackupHandler::deleteBackup(QuaZip& zip) {
     }
 
     auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
-        return value.filePath == zip.getZipName();
+        return value.filePath == absoluteFilePath;
     });
     if (it == end(_backups)) {
-        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to delete.";
+        qCDebug(asset_backup) << "Could not find backup" << absoluteFilePath << "to delete.";
         return;
     }
 
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index 1421ddd400..a4b62f563d 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -37,7 +37,7 @@ public:
     void loadBackup(QuaZip& zip) override;
     void createBackup(QuaZip& zip) override;
     void recoverBackup(QuaZip& zip) override;
-    void deleteBackup(QuaZip& zip) override;
+    void deleteBackup(const QString& absoluteFilePath) override;
     void consolidateBackup(QuaZip& zip) override;
 
     bool operationInProgress() { return getRecoveryStatus().first; }
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 1bd40cd9e4..7d876cec01 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -30,7 +30,7 @@ public:
     virtual void loadBackup(QuaZip& zip) = 0;
     virtual void createBackup(QuaZip& zip) = 0;
     virtual void recoverBackup(QuaZip& zip) = 0;
-    virtual void deleteBackup(QuaZip& zip) = 0;
+    virtual void deleteBackup(const QString& absoluteFilePath) = 0;
     virtual void consolidateBackup(QuaZip& zip) = 0;
 };
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index 8a81392513..ba252c862c 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -28,7 +28,7 @@ public:
 
     void recoverBackup(QuaZip& zip) override;
 
-    void deleteBackup(QuaZip& zip) override {}
+    void deleteBackup(const QString& absoluteFilePath) override {}
 
     void consolidateBackup(QuaZip& zip) override {}
 private:
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 5eb4e7627f..bf388ce63e 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -89,8 +89,7 @@ void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
             }
 
             auto name = obj["Name"].toString();
-            auto format = obj["format"].toString();
-            format = name.replace(" ", "_").toLower();
+            auto format = name.replace(" ", "_").toLower();
 
             qCDebug(domain_server) << "    Name:" << name;
             qCDebug(domain_server) << "        format:" << format;
@@ -116,6 +115,12 @@ void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
     }
 }
 
+void DomainContentBackupManager::refreshBackupRules() {
+    for (auto& backup : _backupRules) {
+        backup.lastBackupSeconds = getMostRecentBackupTimeInSecs(backup.extensionFormat);
+    }
+}
+
 int64_t DomainContentBackupManager::getMostRecentBackupTimeInSecs(const QString& format) {
     int64_t mostRecentBackupInSecs = 0;
 
@@ -235,8 +240,16 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
     }
 
     QDir backupDir { _backupDirectory };
-    QFile backupFile { backupDir.filePath(backupName) };
+    auto absoluteFilePath { backupDir.filePath(backupName) };
+    QFile backupFile { absoluteFilePath };
     auto success = backupFile.remove();
+
+    refreshBackupRules();
+
+    for (auto& handler : _backupHandlers) {
+        handler->deleteBackup(absoluteFilePath);
+    }
+
     promise->resolve({
         { "success", success }
     });
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 790dff0fb4..4ec3d7bcc7 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -68,6 +68,7 @@ protected:
     void load();
     void backup();
     void removeOldBackupVersions(const BackupRule& rule);
+    void refreshBackupRules();
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
     int64_t getMostRecentBackupTimeInSecs(const QString& format);
     void parseSettings(const QJsonObject& settings);
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 1a6110f1cd..c143fe5774 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -30,7 +30,7 @@ public:
     void recoverBackup(QuaZip& zip) override;
 
     // Delete a skeleton backup
-    void deleteBackup(QuaZip& zip) override {}
+    void deleteBackup(const QString& absoluteFilePath) override {}
 
     // Create a full backup
     void consolidateBackup(QuaZip& zip) override {}

From bb8caa0ce3edccec0ed6d6d31c06f20643d4e508 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:07:45 -0800
Subject: [PATCH 328/569] Update HTTPConnection to not use QIODevice when given
 a QByteArray

---
 .../embedded-webserver/src/HTTPConnection.cpp | 72 ++++++++++---------
 .../embedded-webserver/src/HTTPConnection.h   |  1 +
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 6d0126b3d1..3f6f8d64ee 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -133,57 +133,33 @@ QList<FormData> HTTPConnection::parseFormData() const {
 }
 
 void HTTPConnection::respond(const char* code, const QByteArray& content, const char* contentType, const Headers& headers) {
-    QByteArray data(content);
-    auto device { std::unique_ptr<QBuffer>(new QBuffer()) };
-    device->setBuffer(new QByteArray(content));
-    if (device->open(QIODevice::ReadOnly)) {
-        respond(code, std::move(device), contentType, headers);
-    } else {
-        qCritical() << "Error opening QBuffer to respond to " << _requestUrl.path();
-    }
+    respondWithStatusAndHeaders(code, contentType, headers, content.size());
+
+    _socket->write(content);
+
+    _socket->disconnectFromHost();
+
+    // make sure we receive no further read notifications
+    disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
 void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device, const char* contentType, const Headers& headers) {
     _responseDevice = std::move(device);
 
-    _socket->write("HTTP/1.1 ");
-
     if (_responseDevice->isSequential()) {
         qWarning() << "Error responding to HTTPConnection: sequential IO devices not supported";
-        _socket->write(StatusCode500);
-        _socket->write("\r\n");
+        respondWithStatusAndHeaders(StatusCode500, contentType, headers, 0);
         _socket->disconnect(SIGNAL(readyRead()), this);
         _socket->disconnectFromHost();
         return;
     }
 
-    _socket->write(code);
-    _socket->write("\r\n");
-
-    for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
-            it != end; it++) {
-        _socket->write(it.key());
-        _socket->write(": ");
-        _socket->write(it.value());
-        _socket->write("\r\n");
-    }
-
-    int csize = _responseDevice->size();
-    if (csize > 0) {
-        _socket->write("Content-Length: ");
-        _socket->write(QByteArray::number(csize));
-        _socket->write("\r\n");
-
-        _socket->write("Content-Type: ");
-        _socket->write(contentType);
-        _socket->write("\r\n");
-    }
-    _socket->write("Connection: close\r\n\r\n");
+    int totalToBeWritten = _responseDevice->size();
+    respondWithStatusAndHeaders(code, contentType, headers, totalToBeWritten);
 
     if (_responseDevice->atEnd()) {
         _socket->disconnectFromHost();
     } else {
-        int totalToBeWritten = csize;
         connect(_socket, &QTcpSocket::bytesWritten, this, [this, totalToBeWritten](size_t bytes) mutable {
             constexpr size_t HTTP_RESPONSE_CHUNK_SIZE = 1024 * 10;
             if (!_responseDevice->atEnd()) {
@@ -201,6 +177,32 @@ void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device
     disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
+void HTTPConnection::respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t contentLength) {
+    _socket->write("HTTP/1.1 ");
+
+    _socket->write(code);
+    _socket->write("\r\n");
+
+    for (Headers::const_iterator it = headers.constBegin(), end = headers.constEnd();
+            it != end; it++) {
+        _socket->write(it.key());
+        _socket->write(": ");
+        _socket->write(it.value());
+        _socket->write("\r\n");
+    }
+
+    if (contentLength > 0) {
+        _socket->write("Content-Length: ");
+        _socket->write(QByteArray::number(contentLength));
+        _socket->write("\r\n");
+
+        _socket->write("Content-Type: ");
+        _socket->write(contentType);
+        _socket->write("\r\n");
+    }
+    _socket->write("Connection: close\r\n\r\n");
+}
+
 void HTTPConnection::readRequest() {
     if (!_socket->canReadLine()) {
         return;
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index a020dfdca9..ec00864514 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -105,6 +105,7 @@ protected slots:
     void readContent ();
 
 protected:
+    void respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t size);
 
     /// The parent HTTP manager
     HTTPManager* _parentManager;

From ec3580f5964187fd898ce735e029544d57856970 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:08:57 -0800
Subject: [PATCH 329/569] Fix recovery ID not being recorded

---
 domain-server/src/DomainContentBackupManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index bf388ce63e..8ea3d2ba90 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -281,6 +281,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
             success = false;
         } else {
             _isRecovering = true;
+            _recoveryFilename = backupName;
             for (auto& handler : _backupHandlers) {
                 handler->recoverBackup(zip);
             }

From 0230abea790ddb7917ec366ae9b7b87c9038d3c4 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:54:35 -0800
Subject: [PATCH 330/569] Fix backup loading not getting auto backups

---
 .../src/DomainContentBackupManager.cpp        | 108 +++++++++++-------
 .../src/DomainContentBackupManager.h          |  13 ++-
 domain-server/src/DomainServer.cpp            |   4 +-
 3 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 8ea3d2ba90..db924c4e4f 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -300,12 +300,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     });
 }
 
-void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise promise) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "getAllBackupInformation", Q_ARG(MiniPromise::Promise, promise));
-        return;
-    }
-
+std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
     QDir backupDir { _backupDirectory };
     auto matchingFiles =
             backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" },
@@ -315,7 +310,7 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
     QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")";
     QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" };
 
-    QVariantList backups;
+    std::vector<BackupItemInfo> backups;
 
     for (const auto& fileInfo : matchingFiles) {
         auto fileName = fileInfo.fileName();
@@ -338,17 +333,53 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
                 availabilityProgress += progress / _backupHandlers.size();
             }
 
-            backups.push_back(QVariantMap({
-                { "id", fileInfo.fileName() },
-                { "name", name },
-                { "createdAtMillis", createdAt.toMSecsSinceEpoch() },
-                { "isAvailable", isAvailable },
-                { "availabilityProgress", availabilityProgress },
-                { "isManualBackup", type == MANUAL_BACKUP_PREFIX }
-            }));
+            backups.push_back(
+                { fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt, type == MANUAL_BACKUP_PREFIX });
         }
     }
 
+    return backups;
+}
+
+void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise promise) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "getAllBackupInformation", Q_ARG(MiniPromise::Promise, promise));
+        return;
+    }
+
+    QDir backupDir { _backupDirectory };
+    auto matchingFiles =
+            backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" },
+                                    QDir::Files | QDir::NoSymLinks, QDir::Name);
+    QString prefixFormat = "(" + QRegExp::escape(AUTOMATIC_BACKUP_PREFIX) + "|" + QRegExp::escape(MANUAL_BACKUP_PREFIX) + ")";
+    QString nameFormat = "(.+)";
+    QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")";
+    QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" };
+
+    auto backups = getAllBackups();
+
+    QVariantList variantBackups;
+
+    for (auto& backup : backups) {
+        bool isAvailable { true };
+        float availabilityProgress { 0.0f };
+        for (auto& handler : _backupHandlers) {
+            bool handlerIsAvailable { true };
+            float progress { 0.0f };
+            std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.absolutePath);
+            isAvailable &= handlerIsAvailable;
+            availabilityProgress += progress / _backupHandlers.size();
+        }
+        variantBackups.push_back(QVariantMap({
+            { "id", backup.id },
+            { "name", backup.name },
+            { "createdAtMillis", backup.createdAt.toMSecsSinceEpoch() },
+            { "isAvailable", isAvailable },
+            { "availabilityProgress", availabilityProgress },
+            { "isManualBackup", backup.isManualBackup }
+        }));
+    }
+
     float recoveryProgress = 0.0f;
     bool isRecovering = _isRecovering.load();
     if (_isRecovering) {
@@ -365,7 +396,7 @@ void DomainContentBackupManager::getAllBackupInformation(MiniPromise::Promise pr
     };
 
     QVariantMap info {
-        { "backups", backups },
+        { "backups", variantBackups },
         { "status", status }
     };
 
@@ -404,32 +435,27 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
 }
 
 void DomainContentBackupManager::load() {
-    QDir backupDir { _backupDirectory };
-    if (backupDir.exists()) {
-
-        auto matchingFiles = backupDir.entryInfoList({ "backup-*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
-
-        for (const auto& file : matchingFiles) {
-            QFile backupFile { file.absoluteFilePath() };
-            if (!backupFile.open(QIODevice::ReadOnly)) {
-                qCritical() << "Could not open file:" << file.absoluteFilePath();
-                qCritical() << "    ERROR:" << backupFile.errorString();
-                continue;
-            }
-
-            QuaZip zip { &backupFile };
-            if (!zip.open(QuaZip::mdUnzip)) {
-                qCritical() << "Could not open backup archive:" << file.absoluteFilePath();
-                qCritical() << "    ERROR:" << zip.getZipError();
-                continue;
-            }
-
-            for (auto& handler : _backupHandlers) {
-                handler->loadBackup(zip);
-            }
-
-            zip.close();
+    auto backups = getAllBackups();
+    for (auto& backup : backups) {
+        QFile backupFile{ backup.absolutePath };
+        if (!backupFile.open(QIODevice::ReadOnly)) {
+            qCritical() << "Could not open file:" << backup.absolutePath;
+            qCritical() << "    ERROR:" << backupFile.errorString();
+            continue;
         }
+
+        QuaZip zip{ &backupFile };
+        if (!zip.open(QuaZip::mdUnzip)) {
+            qCritical() << "Could not open backup archive:" << backup.absolutePath;
+            qCritical() << "    ERROR:" << zip.getZipError();
+            continue;
+        }
+
+        for (auto& handler : _backupHandlers) {
+            handler->loadBackup(zip);
+        }
+
+        zip.close();
     }
 }
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 4ec3d7bcc7..2cfda4b650 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -24,6 +24,14 @@
 
 #include <shared/MiniPromises.h>
 
+struct BackupItemInfo {
+    QString id;
+    QString name;
+    QString absolutePath;
+    QDateTime createdAt;
+    bool isManualBackup;
+};
+
 class DomainContentBackupManager : public GenericThread {
     Q_OBJECT
 public:
@@ -43,14 +51,13 @@ public:
                                int persistInterval = DEFAULT_PERSIST_INTERVAL,
                                bool debugTimestampNow = false);
 
+    std::vector<BackupItemInfo> getAllBackups();
     void addBackupHandler(BackupHandlerPointer handler);
-
     void aboutToFinish();  /// call this to inform the persist thread that the owner is about to finish to support final persist
-
     void replaceData(QByteArray data);
 
 public slots:
-    void getAllBackupInformation(MiniPromise::Promise promise);
+    void getAllBackupsAndStatus(MiniPromise::Promise promise);
     void createManualBackup(MiniPromise::Promise promise, const QString& name);
     void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
     void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index fe145b341b..157eaa483f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2128,13 +2128,13 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
             return true;
         } else if (url.path() == URI_API_BACKUPS) {
-            auto deferred = makePromise("getAllBackupInformation");
+            auto deferred = makePromise("getAllBackupsAndStatus");
             deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
                 QJsonDocument docJSON(QJsonObject::fromVariantMap(result));
 
                 connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
             });
-            _contentManager->getAllBackupInformation(deferred);
+            _contentManager->getAllBackupsAndStatus(deferred);
             return true;
         } else if (url.path().startsWith(URI_API_BACKUPS_ID)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());

From 27c26bab8659b965229d451efb79edb6e4290615 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 13:57:38 -0800
Subject: [PATCH 331/569] Fix ambiguous int64_t in HTTPConnection

---
 libraries/embedded-webserver/src/HTTPConnection.cpp | 2 +-
 libraries/embedded-webserver/src/HTTPConnection.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 3f6f8d64ee..00879e1380 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -177,7 +177,7 @@ void HTTPConnection::respond(const char* code, std::unique_ptr<QIODevice> device
     disconnect(_socket, &QTcpSocket::readyRead, this, nullptr);
 }
 
-void HTTPConnection::respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t contentLength) {
+void HTTPConnection::respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, qint64 contentLength) {
     _socket->write("HTTP/1.1 ");
 
     _socket->write(code);
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index ec00864514..60408d4325 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -105,7 +105,7 @@ protected slots:
     void readContent ();
 
 protected:
-    void respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, int64_t size);
+    void respondWithStatusAndHeaders(const char* code, const char* contentType, const Headers& headers, qint64 size);
 
     /// The parent HTTP manager
     HTTPManager* _parentManager;

From 4c1f22f84e62213b3de4e7cb658a0473809a37d3 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 16 Feb 2018 14:01:33 -0800
Subject: [PATCH 332/569] Models and Avatar cast shadows (box doesn't, yet).

---
 interface/src/avatar/MyAvatar.cpp             |  5 +++-
 .../src/RenderableEntityItem.cpp              |  1 +
 libraries/entities/src/EntityItem.cpp         | 28 +++++++++++++++++++
 libraries/entities/src/EntityItem.h           |  5 ++++
 libraries/entities/src/ModelEntityItem.cpp    | 28 -------------------
 libraries/entities/src/ModelEntityItem.h      |  5 ----
 .../render-utils/src/MeshPartPayload.cpp      |  2 +-
 7 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 97b8c71a32..c70dc9df98 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1112,7 +1112,7 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
     _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
-    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene());
+    _skeletonModel->setCanCastShadow(isEnabled, qApp->getMain3DScene());
 }
 
 void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -2010,8 +2010,11 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
                 _attachmentData[i].jointName.compare("RightEye", Qt::CaseInsensitive) == 0 ||
                 _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
                 _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
+
                 _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene(),
                                                         render::ItemKey::TAG_BITS_NONE, true);
+
+                _attachmentModels[i]->setCanCastShadow(shouldDrawHead, qApp->getMain3DScene());
             }
         }
     }
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index aca2f4d35b..7f2f57d1ac 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -371,6 +371,7 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa
 
         _moving = entity->isMovingRelativeToParent();
         _visible = entity->getVisible();
+        _canCastShadow = entity->getCanCastShadow();
         _cauterized = entity->getCauterized();
         _needsRenderUpdate = false;
     });
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index ed13a46414..e14d0b6757 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -99,6 +99,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_REGISTRATION_POINT;
     requestedProperties += PROP_ANGULAR_DAMPING;
     requestedProperties += PROP_VISIBLE;
+    requestedProperties += PROP_CAN_CAST_SHADOW;
     requestedProperties += PROP_COLLISIONLESS;
     requestedProperties += PROP_COLLISION_MASK;
     requestedProperties += PROP_DYNAMIC;
@@ -257,6 +258,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_REGISTRATION_POINT, getRegistrationPoint());
         APPEND_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, getAngularDamping());
         APPEND_ENTITY_PROPERTY(PROP_VISIBLE, getVisible());
+        APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
         APPEND_ENTITY_PROPERTY(PROP_COLLISIONLESS, getCollisionless());
         APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, getCollisionMask());
         APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, getDynamic());
@@ -807,6 +809,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
     READ_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, float, setAngularDamping);
     READ_ENTITY_PROPERTY(PROP_VISIBLE, bool, setVisible);
+    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLLISIONLESS, bool, setCollisionless);
     READ_ENTITY_PROPERTY(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
     READ_ENTITY_PROPERTY(PROP_DYNAMIC, bool, setDynamic);
@@ -900,6 +903,7 @@ void EntityItem::debugDump() const {
     qCDebug(entities, " edited ago:%f", (double)getEditedAgo());
     qCDebug(entities, " position:%f,%f,%f", (double)position.x, (double)position.y, (double)position.z);
     qCDebug(entities) << " dimensions:" << getScaledDimensions();
+    qCDebug(entities) << " can cast shadow" << getCanCastShadow();
 }
 
 // adjust any internal timestamps to fix clock skew for this server
@@ -1242,6 +1246,7 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(angularDamping, getAngularDamping);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(localRenderAlpha, getLocalRenderAlpha);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(visible, getVisible);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionless, getCollisionless);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionMask, getCollisionMask);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(dynamic, getDynamic);
@@ -1354,6 +1359,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(collisionSoundURL, setCollisionSoundURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(localRenderAlpha, setLocalRenderAlpha);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(visible, setVisible);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(userData, setUserData);
 
     // Certifiable Properties
@@ -2731,6 +2737,28 @@ void EntityItem::setVisible(bool value) {
     }
 }
 
+bool EntityItem::getCanCastShadow() const {
+    bool result;
+    withReadLock([&] {
+        result = _canCastShadow;
+    });
+    return result;
+}
+
+void EntityItem::setCanCastShadow(bool value) {
+    bool changed = false;
+    withWriteLock([&] {
+        if (_canCastShadow != value) {
+            changed = true;
+            _canCastShadow = value;
+        }
+    });
+
+    if (changed) {
+        emit requestRenderUpdate();
+    }
+}
+
 bool EntityItem::isChildOfMyAvatar() const {
     QUuid ancestorID = findAncestorOfType(NestableType::Avatar);
     return !ancestorID.isNull() && (ancestorID == Physics::getSessionUUID() || ancestorID == AVATAR_SELF_ID);
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 5f84bcc311..19a1a9c88e 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -273,6 +273,10 @@ public:
 
     bool getVisible() const;
     void setVisible(bool value);
+
+    bool getCanCastShadow() const;
+    void setCanCastShadow(bool value);
+
     inline bool isVisible() const { return getVisible(); }
     inline bool isInvisible() const { return !getVisible(); }
 
@@ -543,6 +547,7 @@ protected:
     glm::vec3 _registrationPoint { ENTITY_ITEM_DEFAULT_REGISTRATION_POINT };
     float _angularDamping { ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING };
     bool _visible { ENTITY_ITEM_DEFAULT_VISIBLE };
+    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
     bool _collisionless { ENTITY_ITEM_DEFAULT_COLLISIONLESS };
     uint8_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
     bool _dynamic { ENTITY_ITEM_DEFAULT_DYNAMIC };
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index b1edd47a67..a4fe8e6b1e 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -54,7 +54,6 @@ void ModelEntityItem::setTextures(const QString& textures) {
 EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
 
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(modelURL, getModelURL);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL);
@@ -74,7 +73,6 @@ bool ModelEntityItem::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = false;
     somethingChanged = EntityItem::setProperties(properties); // set the properties in our base class
 
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(modelURL, setModelURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL);
@@ -116,7 +114,6 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     const unsigned char* dataAt = data;
     bool animationPropertiesChanged = false;
 
-    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_MODEL_URL, QString, setModelURL);
     READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
@@ -153,7 +150,6 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ModelEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
-    requestedProperties += PROP_CAN_CAST_SHADOW;
     requestedProperties += PROP_MODEL_URL;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_TEXTURES;
@@ -178,7 +174,6 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 
     bool successPropertyFits = true;
 
-    APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_MODEL_URL, getModelURL());
     APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, getCompoundShapeURL());
@@ -295,7 +290,6 @@ void ModelEntityItem::updateFrameCount() {
 }
 
 void ModelEntityItem::debugDump() const {
-    qCDebug(entities) << "    can cast shadow" << getCanCastShadow();
     qCDebug(entities) << "ModelEntityItem id:" << getEntityItemID();
     qCDebug(entities) << "    edited ago:" << getEditedAgo();
     qCDebug(entities) << "    position:" << getWorldPosition();
@@ -728,25 +722,3 @@ bool ModelEntityItem::isAnimatingSomething() const {
             (_animationProperties.getFPS() != 0.0f);
         });
 }
-
-bool ModelEntityItem::getCanCastShadow() const {
-    bool result;
-    withReadLock([&] {
-        result = _canCastShadow;
-    });
-    return result;
-}
-
-void ModelEntityItem::setCanCastShadow(bool value) {
-    bool changed = false;
-    withWriteLock([&] {
-        if (_canCastShadow != value) {
-            changed = true;
-            _canCastShadow = value;
-        }
-    });
-
-    if (changed) {
-        emit requestRenderUpdate();
-    }
-}
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 791eebb7d9..c2109ba51f 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -131,9 +131,6 @@ public:
     QVector<glm::vec3> getJointTranslations() const;
     QVector<bool> getJointTranslationsSet() const;
 
-    bool getCanCastShadow() const;
-    void setCanCastShadow(bool value);
-
 private:
     void setAnimationSettings(const QString& value); // only called for old bitstream format
     ShapeType computeTrueShapeType() const;
@@ -174,8 +171,6 @@ protected:
 
     ShapeType _shapeType = SHAPE_TYPE_NONE;
 
-    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
-
 private:
     uint64_t _lastAnimated{ 0 };
     AnimationPropertyGroup _previousAnimationProperties;
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 84f6c6aca3..178f5782dd 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -411,7 +411,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
     _worldBound.transform(boundTransform);
 }
 
-void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
+void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 

From 936629ec1a41247b8ab47548b65921bd9ec7b081 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 14:05:40 -0800
Subject: [PATCH 333/569] Update DomainContentBackupManager to use emplace_back
 where available

---
 domain-server/src/DomainContentBackupManager.cpp | 6 +++---
 domain-server/src/DomainContentBackupManager.h   | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index db924c4e4f..618af15e60 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -333,8 +333,8 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
                 availabilityProgress += progress / _backupHandlers.size();
             }
 
-            backups.push_back(
-                { fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt, type == MANUAL_BACKUP_PREFIX });
+            backups.emplace_back(fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt,
+                                 type == MANUAL_BACKUP_PREFIX);
         }
     }
 
@@ -343,7 +343,7 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
 
 void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise promise) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "getAllBackupInformation", Q_ARG(MiniPromise::Promise, promise));
+        QMetaObject::invokeMethod(this, "getAllBackupsAndStatus", Q_ARG(MiniPromise::Promise, promise));
         return;
     }
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 2cfda4b650..43e4cb16da 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -25,6 +25,13 @@
 #include <shared/MiniPromises.h>
 
 struct BackupItemInfo {
+    BackupItemInfo(QString pId, QString pName, QString pAbsolutePath, QDateTime pCreatedAt, bool pIsManualBackup)
+        : id(pId)
+        , name(pName)
+        , absolutePath(pAbsolutePath)
+        , createdAt(pCreatedAt)
+        , isManualBackup(pIsManualBackup){};
+
     QString id;
     QString name;
     QString absolutePath;

From 41d7d7efbbf4ec675f04a85e5a5f9f8e083f98a2 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 14:33:19 -0800
Subject: [PATCH 334/569] Fix initializer list style

---
 domain-server/src/DomainContentBackupManager.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 43e4cb16da..f1aa4acab2 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -25,12 +25,8 @@
 #include <shared/MiniPromises.h>
 
 struct BackupItemInfo {
-    BackupItemInfo(QString pId, QString pName, QString pAbsolutePath, QDateTime pCreatedAt, bool pIsManualBackup)
-        : id(pId)
-        , name(pName)
-        , absolutePath(pAbsolutePath)
-        , createdAt(pCreatedAt)
-        , isManualBackup(pIsManualBackup){};
+    BackupItemInfo(QString pId, QString pName, QString pAbsolutePath, QDateTime pCreatedAt, bool pIsManualBackup) :
+        id(pId), name(pName), absolutePath(pAbsolutePath), createdAt(pCreatedAt), isManualBackup(pIsManualBackup) { };
 
     QString id;
     QString name;

From a2072062f18841f47d2ba31927d9cdaf96c23050 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 14:33:33 -0800
Subject: [PATCH 335/569] Fix recovery filename not being reset when recovery
 complete

---
 domain-server/src/DomainContentBackupManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 618af15e60..dc749ad182 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -160,6 +160,7 @@ bool DomainContentBackupManager::process() {
 
                 if (!isStillRecovering) {
                     _isRecovering = false;
+                    _recoveryFilename = "";
                     emit recoveryCompleted();
                 }
             }

From f4cde44e6af1a4863d771ef6fc4ade79e4c04c32 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 16 Feb 2018 15:25:29 -0800
Subject: [PATCH 336/569] Fix indentation of brace initialization

---
 domain-server/src/DomainContentBackupManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index dc749ad182..a711d2112d 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -438,14 +438,14 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
 void DomainContentBackupManager::load() {
     auto backups = getAllBackups();
     for (auto& backup : backups) {
-        QFile backupFile{ backup.absolutePath };
+        QFile backupFile { backup.absolutePath };
         if (!backupFile.open(QIODevice::ReadOnly)) {
             qCritical() << "Could not open file:" << backup.absolutePath;
             qCritical() << "    ERROR:" << backupFile.errorString();
             continue;
         }
 
-        QuaZip zip{ &backupFile };
+        QuaZip zip { &backupFile };
         if (!zip.open(QuaZip::mdUnzip)) {
             qCritical() << "Could not open backup archive:" << backup.absolutePath;
             qCritical() << "    ERROR:" << zip.getZipError();

From 29ceffd7cce43ba0c79e15a5ba2889df2b50671d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 12:05:23 -0800
Subject: [PATCH 337/569] add sections to content page for backup/restore

---
 .../resources/web/content/index.shtml         |   2 +
 .../web/content/js/bootstrap-sortable.min.js  |   1 +
 .../resources/web/content/js/content.js       | 193 +++++++++++++++---
 .../web/content/js/moment-locale.min.js       |   1 +
 .../resources/web/css/bootstrap-sortable.css  | 110 ++++++++++
 domain-server/resources/web/css/style.css     |  52 ++++-
 domain-server/resources/web/header.html       |   1 +
 .../resources/web/js/base-settings.js         |   8 +-
 .../resources/web/js/domain-server.js         |  58 ++++--
 domain-server/resources/web/js/shared.js      |   6 +-
 .../resources/web/settings/js/settings.js     |  18 +-
 11 files changed, 387 insertions(+), 63 deletions(-)
 create mode 100755 domain-server/resources/web/content/js/bootstrap-sortable.min.js
 create mode 100644 domain-server/resources/web/content/js/moment-locale.min.js
 create mode 100755 domain-server/resources/web/css/bootstrap-sortable.css

diff --git a/domain-server/resources/web/content/index.shtml b/domain-server/resources/web/content/index.shtml
index 9b507f7826..f934faa976 100644
--- a/domain-server/resources/web/content/index.shtml
+++ b/domain-server/resources/web/content/index.shtml
@@ -14,6 +14,8 @@
 
 <!--#include virtual="base-settings-scripts.html"-->
 
+<script src="js/moment-locale.min.js"></script>
+<script src="js/bootstrap-sortable.min.js"></script>
 <script src="js/content.js"></script>
 
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/content/js/bootstrap-sortable.min.js b/domain-server/resources/web/content/js/bootstrap-sortable.min.js
new file mode 100755
index 0000000000..ac21ebe969
--- /dev/null
+++ b/domain-server/resources/web/content/js/bootstrap-sortable.min.js
@@ -0,0 +1 @@
+!function(t,e){"use strict";"function"==typeof define&&define.amd?define("tinysort",function(){return e}):t.tinysort=e}(this,function(){"use strict";function t(t,e){for(var r,a=t.length,o=a;o--;)e(t[r=a-o-1],r)}function e(t,e,r){for(var o in e)(r||t[o]===a)&&(t[o]=e[o]);return t}function r(t,e,r){f.push({prepare:t,sort:e,sortBy:r})}var a,o,n=!1,s=null,i=window,d=i.document,l=parseFloat,c=/(-?\d+\.?\d*)\s*$/g,u=/(\d+\.?\d*)\s*$/g,f=[],h=0,p=0,v=String.fromCharCode(4095),m={selector:s,order:"asc",attr:s,data:s,useVal:n,place:"org",returns:n,cases:n,natural:n,forceStrings:n,ignoreDashes:n,sortFunction:s,useFlex:n,emptyEnd:n};return i.Element&&((o=Element.prototype).matchesSelector=o.matchesSelector||o.mozMatchesSelector||o.msMatchesSelector||o.oMatchesSelector||o.webkitMatchesSelector||function(t){for(var e=(this.parentNode||this.document).querySelectorAll(t),r=-1;e[++r]&&e[r]!=this;);return!!e[r]}),e(r,{loop:t}),e(function(r,o){function i(t){var r=!!t.selector,a=r&&":"===t.selector[0],o=e(t||{},m);k.push(e({hasSelector:r,hasAttr:!(o.attr===s||""===o.attr),hasData:o.data!==s,hasFilter:a,sortReturnNumber:"asc"===o.order?1:-1},o))}function g(t,e,r){for(var a=r(t.toString()),o=r(e.toString()),n=0;a[n]&&o[n];n++)if(a[n]!==o[n]){var s=Number(a[n]),i=Number(o[n]);return s==a[n]&&i==o[n]?s-i:a[n]>o[n]?1:-1}return a.length-o.length}function b(t){for(var e,r,a=[],o=0,n=-1,s=0;e=(r=t.charAt(o++)).charCodeAt(0);){var i=46==e||e>=48&&57>=e;i!==s&&(a[++n]="",s=i),a[n]+=r}return a}function w(){return q.forEach(function(t){E.appendChild(t.elm)}),E}function y(t){var e=t.elm,r=d.createElement("div");return t.ghost=r,e.parentNode.insertBefore(r,e),t}function S(t,e){var r=t.ghost,a=r.parentNode;a.insertBefore(e,r),a.removeChild(r),delete t.ghost}function x(t,e){var r,a=t.elm;return e.selector&&(e.hasFilter?a.matchesSelector(e.selector)||(a=s):a=a.querySelector(e.selector)),e.hasAttr?r=a.getAttribute(e.attr):e.useVal?r=a.value||a.getAttribute("value"):e.hasData?r=a.getAttribute("data-"+e.data):a&&(r=a.textContent),C(r)&&(e.cases||(r=r.toLowerCase()),r=r.replace(/\s+/g," ")),null===r&&(r=v),r}function C(t){return"string"==typeof t}C(r)&&(r=d.querySelectorAll(r)),0===r.length&&console.warn("No elements to sort");var F,N,E=d.createDocumentFragment(),A=[],q=[],M=[],k=[],D=!0,z=r.length&&r[0].parentNode,Y=z.rootNode!==document,H=r.length&&(o===a||!1!==o.useFlex)&&!Y&&-1!==getComputedStyle(z,null).display.indexOf("flex");return function(){0===arguments.length?i({}):t(arguments,function(t){i(C(t)?{selector:t}:t)}),h=k.length}.apply(s,Array.prototype.slice.call(arguments,1)),t(r,function(t,e){N?N!==t.parentNode&&(D=!1):N=t.parentNode;var r=k[0],a=r.hasFilter,o=r.selector,n=!o||a&&t.matchesSelector(o)||o&&t.querySelector(o)?q:M,s={elm:t,pos:e,posn:n.length};A.push(s),n.push(s)}),F=q.slice(0),q.sort(function(e,r){var o=0;for(0!==p&&(p=0);0===o&&h>p;){var s=k[p],i=s.ignoreDashes?u:c;if(t(f,function(t){var e=t.prepare;e&&e(s)}),s.sortFunction)o=s.sortFunction(e,r);else if("rand"==s.order)o=Math.random()<.5?1:-1;else{var d=n,v=x(e,s),m=x(r,s),w=""===v||v===a,y=""===m||m===a;if(v===m)o=0;else if(s.emptyEnd&&(w||y))o=w&&y?0:w?1:-1;else{if(!s.forceStrings){var S=C(v)?v&&v.match(i):n,F=C(m)?m&&m.match(i):n;S&&F&&v.substr(0,v.length-S[0].length)==m.substr(0,m.length-F[0].length)&&(d=!n,v=l(S[0]),m=l(F[0]))}o=v===a||m===a?0:s.natural&&(isNaN(v)||isNaN(m))?g(v,m,b):m>v?-1:v>m?1:0}}t(f,function(t){var e=t.sort;e&&(o=e(s,d,v,m,o))}),0==(o*=s.sortReturnNumber)&&p++}return 0===o&&(o=e.pos>r.pos?1:-1),o}),function(){var t=q.length===A.length;if(D&&t)H?q.forEach(function(t,e){t.elm.style.order=e}):N?N.appendChild(w()):console.warn("parentNode has been removed");else{var e=k[0].place,r="start"===e,a="end"===e,o="first"===e,n="last"===e;if("org"===e)q.forEach(y),q.forEach(function(t,e){S(F[e],t.elm)});else if(r||a){var s=F[r?0:F.length-1],i=s&&s.elm.parentNode,d=i&&(r&&i.firstChild||i.lastChild);d&&(d!==s.elm&&(s={elm:d}),y(s),a&&i.appendChild(s.ghost),S(s,w()))}else(o||n)&&S(y(F[o?0:F.length-1]),w())}}(),q.map(function(t){return t.elm})},{plugin:r,defaults:m})}()),function(t,e){"function"==typeof define&&define.amd?define(["jquery","tinysort","moment"],e):e(t.jQuery,t.tinysort,t.moment||void 0)}(this,function(t,e,r){var a,o,n,s=t(document);function i(e){var s=void 0!==r;a=e.sign?e.sign:"arrow","default"==e.customSort&&(e.customSort=u),o=e.customSort||o||u,n=e.emptyEnd,t("table.sortable").each(function(){var a=t(this),o=!0===e.applyLast;a.find("span.sign").remove(),a.find("> thead [colspan]").each(function(){for(var e=parseFloat(t(this).attr("colspan")),r=1;r<e;r++)t(this).after('<th class="colspan-compensate">')}),a.find("> thead [rowspan]").each(function(){for(var e=t(this),r=parseFloat(e.attr("rowspan")),a=1;a<r;a++){var o=e.parent("tr"),n=o.next("tr"),s=o.children().index(e);n.children().eq(s).before('<th class="rowspan-compensate">')}}),a.find("> thead tr").each(function(e){t(this).find("th").each(function(r){var a=t(this);a.addClass("nosort").removeClass("up down"),a.attr("data-sortcolumn",r),a.attr("data-sortkey",r+"-"+e)})}),a.find("> thead .rowspan-compensate, .colspan-compensate").remove(),a.find("th").each(function(){var e=t(this);if(void 0!==e.attr("data-dateformat")&&s){var o=parseFloat(e.attr("data-sortcolumn"));a.find("td:nth-child("+(o+1)+")").each(function(){var a=t(this);a.attr("data-value",r(a.text(),e.attr("data-dateformat")).format("YYYY/MM/DD/HH/mm/ss"))})}else if(void 0!==e.attr("data-valueprovider")){o=parseFloat(e.attr("data-sortcolumn"));a.find("td:nth-child("+(o+1)+")").each(function(){var r=t(this);r.attr("data-value",new RegExp(e.attr("data-valueprovider")).exec(r.text())[0])})}}),a.find("td").each(function(){var e=t(this);void 0!==e.attr("data-dateformat")&&s?e.attr("data-value",r(e.text(),e.attr("data-dateformat")).format("YYYY/MM/DD/HH/mm/ss")):void 0!==e.attr("data-valueprovider")?e.attr("data-value",new RegExp(e.attr("data-valueprovider")).exec(e.text())[0]):void 0===e.attr("data-value")&&e.attr("data-value",e.text())});var n=c(a),i=n.bsSort;a.find('> thead th[data-defaultsort!="disabled"]').each(function(e){var r=t(this),a=r.closest("table.sortable");r.data("sortTable",a);var s=r.attr("data-sortkey"),d=o?n.lastSort:-1;i[s]=o?i[s]:r.attr("data-defaultsort"),void 0!==i[s]&&o===(s===d)&&(i[s]="asc"===i[s]?"desc":"asc",f(r,a))})})}function d(e){e.find("> tbody [rowspan]").each(function(){var e=t(this),r=parseFloat(e.attr("rowspan"));e.removeAttr("rowspan");var a=e.attr("rowspan-group")||function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()}();e.attr("rowspan-group",a),e.attr("rowspan-value",r);for(var o=e.parent("tr"),n=o.children().index(e),s=1;s<r;s++){var i=e.clone(!1),d=o.next("tr");d.children().eq(n).before(i),o=d}})}function l(e){var r=t(e);f(r,r.data("sortTable")||r.closest("table.sortable"))}function c(e){var r=e.data("bootstrap-sortable-context");return void 0===r&&(r={bsSort:[],lastSort:void 0},e.find('> thead th[data-defaultsort!="disabled"]').each(function(e){var a=t(this),o=a.attr("data-sortkey");r.bsSort[o]=a.attr("data-defaultsort"),void 0!==r.bsSort[o]&&(r.lastSort=o)}),e.data("bootstrap-sortable-context",r)),r}function u(t,r){e(t,r)}function f(e,r){r.trigger("before-sort"),d(r);var s=parseFloat(e.attr("data-sortcolumn")),i=c(r),l=i.bsSort;if(e.attr("colspan")){var u=parseFloat(e.data("mainsort"))||0,h=parseFloat(e.data("sortkey").split("-").pop());if(r.find("> thead tr").length-1>h)return void f(r.find('[data-sortkey="'+(s+u)+"-"+(h+1)+'"]'),r);s+=u}var p=e.attr("data-defaultsign")||a;if(r.find("> thead th").each(function(){t(this).removeClass("up").removeClass("down").addClass("nosort")}),t.browser.mozilla){var v=r.find("> thead div.mozilla");void 0!==v&&(v.find(".sign").remove(),v.parent().html(v.html())),e.wrapInner('<div class="mozilla"></div>'),e.children().eq(0).append('<span class="sign '+p+'"></span>')}else r.find("> thead span.sign").remove(),e.append('<span class="sign '+p+'"></span>');var m=e.attr("data-sortkey"),g="desc"!==e.attr("data-firstsort")?"desc":"asc",b=l[m]||g;i.lastSort!==m&&void 0!==l[m]||(b="asc"===b?"desc":"asc"),l[m]=b,i.lastSort=m,"desc"===l[m]?(e.find("span.sign").addClass("up"),e.addClass("up").removeClass("down nosort")):e.addClass("down").removeClass("up nosort");var w=r.children("tbody").children("tr"),y=[];t(w.filter('[data-disablesort="true"]').get().reverse()).each(function(e,r){var a=t(r);y.push({index:w.index(a),row:a}),a.remove()});var S=w.not('[data-disablesort="true"]');if(0!=S.length){var x="asc"===l[m]&&n;o(S,{emptyEnd:x,selector:"td:nth-child("+(s+1)+")",order:l[m],data:"value"})}t(y.reverse()).each(function(t,e){0===e.index?r.children("tbody").prepend(e.row):r.children("tbody").children("tr").eq(e.index-1).after(e.row)}),r.find("> tbody > tr > td.sorted,> thead th.sorted").removeClass("sorted"),S.find("td:eq("+s+")").addClass("sorted"),e.addClass("sorted"),r.find("> tbody [rowspan-group]").each(function(){for(var e=t(this),r=e.attr("rowspan-group"),a=e.parent("tr"),o=a.children().index(e);;){var n=a.next("tr");if(!n.is("tr"))break;var s=n.children().eq(o);if(s.attr("rowspan-group")!==r)break;var i=parseFloat(e.attr("rowspan"))||1;e.attr("rowspan",i+1),s.remove(),a=n}}),r.trigger("sorted")}if(t.bootstrapSortable=function(t){null==t?i({}):t.constructor===Boolean?i({applyLast:t}):void 0!==t.sortingHeader?l(t.sortingHeader):i(t)},s.on("click",'table.sortable>thead th[data-defaultsort!="disabled"]',function(t){l(this)}),!t.browser){t.browser={chrome:!1,mozilla:!1,opera:!1,msie:!1,safari:!1};var h=navigator.userAgent;t.each(t.browser,function(e){t.browser[e]=!!new RegExp(e,"i").test(h),t.browser.mozilla&&"mozilla"===e&&(t.browser.mozilla=!!new RegExp("firefox","i").test(h)),t.browser.chrome&&"safari"===e&&(t.browser.safari=!1)})}t(t.bootstrapSortable)});
\ No newline at end of file
diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index e448952c65..e2b653995f 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -1,37 +1,174 @@
 $(document).ready(function(){
 
-  Settings.afterReloadActions = function() {};
+  var RESTORE_SETTINGS_UPLOAD_ID = 'restore-settings-button';
+  var RESTORE_SETTINGS_FILE_ID = 'restore-settings-file';
 
-  var frm = $('#upload-form');
-  frm.submit(function (ev) {
-    $.ajax({
-      type: frm.attr('method'),
-      url: frm.attr('action'),
-      data: new FormData($(this)[0]),
-      cache: false,
-      contentType: false,
-      processData: false,
-      success: function (data) {
-        swal({
-          title: 'Uploaded',
-          type: 'success',
-          text: 'Your Entity Server is restarting to replace its local content with the uploaded file.',
-          confirmButtonText: 'OK'
-        })
-      },
-      error: function (data) {
-        swal({
-          title: '',
-          type: 'error',
-          text: 'Your entities file could not be transferred to the Entity Server.</br>Verify that the file is a <i>.json</i> or <i>.json.gz</i> entities file and try again.',
-          html: true,
-          confirmButtonText: 'OK',
-        });
+  function setupBackupUpload() {
+    // construct the HTML needed for the settings backup panel
+    var html = "<div class='form-group'>";
+
+    html += "<span class='help-block'>Upload a Content Backup to replace the content of this domain";
+    html += "<br/>Note: Your domain's content will be replaced by the content you upload, but the existing backup files of your domain's content will not immediately be changed.</span>";
+
+    html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
+    html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Domain Settings</button>";
+
+    html += "</div>";
+
+    $('#' + Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID + ' .panel-body').html(html);
+  }
+
+  var GENERATE_ARCHIVE_BUTTON_ID = 'generate-archive-button';
+  var AUTOMATIC_ARCHIVES_TABLE_ID = 'automatic-archives-table';
+  var AUTOMATIC_ARCHIVES_TBODY_ID = 'automatic-archives-tbody';
+  var MANUAL_ARCHIVES_TABLE_ID = 'manual-archives-table';
+  var MANUAL_ARCHIVES_TBODY_ID = 'manual-archives-tbody';
+  var automaticBackups = [];
+  var manualBackups = [];
+
+  function setupContentArchives() {
+
+    // construct the HTML needed for the content archives panel
+    var html = "<div class='form-group'>";
+    html += "<label class='control-label'>Automatic Content Archives</label>";
+    html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your domain content and settings backups.</span>"
+    html += "</div>";
+    html += "<table class='table sortable' id='" + AUTOMATIC_ARCHIVES_TABLE_ID + "'>";
+
+    var backups_table_head = "<thead><tr class='gray-tr'><th>Archive Name</th><th data-defaultsort='desc'>Archive Date</th><th class='text-right' data-defaultsort='disabled'>Actions</th></tr></thead>";
+
+    html += backups_table_head;
+    html += "<tbody id='" + AUTOMATIC_ARCHIVES_TBODY_ID + "'></tbody></table>";
+    html += "<div class='form-group'>";
+    html += "<label class='control-label'>Manual Content Archives</label>";
+    html += "<span class='help-block'>You can generate and download an archive of your domain content right now. You can also download, delete and restore any archive listed.</span>";
+    html += "<button type='button' id='" + GENERATE_ARCHIVE_BUTTON_ID + "' class='btn btn-primary'>Generate New Archive</button>";
+    html += "</div>";
+    html += "<table class='table sortable' id='" + MANUAL_ARCHIVES_TABLE_ID + "'>";
+    html += backups_table_head;
+    html += "<tbody id='" + MANUAL_ARCHIVES_TBODY_ID + "'></tbody></table>";
+
+    // put the base HTML in the content archives panel
+    $('#' + Settings.CONTENT_ARCHIVES_PANEL_ID + ' .panel-body').html(html);
+  }
+
+  function reloadLatestBackups() {
+    // make a GET request to get backup information to populate the table
+    $.get('/api/backups', function(data) {
+      // split the returned data into manual and automatic manual backups
+      var splitBackups = _.partition(data.backups, function(value, index) {
+        return value.isManualBackup;
+      });
+
+      manualBackups = splitBackups[0];
+      automaticBackups = splitBackups[1];
+
+      // populate the backups tables with the backups
+      function createBackupTableRow(backup) {
+        return "<tr><td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-dateformat='lll'>"
+          + moment(backup.createdAtMillis).format('lll')
+          + "</td><td class='text-right'>"
+          + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
+          + "<ul class='dropdown-menu dropdown-menu-right'><li><a class='update-server' href='#'>Restore from here</a></li><li class='divider'></li><li><a class='restart-server' href='#'>Download</a></li><li class='divider'></li><li><a class='' href='#'>Delete</a></li></ul></div>"
+          + "</td>";
       }
+
+      var automaticRows = "";
+
+      if (automaticBackups.length > 0) {
+        for (var backupIndex in automaticBackups) {
+          // create a table row for this backup and add it to the rows we'll put in the table body
+          automaticRows += createBackupTableRow(automaticBackups[backupIndex]);
+        }
+      }
+
+      $('#' + AUTOMATIC_ARCHIVES_TBODY_ID).html(automaticRows);
+
+      var manualRows = "";
+
+      if (manualBackups.length > 0) {
+        for (var backupIndex in manualBackups) {
+          // create a table row for this backup and add it to the rows we'll put in the table body
+          manualRows += createBackupTableRow(manualBackups[backupIndex]);
+        }
+      }
+
+      $('#' + MANUAL_ARCHIVES_TBODY_ID).html(manualRows);
+
+      // tell bootstrap sortable to update for the new rows
+      $.bootstrapSortable({ applyLast: true });
+
+    }).fail(function(){
+      // we've hit the very rare case where we couldn't load the list of backups from the domain server
+
+      // set our backups to empty
+      automaticBackups = [];
+      manualBackups = [];
+
+      // replace the content archives panel with a simple error message
+      // stating that the user should reload the page
+      $('#' + Settings.CONTENT_ARCHIVES_PANEL_ID + ' .panel-body').html(
+        "<div class='form-group'>" +
+        "<span class='help-block'>There was a problem loading your list of automatic and manual content archives. Please reload the page to try again.</span>" +
+        "</div>"
+      );
+
+    }).always(function(){
+      // toggle showing or hiding the tables depending on if they have entries
+      $('#' + AUTOMATIC_ARCHIVES_TABLE_ID).toggle(automaticBackups.length > 0);
+      $('#' + MANUAL_ARCHIVES_TABLE_ID).toggle(manualBackups.length > 0);
     });
+  }
 
-    ev.preventDefault();
+  // handle click on manual archive creation button
+  $('body').on('click', '#' + GENERATE_ARCHIVE_BUTTON_ID, function(e) {
+    e.preventDefault();
 
-    showSpinnerAlert("Uploading Entities File");
+    // show a sweet alert to ask the user to provide a name for their content archive
+    swal({
+      title: "Generate a Content Archive",
+      type: "input",
+      text: "This will capture the state of all the content in your domain right now, which you can save as a backup and restore from later.",
+      confirmButtonText: "Generate Archive",
+      showCancelButton: true,
+      closeOnConfirm: false,
+      inputPlaceholder: 'Archive Name'
+    }, function(inputValue){
+      if (inputValue === false) {
+        return false;
+      }
+
+      if (inputValue === "") {
+        swal.showInputError("Please give the content archive a name.")
+        return false;
+      }
+
+      // post the provided archive name to ask the server to kick off a manual backup
+      $.ajax({
+        type: 'POST',
+        url: '/api/backup',
+        data: {
+          'name': inputValue
+        }
+      }).done(function(data) {
+        // since we successfully setup a new content archive, reload the table of archives
+        // which should show that this archive is pending creation
+        reloadContentArchives();
+      }).fail(function(jqXHR, textStatus, errorThrown) {
+
+      });
+
+      swal.close();
+    });
   });
+
+  Settings.extraGroupsAtIndex = Settings.extraContentGroupsAtIndex;
+
+  Settings.afterReloadActions = function() {
+    setupBackupUpload();
+    setupContentArchives();
+
+    // load the latest backups immediately
+    reloadLatestBackups();
+  };
 });
diff --git a/domain-server/resources/web/content/js/moment-locale.min.js b/domain-server/resources/web/content/js/moment-locale.min.js
new file mode 100644
index 0000000000..fabea0c841
--- /dev/null
+++ b/domain-server/resources/web/content/js/moment-locale.min.js
@@ -0,0 +1 @@
+!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a():"function"==typeof define&&define.amd?define(a):e.moment=a()}(this,function(){"use strict";function e(){return Ea.apply(null,arguments)}function a(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function t(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function s(e){return void 0===e}function n(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function d(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function r(e,a){var t,s=[];for(t=0;t<e.length;++t)s.push(a(e[t],t));return s}function _(e,a){return Object.prototype.hasOwnProperty.call(e,a)}function i(e,a){for(var t in a)_(a,t)&&(e[t]=a[t]);return _(a,"toString")&&(e.toString=a.toString),_(a,"valueOf")&&(e.valueOf=a.valueOf),e}function o(e,a,t,s){return Ye(e,a,t,s,!0).utc()}function m(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function u(e){if(null==e._isValid){var a=m(e),t=Aa.call(a.parsedDateParts,function(e){return null!=e}),s=!isNaN(e._d.getTime())&&a.overflow<0&&!a.empty&&!a.invalidMonth&&!a.invalidWeekday&&!a.weekdayMismatch&&!a.nullInput&&!a.invalidFormat&&!a.userInvalidated&&(!a.meridiem||a.meridiem&&t);if(e._strict&&(s=s&&0===a.charsLeftOver&&0===a.unusedTokens.length&&void 0===a.bigHour),null!=Object.isFrozen&&Object.isFrozen(e))return s;e._isValid=s}return e._isValid}function l(e){var a=o(NaN);return null!=e?i(m(a),e):m(a).userInvalidated=!0,a}function M(e,a){var t,n,d;if(s(a._isAMomentObject)||(e._isAMomentObject=a._isAMomentObject),s(a._i)||(e._i=a._i),s(a._f)||(e._f=a._f),s(a._l)||(e._l=a._l),s(a._strict)||(e._strict=a._strict),s(a._tzm)||(e._tzm=a._tzm),s(a._isUTC)||(e._isUTC=a._isUTC),s(a._offset)||(e._offset=a._offset),s(a._pf)||(e._pf=m(a)),s(a._locale)||(e._locale=a._locale),Fa.length>0)for(t=0;t<Fa.length;t++)s(d=a[n=Fa[t]])||(e[n]=d);return e}function h(a){M(this,a),this._d=new Date(null!=a._d?a._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===za&&(za=!0,e.updateOffset(this),za=!1)}function L(e){return e instanceof h||null!=e&&null!=e._isAMomentObject}function c(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function Y(e){var a=+e,t=0;return 0!==a&&isFinite(a)&&(t=c(a)),t}function y(e,a,t){var s,n=Math.min(e.length,a.length),d=Math.abs(e.length-a.length),r=0;for(s=0;s<n;s++)(t&&e[s]!==a[s]||!t&&Y(e[s])!==Y(a[s]))&&r++;return r+d}function f(a){!1===e.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function k(a,t){var s=!0;return i(function(){if(null!=e.deprecationHandler&&e.deprecationHandler(null,a),s){for(var n,d=[],r=0;r<arguments.length;r++){if(n="","object"==typeof arguments[r]){n+="\n["+r+"] ";for(var _ in arguments[0])n+=_+": "+arguments[0][_]+", ";n=n.slice(0,-2)}else n=arguments[r];d.push(n)}f(a+"\nArguments: "+Array.prototype.slice.call(d).join("")+"\n"+(new Error).stack),s=!1}return t.apply(this,arguments)},t)}function p(a,t){null!=e.deprecationHandler&&e.deprecationHandler(a,t),Ja[a]||(f(t),Ja[a]=!0)}function D(e){return e instanceof Function||"[object Function]"===Object.prototype.toString.call(e)}function T(e,a){var s,n=i({},e);for(s in a)_(a,s)&&(t(e[s])&&t(a[s])?(n[s]={},i(n[s],e[s]),i(n[s],a[s])):null!=a[s]?n[s]=a[s]:delete n[s]);for(s in e)_(e,s)&&!_(a,s)&&t(e[s])&&(n[s]=i({},n[s]));return n}function g(e){null!=e&&this.set(e)}function w(e,a){var t=e.toLowerCase();Ra[t]=Ra[t+"s"]=Ra[a]=e}function v(e){return"string"==typeof e?Ra[e]||Ra[e.toLowerCase()]:void 0}function S(e){var a,t,s={};for(t in e)_(e,t)&&(a=v(t))&&(s[a]=e[t]);return s}function H(e,a){Ia[e]=a}function b(e,a,t){var s=""+Math.abs(e),n=a-s.length;return(e>=0?t?"+":"":"-")+Math.pow(10,Math.max(0,n)).toString().substr(1)+s}function j(e,a,t,s){var n=s;"string"==typeof s&&(n=function(){return this[s]()}),e&&(Va[e]=n),a&&(Va[a[0]]=function(){return b(n.apply(this,arguments),a[1],a[2])}),t&&(Va[t]=function(){return this.localeData().ordinal(n.apply(this,arguments),e)})}function x(e){return e.match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function P(e,a){return e.isValid()?(a=O(a,e.localeData()),Ua[a]=Ua[a]||function(e){var a,t,s=e.match(Ca);for(a=0,t=s.length;a<t;a++)Va[s[a]]?s[a]=Va[s[a]]:s[a]=x(s[a]);return function(a){var n,d="";for(n=0;n<t;n++)d+=D(s[n])?s[n].call(a,e):s[n];return d}}(a),Ua[a](e)):e.localeData().invalidDate()}function O(e,a){function t(e){return a.longDateFormat(e)||e}var s=5;for(Ga.lastIndex=0;s>=0&&Ga.test(e);)e=e.replace(Ga,t),Ga.lastIndex=0,s-=1;return e}function W(e,a,t){ot[e]=D(a)?a:function(e,s){return e&&t?t:a}}function E(e,a){return _(ot,e)?ot[e](a._strict,a._locale):new RegExp(function(e){return A(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,a,t,s,n){return a||t||s||n}))}(e))}function A(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function F(e,a){var t,s=a;for("string"==typeof e&&(e=[e]),n(a)&&(s=function(e,t){t[a]=Y(e)}),t=0;t<e.length;t++)mt[e[t]]=s}function z(e,a){F(e,function(e,t,s,n){s._w=s._w||{},a(e,s._w,s,n)})}function J(e,a,t){null!=a&&_(mt,e)&&mt[e](a,t._a,t,e)}function N(e){return R(e)?366:365}function R(e){return e%4==0&&e%100!=0||e%400==0}function I(a,t){return function(s){return null!=s?(G(this,a,s),e.updateOffset(this,t),this):C(this,a)}}function C(e,a){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+a]():NaN}function G(e,a,t){e.isValid()&&!isNaN(t)&&("FullYear"===a&&R(e.year())&&1===e.month()&&29===e.date()?e._d["set"+(e._isUTC?"UTC":"")+a](t,e.month(),U(t,e.month())):e._d["set"+(e._isUTC?"UTC":"")+a](t))}function U(e,a){if(isNaN(e)||isNaN(a))return NaN;var t=function(e,a){return(e%a+a)%a}(a,12);return e+=(a-t)/12,1===t?R(e)?29:28:31-t%7%2}function V(e,a){var t;if(!e.isValid())return e;if("string"==typeof a)if(/^\d+$/.test(a))a=Y(a);else if(a=e.localeData().monthsParse(a),!n(a))return e;return t=Math.min(e.date(),U(e.year(),a)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](a,t),e}function K(a){return null!=a?(V(this,a),e.updateOffset(this,!0),this):C(this,"Month")}function Z(){function e(e,a){return a.length-e.length}var a,t,s=[],n=[],d=[];for(a=0;a<12;a++)t=o([2e3,a]),s.push(this.monthsShort(t,"")),n.push(this.months(t,"")),d.push(this.months(t,"")),d.push(this.monthsShort(t,""));for(s.sort(e),n.sort(e),d.sort(e),a=0;a<12;a++)s[a]=A(s[a]),n[a]=A(n[a]);for(a=0;a<24;a++)d[a]=A(d[a]);this._monthsRegex=new RegExp("^("+d.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+n.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+s.join("|")+")","i")}function $(e){var a=new Date(Date.UTC.apply(null,arguments));return e<100&&e>=0&&isFinite(a.getUTCFullYear())&&a.setUTCFullYear(e),a}function B(e,a,t){var s=7+a-t;return-((7+$(e,0,s).getUTCDay()-a)%7)+s-1}function q(e,a,t,s,n){var d,r,_=1+7*(a-1)+(7+t-s)%7+B(e,s,n);return _<=0?r=N(d=e-1)+_:_>N(e)?(d=e+1,r=_-N(e)):(d=e,r=_),{year:d,dayOfYear:r}}function Q(e,a,t){var s,n,d=B(e.year(),a,t),r=Math.floor((e.dayOfYear()-d-1)/7)+1;return r<1?s=r+X(n=e.year()-1,a,t):r>X(e.year(),a,t)?(s=r-X(e.year(),a,t),n=e.year()+1):(n=e.year(),s=r),{week:s,year:n}}function X(e,a,t){var s=B(e,a,t),n=B(e+1,a,t);return(N(e)-s+n)/7}function ee(){function e(e,a){return a.length-e.length}var a,t,s,n,d,r=[],_=[],i=[],m=[];for(a=0;a<7;a++)t=o([2e3,1]).day(a),s=this.weekdaysMin(t,""),n=this.weekdaysShort(t,""),d=this.weekdays(t,""),r.push(s),_.push(n),i.push(d),m.push(s),m.push(n),m.push(d);for(r.sort(e),_.sort(e),i.sort(e),m.sort(e),a=0;a<7;a++)_[a]=A(_[a]),i[a]=A(i[a]),m[a]=A(m[a]);this._weekdaysRegex=new RegExp("^("+m.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+i.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+_.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+r.join("|")+")","i")}function ae(){return this.hours()%12||12}function te(e,a){j(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),a)})}function se(e,a){return a._meridiemParse}function ne(e){return e?e.toLowerCase().replace("_","-"):e}function de(e){var a=null;if(!At[e]&&"undefined"!=typeof module&&module&&module.exports)try{a=Ot._abbr;require("./locale/"+e),re(a)}catch(e){}return At[e]}function re(e,a){var t;return e&&(t=s(a)?ie(e):_e(e,a))&&(Ot=t),Ot._abbr}function _e(e,a){if(null!==a){var t=Et;if(a.abbr=e,null!=At[e])p("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),t=At[e]._config;else if(null!=a.parentLocale){if(null==At[a.parentLocale])return Ft[a.parentLocale]||(Ft[a.parentLocale]=[]),Ft[a.parentLocale].push({name:e,config:a}),null;t=At[a.parentLocale]._config}return At[e]=new g(T(t,a)),Ft[e]&&Ft[e].forEach(function(e){_e(e.name,e.config)}),re(e),At[e]}return delete At[e],null}function ie(e){var t;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return Ot;if(!a(e)){if(t=de(e))return t;e=[e]}return function(e){for(var a,t,s,n,d=0;d<e.length;){for(a=(n=ne(e[d]).split("-")).length,t=(t=ne(e[d+1]))?t.split("-"):null;a>0;){if(s=de(n.slice(0,a).join("-")))return s;if(t&&t.length>=a&&y(n,t,!0)>=a-1)break;a--}d++}return null}(e)}function oe(e){var a,t=e._a;return t&&-2===m(e).overflow&&(a=t[lt]<0||t[lt]>11?lt:t[Mt]<1||t[Mt]>U(t[ut],t[lt])?Mt:t[ht]<0||t[ht]>24||24===t[ht]&&(0!==t[Lt]||0!==t[ct]||0!==t[Yt])?ht:t[Lt]<0||t[Lt]>59?Lt:t[ct]<0||t[ct]>59?ct:t[Yt]<0||t[Yt]>999?Yt:-1,m(e)._overflowDayOfYear&&(a<ut||a>Mt)&&(a=Mt),m(e)._overflowWeeks&&-1===a&&(a=yt),m(e)._overflowWeekday&&-1===a&&(a=ft),m(e).overflow=a),e}function me(e,a,t){return null!=e?e:null!=a?a:t}function ue(a){var t,s,n,d,r,_=[];if(!a._d){for(n=function(a){var t=new Date(e.now());return a._useUTC?[t.getUTCFullYear(),t.getUTCMonth(),t.getUTCDate()]:[t.getFullYear(),t.getMonth(),t.getDate()]}(a),a._w&&null==a._a[Mt]&&null==a._a[lt]&&function(e){var a,t,s,n,d,r,_,i;if(null!=(a=e._w).GG||null!=a.W||null!=a.E)d=1,r=4,t=me(a.GG,e._a[ut],Q(ye(),1,4).year),s=me(a.W,1),((n=me(a.E,1))<1||n>7)&&(i=!0);else{d=e._locale._week.dow,r=e._locale._week.doy;var o=Q(ye(),d,r);t=me(a.gg,e._a[ut],o.year),s=me(a.w,o.week),null!=a.d?((n=a.d)<0||n>6)&&(i=!0):null!=a.e?(n=a.e+d,(a.e<0||a.e>6)&&(i=!0)):n=d}s<1||s>X(t,d,r)?m(e)._overflowWeeks=!0:null!=i?m(e)._overflowWeekday=!0:(_=q(t,s,n,d,r),e._a[ut]=_.year,e._dayOfYear=_.dayOfYear)}(a),null!=a._dayOfYear&&(r=me(a._a[ut],n[ut]),(a._dayOfYear>N(r)||0===a._dayOfYear)&&(m(a)._overflowDayOfYear=!0),s=$(r,0,a._dayOfYear),a._a[lt]=s.getUTCMonth(),a._a[Mt]=s.getUTCDate()),t=0;t<3&&null==a._a[t];++t)a._a[t]=_[t]=n[t];for(;t<7;t++)a._a[t]=_[t]=null==a._a[t]?2===t?1:0:a._a[t];24===a._a[ht]&&0===a._a[Lt]&&0===a._a[ct]&&0===a._a[Yt]&&(a._nextDay=!0,a._a[ht]=0),a._d=(a._useUTC?$:function(e,a,t,s,n,d,r){var _=new Date(e,a,t,s,n,d,r);return e<100&&e>=0&&isFinite(_.getFullYear())&&_.setFullYear(e),_}).apply(null,_),d=a._useUTC?a._d.getUTCDay():a._d.getDay(),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[ht]=24),a._w&&void 0!==a._w.d&&a._w.d!==d&&(m(a).weekdayMismatch=!0)}}function le(e){var a,t,s,n,d,r,_=e._i,i=zt.exec(_)||Jt.exec(_);if(i){for(m(e).iso=!0,a=0,t=Rt.length;a<t;a++)if(Rt[a][1].exec(i[1])){n=Rt[a][0],s=!1!==Rt[a][2];break}if(null==n)return void(e._isValid=!1);if(i[3]){for(a=0,t=It.length;a<t;a++)if(It[a][1].exec(i[3])){d=(i[2]||" ")+It[a][0];break}if(null==d)return void(e._isValid=!1)}if(!s&&null!=d)return void(e._isValid=!1);if(i[4]){if(!Nt.exec(i[4]))return void(e._isValid=!1);r="Z"}e._f=n+(d||"")+(r||""),Le(e)}else e._isValid=!1}function Me(e,a,t,s,n,d){var r=[function(e){var a=parseInt(e,10);{if(a<=49)return 2e3+a;if(a<=999)return 1900+a}return a}(e),gt.indexOf(a),parseInt(t,10),parseInt(s,10),parseInt(n,10)];return d&&r.push(parseInt(d,10)),r}function he(e){var a=Gt.exec(function(e){return e.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").trim()}(e._i));if(a){var t=Me(a[4],a[3],a[2],a[5],a[6],a[7]);if(!function(e,a,t){if(e&&Ht.indexOf(e)!==new Date(a[0],a[1],a[2]).getDay())return m(t).weekdayMismatch=!0,t._isValid=!1,!1;return!0}(a[1],t,e))return;e._a=t,e._tzm=function(e,a,t){if(e)return Ut[e];if(a)return 0;var s=parseInt(t,10),n=s%100;return(s-n)/100*60+n}(a[8],a[9],a[10]),e._d=$.apply(null,e._a),e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),m(e).rfc2822=!0}else e._isValid=!1}function Le(a){if(a._f!==e.ISO_8601)if(a._f!==e.RFC_2822){a._a=[],m(a).empty=!0;var t,s,n,d,r,_=""+a._i,i=_.length,o=0;for(n=O(a._f,a._locale).match(Ca)||[],t=0;t<n.length;t++)d=n[t],(s=(_.match(E(d,a))||[])[0])&&((r=_.substr(0,_.indexOf(s))).length>0&&m(a).unusedInput.push(r),_=_.slice(_.indexOf(s)+s.length),o+=s.length),Va[d]?(s?m(a).empty=!1:m(a).unusedTokens.push(d),J(d,s,a)):a._strict&&!s&&m(a).unusedTokens.push(d);m(a).charsLeftOver=i-o,_.length>0&&m(a).unusedInput.push(_),a._a[ht]<=12&&!0===m(a).bigHour&&a._a[ht]>0&&(m(a).bigHour=void 0),m(a).parsedDateParts=a._a.slice(0),m(a).meridiem=a._meridiem,a._a[ht]=function(e,a,t){var s;if(null==t)return a;return null!=e.meridiemHour?e.meridiemHour(a,t):null!=e.isPM?((s=e.isPM(t))&&a<12&&(a+=12),s||12!==a||(a=0),a):a}(a._locale,a._a[ht],a._meridiem),ue(a),oe(a)}else he(a);else le(a)}function ce(_){var o=_._i,c=_._f;return _._locale=_._locale||ie(_._l),null===o||void 0===c&&""===o?l({nullInput:!0}):("string"==typeof o&&(_._i=o=_._locale.preparse(o)),L(o)?new h(oe(o)):(d(o)?_._d=o:a(c)?function(e){var a,t,s,n,d;if(0===e._f.length)return m(e).invalidFormat=!0,void(e._d=new Date(NaN));for(n=0;n<e._f.length;n++)d=0,a=M({},e),null!=e._useUTC&&(a._useUTC=e._useUTC),a._f=e._f[n],Le(a),u(a)&&(d+=m(a).charsLeftOver,d+=10*m(a).unusedTokens.length,m(a).score=d,(null==s||d<s)&&(s=d,t=a));i(e,t||a)}(_):c?Le(_):function(_){var i=_._i;s(i)?_._d=new Date(e.now()):d(i)?_._d=new Date(i.valueOf()):"string"==typeof i?function(a){var t=Ct.exec(a._i);null===t?(le(a),!1===a._isValid&&(delete a._isValid,he(a),!1===a._isValid&&(delete a._isValid,e.createFromInputFallback(a)))):a._d=new Date(+t[1])}(_):a(i)?(_._a=r(i.slice(0),function(e){return parseInt(e,10)}),ue(_)):t(i)?function(e){if(!e._d){var a=S(e._i);e._a=r([a.year,a.month,a.day||a.date,a.hour,a.minute,a.second,a.millisecond],function(e){return e&&parseInt(e,10)}),ue(e)}}(_):n(i)?_._d=new Date(i):e.createFromInputFallback(_)}(_),u(_)||(_._d=null),_))}function Ye(e,s,n,d,r){var _={};return!0!==n&&!1!==n||(d=n,n=void 0),(t(e)&&function(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;var a;for(a in e)if(e.hasOwnProperty(a))return!1;return!0}(e)||a(e)&&0===e.length)&&(e=void 0),_._isAMomentObject=!0,_._useUTC=_._isUTC=r,_._l=n,_._i=e,_._f=s,_._strict=d,function(e){var a=new h(oe(ce(e)));return a._nextDay&&(a.add(1,"d"),a._nextDay=void 0),a}(_)}function ye(e,a,t,s){return Ye(e,a,t,s,!1)}function fe(e,t){var s,n;if(1===t.length&&a(t[0])&&(t=t[0]),!t.length)return ye();for(s=t[0],n=1;n<t.length;++n)t[n].isValid()&&!t[n][e](s)||(s=t[n]);return s}function ke(e){var a=S(e),t=a.year||0,s=a.quarter||0,n=a.month||0,d=a.week||0,r=a.day||0,_=a.hour||0,i=a.minute||0,o=a.second||0,m=a.millisecond||0;this._isValid=function(e){for(var a in e)if(-1===kt.call(Zt,a)||null!=e[a]&&isNaN(e[a]))return!1;for(var t=!1,s=0;s<Zt.length;++s)if(e[Zt[s]]){if(t)return!1;parseFloat(e[Zt[s]])!==Y(e[Zt[s]])&&(t=!0)}return!0}(a),this._milliseconds=+m+1e3*o+6e4*i+1e3*_*60*60,this._days=+r+7*d,this._months=+n+3*s+12*t,this._data={},this._locale=ie(),this._bubble()}function pe(e){return e instanceof ke}function De(e){return e<0?-1*Math.round(-1*e):Math.round(e)}function Te(e,a){j(e,0,0,function(){var e=this.utcOffset(),t="+";return e<0&&(e=-e,t="-"),t+b(~~(e/60),2)+a+b(~~e%60,2)})}function ge(e,a){var t=(a||"").match(e);if(null===t)return null;var s=((t[t.length-1]||[])+"").match($t)||["-",0,0],n=60*s[1]+Y(s[2]);return 0===n?0:"+"===s[0]?n:-n}function we(a,t){var s,n;return t._isUTC?(s=t.clone(),n=(L(a)||d(a)?a.valueOf():ye(a).valueOf())-s.valueOf(),s._d.setTime(s._d.valueOf()+n),e.updateOffset(s,!1),s):ye(a).local()}function ve(e){return 15*-Math.round(e._d.getTimezoneOffset()/15)}function Se(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}function He(e,a){var t,s,d,r=e,i=null;return pe(e)?r={ms:e._milliseconds,d:e._days,M:e._months}:n(e)?(r={},a?r[a]=e:r.milliseconds=e):(i=Bt.exec(e))?(t="-"===i[1]?-1:1,r={y:0,d:Y(i[Mt])*t,h:Y(i[ht])*t,m:Y(i[Lt])*t,s:Y(i[ct])*t,ms:Y(De(1e3*i[Yt]))*t}):(i=qt.exec(e))?(t="-"===i[1]?-1:(i[1],1),r={y:be(i[2],t),M:be(i[3],t),w:be(i[4],t),d:be(i[5],t),h:be(i[6],t),m:be(i[7],t),s:be(i[8],t)}):null==r?r={}:"object"==typeof r&&("from"in r||"to"in r)&&(d=function(e,a){var t;if(!e.isValid()||!a.isValid())return{milliseconds:0,months:0};a=we(a,e),e.isBefore(a)?t=je(e,a):((t=je(a,e)).milliseconds=-t.milliseconds,t.months=-t.months);return t}(ye(r.from),ye(r.to)),(r={}).ms=d.milliseconds,r.M=d.months),s=new ke(r),pe(e)&&_(e,"_locale")&&(s._locale=e._locale),s}function be(e,a){var t=e&&parseFloat(e.replace(",","."));return(isNaN(t)?0:t)*a}function je(e,a){var t={milliseconds:0,months:0};return t.months=a.month()-e.month()+12*(a.year()-e.year()),e.clone().add(t.months,"M").isAfter(a)&&--t.months,t.milliseconds=+a-+e.clone().add(t.months,"M"),t}function xe(e,a){return function(t,s){var n,d;return null===s||isNaN(+s)||(p(a,"moment()."+a+"(period, number) is deprecated. Please use moment()."+a+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),d=t,t=s,s=d),t="string"==typeof t?+t:t,n=He(t,s),Pe(this,n,e),this}}function Pe(a,t,s,n){var d=t._milliseconds,r=De(t._days),_=De(t._months);a.isValid()&&(n=null==n||n,_&&V(a,C(a,"Month")+_*s),r&&G(a,"Date",C(a,"Date")+r*s),d&&a._d.setTime(a._d.valueOf()+d*s),n&&e.updateOffset(a,r||_))}function Oe(e,a){var t,s=12*(a.year()-e.year())+(a.month()-e.month()),n=e.clone().add(s,"months");return t=a-n<0?(a-n)/(n-e.clone().add(s-1,"months")):(a-n)/(e.clone().add(s+1,"months")-n),-(s+t)||0}function We(e){var a;return void 0===e?this._locale._abbr:(null!=(a=ie(e))&&(this._locale=a),this)}function Ee(){return this._locale}function Ae(e,a){j(0,[e,e.length],0,a)}function Fe(e,a,t,s,n){var d;return null==e?Q(this,s,n).year:(d=X(e,s,n),a>d&&(a=d),function(e,a,t,s,n){var d=q(e,a,t,s,n),r=$(d.year,0,d.dayOfYear);return this.year(r.getUTCFullYear()),this.month(r.getUTCMonth()),this.date(r.getUTCDate()),this}.call(this,e,a,t,s,n))}function ze(e,a){a[Yt]=Y(1e3*("0."+e))}function Je(e){return e}function Ne(e,a,t,s){var n=ie(),d=o().set(s,a);return n[t](d,e)}function Re(e,a,t){if(n(e)&&(a=e,e=void 0),e=e||"",null!=a)return Ne(e,a,t,"month");var s,d=[];for(s=0;s<12;s++)d[s]=Ne(e,s,t,"month");return d}function Ie(e,a,t,s){"boolean"==typeof e?(n(a)&&(t=a,a=void 0),a=a||""):(t=a=e,e=!1,n(a)&&(t=a,a=void 0),a=a||"");var d=ie(),r=e?d._week.dow:0;if(null!=t)return Ne(a,(t+r)%7,s,"day");var _,i=[];for(_=0;_<7;_++)i[_]=Ne(a,(_+r)%7,s,"day");return i}function Ce(e,a,t,s){var n=He(a,t);return e._milliseconds+=s*n._milliseconds,e._days+=s*n._days,e._months+=s*n._months,e._bubble()}function Ge(e){return e<0?Math.floor(e):Math.ceil(e)}function Ue(e){return 4800*e/146097}function Ve(e){return 146097*e/4800}function Ke(e){return function(){return this.as(e)}}function Ze(e){return function(){return this.isValid()?this._data[e]:NaN}}function $e(e){return(e>0)-(e<0)||+e}function Be(){if(!this.isValid())return this.localeData().invalidDate();var e,a,t=vs(this._milliseconds)/1e3,s=vs(this._days),n=vs(this._months);a=c((e=c(t/60))/60),t%=60,e%=60;var d=c(n/12),r=n%=12,_=s,i=a,o=e,m=t?t.toFixed(3).replace(/\.?0+$/,""):"",u=this.asSeconds();if(!u)return"P0D";var l=u<0?"-":"",M=$e(this._months)!==$e(u)?"-":"",h=$e(this._days)!==$e(u)?"-":"",L=$e(this._milliseconds)!==$e(u)?"-":"";return l+"P"+(d?M+d+"Y":"")+(r?M+r+"M":"")+(_?h+_+"D":"")+(i||o||m?"T":"")+(i?L+i+"H":"")+(o?L+o+"M":"")+(m?L+m+"S":"")}function qe(e,a,t){return"m"===t?a?"\u0445\u0432\u0456\u043b\u0456\u043d\u0430":"\u0445\u0432\u0456\u043b\u0456\u043d\u0443":"h"===t?a?"\u0433\u0430\u0434\u0437\u0456\u043d\u0430":"\u0433\u0430\u0434\u0437\u0456\u043d\u0443":e+" "+function(e,a){var t=e.split("_");return a%10==1&&a%100!=11?t[0]:a%10>=2&&a%10<=4&&(a%100<10||a%100>=20)?t[1]:t[2]}({ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u0445\u0432\u0456\u043b\u0456\u043d\u0430_\u0445\u0432\u0456\u043b\u0456\u043d\u044b_\u0445\u0432\u0456\u043b\u0456\u043d":"\u0445\u0432\u0456\u043b\u0456\u043d\u0443_\u0445\u0432\u0456\u043b\u0456\u043d\u044b_\u0445\u0432\u0456\u043b\u0456\u043d",hh:a?"\u0433\u0430\u0434\u0437\u0456\u043d\u0430_\u0433\u0430\u0434\u0437\u0456\u043d\u044b_\u0433\u0430\u0434\u0437\u0456\u043d":"\u0433\u0430\u0434\u0437\u0456\u043d\u0443_\u0433\u0430\u0434\u0437\u0456\u043d\u044b_\u0433\u0430\u0434\u0437\u0456\u043d",dd:"\u0434\u0437\u0435\u043d\u044c_\u0434\u043d\u0456_\u0434\u0437\u0451\u043d",MM:"\u043c\u0435\u0441\u044f\u0446_\u043c\u0435\u0441\u044f\u0446\u044b_\u043c\u0435\u0441\u044f\u0446\u0430\u045e",yy:"\u0433\u043e\u0434_\u0433\u0430\u0434\u044b_\u0433\u0430\u0434\u043e\u045e"}[t],+e)}function Qe(e,a,t){return e+" "+function(e,a){if(2===a)return function(e){var a={m:"v",b:"v",d:"z"};if(void 0===a[e.charAt(0)])return e;return a[e.charAt(0)]+e.substring(1)}(e);return e}({mm:"munutenn",MM:"miz",dd:"devezh"}[t],e)}function Xe(e){return e>9?Xe(e%10):e}function ea(e,a,t){var s=e+" ";switch(t){case"ss":return s+=1===e?"sekunda":2===e||3===e||4===e?"sekunde":"sekundi";case"m":return a?"jedna minuta":"jedne minute";case"mm":return s+=1===e?"minuta":2===e||3===e||4===e?"minute":"minuta";case"h":return a?"jedan sat":"jednog sata";case"hh":return s+=1===e?"sat":2===e||3===e||4===e?"sata":"sati";case"dd":return s+=1===e?"dan":"dana";case"MM":return s+=1===e?"mjesec":2===e||3===e||4===e?"mjeseca":"mjeseci";case"yy":return s+=1===e?"godina":2===e||3===e||4===e?"godine":"godina"}}function aa(e){return e>1&&e<5&&1!=~~(e/10)}function ta(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"p\xe1r sekund":"p\xe1r sekundami";case"ss":return a||s?n+(aa(e)?"sekundy":"sekund"):n+"sekundami";break;case"m":return a?"minuta":s?"minutu":"minutou";case"mm":return a||s?n+(aa(e)?"minuty":"minut"):n+"minutami";break;case"h":return a?"hodina":s?"hodinu":"hodinou";case"hh":return a||s?n+(aa(e)?"hodiny":"hodin"):n+"hodinami";break;case"d":return a||s?"den":"dnem";case"dd":return a||s?n+(aa(e)?"dny":"dn\xed"):n+"dny";break;case"M":return a||s?"m\u011bs\xedc":"m\u011bs\xedcem";case"MM":return a||s?n+(aa(e)?"m\u011bs\xedce":"m\u011bs\xedc\u016f"):n+"m\u011bs\xedci";break;case"y":return a||s?"rok":"rokem";case"yy":return a||s?n+(aa(e)?"roky":"let"):n+"lety";break}}function sa(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}function na(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}function da(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}function ra(e,a,t,s){var n={s:["m\xf5ne sekundi","m\xf5ni sekund","paar sekundit"],ss:[e+"sekundi",e+"sekundit"],m:["\xfche minuti","\xfcks minut"],mm:[e+" minuti",e+" minutit"],h:["\xfche tunni","tund aega","\xfcks tund"],hh:[e+" tunni",e+" tundi"],d:["\xfche p\xe4eva","\xfcks p\xe4ev"],M:["kuu aja","kuu aega","\xfcks kuu"],MM:[e+" kuu",e+" kuud"],y:["\xfche aasta","aasta","\xfcks aasta"],yy:[e+" aasta",e+" aastat"]};return a?n[t][2]?n[t][2]:n[t][1]:s?n[t][0]:n[t][1]}function _a(e,a,t,s){var n="";switch(t){case"s":return s?"muutaman sekunnin":"muutama sekunti";case"ss":return s?"sekunnin":"sekuntia";case"m":return s?"minuutin":"minuutti";case"mm":n=s?"minuutin":"minuuttia";break;case"h":return s?"tunnin":"tunti";case"hh":n=s?"tunnin":"tuntia";break;case"d":return s?"p\xe4iv\xe4n":"p\xe4iv\xe4";case"dd":n=s?"p\xe4iv\xe4n":"p\xe4iv\xe4\xe4";break;case"M":return s?"kuukauden":"kuukausi";case"MM":n=s?"kuukauden":"kuukautta";break;case"y":return s?"vuoden":"vuosi";case"yy":n=s?"vuoden":"vuotta";break}return n=function(e,a){return e<10?a?mn[e]:on[e]:e}(e,s)+" "+n}function ia(e,a,t,s){var n={s:["thodde secondanim","thodde second"],ss:[e+" secondanim",e+" second"],m:["eka mintan","ek minute"],mm:[e+" mintanim",e+" mintam"],h:["eka horan","ek hor"],hh:[e+" horanim",e+" hor"],d:["eka disan","ek dis"],dd:[e+" disanim",e+" dis"],M:["eka mhoinean","ek mhoino"],MM:[e+" mhoineanim",e+" mhoine"],y:["eka vorsan","ek voros"],yy:[e+" vorsanim",e+" vorsam"]};return a?n[t][0]:n[t][1]}function oa(e,a,t){var s=e+" ";switch(t){case"ss":return s+=1===e?"sekunda":2===e||3===e||4===e?"sekunde":"sekundi";case"m":return a?"jedna minuta":"jedne minute";case"mm":return s+=1===e?"minuta":2===e||3===e||4===e?"minute":"minuta";case"h":return a?"jedan sat":"jednog sata";case"hh":return s+=1===e?"sat":2===e||3===e||4===e?"sata":"sati";case"dd":return s+=1===e?"dan":"dana";case"MM":return s+=1===e?"mjesec":2===e||3===e||4===e?"mjeseca":"mjeseci";case"yy":return s+=1===e?"godina":2===e||3===e||4===e?"godine":"godina"}}function ma(e,a,t,s){var n=e;switch(t){case"s":return s||a?"n\xe9h\xe1ny m\xe1sodperc":"n\xe9h\xe1ny m\xe1sodperce";case"ss":return n+(s||a)?" m\xe1sodperc":" m\xe1sodperce";case"m":return"egy"+(s||a?" perc":" perce");case"mm":return n+(s||a?" perc":" perce");case"h":return"egy"+(s||a?" \xf3ra":" \xf3r\xe1ja");case"hh":return n+(s||a?" \xf3ra":" \xf3r\xe1ja");case"d":return"egy"+(s||a?" nap":" napja");case"dd":return n+(s||a?" nap":" napja");case"M":return"egy"+(s||a?" h\xf3nap":" h\xf3napja");case"MM":return n+(s||a?" h\xf3nap":" h\xf3napja");case"y":return"egy"+(s||a?" \xe9v":" \xe9ve");case"yy":return n+(s||a?" \xe9v":" \xe9ve")}return""}function ua(e){return(e?"":"[m\xfalt] ")+"["+Yn[this.day()]+"] LT[-kor]"}function la(e){return e%100==11||e%10!=1}function Ma(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"nokkrar sek\xfandur":"nokkrum sek\xfandum";case"ss":return la(e)?n+(a||s?"sek\xfandur":"sek\xfandum"):n+"sek\xfanda";case"m":return a?"m\xedn\xfata":"m\xedn\xfatu";case"mm":return la(e)?n+(a||s?"m\xedn\xfatur":"m\xedn\xfatum"):a?n+"m\xedn\xfata":n+"m\xedn\xfatu";case"hh":return la(e)?n+(a||s?"klukkustundir":"klukkustundum"):n+"klukkustund";case"d":return a?"dagur":s?"dag":"degi";case"dd":return la(e)?a?n+"dagar":n+(s?"daga":"d\xf6gum"):a?n+"dagur":n+(s?"dag":"degi");case"M":return a?"m\xe1nu\xf0ur":s?"m\xe1nu\xf0":"m\xe1nu\xf0i";case"MM":return la(e)?a?n+"m\xe1nu\xf0ir":n+(s?"m\xe1nu\xf0i":"m\xe1nu\xf0um"):a?n+"m\xe1nu\xf0ur":n+(s?"m\xe1nu\xf0":"m\xe1nu\xf0i");case"y":return a||s?"\xe1r":"\xe1ri";case"yy":return la(e)?n+(a||s?"\xe1r":"\xe1rum"):n+(a||s?"\xe1r":"\xe1ri")}}function ha(e,a,t,s){var n={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return a?n[t][0]:n[t][1]}function La(e){if(e=parseInt(e,10),isNaN(e))return!1;if(e<0)return!0;if(e<10)return 4<=e&&e<=7;if(e<100){var a=e%10;return La(0===a?e/10:a)}if(e<1e4){for(;e>=10;)e/=10;return La(e)}return e/=1e3,La(e)}function ca(e,a,t,s){return a?ya(t)[0]:s?ya(t)[1]:ya(t)[2]}function Ya(e){return e%10==0||e>10&&e<20}function ya(e){return Dn[e].split("_")}function fa(e,a,t,s){var n=e+" ";return 1===e?n+ca(0,a,t[0],s):a?n+(Ya(e)?ya(t)[1]:ya(t)[0]):s?n+ya(t)[1]:n+(Ya(e)?ya(t)[1]:ya(t)[2])}function ka(e,a,t){return t?a%10==1&&a%100!=11?e[2]:e[3]:a%10==1&&a%100!=11?e[0]:e[1]}function pa(e,a,t){return e+" "+ka(Tn[t],e,a)}function Da(e,a,t){return ka(Tn[t],e,a)}function Ta(e,a,t,s){var n="";if(a)switch(t){case"s":n="\u0915\u093e\u0939\u0940 \u0938\u0947\u0915\u0902\u0926";break;case"ss":n="%d \u0938\u0947\u0915\u0902\u0926";break;case"m":n="\u090f\u0915 \u092e\u093f\u0928\u093f\u091f";break;case"mm":n="%d \u092e\u093f\u0928\u093f\u091f\u0947";break;case"h":n="\u090f\u0915 \u0924\u093e\u0938";break;case"hh":n="%d \u0924\u093e\u0938";break;case"d":n="\u090f\u0915 \u0926\u093f\u0935\u0938";break;case"dd":n="%d \u0926\u093f\u0935\u0938";break;case"M":n="\u090f\u0915 \u092e\u0939\u093f\u0928\u093e";break;case"MM":n="%d \u092e\u0939\u093f\u0928\u0947";break;case"y":n="\u090f\u0915 \u0935\u0930\u094d\u0937";break;case"yy":n="%d \u0935\u0930\u094d\u0937\u0947";break}else switch(t){case"s":n="\u0915\u093e\u0939\u0940 \u0938\u0947\u0915\u0902\u0926\u093e\u0902";break;case"ss":n="%d \u0938\u0947\u0915\u0902\u0926\u093e\u0902";break;case"m":n="\u090f\u0915\u093e \u092e\u093f\u0928\u093f\u091f\u093e";break;case"mm":n="%d \u092e\u093f\u0928\u093f\u091f\u093e\u0902";break;case"h":n="\u090f\u0915\u093e \u0924\u093e\u0938\u093e";break;case"hh":n="%d \u0924\u093e\u0938\u093e\u0902";break;case"d":n="\u090f\u0915\u093e \u0926\u093f\u0935\u0938\u093e";break;case"dd":n="%d \u0926\u093f\u0935\u0938\u093e\u0902";break;case"M":n="\u090f\u0915\u093e \u092e\u0939\u093f\u0928\u094d\u092f\u093e";break;case"MM":n="%d \u092e\u0939\u093f\u0928\u094d\u092f\u093e\u0902";break;case"y":n="\u090f\u0915\u093e \u0935\u0930\u094d\u0937\u093e";break;case"yy":n="%d \u0935\u0930\u094d\u0937\u093e\u0902";break}return n.replace(/%d/i,e)}function ga(e){return e%10<5&&e%10>1&&~~(e/10)%10!=1}function wa(e,a,t){var s=e+" ";switch(t){case"ss":return s+(ga(e)?"sekundy":"sekund");case"m":return a?"minuta":"minut\u0119";case"mm":return s+(ga(e)?"minuty":"minut");case"h":return a?"godzina":"godzin\u0119";case"hh":return s+(ga(e)?"godziny":"godzin");case"MM":return s+(ga(e)?"miesi\u0105ce":"miesi\u0119cy");case"yy":return s+(ga(e)?"lata":"lat")}}function va(e,a,t){var s=" ";return(e%100>=20||e>=100&&e%100==0)&&(s=" de "),e+s+{ss:"secunde",mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"}[t]}function Sa(e,a,t){return"m"===t?a?"\u043c\u0438\u043d\u0443\u0442\u0430":"\u043c\u0438\u043d\u0443\u0442\u0443":e+" "+function(e,a){var t=e.split("_");return a%10==1&&a%100!=11?t[0]:a%10>=2&&a%10<=4&&(a%100<10||a%100>=20)?t[1]:t[2]}({ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u043c\u0438\u043d\u0443\u0442\u0430_\u043c\u0438\u043d\u0443\u0442\u044b_\u043c\u0438\u043d\u0443\u0442":"\u043c\u0438\u043d\u0443\u0442\u0443_\u043c\u0438\u043d\u0443\u0442\u044b_\u043c\u0438\u043d\u0443\u0442",hh:"\u0447\u0430\u0441_\u0447\u0430\u0441\u0430_\u0447\u0430\u0441\u043e\u0432",dd:"\u0434\u0435\u043d\u044c_\u0434\u043d\u044f_\u0434\u043d\u0435\u0439",MM:"\u043c\u0435\u0441\u044f\u0446_\u043c\u0435\u0441\u044f\u0446\u0430_\u043c\u0435\u0441\u044f\u0446\u0435\u0432",yy:"\u0433\u043e\u0434_\u0433\u043e\u0434\u0430_\u043b\u0435\u0442"}[t],+e)}function Ha(e){return e>1&&e<5}function ba(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"p\xe1r sek\xfand":"p\xe1r sekundami";case"ss":return a||s?n+(Ha(e)?"sekundy":"sek\xfand"):n+"sekundami";break;case"m":return a?"min\xfata":s?"min\xfatu":"min\xfatou";case"mm":return a||s?n+(Ha(e)?"min\xfaty":"min\xfat"):n+"min\xfatami";break;case"h":return a?"hodina":s?"hodinu":"hodinou";case"hh":return a||s?n+(Ha(e)?"hodiny":"hod\xedn"):n+"hodinami";break;case"d":return a||s?"de\u0148":"d\u0148om";case"dd":return a||s?n+(Ha(e)?"dni":"dn\xed"):n+"d\u0148ami";break;case"M":return a||s?"mesiac":"mesiacom";case"MM":return a||s?n+(Ha(e)?"mesiace":"mesiacov"):n+"mesiacmi";break;case"y":return a||s?"rok":"rokom";case"yy":return a||s?n+(Ha(e)?"roky":"rokov"):n+"rokmi";break}}function ja(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"nekaj sekund":"nekaj sekundami";case"ss":return n+=1===e?a?"sekundo":"sekundi":2===e?a||s?"sekundi":"sekundah":e<5?a||s?"sekunde":"sekundah":"sekund";case"m":return a?"ena minuta":"eno minuto";case"mm":return n+=1===e?a?"minuta":"minuto":2===e?a||s?"minuti":"minutama":e<5?a||s?"minute":"minutami":a||s?"minut":"minutami";case"h":return a?"ena ura":"eno uro";case"hh":return n+=1===e?a?"ura":"uro":2===e?a||s?"uri":"urama":e<5?a||s?"ure":"urami":a||s?"ur":"urami";case"d":return a||s?"en dan":"enim dnem";case"dd":return n+=1===e?a||s?"dan":"dnem":2===e?a||s?"dni":"dnevoma":a||s?"dni":"dnevi";case"M":return a||s?"en mesec":"enim mesecem";case"MM":return n+=1===e?a||s?"mesec":"mesecem":2===e?a||s?"meseca":"mesecema":e<5?a||s?"mesece":"meseci":a||s?"mesecev":"meseci";case"y":return a||s?"eno leto":"enim letom";case"yy":return n+=1===e?a||s?"leto":"letom":2===e?a||s?"leti":"letoma":e<5?a||s?"leta":"leti":a||s?"let":"leti"}}function xa(e,a,t,s){var n=function(e){var a=Math.floor(e%1e3/100),t=Math.floor(e%100/10),s=e%10,n="";a>0&&(n+=Qn[a]+"vatlh");t>0&&(n+=(""!==n?" ":"")+Qn[t]+"maH");s>0&&(n+=(""!==n?" ":"")+Qn[s]);return""===n?"pagh":n}(e);switch(t){case"ss":return n+" lup";case"mm":return n+" tup";case"hh":return n+" rep";case"dd":return n+" jaj";case"MM":return n+" jar";case"yy":return n+" DIS"}}function Pa(e,a,t,s){var n={s:["viensas secunds","'iensas secunds"],ss:[e+" secunds",e+" secunds"],m:["'n m\xedut","'iens m\xedut"],mm:[e+" m\xeduts",e+" m\xeduts"],h:["'n \xfeora","'iensa \xfeora"],hh:[e+" \xfeoras",e+" \xfeoras"],d:["'n ziua","'iensa ziua"],dd:[e+" ziuas",e+" ziuas"],M:["'n mes","'iens mes"],MM:[e+" mesen",e+" mesen"],y:["'n ar","'iens ar"],yy:[e+" ars",e+" ars"]};return s?n[t][0]:a?n[t][0]:n[t][1]}function Oa(e,a,t){return"m"===t?a?"\u0445\u0432\u0438\u043b\u0438\u043d\u0430":"\u0445\u0432\u0438\u043b\u0438\u043d\u0443":"h"===t?a?"\u0433\u043e\u0434\u0438\u043d\u0430":"\u0433\u043e\u0434\u0438\u043d\u0443":e+" "+function(e,a){var t=e.split("_");return a%10==1&&a%100!=11?t[0]:a%10>=2&&a%10<=4&&(a%100<10||a%100>=20)?t[1]:t[2]}({ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u0438_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u0438_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u0445\u0432\u0438\u043b\u0438\u043d\u0430_\u0445\u0432\u0438\u043b\u0438\u043d\u0438_\u0445\u0432\u0438\u043b\u0438\u043d":"\u0445\u0432\u0438\u043b\u0438\u043d\u0443_\u0445\u0432\u0438\u043b\u0438\u043d\u0438_\u0445\u0432\u0438\u043b\u0438\u043d",hh:a?"\u0433\u043e\u0434\u0438\u043d\u0430_\u0433\u043e\u0434\u0438\u043d\u0438_\u0433\u043e\u0434\u0438\u043d":"\u0433\u043e\u0434\u0438\u043d\u0443_\u0433\u043e\u0434\u0438\u043d\u0438_\u0433\u043e\u0434\u0438\u043d",dd:"\u0434\u0435\u043d\u044c_\u0434\u043d\u0456_\u0434\u043d\u0456\u0432",MM:"\u043c\u0456\u0441\u044f\u0446\u044c_\u043c\u0456\u0441\u044f\u0446\u0456_\u043c\u0456\u0441\u044f\u0446\u0456\u0432",yy:"\u0440\u0456\u043a_\u0440\u043e\u043a\u0438_\u0440\u043e\u043a\u0456\u0432"}[t],+e)}function Wa(e){return function(){return e+"\u043e"+(11===this.hours()?"\u0431":"")+"] LT"}}var Ea,Aa;Aa=Array.prototype.some?Array.prototype.some:function(e){for(var a=Object(this),t=a.length>>>0,s=0;s<t;s++)if(s in a&&e.call(this,a[s],s,a))return!0;return!1};var Fa=e.momentProperties=[],za=!1,Ja={};e.suppressDeprecationWarnings=!1,e.deprecationHandler=null;var Na;Na=Object.keys?Object.keys:function(e){var a,t=[];for(a in e)_(e,a)&&t.push(a);return t};var Ra={},Ia={},Ca=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,Ga=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Ua={},Va={},Ka=/\d/,Za=/\d\d/,$a=/\d{3}/,Ba=/\d{4}/,qa=/[+-]?\d{6}/,Qa=/\d\d?/,Xa=/\d\d\d\d?/,et=/\d\d\d\d\d\d?/,at=/\d{1,3}/,tt=/\d{1,4}/,st=/[+-]?\d{1,6}/,nt=/\d+/,dt=/[+-]?\d+/,rt=/Z|[+-]\d\d:?\d\d/gi,_t=/Z|[+-]\d\d(?::?\d\d)?/gi,it=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ot={},mt={},ut=0,lt=1,Mt=2,ht=3,Lt=4,ct=5,Yt=6,yt=7,ft=8;j("Y",0,0,function(){var e=this.year();return e<=9999?""+e:"+"+e}),j(0,["YY",2],0,function(){return this.year()%100}),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),w("year","y"),H("year",1),W("Y",dt),W("YY",Qa,Za),W("YYYY",tt,Ba),W("YYYYY",st,qa),W("YYYYYY",st,qa),F(["YYYYY","YYYYYY"],ut),F("YYYY",function(a,t){t[ut]=2===a.length?e.parseTwoDigitYear(a):Y(a)}),F("YY",function(a,t){t[ut]=e.parseTwoDigitYear(a)}),F("Y",function(e,a){a[ut]=parseInt(e,10)}),e.parseTwoDigitYear=function(e){return Y(e)+(Y(e)>68?1900:2e3)};var kt,pt=I("FullYear",!0);kt=Array.prototype.indexOf?Array.prototype.indexOf:function(e){var a;for(a=0;a<this.length;++a)if(this[a]===e)return a;return-1},j("M",["MM",2],"Mo",function(){return this.month()+1}),j("MMM",0,0,function(e){return this.localeData().monthsShort(this,e)}),j("MMMM",0,0,function(e){return this.localeData().months(this,e)}),w("month","M"),H("month",8),W("M",Qa),W("MM",Qa,Za),W("MMM",function(e,a){return a.monthsShortRegex(e)}),W("MMMM",function(e,a){return a.monthsRegex(e)}),F(["M","MM"],function(e,a){a[lt]=Y(e)-1}),F(["MMM","MMMM"],function(e,a,t,s){var n=t._locale.monthsParse(e,s,t._strict);null!=n?a[lt]=n:m(t).invalidMonth=e});var Dt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Tt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),gt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),wt=it,vt=it;j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),w("week","w"),w("isoWeek","W"),H("week",5),H("isoWeek",5),W("w",Qa),W("ww",Qa,Za),W("W",Qa),W("WW",Qa,Za),z(["w","ww","W","WW"],function(e,a,t,s){a[s.substr(0,1)]=Y(e)});j("d",0,"do","day"),j("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),j("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),j("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),w("day","d"),w("weekday","e"),w("isoWeekday","E"),H("day",11),H("weekday",11),H("isoWeekday",11),W("d",Qa),W("e",Qa),W("E",Qa),W("dd",function(e,a){return a.weekdaysMinRegex(e)}),W("ddd",function(e,a){return a.weekdaysShortRegex(e)}),W("dddd",function(e,a){return a.weekdaysRegex(e)}),z(["dd","ddd","dddd"],function(e,a,t,s){var n=t._locale.weekdaysParse(e,s,t._strict);null!=n?a.d=n:m(t).invalidWeekday=e}),z(["d","e","E"],function(e,a,t,s){a[s]=Y(e)});var St="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ht="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),bt="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),jt=it,xt=it,Pt=it;j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,function(){return this.hours()||24}),j("hmm",0,0,function(){return""+ae.apply(this)+b(this.minutes(),2)}),j("hmmss",0,0,function(){return""+ae.apply(this)+b(this.minutes(),2)+b(this.seconds(),2)}),j("Hmm",0,0,function(){return""+this.hours()+b(this.minutes(),2)}),j("Hmmss",0,0,function(){return""+this.hours()+b(this.minutes(),2)+b(this.seconds(),2)}),te("a",!0),te("A",!1),w("hour","h"),H("hour",13),W("a",se),W("A",se),W("H",Qa),W("h",Qa),W("k",Qa),W("HH",Qa,Za),W("hh",Qa,Za),W("kk",Qa,Za),W("hmm",Xa),W("hmmss",et),W("Hmm",Xa),W("Hmmss",et),F(["H","HH"],ht),F(["k","kk"],function(e,a,t){var s=Y(e);a[ht]=24===s?0:s}),F(["a","A"],function(e,a,t){t._isPm=t._locale.isPM(e),t._meridiem=e}),F(["h","hh"],function(e,a,t){a[ht]=Y(e),m(t).bigHour=!0}),F("hmm",function(e,a,t){var s=e.length-2;a[ht]=Y(e.substr(0,s)),a[Lt]=Y(e.substr(s)),m(t).bigHour=!0}),F("hmmss",function(e,a,t){var s=e.length-4,n=e.length-2;a[ht]=Y(e.substr(0,s)),a[Lt]=Y(e.substr(s,2)),a[ct]=Y(e.substr(n)),m(t).bigHour=!0}),F("Hmm",function(e,a,t){var s=e.length-2;a[ht]=Y(e.substr(0,s)),a[Lt]=Y(e.substr(s))}),F("Hmmss",function(e,a,t){var s=e.length-4,n=e.length-2;a[ht]=Y(e.substr(0,s)),a[Lt]=Y(e.substr(s,2)),a[ct]=Y(e.substr(n))});var Ot,Wt=I("Hours",!0),Et={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Tt,monthsShort:gt,week:{dow:0,doy:6},weekdays:St,weekdaysMin:bt,weekdaysShort:Ht,meridiemParse:/[ap]\.?m?\.?/i},At={},Ft={},zt=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Jt=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Nt=/Z|[+-]\d\d(?::?\d\d)?/,Rt=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],It=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Ct=/^\/?Date\((\-?\d+)/i,Gt=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,Ut={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};e.createFromInputFallback=k("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))}),e.ISO_8601=function(){},e.RFC_2822=function(){};var Vt=k("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=ye.apply(null,arguments);return this.isValid()&&e.isValid()?e<this?this:e:l()}),Kt=k("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=ye.apply(null,arguments);return this.isValid()&&e.isValid()?e>this?this:e:l()}),Zt=["year","quarter","month","week","day","hour","minute","second","millisecond"];Te("Z",":"),Te("ZZ",""),W("Z",_t),W("ZZ",_t),F(["Z","ZZ"],function(e,a,t){t._useUTC=!0,t._tzm=ge(_t,e)});var $t=/([\+\-]|\d\d)/gi;e.updateOffset=function(){};var Bt=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,qt=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;He.fn=ke.prototype,He.invalid=function(){return He(NaN)};var Qt=xe(1,"add"),Xt=xe(-1,"subtract");e.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",e.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var es=k("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return void 0===e?this.localeData():this.locale(e)});j(0,["gg",2],0,function(){return this.weekYear()%100}),j(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Ae("gggg","weekYear"),Ae("ggggg","weekYear"),Ae("GGGG","isoWeekYear"),Ae("GGGGG","isoWeekYear"),w("weekYear","gg"),w("isoWeekYear","GG"),H("weekYear",1),H("isoWeekYear",1),W("G",dt),W("g",dt),W("GG",Qa,Za),W("gg",Qa,Za),W("GGGG",tt,Ba),W("gggg",tt,Ba),W("GGGGG",st,qa),W("ggggg",st,qa),z(["gggg","ggggg","GGGG","GGGGG"],function(e,a,t,s){a[s.substr(0,2)]=Y(e)}),z(["gg","GG"],function(a,t,s,n){t[n]=e.parseTwoDigitYear(a)}),j("Q",0,"Qo","quarter"),w("quarter","Q"),H("quarter",7),W("Q",Ka),F("Q",function(e,a){a[lt]=3*(Y(e)-1)}),j("D",["DD",2],"Do","date"),w("date","D"),H("date",9),W("D",Qa),W("DD",Qa,Za),W("Do",function(e,a){return e?a._dayOfMonthOrdinalParse||a._ordinalParse:a._dayOfMonthOrdinalParseLenient}),F(["D","DD"],Mt),F("Do",function(e,a){a[Mt]=Y(e.match(Qa)[0])});var as=I("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),w("dayOfYear","DDD"),H("dayOfYear",4),W("DDD",at),W("DDDD",$a),F(["DDD","DDDD"],function(e,a,t){t._dayOfYear=Y(e)}),j("m",["mm",2],0,"minute"),w("minute","m"),H("minute",14),W("m",Qa),W("mm",Qa,Za),F(["m","mm"],Lt);var ts=I("Minutes",!1);j("s",["ss",2],0,"second"),w("second","s"),H("second",15),W("s",Qa),W("ss",Qa,Za),F(["s","ss"],ct);var ss=I("Seconds",!1);j("S",0,0,function(){return~~(this.millisecond()/100)}),j(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,function(){return 10*this.millisecond()}),j(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),j(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),j(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),j(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),j(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),w("millisecond","ms"),H("millisecond",16),W("S",at,Ka),W("SS",at,Za),W("SSS",at,$a);var ns;for(ns="SSSS";ns.length<=9;ns+="S")W(ns,nt);for(ns="S";ns.length<=9;ns+="S")F(ns,ze);var ds=I("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var rs=h.prototype;rs.add=Qt,rs.calendar=function(a,t){var s=a||ye(),n=we(s,this).startOf("day"),d=e.calendarFormat(this,n)||"sameElse",r=t&&(D(t[d])?t[d].call(this,s):t[d]);return this.format(r||this.localeData().calendar(d,this,ye(s)))},rs.clone=function(){return new h(this)},rs.diff=function(e,a,t){var s,n,d;if(!this.isValid())return NaN;if(!(s=we(e,this)).isValid())return NaN;switch(n=6e4*(s.utcOffset()-this.utcOffset()),a=v(a)){case"year":d=Oe(this,s)/12;break;case"month":d=Oe(this,s);break;case"quarter":d=Oe(this,s)/3;break;case"second":d=(this-s)/1e3;break;case"minute":d=(this-s)/6e4;break;case"hour":d=(this-s)/36e5;break;case"day":d=(this-s-n)/864e5;break;case"week":d=(this-s-n)/6048e5;break;default:d=this-s}return t?d:c(d)},rs.endOf=function(e){return void 0===(e=v(e))||"millisecond"===e?this:("date"===e&&(e="day"),this.startOf(e).add(1,"isoWeek"===e?"week":e).subtract(1,"ms"))},rs.format=function(a){a||(a=this.isUtc()?e.defaultFormatUtc:e.defaultFormat);var t=P(this,a);return this.localeData().postformat(t)},rs.from=function(e,a){return this.isValid()&&(L(e)&&e.isValid()||ye(e).isValid())?He({to:this,from:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},rs.fromNow=function(e){return this.from(ye(),e)},rs.to=function(e,a){return this.isValid()&&(L(e)&&e.isValid()||ye(e).isValid())?He({from:this,to:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},rs.toNow=function(e){return this.to(ye(),e)},rs.get=function(e){return e=v(e),D(this[e])?this[e]():this},rs.invalidAt=function(){return m(this).overflow},rs.isAfter=function(e,a){var t=L(e)?e:ye(e);return!(!this.isValid()||!t.isValid())&&("millisecond"===(a=v(s(a)?"millisecond":a))?this.valueOf()>t.valueOf():t.valueOf()<this.clone().startOf(a).valueOf())},rs.isBefore=function(e,a){var t=L(e)?e:ye(e);return!(!this.isValid()||!t.isValid())&&("millisecond"===(a=v(s(a)?"millisecond":a))?this.valueOf()<t.valueOf():this.clone().endOf(a).valueOf()<t.valueOf())},rs.isBetween=function(e,a,t,s){return("("===(s=s||"()")[0]?this.isAfter(e,t):!this.isBefore(e,t))&&(")"===s[1]?this.isBefore(a,t):!this.isAfter(a,t))},rs.isSame=function(e,a){var t,s=L(e)?e:ye(e);return!(!this.isValid()||!s.isValid())&&("millisecond"===(a=v(a||"millisecond"))?this.valueOf()===s.valueOf():(t=s.valueOf(),this.clone().startOf(a).valueOf()<=t&&t<=this.clone().endOf(a).valueOf()))},rs.isSameOrAfter=function(e,a){return this.isSame(e,a)||this.isAfter(e,a)},rs.isSameOrBefore=function(e,a){return this.isSame(e,a)||this.isBefore(e,a)},rs.isValid=function(){return u(this)},rs.lang=es,rs.locale=We,rs.localeData=Ee,rs.max=Kt,rs.min=Vt,rs.parsingFlags=function(){return i({},m(this))},rs.set=function(e,a){if("object"==typeof e)for(var t=function(e){var a=[];for(var t in e)a.push({unit:t,priority:Ia[t]});return a.sort(function(e,a){return e.priority-a.priority}),a}(e=S(e)),s=0;s<t.length;s++)this[t[s].unit](e[t[s].unit]);else if(e=v(e),D(this[e]))return this[e](a);return this},rs.startOf=function(e){switch(e=v(e)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":case"date":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===e&&this.weekday(0),"isoWeek"===e&&this.isoWeekday(1),"quarter"===e&&this.month(3*Math.floor(this.month()/3)),this},rs.subtract=Xt,rs.toArray=function(){return[this.year(),this.month(),this.date(),this.hour(),this.minute(),this.second(),this.millisecond()]},rs.toObject=function(){return{years:this.year(),months:this.month(),date:this.date(),hours:this.hours(),minutes:this.minutes(),seconds:this.seconds(),milliseconds:this.milliseconds()}},rs.toDate=function(){return new Date(this.valueOf())},rs.toISOString=function(e){if(!this.isValid())return null;var a=!0!==e,t=a?this.clone().utc():this;return t.year()<0||t.year()>9999?P(t,a?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):D(Date.prototype.toISOString)?a?this.toDate().toISOString():new Date(this._d.valueOf()).toISOString().replace("Z",P(t,"Z")):P(t,a?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},rs.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e="moment",a="";this.isLocal()||(e=0===this.utcOffset()?"moment.utc":"moment.parseZone",a="Z");var t="["+e+'("]',s=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",n=a+'[")]';return this.format(t+s+"-MM-DD[T]HH:mm:ss.SSS"+n)},rs.toJSON=function(){return this.isValid()?this.toISOString():null},rs.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},rs.unix=function(){return Math.floor(this.valueOf()/1e3)},rs.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},rs.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},rs.year=pt,rs.isLeapYear=function(){return R(this.year())},rs.weekYear=function(e){return Fe.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},rs.isoWeekYear=function(e){return Fe.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},rs.quarter=rs.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},rs.month=K,rs.daysInMonth=function(){return U(this.year(),this.month())},rs.week=rs.weeks=function(e){var a=this.localeData().week(this);return null==e?a:this.add(7*(e-a),"d")},rs.isoWeek=rs.isoWeeks=function(e){var a=Q(this,1,4).week;return null==e?a:this.add(7*(e-a),"d")},rs.weeksInYear=function(){var e=this.localeData()._week;return X(this.year(),e.dow,e.doy)},rs.isoWeeksInYear=function(){return X(this.year(),1,4)},rs.date=as,rs.day=rs.days=function(e){if(!this.isValid())return null!=e?this:NaN;var a=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(e=function(e,a){return"string"!=typeof e?e:isNaN(e)?"number"==typeof(e=a.weekdaysParse(e))?e:null:parseInt(e,10)}(e,this.localeData()),this.add(e-a,"d")):a},rs.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var a=(this.day()+7-this.localeData()._week.dow)%7;return null==e?a:this.add(e-a,"d")},rs.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null!=e){var a=function(e,a){return"string"==typeof e?a.weekdaysParse(e)%7||7:isNaN(e)?null:e}(e,this.localeData());return this.day(this.day()%7?a:a-7)}return this.day()||7},rs.dayOfYear=function(e){var a=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?a:this.add(e-a,"d")},rs.hour=rs.hours=Wt,rs.minute=rs.minutes=ts,rs.second=rs.seconds=ss,rs.millisecond=rs.milliseconds=ds,rs.utcOffset=function(a,t,s){var n,d=this._offset||0;if(!this.isValid())return null!=a?this:NaN;if(null!=a){if("string"==typeof a){if(null===(a=ge(_t,a)))return this}else Math.abs(a)<16&&!s&&(a*=60);return!this._isUTC&&t&&(n=ve(this)),this._offset=a,this._isUTC=!0,null!=n&&this.add(n,"m"),d!==a&&(!t||this._changeInProgress?Pe(this,He(a-d,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,e.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?d:ve(this)},rs.utc=function(e){return this.utcOffset(0,e)},rs.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(ve(this),"m")),this},rs.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var e=ge(rt,this._i);null!=e?this.utcOffset(e):this.utcOffset(0,!0)}return this},rs.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?ye(e).utcOffset():0,(this.utcOffset()-e)%60==0)},rs.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},rs.isLocal=function(){return!!this.isValid()&&!this._isUTC},rs.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},rs.isUtc=Se,rs.isUTC=Se,rs.zoneAbbr=function(){return this._isUTC?"UTC":""},rs.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},rs.dates=k("dates accessor is deprecated. Use date instead.",as),rs.months=k("months accessor is deprecated. Use month instead",K),rs.years=k("years accessor is deprecated. Use year instead",pt),rs.zone=k("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,a){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,a),this):-this.utcOffset()}),rs.isDSTShifted=k("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var e={};if(M(e,this),(e=ce(e))._a){var a=e._isUTC?o(e._a):ye(e._a);this._isDSTShifted=this.isValid()&&y(e._a,a.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted});var _s=g.prototype;_s.calendar=function(e,a,t){var s=this._calendar[e]||this._calendar.sameElse;return D(s)?s.call(a,t):s},_s.longDateFormat=function(e){var a=this._longDateFormat[e],t=this._longDateFormat[e.toUpperCase()];return a||!t?a:(this._longDateFormat[e]=t.replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e])},_s.invalidDate=function(){return this._invalidDate},_s.ordinal=function(e){return this._ordinal.replace("%d",e)},_s.preparse=Je,_s.postformat=Je,_s.relativeTime=function(e,a,t,s){var n=this._relativeTime[t];return D(n)?n(e,a,t,s):n.replace(/%d/i,e)},_s.pastFuture=function(e,a){var t=this._relativeTime[e>0?"future":"past"];return D(t)?t(a):t.replace(/%s/i,a)},_s.set=function(e){var a,t;for(t in e)D(a=e[t])?this[t]=a:this["_"+t]=a;this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},_s.months=function(e,t){return e?a(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||Dt).test(t)?"format":"standalone"][e.month()]:a(this._months)?this._months:this._months.standalone},_s.monthsShort=function(e,t){return e?a(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[Dt.test(t)?"format":"standalone"][e.month()]:a(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},_s.monthsParse=function(e,a,t){var s,n,d;if(this._monthsParseExact)return function(e,a,t){var s,n,d,r=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],s=0;s<12;++s)d=o([2e3,s]),this._shortMonthsParse[s]=this.monthsShort(d,"").toLocaleLowerCase(),this._longMonthsParse[s]=this.months(d,"").toLocaleLowerCase();return t?"MMM"===a?-1!==(n=kt.call(this._shortMonthsParse,r))?n:null:-1!==(n=kt.call(this._longMonthsParse,r))?n:null:"MMM"===a?-1!==(n=kt.call(this._shortMonthsParse,r))?n:-1!==(n=kt.call(this._longMonthsParse,r))?n:null:-1!==(n=kt.call(this._longMonthsParse,r))?n:-1!==(n=kt.call(this._shortMonthsParse,r))?n:null}.call(this,e,a,t);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),s=0;s<12;s++){if(n=o([2e3,s]),t&&!this._longMonthsParse[s]&&(this._longMonthsParse[s]=new RegExp("^"+this.months(n,"").replace(".","")+"$","i"),this._shortMonthsParse[s]=new RegExp("^"+this.monthsShort(n,"").replace(".","")+"$","i")),t||this._monthsParse[s]||(d="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[s]=new RegExp(d.replace(".",""),"i")),t&&"MMMM"===a&&this._longMonthsParse[s].test(e))return s;if(t&&"MMM"===a&&this._shortMonthsParse[s].test(e))return s;if(!t&&this._monthsParse[s].test(e))return s}},_s.monthsRegex=function(e){return this._monthsParseExact?(_(this,"_monthsRegex")||Z.call(this),e?this._monthsStrictRegex:this._monthsRegex):(_(this,"_monthsRegex")||(this._monthsRegex=vt),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},_s.monthsShortRegex=function(e){return this._monthsParseExact?(_(this,"_monthsRegex")||Z.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(_(this,"_monthsShortRegex")||(this._monthsShortRegex=wt),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},_s.week=function(e){return Q(e,this._week.dow,this._week.doy).week},_s.firstDayOfYear=function(){return this._week.doy},_s.firstDayOfWeek=function(){return this._week.dow},_s.weekdays=function(e,t){return e?a(this._weekdays)?this._weekdays[e.day()]:this._weekdays[this._weekdays.isFormat.test(t)?"format":"standalone"][e.day()]:a(this._weekdays)?this._weekdays:this._weekdays.standalone},_s.weekdaysMin=function(e){return e?this._weekdaysMin[e.day()]:this._weekdaysMin},_s.weekdaysShort=function(e){return e?this._weekdaysShort[e.day()]:this._weekdaysShort},_s.weekdaysParse=function(e,a,t){var s,n,d;if(this._weekdaysParseExact)return function(e,a,t){var s,n,d,r=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],s=0;s<7;++s)d=o([2e3,1]).day(s),this._minWeekdaysParse[s]=this.weekdaysMin(d,"").toLocaleLowerCase(),this._shortWeekdaysParse[s]=this.weekdaysShort(d,"").toLocaleLowerCase(),this._weekdaysParse[s]=this.weekdays(d,"").toLocaleLowerCase();return t?"dddd"===a?-1!==(n=kt.call(this._weekdaysParse,r))?n:null:"ddd"===a?-1!==(n=kt.call(this._shortWeekdaysParse,r))?n:null:-1!==(n=kt.call(this._minWeekdaysParse,r))?n:null:"dddd"===a?-1!==(n=kt.call(this._weekdaysParse,r))?n:-1!==(n=kt.call(this._shortWeekdaysParse,r))?n:-1!==(n=kt.call(this._minWeekdaysParse,r))?n:null:"ddd"===a?-1!==(n=kt.call(this._shortWeekdaysParse,r))?n:-1!==(n=kt.call(this._weekdaysParse,r))?n:-1!==(n=kt.call(this._minWeekdaysParse,r))?n:null:-1!==(n=kt.call(this._minWeekdaysParse,r))?n:-1!==(n=kt.call(this._weekdaysParse,r))?n:-1!==(n=kt.call(this._shortWeekdaysParse,r))?n:null}.call(this,e,a,t);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),s=0;s<7;s++){if(n=o([2e3,1]).day(s),t&&!this._fullWeekdaysParse[s]&&(this._fullWeekdaysParse[s]=new RegExp("^"+this.weekdays(n,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[s]=new RegExp("^"+this.weekdaysShort(n,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[s]=new RegExp("^"+this.weekdaysMin(n,"").replace(".",".?")+"$","i")),this._weekdaysParse[s]||(d="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[s]=new RegExp(d.replace(".",""),"i")),t&&"dddd"===a&&this._fullWeekdaysParse[s].test(e))return s;if(t&&"ddd"===a&&this._shortWeekdaysParse[s].test(e))return s;if(t&&"dd"===a&&this._minWeekdaysParse[s].test(e))return s;if(!t&&this._weekdaysParse[s].test(e))return s}},_s.weekdaysRegex=function(e){return this._weekdaysParseExact?(_(this,"_weekdaysRegex")||ee.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(_(this,"_weekdaysRegex")||(this._weekdaysRegex=jt),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},_s.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(_(this,"_weekdaysRegex")||ee.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(_(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=xt),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},_s.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(_(this,"_weekdaysRegex")||ee.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(_(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Pt),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},_s.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},_s.meridiem=function(e,a,t){return e>11?t?"pm":"PM":t?"am":"AM"},re("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var a=e%10;return e+(1===Y(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")}}),e.lang=k("moment.lang is deprecated. Use moment.locale instead.",re),e.langData=k("moment.langData is deprecated. Use moment.localeData instead.",ie);var is=Math.abs,os=Ke("ms"),ms=Ke("s"),us=Ke("m"),ls=Ke("h"),Ms=Ke("d"),hs=Ke("w"),Ls=Ke("M"),cs=Ke("y"),Ys=Ze("milliseconds"),ys=Ze("seconds"),fs=Ze("minutes"),ks=Ze("hours"),ps=Ze("days"),Ds=Ze("months"),Ts=Ze("years"),gs=Math.round,ws={ss:44,s:45,m:45,h:22,d:26,M:11},vs=Math.abs,Ss=ke.prototype;Ss.isValid=function(){return this._isValid},Ss.abs=function(){var e=this._data;return this._milliseconds=is(this._milliseconds),this._days=is(this._days),this._months=is(this._months),e.milliseconds=is(e.milliseconds),e.seconds=is(e.seconds),e.minutes=is(e.minutes),e.hours=is(e.hours),e.months=is(e.months),e.years=is(e.years),this},Ss.add=function(e,a){return Ce(this,e,a,1)},Ss.subtract=function(e,a){return Ce(this,e,a,-1)},Ss.as=function(e){if(!this.isValid())return NaN;var a,t,s=this._milliseconds;if("month"===(e=v(e))||"year"===e)return a=this._days+s/864e5,t=this._months+Ue(a),"month"===e?t:t/12;switch(a=this._days+Math.round(Ve(this._months)),e){case"week":return a/7+s/6048e5;case"day":return a+s/864e5;case"hour":return 24*a+s/36e5;case"minute":return 1440*a+s/6e4;case"second":return 86400*a+s/1e3;case"millisecond":return Math.floor(864e5*a)+s;default:throw new Error("Unknown unit "+e)}},Ss.asMilliseconds=os,Ss.asSeconds=ms,Ss.asMinutes=us,Ss.asHours=ls,Ss.asDays=Ms,Ss.asWeeks=hs,Ss.asMonths=Ls,Ss.asYears=cs,Ss.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*Y(this._months/12):NaN},Ss._bubble=function(){var e,a,t,s,n,d=this._milliseconds,r=this._days,_=this._months,i=this._data;return d>=0&&r>=0&&_>=0||d<=0&&r<=0&&_<=0||(d+=864e5*Ge(Ve(_)+r),r=0,_=0),i.milliseconds=d%1e3,e=c(d/1e3),i.seconds=e%60,a=c(e/60),i.minutes=a%60,t=c(a/60),i.hours=t%24,r+=c(t/24),n=c(Ue(r)),_+=n,r-=Ge(Ve(n)),s=c(_/12),_%=12,i.days=r,i.months=_,i.years=s,this},Ss.clone=function(){return He(this)},Ss.get=function(e){return e=v(e),this.isValid()?this[e+"s"]():NaN},Ss.milliseconds=Ys,Ss.seconds=ys,Ss.minutes=fs,Ss.hours=ks,Ss.days=ps,Ss.weeks=function(){return c(this.days()/7)},Ss.months=Ds,Ss.years=Ts,Ss.humanize=function(e){if(!this.isValid())return this.localeData().invalidDate();var a=this.localeData(),t=function(e,a,t){var s=He(e).abs(),n=gs(s.as("s")),d=gs(s.as("m")),r=gs(s.as("h")),_=gs(s.as("d")),i=gs(s.as("M")),o=gs(s.as("y")),m=n<=ws.ss&&["s",n]||n<ws.s&&["ss",n]||d<=1&&["m"]||d<ws.m&&["mm",d]||r<=1&&["h"]||r<ws.h&&["hh",r]||_<=1&&["d"]||_<ws.d&&["dd",_]||i<=1&&["M"]||i<ws.M&&["MM",i]||o<=1&&["y"]||["yy",o];return m[2]=a,m[3]=+e>0,m[4]=t,function(e,a,t,s,n){return n.relativeTime(a||1,!!t,e,s)}.apply(null,m)}(this,!e,a);return e&&(t=a.pastFuture(+this,t)),a.postformat(t)},Ss.toISOString=Be,Ss.toString=Be,Ss.toJSON=Be,Ss.locale=We,Ss.localeData=Ee,Ss.toIsoString=k("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Be),Ss.lang=es,j("X",0,0,"unix"),j("x",0,0,"valueOf"),W("x",dt),W("X",/[+-]?\d+(\.\d{1,3})?/),F("X",function(e,a,t){t._d=new Date(1e3*parseFloat(e,10))}),F("x",function(e,a,t){t._d=new Date(Y(e))}),e.version="2.20.1",function(e){Ea=e}(ye),e.fn=rs,e.min=function(){return fe("isBefore",[].slice.call(arguments,0))},e.max=function(){return fe("isAfter",[].slice.call(arguments,0))},e.now=function(){return Date.now?Date.now():+new Date},e.utc=o,e.unix=function(e){return ye(1e3*e)},e.months=function(e,a){return Re(e,a,"months")},e.isDate=d,e.locale=re,e.invalid=l,e.duration=He,e.isMoment=L,e.weekdays=function(e,a,t){return Ie(e,a,t,"weekdays")},e.parseZone=function(){return ye.apply(null,arguments).parseZone()},e.localeData=ie,e.isDuration=pe,e.monthsShort=function(e,a){return Re(e,a,"monthsShort")},e.weekdaysMin=function(e,a,t){return Ie(e,a,t,"weekdaysMin")},e.defineLocale=_e,e.updateLocale=function(e,a){if(null!=a){var t,s,n=Et;null!=(s=de(e))&&(n=s._config),(t=new g(a=T(n,a))).parentLocale=At[e],At[e]=t,re(e)}else null!=At[e]&&(null!=At[e].parentLocale?At[e]=At[e].parentLocale:null!=At[e]&&delete At[e]);return At[e]},e.locales=function(){return Na(At)},e.weekdaysShort=function(e,a,t){return Ie(e,a,t,"weekdaysShort")},e.normalizeUnits=v,e.relativeTimeRounding=function(e){return void 0===e?gs:"function"==typeof e&&(gs=e,!0)},e.relativeTimeThreshold=function(e,a){return void 0!==ws[e]&&(void 0===a?ws[e]:(ws[e]=a,"s"===e&&(ws.ss=a-1),!0))},e.calendarFormat=function(e,a){var t=e.diff(a,"days",!0);return t<-6?"sameElse":t<-1?"lastWeek":t<0?"lastDay":t<1?"sameDay":t<2?"nextDay":t<7?"nextWeek":"sameElse"},e.prototype=rs,e.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"YYYY-[W]WW",MONTH:"YYYY-MM"},e.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiemParse:/vm|nm/i,isPM:function(e){return/^nm$/i.test(e)},meridiem:function(e,a,t){return e<12?t?"vm":"VM":t?"nm":"NM"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[M\xf4re om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",ss:"%d sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||e>=20?"ste":"de")},week:{dow:1,doy:4}}),e.defineLocale("ar-dz",{months:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),monthsShort:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0627\u062d\u062f_\u0627\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u0623\u062d_\u0625\u062b_\u062b\u0644\u0627_\u0623\u0631_\u062e\u0645_\u062c\u0645_\u0633\u0628".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:0,doy:4}}),e.defineLocale("ar-kw",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062a\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0627\u062d\u062f_\u0627\u062a\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:0,doy:12}});var Hs={1:"1",2:"2",3:"3",4:"4",5:"5",6:"6",7:"7",8:"8",9:"9",0:"0"},bs=function(e){return 0===e?0:1===e?1:2===e?2:e%100>=3&&e%100<=10?3:e%100>=11?4:5},js={s:["\u0623\u0642\u0644 \u0645\u0646 \u062b\u0627\u0646\u064a\u0629","\u062b\u0627\u0646\u064a\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062b\u0627\u0646\u064a\u062a\u0627\u0646","\u062b\u0627\u0646\u064a\u062a\u064a\u0646"],"%d \u062b\u0648\u0627\u0646","%d \u062b\u0627\u0646\u064a\u0629","%d \u062b\u0627\u0646\u064a\u0629"],m:["\u0623\u0642\u0644 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629","\u062f\u0642\u064a\u0642\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062f\u0642\u064a\u0642\u062a\u0627\u0646","\u062f\u0642\u064a\u0642\u062a\u064a\u0646"],"%d \u062f\u0642\u0627\u0626\u0642","%d \u062f\u0642\u064a\u0642\u0629","%d \u062f\u0642\u064a\u0642\u0629"],h:["\u0623\u0642\u0644 \u0645\u0646 \u0633\u0627\u0639\u0629","\u0633\u0627\u0639\u0629 \u0648\u0627\u062d\u062f\u0629",["\u0633\u0627\u0639\u062a\u0627\u0646","\u0633\u0627\u0639\u062a\u064a\u0646"],"%d \u0633\u0627\u0639\u0627\u062a","%d \u0633\u0627\u0639\u0629","%d \u0633\u0627\u0639\u0629"],d:["\u0623\u0642\u0644 \u0645\u0646 \u064a\u0648\u0645","\u064a\u0648\u0645 \u0648\u0627\u062d\u062f",["\u064a\u0648\u0645\u0627\u0646","\u064a\u0648\u0645\u064a\u0646"],"%d \u0623\u064a\u0627\u0645","%d \u064a\u0648\u0645\u064b\u0627","%d \u064a\u0648\u0645"],M:["\u0623\u0642\u0644 \u0645\u0646 \u0634\u0647\u0631","\u0634\u0647\u0631 \u0648\u0627\u062d\u062f",["\u0634\u0647\u0631\u0627\u0646","\u0634\u0647\u0631\u064a\u0646"],"%d \u0623\u0634\u0647\u0631","%d \u0634\u0647\u0631\u0627","%d \u0634\u0647\u0631"],y:["\u0623\u0642\u0644 \u0645\u0646 \u0639\u0627\u0645","\u0639\u0627\u0645 \u0648\u0627\u062d\u062f",["\u0639\u0627\u0645\u0627\u0646","\u0639\u0627\u0645\u064a\u0646"],"%d \u0623\u0639\u0648\u0627\u0645","%d \u0639\u0627\u0645\u064b\u0627","%d \u0639\u0627\u0645"]},xs=function(e){return function(a,t,s,n){var d=bs(a),r=js[e][bs(a)];return 2===d&&(r=r[t?0:1]),r.replace(/%d/i,a)}},Ps=["\u064a\u0646\u0627\u064a\u0631","\u0641\u0628\u0631\u0627\u064a\u0631","\u0645\u0627\u0631\u0633","\u0623\u0628\u0631\u064a\u0644","\u0645\u0627\u064a\u0648","\u064a\u0648\u0646\u064a\u0648","\u064a\u0648\u0644\u064a\u0648","\u0623\u063a\u0633\u0637\u0633","\u0633\u0628\u062a\u0645\u0628\u0631","\u0623\u0643\u062a\u0648\u0628\u0631","\u0646\u0648\u0641\u0645\u0628\u0631","\u062f\u064a\u0633\u0645\u0628\u0631"];e.defineLocale("ar-ly",{months:Ps,monthsShort:Ps,weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/\u200fM/\u200fYYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u064b\u0627 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0628\u0639\u062f %s",past:"\u0645\u0646\u0630 %s",s:xs("s"),ss:xs("s"),m:xs("m"),mm:xs("m"),h:xs("h"),hh:xs("h"),d:xs("d"),dd:xs("d"),M:xs("M"),MM:xs("M"),y:xs("y"),yy:xs("y")},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return Hs[e]}).replace(/,/g,"\u060c")},week:{dow:6,doy:12}}),e.defineLocale("ar-ma",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062a\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0627\u062d\u062f_\u0627\u062a\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:6,doy:12}});var Os={1:"\u0661",2:"\u0662",3:"\u0663",4:"\u0664",5:"\u0665",6:"\u0666",7:"\u0667",8:"\u0668",9:"\u0669",0:"\u0660"},Ws={"\u0661":"1","\u0662":"2","\u0663":"3","\u0664":"4","\u0665":"5","\u0666":"6","\u0667":"7","\u0668":"8","\u0669":"9","\u0660":"0"};e.defineLocale("ar-sa",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a\u0648_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648_\u0623\u063a\u0633\u0637\u0633_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a\u0648_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648_\u0623\u063a\u0633\u0637\u0633_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},preparse:function(e){return e.replace(/[\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660]/g,function(e){return Ws[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return Os[e]}).replace(/,/g,"\u060c")},week:{dow:0,doy:6}}),e.defineLocale("ar-tn",{months:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),monthsShort:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:1,doy:4}});var Es={1:"\u0661",2:"\u0662",3:"\u0663",4:"\u0664",5:"\u0665",6:"\u0666",7:"\u0667",8:"\u0668",9:"\u0669",0:"\u0660"},As={"\u0661":"1","\u0662":"2","\u0663":"3","\u0664":"4","\u0665":"5","\u0666":"6","\u0667":"7","\u0668":"8","\u0669":"9","\u0660":"0"},Fs=function(e){return 0===e?0:1===e?1:2===e?2:e%100>=3&&e%100<=10?3:e%100>=11?4:5},zs={s:["\u0623\u0642\u0644 \u0645\u0646 \u062b\u0627\u0646\u064a\u0629","\u062b\u0627\u0646\u064a\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062b\u0627\u0646\u064a\u062a\u0627\u0646","\u062b\u0627\u0646\u064a\u062a\u064a\u0646"],"%d \u062b\u0648\u0627\u0646","%d \u062b\u0627\u0646\u064a\u0629","%d \u062b\u0627\u0646\u064a\u0629"],m:["\u0623\u0642\u0644 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629","\u062f\u0642\u064a\u0642\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062f\u0642\u064a\u0642\u062a\u0627\u0646","\u062f\u0642\u064a\u0642\u062a\u064a\u0646"],"%d \u062f\u0642\u0627\u0626\u0642","%d \u062f\u0642\u064a\u0642\u0629","%d \u062f\u0642\u064a\u0642\u0629"],h:["\u0623\u0642\u0644 \u0645\u0646 \u0633\u0627\u0639\u0629","\u0633\u0627\u0639\u0629 \u0648\u0627\u062d\u062f\u0629",["\u0633\u0627\u0639\u062a\u0627\u0646","\u0633\u0627\u0639\u062a\u064a\u0646"],"%d \u0633\u0627\u0639\u0627\u062a","%d \u0633\u0627\u0639\u0629","%d \u0633\u0627\u0639\u0629"],d:["\u0623\u0642\u0644 \u0645\u0646 \u064a\u0648\u0645","\u064a\u0648\u0645 \u0648\u0627\u062d\u062f",["\u064a\u0648\u0645\u0627\u0646","\u064a\u0648\u0645\u064a\u0646"],"%d \u0623\u064a\u0627\u0645","%d \u064a\u0648\u0645\u064b\u0627","%d \u064a\u0648\u0645"],M:["\u0623\u0642\u0644 \u0645\u0646 \u0634\u0647\u0631","\u0634\u0647\u0631 \u0648\u0627\u062d\u062f",["\u0634\u0647\u0631\u0627\u0646","\u0634\u0647\u0631\u064a\u0646"],"%d \u0623\u0634\u0647\u0631","%d \u0634\u0647\u0631\u0627","%d \u0634\u0647\u0631"],y:["\u0623\u0642\u0644 \u0645\u0646 \u0639\u0627\u0645","\u0639\u0627\u0645 \u0648\u0627\u062d\u062f",["\u0639\u0627\u0645\u0627\u0646","\u0639\u0627\u0645\u064a\u0646"],"%d \u0623\u0639\u0648\u0627\u0645","%d \u0639\u0627\u0645\u064b\u0627","%d \u0639\u0627\u0645"]},Js=function(e){return function(a,t,s,n){var d=Fs(a),r=zs[e][Fs(a)];return 2===d&&(r=r[t?0:1]),r.replace(/%d/i,a)}},Ns=["\u064a\u0646\u0627\u064a\u0631","\u0641\u0628\u0631\u0627\u064a\u0631","\u0645\u0627\u0631\u0633","\u0623\u0628\u0631\u064a\u0644","\u0645\u0627\u064a\u0648","\u064a\u0648\u0646\u064a\u0648","\u064a\u0648\u0644\u064a\u0648","\u0623\u063a\u0633\u0637\u0633","\u0633\u0628\u062a\u0645\u0628\u0631","\u0623\u0643\u062a\u0648\u0628\u0631","\u0646\u0648\u0641\u0645\u0628\u0631","\u062f\u064a\u0633\u0645\u0628\u0631"];e.defineLocale("ar",{months:Ns,monthsShort:Ns,weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/\u200fM/\u200fYYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u064b\u0627 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0628\u0639\u062f %s",past:"\u0645\u0646\u0630 %s",s:Js("s"),ss:Js("s"),m:Js("m"),mm:Js("m"),h:Js("h"),hh:Js("h"),d:Js("d"),dd:Js("d"),M:Js("M"),MM:Js("M"),y:Js("y"),yy:Js("y")},preparse:function(e){return e.replace(/[\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660]/g,function(e){return As[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return Es[e]}).replace(/,/g,"\u060c")},week:{dow:6,doy:12}});var Rs={1:"-inci",5:"-inci",8:"-inci",70:"-inci",80:"-inci",2:"-nci",7:"-nci",20:"-nci",50:"-nci",3:"-\xfcnc\xfc",4:"-\xfcnc\xfc",100:"-\xfcnc\xfc",6:"-nc\u0131",9:"-uncu",10:"-uncu",30:"-uncu",60:"-\u0131nc\u0131",90:"-\u0131nc\u0131"};e.defineLocale("az",{months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekdays:"Bazar_Bazar ert\u0259si_\xc7\u0259r\u015f\u0259nb\u0259 ax\u015fam\u0131_\xc7\u0259r\u015f\u0259nb\u0259_C\xfcm\u0259 ax\u015fam\u0131_C\xfcm\u0259_\u015e\u0259nb\u0259".split("_"),weekdaysShort:"Baz_BzE_\xc7Ax_\xc7\u0259r_CAx_C\xfcm_\u015e\u0259n".split("_"),weekdaysMin:"Bz_BE_\xc7A_\xc7\u0259_CA_C\xfc_\u015e\u0259".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bug\xfcn saat] LT",nextDay:"[sabah saat] LT",nextWeek:"[g\u0259l\u0259n h\u0259ft\u0259] dddd [saat] LT",lastDay:"[d\xfcn\u0259n] LT",lastWeek:"[ke\xe7\u0259n h\u0259ft\u0259] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s \u0259vv\u0259l",s:"birne\xe7\u0259 saniyy\u0259",ss:"%d saniy\u0259",m:"bir d\u0259qiq\u0259",mm:"%d d\u0259qiq\u0259",h:"bir saat",hh:"%d saat",d:"bir g\xfcn",dd:"%d g\xfcn",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},meridiemParse:/gec\u0259|s\u0259h\u0259r|g\xfcnd\xfcz|ax\u015fam/,isPM:function(e){return/^(g\xfcnd\xfcz|ax\u015fam)$/.test(e)},meridiem:function(e,a,t){return e<4?"gec\u0259":e<12?"s\u0259h\u0259r":e<17?"g\xfcnd\xfcz":"ax\u015fam"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0131nc\u0131|inci|nci|\xfcnc\xfc|nc\u0131|uncu)/,ordinal:function(e){if(0===e)return e+"-\u0131nc\u0131";var a=e%10;return e+(Rs[a]||Rs[e%100-a]||Rs[e>=100?100:null])},week:{dow:1,doy:7}}),e.defineLocale("be",{months:{format:"\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f_\u043b\u044e\u0442\u0430\u0433\u0430_\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430_\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430_\u0442\u0440\u0430\u045e\u043d\u044f_\u0447\u044d\u0440\u0432\u0435\u043d\u044f_\u043b\u0456\u043f\u0435\u043d\u044f_\u0436\u043d\u0456\u045e\u043d\u044f_\u0432\u0435\u0440\u0430\u0441\u043d\u044f_\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430_\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430_\u0441\u043d\u0435\u0436\u043d\u044f".split("_"),standalone:"\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044c_\u043b\u044e\u0442\u044b_\u0441\u0430\u043a\u0430\u0432\u0456\u043a_\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a_\u0442\u0440\u0430\u0432\u0435\u043d\u044c_\u0447\u044d\u0440\u0432\u0435\u043d\u044c_\u043b\u0456\u043f\u0435\u043d\u044c_\u0436\u043d\u0456\u0432\u0435\u043d\u044c_\u0432\u0435\u0440\u0430\u0441\u0435\u043d\u044c_\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a_\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434_\u0441\u043d\u0435\u0436\u0430\u043d\u044c".split("_")},monthsShort:"\u0441\u0442\u0443\u0434_\u043b\u044e\u0442_\u0441\u0430\u043a_\u043a\u0440\u0430\u0441_\u0442\u0440\u0430\u0432_\u0447\u044d\u0440\u0432_\u043b\u0456\u043f_\u0436\u043d\u0456\u0432_\u0432\u0435\u0440_\u043a\u0430\u0441\u0442_\u043b\u0456\u0441\u0442_\u0441\u043d\u0435\u0436".split("_"),weekdays:{format:"\u043d\u044f\u0434\u0437\u0435\u043b\u044e_\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a_\u0430\u045e\u0442\u043e\u0440\u0430\u043a_\u0441\u0435\u0440\u0430\u0434\u0443_\u0447\u0430\u0446\u0432\u0435\u0440_\u043f\u044f\u0442\u043d\u0456\u0446\u0443_\u0441\u0443\u0431\u043e\u0442\u0443".split("_"),standalone:"\u043d\u044f\u0434\u0437\u0435\u043b\u044f_\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a_\u0430\u045e\u0442\u043e\u0440\u0430\u043a_\u0441\u0435\u0440\u0430\u0434\u0430_\u0447\u0430\u0446\u0432\u0435\u0440_\u043f\u044f\u0442\u043d\u0456\u0446\u0430_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),isFormat:/\[ ?[\u0412\u0432] ?(?:\u043c\u0456\u043d\u0443\u043b\u0443\u044e|\u043d\u0430\u0441\u0442\u0443\u043f\u043d\u0443\u044e)? ?\] ?dddd/},weekdaysShort:"\u043d\u0434_\u043f\u043d_\u0430\u0442_\u0441\u0440_\u0447\u0446_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0430\u0442_\u0441\u0440_\u0447\u0446_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0433.",LLL:"D MMMM YYYY \u0433., HH:mm",LLLL:"dddd, D MMMM YYYY \u0433., HH:mm"},calendar:{sameDay:"[\u0421\u0451\u043d\u043d\u044f \u045e] LT",nextDay:"[\u0417\u0430\u045e\u0442\u0440\u0430 \u045e] LT",lastDay:"[\u0423\u0447\u043e\u0440\u0430 \u045e] LT",nextWeek:function(){return"[\u0423] dddd [\u045e] LT"},lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return"[\u0423 \u043c\u0456\u043d\u0443\u043b\u0443\u044e] dddd [\u045e] LT";case 1:case 2:case 4:return"[\u0423 \u043c\u0456\u043d\u0443\u043b\u044b] dddd [\u045e] LT"}},sameElse:"L"},relativeTime:{future:"\u043f\u0440\u0430\u0437 %s",past:"%s \u0442\u0430\u043c\u0443",s:"\u043d\u0435\u043a\u0430\u043b\u044c\u043a\u0456 \u0441\u0435\u043a\u0443\u043d\u0434",m:qe,mm:qe,h:qe,hh:qe,d:"\u0434\u0437\u0435\u043d\u044c",dd:qe,M:"\u043c\u0435\u0441\u044f\u0446",MM:qe,y:"\u0433\u043e\u0434",yy:qe},meridiemParse:/\u043d\u043e\u0447\u044b|\u0440\u0430\u043d\u0456\u0446\u044b|\u0434\u043d\u044f|\u0432\u0435\u0447\u0430\u0440\u0430/,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u0430\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u044b":e<12?"\u0440\u0430\u043d\u0456\u0446\u044b":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u0430\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0456|\u044b|\u0433\u0430)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":case"w":case"W":return e%10!=2&&e%10!=3||e%100==12||e%100==13?e+"-\u044b":e+"-\u0456";case"D":return e+"-\u0433\u0430";default:return e}},week:{dow:1,doy:7}}),e.defineLocale("bg",{months:"\u044f\u043d\u0443\u0430\u0440\u0438_\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0439_\u044e\u043d\u0438_\u044e\u043b\u0438_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438_\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438_\u043d\u043e\u0435\u043c\u0432\u0440\u0438_\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438".split("_"),monthsShort:"\u044f\u043d\u0440_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0439_\u044e\u043d\u0438_\u044e\u043b\u0438_\u0430\u0432\u0433_\u0441\u0435\u043f_\u043e\u043a\u0442_\u043d\u043e\u0435_\u0434\u0435\u043a".split("_"),weekdays:"\u043d\u0435\u0434\u0435\u043b\u044f_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u044f\u0434\u0430_\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a_\u043f\u0435\u0442\u044a\u043a_\u0441\u044a\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434_\u043f\u043e\u043d_\u0432\u0442\u043e_\u0441\u0440\u044f_\u0447\u0435\u0442_\u043f\u0435\u0442_\u0441\u044a\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[\u0414\u043d\u0435\u0441 \u0432] LT",nextDay:"[\u0423\u0442\u0440\u0435 \u0432] LT",nextWeek:"dddd [\u0432] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430 \u0432] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[\u0412 \u0438\u0437\u043c\u0438\u043d\u0430\u043b\u0430\u0442\u0430] dddd [\u0432] LT";case 1:case 2:case 4:case 5:return"[\u0412 \u0438\u0437\u043c\u0438\u043d\u0430\u043b\u0438\u044f] dddd [\u0432] LT"}},sameElse:"L"},relativeTime:{future:"\u0441\u043b\u0435\u0434 %s",past:"\u043f\u0440\u0435\u0434\u0438 %s",s:"\u043d\u044f\u043a\u043e\u043b\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434\u0438",m:"\u043c\u0438\u043d\u0443\u0442\u0430",mm:"%d \u043c\u0438\u043d\u0443\u0442\u0438",h:"\u0447\u0430\u0441",hh:"%d \u0447\u0430\u0441\u0430",d:"\u0434\u0435\u043d",dd:"%d \u0434\u043d\u0438",M:"\u043c\u0435\u0441\u0435\u0446",MM:"%d \u043c\u0435\u0441\u0435\u0446\u0430",y:"\u0433\u043e\u0434\u0438\u043d\u0430",yy:"%d \u0433\u043e\u0434\u0438\u043d\u0438"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0435\u0432|\u0435\u043d|\u0442\u0438|\u0432\u0438|\u0440\u0438|\u043c\u0438)/,ordinal:function(e){var a=e%10,t=e%100;return 0===e?e+"-\u0435\u0432":0===t?e+"-\u0435\u043d":t>10&&t<20?e+"-\u0442\u0438":1===a?e+"-\u0432\u0438":2===a?e+"-\u0440\u0438":7===a||8===a?e+"-\u043c\u0438":e+"-\u0442\u0438"},week:{dow:1,doy:7}}),e.defineLocale("bm",{months:"Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_M\u025bkalo_Zuw\u025bnkalo_Zuluyekalo_Utikalo_S\u025btanburukalo_\u0254kut\u0254burukalo_Nowanburukalo_Desanburukalo".split("_"),monthsShort:"Zan_Few_Mar_Awi_M\u025b_Zuw_Zul_Uti_S\u025bt_\u0254ku_Now_Des".split("_"),weekdays:"Kari_Nt\u025bn\u025bn_Tarata_Araba_Alamisa_Juma_Sibiri".split("_"),weekdaysShort:"Kar_Nt\u025b_Tar_Ara_Ala_Jum_Sib".split("_"),weekdaysMin:"Ka_Nt_Ta_Ar_Al_Ju_Si".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"MMMM [tile] D [san] YYYY",LLL:"MMMM [tile] D [san] YYYY [l\u025br\u025b] HH:mm",LLLL:"dddd MMMM [tile] D [san] YYYY [l\u025br\u025b] HH:mm"},calendar:{sameDay:"[Bi l\u025br\u025b] LT",nextDay:"[Sini l\u025br\u025b] LT",nextWeek:"dddd [don l\u025br\u025b] LT",lastDay:"[Kunu l\u025br\u025b] LT",lastWeek:"dddd [t\u025bm\u025bnen l\u025br\u025b] LT",sameElse:"L"},relativeTime:{future:"%s k\u0254n\u0254",past:"a b\u025b %s b\u0254",s:"sanga dama dama",ss:"sekondi %d",m:"miniti kelen",mm:"miniti %d",h:"l\u025br\u025b kelen",hh:"l\u025br\u025b %d",d:"tile kelen",dd:"tile %d",M:"kalo kelen",MM:"kalo %d",y:"san kelen",yy:"san %d"},week:{dow:1,doy:4}});var Is={1:"\u09e7",2:"\u09e8",3:"\u09e9",4:"\u09ea",5:"\u09eb",6:"\u09ec",7:"\u09ed",8:"\u09ee",9:"\u09ef",0:"\u09e6"},Cs={"\u09e7":"1","\u09e8":"2","\u09e9":"3","\u09ea":"4","\u09eb":"5","\u09ec":"6","\u09ed":"7","\u09ee":"8","\u09ef":"9","\u09e6":"0"};e.defineLocale("bn",{months:"\u099c\u09be\u09a8\u09c1\u09df\u09be\u09b0\u09c0_\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09df\u09be\u09b0\u09bf_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0\u09bf\u09b2_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2\u09be\u0987_\u0986\u0997\u09b8\u09cd\u099f_\u09b8\u09c7\u09aa\u09cd\u099f\u09c7\u09ae\u09cd\u09ac\u09b0_\u0985\u0995\u09cd\u099f\u09cb\u09ac\u09b0_\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0_\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0".split("_"),monthsShort:"\u099c\u09be\u09a8\u09c1_\u09ab\u09c7\u09ac_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2_\u0986\u0997_\u09b8\u09c7\u09aa\u09cd\u099f_\u0985\u0995\u09cd\u099f\u09cb_\u09a8\u09ad\u09c7_\u09a1\u09bf\u09b8\u09c7".split("_"),weekdays:"\u09b0\u09ac\u09bf\u09ac\u09be\u09b0_\u09b8\u09cb\u09ae\u09ac\u09be\u09b0_\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0_\u09ac\u09c1\u09a7\u09ac\u09be\u09b0_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0_\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0_\u09b6\u09a8\u09bf\u09ac\u09be\u09b0".split("_"),weekdaysShort:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997\u09b2_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),weekdaysMin:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9\u0983_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),longDateFormat:{LT:"A h:mm \u09b8\u09ae\u09df",LTS:"A h:mm:ss \u09b8\u09ae\u09df",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u09b8\u09ae\u09df",LLLL:"dddd, D MMMM YYYY, A h:mm \u09b8\u09ae\u09df"},calendar:{sameDay:"[\u0986\u099c] LT",nextDay:"[\u0986\u0997\u09be\u09ae\u09c0\u0995\u09be\u09b2] LT",nextWeek:"dddd, LT",lastDay:"[\u0997\u09a4\u0995\u09be\u09b2] LT",lastWeek:"[\u0997\u09a4] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u09aa\u09b0\u09c7",past:"%s \u0986\u0997\u09c7",s:"\u0995\u09df\u09c7\u0995 \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",ss:"%d \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",m:"\u098f\u0995 \u09ae\u09bf\u09a8\u09bf\u099f",mm:"%d \u09ae\u09bf\u09a8\u09bf\u099f",h:"\u098f\u0995 \u0998\u09a8\u09cd\u099f\u09be",hh:"%d \u0998\u09a8\u09cd\u099f\u09be",d:"\u098f\u0995 \u09a6\u09bf\u09a8",dd:"%d \u09a6\u09bf\u09a8",M:"\u098f\u0995 \u09ae\u09be\u09b8",MM:"%d \u09ae\u09be\u09b8",y:"\u098f\u0995 \u09ac\u099b\u09b0",yy:"%d \u09ac\u099b\u09b0"},preparse:function(e){return e.replace(/[\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef\u09e6]/g,function(e){return Cs[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Is[e]})},meridiemParse:/\u09b0\u09be\u09a4|\u09b8\u0995\u09be\u09b2|\u09a6\u09c1\u09aa\u09c1\u09b0|\u09ac\u09bf\u0995\u09be\u09b2|\u09b0\u09be\u09a4/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u09b0\u09be\u09a4"===a&&e>=4||"\u09a6\u09c1\u09aa\u09c1\u09b0"===a&&e<5||"\u09ac\u09bf\u0995\u09be\u09b2"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u09b0\u09be\u09a4":e<10?"\u09b8\u0995\u09be\u09b2":e<17?"\u09a6\u09c1\u09aa\u09c1\u09b0":e<20?"\u09ac\u09bf\u0995\u09be\u09b2":"\u09b0\u09be\u09a4"},week:{dow:0,doy:6}});var Gs={1:"\u0f21",2:"\u0f22",3:"\u0f23",4:"\u0f24",5:"\u0f25",6:"\u0f26",7:"\u0f27",8:"\u0f28",9:"\u0f29",0:"\u0f20"},Us={"\u0f21":"1","\u0f22":"2","\u0f23":"3","\u0f24":"4","\u0f25":"5","\u0f26":"6","\u0f27":"7","\u0f28":"8","\u0f29":"9","\u0f20":"0"};e.defineLocale("bo",{months:"\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f66\u0f74\u0f58\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f5e\u0f72\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f63\u0f94\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0fb2\u0f74\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f62\u0f92\u0fb1\u0f51\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f42\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f45\u0f72\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54".split("_"),monthsShort:"\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f66\u0f74\u0f58\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f5e\u0f72\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f63\u0f94\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0fb2\u0f74\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f62\u0f92\u0fb1\u0f51\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f42\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f45\u0f72\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54".split("_"),weekdays:"\u0f42\u0f5f\u0f60\u0f0b\u0f49\u0f72\u0f0b\u0f58\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f5f\u0fb3\u0f0b\u0f56\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f58\u0f72\u0f42\u0f0b\u0f51\u0f58\u0f62\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f63\u0fb7\u0f42\u0f0b\u0f54\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f55\u0f74\u0f62\u0f0b\u0f56\u0f74_\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b".split("_"),weekdaysShort:"\u0f49\u0f72\u0f0b\u0f58\u0f0b_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b_\u0f58\u0f72\u0f42\u0f0b\u0f51\u0f58\u0f62\u0f0b_\u0f63\u0fb7\u0f42\u0f0b\u0f54\u0f0b_\u0f55\u0f74\u0f62\u0f0b\u0f56\u0f74_\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b_\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b".split("_"),weekdaysMin:"\u0f49\u0f72\u0f0b\u0f58\u0f0b_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b_\u0f58\u0f72\u0f42\u0f0b\u0f51\u0f58\u0f62\u0f0b_\u0f63\u0fb7\u0f42\u0f0b\u0f54\u0f0b_\u0f55\u0f74\u0f62\u0f0b\u0f56\u0f74_\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b_\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0f51\u0f72\u0f0b\u0f62\u0f72\u0f44] LT",nextDay:"[\u0f66\u0f44\u0f0b\u0f49\u0f72\u0f53] LT",nextWeek:"[\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f55\u0fb2\u0f42\u0f0b\u0f62\u0f97\u0f7a\u0f66\u0f0b\u0f58], LT",lastDay:"[\u0f41\u0f0b\u0f66\u0f44] LT",lastWeek:"[\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f55\u0fb2\u0f42\u0f0b\u0f58\u0f50\u0f60\u0f0b\u0f58] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0f63\u0f0b",past:"%s \u0f66\u0f94\u0f53\u0f0b\u0f63",s:"\u0f63\u0f58\u0f0b\u0f66\u0f44",ss:"%d \u0f66\u0f90\u0f62\u0f0b\u0f46\u0f0d",m:"\u0f66\u0f90\u0f62\u0f0b\u0f58\u0f0b\u0f42\u0f45\u0f72\u0f42",mm:"%d \u0f66\u0f90\u0f62\u0f0b\u0f58",h:"\u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51\u0f0b\u0f42\u0f45\u0f72\u0f42",hh:"%d \u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51",d:"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f45\u0f72\u0f42",dd:"%d \u0f49\u0f72\u0f53\u0f0b",M:"\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f45\u0f72\u0f42",MM:"%d \u0f5f\u0fb3\u0f0b\u0f56",y:"\u0f63\u0f7c\u0f0b\u0f42\u0f45\u0f72\u0f42",yy:"%d \u0f63\u0f7c"},preparse:function(e){return e.replace(/[\u0f21\u0f22\u0f23\u0f24\u0f25\u0f26\u0f27\u0f28\u0f29\u0f20]/g,function(e){return Us[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Gs[e]})},meridiemParse:/\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c|\u0f5e\u0f7c\u0f42\u0f66\u0f0b\u0f40\u0f66|\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44|\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42|\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c"===a&&e>=4||"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44"===a&&e<5||"\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c":e<10?"\u0f5e\u0f7c\u0f42\u0f66\u0f0b\u0f40\u0f66":e<17?"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44":e<20?"\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42":"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c"},week:{dow:0,doy:6}}),e.defineLocale("br",{months:"Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),monthsShort:"Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdays:"Sul_Lun_Meurzh_Merc'her_Yaou_Gwener_Sadorn".split("_"),weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h[e]mm A",LTS:"h[e]mm:ss A",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY h[e]mm A",LLLL:"dddd, D [a viz] MMMM YYYY h[e]mm A"},calendar:{sameDay:"[Hiziv da] LT",nextDay:"[Warc'hoazh da] LT",nextWeek:"dddd [da] LT",lastDay:"[Dec'h da] LT",lastWeek:"dddd [paset da] LT",sameElse:"L"},relativeTime:{future:"a-benn %s",past:"%s 'zo",s:"un nebeud segondenno\xf9",ss:"%d eilenn",m:"ur vunutenn",mm:Qe,h:"un eur",hh:"%d eur",d:"un devezh",dd:Qe,M:"ur miz",MM:Qe,y:"ur bloaz",yy:function(e){switch(Xe(e)){case 1:case 3:case 4:case 5:case 9:return e+" bloaz";default:return e+" vloaz"}}},dayOfMonthOrdinalParse:/\d{1,2}(a\xf1|vet)/,ordinal:function(e){return e+(1===e?"a\xf1":"vet")},week:{dow:1,doy:4}}),e.defineLocale("bs",{months:"januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010der u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[pro\u0161lu] dddd [u] LT";case 6:return"[pro\u0161le] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[pro\u0161li] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",ss:ea,m:ea,mm:ea,h:ea,hh:ea,d:"dan",dd:ea,M:"mjesec",MM:ea,y:"godinu",yy:ea},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),e.defineLocale("ca",{months:{standalone:"gener_febrer_mar\xe7_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),format:"de gener_de febrer_de mar\xe7_d'abril_de maig_de juny_de juliol_d'agost_de setembre_d'octubre_de novembre_de desembre".split("_"),isFormat:/D[oD]?(\s)+MMMM/},monthsShort:"gen._febr._mar\xe7_abr._maig_juny_jul._ag._set._oct._nov._des.".split("_"),monthsParseExact:!0,weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"dg_dl_dt_dc_dj_dv_ds".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [de] YYYY",ll:"D MMM YYYY",LLL:"D MMMM [de] YYYY [a les] H:mm",lll:"D MMM YYYY, H:mm",LLLL:"dddd D MMMM [de] YYYY [a les] H:mm",llll:"ddd D MMM YYYY, H:mm"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[dem\xe0 a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"d'aqu\xed %s",past:"fa %s",s:"uns segons",ss:"%d segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},dayOfMonthOrdinalParse:/\d{1,2}(r|n|t|\xe8|a)/,ordinal:function(e,a){var t=1===e?"r":2===e?"n":3===e?"r":4===e?"t":"\xe8";return"w"!==a&&"W"!==a||(t="a"),e+t},week:{dow:1,doy:4}});var Vs="leden_\xfanor_b\u0159ezen_duben_kv\u011bten_\u010derven_\u010dervenec_srpen_z\xe1\u0159\xed_\u0159\xedjen_listopad_prosinec".split("_"),Ks="led_\xfano_b\u0159e_dub_kv\u011b_\u010dvn_\u010dvc_srp_z\xe1\u0159_\u0159\xedj_lis_pro".split("_");e.defineLocale("cs",{months:Vs,monthsShort:Ks,monthsParse:function(e,a){var t,s=[];for(t=0;t<12;t++)s[t]=new RegExp("^"+e[t]+"$|^"+a[t]+"$","i");return s}(Vs,Ks),shortMonthsParse:function(e){var a,t=[];for(a=0;a<12;a++)t[a]=new RegExp("^"+e[a]+"$","i");return t}(Ks),longMonthsParse:function(e){var a,t=[];for(a=0;a<12;a++)t[a]=new RegExp("^"+e[a]+"$","i");return t}(Vs),weekdays:"ned\u011ble_pond\u011bl\xed_\xfater\xfd_st\u0159eda_\u010dtvrtek_p\xe1tek_sobota".split("_"),weekdaysShort:"ne_po_\xfat_st_\u010dt_p\xe1_so".split("_"),weekdaysMin:"ne_po_\xfat_st_\u010dt_p\xe1_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm",l:"D. M. YYYY"},calendar:{sameDay:"[dnes v] LT",nextDay:"[z\xedtra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v ned\u011bli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve st\u0159edu v] LT";case 4:return"[ve \u010dtvrtek v] LT";case 5:return"[v p\xe1tek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[v\u010dera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou ned\u011bli v] LT";case 1:case 2:return"[minul\xe9] dddd [v] LT";case 3:return"[minulou st\u0159edu v] LT";case 4:case 5:return"[minul\xfd] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"p\u0159ed %s",s:ta,ss:ta,m:ta,mm:ta,h:ta,hh:ta,d:ta,dd:ta,M:ta,MM:ta,y:ta,yy:ta},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("cv",{months:"\u043a\u04d1\u0440\u043b\u0430\u0447_\u043d\u0430\u0440\u04d1\u0441_\u043f\u0443\u0448_\u0430\u043a\u0430_\u043c\u0430\u0439_\u04ab\u04d7\u0440\u0442\u043c\u0435_\u0443\u0442\u04d1_\u04ab\u0443\u0440\u043b\u0430_\u0430\u0432\u04d1\u043d_\u044e\u043f\u0430_\u0447\u04f3\u043a_\u0440\u0430\u0448\u0442\u0430\u0432".split("_"),monthsShort:"\u043a\u04d1\u0440_\u043d\u0430\u0440_\u043f\u0443\u0448_\u0430\u043a\u0430_\u043c\u0430\u0439_\u04ab\u04d7\u0440_\u0443\u0442\u04d1_\u04ab\u0443\u0440_\u0430\u0432\u043d_\u044e\u043f\u0430_\u0447\u04f3\u043a_\u0440\u0430\u0448".split("_"),weekdays:"\u0432\u044b\u0440\u0441\u0430\u0440\u043d\u0438\u043a\u0443\u043d_\u0442\u0443\u043d\u0442\u0438\u043a\u0443\u043d_\u044b\u0442\u043b\u0430\u0440\u0438\u043a\u0443\u043d_\u044e\u043d\u043a\u0443\u043d_\u043a\u04d7\u04ab\u043d\u0435\u0440\u043d\u0438\u043a\u0443\u043d_\u044d\u0440\u043d\u0435\u043a\u0443\u043d_\u0448\u04d1\u043c\u0430\u0442\u043a\u0443\u043d".split("_"),weekdaysShort:"\u0432\u044b\u0440_\u0442\u0443\u043d_\u044b\u0442\u043b_\u044e\u043d_\u043a\u04d7\u04ab_\u044d\u0440\u043d_\u0448\u04d1\u043c".split("_"),weekdaysMin:"\u0432\u0440_\u0442\u043d_\u044b\u0442_\u044e\u043d_\u043a\u04ab_\u044d\u0440_\u0448\u043c".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7]",LLL:"YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7], HH:mm",LLLL:"dddd, YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7], HH:mm"},calendar:{sameDay:"[\u041f\u0430\u044f\u043d] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",nextDay:"[\u042b\u0440\u0430\u043d] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",lastDay:"[\u04d6\u043d\u0435\u0440] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",nextWeek:"[\u04aa\u0438\u0442\u0435\u0441] dddd LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",lastWeek:"[\u0418\u0440\u0442\u043d\u04d7] dddd LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",sameElse:"L"},relativeTime:{future:function(e){return e+(/\u0441\u0435\u0445\u0435\u0442$/i.exec(e)?"\u0440\u0435\u043d":/\u04ab\u0443\u043b$/i.exec(e)?"\u0442\u0430\u043d":"\u0440\u0430\u043d")},past:"%s \u043a\u0430\u044f\u043b\u043b\u0430",s:"\u043f\u04d7\u0440-\u0438\u043a \u04ab\u0435\u043a\u043a\u0443\u043d\u0442",ss:"%d \u04ab\u0435\u043a\u043a\u0443\u043d\u0442",m:"\u043f\u04d7\u0440 \u043c\u0438\u043d\u0443\u0442",mm:"%d \u043c\u0438\u043d\u0443\u0442",h:"\u043f\u04d7\u0440 \u0441\u0435\u0445\u0435\u0442",hh:"%d \u0441\u0435\u0445\u0435\u0442",d:"\u043f\u04d7\u0440 \u043a\u0443\u043d",dd:"%d \u043a\u0443\u043d",M:"\u043f\u04d7\u0440 \u0443\u0439\u04d1\u0445",MM:"%d \u0443\u0439\u04d1\u0445",y:"\u043f\u04d7\u0440 \u04ab\u0443\u043b",yy:"%d \u04ab\u0443\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-\u043c\u04d7\u0448/,ordinal:"%d-\u043c\u04d7\u0448",week:{dow:1,doy:7}}),e.defineLocale("cy",{months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Heddiw am] LT",nextDay:"[Yfory am] LT",nextWeek:"dddd [am] LT",lastDay:"[Ddoe am] LT",lastWeek:"dddd [diwethaf am] LT",sameElse:"L"},relativeTime:{future:"mewn %s",past:"%s yn \xf4l",s:"ychydig eiliadau",ss:"%d eiliad",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"},dayOfMonthOrdinalParse:/\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,ordinal:function(e){var a="";return e>20?a=40===e||50===e||60===e||80===e||100===e?"fed":"ain":e>0&&(a=["","af","il","ydd","ydd","ed","ed","ed","fed","fed","fed","eg","fed","eg","eg","fed","eg","eg","fed","eg","fed"][e]),e+a},week:{dow:1,doy:4}}),e.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"s\xf8ndag_mandag_tirsdag_onsdag_torsdag_fredag_l\xf8rdag".split("_"),weekdaysShort:"s\xf8n_man_tir_ons_tor_fre_l\xf8r".split("_"),weekdaysMin:"s\xf8_ma_ti_on_to_fr_l\xf8".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"p\xe5 dddd [kl.] LT",lastDay:"[i g\xe5r kl.] LT",lastWeek:"[i] dddd[s kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"f\xe5 sekunder",ss:"%d sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en m\xe5ned",MM:"%d m\xe5neder",y:"et \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("de-at",{months:"J\xe4nner_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"J\xe4n._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:sa,mm:"%d Minuten",h:sa,hh:"%d Stunden",d:sa,dd:sa,M:sa,MM:sa,y:sa,yy:sa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("de-ch",{months:"Januar_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:na,mm:"%d Minuten",h:na,hh:"%d Stunden",d:na,dd:na,M:na,MM:na,y:na,yy:na},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("de",{months:"Januar_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:da,mm:"%d Minuten",h:da,hh:"%d Stunden",d:da,dd:da,M:da,MM:da,y:da,yy:da},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Zs=["\u0796\u07ac\u0782\u07aa\u0787\u07a6\u0783\u07a9","\u078a\u07ac\u0784\u07b0\u0783\u07aa\u0787\u07a6\u0783\u07a9","\u0789\u07a7\u0783\u07a8\u0797\u07aa","\u0787\u07ad\u0795\u07b0\u0783\u07a9\u078d\u07aa","\u0789\u07ad","\u0796\u07ab\u0782\u07b0","\u0796\u07aa\u078d\u07a6\u0787\u07a8","\u0787\u07af\u078e\u07a6\u0790\u07b0\u0793\u07aa","\u0790\u07ac\u0795\u07b0\u0793\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa","\u0787\u07ae\u0786\u07b0\u0793\u07af\u0784\u07a6\u0783\u07aa","\u0782\u07ae\u0788\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa","\u0791\u07a8\u0790\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa"],$s=["\u0787\u07a7\u078b\u07a8\u0787\u07b0\u078c\u07a6","\u0780\u07af\u0789\u07a6","\u0787\u07a6\u0782\u07b0\u078e\u07a7\u0783\u07a6","\u0784\u07aa\u078b\u07a6","\u0784\u07aa\u0783\u07a7\u0790\u07b0\u078a\u07a6\u078c\u07a8","\u0780\u07aa\u0786\u07aa\u0783\u07aa","\u0780\u07ae\u0782\u07a8\u0780\u07a8\u0783\u07aa"];e.defineLocale("dv",{months:Zs,monthsShort:Zs,weekdays:$s,weekdaysShort:$s,weekdaysMin:"\u0787\u07a7\u078b\u07a8_\u0780\u07af\u0789\u07a6_\u0787\u07a6\u0782\u07b0_\u0784\u07aa\u078b\u07a6_\u0784\u07aa\u0783\u07a7_\u0780\u07aa\u0786\u07aa_\u0780\u07ae\u0782\u07a8".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/M/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0789\u0786|\u0789\u078a/,isPM:function(e){return"\u0789\u078a"===e},meridiem:function(e,a,t){return e<12?"\u0789\u0786":"\u0789\u078a"},calendar:{sameDay:"[\u0789\u07a8\u0787\u07a6\u078b\u07aa] LT",nextDay:"[\u0789\u07a7\u078b\u07a6\u0789\u07a7] LT",nextWeek:"dddd LT",lastDay:"[\u0787\u07a8\u0787\u07b0\u0794\u07ac] LT",lastWeek:"[\u078a\u07a7\u0787\u07a8\u078c\u07aa\u0788\u07a8] dddd LT",sameElse:"L"},relativeTime:{future:"\u078c\u07ac\u0783\u07ad\u078e\u07a6\u0787\u07a8 %s",past:"\u0786\u07aa\u0783\u07a8\u0782\u07b0 %s",s:"\u0790\u07a8\u0786\u07aa\u0782\u07b0\u078c\u07aa\u0786\u07ae\u0785\u07ac\u0787\u07b0",ss:"d% \u0790\u07a8\u0786\u07aa\u0782\u07b0\u078c\u07aa",m:"\u0789\u07a8\u0782\u07a8\u0793\u07ac\u0787\u07b0",mm:"\u0789\u07a8\u0782\u07a8\u0793\u07aa %d",h:"\u078e\u07a6\u0791\u07a8\u0787\u07a8\u0783\u07ac\u0787\u07b0",hh:"\u078e\u07a6\u0791\u07a8\u0787\u07a8\u0783\u07aa %d",d:"\u078b\u07aa\u0788\u07a6\u0780\u07ac\u0787\u07b0",dd:"\u078b\u07aa\u0788\u07a6\u0790\u07b0 %d",M:"\u0789\u07a6\u0780\u07ac\u0787\u07b0",MM:"\u0789\u07a6\u0790\u07b0 %d",y:"\u0787\u07a6\u0780\u07a6\u0783\u07ac\u0787\u07b0",yy:"\u0787\u07a6\u0780\u07a6\u0783\u07aa %d"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:7,doy:12}}),e.defineLocale("el",{monthsNominativeEl:"\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2_\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2_\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2_\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2_\u039c\u03ac\u03b9\u03bf\u03c2_\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2_\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2_\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2_\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2_\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2_\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2_\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2".split("_"),monthsGenitiveEl:"\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5_\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5_\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5_\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5_\u039c\u03b1\u0390\u03bf\u03c5_\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5_\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5_\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5_\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5_\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5_\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5_\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5".split("_"),months:function(e,a){return e?"string"==typeof a&&/D/.test(a.substring(0,a.indexOf("MMMM")))?this._monthsGenitiveEl[e.month()]:this._monthsNominativeEl[e.month()]:this._monthsNominativeEl},monthsShort:"\u0399\u03b1\u03bd_\u03a6\u03b5\u03b2_\u039c\u03b1\u03c1_\u0391\u03c0\u03c1_\u039c\u03b1\u03ca_\u0399\u03bf\u03c5\u03bd_\u0399\u03bf\u03c5\u03bb_\u0391\u03c5\u03b3_\u03a3\u03b5\u03c0_\u039f\u03ba\u03c4_\u039d\u03bf\u03b5_\u0394\u03b5\u03ba".split("_"),weekdays:"\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae_\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1_\u03a4\u03c1\u03af\u03c4\u03b7_\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7_\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7_\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae_\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf".split("_"),weekdaysShort:"\u039a\u03c5\u03c1_\u0394\u03b5\u03c5_\u03a4\u03c1\u03b9_\u03a4\u03b5\u03c4_\u03a0\u03b5\u03bc_\u03a0\u03b1\u03c1_\u03a3\u03b1\u03b2".split("_"),weekdaysMin:"\u039a\u03c5_\u0394\u03b5_\u03a4\u03c1_\u03a4\u03b5_\u03a0\u03b5_\u03a0\u03b1_\u03a3\u03b1".split("_"),meridiem:function(e,a,t){return e>11?t?"\u03bc\u03bc":"\u039c\u039c":t?"\u03c0\u03bc":"\u03a0\u039c"},isPM:function(e){return"\u03bc"===(e+"").toLowerCase()[0]},meridiemParse:/[\u03a0\u039c]\.?\u039c?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendarEl:{sameDay:"[\u03a3\u03ae\u03bc\u03b5\u03c1\u03b1 {}] LT",nextDay:"[\u0391\u03cd\u03c1\u03b9\u03bf {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[\u03a7\u03b8\u03b5\u03c2 {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[\u03c4\u03bf \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf] dddd [{}] LT";default:return"[\u03c4\u03b7\u03bd \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03b7] dddd [{}] LT"}},sameElse:"L"},calendar:function(e,a){var t=this._calendarEl[e],s=a&&a.hours();return D(t)&&(t=t.apply(a)),t.replace("{}",s%12==1?"\u03c3\u03c4\u03b7":"\u03c3\u03c4\u03b9\u03c2")},relativeTime:{future:"\u03c3\u03b5 %s",past:"%s \u03c0\u03c1\u03b9\u03bd",s:"\u03bb\u03af\u03b3\u03b1 \u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1",ss:"%d \u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1",m:"\u03ad\u03bd\u03b1 \u03bb\u03b5\u03c0\u03c4\u03cc",mm:"%d \u03bb\u03b5\u03c0\u03c4\u03ac",h:"\u03bc\u03af\u03b1 \u03ce\u03c1\u03b1",hh:"%d \u03ce\u03c1\u03b5\u03c2",d:"\u03bc\u03af\u03b1 \u03bc\u03ad\u03c1\u03b1",dd:"%d \u03bc\u03ad\u03c1\u03b5\u03c2",M:"\u03ad\u03bd\u03b1\u03c2 \u03bc\u03ae\u03bd\u03b1\u03c2",MM:"%d \u03bc\u03ae\u03bd\u03b5\u03c2",y:"\u03ad\u03bd\u03b1\u03c2 \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2",yy:"%d \u03c7\u03c1\u03cc\u03bd\u03b9\u03b1"},dayOfMonthOrdinalParse:/\d{1,2}\u03b7/,ordinal:"%d\u03b7",week:{dow:1,doy:4}}),e.defineLocale("en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")}}),e.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("en-ie",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("en-nz",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("eo",{months:"januaro_februaro_marto_aprilo_majo_junio_julio_a\u016dgusto_septembro_oktobro_novembro_decembro".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_a\u016dg_sep_okt_nov_dec".split("_"),weekdays:"diman\u0109o_lundo_mardo_merkredo_\u0135a\u016ddo_vendredo_sabato".split("_"),weekdaysShort:"dim_lun_mard_merk_\u0135a\u016d_ven_sab".split("_"),weekdaysMin:"di_lu_ma_me_\u0135a_ve_sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D[-a de] MMMM, YYYY",LLL:"D[-a de] MMMM, YYYY HH:mm",LLLL:"dddd, [la] D[-a de] MMMM, YYYY HH:mm"},meridiemParse:/[ap]\.t\.m/i,isPM:function(e){return"p"===e.charAt(0).toLowerCase()},meridiem:function(e,a,t){return e>11?t?"p.t.m.":"P.T.M.":t?"a.t.m.":"A.T.M."},calendar:{sameDay:"[Hodia\u016d je] LT",nextDay:"[Morga\u016d je] LT",nextWeek:"dddd [je] LT",lastDay:"[Hiera\u016d je] LT",lastWeek:"[pasinta] dddd [je] LT",sameElse:"L"},relativeTime:{future:"post %s",past:"anta\u016d %s",s:"sekundoj",ss:"%d sekundoj",m:"minuto",mm:"%d minutoj",h:"horo",hh:"%d horoj",d:"tago",dd:"%d tagoj",M:"monato",MM:"%d monatoj",y:"jaro",yy:"%d jaroj"},dayOfMonthOrdinalParse:/\d{1,2}a/,ordinal:"%da",week:{dow:1,doy:7}});var Bs="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),qs="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),Qs=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],Xs=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;e.defineLocale("es-do",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?qs[e.month()]:Bs[e.month()]:Bs},monthsRegex:Xs,monthsShortRegex:Xs,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:Qs,longMonthsParse:Qs,shortMonthsParse:Qs,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}});var en="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),an="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_");e.defineLocale("es-us",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?an[e.month()]:en[e.month()]:en},monthsParseExact:!0,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"MM/DD/YYYY",LL:"MMMM [de] D [de] YYYY",LLL:"MMMM [de] D [de] YYYY h:mm A",LLLL:"dddd, MMMM [de] D [de] YYYY h:mm A"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:0,doy:6}});var tn="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),sn="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),nn=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],dn=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;e.defineLocale("es",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?sn[e.month()]:tn[e.month()]:tn},monthsRegex:dn,monthsShortRegex:dn,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:nn,longMonthsParse:nn,shortMonthsParse:nn,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),e.defineLocale("et",{months:"jaanuar_veebruar_m\xe4rts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_m\xe4rts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),weekdays:"p\xfchap\xe4ev_esmasp\xe4ev_teisip\xe4ev_kolmap\xe4ev_neljap\xe4ev_reede_laup\xe4ev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[T\xe4na,] LT",nextDay:"[Homme,] LT",nextWeek:"[J\xe4rgmine] dddd LT",lastDay:"[Eile,] LT",lastWeek:"[Eelmine] dddd LT",sameElse:"L"},relativeTime:{future:"%s p\xe4rast",past:"%s tagasi",s:ra,ss:ra,m:ra,mm:ra,h:ra,hh:ra,d:ra,dd:"%d p\xe4eva",M:ra,MM:ra,y:ra,yy:ra},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),monthsParseExact:!0,weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] HH:mm",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] HH:mm",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] HH:mm",llll:"ddd, YYYY[ko] MMM D[a] HH:mm"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",ss:"%d segundo",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var rn={1:"\u06f1",2:"\u06f2",3:"\u06f3",4:"\u06f4",5:"\u06f5",6:"\u06f6",7:"\u06f7",8:"\u06f8",9:"\u06f9",0:"\u06f0"},_n={"\u06f1":"1","\u06f2":"2","\u06f3":"3","\u06f4":"4","\u06f5":"5","\u06f6":"6","\u06f7":"7","\u06f8":"8","\u06f9":"9","\u06f0":"0"};e.defineLocale("fa",{months:"\u0698\u0627\u0646\u0648\u06cc\u0647_\u0641\u0648\u0631\u06cc\u0647_\u0645\u0627\u0631\u0633_\u0622\u0648\u0631\u06cc\u0644_\u0645\u0647_\u0698\u0648\u0626\u0646_\u0698\u0648\u0626\u06cc\u0647_\u0627\u0648\u062a_\u0633\u067e\u062a\u0627\u0645\u0628\u0631_\u0627\u06a9\u062a\u0628\u0631_\u0646\u0648\u0627\u0645\u0628\u0631_\u062f\u0633\u0627\u0645\u0628\u0631".split("_"),monthsShort:"\u0698\u0627\u0646\u0648\u06cc\u0647_\u0641\u0648\u0631\u06cc\u0647_\u0645\u0627\u0631\u0633_\u0622\u0648\u0631\u06cc\u0644_\u0645\u0647_\u0698\u0648\u0626\u0646_\u0698\u0648\u0626\u06cc\u0647_\u0627\u0648\u062a_\u0633\u067e\u062a\u0627\u0645\u0628\u0631_\u0627\u06a9\u062a\u0628\u0631_\u0646\u0648\u0627\u0645\u0628\u0631_\u062f\u0633\u0627\u0645\u0628\u0631".split("_"),weekdays:"\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647_\u062f\u0648\u0634\u0646\u0628\u0647_\u0633\u0647\u200c\u0634\u0646\u0628\u0647_\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647_\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647_\u062c\u0645\u0639\u0647_\u0634\u0646\u0628\u0647".split("_"),weekdaysShort:"\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647_\u062f\u0648\u0634\u0646\u0628\u0647_\u0633\u0647\u200c\u0634\u0646\u0628\u0647_\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647_\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647_\u062c\u0645\u0639\u0647_\u0634\u0646\u0628\u0647".split("_"),weekdaysMin:"\u06cc_\u062f_\u0633_\u0686_\u067e_\u062c_\u0634".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/\u0642\u0628\u0644 \u0627\u0632 \u0638\u0647\u0631|\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631/,isPM:function(e){return/\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631/.test(e)},meridiem:function(e,a,t){return e<12?"\u0642\u0628\u0644 \u0627\u0632 \u0638\u0647\u0631":"\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631"},calendar:{sameDay:"[\u0627\u0645\u0631\u0648\u0632 \u0633\u0627\u0639\u062a] LT",nextDay:"[\u0641\u0631\u062f\u0627 \u0633\u0627\u0639\u062a] LT",nextWeek:"dddd [\u0633\u0627\u0639\u062a] LT",lastDay:"[\u062f\u06cc\u0631\u0648\u0632 \u0633\u0627\u0639\u062a] LT",lastWeek:"dddd [\u067e\u06cc\u0634] [\u0633\u0627\u0639\u062a] LT",sameElse:"L"},relativeTime:{future:"\u062f\u0631 %s",past:"%s \u067e\u06cc\u0634",s:"\u0686\u0646\u062f \u062b\u0627\u0646\u06cc\u0647",ss:"\u062b\u0627\u0646\u06cc\u0647 d%",m:"\u06cc\u06a9 \u062f\u0642\u06cc\u0642\u0647",mm:"%d \u062f\u0642\u06cc\u0642\u0647",h:"\u06cc\u06a9 \u0633\u0627\u0639\u062a",hh:"%d \u0633\u0627\u0639\u062a",d:"\u06cc\u06a9 \u0631\u0648\u0632",dd:"%d \u0631\u0648\u0632",M:"\u06cc\u06a9 \u0645\u0627\u0647",MM:"%d \u0645\u0627\u0647",y:"\u06cc\u06a9 \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/[\u06f0-\u06f9]/g,function(e){return _n[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return rn[e]}).replace(/,/g,"\u060c")},dayOfMonthOrdinalParse:/\d{1,2}\u0645/,ordinal:"%d\u0645",week:{dow:6,doy:12}});var on="nolla yksi kaksi kolme nelj\xe4 viisi kuusi seitsem\xe4n kahdeksan yhdeks\xe4n".split(" "),mn=["nolla","yhden","kahden","kolmen","nelj\xe4n","viiden","kuuden",on[7],on[8],on[9]];e.defineLocale("fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kes\xe4kuu_hein\xe4kuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kes\xe4_hein\xe4_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] HH.mm",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] HH.mm",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] HH.mm",llll:"ddd, Do MMM YYYY, [klo] HH.mm"},calendar:{sameDay:"[t\xe4n\xe4\xe4n] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s p\xe4\xe4st\xe4",past:"%s sitten",s:_a,ss:_a,m:_a,mm:_a,h:_a,hh:_a,d:_a,dd:_a,M:_a,MM:_a,y:_a,yy:_a},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("fo",{months:"januar_februar_mars_apr\xedl_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sunnudagur_m\xe1nadagur_t\xfdsdagur_mikudagur_h\xf3sdagur_fr\xedggjadagur_leygardagur".split("_"),weekdaysShort:"sun_m\xe1n_t\xfds_mik_h\xf3s_fr\xed_ley".split("_"),weekdaysMin:"su_m\xe1_t\xfd_mi_h\xf3_fr_le".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D. MMMM, YYYY HH:mm"},calendar:{sameDay:"[\xcd dag kl.] LT",nextDay:"[\xcd morgin kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[\xcd gj\xe1r kl.] LT",lastWeek:"[s\xed\xf0stu] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"um %s",past:"%s s\xed\xf0ani",s:"f\xe1 sekund",ss:"%d sekundir",m:"ein minutt",mm:"%d minuttir",h:"ein t\xedmi",hh:"%d t\xedmar",d:"ein dagur",dd:"%d dagar",M:"ein m\xe1na\xf0i",MM:"%d m\xe1na\xf0ir",y:"eitt \xe1r",yy:"%d \xe1r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("fr-ca",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|e)/,ordinal:function(e,a){switch(a){default:case"M":case"Q":case"D":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}}}),e.defineLocale("fr-ch",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|e)/,ordinal:function(e,a){switch(a){default:case"M":case"Q":case"D":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}},week:{dow:1,doy:4}}),e.defineLocale("fr",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|)/,ordinal:function(e,a){switch(a){case"D":return e+(1===e?"er":"");default:case"M":case"Q":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}},week:{dow:1,doy:4}});var un="jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_"),ln="jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_");e.defineLocale("fy",{months:"jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?ln[e.month()]:un[e.month()]:un},monthsParseExact:!0,weekdays:"snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),weekdaysShort:"si._mo._ti._wo._to._fr._so.".split("_"),weekdaysMin:"Si_Mo_Ti_Wo_To_Fr_So".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[hjoed om] LT",nextDay:"[moarn om] LT",nextWeek:"dddd [om] LT",lastDay:"[juster om] LT",lastWeek:"[\xf4fr\xfbne] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oer %s",past:"%s lyn",s:"in pear sekonden",ss:"%d sekonden",m:"ien min\xfat",mm:"%d minuten",h:"ien oere",hh:"%d oeren",d:"ien dei",dd:"%d dagen",M:"ien moanne",MM:"%d moannen",y:"ien jier",yy:"%d jierren"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||e>=20?"ste":"de")},week:{dow:1,doy:4}});e.defineLocale("gd",{months:["Am Faoilleach","An Gearran","Am M\xe0rt","An Giblean","An C\xe8itean","An t-\xd2gmhios","An t-Iuchar","An L\xf9nastal","An t-Sultain","An D\xe0mhair","An t-Samhain","An D\xf9bhlachd"],monthsShort:["Faoi","Gear","M\xe0rt","Gibl","C\xe8it","\xd2gmh","Iuch","L\xf9n","Sult","D\xe0mh","Samh","D\xf9bh"],monthsParseExact:!0,weekdays:["Did\xf2mhnaich","Diluain","Dim\xe0irt","Diciadain","Diardaoin","Dihaoine","Disathairne"],weekdaysShort:["Did","Dil","Dim","Dic","Dia","Dih","Dis"],weekdaysMin:["D\xf2","Lu","M\xe0","Ci","Ar","Ha","Sa"],longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[An-diugh aig] LT",nextDay:"[A-m\xe0ireach aig] LT",nextWeek:"dddd [aig] LT",lastDay:"[An-d\xe8 aig] LT",lastWeek:"dddd [seo chaidh] [aig] LT",sameElse:"L"},relativeTime:{future:"ann an %s",past:"bho chionn %s",s:"beagan diogan",ss:"%d diogan",m:"mionaid",mm:"%d mionaidean",h:"uair",hh:"%d uairean",d:"latha",dd:"%d latha",M:"m\xecos",MM:"%d m\xecosan",y:"bliadhna",yy:"%d bliadhna"},dayOfMonthOrdinalParse:/\d{1,2}(d|na|mh)/,ordinal:function(e){return e+(1===e?"d":e%10==2?"na":"mh")},week:{dow:1,doy:4}}),e.defineLocale("gl",{months:"xaneiro_febreiro_marzo_abril_maio_xu\xf1o_xullo_agosto_setembro_outubro_novembro_decembro".split("_"),monthsShort:"xan._feb._mar._abr._mai._xu\xf1._xul._ago._set._out._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"domingo_luns_martes_m\xe9rcores_xoves_venres_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._m\xe9r._xov._ven._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_m\xe9_xo_ve_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"\xe1s":"\xe1")+"] LT"},nextDay:function(){return"[ma\xf1\xe1 "+(1!==this.hours()?"\xe1s":"\xe1")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"\xe1s":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"\xe1":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"\xe1s":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(e){return 0===e.indexOf("un")?"n"+e:"en "+e},past:"hai %s",s:"uns segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),e.defineLocale("gom-latn",{months:"Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr".split("_"),monthsShort:"Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son'var".split("_"),weekdaysShort:"Ait._Som._Mon._Bud._Bre._Suk._Son.".split("_"),weekdaysMin:"Ai_Sm_Mo_Bu_Br_Su_Sn".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"A h:mm [vazta]",LTS:"A h:mm:ss [vazta]",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY A h:mm [vazta]",LLLL:"dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]",llll:"ddd, D MMM YYYY, A h:mm [vazta]"},calendar:{sameDay:"[Aiz] LT",nextDay:"[Faleam] LT",nextWeek:"[Ieta to] dddd[,] LT",lastDay:"[Kal] LT",lastWeek:"[Fatlo] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%s",past:"%s adim",s:ia,ss:ia,m:ia,mm:ia,h:ia,hh:ia,d:ia,dd:ia,M:ia,MM:ia,y:ia,yy:ia},dayOfMonthOrdinalParse:/\d{1,2}(er)/,ordinal:function(e,a){switch(a){case"D":return e+"er";default:case"M":case"Q":case"DDD":case"d":case"w":case"W":return e}},week:{dow:1,doy:4},meridiemParse:/rati|sokalli|donparam|sanje/,meridiemHour:function(e,a){return 12===e&&(e=0),"rati"===a?e<4?e:e+12:"sokalli"===a?e:"donparam"===a?e>12?e:e+12:"sanje"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"rati":e<12?"sokalli":e<16?"donparam":e<20?"sanje":"rati"}});var Mn={1:"\u0ae7",2:"\u0ae8",3:"\u0ae9",4:"\u0aea",5:"\u0aeb",6:"\u0aec",7:"\u0aed",8:"\u0aee",9:"\u0aef",0:"\u0ae6"},hn={"\u0ae7":"1","\u0ae8":"2","\u0ae9":"3","\u0aea":"4","\u0aeb":"5","\u0aec":"6","\u0aed":"7","\u0aee":"8","\u0aef":"9","\u0ae6":"0"};e.defineLocale("gu",{months:"\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1\u0a86\u0ab0\u0ac0_\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1\u0a86\u0ab0\u0ac0_\u0aae\u0abe\u0ab0\u0acd\u0a9a_\u0a8f\u0aaa\u0acd\u0ab0\u0abf\u0ab2_\u0aae\u0ac7_\u0a9c\u0ac2\u0aa8_\u0a9c\u0ac1\u0ab2\u0abe\u0a88_\u0a91\u0a97\u0ab8\u0acd\u0a9f_\u0ab8\u0aaa\u0acd\u0a9f\u0ac7\u0aae\u0acd\u0aac\u0ab0_\u0a91\u0a95\u0acd\u0a9f\u0acd\u0aac\u0ab0_\u0aa8\u0ab5\u0ac7\u0aae\u0acd\u0aac\u0ab0_\u0aa1\u0abf\u0ab8\u0ac7\u0aae\u0acd\u0aac\u0ab0".split("_"),monthsShort:"\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1._\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1._\u0aae\u0abe\u0ab0\u0acd\u0a9a_\u0a8f\u0aaa\u0acd\u0ab0\u0abf._\u0aae\u0ac7_\u0a9c\u0ac2\u0aa8_\u0a9c\u0ac1\u0ab2\u0abe._\u0a91\u0a97._\u0ab8\u0aaa\u0acd\u0a9f\u0ac7._\u0a91\u0a95\u0acd\u0a9f\u0acd._\u0aa8\u0ab5\u0ac7._\u0aa1\u0abf\u0ab8\u0ac7.".split("_"),monthsParseExact:!0,weekdays:"\u0ab0\u0ab5\u0abf\u0ab5\u0abe\u0ab0_\u0ab8\u0acb\u0aae\u0ab5\u0abe\u0ab0_\u0aae\u0a82\u0a97\u0ab3\u0ab5\u0abe\u0ab0_\u0aac\u0ac1\u0aa7\u0acd\u0ab5\u0abe\u0ab0_\u0a97\u0ac1\u0ab0\u0ac1\u0ab5\u0abe\u0ab0_\u0ab6\u0ac1\u0a95\u0acd\u0ab0\u0ab5\u0abe\u0ab0_\u0ab6\u0aa8\u0abf\u0ab5\u0abe\u0ab0".split("_"),weekdaysShort:"\u0ab0\u0ab5\u0abf_\u0ab8\u0acb\u0aae_\u0aae\u0a82\u0a97\u0ab3_\u0aac\u0ac1\u0aa7\u0acd_\u0a97\u0ac1\u0ab0\u0ac1_\u0ab6\u0ac1\u0a95\u0acd\u0ab0_\u0ab6\u0aa8\u0abf".split("_"),weekdaysMin:"\u0ab0_\u0ab8\u0acb_\u0aae\u0a82_\u0aac\u0ac1_\u0a97\u0ac1_\u0ab6\u0ac1_\u0ab6".split("_"),longDateFormat:{LT:"A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",LTS:"A h:mm:ss \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",LLLL:"dddd, D MMMM YYYY, A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7"},calendar:{sameDay:"[\u0a86\u0a9c] LT",nextDay:"[\u0a95\u0abe\u0ab2\u0ac7] LT",nextWeek:"dddd, LT",lastDay:"[\u0a97\u0a87\u0a95\u0abe\u0ab2\u0ac7] LT",lastWeek:"[\u0aaa\u0abe\u0a9b\u0ab2\u0abe] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0aae\u0abe",past:"%s \u0aaa\u0ac7\u0ab9\u0ab2\u0abe",s:"\u0a85\u0aae\u0ac1\u0a95 \u0aaa\u0ab3\u0acb",ss:"%d \u0ab8\u0ac7\u0a95\u0a82\u0aa1",m:"\u0a8f\u0a95 \u0aae\u0abf\u0aa8\u0abf\u0a9f",mm:"%d \u0aae\u0abf\u0aa8\u0abf\u0a9f",h:"\u0a8f\u0a95 \u0a95\u0ab2\u0abe\u0a95",hh:"%d \u0a95\u0ab2\u0abe\u0a95",d:"\u0a8f\u0a95 \u0aa6\u0abf\u0ab5\u0ab8",dd:"%d \u0aa6\u0abf\u0ab5\u0ab8",M:"\u0a8f\u0a95 \u0aae\u0ab9\u0abf\u0aa8\u0acb",MM:"%d \u0aae\u0ab9\u0abf\u0aa8\u0acb",y:"\u0a8f\u0a95 \u0ab5\u0ab0\u0acd\u0ab7",yy:"%d \u0ab5\u0ab0\u0acd\u0ab7"},preparse:function(e){return e.replace(/[\u0ae7\u0ae8\u0ae9\u0aea\u0aeb\u0aec\u0aed\u0aee\u0aef\u0ae6]/g,function(e){return hn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Mn[e]})},meridiemParse:/\u0ab0\u0abe\u0aa4|\u0aac\u0aaa\u0acb\u0ab0|\u0ab8\u0ab5\u0abe\u0ab0|\u0ab8\u0abe\u0a82\u0a9c/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0ab0\u0abe\u0aa4"===a?e<4?e:e+12:"\u0ab8\u0ab5\u0abe\u0ab0"===a?e:"\u0aac\u0aaa\u0acb\u0ab0"===a?e>=10?e:e+12:"\u0ab8\u0abe\u0a82\u0a9c"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0ab0\u0abe\u0aa4":e<10?"\u0ab8\u0ab5\u0abe\u0ab0":e<17?"\u0aac\u0aaa\u0acb\u0ab0":e<20?"\u0ab8\u0abe\u0a82\u0a9c":"\u0ab0\u0abe\u0aa4"},week:{dow:0,doy:6}}),e.defineLocale("he",{months:"\u05d9\u05e0\u05d5\u05d0\u05e8_\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8_\u05de\u05e8\u05e5_\u05d0\u05e4\u05e8\u05d9\u05dc_\u05de\u05d0\u05d9_\u05d9\u05d5\u05e0\u05d9_\u05d9\u05d5\u05dc\u05d9_\u05d0\u05d5\u05d2\u05d5\u05e1\u05d8_\u05e1\u05e4\u05d8\u05de\u05d1\u05e8_\u05d0\u05d5\u05e7\u05d8\u05d5\u05d1\u05e8_\u05e0\u05d5\u05d1\u05de\u05d1\u05e8_\u05d3\u05e6\u05de\u05d1\u05e8".split("_"),monthsShort:"\u05d9\u05e0\u05d5\u05f3_\u05e4\u05d1\u05e8\u05f3_\u05de\u05e8\u05e5_\u05d0\u05e4\u05e8\u05f3_\u05de\u05d0\u05d9_\u05d9\u05d5\u05e0\u05d9_\u05d9\u05d5\u05dc\u05d9_\u05d0\u05d5\u05d2\u05f3_\u05e1\u05e4\u05d8\u05f3_\u05d0\u05d5\u05e7\u05f3_\u05e0\u05d5\u05d1\u05f3_\u05d3\u05e6\u05de\u05f3".split("_"),weekdays:"\u05e8\u05d0\u05e9\u05d5\u05df_\u05e9\u05e0\u05d9_\u05e9\u05dc\u05d9\u05e9\u05d9_\u05e8\u05d1\u05d9\u05e2\u05d9_\u05d7\u05de\u05d9\u05e9\u05d9_\u05e9\u05d9\u05e9\u05d9_\u05e9\u05d1\u05ea".split("_"),weekdaysShort:"\u05d0\u05f3_\u05d1\u05f3_\u05d2\u05f3_\u05d3\u05f3_\u05d4\u05f3_\u05d5\u05f3_\u05e9\u05f3".split("_"),weekdaysMin:"\u05d0_\u05d1_\u05d2_\u05d3_\u05d4_\u05d5_\u05e9".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [\u05d1]MMMM YYYY",LLL:"D [\u05d1]MMMM YYYY HH:mm",LLLL:"dddd, D [\u05d1]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[\u05d4\u05d9\u05d5\u05dd \u05d1\u05be]LT",nextDay:"[\u05de\u05d7\u05e8 \u05d1\u05be]LT",nextWeek:"dddd [\u05d1\u05e9\u05e2\u05d4] LT",lastDay:"[\u05d0\u05ea\u05de\u05d5\u05dc \u05d1\u05be]LT",lastWeek:"[\u05d1\u05d9\u05d5\u05dd] dddd [\u05d4\u05d0\u05d7\u05e8\u05d5\u05df \u05d1\u05e9\u05e2\u05d4] LT",sameElse:"L"},relativeTime:{future:"\u05d1\u05e2\u05d5\u05d3 %s",past:"\u05dc\u05e4\u05e0\u05d9 %s",s:"\u05de\u05e1\u05e4\u05e8 \u05e9\u05e0\u05d9\u05d5\u05ea",ss:"%d \u05e9\u05e0\u05d9\u05d5\u05ea",m:"\u05d3\u05e7\u05d4",mm:"%d \u05d3\u05e7\u05d5\u05ea",h:"\u05e9\u05e2\u05d4",hh:function(e){return 2===e?"\u05e9\u05e2\u05ea\u05d9\u05d9\u05dd":e+" \u05e9\u05e2\u05d5\u05ea"},d:"\u05d9\u05d5\u05dd",dd:function(e){return 2===e?"\u05d9\u05d5\u05de\u05d9\u05d9\u05dd":e+" \u05d9\u05de\u05d9\u05dd"},M:"\u05d7\u05d5\u05d3\u05e9",MM:function(e){return 2===e?"\u05d7\u05d5\u05d3\u05e9\u05d9\u05d9\u05dd":e+" \u05d7\u05d5\u05d3\u05e9\u05d9\u05dd"},y:"\u05e9\u05e0\u05d4",yy:function(e){return 2===e?"\u05e9\u05e0\u05ea\u05d9\u05d9\u05dd":e%10==0&&10!==e?e+" \u05e9\u05e0\u05d4":e+" \u05e9\u05e0\u05d9\u05dd"}},meridiemParse:/\u05d0\u05d7\u05d4"\u05e6|\u05dc\u05e4\u05e0\u05d4"\u05e6|\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05dc\u05e4\u05e0\u05d5\u05ea \u05d1\u05d5\u05e7\u05e8|\u05d1\u05d1\u05d5\u05e7\u05e8|\u05d1\u05e2\u05e8\u05d1/i,isPM:function(e){return/^(\u05d0\u05d7\u05d4"\u05e6|\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05d1\u05e2\u05e8\u05d1)$/.test(e)},meridiem:function(e,a,t){return e<5?"\u05dc\u05e4\u05e0\u05d5\u05ea \u05d1\u05d5\u05e7\u05e8":e<10?"\u05d1\u05d1\u05d5\u05e7\u05e8":e<12?t?'\u05dc\u05e4\u05e0\u05d4"\u05e6':"\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd":e<18?t?'\u05d0\u05d7\u05d4"\u05e6':"\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd":"\u05d1\u05e2\u05e8\u05d1"}});var Ln={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},cn={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};e.defineLocale("hi",{months:"\u091c\u0928\u0935\u0930\u0940_\u092b\u093c\u0930\u0935\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u0948\u0932_\u092e\u0908_\u091c\u0942\u0928_\u091c\u0941\u0932\u093e\u0908_\u0905\u0917\u0938\u094d\u0924_\u0938\u093f\u0924\u092e\u094d\u092c\u0930_\u0905\u0915\u094d\u091f\u0942\u092c\u0930_\u0928\u0935\u092e\u094d\u092c\u0930_\u0926\u093f\u0938\u092e\u094d\u092c\u0930".split("_"),monthsShort:"\u091c\u0928._\u092b\u093c\u0930._\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u0948._\u092e\u0908_\u091c\u0942\u0928_\u091c\u0941\u0932._\u0905\u0917._\u0938\u093f\u0924._\u0905\u0915\u094d\u091f\u0942._\u0928\u0935._\u0926\u093f\u0938.".split("_"),monthsParseExact:!0,weekdays:"\u0930\u0935\u093f\u0935\u093e\u0930_\u0938\u094b\u092e\u0935\u093e\u0930_\u092e\u0902\u0917\u0932\u0935\u093e\u0930_\u092c\u0941\u0927\u0935\u093e\u0930_\u0917\u0941\u0930\u0942\u0935\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930_\u0936\u0928\u093f\u0935\u093e\u0930".split("_"),weekdaysShort:"\u0930\u0935\u093f_\u0938\u094b\u092e_\u092e\u0902\u0917\u0932_\u092c\u0941\u0927_\u0917\u0941\u0930\u0942_\u0936\u0941\u0915\u094d\u0930_\u0936\u0928\u093f".split("_"),weekdaysMin:"\u0930_\u0938\u094b_\u092e\u0902_\u092c\u0941_\u0917\u0941_\u0936\u0941_\u0936".split("_"),longDateFormat:{LT:"A h:mm \u092c\u091c\u0947",LTS:"A h:mm:ss \u092c\u091c\u0947",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u092c\u091c\u0947",LLLL:"dddd, D MMMM YYYY, A h:mm \u092c\u091c\u0947"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u0915\u0932] LT",nextWeek:"dddd, LT",lastDay:"[\u0915\u0932] LT",lastWeek:"[\u092a\u093f\u091b\u0932\u0947] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u092e\u0947\u0902",past:"%s \u092a\u0939\u0932\u0947",s:"\u0915\u0941\u091b \u0939\u0940 \u0915\u094d\u0937\u0923",ss:"%d \u0938\u0947\u0915\u0902\u0921",m:"\u090f\u0915 \u092e\u093f\u0928\u091f",mm:"%d \u092e\u093f\u0928\u091f",h:"\u090f\u0915 \u0918\u0902\u091f\u093e",hh:"%d \u0918\u0902\u091f\u0947",d:"\u090f\u0915 \u0926\u093f\u0928",dd:"%d \u0926\u093f\u0928",M:"\u090f\u0915 \u092e\u0939\u0940\u0928\u0947",MM:"%d \u092e\u0939\u0940\u0928\u0947",y:"\u090f\u0915 \u0935\u0930\u094d\u0937",yy:"%d \u0935\u0930\u094d\u0937"},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return cn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Ln[e]})},meridiemParse:/\u0930\u093e\u0924|\u0938\u0941\u092c\u0939|\u0926\u094b\u092a\u0939\u0930|\u0936\u093e\u092e/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924"===a?e<4?e:e+12:"\u0938\u0941\u092c\u0939"===a?e:"\u0926\u094b\u092a\u0939\u0930"===a?e>=10?e:e+12:"\u0936\u093e\u092e"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0930\u093e\u0924":e<10?"\u0938\u0941\u092c\u0939":e<17?"\u0926\u094b\u092a\u0939\u0930":e<20?"\u0936\u093e\u092e":"\u0930\u093e\u0924"},week:{dow:0,doy:6}}),e.defineLocale("hr",{months:{format:"sije\u010dnja_velja\u010de_o\u017eujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),standalone:"sije\u010danj_velja\u010da_o\u017eujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_")},monthsShort:"sij._velj._o\u017eu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010der u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[pro\u0161lu] dddd [u] LT";case 6:return"[pro\u0161le] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[pro\u0161li] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",ss:oa,m:oa,mm:oa,h:oa,hh:oa,d:"dan",dd:oa,M:"mjesec",MM:oa,y:"godinu",yy:oa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var Yn="vas\xe1rnap h\xe9tf\u0151n kedden szerd\xe1n cs\xfct\xf6rt\xf6k\xf6n p\xe9nteken szombaton".split(" ");e.defineLocale("hu",{months:"janu\xe1r_febru\xe1r_m\xe1rcius_\xe1prilis_m\xe1jus_j\xfanius_j\xfalius_augusztus_szeptember_okt\xf3ber_november_december".split("_"),monthsShort:"jan_feb_m\xe1rc_\xe1pr_m\xe1j_j\xfan_j\xfal_aug_szept_okt_nov_dec".split("_"),weekdays:"vas\xe1rnap_h\xe9tf\u0151_kedd_szerda_cs\xfct\xf6rt\xf6k_p\xe9ntek_szombat".split("_"),weekdaysShort:"vas_h\xe9t_kedd_sze_cs\xfct_p\xe9n_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"},meridiemParse:/de|du/i,isPM:function(e){return"u"===e.charAt(1).toLowerCase()},meridiem:function(e,a,t){return e<12?!0===t?"de":"DE":!0===t?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return ua.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return ua.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s m\xfalva",past:"%s",s:ma,ss:ma,m:ma,mm:ma,h:ma,hh:ma,d:ma,dd:ma,M:ma,MM:ma,y:ma,yy:ma},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("hy-am",{months:{format:"\u0570\u0578\u0582\u0576\u057e\u0561\u0580\u056b_\u0583\u0565\u057f\u0580\u057e\u0561\u0580\u056b_\u0574\u0561\u0580\u057f\u056b_\u0561\u057a\u0580\u056b\u056c\u056b_\u0574\u0561\u0575\u056b\u057d\u056b_\u0570\u0578\u0582\u0576\u056b\u057d\u056b_\u0570\u0578\u0582\u056c\u056b\u057d\u056b_\u0585\u0563\u0578\u057d\u057f\u0578\u057d\u056b_\u057d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580\u056b_\u0570\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580\u056b_\u0576\u0578\u0575\u0565\u0574\u0562\u0565\u0580\u056b_\u0564\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580\u056b".split("_"),standalone:"\u0570\u0578\u0582\u0576\u057e\u0561\u0580_\u0583\u0565\u057f\u0580\u057e\u0561\u0580_\u0574\u0561\u0580\u057f_\u0561\u057a\u0580\u056b\u056c_\u0574\u0561\u0575\u056b\u057d_\u0570\u0578\u0582\u0576\u056b\u057d_\u0570\u0578\u0582\u056c\u056b\u057d_\u0585\u0563\u0578\u057d\u057f\u0578\u057d_\u057d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580_\u0570\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580_\u0576\u0578\u0575\u0565\u0574\u0562\u0565\u0580_\u0564\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580".split("_")},monthsShort:"\u0570\u0576\u057e_\u0583\u057f\u0580_\u0574\u0580\u057f_\u0561\u057a\u0580_\u0574\u0575\u057d_\u0570\u0576\u057d_\u0570\u056c\u057d_\u0585\u0563\u057d_\u057d\u057a\u057f_\u0570\u056f\u057f_\u0576\u0574\u0562_\u0564\u056f\u057f".split("_"),weekdays:"\u056f\u056b\u0580\u0561\u056f\u056b_\u0565\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b_\u0565\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b_\u0579\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b_\u0570\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b_\u0578\u0582\u0580\u0562\u0561\u0569_\u0577\u0561\u0562\u0561\u0569".split("_"),weekdaysShort:"\u056f\u0580\u056f_\u0565\u0580\u056f_\u0565\u0580\u0584_\u0579\u0580\u0584_\u0570\u0576\u0563_\u0578\u0582\u0580\u0562_\u0577\u0562\u0569".split("_"),weekdaysMin:"\u056f\u0580\u056f_\u0565\u0580\u056f_\u0565\u0580\u0584_\u0579\u0580\u0584_\u0570\u0576\u0563_\u0578\u0582\u0580\u0562_\u0577\u0562\u0569".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0569.",LLL:"D MMMM YYYY \u0569., HH:mm",LLLL:"dddd, D MMMM YYYY \u0569., HH:mm"},calendar:{sameDay:"[\u0561\u0575\u057d\u0585\u0580] LT",nextDay:"[\u057e\u0561\u0572\u0568] LT",lastDay:"[\u0565\u0580\u0565\u056f] LT",nextWeek:function(){return"dddd [\u0585\u0580\u0568 \u056a\u0561\u0574\u0568] LT"},lastWeek:function(){return"[\u0561\u0576\u0581\u0561\u056e] dddd [\u0585\u0580\u0568 \u056a\u0561\u0574\u0568] LT"},sameElse:"L"},relativeTime:{future:"%s \u0570\u0565\u057f\u0578",past:"%s \u0561\u057c\u0561\u057b",s:"\u0574\u056b \u0584\u0561\u0576\u056b \u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576",ss:"%d \u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576",m:"\u0580\u0578\u057a\u0565",mm:"%d \u0580\u0578\u057a\u0565",h:"\u056a\u0561\u0574",hh:"%d \u056a\u0561\u0574",d:"\u0585\u0580",dd:"%d \u0585\u0580",M:"\u0561\u0574\u056b\u057d",MM:"%d \u0561\u0574\u056b\u057d",y:"\u057f\u0561\u0580\u056b",yy:"%d \u057f\u0561\u0580\u056b"},meridiemParse:/\u0563\u056b\u0577\u0565\u0580\u057e\u0561|\u0561\u057c\u0561\u057e\u0578\u057f\u057e\u0561|\u0581\u0565\u0580\u0565\u056f\u057e\u0561|\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576/,isPM:function(e){return/^(\u0581\u0565\u0580\u0565\u056f\u057e\u0561|\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576)$/.test(e)},meridiem:function(e){return e<4?"\u0563\u056b\u0577\u0565\u0580\u057e\u0561":e<12?"\u0561\u057c\u0561\u057e\u0578\u057f\u057e\u0561":e<17?"\u0581\u0565\u0580\u0565\u056f\u057e\u0561":"\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576"},dayOfMonthOrdinalParse:/\d{1,2}|\d{1,2}-(\u056b\u0576|\u0580\u0564)/,ordinal:function(e,a){switch(a){case"DDD":case"w":case"W":case"DDDo":return 1===e?e+"-\u056b\u0576":e+"-\u0580\u0564";default:return e}},week:{dow:1,doy:7}}),e.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"siang"===a?e>=11?e:e+12:"sore"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"siang":e<19?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",ss:"%d detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),e.defineLocale("is",{months:"jan\xfaar_febr\xfaar_mars_apr\xedl_ma\xed_j\xfan\xed_j\xfal\xed_\xe1g\xfast_september_okt\xf3ber_n\xf3vember_desember".split("_"),monthsShort:"jan_feb_mar_apr_ma\xed_j\xfan_j\xfal_\xe1g\xfa_sep_okt_n\xf3v_des".split("_"),weekdays:"sunnudagur_m\xe1nudagur_\xferi\xf0judagur_mi\xf0vikudagur_fimmtudagur_f\xf6studagur_laugardagur".split("_"),weekdaysShort:"sun_m\xe1n_\xferi_mi\xf0_fim_f\xf6s_lau".split("_"),weekdaysMin:"Su_M\xe1_\xder_Mi_Fi_F\xf6_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd, D. MMMM YYYY [kl.] H:mm"},calendar:{sameDay:"[\xed dag kl.] LT",nextDay:"[\xe1 morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[\xed g\xe6r kl.] LT",lastWeek:"[s\xed\xf0asta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s s\xed\xf0an",s:Ma,ss:Ma,m:Ma,mm:Ma,h:"klukkustund",hh:Ma,d:Ma,dd:Ma,M:Ma,MM:Ma,y:Ma,yy:Ma},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"domenica_luned\xec_marted\xec_mercoled\xec_gioved\xec_venerd\xec_sabato".split("_"),weekdaysShort:"dom_lun_mar_mer_gio_ven_sab".split("_"),weekdaysMin:"do_lu_ma_me_gi_ve_sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(e){return(/^[0-9].+$/.test(e)?"tra":"in")+" "+e},past:"%s fa",s:"alcuni secondi",ss:"%d secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),e.defineLocale("ja",{months:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u65e5\u66dc\u65e5_\u6708\u66dc\u65e5_\u706b\u66dc\u65e5_\u6c34\u66dc\u65e5_\u6728\u66dc\u65e5_\u91d1\u66dc\u65e5_\u571f\u66dc\u65e5".split("_"),weekdaysShort:"\u65e5_\u6708_\u706b_\u6c34_\u6728_\u91d1_\u571f".split("_"),weekdaysMin:"\u65e5_\u6708_\u706b_\u6c34_\u6728_\u91d1_\u571f".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm dddd",l:"YYYY/MM/DD",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5 HH:mm dddd"},meridiemParse:/\u5348\u524d|\u5348\u5f8c/i,isPM:function(e){return"\u5348\u5f8c"===e},meridiem:function(e,a,t){return e<12?"\u5348\u524d":"\u5348\u5f8c"},calendar:{sameDay:"[\u4eca\u65e5] LT",nextDay:"[\u660e\u65e5] LT",nextWeek:"[\u6765\u9031]dddd LT",lastDay:"[\u6628\u65e5] LT",lastWeek:"[\u524d\u9031]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}\u65e5/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";default:return e}},relativeTime:{future:"%s\u5f8c",past:"%s\u524d",s:"\u6570\u79d2",ss:"%d\u79d2",m:"1\u5206",mm:"%d\u5206",h:"1\u6642\u9593",hh:"%d\u6642\u9593",d:"1\u65e5",dd:"%d\u65e5",M:"1\u30f6\u6708",MM:"%d\u30f6\u6708",y:"1\u5e74",yy:"%d\u5e74"}}),e.defineLocale("jv",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),weekdays:"Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),weekdaysShort:"Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/enjing|siyang|sonten|ndalu/,meridiemHour:function(e,a){return 12===e&&(e=0),"enjing"===a?e:"siyang"===a?e>=11?e:e+12:"sonten"===a||"ndalu"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"enjing":e<15?"siyang":e<19?"sonten":"ndalu"},calendar:{sameDay:"[Dinten puniko pukul] LT",nextDay:"[Mbenjang pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kala wingi pukul] LT",lastWeek:"dddd [kepengker pukul] LT",sameElse:"L"},relativeTime:{future:"wonten ing %s",past:"%s ingkang kepengker",s:"sawetawis detik",ss:"%d detik",m:"setunggal menit",mm:"%d menit",h:"setunggal jam",hh:"%d jam",d:"sedinten",dd:"%d dinten",M:"sewulan",MM:"%d wulan",y:"setaun",yy:"%d taun"},week:{dow:1,doy:7}}),e.defineLocale("ka",{months:{standalone:"\u10d8\u10d0\u10dc\u10d5\u10d0\u10e0\u10d8_\u10d7\u10d4\u10d1\u10d4\u10e0\u10d5\u10d0\u10da\u10d8_\u10db\u10d0\u10e0\u10e2\u10d8_\u10d0\u10de\u10e0\u10d8\u10da\u10d8_\u10db\u10d0\u10d8\u10e1\u10d8_\u10d8\u10d5\u10dc\u10d8\u10e1\u10d8_\u10d8\u10d5\u10da\u10d8\u10e1\u10d8_\u10d0\u10d2\u10d5\u10d8\u10e1\u10e2\u10dd_\u10e1\u10d4\u10e5\u10e2\u10d4\u10db\u10d1\u10d4\u10e0\u10d8_\u10dd\u10e5\u10e2\u10dd\u10db\u10d1\u10d4\u10e0\u10d8_\u10dc\u10dd\u10d4\u10db\u10d1\u10d4\u10e0\u10d8_\u10d3\u10d4\u10d9\u10d4\u10db\u10d1\u10d4\u10e0\u10d8".split("_"),format:"\u10d8\u10d0\u10dc\u10d5\u10d0\u10e0\u10e1_\u10d7\u10d4\u10d1\u10d4\u10e0\u10d5\u10d0\u10da\u10e1_\u10db\u10d0\u10e0\u10e2\u10e1_\u10d0\u10de\u10e0\u10d8\u10da\u10d8\u10e1_\u10db\u10d0\u10d8\u10e1\u10e1_\u10d8\u10d5\u10dc\u10d8\u10e1\u10e1_\u10d8\u10d5\u10da\u10d8\u10e1\u10e1_\u10d0\u10d2\u10d5\u10d8\u10e1\u10e2\u10e1_\u10e1\u10d4\u10e5\u10e2\u10d4\u10db\u10d1\u10d4\u10e0\u10e1_\u10dd\u10e5\u10e2\u10dd\u10db\u10d1\u10d4\u10e0\u10e1_\u10dc\u10dd\u10d4\u10db\u10d1\u10d4\u10e0\u10e1_\u10d3\u10d4\u10d9\u10d4\u10db\u10d1\u10d4\u10e0\u10e1".split("_")},monthsShort:"\u10d8\u10d0\u10dc_\u10d7\u10d4\u10d1_\u10db\u10d0\u10e0_\u10d0\u10de\u10e0_\u10db\u10d0\u10d8_\u10d8\u10d5\u10dc_\u10d8\u10d5\u10da_\u10d0\u10d2\u10d5_\u10e1\u10d4\u10e5_\u10dd\u10e5\u10e2_\u10dc\u10dd\u10d4_\u10d3\u10d4\u10d9".split("_"),weekdays:{standalone:"\u10d9\u10d5\u10d8\u10e0\u10d0_\u10dd\u10e0\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10e1\u10d0\u10db\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10dd\u10d7\u10ee\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10ee\u10e3\u10d7\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10d8_\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8".split("_"),format:"\u10d9\u10d5\u10d8\u10e0\u10d0\u10e1_\u10dd\u10e0\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10e1\u10d0\u10db\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10dd\u10d7\u10ee\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10ee\u10e3\u10d7\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10e1_\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1".split("_"),isFormat:/(\u10ec\u10d8\u10dc\u10d0|\u10e8\u10d4\u10db\u10d3\u10d4\u10d2)/},weekdaysShort:"\u10d9\u10d5\u10d8_\u10dd\u10e0\u10e8_\u10e1\u10d0\u10db_\u10dd\u10d7\u10ee_\u10ee\u10e3\u10d7_\u10de\u10d0\u10e0_\u10e8\u10d0\u10d1".split("_"),weekdaysMin:"\u10d9\u10d5_\u10dd\u10e0_\u10e1\u10d0_\u10dd\u10d7_\u10ee\u10e3_\u10de\u10d0_\u10e8\u10d0".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[\u10d3\u10e6\u10d4\u10e1] LT[-\u10d6\u10d4]",nextDay:"[\u10ee\u10d5\u10d0\u10da] LT[-\u10d6\u10d4]",lastDay:"[\u10d2\u10e3\u10e8\u10d8\u10dc] LT[-\u10d6\u10d4]",nextWeek:"[\u10e8\u10d4\u10db\u10d3\u10d4\u10d2] dddd LT[-\u10d6\u10d4]",lastWeek:"[\u10ec\u10d8\u10dc\u10d0] dddd LT-\u10d6\u10d4",sameElse:"L"},relativeTime:{future:function(e){return/(\u10ec\u10d0\u10db\u10d8|\u10ec\u10e3\u10d7\u10d8|\u10e1\u10d0\u10d0\u10d7\u10d8|\u10ec\u10d4\u10da\u10d8)/.test(e)?e.replace(/\u10d8$/,"\u10e8\u10d8"):e+"\u10e8\u10d8"},past:function(e){return/(\u10ec\u10d0\u10db\u10d8|\u10ec\u10e3\u10d7\u10d8|\u10e1\u10d0\u10d0\u10d7\u10d8|\u10d3\u10e6\u10d4|\u10d7\u10d5\u10d4)/.test(e)?e.replace(/(\u10d8|\u10d4)$/,"\u10d8\u10e1 \u10e3\u10d9\u10d0\u10dc"):/\u10ec\u10d4\u10da\u10d8/.test(e)?e.replace(/\u10ec\u10d4\u10da\u10d8$/,"\u10ec\u10da\u10d8\u10e1 \u10e3\u10d9\u10d0\u10dc"):void 0},s:"\u10e0\u10d0\u10db\u10d3\u10d4\u10dc\u10d8\u10db\u10d4 \u10ec\u10d0\u10db\u10d8",ss:"%d \u10ec\u10d0\u10db\u10d8",m:"\u10ec\u10e3\u10d7\u10d8",mm:"%d \u10ec\u10e3\u10d7\u10d8",h:"\u10e1\u10d0\u10d0\u10d7\u10d8",hh:"%d \u10e1\u10d0\u10d0\u10d7\u10d8",d:"\u10d3\u10e6\u10d4",dd:"%d \u10d3\u10e6\u10d4",M:"\u10d7\u10d5\u10d4",MM:"%d \u10d7\u10d5\u10d4",y:"\u10ec\u10d4\u10da\u10d8",yy:"%d \u10ec\u10d4\u10da\u10d8"},dayOfMonthOrdinalParse:/0|1-\u10da\u10d8|\u10db\u10d4-\d{1,2}|\d{1,2}-\u10d4/,ordinal:function(e){return 0===e?e:1===e?e+"-\u10da\u10d8":e<20||e<=100&&e%20==0||e%100==0?"\u10db\u10d4-"+e:e+"-\u10d4"},week:{dow:1,doy:7}});var yn={0:"-\u0448\u0456",1:"-\u0448\u0456",2:"-\u0448\u0456",3:"-\u0448\u0456",4:"-\u0448\u0456",5:"-\u0448\u0456",6:"-\u0448\u044b",7:"-\u0448\u0456",8:"-\u0448\u0456",9:"-\u0448\u044b",10:"-\u0448\u044b",20:"-\u0448\u044b",30:"-\u0448\u044b",40:"-\u0448\u044b",50:"-\u0448\u0456",60:"-\u0448\u044b",70:"-\u0448\u0456",80:"-\u0448\u0456",90:"-\u0448\u044b",100:"-\u0448\u0456"};e.defineLocale("kk",{months:"\u049b\u0430\u04a3\u0442\u0430\u0440_\u0430\u049b\u043f\u0430\u043d_\u043d\u0430\u0443\u0440\u044b\u0437_\u0441\u04d9\u0443\u0456\u0440_\u043c\u0430\u043c\u044b\u0440_\u043c\u0430\u0443\u0441\u044b\u043c_\u0448\u0456\u043b\u0434\u0435_\u0442\u0430\u043c\u044b\u0437_\u049b\u044b\u0440\u043a\u04af\u0439\u0435\u043a_\u049b\u0430\u0437\u0430\u043d_\u049b\u0430\u0440\u0430\u0448\u0430_\u0436\u0435\u043b\u0442\u043e\u049b\u0441\u0430\u043d".split("_"),monthsShort:"\u049b\u0430\u04a3_\u0430\u049b\u043f_\u043d\u0430\u0443_\u0441\u04d9\u0443_\u043c\u0430\u043c_\u043c\u0430\u0443_\u0448\u0456\u043b_\u0442\u0430\u043c_\u049b\u044b\u0440_\u049b\u0430\u0437_\u049b\u0430\u0440_\u0436\u0435\u043b".split("_"),weekdays:"\u0436\u0435\u043a\u0441\u0435\u043d\u0431\u0456_\u0434\u04af\u0439\u0441\u0435\u043d\u0431\u0456_\u0441\u0435\u0439\u0441\u0435\u043d\u0431\u0456_\u0441\u04d9\u0440\u0441\u0435\u043d\u0431\u0456_\u0431\u0435\u0439\u0441\u0435\u043d\u0431\u0456_\u0436\u04b1\u043c\u0430_\u0441\u0435\u043d\u0431\u0456".split("_"),weekdaysShort:"\u0436\u0435\u043a_\u0434\u04af\u0439_\u0441\u0435\u0439_\u0441\u04d9\u0440_\u0431\u0435\u0439_\u0436\u04b1\u043c_\u0441\u0435\u043d".split("_"),weekdaysMin:"\u0436\u043a_\u0434\u0439_\u0441\u0439_\u0441\u0440_\u0431\u0439_\u0436\u043c_\u0441\u043d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0411\u04af\u0433\u0456\u043d \u0441\u0430\u0493\u0430\u0442] LT",nextDay:"[\u0415\u0440\u0442\u0435\u04a3 \u0441\u0430\u0493\u0430\u0442] LT",nextWeek:"dddd [\u0441\u0430\u0493\u0430\u0442] LT",lastDay:"[\u041a\u0435\u0448\u0435 \u0441\u0430\u0493\u0430\u0442] LT",lastWeek:"[\u04e8\u0442\u043a\u0435\u043d \u0430\u043f\u0442\u0430\u043d\u044b\u04a3] dddd [\u0441\u0430\u0493\u0430\u0442] LT",sameElse:"L"},relativeTime:{future:"%s \u0456\u0448\u0456\u043d\u0434\u0435",past:"%s \u0431\u04b1\u0440\u044b\u043d",s:"\u0431\u0456\u0440\u043d\u0435\u0448\u0435 \u0441\u0435\u043a\u0443\u043d\u0434",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434",m:"\u0431\u0456\u0440 \u043c\u0438\u043d\u0443\u0442",mm:"%d \u043c\u0438\u043d\u0443\u0442",h:"\u0431\u0456\u0440 \u0441\u0430\u0493\u0430\u0442",hh:"%d \u0441\u0430\u0493\u0430\u0442",d:"\u0431\u0456\u0440 \u043a\u04af\u043d",dd:"%d \u043a\u04af\u043d",M:"\u0431\u0456\u0440 \u0430\u0439",MM:"%d \u0430\u0439",y:"\u0431\u0456\u0440 \u0436\u044b\u043b",yy:"%d \u0436\u044b\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0448\u0456|\u0448\u044b)/,ordinal:function(e){return e+(yn[e]||yn[e%10]||yn[e>=100?100:null])},week:{dow:1,doy:7}}),e.defineLocale("km",{months:"\u1798\u1780\u179a\u17b6_\u1780\u17bb\u1798\u17d2\u1797\u17c8_\u1798\u17b8\u1793\u17b6_\u1798\u17c1\u179f\u17b6_\u17a7\u179f\u1797\u17b6_\u1798\u17b7\u1790\u17bb\u1793\u17b6_\u1780\u1780\u17d2\u1780\u178a\u17b6_\u179f\u17b8\u17a0\u17b6_\u1780\u1789\u17d2\u1789\u17b6_\u178f\u17bb\u179b\u17b6_\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6_\u1792\u17d2\u1793\u17bc".split("_"),monthsShort:"\u1798\u1780\u179a\u17b6_\u1780\u17bb\u1798\u17d2\u1797\u17c8_\u1798\u17b8\u1793\u17b6_\u1798\u17c1\u179f\u17b6_\u17a7\u179f\u1797\u17b6_\u1798\u17b7\u1790\u17bb\u1793\u17b6_\u1780\u1780\u17d2\u1780\u178a\u17b6_\u179f\u17b8\u17a0\u17b6_\u1780\u1789\u17d2\u1789\u17b6_\u178f\u17bb\u179b\u17b6_\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6_\u1792\u17d2\u1793\u17bc".split("_"),weekdays:"\u17a2\u17b6\u1791\u17b7\u178f\u17d2\u1799_\u1785\u17d0\u1793\u17d2\u1791_\u17a2\u1784\u17d2\u1782\u17b6\u179a_\u1796\u17bb\u1792_\u1796\u17d2\u179a\u17a0\u179f\u17d2\u1794\u178f\u17b7\u17cd_\u179f\u17bb\u1780\u17d2\u179a_\u179f\u17c5\u179a\u17cd".split("_"),weekdaysShort:"\u17a2\u17b6\u1791\u17b7\u178f\u17d2\u1799_\u1785\u17d0\u1793\u17d2\u1791_\u17a2\u1784\u17d2\u1782\u17b6\u179a_\u1796\u17bb\u1792_\u1796\u17d2\u179a\u17a0\u179f\u17d2\u1794\u178f\u17b7\u17cd_\u179f\u17bb\u1780\u17d2\u179a_\u179f\u17c5\u179a\u17cd".split("_"),weekdaysMin:"\u17a2\u17b6\u1791\u17b7\u178f\u17d2\u1799_\u1785\u17d0\u1793\u17d2\u1791_\u17a2\u1784\u17d2\u1782\u17b6\u179a_\u1796\u17bb\u1792_\u1796\u17d2\u179a\u17a0\u179f\u17d2\u1794\u178f\u17b7\u17cd_\u179f\u17bb\u1780\u17d2\u179a_\u179f\u17c5\u179a\u17cd".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u1790\u17d2\u1784\u17c3\u1793\u17c1\u17c7 \u1798\u17c9\u17c4\u1784] LT",nextDay:"[\u179f\u17d2\u17a2\u17c2\u1780 \u1798\u17c9\u17c4\u1784] LT",nextWeek:"dddd [\u1798\u17c9\u17c4\u1784] LT",lastDay:"[\u1798\u17d2\u179f\u17b7\u179b\u1798\u17b7\u1789 \u1798\u17c9\u17c4\u1784] LT",lastWeek:"dddd [\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1798\u17bb\u1793] [\u1798\u17c9\u17c4\u1784] LT",sameElse:"L"},relativeTime:{future:"%s\u1791\u17c0\u178f",past:"%s\u1798\u17bb\u1793",s:"\u1794\u17c9\u17bb\u1793\u17d2\u1798\u17b6\u1793\u179c\u17b7\u1793\u17b6\u1791\u17b8",ss:"%d \u179c\u17b7\u1793\u17b6\u1791\u17b8",m:"\u1798\u17bd\u1799\u1793\u17b6\u1791\u17b8",mm:"%d \u1793\u17b6\u1791\u17b8",h:"\u1798\u17bd\u1799\u1798\u17c9\u17c4\u1784",hh:"%d \u1798\u17c9\u17c4\u1784",d:"\u1798\u17bd\u1799\u1790\u17d2\u1784\u17c3",dd:"%d \u1790\u17d2\u1784\u17c3",M:"\u1798\u17bd\u1799\u1781\u17c2",MM:"%d \u1781\u17c2",y:"\u1798\u17bd\u1799\u1786\u17d2\u1793\u17b6\u17c6",yy:"%d \u1786\u17d2\u1793\u17b6\u17c6"},week:{dow:1,doy:4}});var fn={1:"\u0ce7",2:"\u0ce8",3:"\u0ce9",4:"\u0cea",5:"\u0ceb",6:"\u0cec",7:"\u0ced",8:"\u0cee",9:"\u0cef",0:"\u0ce6"},kn={"\u0ce7":"1","\u0ce8":"2","\u0ce9":"3","\u0cea":"4","\u0ceb":"5","\u0cec":"6","\u0ced":"7","\u0cee":"8","\u0cef":"9","\u0ce6":"0"};e.defineLocale("kn",{months:"\u0c9c\u0ca8\u0cb5\u0cb0\u0cbf_\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cbf_\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd_\u0c8f\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd_\u0cae\u0cc6\u0cd5_\u0c9c\u0cc2\u0ca8\u0ccd_\u0c9c\u0cc1\u0cb2\u0cc6\u0cd6_\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd_\u0cb8\u0cc6\u0caa\u0ccd\u0c9f\u0cc6\u0c82\u0cac\u0cb0\u0ccd_\u0c85\u0c95\u0ccd\u0c9f\u0cc6\u0cc2\u0cd5\u0cac\u0cb0\u0ccd_\u0ca8\u0cb5\u0cc6\u0c82\u0cac\u0cb0\u0ccd_\u0ca1\u0cbf\u0cb8\u0cc6\u0c82\u0cac\u0cb0\u0ccd".split("_"),monthsShort:"\u0c9c\u0ca8_\u0cab\u0cc6\u0cac\u0ccd\u0cb0_\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd_\u0c8f\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd_\u0cae\u0cc6\u0cd5_\u0c9c\u0cc2\u0ca8\u0ccd_\u0c9c\u0cc1\u0cb2\u0cc6\u0cd6_\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd_\u0cb8\u0cc6\u0caa\u0ccd\u0c9f\u0cc6\u0c82\u0cac_\u0c85\u0c95\u0ccd\u0c9f\u0cc6\u0cc2\u0cd5\u0cac_\u0ca8\u0cb5\u0cc6\u0c82\u0cac_\u0ca1\u0cbf\u0cb8\u0cc6\u0c82\u0cac".split("_"),monthsParseExact:!0,weekdays:"\u0cad\u0cbe\u0ca8\u0cc1\u0cb5\u0cbe\u0cb0_\u0cb8\u0cc6\u0cc2\u0cd5\u0cae\u0cb5\u0cbe\u0cb0_\u0cae\u0c82\u0c97\u0cb3\u0cb5\u0cbe\u0cb0_\u0cac\u0cc1\u0ca7\u0cb5\u0cbe\u0cb0_\u0c97\u0cc1\u0cb0\u0cc1\u0cb5\u0cbe\u0cb0_\u0cb6\u0cc1\u0c95\u0ccd\u0cb0\u0cb5\u0cbe\u0cb0_\u0cb6\u0ca8\u0cbf\u0cb5\u0cbe\u0cb0".split("_"),weekdaysShort:"\u0cad\u0cbe\u0ca8\u0cc1_\u0cb8\u0cc6\u0cc2\u0cd5\u0cae_\u0cae\u0c82\u0c97\u0cb3_\u0cac\u0cc1\u0ca7_\u0c97\u0cc1\u0cb0\u0cc1_\u0cb6\u0cc1\u0c95\u0ccd\u0cb0_\u0cb6\u0ca8\u0cbf".split("_"),weekdaysMin:"\u0cad\u0cbe_\u0cb8\u0cc6\u0cc2\u0cd5_\u0cae\u0c82_\u0cac\u0cc1_\u0c97\u0cc1_\u0cb6\u0cc1_\u0cb6".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0c87\u0c82\u0ca6\u0cc1] LT",nextDay:"[\u0ca8\u0cbe\u0cb3\u0cc6] LT",nextWeek:"dddd, LT",lastDay:"[\u0ca8\u0cbf\u0ca8\u0ccd\u0ca8\u0cc6] LT",lastWeek:"[\u0c95\u0cc6\u0cc2\u0ca8\u0cc6\u0caf] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0ca8\u0c82\u0ca4\u0cb0",past:"%s \u0cb9\u0cbf\u0c82\u0ca6\u0cc6",s:"\u0c95\u0cc6\u0cb2\u0cb5\u0cc1 \u0c95\u0ccd\u0cb7\u0ca3\u0c97\u0cb3\u0cc1",ss:"%d \u0cb8\u0cc6\u0c95\u0cc6\u0c82\u0ca1\u0cc1\u0c97\u0cb3\u0cc1",m:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca8\u0cbf\u0cae\u0cbf\u0cb7",mm:"%d \u0ca8\u0cbf\u0cae\u0cbf\u0cb7",h:"\u0c92\u0c82\u0ca6\u0cc1 \u0c97\u0c82\u0c9f\u0cc6",hh:"%d \u0c97\u0c82\u0c9f\u0cc6",d:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca6\u0cbf\u0ca8",dd:"%d \u0ca6\u0cbf\u0ca8",M:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca4\u0cbf\u0c82\u0c97\u0cb3\u0cc1",MM:"%d \u0ca4\u0cbf\u0c82\u0c97\u0cb3\u0cc1",y:"\u0c92\u0c82\u0ca6\u0cc1 \u0cb5\u0cb0\u0ccd\u0cb7",yy:"%d \u0cb5\u0cb0\u0ccd\u0cb7"},preparse:function(e){return e.replace(/[\u0ce7\u0ce8\u0ce9\u0cea\u0ceb\u0cec\u0ced\u0cee\u0cef\u0ce6]/g,function(e){return kn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return fn[e]})},meridiemParse:/\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf|\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6|\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8|\u0cb8\u0c82\u0c9c\u0cc6/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf"===a?e<4?e:e+12:"\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6"===a?e:"\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8"===a?e>=10?e:e+12:"\u0cb8\u0c82\u0c9c\u0cc6"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf":e<10?"\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6":e<17?"\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8":e<20?"\u0cb8\u0c82\u0c9c\u0cc6":"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf"},dayOfMonthOrdinalParse:/\d{1,2}(\u0ca8\u0cc6\u0cd5)/,ordinal:function(e){return e+"\u0ca8\u0cc6\u0cd5"},week:{dow:0,doy:6}}),e.defineLocale("ko",{months:"1\uc6d4_2\uc6d4_3\uc6d4_4\uc6d4_5\uc6d4_6\uc6d4_7\uc6d4_8\uc6d4_9\uc6d4_10\uc6d4_11\uc6d4_12\uc6d4".split("_"),monthsShort:"1\uc6d4_2\uc6d4_3\uc6d4_4\uc6d4_5\uc6d4_6\uc6d4_7\uc6d4_8\uc6d4_9\uc6d4_10\uc6d4_11\uc6d4_12\uc6d4".split("_"),weekdays:"\uc77c\uc694\uc77c_\uc6d4\uc694\uc77c_\ud654\uc694\uc77c_\uc218\uc694\uc77c_\ubaa9\uc694\uc77c_\uae08\uc694\uc77c_\ud1a0\uc694\uc77c".split("_"),weekdaysShort:"\uc77c_\uc6d4_\ud654_\uc218_\ubaa9_\uae08_\ud1a0".split("_"),weekdaysMin:"\uc77c_\uc6d4_\ud654_\uc218_\ubaa9_\uae08_\ud1a0".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"YYYY.MM.DD",LL:"YYYY\ub144 MMMM D\uc77c",LLL:"YYYY\ub144 MMMM D\uc77c A h:mm",LLLL:"YYYY\ub144 MMMM D\uc77c dddd A h:mm",l:"YYYY.MM.DD",ll:"YYYY\ub144 MMMM D\uc77c",lll:"YYYY\ub144 MMMM D\uc77c A h:mm",llll:"YYYY\ub144 MMMM D\uc77c dddd A h:mm"},calendar:{sameDay:"\uc624\ub298 LT",nextDay:"\ub0b4\uc77c LT",nextWeek:"dddd LT",lastDay:"\uc5b4\uc81c LT",lastWeek:"\uc9c0\ub09c\uc8fc dddd LT",sameElse:"L"},relativeTime:{future:"%s \ud6c4",past:"%s \uc804",s:"\uba87 \ucd08",ss:"%d\ucd08",m:"1\ubd84",mm:"%d\ubd84",h:"\ud55c \uc2dc\uac04",hh:"%d\uc2dc\uac04",d:"\ud558\ub8e8",dd:"%d\uc77c",M:"\ud55c \ub2ec",MM:"%d\ub2ec",y:"\uc77c \ub144",yy:"%d\ub144"},dayOfMonthOrdinalParse:/\d{1,2}(\uc77c|\uc6d4|\uc8fc)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\uc77c";case"M":return e+"\uc6d4";case"w":case"W":return e+"\uc8fc";default:return e}},meridiemParse:/\uc624\uc804|\uc624\ud6c4/,isPM:function(e){return"\uc624\ud6c4"===e},meridiem:function(e,a,t){return e<12?"\uc624\uc804":"\uc624\ud6c4"}});var pn={0:"-\u0447\u04af",1:"-\u0447\u0438",2:"-\u0447\u0438",3:"-\u0447\u04af",4:"-\u0447\u04af",5:"-\u0447\u0438",6:"-\u0447\u044b",7:"-\u0447\u0438",8:"-\u0447\u0438",9:"-\u0447\u0443",10:"-\u0447\u0443",20:"-\u0447\u044b",30:"-\u0447\u0443",40:"-\u0447\u044b",50:"-\u0447\u04af",60:"-\u0447\u044b",70:"-\u0447\u0438",80:"-\u0447\u0438",90:"-\u0447\u0443",100:"-\u0447\u04af"};e.defineLocale("ky",{months:"\u044f\u043d\u0432\u0430\u0440\u044c_\u0444\u0435\u0432\u0440\u0430\u043b\u044c_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b\u044c_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c_\u043e\u043a\u0442\u044f\u0431\u0440\u044c_\u043d\u043e\u044f\u0431\u0440\u044c_\u0434\u0435\u043a\u0430\u0431\u0440\u044c".split("_"),monthsShort:"\u044f\u043d\u0432_\u0444\u0435\u0432_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433_\u0441\u0435\u043d_\u043e\u043a\u0442_\u043d\u043e\u044f_\u0434\u0435\u043a".split("_"),weekdays:"\u0416\u0435\u043a\u0448\u0435\u043c\u0431\u0438_\u0414\u04af\u0439\u0448\u04e9\u043c\u0431\u04af_\u0428\u0435\u0439\u0448\u0435\u043c\u0431\u0438_\u0428\u0430\u0440\u0448\u0435\u043c\u0431\u0438_\u0411\u0435\u0439\u0448\u0435\u043c\u0431\u0438_\u0416\u0443\u043c\u0430_\u0418\u0448\u0435\u043c\u0431\u0438".split("_"),weekdaysShort:"\u0416\u0435\u043a_\u0414\u04af\u0439_\u0428\u0435\u0439_\u0428\u0430\u0440_\u0411\u0435\u0439_\u0416\u0443\u043c_\u0418\u0448\u0435".split("_"),weekdaysMin:"\u0416\u043a_\u0414\u0439_\u0428\u0439_\u0428\u0440_\u0411\u0439_\u0416\u043c_\u0418\u0448".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0411\u04af\u0433\u04af\u043d \u0441\u0430\u0430\u0442] LT",nextDay:"[\u042d\u0440\u0442\u0435\u04a3 \u0441\u0430\u0430\u0442] LT",nextWeek:"dddd [\u0441\u0430\u0430\u0442] LT",lastDay:"[\u041a\u0435\u0447\u0435 \u0441\u0430\u0430\u0442] LT",lastWeek:"[\u04e8\u0442\u043a\u0435\u043d \u0430\u043f\u0442\u0430\u043d\u044b\u043d] dddd [\u043a\u04af\u043d\u04af] [\u0441\u0430\u0430\u0442] LT",sameElse:"L"},relativeTime:{future:"%s \u0438\u0447\u0438\u043d\u0434\u0435",past:"%s \u043c\u0443\u0440\u0443\u043d",s:"\u0431\u0438\u0440\u043d\u0435\u0447\u0435 \u0441\u0435\u043a\u0443\u043d\u0434",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434",m:"\u0431\u0438\u0440 \u043c\u04af\u043d\u04e9\u0442",mm:"%d \u043c\u04af\u043d\u04e9\u0442",h:"\u0431\u0438\u0440 \u0441\u0430\u0430\u0442",hh:"%d \u0441\u0430\u0430\u0442",d:"\u0431\u0438\u0440 \u043a\u04af\u043d",dd:"%d \u043a\u04af\u043d",M:"\u0431\u0438\u0440 \u0430\u0439",MM:"%d \u0430\u0439",y:"\u0431\u0438\u0440 \u0436\u044b\u043b",yy:"%d \u0436\u044b\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0447\u0438|\u0447\u044b|\u0447\u04af|\u0447\u0443)/,ordinal:function(e){return e+(pn[e]||pn[e%10]||pn[e>=100?100:null])},week:{dow:1,doy:7}}),e.defineLocale("lb",{months:"Januar_Februar_M\xe4erz_Abr\xebll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonndeg_M\xe9indeg_D\xebnschdeg_M\xebttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._M\xe9._D\xeb._M\xeb._Do._Fr._Sa.".split("_"),weekdaysMin:"So_M\xe9_D\xeb_M\xeb_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm [Auer]",LLLL:"dddd, D. MMMM YYYY H:mm [Auer]"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[G\xebschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:function(e){return La(e.substr(0,e.indexOf(" ")))?"a "+e:"an "+e},past:function(e){return La(e.substr(0,e.indexOf(" ")))?"viru "+e:"virun "+e},s:"e puer Sekonnen",ss:"%d Sekonnen",m:ha,mm:"%d Minutten",h:ha,hh:"%d Stonnen",d:ha,dd:"%d Deeg",M:ha,MM:"%d M\xe9int",y:ha,yy:"%d Joer"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("lo",{months:"\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99_\u0e81\u0eb8\u0ea1\u0e9e\u0eb2_\u0ea1\u0eb5\u0e99\u0eb2_\u0ec0\u0ea1\u0eaa\u0eb2_\u0e9e\u0eb6\u0e94\u0eaa\u0eb0\u0e9e\u0eb2_\u0ea1\u0eb4\u0e96\u0eb8\u0e99\u0eb2_\u0e81\u0ecd\u0ea5\u0eb0\u0e81\u0ebb\u0e94_\u0eaa\u0eb4\u0e87\u0eab\u0eb2_\u0e81\u0eb1\u0e99\u0e8d\u0eb2_\u0e95\u0eb8\u0ea5\u0eb2_\u0e9e\u0eb0\u0e88\u0eb4\u0e81_\u0e97\u0eb1\u0e99\u0ea7\u0eb2".split("_"),monthsShort:"\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99_\u0e81\u0eb8\u0ea1\u0e9e\u0eb2_\u0ea1\u0eb5\u0e99\u0eb2_\u0ec0\u0ea1\u0eaa\u0eb2_\u0e9e\u0eb6\u0e94\u0eaa\u0eb0\u0e9e\u0eb2_\u0ea1\u0eb4\u0e96\u0eb8\u0e99\u0eb2_\u0e81\u0ecd\u0ea5\u0eb0\u0e81\u0ebb\u0e94_\u0eaa\u0eb4\u0e87\u0eab\u0eb2_\u0e81\u0eb1\u0e99\u0e8d\u0eb2_\u0e95\u0eb8\u0ea5\u0eb2_\u0e9e\u0eb0\u0e88\u0eb4\u0e81_\u0e97\u0eb1\u0e99\u0ea7\u0eb2".split("_"),weekdays:"\u0ead\u0eb2\u0e97\u0eb4\u0e94_\u0e88\u0eb1\u0e99_\u0ead\u0eb1\u0e87\u0e84\u0eb2\u0e99_\u0e9e\u0eb8\u0e94_\u0e9e\u0eb0\u0eab\u0eb1\u0e94_\u0eaa\u0eb8\u0e81_\u0ec0\u0eaa\u0ebb\u0eb2".split("_"),weekdaysShort:"\u0e97\u0eb4\u0e94_\u0e88\u0eb1\u0e99_\u0ead\u0eb1\u0e87\u0e84\u0eb2\u0e99_\u0e9e\u0eb8\u0e94_\u0e9e\u0eb0\u0eab\u0eb1\u0e94_\u0eaa\u0eb8\u0e81_\u0ec0\u0eaa\u0ebb\u0eb2".split("_"),weekdaysMin:"\u0e97_\u0e88_\u0ead\u0e84_\u0e9e_\u0e9e\u0eab_\u0eaa\u0e81_\u0eaa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"\u0ea7\u0eb1\u0e99dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0e95\u0ead\u0e99\u0ec0\u0e8a\u0ebb\u0ec9\u0eb2|\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87/,isPM:function(e){return"\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87"===e},meridiem:function(e,a,t){return e<12?"\u0e95\u0ead\u0e99\u0ec0\u0e8a\u0ebb\u0ec9\u0eb2":"\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87"},calendar:{sameDay:"[\u0ea1\u0eb7\u0ec9\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",nextDay:"[\u0ea1\u0eb7\u0ec9\u0ead\u0eb7\u0ec8\u0e99\u0ec0\u0ea7\u0ea5\u0eb2] LT",nextWeek:"[\u0ea7\u0eb1\u0e99]dddd[\u0edc\u0ec9\u0eb2\u0ec0\u0ea7\u0ea5\u0eb2] LT",lastDay:"[\u0ea1\u0eb7\u0ec9\u0ea7\u0eb2\u0e99\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",lastWeek:"[\u0ea7\u0eb1\u0e99]dddd[\u0ec1\u0ea5\u0ec9\u0ea7\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",sameElse:"L"},relativeTime:{future:"\u0ead\u0eb5\u0e81 %s",past:"%s\u0e9c\u0ec8\u0eb2\u0e99\u0ea1\u0eb2",s:"\u0e9a\u0ecd\u0ec8\u0ec0\u0e97\u0ebb\u0ec8\u0eb2\u0ec3\u0e94\u0ea7\u0eb4\u0e99\u0eb2\u0e97\u0eb5",ss:"%d \u0ea7\u0eb4\u0e99\u0eb2\u0e97\u0eb5",m:"1 \u0e99\u0eb2\u0e97\u0eb5",mm:"%d \u0e99\u0eb2\u0e97\u0eb5",h:"1 \u0e8a\u0ebb\u0ec8\u0ea7\u0ec2\u0ea1\u0e87",hh:"%d \u0e8a\u0ebb\u0ec8\u0ea7\u0ec2\u0ea1\u0e87",d:"1 \u0ea1\u0eb7\u0ec9",dd:"%d \u0ea1\u0eb7\u0ec9",M:"1 \u0ec0\u0e94\u0eb7\u0ead\u0e99",MM:"%d \u0ec0\u0e94\u0eb7\u0ead\u0e99",y:"1 \u0e9b\u0eb5",yy:"%d \u0e9b\u0eb5"},dayOfMonthOrdinalParse:/(\u0e97\u0eb5\u0ec8)\d{1,2}/,ordinal:function(e){return"\u0e97\u0eb5\u0ec8"+e}});var Dn={ss:"sekund\u0117_sekund\u017ei\u0173_sekundes",m:"minut\u0117_minut\u0117s_minut\u0119",mm:"minut\u0117s_minu\u010di\u0173_minutes",h:"valanda_valandos_valand\u0105",hh:"valandos_valand\u0173_valandas",d:"diena_dienos_dien\u0105",dd:"dienos_dien\u0173_dienas",M:"m\u0117nuo_m\u0117nesio_m\u0117nes\u012f",MM:"m\u0117nesiai_m\u0117nesi\u0173_m\u0117nesius",y:"metai_met\u0173_metus",yy:"metai_met\u0173_metus"};e.defineLocale("lt",{months:{format:"sausio_vasario_kovo_baland\u017eio_gegu\u017e\u0117s_bir\u017eelio_liepos_rugpj\u016b\u010dio_rugs\u0117jo_spalio_lapkri\u010dio_gruod\u017eio".split("_"),standalone:"sausis_vasaris_kovas_balandis_gegu\u017e\u0117_bir\u017eelis_liepa_rugpj\u016btis_rugs\u0117jis_spalis_lapkritis_gruodis".split("_"),isFormat:/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/},monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:{format:"sekmadien\u012f_pirmadien\u012f_antradien\u012f_tre\u010diadien\u012f_ketvirtadien\u012f_penktadien\u012f_\u0161e\u0161tadien\u012f".split("_"),standalone:"sekmadienis_pirmadienis_antradienis_tre\u010diadienis_ketvirtadienis_penktadienis_\u0161e\u0161tadienis".split("_"),isFormat:/dddd HH:mm/},weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_\u0160e\u0161".split("_"),weekdaysMin:"S_P_A_T_K_Pn_\u0160".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"},calendar:{sameDay:"[\u0160iandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Pra\u0117jus\u012f] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prie\u0161 %s",s:function(e,a,t,s){return a?"kelios sekund\u0117s":s?"keli\u0173 sekund\u017ei\u0173":"kelias sekundes"},ss:fa,m:ca,mm:fa,h:ca,hh:fa,d:ca,dd:fa,M:ca,MM:fa,y:ca,yy:fa},dayOfMonthOrdinalParse:/\d{1,2}-oji/,ordinal:function(e){return e+"-oji"},week:{dow:1,doy:4}});var Tn={ss:"sekundes_sekund\u0113m_sekunde_sekundes".split("_"),m:"min\u016btes_min\u016bt\u0113m_min\u016bte_min\u016btes".split("_"),mm:"min\u016btes_min\u016bt\u0113m_min\u016bte_min\u016btes".split("_"),h:"stundas_stund\u0101m_stunda_stundas".split("_"),hh:"stundas_stund\u0101m_stunda_stundas".split("_"),d:"dienas_dien\u0101m_diena_dienas".split("_"),dd:"dienas_dien\u0101m_diena_dienas".split("_"),M:"m\u0113ne\u0161a_m\u0113ne\u0161iem_m\u0113nesis_m\u0113ne\u0161i".split("_"),MM:"m\u0113ne\u0161a_m\u0113ne\u0161iem_m\u0113nesis_m\u0113ne\u0161i".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")};e.defineLocale("lv",{months:"janv\u0101ris_febru\u0101ris_marts_apr\u012blis_maijs_j\u016bnijs_j\u016blijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_j\u016bn_j\u016bl_aug_sep_okt_nov_dec".split("_"),weekdays:"sv\u0113tdiena_pirmdiena_otrdiena_tre\u0161diena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, HH:mm",LLLL:"YYYY. [gada] D. MMMM, dddd, HH:mm"},calendar:{sameDay:"[\u0160odien pulksten] LT",nextDay:"[R\u012bt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pag\u0101ju\u0161\u0101] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"p\u0113c %s",past:"pirms %s",s:function(e,a){return a?"da\u017eas sekundes":"da\u017e\u0101m sekund\u0113m"},ss:pa,m:Da,mm:pa,h:Da,hh:pa,d:Da,dd:pa,M:Da,MM:pa,y:Da,yy:pa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var gn={words:{ss:["sekund","sekunda","sekundi"],m:["jedan minut","jednog minuta"],mm:["minut","minuta","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mjesec","mjeseca","mjeseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:e>=2&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=gn.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+gn.correctGrammaticalCase(e,s)}};e.defineLocale("me",{months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sjutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010de u] LT",lastWeek:function(){return["[pro\u0161le] [nedjelje] [u] LT","[pro\u0161log] [ponedjeljka] [u] LT","[pro\u0161log] [utorka] [u] LT","[pro\u0161le] [srijede] [u] LT","[pro\u0161log] [\u010detvrtka] [u] LT","[pro\u0161log] [petka] [u] LT","[pro\u0161le] [subote] [u] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"nekoliko sekundi",ss:gn.translate,m:gn.translate,mm:gn.translate,h:gn.translate,hh:gn.translate,d:"dan",dd:gn.translate,M:"mjesec",MM:gn.translate,y:"godinu",yy:gn.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),e.defineLocale("mi",{months:"Kohi-t\u0101te_Hui-tanguru_Pout\u016b-te-rangi_Paenga-wh\u0101wh\u0101_Haratua_Pipiri_H\u014dngoingoi_Here-turi-k\u014dk\u0101_Mahuru_Whiringa-\u0101-nuku_Whiringa-\u0101-rangi_Hakihea".split("_"),monthsShort:"Kohi_Hui_Pou_Pae_Hara_Pipi_H\u014dngoi_Here_Mahu_Whi-nu_Whi-ra_Haki".split("_"),monthsRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsStrictRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsShortRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsShortStrictRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,weekdays:"R\u0101tapu_Mane_T\u016brei_Wenerei_T\u0101ite_Paraire_H\u0101tarei".split("_"),weekdaysShort:"Ta_Ma_T\u016b_We_T\u0101i_Pa_H\u0101".split("_"),weekdaysMin:"Ta_Ma_T\u016b_We_T\u0101i_Pa_H\u0101".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [i] HH:mm",LLLL:"dddd, D MMMM YYYY [i] HH:mm"},calendar:{sameDay:"[i teie mahana, i] LT",nextDay:"[apopo i] LT",nextWeek:"dddd [i] LT",lastDay:"[inanahi i] LT",lastWeek:"dddd [whakamutunga i] LT",sameElse:"L"},relativeTime:{future:"i roto i %s",past:"%s i mua",s:"te h\u0113kona ruarua",ss:"%d h\u0113kona",m:"he meneti",mm:"%d meneti",h:"te haora",hh:"%d haora",d:"he ra",dd:"%d ra",M:"he marama",MM:"%d marama",y:"he tau",yy:"%d tau"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),e.defineLocale("mk",{months:"\u0458\u0430\u043d\u0443\u0430\u0440\u0438_\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0458_\u0458\u0443\u043d\u0438_\u0458\u0443\u043b\u0438_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438_\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438_\u043d\u043e\u0435\u043c\u0432\u0440\u0438_\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438".split("_"),monthsShort:"\u0458\u0430\u043d_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433_\u0441\u0435\u043f_\u043e\u043a\u0442_\u043d\u043e\u0435_\u0434\u0435\u043a".split("_"),weekdays:"\u043d\u0435\u0434\u0435\u043b\u0430_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0440\u0442\u043e\u043a_\u043f\u0435\u0442\u043e\u043a_\u0441\u0430\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434_\u043f\u043e\u043d_\u0432\u0442\u043e_\u0441\u0440\u0435_\u0447\u0435\u0442_\u043f\u0435\u0442_\u0441\u0430\u0431".split("_"),weekdaysMin:"\u043de_\u043fo_\u0432\u0442_\u0441\u0440_\u0447\u0435_\u043f\u0435_\u0441a".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[\u0414\u0435\u043d\u0435\u0441 \u0432\u043e] LT",nextDay:"[\u0423\u0442\u0440\u0435 \u0432\u043e] LT",nextWeek:"[\u0412\u043e] dddd [\u0432\u043e] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430 \u0432\u043e] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[\u0418\u0437\u043c\u0438\u043d\u0430\u0442\u0430\u0442\u0430] dddd [\u0432\u043e] LT";case 1:case 2:case 4:case 5:return"[\u0418\u0437\u043c\u0438\u043d\u0430\u0442\u0438\u043e\u0442] dddd [\u0432\u043e] LT"}},sameElse:"L"},relativeTime:{future:"\u043f\u043e\u0441\u043b\u0435 %s",past:"\u043f\u0440\u0435\u0434 %s",s:"\u043d\u0435\u043a\u043e\u043b\u043a\u0443 \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434\u0438",m:"\u043c\u0438\u043d\u0443\u0442\u0430",mm:"%d \u043c\u0438\u043d\u0443\u0442\u0438",h:"\u0447\u0430\u0441",hh:"%d \u0447\u0430\u0441\u0430",d:"\u0434\u0435\u043d",dd:"%d \u0434\u0435\u043d\u0430",M:"\u043c\u0435\u0441\u0435\u0446",MM:"%d \u043c\u0435\u0441\u0435\u0446\u0438",y:"\u0433\u043e\u0434\u0438\u043d\u0430",yy:"%d \u0433\u043e\u0434\u0438\u043d\u0438"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0435\u0432|\u0435\u043d|\u0442\u0438|\u0432\u0438|\u0440\u0438|\u043c\u0438)/,ordinal:function(e){var a=e%10,t=e%100;return 0===e?e+"-\u0435\u0432":0===t?e+"-\u0435\u043d":t>10&&t<20?e+"-\u0442\u0438":1===a?e+"-\u0432\u0438":2===a?e+"-\u0440\u0438":7===a||8===a?e+"-\u043c\u0438":e+"-\u0442\u0438"},week:{dow:1,doy:7}}),e.defineLocale("ml",{months:"\u0d1c\u0d28\u0d41\u0d35\u0d30\u0d3f_\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41\u0d35\u0d30\u0d3f_\u0d2e\u0d3e\u0d7c\u0d1a\u0d4d\u0d1a\u0d4d_\u0d0f\u0d2a\u0d4d\u0d30\u0d3f\u0d7d_\u0d2e\u0d47\u0d2f\u0d4d_\u0d1c\u0d42\u0d7a_\u0d1c\u0d42\u0d32\u0d48_\u0d13\u0d17\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d_\u0d38\u0d46\u0d2a\u0d4d\u0d31\u0d4d\u0d31\u0d02\u0d2c\u0d7c_\u0d12\u0d15\u0d4d\u0d1f\u0d4b\u0d2c\u0d7c_\u0d28\u0d35\u0d02\u0d2c\u0d7c_\u0d21\u0d3f\u0d38\u0d02\u0d2c\u0d7c".split("_"),monthsShort:"\u0d1c\u0d28\u0d41._\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41._\u0d2e\u0d3e\u0d7c._\u0d0f\u0d2a\u0d4d\u0d30\u0d3f._\u0d2e\u0d47\u0d2f\u0d4d_\u0d1c\u0d42\u0d7a_\u0d1c\u0d42\u0d32\u0d48._\u0d13\u0d17._\u0d38\u0d46\u0d2a\u0d4d\u0d31\u0d4d\u0d31._\u0d12\u0d15\u0d4d\u0d1f\u0d4b._\u0d28\u0d35\u0d02._\u0d21\u0d3f\u0d38\u0d02.".split("_"),monthsParseExact:!0,weekdays:"\u0d1e\u0d3e\u0d2f\u0d31\u0d3e\u0d34\u0d4d\u0d1a_\u0d24\u0d3f\u0d19\u0d4d\u0d15\u0d33\u0d3e\u0d34\u0d4d\u0d1a_\u0d1a\u0d4a\u0d35\u0d4d\u0d35\u0d3e\u0d34\u0d4d\u0d1a_\u0d2c\u0d41\u0d27\u0d28\u0d3e\u0d34\u0d4d\u0d1a_\u0d35\u0d4d\u0d2f\u0d3e\u0d34\u0d3e\u0d34\u0d4d\u0d1a_\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u0d1a_\u0d36\u0d28\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u0d1a".split("_"),weekdaysShort:"\u0d1e\u0d3e\u0d2f\u0d7c_\u0d24\u0d3f\u0d19\u0d4d\u0d15\u0d7e_\u0d1a\u0d4a\u0d35\u0d4d\u0d35_\u0d2c\u0d41\u0d27\u0d7b_\u0d35\u0d4d\u0d2f\u0d3e\u0d34\u0d02_\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f_\u0d36\u0d28\u0d3f".split("_"),weekdaysMin:"\u0d1e\u0d3e_\u0d24\u0d3f_\u0d1a\u0d4a_\u0d2c\u0d41_\u0d35\u0d4d\u0d2f\u0d3e_\u0d35\u0d46_\u0d36".split("_"),longDateFormat:{LT:"A h:mm -\u0d28\u0d41",LTS:"A h:mm:ss -\u0d28\u0d41",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm -\u0d28\u0d41",LLLL:"dddd, D MMMM YYYY, A h:mm -\u0d28\u0d41"},calendar:{sameDay:"[\u0d07\u0d28\u0d4d\u0d28\u0d4d] LT",nextDay:"[\u0d28\u0d3e\u0d33\u0d46] LT",nextWeek:"dddd, LT",lastDay:"[\u0d07\u0d28\u0d4d\u0d28\u0d32\u0d46] LT",lastWeek:"[\u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d",past:"%s \u0d2e\u0d41\u0d7b\u0d2a\u0d4d",s:"\u0d05\u0d7d\u0d2a \u0d28\u0d3f\u0d2e\u0d3f\u0d37\u0d19\u0d4d\u0d19\u0d7e",ss:"%d \u0d38\u0d46\u0d15\u0d4d\u0d15\u0d7b\u0d21\u0d4d",m:"\u0d12\u0d30\u0d41 \u0d2e\u0d3f\u0d28\u0d3f\u0d31\u0d4d\u0d31\u0d4d",mm:"%d \u0d2e\u0d3f\u0d28\u0d3f\u0d31\u0d4d\u0d31\u0d4d",h:"\u0d12\u0d30\u0d41 \u0d2e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d42\u0d7c",hh:"%d \u0d2e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d42\u0d7c",d:"\u0d12\u0d30\u0d41 \u0d26\u0d3f\u0d35\u0d38\u0d02",dd:"%d \u0d26\u0d3f\u0d35\u0d38\u0d02",M:"\u0d12\u0d30\u0d41 \u0d2e\u0d3e\u0d38\u0d02",MM:"%d \u0d2e\u0d3e\u0d38\u0d02",y:"\u0d12\u0d30\u0d41 \u0d35\u0d7c\u0d37\u0d02",yy:"%d \u0d35\u0d7c\u0d37\u0d02"},meridiemParse:/\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f|\u0d30\u0d3e\u0d35\u0d3f\u0d32\u0d46|\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d|\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02|\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f/i,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f"===a&&e>=4||"\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d"===a||"\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f":e<12?"\u0d30\u0d3e\u0d35\u0d3f\u0d32\u0d46":e<17?"\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d":e<20?"\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02":"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f"}});var wn={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},vn={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};e.defineLocale("mr",{months:"\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u090f\u092a\u094d\u0930\u093f\u0932_\u092e\u0947_\u091c\u0942\u0928_\u091c\u0941\u0932\u0948_\u0911\u0917\u0938\u094d\u091f_\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930_\u0911\u0915\u094d\u091f\u094b\u092c\u0930_\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930_\u0921\u093f\u0938\u0947\u0902\u092c\u0930".split("_"),monthsShort:"\u091c\u093e\u0928\u0947._\u092b\u0947\u092c\u094d\u0930\u0941._\u092e\u093e\u0930\u094d\u091a._\u090f\u092a\u094d\u0930\u093f._\u092e\u0947._\u091c\u0942\u0928._\u091c\u0941\u0932\u0948._\u0911\u0917._\u0938\u092a\u094d\u091f\u0947\u0902._\u0911\u0915\u094d\u091f\u094b._\u0928\u094b\u0935\u094d\u0939\u0947\u0902._\u0921\u093f\u0938\u0947\u0902.".split("_"),monthsParseExact:!0,weekdays:"\u0930\u0935\u093f\u0935\u093e\u0930_\u0938\u094b\u092e\u0935\u093e\u0930_\u092e\u0902\u0917\u0933\u0935\u093e\u0930_\u092c\u0941\u0927\u0935\u093e\u0930_\u0917\u0941\u0930\u0942\u0935\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930_\u0936\u0928\u093f\u0935\u093e\u0930".split("_"),weekdaysShort:"\u0930\u0935\u093f_\u0938\u094b\u092e_\u092e\u0902\u0917\u0933_\u092c\u0941\u0927_\u0917\u0941\u0930\u0942_\u0936\u0941\u0915\u094d\u0930_\u0936\u0928\u093f".split("_"),weekdaysMin:"\u0930_\u0938\u094b_\u092e\u0902_\u092c\u0941_\u0917\u0941_\u0936\u0941_\u0936".split("_"),longDateFormat:{LT:"A h:mm \u0935\u093e\u091c\u0924\u093e",LTS:"A h:mm:ss \u0935\u093e\u091c\u0924\u093e",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0935\u093e\u091c\u0924\u093e",LLLL:"dddd, D MMMM YYYY, A h:mm \u0935\u093e\u091c\u0924\u093e"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u0909\u0926\u094d\u092f\u093e] LT",nextWeek:"dddd, LT",lastDay:"[\u0915\u093e\u0932] LT",lastWeek:"[\u092e\u093e\u0917\u0940\u0932] dddd, LT",sameElse:"L"},relativeTime:{future:"%s\u092e\u0927\u094d\u092f\u0947",past:"%s\u092a\u0942\u0930\u094d\u0935\u0940",s:Ta,ss:Ta,m:Ta,mm:Ta,h:Ta,hh:Ta,d:Ta,dd:Ta,M:Ta,MM:Ta,y:Ta,yy:Ta},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return vn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return wn[e]})},meridiemParse:/\u0930\u093e\u0924\u094d\u0930\u0940|\u0938\u0915\u093e\u0933\u0940|\u0926\u0941\u092a\u093e\u0930\u0940|\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924\u094d\u0930\u0940"===a?e<4?e:e+12:"\u0938\u0915\u093e\u0933\u0940"===a?e:"\u0926\u0941\u092a\u093e\u0930\u0940"===a?e>=10?e:e+12:"\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0930\u093e\u0924\u094d\u0930\u0940":e<10?"\u0938\u0915\u093e\u0933\u0940":e<17?"\u0926\u0941\u092a\u093e\u0930\u0940":e<20?"\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940":"\u0930\u093e\u0924\u094d\u0930\u0940"},week:{dow:0,doy:6}}),e.defineLocale("ms-my",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"tengahari"===a?e>=11?e:e+12:"petang"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"tengahari":e<19?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",ss:"%d saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),e.defineLocale("ms",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"tengahari"===a?e>=11?e:e+12:"petang"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"tengahari":e<19?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",ss:"%d saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),e.defineLocale("mt",{months:"Jannar_Frar_Marzu_April_Mejju_\u0120unju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Di\u010bembru".split("_"),monthsShort:"Jan_Fra_Mar_Apr_Mej_\u0120un_Lul_Aww_Set_Ott_Nov_Di\u010b".split("_"),weekdays:"Il-\u0126add_It-Tnejn_It-Tlieta_L-Erbg\u0127a_Il-\u0126amis_Il-\u0120img\u0127a_Is-Sibt".split("_"),weekdaysShort:"\u0126ad_Tne_Tli_Erb_\u0126am_\u0120im_Sib".split("_"),weekdaysMin:"\u0126a_Tn_Tl_Er_\u0126a_\u0120i_Si".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Illum fil-]LT",nextDay:"[G\u0127ada fil-]LT",nextWeek:"dddd [fil-]LT",lastDay:"[Il-biera\u0127 fil-]LT",lastWeek:"dddd [li g\u0127adda] [fil-]LT",sameElse:"L"},relativeTime:{future:"f\u2019 %s",past:"%s ilu",s:"ftit sekondi",ss:"%d sekondi",m:"minuta",mm:"%d minuti",h:"sieg\u0127a",hh:"%d sieg\u0127at",d:"\u0121urnata",dd:"%d \u0121ranet",M:"xahar",MM:"%d xhur",y:"sena",yy:"%d sni"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}});var Sn={1:"\u1041",2:"\u1042",3:"\u1043",4:"\u1044",5:"\u1045",6:"\u1046",7:"\u1047",8:"\u1048",9:"\u1049",0:"\u1040"},Hn={"\u1041":"1","\u1042":"2","\u1043":"3","\u1044":"4","\u1045":"5","\u1046":"6","\u1047":"7","\u1048":"8","\u1049":"9","\u1040":"0"};e.defineLocale("my",{months:"\u1007\u1014\u103a\u1014\u101d\u102b\u101b\u102e_\u1016\u1031\u1016\u1031\u102c\u103a\u101d\u102b\u101b\u102e_\u1019\u1010\u103a_\u1027\u1015\u103c\u102e_\u1019\u1031_\u1007\u103d\u1014\u103a_\u1007\u1030\u101c\u102d\u102f\u1004\u103a_\u101e\u103c\u1002\u102f\u1010\u103a_\u1005\u1000\u103a\u1010\u1004\u103a\u1018\u102c_\u1021\u1031\u102c\u1000\u103a\u1010\u102d\u102f\u1018\u102c_\u1014\u102d\u102f\u101d\u1004\u103a\u1018\u102c_\u1012\u102e\u1007\u1004\u103a\u1018\u102c".split("_"),monthsShort:"\u1007\u1014\u103a_\u1016\u1031_\u1019\u1010\u103a_\u1015\u103c\u102e_\u1019\u1031_\u1007\u103d\u1014\u103a_\u101c\u102d\u102f\u1004\u103a_\u101e\u103c_\u1005\u1000\u103a_\u1021\u1031\u102c\u1000\u103a_\u1014\u102d\u102f_\u1012\u102e".split("_"),weekdays:"\u1010\u1014\u1004\u103a\u1039\u1002\u1014\u103d\u1031_\u1010\u1014\u1004\u103a\u1039\u101c\u102c_\u1021\u1004\u103a\u1039\u1002\u102b_\u1017\u102f\u1012\u1039\u1013\u101f\u1030\u1038_\u1000\u103c\u102c\u101e\u1015\u1010\u1031\u1038_\u101e\u1031\u102c\u1000\u103c\u102c_\u1005\u1014\u1031".split("_"),weekdaysShort:"\u1014\u103d\u1031_\u101c\u102c_\u1002\u102b_\u101f\u1030\u1038_\u1000\u103c\u102c_\u101e\u1031\u102c_\u1014\u1031".split("_"),weekdaysMin:"\u1014\u103d\u1031_\u101c\u102c_\u1002\u102b_\u101f\u1030\u1038_\u1000\u103c\u102c_\u101e\u1031\u102c_\u1014\u1031".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u101a\u1014\u1031.] LT [\u1019\u103e\u102c]",nextDay:"[\u1019\u1014\u1000\u103a\u1016\u103c\u1014\u103a] LT [\u1019\u103e\u102c]",nextWeek:"dddd LT [\u1019\u103e\u102c]",lastDay:"[\u1019\u1014\u1031.\u1000] LT [\u1019\u103e\u102c]",lastWeek:"[\u1015\u103c\u102e\u1038\u1001\u1032\u1037\u101e\u1031\u102c] dddd LT [\u1019\u103e\u102c]",sameElse:"L"},relativeTime:{future:"\u101c\u102c\u1019\u100a\u103a\u1037 %s \u1019\u103e\u102c",past:"\u101c\u103d\u1014\u103a\u1001\u1032\u1037\u101e\u1031\u102c %s \u1000",s:"\u1005\u1000\u1039\u1000\u1014\u103a.\u1021\u1014\u100a\u103a\u1038\u1004\u101a\u103a",ss:"%d \u1005\u1000\u1039\u1000\u1014\u1037\u103a",m:"\u1010\u1005\u103a\u1019\u102d\u1014\u1005\u103a",mm:"%d \u1019\u102d\u1014\u1005\u103a",h:"\u1010\u1005\u103a\u1014\u102c\u101b\u102e",hh:"%d \u1014\u102c\u101b\u102e",d:"\u1010\u1005\u103a\u101b\u1000\u103a",dd:"%d \u101b\u1000\u103a",M:"\u1010\u1005\u103a\u101c",MM:"%d \u101c",y:"\u1010\u1005\u103a\u1014\u103e\u1005\u103a",yy:"%d \u1014\u103e\u1005\u103a"},preparse:function(e){return e.replace(/[\u1041\u1042\u1043\u1044\u1045\u1046\u1047\u1048\u1049\u1040]/g,function(e){return Hn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Sn[e]})},week:{dow:1,doy:4}}),e.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),monthsParseExact:!0,weekdays:"s\xf8ndag_mandag_tirsdag_onsdag_torsdag_fredag_l\xf8rdag".split("_"),weekdaysShort:"s\xf8._ma._ti._on._to._fr._l\xf8.".split("_"),weekdaysMin:"s\xf8_ma_ti_on_to_fr_l\xf8".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] HH:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i g\xe5r kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"noen sekunder",ss:"%d sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en m\xe5ned",MM:"%d m\xe5neder",y:"ett \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var bn={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},jn={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};e.defineLocale("ne",{months:"\u091c\u0928\u0935\u0930\u0940_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u093f\u0932_\u092e\u0908_\u091c\u0941\u0928_\u091c\u0941\u0932\u093e\u0908_\u0905\u0917\u0937\u094d\u091f_\u0938\u0947\u092a\u094d\u091f\u0947\u092e\u094d\u092c\u0930_\u0905\u0915\u094d\u091f\u094b\u092c\u0930_\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930_\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930".split("_"),monthsShort:"\u091c\u0928._\u092b\u0947\u092c\u094d\u0930\u0941._\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u093f._\u092e\u0908_\u091c\u0941\u0928_\u091c\u0941\u0932\u093e\u0908._\u0905\u0917._\u0938\u0947\u092a\u094d\u091f._\u0905\u0915\u094d\u091f\u094b._\u0928\u094b\u092d\u0947._\u0921\u093f\u0938\u0947.".split("_"),monthsParseExact:!0,weekdays:"\u0906\u0907\u0924\u092c\u093e\u0930_\u0938\u094b\u092e\u092c\u093e\u0930_\u092e\u0919\u094d\u0917\u0932\u092c\u093e\u0930_\u092c\u0941\u0927\u092c\u093e\u0930_\u092c\u093f\u0939\u093f\u092c\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930_\u0936\u0928\u093f\u092c\u093e\u0930".split("_"),weekdaysShort:"\u0906\u0907\u0924._\u0938\u094b\u092e._\u092e\u0919\u094d\u0917\u0932._\u092c\u0941\u0927._\u092c\u093f\u0939\u093f._\u0936\u0941\u0915\u094d\u0930._\u0936\u0928\u093f.".split("_"),weekdaysMin:"\u0906._\u0938\u094b._\u092e\u0902._\u092c\u0941._\u092c\u093f._\u0936\u0941._\u0936.".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"A\u0915\u094b h:mm \u092c\u091c\u0947",LTS:"A\u0915\u094b h:mm:ss \u092c\u091c\u0947",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A\u0915\u094b h:mm \u092c\u091c\u0947",LLLL:"dddd, D MMMM YYYY, A\u0915\u094b h:mm \u092c\u091c\u0947"},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return jn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return bn[e]})},meridiemParse:/\u0930\u093e\u0924\u093f|\u092c\u093f\u0939\u093e\u0928|\u0926\u093f\u0909\u0901\u0938\u094b|\u0938\u093e\u0901\u091d/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924\u093f"===a?e<4?e:e+12:"\u092c\u093f\u0939\u093e\u0928"===a?e:"\u0926\u093f\u0909\u0901\u0938\u094b"===a?e>=10?e:e+12:"\u0938\u093e\u0901\u091d"===a?e+12:void 0},meridiem:function(e,a,t){return e<3?"\u0930\u093e\u0924\u093f":e<12?"\u092c\u093f\u0939\u093e\u0928":e<16?"\u0926\u093f\u0909\u0901\u0938\u094b":e<20?"\u0938\u093e\u0901\u091d":"\u0930\u093e\u0924\u093f"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u092d\u094b\u0932\u093f] LT",nextWeek:"[\u0906\u0909\u0901\u0926\u094b] dddd[,] LT",lastDay:"[\u0939\u093f\u091c\u094b] LT",lastWeek:"[\u0917\u090f\u0915\u094b] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%s\u092e\u093e",past:"%s \u0905\u0917\u093e\u0921\u093f",s:"\u0915\u0947\u0939\u0940 \u0915\u094d\u0937\u0923",ss:"%d \u0938\u0947\u0915\u0947\u0923\u094d\u0921",m:"\u090f\u0915 \u092e\u093f\u0928\u0947\u091f",mm:"%d \u092e\u093f\u0928\u0947\u091f",h:"\u090f\u0915 \u0918\u0923\u094d\u091f\u093e",hh:"%d \u0918\u0923\u094d\u091f\u093e",d:"\u090f\u0915 \u0926\u093f\u0928",dd:"%d \u0926\u093f\u0928",M:"\u090f\u0915 \u092e\u0939\u093f\u0928\u093e",MM:"%d \u092e\u0939\u093f\u0928\u093e",y:"\u090f\u0915 \u092c\u0930\u094d\u0937",yy:"%d \u092c\u0930\u094d\u0937"},week:{dow:0,doy:6}});var xn="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),Pn="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),On=[/^jan/i,/^feb/i,/^maart|mrt.?$/i,/^apr/i,/^mei$/i,/^jun[i.]?$/i,/^jul[i.]?$/i,/^aug/i,/^sep/i,/^okt/i,/^nov/i,/^dec/i],Wn=/^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;e.defineLocale("nl-be",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?Pn[e.month()]:xn[e.month()]:xn},monthsRegex:Wn,monthsShortRegex:Wn,monthsStrictRegex:/^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,monthsShortStrictRegex:/^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,monthsParse:On,longMonthsParse:On,shortMonthsParse:On,weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",ss:"%d seconden",m:"\xe9\xe9n minuut",mm:"%d minuten",h:"\xe9\xe9n uur",hh:"%d uur",d:"\xe9\xe9n dag",dd:"%d dagen",M:"\xe9\xe9n maand",MM:"%d maanden",y:"\xe9\xe9n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||e>=20?"ste":"de")},week:{dow:1,doy:4}});var En="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),An="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),Fn=[/^jan/i,/^feb/i,/^maart|mrt.?$/i,/^apr/i,/^mei$/i,/^jun[i.]?$/i,/^jul[i.]?$/i,/^aug/i,/^sep/i,/^okt/i,/^nov/i,/^dec/i],zn=/^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;e.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?An[e.month()]:En[e.month()]:En},monthsRegex:zn,monthsShortRegex:zn,monthsStrictRegex:/^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,monthsShortStrictRegex:/^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,monthsParse:Fn,longMonthsParse:Fn,shortMonthsParse:Fn,weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",ss:"%d seconden",m:"\xe9\xe9n minuut",mm:"%d minuten",h:"\xe9\xe9n uur",hh:"%d uur",d:"\xe9\xe9n dag",dd:"%d dagen",M:"\xe9\xe9n maand",MM:"%d maanden",y:"\xe9\xe9n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||e>=20?"ste":"de")},week:{dow:1,doy:4}}),e.defineLocale("nn",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sundag_m\xe5ndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"sun_m\xe5n_tys_ons_tor_fre_lau".split("_"),weekdaysMin:"su_m\xe5_ty_on_to_fr_l\xf8".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[I dag klokka] LT",nextDay:"[I morgon klokka] LT",nextWeek:"dddd [klokka] LT",lastDay:"[I g\xe5r klokka] LT",lastWeek:"[F\xf8reg\xe5ande] dddd [klokka] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s sidan",s:"nokre sekund",ss:"%d sekund",m:"eit minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",M:"ein m\xe5nad",MM:"%d m\xe5nader",y:"eit \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Jn={1:"\u0a67",2:"\u0a68",3:"\u0a69",4:"\u0a6a",5:"\u0a6b",6:"\u0a6c",7:"\u0a6d",8:"\u0a6e",9:"\u0a6f",0:"\u0a66"},Nn={"\u0a67":"1","\u0a68":"2","\u0a69":"3","\u0a6a":"4","\u0a6b":"5","\u0a6c":"6","\u0a6d":"7","\u0a6e":"8","\u0a6f":"9","\u0a66":"0"};e.defineLocale("pa-in",{months:"\u0a1c\u0a28\u0a35\u0a30\u0a40_\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40_\u0a2e\u0a3e\u0a30\u0a1a_\u0a05\u0a2a\u0a4d\u0a30\u0a48\u0a32_\u0a2e\u0a08_\u0a1c\u0a42\u0a28_\u0a1c\u0a41\u0a32\u0a3e\u0a08_\u0a05\u0a17\u0a38\u0a24_\u0a38\u0a24\u0a70\u0a2c\u0a30_\u0a05\u0a15\u0a24\u0a42\u0a2c\u0a30_\u0a28\u0a35\u0a70\u0a2c\u0a30_\u0a26\u0a38\u0a70\u0a2c\u0a30".split("_"),monthsShort:"\u0a1c\u0a28\u0a35\u0a30\u0a40_\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40_\u0a2e\u0a3e\u0a30\u0a1a_\u0a05\u0a2a\u0a4d\u0a30\u0a48\u0a32_\u0a2e\u0a08_\u0a1c\u0a42\u0a28_\u0a1c\u0a41\u0a32\u0a3e\u0a08_\u0a05\u0a17\u0a38\u0a24_\u0a38\u0a24\u0a70\u0a2c\u0a30_\u0a05\u0a15\u0a24\u0a42\u0a2c\u0a30_\u0a28\u0a35\u0a70\u0a2c\u0a30_\u0a26\u0a38\u0a70\u0a2c\u0a30".split("_"),weekdays:"\u0a10\u0a24\u0a35\u0a3e\u0a30_\u0a38\u0a4b\u0a2e\u0a35\u0a3e\u0a30_\u0a2e\u0a70\u0a17\u0a32\u0a35\u0a3e\u0a30_\u0a2c\u0a41\u0a27\u0a35\u0a3e\u0a30_\u0a35\u0a40\u0a30\u0a35\u0a3e\u0a30_\u0a38\u0a3c\u0a41\u0a71\u0a15\u0a30\u0a35\u0a3e\u0a30_\u0a38\u0a3c\u0a28\u0a40\u0a1a\u0a30\u0a35\u0a3e\u0a30".split("_"),weekdaysShort:"\u0a10\u0a24_\u0a38\u0a4b\u0a2e_\u0a2e\u0a70\u0a17\u0a32_\u0a2c\u0a41\u0a27_\u0a35\u0a40\u0a30_\u0a38\u0a3c\u0a41\u0a15\u0a30_\u0a38\u0a3c\u0a28\u0a40".split("_"),weekdaysMin:"\u0a10\u0a24_\u0a38\u0a4b\u0a2e_\u0a2e\u0a70\u0a17\u0a32_\u0a2c\u0a41\u0a27_\u0a35\u0a40\u0a30_\u0a38\u0a3c\u0a41\u0a15\u0a30_\u0a38\u0a3c\u0a28\u0a40".split("_"),longDateFormat:{LT:"A h:mm \u0a35\u0a1c\u0a47",LTS:"A h:mm:ss \u0a35\u0a1c\u0a47",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0a35\u0a1c\u0a47",LLLL:"dddd, D MMMM YYYY, A h:mm \u0a35\u0a1c\u0a47"},calendar:{sameDay:"[\u0a05\u0a1c] LT",nextDay:"[\u0a15\u0a32] LT",nextWeek:"dddd, LT",lastDay:"[\u0a15\u0a32] LT",lastWeek:"[\u0a2a\u0a3f\u0a1b\u0a32\u0a47] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0a35\u0a3f\u0a71\u0a1a",past:"%s \u0a2a\u0a3f\u0a1b\u0a32\u0a47",s:"\u0a15\u0a41\u0a1d \u0a38\u0a15\u0a3f\u0a70\u0a1f",ss:"%d \u0a38\u0a15\u0a3f\u0a70\u0a1f",m:"\u0a07\u0a15 \u0a2e\u0a3f\u0a70\u0a1f",mm:"%d \u0a2e\u0a3f\u0a70\u0a1f",h:"\u0a07\u0a71\u0a15 \u0a18\u0a70\u0a1f\u0a3e",hh:"%d \u0a18\u0a70\u0a1f\u0a47",d:"\u0a07\u0a71\u0a15 \u0a26\u0a3f\u0a28",dd:"%d \u0a26\u0a3f\u0a28",M:"\u0a07\u0a71\u0a15 \u0a2e\u0a39\u0a40\u0a28\u0a3e",MM:"%d \u0a2e\u0a39\u0a40\u0a28\u0a47",y:"\u0a07\u0a71\u0a15 \u0a38\u0a3e\u0a32",yy:"%d \u0a38\u0a3e\u0a32"},preparse:function(e){return e.replace(/[\u0a67\u0a68\u0a69\u0a6a\u0a6b\u0a6c\u0a6d\u0a6e\u0a6f\u0a66]/g,function(e){return Nn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Jn[e]})},meridiemParse:/\u0a30\u0a3e\u0a24|\u0a38\u0a35\u0a47\u0a30|\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30|\u0a38\u0a3c\u0a3e\u0a2e/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0a30\u0a3e\u0a24"===a?e<4?e:e+12:"\u0a38\u0a35\u0a47\u0a30"===a?e:"\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30"===a?e>=10?e:e+12:"\u0a38\u0a3c\u0a3e\u0a2e"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0a30\u0a3e\u0a24":e<10?"\u0a38\u0a35\u0a47\u0a30":e<17?"\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30":e<20?"\u0a38\u0a3c\u0a3e\u0a2e":"\u0a30\u0a3e\u0a24"},week:{dow:0,doy:6}});var Rn="stycze\u0144_luty_marzec_kwiecie\u0144_maj_czerwiec_lipiec_sierpie\u0144_wrzesie\u0144_pa\u017adziernik_listopad_grudzie\u0144".split("_"),In="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_wrze\u015bnia_pa\u017adziernika_listopada_grudnia".split("_");e.defineLocale("pl",{months:function(e,a){return e?""===a?"("+In[e.month()]+"|"+Rn[e.month()]+")":/D MMMM/.test(a)?In[e.month()]:Rn[e.month()]:Rn},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_pa\u017a_lis_gru".split("_"),weekdays:"niedziela_poniedzia\u0142ek_wtorek_\u015broda_czwartek_pi\u0105tek_sobota".split("_"),weekdaysShort:"ndz_pon_wt_\u015br_czw_pt_sob".split("_"),weekdaysMin:"Nd_Pn_Wt_\u015ar_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Dzi\u015b o] LT",nextDay:"[Jutro o] LT",nextWeek:function(){switch(this.day()){case 0:return"[W niedziel\u0119 o] LT";case 2:return"[We wtorek o] LT";case 3:return"[W \u015brod\u0119 o] LT";case 6:return"[W sobot\u0119 o] LT";default:return"[W] dddd [o] LT"}},lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zesz\u0142\u0105 niedziel\u0119 o] LT";case 3:return"[W zesz\u0142\u0105 \u015brod\u0119 o] LT";case 6:return"[W zesz\u0142\u0105 sobot\u0119 o] LT";default:return"[W zesz\u0142y] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",ss:wa,m:wa,mm:wa,h:wa,hh:wa,d:"1 dzie\u0144",dd:"%d dni",M:"miesi\u0105c",MM:wa,y:"rok",yy:wa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("pt-br",{months:"janeiro_fevereiro_mar\xe7o_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"Domingo_Segunda-feira_Ter\xe7a-feira_Quarta-feira_Quinta-feira_Sexta-feira_S\xe1bado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_S\xe1b".split("_"),weekdaysMin:"Do_2\xaa_3\xaa_4\xaa_5\xaa_6\xaa_S\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [\xe0s] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [\xe0s] HH:mm"},calendar:{sameDay:"[Hoje \xe0s] LT",nextDay:"[Amanh\xe3 \xe0s] LT",nextWeek:"dddd [\xe0s] LT",lastDay:"[Ontem \xe0s] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[\xdaltimo] dddd [\xe0s] LT":"[\xdaltima] dddd [\xe0s] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atr\xe1s",s:"poucos segundos",ss:"%d segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um m\xeas",MM:"%d meses",y:"um ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba"}),e.defineLocale("pt",{months:"janeiro_fevereiro_mar\xe7o_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"Domingo_Segunda-feira_Ter\xe7a-feira_Quarta-feira_Quinta-feira_Sexta-feira_S\xe1bado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_S\xe1b".split("_"),weekdaysMin:"Do_2\xaa_3\xaa_4\xaa_5\xaa_6\xaa_S\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY HH:mm"},calendar:{sameDay:"[Hoje \xe0s] LT",nextDay:"[Amanh\xe3 \xe0s] LT",nextWeek:"dddd [\xe0s] LT",lastDay:"[Ontem \xe0s] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[\xdaltimo] dddd [\xe0s] LT":"[\xdaltima] dddd [\xe0s] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"h\xe1 %s",s:"segundos",ss:"%d segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um m\xeas",MM:"%d meses",y:"um ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),e.defineLocale("ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"duminic\u0103_luni_mar\u021bi_miercuri_joi_vineri_s\xe2mb\u0103t\u0103".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_S\xe2m".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_S\xe2".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[m\xe2ine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s \xeen urm\u0103",s:"c\xe2teva secunde",ss:va,m:"un minut",mm:va,h:"o or\u0103",hh:va,d:"o zi",dd:va,M:"o lun\u0103",MM:va,y:"un an",yy:va},week:{dow:1,doy:7}});var Cn=[/^\u044f\u043d\u0432/i,/^\u0444\u0435\u0432/i,/^\u043c\u0430\u0440/i,/^\u0430\u043f\u0440/i,/^\u043c\u0430[\u0439\u044f]/i,/^\u0438\u044e\u043d/i,/^\u0438\u044e\u043b/i,/^\u0430\u0432\u0433/i,/^\u0441\u0435\u043d/i,/^\u043e\u043a\u0442/i,/^\u043d\u043e\u044f/i,/^\u0434\u0435\u043a/i];e.defineLocale("ru",{months:{format:"\u044f\u043d\u0432\u0430\u0440\u044f_\u0444\u0435\u0432\u0440\u0430\u043b\u044f_\u043c\u0430\u0440\u0442\u0430_\u0430\u043f\u0440\u0435\u043b\u044f_\u043c\u0430\u044f_\u0438\u044e\u043d\u044f_\u0438\u044e\u043b\u044f_\u0430\u0432\u0433\u0443\u0441\u0442\u0430_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f_\u043e\u043a\u0442\u044f\u0431\u0440\u044f_\u043d\u043e\u044f\u0431\u0440\u044f_\u0434\u0435\u043a\u0430\u0431\u0440\u044f".split("_"),standalone:"\u044f\u043d\u0432\u0430\u0440\u044c_\u0444\u0435\u0432\u0440\u0430\u043b\u044c_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b\u044c_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c_\u043e\u043a\u0442\u044f\u0431\u0440\u044c_\u043d\u043e\u044f\u0431\u0440\u044c_\u0434\u0435\u043a\u0430\u0431\u0440\u044c".split("_")},monthsShort:{format:"\u044f\u043d\u0432._\u0444\u0435\u0432\u0440._\u043c\u0430\u0440._\u0430\u043f\u0440._\u043c\u0430\u044f_\u0438\u044e\u043d\u044f_\u0438\u044e\u043b\u044f_\u0430\u0432\u0433._\u0441\u0435\u043d\u0442._\u043e\u043a\u0442._\u043d\u043e\u044f\u0431._\u0434\u0435\u043a.".split("_"),standalone:"\u044f\u043d\u0432._\u0444\u0435\u0432\u0440._\u043c\u0430\u0440\u0442_\u0430\u043f\u0440._\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433._\u0441\u0435\u043d\u0442._\u043e\u043a\u0442._\u043d\u043e\u044f\u0431._\u0434\u0435\u043a.".split("_")},weekdays:{standalone:"\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0435\u0440\u0433_\u043f\u044f\u0442\u043d\u0438\u0446\u0430_\u0441\u0443\u0431\u0431\u043e\u0442\u0430".split("_"),format:"\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0443_\u0447\u0435\u0442\u0432\u0435\u0440\u0433_\u043f\u044f\u0442\u043d\u0438\u0446\u0443_\u0441\u0443\u0431\u0431\u043e\u0442\u0443".split("_"),isFormat:/\[ ?[\u0412\u0432] ?(?:\u043f\u0440\u043e\u0448\u043b\u0443\u044e|\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e|\u044d\u0442\u0443)? ?\] ?dddd/},weekdaysShort:"\u0432\u0441_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u0432\u0441_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),monthsParse:Cn,longMonthsParse:Cn,shortMonthsParse:Cn,monthsRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044c\u044f]|\u044f\u043d\u0432\.?|\u0444\u0435\u0432\u0440\u0430\u043b[\u044c\u044f]|\u0444\u0435\u0432\u0440?\.?|\u043c\u0430\u0440\u0442\u0430?|\u043c\u0430\u0440\.?|\u0430\u043f\u0440\u0435\u043b[\u044c\u044f]|\u0430\u043f\u0440\.?|\u043c\u0430[\u0439\u044f]|\u0438\u044e\u043d[\u044c\u044f]|\u0438\u044e\u043d\.?|\u0438\u044e\u043b[\u044c\u044f]|\u0438\u044e\u043b\.?|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0430\u0432\u0433\.?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044c\u044f]|\u0441\u0435\u043d\u0442?\.?|\u043e\u043a\u0442\u044f\u0431\u0440[\u044c\u044f]|\u043e\u043a\u0442\.?|\u043d\u043e\u044f\u0431\u0440[\u044c\u044f]|\u043d\u043e\u044f\u0431?\.?|\u0434\u0435\u043a\u0430\u0431\u0440[\u044c\u044f]|\u0434\u0435\u043a\.?)/i,monthsShortRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044c\u044f]|\u044f\u043d\u0432\.?|\u0444\u0435\u0432\u0440\u0430\u043b[\u044c\u044f]|\u0444\u0435\u0432\u0440?\.?|\u043c\u0430\u0440\u0442\u0430?|\u043c\u0430\u0440\.?|\u0430\u043f\u0440\u0435\u043b[\u044c\u044f]|\u0430\u043f\u0440\.?|\u043c\u0430[\u0439\u044f]|\u0438\u044e\u043d[\u044c\u044f]|\u0438\u044e\u043d\.?|\u0438\u044e\u043b[\u044c\u044f]|\u0438\u044e\u043b\.?|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0430\u0432\u0433\.?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044c\u044f]|\u0441\u0435\u043d\u0442?\.?|\u043e\u043a\u0442\u044f\u0431\u0440[\u044c\u044f]|\u043e\u043a\u0442\.?|\u043d\u043e\u044f\u0431\u0440[\u044c\u044f]|\u043d\u043e\u044f\u0431?\.?|\u0434\u0435\u043a\u0430\u0431\u0440[\u044c\u044f]|\u0434\u0435\u043a\.?)/i,monthsStrictRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044f\u044c]|\u0444\u0435\u0432\u0440\u0430\u043b[\u044f\u044c]|\u043c\u0430\u0440\u0442\u0430?|\u0430\u043f\u0440\u0435\u043b[\u044f\u044c]|\u043c\u0430[\u044f\u0439]|\u0438\u044e\u043d[\u044f\u044c]|\u0438\u044e\u043b[\u044f\u044c]|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044f\u044c]|\u043e\u043a\u0442\u044f\u0431\u0440[\u044f\u044c]|\u043d\u043e\u044f\u0431\u0440[\u044f\u044c]|\u0434\u0435\u043a\u0430\u0431\u0440[\u044f\u044c])/i,monthsShortStrictRegex:/^(\u044f\u043d\u0432\.|\u0444\u0435\u0432\u0440?\.|\u043c\u0430\u0440[\u0442.]|\u0430\u043f\u0440\.|\u043c\u0430[\u044f\u0439]|\u0438\u044e\u043d[\u044c\u044f.]|\u0438\u044e\u043b[\u044c\u044f.]|\u0430\u0432\u0433\.|\u0441\u0435\u043d\u0442?\.|\u043e\u043a\u0442\.|\u043d\u043e\u044f\u0431?\.|\u0434\u0435\u043a\.)/i,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0433.",LLL:"D MMMM YYYY \u0433., H:mm",LLLL:"dddd, D MMMM YYYY \u0433., H:mm"},calendar:{sameDay:"[\u0421\u0435\u0433\u043e\u0434\u043d\u044f \u0432] LT",nextDay:"[\u0417\u0430\u0432\u0442\u0440\u0430 \u0432] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430 \u0432] LT",nextWeek:function(e){if(e.week()===this.week())return 2===this.day()?"[\u0412\u043e] dddd [\u0432] LT":"[\u0412] dddd [\u0432] LT";switch(this.day()){case 0:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435] dddd [\u0432] LT";case 1:case 2:case 4:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439] dddd [\u0432] LT";case 3:case 5:case 6:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e] dddd [\u0432] LT"}},lastWeek:function(e){if(e.week()===this.week())return 2===this.day()?"[\u0412\u043e] dddd [\u0432] LT":"[\u0412] dddd [\u0432] LT";switch(this.day()){case 0:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u043e\u0435] dddd [\u0432] LT";case 1:case 2:case 4:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u044b\u0439] dddd [\u0432] LT";case 3:case 5:case 6:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u0443\u044e] dddd [\u0432] LT"}},sameElse:"L"},relativeTime:{future:"\u0447\u0435\u0440\u0435\u0437 %s",past:"%s \u043d\u0430\u0437\u0430\u0434",s:"\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434",ss:Sa,m:Sa,mm:Sa,h:"\u0447\u0430\u0441",hh:Sa,d:"\u0434\u0435\u043d\u044c",dd:Sa,M:"\u043c\u0435\u0441\u044f\u0446",MM:Sa,y:"\u0433\u043e\u0434",yy:Sa},meridiemParse:/\u043d\u043e\u0447\u0438|\u0443\u0442\u0440\u0430|\u0434\u043d\u044f|\u0432\u0435\u0447\u0435\u0440\u0430/i,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u0435\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u0438":e<12?"\u0443\u0442\u0440\u0430":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u0435\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0439|\u0433\u043e|\u044f)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":return e+"-\u0439";case"D":return e+"-\u0433\u043e";case"w":case"W":return e+"-\u044f";default:return e}},week:{dow:1,doy:4}});var Gn=["\u062c\u0646\u0648\u0631\u064a","\u0641\u064a\u0628\u0631\u0648\u0631\u064a","\u0645\u0627\u0631\u0686","\u0627\u067e\u0631\u064a\u0644","\u0645\u0626\u064a","\u062c\u0648\u0646","\u062c\u0648\u0644\u0627\u0621\u0650","\u0622\u06af\u0633\u067d","\u0633\u064a\u067e\u067d\u0645\u0628\u0631","\u0622\u06aa\u067d\u0648\u0628\u0631","\u0646\u0648\u0645\u0628\u0631","\u068a\u0633\u0645\u0628\u0631"],Un=["\u0622\u0686\u0631","\u0633\u0648\u0645\u0631","\u0627\u06b1\u0627\u0631\u0648","\u0627\u0631\u0628\u0639","\u062e\u0645\u064a\u0633","\u062c\u0645\u0639","\u0687\u0646\u0687\u0631"];e.defineLocale("sd",{months:Gn,monthsShort:Gn,weekdays:Un,weekdaysShort:Un,weekdaysMin:Un,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd\u060c D MMMM YYYY HH:mm"},meridiemParse:/\u0635\u0628\u062d|\u0634\u0627\u0645/,isPM:function(e){return"\u0634\u0627\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635\u0628\u062d":"\u0634\u0627\u0645"},calendar:{sameDay:"[\u0627\u0684] LT",nextDay:"[\u0633\u0680\u0627\u06bb\u064a] LT",nextWeek:"dddd [\u0627\u06b3\u064a\u0646 \u0647\u0641\u062a\u064a \u062a\u064a] LT",lastDay:"[\u06aa\u0627\u0644\u0647\u0647] LT",lastWeek:"[\u06af\u0632\u0631\u064a\u0644 \u0647\u0641\u062a\u064a] dddd [\u062a\u064a] LT",sameElse:"L"},relativeTime:{future:"%s \u067e\u0648\u0621",past:"%s \u0627\u06b3",s:"\u0686\u0646\u062f \u0633\u064a\u06aa\u0646\u068a",ss:"%d \u0633\u064a\u06aa\u0646\u068a",m:"\u0647\u06aa \u0645\u0646\u067d",mm:"%d \u0645\u0646\u067d",h:"\u0647\u06aa \u06aa\u0644\u0627\u06aa",hh:"%d \u06aa\u0644\u0627\u06aa",d:"\u0647\u06aa \u068f\u064a\u0646\u0647\u0646",dd:"%d \u068f\u064a\u0646\u0647\u0646",M:"\u0647\u06aa \u0645\u0647\u064a\u0646\u0648",MM:"%d \u0645\u0647\u064a\u0646\u0627",y:"\u0647\u06aa \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:1,doy:4}}),e.defineLocale("se",{months:"o\u0111\u0111ajagem\xe1nnu_guovvam\xe1nnu_njuk\u010dam\xe1nnu_cuo\u014bom\xe1nnu_miessem\xe1nnu_geassem\xe1nnu_suoidnem\xe1nnu_borgem\xe1nnu_\u010dak\u010dam\xe1nnu_golggotm\xe1nnu_sk\xe1bmam\xe1nnu_juovlam\xe1nnu".split("_"),monthsShort:"o\u0111\u0111j_guov_njuk_cuo_mies_geas_suoi_borg_\u010dak\u010d_golg_sk\xe1b_juov".split("_"),weekdays:"sotnabeaivi_vuoss\xe1rga_ma\u014b\u014beb\xe1rga_gaskavahkku_duorastat_bearjadat_l\xe1vvardat".split("_"),weekdaysShort:"sotn_vuos_ma\u014b_gask_duor_bear_l\xe1v".split("_"),weekdaysMin:"s_v_m_g_d_b_L".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"MMMM D. [b.] YYYY",LLL:"MMMM D. [b.] YYYY [ti.] HH:mm",LLLL:"dddd, MMMM D. [b.] YYYY [ti.] HH:mm"},calendar:{sameDay:"[otne ti] LT",nextDay:"[ihttin ti] LT",nextWeek:"dddd [ti] LT",lastDay:"[ikte ti] LT",lastWeek:"[ovddit] dddd [ti] LT",sameElse:"L"},relativeTime:{future:"%s gea\u017ees",past:"ma\u014bit %s",s:"moadde sekunddat",ss:"%d sekunddat",m:"okta minuhta",mm:"%d minuhtat",h:"okta diimmu",hh:"%d diimmut",d:"okta beaivi",dd:"%d beaivvit",M:"okta m\xe1nnu",MM:"%d m\xe1nut",y:"okta jahki",yy:"%d jagit"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("si",{months:"\u0da2\u0db1\u0dc0\u0dcf\u0dbb\u0dd2_\u0db4\u0dd9\u0db6\u0dbb\u0dc0\u0dcf\u0dbb\u0dd2_\u0db8\u0dcf\u0dbb\u0dca\u0dad\u0dd4_\u0d85\u0db4\u0dca\u200d\u0dbb\u0dda\u0dbd\u0dca_\u0db8\u0dd0\u0dba\u0dd2_\u0da2\u0dd6\u0db1\u0dd2_\u0da2\u0dd6\u0dbd\u0dd2_\u0d85\u0d9c\u0ddd\u0dc3\u0dca\u0dad\u0dd4_\u0dc3\u0dd0\u0db4\u0dca\u0dad\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca_\u0d94\u0d9a\u0dca\u0dad\u0ddd\u0db6\u0dbb\u0dca_\u0db1\u0ddc\u0dc0\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca_\u0daf\u0dd9\u0dc3\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca".split("_"),monthsShort:"\u0da2\u0db1_\u0db4\u0dd9\u0db6_\u0db8\u0dcf\u0dbb\u0dca_\u0d85\u0db4\u0dca_\u0db8\u0dd0\u0dba\u0dd2_\u0da2\u0dd6\u0db1\u0dd2_\u0da2\u0dd6\u0dbd\u0dd2_\u0d85\u0d9c\u0ddd_\u0dc3\u0dd0\u0db4\u0dca_\u0d94\u0d9a\u0dca_\u0db1\u0ddc\u0dc0\u0dd0_\u0daf\u0dd9\u0dc3\u0dd0".split("_"),weekdays:"\u0d89\u0dbb\u0dd2\u0daf\u0dcf_\u0dc3\u0db3\u0dd4\u0daf\u0dcf_\u0d85\u0d9f\u0dc4\u0dbb\u0dd4\u0dc0\u0dcf\u0daf\u0dcf_\u0db6\u0daf\u0dcf\u0daf\u0dcf_\u0db6\u0dca\u200d\u0dbb\u0dc4\u0dc3\u0dca\u0db4\u0dad\u0dd2\u0db1\u0dca\u0daf\u0dcf_\u0dc3\u0dd2\u0d9a\u0dd4\u0dbb\u0dcf\u0daf\u0dcf_\u0dc3\u0dd9\u0db1\u0dc3\u0dd4\u0dbb\u0dcf\u0daf\u0dcf".split("_"),weekdaysShort:"\u0d89\u0dbb\u0dd2_\u0dc3\u0db3\u0dd4_\u0d85\u0d9f_\u0db6\u0daf\u0dcf_\u0db6\u0dca\u200d\u0dbb\u0dc4_\u0dc3\u0dd2\u0d9a\u0dd4_\u0dc3\u0dd9\u0db1".split("_"),weekdaysMin:"\u0d89_\u0dc3_\u0d85_\u0db6_\u0db6\u0dca\u200d\u0dbb_\u0dc3\u0dd2_\u0dc3\u0dd9".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"a h:mm",LTS:"a h:mm:ss",L:"YYYY/MM/DD",LL:"YYYY MMMM D",LLL:"YYYY MMMM D, a h:mm",LLLL:"YYYY MMMM D [\u0dc0\u0dd0\u0db1\u0dd2] dddd, a h:mm:ss"},calendar:{sameDay:"[\u0d85\u0daf] LT[\u0da7]",nextDay:"[\u0dc4\u0dd9\u0da7] LT[\u0da7]",nextWeek:"dddd LT[\u0da7]",lastDay:"[\u0d8a\u0dba\u0dda] LT[\u0da7]",lastWeek:"[\u0db4\u0dc3\u0dd4\u0d9c\u0dd2\u0dba] dddd LT[\u0da7]",sameElse:"L"},relativeTime:{future:"%s\u0d9a\u0dd2\u0db1\u0dca",past:"%s\u0d9a\u0da7 \u0db4\u0dd9\u0dbb",s:"\u0dad\u0dad\u0dca\u0db4\u0dbb \u0d9a\u0dd2\u0dc4\u0dd2\u0db4\u0dba",ss:"\u0dad\u0dad\u0dca\u0db4\u0dbb %d",m:"\u0db8\u0dd2\u0db1\u0dd2\u0dad\u0dca\u0dad\u0dd4\u0dc0",mm:"\u0db8\u0dd2\u0db1\u0dd2\u0dad\u0dca\u0dad\u0dd4 %d",h:"\u0db4\u0dd0\u0dba",hh:"\u0db4\u0dd0\u0dba %d",d:"\u0daf\u0dd2\u0db1\u0dba",dd:"\u0daf\u0dd2\u0db1 %d",M:"\u0db8\u0dcf\u0dc3\u0dba",MM:"\u0db8\u0dcf\u0dc3 %d",y:"\u0dc0\u0dc3\u0dbb",yy:"\u0dc0\u0dc3\u0dbb %d"},dayOfMonthOrdinalParse:/\d{1,2} \u0dc0\u0dd0\u0db1\u0dd2/,ordinal:function(e){return e+" \u0dc0\u0dd0\u0db1\u0dd2"},meridiemParse:/\u0db4\u0dd9\u0dbb \u0dc0\u0dbb\u0dd4|\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4|\u0db4\u0dd9.\u0dc0|\u0db4.\u0dc0./,isPM:function(e){return"\u0db4.\u0dc0."===e||"\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4"===e},meridiem:function(e,a,t){return e>11?t?"\u0db4.\u0dc0.":"\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4":t?"\u0db4\u0dd9.\u0dc0.":"\u0db4\u0dd9\u0dbb \u0dc0\u0dbb\u0dd4"}});var Vn="janu\xe1r_febru\xe1r_marec_apr\xedl_m\xe1j_j\xfan_j\xfal_august_september_okt\xf3ber_november_december".split("_"),Kn="jan_feb_mar_apr_m\xe1j_j\xfan_j\xfal_aug_sep_okt_nov_dec".split("_");e.defineLocale("sk",{months:Vn,monthsShort:Kn,weekdays:"nede\u013ea_pondelok_utorok_streda_\u0161tvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_\u0161t_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_\u0161t_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nede\u013eu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo \u0161tvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[v\u010dera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minul\xfa nede\u013eu o] LT";case 1:case 2:return"[minul\xfd] dddd [o] LT";case 3:return"[minul\xfa stredu o] LT";case 4:case 5:return"[minul\xfd] dddd [o] LT";case 6:return"[minul\xfa sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:ba,ss:ba,m:ba,mm:ba,h:ba,hh:ba,d:ba,dd:ba,M:ba,MM:ba,y:ba,yy:ba},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljek_torek_sreda_\u010detrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._\u010det._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_\u010de_pe_so".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[v\u010deraj ob] LT",lastWeek:function(){switch(this.day()){case 0:return"[prej\u0161njo] [nedeljo] [ob] LT";case 3:return"[prej\u0161njo] [sredo] [ob] LT";case 6:return"[prej\u0161njo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prej\u0161nji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"\u010dez %s",past:"pred %s",s:ja,ss:ja,m:ja,mm:ja,h:ja,hh:ja,d:ja,dd:ja,M:ja,MM:ja,y:ja,yy:ja},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),e.defineLocale("sq",{months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_N\xebntor_Dhjetor".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_N\xebn_Dhj".split("_"),weekdays:"E Diel_E H\xebn\xeb_E Mart\xeb_E M\xebrkur\xeb_E Enjte_E Premte_E Shtun\xeb".split("_"),weekdaysShort:"Die_H\xebn_Mar_M\xebr_Enj_Pre_Sht".split("_"),weekdaysMin:"D_H_Ma_M\xeb_E_P_Sh".split("_"),weekdaysParseExact:!0,meridiemParse:/PD|MD/,isPM:function(e){return"M"===e.charAt(0)},meridiem:function(e,a,t){return e<12?"PD":"MD"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Sot n\xeb] LT",nextDay:"[Nes\xebr n\xeb] LT",nextWeek:"dddd [n\xeb] LT",lastDay:"[Dje n\xeb] LT",lastWeek:"dddd [e kaluar n\xeb] LT",sameElse:"L"},relativeTime:{future:"n\xeb %s",past:"%s m\xeb par\xeb",s:"disa sekonda",ss:"%d sekonda",m:"nj\xeb minut\xeb",mm:"%d minuta",h:"nj\xeb or\xeb",hh:"%d or\xeb",d:"nj\xeb dit\xeb",dd:"%d dit\xeb",M:"nj\xeb muaj",MM:"%d muaj",y:"nj\xeb vit",yy:"%d vite"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Zn={words:{ss:["\u0441\u0435\u043a\u0443\u043d\u0434\u0430","\u0441\u0435\u043a\u0443\u043d\u0434\u0435","\u0441\u0435\u043a\u0443\u043d\u0434\u0438"],m:["\u0458\u0435\u0434\u0430\u043d \u043c\u0438\u043d\u0443\u0442","\u0458\u0435\u0434\u043d\u0435 \u043c\u0438\u043d\u0443\u0442\u0435"],mm:["\u043c\u0438\u043d\u0443\u0442","\u043c\u0438\u043d\u0443\u0442\u0435","\u043c\u0438\u043d\u0443\u0442\u0430"],h:["\u0458\u0435\u0434\u0430\u043d \u0441\u0430\u0442","\u0458\u0435\u0434\u043d\u043e\u0433 \u0441\u0430\u0442\u0430"],hh:["\u0441\u0430\u0442","\u0441\u0430\u0442\u0430","\u0441\u0430\u0442\u0438"],dd:["\u0434\u0430\u043d","\u0434\u0430\u043d\u0430","\u0434\u0430\u043d\u0430"],MM:["\u043c\u0435\u0441\u0435\u0446","\u043c\u0435\u0441\u0435\u0446\u0430","\u043c\u0435\u0441\u0435\u0446\u0438"],yy:["\u0433\u043e\u0434\u0438\u043d\u0430","\u0433\u043e\u0434\u0438\u043d\u0435","\u0433\u043e\u0434\u0438\u043d\u0430"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:e>=2&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=Zn.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+Zn.correctGrammaticalCase(e,s)}};e.defineLocale("sr-cyrl",{months:"\u0458\u0430\u043d\u0443\u0430\u0440_\u0444\u0435\u0431\u0440\u0443\u0430\u0440_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440_\u043e\u043a\u0442\u043e\u0431\u0430\u0440_\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440_\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440".split("_"),monthsShort:"\u0458\u0430\u043d._\u0444\u0435\u0431._\u043c\u0430\u0440._\u0430\u043f\u0440._\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433._\u0441\u0435\u043f._\u043e\u043a\u0442._\u043d\u043e\u0432._\u0434\u0435\u0446.".split("_"),monthsParseExact:!0,weekdays:"\u043d\u0435\u0434\u0435\u0459\u0430_\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a_\u0443\u0442\u043e\u0440\u0430\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a_\u043f\u0435\u0442\u0430\u043a_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434._\u043f\u043e\u043d._\u0443\u0442\u043e._\u0441\u0440\u0435._\u0447\u0435\u0442._\u043f\u0435\u0442._\u0441\u0443\u0431.".split("_"),weekdaysMin:"\u043d\u0435_\u043f\u043e_\u0443\u0442_\u0441\u0440_\u0447\u0435_\u043f\u0435_\u0441\u0443".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[\u0434\u0430\u043d\u0430\u0441 \u0443] LT",nextDay:"[\u0441\u0443\u0442\u0440\u0430 \u0443] LT",nextWeek:function(){switch(this.day()){case 0:return"[\u0443] [\u043d\u0435\u0434\u0435\u0459\u0443] [\u0443] LT";case 3:return"[\u0443] [\u0441\u0440\u0435\u0434\u0443] [\u0443] LT";case 6:return"[\u0443] [\u0441\u0443\u0431\u043e\u0442\u0443] [\u0443] LT";case 1:case 2:case 4:case 5:return"[\u0443] dddd [\u0443] LT"}},lastDay:"[\u0458\u0443\u0447\u0435 \u0443] LT",lastWeek:function(){return["[\u043f\u0440\u043e\u0448\u043b\u0435] [\u043d\u0435\u0434\u0435\u0459\u0435] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u0443\u0442\u043e\u0440\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u0435] [\u0441\u0440\u0435\u0434\u0435] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u0447\u0435\u0442\u0432\u0440\u0442\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u043f\u0435\u0442\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u0435] [\u0441\u0443\u0431\u043e\u0442\u0435] [\u0443] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"\u0437\u0430 %s",past:"\u043f\u0440\u0435 %s",s:"\u043d\u0435\u043a\u043e\u043b\u0438\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:Zn.translate,m:Zn.translate,mm:Zn.translate,h:Zn.translate,hh:Zn.translate,d:"\u0434\u0430\u043d",dd:Zn.translate,M:"\u043c\u0435\u0441\u0435\u0446",MM:Zn.translate,y:"\u0433\u043e\u0434\u0438\u043d\u0443",yy:Zn.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var $n={words:{ss:["sekunda","sekunde","sekundi"],m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:e>=2&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=$n.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+$n.correctGrammaticalCase(e,s)}};e.defineLocale("sr",{months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljak_utorak_sreda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sre._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010de u] LT",lastWeek:function(){return["[pro\u0161le] [nedelje] [u] LT","[pro\u0161log] [ponedeljka] [u] LT","[pro\u0161log] [utorka] [u] LT","[pro\u0161le] [srede] [u] LT","[pro\u0161log] [\u010detvrtka] [u] LT","[pro\u0161log] [petka] [u] LT","[pro\u0161le] [subote] [u] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",ss:$n.translate,m:$n.translate,mm:$n.translate,h:$n.translate,hh:$n.translate,d:"dan",dd:$n.translate,M:"mesec",MM:$n.translate,y:"godinu",yy:$n.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),e.defineLocale("ss",{months:"Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split("_"),monthsShort:"Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo".split("_"),weekdays:"Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo".split("_"),weekdaysShort:"Lis_Umb_Lsb_Les_Lsi_Lsh_Umg".split("_"),weekdaysMin:"Li_Us_Lb_Lt_Ls_Lh_Ug".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Namuhla nga] LT",nextDay:"[Kusasa nga] LT",nextWeek:"dddd [nga] LT",lastDay:"[Itolo nga] LT",lastWeek:"dddd [leliphelile] [nga] LT",sameElse:"L"},relativeTime:{future:"nga %s",past:"wenteka nga %s",s:"emizuzwana lomcane",ss:"%d mzuzwana",m:"umzuzu",mm:"%d emizuzu",h:"lihora",hh:"%d emahora",d:"lilanga",dd:"%d emalanga",M:"inyanga",MM:"%d tinyanga",y:"umnyaka",yy:"%d iminyaka"},meridiemParse:/ekuseni|emini|entsambama|ebusuku/,meridiem:function(e,a,t){return e<11?"ekuseni":e<15?"emini":e<19?"entsambama":"ebusuku"},meridiemHour:function(e,a){return 12===e&&(e=0),"ekuseni"===a?e:"emini"===a?e>=11?e:e+12:"entsambama"===a||"ebusuku"===a?0===e?0:e+12:void 0},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:"%d",week:{dow:1,doy:4}}),e.defineLocale("sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"s\xf6ndag_m\xe5ndag_tisdag_onsdag_torsdag_fredag_l\xf6rdag".split("_"),weekdaysShort:"s\xf6n_m\xe5n_tis_ons_tor_fre_l\xf6r".split("_"),weekdaysMin:"s\xf6_m\xe5_ti_on_to_fr_l\xf6".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Ig\xe5r] LT",nextWeek:"[P\xe5] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"f\xf6r %s sedan",s:"n\xe5gra sekunder",ss:"%d sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en m\xe5nad",MM:"%d m\xe5nader",y:"ett \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}(e|a)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"e":1===a?"a":2===a?"a":"e")},week:{dow:1,doy:4}}),e.defineLocale("sw",{months:"Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des".split("_"),weekdays:"Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi".split("_"),weekdaysShort:"Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos".split("_"),weekdaysMin:"J2_J3_J4_J5_Al_Ij_J1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[leo saa] LT",nextDay:"[kesho saa] LT",nextWeek:"[wiki ijayo] dddd [saat] LT",lastDay:"[jana] LT",lastWeek:"[wiki iliyopita] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s baadaye",past:"tokea %s",s:"hivi punde",ss:"sekunde %d",m:"dakika moja",mm:"dakika %d",h:"saa limoja",hh:"masaa %d",d:"siku moja",dd:"masiku %d",M:"mwezi mmoja",MM:"miezi %d",y:"mwaka mmoja",yy:"miaka %d"},week:{dow:1,doy:7}});var Bn={1:"\u0be7",2:"\u0be8",3:"\u0be9",4:"\u0bea",5:"\u0beb",6:"\u0bec",7:"\u0bed",8:"\u0bee",9:"\u0bef",0:"\u0be6"},qn={"\u0be7":"1","\u0be8":"2","\u0be9":"3","\u0bea":"4","\u0beb":"5","\u0bec":"6","\u0bed":"7","\u0bee":"8","\u0bef":"9","\u0be6":"0"};e.defineLocale("ta",{months:"\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf_\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf_\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd_\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd_\u0bae\u0bc7_\u0b9c\u0bc2\u0ba9\u0bcd_\u0b9c\u0bc2\u0bb2\u0bc8_\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd_\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bc6\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b85\u0b95\u0bcd\u0b9f\u0bc7\u0bbe\u0baa\u0bb0\u0bcd_\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd".split("_"),monthsShort:"\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf_\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf_\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd_\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd_\u0bae\u0bc7_\u0b9c\u0bc2\u0ba9\u0bcd_\u0b9c\u0bc2\u0bb2\u0bc8_\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd_\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bc6\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b85\u0b95\u0bcd\u0b9f\u0bc7\u0bbe\u0baa\u0bb0\u0bcd_\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd".split("_"),weekdays:"\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bcd\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0b9f\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0baa\u0bc1\u0ba4\u0ba9\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0b9a\u0ba9\u0bbf\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8".split("_"),weekdaysShort:"\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1_\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd_\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd_\u0baa\u0bc1\u0ba4\u0ba9\u0bcd_\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd_\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf_\u0b9a\u0ba9\u0bbf".split("_"),weekdaysMin:"\u0b9e\u0bbe_\u0ba4\u0bbf_\u0b9a\u0bc6_\u0baa\u0bc1_\u0bb5\u0bbf_\u0bb5\u0bc6_\u0b9a".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, HH:mm",LLLL:"dddd, D MMMM YYYY, HH:mm"},calendar:{sameDay:"[\u0b87\u0ba9\u0bcd\u0bb1\u0bc1] LT",nextDay:"[\u0ba8\u0bbe\u0bb3\u0bc8] LT",nextWeek:"dddd, LT",lastDay:"[\u0ba8\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1] LT",lastWeek:"[\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbe\u0bb0\u0bae\u0bcd] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0b87\u0bb2\u0bcd",past:"%s \u0bae\u0bc1\u0ba9\u0bcd",s:"\u0b92\u0bb0\u0bc1 \u0b9a\u0bbf\u0bb2 \u0bb5\u0bbf\u0ba8\u0bbe\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",ss:"%d \u0bb5\u0bbf\u0ba8\u0bbe\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",m:"\u0b92\u0bb0\u0bc1 \u0ba8\u0bbf\u0bae\u0bbf\u0b9f\u0bae\u0bcd",mm:"%d \u0ba8\u0bbf\u0bae\u0bbf\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd",h:"\u0b92\u0bb0\u0bc1 \u0bae\u0ba3\u0bbf \u0ba8\u0bc7\u0bb0\u0bae\u0bcd",hh:"%d \u0bae\u0ba3\u0bbf \u0ba8\u0bc7\u0bb0\u0bae\u0bcd",d:"\u0b92\u0bb0\u0bc1 \u0ba8\u0bbe\u0bb3\u0bcd",dd:"%d \u0ba8\u0bbe\u0b9f\u0bcd\u0b95\u0bb3\u0bcd",M:"\u0b92\u0bb0\u0bc1 \u0bae\u0bbe\u0ba4\u0bae\u0bcd",MM:"%d \u0bae\u0bbe\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd",y:"\u0b92\u0bb0\u0bc1 \u0bb5\u0bb0\u0bc1\u0b9f\u0bae\u0bcd",yy:"%d \u0b86\u0ba3\u0bcd\u0b9f\u0bc1\u0b95\u0bb3\u0bcd"},dayOfMonthOrdinalParse:/\d{1,2}\u0bb5\u0ba4\u0bc1/,ordinal:function(e){return e+"\u0bb5\u0ba4\u0bc1"},preparse:function(e){return e.replace(/[\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef\u0be6]/g,function(e){return qn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Bn[e]})},meridiemParse:/\u0baf\u0bbe\u0bae\u0bae\u0bcd|\u0bb5\u0bc8\u0b95\u0bb1\u0bc8|\u0b95\u0bbe\u0bb2\u0bc8|\u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd|\u0b8e\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1|\u0bae\u0bbe\u0bb2\u0bc8/,meridiem:function(e,a,t){return e<2?" \u0baf\u0bbe\u0bae\u0bae\u0bcd":e<6?" \u0bb5\u0bc8\u0b95\u0bb1\u0bc8":e<10?" \u0b95\u0bbe\u0bb2\u0bc8":e<14?" \u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd":e<18?" \u0b8e\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1":e<22?" \u0bae\u0bbe\u0bb2\u0bc8":" \u0baf\u0bbe\u0bae\u0bae\u0bcd"},meridiemHour:function(e,a){return 12===e&&(e=0),"\u0baf\u0bbe\u0bae\u0bae\u0bcd"===a?e<2?e:e+12:"\u0bb5\u0bc8\u0b95\u0bb1\u0bc8"===a||"\u0b95\u0bbe\u0bb2\u0bc8"===a?e:"\u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd"===a&&e>=10?e:e+12},week:{dow:0,doy:6}}),e.defineLocale("te",{months:"\u0c1c\u0c28\u0c35\u0c30\u0c3f_\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f_\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f_\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d_\u0c2e\u0c47_\u0c1c\u0c42\u0c28\u0c4d_\u0c1c\u0c42\u0c32\u0c46\u0c56_\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41_\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d_\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d_\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d_\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d".split("_"),monthsShort:"\u0c1c\u0c28._\u0c2b\u0c3f\u0c2c\u0c4d\u0c30._\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f_\u0c0f\u0c2a\u0c4d\u0c30\u0c3f._\u0c2e\u0c47_\u0c1c\u0c42\u0c28\u0c4d_\u0c1c\u0c42\u0c32\u0c46\u0c56_\u0c06\u0c17._\u0c38\u0c46\u0c2a\u0c4d._\u0c05\u0c15\u0c4d\u0c1f\u0c4b._\u0c28\u0c35._\u0c21\u0c3f\u0c38\u0c46.".split("_"),monthsParseExact:!0,weekdays:"\u0c06\u0c26\u0c3f\u0c35\u0c3e\u0c30\u0c02_\u0c38\u0c4b\u0c2e\u0c35\u0c3e\u0c30\u0c02_\u0c2e\u0c02\u0c17\u0c33\u0c35\u0c3e\u0c30\u0c02_\u0c2c\u0c41\u0c27\u0c35\u0c3e\u0c30\u0c02_\u0c17\u0c41\u0c30\u0c41\u0c35\u0c3e\u0c30\u0c02_\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02_\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02".split("_"),weekdaysShort:"\u0c06\u0c26\u0c3f_\u0c38\u0c4b\u0c2e_\u0c2e\u0c02\u0c17\u0c33_\u0c2c\u0c41\u0c27_\u0c17\u0c41\u0c30\u0c41_\u0c36\u0c41\u0c15\u0c4d\u0c30_\u0c36\u0c28\u0c3f".split("_"),weekdaysMin:"\u0c06_\u0c38\u0c4b_\u0c2e\u0c02_\u0c2c\u0c41_\u0c17\u0c41_\u0c36\u0c41_\u0c36".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0c28\u0c47\u0c21\u0c41] LT",nextDay:"[\u0c30\u0c47\u0c2a\u0c41] LT",nextWeek:"dddd, LT",lastDay:"[\u0c28\u0c3f\u0c28\u0c4d\u0c28] LT",lastWeek:"[\u0c17\u0c24] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0c32\u0c4b",past:"%s \u0c15\u0c4d\u0c30\u0c3f\u0c24\u0c02",s:"\u0c15\u0c4a\u0c28\u0c4d\u0c28\u0c3f \u0c15\u0c4d\u0c37\u0c23\u0c3e\u0c32\u0c41",ss:"%d \u0c38\u0c46\u0c15\u0c28\u0c4d\u0c32\u0c41",m:"\u0c12\u0c15 \u0c28\u0c3f\u0c2e\u0c3f\u0c37\u0c02",mm:"%d \u0c28\u0c3f\u0c2e\u0c3f\u0c37\u0c3e\u0c32\u0c41",h:"\u0c12\u0c15 \u0c17\u0c02\u0c1f",hh:"%d \u0c17\u0c02\u0c1f\u0c32\u0c41",d:"\u0c12\u0c15 \u0c30\u0c4b\u0c1c\u0c41",dd:"%d \u0c30\u0c4b\u0c1c\u0c41\u0c32\u0c41",M:"\u0c12\u0c15 \u0c28\u0c46\u0c32",MM:"%d \u0c28\u0c46\u0c32\u0c32\u0c41",y:"\u0c12\u0c15 \u0c38\u0c02\u0c35\u0c24\u0c4d\u0c38\u0c30\u0c02",yy:"%d \u0c38\u0c02\u0c35\u0c24\u0c4d\u0c38\u0c30\u0c3e\u0c32\u0c41"},dayOfMonthOrdinalParse:/\d{1,2}\u0c35/,ordinal:"%d\u0c35",meridiemParse:/\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f|\u0c09\u0c26\u0c2f\u0c02|\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02|\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f"===a?e<4?e:e+12:"\u0c09\u0c26\u0c2f\u0c02"===a?e:"\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02"===a?e>=10?e:e+12:"\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f":e<10?"\u0c09\u0c26\u0c2f\u0c02":e<17?"\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02":e<20?"\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02":"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f"},week:{dow:0,doy:6}}),e.defineLocale("tet",{months:"Janeiru_Fevereiru_Marsu_Abril_Maiu_Juniu_Juliu_Augustu_Setembru_Outubru_Novembru_Dezembru".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Aug_Set_Out_Nov_Dez".split("_"),weekdays:"Domingu_Segunda_Tersa_Kuarta_Kinta_Sexta_Sabadu".split("_"),weekdaysShort:"Dom_Seg_Ters_Kua_Kint_Sext_Sab".split("_"),weekdaysMin:"Do_Seg_Te_Ku_Ki_Sex_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Ohin iha] LT",nextDay:"[Aban iha] LT",nextWeek:"dddd [iha] LT",lastDay:"[Horiseik iha] LT",lastWeek:"dddd [semana kotuk] [iha] LT",sameElse:"L"},relativeTime:{future:"iha %s",past:"%s liuba",s:"minutu balun",ss:"minutu %d",m:"minutu ida",mm:"minutus %d",h:"horas ida",hh:"horas %d",d:"loron ida",dd:"loron %d",M:"fulan ida",MM:"fulan %d",y:"tinan ida",yy:"tinan %d"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("th",{months:"\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21_\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c_\u0e21\u0e35\u0e19\u0e32\u0e04\u0e21_\u0e40\u0e21\u0e29\u0e32\u0e22\u0e19_\u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21_\u0e21\u0e34\u0e16\u0e38\u0e19\u0e32\u0e22\u0e19_\u0e01\u0e23\u0e01\u0e0e\u0e32\u0e04\u0e21_\u0e2a\u0e34\u0e07\u0e2b\u0e32\u0e04\u0e21_\u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19_\u0e15\u0e38\u0e25\u0e32\u0e04\u0e21_\u0e1e\u0e24\u0e28\u0e08\u0e34\u0e01\u0e32\u0e22\u0e19_\u0e18\u0e31\u0e19\u0e27\u0e32\u0e04\u0e21".split("_"),monthsShort:"\u0e21.\u0e04._\u0e01.\u0e1e._\u0e21\u0e35.\u0e04._\u0e40\u0e21.\u0e22._\u0e1e.\u0e04._\u0e21\u0e34.\u0e22._\u0e01.\u0e04._\u0e2a.\u0e04._\u0e01.\u0e22._\u0e15.\u0e04._\u0e1e.\u0e22._\u0e18.\u0e04.".split("_"),monthsParseExact:!0,weekdays:"\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c_\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c_\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23_\u0e1e\u0e38\u0e18_\u0e1e\u0e24\u0e2b\u0e31\u0e2a\u0e1a\u0e14\u0e35_\u0e28\u0e38\u0e01\u0e23\u0e4c_\u0e40\u0e2a\u0e32\u0e23\u0e4c".split("_"),weekdaysShort:"\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c_\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c_\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23_\u0e1e\u0e38\u0e18_\u0e1e\u0e24\u0e2b\u0e31\u0e2a_\u0e28\u0e38\u0e01\u0e23\u0e4c_\u0e40\u0e2a\u0e32\u0e23\u0e4c".split("_"),weekdaysMin:"\u0e2d\u0e32._\u0e08._\u0e2d._\u0e1e._\u0e1e\u0e24._\u0e28._\u0e2a.".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY \u0e40\u0e27\u0e25\u0e32 H:mm",LLLL:"\u0e27\u0e31\u0e19dddd\u0e17\u0e35\u0e48 D MMMM YYYY \u0e40\u0e27\u0e25\u0e32 H:mm"},meridiemParse:/\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07|\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07/,isPM:function(e){return"\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07"===e},meridiem:function(e,a,t){return e<12?"\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07":"\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07"},calendar:{sameDay:"[\u0e27\u0e31\u0e19\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",nextDay:"[\u0e1e\u0e23\u0e38\u0e48\u0e07\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",nextWeek:"dddd[\u0e2b\u0e19\u0e49\u0e32 \u0e40\u0e27\u0e25\u0e32] LT",lastDay:"[\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e27\u0e32\u0e19\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",lastWeek:"[\u0e27\u0e31\u0e19]dddd[\u0e17\u0e35\u0e48\u0e41\u0e25\u0e49\u0e27 \u0e40\u0e27\u0e25\u0e32] LT",sameElse:"L"},relativeTime:{future:"\u0e2d\u0e35\u0e01 %s",past:"%s\u0e17\u0e35\u0e48\u0e41\u0e25\u0e49\u0e27",s:"\u0e44\u0e21\u0e48\u0e01\u0e35\u0e48\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35",ss:"%d \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35",m:"1 \u0e19\u0e32\u0e17\u0e35",mm:"%d \u0e19\u0e32\u0e17\u0e35",h:"1 \u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07",hh:"%d \u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07",d:"1 \u0e27\u0e31\u0e19",dd:"%d \u0e27\u0e31\u0e19",M:"1 \u0e40\u0e14\u0e37\u0e2d\u0e19",MM:"%d \u0e40\u0e14\u0e37\u0e2d\u0e19",y:"1 \u0e1b\u0e35",yy:"%d \u0e1b\u0e35"}}),e.defineLocale("tl-ph",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY HH:mm",LLLL:"dddd, MMMM DD, YYYY HH:mm"},calendar:{sameDay:"LT [ngayong araw]",nextDay:"[Bukas ng] LT",nextWeek:"LT [sa susunod na] dddd",lastDay:"LT [kahapon]",lastWeek:"LT [noong nakaraang] dddd",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",ss:"%d segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:function(e){return e},week:{dow:1,doy:4}});var Qn="pagh_wa\u2019_cha\u2019_wej_loS_vagh_jav_Soch_chorgh_Hut".split("_");e.defineLocale("tlh",{months:"tera\u2019 jar wa\u2019_tera\u2019 jar cha\u2019_tera\u2019 jar wej_tera\u2019 jar loS_tera\u2019 jar vagh_tera\u2019 jar jav_tera\u2019 jar Soch_tera\u2019 jar chorgh_tera\u2019 jar Hut_tera\u2019 jar wa\u2019maH_tera\u2019 jar wa\u2019maH wa\u2019_tera\u2019 jar wa\u2019maH cha\u2019".split("_"),monthsShort:"jar wa\u2019_jar cha\u2019_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa\u2019maH_jar wa\u2019maH wa\u2019_jar wa\u2019maH cha\u2019".split("_"),monthsParseExact:!0,weekdays:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),weekdaysShort:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),weekdaysMin:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[DaHjaj] LT",nextDay:"[wa\u2019leS] LT",nextWeek:"LLL",lastDay:"[wa\u2019Hu\u2019] LT",lastWeek:"LLL",sameElse:"L"},relativeTime:{future:function(e){var a=e;return a=-1!==e.indexOf("jaj")?a.slice(0,-3)+"leS":-1!==e.indexOf("jar")?a.slice(0,-3)+"waQ":-1!==e.indexOf("DIS")?a.slice(0,-3)+"nem":a+" pIq"},past:function(e){var a=e;return a=-1!==e.indexOf("jaj")?a.slice(0,-3)+"Hu\u2019":-1!==e.indexOf("jar")?a.slice(0,-3)+"wen":-1!==e.indexOf("DIS")?a.slice(0,-3)+"ben":a+" ret"},s:"puS lup",ss:xa,m:"wa\u2019 tup",mm:xa,h:"wa\u2019 rep",hh:xa,d:"wa\u2019 jaj",dd:xa,M:"wa\u2019 jar",MM:xa,y:"wa\u2019 DIS",yy:xa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Xn={1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'\xfcnc\xfc",4:"'\xfcnc\xfc",100:"'\xfcnc\xfc",6:"'nc\u0131",9:"'uncu",10:"'uncu",30:"'uncu",60:"'\u0131nc\u0131",90:"'\u0131nc\u0131"};e.defineLocale("tr",{months:"Ocak_\u015eubat_Mart_Nisan_May\u0131s_Haziran_Temmuz_A\u011fustos_Eyl\xfcl_Ekim_Kas\u0131m_Aral\u0131k".split("_"),monthsShort:"Oca_\u015eub_Mar_Nis_May_Haz_Tem_A\u011fu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Sal\u0131_\xc7ar\u015famba_Per\u015fembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_\xc7ar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_\xc7a_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bug\xfcn saat] LT",nextDay:"[yar\u0131n saat] LT",nextWeek:"[gelecek] dddd [saat] LT",lastDay:"[d\xfcn] LT",lastWeek:"[ge\xe7en] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s \xf6nce",s:"birka\xe7 saniye",ss:"%d saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir g\xfcn",dd:"%d g\xfcn",M:"bir ay",MM:"%d ay",y:"bir y\u0131l",yy:"%d y\u0131l"},dayOfMonthOrdinalParse:/\d{1,2}'(inci|nci|\xfcnc\xfc|nc\u0131|uncu|\u0131nc\u0131)/,ordinal:function(e){if(0===e)return e+"'\u0131nc\u0131";var a=e%10;return e+(Xn[a]||Xn[e%100-a]||Xn[e>=100?100:null])},week:{dow:1,doy:7}}),e.defineLocale("tzl",{months:"Januar_Fevraglh_Mar\xe7_Avr\xefu_Mai_G\xfcn_Julia_Guscht_Setemvar_Listop\xe4ts_Noemvar_Zecemvar".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_G\xfcn_Jul_Gus_Set_Lis_Noe_Zec".split("_"),weekdays:"S\xfaladi_L\xfane\xe7i_Maitzi_M\xe1rcuri_Xh\xfaadi_Vi\xe9ner\xe7i_S\xe1turi".split("_"),weekdaysShort:"S\xfal_L\xfan_Mai_M\xe1r_Xh\xfa_Vi\xe9_S\xe1t".split("_"),weekdaysMin:"S\xfa_L\xfa_Ma_M\xe1_Xh_Vi_S\xe1".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM [dallas] YYYY",LLL:"D. MMMM [dallas] YYYY HH.mm",LLLL:"dddd, [li] D. MMMM [dallas] YYYY HH.mm"},meridiemParse:/d\'o|d\'a/i,isPM:function(e){return"d'o"===e.toLowerCase()},meridiem:function(e,a,t){return e>11?t?"d'o":"D'O":t?"d'a":"D'A"},calendar:{sameDay:"[oxhi \xe0] LT",nextDay:"[dem\xe0 \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[ieiri \xe0] LT",lastWeek:"[s\xfcr el] dddd [lasteu \xe0] LT",sameElse:"L"},relativeTime:{future:"osprei %s",past:"ja%s",s:Pa,ss:Pa,m:Pa,mm:Pa,h:Pa,hh:Pa,d:Pa,dd:Pa,M:Pa,MM:Pa,y:Pa,yy:Pa},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),e.defineLocale("tzm-latn",{months:"innayr_br\u02e4ayr\u02e4_mar\u02e4s\u02e4_ibrir_mayyw_ywnyw_ywlywz_\u0263w\u0161t_\u0161wtanbir_kt\u02e4wbr\u02e4_nwwanbir_dwjnbir".split("_"),monthsShort:"innayr_br\u02e4ayr\u02e4_mar\u02e4s\u02e4_ibrir_mayyw_ywnyw_ywlywz_\u0263w\u0161t_\u0161wtanbir_kt\u02e4wbr\u02e4_nwwanbir_dwjnbir".split("_"),weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[asdkh g] LT",nextDay:"[aska g] LT",nextWeek:"dddd [g] LT",lastDay:"[assant g] LT",lastWeek:"dddd [g] LT",sameElse:"L"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",ss:"%d imik",m:"minu\u1e0d",mm:"%d minu\u1e0d",h:"sa\u025ba",hh:"%d tassa\u025bin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"},week:{dow:6,doy:12}}),e.defineLocale("tzm",{months:"\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54_\u2d31\u2d55\u2d30\u2d62\u2d55_\u2d4e\u2d30\u2d55\u2d5a_\u2d49\u2d31\u2d54\u2d49\u2d54_\u2d4e\u2d30\u2d62\u2d62\u2d53_\u2d62\u2d53\u2d4f\u2d62\u2d53_\u2d62\u2d53\u2d4d\u2d62\u2d53\u2d63_\u2d56\u2d53\u2d5b\u2d5c_\u2d5b\u2d53\u2d5c\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d3d\u2d5f\u2d53\u2d31\u2d55_\u2d4f\u2d53\u2d61\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d37\u2d53\u2d4a\u2d4f\u2d31\u2d49\u2d54".split("_"),monthsShort:"\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54_\u2d31\u2d55\u2d30\u2d62\u2d55_\u2d4e\u2d30\u2d55\u2d5a_\u2d49\u2d31\u2d54\u2d49\u2d54_\u2d4e\u2d30\u2d62\u2d62\u2d53_\u2d62\u2d53\u2d4f\u2d62\u2d53_\u2d62\u2d53\u2d4d\u2d62\u2d53\u2d63_\u2d56\u2d53\u2d5b\u2d5c_\u2d5b\u2d53\u2d5c\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d3d\u2d5f\u2d53\u2d31\u2d55_\u2d4f\u2d53\u2d61\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d37\u2d53\u2d4a\u2d4f\u2d31\u2d49\u2d54".split("_"),weekdays:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),weekdaysShort:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),weekdaysMin:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u2d30\u2d59\u2d37\u2d45 \u2d34] LT",nextDay:"[\u2d30\u2d59\u2d3d\u2d30 \u2d34] LT",nextWeek:"dddd [\u2d34] LT",lastDay:"[\u2d30\u2d5a\u2d30\u2d4f\u2d5c \u2d34] LT",lastWeek:"dddd [\u2d34] LT",sameElse:"L"},relativeTime:{future:"\u2d37\u2d30\u2d37\u2d45 \u2d59 \u2d62\u2d30\u2d4f %s",past:"\u2d62\u2d30\u2d4f %s",s:"\u2d49\u2d4e\u2d49\u2d3d",ss:"%d \u2d49\u2d4e\u2d49\u2d3d",m:"\u2d4e\u2d49\u2d4f\u2d53\u2d3a",mm:"%d \u2d4e\u2d49\u2d4f\u2d53\u2d3a",h:"\u2d59\u2d30\u2d44\u2d30",hh:"%d \u2d5c\u2d30\u2d59\u2d59\u2d30\u2d44\u2d49\u2d4f",d:"\u2d30\u2d59\u2d59",dd:"%d o\u2d59\u2d59\u2d30\u2d4f",M:"\u2d30\u2d62o\u2d53\u2d54",MM:"%d \u2d49\u2d62\u2d62\u2d49\u2d54\u2d4f",y:"\u2d30\u2d59\u2d33\u2d30\u2d59",yy:"%d \u2d49\u2d59\u2d33\u2d30\u2d59\u2d4f"},week:{dow:6,doy:12}}),e.defineLocale("uk",{months:{format:"\u0441\u0456\u0447\u043d\u044f_\u043b\u044e\u0442\u043e\u0433\u043e_\u0431\u0435\u0440\u0435\u0437\u043d\u044f_\u043a\u0432\u0456\u0442\u043d\u044f_\u0442\u0440\u0430\u0432\u043d\u044f_\u0447\u0435\u0440\u0432\u043d\u044f_\u043b\u0438\u043f\u043d\u044f_\u0441\u0435\u0440\u043f\u043d\u044f_\u0432\u0435\u0440\u0435\u0441\u043d\u044f_\u0436\u043e\u0432\u0442\u043d\u044f_\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434\u0430_\u0433\u0440\u0443\u0434\u043d\u044f".split("_"),standalone:"\u0441\u0456\u0447\u0435\u043d\u044c_\u043b\u044e\u0442\u0438\u0439_\u0431\u0435\u0440\u0435\u0437\u0435\u043d\u044c_\u043a\u0432\u0456\u0442\u0435\u043d\u044c_\u0442\u0440\u0430\u0432\u0435\u043d\u044c_\u0447\u0435\u0440\u0432\u0435\u043d\u044c_\u043b\u0438\u043f\u0435\u043d\u044c_\u0441\u0435\u0440\u043f\u0435\u043d\u044c_\u0432\u0435\u0440\u0435\u0441\u0435\u043d\u044c_\u0436\u043e\u0432\u0442\u0435\u043d\u044c_\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434_\u0433\u0440\u0443\u0434\u0435\u043d\u044c".split("_")},monthsShort:"\u0441\u0456\u0447_\u043b\u044e\u0442_\u0431\u0435\u0440_\u043a\u0432\u0456\u0442_\u0442\u0440\u0430\u0432_\u0447\u0435\u0440\u0432_\u043b\u0438\u043f_\u0441\u0435\u0440\u043f_\u0432\u0435\u0440_\u0436\u043e\u0432\u0442_\u043b\u0438\u0441\u0442_\u0433\u0440\u0443\u0434".split("_"),weekdays:function(e,a){var t={nominative:"\u043d\u0435\u0434\u0456\u043b\u044f_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a_\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a_\u0441\u0435\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0435\u0440_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u044f_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),accusative:"\u043d\u0435\u0434\u0456\u043b\u044e_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a_\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a_\u0441\u0435\u0440\u0435\u0434\u0443_\u0447\u0435\u0442\u0432\u0435\u0440_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u044e_\u0441\u0443\u0431\u043e\u0442\u0443".split("_"),genitive:"\u043d\u0435\u0434\u0456\u043b\u0456_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043a\u0430_\u0432\u0456\u0432\u0442\u043e\u0440\u043a\u0430_\u0441\u0435\u0440\u0435\u0434\u0438_\u0447\u0435\u0442\u0432\u0435\u0440\u0433\u0430_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u0456_\u0441\u0443\u0431\u043e\u0442\u0438".split("_")};return e?t[/(\[[\u0412\u0432\u0423\u0443]\]) ?dddd/.test(a)?"accusative":/\[?(?:\u043c\u0438\u043d\u0443\u043b\u043e\u0457|\u043d\u0430\u0441\u0442\u0443\u043f\u043d\u043e\u0457)? ?\] ?dddd/.test(a)?"genitive":"nominative"][e.day()]:t.nominative},weekdaysShort:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0440.",LLL:"D MMMM YYYY \u0440., HH:mm",LLLL:"dddd, D MMMM YYYY \u0440., HH:mm"},calendar:{sameDay:Wa("[\u0421\u044c\u043e\u0433\u043e\u0434\u043d\u0456 "),nextDay:Wa("[\u0417\u0430\u0432\u0442\u0440\u0430 "),lastDay:Wa("[\u0412\u0447\u043e\u0440\u0430 "),nextWeek:Wa("[\u0423] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return Wa("[\u041c\u0438\u043d\u0443\u043b\u043e\u0457] dddd [").call(this);case 1:case 2:case 4:return Wa("[\u041c\u0438\u043d\u0443\u043b\u043e\u0433\u043e] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"\u0437\u0430 %s",past:"%s \u0442\u043e\u043c\u0443",s:"\u0434\u0435\u043a\u0456\u043b\u044c\u043a\u0430 \u0441\u0435\u043a\u0443\u043d\u0434",ss:Oa,m:Oa,mm:Oa,h:"\u0433\u043e\u0434\u0438\u043d\u0443",hh:Oa,d:"\u0434\u0435\u043d\u044c",dd:Oa,M:"\u043c\u0456\u0441\u044f\u0446\u044c",MM:Oa,y:"\u0440\u0456\u043a",yy:Oa},meridiemParse:/\u043d\u043e\u0447\u0456|\u0440\u0430\u043d\u043a\u0443|\u0434\u043d\u044f|\u0432\u0435\u0447\u043e\u0440\u0430/,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u043e\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u0456":e<12?"\u0440\u0430\u043d\u043a\u0443":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u043e\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0439|\u0433\u043e)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":case"w":case"W":return e+"-\u0439";case"D":return e+"-\u0433\u043e";default:return e}},week:{dow:1,doy:7}});var ed=["\u062c\u0646\u0648\u0631\u06cc","\u0641\u0631\u0648\u0631\u06cc","\u0645\u0627\u0631\u0686","\u0627\u067e\u0631\u06cc\u0644","\u0645\u0626\u06cc","\u062c\u0648\u0646","\u062c\u0648\u0644\u0627\u0626\u06cc","\u0627\u06af\u0633\u062a","\u0633\u062a\u0645\u0628\u0631","\u0627\u06a9\u062a\u0648\u0628\u0631","\u0646\u0648\u0645\u0628\u0631","\u062f\u0633\u0645\u0628\u0631"],ad=["\u0627\u062a\u0648\u0627\u0631","\u067e\u06cc\u0631","\u0645\u0646\u06af\u0644","\u0628\u062f\u06be","\u062c\u0645\u0639\u0631\u0627\u062a","\u062c\u0645\u0639\u06c1","\u06c1\u0641\u062a\u06c1"];return e.defineLocale("ur",{months:ed,monthsShort:ed,weekdays:ad,weekdaysShort:ad,weekdaysMin:ad,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd\u060c D MMMM YYYY HH:mm"},meridiemParse:/\u0635\u0628\u062d|\u0634\u0627\u0645/,isPM:function(e){return"\u0634\u0627\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635\u0628\u062d":"\u0634\u0627\u0645"},calendar:{sameDay:"[\u0622\u062c \u0628\u0648\u0642\u062a] LT",nextDay:"[\u06a9\u0644 \u0628\u0648\u0642\u062a] LT",nextWeek:"dddd [\u0628\u0648\u0642\u062a] LT",lastDay:"[\u06af\u0630\u0634\u062a\u06c1 \u0631\u0648\u0632 \u0628\u0648\u0642\u062a] LT",lastWeek:"[\u06af\u0630\u0634\u062a\u06c1] dddd [\u0628\u0648\u0642\u062a] LT",sameElse:"L"},relativeTime:{future:"%s \u0628\u0639\u062f",past:"%s \u0642\u0628\u0644",s:"\u0686\u0646\u062f \u0633\u06cc\u06a9\u0646\u0688",ss:"%d \u0633\u06cc\u06a9\u0646\u0688",m:"\u0627\u06cc\u06a9 \u0645\u0646\u0679",mm:"%d \u0645\u0646\u0679",h:"\u0627\u06cc\u06a9 \u06af\u06be\u0646\u0679\u06c1",hh:"%d \u06af\u06be\u0646\u0679\u06d2",d:"\u0627\u06cc\u06a9 \u062f\u0646",dd:"%d \u062f\u0646",M:"\u0627\u06cc\u06a9 \u0645\u0627\u06c1",MM:"%d \u0645\u0627\u06c1",y:"\u0627\u06cc\u06a9 \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:1,doy:4}}),e.defineLocale("uz-latn",{months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[Bugun soat] LT [da]",nextDay:"[Ertaga] LT [da]",nextWeek:"dddd [kuni soat] LT [da]",lastDay:"[Kecha soat] LT [da]",lastWeek:"[O'tgan] dddd [kuni soat] LT [da]",sameElse:"L"},relativeTime:{future:"Yaqin %s ichida",past:"Bir necha %s oldin",s:"soniya",ss:"%d soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"},week:{dow:1,doy:7}}),e.defineLocale("uz",{months:"\u044f\u043d\u0432\u0430\u0440_\u0444\u0435\u0432\u0440\u0430\u043b_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440_\u043e\u043a\u0442\u044f\u0431\u0440_\u043d\u043e\u044f\u0431\u0440_\u0434\u0435\u043a\u0430\u0431\u0440".split("_"),monthsShort:"\u044f\u043d\u0432_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433_\u0441\u0435\u043d_\u043e\u043a\u0442_\u043d\u043e\u044f_\u0434\u0435\u043a".split("_"),weekdays:"\u042f\u043a\u0448\u0430\u043d\u0431\u0430_\u0414\u0443\u0448\u0430\u043d\u0431\u0430_\u0421\u0435\u0448\u0430\u043d\u0431\u0430_\u0427\u043e\u0440\u0448\u0430\u043d\u0431\u0430_\u041f\u0430\u0439\u0448\u0430\u043d\u0431\u0430_\u0416\u0443\u043c\u0430_\u0428\u0430\u043d\u0431\u0430".split("_"),weekdaysShort:"\u042f\u043a\u0448_\u0414\u0443\u0448_\u0421\u0435\u0448_\u0427\u043e\u0440_\u041f\u0430\u0439_\u0416\u0443\u043c_\u0428\u0430\u043d".split("_"),weekdaysMin:"\u042f\u043a_\u0414\u0443_\u0421\u0435_\u0427\u043e_\u041f\u0430_\u0416\u0443_\u0428\u0430".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[\u0411\u0443\u0433\u0443\u043d \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",nextDay:"[\u042d\u0440\u0442\u0430\u0433\u0430] LT [\u0434\u0430]",nextWeek:"dddd [\u043a\u0443\u043d\u0438 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",lastDay:"[\u041a\u0435\u0447\u0430 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",lastWeek:"[\u0423\u0442\u0433\u0430\u043d] dddd [\u043a\u0443\u043d\u0438 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",sameElse:"L"},relativeTime:{future:"\u042f\u043a\u0438\u043d %s \u0438\u0447\u0438\u0434\u0430",past:"\u0411\u0438\u0440 \u043d\u0435\u0447\u0430 %s \u043e\u043b\u0434\u0438\u043d",s:"\u0444\u0443\u0440\u0441\u0430\u0442",ss:"%d \u0444\u0443\u0440\u0441\u0430\u0442",m:"\u0431\u0438\u0440 \u0434\u0430\u043a\u0438\u043a\u0430",mm:"%d \u0434\u0430\u043a\u0438\u043a\u0430",h:"\u0431\u0438\u0440 \u0441\u043e\u0430\u0442",hh:"%d \u0441\u043e\u0430\u0442",d:"\u0431\u0438\u0440 \u043a\u0443\u043d",dd:"%d \u043a\u0443\u043d",M:"\u0431\u0438\u0440 \u043e\u0439",MM:"%d \u043e\u0439",y:"\u0431\u0438\u0440 \u0439\u0438\u043b",yy:"%d \u0439\u0438\u043b"},week:{dow:1,doy:7}}),e.defineLocale("vi",{months:"th\xe1ng 1_th\xe1ng 2_th\xe1ng 3_th\xe1ng 4_th\xe1ng 5_th\xe1ng 6_th\xe1ng 7_th\xe1ng 8_th\xe1ng 9_th\xe1ng 10_th\xe1ng 11_th\xe1ng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),monthsParseExact:!0,weekdays:"ch\u1ee7 nh\u1eadt_th\u1ee9 hai_th\u1ee9 ba_th\u1ee9 t\u01b0_th\u1ee9 n\u0103m_th\u1ee9 s\xe1u_th\u1ee9 b\u1ea3y".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysParseExact:!0,meridiemParse:/sa|ch/i,isPM:function(e){return/^ch$/i.test(e)},meridiem:function(e,a,t){return e<12?t?"sa":"SA":t?"ch":"CH"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [n\u0103m] YYYY",LLL:"D MMMM [n\u0103m] YYYY HH:mm",LLLL:"dddd, D MMMM [n\u0103m] YYYY HH:mm",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[H\xf4m nay l\xfac] LT",nextDay:"[Ng\xe0y mai l\xfac] LT",nextWeek:"dddd [tu\u1ea7n t\u1edbi l\xfac] LT",lastDay:"[H\xf4m qua l\xfac] LT",lastWeek:"dddd [tu\u1ea7n r\u1ed3i l\xfac] LT",sameElse:"L"},relativeTime:{future:"%s t\u1edbi",past:"%s tr\u01b0\u1edbc",s:"v\xe0i gi\xe2y",ss:"%d gi\xe2y",m:"m\u1ed9t ph\xfat",mm:"%d ph\xfat",h:"m\u1ed9t gi\u1edd",hh:"%d gi\u1edd",d:"m\u1ed9t ng\xe0y",dd:"%d ng\xe0y",M:"m\u1ed9t th\xe1ng",MM:"%d th\xe1ng",y:"m\u1ed9t n\u0103m",yy:"%d n\u0103m"},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:function(e){return e},week:{dow:1,doy:4}}),e.defineLocale("x-pseudo",{months:"J~\xe1\xf1\xfa\xe1~r\xfd_F~\xe9br\xfa~\xe1r\xfd_~M\xe1rc~h_\xc1p~r\xedl_~M\xe1\xfd_~J\xfa\xf1\xe9~_J\xfal~\xfd_\xc1\xfa~g\xfast~_S\xe9p~t\xe9mb~\xe9r_\xd3~ct\xf3b~\xe9r_\xd1~\xf3v\xe9m~b\xe9r_~D\xe9c\xe9~mb\xe9r".split("_"),monthsShort:"J~\xe1\xf1_~F\xe9b_~M\xe1r_~\xc1pr_~M\xe1\xfd_~J\xfa\xf1_~J\xfal_~\xc1\xfag_~S\xe9p_~\xd3ct_~\xd1\xf3v_~D\xe9c".split("_"),monthsParseExact:!0,weekdays:"S~\xfa\xf1d\xe1~\xfd_M\xf3~\xf1d\xe1\xfd~_T\xfa\xe9~sd\xe1\xfd~_W\xe9d~\xf1\xe9sd~\xe1\xfd_T~h\xfars~d\xe1\xfd_~Fr\xedd~\xe1\xfd_S~\xe1t\xfar~d\xe1\xfd".split("_"),weekdaysShort:"S~\xfa\xf1_~M\xf3\xf1_~T\xfa\xe9_~W\xe9d_~Th\xfa_~Fr\xed_~S\xe1t".split("_"),weekdaysMin:"S~\xfa_M\xf3~_T\xfa_~W\xe9_T~h_Fr~_S\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[T~\xf3d\xe1~\xfd \xe1t] LT",nextDay:"[T~\xf3m\xf3~rr\xf3~w \xe1t] LT",nextWeek:"dddd [\xe1t] LT",lastDay:"[\xdd~\xe9st~\xe9rd\xe1~\xfd \xe1t] LT",lastWeek:"[L~\xe1st] dddd [\xe1t] LT",sameElse:"L"},relativeTime:{future:"\xed~\xf1 %s",past:"%s \xe1~g\xf3",s:"\xe1 ~f\xe9w ~s\xe9c\xf3~\xf1ds",ss:"%d s~\xe9c\xf3\xf1~ds",m:"\xe1 ~m\xed\xf1~\xfat\xe9",mm:"%d m~\xed\xf1\xfa~t\xe9s",h:"\xe1~\xf1 h\xf3~\xfar",hh:"%d h~\xf3\xfars",d:"\xe1 ~d\xe1\xfd",dd:"%d d~\xe1\xfds",M:"\xe1 ~m\xf3\xf1~th",MM:"%d m~\xf3\xf1t~hs",y:"\xe1 ~\xfd\xe9\xe1r",yy:"%d \xfd~\xe9\xe1rs"},dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th")},week:{dow:1,doy:4}}),e.defineLocale("yo",{months:"S\u1eb9\u0301r\u1eb9\u0301_E\u0300re\u0300le\u0300_\u1eb8r\u1eb9\u0300na\u0300_I\u0300gbe\u0301_E\u0300bibi_O\u0300ku\u0300du_Ag\u1eb9mo_O\u0300gu\u0301n_Owewe_\u1ecc\u0300wa\u0300ra\u0300_Be\u0301lu\u0301_\u1ecc\u0300p\u1eb9\u0300\u0300".split("_"),monthsShort:"S\u1eb9\u0301r_E\u0300rl_\u1eb8rn_I\u0300gb_E\u0300bi_O\u0300ku\u0300_Ag\u1eb9_O\u0300gu\u0301_Owe_\u1ecc\u0300wa\u0300_Be\u0301l_\u1ecc\u0300p\u1eb9\u0300\u0300".split("_"),weekdays:"A\u0300i\u0300ku\u0301_Aje\u0301_I\u0300s\u1eb9\u0301gun_\u1eccj\u1ecd\u0301ru\u0301_\u1eccj\u1ecd\u0301b\u1ecd_\u1eb8ti\u0300_A\u0300ba\u0301m\u1eb9\u0301ta".split("_"),weekdaysShort:"A\u0300i\u0300k_Aje\u0301_I\u0300s\u1eb9\u0301_\u1eccjr_\u1eccjb_\u1eb8ti\u0300_A\u0300ba\u0301".split("_"),weekdaysMin:"A\u0300i\u0300_Aj_I\u0300s_\u1eccr_\u1eccb_\u1eb8t_A\u0300b".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[O\u0300ni\u0300 ni] LT",nextDay:"[\u1ecc\u0300la ni] LT",nextWeek:"dddd [\u1eccs\u1eb9\u0300 to\u0301n'b\u1ecd] [ni] LT",lastDay:"[A\u0300na ni] LT",lastWeek:"dddd [\u1eccs\u1eb9\u0300 to\u0301l\u1ecd\u0301] [ni] LT",sameElse:"L"},relativeTime:{future:"ni\u0301 %s",past:"%s k\u1ecdja\u0301",s:"i\u0300s\u1eb9ju\u0301 aaya\u0301 die",ss:"aaya\u0301 %d",m:"i\u0300s\u1eb9ju\u0301 kan",mm:"i\u0300s\u1eb9ju\u0301 %d",h:"wa\u0301kati kan",hh:"wa\u0301kati %d",d:"\u1ecdj\u1ecd\u0301 kan",dd:"\u1ecdj\u1ecd\u0301 %d",M:"osu\u0300 kan",MM:"osu\u0300 %d",y:"\u1ecddu\u0301n kan",yy:"\u1ecddu\u0301n %d"},dayOfMonthOrdinalParse:/\u1ecdj\u1ecd\u0301\s\d{1,2}/,ordinal:"\u1ecdj\u1ecd\u0301 %d",week:{dow:1,doy:4}}),e.defineLocale("zh-cn",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u5468\u65e5_\u5468\u4e00_\u5468\u4e8c_\u5468\u4e09_\u5468\u56db_\u5468\u4e94_\u5468\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5Ah\u70b9mm\u5206",LLLL:"YYYY\u5e74M\u6708D\u65e5ddddAh\u70b9mm\u5206",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:e>=11?e:e+12},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929]LT",nextDay:"[\u660e\u5929]LT",nextWeek:"[\u4e0b]ddddLT",lastDay:"[\u6628\u5929]LT",lastWeek:"[\u4e0a]ddddLT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u5468)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u5468";default:return e}},relativeTime:{future:"%s\u5185",past:"%s\u524d",s:"\u51e0\u79d2",ss:"%d \u79d2",m:"1 \u5206\u949f",mm:"%d \u5206\u949f",h:"1 \u5c0f\u65f6",hh:"%d \u5c0f\u65f6",d:"1 \u5929",dd:"%d \u5929",M:"1 \u4e2a\u6708",MM:"%d \u4e2a\u6708",y:"1 \u5e74",yy:"%d \u5e74"},week:{dow:1,doy:4}}),e.defineLocale("zh-hk",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u9031\u65e5_\u9031\u4e00_\u9031\u4e8c_\u9031\u4e09_\u9031\u56db_\u9031\u4e94_\u9031\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e2d\u5348"===a?e>=11?e:e+12:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:void 0},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929]LT",nextDay:"[\u660e\u5929]LT",nextWeek:"[\u4e0b]ddddLT",lastDay:"[\u6628\u5929]LT",lastWeek:"[\u4e0a]ddddLT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u9031)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u9031";default:return e}},relativeTime:{future:"%s\u5167",past:"%s\u524d",s:"\u5e7e\u79d2",ss:"%d \u79d2",m:"1 \u5206\u9418",mm:"%d \u5206\u9418",h:"1 \u5c0f\u6642",hh:"%d \u5c0f\u6642",d:"1 \u5929",dd:"%d \u5929",M:"1 \u500b\u6708",MM:"%d \u500b\u6708",y:"1 \u5e74",yy:"%d \u5e74"}}),e.defineLocale("zh-tw",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u9031\u65e5_\u9031\u4e00_\u9031\u4e8c_\u9031\u4e09_\u9031\u56db_\u9031\u4e94_\u9031\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e2d\u5348"===a?e>=11?e:e+12:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:void 0},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929]LT",nextDay:"[\u660e\u5929]LT",nextWeek:"[\u4e0b]ddddLT",lastDay:"[\u6628\u5929]LT",lastWeek:"[\u4e0a]ddddLT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u9031)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u9031";default:return e}},relativeTime:{future:"%s\u5167",past:"%s\u524d",s:"\u5e7e\u79d2",ss:"%d \u79d2",m:"1 \u5206\u9418",mm:"%d \u5206\u9418",h:"1 \u5c0f\u6642",hh:"%d \u5c0f\u6642",d:"1 \u5929",dd:"%d \u5929",M:"1 \u500b\u6708",MM:"%d \u500b\u6708",y:"1 \u5e74",yy:"%d \u5e74"}}),e.locale("en"),e});
\ No newline at end of file
diff --git a/domain-server/resources/web/css/bootstrap-sortable.css b/domain-server/resources/web/css/bootstrap-sortable.css
new file mode 100755
index 0000000000..aed89cd62e
--- /dev/null
+++ b/domain-server/resources/web/css/bootstrap-sortable.css
@@ -0,0 +1,110 @@
+/**
+ * adding sorting ability to HTML tables with Bootstrap styling
+ * @summary HTML tables sorting ability
+ * @version 2.0.0
+ * @requires tinysort, moment.js, jQuery
+ * @license MIT
+ * @author Matus Brlit (drvic10k)
+ * @copyright Matus Brlit (drvic10k), bootstrap-sortable contributors
+ */
+
+table.sortable span.sign {
+    display: block;
+    position: absolute;
+    top: 50%;
+    right: 5px;
+    font-size: 12px;
+    margin-top: -10px;
+    color: #bfbfc1;
+}
+
+table.sortable th:after {
+    display: block;
+    position: absolute;
+    top: 50%;
+    right: 5px;
+    font-size: 12px;
+    margin-top: -10px;
+    color: #bfbfc1;
+}
+
+table.sortable th.arrow:after {
+    content: '';
+}
+
+table.sortable span.arrow, span.reversed, th.arrow.down:after, th.reversedarrow.down:after, th.arrow.up:after, th.reversedarrow.up:after {
+    border-style: solid;
+    border-width: 5px;
+    font-size: 0;
+    border-color: #ccc transparent transparent transparent;
+    line-height: 0;
+    height: 0;
+    width: 0;
+    margin-top: -2px;
+}
+
+    table.sortable span.arrow.up, th.arrow.up:after {
+        border-color: transparent transparent #ccc transparent;
+        margin-top: -7px;
+    }
+
+table.sortable span.reversed, th.reversedarrow.down:after {
+    border-color: transparent transparent #ccc transparent;
+    margin-top: -7px;
+}
+
+    table.sortable span.reversed.up, th.reversedarrow.up:after {
+        border-color: #ccc transparent transparent transparent;
+        margin-top: -2px;
+    }
+
+table.sortable span.az:before, th.az.down:after {
+    content: "a .. z";
+}
+
+table.sortable span.az.up:before, th.az.up:after {
+    content: "z .. a";
+}
+
+table.sortable th.az.nosort:after, th.AZ.nosort:after, th._19.nosort:after, th.month.nosort:after {
+    content: "..";
+}
+
+table.sortable span.AZ:before, th.AZ.down:after {
+    content: "A .. Z";
+}
+
+table.sortable span.AZ.up:before, th.AZ.up:after {
+    content: "Z .. A";
+}
+
+table.sortable span._19:before, th._19.down:after {
+    content: "1 .. 9";
+}
+
+table.sortable span._19.up:before, th._19.up:after {
+    content: "9 .. 1";
+}
+
+table.sortable span.month:before, th.month.down:after {
+    content: "jan .. dec";
+}
+
+table.sortable span.month.up:before, th.month.up:after {
+    content: "dec .. jan";
+}
+
+table.sortable>thead th:not([data-defaultsort=disabled]) {
+    cursor: pointer;
+    position: relative;
+    top: 0;
+    left: 0;
+}
+
+table.sortable>thead th:hover:not([data-defaultsort=disabled]) {
+    background: #efefef;
+}
+
+table.sortable>thead th div.mozilla {
+    position: relative;
+}
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 5121b85a42..2bcc870ecf 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -355,21 +355,31 @@ table .headers + .headers td {
   }
 }
 
-ul.nav li.dropdown ul.dropdown-menu {
+ul.dropdown-menu {
   padding: 0px 0px;
 }
 
-ul.nav li.dropdown li a {
+ul.dropdown-menu li a {
   padding-top: 7px;
   padding-bottom: 7px;
 }
 
-ul.nav li.dropdown li a:hover {
+ul.dropdown-menu li a:hover {
   color: white;
   background-color: #337ab7;
 }
 
-ul.nav li.dropdown ul.dropdown-menu .divider {
+table ul.dropdown-menu li:first-child a:hover {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+ul.dropdown-menu li:last-child a:hover {
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+ul.dropdown-menu .divider {
   margin: 0px 0;
 }
 
@@ -434,3 +444,37 @@ ul.nav li.dropdown ul.dropdown-menu .divider {
 .save-button-text {
   pointer-events: none;
 }
+
+#content_archives .panel-body {
+  padding: 0;
+}
+
+#content_archives .panel-body .form-group {
+  padding: 15px;
+}
+
+#content_archives .panel-body th, #content_archives .panel-body td {
+  padding: 8px 15px;
+}
+
+#content_archives table {
+  border-top: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
+}
+
+tr.gray-tr {
+  background-color: #f5f5f5;
+}
+
+.dropdown-toggle span.glyphicon-option-vertical {
+  font-size: 110%;
+  cursor: pointer;
+  border-radius: 50%;
+  background-color: #F5F5F5;
+  padding: 4px 4px 4px 6px;
+}
+
+.dropdown.open span.glyphicon-option-vertical {
+  background-color: #337AB7;
+  color: white;
+}
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 1b7b306fff..bf1d1d1df1 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -9,6 +9,7 @@
     <link href="/css/style.css" rel="stylesheet" media="screen">
     <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
     <link href="/css/bootstrap-switch.min.css" rel="stylesheet" media="screen">
+    <link href="/css/bootstrap-sortable.css" rel="stylesheet" media="screen">
 
     <script src='/js/sweetalert.min.js'></script>
   </head>
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 17f06f3ad1..961a7df3b2 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -106,8 +106,12 @@ function reloadSettings(callback) {
   $.getJSON(Settings.endpoint, function(data){
     _.extend(data, viewHelpers);
 
-    for (var spliceIndex in Settings.extraGroups) {
-      data.descriptions.splice(spliceIndex, 0, Settings.extraGroups[spliceIndex]);
+    for (var spliceIndex in Settings.extraGroupsAtIndex) {
+      data.descriptions.splice(spliceIndex, 0, Settings.extraGroupsAtIndex[spliceIndex]);
+    }
+
+    for (var endGroupIndex in Settings.extraGroupsAtEnd) {
+      data.descriptions.push(Settings.extraGroupsAtEnd[endGroupIndex]);
     }
 
     $('#panels').html(Settings.panelsTemplate(data));
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 2f75794786..184b2b954f 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -55,6 +55,34 @@ $(document).ready(function(){
   var $contentDropdown = $('#content-settings-nav-dropdown');
   var $settingsDropdown = $('#domain-settings-nav-dropdown');
 
+   // define extra groups to add to setting panels, with their splice index
+  Settings.extraContentGroupsAtIndex = {
+    0: {
+      html_id: Settings.CONTENT_ARCHIVES_PANEL_ID,
+      label: 'Content Archives'
+    },
+    1: {
+      html_id: Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID,
+      label: 'Upload Content'
+    }
+  };
+
+  Settings.extraContentGroupsAtEnd = [];
+
+  Settings.extraDomainGroupsAtIndex = {
+    1: {
+      html_id: 'places',
+      label: 'Places'
+    }
+  }
+
+  Settings.extraDomainGroupsAtEnd = [
+    {
+      html_id: 'settings_backup',
+      label: 'Settings Backup'
+    }
+  ]
+
   // for pages that have the settings dropdowns
   if ($contentDropdown.length && $settingsDropdown.length) {
     // make a JSON request to get the dropdown menus for content and settings
@@ -65,6 +93,15 @@ $(document).ready(function(){
         return "<li class='setting-group'><a href='" + settingsGroupAnchor(base, html_id) + "'>" + group.label + "<span class='badge'></span></a></li>";
       }
 
+      // add the dummy settings groups that get populated via JS
+      for (var spliceIndex in Settings.extraContentGroupsAtIndex) {
+        data.content_settings.splice(spliceIndex, 0, Settings.extraContentGroupsAtIndex[spliceIndex]);
+      }
+
+      for (var endIndex in Settings.extraContentGroupsAtEnd) {
+        data.content_settings.push(Settings.extraContentGroupsAtIndex[spliceIndex]);
+      }
+
       $.each(data.content_settings, function(index, group){
         if (index > 0) {
           $contentDropdown.append("<li role='separator' class='divider'></li>");
@@ -73,25 +110,22 @@ $(document).ready(function(){
         $contentDropdown.append(makeGroupDropdownElement(group, "/content/"));
       });
 
+      // add the dummy settings groups that get populated via JS
+      for (var spliceIndex in Settings.extraDomainGroupsAtIndex) {
+        data.domain_settings.splice(spliceIndex, 0, Settings.extraDomainGroupsAtIndex[spliceIndex]);
+      }
+
+      for (var endIndex in Settings.extraDomainGroupsAtEnd) {
+        data.domain_settings.push(Settings.extraDomainGroupsAtEnd[endIndex]);
+      }
+
       $.each(data.domain_settings, function(index, group){
         if (index > 0) {
           $settingsDropdown.append("<li role='separator' class='divider'></li>");
         }
 
         $settingsDropdown.append(makeGroupDropdownElement(group, "/settings/"));
-
-        // for domain settings, we add a dummy "Places" group that we fill
-        // via the API - add it to the dropdown menu in the right spot
-        // which is after "Metaverse / Networking"
-        if (group.name == "metaverse") {
-          $settingsDropdown.append("<li role='separator' class='divider'></li>");
-          $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
-        }
       });
-
-      // append a link for the "Settings Backup" panel
-      $settingsDropdown.append("<li role='separator' class='divider'></li>");
-      $settingsDropdown.append(makeGroupDropdownElement({ html_id: 'settings_backup', label: 'Settings Backup'}, "/settings"));
     });
   }
 });
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 69721ee924..040d8959e7 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -42,7 +42,9 @@ Object.assign(Settings, {
   ADD_PLACE_BTN_ID: 'add-place-btn',
   FORM_ID: 'settings-form',
   INVALID_ROW_CLASS: 'invalid-input',
-  DATA_ROW_INDEX: 'data-row-index'
+  DATA_ROW_INDEX: 'data-row-index',
+  CONTENT_ARCHIVES_PANEL_ID: 'content_archives',
+  UPLOAD_CONTENT_BACKUP_PANEL_ID: 'upload_content'
 });
 
 var URLs = {
@@ -164,7 +166,7 @@ function getDomainFromAPI(callback) {
   if (callback === undefined) {
     callback = function() {};
   }
-  
+
   if (!domainIDIsSet()) {
     callback({ status: 'fail' });
     return null;
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 68684c9106..d4de0d5f4c 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -14,17 +14,9 @@ $(document).ready(function(){
       return b;
   })(window.location.search.substr(1).split('&'));
 
-  // define extra groups to add to description, with their splice index
-  Settings.extraGroups = {
-    1: {
-      html_id: 'places',
-      label: 'Places'
-    },
-    "-1": {
-      html_id: 'settings_backup',
-      label: 'Settings Backup'
-    }
-  }
+  Settings.extraGroupsAtEnd = Settings.extraDomainGroupsAtEnd;
+  Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex;
+
 
   Settings.afterReloadActions = function() {
     // append the domain selection modal
@@ -643,7 +635,6 @@ $(document).ready(function(){
     autoNetworkingEl.after(form);
   }
 
-
   function setupPlacesTable() {
     // create a dummy table using our view helper
     var placesTableSetting = {
@@ -1097,8 +1088,5 @@ $(document).ready(function(){
     html += "</div>";
 
     $('#settings_backup .panel-body').html(html);
-
-    // add an upload button to the footer to kick off the upload form
-
   }
 });

From dd5a705836d22a9d34d8d56b672d77115e817557 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 13:29:42 -0800
Subject: [PATCH 338/569] move rolling interval backup rules to automatic
 content archives

---
 .../resources/describe-settings.json          | 130 +++++++++---------
 .../resources/web/content/js/content.js       |  30 +++-
 .../resources/web/js/base-settings.js         |   4 +
 .../src/DomainContentBackupManager.cpp        |   6 +-
 domain-server/src/DomainServer.cpp            |   9 +-
 .../src/DomainServerSettingsManager.cpp       |  17 +++
 .../src/DomainServerSettingsManager.h         |   1 +
 7 files changed, 123 insertions(+), 74 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 93d703c8b3..427dc62520 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,5 +1,5 @@
 {
-  "version": 2.1,
+  "version": 2.2,
   "settings": [
     {
       "name": "metaverse",
@@ -1321,73 +1321,6 @@
           "default": "30000",
           "advanced": true
         },
-        {
-          "name": "backups",
-          "type": "table",
-          "label": "Backup Rules",
-          "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
-          "numbered": false,
-          "can_add_new_rows": true,
-          "default": [
-            {
-              "Name": "Half Hourly Rolling",
-              "backupInterval": 1800,
-              "format": ".backup.halfhourly.%N",
-              "maxBackupVersions": 5
-            },
-            {
-              "Name": "Daily Rolling",
-              "backupInterval": 86400,
-              "format": ".backup.daily.%N",
-              "maxBackupVersions": 7
-            },
-            {
-              "Name": "Weekly Rolling",
-              "backupInterval": 604800,
-              "format": ".backup.weekly.%N",
-              "maxBackupVersions": 4
-            },
-            {
-              "Name": "Thirty Day Rolling",
-              "backupInterval": 2592000,
-              "format": ".backup.thirtyday.%N",
-              "maxBackupVersions": 12
-            }
-          ],
-          "columns": [
-            {
-              "name": "Name",
-              "label": "Name",
-              "can_set": true,
-              "placeholder": "Example",
-              "default": "Example"
-            },
-            {
-              "name": "format",
-              "label": "Rule Format",
-              "can_set": true,
-              "help": "Format used to create the extension for the backup of your persisted entities. Use a format with %N to get rolling. Or use date formatting like %Y-%m-%d.%H:%M:%S.%z",
-              "placeholder": ".backup.example.%N",
-              "default": ".backup.example.%N"
-            },
-            {
-              "name": "backupInterval",
-              "label": "Backup Interval in Seconds",
-              "help": "Interval between backup checks in seconds.",
-              "placeholder": 1800,
-              "default": 1800,
-              "can_set": true
-            },
-            {
-              "name": "maxBackupVersions",
-              "label": "Max Rolled Backup Versions",
-              "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
-              "placeholder": 5,
-              "default": 5,
-              "can_set": true
-            }
-          ]
-        },
         {
           "name": "NoPersist",
           "type": "checkbox",
@@ -1649,6 +1582,67 @@
         }
       ]
     },
+    {
+      "name": "automatic_content_archives",
+      "label": "Automatic Content Archives",
+      "settings": [
+        {
+          "name": "backup_rules",
+          "type": "table",
+          "label": "Rolling Backup Rules",
+          "help": "Define how frequently to create automatic content archives",
+          "numbered": false,
+          "can_add_new_rows": true,
+          "default": [
+            {
+              "Name": "Half Hourly Rolling",
+              "backupInterval": 1800,
+              "maxBackupVersions": 5
+            },
+            {
+              "Name": "Daily Rolling",
+              "backupInterval": 86400,
+              "maxBackupVersions": 7
+            },
+            {
+              "Name": "Weekly Rolling",
+              "backupInterval": 604800,
+              "maxBackupVersions": 4
+            },
+            {
+              "Name": "Thirty Day Rolling",
+              "backupInterval": 2592000,
+              "maxBackupVersions": 12
+            }
+          ],
+          "columns": [
+            {
+              "name": "Name",
+              "label": "Name",
+              "can_set": true,
+              "placeholder": "Example",
+              "default": "Example"
+            },
+            {
+              "name": "backupInterval",
+              "label": "Backup Interval in Seconds",
+              "help": "Interval between backup checks in seconds.",
+              "placeholder": 1800,
+              "default": 1800,
+              "can_set": true
+            },
+            {
+              "name": "maxBackupVersions",
+              "label": "Max Rolled Backup Versions",
+              "help": "If your backup extension format uses 'rolling', how many versions do you want us to keep?",
+              "placeholder": 5,
+              "default": 5,
+              "can_set": true
+            }
+          ]
+        }
+      ]
+    },
     {
       "name": "wizard",
       "label": "Setup Wizard",
diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index e2b653995f..0fd5f37a94 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -23,15 +23,17 @@ $(document).ready(function(){
   var AUTOMATIC_ARCHIVES_TBODY_ID = 'automatic-archives-tbody';
   var MANUAL_ARCHIVES_TABLE_ID = 'manual-archives-table';
   var MANUAL_ARCHIVES_TBODY_ID = 'manual-archives-tbody';
+  var AUTO_ARCHIVES_SETTINGS_LINK_ID = 'auto-archives-settings-link';
+
   var automaticBackups = [];
   var manualBackups = [];
 
   function setupContentArchives() {
-
     // construct the HTML needed for the content archives panel
     var html = "<div class='form-group'>";
     html += "<label class='control-label'>Automatic Content Archives</label>";
-    html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your domain content and settings backups.</span>"
+    html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your domain content and settings backups. "
+    html += "<a href='/settings/#automatic_content_archives' id='" + AUTO_ARCHIVES_SETTINGS_LINK_ID + "'>Click here to manage automatic content archive intervals.</a>";
     html += "</div>";
     html += "<table class='table sortable' id='" + AUTOMATIC_ARCHIVES_TABLE_ID + "'>";
 
@@ -120,6 +122,30 @@ $(document).ready(function(){
     });
   }
 
+  // handle click on automatic content archive settings link
+  $('body').on('click', '#' + AUTO_ARCHIVES_SETTINGS_LINK_ID, function(e) {
+    if (Settings.pendingChanges > 0) {
+      // don't follow the link right away, make sure the user knows they are about to leave
+      // the page and lose changes
+      e.preventDefault();
+
+      var settingsLink = $(this).attr('href');
+
+      swal({
+        title: "Are you sure?",
+        text: "You have pending changes to content settings that have not been saved. They will be lost if you leave the page to manage automatic content archive intervals.",
+        type: "warning",
+        showCancelButton: true,
+        confirmButtonText: "Leave and Lose Pending Changes",
+        closeOnConfirm: true
+      },
+      function () {
+        // user wants to drop their changes, switch pages
+        window.location =  settingsLink;
+      });
+    }
+  });
+
   // handle click on manual archive creation button
   $('body').on('click', '#' + GENERATE_ARCHIVE_BUTTON_ID, function(e) {
     e.preventDefault();
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 961a7df3b2..3476792222 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -126,6 +126,8 @@ function reloadSettings(callback) {
 
     $('[data-toggle="tooltip"]').tooltip();
 
+    Settings.pendingChanges = 0;
+
     // call the callback now that settings are loaded
     callback(true);
   }).fail(function() {
@@ -805,6 +807,8 @@ function badgeForDifferences(changedElement) {
     }
   });
 
+  Settings.pendingChanges = totalChanges;
+
   if (totalChanges == 0) {
     totalChanges = ""
   }
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index a711d2112d..345faffec4 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -63,9 +63,9 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
 }
 
 void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
-    qDebug() << settings << settings["backups"] << settings["backups"].isArray();
-    if (settings["backups"].isArray()) {
-        const QJsonArray& backupRules = settings["backups"].toArray();
+    static const QString BACKUP_RULES_KEY = "backup_rules";
+    if (settings[BACKUP_RULES_KEY].isArray()) {
+        const QJsonArray& backupRules = settings[BACKUP_RULES_KEY].toArray();
         qCDebug(domain_server) << "BACKUP RULES:";
 
         for (const QJsonValue& value : backupRules) {
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 157eaa483f..8247e12de5 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -296,8 +296,15 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         qCDebug(domain_server) << "Created entities data directory";
     }
     maybeHandleReplacementEntityFile();
+    
+    auto contentArchivesGroup = _settingsManager.valueOrDefaultValueForKeyPath(AUTOMATIC_CONTENT_ARCHIVES_GROUP);
+    auto archivesIntervalObject = QJsonObject();
 
-    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), _settingsManager.settingsResponseObjectForType("6")["entity_server_settings"].toObject()));
+    if (contentArchivesGroup.canConvert<QVariantMap>()) {
+        archivesIntervalObject = QJsonObject::fromVariantMap(contentArchivesGroup.toMap());
+    }
+
+    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), archivesIntervalObject));
 
     connect(_contentManager.get(), &DomainContentBackupManager::started, _contentManager.get(), [this](){
         _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 85d6a046b5..a50cde0807 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -393,6 +393,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
             _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canRezTemporaryCertifiedEntities);
             packPermissions();
         }
+
         if (oldVersion < 2.0) {
             const QString WIZARD_COMPLETED_ONCE = "wizard.completed_once";
 
@@ -400,6 +401,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
             *wizardCompletedOnce = QVariant(true);
         }
+
         if (oldVersion < 2.1) {
             // convert old avatar scale settings into avatar height.
 
@@ -421,6 +423,21 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
             }
         }
 
+        if (oldVersion < 2.2) {
+            // migrate entity server rolling backup intervals to new location for automatic content archive intervals
+
+            const QString ENTITY_SERVER_BACKUPS_KEYPATH = "entity_server_settings.backups";
+            const QString AUTO_CONTENT_ARCHIVES_RULES_KEYPATH = "automatic_content_archives.backup_rules";
+
+            QVariant* previousBackupsVariant = _configMap.valueForKeyPath(ENTITY_SERVER_BACKUPS_KEYPATH);
+
+            if (previousBackupsVariant) {
+                auto migratedBackupsVariant = _configMap.valueForKeyPath(AUTO_CONTENT_ARCHIVES_RULES_KEYPATH, true);
+                *migratedBackupsVariant = *previousBackupsVariant;
+            }
+        }
+
+
         // write the current description version to our settings
         *versionVariant = _descriptionVersion;
 
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index abc70751a8..897a15485f 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -37,6 +37,7 @@ const QString MAC_PERMISSIONS_KEYPATH = "security.mac_permissions";
 const QString MACHINE_FINGERPRINT_PERMISSIONS_KEYPATH = "security.machine_fingerprint_permissions";
 const QString GROUP_PERMISSIONS_KEYPATH = "security.group_permissions";
 const QString GROUP_FORBIDDENS_KEYPATH = "security.group_forbiddens";
+const QString AUTOMATIC_CONTENT_ARCHIVES_GROUP = "automatic_content_archives";
 
 using GroupByUUIDKey = QPair<QUuid, QUuid>; // groupID, rankID
 

From 2d9f2ebf81c0de164948c372e26e8bba286c7bb9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 13:50:46 -0800
Subject: [PATCH 339/569] fix active with anchor and settings dropdowns on
 non-settings pages

---
 domain-server/resources/web/base-settings-scripts.html | 1 -
 domain-server/resources/web/footer.html                | 1 +
 domain-server/resources/web/js/domain-server.js        | 6 +++---
 domain-server/resources/web/settings/js/settings.js    | 1 -
 domain-server/resources/web/wizard/index.shtml         | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/domain-server/resources/web/base-settings-scripts.html b/domain-server/resources/web/base-settings-scripts.html
index fe370c4675..877b0a6125 100644
--- a/domain-server/resources/web/base-settings-scripts.html
+++ b/domain-server/resources/web/base-settings-scripts.html
@@ -3,5 +3,4 @@
 <script src='/js/bootbox.min.js'></script>
 <script src='/js/form2js.min.js'></script>
 <script src='/js/bootstrap-switch.min.js'></script>
-<script src='/js/shared.js'></script>
 <script src='/js/base-settings.js'></script>
diff --git a/domain-server/resources/web/footer.html b/domain-server/resources/web/footer.html
index e8ea392b49..49e883509e 100644
--- a/domain-server/resources/web/footer.html
+++ b/domain-server/resources/web/footer.html
@@ -1,4 +1,5 @@
 </div>
 <script src='/js/jquery-2.1.4.min.js'></script>
 <script src='/js/bootstrap.min.js'></script>
+<script src='/js/shared.js'></script>
 <script src='/js/domain-server.js'></script>
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 184b2b954f..6b2d4e1316 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -28,7 +28,7 @@ function settingsGroupAnchor(base, html_id) {
 }
 
 $(document).ready(function(){
-  var url = window.location;
+  var url = location.protocol + '//' + location.host+location.pathname;
 
   // Will only work if string in href matches with location
   $('ul.nav a[href="'+ url +'"]').parent().addClass('active');
@@ -55,7 +55,7 @@ $(document).ready(function(){
   var $contentDropdown = $('#content-settings-nav-dropdown');
   var $settingsDropdown = $('#domain-settings-nav-dropdown');
 
-   // define extra groups to add to setting panels, with their splice index
+  // define extra groups to add to setting panels, with their splice index
   Settings.extraContentGroupsAtIndex = {
     0: {
       html_id: Settings.CONTENT_ARCHIVES_PANEL_ID,
@@ -99,7 +99,7 @@ $(document).ready(function(){
       }
 
       for (var endIndex in Settings.extraContentGroupsAtEnd) {
-        data.content_settings.push(Settings.extraContentGroupsAtIndex[spliceIndex]);
+        data.content_settings.push(Settings.extraContentGroupsAtEnd[endIndex]);
       }
 
       $.each(data.content_settings, function(index, group){
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index d4de0d5f4c..1c6510298f 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -17,7 +17,6 @@ $(document).ready(function(){
   Settings.extraGroupsAtEnd = Settings.extraDomainGroupsAtEnd;
   Settings.extraGroupsAtIndex = Settings.extraDomainGroupsAtIndex;
 
-
   Settings.afterReloadActions = function() {
     // append the domain selection modal
     appendDomainIDButtons();
diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml
index b526a5719b..5a3286296d 100644
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@@ -261,6 +261,5 @@
 <script src='/js/underscore-min.js'></script>
 <script src='/js/bootbox.min.js'></script>
 <script src='/js/sha256.js'></script>
-<script src='/js/shared.js'></script>
 <script src='js/wizard.js'></script>
 <!--#include virtual="page-end.html"-->

From b019895fce5051e18188d75a89c1a4ce791d3765 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 15:49:42 -0800
Subject: [PATCH 340/569] handle entity file upload from new content upload

---
 .../resources/web/content/js/content.js       | 58 +++++++++++++++++--
 .../resources/web/js/domain-server.js         |  2 +-
 .../resources/web/settings/js/settings.js     | 53 ++++++++++-------
 domain-server/src/DomainServer.cpp            | 30 ++++++++--
 4 files changed, 111 insertions(+), 32 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 0fd5f37a94..4e2c27bf54 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -7,17 +7,67 @@ $(document).ready(function(){
     // construct the HTML needed for the settings backup panel
     var html = "<div class='form-group'>";
 
-    html += "<span class='help-block'>Upload a Content Backup to replace the content of this domain";
-    html += "<br/>Note: Your domain's content will be replaced by the content you upload, but the existing backup files of your domain's content will not immediately be changed.</span>";
+    html += "<span class='help-block'>Upload a Content Archive (.zip) or entity file (.json, .json.gz) to replace the content of this domain.";
+    html += "<br/>Note: Your domain content will be replaced by the content you upload, but the existing backup files of your domain's content will not immediately be changed.</span>";
 
     html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
-    html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Domain Settings</button>";
+    html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Content</button>";
 
     html += "</div>";
 
     $('#' + Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID + ' .panel-body').html(html);
   }
 
+  // handle content archive or entity file upload
+
+  // when the selected file is changed, enable the button if there's a selected file
+  $('body').on('change', '#' + RESTORE_SETTINGS_FILE_ID, function() {
+    if ($(this).val()) {
+        $('#' + RESTORE_SETTINGS_UPLOAD_ID).attr('disabled', false);
+    }
+  });
+
+  // when the upload button is clicked, send the file to the DS
+  // and reload the page if restore was successful or
+  // show an error if not
+  $('body').on('click', '#' + RESTORE_SETTINGS_UPLOAD_ID, function(e){
+    e.preventDefault();
+
+    swal({
+      title: "Are you sure?",
+      text: "Your domain content will be replaced by the uploaded Content Archive or entity file",
+      type: "warning",
+      showCancelButton: true,
+      closeOnConfirm: false
+    },
+    function () {
+      var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
+
+      var fileFormData = new FormData();
+      fileFormData.append('restore-file', files[0]);
+
+      showSpinnerAlert("Restoring Content");
+
+      $.ajax({
+        url: '/content/upload',
+        type: 'POST',
+        cache: false,
+        processData: false,
+        contentType: false,
+        data: fileFormData
+      }).done(function(data, textStatus, jqXHR) {
+        swal.close();
+        showRestartModal();
+      }).fail(function(jqXHR, textStatus, errorThrown) {
+        showErrorMessage(
+          "Error",
+          "There was a problem restoring domain content.\n"
+          + "Please ensure that the content archive or entity file is valid and try again."
+        );
+      });
+    });
+  });
+
   var GENERATE_ARCHIVE_BUTTON_ID = 'generate-archive-button';
   var AUTOMATIC_ARCHIVES_TABLE_ID = 'automatic-archives-table';
   var AUTOMATIC_ARCHIVES_TBODY_ID = 'automatic-archives-tbody';
@@ -136,7 +186,7 @@ $(document).ready(function(){
         text: "You have pending changes to content settings that have not been saved. They will be lost if you leave the page to manage automatic content archive intervals.",
         type: "warning",
         showCancelButton: true,
-        confirmButtonText: "Leave and Lose Pending Changes",
+        confirmButtonText: "Proceed without Saving",
         closeOnConfirm: true
       },
       function () {
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 6b2d4e1316..d3b20d40bb 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -79,7 +79,7 @@ $(document).ready(function(){
   Settings.extraDomainGroupsAtEnd = [
     {
       html_id: 'settings_backup',
-      label: 'Settings Backup'
+      label: 'Settings Backup / Restore'
     }
   ]
 
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 1c6510298f..b73337ef2d 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1033,31 +1033,40 @@ $(document).ready(function(){
   $('body').on('click', '#' + RESTORE_SETTINGS_UPLOAD_ID, function(e){
     e.preventDefault();
 
-    var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
+    swal({
+      title: "Are you sure?",
+      text: "Your domain settings will be replaced by the uploaded settings",
+      type: "warning",
+      showCancelButton: true,
+      closeOnConfirm: false
+    },
+    function() {
+      var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
 
-    var fileFormData = new FormData();
-    fileFormData.append('restore-file', files[0]);
+      var fileFormData = new FormData();
+      fileFormData.append('restore-file', files[0]);
 
-    showSpinnerAlert("Restoring Settings");
+      showSpinnerAlert("Restoring Settings");
 
-    $.ajax({
-      url: '/settings/restore',
-      type: 'POST',
-      processData: false,
-      contentType: false,
-      dataType: 'json',
-      data: fileFormData
-    }).done(function(data, textStatus, jqXHR) {
-      swal.close();
-      showRestartModal();
-    }).fail(function(jqXHR, textStatus, errorThrown) {
-      showErrorMessage(
-        "Error",
-        "There was a problem restoring domain settings.\n"
-        + "Please ensure that your current domain settings are valid and try again."
-      );
+      $.ajax({
+        url: '/settings/restore',
+        type: 'POST',
+        processData: false,
+        contentType: false,
+        dataType: 'json',
+        data: fileFormData
+      }).done(function(data, textStatus, jqXHR) {
+        swal.close();
+        showRestartModal();
+      }).fail(function(jqXHR, textStatus, errorThrown) {
+        showErrorMessage(
+          "Error",
+          "There was a problem restoring domain settings.\n"
+          + "Please ensure that your current domain settings are valid and try again."
+        );
 
-      reloadSettings();
+        reloadSettings();
+      });
     });
   });
 
@@ -1079,7 +1088,7 @@ $(document).ready(function(){
     html += "<div class='form-group'>";
     html += "<label class='control-label'>Upload a Settings Configuration</label>";
     html += "<span class='help-block'>Upload a settings configuration to quickly configure this domain";
-    html += "<br/>Note: Your domain's settings will be replaced by the settings you upload</span>";
+    html += "<br/>Note: Your domain settings will be replaced by the settings you upload</span>";
 
     html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
     html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Domain Settings</button>";
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 8247e12de5..f3765f6868 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2256,12 +2256,32 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             QList<FormData> formData = connection->parseFormData();
 
             if (formData.size() > 0 && formData[0].second.size() > 0) {
-                // invoke our method to hand the new octree file off to the octree server
-                QMetaObject::invokeMethod(this, "handleOctreeFileReplacement",
-                                          Qt::QueuedConnection, Q_ARG(QByteArray, formData[0].second));
+                auto& firstFormData = formData[0];
+
+                // check the file extension to see what kind of file this is
+                // to match sure we handle this filetype for a content restore
+                auto dispositionValue = QString(firstFormData.first.value("Content-Disposition"));
+                auto formDataFilenameRegex = QRegExp("filename=\"(\\S+)\"");
+                auto matchIndex = formDataFilenameRegex.indexIn(dispositionValue);
+
+                QString uploadedFilename = "";
+                if (matchIndex != -1) {
+                    uploadedFilename = formDataFilenameRegex.cap(1);
+                }
+
+                if (uploadedFilename.endsWith(".json", Qt::CaseInsensitive)
+                    || uploadedFilename.endsWith(".json.gz", Qt::CaseInsensitive)) {
+                    // invoke our method to hand the new octree file off to the octree server
+                    QMetaObject::invokeMethod(this, "handleOctreeFileReplacement",
+                                              Qt::QueuedConnection, Q_ARG(QByteArray, formData[0].second));
+
+                    // respond with a 200 for success
+                    connection->respond(HTTPConnection::StatusCode200);
+                } else {
+                    // we don't have handling for this filetype, send back a 400 for failure
+                    connection->respond(HTTPConnection::StatusCode400);
+                }
 
-                // respond with a 200 for success
-                connection->respond(HTTPConnection::StatusCode200);
             } else {
                 // respond with a 400 for failure
                 connection->respond(HTTPConnection::StatusCode400);

From 2b39419795166233273eb6688621f66266ddd10d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 14 Feb 2018 17:42:49 -0800
Subject: [PATCH 341/569] keeping AYS DRY and hooking up restore/delete for
 content archives

---
 .../resources/web/content/js/content.js       | 165 +++++++++++++-----
 .../resources/web/js/domain-server.js         |  19 +-
 domain-server/resources/web/js/shared.js      |  11 ++
 .../resources/web/settings/js/settings.js     |  78 ++++-----
 4 files changed, 175 insertions(+), 98 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 4e2c27bf54..34af9262a2 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -7,7 +7,7 @@ $(document).ready(function(){
     // construct the HTML needed for the settings backup panel
     var html = "<div class='form-group'>";
 
-    html += "<span class='help-block'>Upload a Content Archive (.zip) or entity file (.json, .json.gz) to replace the content of this domain.";
+    html += "<span class='help-block'>Upload a content archive (.zip) or entity file (.json, .json.gz) to replace the content of this domain.";
     html += "<br/>Note: Your domain content will be replaced by the content you upload, but the existing backup files of your domain's content will not immediately be changed.</span>";
 
     html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
@@ -33,39 +33,36 @@ $(document).ready(function(){
   $('body').on('click', '#' + RESTORE_SETTINGS_UPLOAD_ID, function(e){
     e.preventDefault();
 
-    swal({
-      title: "Are you sure?",
-      text: "Your domain content will be replaced by the uploaded Content Archive or entity file",
-      type: "warning",
-      showCancelButton: true,
-      closeOnConfirm: false
-    },
-    function () {
-      var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
+    swalAreYouSure(
+      "Your domain content will be replaced by the uploaded Content Archive or entity file",
+      "Restore content",
+      function() {
+        var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
 
-      var fileFormData = new FormData();
-      fileFormData.append('restore-file', files[0]);
+        var fileFormData = new FormData();
+        fileFormData.append('restore-file', files[0]);
 
-      showSpinnerAlert("Restoring Content");
+        showSpinnerAlert("Restoring Content");
 
-      $.ajax({
-        url: '/content/upload',
-        type: 'POST',
-        cache: false,
-        processData: false,
-        contentType: false,
-        data: fileFormData
-      }).done(function(data, textStatus, jqXHR) {
-        swal.close();
-        showRestartModal();
-      }).fail(function(jqXHR, textStatus, errorThrown) {
-        showErrorMessage(
-          "Error",
-          "There was a problem restoring domain content.\n"
-          + "Please ensure that the content archive or entity file is valid and try again."
-        );
-      });
-    });
+        $.ajax({
+          url: '/content/upload',
+          type: 'POST',
+          cache: false,
+          processData: false,
+          contentType: false,
+          data: fileFormData
+        }).done(function(data, textStatus, jqXHR) {
+          swal.close();
+          showRestartModal();
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+          showErrorMessage(
+            "Error",
+            "There was a problem restoring domain content.\n"
+            + "Please ensure that the content archive or entity file is valid and try again."
+          );
+        });
+      }
+    );
   });
 
   var GENERATE_ARCHIVE_BUTTON_ID = 'generate-archive-button';
@@ -104,6 +101,10 @@ $(document).ready(function(){
     $('#' + Settings.CONTENT_ARCHIVES_PANEL_ID + ' .panel-body').html(html);
   }
 
+  var BACKUP_RESTORE_LINK_CLASS = 'restore-backup';
+  var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
+  var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
+
   function reloadLatestBackups() {
     // make a GET request to get backup information to populate the table
     $.get('/api/backups', function(data) {
@@ -117,12 +118,15 @@ $(document).ready(function(){
 
       // populate the backups tables with the backups
       function createBackupTableRow(backup) {
-        return "<tr><td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-dateformat='lll'>"
+        return "<tr data-backup-id='" + backup.id + "' data-backup-name='" + backup.name + "'>"
+          + "<td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-dateformat='lll'>"
           + moment(backup.createdAtMillis).format('lll')
           + "</td><td class='text-right'>"
           + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
-          + "<ul class='dropdown-menu dropdown-menu-right'><li><a class='update-server' href='#'>Restore from here</a></li><li class='divider'></li><li><a class='restart-server' href='#'>Download</a></li><li class='divider'></li><li><a class='' href='#'>Delete</a></li></ul></div>"
-          + "</td>";
+          + "<ul class='dropdown-menu dropdown-menu-right'>"
+          + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
+          + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>"
+          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='#'>Delete</a></li></ul></div></td>";
       }
 
       var automaticRows = "";
@@ -172,6 +176,79 @@ $(document).ready(function(){
     });
   }
 
+  // handle click in table to restore a given content backup
+  $('body').on('click', '.' + BACKUP_RESTORE_LINK_CLASS, function(e){
+    // stop the default behaviour
+    e.preventDefault();
+
+    // grab the name of this backup so we can show it in alerts
+    var backupName = $(this).closest('tr').attr('data-backup-name');
+
+    // grab the ID of this backup in case we need to send a POST
+    var backupID = $(this).closest('tr').attr('data-backup-id');
+
+    // make sure the user knows what is about to happen
+    swalAreYouSure(
+      "Your domain content will be replaced by the content archive " + backupName,
+      "Restore content",
+      function() {
+        // show a spinner while we send off our request
+        showSpinnerAlert("Restoring Content Archive " +  backupName);
+
+        // setup an AJAX POST to request content restore
+        $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
+          swal.close();
+          showRestartModal();
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+          showErrorMessage(
+            "Error",
+            "There was a problem restoring domain content.\n"
+            + "If the problem persists, the content archive may be corrupted."
+          );
+        });
+      }
+    )
+  });
+
+  // handle click in table to delete a given content backup
+  $('body').on('click', '.' + BACKUP_DELETE_LINK_CLASS, function(e){
+    // stop the default behaviour
+    e.preventDefault();
+
+    // grab the name of this backup so we can show it in alerts
+    var backupName = $(this).closest('tr').attr('data-backup-name');
+
+    // grab the ID of this backup in case we need to send the DELETE request
+    var backupID = $(this).closest('tr').attr('data-backup-id');
+
+    // make sure the user knows what is about to happen
+    swalAreYouSure(
+      "The content archive " + backupName + " will be deleted and will no longer be available for restore or download from this page.",
+      "Delete content archive",
+      function() {
+        // show a spinner while we send off our request
+        showSpinnerAlert("Deleting content archive " +  backupName);
+
+        // setup an AJAX DELETE to request content archive delete
+        $.ajax({
+          url: '/api/backups/' + backupID,
+          type: 'DELETE'
+        }).done(function(data, textStatus, jqXHR) {
+          swal.close();
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+          showErrorMessage(
+            "Error",
+            "There was an unexpected error deleting the content archive"
+          );
+        }).always(function(){
+          // reload the list of content archives in case we deleted a backup
+          // or it's no longer an available backup for some other reason
+          reloadContentArchives();
+        });
+      }
+    )
+  });
+
   // handle click on automatic content archive settings link
   $('body').on('click', '#' + AUTO_ARCHIVES_SETTINGS_LINK_ID, function(e) {
     if (Settings.pendingChanges > 0) {
@@ -181,18 +258,14 @@ $(document).ready(function(){
 
       var settingsLink = $(this).attr('href');
 
-      swal({
-        title: "Are you sure?",
-        text: "You have pending changes to content settings that have not been saved. They will be lost if you leave the page to manage automatic content archive intervals.",
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonText: "Proceed without Saving",
-        closeOnConfirm: true
-      },
-      function () {
-        // user wants to drop their changes, switch pages
-        window.location =  settingsLink;
-      });
+      swalAreYouSure(
+        "You have pending changes to content settings that have not been saved. They will be lost if you leave the page to manage automatic content archive intervals.",
+        "Proceed without Saving",
+        function() {
+          // user wants to drop their changes, switch pages
+          window.location =  settingsLink;
+        }
+      );
     }
   });
 
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index d3b20d40bb..2c12e2683a 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -39,16 +39,15 @@ $(document).ready(function(){
   }).parent().addClass('active');
 
   $('body').on('click', '#restart-server', function(e) {
-    swal( {
-      title: "Are you sure?",
-      text: "This will restart your domain server, causing your domain to be briefly offline.",
-      type: "warning",
-      html: true,
-      showCancelButton: true
-    }, function() {
-      $.get("/restart");
-      showRestartModal();
-    });
+    swalAreYouSure(
+      "This will restart your domain server, causing your domain to be briefly offline.",
+      "Restart",
+      function() {
+        swal.close();
+        $.get("/restart");
+        showRestartModal();
+      }
+    )
     return false;
   });
 
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 040d8959e7..84bba4de56 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -98,6 +98,17 @@ var DOMAIN_ID_TYPE_TEMP = 1;
 var DOMAIN_ID_TYPE_FULL = 2;
 var DOMAIN_ID_TYPE_UNKNOWN = 3;
 
+function swalAreYouSure(text, confirmButtonText, callback) {
+  swal({
+    title: "Are you sure?",
+    text: text,
+    type: "warning",
+    showCancelButton: true,
+    confirmButtonText: confirmButtonText,
+    closeOnConfirm: false
+  }, callback);
+}
+
 function domainIDIsSet() {
   if (typeof Settings.data.values.metaverse !== 'undefined' &&
     typeof Settings.data.values.metaverse.id !== 'undefined') {
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index b73337ef2d..e67ea43158 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -94,20 +94,17 @@ $(document).ready(function(){
       var password = formJSON["security"]["http_password"];
 
       if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) {
-        swal({
-          title: "Are you sure?",
-          text: "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?",
-          type: "warning",
-          showCancelButton: true,
-          confirmButtonColor: "#5cb85c",
-          confirmButtonText: "Yes!",
-          closeOnConfirm: true
-        },
-        function () {
+        swalAreYouSure(
+          "You have entered a blank password with a non-blank username. Are you sure you want to require a blank password?",
+          "Use blank password",
+          function() {
+            swal.close();
+            
             formJSON["security"]["http_password"] = "";
 
             postSettings(formJSON);
-        });
+          }
+        );
 
         return;
       }
@@ -1033,41 +1030,38 @@ $(document).ready(function(){
   $('body').on('click', '#' + RESTORE_SETTINGS_UPLOAD_ID, function(e){
     e.preventDefault();
 
-    swal({
-      title: "Are you sure?",
-      text: "Your domain settings will be replaced by the uploaded settings",
-      type: "warning",
-      showCancelButton: true,
-      closeOnConfirm: false
-    },
-    function() {
-      var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
+    swalAreYouSure(
+      "Your domain settings will be replaced by the uploaded settings",
+      "Restore settings",
+      function() {
+        var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
 
-      var fileFormData = new FormData();
-      fileFormData.append('restore-file', files[0]);
+        var fileFormData = new FormData();
+        fileFormData.append('restore-file', files[0]);
 
-      showSpinnerAlert("Restoring Settings");
+        showSpinnerAlert("Restoring Settings");
 
-      $.ajax({
-        url: '/settings/restore',
-        type: 'POST',
-        processData: false,
-        contentType: false,
-        dataType: 'json',
-        data: fileFormData
-      }).done(function(data, textStatus, jqXHR) {
-        swal.close();
-        showRestartModal();
-      }).fail(function(jqXHR, textStatus, errorThrown) {
-        showErrorMessage(
-          "Error",
-          "There was a problem restoring domain settings.\n"
-          + "Please ensure that your current domain settings are valid and try again."
-        );
+        $.ajax({
+          url: '/settings/restore',
+          type: 'POST',
+          processData: false,
+          contentType: false,
+          dataType: 'json',
+          data: fileFormData
+        }).done(function(data, textStatus, jqXHR) {
+          swal.close();
+          showRestartModal();
+        }).fail(function(jqXHR, textStatus, errorThrown) {
+          showErrorMessage(
+            "Error",
+            "There was a problem restoring domain settings.\n"
+            + "Please ensure that your current domain settings are valid and try again."
+          );
 
-        reloadSettings();
-      });
-    });
+          reloadSettings();
+        });
+      }
+    );
   });
 
   $('body').on('change', '#' + RESTORE_SETTINGS_FILE_ID, function() {

From 41b0bb8c581ae249b2e3dbb4a915f8912e270fed Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 10:06:36 -0800
Subject: [PATCH 342/569] connect download link from content archive tables

---
 domain-server/resources/web/content/js/content.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 34af9262a2..12a6d4b734 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -126,7 +126,7 @@ $(document).ready(function(){
           + "<ul class='dropdown-menu dropdown-menu-right'>"
           + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
           + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>"
-          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='#'>Delete</a></li></ul></div></td>";
+          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backups.id + "' target='_blank'>Delete</a></li></ul></div></td>";
       }
 
       var automaticRows = "";

From 910f3425f8bf3fa080b68dae1e0b5786e6564517 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 10:57:07 -0800
Subject: [PATCH 343/569] fix latest backup refreshing with no caching

---
 domain-server/resources/web/content/js/content.js | 14 +++++++++-----
 domain-server/src/DomainServer.cpp                |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 12a6d4b734..1e5b6ac131 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -107,7 +107,11 @@ $(document).ready(function(){
 
   function reloadLatestBackups() {
     // make a GET request to get backup information to populate the table
-    $.get('/api/backups', function(data) {
+    $.ajax({
+      url: '/api/backups',
+      cache: false
+    }).done(function(data) {
+
       // split the returned data into manual and automatic manual backups
       var splitBackups = _.partition(data.backups, function(value, index) {
         return value.isManualBackup;
@@ -126,7 +130,7 @@ $(document).ready(function(){
           + "<ul class='dropdown-menu dropdown-menu-right'>"
           + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
           + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>"
-          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backups.id + "' target='_blank'>Delete</a></li></ul></div></td>";
+          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backup.id + "' target='_blank'>Delete</a></li></ul></div></td>";
       }
 
       var automaticRows = "";
@@ -243,7 +247,7 @@ $(document).ready(function(){
         }).always(function(){
           // reload the list of content archives in case we deleted a backup
           // or it's no longer an available backup for some other reason
-          reloadContentArchives();
+          reloadLatestBackups();
         });
       }
     )
@@ -295,14 +299,14 @@ $(document).ready(function(){
       // post the provided archive name to ask the server to kick off a manual backup
       $.ajax({
         type: 'POST',
-        url: '/api/backup',
+        url: '/api/backups',
         data: {
           'name': inputValue
         }
       }).done(function(data) {
         // since we successfully setup a new content archive, reload the table of archives
         // which should show that this archive is pending creation
-        reloadContentArchives();
+        reloadLatestBackups();
       }).fail(function(jqXHR, textStatus, errorThrown) {
 
       });
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index f3765f6868..c23d17ed95 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1941,7 +1941,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     const QString URI_ASSIGNMENT = "/assignment";
     const QString URI_NODES = "/nodes";
     const QString URI_SETTINGS = "/settings";
-    const QString URI_ENTITY_FILE_UPLOAD = "/content/upload";
+    const QString URI_CONTENT_UPLOAD = "/content/upload";
     const QString URI_RESTART = "/restart";
     const QString URI_API_PLACES = "/api/places";
     const QString URI_API_DOMAINS = "/api/domains";
@@ -2251,7 +2251,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             connection->respond(HTTPConnection::StatusCode200);
 
             return true;
-        } else if (url.path() == URI_ENTITY_FILE_UPLOAD) {
+        } else if (url.path() == URI_CONTENT_UPLOAD) {
             // this is an entity file upload, ask the HTTPConnection to parse the data
             QList<FormData> formData = connection->parseFormData();
 

From 6f8381d3787038175b3dff25d345675efeed9657 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 10:59:48 -0800
Subject: [PATCH 344/569] use automatic content archives group const

---
 domain-server/src/DomainServerSettingsManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index a50cde0807..a3f99facea 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -427,7 +427,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
             // migrate entity server rolling backup intervals to new location for automatic content archive intervals
 
             const QString ENTITY_SERVER_BACKUPS_KEYPATH = "entity_server_settings.backups";
-            const QString AUTO_CONTENT_ARCHIVES_RULES_KEYPATH = "automatic_content_archives.backup_rules";
+            const QString AUTO_CONTENT_ARCHIVES_RULES_KEYPATH = AUTOMATIC_CONTENT_ARCHIVES_GROUP + ".backup_rules";
 
             QVariant* previousBackupsVariant = _configMap.valueForKeyPath(ENTITY_SERVER_BACKUPS_KEYPATH);
 

From 2020ce5907e05338ec8f7e9fbda3a457dd198df0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 11:20:02 -0800
Subject: [PATCH 345/569] add API to recover from content archive

---
 .../src/DomainContentBackupManager.cpp        | 54 ++++++++++++++-----
 .../src/DomainContentBackupManager.h          |  3 ++
 domain-server/src/DomainServer.cpp            | 17 +++++-
 3 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 345faffec4..379aa640f8 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -18,6 +18,7 @@
 #include <fstream>
 #include <time.h>
 
+#include <QBuffer>
 #include <QDateTime>
 #include <QDebug>
 #include <QDir>
@@ -256,6 +257,22 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
     });
 }
 
+bool DomainContentBackupManager::recoverFromBackupZip(QuaZip& zip, const QString& backupName) {
+    if (!zip.open(QuaZip::Mode::mdUnzip)) {
+        qWarning() << "Failed to unzip file: " << zip.getZipName();
+        return false;
+    } else {
+        _isRecovering = true;
+
+        for (auto& handler : _backupHandlers) {
+            handler->recoverBackup(zip);
+        }
+
+        qDebug() << "Successfully started recovering from " << zip.getZipName();
+        return true;
+    }
+}
+
 void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise, const QString& backupName) {
     if (_isRecovering) {
         promise->resolve({
@@ -277,19 +294,9 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     QFile backupFile { backupDir.filePath(backupName) };
     if (backupFile.open(QIODevice::ReadOnly)) {
         QuaZip zip { &backupFile };
-        if (!zip.open(QuaZip::Mode::mdUnzip)) {
-            qWarning() << "Failed to unzip file: " << backupName;
-            success = false;
-        } else {
-            _isRecovering = true;
-            _recoveryFilename = backupName;
-            for (auto& handler : _backupHandlers) {
-                handler->recoverBackup(zip);
-            }
-            
-            qDebug() << "Successfully started recovering from " << backupName;
-            success = true;
-        }
+
+        success = recoverFromBackupZip(zip, backupName);
+
         backupFile.close();
     } else {
         success = false;
@@ -301,7 +308,28 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     });
 }
 
+void DomainContentBackupManager::recoverFromUploadedBackup(MiniPromise::Promise promise, QByteArray uploadedBackup) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "recoverFromUploadedBackup", Q_ARG(MiniPromise::Promise, promise),
+                                  Q_ARG(QByteArray, uploadedBackup));
+        return;
+    }
+
+    qDebug() << "Recovering from uploaded content archive";
+
+    // create a buffer and then a QuaZip from that buffer
+    QBuffer uploadedBackupBuffer { &uploadedBackup };
+    QuaZip uploadedZip { &uploadedBackupBuffer };
+
+    bool success = recoverFromBackupZip(uploadedZip, MANUAL_BACKUP_PREFIX + "uploaded.zip");
+
+    promise->resolve({
+        { "success", success }
+    });
+}
+
 std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
+
     QDir backupDir { _backupDirectory };
     auto matchingFiles =
             backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" },
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index f1aa4acab2..d4b1f60b87 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -63,6 +63,7 @@ public slots:
     void getAllBackupsAndStatus(MiniPromise::Promise promise);
     void createManualBackup(MiniPromise::Promise promise, const QString& name);
     void recoverFromBackup(MiniPromise::Promise promise, const QString& backupName);
+    void recoverFromUploadedBackup(MiniPromise::Promise promise, QByteArray uploadedBackup);
     void deleteBackup(MiniPromise::Promise promise, const QString& backupName);
     void consolidateBackup(MiniPromise::Promise promise, QString fileName);
 
@@ -85,6 +86,8 @@ protected:
 
     std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
 
+    bool recoverFromBackupZip(QuaZip& backupZip, const QString& backupName);
+
 private:
     const QString _backupDirectory;
     std::vector<BackupHandlerPointer> _backupHandlers;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index c23d17ed95..7fe1d1a0ab 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2273,10 +2273,25 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                     || uploadedFilename.endsWith(".json.gz", Qt::CaseInsensitive)) {
                     // invoke our method to hand the new octree file off to the octree server
                     QMetaObject::invokeMethod(this, "handleOctreeFileReplacement",
-                                              Qt::QueuedConnection, Q_ARG(QByteArray, formData[0].second));
+                                              Qt::QueuedConnection, Q_ARG(QByteArray, firstFormData.second));
 
                     // respond with a 200 for success
                     connection->respond(HTTPConnection::StatusCode200);
+                } else if (uploadedFilename.endsWith(".zip", Qt::CaseInsensitive)) {
+                    auto deferred = makePromise("recoverFromUploadedBackup");
+
+                    deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                        QJsonObject rootJSON;
+                        auto success = result["success"].toBool();
+                        rootJSON["success"] = success;
+                        QJsonDocument docJSON(rootJSON);
+                        connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                                            JSON_MIME_TYPE.toUtf8());
+                    });
+
+                    _contentManager->recoverFromUploadedBackup(deferred, firstFormData.second);
+
+                    return true;
                 } else {
                     // we don't have handling for this filetype, send back a 400 for failure
                     connection->respond(HTTPConnection::StatusCode400);

From de75fe8e9f04618b0e3e9febbc6c2c6481d37e18 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 15:34:03 -0800
Subject: [PATCH 346/569] CR fix for typo in comment

---
 domain-server/src/DomainServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 7fe1d1a0ab..7cd6cd34fe 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2259,7 +2259,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 auto& firstFormData = formData[0];
 
                 // check the file extension to see what kind of file this is
-                // to match sure we handle this filetype for a content restore
+                // to make sure we handle this filetype for a content restore
                 auto dispositionValue = QString(firstFormData.first.value("Content-Disposition"));
                 auto formDataFilenameRegex = QRegExp("filename=\"(\\S+)\"");
                 auto matchIndex = formDataFilenameRegex.indexIn(dispositionValue);

From 40078450dd855cb4dc8ea371ee9bcf5a0d0cab90 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 11:20:02 -0800
Subject: [PATCH 347/569] add API to recover from content archive

---
 domain-server/src/DomainContentBackupManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 379aa640f8..40a2a55486 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -309,6 +309,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
 }
 
 void DomainContentBackupManager::recoverFromUploadedBackup(MiniPromise::Promise promise, QByteArray uploadedBackup) {
+
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "recoverFromUploadedBackup", Q_ARG(MiniPromise::Promise, promise),
                                   Q_ARG(QByteArray, uploadedBackup));

From cb747c9cdfc394d53b12ba91a6041cd96f807d10 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 15 Feb 2018 17:32:53 -0800
Subject: [PATCH 348/569] refresh backups for availability and restore status

---
 .../resources/web/content/js/content.js       | 89 +++++++++++++++----
 domain-server/resources/web/css/style.css     |  5 ++
 .../resources/web/js/domain-server.js         |  2 +-
 3 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 1e5b6ac131..69a8c93f82 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -2,10 +2,19 @@ $(document).ready(function(){
 
   var RESTORE_SETTINGS_UPLOAD_ID = 'restore-settings-button';
   var RESTORE_SETTINGS_FILE_ID = 'restore-settings-file';
+  var UPLOAD_CONTENT_ALLOWED_DIV_ID = 'upload-content-allowed';
+  var UPLOAD_CONTENT_RECOVERING_DIV_ID = 'upload-content-recovering';
+
+  function progressBarHTML(extraClass, label) {
+    var html = "<div class='progress'>";
+    html += "<div class='" + extraClass + " progress-bar progress-bar-success progress-bar-striped active' role='progressbar' aria-valuemin='0' aria-valuemax='100'>";
+    html += label + "<span class='sr-only'></span></div></div>";
+    return html;
+  }
 
   function setupBackupUpload() {
     // construct the HTML needed for the settings backup panel
-    var html = "<div class='form-group'>";
+    var html = "<div class='form-group'><div id='" + UPLOAD_CONTENT_ALLOWED_DIV_ID + "'>";
 
     html += "<span class='help-block'>Upload a content archive (.zip) or entity file (.json, .json.gz) to replace the content of this domain.";
     html += "<br/>Note: Your domain content will be replaced by the content you upload, but the existing backup files of your domain's content will not immediately be changed.</span>";
@@ -13,7 +22,10 @@ $(document).ready(function(){
     html += "<input id='restore-settings-file' name='restore-settings' type='file'>";
     html += "<button type='button' id='" + RESTORE_SETTINGS_UPLOAD_ID + "' disabled='true' class='btn btn-primary'>Upload Content</button>";
 
-    html += "</div>";
+    html += "</div><div id='" + UPLOAD_CONTENT_RECOVERING_DIV_ID + "'>";
+    html += "<span class='help-block'>Restore in progress</span>";
+    html += progressBarHTML('recovery', 'Restoring');
+    html += "</div></div>";
 
     $('#' + Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID + ' .panel-body').html(html);
   }
@@ -71,6 +83,7 @@ $(document).ready(function(){
   var MANUAL_ARCHIVES_TABLE_ID = 'manual-archives-table';
   var MANUAL_ARCHIVES_TBODY_ID = 'manual-archives-tbody';
   var AUTO_ARCHIVES_SETTINGS_LINK_ID = 'auto-archives-settings-link';
+  var ACTION_MENU_CLASS = 'action-menu';
 
   var automaticBackups = [];
   var manualBackups = [];
@@ -84,7 +97,9 @@ $(document).ready(function(){
     html += "</div>";
     html += "<table class='table sortable' id='" + AUTOMATIC_ARCHIVES_TABLE_ID + "'>";
 
-    var backups_table_head = "<thead><tr class='gray-tr'><th>Archive Name</th><th data-defaultsort='desc'>Archive Date</th><th class='text-right' data-defaultsort='disabled'>Actions</th></tr></thead>";
+    var backups_table_head = "<thead><tr class='gray-tr'><th>Archive Name</th><th data-defaultsort='desc'>Archive Date</th>"
+      + "<th data-defaultsort='disabled'></th><th class='" + ACTION_MENU_CLASS + "' data-defaultsort='disabled'>Actions</th>"
+      + "</tr></thead>";
 
     html += backups_table_head;
     html += "<tbody id='" + AUTOMATIC_ARCHIVES_TBODY_ID + "'></tbody></table>";
@@ -105,7 +120,7 @@ $(document).ready(function(){
   var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
   var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
 
-  function reloadLatestBackups() {
+  function reloadBackupInformation() {
     // make a GET request to get backup information to populate the table
     $.ajax({
       url: '/api/backups',
@@ -125,7 +140,7 @@ $(document).ready(function(){
         return "<tr data-backup-id='" + backup.id + "' data-backup-name='" + backup.name + "'>"
           + "<td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-dateformat='lll'>"
           + moment(backup.createdAtMillis).format('lll')
-          + "</td><td class='text-right'>"
+          + "</td><td class='backup-status'></td><td class='" + ACTION_MENU_CLASS + "'>"
           + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
           + "<ul class='dropdown-menu dropdown-menu-right'>"
           + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
@@ -133,27 +148,64 @@ $(document).ready(function(){
           + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backup.id + "' target='_blank'>Delete</a></li></ul></div></td>";
       }
 
+      function updateProgressBars($progressBar, value) {
+        $progressBar.attr('aria-valuenow', value).attr('style', 'width: ' + value + '%');
+        $progressBar.find('.sr-only').html(data.status.recoveryProgress + "% Complete");
+      }
+
+      function updateOrAddTableRow(backup, tableBodyID) {
+        // check for a backup with this ID
+        var $backupRow = $("tr[data-backup-id='" + backup.id + "']");
+
+        if ($backupRow.length == 0) {
+          // create a new row and then add it to the table
+          $backupRow = $(createBackupTableRow(backup));
+          $('#' + tableBodyID).append($backupRow);
+        }
+
+        // update the row status column depending on if it is available or recovering
+        if (!backup.isAvailable) {
+          // add a progress bar to the status row for availability
+          $backupRow.find('td.backup-status').html(progressBarHTML('availability', 'Archiving'));
+
+          // set the value of the progress bar based on availability progress
+          updateProgressBars($backupRow.find('.progress-bar'), backup.availabilityProgress);
+        } else if (backup.id == data.status.recoveringBackupId) {
+          // add a progress bar to the status row for recovery
+          $backupRow.find('td.backup-status').html(progressBarHTML('recovery', 'Restoring'));
+        } else {
+          // no special status for this row, use an empty status column
+          $backupRow.find('td.backup-status').html('');
+        }
+
+        $backupRow.find('td.' + ACTION_MENU_CLASS + ' .dropdown').toggle(backup.isAvailable);
+      }
+
       var automaticRows = "";
 
       if (automaticBackups.length > 0) {
         for (var backupIndex in automaticBackups) {
-          // create a table row for this backup and add it to the rows we'll put in the table body
-          automaticRows += createBackupTableRow(automaticBackups[backupIndex]);
+          updateOrAddTableRow(automaticBackups[backupIndex], AUTOMATIC_ARCHIVES_TBODY_ID)
         }
       }
 
-      $('#' + AUTOMATIC_ARCHIVES_TBODY_ID).html(automaticRows);
-
-      var manualRows = "";
-
       if (manualBackups.length > 0) {
         for (var backupIndex in manualBackups) {
-          // create a table row for this backup and add it to the rows we'll put in the table body
-          manualRows += createBackupTableRow(manualBackups[backupIndex]);
+          updateOrAddTableRow(manualBackups[backupIndex], MANUAL_ARCHIVES_TBODY_ID)
         }
       }
 
-      $('#' + MANUAL_ARCHIVES_TBODY_ID).html(manualRows);
+      // check if the restore action on all rows should be enabled or disabled
+      $('.' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', data.status.isRecovering);
+
+      // hide or show the manual content upload file and button depending on our recovering status
+      $('#' + UPLOAD_CONTENT_ALLOWED_DIV_ID).toggle(!data.status.isRecovering);
+      $('#' + UPLOAD_CONTENT_RECOVERING_DIV_ID).toggle(data.status.isRecovering);
+
+      // update the progress bars for current restore status
+      if (data.status.isRecovering) {
+        updateProgressBars($('.recovery.progress-bar'), data.status.recoveryProgress);
+      }
 
       // tell bootstrap sortable to update for the new rows
       $.bootstrapSortable({ applyLast: true });
@@ -247,7 +299,7 @@ $(document).ready(function(){
         }).always(function(){
           // reload the list of content archives in case we deleted a backup
           // or it's no longer an available backup for some other reason
-          reloadLatestBackups();
+          reloadBackupInformation();
         });
       }
     )
@@ -306,7 +358,7 @@ $(document).ready(function(){
       }).done(function(data) {
         // since we successfully setup a new content archive, reload the table of archives
         // which should show that this archive is pending creation
-        reloadLatestBackups();
+        reloadBackupInformation();
       }).fail(function(jqXHR, textStatus, errorThrown) {
 
       });
@@ -322,6 +374,9 @@ $(document).ready(function(){
     setupContentArchives();
 
     // load the latest backups immediately
-    reloadLatestBackups();
+    reloadBackupInformation();
+
+    // setup a timer to reload them every 5 seconds
+    setTimeout(reloadBackupInformation(), 5000);
   };
 });
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 2bcc870ecf..62f442584e 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -466,6 +466,11 @@ tr.gray-tr {
   background-color: #f5f5f5;
 }
 
+table .action-menu {
+  text-align: right;
+  width: 90px;
+}
+
 .dropdown-toggle span.glyphicon-option-vertical {
   font-size: 110%;
   cursor: pointer;
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 2c12e2683a..ed9559b6e9 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -62,7 +62,7 @@ $(document).ready(function(){
     },
     1: {
       html_id: Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID,
-      label: 'Upload Content'
+      label: 'Upload Content Archive'
     }
   };
 

From faacd986b3924ccc092801a58e79b63f8fe9563f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 10:37:15 -0800
Subject: [PATCH 349/569] remove deleted backups from content archives tables

---
 .../resources/web/content/js/content.js       | 46 +++++++++++++------
 .../src/DomainServerSettingsManager.cpp       |  3 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 69a8c93f82..5c2e134102 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -78,6 +78,8 @@ $(document).ready(function(){
   });
 
   var GENERATE_ARCHIVE_BUTTON_ID = 'generate-archive-button';
+  var CONTENT_ARCHIVES_NORMAL_ID = 'content-archives-success';
+  var CONTENT_ARCHIVES_ERROR_ID = 'content-archives-error';
   var AUTOMATIC_ARCHIVES_TABLE_ID = 'automatic-archives-table';
   var AUTOMATIC_ARCHIVES_TBODY_ID = 'automatic-archives-tbody';
   var MANUAL_ARCHIVES_TABLE_ID = 'manual-archives-table';
@@ -90,10 +92,10 @@ $(document).ready(function(){
 
   function setupContentArchives() {
     // construct the HTML needed for the content archives panel
-    var html = "<div class='form-group'>";
+    var html = "<div id='" + CONTENT_ARCHIVES_NORMAL_ID + "'><div class='form-group'>";
     html += "<label class='control-label'>Automatic Content Archives</label>";
     html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your domain content and settings backups. "
-    html += "<a href='/settings/#automatic_content_archives' id='" + AUTO_ARCHIVES_SETTINGS_LINK_ID + "'>Click here to manage automatic content archive intervals.</a>";
+    html += "<a href='/settings/#automatic_content_archives' id='" + AUTO_ARCHIVES_SETTINGS_LINK_ID + "'>Click here to manage automatic content archive intervals.</a></span>";
     html += "</div>";
     html += "<table class='table sortable' id='" + AUTOMATIC_ARCHIVES_TABLE_ID + "'>";
 
@@ -110,7 +112,11 @@ $(document).ready(function(){
     html += "</div>";
     html += "<table class='table sortable' id='" + MANUAL_ARCHIVES_TABLE_ID + "'>";
     html += backups_table_head;
-    html += "<tbody id='" + MANUAL_ARCHIVES_TBODY_ID + "'></tbody></table>";
+    html += "<tbody id='" + MANUAL_ARCHIVES_TBODY_ID + "'></tbody></table></div>";
+
+    html += "<div class='form-group' id='" + CONTENT_ARCHIVES_ERROR_ID + "' style='display:none;'>"
+      + "<span class='help-block'>There was a problem loading your list of automatic and manual content archives. "
+      + "Please reload the page to try again.</span></div>";
 
     // put the base HTML in the content archives panel
     $('#' + Settings.CONTENT_ARCHIVES_PANEL_ID + ' .panel-body').html(html);
@@ -119,7 +125,8 @@ $(document).ready(function(){
   var BACKUP_RESTORE_LINK_CLASS = 'restore-backup';
   var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
   var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
-
+  var ACTIVE_BACKUP_ROW_CLASS = 'active-backup';
+  
   function reloadBackupInformation() {
     // make a GET request to get backup information to populate the table
     $.ajax({
@@ -153,6 +160,10 @@ $(document).ready(function(){
         $progressBar.find('.sr-only').html(data.status.recoveryProgress + "% Complete");
       }
 
+      // before we add any new rows and update existing ones
+      // remove our flag for active rows
+      $('.' + ACTIVE_BACKUP_ROW_CLASS).removeClass(ACTIVE_BACKUP_ROW_CLASS);
+
       function updateOrAddTableRow(backup, tableBodyID) {
         // check for a backup with this ID
         var $backupRow = $("tr[data-backup-id='" + backup.id + "']");
@@ -169,7 +180,7 @@ $(document).ready(function(){
           $backupRow.find('td.backup-status').html(progressBarHTML('availability', 'Archiving'));
 
           // set the value of the progress bar based on availability progress
-          updateProgressBars($backupRow.find('.progress-bar'), backup.availabilityProgress);
+          updateProgressBars($backupRow.find('.progress-bar'), backup.availabilityProgress * 100);
         } else if (backup.id == data.status.recoveringBackupId) {
           // add a progress bar to the status row for recovery
           $backupRow.find('td.backup-status').html(progressBarHTML('recovery', 'Restoring'));
@@ -179,22 +190,29 @@ $(document).ready(function(){
         }
 
         $backupRow.find('td.' + ACTION_MENU_CLASS + ' .dropdown').toggle(backup.isAvailable);
+
+        $backupRow.addClass(ACTIVE_BACKUP_ROW_CLASS);
       }
 
       var automaticRows = "";
 
       if (automaticBackups.length > 0) {
         for (var backupIndex in automaticBackups) {
-          updateOrAddTableRow(automaticBackups[backupIndex], AUTOMATIC_ARCHIVES_TBODY_ID)
+          updateOrAddTableRow(automaticBackups[backupIndex], AUTOMATIC_ARCHIVES_TBODY_ID);
+
         }
       }
 
       if (manualBackups.length > 0) {
         for (var backupIndex in manualBackups) {
-          updateOrAddTableRow(manualBackups[backupIndex], MANUAL_ARCHIVES_TBODY_ID)
+          updateOrAddTableRow(manualBackups[backupIndex], MANUAL_ARCHIVES_TBODY_ID);
         }
       }
 
+      // at this point, any rows that no longer have the ACTIVE_BACKUP_ROW_CLASS
+      // are deleted backups, so we remove them from the table
+      $('tbody tr:not(.' + ACTIVE_BACKUP_ROW_CLASS + ')').remove();
+
       // check if the restore action on all rows should be enabled or disabled
       $('.' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', data.status.isRecovering);
 
@@ -204,12 +222,15 @@ $(document).ready(function(){
 
       // update the progress bars for current restore status
       if (data.status.isRecovering) {
-        updateProgressBars($('.recovery.progress-bar'), data.status.recoveryProgress);
+        updateProgressBars($('.recovery.progress-bar'), data.status.recoveryProgress * 100);
       }
 
       // tell bootstrap sortable to update for the new rows
       $.bootstrapSortable({ applyLast: true });
 
+      $('#' + CONTENT_ARCHIVES_NORMAL_ID).toggle(true);
+      $('#' + CONTENT_ARCHIVES_ERROR_ID).toggle(false);
+
     }).fail(function(){
       // we've hit the very rare case where we couldn't load the list of backups from the domain server
 
@@ -219,11 +240,8 @@ $(document).ready(function(){
 
       // replace the content archives panel with a simple error message
       // stating that the user should reload the page
-      $('#' + Settings.CONTENT_ARCHIVES_PANEL_ID + ' .panel-body').html(
-        "<div class='form-group'>" +
-        "<span class='help-block'>There was a problem loading your list of automatic and manual content archives. Please reload the page to try again.</span>" +
-        "</div>"
-      );
+      $('#' + CONTENT_ARCHIVES_NORMAL_ID).toggle(false);
+      $('#' + CONTENT_ARCHIVES_ERROR_ID).toggle(true);
 
     }).always(function(){
       // toggle showing or hiding the tables depending on if they have entries
@@ -377,6 +395,6 @@ $(document).ready(function(){
     reloadBackupInformation();
 
     // setup a timer to reload them every 5 seconds
-    setTimeout(reloadBackupInformation(), 5000);
+    setInterval(reloadBackupInformation, 5000);
   };
 });
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index a3f99facea..cd7155d9da 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1356,7 +1356,7 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
 
         BLOCKING_INVOKE_METHOD(this, "settingsResponseObjectForType",
                                Q_RETURN_ARG(QJsonObject, responseObject),
-                               Q_ARG(const QString&, typeValue),
+                               Q_ARG(QString, typeValue),
                                Q_ARG(bool, isAuthenticated),
                                Q_ARG(bool, includeDomainSettings),
                                Q_ARG(bool, includeContentSettings),
@@ -1374,6 +1374,7 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
 
         // only enumerate the requested settings type (domain setting or content setting)
         QJsonArray* filteredDescriptionArray = &_descriptionArray;
+
         if (includeDomainSettings && !includeContentSettings) {
             filteredDescriptionArray = &_domainSettingsDescription;
         } else if (includeContentSettings && !includeDomainSettings) {

From 5dec3aba505a2ab8c3c210f19bb2441b457b1f73 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 10:49:57 -0800
Subject: [PATCH 350/569] fix download link and restore behaviour with pending

---
 domain-server/resources/web/content/js/content.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 5c2e134102..717f149760 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -126,7 +126,7 @@ $(document).ready(function(){
   var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
   var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
   var ACTIVE_BACKUP_ROW_CLASS = 'active-backup';
-  
+
   function reloadBackupInformation() {
     // make a GET request to get backup information to populate the table
     $.ajax({
@@ -151,8 +151,8 @@ $(document).ready(function(){
           + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
           + "<ul class='dropdown-menu dropdown-menu-right'>"
           + "<li><a class='" + BACKUP_RESTORE_LINK_CLASS + "' href='#'>Restore from here</a></li><li class='divider'></li>"
-          + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='#'>Download</a></li><li class='divider'></li>"
-          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='/api/backups/" + backup.id + "' target='_blank'>Delete</a></li></ul></div></td>";
+          + "<li><a class='" + BACKUP_DOWNLOAD_LINK_CLASS + "' href='/api/backups/" + backup.id + "'>Download</a></li><li class='divider'></li>"
+          + "<li><a class='" + BACKUP_DELETE_LINK_CLASS + "' href='#' target='_blank'>Delete</a></li></ul></div></td>";
       }
 
       function updateProgressBars($progressBar, value) {
@@ -267,12 +267,11 @@ $(document).ready(function(){
       "Restore content",
       function() {
         // show a spinner while we send off our request
-        showSpinnerAlert("Restoring Content Archive " +  backupName);
+        showSpinnerAlert("Starting restore of " +  backupName);
 
         // setup an AJAX POST to request content restore
         $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
           swal.close();
-          showRestartModal();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
             "Error",

From 494f93304b9eb84c5815e5e9a50b1c0dd57d421e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 10:58:32 -0800
Subject: [PATCH 351/569] take down AssetClient after content manager

---
 domain-server/src/DomainServer.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 7cd6cd34fe..584cbe3513 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -380,11 +380,6 @@ void DomainServer::parseCommandLine() {
 DomainServer::~DomainServer() {
     qInfo() << "Domain Server is shutting down.";
 
-    // cleanup the AssetClient thread
-    DependencyManager::destroy<AssetClient>();
-    _assetClientThread.quit();
-    _assetClientThread.wait();
-
     // destroy the LimitedNodeList before the DomainServer QCoreApplication is down
     DependencyManager::destroy<LimitedNodeList>();
 
@@ -392,6 +387,11 @@ DomainServer::~DomainServer() {
         _contentManager->aboutToFinish();
         _contentManager->terminate();
     }
+
+    // cleanup the AssetClient thread
+    DependencyManager::destroy<AssetClient>();
+    _assetClientThread.quit();
+    _assetClientThread.wait();
 }
 
 void DomainServer::queuedQuit(QString quitMessage, int exitCode) {

From 441b55301f8637fa86f6c297266e4cd250f66252 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 11:01:22 -0800
Subject: [PATCH 352/569] cleanup LNL last during DS shutdown

---
 domain-server/src/DomainServer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 584cbe3513..5b8d253110 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -380,9 +380,6 @@ void DomainServer::parseCommandLine() {
 DomainServer::~DomainServer() {
     qInfo() << "Domain Server is shutting down.";
 
-    // destroy the LimitedNodeList before the DomainServer QCoreApplication is down
-    DependencyManager::destroy<LimitedNodeList>();
-
     if (_contentManager) {
         _contentManager->aboutToFinish();
         _contentManager->terminate();
@@ -392,6 +389,9 @@ DomainServer::~DomainServer() {
     DependencyManager::destroy<AssetClient>();
     _assetClientThread.quit();
     _assetClientThread.wait();
+
+    // destroy the LimitedNodeList before the DomainServer QCoreApplication is down
+    DependencyManager::destroy<LimitedNodeList>();
 }
 
 void DomainServer::queuedQuit(QString quitMessage, int exitCode) {

From 8e621a95a3c9abb5a0c4d948d60389f3b80d2533 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 11:04:58 -0800
Subject: [PATCH 353/569] fix typo in debug for writing new entities

---
 domain-server/src/DomainServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5b8d253110..81dcf65be5 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1761,7 +1761,7 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
         f.write(data);
         OctreeUtils::RawOctreeData octreeData;
         if (OctreeUtils::readOctreeDataInfoFromData(data, &octreeData)) {
-            qCDebug(domain_server) << "Wrote new entiteis file" << octreeData.id << octreeData.version;
+            qCDebug(domain_server) << "Wrote new entities file" << octreeData.id << octreeData.version;
         } else {
             qCDebug(domain_server) << "Failed to read new octree data info";
         }

From d9f2e1986fa1d5a16c249693605609614449e237 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 11:11:54 -0800
Subject: [PATCH 354/569] set DomainContentBackupManager object name so it
 appears on thread

---
 domain-server/src/DomainContentBackupManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 40a2a55486..f6c6e7a7ba 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -57,6 +57,8 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
     _persistInterval(persistInterval),
     _lastCheck(usecTimestampNow())
 {
+    setObjectName("DomainContentBackupManager");
+    
     // Make sure the backup directory exists.
     QDir(_backupDirectory).mkpath(".");
 

From 1c053730eb997c5d0f1b037c882c9ab9bbae669d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 14:09:00 -0800
Subject: [PATCH 355/569] make DomainServerSettingsManager thread-safe for use
 in content backup

---
 .../src/DomainContentBackupManager.cpp        |   2 +-
 domain-server/src/DomainGatekeeper.cpp        |  15 +-
 domain-server/src/DomainMetadata.cpp          |  17 +-
 domain-server/src/DomainServer.cpp            | 150 ++++++++----------
 .../src/DomainServerSettingsManager.cpp       |  95 +++++------
 .../src/DomainServerSettingsManager.h         |  26 +--
 6 files changed, 153 insertions(+), 152 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index f6c6e7a7ba..0bef6bb891 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -58,7 +58,7 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
     _lastCheck(usecTimestampNow())
 {
     setObjectName("DomainContentBackupManager");
-    
+
     // Make sure the backup directory exists.
     QDir(_backupDirectory).mkpath(".");
 
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index 3aab7b4563..e697bbdda1 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -435,10 +435,11 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
     if (!userPerms.can(NodePermissions::Permission::canConnectPastMaxCapacity) && !isWithinMaxCapacity()) {
         // we can't allow this user to connect because we are at max capacity
         QString redirectOnMaxCapacity;
-        const QVariant* redirectOnMaxCapacityVariant =
-            valueForKeyPath(_server->_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION);
-        if (redirectOnMaxCapacityVariant && redirectOnMaxCapacityVariant->canConvert<QString>()) {
-            redirectOnMaxCapacity = redirectOnMaxCapacityVariant->toString();
+
+        QVariant redirectOnMaxCapacityVariant =
+            _server->_settingsManager.valueOrDefaultValueForKeyPath(MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION);
+        if (redirectOnMaxCapacityVariant.canConvert<QString>()) {
+            redirectOnMaxCapacity = redirectOnMaxCapacityVariant.toString();
             qDebug() << "Redirection domain:" << redirectOnMaxCapacity;
         }
 
@@ -610,9 +611,9 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
 
 bool DomainGatekeeper::isWithinMaxCapacity() {
     // find out what our maximum capacity is
-    const QVariant* maximumUserCapacityVariant =
-        valueForKeyPath(_server->_settingsManager.getSettingsMap(), MAXIMUM_USER_CAPACITY);
-    unsigned int maximumUserCapacity = maximumUserCapacityVariant ? maximumUserCapacityVariant->toUInt() : 0;
+    QVariant maximumUserCapacityVariant =
+        _server->_settingsManager.valueOrDefaultValueForKeyPath(MAXIMUM_USER_CAPACITY);
+    unsigned int maximumUserCapacity = !maximumUserCapacityVariant.isValid() ? maximumUserCapacityVariant.toUInt() : 0;
 
     if (maximumUserCapacity > 0) {
         unsigned int connectedUsers = _server->countConnectedUsers();
diff --git a/domain-server/src/DomainMetadata.cpp b/domain-server/src/DomainMetadata.cpp
index eee5673af3..24d55d74b6 100644
--- a/domain-server/src/DomainMetadata.cpp
+++ b/domain-server/src/DomainMetadata.cpp
@@ -84,21 +84,22 @@ void DomainMetadata::descriptorsChanged() {
     // get descriptors
     assert(_metadata[DESCRIPTORS].canConvert<QVariantMap>());
     auto& state = *static_cast<QVariantMap*>(_metadata[DESCRIPTORS].data());
-    auto& settings = static_cast<DomainServer*>(parent())->_settingsManager.getSettingsMap();
-    auto& descriptors = static_cast<DomainServer*>(parent())->_settingsManager.getDescriptorsMap();
+
+    static const QString DESCRIPTORS_GROUP_KEYPATH = "descriptors";
+    auto descriptorsMap = static_cast<DomainServer*>(parent())->_settingsManager.valueForKeyPath(DESCRIPTORS).toMap();
 
     // copy simple descriptors (description/maturity)
-    state[Descriptors::DESCRIPTION] = descriptors[Descriptors::DESCRIPTION]; 
-    state[Descriptors::MATURITY] = descriptors[Descriptors::MATURITY];
+    state[Descriptors::DESCRIPTION] = descriptorsMap[Descriptors::DESCRIPTION];
+    state[Descriptors::MATURITY] = descriptorsMap[Descriptors::MATURITY];
 
     // copy array descriptors (hosts/tags)
-    state[Descriptors::HOSTS] = descriptors[Descriptors::HOSTS].toList();
-    state[Descriptors::TAGS] = descriptors[Descriptors::TAGS].toList();
+    state[Descriptors::HOSTS] = descriptorsMap[Descriptors::HOSTS].toList();
+    state[Descriptors::TAGS] = descriptorsMap[Descriptors::TAGS].toList();
 
     // parse capacity
     static const QString CAPACITY = "security.maximum_user_capacity";
-    const QVariant* capacityVariant = valueForKeyPath(settings, CAPACITY);
-    unsigned int capacity = capacityVariant ? capacityVariant->toUInt() : 0;
+    QVariant capacityVariant = static_cast<DomainServer*>(parent())->_settingsManager.valueForKeyPath(CAPACITY);
+    unsigned int capacity = capacityVariant.isValid() ? capacityVariant.toUInt() : 0;
     state[Descriptors::CAPACITY] = capacity;
 
 #if DEV_BUILD || PR_BUILD
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 81dcf65be5..9cecea5f70 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -75,8 +75,8 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
                                               std::initializer_list<QString> optionalData,
                                               bool requireAccessToken) {
 
-    auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
-    if (accessTokenVariant == nullptr && requireAccessToken) {
+    auto accessTokenVariant = _settingsManager.valueForKeyPath(ACCESS_TOKEN_KEY_PATH);
+    if (!accessTokenVariant.isValid() && requireAccessToken) {
         connection->respond(HTTPConnection::StatusCode400, "User access token has not been set");
         return true;
     }
@@ -112,8 +112,8 @@ bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
     req.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
     req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
-    if (accessTokenVariant != nullptr) {
-        auto accessTokenHeader = QString("Bearer ") + accessTokenVariant->toString();
+    if (accessTokenVariant.isValid()) {
+        auto accessTokenHeader = QString("Bearer ") + accessTokenVariant.toString();
         req.setRawHeader("Authorization", accessTokenHeader.toLatin1());
     }
 
@@ -417,8 +417,8 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
     const QString X509_PRIVATE_KEY_OPTION = "key";
     const QString X509_KEY_PASSPHRASE_ENV = "DOMAIN_SERVER_KEY_PASSPHRASE";
 
-    QString certPath = _settingsManager.getSettingsMap().value(X509_CERTIFICATE_OPTION).toString();
-    QString keyPath = _settingsManager.getSettingsMap().value(X509_PRIVATE_KEY_OPTION).toString();
+    QString certPath = _settingsManager.valueForKeyPath(X509_CERTIFICATE_OPTION).toString();
+    QString keyPath = _settingsManager.valueForKeyPath(X509_PRIVATE_KEY_OPTION).toString();
 
     if (!certPath.isEmpty() && !keyPath.isEmpty()) {
         // the user wants to use the following cert and key for HTTPS
@@ -461,8 +461,7 @@ bool DomainServer::optionallySetupOAuth() {
     const QString OAUTH_CLIENT_SECRET_ENV = "DOMAIN_SERVER_CLIENT_SECRET";
     const QString REDIRECT_HOSTNAME_OPTION = "hostname";
 
-    const QVariantMap& settingsMap = _settingsManager.getSettingsMap();
-    _oauthProviderURL = QUrl(settingsMap.value(OAUTH_PROVIDER_URL_OPTION).toString());
+    _oauthProviderURL = QUrl(_settingsManager.valueForKeyPath(OAUTH_PROVIDER_URL_OPTION).toString());
 
     // if we don't have an oauth provider URL then we default to the default node auth url
     if (_oauthProviderURL.isEmpty()) {
@@ -472,9 +471,9 @@ bool DomainServer::optionallySetupOAuth() {
     auto accountManager = DependencyManager::get<AccountManager>();
     accountManager->setAuthURL(_oauthProviderURL);
 
-    _oauthClientID = settingsMap.value(OAUTH_CLIENT_ID_OPTION).toString();
+    _oauthClientID = _settingsManager.valueForKeyPath(OAUTH_CLIENT_ID_OPTION).toString();
     _oauthClientSecret = QProcessEnvironment::systemEnvironment().value(OAUTH_CLIENT_SECRET_ENV);
-    _hostname = settingsMap.value(REDIRECT_HOSTNAME_OPTION).toString();
+    _hostname = _settingsManager.valueForKeyPath(REDIRECT_HOSTNAME_OPTION).toString();
 
     if (!_oauthClientID.isEmpty()) {
         if (_oauthProviderURL.isEmpty()
@@ -499,11 +498,11 @@ static const QString METAVERSE_DOMAIN_ID_KEY_PATH = "metaverse.id";
 
 void DomainServer::getTemporaryName(bool force) {
     // check if we already have a domain ID
-    const QVariant* idValueVariant = valueForKeyPath(_settingsManager.getSettingsMap(), METAVERSE_DOMAIN_ID_KEY_PATH);
+    QVariant idValueVariant = _settingsManager.valueForKeyPath(METAVERSE_DOMAIN_ID_KEY_PATH);
 
     qInfo() << "Requesting temporary domain name";
-    if (idValueVariant) {
-        qDebug() << "A domain ID is already present in domain-server settings:" << idValueVariant->toString();
+    if (idValueVariant.isValid()) {
+        qDebug() << "A domain ID is already present in domain-server settings:" << idValueVariant.toString();
         if (force) {
             qDebug() << "Requesting temporary domain name to replace current ID:" << getID();
         } else {
@@ -543,9 +542,6 @@ void DomainServer::handleTempDomainSuccess(QNetworkReply& requestReply) {
         auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8());
         _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings);
 
-        // store the new ID and auto networking setting on disk
-        _settingsManager.persistToFile();
-
         // store the new token to the account info
         auto accountManager = DependencyManager::get<AccountManager>();
         accountManager->setTemporaryDomain(id, key);
@@ -647,8 +643,6 @@ void DomainServer::setupNodeListAndAssignments() {
     QVariant localPortValue = _settingsManager.valueOrDefaultValueForKeyPath(CUSTOM_LOCAL_PORT_OPTION);
     int domainServerPort = localPortValue.toInt();
 
-    QVariantMap& settingsMap = _settingsManager.getSettingsMap();
-
     int domainServerDTLSPort = INVALID_PORT;
 
     if (_isUsingDTLS) {
@@ -656,8 +650,9 @@ void DomainServer::setupNodeListAndAssignments() {
 
         const QString CUSTOM_DTLS_PORT_OPTION = "dtls-port";
 
-        if (settingsMap.contains(CUSTOM_DTLS_PORT_OPTION)) {
-            domainServerDTLSPort = (unsigned short) settingsMap.value(CUSTOM_DTLS_PORT_OPTION).toUInt();
+        auto dtlsPortVariant = _settingsManager.valueForKeyPath(CUSTOM_DTLS_PORT_OPTION);
+        if (dtlsPortVariant.isValid()) {
+            domainServerDTLSPort = (unsigned short) dtlsPortVariant.toUInt();
         }
     }
 
@@ -687,9 +682,9 @@ void DomainServer::setupNodeListAndAssignments() {
         nodeList->setSessionUUID(_overridingDomainID);
         isMetaverseDomain = true; // assume metaverse domain
     } else {
-        const QVariant* idValueVariant = valueForKeyPath(settingsMap, METAVERSE_DOMAIN_ID_KEY_PATH);
-        if (idValueVariant) {
-            nodeList->setSessionUUID(idValueVariant->toString());
+        QVariant idValueVariant = _settingsManager.valueForKeyPath(METAVERSE_DOMAIN_ID_KEY_PATH);
+        if (idValueVariant.isValid()) {
+            nodeList->setSessionUUID(idValueVariant.toString());
             isMetaverseDomain = true; // if we have an ID, we'll assume we're a metaverse domain
         } else {
             nodeList->setSessionUUID(QUuid::createUuid()); // Use random UUID
@@ -758,10 +753,10 @@ bool DomainServer::resetAccountManagerAccessToken() {
         QString accessToken = QProcessEnvironment::systemEnvironment().value(ENV_ACCESS_TOKEN_KEY);
 
         if (accessToken.isEmpty()) {
-            const QVariant* accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
+            QVariant accessTokenVariant = _settingsManager.valueForKeyPath(ACCESS_TOKEN_KEY_PATH);
 
-            if (accessTokenVariant && accessTokenVariant->canConvert(QMetaType::QString)) {
-                accessToken = accessTokenVariant->toString();
+            if (accessTokenVariant.isValid() && accessTokenVariant.canConvert(QMetaType::QString)) {
+                accessToken = accessTokenVariant.toString();
             } else {
                 qWarning() << "No access token is present. Some operations that use the metaverse API will fail.";
                 qDebug() << "Set an access token via the web interface, in your user config"
@@ -892,31 +887,26 @@ void DomainServer::updateICEServerAddresses() {
 }
 
 void DomainServer::parseAssignmentConfigs(QSet<Assignment::Type>& excludedTypes) {
-    const QString ASSIGNMENT_CONFIG_REGEX_STRING = "config-([\\d]+)";
-    QRegExp assignmentConfigRegex(ASSIGNMENT_CONFIG_REGEX_STRING);
-
-    const QVariantMap& settingsMap = _settingsManager.getSettingsMap();
+    const QString ASSIGNMENT_CONFIG_PREFIX = "config-";
 
     // scan for assignment config keys
-    QStringList variantMapKeys = settingsMap.keys();
-    int configIndex = variantMapKeys.indexOf(assignmentConfigRegex);
+    for (int i = 0; i < Assignment::AllTypes; ++i) {
+        QVariant assignmentConfigVariant = _settingsManager.valueOrDefaultValueForKeyPath(ASSIGNMENT_CONFIG_PREFIX + QString::number(i));
 
-    while (configIndex != -1) {
-        // figure out which assignment type this matches
-        Assignment::Type assignmentType = (Assignment::Type) assignmentConfigRegex.cap(1).toInt();
+        if (assignmentConfigVariant.isValid()) {
+            // figure out which assignment type this matches
+            Assignment::Type assignmentType = static_cast<Assignment::Type>(i);
 
-        if (assignmentType < Assignment::AllTypes && !excludedTypes.contains(assignmentType)) {
-            QVariant mapValue = settingsMap[variantMapKeys[configIndex]];
-            QVariantList assignmentList = mapValue.toList();
+            if (!excludedTypes.contains(assignmentType)) {
+                QVariantList assignmentList = assignmentConfigVariant.toList();
 
-            if (assignmentType != Assignment::AgentType) {
-                createStaticAssignmentsForType(assignmentType, assignmentList);
+                if (assignmentType != Assignment::AgentType) {
+                    createStaticAssignmentsForType(assignmentType, assignmentList);
+                }
+
+                excludedTypes.insert(assignmentType);
             }
-
-            excludedTypes.insert(assignmentType);
         }
-
-        configIndex = variantMapKeys.indexOf(assignmentConfigRegex, configIndex + 1);
     }
 }
 
@@ -928,10 +918,10 @@ void DomainServer::addStaticAssignmentToAssignmentHash(Assignment* newAssignment
 
 void DomainServer::populateStaticScriptedAssignmentsFromSettings() {
     const QString PERSISTENT_SCRIPTS_KEY_PATH = "scripts.persistent_scripts";
-    const QVariant* persistentScriptsVariant = valueForKeyPath(_settingsManager.getSettingsMap(), PERSISTENT_SCRIPTS_KEY_PATH);
+    QVariant persistentScriptsVariant = _settingsManager.valueOrDefaultValueForKeyPath(PERSISTENT_SCRIPTS_KEY_PATH);
 
-    if (persistentScriptsVariant) {
-        QVariantList persistentScriptsList = persistentScriptsVariant->toList();
+    if (persistentScriptsVariant.isValid()) {
+        QVariantList persistentScriptsList = persistentScriptsVariant.toList();
         foreach(const QVariant& persistentScriptVariant, persistentScriptsList) {
             QVariantMap persistentScript = persistentScriptVariant.toMap();
 
@@ -1954,13 +1944,12 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
     auto nodeList = DependencyManager::get<LimitedNodeList>();
 
-    auto getSetting = [this](QString keyPath, QVariant& value) -> bool {
-        QVariantMap& settingsMap = _settingsManager.getSettingsMap();
-        QVariant* var = valueForKeyPath(settingsMap, keyPath);
-        if (var == nullptr) {
+    auto getSetting = [this](QString keyPath, QVariant value) -> bool {
+
+        value = _settingsManager.valueForKeyPath(keyPath);
+        if (!value.isValid()) {
             return false;
         }
-        value = *var;
         return true;
     };
 
@@ -2028,8 +2017,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
         const QString URI_WIZARD = "/wizard/";
         const QString WIZARD_COMPLETED_ONCE_KEY_PATH = "wizard.completed_once";
-        const QVariant* wizardCompletedOnce = valueForKeyPath(_settingsManager.getSettingsMap(), WIZARD_COMPLETED_ONCE_KEY_PATH);
-        const bool completedOnce = wizardCompletedOnce && wizardCompletedOnce->toBool();
+        QVariant wizardCompletedOnce = _settingsManager.valueForKeyPath(WIZARD_COMPLETED_ONCE_KEY_PATH);
+        const bool completedOnce = wizardCompletedOnce.isValid() && wizardCompletedOnce.toBool();
 
         if (url.path() != URI_WIZARD && url.path().endsWith('/') && !completedOnce) {
             // First visit, redirect to the wizard
@@ -2326,8 +2315,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             return true;
 
         } else if (url.path() == "/domain_settings") {
-            auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
-            if (!accessTokenVariant) {
+            auto accessTokenVariant = _settingsManager.valueForKeyPath(ACCESS_TOKEN_KEY_PATH);
+            if (!accessTokenVariant.isValid()) {
                 connection->respond(HTTPConnection::StatusCode400);
                 return true;
             }
@@ -2360,8 +2349,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             return forwardMetaverseAPIRequest(connection, "/api/v1/domains/" + domainID, "domain",
                                               { }, { "network_address", "network_port", "label" });
         }  else if (url.path() == URI_API_PLACES) {
-            auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
-            if (!accessTokenVariant->isValid()) {
+            auto accessTokenVariant = _settingsManager.valueForKeyPath(ACCESS_TOKEN_KEY_PATH);
+            if (!accessTokenVariant.isValid()) {
                 connection->respond(HTTPConnection::StatusCode400, "User access token has not been set");
                 return true;
             }
@@ -2409,7 +2398,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
             QUrl url { NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/api/v1/places/" + place_id };
 
-            url.setQuery("access_token=" + accessTokenVariant->toString());
+            url.setQuery("access_token=" + accessTokenVariant.toString());
 
             QNetworkRequest req(url);
             req.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
@@ -2604,10 +2593,11 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
 
     const QByteArray UNAUTHENTICATED_BODY = "You do not have permission to access this domain-server.";
 
-    QVariantMap& settingsMap = _settingsManager.getSettingsMap();
+    QVariant adminUsersVariant = _settingsManager.valueForKeyPath(ADMIN_USERS_CONFIG_KEY);
+    QVariant adminRolesVariant = _settingsManager.valueForKeyPath(ADMIN_ROLES_CONFIG_KEY);
 
     if (!_oauthProviderURL.isEmpty()
-        && (settingsMap.contains(ADMIN_USERS_CONFIG_KEY) || settingsMap.contains(ADMIN_ROLES_CONFIG_KEY))) {
+        && (adminUsersVariant.isValid() || adminRolesVariant.isValid())) {
         QString cookieString = connection->requestHeaders().value(HTTP_COOKIE_HEADER_KEY);
 
         const QString COOKIE_UUID_REGEX_STRING = HIFI_SESSION_COOKIE_KEY + "=([\\d\\w-]+)($|;)";
@@ -2618,7 +2608,7 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
             cookieUUID = cookieUUIDRegex.cap(1);
         }
 
-        if (valueForKeyPath(settingsMap, BASIC_AUTH_USERNAME_KEY_PATH)) {
+        if (_settingsManager.valueForKeyPath(BASIC_AUTH_USERNAME_KEY_PATH).isValid()) {
             qDebug() << "Config file contains web admin settings for OAuth and basic HTTP authentication."
                 << "These cannot be combined - using OAuth for authentication.";
         }
@@ -2628,13 +2618,13 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
             DomainServerWebSessionData sessionData = _cookieSessionHash.value(cookieUUID);
             QString profileUsername = sessionData.getUsername();
 
-            if (settingsMap.value(ADMIN_USERS_CONFIG_KEY).toStringList().contains(profileUsername)) {
+            if (_settingsManager.valueForKeyPath(ADMIN_USERS_CONFIG_KEY).toStringList().contains(profileUsername)) {
                 // this is an authenticated user
                 return true;
             }
 
             // loop the roles of this user and see if they are in the admin-roles array
-            QStringList adminRolesArray = settingsMap.value(ADMIN_ROLES_CONFIG_KEY).toStringList();
+            QStringList adminRolesArray = _settingsManager.valueForKeyPath(ADMIN_ROLES_CONFIG_KEY).toStringList();
 
             if (!adminRolesArray.isEmpty()) {
                 foreach(const QString& userRole, sessionData.getRoles()) {
@@ -2679,7 +2669,7 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
             // we don't know about this user yet, so they are not yet authenticated
             return false;
         }
-    } else if (valueForKeyPath(settingsMap, BASIC_AUTH_USERNAME_KEY_PATH)) {
+    } else if (_settingsManager.valueForKeyPath(BASIC_AUTH_USERNAME_KEY_PATH).isValid()) {
         // config file contains username and password combinations for basic auth
         const QByteArray BASIC_AUTH_HEADER_KEY = "Authorization";
 
@@ -2698,10 +2688,10 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
                     QString headerPassword = credentialList[1];
 
                     // we've pulled a username and password - now check if there is a match in our basic auth hash
-                    QString settingsUsername = valueForKeyPath(settingsMap, BASIC_AUTH_USERNAME_KEY_PATH)->toString();
-                    const QVariant* settingsPasswordVariant = valueForKeyPath(settingsMap, BASIC_AUTH_PASSWORD_KEY_PATH);
+                    QString settingsUsername = _settingsManager.valueForKeyPath(BASIC_AUTH_USERNAME_KEY_PATH).toString();
+                    QVariant settingsPasswordVariant = _settingsManager.valueForKeyPath(BASIC_AUTH_PASSWORD_KEY_PATH);
 
-                    QString settingsPassword = settingsPasswordVariant ? settingsPasswordVariant->toString() : "";
+                    QString settingsPassword = settingsPasswordVariant.isValid() ? settingsPasswordVariant.toString() : "";
                     QString hexHeaderPassword = headerPassword.isEmpty() ?
                         "" : QCryptographicHash::hash(headerPassword.toUtf8(), QCryptographicHash::Sha256).toHex();
                         
@@ -2838,13 +2828,14 @@ ReplicationServerInfo serverInformationFromSettings(QVariantMap serverMap, Repli
 }
 
 void DomainServer::updateReplicationNodes(ReplicationServerDirection direction) {
-    auto settings = _settingsManager.getSettingsMap();
 
-    if (settings.contains(BROADCASTING_SETTINGS_KEY)) {
+    auto broadcastSettingsVariant = _settingsManager.valueForKeyPath(BROADCASTING_SETTINGS_KEY);
+
+    if (broadcastSettingsVariant.isValid()) {
         auto nodeList = DependencyManager::get<LimitedNodeList>();
         std::vector<HifiSockAddr> replicationNodesInSettings;
 
-        auto replicationSettings = settings.value(BROADCASTING_SETTINGS_KEY).toMap();
+        auto replicationSettings = broadcastSettingsVariant.toMap();
 
         QString serversKey = direction == Upstream ? "upstream_servers" : "downstream_servers";
         QString replicationDirection = direction == Upstream ? "upstream" : "downstream";
@@ -2920,13 +2911,12 @@ void DomainServer::updateUpstreamNodes() {
 
 void DomainServer::updateReplicatedNodes() {
     // Make sure we have downstream nodes in our list
-    auto settings = _settingsManager.getSettingsMap();
-
     static const QString REPLICATED_USERS_KEY = "users";
     _replicatedUsernames.clear();
-    
-    if (settings.contains(BROADCASTING_SETTINGS_KEY)) {
-        auto replicationSettings = settings.value(BROADCASTING_SETTINGS_KEY).toMap();
+
+    auto replicationVariant = _settingsManager.valueForKeyPath(BROADCASTING_SETTINGS_KEY);
+    if (replicationVariant.isValid()) {
+        auto replicationSettings = replicationVariant.toMap();
         if (replicationSettings.contains(REPLICATED_USERS_KEY)) {
             auto usersSettings = replicationSettings.value(REPLICATED_USERS_KEY).toList();
             for (auto& username : usersSettings) {
@@ -3114,17 +3104,17 @@ void DomainServer::processPathQueryPacket(QSharedPointer<ReceivedMessage> messag
 
         // check out paths in the _configMap to see if we have a match
         auto keypath = QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(SETTINGS_PATHS_KEY).arg(pathQuery);
-        const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(), keypath);
+        QVariant pathMatch = _settingsManager.valueForKeyPath(keypath);
 
-        if (pathMatch || pathQuery == INDEX_PATH) {
+        if (pathMatch.isValid() || pathQuery == INDEX_PATH) {
             // we got a match, respond with the resulting viewpoint
             auto nodeList = DependencyManager::get<LimitedNodeList>();
 
             QString responseViewpoint;
 
             // if we didn't match the path BUT this is for the index path then send back our default
-            if (pathMatch) {
-                responseViewpoint = pathMatch->toMap()[PATH_VIEWPOINT_KEY].toString();
+            if (pathMatch.isValid()) {
+                responseViewpoint = pathMatch.toMap()[PATH_VIEWPOINT_KEY].toString();
             } else {
                 const QString DEFAULT_INDEX_PATH = "/0,0,0/0,0,0,1";
                 responseViewpoint = DEFAULT_INDEX_PATH;
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index cd7155d9da..ad0381a697 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -38,6 +38,9 @@
 #include "DomainServerNodeData.h"
 
 const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings.json";
+const QString SETTINGS_PATH = "/settings";
+const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
+const QString CONTENT_SETTINGS_PATH_JSON = "/content-settings.json";
 
 const QString DESCRIPTION_SETTINGS_KEY = "settings";
 const QString SETTING_DEFAULT_KEY = "default";
@@ -190,6 +193,9 @@ void DomainServerSettingsManager::processSettingsRequestPacket(QSharedPointer<Re
 }
 
 void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList) {
+    // since we're called from the DomainServerSettingsManager constructor, we don't take a write lock here
+    // even though we change the underlying config map
+
     _argumentList = argumentList;
 
     _configMap.loadConfig(_argumentList);
@@ -448,17 +454,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
     unpackPermissions();
 }
 
-QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {
-    static const QString DESCRIPTORS{ "descriptors" };
-
-    auto& settingsMap = getSettingsMap();
-    if (!getSettingsMap().contains(DESCRIPTORS)) {
-        settingsMap.insert(DESCRIPTORS, QVariantMap());
-    }
-
-    return *static_cast<QVariantMap*>(getSettingsMap()[DESCRIPTORS].data());
-}
-
 void DomainServerSettingsManager::initializeGroupPermissions(NodePermissionsMap& permissionsRows,
                                                              QString groupName, NodePermissionsPointer perms) {
     // this is called when someone has used the domain-settings webpage to add a group.  They type the group's name
@@ -487,6 +482,9 @@ void DomainServerSettingsManager::initializeGroupPermissions(NodePermissionsMap&
 void DomainServerSettingsManager::packPermissionsForMap(QString mapName,
                                                         NodePermissionsMap& permissionsRows,
                                                         QString keyPath) {
+    // grab a write lock on the settings mutex since we're about to change the config map
+    QWriteLocker locker(&_settingsLock);
+
     // find (or create) the "security" section of the settings map
     QVariant* security = _configMap.valueForKeyPath("security", true);
     if (!security->canConvert(QMetaType::QVariantMap)) {
@@ -576,15 +574,15 @@ bool DomainServerSettingsManager::unpackPermissionsForKeypath(const QString& key
 
     mapPointer->clear();
 
-    QVariant* permissions = _configMap.valueForKeyPath(keyPath, true);
-    if (!permissions->canConvert(QMetaType::QVariantList)) {
+    QVariant permissions = valueForKeyPath(keyPath);
+
+    if (!permissions.canConvert(QMetaType::QVariantList)) {
         qDebug() << "Failed to extract permissions for key path" << keyPath << "from settings.";
-        (*permissions) = QVariantList();
     }
 
     bool needPack = false;
 
-    QList<QVariant> permissionsList = permissions->toList();
+    QList<QVariant> permissionsList = permissions.toList();
     foreach (QVariant permsHash, permissionsList) {
         NodePermissionsPointer perms { new NodePermissions(permsHash.toMap()) };
         QString id = perms->getID();
@@ -1068,12 +1066,22 @@ NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QUuid&
     return getForbiddensForGroup(groupKey.first, groupKey.second);
 }
 
+QVariant DomainServerSettingsManager::valueForKeyPath(const QString& keyPath) {
+    QReadLocker locker(&_settingsLock);
+    auto foundValue = _configMap.valueForKeyPath(keyPath);
+    return foundValue ? *foundValue : QVariant();
+}
+
 QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QString& keyPath) {
+    QReadLocker locker(&_settingsLock);
     const QVariant* foundValue = _configMap.valueForKeyPath(keyPath);
 
     if (foundValue) {
         return *foundValue;
     } else {
+        // we don't need the settings lock anymore since we're done reading from the config map
+        _settingsLock.unlock();
+
         int dotIndex = keyPath.indexOf('.');
 
         QString groupKey = keyPath.mid(0, dotIndex);
@@ -1112,9 +1120,6 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
             // we recurse one level deep below each group for the appropriate setting
             bool restartRequired = recurseJSONObjectAndOverwriteSettings(postedObject, endpointType);
 
-            // store whatever the current _settingsMap is to file
-            persistToFile();
-
             // return success to the caller
             QString jsonSuccess = "{\"status\": \"success\"}";
             connection->respond(HTTPConnection::StatusCode200, jsonSuccess.toUtf8(), "application/json");
@@ -1216,16 +1221,9 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 }
 
 bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType) {
-    
-    if (thread() != QThread::currentThread()) {
-        bool success;
 
-        BLOCKING_INVOKE_METHOD(this, "restoreSettingsFromObject",
-                               Q_RETURN_ARG(bool, success),
-                               Q_ARG(QJsonObject, settingsToRestore),
-                               Q_ARG(SettingsType, settingsType));
-        return success;
-    }
+    // grab a write lock since we're about to change the settings map
+    QWriteLocker locker(&_settingsLock);
 
     QJsonArray* filteredDescriptionArray = settingsType == DomainSettings
         ? &_domainSettingsDescription : &_contentSettingsDescription;
@@ -1341,6 +1339,10 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
     } else {
         // restore completed, persist the new settings
         qDebug() << "Restore completed, persisting restored settings to file";
+
+        // let go of the write lock since we're done making changes to the config map
+        locker.unlock();
+
         persistToFile();
         return true;
     }
@@ -1352,20 +1354,6 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                                                                        bool includeDefaults, bool isForBackup) {
     QJsonObject responseObject;
 
-    if (thread() != QThread::currentThread()) {
-
-        BLOCKING_INVOKE_METHOD(this, "settingsResponseObjectForType",
-                               Q_RETURN_ARG(QJsonObject, responseObject),
-                               Q_ARG(QString, typeValue),
-                               Q_ARG(bool, isAuthenticated),
-                               Q_ARG(bool, includeDomainSettings),
-                               Q_ARG(bool, includeContentSettings),
-                               Q_ARG(bool, includeDefaults),
-                               Q_ARG(bool, isForBackup));
-
-        return responseObject;
-    }
-
     if (!typeValue.isEmpty() || isAuthenticated) {
         // convert the string type value to a QJsonValue
         QJsonValue queryType = typeValue.isEmpty() ? QJsonValue() : QJsonValue(typeValue.toInt());
@@ -1414,21 +1402,21 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                         QVariant variantValue;
 
                         if (!groupKey.isEmpty()) {
-                             QVariant settingsMapGroupValue = _configMap.value(groupKey);
+                             QVariant settingsMapGroupValue = valueForKeyPath(groupKey);
 
                             if (!settingsMapGroupValue.isNull()) {
                                 variantValue = settingsMapGroupValue.toMap().value(settingName);
                             }
                         } else {
-                            variantValue = _configMap.value(settingName);
+                            variantValue = valueForKeyPath(settingName);
                         }
 
                         // final check for inclusion
                         // either we include default values or we don't but this isn't a default value
-                        if (includeDefaults || !variantValue.isNull()) {
+                        if (includeDefaults || variantValue.isValid()) {
                             QJsonValue result;
 
-                            if (variantValue.isNull()) {
+                            if (!variantValue.isValid()) {
                                 // no value for this setting, pass the default
                                 if (settingObject.contains(SETTING_DEFAULT_KEY)) {
                                     result = settingObject[SETTING_DEFAULT_KEY];
@@ -1567,6 +1555,10 @@ QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJson
 
 bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
                                                                         SettingsType settingsType) {
+
+    // take a write lock since we're about to overwrite settings in the config map
+    QWriteLocker locker(&_settingsLock);
+
     static const QString SECURITY_ROOT_KEY = "security";
     static const QString AC_SUBNET_WHITELIST_KEY = "ac_subnet_whitelist";
     static const QString BROADCASTING_KEY = "broadcasting";
@@ -1664,6 +1656,12 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
         }
     }
 
+    // we're done making changes to the config map, let go of our read lock
+    locker.unlock();
+
+    // store whatever the current config map is to file
+    persistToFile();
+
     return needRestart;
 }
 
@@ -1690,6 +1688,9 @@ bool permissionVariantLessThan(const QVariant &v1, const QVariant &v2) {
 }
 
 void DomainServerSettingsManager::sortPermissions() {
+    // take a write lock since we're about to change the config map data
+    QWriteLocker locker(&_settingsLock);
+
     // sort the permission-names
     QVariant* standardPermissions = _configMap.valueForKeyPath(AGENT_STANDARD_PERMISSIONS_KEYPATH);
     if (standardPermissions && standardPermissions->canConvert(QMetaType::QVariantList)) {
@@ -1726,11 +1727,15 @@ void DomainServerSettingsManager::persistToFile() {
     QFile settingsFile(_configMap.getUserConfigFilename());
 
     if (settingsFile.open(QIODevice::WriteOnly)) {
+        // take a read lock so we can grab the config and write it to file
+        QReadLocker locker(&_settingsLock);
         settingsFile.write(QJsonDocument::fromVariant(_configMap.getConfig()).toJson());
     } else {
         qCritical("Could not write to JSON settings file. Unable to persist settings.");
 
         // failed to write, reload whatever the current config state is
+        // with a write lock since we're about to overwrite the config map
+        QWriteLocker locker(&_settingsLock);
         _configMap.loadConfig(_argumentList);
     }
 }
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 897a15485f..d81547410b 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -27,9 +27,6 @@
 
 const QString SETTINGS_PATHS_KEY = "paths";
 
-const QString SETTINGS_PATH = "/settings";
-const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
-const QString CONTENT_SETTINGS_PATH_JSON = "/content-settings.json";
 const QString AGENT_STANDARD_PERMISSIONS_KEYPATH = "security.standard_permissions";
 const QString AGENT_PERMISSIONS_KEYPATH = "security.permissions";
 const QString IP_PERMISSIONS_KEYPATH = "security.ip_permissions";
@@ -53,11 +50,12 @@ public:
     bool handleAuthenticatedHTTPRequest(HTTPConnection* connection, const QUrl& url);
 
     void setupConfigMap(const QStringList& argumentList);
+
+    // each of the three methods in this group takes a read lock of _settingsLock
+    // and cannot be called when the a write lock is held by the same thread
     QVariant valueOrDefaultValueForKeyPath(const QString& keyPath);
-
-    QVariantMap& getSettingsMap() { return _configMap.getConfig(); }
-
-    QVariantMap& getDescriptorsMap();
+    QVariant valueForKeyPath(const QString& keyPath);
+    bool containsKeyPath(const QString& keyPath) { return valueForKeyPath(keyPath).isValid(); }
 
     // these give access to anonymous/localhost/logged-in settings from the domain-server settings page
     bool haveStandardPermissionsForName(const QString& name) const { return _standardAgentPermissions.contains(name, 0); }
@@ -119,6 +117,8 @@ public:
     /// thread safe method to restore settings from a JSON object
     Q_INVOKABLE bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
 
+    bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
+
 signals:
     void updateNodePermissions();
     void settingsUpdated();
@@ -138,12 +138,13 @@ private:
     QStringList _argumentList;
 
     QJsonArray filteredDescriptionArray(bool isContentSettings);
-    bool recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, SettingsType settingsType);
-
     void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
                        const QJsonObject& settingDescription);
     QJsonObject settingDescriptionFromGroup(const QJsonObject& groupObject, const QString& settingName);
     void sortPermissions();
+
+    // you cannot be holding the _settingsLock when persisting to file from the same thread
+    // since it may take either a read lock or write lock and recursive locking doesn't allow a change in type
     void persistToFile();
 
     void splitSettingsDescription();
@@ -155,10 +156,10 @@ private:
     QJsonArray _contentSettingsDescription;
     QJsonObject _settingsMenuGroups;
 
+    // any method that calls _valueForKeyPath on this _configMap must get a write lock it keeps until it
+    // is done with the returned QVariant*
     HifiConfigVariantMap _configMap;
 
-    friend class DomainServer;
-
     // these cause calls to metaverse's group api
     void apiGetGroupID(const QString& groupName);
     void apiGetGroupRanks(const QUuid& groupID);
@@ -192,6 +193,9 @@ private:
 
     // keep track of answers to api queries about which users are in which groups
     QHash<QString, QHash<QUuid, QUuid>> _groupMembership; // QHash<user-name, QHash<group-id, rank-id>>
+
+    /// guard read/write access from multiple threads to settings 
+    QReadWriteLock _settingsLock { QReadWriteLock::Recursive };
 };
 
 #endif // hifi_DomainServerSettingsManager_h

From 679513599cce5f1b7a31b9312e3198c46bede1d2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 14:09:14 -0800
Subject: [PATCH 356/569] fix row hiding and paste events for badging

---
 domain-server/resources/web/content/js/content.js | 4 ++--
 domain-server/resources/web/js/base-settings.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 717f149760..525b989259 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -145,7 +145,7 @@ $(document).ready(function(){
       // populate the backups tables with the backups
       function createBackupTableRow(backup) {
         return "<tr data-backup-id='" + backup.id + "' data-backup-name='" + backup.name + "'>"
-          + "<td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-dateformat='lll'>"
+          + "<td data-value='" + backup.name.toLowerCase() + "'>" + backup.name + "</td><td data-value='" + backup.createdAtMillis + "'>"
           + moment(backup.createdAtMillis).format('lll')
           + "</td><td class='backup-status'></td><td class='" + ACTION_MENU_CLASS + "'>"
           + "<div class='dropdown'><div class='dropdown-toggle' data-toggle='dropdown' aria-expanded='false'><span class='glyphicon glyphicon-option-vertical'></span></div>"
@@ -211,7 +211,7 @@ $(document).ready(function(){
 
       // at this point, any rows that no longer have the ACTIVE_BACKUP_ROW_CLASS
       // are deleted backups, so we remove them from the table
-      $('tbody tr:not(.' + ACTIVE_BACKUP_ROW_CLASS + ')').remove();
+      $('#' + CONTENT_ARCHIVES_NORMAL_ID + ' tbody tr:not(.' + ACTIVE_BACKUP_ROW_CLASS + ')').remove();
 
       // check if the restore action on all rows should be enabled or disabled
       $('.' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', data.status.isRecovering);
diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 3476792222..3631e364cb 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -263,7 +263,7 @@ $(document).ready(function(){
     }
   });
 
-  $('#' + Settings.FORM_ID).on('change keyup paste', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
+  $('#' + Settings.FORM_ID).on('input propertychange', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true);
 
@@ -838,7 +838,7 @@ function addTableRow(row) {
     var keyInput = row.children(".key").children("input");
 
     // whenever the keyInput changes, re-badge for differences
-    keyInput.on('change keyup paste', function(e){
+    keyInput.on('input propertychange', function(e){
       // update siblings in the row to have the correct name
       var currentKey = $(this).val();
 

From dd5b08bdc1364887cd97eb7cf7f6d0151abf9d6a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 14:34:54 -0800
Subject: [PATCH 357/569] fix unlock of locker not mutex, don't pack permission
 defaults

---
 domain-server/src/DomainServerSettingsManager.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index ad0381a697..2c3cf0f17b 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -686,9 +686,6 @@ void DomainServerSettingsManager::unpackPermissions() {
 
             // add the permissions to the standard map
             _standardAgentPermissions[standardKey] = perms;
-
-            // this will require a packing of permissions
-            needPack = true;
         }
     }
 
@@ -1080,7 +1077,7 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
         return *foundValue;
     } else {
         // we don't need the settings lock anymore since we're done reading from the config map
-        _settingsLock.unlock();
+        locker.unlock();
 
         int dotIndex = keyPath.indexOf('.');
 

From 9057918e08188f10fb7bf2dc641cb5f2b23f5e70 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 15:01:43 -0800
Subject: [PATCH 358/569] move default security permissions to
 describe-settings.json

---
 .../resources/describe-settings.json          | 32 ++++++++-
 .../src/DomainServerSettingsManager.cpp       | 65 +++++++++----------
 2 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 427dc62520..83dd633d22 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -306,7 +306,37 @@
             }
           ],
           "non-deletable-row-key": "permissions_id",
-          "non-deletable-row-values": [ "localhost", "anonymous", "logged-in" ]
+          "non-deletable-row-values": [ "localhost", "anonymous", "logged-in" ],
+          "default": [
+            {
+                "id_can_connect": true,
+                "id_can_rez_tmp_certified": true,
+                "permissions_id": "anonymous"
+            },
+            {
+                "id_can_connect": true,
+                "id_can_rez_tmp_certified": true,
+                "permissions_id": "friends"
+            },
+            {
+                "id_can_adjust_locks": true,
+                "id_can_connect": true,
+                "id_can_connect_past_max_capacity": true,
+                "id_can_kick": true,
+                "id_can_replace_content": true,
+                "id_can_rez": true,
+                "id_can_rez_certified": true,
+                "id_can_rez_tmp": true,
+                "id_can_rez_tmp_certified": true,
+                "id_can_write_to_asset_server": true,
+                "permissions_id": "localhost"
+            },
+            {
+                "id_can_connect": true,
+                "id_can_rez_tmp_certified": true,
+                "permissions_id": "logged-in"
+            }
+          ]
         },
         {
           "name": "group_permissions",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 2c3cf0f17b..5157654c33 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -574,7 +574,12 @@ bool DomainServerSettingsManager::unpackPermissionsForKeypath(const QString& key
 
     mapPointer->clear();
 
-    QVariant permissions = valueForKeyPath(keyPath);
+    QVariant permissions = valueOrDefaultValueForKeyPath(keyPath);
+
+    if (!permissions.isValid()) {
+        // we don't have a permissions object to unpack for this keypath, bail
+        return false;
+    }
 
     if (!permissions.canConvert(QMetaType::QVariantList)) {
         qDebug() << "Failed to extract permissions for key path" << keyPath << "from settings.";
@@ -609,6 +614,11 @@ bool DomainServerSettingsManager::unpackPermissionsForKeypath(const QString& key
 void DomainServerSettingsManager::unpackPermissions() {
     // transfer details from _configMap to _agentPermissions
 
+    // NOTE: Defaults for standard permissions (anonymous, friends, localhost, logged-in) used
+    // to be set here and then immediately persisted to the config JSON file.
+    // They have since been moved to describe-settings.json as the default value for AGENT_STANDARD_PERMISSIONS_KEYPATH.
+    // In order to change the default standard permissions you must change the default value in describe-settings.json.
+
     bool needPack = false;
 
     needPack |= unpackPermissionsForKeypath(AGENT_STANDARD_PERMISSIONS_KEYPATH, &_standardAgentPermissions);
@@ -668,54 +678,39 @@ void DomainServerSettingsManager::unpackPermissions() {
             }
     });
 
-    // if any of the standard names are missing, add them
-    foreach(const QString& standardName, NodePermissions::standardNames) {
-        NodePermissionsKey standardKey { standardName, 0 };
-        if (!_standardAgentPermissions.contains(standardKey)) {
-            // we don't have permissions for one of the standard groups, so we'll add them now
-            NodePermissionsPointer perms { new NodePermissions(standardKey) };
-
-            if (standardKey == NodePermissions::standardNameLocalhost) {
-                // the localhost user is granted all permissions by default
-                perms->setAll(true);
-            } else {
-                // anonymous, logged in, and friend users get connect permissions by default
-                perms->set(NodePermissions::Permission::canConnectToDomain);
-                perms->set(NodePermissions::Permission::canRezTemporaryCertifiedEntities);
-            }
-
-            // add the permissions to the standard map
-            _standardAgentPermissions[standardKey] = perms;
-        }
-    }
-
     needPack |= ensurePermissionsForGroupRanks();
 
     if (needPack) {
         packPermissions();
     }
 
-    #ifdef WANT_DEBUG
+#ifdef WANT_DEBUG
     qDebug() << "--------------- permissions ---------------------";
-    QList<QHash<NodePermissionsKey, NodePermissionsPointer>> permissionsSets;
-    permissionsSets << _standardAgentPermissions.get() << _agentPermissions.get()
-                    << _groupPermissions.get() << _groupForbiddens.get()
-                    << _ipPermissions.get() << _macPermissions.get()
-                    << _machineFingerprintPermissions.get();
+    std::list<NodePermissionsMap*> permissionsSets {
+        &_standardAgentPermissions, &_agentPermissions,
+        &_groupPermissions, &_groupForbiddens,
+        &_ipPermissions, &_macPermissions,
+        &_machineFingerprintPermissions
+    };
 
     foreach (auto permissionSet, permissionsSets) {
-        QHashIterator<NodePermissionsKey, NodePermissionsPointer> i(permissionSet);
-        while (i.hasNext()) {
-            i.next();
-            NodePermissionsPointer perms = i.value();
+        auto& permissionKeyMap = permissionSet->get();
+        auto it = permissionKeyMap.begin();
+
+        while (it != permissionKeyMap.end()) {
+
+            NodePermissionsPointer perms = it->second;
             if (perms->isGroup()) {
-                qDebug() << i.key() << perms->getGroupID() << perms;
+                qDebug() << it->first << perms->getGroupID() << perms;
             } else {
-                qDebug() << i.key() << perms;
+                qDebug() << it->first << perms;
             }
+
+            ++it;
         }
     }
-    #endif
+#endif
+
 }
 
 bool DomainServerSettingsManager::ensurePermissionsForGroupRanks() {

From c8308efa0ca3cdcc26fb3587aa0108ac20c5fdef Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 16:04:52 -0800
Subject: [PATCH 359/569] put back more broad header for content upload

---
 domain-server/resources/web/js/domain-server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index ed9559b6e9..2c12e2683a 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -62,7 +62,7 @@ $(document).ready(function(){
     },
     1: {
       html_id: Settings.UPLOAD_CONTENT_BACKUP_PANEL_ID,
-      label: 'Upload Content Archive'
+      label: 'Upload Content'
     }
   };
 

From 4c10dcba961a1451d1ebaeadd8e0326c3a403671 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 16:06:29 -0800
Subject: [PATCH 360/569] match previous behavior in DomainGatekeeper

---
 domain-server/src/DomainGatekeeper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index e697bbdda1..ac94d953d5 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -437,7 +437,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
         QString redirectOnMaxCapacity;
 
         QVariant redirectOnMaxCapacityVariant =
-            _server->_settingsManager.valueOrDefaultValueForKeyPath(MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION);
+            _server->_settingsManager.valueForKeyPath(MAXIMUM_USER_CAPACITY_REDIRECT_LOCATION);
         if (redirectOnMaxCapacityVariant.canConvert<QString>()) {
             redirectOnMaxCapacity = redirectOnMaxCapacityVariant.toString();
             qDebug() << "Redirection domain:" << redirectOnMaxCapacity;
@@ -612,7 +612,7 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
 bool DomainGatekeeper::isWithinMaxCapacity() {
     // find out what our maximum capacity is
     QVariant maximumUserCapacityVariant =
-        _server->_settingsManager.valueOrDefaultValueForKeyPath(MAXIMUM_USER_CAPACITY);
+        _server->_settingsManager.valueForKeyPath(MAXIMUM_USER_CAPACITY);
     unsigned int maximumUserCapacity = !maximumUserCapacityVariant.isValid() ? maximumUserCapacityVariant.toUInt() : 0;
 
     if (maximumUserCapacity > 0) {

From 9af7579b856f16df67b0dd091073177ccb7b9c4f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 16:32:21 -0800
Subject: [PATCH 361/569] handle change for programmatic input change badging

---
 domain-server/resources/web/js/base-settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index 3631e364cb..bafe5f96cf 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -263,7 +263,7 @@ $(document).ready(function(){
     }
   });
 
-  $('#' + Settings.FORM_ID).on('input propertychange', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
+  $('#' + Settings.FORM_ID).on('change input propertychange', '.' + Settings.TRIGGER_CHANGE_CLASS , function(e){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true);
 
@@ -838,7 +838,7 @@ function addTableRow(row) {
     var keyInput = row.children(".key").children("input");
 
     // whenever the keyInput changes, re-badge for differences
-    keyInput.on('input propertychange', function(e){
+    keyInput.on('change input propertychange', function(e){
       // update siblings in the row to have the correct name
       var currentKey = $(this).val();
 

From acc68d65c2bc14d58af789f9ae1065cc48fda87f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 16 Feb 2018 13:53:55 -0800
Subject: [PATCH 362/569] Backup bug fixes

---
 domain-server/src/AssetsBackupHandler.cpp     |  8 +--
 .../src/DomainContentBackupManager.cpp        | 69 +++++++------------
 .../src/DomainContentBackupManager.h          |  4 +-
 domain-server/src/DomainServer.cpp            | 11 ++-
 4 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 694277910f..19b970f30a 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -113,7 +113,7 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
 
 
 std::pair<bool, float> AssetsBackupHandler::isAvailable(QString filePath) {
-    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
         return value.filePath == filePath;
     });
     if (it == end(_backups)) {
@@ -269,7 +269,7 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
         qCWarning(asset_backup) << "Current asset mappings that might be stale.";
     }
 
-    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
         return value.filePath == zip.getZipName();
     });
     if (it == end(_backups)) {
@@ -314,7 +314,7 @@ void AssetsBackupHandler::deleteBackup(const QString& absoluteFilePath) {
         return;
     }
 
-    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
         return value.filePath == absoluteFilePath;
     });
     if (it == end(_backups)) {
@@ -335,7 +335,7 @@ void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
     }
     QFileInfo zipInfo(zip.getZipName());
 
-    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
         QFileInfo info(value.filePath);
         return info.fileName() == zipInfo.fileName();
     });
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 0bef6bb891..dca3c645d6 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -50,7 +50,7 @@ void DomainContentBackupManager::addBackupHandler(BackupHandlerPointer handler)
 }
 
 DomainContentBackupManager::DomainContentBackupManager(const QString& backupDirectory,
-                                                       const QJsonObject& settings,
+                                                       const QVariantList& backupRules,
                                                        int persistInterval,
                                                        bool debugTimestampNow)
     : _backupDirectory(backupDirectory),
@@ -62,59 +62,38 @@ DomainContentBackupManager::DomainContentBackupManager(const QString& backupDire
     // Make sure the backup directory exists.
     QDir(_backupDirectory).mkpath(".");
 
-    parseSettings(settings);
+    parseBackupRules(backupRules);
 }
 
-void DomainContentBackupManager::parseSettings(const QJsonObject& settings) {
-    static const QString BACKUP_RULES_KEY = "backup_rules";
-    if (settings[BACKUP_RULES_KEY].isArray()) {
-        const QJsonArray& backupRules = settings[BACKUP_RULES_KEY].toArray();
-        qCDebug(domain_server) << "BACKUP RULES:";
+void DomainContentBackupManager::parseBackupRules(const QVariantList& backupRules) {
+    qCDebug(domain_server) << "BACKUP RULES:";
 
-        for (const QJsonValue& value : backupRules) {
-            QJsonObject obj = value.toObject();
+    for (const QVariant& value : backupRules) {
+        QVariantMap map = value.toMap();
 
-            int interval = 0;
-            int count = 0;
+        int interval = map["backupInterval"].toInt();
+        int count = map["maxBackupVersions"].toInt();
+        auto name = map["Name"].toString();
+        auto format = name.replace(" ", "_").toLower();
 
-            QJsonValue intervalVal = obj["backupInterval"];
-            if (intervalVal.isString()) {
-                interval = intervalVal.toString().toInt();
-            } else {
-                interval = intervalVal.toInt();
-            }
+        qCDebug(domain_server) << "    Name:" << name;
+        qCDebug(domain_server) << "        format:" << format;
+        qCDebug(domain_server) << "        interval:" << interval;
+        qCDebug(domain_server) << "        count:" << count;
 
-            QJsonValue countVal = obj["maxBackupVersions"];
-            if (countVal.isString()) {
-                count = countVal.toString().toInt();
-            } else {
-                count = countVal.toInt();
-            }
+        BackupRule newRule = { name, interval, format, count, 0 };
 
-            auto name = obj["Name"].toString();
-            auto format = name.replace(" ", "_").toLower();
+        newRule.lastBackupSeconds = getMostRecentBackupTimeInSecs(format);
 
-            qCDebug(domain_server) << "    Name:" << name;
-            qCDebug(domain_server) << "        format:" << format;
-            qCDebug(domain_server) << "        interval:" << interval;
-            qCDebug(domain_server) << "        count:" << count;
-
-            BackupRule newRule = { name, interval, format, count, 0 };
-
-            newRule.lastBackupSeconds = getMostRecentBackupTimeInSecs(format);
-
-            if (newRule.lastBackupSeconds > 0) {
-                auto now = QDateTime::currentSecsSinceEpoch();
-                auto sinceLastBackup = now - newRule.lastBackupSeconds;
-                qCDebug(domain_server).noquote() << "        lastBackup:" <<  formatSecTime(sinceLastBackup) << "ago";
-            } else {
-                qCDebug(domain_server) << "        lastBackup: NEVER";
-            }
-
-            _backupRules.push_back(newRule);
+        if (newRule.lastBackupSeconds > 0) {
+            auto now = QDateTime::currentSecsSinceEpoch();
+            auto sinceLastBackup = now - newRule.lastBackupSeconds;
+            qCDebug(domain_server).noquote() << "        lastBackup:" <<  formatSecTime(sinceLastBackup) << "ago";
+        } else {
+            qCDebug(domain_server) << "        lastBackup: NEVER";
         }
-    } else {
-        qCDebug(domain_server) << "BACKUP RULES: NONE";
+
+        _backupRules.push_back(newRule);
     }
 }
 
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index d4b1f60b87..c820a084f8 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -50,7 +50,7 @@ public:
     static const int DEFAULT_PERSIST_INTERVAL;
 
     DomainContentBackupManager(const QString& rootBackupDirectory,
-                               const QJsonObject& settings,
+                               const QVariantList& settings,
                                int persistInterval = DEFAULT_PERSIST_INTERVAL,
                                bool debugTimestampNow = false);
 
@@ -82,7 +82,7 @@ protected:
     void refreshBackupRules();
     bool getMostRecentBackup(const QString& format, QString& mostRecentBackupFileName, QDateTime& mostRecentBackupTime);
     int64_t getMostRecentBackupTimeInSecs(const QString& format);
-    void parseSettings(const QJsonObject& settings);
+    void parseBackupRules(const QVariantList& backupRules);
 
     std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 9cecea5f70..a332810e54 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -296,15 +296,12 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         qCDebug(domain_server) << "Created entities data directory";
     }
     maybeHandleReplacementEntityFile();
-    
-    auto contentArchivesGroup = _settingsManager.valueOrDefaultValueForKeyPath(AUTOMATIC_CONTENT_ARCHIVES_GROUP);
-    auto archivesIntervalObject = QJsonObject();
 
-    if (contentArchivesGroup.canConvert<QVariantMap>()) {
-        archivesIntervalObject = QJsonObject::fromVariantMap(contentArchivesGroup.toMap());
-    }
 
-    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), archivesIntervalObject));
+    static const QString BACKUP_RULES_KEYPATH = AUTOMATIC_CONTENT_ARCHIVES_GROUP + ".backup_rules";
+    auto backupRulesVariant = _settingsManager.valueOrDefaultValueForKeyPath(BACKUP_RULES_KEYPATH);
+
+    _contentManager.reset(new DomainContentBackupManager(getContentBackupDir(), backupRulesVariant.toList()));
 
     connect(_contentManager.get(), &DomainContentBackupManager::started, _contentManager.get(), [this](){
         _contentManager->addBackupHandler(BackupHandlerPointer(new EntitiesBackupHandler(getEntitiesFilePath(), getEntitiesReplacementFilePath())));

From 2faa67c68dd3d1cf9c814ce66283bc2da264a360 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 17:01:46 -0800
Subject: [PATCH 363/569] make filename regex less restrictive

---
 domain-server/src/DomainServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 9cecea5f70..0689bc5b5f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2250,7 +2250,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 // check the file extension to see what kind of file this is
                 // to make sure we handle this filetype for a content restore
                 auto dispositionValue = QString(firstFormData.first.value("Content-Disposition"));
-                auto formDataFilenameRegex = QRegExp("filename=\"(\\S+)\"");
+                auto formDataFilenameRegex = QRegExp("filename=\"(.+)\"");
                 auto matchIndex = formDataFilenameRegex.indexIn(dispositionValue);
 
                 QString uploadedFilename = "";

From c61aa4bf9595a8f359f0c288f5f654ab5ff1bb96 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 16 Feb 2018 15:49:10 -0800
Subject: [PATCH 364/569] Pass in backup name to handler

---
 domain-server/src/AssetsBackupHandler.cpp     | 57 +++++++++----------
 domain-server/src/AssetsBackupHandler.h       | 17 +++---
 domain-server/src/BackupHandler.h             | 12 ++--
 .../src/ContentSettingsBackupHandler.cpp      |  5 +-
 .../src/ContentSettingsBackupHandler.h        | 12 ++--
 .../src/DomainContentBackupManager.cpp        | 33 ++++++-----
 .../src/DomainContentBackupManager.h          |  2 +-
 domain-server/src/EntitiesBackupHandler.cpp   |  4 +-
 domain-server/src/EntitiesBackupHandler.h     | 12 ++--
 9 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 19b970f30a..aa92b19f4c 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -112,9 +112,9 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
 }
 
 
-std::pair<bool, float> AssetsBackupHandler::isAvailable(QString filePath) {
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
-        return value.filePath == filePath;
+std::pair<bool, float> AssetsBackupHandler::isAvailable(const QString& backupName) {
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+        return backup.name == backupName;
     });
     if (it == end(_backups)) {
         return { true, 1.0f };
@@ -154,10 +154,10 @@ std::pair<bool, float> AssetsBackupHandler::getRecoveryStatus() {
     return { true, progress };
 }
 
-void AssetsBackupHandler::loadBackup(QuaZip& zip) {
+void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
-    _backups.push_back({ zip.getZipName(), {}, false });
+    _backups.emplace_back(backupName, AssetUtils::Mappings(), false);
     auto& backup = _backups.back();
 
     if (!zip.setCurrentFile(MAPPINGS_FILE)) {
@@ -170,7 +170,7 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
 
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QFile::ReadOnly)) {
-        qCCritical(asset_backup) << "Could not unzip backup file for load:" << zip.getZipName();
+        qCCritical(asset_backup) << "Could not unzip backup file for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
         _allBackupsLoadedSuccessfully = false;
@@ -180,7 +180,7 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
     QJsonParseError error;
     auto document = QJsonDocument::fromJson(zipFile.readAll(), &error);
     if (document.isNull() || !document.isObject()) {
-        qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << zip.getZipName();
+        qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
         _allBackupsLoadedSuccessfully = false;
@@ -193,7 +193,7 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
         const auto& assetHash = it.value().toString();
 
         if (!AssetUtils::isValidHash(assetHash)) {
-            qCCritical(asset_backup) << "Corrupted mapping in loading backup file" << zip.getZipName() << ":" << it.key();
+            qCCritical(asset_backup) << "Corrupted mapping in loading backup file" << backupName << ":" << it.key();
             backup.corruptedBackup = true;
             _allBackupsLoadedSuccessfully = false;
             continue;
@@ -208,7 +208,7 @@ void AssetsBackupHandler::loadBackup(QuaZip& zip) {
     return;
 }
 
-void AssetsBackupHandler::createBackup(QuaZip& zip) {
+void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
@@ -226,12 +226,11 @@ void AssetsBackupHandler::createBackup(QuaZip& zip) {
         qCWarning(asset_backup) << "Backing up asset mappings that might be stale.";
     }
 
-    AssetServerBackup backup;
-    backup.filePath = zip.getZipName();
+    AssetUtils::Mappings mappings;
 
     QJsonObject jsonObject;
     for (const auto& mapping : _currentMappings) {
-        backup.mappings[mapping.first] = mapping.second;
+        mappings[mapping.first] = mapping.second;
         _assetsInBackups.insert(mapping.second);
         jsonObject.insert(mapping.first, mapping.second);
     }
@@ -248,10 +247,11 @@ void AssetsBackupHandler::createBackup(QuaZip& zip) {
         qCDebug(asset_backup) << "Could not close zip file: " << zipFile.getZipError();
         return;
     }
-    _backups.push_back(backup);
+    _backups.emplace_back(backupName, mappings, false);
+    qDebug() << "Created asset backup:" << backupName;
 }
 
-void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
+void AssetsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
@@ -269,13 +269,11 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
         qCWarning(asset_backup) << "Current asset mappings that might be stale.";
     }
 
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
-        return value.filePath == zip.getZipName();
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+        return backup.name == backupName;
     });
     if (it == end(_backups)) {
-        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to restore.";
-
-        loadBackup(zip);
+        loadBackup(backupName, zip);
 
         QuaZipDir zipDir { &zip, ZIP_ASSETS_FOLDER };
 
@@ -306,7 +304,7 @@ void AssetsBackupHandler::recoverBackup(QuaZip& zip) {
     restoreAllAssets();
 }
 
-void AssetsBackupHandler::deleteBackup(const QString& absoluteFilePath) {
+void AssetsBackupHandler::deleteBackup(const QString& backupName) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
@@ -314,33 +312,32 @@ void AssetsBackupHandler::deleteBackup(const QString& absoluteFilePath) {
         return;
     }
 
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
-        return value.filePath == absoluteFilePath;
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+        return backup.name == backupName;
     });
     if (it == end(_backups)) {
-        qCDebug(asset_backup) << "Could not find backup" << absoluteFilePath << "to delete.";
+        qCDebug(asset_backup) << "Could not find backup" << backupName << "to delete.";
         return;
     }
 
     refreshAssetsInBackups();
     checkForAssetsToDelete();
+    qDebug() << "Deleted asset backup:" << backupName;
 }
 
-void AssetsBackupHandler::consolidateBackup(QuaZip& zip) {
+void AssetsBackupHandler::consolidateBackup(const QString& backupName, QuaZip& zip) {
     Q_ASSERT(QThread::currentThread() == thread());
 
     if (operationInProgress()) {
         qCWarning(asset_backup) << "There is a backup/restore in progress.";
         return;
     }
-    QFileInfo zipInfo(zip.getZipName());
 
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
-        QFileInfo info(value.filePath);
-        return info.fileName() == zipInfo.fileName();
+    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+        return backup.name == backupName;
     });
     if (it == end(_backups)) {
-        qCDebug(asset_backup) << "Could not find backup" << zip.getZipName() << "to consolidate.";
+        qCDebug(asset_backup) << "Could not find backup" << backupName << "to consolidate.";
         return;
     }
 
@@ -465,7 +462,7 @@ bool AssetsBackupHandler::writeAssetFile(const AssetUtils::AssetHash& hash, cons
 }
 
 void AssetsBackupHandler::computeServerStateDifference(const AssetUtils::Mappings& currentMappings,
-                                                    const AssetUtils::Mappings& newMappings) {
+                                                       const AssetUtils::Mappings& newMappings) {
     _mappingsLeftToSet.reserve((int)newMappings.size());
     _assetsLeftToUpload.reserve((int)newMappings.size());
     _mappingsLeftToDelete.reserve((int)currentMappings.size());
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index a4b62f563d..1e9ae7cc38 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -31,14 +31,14 @@ class AssetsBackupHandler : public QObject, public BackupHandlerInterface {
 public:
     AssetsBackupHandler(const QString& backupDirectory);
 
-    std::pair<bool, float> isAvailable(QString filePath) override;
+    std::pair<bool, float> isAvailable(const QString& backupName) override;
     std::pair<bool, float> getRecoveryStatus() override;
 
-    void loadBackup(QuaZip& zip) override;
-    void createBackup(QuaZip& zip) override;
-    void recoverBackup(QuaZip& zip) override;
-    void deleteBackup(const QString& absoluteFilePath) override;
-    void consolidateBackup(QuaZip& zip) override;
+    void loadBackup(const QString& backupName, QuaZip& zip) override;
+    void createBackup(const QString& backupName, QuaZip& zip) override;
+    void recoverBackup(const QString& backupName, QuaZip& zip) override;
+    void deleteBackup(const QString& backupName) override;
+    void consolidateBackup(const QString& backupName, QuaZip& zip) override;
 
     bool operationInProgress() { return getRecoveryStatus().first; }
 
@@ -68,7 +68,10 @@ private:
     AssetUtils::Mappings _currentMappings;
 
     struct AssetServerBackup {
-        QString filePath;
+        AssetServerBackup(const QString& pName, AssetUtils::Mappings pMappings, bool pCorruptedBackup) :
+            name(pName), mappings(pMappings), corruptedBackup(pCorruptedBackup) {}
+
+        QString name;
         AssetUtils::Mappings mappings;
         bool corruptedBackup;
     };
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 7d876cec01..d3263fc3d3 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -22,16 +22,16 @@ class BackupHandlerInterface {
 public:
     virtual ~BackupHandlerInterface() = default;
 
-    virtual std::pair<bool, float> isAvailable(QString filePath) = 0;
+    virtual std::pair<bool, float> isAvailable(const QString& backupName) = 0;
 
     // Returns whether a recovery is ongoing and a progress between 0 and 1 if one is.
     virtual std::pair<bool, float> getRecoveryStatus() = 0;
 
-    virtual void loadBackup(QuaZip& zip) = 0;
-    virtual void createBackup(QuaZip& zip) = 0;
-    virtual void recoverBackup(QuaZip& zip) = 0;
-    virtual void deleteBackup(const QString& absoluteFilePath) = 0;
-    virtual void consolidateBackup(QuaZip& zip) = 0;
+    virtual void loadBackup(const QString& backupName, QuaZip& zip) = 0;
+    virtual void createBackup(const QString& backupName, QuaZip& zip) = 0;
+    virtual void recoverBackup(const QString& backupName, QuaZip& zip) = 0;
+    virtual void deleteBackup(const QString& backupName) = 0;
+    virtual void consolidateBackup(const QString& backupName, QuaZip& zip) = 0;
 };
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
diff --git a/domain-server/src/ContentSettingsBackupHandler.cpp b/domain-server/src/ContentSettingsBackupHandler.cpp
index be470bdd9f..7848cb1701 100644
--- a/domain-server/src/ContentSettingsBackupHandler.cpp
+++ b/domain-server/src/ContentSettingsBackupHandler.cpp
@@ -17,12 +17,11 @@
 ContentSettingsBackupHandler::ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager) :
     _settingsManager(domainServerSettingsManager)
 {
-
 }
 
 static const QString CONTENT_SETTINGS_BACKUP_FILENAME = "content-settings.json";
 
-void ContentSettingsBackupHandler::createBackup(QuaZip& zip) {
+void ContentSettingsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
 
     // grab the content settings as JSON,excluding default values and values hidden from backup
     QJsonObject contentSettingsJSON = _settingsManager.settingsResponseObjectForType("", true, false, true, false, true);
@@ -41,7 +40,7 @@ void ContentSettingsBackupHandler::createBackup(QuaZip& zip) {
     }
 }
 
-void ContentSettingsBackupHandler::recoverBackup(QuaZip& zip) {
+void ContentSettingsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip) {
     if (!zip.setCurrentFile(CONTENT_SETTINGS_BACKUP_FILENAME)) {
         qWarning() << "Failed to find" << CONTENT_SETTINGS_BACKUP_FILENAME << "while recovering backup";
         return;
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index ba252c862c..1d8bbae617 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -19,18 +19,18 @@ class ContentSettingsBackupHandler : public BackupHandlerInterface {
 public:
     ContentSettingsBackupHandler(DomainServerSettingsManager& domainServerSettingsManager);
 
-    std::pair<bool, float> isAvailable(QString filePath) override { return { true, 1.0f }; }
+    std::pair<bool, float> isAvailable(const QString& backupName) override { return { true, 1.0f }; }
     std::pair<bool, float> getRecoveryStatus() override { return { false, 1.0f }; }
 
-    void loadBackup(QuaZip& zip) override {}
+    void loadBackup(const QString& backupName, QuaZip& zip) override {}
 
-    void createBackup(QuaZip& zip) override;
+    void createBackup(const QString& backupName, QuaZip& zip) override;
 
-    void recoverBackup(QuaZip& zip) override;
+    void recoverBackup(const QString& backupName, QuaZip& zip) override;
 
-    void deleteBackup(const QString& absoluteFilePath) override {}
+    void deleteBackup(const QString& backupName) override {}
 
-    void consolidateBackup(QuaZip& zip) override {}
+    void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
 private:
     DomainServerSettingsManager& _settingsManager;
 };
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index dca3c645d6..4457df49f1 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -135,8 +135,7 @@ bool DomainContentBackupManager::process() {
         if (sinceLastSave > intervalToCheck) {
             _lastCheck = now;
             if (_isRecovering) {
-                using Value = std::vector<BackupHandlerPointer>::value_type;
-                bool isStillRecovering = std::any_of(begin(_backupHandlers), end(_backupHandlers), [](const Value& handler) {
+                bool isStillRecovering = any_of(begin(_backupHandlers), end(_backupHandlers), [](const BackupHandlerPointer& handler) {
                     return handler->getRecoveryStatus().first;
                 });
 
@@ -223,14 +222,13 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
     }
 
     QDir backupDir { _backupDirectory };
-    auto absoluteFilePath { backupDir.filePath(backupName) };
-    QFile backupFile { absoluteFilePath };
+    QFile backupFile { backupDir.filePath(backupName) };
     auto success = backupFile.remove();
 
     refreshBackupRules();
 
     for (auto& handler : _backupHandlers) {
-        handler->deleteBackup(absoluteFilePath);
+        handler->deleteBackup(backupName);
     }
 
     promise->resolve({
@@ -238,18 +236,18 @@ void DomainContentBackupManager::deleteBackup(MiniPromise::Promise promise, cons
     });
 }
 
-bool DomainContentBackupManager::recoverFromBackupZip(QuaZip& zip, const QString& backupName) {
+bool DomainContentBackupManager::recoverFromBackupZip(const QString& backupName, QuaZip& zip) {
     if (!zip.open(QuaZip::Mode::mdUnzip)) {
-        qWarning() << "Failed to unzip file: " << zip.getZipName();
+        qWarning() << "Failed to unzip file: " << backupName;
         return false;
     } else {
         _isRecovering = true;
 
         for (auto& handler : _backupHandlers) {
-            handler->recoverBackup(zip);
+            handler->recoverBackup(backupName, zip);
         }
 
-        qDebug() << "Successfully started recovering from " << zip.getZipName();
+        qDebug() << "Successfully started recovering from " << backupName;
         return true;
     }
 }
@@ -276,7 +274,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     if (backupFile.open(QIODevice::ReadOnly)) {
         QuaZip zip { &backupFile };
 
-        success = recoverFromBackupZip(zip, backupName);
+        success = recoverFromBackupZip(backupName, zip);
 
         backupFile.close();
     } else {
@@ -303,7 +301,8 @@ void DomainContentBackupManager::recoverFromUploadedBackup(MiniPromise::Promise
     QBuffer uploadedBackupBuffer { &uploadedBackup };
     QuaZip uploadedZip { &uploadedBackupBuffer };
 
-    bool success = recoverFromBackupZip(uploadedZip, MANUAL_BACKUP_PREFIX + "uploaded.zip");
+    QString backupName = MANUAL_BACKUP_PREFIX + "uploaded.zip";
+    bool success = recoverFromBackupZip(backupName, uploadedZip);
 
     promise->resolve({
         { "success", success }
@@ -339,7 +338,7 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
             for (auto& handler : _backupHandlers) {
                 bool handlerIsAvailable { true };
                 float progress { 0.0f };
-                std::tie(handlerIsAvailable, progress) = handler->isAvailable(fileInfo.absoluteFilePath());
+                std::tie(handlerIsAvailable, progress) = handler->isAvailable(fileName);
                 isAvailable &= handlerIsAvailable;
                 availabilityProgress += progress / _backupHandlers.size();
             }
@@ -377,7 +376,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
         for (auto& handler : _backupHandlers) {
             bool handlerIsAvailable { true };
             float progress { 0.0f };
-            std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.absolutePath);
+            std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.name);
             isAvailable &= handlerIsAvailable;
             availabilityProgress += progress / _backupHandlers.size();
         }
@@ -463,7 +462,7 @@ void DomainContentBackupManager::load() {
         }
 
         for (auto& handler : _backupHandlers) {
-            handler->loadBackup(zip);
+            handler->loadBackup(backup.name, zip);
         }
 
         zip.close();
@@ -507,7 +506,7 @@ void DomainContentBackupManager::backup() {
 void DomainContentBackupManager::consolidateBackup(MiniPromise::Promise promise, QString fileName) {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "consolidateBackup", Q_ARG(MiniPromise::Promise, promise),
-                                  Q_ARG(const QString&, fileName));
+                                  Q_ARG(QString, fileName));
         return;
     }
 
@@ -543,7 +542,7 @@ void DomainContentBackupManager::consolidateBackup(MiniPromise::Promise promise,
     }
 
     for (auto& handler : _backupHandlers) {
-        handler->consolidateBackup(zip);
+        handler->consolidateBackup(fileName, zip);
     }
 
     zip.close();
@@ -588,7 +587,7 @@ std::pair<bool, QString> DomainContentBackupManager::createBackup(const QString&
     }
 
     for (auto& handler : _backupHandlers) {
-        handler->createBackup(zip);
+        handler->createBackup(fileName, zip);
     }
 
     zip.close();
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index c820a084f8..06a8d0394f 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -86,7 +86,7 @@ protected:
 
     std::pair<bool, QString> createBackup(const QString& prefix, const QString& name);
 
-    bool recoverFromBackupZip(QuaZip& backupZip, const QString& backupName);
+    bool recoverFromBackupZip(const QString& backupName, QuaZip& backupZip);
 
 private:
     const QString _backupDirectory;
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index 6ad00d01c8..e15e8c5419 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -26,7 +26,7 @@ EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString e
 
 static const QString ENTITIES_BACKUP_FILENAME = "models.json.gz";
 
-void EntitiesBackupHandler::createBackup(QuaZip& zip) {
+void EntitiesBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
     QFile entitiesFile { _entitiesFilePath };
 
     if (entitiesFile.open(QIODevice::ReadOnly)) {
@@ -40,7 +40,7 @@ void EntitiesBackupHandler::createBackup(QuaZip& zip) {
     }
 }
 
-void EntitiesBackupHandler::recoverBackup(QuaZip& zip) {
+void EntitiesBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip) {
     if (!zip.setCurrentFile(ENTITIES_BACKUP_FILENAME)) {
         qWarning() << "Failed to find" << ENTITIES_BACKUP_FILENAME << "while recovering backup";
         return;
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index c143fe5774..7c018c9d2d 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -18,22 +18,22 @@ class EntitiesBackupHandler : public BackupHandlerInterface {
 public:
     EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath);
 
-    std::pair<bool, float> isAvailable(QString filePath) override { return { true, 1.0f }; }
+    std::pair<bool, float> isAvailable(const QString& backupName) override { return { true, 1.0f }; }
     std::pair<bool, float> getRecoveryStatus() override { return { false, 1.0f }; }
 
-    void loadBackup(QuaZip& zip) override {}
+    void loadBackup(const QString& backupName, QuaZip& zip) override {}
 
     // Create a skeleton backup
-    void createBackup(QuaZip& zip) override;
+    void createBackup(const QString& backupName, QuaZip& zip) override;
 
     // Recover from a full backup
-    void recoverBackup(QuaZip& zip) override;
+    void recoverBackup(const QString& backupName, QuaZip& zip) override;
 
     // Delete a skeleton backup
-    void deleteBackup(const QString& absoluteFilePath) override {}
+    void deleteBackup(const QString& backupName) override {}
 
     // Create a full backup
-    void consolidateBackup(QuaZip& zip) override {}
+    void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
 
 private:
     QString _entitiesFilePath;

From 5dd74674ef106559857cb256e70e7507e085fcca Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 17:18:28 -0800
Subject: [PATCH 365/569] fix spinner and restart behaviour for manual content
 upload

---
 domain-server/resources/web/content/js/content.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 525b989259..4d8034eb1d 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -54,7 +54,7 @@ $(document).ready(function(){
         var fileFormData = new FormData();
         fileFormData.append('restore-file', files[0]);
 
-        showSpinnerAlert("Restoring Content");
+        showSpinnerAlert("Uploading content to restore");
 
         $.ajax({
           url: '/content/upload',
@@ -65,7 +65,6 @@ $(document).ready(function(){
           data: fileFormData
         }).done(function(data, textStatus, jqXHR) {
           swal.close();
-          showRestartModal();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
             "Error",

From 85c1739df42f4dd0fdefac17ccb8dc9a710f7c5c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 16 Feb 2018 15:49:10 -0800
Subject: [PATCH 366/569] Fix filename not being passed in correctly

---
 domain-server/src/DomainContentBackupManager.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 4457df49f1..a218ee87ea 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -357,15 +357,6 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
         return;
     }
 
-    QDir backupDir { _backupDirectory };
-    auto matchingFiles =
-            backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + "*.zip", MANUAL_BACKUP_PREFIX + "*.zip" },
-                                    QDir::Files | QDir::NoSymLinks, QDir::Name);
-    QString prefixFormat = "(" + QRegExp::escape(AUTOMATIC_BACKUP_PREFIX) + "|" + QRegExp::escape(MANUAL_BACKUP_PREFIX) + ")";
-    QString nameFormat = "(.+)";
-    QString dateTimeFormat = "(" + DATETIME_FORMAT_RE + ")";
-    QRegExp backupNameFormat { prefixFormat + nameFormat + "-" + dateTimeFormat + "\\.zip" };
-
     auto backups = getAllBackups();
 
     QVariantList variantBackups;
@@ -376,7 +367,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
         for (auto& handler : _backupHandlers) {
             bool handlerIsAvailable { true };
             float progress { 0.0f };
-            std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.name);
+            std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.id);
             isAvailable &= handlerIsAvailable;
             availabilityProgress += progress / _backupHandlers.size();
         }
@@ -462,7 +453,7 @@ void DomainContentBackupManager::load() {
         }
 
         for (auto& handler : _backupHandlers) {
-            handler->loadBackup(backup.name, zip);
+            handler->loadBackup(backup.id, zip);
         }
 
         zip.close();

From 3f75bf62d58cce59fc0821f7870ac61aebd19375 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 18:03:16 -0800
Subject: [PATCH 367/569] check for recovery complete always, reload content
 page on restore

---
 .../resources/web/content/js/content.js       | 11 +++++++++
 .../src/DomainContentBackupManager.cpp        | 23 ++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 4d8034eb1d..268cd2f5dd 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -5,6 +5,8 @@ $(document).ready(function(){
   var UPLOAD_CONTENT_ALLOWED_DIV_ID = 'upload-content-allowed';
   var UPLOAD_CONTENT_RECOVERING_DIV_ID = 'upload-content-recovering';
 
+  var isRestoring = false;
+
   function progressBarHTML(extraClass, label) {
     var html = "<div class='progress'>";
     html += "<div class='" + extraClass + " progress-bar progress-bar-success progress-bar-striped active' role='progressbar' aria-valuemin='0' aria-valuemax='100'>";
@@ -64,6 +66,7 @@ $(document).ready(function(){
           contentType: false,
           data: fileFormData
         }).done(function(data, textStatus, jqXHR) {
+          isRestoring = true;
           swal.close();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
@@ -138,6 +141,13 @@ $(document).ready(function(){
         return value.isManualBackup;
       });
 
+      if (isRestoring && !data.status.isRecovering) {
+        // we were recovering and we finished - the DS is going to restart so show the restart modal
+        showRestartModal();
+      }
+
+      isRestoring = data.status.isRecovering;
+
       manualBackups = splitBackups[0];
       automaticBackups = splitBackups[1];
 
@@ -270,6 +280,7 @@ $(document).ready(function(){
 
         // setup an AJAX POST to request content restore
         $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
+          isRestoring = true;
           swal.close();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index a218ee87ea..d58b943317 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -132,19 +132,20 @@ bool DomainContentBackupManager::process() {
         int64_t sinceLastSave = now - _lastCheck;
         int64_t intervalToCheck = _persistInterval * MSECS_TO_USECS;
 
+        if (_isRecovering) {
+            bool isStillRecovering = any_of(begin(_backupHandlers), end(_backupHandlers), [](const BackupHandlerPointer& handler) {
+                return handler->getRecoveryStatus().first;
+            });
+
+            if (!isStillRecovering) {
+                _isRecovering = false;
+                _recoveryFilename = "";
+                emit recoveryCompleted();
+            }
+        }
+
         if (sinceLastSave > intervalToCheck) {
             _lastCheck = now;
-            if (_isRecovering) {
-                bool isStillRecovering = any_of(begin(_backupHandlers), end(_backupHandlers), [](const BackupHandlerPointer& handler) {
-                    return handler->getRecoveryStatus().first;
-                });
-
-                if (!isStillRecovering) {
-                    _isRecovering = false;
-                    _recoveryFilename = "";
-                    emit recoveryCompleted();
-                }
-            }
 
             if (!_isRecovering) {
                 backup();

From dc3b03c9bcbd3df163cacfabdb6701a2dad3055b Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 16 Feb 2018 18:37:47 -0800
Subject: [PATCH 368/569] Added shadows to shapes - still sucks...

---
 libraries/entities-renderer/src/RenderableEntityItem.cpp | 4 ++--
 libraries/render/src/render/Item.h                       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 7f2f57d1ac..1318f221c9 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -159,10 +159,10 @@ Item::Bound EntityRenderer::getBound() {
 
 ItemKey EntityRenderer::getKey() {
     if (isTransparent()) {
-        return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
+        return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withNoShadowCaster();
     }
 
-    return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
+    return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withShadowCaster();
 }
 
 uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) {
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index e4dcc7ee03..bd7daa228e 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -123,6 +123,7 @@ public:
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
+        Builder& withNoShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
         Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
         Builder& withSubMetaCulled() { _flags.set(SUB_META_CULLED); return (*this); }

From 7ba8a9935a5d18c2448e203c3556f1bd59ddbab2 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Fri, 16 Feb 2018 19:23:31 -0800
Subject: [PATCH 369/569] No extraneous shadows.

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

diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 178f5782dd..293150d552 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -87,6 +87,8 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShad
 
     if (canCastShadow) {
         builder.withShadowCaster();
+    } else {
+        builder.withNoShadowCaster();
     }
 
     if (isGroupCulled) {
@@ -427,6 +429,8 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCas
 
     if (canCastShadow) {
         builder.withShadowCaster();
+    } else {
+        builder.withNoShadowCaster();
     }
 
     if (isGroupCulled) {

From e5f953c103a5df5738b26affc6316ef751555e77 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sat, 17 Feb 2018 16:52:32 +0100
Subject: [PATCH 370/569] Make sure Flickable for GridView for TabletHome will
 not flick

---
 interface/resources/qml/hifi/tablet/TabletHome.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/resources/qml/hifi/tablet/TabletHome.qml b/interface/resources/qml/hifi/tablet/TabletHome.qml
index cfff3a3273..1922b02f93 100644
--- a/interface/resources/qml/hifi/tablet/TabletHome.qml
+++ b/interface/resources/qml/hifi/tablet/TabletHome.qml
@@ -130,6 +130,7 @@ Item {
                         flickableDirection: Flickable.AutoFlickIfNeeded
                         keyNavigationEnabled: false
                         highlightFollowsCurrentItem: false
+                        interactive: false
 
                         property int previousGridIndex: -1
 

From 47ed45b5e994298778020edff562262f68d67497 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Sat, 17 Feb 2018 18:14:44 +0000
Subject: [PATCH 371/569] Fixed extra " in backup_instructions.html

---
 interface/resources/html/commerce/backup_instructions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/html/commerce/backup_instructions.html b/interface/resources/html/commerce/backup_instructions.html
index 560894e33d..4056b81896 100644
--- a/interface/resources/html/commerce/backup_instructions.html
+++ b/interface/resources/html/commerce/backup_instructions.html
@@ -342,7 +342,7 @@
           <p>In High Fidelity, your private keys are used to securely access the contents of your Wallet and Purchases.</p>
 
         <hr>
-        <h3>Where are my private keys stored?"</h3>
+        <h3>Where are my private keys stored?</h3>
           <p>By default, your private keys are only stored on your hard drive in High Fidelity Interface's <code>AppData</code> directory.</p>
           <p>Here is the file path of your hifikey - you can browse to it using your file explorer.</p>
           <div class="alert"> <code>HIFIKEY_PATH_REPLACEME</code> </div>

From a69816f885146389750438f8a69caad5c62d297e Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Sat, 17 Feb 2018 15:21:57 -0800
Subject: [PATCH 372/569] WIP.

---
 libraries/entities/src/EntityItem.cpp         |  1 -
 .../entities/src/EntityItemProperties.cpp     | 36 ++++++++-----------
 .../src/EntityItemPropertiesDefaults.h        |  4 +--
 libraries/entities/src/EntityPropertyFlags.h  |  2 +-
 libraries/entities/src/ShapeEntityItem.cpp    | 27 --------------
 libraries/entities/src/ShapeEntityItem.h      |  3 --
 6 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index e14d0b6757..3b118a1376 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -903,7 +903,6 @@ void EntityItem::debugDump() const {
     qCDebug(entities, " edited ago:%f", (double)getEditedAgo());
     qCDebug(entities, " position:%f,%f,%f", (double)position.x, (double)position.y, (double)position.z);
     qCDebug(entities) << " dimensions:" << getScaledDimensions();
-    qCDebug(entities) << " can cast shadow" << getCanCastShadow();
 }
 
 // adjust any internal timestamps to fix clock skew for this server
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 78c6c6a6b3..60f0034d81 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -458,6 +458,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ANGULAR_VELOCITY, angularVelocity);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ANGULAR_DAMPING, angularDamping);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_VISIBLE, visible);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CAN_CAST_SHADOW, canCastShadow);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISIONLESS, collisionless);
     COPY_PROXY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_COLLISIONLESS, collisionless, ignoreForCollisions, getCollisionless()); // legacy support
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISION_MASK, collisionMask);
@@ -626,10 +627,10 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IS_UV_MODE_STRETCH, isUVModeStretch);
     }
 
-    // Models and Shapes
-    if (_type == EntityTypes::Model || _type == EntityTypes::Shape || _type == EntityTypes::Box || _type == EntityTypes::Sphere) {
-        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CAN_CAST_SHADOW, canCastShadow);
-    }
+    ////// Models and Shapes
+    ////if (_type == EntityTypes::Model || _type == EntityTypes::Shape || _type == EntityTypes::Box || _type == EntityTypes::Sphere) {
+    ////    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CAN_CAST_SHADOW, canCastShadow);
+    ////}
 
     if (!skipDefaults && !strictSemantics) {
         AABox aaBox = getAABox();
@@ -1364,6 +1365,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
             APPEND_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, properties.getAngularVelocity());
             APPEND_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, properties.getAngularDamping());
             APPEND_ENTITY_PROPERTY(PROP_VISIBLE, properties.getVisible());
+            APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, properties.getCanCastShadow());
             APPEND_ENTITY_PROPERTY(PROP_COLLISIONLESS, properties.getCollisionless());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, properties.getCollisionMask());
             APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, properties.getDynamic());
@@ -1506,14 +1508,14 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                 APPEND_ENTITY_PROPERTY(PROP_SHAPE, properties.getShape());
             }
 
-            // Only models and shapes (including cubes and spheres) can cast shadows
-            if (properties.getType() == EntityTypes::Model ||
-                properties.getType() == EntityTypes::Shape ||
-                properties.getType() == EntityTypes::Box ||
-                properties.getType() == EntityTypes::Sphere) {
-                
-                APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, properties.getCanCastShadow());
-            }
+            ////// Only models and shapes (including cubes and spheres) can cast shadows
+            ////if (properties.getType() == EntityTypes::Model ||
+            ////    properties.getType() == EntityTypes::Shape ||
+            ////    properties.getType() == EntityTypes::Box ||
+            ////    properties.getType() == EntityTypes::Sphere) {
+            ////    
+            ////    APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, properties.getCanCastShadow());
+            ////}
 
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, properties.getCollisionSoundURL());
@@ -1734,6 +1736,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ANGULAR_VELOCITY, glm::vec3, setAngularVelocity);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ANGULAR_DAMPING, float, setAngularDamping);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VISIBLE, bool, setVisible);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONLESS, bool, setCollisionless);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DYNAMIC, bool, setDynamic);
@@ -1871,15 +1874,6 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE, QString, setShape);
     }
 
-    // Can cast shadow flag
-    if (properties.getType() == EntityTypes::Model || 
-        properties.getType() == EntityTypes::Shape ||
-        properties.getType() == EntityTypes::Box ||
-        properties.getType() == EntityTypes::Sphere) {
-
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
-    }
-
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ACTION_DATA, QByteArray, setActionData);
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index efbf45ce8d..7a8db2591f 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,8 +46,8 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
-const bool ENTITY_ITEM_DEFAULT_CAST_SHADOWS { true };
-const bool ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW { false };
+const bool ENTITY_ITEM_DEFAULT_CAST_SHADOWS { false };
+const bool ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW { true };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
 const quint64 ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP = 0;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index ab17f2a873..3f542adfc2 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -20,6 +20,7 @@ enum EntityPropertyList {
 
     // these properties are supported by the EntityItem base class
     PROP_VISIBLE,
+    PROP_CAN_CAST_SHADOW,
     PROP_POSITION,
     PROP_DIMENSIONS,
     PROP_ROTATION,
@@ -31,7 +32,6 @@ enum EntityPropertyList {
     PROP_SCRIPT,
 
     // these properties are supported by some derived classes
-    PROP_CAN_CAST_SHADOW,
     PROP_COLOR,
 
     // these are used by models only
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 9d81e850df..10588aa643 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -91,7 +91,6 @@ EntityItemProperties ShapeEntityItem::getProperties(EntityPropertyFlags desiredP
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     properties.setColor(getXColor());
     properties.setShape(entity::stringFromShape(getShape()));
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
     
     return properties;
 }
@@ -131,7 +130,6 @@ bool ShapeEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(alpha, setAlpha);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(shape, setShape);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -157,7 +155,6 @@ int ShapeEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_SHAPE, QString, setShape);
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
-    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
 
     return bytesRead;
 }
@@ -169,7 +166,6 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_SHAPE;
     requestedProperties += PROP_COLOR;
     requestedProperties += PROP_ALPHA;
-    requestedProperties += PROP_CAN_CAST_SHADOW;
 
     return requestedProperties;
 }
@@ -186,7 +182,6 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_SHAPE, entity::stringFromShape(getShape()));
     APPEND_ENTITY_PROPERTY(PROP_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
-    APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
 }
 
 void ShapeEntityItem::setColor(const rgbColor& value) {
@@ -369,25 +364,3 @@ void ShapeEntityItem::computeShapeInfo(ShapeInfo& info) {
 ShapeType ShapeEntityItem::getShapeType() const {
     return _collisionShapeType;
 }
-
-bool ShapeEntityItem::getCanCastShadow() const {
-    bool result;
-    withReadLock([&] {
-        result = _canCastShadow;
-    });
-    return result;
-}
-
-void ShapeEntityItem::setCanCastShadow(bool value) {
-    bool changed = false;
-    withWriteLock([&] {
-        if (_canCastShadow != value) {
-            changed = true;
-            _canCastShadow = value;
-        }
-    });
-
-    if (changed) {
-        emit requestRenderUpdate();
-    }
-}
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 4bc008f761..f5677830c7 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -101,9 +101,6 @@ public:
     virtual void computeShapeInfo(ShapeInfo& info) override;
     virtual ShapeType getShapeType() const override;
 
-    bool getCanCastShadow() const;
-    void setCanCastShadow(bool value);
-
 protected:
 
     float _alpha { 1 };

From 3027d3461e446eca1901527206cdc064dd8efca8 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 17 Feb 2018 15:24:50 -0800
Subject: [PATCH 373/569] Qt 5.10 seems to indicate pendingDatagramSizes of 0. 
 Reading from these would block and causes an QAbstractSocket::TemporaryError
 to be thrown

---
 libraries/networking/src/udt/Socket.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 55643985c8..f705854bda 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -328,14 +328,14 @@ void Socket::checkForReadyReadBackup() {
 void Socket::readPendingDatagrams() {
     int packetSizeWithHeader = -1;
 
-    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
+    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) > 0) {
 
         // we're reading a packet so re-start the readyRead backup timer
         _readyReadBackupTimer->start();
 
         // grab a time point we can mark as the receive time of this packet
         auto receiveTime = p_high_resolution_clock::now();
-        
+
         // setup a HifiSockAddr to read into
         HifiSockAddr senderSockAddr;
 

From 0a92596452250881bec62a2faf9785603db6bf89 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 18 Feb 2018 10:04:22 -0800
Subject: [PATCH 374/569] don't rely on return value of pendingDatagramSize()
 when hasPendingDatagrams() is false

---
 libraries/networking/src/udt/Socket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index f705854bda..af9ff76eb3 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -328,7 +328,7 @@ void Socket::checkForReadyReadBackup() {
 void Socket::readPendingDatagrams() {
     int packetSizeWithHeader = -1;
 
-    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) > 0) {
+    while (_udpSocket.hasPendingDatagrams() && (packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
 
         // we're reading a packet so re-start the readyRead backup timer
         _readyReadBackupTimer->start();

From 81c9e449e69248b7e6369d7681a41778774c8fa1 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Sun, 18 Feb 2018 10:19:17 -0800
Subject: [PATCH 375/569] Models casting shadows (again).  (Something stupid
 happened...)

---
 libraries/entities/src/ShapeEntityItem.cpp | 1 -
 libraries/render/src/render/Item.h         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 10588aa643..c9ba96d06d 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -261,7 +261,6 @@ void ShapeEntityItem::debugDump() const {
     qCDebug(entities) << "         dimensions:" << debugTreeVector(getScaledDimensions());
     qCDebug(entities) << "      getLastEdited:" << debugTime(getLastEdited(), now);
     qCDebug(entities) << "SHAPE EntityItem Ptr:" << this;
-    qCDebug(entities) << "     can cast shadow" << getCanCastShadow();
 }
 
 void ShapeEntityItem::computeShapeInfo(ShapeInfo& info) {
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index bd7daa228e..25c1244990 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -123,7 +123,7 @@ public:
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
-        Builder& withNoShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
+        Builder& withNoShadowCaster() { _flags.reset(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
         Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
         Builder& withSubMetaCulled() { _flags.set(SUB_META_CULLED); return (*this); }

From 65efeadf107e2a9171714d4a020c5f297338d453 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 19 Feb 2018 19:17:23 +1300
Subject: [PATCH 376/569] Fix selecting values when tabbing between entity
 properties fields

---
 scripts/system/html/js/entityProperties.js | 44 ++++------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index b27c852974..349516393a 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -497,15 +497,6 @@ function unbindAllInputs() {
     }
 }
 
-function clearSelection() {
-    if (document.selection && document.selection.empty) {
-        document.selection.empty();
-    } else if (window.getSelection) {
-        var sel = window.getSelection();
-        sel.removeAllRanges();
-    }
-}
-
 function loaded() {
     openEventBridge(function() {
 
@@ -791,8 +782,10 @@ function loaded() {
                         if (lastEntityID !== '"' + properties.id + '"' && lastEntityID !== null && editor !== null) {
                             saveJSONUserData(true);
                         }
-                        // the event bridge and json parsing handle our avatar id string differently.
 
+                        var doSelectElement = lastEntityID === '"' + properties.id + '"';
+
+                        // the event bridge and json parsing handle our avatar id string differently.
                         lastEntityID = '"' + properties.id + '"';
                         elID.value = properties.id;
 
@@ -1138,12 +1131,10 @@ function loaded() {
                         }
 
                         var activeElement = document.activeElement;
-
-                        if (typeof activeElement.select !== "undefined") {
+                        if (doSelectElement && typeof activeElement.select !== "undefined") {
                             activeElement.select();
                         }
                     }
-                    clearSelection();
                 }
             });
         }
@@ -1682,34 +1673,13 @@ function loaded() {
         };
 
         // For input and textarea elements, select all of the text on focus
-        // WebKit-based browsers, such as is used with QWebView, have a quirk
-        // where the mouseup event comes after the focus event, causing the
-        // text to be deselected immediately after selecting all of the text.
-        // To make this work we block the first mouseup event after the elements
-        // received focus.  If we block all mouseup events the user will not
-        // be able to click within the selected text.
-        // We also check to see if the value has changed to make sure we aren't
-        // blocking a mouse-up event when clicking on an input spinner.
         var els = document.querySelectorAll("input, textarea");
         for (var i = 0; i < els.length; i++) {
-            var clicked = false;
-            var originalText;
-            // TODO FIXME: (JSHint) Functions declared within loops referencing 
-            //             an outer scoped variable may lead to confusing semantics.
-            els[i].onfocus = function(e) {
-                originalText = this.value;
-                this.select();
-                clicked = false;
-            };
-            // TODO FIXME: (JSHint) Functions declared within loops referencing 
-            //             an outer scoped variable may lead to confusing semantics.
-            els[i].onmouseup = function(e) {
-                if (!clicked && originalText === this.value) {
-                    e.preventDefault();
-                }
-                clicked = true;
+            els[i].onfocus = function (e) {
+                e.target.select();
             };
         }
+
         bindAllNonJSONEditorElements();
     });
 

From 6a9bbaf0a55175d3886d4a73c1f210c4909f613e Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Mon, 19 Feb 2018 12:00:30 -0800
Subject: [PATCH 377/569] WIP - clean-up.

---
 libraries/entities-renderer/src/RenderableEntityItem.cpp | 2 +-
 libraries/render-utils/src/MeshPartPayload.cpp           | 5 +----
 libraries/render-utils/src/RenderShadowTask.cpp          | 3 +++
 libraries/render/src/render/Item.h                       | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index 1318f221c9..b1251a2530 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -159,7 +159,7 @@ Item::Bound EntityRenderer::getBound() {
 
 ItemKey EntityRenderer::getKey() {
     if (isTransparent()) {
-        return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withNoShadowCaster();
+        return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
     }
 
     return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withShadowCaster();
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 293150d552..16eca007af 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -87,8 +87,6 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShad
 
     if (canCastShadow) {
         builder.withShadowCaster();
-    } else {
-        builder.withNoShadowCaster();
     }
 
     if (isGroupCulled) {
@@ -413,6 +411,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
     _worldBound.transform(boundTransform);
 }
 
+// Note that this method is called for models but not for shapes
 void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
@@ -429,8 +428,6 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCas
 
     if (canCastShadow) {
         builder.withShadowCaster();
-    } else {
-        builder.withNoShadowCaster();
     }
 
     if (isGroupCulled) {
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 7806c95330..be84482c63 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -223,7 +223,10 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
+
+    // Enable models to not cast shadows (otherwise, models will always cast shadows)
     static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withShadowCaster();
+
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index 25c1244990..f6cd6a19e1 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -123,7 +123,6 @@ public:
         Builder& withDeformed() { _flags.set(DEFORMED); return (*this); }
         Builder& withInvisible() { _flags.set(INVISIBLE); return (*this); }
         Builder& withShadowCaster() { _flags.set(SHADOW_CASTER); return (*this); }
-        Builder& withNoShadowCaster() { _flags.reset(SHADOW_CASTER); return (*this); }
         Builder& withLayered() { _flags.set(LAYERED); return (*this); }
         Builder& withMetaCullGroup() { _flags.set(META_CULL_GROUP); return (*this); }
         Builder& withSubMetaCulled() { _flags.set(SUB_META_CULLED); return (*this); }
@@ -227,7 +226,6 @@ public:
         Builder& withVisible()          { _value.reset(ItemKey::INVISIBLE); _mask.set(ItemKey::INVISIBLE); return (*this); }
         Builder& withInvisible()        { _value.set(ItemKey::INVISIBLE);  _mask.set(ItemKey::INVISIBLE); return (*this); }
 
-        Builder& withNoShadowCaster()   { _value.reset(ItemKey::SHADOW_CASTER); _mask.set(ItemKey::SHADOW_CASTER); return (*this); }
         Builder& withShadowCaster()     { _value.set(ItemKey::SHADOW_CASTER);  _mask.set(ItemKey::SHADOW_CASTER); return (*this); }
 
         Builder& withoutLayered()       { _value.reset(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }

From 992121780703dd586bf97ee74ffaf01f086a2aa1 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Mon, 19 Feb 2018 12:32:11 -0800
Subject: [PATCH 378/569] Shapes casting shadows OK.

---
 libraries/entities-renderer/src/RenderableEntityItem.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index b1251a2530..6483a7e891 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -162,7 +162,12 @@ ItemKey EntityRenderer::getKey() {
         return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
     }
 
-    return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withShadowCaster();
+    // This allows shapes to cast shadows
+    if (_canCastShadow) {
+        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withShadowCaster();
+    } else {
+        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
+    }
 }
 
 uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) {

From 5791ca4c5111faa42e0f8f64bd9b0806bdf3606c Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Tue, 20 Feb 2018 12:22:04 -0500
Subject: [PATCH 379/569] interim checkin

---
 interface/src/Application.cpp                 |   1 +
 .../src/avatars-renderer/Avatar.cpp           |  22 +--
 .../src/avatars-renderer/Avatar.h             |   5 +-
 .../src/RenderableModelEntityItem.cpp         |   3 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   2 +-
 .../src/RenderablePolyLineEntityItem.h        |   2 +-
 .../src/RenderablePolyVoxEntityItem.cpp       |  15 +-
 .../src/RenderablePolyVoxEntityItem.h         |   4 +-
 .../src/RenderableShapeEntityItem.cpp         |   9 +-
 .../src/RenderableShapeEntityItem.h           |   2 +-
 libraries/fbx/src/FBXReader.cpp               |   5 +-
 libraries/fbx/src/OBJWriter.cpp               |   7 +-
 .../GraphicsScriptingUtil.h                   |  10 +
 .../ModelScriptingInterface.cpp               |   8 +-
 .../src/graphics-scripting/ScriptableMesh.cpp |  31 ++-
 .../src/graphics-scripting/ScriptableMesh.h   |   2 +-
 .../graphics-scripting/ScriptableModel.cpp    | 149 ++++++++++++++
 .../src/graphics-scripting/ScriptableModel.h  |   2 +-
 libraries/graphics/src/graphics/Geometry.h    |   3 +-
 libraries/render-utils/src/GeometryCache.cpp  |   3 +-
 libraries/render-utils/src/Model.cpp          | 184 ++++++++++++------
 libraries/render-utils/src/Model.h            |   5 +-
 .../src/Model_temporary_hack.cpp.h            | 121 ++++++++++++
 .../src/AssetScriptingInterface.cpp           |   2 +-
 libraries/script-engine/src/ScriptEngines.cpp |  30 ++-
 libraries/script-engine/src/ScriptEngines.h   |  11 +-
 .../src/shared/ScriptInitializerMixin.h       |  38 ++++
 27 files changed, 557 insertions(+), 119 deletions(-)
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
 create mode 100644 libraries/render-utils/src/Model_temporary_hack.cpp.h
 create mode 100644 libraries/shared/src/shared/ScriptInitializerMixin.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bdef2f456b..5bfb1846a5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -771,6 +771,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
     DependencyManager::set<StatTracker>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT);
+    DependencyManager::set<ScriptInitializerMixin, NativeScriptInitializers>();
     DependencyManager::set<Preferences>();
     DependencyManager::set<recording::Deck>();
     DependencyManager::set<recording::Recorder>();
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 8e22f355e4..066afac8f5 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -35,7 +35,7 @@
 #include "ModelEntityItem.h"
 #include "RenderableModelEntityItem.h"
 
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 
 #include "Logging.h"
 
@@ -1763,24 +1763,24 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
     }
 }
 
-scriptable::ScriptableModel Avatar::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase Avatar::getScriptableModel(bool* ok) {
     qDebug() << "Avatar::getScriptableModel" ;
     if (!_skeletonModel || !_skeletonModel->isLoaded()) {
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
-    scriptable::ScriptableModel result;
-    result.metadata = {
+    scriptable::ScriptableModelBase result = _skeletonModel->getScriptableModel(ok);
+    result.objectID = getSessionUUID(); 
+    result.mixin({
         { "avatarID", getSessionUUID().toString() },
         { "url", _skeletonModelURL.toString() },
         { "origin", "Avatar/avatar::" + _displayName },
         { "textures", _skeletonModel->getTextures() },
-    };
-    result.mixin(_skeletonModel->getScriptableModel(ok));
-
-    // FIXME: for now access to attachment models are merged with the main avatar model
-    for (auto& attachmentModel : _attachmentModels) {
-        if (attachmentModel->isLoaded()) {
-            result.mixin(attachmentModel->getScriptableModel(ok));
+    });
+    // FIXME: for now access to attachment models are merged into the main avatar ScriptableModel set
+    for (int i = 0; i < (int)_attachmentModels.size(); i++) {
+        auto& model = _attachmentModels.at(i);
+        if (model->isLoaded()) {
+            result.append(model->getScriptableModel(ok), _attachmentData.at(i).toVariant().toMap());
         }
     }
     if (ok) {
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 5cfc399b65..50301a2507 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -1,3 +1,4 @@
+
 //
 //  Avatar.h
 //  interface/src/avatar
@@ -20,7 +21,7 @@
 #include <AvatarData.h>
 #include <ShapeInfo.h>
 #include <render/Scene.h>
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 #include <GLMHelpers.h>
 
 
@@ -274,7 +275,7 @@ public:
     virtual void setAvatarEntityDataChanged(bool value) override;
 
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 3d6714a400..155580d885 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -962,7 +962,6 @@ scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScript
 }
 
 bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
-    qCDebug(entitiesrenderer) << "REPLACING RenderableModelEntityItem" << newModel->objectName();
     ModelPointer model;
     withReadLock([&] { model = _model; });
 
@@ -970,7 +969,7 @@ bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scrip
         return false;
     }
 
-   return _model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
+   return model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
 }
 
 void RenderableModelEntityItem::simulateRelayedJoints() {
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index e18bd2a7fe..a70a1613c3 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -281,7 +281,7 @@ std::vector<PolyLineEntityRenderer::Vertex> PolyLineEntityRenderer::updateVertic
     return vertices;
 }
 
-scriptable::ScriptableModel PolyLineEntityRenderer::getScriptableModel(bool *ok) {
+scriptable::ScriptableModelBase PolyLineEntityRenderer::getScriptableModel(bool *ok) {
     // TODO: adapt polyline into a triangles mesh...
     return EntityRenderer::getScriptableModel(ok);
 }
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 3bb8901178..d9d770e64f 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -25,7 +25,7 @@ class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
 public:
     PolyLineEntityRenderer(const EntityItemPointer& entity);
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 protected:
     virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
     virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index fd923c40b0..454fba4f94 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1414,14 +1414,14 @@ void RenderablePolyVoxEntityItem::bonkNeighbors() {
     }
 }
 
-scriptable::ScriptableModel RenderablePolyVoxEntityItem::getScriptableModel(bool * ok) {
+scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel(bool * ok) {
     if (!updateDependents() || !_mesh) {
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
     bool success = false;
     glm::mat4 transform = voxelToLocalMatrix();
-    scriptable::ScriptableModel result;
+    scriptable::ScriptableModelBase result;
     withReadLock([&] {
         gpu::BufferView::Index numVertices = (gpu::BufferView::Index)_mesh->getNumVertices();
         if (!_meshReady) {
@@ -1433,11 +1433,12 @@ scriptable::ScriptableModel RenderablePolyVoxEntityItem::getScriptableModel(bool
         } else {
             success = true;
             // the mesh will be in voxel-space.  transform it into object-space
-            result.meshes << 
-                _mesh->map([=](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
-                           [=](glm::vec3 color){ return color; },
-                           [=](glm::vec3 normal){ return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
-                           [&](uint32_t index){ return index; });
+            result.append(_mesh->map(
+                [=](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                [=](glm::vec3 color){ return color; },
+                [=](glm::vec3 normal){ return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
+                [&](uint32_t index){ return index; }
+            ));
         }
     });
     if (ok) {
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index 55b9be23d8..733d5b62f5 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -113,7 +113,7 @@ public:
 
     void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 
 private:
     bool updateOnCount(const ivec3& v, uint8_t toValue);
@@ -163,7 +163,7 @@ class PolyVoxEntityRenderer : public TypedEntityRenderer<RenderablePolyVoxEntity
 
 public:
     PolyVoxEntityRenderer(const EntityItemPointer& entity);
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override {
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override {
         return asTypedEntity<RenderablePolyVoxEntityItem>()->getScriptableModel(ok);
     }
     
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 746102681c..5ea1c9edb7 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -157,8 +157,8 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     args->_details._trianglesRendered += (int)triCount;
 }
 
-scriptable::ScriptableModel ShapeEntityRenderer::getScriptableModel(bool* ok)  {
-    scriptable::ScriptableModel result;
+scriptable::ScriptableModelBase ShapeEntityRenderer::getScriptableModel(bool* ok)  {
+    scriptable::ScriptableModelBase result;
     result.metadata = {
         { "entityID", getEntity()->getID().toString() },
         { "shape", entity::stringFromShape(_shape) },
@@ -169,7 +169,10 @@ scriptable::ScriptableModel ShapeEntityRenderer::getScriptableModel(bool* ok)  {
     auto vertexColor = glm::vec3(_color);
     auto success = false;
     if (auto mesh = geometryCache->meshFromShape(geometryShape, vertexColor)) {
-        result.meshes << mesh;
+        scriptable::ScriptableMeshBase base{ mesh, {
+            { "shape", entity::stringFromShape(_shape) },
+        }};
+        result.append(base);
         success = true;
     }
     if (ok) {
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index 6ada7e7317..57f899641a 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -22,7 +22,7 @@ class ShapeEntityRenderer : public TypedEntityRenderer<ShapeEntityItem> {
 public:
     ShapeEntityRenderer(const EntityItemPointer& entity);
 
-    virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 
 private:
     virtual bool needsRenderUpdate() const override;
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 50abe7928f..402afea2cc 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1897,7 +1897,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         geometry.meshes.append(extracted.mesh);
         int meshIndex = geometry.meshes.size() - 1;
         if (extracted.mesh._mesh) {
-            extracted.mesh._mesh->displayName = QString("%1#/mesh/%2").arg(url).arg(meshIndex);
+            extracted.mesh._mesh->displayName = QString("%1#/mesh/%2").arg(url).arg(meshIndex).toStdString();
+            extracted.mesh._mesh->modelName = modelIDsToNames.value(modelID).toStdString();
         }
         meshIDsToMeshIndices.insert(it.key(), meshIndex);
     }
@@ -1983,7 +1984,7 @@ FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QStri
     reader._loadLightmaps = loadLightmaps;
     reader._lightmapLevel = lightmapLevel;
 
-    qDebug() << "Reading FBX: " << url;
+    qCDebug(modelformat) << "Reading FBX: " << url;
 
     return reader.extractFBXGeometry(mapping, url);
 }
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 5307f49f36..621852f591 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -71,7 +71,8 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
             out << formatFloat(v[1]) << " ";
             out << formatFloat(v[2]);
             if (colorIndex < numColors) {
-                glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
+                glm::vec3 color = glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(colorsBufferView, colorIndex));
+                //glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
                 out << " " << formatFloat(color[0]);
                 out << " " << formatFloat(color[1]);
                 out << " " << formatFloat(color[2]);
@@ -94,7 +95,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
         for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
-            glm::vec3 normal = glmVecFromVariant<glm::vec3>(bufferViewElementToVariant(normalsBufferView, i));
+            glm::vec3 normal = glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(normalsBufferView, i));
             //glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
             out << "vn ";
             out << formatFloat(normal[0]) << " ";
@@ -117,7 +118,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& indexBuffer = mesh->getIndexBuffer();
 
         graphics::Index partCount = (graphics::Index)mesh->getNumParts();
-        QString name = (!mesh->displayName.size() ? QString("mesh-%1-part").arg(nth) : QString(mesh->displayName))
+        QString name = (!mesh->displayName.size() ? QString("mesh-%1-part").arg(nth) : QString::fromStdString(mesh->displayName))
             .replace(QRegExp("[^-_a-zA-Z0-9]"), "_");
         for (int partIndex = 0; partIndex < partCount; partIndex++) {
             const graphics::Mesh::Part& part = partBuffer.get<graphics::Mesh::Part>(partIndex);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
index a536fc413c..cfa510f87f 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
@@ -19,7 +19,9 @@ namespace scriptable {
     // JS => QPointer<QObject>
     template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value) {
         auto obj = value.toQObject();
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "qpointer_qobject_cast" << obj << value.toString();
+#endif
         if (auto tmp = qobject_cast<T*>(obj)) {
             return QPointer<T>(tmp);
         }
@@ -41,11 +43,15 @@ namespace scriptable {
     // C++ > QtOwned instance
     template <typename T, class... Rest> std::shared_ptr<T> make_qtowned(Rest... rest) {
         T* tmp = new T(rest...);
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "scriptable::make_qtowned" << toDebugString(tmp);
+#endif
         QString debug = toDebugString(tmp);
         if (tmp) {
             tmp->metadata["__ownership__"] = QScriptEngine::QtOwnership;
+#ifdef SCRIPTABLE_MESH_DEBUG
             QObject::connect(tmp, &QObject::destroyed, [=]() {  qCInfo(graphics_scripting) << "-------- ~scriptable::make_qtowned" << debug; });
+#endif
             auto ptr = std::shared_ptr<T>(tmp, [debug](T* tmp) {
                     //qDebug() << "~std::shared_ptr<T>" << debug;
                 delete tmp;
@@ -58,7 +64,9 @@ namespace scriptable {
     // C++ > ScriptOwned JS instance
     template <typename T, class... Rest> QPointer<T> make_scriptowned(Rest... rest) {
         T* tmp = new T(rest...);
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "scriptable::make_scriptowned" << toDebugString(tmp);
+#endif
         if (tmp) {
             tmp->metadata["__ownership__"] = QScriptEngine::ScriptOwnership;
             //auto blah = (DeleterFunction)[](void* delme) { };
@@ -71,12 +79,14 @@ namespace scriptable {
     template <typename T> QPointer<T> add_scriptowned_destructor(T* tmp) {
         QString debug = toDebugString(tmp);
         if (tmp) {
+#ifdef SCRIPTABLE_MESH_DEBUG
             QObject::connect(tmp, &QObject::destroyed, [=]() {
                     qCInfo(graphics_scripting) << "-------- ~scriptable::make_scriptowned" << debug;// << !!customDeleter;
                 //if (customDeleter) {
                     // customDeleter(tmp);
                 //}
             });
+#endif
         } else {
             qCInfo(graphics_scripting) << "add_scriptowned_destructor -- not connecting to null value" << debug;
         }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
index ab9403a8ed..d78f646087 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
@@ -48,7 +48,7 @@ bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::Scripta
 
 bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model) {
     auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
+    //qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
     scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
     QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
     if (providerType.isEmpty()) {
@@ -56,12 +56,12 @@ bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::Scripta
     }
     bool success = false;
     if (provider) {
-        qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
+        //qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
         auto scriptableMeshes = provider->getScriptableModel(&success);
-        qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
+        //qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
         if (success) {
             const scriptable::ScriptableModelBasePointer base = model->operator scriptable::ScriptableModelBasePointer();
-            qCDebug(graphics_scripting) << "as base" << base;
+            //qCDebug(graphics_scripting) << "as base" << base;
             if (base) {
                 //auto meshes = model->getConstMeshes();
                 success = provider->replaceScriptableModelMeshPart(base, -1, -1);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index b83b901acd..c662371c89 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -28,6 +28,8 @@
 
 #include "OBJWriter.h"
 
+// #define SCRIPTABLE_MESH_DEBUG
+
 namespace scriptable {
     // QScriptValue jsBindCallback(QScriptValue callback);
     // template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value);
@@ -287,7 +289,9 @@ quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
         return 0;
     }
     auto meshPart = js ? js->toScriptValue(getSelf()) : QScriptValue::NullValue;
+#ifdef SCRIPTABLE_MESH_DEBUG
     qCInfo(graphics_scripting) << "mapAttributeValues" << mesh.get() << js->currentContext()->thisObject().toQObject();
+#endif
     auto obj = js->newObject();
     auto attributeViews = buffer_helpers::gatherBufferViews(mesh, { "normal", "color" });
     metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
@@ -328,9 +332,10 @@ quint32 scriptable::ScriptableMeshPart::mapAttributeValues(QScriptValue callback
 }
 
 bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
-    auto meshProxy = this;
     auto mesh = getMeshPointer();
+#ifdef SCRIPTABLE_MESH_DEBUG
     qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices" << !!mesh<< !!meshProxy;
+#endif
     if (!mesh) {
         return false;
     }
@@ -527,28 +532,32 @@ scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool rec
         qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh -- !meshPointer";
         return nullptr;
     }
-    qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
+    // qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
     auto clone = buffer_helpers::cloneMesh(mesh);
     
-    qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
+    // qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
     if (recalcNormals) {
         buffer_helpers::recalculateNormals(clone);
     }
-    qCDebug(graphics_scripting) << clone.get();// << metadata;
+    //qCDebug(graphics_scripting) << clone.get();// << metadata;
     auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, metadata);
     clone.reset(); // free local reference
-    qCInfo(graphics_scripting) << "========= ScriptableMesh::cloneMesh..." << meshPointer << meshPointer->ownedMesh.use_count();
+    // qCInfo(graphics_scripting) << "========= ScriptableMesh::cloneMesh..." << meshPointer << meshPointer->ownedMesh.use_count();
     //scriptable::MeshPointer* ppMesh = new scriptable::MeshPointer();
     //*ppMesh = clone;
 
-    if (meshPointer) {
+    if (0 && meshPointer) {
         scriptable::WeakMeshPointer delme = meshPointer->mesh;
         QString debugString = scriptable::toDebugString(meshPointer);
         QObject::connect(meshPointer, &QObject::destroyed, meshPointer, [=]() {
-            qCWarning(graphics_scripting) << "*************** cloneMesh/Destroy";
-            qCWarning(graphics_scripting) << "*************** " << debugString << delme.lock().get();
+            // qCWarning(graphics_scripting) << "*************** cloneMesh/Destroy";
+            // qCWarning(graphics_scripting) << "*************** " << debugString << delme.lock().get();
             if (!delme.expired()) {
-                qCWarning(graphics_scripting) << "cloneMesh -- potential memory leak..." << debugString << delme.lock().get();
+                QTimer::singleShot(250, this, [=]{
+                    if (!delme.expired()) {
+                        qCWarning(graphics_scripting) << "cloneMesh -- potential memory leak..." << debugString << delme.use_count();
+                    }
+                });
             }
         });
     }
@@ -575,12 +584,16 @@ scriptable::ScriptableMeshBase& scriptable::ScriptableMeshBase::operator=(const
 }
                                                                                                                                                                                                scriptable::ScriptableMeshBase::~ScriptableMeshBase() {
     ownedMesh.reset();
+#ifdef SCRIPTABLE_MESH_DEBUG
     qCInfo(graphics_scripting) << "//~ScriptableMeshBase" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
+#endif
 }
 
 scriptable::ScriptableMesh::~ScriptableMesh() {
     ownedMesh.reset();
+#ifdef SCRIPTABLE_MESH_DEBUG
     qCInfo(graphics_scripting) << "//~ScriptableMesh" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
+#endif
 }
 
 QString scriptable::ScriptableMeshPart::toOBJ() {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index c655167c2b..ba0efa007d 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -100,7 +100,7 @@ namespace scriptable {
         ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
         ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
         ScriptableMeshPart(const ScriptableMeshPart& other) : parentMesh(other.parentMesh), partIndex(other.partIndex) {}
-        ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
+        // ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
 
     public slots:
         scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
new file mode 100644
index 0000000000..c8f1975249
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -0,0 +1,149 @@
+//
+//  ScriptableModel.cpp
+//  libraries/graphics-scripting
+//
+//  Copyright 2018 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 "GraphicsScriptingUtil.h"
+#include "ScriptableModel.h"
+#include "ScriptableMesh.h"
+
+#include <QtScript/QScriptEngine>
+//#include "ScriptableModel.moc"
+
+void scriptable::ScriptableModelBase::mixin(const QVariantMap& modelMetaData) {
+    for (const auto& key : modelMetaData.keys()) {
+        const auto& value = modelMetaData[key];
+        if (metadata.contains(key) && metadata[key].type() == (QVariant::Type)QMetaType::QVariantList) {
+            qCDebug(graphics_scripting) << "CONCATENATING" << key << metadata[key].toList().size() << "+" << value.toList().size();
+            metadata[key] = metadata[key].toList() + value.toList();
+        } else {
+            metadata[key] = modelMetaData[key];
+        }
+    }
+}
+
+scriptable::ScriptableModelBase::~ScriptableModelBase() {
+#ifdef SCRIPTABLE_MESH_DEBUG
+    qCDebug(graphics_scripting) << "~ScriptableModelBase" << this;
+#endif
+    for (auto& m : meshes) {
+        m.ownedMesh.reset();
+        //qCDebug(graphics_scripting) << "~~~~ScriptableModelBase" << &m << m.mesh.use_count();
+    }
+    meshes.clear();
+    //qCDebug(graphics_scripting) << "//~ScriptableModelBase" << this;
+}
+void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
+    //qCDebug(graphics_scripting) << "+ APPEND WeakMeshPointer" << mesh.lock().get();
+    meshes << ScriptableMeshBase{ provider, this, mesh, metadata };
+}
+
+void scriptable::ScriptableModelBase::append(const ScriptableMeshBase& mesh, const QVariantMap& modelMetaData) {
+    //qCDebug(graphics_scripting) << "+ APPEND ScriptableMeshBase" << &mesh;
+    if (mesh.provider.lock().get() != provider.lock().get()) {
+        qCDebug(graphics_scripting) << "warning: appending mesh from different provider..." << mesh.provider.lock().get() << " != " << provider.lock().get();
+    }
+    //if (mesh.model && mesh.model != this) {
+    //    qCDebug(graphics_scripting) << "warning: appending mesh from different model..." << mesh.model << " != " << this;
+    //}                    
+    meshes << mesh;
+    mixin(modelMetaData);
+}
+
+void scriptable::ScriptableModelBase::append(const ScriptableModelBase& other, const QVariantMap& modelMetaData) {
+    //qCDebug(graphics_scripting) << "+ APPEND ScriptableModelBase" << &other;
+    for (const auto& mesh : other.meshes) { append(mesh); }
+    mixin(other.metadata);
+    mixin(modelMetaData);
+}
+
+
+QString scriptable::ScriptableModel::toString() const {
+    return QString("[ScriptableModel%1%2]")
+        .arg(objectID.isNull() ? "" : " objectID="+objectID.toString())
+        .arg(objectName().isEmpty() ? "" : " name=" +objectName());
+}
+
+scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const QVariantMap& options) {
+    scriptable::ScriptableModelPointer clone = scriptable::ScriptableModelPointer(new scriptable::ScriptableModel(*this));
+    qCDebug(graphics_scripting) << "clone->getNumMeshes" << clone->getNumMeshes();
+    clone->meshes.clear();
+    qCDebug(graphics_scripting) << "..clone->getNumMeshes" << clone->getNumMeshes();
+    for (const auto &mesh : getConstMeshes()) {
+        auto cloned = mesh->cloneMesh(options.value("recalculateNormals").toBool());
+        if (auto tmp = qobject_cast<scriptable::ScriptableMeshBase*>(cloned)) {
+            qCDebug(graphics_scripting) << "++ APPEND"  << tmp << tmp->ownedMesh.use_count() << tmp->metadata.value("__ownership__") << tmp->metadata.value("__native__");
+            clone->meshes << *tmp;
+            tmp->deleteLater();
+            qCDebug(graphics_scripting) << "//++ APPEND"  << clone->meshes.constLast().ownedMesh.use_count();;
+        } else {
+            qCDebug(graphics_scripting) << "error cloning mesh" << cloned;
+        }
+    }
+    qCDebug(graphics_scripting) << "//clone->getNumMeshes" << clone->getNumMeshes();
+    return clone;
+}
+
+
+const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
+    QVector<scriptable::ScriptableMeshPointer> out;
+    for(const auto& mesh : meshes) {
+        const scriptable::ScriptableMesh* m = qobject_cast<const scriptable::ScriptableMesh*>(&mesh);
+        if (!m) {
+            m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
+        } else {
+            qCDebug(graphics_scripting) << "reusing scriptable mesh" << m;
+        }
+        const scriptable::ScriptableMeshPointer mp = scriptable::ScriptableMeshPointer(const_cast<scriptable::ScriptableMesh*>(m));
+        out << mp;
+    }
+    return out;
+}
+
+QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
+    QVector<scriptable::ScriptableMeshPointer> out;
+    for(auto& mesh : meshes) {
+        scriptable::ScriptableMesh* m = qobject_cast<scriptable::ScriptableMesh*>(&mesh);
+        if (!m) {
+            m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
+        } else {
+            qCDebug(graphics_scripting) << "reusing scriptable mesh" << m;
+        }
+        scriptable::ScriptableMeshPointer mp = scriptable::ScriptableMeshPointer(m);
+        out << mp;
+    }
+    return out;
+}
+
+quint32 scriptable::ScriptableModel::mapAttributeValues(QScriptValue callback) {
+    quint32 result = 0;
+    QVector<scriptable::ScriptableMeshPointer> in = getMeshes();
+    if (in.size()) {
+        foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
+            result += meshProxy->mapAttributeValues(callback);
+        }
+    }
+    return result;
+}
+
+/*namespace {
+    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, scriptable::ScriptableModelPointer const &in) {
+        return qObjectToScriptValue(engine, in);
+    }
+    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
+        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableModel>(value);
+    }
+}
+
+namespace scriptable {
+    bool registerMetaTypes(QScriptEngine* engine) {
+        qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
+        return true;
+    }
+}
+*/
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index 97a73ddd61..d2c50bd768 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -16,7 +16,7 @@ namespace scriptable {
         ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
         ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
         ScriptableModel& operator=(const ScriptableModelBase& view) {  ScriptableModelBase::operator=(view); return *this; }
-        virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
+        //virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
 
         Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
         // TODO: in future accessors for these could go here
diff --git a/libraries/graphics/src/graphics/Geometry.h b/libraries/graphics/src/graphics/Geometry.h
index 23ebec2965..a75fb1bf62 100755
--- a/libraries/graphics/src/graphics/Geometry.h
+++ b/libraries/graphics/src/graphics/Geometry.h
@@ -136,7 +136,8 @@ public:
 
     static MeshPointer createIndexedTriangles_P3F(uint32_t numVertices, uint32_t numTriangles, const glm::vec3* vertices = nullptr, const uint32_t* indices = nullptr);
 
-    QString displayName;
+    std::string modelName;
+    std::string displayName;
 
 protected:
 
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 6aa42cf6df..95985a48cb 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -2448,7 +2448,8 @@ graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec
     auto partBuffer = new gpu::Buffer(sizeof(graphics::Mesh::Part), (gpu::Byte*)&part);
     mesh->setPartBuffer(gpu::BufferView(partBuffer, gpu::Element::PART_DRAWCALL));
 
-    mesh->displayName = QString("GeometryCache/shape::%1").arg(GeometryCache::stringFromShape(geometryShape));
+    mesh->modelName = GeometryCache::stringFromShape(geometryShape).toStdString();
+    mesh->displayName = QString("GeometryCache/shape::%1").arg(GeometryCache::stringFromShape(geometryShape)).toStdString();
 
     return mesh;
 }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index ae5ac5d61c..81ff5433f7 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -9,6 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <QtCore/QLoggingCategory>
+namespace { QLoggingCategory wtf{ "tim.Model.cpp" }; }
+
+
 #include "Model.h"
 
 #include <QMetaType>
@@ -26,7 +30,7 @@
 #include <GLMHelpers.h>
 #include <TBBHelpers.h>
 
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 #include <DualQuaternion.h>
 
 #include <glm/gtc/packing.hpp>
@@ -75,7 +79,7 @@ void initCollisionMaterials() {
             graphics::MaterialPointer material;
             material = std::make_shared<graphics::Material>();
             int index = j * sectionWidth + i;
-            float red = component[index];
+            float red = component[index % NUM_COLLISION_HULL_COLORS];
             float green = component[(index + greenPhase) % NUM_COLLISION_HULL_COLORS];
             float blue = component[(index + bluePhase) % NUM_COLLISION_HULL_COLORS];
             material->setAlbedo(glm::vec3(red, green, blue));
@@ -573,35 +577,109 @@ bool Model::convexHullContains(glm::vec3 point) {
     return false;
 }
 
-scriptable::ScriptableModel Model::getScriptableModel(bool* ok) {
-    scriptable::ScriptableModel result;
+// FIXME: temporary workaround that updates the whole FBXGeometry (to keep findRayIntersection in sync)
+#include "Model_temporary_hack.cpp.h"
+
+bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer _newModel, int meshIndex, int partIndex) {
+    QMutexLocker lock(&_mutex);
+
+    if (!isLoaded()) {
+        return false;
+    }
+
+    {
+        // FIXME: temporary workaround for updating the whole FBXGeometry (to keep findRayIntersection in sync)
+        auto newRenderGeometry = new MyGeometryMappingResource(
+            _url, _renderGeometry, _newModel ? scriptable::make_qtowned<scriptable::ScriptableModelBase>(*_newModel) : nullptr
+            );
+        _needsUpdateTextures = true;
+        _visualGeometryRequestFailed = false;
+        invalidCalculatedMeshBoxes();
+        deleteGeometry();
+        _renderGeometry.reset(newRenderGeometry);
+        onInvalidate();
+        reset();
+        _rig.destroyAnimGraph();
+        assert(_rig.jointStatesEmpty());
+        updateGeometry();
+        calculateTriangleSets();
+        computeMeshPartLocalBounds();
+        _needsReload = false;
+        _needsFixupInScene = true;
+        invalidCalculatedMeshBoxes();
+        setRenderItemsNeedUpdate();
+    }
+    return true;
+}
+
+scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
+    QMutexLocker lock(&_mutex);
+    scriptable::ScriptableModelBase result;
     const Geometry::Pointer& renderGeometry = getGeometry();
 
     if (!isLoaded()) {
-        qDebug() << "Model::getScriptableModel -- !isLoaded";
+        qCDebug(wtf) << "Model::getScriptableModel -- !isLoaded";
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
     const FBXGeometry& geometry = getFBXGeometry();
-    auto mat4toVariant = [](const glm::mat4& mat4) -> QVariant {
-        QVector<float> floats;
-        floats.resize(16);
-        memcpy(floats.data(), &mat4, sizeof(glm::mat4));
-        QVariant v;
-        v.setValue<QVector<float>>(floats);
-        return v;
-    };
+    Transform offset;
+    offset.setScale(_scale);
+    offset.postTranslate(_offset);
+    glm::mat4 offsetMat = offset.getMatrix();
+    glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
+    glm::mat4 meshToWorldMatrix = createMatFromQuatAndPos(_rotation, _translation) * meshToModelMatrix;
     result.metadata = {
         { "url", _url.toString() },
         { "textures", renderGeometry->getTextures() },
         { "offset", vec3toVariant(_offset) },
-        { "scale", vec3toVariant(_scale) },
-        { "rotation", quatToVariant(_rotation) },
-        { "translation", vec3toVariant(_translation) },
-        { "meshToModel", mat4toVariant(glm::scale(_scale) * glm::translate(_offset)) },
-        { "meshToWorld", mat4toVariant(createMatFromQuatAndPos(_rotation, _translation) * (glm::scale(_scale) * glm::translate(_offset))) },
-        { "geometryOffset", mat4toVariant(geometry.offset) },
+        { "scale", vec3toVariant(getScale()) },
+        { "rotation", quatToVariant(getRotation()) },
+        { "translation", vec3toVariant(getTranslation()) },
+        { "meshToModel", buffer_helpers::toVariant(meshToModelMatrix) },
+        { "meshToWorld", buffer_helpers::toVariant(meshToWorldMatrix) },
+        { "geometryOffset", buffer_helpers::toVariant(geometry.offset) },
+        { "naturalDimensions", vec3toVariant(getNaturalDimensions()) },
+        { "meshExtents", buffer_helpers::toVariant(getMeshExtents()) },
+        { "unscaledMeshExtents", buffer_helpers::toVariant(getUnscaledMeshExtents()) },
+        { "meshBound", buffer_helpers::toVariant(Extents(getRenderableMeshBound())) },
+        { "bindExtents", buffer_helpers::toVariant(getBindExtents()) },
+        { "offsetMat", buffer_helpers::toVariant(offsetMat) },
+        { "transform", buffer_helpers::toVariant(getTransform().getMatrix()) },
     };
+    {
+        Transform transform;
+        transform.setScale(getScale());
+        transform.setTranslation(getTranslation());
+        transform.setRotation(getRotation());
+        result.metadata["_transform"] = buffer_helpers::toVariant(transform.getMatrix());
+    }
+    {
+        glm::vec3 position = _translation;
+        glm::mat4 rotation = glm::mat4_cast(_rotation);
+        glm::mat4 translation = glm::translate(position);
+        glm::mat4 modelToWorldMatrix = translation * rotation;
+        //glm::mat4 worldToModelMatrix = glm::inverse(modelToWorldMatrix);
+        result.metadata["_modelToWorld"] = buffer_helpers::toVariant(modelToWorldMatrix);
+    }
+    {
+        glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
+        glm::mat4 meshToWorldMatrix = createMatFromQuatAndPos(_rotation, _translation) * meshToModelMatrix;
+        //glm::mat4 worldToMeshMatrix = glm::inverse(meshToWorldMatrix);
+        result.metadata["_meshToWorld"] = buffer_helpers::toVariant(meshToWorldMatrix);
+    }
+    {
+        Transform transform;
+        transform.setTranslation(_translation);
+        transform.setRotation(_rotation);
+        Transform offset;
+        offset.setScale(_scale);
+        offset.postTranslate(_offset);
+        Transform output;
+        Transform::mult( output, transform, offset);
+        result.metadata["_renderTransform"] = buffer_helpers::toVariant(output.getMatrix());
+    }        
+
     QVariantList submeshes;
     int numberOfMeshes = geometry.meshes.size();
     for (int i = 0; i < numberOfMeshes; i++) {
@@ -610,53 +688,43 @@ scriptable::ScriptableModel Model::getScriptableModel(bool* ok) {
         if (!mesh) {
             continue;
         }
-        result.meshes << std::const_pointer_cast<graphics::Mesh>(mesh);
-        auto extraInfo = geometry.getModelNameOfMesh(i);
-        qDebug() << "Model::getScriptableModel #" << i << QString(mesh->displayName) << extraInfo;
-        submeshes << QVariantMap{
+        auto name = geometry.getModelNameOfMesh(i);
+        qCDebug(wtf) << "Model::getScriptableModel #" << i << QString::fromStdString(mesh->displayName) << name;
+        const AABox& box = _modelSpaceMeshTriangleSets.value(i).getBounds();
+        AABox hardbounds;
+        auto meshTransform = geometry.offset * fbxMesh.modelTransform;
+        for (const auto& v : fbxMesh.vertices) {
+            hardbounds += glm::vec3(meshTransform * glm::vec4(v,1));
+        }
+        QVariantList renderIDs;
+        for (uint32_t m = 0; m <  _modelMeshRenderItemIDs.size(); m++) {
+            auto meshIndex = _modelMeshRenderItemShapes.size() > m ? _modelMeshRenderItemShapes.at(m).meshIndex : -1;
+            if (meshIndex == i) {
+                renderIDs << _modelMeshRenderItemIDs[m];
+                break;
+            }
+        }
+
+        result.append(std::const_pointer_cast<graphics::Mesh>(mesh), {
             { "index", i },
+            { "name", name },
+            { "renderIDs", renderIDs },
             { "meshIndex", fbxMesh.meshIndex },
-            { "modelName", extraInfo },
-            { "transform", mat4toVariant(fbxMesh.modelTransform) },
-            { "extents", QVariantMap({
-                { "minimum", vec3toVariant(fbxMesh.meshExtents.minimum) },
-                { "maximum", vec3toVariant(fbxMesh.meshExtents.maximum) },
-            })},
-        };
+            { "displayName", QString::fromStdString(mesh->displayName) },
+            { "modelName", QString::fromStdString(mesh->modelName) },
+            { "modelTransform", buffer_helpers::toVariant(fbxMesh.modelTransform) },
+            { "transform", buffer_helpers::toVariant(geometry.offset * fbxMesh.modelTransform) },
+            { "extents", buffer_helpers::toVariant(fbxMesh.meshExtents) },
+            { "bounds", buffer_helpers::toVariant(Extents(box)) },
+            { "hardbounds", buffer_helpers::toVariant(Extents(hardbounds)) },
+                });
     }
     if (ok) {
         *ok = true;
     }
-    qDebug() << "//Model::getScriptableModel -- #" << result.meshes.size();
+    qCDebug(wtf) << "//Model::getScriptableModel -- #" << result.meshes.size();
     result.metadata["submeshes"] = submeshes;
     return result;
-
-// TODO: remove -- this was an earlier approach using renderGeometry instead of FBXGeometry
-#if 0 // renderGeometry approach
-    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
-    Transform offset;
-    offset.setScale(_scale);
-    offset.postTranslate(_offset);
-    glm::mat4 offsetMat = offset.getMatrix();
-
-    for (std::shared_ptr<const graphics::Mesh> mesh : meshes) {
-        if (!mesh) {
-            continue;
-        }
-        qDebug() << "Model::getScriptableModel #" << i++ << mesh->displayName;
-        auto newmesh = mesh->map(
-            [=](glm::vec3 position) {
-                return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
-            },
-            [=](glm::vec3 color) { return color; },
-            [=](glm::vec3 normal) {
-                return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
-            },
-            [&](uint32_t index) { return index; });
-        newmesh->displayName = mesh->displayName;
-        result << newmesh;
-    }
-#endif
 }
 
 void Model::calculateTriangleSets() {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 4fd00c9f9a..375ee016ca 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -27,7 +27,7 @@
 #include <gpu/Batch.h>
 #include <render/Forward.h>
 #include <render/Scene.h>
-#include <graphics-scripting/ScriptableModel.h>
+#include <graphics-scripting/Forward.h>
 #include <Transform.h>
 #include <SpatiallyNestable.h>
 #include <TriangleSet.h>
@@ -314,7 +314,8 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
-    Q_INVOKABLE virtual scriptable::ScriptableModel getScriptableModel(bool* ok = nullptr) override;
+    Q_INVOKABLE virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void scaleToFit();
 
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
new file mode 100644
index 0000000000..bc31abcb37
--- /dev/null
+++ b/libraries/render-utils/src/Model_temporary_hack.cpp.h
@@ -0,0 +1,121 @@
+#include <graphics-scripting/BufferViewHelpers.h>
+#include <graphics-scripting/GraphicsScriptingUtil.h>
+class MyGeometryMappingResource : public GeometryResource {
+//    Q_OBJECT
+public:
+    virtual void init(bool resetLoaded = true) override {
+        qCDebug(wtf) << "############################# Snarfing init()...";
+    }
+
+    virtual void deleter() override {
+        qCDebug(wtf) << "############################# Snarfing deleter()...";
+    }
+    shared_ptr<FBXGeometry> fbxGeometry;
+    MyGeometryMappingResource(const QUrl& url, Geometry::Pointer originalGeometry, std::shared_ptr<scriptable::ScriptableModelBase> newModel) : GeometryResource(url) {
+        fbxGeometry = std::make_shared<FBXGeometry>();
+        FBXGeometry& geometry = *fbxGeometry.get();
+        const FBXGeometry* original;
+        shared_ptr<FBXGeometry> tmpGeometry;
+        if (originalGeometry) {
+            original = &originalGeometry->getFBXGeometry();
+        } else {
+            tmpGeometry = std::make_shared<FBXGeometry>();
+            original = tmpGeometry.get();
+        }
+        geometry.originalURL = original->originalURL;
+
+        geometry.author = original->author;
+        geometry.applicationName = original->applicationName;
+        for (const auto &j : original->joints) {
+            geometry.joints << j;
+        }
+        geometry.jointIndices = QHash<QString,int>{ original->jointIndices };
+
+        geometry.animationFrames = QVector<FBXAnimationFrame>{ original->animationFrames };
+        geometry.meshIndicesToModelNames = QHash<int, QString>{ original->meshIndicesToModelNames };
+        geometry.blendshapeChannelNames = QList<QString>{ original->blendshapeChannelNames };
+
+        geometry.hasSkeletonJoints = original->hasSkeletonJoints;
+        geometry.offset = original->offset;
+        geometry.leftEyeJointIndex = original->leftEyeJointIndex;
+        geometry.rightEyeJointIndex = original->rightEyeJointIndex;
+        geometry.neckJointIndex = original->neckJointIndex;
+        geometry.rootJointIndex = original->rootJointIndex;
+        geometry.leanJointIndex = original->leanJointIndex;
+        geometry.headJointIndex = original->headJointIndex;
+        geometry.leftHandJointIndex = original->leftHandJointIndex;
+        geometry.rightHandJointIndex = original->rightHandJointIndex;
+        geometry.leftToeJointIndex = original->leftToeJointIndex;
+        geometry.rightToeJointIndex = original->rightToeJointIndex;
+        geometry.leftEyeSize = original->leftEyeSize;
+        geometry.rightEyeSize = original->rightEyeSize;
+        geometry.humanIKJointIndices = original->humanIKJointIndices;
+        geometry.palmDirection = original->palmDirection;
+        geometry.neckPivot = original->neckPivot;
+        geometry.bindExtents = original->bindExtents;
+
+        // Copy materials
+        QHash<QString, size_t> materialIDAtlas;
+        for (const FBXMaterial& material : original->materials) {
+            materialIDAtlas[material.materialID] = _materials.size();
+            _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
+        }
+        std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
+        std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
+        int meshID = 0;
+        if (newModel) {
+            geometry.meshExtents.reset();
+            for (const auto& newMesh : newModel->meshes) {
+                FBXMesh mesh;
+                if (meshID < original->meshes.size()) {
+                    mesh = original->meshes.at(meshID); // copy
+                }
+                mesh._mesh = newMesh.getMeshPointer();
+                // duplicate the buffers
+                mesh.vertices = buffer_helpers::toVector<glm::vec3>(mesh._mesh->getVertexBuffer(), "mesh.vertices");
+                mesh.normals = buffer_helpers::toVector<glm::vec3>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::NORMAL), "mesh.normals");
+                mesh.colors = buffer_helpers::toVector<glm::vec3>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::COLOR), "mesh.colors");
+                mesh.texCoords = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD0), "mesh.texCoords");
+                mesh.texCoords1 = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD1), "mesh.texCoords1");
+                geometry.meshes << mesh;
+                // Copy mesh pointers
+                meshes->emplace_back(newMesh.getMeshPointer());//buffer_helpers::cloneMesh(ptr));
+                int partID = 0;
+                const auto oldParts = mesh.parts;
+                mesh.parts.clear();
+                for (const FBXMeshPart& fbxPart : oldParts) {
+                    FBXMeshPart part; // copy;
+                    part.materialID = fbxPart.materialID;
+                    // Construct local parts
+                    ///qCDebug(wtf) << "GeometryMappingResource -- meshes part" << meshID << partID << part.materialID;
+                    part.triangleIndices = buffer_helpers::toVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
+                    mesh.parts << part;
+                    auto p = std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]);
+                    parts->push_back(p);
+                    partID++;
+                }
+                {
+                    // accumulate local transforms
+                    // compute the mesh extents from the transformed vertices
+                    foreach (const glm::vec3& vertex, mesh.vertices) {
+                        glm::vec3 transformedVertex = glm::vec3(mesh.modelTransform * glm::vec4(vertex, 1.0f));
+                        geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
+                        geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
+                        
+                        mesh.meshExtents.minimum = glm::min(mesh.meshExtents.minimum, transformedVertex);
+                        mesh.meshExtents.maximum = glm::max(mesh.meshExtents.maximum, transformedVertex);
+                    }
+                }
+                            
+                meshID++;
+            }
+        }
+        _meshes = meshes;
+        _meshParts = parts;
+        _animGraphOverrideUrl = originalGeometry ? originalGeometry->getAnimGraphOverrideUrl() : QUrl();
+        _loaded = true;
+        _fbxGeometry = fbxGeometry;
+        finishedLoading(true);
+    };    
+};
+
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 1c811573fb..750e612781 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -440,7 +440,7 @@ void AssetScriptingInterface::saveToCache(const QUrl& rawURL, const QByteArray&
     JS_VERIFY(url.scheme() == "atp" || url.scheme() == "cache", "only 'atp' and 'cache' URL schemes supported");
     JS_VERIFY(hash.isEmpty() || hash == hashDataHex(data), QString("invalid checksum hash for atp:HASH style URL (%1 != %2)").arg(hash, hashDataHex(data)));
 
-    qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
+    //qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
 
     jsPromiseReady(Parent::saveToCache(url, data, metadata), scope, callback);
 }
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 78cb05fa0d..873c205706 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -132,6 +132,20 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) {
 
 QObject* scriptsModel();
 
+bool NativeScriptInitializers::registerNativeScriptInitializer(NativeScriptInitializer initializer) {
+    return registerScriptInitializer([=](ScriptEnginePointer engine) {
+        initializer(qobject_cast<QScriptEngine*>(engine.data()));
+    });
+}
+
+bool NativeScriptInitializers::registerScriptInitializer(ScriptInitializer initializer) {
+    if (auto scriptEngines = DependencyManager::get<ScriptEngines>().data()) {
+        scriptEngines->registerScriptInitializer(initializer);
+        return true;
+    }
+    return false;
+}
+
 void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) {
     _scriptInitializers.push_back(initializer);
 }
@@ -520,6 +534,17 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
     emit scriptCountChanged();
 }
 
+int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
+    // register our application services and set it off on its own thread
+    int ii=0;
+    for (auto initializer : _scriptInitializers) {
+        ii++;
+        qDebug() << "initializer" << ii;
+        initializer(scriptEngine);
+    }
+    return ii;
+}
+
 void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
     connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection);
     connect(scriptEngine.data(), &ScriptEngine::loadScript, [&](const QString& scriptName, bool userLoaded) {
@@ -529,10 +554,7 @@ void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
         loadScript(scriptName, userLoaded, false, false, true);
     });
 
-    // register our application services and set it off on its own thread
-    for (auto initializer : _scriptInitializers) {
-        initializer(scriptEngine);
-    }
+    runScriptInitializers(scriptEngine);
 
     // FIXME disabling 'shift key' debugging for now.  If you start up the application with
     // the shift key held down, it triggers a deadlock because of script interfaces running
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index 5a4b8f2f47..ea07ebe840 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -19,6 +19,7 @@
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>
+#include <shared/ScriptInitializerMixin.h>
 
 #include "ScriptEngine.h"
 #include "ScriptsModel.h"
@@ -26,6 +27,12 @@
 
 class ScriptEngine;
 
+class NativeScriptInitializers : public ScriptInitializerMixin {
+public:
+    bool registerNativeScriptInitializer(NativeScriptInitializer initializer) override;
+    bool registerScriptInitializer(ScriptInitializer initializer) override;
+};
+
 class ScriptEngines : public QObject, public Dependency {
     Q_OBJECT
 
@@ -34,11 +41,11 @@ class ScriptEngines : public QObject, public Dependency {
     Q_PROPERTY(QString debugScriptUrl READ getDebugScriptUrl WRITE setDebugScriptUrl)
 
 public:
-    using ScriptInitializer = std::function<void(ScriptEnginePointer)>;
+    using ScriptInitializer = ScriptInitializerMixin::ScriptInitializer;
 
     ScriptEngines(ScriptEngine::Context context);
     void registerScriptInitializer(ScriptInitializer initializer);
-
+    int runScriptInitializers(ScriptEnginePointer engine);
     void loadScripts();
     void saveScripts();
 
diff --git a/libraries/shared/src/shared/ScriptInitializerMixin.h b/libraries/shared/src/shared/ScriptInitializerMixin.h
new file mode 100644
index 0000000000..50de553b0b
--- /dev/null
+++ b/libraries/shared/src/shared/ScriptInitializerMixin.h
@@ -0,0 +1,38 @@
+//
+//  ScriptInitializerMixin.h
+//  libraries/shared/src/shared
+//
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+
+#pragma once
+
+#include <functional>
+#include <QSharedPointer>
+#include "../DependencyManager.h"
+
+class QScriptEngine;
+class ScriptEngine;
+
+class ScriptInitializerMixin : public QObject, public Dependency {
+    Q_OBJECT
+public:
+    // Lightweight `QScriptEngine*` initializer (only depends on built-in Qt components)
+    // example registration:
+    // eg: [&](QScriptEngine* engine) -> bool {
+    //     engine->globalObject().setProperties("API", engine->newQObject(...instance...))
+    //     return true;
+    // }
+    using NativeScriptInitializer = std::function<void(QScriptEngine*)>;
+    virtual bool registerNativeScriptInitializer(NativeScriptInitializer initializer) = 0;
+
+    // Heavyweight `ScriptEngine*` initializer (tightly coupled to Interface and script-engine library internals)
+    // eg: [&](ScriptEnginePointer scriptEngine) -> bool {
+    //     engine->registerGlobalObject("API", ...instance..);
+    //     return true;
+    // }
+    using ScriptEnginePointer = QSharedPointer<ScriptEngine>;
+    using ScriptInitializer = std::function<void(ScriptEnginePointer)>;
+    virtual bool registerScriptInitializer(ScriptInitializer initializer) { return false; };
+};

From 479dfaf330ca0aaec110df7e115a385e3cd4f8a7 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 20 Feb 2018 10:08:20 -0800
Subject: [PATCH 380/569] Add corrupted backup status to domain content backup
 info

---
 domain-server/src/AssetsBackupHandler.cpp        | 11 +++++++++++
 domain-server/src/AssetsBackupHandler.h          |  1 +
 domain-server/src/BackupHandler.h                |  1 +
 domain-server/src/ContentSettingsBackupHandler.h |  3 +++
 domain-server/src/DomainContentBackupManager.cpp |  6 +++++-
 domain-server/src/EntitiesBackupHandler.h        |  2 ++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index aa92b19f4c..4bd2d9b2c4 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -111,6 +111,17 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
     }
 }
 
+bool AssetsBackupHandler::isCorruptedBackup(const QString& filePath) {
+    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
+        return value.filePath == filePath;
+    });
+
+    if (it == end(_backups)) {
+        return false;
+    }
+
+    return it->corruptedBackup;
+}
 
 std::pair<bool, float> AssetsBackupHandler::isAvailable(const QString& backupName) {
     const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index 1e9ae7cc38..d223e4f8f7 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -39,6 +39,7 @@ public:
     void recoverBackup(const QString& backupName, QuaZip& zip) override;
     void deleteBackup(const QString& backupName) override;
     void consolidateBackup(const QString& backupName, QuaZip& zip) override;
+    bool isCorruptedBackup(const QString& absoluteFilePath) override;
 
     bool operationInProgress() { return getRecoveryStatus().first; }
 
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index d3263fc3d3..1971db79df 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -32,6 +32,7 @@ public:
     virtual void recoverBackup(const QString& backupName, QuaZip& zip) = 0;
     virtual void deleteBackup(const QString& backupName) = 0;
     virtual void consolidateBackup(const QString& backupName, QuaZip& zip) = 0;
+    virtual bool isCorruptedBackup(const QString& absoluteFilePath) = 0;
 };
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index 1d8bbae617..e8bff3d12e 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -31,6 +31,9 @@ public:
     void deleteBackup(const QString& backupName) override {}
 
     void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
+
+    bool isCorruptedBackup(const QString& absoluteFilePath) override { return true; }
+
 private:
     DomainServerSettingsManager& _settingsManager;
 };
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index a218ee87ea..23064862e5 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -363,6 +363,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
 
     for (auto& backup : backups) {
         bool isAvailable { true };
+        bool isCorrupted { false };
         float availabilityProgress { 0.0f };
         for (auto& handler : _backupHandlers) {
             bool handlerIsAvailable { true };
@@ -370,6 +371,8 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
             std::tie(handlerIsAvailable, progress) = handler->isAvailable(backup.id);
             isAvailable &= handlerIsAvailable;
             availabilityProgress += progress / _backupHandlers.size();
+
+            isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.absolutePath);
         }
         variantBackups.push_back(QVariantMap({
             { "id", backup.id },
@@ -377,7 +380,8 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
             { "createdAtMillis", backup.createdAt.toMSecsSinceEpoch() },
             { "isAvailable", isAvailable },
             { "availabilityProgress", availabilityProgress },
-            { "isManualBackup", backup.isManualBackup }
+            { "isManualBackup", backup.isManualBackup },
+            { "isCorrupted", isCorrupted }
         }));
     }
 
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 7c018c9d2d..1b524b4d90 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -35,6 +35,8 @@ public:
     // Create a full backup
     void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
 
+    bool isCorruptedBackup(const QString& absoluteFilePath) override { return false; }
+
 private:
     QString _entitiesFilePath;
     QString _entitiesReplacementFilePath;

From 11f897beb098e0dd0464370ab34bb09adcc1fc01 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 20 Feb 2018 10:39:36 -0800
Subject: [PATCH 381/569] Initial app support

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 2 +-
 scripts/system/marketplaces/marketplaces.js                 | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 891c8142bf..bf73decf9b 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -530,7 +530,7 @@ Rectangle {
             // "Buy" button
             HifiControlsUit.Button {
                 id: buyButton;
-                visible: !(root.itemType === "avatar" && viewInMyPurchasesButton.visible)
+                visible: !((root.itemType === "avatar" || root.itemType === "app") && viewInMyPurchasesButton.visible)
                 enabled: (root.balanceAfterPurchase >= 0 && ownershipStatusReceived && balanceReceived) || (!root.isCertified);
                 color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index c61272119d..45085b2d45 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -550,7 +550,11 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 break;
             case 'checkout_rezClicked':
             case 'purchases_rezClicked':
-                rezEntity(message.itemHref, message.itemType);
+                if (message.itemType === "app") {
+
+                } else {
+                    rezEntity(message.itemHref, message.itemType);
+                }
                 break;
             case 'header_marketplaceImageClicked':
             case 'purchases_backClicked':

From 0c7f5250f306d33bb4eacf417d66b7a44442687d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 20 Feb 2018 11:48:25 -0800
Subject: [PATCH 382/569] Update isCorrupted with name indexing

---
 domain-server/src/AssetsBackupHandler.cpp        | 6 +++---
 domain-server/src/AssetsBackupHandler.h          | 2 +-
 domain-server/src/BackupHandler.h                | 2 +-
 domain-server/src/ContentSettingsBackupHandler.h | 2 +-
 domain-server/src/DomainContentBackupManager.cpp | 2 +-
 domain-server/src/EntitiesBackupHandler.h        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 4bd2d9b2c4..b979aab993 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -111,9 +111,9 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
     }
 }
 
-bool AssetsBackupHandler::isCorruptedBackup(const QString& filePath) {
-    auto it = find_if(begin(_backups), end(_backups), [&](const std::vector<AssetServerBackup>::value_type& value) {
-        return value.filePath == filePath;
+bool AssetsBackupHandler::isCorruptedBackup(const QString& backupName) {
+    auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& value) {
+        return value.name == backupName;
     });
 
     if (it == end(_backups)) {
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index d223e4f8f7..f94ba43cdf 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -39,7 +39,7 @@ public:
     void recoverBackup(const QString& backupName, QuaZip& zip) override;
     void deleteBackup(const QString& backupName) override;
     void consolidateBackup(const QString& backupName, QuaZip& zip) override;
-    bool isCorruptedBackup(const QString& absoluteFilePath) override;
+    bool isCorruptedBackup(const QString& backupName) override;
 
     bool operationInProgress() { return getRecoveryStatus().first; }
 
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 1971db79df..1e2450cce4 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -32,7 +32,7 @@ public:
     virtual void recoverBackup(const QString& backupName, QuaZip& zip) = 0;
     virtual void deleteBackup(const QString& backupName) = 0;
     virtual void consolidateBackup(const QString& backupName, QuaZip& zip) = 0;
-    virtual bool isCorruptedBackup(const QString& absoluteFilePath) = 0;
+    virtual bool isCorruptedBackup(const QString& backupName) = 0;
 };
 using BackupHandlerPointer = std::unique_ptr<BackupHandlerInterface>;
 
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index e8bff3d12e..a33fa3ca3f 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -32,7 +32,7 @@ public:
 
     void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
 
-    bool isCorruptedBackup(const QString& absoluteFilePath) override { return true; }
+    bool isCorruptedBackup(const QString& backupName) override { return false; }
 
 private:
     DomainServerSettingsManager& _settingsManager;
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 23064862e5..9c72d64eea 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -372,7 +372,7 @@ void DomainContentBackupManager::getAllBackupsAndStatus(MiniPromise::Promise pro
             isAvailable &= handlerIsAvailable;
             availabilityProgress += progress / _backupHandlers.size();
 
-            isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.absolutePath);
+            isCorrupted = isCorrupted || handler->isCorruptedBackup(backup.id);
         }
         variantBackups.push_back(QVariantMap({
             { "id", backup.id },
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 1b524b4d90..802c395b57 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -35,7 +35,7 @@ public:
     // Create a full backup
     void consolidateBackup(const QString& backupName, QuaZip& zip) override {}
 
-    bool isCorruptedBackup(const QString& absoluteFilePath) override { return false; }
+    bool isCorruptedBackup(const QString& backupName) override { return false; }
 
 private:
     QString _entitiesFilePath;

From 9bde9f5a4f260d40b1af694ad86866d5451143c0 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 20 Feb 2018 12:36:11 -0800
Subject: [PATCH 383/569] Fix height of Optional Message in Send Money

---
 .../resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
index 7dd72b904e..9d05d3a7ef 100644
--- a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
@@ -923,7 +923,7 @@ Item {
             anchors.leftMargin: 20;
             anchors.right: parent.right;
             anchors.rightMargin: 20;
-            height: 140;
+            height: 95;
                 
             FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; }
             TextArea {

From eb29bdf5d2530606bfd34002ea7e384a1b00e906 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 20 Feb 2018 13:06:10 -0800
Subject: [PATCH 384/569] Don't allow tabs or newlines

---
 .../qml/hifi/commerce/wallet/sendMoney/SendMoney.qml      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
index 9d05d3a7ef..f5b7f42a3f 100644
--- a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
@@ -947,8 +947,14 @@ Item {
                 wrapMode: TextEdit.Wrap;
                 activeFocusOnPress: true;
                 activeFocusOnTab: true;
-                // Workaround for no max length on TextAreas
                 onTextChanged: {
+                    // Don't allow tabs or newlines
+                    if ((/[\n\r\t]/g).test(text)) {
+                        var cursor = cursorPosition;
+                        text = text.replace(/[\n\r\t]/g, '');
+                        cursorPosition = cursor-1;
+                    }
+                    // Workaround for no max length on TextAreas
                     if (text.length > maximumLength) {
                         var cursor = cursorPosition;
                         text = previousText;

From fd6f4b569f2bd1b875be0ea365ecd09b68cba2d8 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 20 Feb 2018 13:19:31 -0800
Subject: [PATCH 385/569] Fix active focus issue

---
 .../qml/hifi/commerce/wallet/PassphraseModal.qml       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
index c586af9e80..f1692acb3d 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -75,8 +75,6 @@ Item {
     // TODO: Fix this unlikely bug
     onVisibleChanged: {
         if (visible) {
-            passphraseField.error = false;
-            passphraseField.focus = true;
             sendSignalToParent({method: 'disableHmdPreview'});
         } else {
             sendSignalToParent({method: 'maybeEnableHmdPreview'});
@@ -206,6 +204,14 @@ Item {
             placeholderText: "passphrase";
             activeFocusOnPress: true;
             activeFocusOnTab: true;
+            
+            onVisibleChanged: {
+                if (visible) {
+                    error = false;
+                    focus = true;
+                    forceActiveFocus();
+                }
+            }
 
             onFocusChanged: {
                 root.keyboardRaised = focus;

From 4f0f6709c11d0c77fd63c8999e8b4656a9a46539 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 20 Feb 2018 13:56:06 -0800
Subject: [PATCH 386/569] fix build errors

---
 .../src/graphics-scripting/ScriptableModel.cpp                 | 1 +
 .../src/graphics-scripting/ScriptableModel.h                   | 1 -
 libraries/render-utils/CMakeLists.txt                          | 3 +--
 tests/render-perf/CMakeLists.txt                               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index c8f1975249..05ff043820 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -38,6 +38,7 @@ scriptable::ScriptableModelBase::~ScriptableModelBase() {
     meshes.clear();
     //qCDebug(graphics_scripting) << "//~ScriptableModelBase" << this;
 }
+
 void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
     //qCDebug(graphics_scripting) << "+ APPEND WeakMeshPointer" << mesh.lock().get();
     meshes << ScriptableMeshBase{ provider, this, mesh, metadata };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index d2c50bd768..bdfaac5d7c 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -16,7 +16,6 @@ namespace scriptable {
         ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
         ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
         ScriptableModel& operator=(const ScriptableModelBase& view) {  ScriptableModelBase::operator=(view); return *this; }
-        //virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
 
         Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
         // TODO: in future accessors for these could go here
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 55762e38fd..54c0821569 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -3,11 +3,10 @@ AUTOSCRIBE_SHADER_LIB(gpu graphics render)
 # pull in the resources.qrc file
 qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
 setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
-link_hifi_libraries(shared ktx gpu graphics model-networking render animation fbx image procedural)
+link_hifi_libraries(shared ktx gpu graphics graphics-scripting model-networking render animation fbx image procedural)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(audio)
-include_hifi_library_headers(graphics-scripting) # for ScriptableModel.h
 
 if (NOT ANDROID)
   target_nsight()
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index 5314f7a45b..a4570e9b54 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -16,7 +16,7 @@ link_hifi_libraries(
     shared networking animation 
     ktx image octree gl gpu  
     render render-utils 
-    graphics fbx model-networking 
+    graphics fbx model-networking graphics-scripting
     entities entities-renderer audio avatars script-engine 
     physics procedural midi ui
     ${PLATFORM_GL_BACKEND}

From f08c66e3ac9b8538a30054cc86838806afb9f19c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 20 Feb 2018 14:14:59 -0800
Subject: [PATCH 387/569] Remove debug code

---
 .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml     | 2 +-
 scripts/system/commerce/wallet.js                               | 2 +-
 scripts/system/marketplaces/marketplaces.js                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 272c542fde..3a414acbb5 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -182,7 +182,7 @@ Item {
         }
         HiFiGlyphs {
             id: noPermissionGlyph;
-            visible: true// !root.hasPermissionToRezThis;
+            visible: !root.hasPermissionToRezThis;
             anchors.verticalCenter: itemName.verticalCenter;
             anchors.left: itemName.right;
             anchors.leftMargin: itemName.truncated ? -14 : -2;
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 9ff7038c09..8cf5b72b9a 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -39,7 +39,7 @@
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            tablet.loadQMLSource(MARKETPLACE_PURCHASES_QML_PATH);
+            tablet.loadQMLSource(WALLET_QML_SOURCE);
         }
     }
 
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 45085b2d45..8c41906d77 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -65,7 +65,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
     var onMarketplaceScreen = false;
     var onCommerceScreen = false;
 
-    var debugCheckout = true;
+    var debugCheckout = false;
     var debugError = false;
     function showMarketplace() {
         if (!debugCheckout) {

From 4b25c9c419edbd2879d311dc6de9f9fc6a47ac42 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 20 Feb 2018 15:06:24 -0800
Subject: [PATCH 388/569] handle permissions save with no existing permissions

---
 domain-server/resources/web/wizard/js/wizard.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
index c0d17ca02c..efd3b28116 100644
--- a/domain-server/resources/web/wizard/js/wizard.js
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -396,10 +396,12 @@ function savePermissions() {
 
   var admins = $('#admin-usernames').val().split(',');
 
-  var existingAdmins = Settings.data.values.security.permissions.map(function(value) {
-    return value.permissions_id;
-  });
-  admins = admins.concat(existingAdmins);
+  if (Settings.data.values.security.permissions) {
+    var existingAdmins = Settings.data.values.security.permissions.map(function(value) {
+      return value.permissions_id;
+    });
+    admins = admins.concat(existingAdmins);
+  }
 
   // Filter out unique values
   admins = _.uniq(admins.map(function(username) {

From bf73df12652955fda81749946d738e44635aeef4 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 20 Feb 2018 15:45:47 -0800
Subject: [PATCH 389/569] more logging for fogbugz 11748

---
 libraries/animation/src/Rig.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 01b7dfb0de..d6791ab0b8 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -434,9 +434,13 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
 
 bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
     bool success { false };
-    if (QThread::currentThread() == thread()) {
+    glm::vec3 originalPosition = position;
+    bool onOwnerThread = (QThread::currentThread() == thread());
+    glm::vec3 poseSetTrans;
+    if (onOwnerThread) {
         if (isIndexValid(jointIndex)) {
-            position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+            poseSetTrans = _internalPoseSet._absolutePoses[jointIndex].trans();
+            position = (rotation * poseSetTrans) + translation;
             success = true;
         } else {
             success = false;
@@ -444,7 +448,8 @@ bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm:
     } else {
         QReadLocker readLock(&_externalPoseSetLock);
         if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
-            position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+            poseSetTrans = _externalPoseSet._absolutePoses[jointIndex].trans();
+            position = (rotation * poseSetTrans) + translation;
             success = true;
         } else {
             success = false;
@@ -452,7 +457,14 @@ bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm:
     }
 
     if (isNaN(position)) {
-        qCWarning(animation) << "Rig::getJointPositionInWorldFrame produces NaN";
+        qCWarning(animation) << "Rig::getJointPositionInWorldFrame produced NaN."
+                             << " is owner thread = " << onOwnerThread
+                             << " position = " << originalPosition
+                             << " translation = " << translation
+                             << " rotation = " << rotation
+                             << " poseSetTrans = " <<  poseSetTrans
+                             << " success = " << success
+                             << " jointIndex = " << jointIndex;
         success = false;
         position = glm::vec3(0.0f);
     }

From 5cd184ddc3d5403eca4bea7a70f830c2f7ef381e Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Tue, 20 Feb 2018 17:55:30 -0800
Subject: [PATCH 390/569] change default add to world shape for asset browser

---
 interface/resources/qml/hifi/AssetServer.qml               | 2 +-
 interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index dd0aba9ec5..fea275999e 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -206,7 +206,7 @@ Windows.ScrollingWindow {
             SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
             SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
         
-            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
+            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_SIMPLE_COMPOUND;
             var DYNAMIC_DEFAULT = false;
             var prompt = desktop.customInputDialog({
                 textInput: {
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 049a7faad8..c5f85e885c 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -207,7 +207,7 @@ Rectangle {
             SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
             SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
         
-            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
+            var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_SIMPLE_COMPOUND;
             var DYNAMIC_DEFAULT = false;
             var prompt = tabletRoot.customInputDialog({
                 textInput: {

From 6f84e4c9772627dbb1c511896f571977c8886d6f Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Tue, 20 Feb 2018 23:45:07 -0800
Subject: [PATCH 391/569] Moved shadows and ambient occlusion to menu
 checkboxes.

---
 .../dialogs/GraphicsPreferencesDialog.qml     | 19 ----------
 .../hifi/tablet/TabletGraphicsPreferences.qml | 37 -------------------
 interface/src/Menu.cpp                        | 14 +++++--
 interface/src/Menu.h                          |  2 +
 .../src/DeferredLightingEffect.cpp            |  2 +-
 5 files changed, 13 insertions(+), 61 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
 delete mode 100644 interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml

diff --git a/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml b/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
deleted file mode 100644
index d95bafd0a9..0000000000
--- a/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.5
-import Qt.labs.settings 1.0
-
-import "../../dialogs"
-
-PreferencesDialog {
-    id: root
-    objectName: "GraphicsPreferencesDialog"
-    title: "Graphics Settings"
-    showCategories: ["Graphics"]
-    property var settings: Settings {
-        category: root.objectName
-        property alias x: root.x
-        property alias y: root.y
-        property alias width: root.width
-        property alias height: root.height
-    }
-}
-
diff --git a/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
deleted file mode 100644
index 25b5be05f2..0000000000
--- a/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  TabletGraphicsPreferences.qml
-//
-//  Created by Vlad Stelmahovsky on 12 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 "tabletWindows"
-import "../../dialogs"
-
-StackView {
-    id: profileRoot
-    initialItem: root
-    objectName: "stack"
-    property string title: "Graphics Settings"
-
-    signal sendToScript(var message);
-
-    function pushSource(path) {
-        profileRoot.push(Qt.resolvedUrl(path));
-    }
-
-    function popSource() {
-        profileRoot.pop();
-    }
-
-    TabletPreferencesDialog {
-        id: root
-        objectName: "TabletGraphicsPreferences"
-        showCategories: ["Graphics"]
-    }
-}
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index f3d8ea2344..051d5ce8ec 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -44,6 +44,7 @@
 #include "ui/StandAloneJSConsole.h"
 #include "InterfaceLogging.h"
 #include "LocationBookmarks.h"
+#include "DeferredLightingEffect.h"
 
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #include "SpeechRecognizer.h"
@@ -365,10 +366,15 @@ Menu::Menu() {
     MenuWrapper* developerMenu = addMenu("Developer", "Developer");
 
     // Developer > Graphics...
-    action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
-    connect(action, &QAction::triggered, [] {
-        qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
-            QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
+    MenuWrapper* graphicsOptionsMenu = developerMenu->addMenu("Render");
+    action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::Shadows, 0, true);
+    connect(action, &QAction::triggered, [action] {
+        DependencyManager::get<DeferredLightingEffect>()->setShadowMapEnabled(action->isChecked());
+    });
+
+    action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::AmbientOcclusion, 0, false);
+    connect(action, &QAction::triggered, [action] {
+        DependencyManager::get<DeferredLightingEffect>()->setAmbientOcclusionEnabled(action->isChecked());
     });
 
     // Developer > UI >>>
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 8cb1804fd4..ec6fa42818 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -204,6 +204,8 @@ namespace MenuOption {
     const QString WorldAxes = "World Axes";
     const QString DesktopTabletToToolbar = "Desktop Tablet Becomes Toolbar";
     const QString HMDTabletToToolbar = "HMD Tablet Becomes Toolbar";
+    const QString Shadows = "Shadows";
+    const QString AmbientOcclusion = "AmbientOcclusion";
 }
 
 #endif // hifi_Menu_h
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 665e767c7c..78bc3ba195 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -492,7 +492,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
         batch.setResourceTexture(DEFERRED_BUFFER_DEPTH_UNIT, deferredFramebuffer->getPrimaryDepthTexture());
         
         // FIXME: Different render modes should have different tasks
-        if (args->_renderMode == RenderArgs::DEFAULT_RENDER_MODE && deferredLightingEffect->isAmbientOcclusionEnabled()) {
+        if (args->_renderMode == RenderArgs::DEFAULT_RENDER_MODE && deferredLightingEffect->isAmbientOcclusionEnabled() && ambientOcclusionFramebuffer) {
             batch.setResourceTexture(DEFERRED_BUFFER_OBSCURANCE_UNIT, ambientOcclusionFramebuffer->getOcclusionTexture());
         } else {
             // need to assign the white texture if ao is off

From 16ffcc7fe2696c10ec5429a07de14f0dcc4b3bca Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Wed, 21 Feb 2018 09:48:15 -0800
Subject: [PATCH 392/569] Add #include of Forward.h to AudioMixer.h

This makes the compile by Qt MOC less dependent on order of processing.
See Manuscript case 12527.
---
 assignment-client/src/audio/AudioMixer.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index ed3a5b0541..12ae3422bc 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -18,6 +18,8 @@
 #include <ThreadedAssignment.h>
 #include <UUIDHasher.h>
 
+#include "Plugins/Forward.h"
+
 #include "AudioMixerStats.h"
 #include "AudioMixerSlavePool.h"
 

From 47a98d9d0f49dd2621102c34475bae4112d50419 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Wed, 21 Feb 2018 10:12:04 -0800
Subject: [PATCH 393/569] relax the deadlock time to 2 minutes

---
 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 3aa0f3d889..2b87456459 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -392,7 +392,7 @@ const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensi
 class DeadlockWatchdogThread : public QThread {
 public:
     static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
-    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 30 * USECS_PER_SECOND;
+    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 120 * USECS_PER_SECOND; // 2 mins with no checkin probably a deadlock
     static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large
     static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples
 

From 4dde178b931f04e02b2c1028dbcf17899fb48b5b Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 21 Feb 2018 10:33:15 -0800
Subject: [PATCH 394/569] fix new material UI

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

diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
index 226c17e8e2..c7fbc9d45a 100644
--- a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
@@ -131,7 +131,7 @@ Rectangle {
                     spacing: 5
 
                     anchors.horizontalCenter: column3.horizontalCenter
-                    anchors.horizontalCenterOffset: -20
+                    anchors.horizontalCenterOffset: 0
 
                     Button {
                         id: button1

From 1fbc16aae224f5e9aa62a74690ec01b44e60c2b3 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 21 Feb 2018 10:52:17 -0800
Subject: [PATCH 395/569] Fix noPermissionGlyph margin

---
 .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 3a414acbb5..5b70fdbde9 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -185,7 +185,7 @@ Item {
             visible: !root.hasPermissionToRezThis;
             anchors.verticalCenter: itemName.verticalCenter;
             anchors.left: itemName.right;
-            anchors.leftMargin: itemName.truncated ? -14 : -2;
+            anchors.leftMargin: itemName.truncated ? -10 : -2;
             text: hifi.glyphs.info;
             // Size
             size: 40;

From 619901caa01d4ee3994f34563dc15a712590f58c Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Wed, 21 Feb 2018 11:12:09 -0800
Subject: [PATCH 396/569] Move up main #include for other AudioMixer*

Having #include first will make more robust for MOC compile problems.
Also fixes previous commit to use <> form and correct case.
See Case 12527.
---
 assignment-client/src/audio/AudioMixer.cpp           | 4 ++--
 assignment-client/src/audio/AudioMixer.h             | 2 +-
 assignment-client/src/audio/AudioMixerClientData.cpp | 4 ++--
 assignment-client/src/audio/AudioMixerClientData.h   | 1 +
 assignment-client/src/audio/AudioMixerSlave.cpp      | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 7f088d8183..8af4eec934 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixer.h"
+
 #include <thread>
 
 #include <QtCore/QJsonArray>
@@ -36,8 +38,6 @@
 #include "AvatarAudioStream.h"
 #include "InjectedAudioStream.h"
 
-#include "AudioMixer.h"
-
 static const float DEFAULT_ATTENUATION_PER_DOUBLING_IN_DISTANCE = 0.5f;    // attenuation = -6dB * log2(distance)
 static const int DISABLE_STATIC_JITTER_FRAMES = -1;
 static const float DEFAULT_NOISE_MUTING_THRESHOLD = 1.0f;
diff --git a/assignment-client/src/audio/AudioMixer.h b/assignment-client/src/audio/AudioMixer.h
index 12ae3422bc..8c47893aa3 100644
--- a/assignment-client/src/audio/AudioMixer.h
+++ b/assignment-client/src/audio/AudioMixer.h
@@ -18,7 +18,7 @@
 #include <ThreadedAssignment.h>
 #include <UUIDHasher.h>
 
-#include "Plugins/Forward.h"
+#include <plugins/Forward.h>
 
 #include "AudioMixerStats.h"
 #include "AudioMixerSlavePool.h"
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 2560f43337..d4d4f847ee 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerClientData.h"
+
 #include <random>
 
 #include <QtCore/QDebug>
@@ -22,8 +24,6 @@
 #include "AudioLogging.h"
 #include "AudioHelpers.h"
 #include "AudioMixer.h"
-#include "AudioMixerClientData.h"
-
 
 AudioMixerClientData::AudioMixerClientData(const QUuid& nodeID) :
     NodeData(nodeID),
diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h
index c3a31715ea..514e1c9756 100644
--- a/assignment-client/src/audio/AudioMixerClientData.h
+++ b/assignment-client/src/audio/AudioMixerClientData.h
@@ -21,6 +21,7 @@
 #include <AudioLimiter.h>
 #include <UUIDHasher.h>
 
+#include <plugins/Forward.h>
 #include <plugins/CodecPlugin.h>
 
 #include "PositionalAudioStream.h"
diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index abc2f7220d..b975ba8bfe 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerSlave.h"
+
 #include <algorithm>
 
 #include <glm/glm.hpp>
@@ -34,8 +36,6 @@
 #include "InjectedAudioStream.h"
 #include "AudioHelpers.h"
 
-#include "AudioMixerSlave.h"
-
 using AudioStreamMap = AudioMixerClientData::AudioStreamMap;
 
 // packet helpers

From b548567f5acf5170c7dc6f26a136d42552a28ce5 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 21 Feb 2018 11:17:47 -0800
Subject: [PATCH 397/569] Apps protection

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml   | 4 ++--
 interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 4 ++--
 scripts/system/marketplaces/marketplaces.js                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index bf73decf9b..27acb121ca 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -135,10 +135,10 @@ Rectangle {
             root.itemType = "avatar";
         } else if (root.itemHref.indexOf('.json.gz') > -1) {
             root.itemType = "contentSet";
+        } else if (root.itemHref.indexOf('.app.json') > -1) {
+            root.itemType = "app";
         } else if (root.itemHref.indexOf('.json') > -1) {
             root.itemType = "entity"; // "wearable" type handled later
-        } else if (root.itemHref.indexOf('.js') > -1) {
-            root.itemType = "app";
         } else {
             console.log("WARNING - Item type is UNKNOWN!");
             root.itemType = "entity";
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index b01dfcfce3..9b333a60cd 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -401,10 +401,10 @@ Rectangle {
                         "wearable";
                     } else if (model.root_file_url.endsWith('.json.gz')) {
                         "contentSet";
+                    } else if (model.root_file_url.endsWith('.app.json')) {
+                        "app";
                     } else if (model.root_file_url.endsWith('.json')) {
                         "entity";
-                    } else if (model.root_file_url.endsWith('.js')) {
-                        "app";
                     } else {
                         "unknown";
                     }
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 8c41906d77..1eb16cf453 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -551,7 +551,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
             case 'checkout_rezClicked':
             case 'purchases_rezClicked':
                 if (message.itemType === "app") {
-
+                    console.log("How did you get here? You can't buy apps yet!");
                 } else {
                     rezEntity(message.itemHref, message.itemType);
                 }

From 74655bde49b878f81e2707af08b871702911ff7a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 21 Feb 2018 12:12:20 -0800
Subject: [PATCH 398/569] Fix skeletonmodelURLchanged signal

---
 .../qml/hifi/commerce/purchases/PurchasedItem.qml        | 9 ++-------
 interface/src/avatar/MyAvatar.cpp                        | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 5b70fdbde9..cc2bcd69aa 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -564,6 +564,7 @@ Item {
                                        : hifi.buttons.disabledTextColor[control.colorScheme]
                     }
                     RalewayBold {
+                        id: rezIconLabel;
                         anchors.top: rezIcon.bottom;
                         anchors.topMargin: -4;
                         anchors.right: parent.right;
@@ -575,13 +576,7 @@ Item {
                         size: 15;
                         verticalAlignment: Text.AlignVCenter
                         horizontalAlignment: Text.AlignHCenter
-                        text: {
-                            if (MyAvatar.skeletonModelURL === root.itemHref) {
-                                "CURRENT";
-                            } else {
-                                (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
-                            }
-                        }
+                        text: MyAvatar.skeletonModelURL === root.itemHref ? "CURRENT" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
                     }
                 }
             }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c25aaeeecd..50753724e8 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1479,7 +1479,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     });
     saveAvatarUrl();
     emit skeletonChanged();
-
+    emit skeletonModelURLChanged();
 }
 
 void MyAvatar::removeAvatarEntities() {

From bf4ba07b722fb4e2f1990e7a445794f828037d97 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 21 Feb 2018 12:36:34 -0800
Subject: [PATCH 399/569] Added parameters to canCastShadow - still sucks.

---
 interface/src/avatar/MyAvatar.cpp                           | 6 +++---
 .../entities-renderer/src/RenderableModelEntityItem.cpp     | 2 +-
 libraries/render-utils/src/Model.cpp                        | 4 +---
 libraries/render-utils/src/Model.h                          | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c70dc9df98..2a2e4a1199 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1112,7 +1112,7 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
     _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
-    _skeletonModel->setCanCastShadow(isEnabled, qApp->getMain3DScene());
+    _skeletonModel->setCanCastShadow(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
 }
 
 void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -1465,7 +1465,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     int skeletonModelChangeCount = _skeletonModelChangeCount;
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
-    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene());
+    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
 
@@ -2014,7 +2014,7 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
                 _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene(),
                                                         render::ItemKey::TAG_BITS_NONE, true);
 
-                _attachmentModels[i]->setCanCastShadow(shouldDrawHead, qApp->getMain3DScene());
+                _attachmentModels[i]->setCanCastShadow(shouldDrawHead, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
             }
         }
     }
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 9dfa7d4796..1a7af15374 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1357,7 +1357,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     // TODO? early exit here when not visible?
 
     if (model->canCastShadow() != _canCastShadow) {
-        model->setCanCastShadow(_canCastShadow, scene);
+        model->setCanCastShadow(_canCastShadow, scene, viewTaskBits, false);
     }
 
     if (_needsCollisionGeometryUpdate) {
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 11955c4be5..386f890153 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -713,15 +713,13 @@ void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene,
     }
 }
 
-void Model::setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene) {
+void Model::setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) {
     if (_canCastShadow != canCastShadow) {
         _canCastShadow = canCastShadow;
 
         bool isVisible = _isVisible;
-        bool viewTagBits = _viewTagBits;
         bool isLayeredInFront = _isLayeredInFront;
         bool isLayeredInHUD = _isLayeredInHUD;
-        bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach (auto item, _modelMeshRenderItemsMap.keys()) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index b7015b8732..f301dd8031 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -89,7 +89,7 @@ public:
     void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
 
     bool canCastShadow() const { return _canCastShadow; }
-    void setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene);
+    void setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
 
     void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
     void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);

From fa1f2267cf9ad18fc87863427c753b944146575e Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 22 Feb 2018 10:06:00 +1300
Subject: [PATCH 400/569] Support RC63

---
 unpublishedScripts/marketplace/record/record.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unpublishedScripts/marketplace/record/record.js b/unpublishedScripts/marketplace/record/record.js
index 08400dbb85..8e49589e3c 100644
--- a/unpublishedScripts/marketplace/record/record.js
+++ b/unpublishedScripts/marketplace/record/record.js
@@ -139,7 +139,8 @@
         }
 
         function setMappingCallback(status) {
-            if (status !== null) {
+            // FIXME: "" is for RC <= 63, null is for RC > 63. Remove the former when RC63 is no longer used.
+            if (status !== null && status !== "") {
                 error("Error mapping recording to " + mappingPath + " on Asset Server!", status);
                 return;
             }

From 2a597eb7154d99679da744c7282e2326371d1afc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 20 Feb 2018 17:00:28 -0800
Subject: [PATCH 401/569] use QCoreApplication for oven when headless version
 is used

---
 tools/oven/src/BakerCLI.cpp            | 19 +++++---
 tools/oven/src/BakerCLI.h              |  6 +--
 tools/oven/src/DomainBaker.cpp         |  6 +--
 tools/oven/src/Oven.cpp                | 62 +++++++-------------------
 tools/oven/src/Oven.h                  | 23 +++-------
 tools/oven/src/OvenCLIApplication.cpp  | 49 ++++++++++++++++++++
 tools/oven/src/OvenCLIApplication.h    | 27 +++++++++++
 tools/oven/src/OvenGUIApplication.cpp  | 19 ++++++++
 tools/oven/src/OvenGUIApplication.h    | 33 ++++++++++++++
 tools/oven/src/main.cpp                | 13 ++++--
 tools/oven/src/ui/BakeWidget.cpp       |  5 +--
 tools/oven/src/ui/DomainBakeWidget.cpp | 11 +++--
 tools/oven/src/ui/ModelBakeWidget.cpp  | 11 +++--
 tools/oven/src/ui/SkyboxBakeWidget.cpp |  9 ++--
 14 files changed, 193 insertions(+), 100 deletions(-)
 create mode 100644 tools/oven/src/OvenCLIApplication.cpp
 create mode 100644 tools/oven/src/OvenCLIApplication.h
 create mode 100644 tools/oven/src/OvenGUIApplication.cpp
 create mode 100644 tools/oven/src/OvenGUIApplication.h

diff --git a/tools/oven/src/BakerCLI.cpp b/tools/oven/src/BakerCLI.cpp
index 5af65c4dc0..f5af5455fb 100644
--- a/tools/oven/src/BakerCLI.cpp
+++ b/tools/oven/src/BakerCLI.cpp
@@ -14,13 +14,14 @@
 #include <QtCore/QDebug>
 #include <QFile>
 
+#include "OvenCLIApplication.h"
 #include "ModelBakingLoggingCategory.h"
-#include "Oven.h"
 #include "BakerCLI.h"
 #include "FBXBaker.h"
 #include "TextureBaker.h"
 
-BakerCLI::BakerCLI(Oven* parent) : QObject(parent) {
+BakerCLI::BakerCLI(OvenCLIApplication* parent) : QObject(parent) {
+    
 }
 
 void BakerCLI::bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type) {
@@ -50,14 +51,18 @@ void BakerCLI::bakeFile(QUrl inputUrl, const QString& outputPath, const QString&
 
     // create our appropiate baker
     if (isFBX) {
-        _baker = std::unique_ptr<Baker> { new FBXBaker(inputUrl, []() -> QThread* { return qApp->getNextWorkerThread(); }, outputPath) };
-        _baker->moveToThread(qApp->getNextWorkerThread());
+        _baker = std::unique_ptr<Baker> {
+            new FBXBaker(inputUrl,
+                         []() -> QThread* { return Oven::instance().getNextWorkerThread(); },
+                         outputPath)
+        };
+        _baker->moveToThread(Oven::instance().getNextWorkerThread());
     } else if (isSupportedImage) {
         _baker = std::unique_ptr<Baker> { new TextureBaker(inputUrl, image::TextureUsage::CUBE_TEXTURE, outputPath) };
-        _baker->moveToThread(qApp->getNextWorkerThread());
+        _baker->moveToThread(Oven::instance().getNextWorkerThread());
     } else {
         qCDebug(model_baking) << "Failed to determine baker type for file" << inputUrl;
-        QApplication::exit(OVEN_STATUS_CODE_FAIL);
+        QCoreApplication::exit(OVEN_STATUS_CODE_FAIL);
     }
 
     // invoke the bake method on the baker thread
@@ -81,5 +86,5 @@ void BakerCLI::handleFinishedBaker() {
             errorFile.close();
         }
     }
-    QApplication::exit(exitCode);
+    QCoreApplication::exit(exitCode);
 }
diff --git a/tools/oven/src/BakerCLI.h b/tools/oven/src/BakerCLI.h
index 7d362eb898..4f5b6607b0 100644
--- a/tools/oven/src/BakerCLI.h
+++ b/tools/oven/src/BakerCLI.h
@@ -18,7 +18,7 @@
 #include <memory>
 
 #include "Baker.h"
-#include "Oven.h"
+#include "OvenCLIApplication.h"
 
 static const int OVEN_STATUS_CODE_SUCCESS { 0 };
 static const int OVEN_STATUS_CODE_FAIL { 1 };
@@ -27,10 +27,10 @@ static const int OVEN_STATUS_CODE_ABORT { 2 };
 static const QString OVEN_ERROR_FILENAME = "errors.txt";
 
 class BakerCLI : public QObject {
-    Q_OBJECT   
+    Q_OBJECT
 
 public:
-    BakerCLI(Oven* parent);
+    BakerCLI(OvenCLIApplication* parent);
     void bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type = QString::null);
 
 private slots:
diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index edc2492e82..28ede982a0 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -201,7 +201,7 @@ void DomainBaker::enumerateEntities() {
                         }
                         QSharedPointer<FBXBaker> baker {
                             new FBXBaker(modelURL, []() -> QThread* {
-                                return qApp->getNextWorkerThread();
+                                return Oven::instance().getNextWorkerThread();
                             }, _contentOutputPath + subDirName + "/baked", _contentOutputPath + subDirName + "/original"),
                             &FBXBaker::deleteLater
                         };
@@ -214,7 +214,7 @@ void DomainBaker::enumerateEntities() {
 
                         // move the baker to the baker thread
                         // and kickoff the bake
-                        baker->moveToThread(qApp->getNextWorkerThread());
+                        baker->moveToThread(Oven::instance().getNextWorkerThread());
                         QMetaObject::invokeMethod(baker.data(), "bake");
 
                         // keep track of the total number of baking entities
@@ -285,7 +285,7 @@ void DomainBaker::bakeSkybox(QUrl skyboxURL, QJsonValueRef entity) {
             _skyboxBakers.insert(skyboxURL, skyboxBaker);
 
             // move the baker to a worker thread and kickoff the bake
-            skyboxBaker->moveToThread(qApp->getNextWorkerThread());
+            skyboxBaker->moveToThread(Oven::instance().getNextWorkerThread());
             QMetaObject::invokeMethod(skyboxBaker.data(), "bake");
 
             // keep track of the total number of baking entities
diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index 69d2ef84ce..e8d4c01f63 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -11,33 +11,15 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
-#include <QtCore/QCommandLineParser>
 
 #include <image/Image.h>
 
-#include "ui/OvenMainWindow.h"
 #include "Oven.h"
-#include "BakerCLI.h"
 
-static const QString OUTPUT_FOLDER = "/Users/birarda/code/hifi/lod/test-oven/export";
+Oven* Oven::_staticInstance { nullptr };
 
-static const QString CLI_INPUT_PARAMETER = "i";
-static const QString CLI_OUTPUT_PARAMETER = "o";
-static const QString CLI_TYPE_PARAMETER = "t";
-
-Oven::Oven(int argc, char* argv[]) :
-    QApplication(argc, argv)
-{
-    // parse the command line parameters
-    QCommandLineParser parser;
-   
-    parser.addOptions({
-        { CLI_INPUT_PARAMETER, "Path to file that you would like to bake.", "input" },
-        { CLI_OUTPUT_PARAMETER, "Path to folder that will be used as output.", "output" },
-        { CLI_TYPE_PARAMETER, "Type of asset.", "type" }
-    });
-    parser.addHelpOption();
-    parser.process(*this);
+Oven::Oven() {
+    _staticInstance = this;
 
     // enable compression in image library
     image::setColorTexturesCompressionEnabled(true);
@@ -47,41 +29,27 @@ Oven::Oven(int argc, char* argv[]) :
 
     // setup our worker threads
     setupWorkerThreads(QThread::idealThreadCount());
-
-    // check if we were passed any command line arguments that would tell us just to run without the GUI
-    if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) {
-        if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
-            BakerCLI* cli = new BakerCLI(this);
-            QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
-            QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
-            QString type = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString::null;
-            cli->bakeFile(inputUrl, outputUrl.toString(), type);
-        } else {
-            parser.showHelp();
-            QApplication::quit();
-        } 
-    } else {
-        // setup the GUI
-        _mainWindow = new OvenMainWindow;
-        _mainWindow->show();
-    }
 }
 
 Oven::~Oven() {
-    // cleanup the worker threads
-    for (auto i = 0; i < _workerThreads.size(); ++i) {
-        _workerThreads[i]->quit();
-        _workerThreads[i]->wait();
+    // quit and wait on the worker threads
+    for (auto& thread : _workerThreads) {
+        thread->quit();
+        thread->wait();
     }
+
+    _staticInstance = nullptr;
 }
 
 void Oven::setupWorkerThreads(int numWorkerThreads) {
+    _workerThreads.reserve(numWorkerThreads);
+
     for (auto i = 0; i < numWorkerThreads; ++i) {
         // setup a worker thread yet and add it to our concurrent vector
-        auto newThread = new QThread(this);
+        auto newThread = std::unique_ptr<QThread> { new QThread };
         newThread->setObjectName("Oven Worker Thread " + QString::number(i + 1));
 
-        _workerThreads.push_back(newThread);
+        _workerThreads.push_back(std::move(newThread));
     }
 }
 
@@ -92,13 +60,13 @@ QThread* Oven::getNextWorkerThread() {
     // (for the FBX Baker Thread to have room), and cycle through them to hand a usable running thread back to our callers.
 
     auto nextIndex = ++_nextWorkerThreadIndex;
-    auto nextThread = _workerThreads[nextIndex % _workerThreads.size()];
+    auto& nextThread = _workerThreads[nextIndex % _workerThreads.size()];
 
     // start the thread if it isn't running yet
     if (!nextThread->isRunning()) {
         nextThread->start();
     }
 
-    return nextThread;
+    return nextThread.get();
 }
 
diff --git a/tools/oven/src/Oven.h b/tools/oven/src/Oven.h
index 928ba4eb11..443def5cb1 100644
--- a/tools/oven/src/Oven.h
+++ b/tools/oven/src/Oven.h
@@ -12,27 +12,15 @@
 #ifndef hifi_Oven_h
 #define hifi_Oven_h
 
-#include <QtWidgets/QApplication>
-
-#include <TBBHelpers.h>
-
 #include <atomic>
 
-#if defined(qApp)
-#undef qApp
-#endif
-#define qApp (static_cast<Oven*>(QCoreApplication::instance()))
-
-class OvenMainWindow;
-
-class Oven : public QApplication {
-    Q_OBJECT
+class Oven {
 
 public:
-    Oven(int argc, char* argv[]);
+    Oven();
     ~Oven();
 
-    OvenMainWindow* getMainWindow() const { return _mainWindow; }
+    static Oven& instance() { return *_staticInstance; }
 
     QThread* getNextWorkerThread();
 
@@ -40,11 +28,12 @@ private:
     void setupWorkerThreads(int numWorkerThreads);
     void setupFBXBakerThread();
 
-    OvenMainWindow* _mainWindow;
-    QList<QThread*> _workerThreads;
+    std::vector<std::unique_ptr<QThread>> _workerThreads;
 
     std::atomic<uint> _nextWorkerThreadIndex;
     int _numWorkerThreads;
+
+    static Oven* _staticInstance;
 };
 
 
diff --git a/tools/oven/src/OvenCLIApplication.cpp b/tools/oven/src/OvenCLIApplication.cpp
new file mode 100644
index 0000000000..38d9963eeb
--- /dev/null
+++ b/tools/oven/src/OvenCLIApplication.cpp
@@ -0,0 +1,49 @@
+//
+//  OvenCLIApplication.cpp
+//  tools/oven/src
+//
+//  Created by Stephen Birarda on 2/20/18.
+//  Copyright 2018 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 <QtCore/QCommandLineParser>
+#include <QtCore/QUrl>
+
+#include "BakerCLI.h"
+
+#include "OvenCLIApplication.h"
+
+static const QString CLI_INPUT_PARAMETER = "i";
+static const QString CLI_OUTPUT_PARAMETER = "o";
+static const QString CLI_TYPE_PARAMETER = "t";
+
+OvenCLIApplication::OvenCLIApplication(int argc, char* argv[]) :
+    QCoreApplication(argc, argv)
+{
+    // parse the command line parameters
+    QCommandLineParser parser;
+
+    parser.addOptions({
+        { CLI_INPUT_PARAMETER, "Path to file that you would like to bake.", "input" },
+        { CLI_OUTPUT_PARAMETER, "Path to folder that will be used as output.", "output" },
+        { CLI_TYPE_PARAMETER, "Type of asset.", "type" }
+    });
+
+    parser.addHelpOption();
+    parser.process(*this);
+
+    if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
+        BakerCLI* cli = new BakerCLI(this);
+        QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
+        QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
+        QString type = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString::null;
+        cli->bakeFile(inputUrl, outputUrl.toString(), type);
+    } else {
+        parser.showHelp();
+        QCoreApplication::quit();
+    }
+
+}
diff --git a/tools/oven/src/OvenCLIApplication.h b/tools/oven/src/OvenCLIApplication.h
new file mode 100644
index 0000000000..5d81166f69
--- /dev/null
+++ b/tools/oven/src/OvenCLIApplication.h
@@ -0,0 +1,27 @@
+//
+//  OvenCLIApplication.h
+//  tools/oven/src
+//
+//  Created by Stephen Birarda on 2/20/18.
+//  Copyright 2018 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_OvenCLIApplication_h
+#define hifi_OvenCLIApplication_h
+
+#include <QtCore/QCoreApplication>
+
+#include "Oven.h"
+
+class OvenCLIApplication : public QCoreApplication, public Oven {
+    Q_OBJECT
+public:
+    OvenCLIApplication(int argc, char* argv[]);
+
+    static OvenCLIApplication* instance() { return dynamic_cast<OvenCLIApplication*>(QCoreApplication::instance()); }
+};
+
+#endif // hifi_OvenCLIApplication_h
diff --git a/tools/oven/src/OvenGUIApplication.cpp b/tools/oven/src/OvenGUIApplication.cpp
new file mode 100644
index 0000000000..33dc375634
--- /dev/null
+++ b/tools/oven/src/OvenGUIApplication.cpp
@@ -0,0 +1,19 @@
+//
+//  OvenGUIApplication.cpp
+//  tools/src/oven
+//
+//  Created by Stephen Birarda on 2/20/18.
+//  Copyright 2018 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 "OvenGUIApplication.h"
+
+OvenGUIApplication::OvenGUIApplication(int argc, char* argv[]) :
+    QApplication(argc, argv)
+{
+    // setup the GUI
+    _mainWindow.show();
+}
diff --git a/tools/oven/src/OvenGUIApplication.h b/tools/oven/src/OvenGUIApplication.h
new file mode 100644
index 0000000000..7f5bbf3eaf
--- /dev/null
+++ b/tools/oven/src/OvenGUIApplication.h
@@ -0,0 +1,33 @@
+//
+//  OvenGUIApplication.h
+//  tools/oven/src
+//
+//  Created by Stephen Birarda on 2/20/18.
+//  Copyright 2018 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_OvenGUIApplication_h
+#define hifi_OvenGUIApplication_h
+
+#include <QtWidgets/QApplication>
+
+#include "ui/OvenMainWindow.h"
+
+#include "Oven.h"
+
+class OvenGUIApplication : public QApplication, public Oven {
+    Q_OBJECT
+public:
+    OvenGUIApplication(int argc, char* argv[]);
+
+    static OvenGUIApplication* instance() { return dynamic_cast<OvenGUIApplication*>(QApplication::instance()); }
+    
+    OvenMainWindow* getMainWindow() { return &_mainWindow; }
+private:
+    OvenMainWindow _mainWindow;
+};
+
+#endif // hifi_OvenGUIApplication_h
diff --git a/tools/oven/src/main.cpp b/tools/oven/src/main.cpp
index 788470b75e..062cc63a0d 100644
--- a/tools/oven/src/main.cpp
+++ b/tools/oven/src/main.cpp
@@ -8,7 +8,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-#include "Oven.h"
+#include "OvenCLIApplication.h"
+#include "OvenGUIApplication.h"
 
 #include <SettingInterface.h>
 
@@ -19,6 +20,12 @@ int main (int argc, char** argv) {
     // init the settings interface so we can save and load settings
     Setting::init();
 
-    Oven app(argc, argv);
-    return app.exec();
+    // figure out if we're launching our GUI application or just the simple command line interface
+    if (argc > 1) {
+        OvenCLIApplication app { argc, argv };
+        return app.exec();
+    } else {
+        OvenGUIApplication app { argc, argv };
+        return app.exec();
+    }
 }
diff --git a/tools/oven/src/ui/BakeWidget.cpp b/tools/oven/src/ui/BakeWidget.cpp
index 9fb8f2f880..22e1b1aaf9 100644
--- a/tools/oven/src/ui/BakeWidget.cpp
+++ b/tools/oven/src/ui/BakeWidget.cpp
@@ -11,8 +11,7 @@
 
 #include <QtWidgets/QStackedWidget>
 
-#include "../Oven.h"
-#include "OvenMainWindow.h"
+#include "../OvenGUIApplication.h"
 
 #include "BakeWidget.h"
 
@@ -28,7 +27,7 @@ BakeWidget::~BakeWidget() {
     auto it = _bakers.begin();
     while (it != _bakers.end()) {
         auto resultRow = it->second;
-        auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+        auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
 
         resultsWindow->changeStatusForRow(resultRow, "Cancelled");
 
diff --git a/tools/oven/src/ui/DomainBakeWidget.cpp b/tools/oven/src/ui/DomainBakeWidget.cpp
index 41452c7283..bf79319458 100644
--- a/tools/oven/src/ui/DomainBakeWidget.cpp
+++ b/tools/oven/src/ui/DomainBakeWidget.cpp
@@ -21,8 +21,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
-#include "../Oven.h"
-#include "OvenMainWindow.h"
+#include "../OvenGUIApplication.h"
 
 #include "DomainBakeWidget.h"
 
@@ -223,14 +222,14 @@ void DomainBakeWidget::bakeButtonClicked() {
         connect(domainBaker.get(), &DomainBaker::bakeProgress, this, &DomainBakeWidget::handleBakerProgress);
 
         // move the baker to the next available Oven worker thread
-        auto nextThread = qApp->getNextWorkerThread();
+        auto nextThread = Oven::instance().getNextWorkerThread();
         domainBaker->moveToThread(nextThread);
 
         // kickoff the domain baker on its thread
         QMetaObject::invokeMethod(domainBaker.get(), "bake");
 
         // add a pending row to the results window to show that this bake is in process
-        auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+        auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
         auto resultsRowName = _domainNameLineEdit->text().isEmpty() ? fileToBakeURL.fileName() : _domainNameLineEdit->text();
         auto resultsRow = resultsWindow->addPendingResultRow(resultsRowName, outputDirectory);
 
@@ -250,7 +249,7 @@ void DomainBakeWidget::handleBakerProgress(int baked, int total) {
             auto resultRow = it->second;
             
             // grab the results window, don't force it to be brought to the top
-            auto resultsWindow = qApp->getMainWindow()->showResultsWindow(false);
+            auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow(false);
 
             int percentage = roundf(float(baked) / float(total) * 100.0f);
 
@@ -269,7 +268,7 @@ void DomainBakeWidget::handleFinishedBaker() {
 
         if (it != _bakers.end()) {
             auto resultRow = it->second;
-            auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+            auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
 
             if (baker->hasErrors()) {
                 auto errors = baker->getErrors();
diff --git a/tools/oven/src/ui/ModelBakeWidget.cpp b/tools/oven/src/ui/ModelBakeWidget.cpp
index 7963b3f3c4..61eea55917 100644
--- a/tools/oven/src/ui/ModelBakeWidget.cpp
+++ b/tools/oven/src/ui/ModelBakeWidget.cpp
@@ -21,8 +21,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
 
-#include "../Oven.h"
-#include "OvenMainWindow.h"
+#include "../OvenGUIApplication.h"
 
 #include "ModelBakeWidget.h"
 
@@ -208,12 +207,12 @@ void ModelBakeWidget::bakeButtonClicked() {
         // everything seems to be in place, kick off a bake for this model now
         auto baker = std::unique_ptr<FBXBaker> {
             new FBXBaker(modelToBakeURL, []() -> QThread* {
-                return qApp->getNextWorkerThread();
+                return Oven::instance().getNextWorkerThread();
             }, bakedOutputDirectory.absolutePath(), originalOutputDirectory.absolutePath())
         };
 
         // move the baker to the FBX baker thread
-        baker->moveToThread(qApp->getNextWorkerThread());
+        baker->moveToThread(Oven::instance().getNextWorkerThread());
 
         // invoke the bake method on the baker thread
         QMetaObject::invokeMethod(baker.get(), "bake");
@@ -222,7 +221,7 @@ void ModelBakeWidget::bakeButtonClicked() {
         connect(baker.get(), &FBXBaker::finished, this, &ModelBakeWidget::handleFinishedBaker);
 
         // add a pending row to the results window to show that this bake is in process
-        auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+        auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
         auto resultsRow = resultsWindow->addPendingResultRow(modelToBakeURL.fileName(), outputDirectory);
 
         // keep a unique_ptr to this baker
@@ -244,7 +243,7 @@ void ModelBakeWidget::handleFinishedBaker() {
 
         if (it != _bakers.end()) {
             auto resultRow = it->second;
-            auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+            auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
 
             if (baker->hasErrors()) {
                 resultsWindow->changeStatusForRow(resultRow, baker->getErrors().join("\n"));
diff --git a/tools/oven/src/ui/SkyboxBakeWidget.cpp b/tools/oven/src/ui/SkyboxBakeWidget.cpp
index cbaaa5ec0a..369b06c39f 100644
--- a/tools/oven/src/ui/SkyboxBakeWidget.cpp
+++ b/tools/oven/src/ui/SkyboxBakeWidget.cpp
@@ -21,8 +21,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
 
-#include "../Oven.h"
-#include "OvenMainWindow.h"
+#include "../OvenGUIApplication.h"
 
 #include "SkyboxBakeWidget.h"
 
@@ -184,7 +183,7 @@ void SkyboxBakeWidget::bakeButtonClicked() {
         };
 
         // move the baker to a worker thread
-        baker->moveToThread(qApp->getNextWorkerThread());
+        baker->moveToThread(Oven::instance().getNextWorkerThread());
 
         // invoke the bake method on the baker thread
         QMetaObject::invokeMethod(baker.get(), "bake");
@@ -193,7 +192,7 @@ void SkyboxBakeWidget::bakeButtonClicked() {
         connect(baker.get(), &TextureBaker::finished, this, &SkyboxBakeWidget::handleFinishedBaker);
 
         // add a pending row to the results window to show that this bake is in process
-        auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+        auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
         auto resultsRow = resultsWindow->addPendingResultRow(skyboxToBakeURL.fileName(), outputDirectory);
 
         // keep a unique_ptr to this baker
@@ -211,7 +210,7 @@ void SkyboxBakeWidget::handleFinishedBaker() {
 
         if (it != _bakers.end()) {
             auto resultRow = it->second;
-            auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
+            auto resultsWindow = OvenGUIApplication::instance()->getMainWindow()->showResultsWindow();
 
             if (baker->hasErrors()) {
                 resultsWindow->changeStatusForRow(resultRow, baker->getErrors().join("\n"));

From d4061c172ef8cb795b4b8409312ae1d41865686b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 20 Feb 2018 17:27:40 -0800
Subject: [PATCH 402/569] quit all threads before waiting on them (CR)

---
 tools/oven/src/Oven.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index e8d4c01f63..650683e1f0 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -32,9 +32,12 @@ Oven::Oven() {
 }
 
 Oven::~Oven() {
-    // quit and wait on the worker threads
+    // quit all worker threads and wait on them
     for (auto& thread : _workerThreads) {
         thread->quit();
+    }
+
+    for (auto& thread: _workerThreads) {
         thread->wait();
     }
 

From 79f5d0cee21161054b12d220b28d1d4bac546887 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 20 Feb 2018 18:49:38 -0800
Subject: [PATCH 403/569] include memory for unique_ptr in Oven

---
 tools/oven/src/Oven.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/oven/src/Oven.h b/tools/oven/src/Oven.h
index 443def5cb1..effebb472e 100644
--- a/tools/oven/src/Oven.h
+++ b/tools/oven/src/Oven.h
@@ -13,6 +13,7 @@
 #define hifi_Oven_h
 
 #include <atomic>
+#include <memory>
 
 class Oven {
 

From 049beba1572638b2b45695dfee3a3e5c5f2b8c86 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Wed, 21 Feb 2018 14:15:41 -0800
Subject: [PATCH 404/569] Corrected edge case of creating a snapshot with "" as
 the filename.

---
 interface/src/Application.h                        | 3 +--
 interface/src/scripting/WindowScriptingInterface.h | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index d4041aa3be..784b509c1a 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -266,9 +266,8 @@ public:
 
     float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
-    // Note that takeSnapshot has a default value, as this method is used internally.
     void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
-    void takeSecondaryCameraSnapshot(const QString& filename);
+    void takeSecondaryCameraSnapshot(const QString& filename = QString());
 
     void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 76decf4362..196863e362 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -334,8 +334,8 @@ public slots:
      * @param {number} aspectRatio=0 - The width/height ratio of the snapshot required. If the value is <code>0</code> the
      *     full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
      *     dimensions is adjusted in order to match the aspect ratio.
-     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ",jpg".
-	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'
+     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ",jpg".
+	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
      * @example <caption>Using the snapshot function and signals.</caption>
      * function onStillSnapshotTaken(path, notify) {
      *     print("Still snapshot taken: " + path);
@@ -357,7 +357,7 @@ public slots:
      * var notify = true;
      * var animated = true;
      * var aspect = 1920 / 1080;
-     * var filename = QString();
+     * var filename = "";
      * Window.takeSnapshot(notify, animated, aspect, filename);
      */
     void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
@@ -365,7 +365,7 @@ public slots:
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
      * @function Window.takeSecondaryCameraSnapshot
-     * @param {string} filename=QString() - If this value is not null then the image will be saved to this filename, with an appended ".jpg"
+     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ".jpg".
      *
      * var filename = QString();
      */

From 758239568644731da70bc9a556da5da983e052d7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 14:52:02 -0800
Subject: [PATCH 405/569] Cleanup backup handlers timers on the correct thread

---
 domain-server/src/DomainContentBackupManager.cpp | 5 +++++
 domain-server/src/DomainContentBackupManager.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 9c72d64eea..aa5c247ccf 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -155,6 +155,11 @@ bool DomainContentBackupManager::process() {
     return isStillRunning();
 }
 
+void DomainContentBackupManager::shutdown() {
+    // Destroy handlers on the correct thread so that they can cleanup timers
+    _backupHandlers.clear();
+}
+
 void DomainContentBackupManager::aboutToFinish() {
     _stopThread = true;
 }
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 06a8d0394f..4024794856 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -75,6 +75,7 @@ protected:
     /// Implements generic processing behavior for this thread.
     virtual void setup() override;
     virtual bool process() override;
+    virtual void shutdown() override;
 
     void load();
     void backup();

From 468ac62676854b400fdf0e6e58660690c7e217a2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Feb 2018 15:33:12 -0800
Subject: [PATCH 406/569] mark corrupted backups and refuse to restore from
 them in web UI

---
 domain-server/resources/web/content/js/content.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 4d8034eb1d..dbb660d4b9 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -125,6 +125,7 @@ $(document).ready(function(){
   var BACKUP_DOWNLOAD_LINK_CLASS = 'download-backup';
   var BACKUP_DELETE_LINK_CLASS = 'delete-backup';
   var ACTIVE_BACKUP_ROW_CLASS = 'active-backup';
+  var CORRUPTED_ROW_CLASS = 'danger';
 
   function reloadBackupInformation() {
     // make a GET request to get backup information to populate the table
@@ -183,11 +184,21 @@ $(document).ready(function(){
         } else if (backup.id == data.status.recoveringBackupId) {
           // add a progress bar to the status row for recovery
           $backupRow.find('td.backup-status').html(progressBarHTML('recovery', 'Restoring'));
+        } else if (backup.isCorrupted) {
+          // add text for corrupted status to row
+          $backupRow.find('td.backup-status').html('<span>Corrupted</span>');
         } else {
           // no special status for this row, use an empty status column
           $backupRow.find('td.backup-status').html('');
         }
 
+        // color the row red if it is corrupted
+        $backupRow.toggleClass(CORRUPTED_ROW_CLASS, backup.isCorrupted);
+
+        // disable restore if the backup is corrupted
+        $backupRow.find('a.' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', backup.isCorrupted);
+
+        // toggle the dropdown menu depending on if the row is available
         $backupRow.find('td.' + ACTION_MENU_CLASS + ' .dropdown').toggle(backup.isAvailable);
 
         $backupRow.addClass(ACTIVE_BACKUP_ROW_CLASS);
@@ -213,7 +224,7 @@ $(document).ready(function(){
       $('#' + CONTENT_ARCHIVES_NORMAL_ID + ' tbody tr:not(.' + ACTIVE_BACKUP_ROW_CLASS + ')').remove();
 
       // check if the restore action on all rows should be enabled or disabled
-      $('.' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', data.status.isRecovering);
+      $('tr:not(.' + CORRUPTED_ROW_CLASS + ') .' + BACKUP_RESTORE_LINK_CLASS).parent().toggleClass('disabled', data.status.isRecovering);
 
       // hide or show the manual content upload file and button depending on our recovering status
       $('#' + UPLOAD_CONTENT_ALLOWED_DIV_ID).toggle(!data.status.isRecovering);

From 68f0c0391aedaed87b64bf36230bb0410e4796e8 Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Wed, 21 Feb 2018 15:44:23 -0800
Subject: [PATCH 407/569] Initial fix - need a little style fixing

---
 .../resources/qml/hifi/tablet/EditTabView.qml | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index c79c05a601..9439d3fcea 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls 2.2 // Need both for short-term fix
 import QtWebEngine 1.1
 import QtWebChannel 1.0
 import QtQuick.Controls.Styles 1.4
@@ -10,6 +11,7 @@ import "../../controls-uit" as HifiControls
 import "../../styles-uit"
 
 
+
 TabView {
     id: editTabView
     // anchors.fill: parent
@@ -23,8 +25,25 @@ TabView {
 
         Rectangle {
             color: "#404040"
+            id: container
+
+            Flickable {
+            height: parent.height
+            width: parent.width
+
+            contentHeight: createEntitiesFlow.height +  importButton.height + assetServerButton.height + 153
+            contentWidth: width
+
+            ScrollBar.vertical : ScrollBar {
+                visible: parent.contentHeight > parent.height
+                width: 20
+                background: Rectangle {
+                    color: hifi.colors.tableScrollBackgroundDark
+                }
+            }
 
             Text {
+                id: header
                 color: "#ffffff"
                 text: "Choose an Entity Type to Create:"
                 font.pixelSize: 14
@@ -176,6 +195,7 @@ TabView {
             }
 
             HifiControls.Button {
+                id: importButton
                 text: "Import Entities (.json)"
                 color: hifi.buttons.black
                 colorScheme: hifi.colorSchemes.dark
@@ -192,6 +212,7 @@ TabView {
                 }
             }
         }
+      } // Flickable
     }
 
     Tab {

From e80fef4e1baaed32b95ab1d00710476146e5f1bd Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Feb 2018 15:52:33 -0800
Subject: [PATCH 408/569] fix badging for changes in tables

---
 domain-server/resources/web/js/base-settings.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/web/js/base-settings.js b/domain-server/resources/web/js/base-settings.js
index bafe5f96cf..7a860098d2 100644
--- a/domain-server/resources/web/js/base-settings.js
+++ b/domain-server/resources/web/js/base-settings.js
@@ -682,11 +682,11 @@ function makeTableHiddenInputs(setting, initialValues, categoryValue) {
     } else {
       html +=
         "<td " + (col.hidden ? "style='display: none;'" : "") + " class='" + Settings.DATA_COL_CLASS + "' " +
-            "name='" + col.name + "'>" +
-          "<input type='text' style='display: none;' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "' " +
-                 "value='" + (defaultValue || "") + "' data-default='" + (defaultValue || "") + "'" +
-                 (col.readonly ? " readonly" : "") + ">" +
-        "</td>";
+          "name='" + col.name + "'>" +
+          "<input type='text' style='display: none;' class='form-control " + Settings.TRIGGER_CHANGE_CLASS +
+          "' placeholder='" + (col.placeholder ? col.placeholder : "") + "' " +
+          "value='" + (defaultValue || "") + "' data-default='" + (defaultValue || "") + "'" +
+          (col.readonly ? " readonly" : "") + ">" + "</td>";
     }
   })
 

From 990e848de6bf35a5bd292b88ec4dc56e817652a5 Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Wed, 21 Feb 2018 15:54:00 -0800
Subject: [PATCH 409/569] fix typo that was breaking popup dialog

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

diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 049a7faad8..bbecb9e85b 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -199,7 +199,7 @@ Rectangle {
             var SHAPE_TYPE_BOX = 4;
             var SHAPE_TYPE_SPHERE = 5;
         
-            var SHAPE_TYPES = [];ww
+            var SHAPE_TYPES = [];
             SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";

From 4b1217f1f6b4768386b8b9f7ab09a2efb31b5d8a Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 21 Feb 2018 15:25:18 -0800
Subject: [PATCH 410/569] move all entity items to main thread

---
 interface/src/octree/OctreePacketProcessor.cpp | 2 ++
 libraries/entities/src/EntityTypes.cpp         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index c792834d9c..122b58c057 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -17,6 +17,8 @@
 #include "SceneScriptingInterface.h"
 
 OctreePacketProcessor::OctreePacketProcessor() {
+    setObjectName("Octree Packet Processor");
+
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     
     packetReceiver.registerDirectListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 307371c649..694542b04e 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -97,6 +97,7 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
         auto mutableProperties = properties;
         mutableProperties.markAllChanged();
         newEntityItem = factory(entityID, mutableProperties);
+        newEntityItem->moveToThread(qApp->thread());
     }
     return newEntityItem;
 }

From aba1cae36d1c6fe172452dd75e1af02b0818955b Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Wed, 21 Feb 2018 16:19:50 -0800
Subject: [PATCH 411/569] get rid of magic number

---
 interface/resources/qml/hifi/tablet/EditTabView.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index 9439d3fcea..e419b04848 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -31,7 +31,9 @@ TabView {
             height: parent.height
             width: parent.width
 
-            contentHeight: createEntitiesFlow.height +  importButton.height + assetServerButton.height + 153
+            contentHeight: createEntitiesFlow.height +  importButton.height + assetServerButton.height +
+                           header.anchors.topMargin + createEntitiesFlow.anchors.topMargin +
+                           assetServerButton.anchors.topMargin + importButton.anchors.topMargin
             contentWidth: width
 
             ScrollBar.vertical : ScrollBar {

From 946474c615815d8b209e3291fbe1c11a9fed9714 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Feb 2018 14:15:39 -0800
Subject: [PATCH 412/569] do not init caching for asset requests in
 domain-server

---
 domain-server/src/DomainServer.cpp                       | 1 -
 libraries/networking/src/AssetClient.cpp                 | 2 +-
 libraries/networking/src/AssetClient.h                   | 2 +-
 libraries/networking/src/AssetUtils.cpp                  | 6 ++----
 libraries/networking/src/BaseAssetScriptingInterface.cpp | 2 +-
 libraries/networking/src/ResourceManager.cpp             | 2 +-
 tools/atp-client/src/ATPClientApp.cpp                    | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index e40adb5059..4311a3ee69 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -735,7 +735,6 @@ void DomainServer::setupNodeListAndAssignments() {
     _assetClientThread.setObjectName("AssetClient Thread");
     auto assetClient = DependencyManager::set<AssetClient>();
     assetClient->moveToThread(&_assetClientThread);
-    QObject::connect(&_assetClientThread, &QThread::started, assetClient.data(), &AssetClient::init);
     _assetClientThread.start();
 
     // add whatever static assignments that have been parsed to the queue
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index 41d988eca4..0a5c2c46c6 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -53,7 +53,7 @@ AssetClient::AssetClient() {
             this, &AssetClient::handleNodeClientConnectionReset);
 }
 
-void AssetClient::init() {
+void AssetClient::initCaching() {
     Q_ASSERT(QThread::currentThread() == thread());
 
     // Setup disk cache if not already
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index 3ec96c3dd4..1860a1744a 100644
--- a/libraries/networking/src/AssetClient.h
+++ b/libraries/networking/src/AssetClient.h
@@ -64,7 +64,7 @@ public:
     Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data);
 
 public slots:
-    void init();
+    void initCaching();
 
     void cacheInfoRequest(QObject* reciever, QString slot);
     MiniPromise::Promise cacheInfoRequestAsync(MiniPromise::Promise deferred = nullptr);
diff --git a/libraries/networking/src/AssetUtils.cpp b/libraries/networking/src/AssetUtils.cpp
index 117274eab8..d302c6fac6 100644
--- a/libraries/networking/src/AssetUtils.cpp
+++ b/libraries/networking/src/AssetUtils.cpp
@@ -72,9 +72,8 @@ QByteArray loadFromCache(const QUrl& url) {
             qCDebug(asset_client) << url.toDisplayString() << "not in disk cache";
         }
 
-    } else {
-        qCWarning(asset_client) << "No disk cache to load assets from.";
     }
+
     return QByteArray();
 }
 
@@ -96,9 +95,8 @@ bool saveToCache(const QUrl& url, const QByteArray& file) {
             }
             qCWarning(asset_client) << "Could not save" << url.toDisplayString() << "to disk cache.";
         }
-    } else {
-        qCWarning(asset_client) << "No disk cache to save assets to.";
     }
+    
     return false;
 }
 
diff --git a/libraries/networking/src/BaseAssetScriptingInterface.cpp b/libraries/networking/src/BaseAssetScriptingInterface.cpp
index 3149bbc768..decb796fa4 100644
--- a/libraries/networking/src/BaseAssetScriptingInterface.cpp
+++ b/libraries/networking/src/BaseAssetScriptingInterface.cpp
@@ -47,7 +47,7 @@ bool BaseAssetScriptingInterface::initializeCache() {
     }
 
     // attempt to initialize the cache
-    QMetaObject::invokeMethod(assetClient().data(), "init");
+    QMetaObject::invokeMethod(assetClient().data(), "initCaching");
 
     Promise deferred = makePromise("BaseAssetScriptingInterface--queryCacheStatus");
     deferred->then([this](QVariantMap result) {
diff --git a/libraries/networking/src/ResourceManager.cpp b/libraries/networking/src/ResourceManager.cpp
index 17dcd9728d..317cabdc61 100644
--- a/libraries/networking/src/ResourceManager.cpp
+++ b/libraries/networking/src/ResourceManager.cpp
@@ -31,7 +31,7 @@ ResourceManager::ResourceManager() {
 
     auto assetClient = DependencyManager::set<AssetClient>();
     assetClient->moveToThread(&_thread);
-    QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init);
+    QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::initCaching);
 
     _thread.start();
 }
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
index 1623cf01cd..dbc2ad53f6 100644
--- a/tools/atp-client/src/ATPClientApp.cpp
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -197,7 +197,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
     }
 
     auto assetClient = DependencyManager::set<AssetClient>();
-    assetClient->init();
+    assetClient->initCaching();
 
     if (_verbose) {
         qDebug() << "domain-server address is" << _domainServerAddress;

From e12ca2683f5f5bb82c954782b3c57467cd33dc7c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 17:28:00 -0800
Subject: [PATCH 413/569] Fix incorrect "all backups loaded" flag

---
 domain-server/src/AssetsBackupHandler.cpp | 9 ++++-----
 domain-server/src/AssetsBackupHandler.h   | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index b979aab993..e86c007d07 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -101,7 +101,10 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
 
     if (deprecatedAssets.size() > 0) {
         qCDebug(asset_backup) << "Found" << deprecatedAssets.size() << "backup assets to delete from disk.";
-        if (_allBackupsLoadedSuccessfully) {
+        const auto noCorruptedBackups = none_of(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+            return backup.corruptedBackup;
+        });
+        if (noCorruptedBackups) {
             for (const auto& hash : deprecatedAssets) {
                 QFile::remove(_assetsDirectory + hash);
             }
@@ -175,7 +178,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Failed to find" << MAPPINGS_FILE << "while loading backup";
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -184,7 +186,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Could not unzip backup file for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -194,7 +195,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -206,7 +206,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         if (!AssetUtils::isValidHash(assetHash)) {
             qCCritical(asset_backup) << "Corrupted mapping in loading backup file" << backupName << ":" << it.key();
             backup.corruptedBackup = true;
-            _allBackupsLoadedSuccessfully = false;
             continue;
         }
 
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index f94ba43cdf..10aa7c5e7f 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -78,7 +78,6 @@ private:
     };
 
     // Internal storage for backups on disk
-    bool _allBackupsLoadedSuccessfully { false };
     std::vector<AssetServerBackup> _backups;
     std::set<AssetUtils::AssetHash> _assetsInBackups;
     std::set<AssetUtils::AssetHash> _assetsOnDisk;

From a2c94bd9d23042d08ab702de58c14673dc7fe54e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 18:06:31 -0800
Subject: [PATCH 414/569] Fix invalid iterator access

---
 domain-server/src/AssetsBackupHandler.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index e86c007d07..ecbe8b58d8 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -279,7 +279,7 @@ void AssetsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip)
         qCWarning(asset_backup) << "Current asset mappings that might be stale.";
     }
 
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+    auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
         return backup.name == backupName;
     });
     if (it == end(_backups)) {
@@ -306,6 +306,17 @@ void AssetsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip)
                 writeAssetFile(asset, zipFile.readAll());
             }
         }
+
+        // iterator is end() and has been invalidated in the `loadBackup` call
+        // grab the new iterator
+        it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+            return backup.name == backupName;
+        });
+
+        if (it == end(_backups)) {
+            qCCritical(asset_backup) << "Failed to recover backup:" << backupName;
+            return;
+        }
     }
 
     const auto& newMappings = it->mappings;

From a036de968774581a7c95543e75b35f47a9482207 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Feb 2018 17:54:45 -0800
Subject: [PATCH 415/569] fix restore of object settings

---
 domain-server/src/DomainServerSettingsManager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 5157654c33..f910799f9e 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1298,6 +1298,9 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
                     }
                 } else {
                     // we have a value to restore, use update setting to set it
+                    // but clear the existing value first so that no merging between the restored settings
+                    // and existing settings occurs
+                    variantValue->clear();
 
                     // we might need to re-grab config group map in case it didn't exist when we looked for it before
                     // but was created by the call to valueForKeyPath before

From 2fb9c324a5d40d7c851af25ec8b5650231f20c3a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 18:39:07 -0800
Subject: [PATCH 416/569] Ignore baked assets in backups

---
 domain-server/src/AssetsBackupHandler.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index ecbe8b58d8..70da40ef66 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -394,9 +394,15 @@ void AssetsBackupHandler::refreshMappings() {
     QObject::connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) {
         if (request->getError() == MappingRequest::NoError) {
             const auto& mappings = request->getMappings();
+
+            // Clear existing mappings
             _currentMappings.clear();
+
+            // Set new mapping, but ignore baked assets
             for (const auto& mapping : mappings) {
-                _currentMappings.insert({ mapping.first, mapping.second.hash });
+                if (!mapping.first.startsWith(AssetUtils::HIDDEN_BAKED_CONTENT_FOLDER)) {
+                    _currentMappings.insert({ mapping.first, mapping.second.hash });
+                }
             }
             _lastMappingsRefresh = usecTimestampNow();
 

From be8d79f53f74a4995319552703cf3a4f0a0499a3 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 05:15:01 -0500
Subject: [PATCH 417/569] CR fedback and cleanup

---
 interface/src/Application.cpp                 |   8 +-
 interface/src/Application.h                   |   1 +
 interface/src/ui/overlays/Base3DOverlay.h     |   1 -
 interface/src/ui/overlays/ModelOverlay.cpp    |   4 +
 .../src/avatars-renderer/Avatar.cpp           |   9 +-
 .../src/avatars-renderer/Avatar.h             |   2 +-
 .../src/RenderableEntityItem.h                |   1 +
 .../src/RenderableModelEntityItem.cpp         |  30 ++
 .../src/RenderableModelEntityItem.h           |   2 +
 .../src/RenderablePolyVoxEntityItem.cpp       |  37 +-
 .../src/RenderablePolyVoxEntityItem.h         |   1 +
 .../src/RenderableShapeEntityItem.cpp         |   6 +-
 libraries/entities/src/EntityItem.h           |   4 +
 .../entities/src/EntityScriptingInterface.cpp |  29 +-
 .../entities/src/EntityScriptingInterface.h   |   6 +-
 libraries/fbx/src/FBXReader.cpp               |  41 +-
 .../graphics-scripting/BufferViewHelpers.cpp  |  86 ++--
 .../graphics-scripting/BufferViewHelpers.h    |   8 +-
 .../BufferViewScripting.cpp                   |   2 -
 .../src/graphics-scripting/Forward.h          |  16 +-
 .../GraphicsScriptingInterface.cpp            | 160 +++++++
 ...terface.h => GraphicsScriptingInterface.h} |  29 +-
 .../ModelScriptingInterface.cpp               | 407 ------------------
 .../graphics-scripting/ScriptableModel.cpp    |   1 +
 .../src/graphics-scripting/ScriptableModel.h  |   1 -
 .../src/model-networking/SimpleMeshProxy.cpp  |  27 ++
 .../src/model-networking/SimpleMeshProxy.h    |  36 ++
 libraries/render-utils/src/GeometryCache.cpp  |   1 -
 libraries/render-utils/src/Model.cpp          | 162 ++-----
 libraries/render-utils/src/Model.h            |   6 +-
 .../src/ModelScriptingInterface.cpp           | 251 +++++++++++
 .../src/ModelScriptingInterface.h             |  39 ++
 libraries/script-engine/src/ScriptEngine.cpp  |   6 +
 libraries/shared/src/RegisteredMetaTypes.cpp  |  65 +++
 libraries/shared/src/RegisteredMetaTypes.h    |  42 ++
 libraries/shared/src/SpatiallyNestable.h      |   8 +-
 36 files changed, 890 insertions(+), 645 deletions(-)
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
 rename libraries/graphics-scripting/src/graphics-scripting/{ModelScriptingInterface.h => GraphicsScriptingInterface.h} (54%)
 delete mode 100644 libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
 create mode 100644 libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
 create mode 100644 libraries/model-networking/src/model-networking/SimpleMeshProxy.h
 create mode 100644 libraries/script-engine/src/ModelScriptingInterface.cpp
 create mode 100644 libraries/script-engine/src/ModelScriptingInterface.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5bfb1846a5..2e59541056 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -166,7 +166,7 @@
 #include "scripting/AccountServicesScriptingInterface.h"
 #include "scripting/HMDScriptingInterface.h"
 #include "scripting/MenuScriptingInterface.h"
-#include "graphics-scripting/ModelScriptingInterface.h"
+#include "graphics-scripting/GraphicsScriptingInterface.h"
 #include "scripting/SettingsScriptingInterface.h"
 #include "scripting/WindowScriptingInterface.h"
 #include "scripting/ControllerScriptingInterface.h"
@@ -199,6 +199,7 @@
 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
 #include <src/scripting/GooglePolyScriptingInterface.h>
 #include <EntityScriptClient.h>
+#include <ModelScriptingInterface.h>
 
 #include <PickManager.h>
 #include <PointerManager.h>
@@ -800,7 +801,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<DesktopScriptingInterface>();
     DependencyManager::set<EntityScriptingInterface>(true);
-    DependencyManager::set<ModelScriptingInterface>();
     DependencyManager::registerInheritance<scriptable::ModelProviderFactory, ApplicationMeshProvider>();
     DependencyManager::set<ApplicationMeshProvider>();
     DependencyManager::set<RecordingScriptingInterface>();
@@ -5981,8 +5981,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Render", _renderEngine->getConfiguration().get());
 
-    ModelScriptingInterface::registerMetaTypes(scriptEngine.data());
-    scriptEngine->registerGlobalObject("Model", DependencyManager::get<ModelScriptingInterface>().data());
+    GraphicsScriptingInterface::registerMetaTypes(scriptEngine.data());
+    scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data());
 
     scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ae07ebd9dd..ddb8ce11e5 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -72,6 +72,7 @@
 
 #include <procedural/ProceduralSkybox.h>
 #include <graphics/Skybox.h>
+#include <ModelScriptingInterface.h>
 #include "FrameTimingsScriptingInterface.h"
 
 #include "Sound.h"
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index 6ccad338c9..25bacf2e7e 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -16,7 +16,6 @@
 #include <graphics-scripting/Forward.h>
 #include "Overlay.h"
 
-namespace model { class Mesh; }
 class Base3DOverlay : public Overlay, public SpatiallyNestable, public scriptable::ModelProvider {
     Q_OBJECT
     using Parent = Overlay;
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index e007591ce0..17bc9e2263 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -75,6 +75,7 @@ void ModelOverlay::update(float deltatime) {
     render::ScenePointer scene = qApp->getMain3DScene();
     render::Transaction transaction;
     if (_model->needsFixupInScene()) {
+        emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(getID(), NestableType::Overlay, _model);
         _model->removeFromScene(scene, transaction);
         _model->addToScene(scene, transaction);
 
@@ -83,6 +84,7 @@ void ModelOverlay::update(float deltatime) {
             auto modelOverlay = static_cast<ModelOverlay*>(&data);
             modelOverlay->setSubRenderItemIDs(newRenderItemIDs);
         });
+        emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelAddedToScene(getID(), NestableType::Overlay, _model);
     }
     if (_visibleDirty) {
         _visibleDirty = false;
@@ -107,12 +109,14 @@ void ModelOverlay::update(float deltatime) {
 bool ModelOverlay::addToScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
     Volume3DOverlay::addToScene(overlay, scene, transaction);
     _model->addToScene(scene, transaction);
+    emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelAddedToScene(getID(), NestableType::Overlay, _model);
     return true;
 }
 
 void ModelOverlay::removeFromScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
     Volume3DOverlay::removeFromScene(overlay, scene, transaction);
     _model->removeFromScene(scene, transaction);
+    emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(getID(), NestableType::Overlay, _model);
     transaction.updateItem<Overlay>(getRenderItemID(), [](Overlay& data) {
         auto modelOverlay = static_cast<ModelOverlay*>(&data);
         modelOverlay->clearSubRenderItemIDs();
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 066afac8f5..aaf86be4bf 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -221,7 +221,7 @@ void Avatar::updateAvatarEntities() {
         return;
     }
 
-    if (getID() == QUuid()) {
+    if (getID() == QUuid() || getID() == AVATAR_SELF_ID) {
         return; // wait until MyAvatar gets an ID before doing this.
     }
 
@@ -577,6 +577,7 @@ void Avatar::addToScene(AvatarSharedPointer self, const render::ScenePointer& sc
     }
 
     _mustFadeIn = true;
+    emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelAddedToScene(getSessionUUID(), NestableType::Avatar, _skeletonModel);
 }
 
 void Avatar::fadeIn(render::ScenePointer scene) {
@@ -626,6 +627,7 @@ void Avatar::removeFromScene(AvatarSharedPointer self, const render::ScenePointe
     for (auto& attachmentModel : _attachmentModels) {
         attachmentModel->removeFromScene(scene, transaction);
     }
+    emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(getSessionUUID(), NestableType::Avatar, _skeletonModel);
 }
 
 void Avatar::updateRenderItem(render::Transaction& transaction) {
@@ -1764,12 +1766,11 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
 }
 
 scriptable::ScriptableModelBase Avatar::getScriptableModel(bool* ok) {
-    qDebug() << "Avatar::getScriptableModel" ;
     if (!_skeletonModel || !_skeletonModel->isLoaded()) {
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
     scriptable::ScriptableModelBase result = _skeletonModel->getScriptableModel(ok);
-    result.objectID = getSessionUUID(); 
+    result.objectID = getSessionUUID();
     result.mixin({
         { "avatarID", getSessionUUID().toString() },
         { "url", _skeletonModelURL.toString() },
@@ -1787,4 +1788,4 @@ scriptable::ScriptableModelBase Avatar::getScriptableModel(bool* ok) {
         *ok = true;
     }
     return result;
-}
+}
\ No newline at end of file
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 50301a2507..16c50e08ae 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -1,4 +1,3 @@
-
 //
 //  Avatar.h
 //  interface/src/avatar
@@ -276,6 +275,7 @@ public:
 
 
     virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 74759f4fe4..6cf745d7b4 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -56,6 +56,7 @@ public:
     const uint64_t& getUpdateTime() const { return _updateTime; }
 
     virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
+
 protected:
     virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
     virtual void onAddToScene(const EntityItemPointer& entity);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 155580d885..8eb48cd1f6 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -950,6 +950,16 @@ QStringList RenderableModelEntityItem::getJointNames() const {
     return result;
 }
 
+// FIXME: deprecated; remove >= RC67
+bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
+    auto model = getModel();
+    if (!model || !model->isLoaded()) {
+        return false;
+    }
+    BLOCKING_INVOKE_METHOD(model.get(), "getMeshes", Q_RETURN_ARG(MeshProxyList, result));
+    return !result.isEmpty();
+}
+
 scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel(bool* ok) {
     ModelPointer model;
     withReadLock([&] { model = _model; });
@@ -998,6 +1008,7 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
         return;
     }
 
+    bool changed { false };
     // relay any inbound joint changes from scripts/animation/network to the model/rig
     _jointDataLock.withWriteLock([&] {
         for (int index = 0; index < _localJointData.size(); ++index) {
@@ -1005,13 +1016,21 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
             if (jointData.rotationDirty) {
                 model->setJointRotation(index, true, jointData.joint.rotation, 1.0f);
                 jointData.rotationDirty = false;
+                changed = true;
             }
             if (jointData.translationDirty) {
                 model->setJointTranslation(index, true, jointData.joint.translation, 1.0f);
                 jointData.translationDirty = false;
+                changed = true;
             }
         }
     });
+
+    if (changed) {
+        forEachChild([&](SpatiallyNestablePointer object) {
+            object->locationChanged(false);
+        });
+    }
 }
 
 using namespace render;
@@ -1054,6 +1073,11 @@ void ModelEntityRenderer::removeFromScene(const ScenePointer& scene, Transaction
 
 void ModelEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
     entity->setModel({});
+    //emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(entity->getID(), NestableType::Entity, _model);
+}
+
+void ModelEntityRenderer::onAddToSceneTyped(const TypedEntityPointer& entity) {
+    //emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelAddedToScene(entity->getID(), NestableType::Entity, _model);
 }
 
 
@@ -1280,6 +1304,7 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
                 auto entityRenderer = static_cast<EntityRenderer*>(&data);
                 entityRenderer->clearSubRenderItemIDs();
             });
+            emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
         }
         return;
     }
@@ -1290,6 +1315,11 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
         connect(model.get(), &Model::setURLFinished, this, [&](bool didVisualGeometryRequestSucceed) {
             setKey(didVisualGeometryRequestSucceed);
             emit requestRenderUpdate();
+            auto factory = DependencyManager::get<scriptable::ModelProviderFactory>().data();
+            qDebug() << "leopoly didVisualGeometryRequestSucceed" << didVisualGeometryRequestSucceed << QThread::currentThread() << _model.get();
+            if(didVisualGeometryRequestSucceed) {
+                emit factory->modelAddedToScene(entity->getEntityItemID(), NestableType::Entity, _model);
+            }
         });
         connect(model.get(), &Model::requestRenderUpdate, this, &ModelEntityRenderer::requestRenderUpdate);
         connect(entity.get(), &RenderableModelEntityItem::requestCollisionGeometryUpdate, this, &ModelEntityRenderer::flagForCollisionGeometryUpdate);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index ffb83d3609..f72ddad6b5 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -111,6 +111,7 @@ public:
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;
 
+    bool getMeshes(MeshProxyList& result) override; // deprecated
     const void* getCollisionMeshKey() const { return _collisionMeshKey; }
 
 signals:
@@ -137,6 +138,7 @@ namespace render { namespace entities {
 class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem> {
     using Parent = TypedEntityRenderer<RenderableModelEntityItem>;
     friend class EntityRenderer;
+    Q_OBJECT
 
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 454fba4f94..931e55f7ef 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -20,6 +20,8 @@
 #include <QByteArray>
 #include <QtConcurrent/QtConcurrentRun>
 
+#include <model-networking/SimpleMeshProxy.h>
+#include <ModelScriptingInterface.h>
 #include <EntityEditPacketSender.h>
 #include <PhysicalEntitySimulation.h>
 #include <StencilMaskPass.h>
@@ -97,7 +99,7 @@ const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
 
   In RenderablePolyVoxEntityItem::render, these flags are checked and changes are propagated along the chain.
   decompressVolumeData() is called to decompress _voxelData into _volData.  recomputeMesh() is called to invoke the
-  polyVox surface extractor to create _mesh (as well as set Simulation _dirtyFlags).  Because Simulation::DIRTY_SHAPE
+  polyVox surface extractor to create _mesh (as well as set Simulation _flags).  Because Simulation::DIRTY_SHAPE
   is set, isReadyToComputeShape() gets called and _shape is created either from _volData or _shape, depending on
   the surface style.
 
@@ -1414,6 +1416,39 @@ void RenderablePolyVoxEntityItem::bonkNeighbors() {
     }
 }
 
+// deprecated
+bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
+    if (!updateDependents()) {
+        return false;
+    }
+
+    bool success = false;
+    if (_mesh) {
+        MeshProxy* meshProxy = nullptr;
+        glm::mat4 transform = voxelToLocalMatrix();
+        withReadLock([&] {
+            gpu::BufferView::Index numVertices = (gpu::BufferView::Index)_mesh->getNumVertices();
+            if (!_meshReady) {
+                // we aren't ready to return a mesh.  the caller will have to try again later.
+                success = false;
+            } else if (numVertices == 0) {
+                // we are ready, but there are no triangles in the mesh.
+                success = true;
+            } else {
+                success = true;
+                // the mesh will be in voxel-space.  transform it into object-space
+                meshProxy = new SimpleMeshProxy(
+                    _mesh->map([=](glm::vec3 position) { return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                    [=](glm::vec3 color) { return color; },
+                    [=](glm::vec3 normal) { return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
+                    [&](uint32_t index) { return index; }));
+                result << meshProxy;
+            }
+        });
+    }
+    return success;
+}
+
 scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel(bool * ok) {
     if (!updateDependents() || !_mesh) {
         return scriptable::ModelProvider::modelUnavailableError(ok);
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index 733d5b62f5..3fb79110e6 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -113,6 +113,7 @@ public:
 
     void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
 
+    bool getMeshes(MeshProxyList& result) override; // deprecated
     virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
 
 private:
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 5ea1c9edb7..aefcc196fa 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -16,8 +16,8 @@
 #include <GeometryCache.h>
 #include <PerfStat.h>
 
-#include <render-utils/simple_vert.h>
-#include <render-utils/simple_frag.h>
+#include "render-utils/simple_vert.h"
+#include "render-utils/simple_frag.h"
 
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
@@ -112,8 +112,6 @@ bool ShapeEntityRenderer::isTransparent() const {
     return Parent::isTransparent();
 }
 
-
-
 void ShapeEntityRenderer::doRender(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableShapeEntityItem::render");
     Q_ASSERT(args->_batch);
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 5c9324fc8a..4c398b8a29 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -57,6 +57,8 @@ using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElemen
 #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10))
 #define debugTreeVector(V) V << "[" << V << " in meters ]"
 
+class MeshProxyList;
+
 /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
 /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
 /// one directly, instead you must only construct one of it's derived classes with additional features.
@@ -454,6 +456,8 @@ public:
 
     bool matchesJSONFilters(const QJsonObject& jsonFilters) const;
 
+    virtual bool getMeshes(MeshProxyList& result) { return true; }
+
     virtual void locationChanged(bool tellPhysics = true) override;
 
     virtual bool getScalesWithParent() const override;
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index a7f1d6b9f1..92ddf5bee2 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -585,7 +585,10 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
                 if (entity->getLocked()) {
                     shouldDelete = false;
                 } else {
-                    _entityTree->deleteEntity(entityID);
+                    // only delete local entities, server entities will round trip through the server filters
+                    if (entity->getClientOnly()) {
+                        _entityTree->deleteEntity(entityID);
+                    }
                 }
             }
         });
@@ -1805,6 +1808,30 @@ bool EntityScriptingInterface::AABoxIntersectsCapsule(const glm::vec3& low, cons
     return aaBox.findCapsulePenetration(start, end, radius, penetration);
 }
 
+void EntityScriptingInterface::getMeshes(QUuid entityID, QScriptValue callback) {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
+
+    EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
+    if (!entity) {
+        qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID;
+        QScriptValueList args { callback.engine()->undefinedValue(), false };
+        callback.call(QScriptValue(), args);
+        return;
+    }
+
+    MeshProxyList result;
+    bool success = entity->getMeshes(result);
+
+    if (success) {
+        QScriptValue resultAsScriptValue = meshesToScriptValue(callback.engine(), result);
+        QScriptValueList args { resultAsScriptValue, true };
+        callback.call(QScriptValue(), args);
+    } else {
+        QScriptValueList args { callback.engine()->undefinedValue(), false };
+        callback.call(QScriptValue(), args);
+    }
+}
+
 glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) {
     glm::mat4 result;
     if (_entityTree) {
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index da201f93eb..d1b321dbca 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -37,6 +37,7 @@
 #include "BaseScriptEngine.h"
 
 class EntityTree;
+class MeshProxy;
 
 // helper factory to compose standardized, async metadata queries for "magic" Entity properties
 // like .script and .serverScripts.  This is used for automated testing of core scripting features
@@ -138,7 +139,7 @@ public slots:
     Q_INVOKABLE bool canRezTmpCertified();
 
     /**jsdoc
-    * @function Entities.canWriteAsseets
+    * @function Entities.canWriteAssets
     * @return {bool} `true` if the DomainServer will allow this Node/Avatar to write to the asset server
     */
     Q_INVOKABLE bool canWriteAssets();
@@ -400,6 +401,9 @@ public slots:
     Q_INVOKABLE bool AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,
                                             const glm::vec3& start, const glm::vec3& end, float radius);
 
+    // FIXME move to a renderable entity interface
+    Q_INVOKABLE void getMeshes(QUuid entityID, QScriptValue callback);
+
     /**jsdoc
      * Returns object to world transform, excluding scale
      *
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 402afea2cc..837d7fe80e 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -408,7 +408,16 @@ static void createTangents(const FBXMesh& mesh, bool generateFromTexCoords,
     }
 }
 
-static void createMeshTangents(FBXMesh& mesh, bool generateFromTexCoords) {
+static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape);
+
+void FBXMesh::createBlendShapeTangents(bool generateTangents) {
+    for (auto& blendShape : blendshapes) {
+        _createBlendShapeTangents(*this, generateTangents, blendShape);
+    }
+}
+
+void FBXMesh::createMeshTangents(bool generateFromTexCoords) {
+    FBXMesh& mesh = *this;
     // This is the only workaround I've found to trick the compiler into understanding that mesh.tangents isn't
     // const in the lambda function.
     auto& tangents = mesh.tangents;
@@ -421,7 +430,7 @@ static void createMeshTangents(FBXMesh& mesh, bool generateFromTexCoords) {
     });
 }
 
-static void createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape) {
+static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape) {
     // Create lookup to get index in blend shape from vertex index in mesh
     std::vector<int> reverseIndices;
     reverseIndices.resize(mesh.vertices.size());
@@ -1455,18 +1464,22 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     QSet<QString> remainingModels;
     for (QHash<QString, FBXModel>::const_iterator model = models.constBegin(); model != models.constEnd(); model++) {
         // models with clusters must be parented to the cluster top
-        foreach (const QString& deformerID, _connectionChildMap.values(model.key())) {
-            foreach (const QString& clusterID, _connectionChildMap.values(deformerID)) {
-                if (!clusters.contains(clusterID)) {
-                    continue;
+        // Unless the model is a root node.
+        bool isARootNode = !modelIDs.contains(_connectionParentMap.value(model.key()));
+        if (!isARootNode) {  
+            foreach(const QString& deformerID, _connectionChildMap.values(model.key())) {
+                foreach(const QString& clusterID, _connectionChildMap.values(deformerID)) {
+                    if (!clusters.contains(clusterID)) {
+                        continue;
+                    }
+                    QString topID = getTopModelID(_connectionParentMap, models, _connectionChildMap.value(clusterID), url);
+                    _connectionChildMap.remove(_connectionParentMap.take(model.key()), model.key());
+                    _connectionParentMap.insert(model.key(), topID);
+                    goto outerBreak;
                 }
-                QString topID = getTopModelID(_connectionParentMap, models, _connectionChildMap.value(clusterID), url);
-                _connectionChildMap.remove(_connectionParentMap.take(model.key()), model.key());
-                _connectionParentMap.insert(model.key(), topID);
-                goto outerBreak;
             }
+            outerBreak: ;
         }
-        outerBreak:
 
         // make sure the parent is in the child map
         QString parent = _connectionParentMap.value(model.key());
@@ -1714,10 +1727,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             }
         }
 
-        createMeshTangents(extracted.mesh, generateTangents);
-        for (auto& blendShape : extracted.mesh.blendshapes) {
-            createBlendShapeTangents(extracted.mesh, generateTangents, blendShape);
-        }
+        extracted.mesh.createMeshTangents(generateTangents);
+        extracted.mesh.createBlendShapeTangents(generateTangents);
 
         // find the clusters with which the mesh is associated
         QVector<QString> clusterIDs;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
index 68cebe2d78..e4eeee856e 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
@@ -22,7 +22,7 @@ namespace glm {
 
 //#define DEBUG_BUFFERVIEW_SCRIPTING
 //#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    #include "DebugNames.h"
+#include "DebugNames.h"
 //#endif
 
 namespace {
@@ -59,8 +59,8 @@ void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QVar
     view.edit<T>(index) = glmVecFromVariant<T>(v);
 }
 
-//FIXME copied from Model.cpp
-static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
+
+void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
     auto absNormal = glm::abs(normal);
     auto absTangent = glm::abs(tangent);
     normal /= glm::max(1e-6f, glm::max(glm::max(absNormal.x, absNormal.y), absNormal.z));
@@ -152,9 +152,9 @@ bool boundsCheck(const gpu::BufferView& view, quint32 index) {
     return (
         index < view.getNumElements() &&
         index * byteLength < (view._size - 1) * byteLength
-     );
+    );
 }
-    
+
 QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
     const auto& element = view._element;
     const auto vecN = element.getScalarCount();
@@ -189,7 +189,7 @@ QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, b
                 return glmVecToVariant(glm::vec3(glm::unpackSnorm3x10_1x2(packedNormal)));
             }
 
-            return getBufferViewElement<glm::u8vec4>(view, index, asArray); 
+            return getBufferViewElement<glm::u8vec4>(view, index, asArray);
         }
         }
     } else if (BYTES_PER_ELEMENT == 2) {
@@ -271,12 +271,12 @@ gpu::BufferView buffer_helpers::fromVector(const QVector<T>& elements, const gpu
 template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
 template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
 
-template <typename T> struct getVec4;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
+template <typename T> struct GpuVec4ToGlm;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
 template <typename T> struct getScalar;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
 
-struct gotter {
+struct GpuToGlmAdapter {
     static float error(const QString& name, const gpu::BufferView& view, quint32 index, const char *hint) {
-        qDebug() << QString("gotter:: unhandled type=%1(element=%2(%3)) size=%4(per=%5) vec%6 hint=%7 #%8")
+        qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2(%3)) size=%4(per=%5) vec%6 hint=%7 #%8")
             .arg(name)
             .arg(DebugNames::stringFrom(view._element.getType()))
             .arg(view._element.getType())
@@ -288,9 +288,9 @@ struct gotter {
         Q_ASSERT(false);
         assert(false);
         return NAN;
-    }        
+    }
 };
-template <typename T> struct getScalar : gotter {
+template <typename T> struct getScalar : GpuToGlmAdapter {
     static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
         case gpu::UINT32: return view.get<glm::uint32>(index);
         case gpu::UINT16: return view.get<glm::uint16>(index);
@@ -305,7 +305,7 @@ template <typename T> struct getScalar : gotter {
     }
 };
 
-template <typename T> struct getVec2 : gotter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+template <typename T> struct GpuVec2ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
         case gpu::UINT32: return view.get<glm::u32vec2>(index);
         case gpu::UINT16: return view.get<glm::u16vec2>(index);
         case gpu::UINT8: return view.get<glm::u8vec2>(index);
@@ -315,10 +315,10 @@ template <typename T> struct getVec2 : gotter { static T get(const gpu::BufferVi
         case gpu::FLOAT: return view.get<glm::fvec2>(index);
         case gpu::HALF: return glm::unpackSnorm2x8(view.get<glm::int16>(index));
         default: break;
-        } return T(error("getVec2", view, index, hint)); }};
+        } return T(error("GpuVec2ToGlm", view, index, hint)); }};
 
 
-template <typename T> struct getVec3  : gotter  { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+template <typename T> struct GpuVec3ToGlm  : GpuToGlmAdapter  { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
         case gpu::UINT32: return view.get<glm::u32vec3>(index);
         case gpu::UINT16: return view.get<glm::u16vec3>(index);
         case gpu::UINT8: return view.get<glm::u8vec3>(index);
@@ -330,12 +330,12 @@ template <typename T> struct getVec3  : gotter  { static T get(const gpu::Buffer
         case gpu::NUINT8:
         case gpu::NINT2_10_10_10:
             if (view._element.getSize() == sizeof(glm::int32)) {
-                return getVec4<T>::get(view, index, hint);
+                return GpuVec4ToGlm<T>::get(view, index, hint);
             }
         default: break;
-        } return T(error("getVec3", view, index, hint)); }};
+        } return T(error("GpuVec3ToGlm", view, index, hint)); }};
 
-template <typename T> struct getVec4 : gotter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) {
+template <typename T> struct GpuVec4ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) {
     assert(view._element.getSize() == sizeof(glm::int32));
     switch(view._element.getType()) {
     case gpu::UINT32: return view.get<glm::u32vec4>(index);
@@ -346,7 +346,7 @@ template <typename T> struct getVec4 : gotter { static T get(const gpu::BufferVi
     case gpu::INT8: return view.get<glm::i8vec4>(index);
     case gpu::NUINT32: break;
     case gpu::NUINT16: break;
-    case gpu::NUINT8: return glm::unpackUnorm4x8(view.get<glm::uint32>(index)); 
+    case gpu::NUINT8: return glm::unpackUnorm4x8(view.get<glm::uint32>(index));
     case gpu::NUINT2: break;
     case gpu::NINT32: break;
     case gpu::NINT16: break;
@@ -356,7 +356,7 @@ template <typename T> struct getVec4 : gotter { static T get(const gpu::BufferVi
     case gpu::FLOAT: return view.get<glm::fvec4>(index);
     case gpu::HALF: return glm::unpackSnorm4x8(view.get<glm::int32>(index));
     case gpu::NINT2_10_10_10: return glm::unpackSnorm3x10_1x2(view.get<glm::uint32>(index));
-    } return T(error("getVec4", view, index, hint)); }};
+    } return T(error("GpuVec4ToGlm", view, index, hint)); }};
 
 
 template <typename FUNC, typename T>
@@ -376,16 +376,32 @@ struct getVec {
     }
 };
 
-template <> QVector<int> buffer_helpers::toVector<int>(const gpu::BufferView& view, const char *hint) { return getVec<getScalar<int>,int>::__to_vector__(view, hint); }
-template <> QVector<glm::vec2> buffer_helpers::toVector<glm::vec2>(const gpu::BufferView& view, const char *hint) { return getVec<getVec2<glm::vec2>,glm::vec2>::__to_vector__(view, hint); }
-template <> QVector<glm::vec3> buffer_helpers::toVector<glm::vec3>(const gpu::BufferView& view, const char *hint) { return getVec<getVec3<glm::vec3>,glm::vec3>::__to_vector__(view, hint); }
-template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::BufferView& view, const char *hint) { return getVec<getVec4<glm::vec4>,glm::vec4>::__to_vector__(view, hint); }
+template <> QVector<int> buffer_helpers::toVector<int>(const gpu::BufferView& view, const char *hint) {
+    return getVec<getScalar<int>,int>::__to_vector__(view, hint);
+}
+template <> QVector<glm::vec2> buffer_helpers::toVector<glm::vec2>(const gpu::BufferView& view, const char *hint) {
+    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_vector__(view, hint);
+}
+template <> QVector<glm::vec3> buffer_helpers::toVector<glm::vec3>(const gpu::BufferView& view, const char *hint) {
+    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_vector__(view, hint);
+}
+template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::BufferView& view, const char *hint) {
+    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_vector__(view, hint);
+}
 
 
-template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getScalar<int>,int>::__to_scalar__(view, index, hint); }
-template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec2<glm::vec2>,glm::vec2>::__to_scalar__(view, index, hint); }
-template <> glm::vec3 buffer_helpers::convert<glm::vec3>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec3<glm::vec3>,glm::vec3>::__to_scalar__(view, index, hint); }
-template <> glm::vec4 buffer_helpers::convert<glm::vec4>(const gpu::BufferView& view, quint32 index, const char *hint) { return getVec<getVec4<glm::vec4>,glm::vec4>::__to_scalar__(view, index, hint); }
+template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) {
+    return getVec<getScalar<int>,int>::__to_scalar__(view, index, hint);
+}
+template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) {
+    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_scalar__(view, index, hint);
+}
+template <> glm::vec3 buffer_helpers::convert<glm::vec3>(const gpu::BufferView& view, quint32 index, const char *hint) {
+    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_scalar__(view, index, hint);
+}
+template <> glm::vec4 buffer_helpers::convert<glm::vec4>(const gpu::BufferView& view, quint32 index, const char *hint) {
+    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_scalar__(view, index, hint);
+}
 
 gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
     return gpu::BufferView(
@@ -410,7 +426,7 @@ gpu::BufferView buffer_helpers::resize(const gpu::BufferView& input, quint32 num
 graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
     auto clone = std::make_shared<graphics::Mesh>();
     //[](graphics::Mesh* blah) {
-        //qCDebug(bufferhelper_logging) << "--- DELETING MESH POINTER" << blah;
+    //qCDebug(bufferhelper_logging) << "--- DELETING MESH POINTER" << blah;
     //  delete blah;
     //});
     clone->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
@@ -437,12 +453,12 @@ graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
 namespace {
     // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
     gpu::BufferView _expandedAttributeBuffer(const graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
-        gpu::BufferView bufferView = buffer_helpers::getBufferView(mesh, slot);        
+        gpu::BufferView bufferView = buffer_helpers::getBufferView(mesh, slot);
         const auto& elementType = bufferView._element;
         //auto vecN = element.getScalarCount();
         //auto type = element.getType();
         //gpu::Element elementType = getVecNElement(type, vecN);
-        
+
         gpu::Size elementSize = elementType.getSize();
         auto nPositions = mesh->getNumVertices();
         auto vsize = nPositions * elementSize;
@@ -484,8 +500,8 @@ namespace {
             typeName = DebugNames::stringFrom(bufferView._element.getType());
 #endif
             qCDebug(bufferhelper_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                          hint.toStdString().c_str(), bufferView._element.getScalarCount(),
-                          typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+                    hint.toStdString().c_str(), bufferView._element.getScalarCount(),
+                    typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
         }
 #endif
         return bufferView;
@@ -529,7 +545,7 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
             auto afterCount = attributeViews[name].getNumElements();
             if (beforeTotal != afterTotal || beforeCount != afterCount) {
                 qCDebug(bufferhelper_logging, "NOTE:: gatherBufferViews.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                              name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
+                        name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
             }
 #endif
         }
@@ -538,7 +554,7 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
 }
 
 
-bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {    
+bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
     qCInfo(bufferhelper_logging) << "Recalculating normals" << !!mesh;
     if (!mesh) {
         return false;
@@ -605,7 +621,7 @@ bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
             }
             break;
         }
-        normals.edit<glm::vec3>(j) = glm::normalize(normal);
+        buffer_helpers::fromVariant(normals, j, glmVecToVariant(glm::normalize(normal)));
     }
     return true;
 }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
index d963fd4b22..e0c2e1eee1 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
@@ -42,9 +42,11 @@ struct buffer_helpers {
 
     template <typename T> static gpu::BufferView fromVector(const QVector<T>& elements, const gpu::Element& elementType);
 
-    template <typename T> static QVector<T> toVector(const gpu::BufferView& view, const char *hint = "");    
+    template <typename T> static QVector<T> toVector(const gpu::BufferView& view, const char *hint = "");
     template <typename T> static T convert(const gpu::BufferView& view, quint32 index, const char* hint = "");
-    
+
     static gpu::BufferView clone(const gpu::BufferView& input);
-    static gpu::BufferView resize(const gpu::BufferView& input, quint32 numElements);    
+    static gpu::BufferView resize(const gpu::BufferView& input, quint32 numElements);
+
+    static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent);
 };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
index ab6f2c92be..775aedad52 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
@@ -42,8 +42,6 @@ bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferVi
     return buffer_helpers::fromVariant(view, index, v.toVariant());
 }
 
-//
-
 template <typename T>
 QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray) {
     static const auto len = T().length();
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 15973b5852..95fcf51921 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -8,10 +8,12 @@
 #include <memory>
 
 #include <DependencyManager.h>
-
+#include <SpatiallyNestable.h>
 namespace graphics {
     class Mesh;
 }
+class Model;
+using ModelPointer = std::shared_ptr<Model>;
 namespace gpu {
     class BufferView;
 }
@@ -83,7 +85,7 @@ namespace scriptable {
     // mixin class for Avatar/Entity/Overlay Rendering that expose their in-memory graphics::Meshes
     class ModelProvider {
     public:
-        QVariantMap metadata{ { "providerType", "unknown" } };
+        NestableType modelProviderType;
         static scriptable::ScriptableModelBase modelUnavailableError(bool* ok) { if (ok) { *ok = false; } return {}; }
         virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) = 0;
 
@@ -91,9 +93,13 @@ namespace scriptable {
     };
 
     // mixin class for resolving UUIDs into a corresponding ModelProvider
-    class ModelProviderFactory : public Dependency {
+    class ModelProviderFactory : public QObject, public Dependency {
+        Q_OBJECT
     public:
-        virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) = 0;
+        virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) = 0;
+    signals:
+        void modelAddedToScene(const QUuid& objectID, NestableType nestableType, const ModelPointer& sender);
+        void modelRemovedFromScene(const QUuid& objectID, NestableType nestableType, const ModelPointer& sender);
     };
 
     using uint32 = quint32;
@@ -105,3 +111,5 @@ namespace scriptable {
     using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
     bool registerMetaTypes(QScriptEngine* engine);
 }
+
+Q_DECLARE_METATYPE(NestableType)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
new file mode 100644
index 0000000000..71ef57bd82
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -0,0 +1,160 @@
+//
+//  GraphicsScriptingInterface.cpp
+//  libraries/script-engine/src
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#include "GraphicsScriptingInterface.h"
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValueIterator>
+#include <QtScript/QScriptValue>
+#include <QUuid>
+#include "BaseScriptEngine.h"
+#include "ScriptEngineLogging.h"
+#include "OBJWriter.h"
+
+#include <GeometryUtil.h>
+#include <shared/QtHelpers.h>
+
+#include <graphics-scripting/DebugNames.h>
+#include <graphics-scripting/BufferViewHelpers.h>
+
+#include "BufferViewScripting.h"
+#include "ScriptableMesh.h"
+#include "GraphicsScriptingUtil.h"
+
+#include "GraphicsScriptingInterface.moc"
+
+#include "RegisteredMetaTypes.h"
+
+GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent) {
+    if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
+        this->registerMetaTypes(scriptEngine);
+    }
+}
+
+bool GraphicsScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex, int partIndex) {
+    auto model = scriptable::make_qtowned<scriptable::ScriptableModel>();
+    if (mesh) {
+        model->append(*mesh);
+    }
+    return updateMeshes(uuid, model.get());
+}
+
+bool GraphicsScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model) {
+    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
+    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
+    QString providerType = provider ? SpatiallyNestable::nestableTypeToString(provider->modelProviderType) : QString();
+    if (providerType.isEmpty()) {
+        providerType = "unknown";
+    }
+    bool success = false;
+    if (provider) {
+        auto scriptableMeshes = provider->getScriptableModel(&success);
+        if (success) {
+            const scriptable::ScriptableModelBasePointer base = model->operator scriptable::ScriptableModelBasePointer();
+            if (base) {
+                success = provider->replaceScriptableModelMeshPart(base, -1, -1);
+            }
+        }
+    }
+    return success;
+}
+
+QScriptValue GraphicsScriptingInterface::getMeshes(QUuid uuid) {
+    scriptable::ScriptableModel* meshes{ nullptr };
+    bool success = false;
+    QString error;
+
+    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
+    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
+    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
+    QString providerType = provider ? SpatiallyNestable::nestableTypeToString(provider->modelProviderType) : QString();
+    if (providerType.isEmpty()) {
+        providerType = "unknown";
+    }
+    if (provider) {
+        auto scriptableMeshes = provider->getScriptableModel(&success);
+        if (success) {
+            meshes = scriptable::make_scriptowned<scriptable::ScriptableModel>(scriptableMeshes);
+            if (meshes->objectName().isEmpty()) {
+                meshes->setObjectName(providerType+"::meshes");
+            }
+            if (meshes->objectID.isNull()) {
+                meshes->objectID = uuid.toString();
+            }
+            meshes->metadata["provider"] = SpatiallyNestable::nestableTypeToString(provider->modelProviderType);
+        }
+    }
+    if (!success) {
+        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
+    }
+
+    QPointer<BaseScriptEngine> scriptEngine = dynamic_cast<BaseScriptEngine*>(engine());    
+    QScriptValue result = error.isEmpty() ? scriptEngine->toScriptValue(meshes) : scriptEngine->makeError(error);
+    if (result.isError()) {
+        qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getMeshes ERROR" << result.toString();
+        if (context()) {
+            context()->throwValue(error);
+        } else {
+            qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getMeshes ERROR" << result.toString();
+        }
+        return QScriptValue::NullValue;
+    }
+    return scriptEngine->toScriptValue(meshes);
+}
+
+QString GraphicsScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
+    const auto& in = _in.getConstMeshes();
+    if (in.size()) {
+        QList<scriptable::MeshPointer> meshes;
+        foreach (auto meshProxy, in) {
+            if (meshProxy) {
+                meshes.append(getMeshPointer(meshProxy));
+            }
+        }
+        if (meshes.size()) {
+            return writeOBJToString(meshes);
+        }
+    }
+    if (context()) {
+        context()->throwError(QString("null mesh"));
+    }
+    return QString();
+}
+void GraphicsScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
+    scriptable::registerMetaTypes(engine);
+}
+
+MeshPointer GraphicsScriptingInterface::getMeshPointer(const scriptable::ScriptableMesh& meshProxy) {
+    return meshProxy.getMeshPointer();
+}
+MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMesh& meshProxy) {
+    return getMeshPointer(&meshProxy);
+}
+MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPointer meshProxy) {
+    MeshPointer result;
+    if (!meshProxy) {
+        if (context()){
+            context()->throwError("expected meshProxy as first parameter");
+        } else {
+            qCDebug(graphics_scripting) << "expected meshProxy as first parameter";
+        }
+        return result;
+    }
+    auto mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        if (context()) {
+            context()->throwError("expected valid meshProxy as first parameter");
+        } else {
+            qCDebug(graphics_scripting) << "expected valid meshProxy as first parameter";
+        }
+        return result;
+    }
+    return mesh;
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
similarity index 54%
rename from libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
rename to libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index fa7b885014..6afa549a19 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -1,16 +1,15 @@
 //
-//  ModelScriptingInterface.h
-//  libraries/script-engine/src
+//  GraphicsScriptingInterface.h
+//  libraries/graphics-scripting/src
 //
-//  Created by Seth Alves on 2017-1-27.
 //  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
 //
 
-#ifndef hifi_ModelScriptingInterface_h
-#define hifi_ModelScriptingInterface_h
+#ifndef hifi_GraphicsScriptingInterface_h
+#define hifi_GraphicsScriptingInterface_h
 
 #include <QtCore/QObject>
 #include <QUrl>
@@ -21,35 +20,27 @@
 #include "ScriptableMesh.h"
 #include <DependencyManager.h>
 
-class ModelScriptingInterface : public QObject, public QScriptable, public Dependency {
+class GraphicsScriptingInterface : public QObject, public QScriptable, public Dependency {
     Q_OBJECT
 
 public:
-    ModelScriptingInterface(QObject* parent = nullptr);
+    GraphicsScriptingInterface(QObject* parent = nullptr);
 
 public slots:
     /**jsdoc
      * Returns the meshes associated with a UUID (entityID, overlayID, or avatarID)
      *
-     * @function ModelScriptingInterface.getMeshes
+     * @function GraphicsScriptingInterface.getMeshes
      * @param {EntityID} entityID The ID of the entity whose meshes are to be retrieve
      */
-    void getMeshes(QUuid uuid, QScriptValue callback);
+    QScriptValue getMeshes(QUuid uuid);
     bool updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model);
     bool updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex=0, int partIndex=0);
 
     QString meshToOBJ(const scriptable::ScriptableModel& in);
 
-    QScriptValue appendMeshes(scriptable::ScriptableModel in);
-    QScriptValue transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform);
-    QScriptValue newMesh(const QVector<glm::vec3>& vertices,
-                                     const QVector<glm::vec3>& normals,
-                                     const QVector<mesh::MeshFace>& faces);
-    QScriptValue getVertexCount(scriptable::ScriptableMeshPointer meshProxy);
-    QScriptValue getVertex(scriptable::ScriptableMeshPointer meshProxy, quint32 vertexIndex);
-
     static void registerMetaTypes(QScriptEngine* engine);
-    
+
 private:
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
@@ -57,4 +48,4 @@ private:
 
 };
 
-#endif // hifi_ModelScriptingInterface_h
+#endif // hifi_GraphicsScriptingInterface_h
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
deleted file mode 100644
index d78f646087..0000000000
--- a/libraries/graphics-scripting/src/graphics-scripting/ModelScriptingInterface.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-//
-//  ModelScriptingInterface.cpp
-//  libraries/script-engine/src
-//
-//  Created by Seth Alves on 2017-1-27.
-//  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
-//
-
-#include "ModelScriptingInterface.h"
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValueIterator>
-#include <QtScript/QScriptValue>
-#include <QUuid>
-#include "BaseScriptEngine.h"
-#include "ScriptEngineLogging.h"
-#include "OBJWriter.h"
-
-#include <GeometryUtil.h>
-#include <shared/QtHelpers.h>
-
-#include <graphics-scripting/DebugNames.h>
-#include <graphics-scripting/BufferViewHelpers.h>
-
-#include "BufferViewScripting.h"
-#include "ScriptableMesh.h"
-#include "GraphicsScriptingUtil.h"
-
-#include "ModelScriptingInterface.moc"
-
-#include "RegisteredMetaTypes.h"
-
-ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
-    if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
-        this->registerMetaTypes(scriptEngine);
-    }
-}
-
-bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex, int partIndex) {
-    auto model = scriptable::make_qtowned<scriptable::ScriptableModel>();
-    if (mesh) {
-        model->append(*mesh);
-    }
-    return updateMeshes(uuid, model.get());
-}
-
-bool ModelScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model) {
-    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    //qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
-    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
-    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
-    if (providerType.isEmpty()) {
-        providerType = "unknown";
-    }
-    bool success = false;
-    if (provider) {
-        //qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
-        auto scriptableMeshes = provider->getScriptableModel(&success);
-        //qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
-        if (success) {
-            const scriptable::ScriptableModelBasePointer base = model->operator scriptable::ScriptableModelBasePointer();
-            //qCDebug(graphics_scripting) << "as base" << base;
-            if (base) {
-                //auto meshes = model->getConstMeshes();
-                success = provider->replaceScriptableModelMeshPart(base, -1, -1);
-                
-                // for (uint32_t m = 0; success && m < meshes.size(); m++) {
-                //     const auto& mesh = meshes.at(m);
-                //     for (int p = 0; success && p < mesh->getNumParts(); p++) {
-                //         qCDebug(graphics_scripting) << "provider->replaceScriptableModelMeshPart" << "meshIndex" << m << "partIndex" << p;
-                //         success = provider->replaceScriptableModelMeshPart(base, m, p);
-                //         //if (!success) {
-                //         qCDebug(graphics_scripting) << "//provider->replaceScriptableModelMeshPart" << "meshIndex" << m << "partIndex" << p << success;
-                //     }
-                // }
-            }
-        }
-    }
-    return success;
-}
-
-void ModelScriptingInterface::getMeshes(QUuid uuid, QScriptValue callback) {
-    auto handler = scriptable::jsBindCallback(callback);
-    Q_ASSERT(handler.engine() == this->engine());
-    QPointer<BaseScriptEngine> engine = dynamic_cast<BaseScriptEngine*>(handler.engine());
-
-    scriptable::ScriptableModel* meshes{ nullptr };
-    bool success = false;
-    QString error;
-
-    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
-    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
-    QString providerType = provider ? provider->metadata.value("providerType").toString() : QString();
-    if (providerType.isEmpty()) {
-        providerType = "unknown";
-    }
-    if (provider) {
-        qCDebug(graphics_scripting) << "fetching meshes from " << providerType << "...";
-        auto scriptableMeshes = provider->getScriptableModel(&success);
-        qCDebug(graphics_scripting) << "//fetched meshes from " << providerType << "success:" <<success << "#" << scriptableMeshes.meshes.size();
-        if (success) {
-            meshes = scriptable::make_scriptowned<scriptable::ScriptableModel>(scriptableMeshes);
-        QString debugString = scriptable::toDebugString(meshes);
-        QObject::connect(meshes, &QObject::destroyed, this, [=]() {
-                qCDebug(graphics_scripting) << "///fetched meshes" << debugString;
-            });
-        
-            if (meshes->objectName().isEmpty()) {
-                meshes->setObjectName(providerType+"::meshes");
-            }
-            if (meshes->objectID.isNull()) {
-                meshes->objectID = uuid.toString();
-            }
-            meshes->metadata["provider"] = provider->metadata;
-        }
-    }
-    if (!success) {
-        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
-    }
-
-    if (!error.isEmpty()) {
-        qCWarning(graphics_scripting) << "ModelScriptingInterface::getMeshes ERROR" << error;
-        callScopedHandlerObject(handler, engine->makeError(error), QScriptValue::NullValue);
-    } else {
-        callScopedHandlerObject(handler, QScriptValue::NullValue, engine->toScriptValue(meshes));
-    }
-}
-
-QString ModelScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
-    const auto& in = _in.getConstMeshes();
-    qCDebug(graphics_scripting) << "meshToOBJ" << in.size();
-    if (in.size()) {
-        QList<scriptable::MeshPointer> meshes;
-        foreach (auto meshProxy, in) {
-            qCDebug(graphics_scripting) << "meshToOBJ" << meshProxy;
-            if (meshProxy) {
-                meshes.append(getMeshPointer(meshProxy));
-            }
-        }
-        if (meshes.size()) {
-            return writeOBJToString(meshes);
-        }
-    }
-    context()->throwError(QString("null mesh"));
-    return QString();
-}
-
-QScriptValue ModelScriptingInterface::appendMeshes(scriptable::ScriptableModel _in) {
-    const auto& in = _in.getMeshes();
-
-    // figure out the size of the resulting mesh
-    size_t totalVertexCount { 0 };
-    size_t totalColorCount { 0 };
-    size_t totalNormalCount { 0 };
-    size_t totalIndexCount { 0 };
-    foreach (auto& meshProxy, in) {
-        scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
-        totalVertexCount += mesh->getNumVertices();
-
-        int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
-        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(attributeTypeColor);
-        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
-        totalColorCount += numColors;
-
-        int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
-        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
-        gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
-        totalNormalCount += numNormals;
-
-        totalIndexCount += mesh->getNumIndices();
-    }
-
-    // alloc the resulting mesh
-    gpu::Resource::Size combinedVertexSize = totalVertexCount * sizeof(glm::vec3);
-    unsigned char* combinedVertexData  = new unsigned char[combinedVertexSize];
-    unsigned char* combinedVertexDataCursor = combinedVertexData;
-
-    gpu::Resource::Size combinedColorSize = totalColorCount * sizeof(glm::vec3);
-    unsigned char* combinedColorData  = new unsigned char[combinedColorSize];
-    unsigned char* combinedColorDataCursor = combinedColorData;
-
-    gpu::Resource::Size combinedNormalSize = totalNormalCount * sizeof(glm::vec3);
-    unsigned char* combinedNormalData  = new unsigned char[combinedNormalSize];
-    unsigned char* combinedNormalDataCursor = combinedNormalData;
-
-    gpu::Resource::Size combinedIndexSize = totalIndexCount * sizeof(uint32_t);
-    unsigned char* combinedIndexData  = new unsigned char[combinedIndexSize];
-    unsigned char* combinedIndexDataCursor = combinedIndexData;
-
-    uint32_t indexStartOffset { 0 };
-
-    foreach (const auto& meshProxy, in) {
-        scriptable::MeshPointer mesh = getMeshPointer(meshProxy);
-        mesh->forEach(
-            [&](glm::vec3 position){
-                memcpy(combinedVertexDataCursor, &position, sizeof(position));
-                combinedVertexDataCursor += sizeof(position);
-            },
-            [&](glm::vec3 color){
-                memcpy(combinedColorDataCursor, &color, sizeof(color));
-                combinedColorDataCursor += sizeof(color);
-            },
-            [&](glm::vec3 normal){
-                memcpy(combinedNormalDataCursor, &normal, sizeof(normal));
-                combinedNormalDataCursor += sizeof(normal);
-            },
-            [&](uint32_t index){
-                index += indexStartOffset;
-                memcpy(combinedIndexDataCursor, &index, sizeof(index));
-                combinedIndexDataCursor += sizeof(index);
-            });
-
-        gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
-        indexStartOffset += numVertices;
-    }
-
-    graphics::MeshPointer result(new graphics::Mesh());
-
-    gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData);
-    gpu::BufferPointer combinedVertexBufferPointer(combinedVertexBuffer);
-    gpu::BufferView combinedVertexBufferView(combinedVertexBufferPointer, vertexElement);
-    result->setVertexBuffer(combinedVertexBufferView);
-
-    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
-    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedColorsBuffer = new gpu::Buffer(combinedColorSize, combinedColorData);
-    gpu::BufferPointer combinedColorsBufferPointer(combinedColorsBuffer);
-    gpu::BufferView combinedColorsBufferView(combinedColorsBufferPointer, colorElement);
-    result->addAttribute(attributeTypeColor, combinedColorsBufferView);
-
-    int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
-    gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
-    gpu::Buffer* combinedNormalsBuffer = new gpu::Buffer(combinedNormalSize, combinedNormalData);
-    gpu::BufferPointer combinedNormalsBufferPointer(combinedNormalsBuffer);
-    gpu::BufferView combinedNormalsBufferView(combinedNormalsBufferPointer, normalElement);
-    result->addAttribute(attributeTypeNormal, combinedNormalsBufferView);
-
-    gpu::Element indexElement = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW);
-    gpu::Buffer* combinedIndexesBuffer = new gpu::Buffer(combinedIndexSize, combinedIndexData);
-    gpu::BufferPointer combinedIndexesBufferPointer(combinedIndexesBuffer);
-    gpu::BufferView combinedIndexesBufferView(combinedIndexesBufferPointer, indexElement);
-    result->setIndexBuffer(combinedIndexesBufferView);
-
-    std::vector<graphics::Mesh::Part> parts;
-    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
-                                         (graphics::Index)result->getNumIndices(), // numIndices
-                                         (graphics::Index)0, // baseVertex
-                                         graphics::Mesh::TRIANGLES)); // topology
-    result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
-                                                          (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
-
-
-    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(result));
-}
-
-QScriptValue ModelScriptingInterface::transformMesh(scriptable::ScriptableMeshPointer meshProxy, glm::mat4 transform) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return false;
-    }
-
-    graphics::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
-                                          [&](glm::vec3 color){ return color; },
-                                          [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
-                                          [&](uint32_t index){ return index; });
-    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(result));
-}
-
-QScriptValue ModelScriptingInterface::getVertexCount(scriptable::ScriptableMeshPointer meshProxy) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return -1;
-    }
-    return (uint32_t)mesh->getNumVertices();
-}
-
-QScriptValue ModelScriptingInterface::getVertex(scriptable::ScriptableMeshPointer meshProxy, quint32 vertexIndex) {
-    auto mesh = getMeshPointer(meshProxy);
-    if (!mesh) {
-        return QScriptValue();
-    }
-
-    const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
-    auto numVertices = mesh->getNumVertices();
-
-    if (vertexIndex >= numVertices) {
-        context()->throwError(QString("invalid index: %1 [0,%2)").arg(vertexIndex).arg(numVertices));
-        return QScriptValue::NullValue;
-    }
-
-    glm::vec3 pos = vertexBufferView.get<glm::vec3>(vertexIndex);
-    return engine()->toScriptValue(pos);
-}
-
-QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
-                                              const QVector<glm::vec3>& normals,
-                                              const QVector<mesh::MeshFace>& faces) {
-    graphics::MeshPointer mesh(new graphics::Mesh());
-
-    // vertices
-    auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
-    auto vertexBufferPtr = gpu::BufferPointer(vertexBuffer);
-    gpu::BufferView vertexBufferView(vertexBufferPtr, 0, vertexBufferPtr->getSize(),
-                                     sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-    mesh->setVertexBuffer(vertexBufferView);
-
-    if (vertices.size() == normals.size()) {
-        // normals
-        auto normalBuffer = std::make_shared<gpu::Buffer>(normals.size() * sizeof(glm::vec3), (gpu::Byte*)normals.data());
-        auto normalBufferPtr = gpu::BufferPointer(normalBuffer);
-        gpu::BufferView normalBufferView(normalBufferPtr, 0, normalBufferPtr->getSize(),
-                                         sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
-        mesh->addAttribute(gpu::Stream::NORMAL, normalBufferView);
-    } else {
-        qCWarning(graphics_scripting, "ModelScriptingInterface::newMesh normals must be same length as vertices");
-    }
-
-    // indices (faces)
-    int VERTICES_PER_TRIANGLE = 3;
-    int indexBufferSize = faces.size() * sizeof(uint32_t) * VERTICES_PER_TRIANGLE;
-    unsigned char* indexData  = new unsigned char[indexBufferSize];
-    unsigned char* indexDataCursor = indexData;
-    foreach(const mesh::MeshFace& meshFace, faces) {
-        for (int i = 0; i < VERTICES_PER_TRIANGLE; i++) {
-            memcpy(indexDataCursor, &meshFace.vertexIndices[i], sizeof(uint32_t));
-            indexDataCursor += sizeof(uint32_t);
-        }
-    }
-    auto indexBuffer = std::make_shared<gpu::Buffer>(indexBufferSize, (gpu::Byte*)indexData);
-    auto indexBufferPtr = gpu::BufferPointer(indexBuffer);
-    gpu::BufferView indexBufferView(indexBufferPtr, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW));
-    mesh->setIndexBuffer(indexBufferView);
-
-    // parts
-    std::vector<graphics::Mesh::Part> parts;
-    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
-                                         (graphics::Index)faces.size() * 3, // numIndices
-                                         (graphics::Index)0, // baseVertex
-                                         graphics::Mesh::TRIANGLES)); // topology
-    mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
-                                                        (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
-
-
-
-    return engine()->toScriptValue(scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh));
-}
-
-namespace {
-
-    // FIXME: MESHFACES:
-    // QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
-    //     QScriptValue obj = engine->newObject();
-    //     obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
-    //     return obj;
-    // }
-    // void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
-    //     qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
-    // }
-    // QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
-    //     return qScriptValueFromSequence(engine, vector);
-    // }
-    // void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
-    //     qScriptValueToSequence(array, result);
-    // }
-
-}
-
-
-void ModelScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
-    scriptable::registerMetaTypes(engine);
-    // FIXME: MESHFACES: remove if MeshFace is not needed anywhere
-    // qScriptRegisterSequenceMetaType<mesh::MeshFaces>(engine);
-    // qScriptRegisterMetaType(engine, meshFaceToScriptValue, meshFaceFromScriptValue);
-    // qScriptRegisterMetaType(engine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
-}
-
-MeshPointer ModelScriptingInterface::getMeshPointer(const scriptable::ScriptableMesh& meshProxy) {
-    return meshProxy.getMeshPointer();
-}
-MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMesh& meshProxy) {
-    return getMeshPointer(&meshProxy);
-}
-MeshPointer ModelScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPointer meshProxy) {
-    MeshPointer result;
-    if (!meshProxy) {
-        if (context()){
-            context()->throwError("expected meshProxy as first parameter");
-        } else {
-            qCDebug(graphics_scripting) << "expected meshProxy as first parameter";
-        }
-        return result;
-    }
-    auto mesh = meshProxy->getMeshPointer();
-    if (!mesh) {
-        if (context()) {
-            context()->throwError("expected valid meshProxy as first parameter");
-        } else {
-            qCDebug(graphics_scripting) << "expected valid meshProxy as first parameter";
-        }
-        return result;
-    }
-    return mesh;
-}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index c8f1975249..05ff043820 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -38,6 +38,7 @@ scriptable::ScriptableModelBase::~ScriptableModelBase() {
     meshes.clear();
     //qCDebug(graphics_scripting) << "//~ScriptableModelBase" << this;
 }
+
 void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
     //qCDebug(graphics_scripting) << "+ APPEND WeakMeshPointer" << mesh.lock().get();
     meshes << ScriptableMeshBase{ provider, this, mesh, metadata };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index d2c50bd768..bdfaac5d7c 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -16,7 +16,6 @@ namespace scriptable {
         ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
         ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
         ScriptableModel& operator=(const ScriptableModelBase& view) {  ScriptableModelBase::operator=(view); return *this; }
-        //virtual ~ScriptableModel() { qDebug() << "~ScriptableModel" << this; }
 
         Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
         // TODO: in future accessors for these could go here
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp b/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
new file mode 100644
index 0000000000..741478789e
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp
@@ -0,0 +1,27 @@
+//
+//  SimpleMeshProxy.cpp
+//  libraries/model-networking/src/model-networking/
+//
+//  Created by Seth Alves on 2017-3-22.
+//  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
+//
+
+#include "SimpleMeshProxy.h"
+
+#include <graphics/Geometry.h>
+
+MeshPointer SimpleMeshProxy::getMeshPointer() const {
+    return _mesh;
+}
+
+int SimpleMeshProxy::getNumVertices() const {
+    return (int)_mesh->getNumVertices();
+}
+
+glm::vec3 SimpleMeshProxy::getPos3(int index) const {
+    return _mesh->getPos3(index);
+}
+
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
new file mode 100644
index 0000000000..24c3fca27e
--- /dev/null
+++ b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
@@ -0,0 +1,36 @@
+//
+//  SimpleMeshProxy.h
+//  libraries/model-networking/src/model-networking/
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#ifndef hifi_SimpleMeshProxy_h
+#define hifi_SimpleMeshProxy_h
+
+#include <QScriptEngine>
+#include <QScriptValueIterator>
+#include <QtScript/QScriptValue>
+
+#include <RegisteredMetaTypes.h>
+
+class SimpleMeshProxy : public MeshProxy {
+public:
+    SimpleMeshProxy(const MeshPointer& mesh) : _mesh(mesh) { }
+
+    MeshPointer getMeshPointer() const override;
+
+    int getNumVertices() const override;
+
+    glm::vec3 getPos3(int index) const override;
+
+
+protected:
+    const MeshPointer _mesh;
+};
+
+#endif // hifi_SimpleMeshProxy_h
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 95985a48cb..3856a333c3 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -1318,7 +1318,6 @@ void GeometryCache::renderUnitQuad(gpu::Batch& batch, const glm::vec4& color, in
     renderQuad(batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, color, id);
 }
 
-
 void GeometryCache::renderQuad(gpu::Batch& batch, const glm::vec2& minCorner, const glm::vec2& maxCorner,
     const glm::vec2& texCoordMinCorner, const glm::vec2& texCoordMaxCorner,
     const glm::vec4& color, int id) {
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 81ff5433f7..281fc89b16 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -31,6 +31,7 @@ namespace { QLoggingCategory wtf{ "tim.Model.cpp" }; }
 #include <TBBHelpers.h>
 
 #include <graphics-scripting/Forward.h>
+#include <graphics-scripting/BufferViewHelpers.h>
 #include <DualQuaternion.h>
 
 #include <glm/gtc/packing.hpp>
@@ -333,34 +334,6 @@ void Model::reset() {
     }
 }
 
-#if FBX_PACK_NORMALS
-static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
-    auto absNormal = glm::abs(normal);
-    auto absTangent = glm::abs(tangent);
-    normal /= glm::max(1e-6f, glm::max(glm::max(absNormal.x, absNormal.y), absNormal.z));
-    tangent /= glm::max(1e-6f, glm::max(glm::max(absTangent.x, absTangent.y), absTangent.z));
-    normal = glm::clamp(normal, -1.0f, 1.0f);
-    tangent = glm::clamp(tangent, -1.0f, 1.0f);
-    normal *= 511.0f;
-    tangent *= 511.0f;
-    normal = glm::round(normal);
-    tangent = glm::round(tangent);
-
-    glm::detail::i10i10i10i2 normalStruct;
-    glm::detail::i10i10i10i2 tangentStruct;
-    normalStruct.data.x = int(normal.x);
-    normalStruct.data.y = int(normal.y);
-    normalStruct.data.z = int(normal.z);
-    normalStruct.data.w = 0;
-    tangentStruct.data.x = int(tangent.x);
-    tangentStruct.data.y = int(tangent.y);
-    tangentStruct.data.z = int(tangent.z);
-    tangentStruct.data.w = 0;
-    packedNormal = normalStruct.pack;
-    packedTangent = tangentStruct.pack;
-}
-#endif
-
 bool Model::updateGeometry() {
     bool needFullUpdate = false;
 
@@ -591,23 +564,26 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
         // FIXME: temporary workaround for updating the whole FBXGeometry (to keep findRayIntersection in sync)
         auto newRenderGeometry = new MyGeometryMappingResource(
             _url, _renderGeometry, _newModel ? scriptable::make_qtowned<scriptable::ScriptableModelBase>(*_newModel) : nullptr
-            );
-        _needsUpdateTextures = true;
+        );
+        //_needsUpdateTextures = true;
         _visualGeometryRequestFailed = false;
-        invalidCalculatedMeshBoxes();
+        //invalidCalculatedMeshBoxes();
         deleteGeometry();
         _renderGeometry.reset(newRenderGeometry);
-        onInvalidate();
-        reset();
+        //onInvalidate();
+        //reset();
         _rig.destroyAnimGraph();
-        assert(_rig.jointStatesEmpty());
+        //assert(_rig.jointStatesEmpty());
         updateGeometry();
         calculateTriangleSets();
-        computeMeshPartLocalBounds();
-        _needsReload = false;
+        //computeMeshPartLocalBounds();
+        //_needsReload = false;
         _needsFixupInScene = true;
-        invalidCalculatedMeshBoxes();
+        //invalidCalculatedMeshBoxes();
         setRenderItemsNeedUpdate();
+        //_hasCalculatedTextureInfo = false;
+        //calculateTextureInfo();
+        //updateRenderItems();
     }
     return true;
 }
@@ -615,7 +591,6 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
 scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
     QMutexLocker lock(&_mutex);
     scriptable::ScriptableModelBase result;
-    const Geometry::Pointer& renderGeometry = getGeometry();
 
     if (!isLoaded()) {
         qCDebug(wtf) << "Model::getScriptableModel -- !isLoaded";
@@ -623,107 +598,26 @@ scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
     }
 
     const FBXGeometry& geometry = getFBXGeometry();
-    Transform offset;
-    offset.setScale(_scale);
-    offset.postTranslate(_offset);
-    glm::mat4 offsetMat = offset.getMatrix();
-    glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
-    glm::mat4 meshToWorldMatrix = createMatFromQuatAndPos(_rotation, _translation) * meshToModelMatrix;
-    result.metadata = {
-        { "url", _url.toString() },
-        { "textures", renderGeometry->getTextures() },
-        { "offset", vec3toVariant(_offset) },
-        { "scale", vec3toVariant(getScale()) },
-        { "rotation", quatToVariant(getRotation()) },
-        { "translation", vec3toVariant(getTranslation()) },
-        { "meshToModel", buffer_helpers::toVariant(meshToModelMatrix) },
-        { "meshToWorld", buffer_helpers::toVariant(meshToWorldMatrix) },
-        { "geometryOffset", buffer_helpers::toVariant(geometry.offset) },
-        { "naturalDimensions", vec3toVariant(getNaturalDimensions()) },
-        { "meshExtents", buffer_helpers::toVariant(getMeshExtents()) },
-        { "unscaledMeshExtents", buffer_helpers::toVariant(getUnscaledMeshExtents()) },
-        { "meshBound", buffer_helpers::toVariant(Extents(getRenderableMeshBound())) },
-        { "bindExtents", buffer_helpers::toVariant(getBindExtents()) },
-        { "offsetMat", buffer_helpers::toVariant(offsetMat) },
-        { "transform", buffer_helpers::toVariant(getTransform().getMatrix()) },
-    };
-    {
-        Transform transform;
-        transform.setScale(getScale());
-        transform.setTranslation(getTranslation());
-        transform.setRotation(getRotation());
-        result.metadata["_transform"] = buffer_helpers::toVariant(transform.getMatrix());
-    }
-    {
-        glm::vec3 position = _translation;
-        glm::mat4 rotation = glm::mat4_cast(_rotation);
-        glm::mat4 translation = glm::translate(position);
-        glm::mat4 modelToWorldMatrix = translation * rotation;
-        //glm::mat4 worldToModelMatrix = glm::inverse(modelToWorldMatrix);
-        result.metadata["_modelToWorld"] = buffer_helpers::toVariant(modelToWorldMatrix);
-    }
-    {
-        glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
-        glm::mat4 meshToWorldMatrix = createMatFromQuatAndPos(_rotation, _translation) * meshToModelMatrix;
-        //glm::mat4 worldToMeshMatrix = glm::inverse(meshToWorldMatrix);
-        result.metadata["_meshToWorld"] = buffer_helpers::toVariant(meshToWorldMatrix);
-    }
-    {
-        Transform transform;
-        transform.setTranslation(_translation);
-        transform.setRotation(_rotation);
-        Transform offset;
-        offset.setScale(_scale);
-        offset.postTranslate(_offset);
-        Transform output;
-        Transform::mult( output, transform, offset);
-        result.metadata["_renderTransform"] = buffer_helpers::toVariant(output.getMatrix());
-    }        
-
-    QVariantList submeshes;
     int numberOfMeshes = geometry.meshes.size();
     for (int i = 0; i < numberOfMeshes; i++) {
         const FBXMesh& fbxMesh = geometry.meshes.at(i);
-        auto mesh = fbxMesh._mesh;
-        if (!mesh) {
-            continue;
+        if (auto mesh = fbxMesh._mesh) {
+            auto name = geometry.getModelNameOfMesh(i);
+            result.append(std::const_pointer_cast<graphics::Mesh>(mesh), {
+                { "index", i },
+                { "name", name },
+                { "meshIndex", fbxMesh.meshIndex },
+                { "displayName", QString::fromStdString(mesh->displayName) },
+                { "modelName", QString::fromStdString(mesh->modelName) },
+                { "modelTransform", buffer_helpers::toVariant(fbxMesh.modelTransform) },
+                { "transform", buffer_helpers::toVariant(geometry.offset * fbxMesh.modelTransform) },
+                { "extents", buffer_helpers::toVariant(fbxMesh.meshExtents) },
+            });
         }
-        auto name = geometry.getModelNameOfMesh(i);
-        qCDebug(wtf) << "Model::getScriptableModel #" << i << QString::fromStdString(mesh->displayName) << name;
-        const AABox& box = _modelSpaceMeshTriangleSets.value(i).getBounds();
-        AABox hardbounds;
-        auto meshTransform = geometry.offset * fbxMesh.modelTransform;
-        for (const auto& v : fbxMesh.vertices) {
-            hardbounds += glm::vec3(meshTransform * glm::vec4(v,1));
-        }
-        QVariantList renderIDs;
-        for (uint32_t m = 0; m <  _modelMeshRenderItemIDs.size(); m++) {
-            auto meshIndex = _modelMeshRenderItemShapes.size() > m ? _modelMeshRenderItemShapes.at(m).meshIndex : -1;
-            if (meshIndex == i) {
-                renderIDs << _modelMeshRenderItemIDs[m];
-                break;
-            }
-        }
-
-        result.append(std::const_pointer_cast<graphics::Mesh>(mesh), {
-            { "index", i },
-            { "name", name },
-            { "renderIDs", renderIDs },
-            { "meshIndex", fbxMesh.meshIndex },
-            { "displayName", QString::fromStdString(mesh->displayName) },
-            { "modelName", QString::fromStdString(mesh->modelName) },
-            { "modelTransform", buffer_helpers::toVariant(fbxMesh.modelTransform) },
-            { "transform", buffer_helpers::toVariant(geometry.offset * fbxMesh.modelTransform) },
-            { "extents", buffer_helpers::toVariant(fbxMesh.meshExtents) },
-            { "bounds", buffer_helpers::toVariant(Extents(box)) },
-            { "hardbounds", buffer_helpers::toVariant(Extents(hardbounds)) },
-                });
     }
     if (ok) {
         *ok = true;
     }
-    qCDebug(wtf) << "//Model::getScriptableModel -- #" << result.meshes.size();
-    result.metadata["submeshes"] = submeshes;
     return result;
 }
 
@@ -1458,7 +1352,7 @@ void Model::setBlendedVertices(int blendNumber, const Geometry::WeakPointer& geo
 #if FBX_PACK_NORMALS
             glm::uint32 finalNormal;
             glm::uint32 finalTangent;
-            packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
+            buffer_helpers::packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
 #else
             const auto finalNormal = *normalIt;
             const auto finalTangent = *tangentIt;
@@ -1481,7 +1375,7 @@ void Model::setBlendedVertices(int blendNumber, const Geometry::WeakPointer& geo
 #if FBX_PACK_NORMALS
                 glm::uint32 finalNormal;
                 glm::uint32 finalTangent;
-                packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
+                buffer_helpers::packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
 #else
                 const auto finalNormal = *normalIt;
                 const auto finalTangent = *tangentIt;
@@ -1555,7 +1449,7 @@ void Model::createVisibleRenderItemSet() {
 
     // all of our mesh vectors must match in size
     if (meshes.size() != _meshStates.size()) {
-        qCDebug(renderutils) << "WARNING!!!! Mesh Sizes don't match! We will not segregate mesh groups yet.";
+        qCDebug(renderutils) << "WARNING!!!! Mesh Sizes don't match! " << meshes.size() << _meshStates.size() << " We will not segregate mesh groups yet.";
         return;
     }
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 375ee016ca..a0fad7b11f 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -140,7 +140,7 @@ public:
     /// Returns a reference to the shared collision geometry.
     const Geometry::Pointer& getCollisionGeometry() const { return _collisionGeometry; }
 
-    const QVariantMap getTextures() const { assert(isLoaded()); return _renderGeometry->getTextures(); }
+    const QVariantMap getTextures() const { assert(isLoaded()); return getGeometry()->getTextures(); }
     Q_INVOKABLE virtual void setTextures(const QVariantMap& textures);
 
     /// Provided as a convenience, will crash if !isLoaded()
@@ -314,7 +314,7 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
-    Q_INVOKABLE virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
     virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void scaleToFit();
@@ -407,7 +407,7 @@ protected:
     int _blendNumber;
     int _appliedBlendNumber;
 
-    QMutex _mutex;
+    mutable QMutex _mutex{ QMutex::Recursive };
 
     bool _overrideModelTransform { false };
     bool _triangleSetsValid { false };
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
new file mode 100644
index 0000000000..c693083ebf
--- /dev/null
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -0,0 +1,251 @@
+//
+//  ModelScriptingInterface.cpp
+//  libraries/script-engine/src
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#include "ModelScriptingInterface.h"
+#include <QScriptEngine>
+#include <QScriptValueIterator>
+#include <QtScript/QScriptValue>
+#include <model-networking/SimpleMeshProxy.h>
+#include "ScriptEngine.h"
+#include "ScriptEngineLogging.h"
+#include "OBJWriter.h"
+
+ModelScriptingInterface::ModelScriptingInterface(QObject* parent) : QObject(parent) {
+    _modelScriptEngine = qobject_cast<QScriptEngine*>(parent);
+
+    qScriptRegisterSequenceMetaType<QList<MeshProxy*>>(_modelScriptEngine);
+    qScriptRegisterMetaType(_modelScriptEngine, meshFaceToScriptValue, meshFaceFromScriptValue);
+    qScriptRegisterMetaType(_modelScriptEngine, qVectorMeshFaceToScriptValue, qVectorMeshFaceFromScriptValue);
+}
+
+QString ModelScriptingInterface::meshToOBJ(MeshProxyList in) {
+    QList<MeshPointer> meshes;
+    foreach (const MeshProxy* meshProxy, in) {
+        meshes.append(meshProxy->getMeshPointer());
+    }
+
+    return writeOBJToString(meshes);
+}
+
+QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
+    // figure out the size of the resulting mesh
+    size_t totalVertexCount { 0 };
+    size_t totalColorCount { 0 };
+    size_t totalNormalCount { 0 };
+    size_t totalIndexCount { 0 };
+    foreach (const MeshProxy* meshProxy, in) {
+        MeshPointer mesh = meshProxy->getMeshPointer();
+        totalVertexCount += mesh->getNumVertices();
+
+        int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(attributeTypeColor);
+        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
+        totalColorCount += numColors;
+
+        int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
+        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
+        gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
+        totalNormalCount += numNormals;
+
+        totalIndexCount += mesh->getNumIndices();
+    }
+
+    // alloc the resulting mesh
+    gpu::Resource::Size combinedVertexSize = totalVertexCount * sizeof(glm::vec3);
+    std::unique_ptr<unsigned char> combinedVertexData{ new unsigned char[combinedVertexSize] };
+    unsigned char* combinedVertexDataCursor = combinedVertexData.get();
+
+    gpu::Resource::Size combinedColorSize = totalColorCount * sizeof(glm::vec3);
+    std::unique_ptr<unsigned char> combinedColorData{ new unsigned char[combinedColorSize] };
+    unsigned char* combinedColorDataCursor = combinedColorData.get();
+
+    gpu::Resource::Size combinedNormalSize = totalNormalCount * sizeof(glm::vec3);
+    std::unique_ptr<unsigned char> combinedNormalData{ new unsigned char[combinedNormalSize] };
+    unsigned char* combinedNormalDataCursor = combinedNormalData.get();
+
+    gpu::Resource::Size combinedIndexSize = totalIndexCount * sizeof(uint32_t);
+    std::unique_ptr<unsigned char> combinedIndexData{ new unsigned char[combinedIndexSize] };
+    unsigned char* combinedIndexDataCursor = combinedIndexData.get();
+
+    uint32_t indexStartOffset { 0 };
+
+    foreach (const MeshProxy* meshProxy, in) {
+        MeshPointer mesh = meshProxy->getMeshPointer();
+        mesh->forEach(
+            [&](glm::vec3 position){
+                memcpy(combinedVertexDataCursor, &position, sizeof(position));
+                combinedVertexDataCursor += sizeof(position);
+            },
+            [&](glm::vec3 color){
+                memcpy(combinedColorDataCursor, &color, sizeof(color));
+                combinedColorDataCursor += sizeof(color);
+            },
+            [&](glm::vec3 normal){
+                memcpy(combinedNormalDataCursor, &normal, sizeof(normal));
+                combinedNormalDataCursor += sizeof(normal);
+            },
+            [&](uint32_t index){
+                index += indexStartOffset;
+                memcpy(combinedIndexDataCursor, &index, sizeof(index));
+                combinedIndexDataCursor += sizeof(index);
+            });
+
+        gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+        indexStartOffset += numVertices;
+    }
+
+    graphics::MeshPointer result(new graphics::Mesh());
+
+    gpu::Element vertexElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedVertexBuffer = new gpu::Buffer(combinedVertexSize, combinedVertexData.get());
+    gpu::BufferPointer combinedVertexBufferPointer(combinedVertexBuffer);
+    gpu::BufferView combinedVertexBufferView(combinedVertexBufferPointer, vertexElement);
+    result->setVertexBuffer(combinedVertexBufferView);
+
+    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedColorsBuffer = new gpu::Buffer(combinedColorSize, combinedColorData.get());
+    gpu::BufferPointer combinedColorsBufferPointer(combinedColorsBuffer);
+    gpu::BufferView combinedColorsBufferView(combinedColorsBufferPointer, colorElement);
+    result->addAttribute(attributeTypeColor, combinedColorsBufferView);
+
+    int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
+    gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedNormalsBuffer = new gpu::Buffer(combinedNormalSize, combinedNormalData.get());
+    gpu::BufferPointer combinedNormalsBufferPointer(combinedNormalsBuffer);
+    gpu::BufferView combinedNormalsBufferView(combinedNormalsBufferPointer, normalElement);
+    result->addAttribute(attributeTypeNormal, combinedNormalsBufferView);
+
+    gpu::Element indexElement = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW);
+    gpu::Buffer* combinedIndexesBuffer = new gpu::Buffer(combinedIndexSize, combinedIndexData.get());
+    gpu::BufferPointer combinedIndexesBufferPointer(combinedIndexesBuffer);
+    gpu::BufferView combinedIndexesBufferView(combinedIndexesBufferPointer, indexElement);
+    result->setIndexBuffer(combinedIndexesBufferView);
+
+    std::vector<graphics::Mesh::Part> parts;
+    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
+                                         (graphics::Index)result->getNumIndices(), // numIndices
+                                         (graphics::Index)0, // baseVertex
+                                         graphics::Mesh::TRIANGLES)); // topology
+    result->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
+                                                          (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
+
+
+    MeshProxy* resultProxy = new SimpleMeshProxy(result);
+    return meshToScriptValue(_modelScriptEngine, resultProxy);
+}
+
+QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshProxy* meshProxy) {
+    if (!meshProxy) {
+        return QScriptValue(false);
+    }
+    MeshPointer mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        return QScriptValue(false);
+    }
+
+    const auto inverseTransposeTransform = glm::inverse(glm::transpose(transform));
+    graphics::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                                          [&](glm::vec3 color){ return color; },
+                                          [&](glm::vec3 normal){ return glm::vec3(inverseTransposeTransform * glm::vec4(normal, 0.0f)); },
+                                          [&](uint32_t index){ return index; });
+    MeshProxy* resultProxy = new SimpleMeshProxy(result);
+    return meshToScriptValue(_modelScriptEngine, resultProxy);
+}
+
+QScriptValue ModelScriptingInterface::getVertexCount(MeshProxy* meshProxy) {
+    if (!meshProxy) {
+        return QScriptValue(false);
+    }
+    MeshPointer mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        return QScriptValue(false);
+    }
+
+    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+
+    return numVertices;
+}
+
+QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertexIndex) {
+    if (!meshProxy) {
+        return QScriptValue(false);
+    }
+    MeshPointer mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        return QScriptValue(false);
+    }
+
+    const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
+    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+
+    if (vertexIndex < 0 || vertexIndex >= numVertices) {
+        return QScriptValue(false);
+    }
+
+    glm::vec3 pos = vertexBufferView.get<glm::vec3>(vertexIndex);
+    return vec3toScriptValue(_modelScriptEngine, pos);
+}
+
+
+QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
+                                              const QVector<glm::vec3>& normals,
+                                              const QVector<MeshFace>& faces) {
+    graphics::MeshPointer mesh(new graphics::Mesh());
+
+    // vertices
+    auto vertexBuffer = std::make_shared<gpu::Buffer>(vertices.size() * sizeof(glm::vec3), (gpu::Byte*)vertices.data());
+    auto vertexBufferPtr = gpu::BufferPointer(vertexBuffer);
+    gpu::BufferView vertexBufferView(vertexBufferPtr, 0, vertexBufferPtr->getSize(),
+                                     sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
+    mesh->setVertexBuffer(vertexBufferView);
+
+    if (vertices.size() == normals.size()) {
+        // normals
+        auto normalBuffer = std::make_shared<gpu::Buffer>(normals.size() * sizeof(glm::vec3), (gpu::Byte*)normals.data());
+        auto normalBufferPtr = gpu::BufferPointer(normalBuffer);
+        gpu::BufferView normalBufferView(normalBufferPtr, 0, normalBufferPtr->getSize(),
+                                         sizeof(glm::vec3), gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
+        mesh->addAttribute(gpu::Stream::NORMAL, normalBufferView);
+    } else {
+        qCDebug(scriptengine) << "ModelScriptingInterface::newMesh normals must be same length as vertices";
+    }
+
+    // indices (faces)
+    int VERTICES_PER_TRIANGLE = 3;
+    int indexBufferSize = faces.size() * sizeof(uint32_t) * VERTICES_PER_TRIANGLE;
+    unsigned char* indexData  = new unsigned char[indexBufferSize];
+    unsigned char* indexDataCursor = indexData;
+    foreach(const MeshFace& meshFace, faces) {
+        for (int i = 0; i < VERTICES_PER_TRIANGLE; i++) {
+            memcpy(indexDataCursor, &meshFace.vertexIndices[i], sizeof(uint32_t));
+            indexDataCursor += sizeof(uint32_t);
+        }
+    }
+    auto indexBuffer = std::make_shared<gpu::Buffer>(indexBufferSize, (gpu::Byte*)indexData);
+    auto indexBufferPtr = gpu::BufferPointer(indexBuffer);
+    gpu::BufferView indexBufferView(indexBufferPtr, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::RAW));
+    mesh->setIndexBuffer(indexBufferView);
+
+    // parts
+    std::vector<graphics::Mesh::Part> parts;
+    parts.emplace_back(graphics::Mesh::Part((graphics::Index)0, // startIndex
+                                         (graphics::Index)faces.size() * 3, // numIndices
+                                         (graphics::Index)0, // baseVertex
+                                         graphics::Mesh::TRIANGLES)); // topology
+    mesh->setPartBuffer(gpu::BufferView(new gpu::Buffer(parts.size() * sizeof(graphics::Mesh::Part),
+                                                        (gpu::Byte*) parts.data()), gpu::Element::PART_DRAWCALL));
+
+
+
+    MeshProxy* meshProxy = new SimpleMeshProxy(mesh);
+    return meshToScriptValue(_modelScriptEngine, meshProxy);
+}
diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h
new file mode 100644
index 0000000000..3c239f006f
--- /dev/null
+++ b/libraries/script-engine/src/ModelScriptingInterface.h
@@ -0,0 +1,39 @@
+//
+//  ModelScriptingInterface.h
+//  libraries/script-engine/src
+//
+//  Created by Seth Alves on 2017-1-27.
+//  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
+//
+
+#ifndef hifi_ModelScriptingInterface_h
+#define hifi_ModelScriptingInterface_h
+
+#include <QtCore/QObject>
+
+#include <RegisteredMetaTypes.h>
+class QScriptEngine;
+
+class ModelScriptingInterface : public QObject {
+    Q_OBJECT
+
+public:
+    ModelScriptingInterface(QObject* parent);
+
+    Q_INVOKABLE QString meshToOBJ(MeshProxyList in);
+    Q_INVOKABLE QScriptValue appendMeshes(MeshProxyList in);
+    Q_INVOKABLE QScriptValue transformMesh(glm::mat4 transform, MeshProxy* meshProxy);
+    Q_INVOKABLE QScriptValue newMesh(const QVector<glm::vec3>& vertices,
+                                     const QVector<glm::vec3>& normals,
+                                     const QVector<MeshFace>& faces);
+    Q_INVOKABLE QScriptValue getVertexCount(MeshProxy* meshProxy);
+    Q_INVOKABLE QScriptValue getVertex(MeshProxy* meshProxy, int vertexIndex);
+
+private:
+    QScriptEngine* _modelScriptEngine { nullptr };
+};
+
+#endif // hifi_ModelScriptingInterface_h
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index ffb1b7bc74..c79ffffec7 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -73,6 +73,8 @@
 #include "WebSocketClass.h"
 #include "RecordingScriptingInterface.h"
 #include "ScriptEngines.h"
+#include "ModelScriptingInterface.h"
+
 
 #include <Profile.h>
 
@@ -709,6 +711,10 @@ void ScriptEngine::init() {
 
     registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
 
+    registerGlobalObject("Model", new ModelScriptingInterface(this));
+    qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
+    qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
+
     registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
 }
 
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index 9ad5c27072..7b455beae5 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -855,3 +855,68 @@ QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const Animatio
 void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& details) {
     // nothing for now...
 }
+
+QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in) {
+    return engine->newQObject(in, QScriptEngine::QtOwnership,
+        QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
+}
+
+void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out) {
+    out = qobject_cast<MeshProxy*>(value.toQObject());
+}
+
+QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in) {
+    // QScriptValueList result;
+    QScriptValue result = engine->newArray();
+    int i = 0;
+    foreach(MeshProxy* const meshProxy, in) {
+        result.setProperty(i++, meshToScriptValue(engine, meshProxy));
+    }
+    return result;
+}
+
+void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out) {
+    QScriptValueIterator itr(value);
+
+    qDebug() << "in meshesFromScriptValue, value.length =" << value.property("length").toInt32();
+
+    while (itr.hasNext()) {
+        itr.next();
+        MeshProxy* meshProxy = qscriptvalue_cast<MeshProxyList::value_type>(itr.value());
+        if (meshProxy) {
+            out.append(meshProxy);
+        } else {
+            qDebug() << "null meshProxy";
+        }
+    }
+}
+
+
+QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace) {
+    QScriptValue obj = engine->newObject();
+    obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
+    return obj;
+}
+
+void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult) {
+    qVectorIntFromScriptValue(object.property("vertices"), meshFaceResult.vertexIndices);
+}
+
+QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector) {
+    QScriptValue array = engine->newArray();
+    for (int i = 0; i < vector.size(); i++) {
+        array.setProperty(i, meshFaceToScriptValue(engine, vector.at(i)));
+    }
+    return array;
+}
+
+void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result) {
+    int length = array.property("length").toInteger();
+    result.clear();
+
+    for (int i = 0; i < length; i++) {
+        MeshFace meshFace = MeshFace();
+        meshFaceFromScriptValue(array.property(i), meshFace);
+        result << meshFace;
+    }
+}
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index e8390c3a86..25b2cec331 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -315,9 +315,51 @@ Q_DECLARE_METATYPE(AnimationDetails);
 QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& event);
 void animationDetailsFromScriptValue(const QScriptValue& object, AnimationDetails& event);
 
+namespace graphics {
+    class Mesh;
+}
+
+using MeshPointer = std::shared_ptr<graphics::Mesh>;
 
 
+class MeshProxy : public QObject {
+    Q_OBJECT
 
+public:
+    virtual MeshPointer getMeshPointer() const = 0;
+    Q_INVOKABLE virtual int getNumVertices() const = 0;
+    Q_INVOKABLE virtual glm::vec3 getPos3(int index) const = 0;
+};
+
+Q_DECLARE_METATYPE(MeshProxy*);
+
+class MeshProxyList : public QList<MeshProxy*> {}; // typedef and using fight with the Qt macros/templates, do this instead
+Q_DECLARE_METATYPE(MeshProxyList);
+
+
+QScriptValue meshToScriptValue(QScriptEngine* engine, MeshProxy* const &in);
+void meshFromScriptValue(const QScriptValue& value, MeshProxy* &out);
+
+QScriptValue meshesToScriptValue(QScriptEngine* engine, const MeshProxyList &in);
+void meshesFromScriptValue(const QScriptValue& value, MeshProxyList &out);
+
+class MeshFace {
+
+public:
+    MeshFace() {}
+    ~MeshFace() {}
+
+    QVector<uint32_t> vertexIndices;
+    // TODO -- material...
+};
+
+Q_DECLARE_METATYPE(MeshFace)
+Q_DECLARE_METATYPE(QVector<MeshFace>)
+
+QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const MeshFace &meshFace);
+void meshFaceFromScriptValue(const QScriptValue &object, MeshFace& meshFaceResult);
+QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<MeshFace>& vector);
+void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<MeshFace>& result);
 
 
 #endif // hifi_RegisteredMetaTypes_h
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index 090ca4c266..5d4793ba4e 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -207,6 +207,10 @@ public:
 
     void dump(const QString& prefix = "") const;
 
+    virtual void locationChanged(bool tellPhysics = true); // called when a this object's location has changed
+    virtual void dimensionsChanged() { _queryAACubeSet = false; } // called when a this object's dimensions have changed
+    virtual void parentDeleted() { } // called on children of a deleted parent
+
 protected:
     const NestableType _nestableType; // EntityItem or an AvatarData
     QUuid _id;
@@ -218,10 +222,6 @@ protected:
     mutable ReadWriteLockable _childrenLock;
     mutable QHash<QUuid, SpatiallyNestableWeakPointer> _children;
 
-    virtual void locationChanged(bool tellPhysics = true); // called when a this object's location has changed
-    virtual void dimensionsChanged() { _queryAACubeSet = false; } // called when a this object's dimensions have changed
-    virtual void parentDeleted() { } // called on children of a deleted parent
-
     // _queryAACube is used to decide where something lives in the octree
     mutable AACube _queryAACube;
     mutable bool _queryAACubeSet { false };

From caab532d80babef35e2075fe3fc6fb23fe3cf6e4 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 06:00:03 -0500
Subject: [PATCH 418/569] remove dupe line

---
 interface/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 80e47a220f..3ed5445493 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -204,7 +204,6 @@ endif()
 
 # link required hifi libraries
 link_hifi_libraries(
-  shared octree ktx gpu gl procedural graphics graphics-scripting render
   shared task octree ktx gpu gl procedural graphics graphics-scripting render
   pointers
   recording fbx networking model-networking entities avatars trackers

From e4a2a589a51ba243568f9553966870b150c28a85 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 07:56:09 -0500
Subject: [PATCH 419/569] CR fedback and cleanup

---
 interface/src/Application.cpp                 |   9 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |   1 +
 .../src/RenderableModelEntityItem.cpp         |   6 -
 libraries/fbx/src/FBX.h                       |   3 +
 libraries/fbx/src/OBJWriter.cpp               |  21 +--
 libraries/graphics-scripting/CMakeLists.txt   |   1 -
 .../BufferViewScripting.cpp                   |   4 +-
 .../GraphicsScriptingInterface.cpp            |  29 ++--
 .../GraphicsScriptingUtil.h                   |  52 ++-----
 .../src/graphics-scripting/ScriptableMesh.cpp |  39 ++---
 .../src/graphics-scripting/ScriptableMesh.h   |  26 ++--
 .../src/graphics}/BufferViewHelpers.cpp       | 145 ++++++++++--------
 .../src/graphics}/BufferViewHelpers.h         |   6 +-
 libraries/render-utils/src/Model.cpp          |  22 +--
 .../src/Model_temporary_hack.cpp.h            |  16 +-
 15 files changed, 159 insertions(+), 221 deletions(-)
 rename libraries/{graphics-scripting/src/graphics-scripting => graphics/src/graphics}/BufferViewHelpers.cpp (87%)
 rename libraries/{graphics-scripting/src/graphics-scripting => graphics/src/graphics}/BufferViewHelpers.h (91%)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0a0c6e15d1..1be22d5087 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -607,7 +607,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
 
 class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
 public:
-    virtual scriptable::ModelProviderPointer lookupModelProvider(QUuid uuid) {
+    virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) {
         QString error;
 
         scriptable::ModelProviderPointer provider;
@@ -631,7 +631,7 @@ public:
         if (auto entity = entityTree->findEntityByID(entityID)) {
             if (auto renderer = entityTreeRenderer->renderableForEntityId(entityID)) {
                 provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(renderer);
-                provider->metadata["providerType"] = "entity";
+                provider->modelProviderType = NestableType::Entity;
             } else {
                 qCWarning(interfaceapp) << "no renderer for entity ID" << entityID.toString();
             }
@@ -645,7 +645,7 @@ public:
         if (auto overlay = overlays.getOverlay(overlayID)) {
             if (auto base3d = std::dynamic_pointer_cast<Base3DOverlay>(overlay)) {
                 provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(base3d);
-                provider->metadata["providerType"] = "overlay";
+                provider->modelProviderType = NestableType::Overlay;
             } else {
                 qCWarning(interfaceapp) << "no renderer for overlay ID" << overlayID.toString();
             }
@@ -659,7 +659,7 @@ public:
         if (auto avatar = avatarManager->getAvatarBySessionID(sessionUUID)) {
             if (avatar->getSessionUUID() == sessionUUID) {
                 provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
-                provider->metadata["providerType"] = "avatar";
+                provider->modelProviderType = NestableType::Avatar;
             }
         }
         return provider;
@@ -811,6 +811,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<DesktopScriptingInterface>();
     DependencyManager::set<EntityScriptingInterface>(true);
+    DependencyManager::set<GraphicsScriptingInterface>();
     DependencyManager::registerInheritance<scriptable::ModelProviderFactory, ApplicationMeshProvider>();
     DependencyManager::set<ApplicationMeshProvider>();
     DependencyManager::set<RecordingScriptingInterface>();
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index e610fa5c2e..b6b79fd8c9 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -119,6 +119,7 @@ bool ModelOverlay::addToScene(Overlay::Pointer overlay, const render::ScenePoint
 void ModelOverlay::removeFromScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
     Volume3DOverlay::removeFromScene(overlay, scene, transaction);
     _model->removeFromScene(scene, transaction);
+    emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(getID(), NestableType::Overlay, _model);
     transaction.updateItem<Overlay>(getRenderItemID(), [](Overlay& data) {
         auto modelOverlay = static_cast<ModelOverlay*>(&data);
         modelOverlay->clearSubRenderItemIDs();
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 1c4a7f1055..c93bcb2055 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1073,14 +1073,8 @@ void ModelEntityRenderer::removeFromScene(const ScenePointer& scene, Transaction
 
 void ModelEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
     entity->setModel({});
-    //emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(entity->getID(), NestableType::Entity, _model);
 }
 
-void ModelEntityRenderer::onAddToSceneTyped(const TypedEntityPointer& entity) {
-    //emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelAddedToScene(entity->getID(), NestableType::Entity, _model);
-}
-
-
 void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     if (!_animation || !_animation->isLoaded()) {
         return;
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 224d19fe96..a609d85fc8 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -242,6 +242,9 @@ public:
 
     graphics::MeshPointer _mesh;
     bool wasCompressed { false };
+
+    void createMeshTangents(bool generateFromTexCoords);
+    void createBlendShapeTangents(bool generateTangents);
 };
 
 class ExtractedMesh {
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 621852f591..a53a3c7c5d 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -9,15 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OBJWriter.h"
+
 #include <QFile>
 #include <QFileInfo>
-#include "graphics/Geometry.h"
-#include "OBJWriter.h"
+#include <graphics/BufferViewHelpers.h>
+#include <graphics/Geometry.h>
 #include "ModelFormatLogging.h"
 
-// FIXME: should this live in shared? (it depends on gpu/)
-#include <../graphics-scripting/src/graphics-scripting/BufferViewHelpers.h>
-
 static QString formatFloat(double n) {
     // limit precision to 6, but don't output trailing zeros.
     QString s = QString::number(n, 'f', 6);
@@ -71,8 +70,10 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
             out << formatFloat(v[1]) << " ";
             out << formatFloat(v[2]);
             if (colorIndex < numColors) {
-                glm::vec3 color = glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(colorsBufferView, colorIndex));
-                //glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
+                glm::vec3 color = buffer_helpers::convert<glm::vec3>(colorsBufferView, colorIndex);
+                // TODO: still verifying that the above decodes properly; previous variations were:
+                // glm::vec3 color = buffer_helpers::glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(colorsBufferView, colorIndex));
+                // glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
                 out << " " << formatFloat(color[0]);
                 out << " " << formatFloat(color[1]);
                 out << " " << formatFloat(color[2]);
@@ -95,8 +96,10 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
         for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
-            glm::vec3 normal = glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(normalsBufferView, i));
-            //glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
+            glm::vec3 normal = buffer_helpers::convert<glm::vec3>(normalsBufferView, i);
+            // TODO: still verifying that the above decodes properly; previous variations were:
+            // glm::vec3 normal = buffer_helpers::glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(normalsBufferView, i));
+            // glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
             out << "vn ";
             out << formatFloat(normal[0]) << " ";
             out << formatFloat(normal[1]) << " ";
diff --git a/libraries/graphics-scripting/CMakeLists.txt b/libraries/graphics-scripting/CMakeLists.txt
index e7fa3de155..ad8055b647 100644
--- a/libraries/graphics-scripting/CMakeLists.txt
+++ b/libraries/graphics-scripting/CMakeLists.txt
@@ -2,4 +2,3 @@ set(TARGET_NAME graphics-scripting)
 setup_hifi_library()
 link_hifi_libraries(shared networking graphics fbx model-networking script-engine)
 include_hifi_library_headers(gpu)
-include_hifi_library_headers(graphics-scripting)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
index 775aedad52..31cf5ff8f3 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
@@ -9,10 +9,10 @@
 #include <gpu/Format.h>
 #include <gpu/Stream.h>
 
-#include <graphics-scripting/BufferViewHelpers.h>
+#include <graphics/BufferViewHelpers.h>
 
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    #include <graphics/DebugNames.h>
+    #include "DebugNames.h"
 #endif
 
 namespace {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 71ef57bd82..58fcd7a064 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -1,8 +1,7 @@
 //
 //  GraphicsScriptingInterface.cpp
-//  libraries/script-engine/src
+//  libraries/graphics-scripting/src
 //
-//  Created by Seth Alves on 2017-1-27.
 //  Copyright 2017 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@@ -10,28 +9,24 @@
 //
 
 #include "GraphicsScriptingInterface.h"
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValueIterator>
-#include <QtScript/QScriptValue>
-#include <QUuid>
 #include "BaseScriptEngine.h"
-#include "ScriptEngineLogging.h"
+#include "BufferViewScripting.h"
+#include "DebugNames.h"
+#include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
-
+#include "RegisteredMetaTypes.h"
+#include "ScriptEngineLogging.h"
+#include "ScriptableMesh.h"
 #include <GeometryUtil.h>
+#include <QUuid>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptValueIterator>
+#include <graphics/BufferViewHelpers.h>
 #include <shared/QtHelpers.h>
 
-#include <graphics-scripting/DebugNames.h>
-#include <graphics-scripting/BufferViewHelpers.h>
-
-#include "BufferViewScripting.h"
-#include "ScriptableMesh.h"
-#include "GraphicsScriptingUtil.h"
-
 #include "GraphicsScriptingInterface.moc"
 
-#include "RegisteredMetaTypes.h"
-
 GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent) {
     if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
         this->registerMetaTypes(scriptEngine);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
index cfa510f87f..594e09bb32 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
@@ -12,12 +12,15 @@ Q_DECLARE_LOGGING_CATEGORY(graphics_scripting)
 
 namespace scriptable {
     // derive current context's C++ QObject (based on current JS "this" value)
-    template <typename T> T this_qobject_cast(QScriptEngine* engine) {
+    template <typename T>
+    T this_qobject_cast(QScriptEngine* engine) {
         auto context = engine ? engine->currentContext() : nullptr;
         return qscriptvalue_cast<T>(context ? context->thisObject() : QScriptValue::NullValue);
     }
+
     // JS => QPointer<QObject>
-    template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value) {
+    template <typename T>
+    QPointer<T> qpointer_qobject_cast(const QScriptValue& value) {
         auto obj = value.toQObject();
 #ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "qpointer_qobject_cast" << obj << value.toString();
@@ -41,54 +44,21 @@ namespace scriptable {
     }
 
     // C++ > QtOwned instance
-    template <typename T, class... Rest> std::shared_ptr<T> make_qtowned(Rest... rest) {
+    template <typename T, class... Rest>
+    std::shared_ptr<T> make_qtowned(Rest... rest) {
         T* tmp = new T(rest...);
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "scriptable::make_qtowned" << toDebugString(tmp);
-#endif
-        QString debug = toDebugString(tmp);
         if (tmp) {
             tmp->metadata["__ownership__"] = QScriptEngine::QtOwnership;
-#ifdef SCRIPTABLE_MESH_DEBUG
-            QObject::connect(tmp, &QObject::destroyed, [=]() {  qCInfo(graphics_scripting) << "-------- ~scriptable::make_qtowned" << debug; });
-#endif
-            auto ptr = std::shared_ptr<T>(tmp, [debug](T* tmp) {
-                    //qDebug() << "~std::shared_ptr<T>" << debug;
-                delete tmp;
-            });
-            return ptr;
-        } else {
-            return std::shared_ptr<T>(tmp);
         }
+        return std::shared_ptr<T>(tmp);
     }
+
     // C++ > ScriptOwned JS instance
-    template <typename T, class... Rest> QPointer<T> make_scriptowned(Rest... rest) {
+    template <typename T, class... Rest>
+    QPointer<T> make_scriptowned(Rest... rest) {
         T* tmp = new T(rest...);
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "scriptable::make_scriptowned" << toDebugString(tmp);
-#endif
         if (tmp) {
             tmp->metadata["__ownership__"] = QScriptEngine::ScriptOwnership;
-            //auto blah = (DeleterFunction)[](void* delme) { };
-            return add_scriptowned_destructor(tmp);
-        } else {
-            return QPointer<T>(tmp);
-        }
-    }
-    // C++ > ScriptOwned JS instance
-    template <typename T> QPointer<T> add_scriptowned_destructor(T* tmp) {
-        QString debug = toDebugString(tmp);
-        if (tmp) {
-#ifdef SCRIPTABLE_MESH_DEBUG
-            QObject::connect(tmp, &QObject::destroyed, [=]() {
-                    qCInfo(graphics_scripting) << "-------- ~scriptable::make_scriptowned" << debug;// << !!customDeleter;
-                //if (customDeleter) {
-                    // customDeleter(tmp);
-                //}
-            });
-#endif
-        } else {
-            qCInfo(graphics_scripting) << "add_scriptowned_destructor -- not connecting to null value" << debug;
         }
         return QPointer<T>(tmp);
     }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index c662371c89..28e57692f6 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -1,41 +1,26 @@
 //
-//  SimpleMeshProxy.cpp
-//  libraries/model-networking/src/model-networking/
-//
-//  Created by Seth Alves on 2017-3-22.
-//  Copyright 2017 High Fidelity, Inc.
+//  Copyright 2018 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 "GraphicsScriptingUtil.h"
 #include "ScriptableMesh.h"
 
-#include <glm/glm.hpp>
-#include <glm/gtx/transform.hpp>
-#include <glm/gtx/norm.hpp>
-#include <graphics/Geometry.h>
-#include <graphics-scripting/DebugNames.h>
-#include <graphics-scripting/BufferViewHelpers.h>
-#include <graphics-scripting/BufferViewScripting.h>
-
-#include "ScriptableMesh.moc"
-
-#include <RegisteredMetaTypes.h>
+#include "BufferViewScripting.h"
+#include "DebugNames.h"
+#include "GraphicsScriptingUtil.h"
+#include "OBJWriter.h"
 #include <BaseScriptEngine.h>
 #include <QtScript/QScriptValue>
+#include <RegisteredMetaTypes.h>
+#include <glm/glm.hpp>
+#include <glm/gtx/norm.hpp>
+#include <glm/gtx/transform.hpp>
+#include <graphics/BufferViewHelpers.h>
+#include <graphics/Geometry.h>
 
-#include "OBJWriter.h"
-
-// #define SCRIPTABLE_MESH_DEBUG
-
-namespace scriptable {
-    // QScriptValue jsBindCallback(QScriptValue callback);
-    // template <typename T> QPointer<T> qpointer_qobject_cast(const QScriptValue& value);
-    // template <typename T> T this_qobject_cast(QScriptEngine* engine);
-    // template <typename T, class... Rest> QPointer<T> make_scriptowned(Rest... rest);
-}
+#include "ScriptableMesh.moc"
 
 scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
     : parentMesh(parentMesh), partIndex(partIndex)  {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index ba0efa007d..2b9399d6ef 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -1,26 +1,22 @@
 #pragma once
 
-#include <glm/glm.hpp>
-#include <QtCore/QObject>
-#include <QtCore/QVector>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QUuid>
-#include <QPointer>
-#include <memory>
+#include "ScriptableModel.h"
 
+#include <glm/glm.hpp>
+#include <graphics/BufferViewHelpers.h>
 #include <DependencyManager.h>
 
-//#include <graphics-scriping/Forward.h>
-#include <graphics-scripting/ScriptableModel.h>
-#include <graphics-scripting/BufferViewHelpers.h>
-
-#include <QtScript/QScriptable>
+#include <memory>
+#include <QPointer>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QUuid>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 #include <QtScript/QScriptValue>
+#include <QtScript/QScriptable>
 
 namespace scriptable {
-
-    QScriptValue jsBindCallback(QScriptValue callback);
     class ScriptableMesh : public ScriptableMeshBase, QScriptable {
         Q_OBJECT
     public:
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
similarity index 87%
rename from libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
rename to libraries/graphics/src/graphics/BufferViewHelpers.cpp
index e4eeee856e..ea511d82f4 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -1,4 +1,11 @@
-#include "./graphics-scripting/BufferViewHelpers.h"
+//
+//  Copyright 2018 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 "BufferViewHelpers.h"
 
 #include <QDebug>
 #include <QVariant>
@@ -7,7 +14,7 @@
 #include <gpu/Format.h>
 #include <gpu/Stream.h>
 
-#include <graphics/Geometry.h>
+#include "Geometry.h"
 
 #include <Extents.h>
 #include <AABox.h>
@@ -15,25 +22,26 @@
 #include <glm/gtx/string_cast.hpp>
 #include <glm/gtc/packing.hpp>
 #include <glm/detail/type_vec.hpp>
+
 namespace glm {
     using hvec2 = glm::tvec2<glm::detail::hdata>;
     using hvec4 = glm::tvec4<glm::detail::hdata>;
 }
 
-//#define DEBUG_BUFFERVIEW_SCRIPTING
-//#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-#include "DebugNames.h"
-//#endif
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+#include "../../graphics-scripting/src/graphics-scripting/DebugNames.h"
+#endif
 
 namespace {
-    QLoggingCategory bufferhelper_logging{"hifi.bufferview"};
-    const std::array<const char*, 4> XYZW = {{ "x", "y", "z", "w" }};
-    const std::array<const char*, 4> ZERO123 = {{ "0", "1", "2", "3" }};
+    QLoggingCategory bufferhelper_logging{ "hifi.bufferview" };
+    const std::array<const char*, 4> XYZW = { { "x", "y", "z", "w" } };
+    const std::array<const char*, 4> ZERO123 = { { "0", "1", "2", "3" } };
 }
 
 gpu::BufferView buffer_helpers::getBufferView(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
     return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
 }
+
 QMap<QString,int> buffer_helpers::ATTRIBUTES{
     {"position", gpu::Stream::POSITION },
     {"normal", gpu::Stream::NORMAL },
@@ -49,16 +57,23 @@ QMap<QString,int> buffer_helpers::ATTRIBUTES{
 };
 
 
-template <typename T>
-QVariant getBufferViewElement(const gpu::BufferView& view, quint32 index, bool asArray = false) {
-    return glmVecToVariant(view.get<T>(index), asArray);
-}
+namespace {
+    bool boundsCheck(const gpu::BufferView& view, quint32 index) {
+        const auto byteLength = view._element.getSize();
+        return (
+            index < view.getNumElements() &&
+            index * byteLength < (view._size - 1) * byteLength
+        );
+    }
 
-template <typename T>
-void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QVariant& v) {
-    view.edit<T>(index) = glmVecFromVariant<T>(v);
-}
+    template <typename T> QVariant getBufferViewElement(const gpu::BufferView& view, quint32 index, bool asArray = false) {
+        return buffer_helpers::glmVecToVariant(view.get<T>(index), asArray);
+    }
 
+    template <typename T> void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QVariant& v) {
+        view.edit<T>(index) = buffer_helpers::glmVecFromVariant<T>(v);
+    }
+}
 
 void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
     auto absNormal = glm::abs(normal);
@@ -147,14 +162,6 @@ bool buffer_helpers::fromVariant(const gpu::BufferView& view, quint32 index, con
     return false;
 }
 
-bool boundsCheck(const gpu::BufferView& view, quint32 index) {
-    const auto byteLength = view._element.getSize();
-    return (
-        index < view.getNumElements() &&
-        index * byteLength < (view._size - 1) * byteLength
-    );
-}
-
 QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
     const auto& element = view._element;
     const auto vecN = element.getScalarCount();
@@ -167,14 +174,17 @@ QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, b
         auto byteOffset = index * vecN * BYTES_PER_ELEMENT;
         auto maxByteOffset = (view._size - 1) * vecN * BYTES_PER_ELEMENT;
         if (byteOffset > maxByteOffset) {
-            qDebug() << "bufferViewElementToVariant -- byteOffset out of range " << byteOffset << " < " << maxByteOffset << DebugNames::stringFrom(dataType);
-            qDebug() << "bufferViewElementToVariant -- index: " << index << "numElements" << view.getNumElements();
-            qDebug() << "bufferViewElementToVariant -- vecN: " << vecN << "byteLength" << byteLength << "BYTES_PER_ELEMENT" << BYTES_PER_ELEMENT;
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+            qDebug() << "toVariant -- " << DebugNames::stringFrom(dataType)
+#endif
+            qDebug() << "toVariant -- byteOffset out of range " << byteOffset << " < " << maxByteOffset;
+            qDebug() << "toVariant -- index: " << index << "numElements" << view.getNumElements();
+            qDebug() << "toVariant -- vecN: " << vecN << "byteLength" << byteLength << "BYTES_PER_ELEMENT" << BYTES_PER_ELEMENT;
         }
         Q_ASSERT(byteOffset <= maxByteOffset);
     }
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    qCDebug(bufferhelper_logging) << "bufferViewElementToVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
+    qCDebug(bufferhelper_logging) << "toVariant -- " << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
 #endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
@@ -223,7 +233,7 @@ QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, b
 }
 
 template <typename T>
-QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
+QVariant buffer_helpers::glmVecToVariant(const T& v, bool asArray /*= false*/) {
     static const auto len = T().length();
     if (asArray) {
         QVariantList list;
@@ -239,8 +249,9 @@ QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
         return obj;
     }
 }
+
 template <typename T>
-const T glmVecFromVariant(const QVariant& v) {
+const T buffer_helpers::glmVecFromVariant(const QVariant& v) {
     auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
     static const auto len = T().length();
     const auto& components = isMap ? XYZW : ZERO123;
@@ -255,9 +266,11 @@ const T glmVecFromVariant(const QVariant& v) {
         } else {
             value = list.value(i).toFloat();
         }
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
         if (value != value) { // NAN
             qWarning().nospace()<< "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
         }
+#endif        
         result[i] = value;
     }
     return result;
@@ -268,17 +281,26 @@ gpu::BufferView buffer_helpers::fromVector(const QVector<T>& elements, const gpu
     auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
     return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
-template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
-template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return fromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(
+    const QVector<unsigned int>& elements, const gpu::Element& elementType
+) { return fromVector(elements, elementType); }
 
-template <typename T> struct GpuVec4ToGlm;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
-template <typename T> struct getScalar;// { static T get(const gpu::BufferView& view, quint32 index, const char *hint); };
+template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(
+    const QVector<glm::vec3>& elements, const gpu::Element& elementType
+) { return fromVector(elements, elementType); }
+
+template <typename T> struct GpuVec4ToGlm;
+template <typename T> struct GpuScalarToGlm;
 
 struct GpuToGlmAdapter {
     static float error(const QString& name, const gpu::BufferView& view, quint32 index, const char *hint) {
+        QString debugName;
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+        debugName = DebugNames::stringFrom(view._element.getType())
+#endif
         qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2(%3)) size=%4(per=%5) vec%6 hint=%7 #%8")
             .arg(name)
-            .arg(DebugNames::stringFrom(view._element.getType()))
+            .arg(debugName)
             .arg(view._element.getType())
             .arg(view._element.getSize())
             .arg(view._element.getSize() / view._element.getScalarCount())
@@ -290,7 +312,8 @@ struct GpuToGlmAdapter {
         return NAN;
     }
 };
-template <typename T> struct getScalar : GpuToGlmAdapter {
+
+template <typename T> struct GpuScalarToGlm : GpuToGlmAdapter {
     static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
         case gpu::UINT32: return view.get<glm::uint32>(index);
         case gpu::UINT16: return view.get<glm::uint16>(index);
@@ -301,7 +324,7 @@ template <typename T> struct getScalar : GpuToGlmAdapter {
         case gpu::FLOAT: return view.get<glm::float32>(index);
         case gpu::HALF: return T(glm::unpackSnorm1x8(view.get<glm::int8>(index)));
         default: break;
-        } return T(error("getScalar", view, index, hint));
+        } return T(error("GpuScalarToGlm", view, index, hint));
     }
 };
 
@@ -376,8 +399,9 @@ struct getVec {
     }
 };
 
+// BufferView => QVector<T>
 template <> QVector<int> buffer_helpers::toVector<int>(const gpu::BufferView& view, const char *hint) {
-    return getVec<getScalar<int>,int>::__to_vector__(view, hint);
+    return getVec<GpuScalarToGlm<int>,int>::__to_vector__(view, hint);
 }
 template <> QVector<glm::vec2> buffer_helpers::toVector<glm::vec2>(const gpu::BufferView& view, const char *hint) {
     return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_vector__(view, hint);
@@ -390,8 +414,9 @@ template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::Bu
 }
 
 
+// indexed conversion accessors (similar to "view.convert<T>(i)" existed)
 template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<getScalar<int>,int>::__to_scalar__(view, index, hint);
+    return getVec<GpuScalarToGlm<int>,int>::__to_scalar__(view, index, hint);
 }
 template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) {
     return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_scalar__(view, index, hint);
@@ -407,30 +432,25 @@ gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
     return gpu::BufferView(
         std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
         input._offset, input._size, input._stride, input._element
-        );
+    );
 }
 
+// TODO: preserve existing data
 gpu::BufferView buffer_helpers::resize(const gpu::BufferView& input, quint32 numElements) {
     auto effectiveSize = input._buffer->getSize() / input.getNumElements();
-    qDebug() << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
+    qCDebug(bufferhelper_logging) << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
     auto vsize = input._element.getSize() * numElements;
-    gpu::Byte *data = new gpu::Byte[vsize];
-    memset(data, 0, vsize);
-    auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
-    delete[] data;
+    std::unique_ptr<gpu::Byte[]> data{ new gpu::Byte[vsize] };
+    memset(data.get(), 0, vsize);
+    auto buffer = new gpu::Buffer(vsize, data.get());
     auto output = gpu::BufferView(buffer, input._element);
-    qDebug() << "resized output" << output.getNumElements() << output._buffer->getSize();
+    qCDebug(bufferhelper_logging) << "resized output" << output.getNumElements() << output._buffer->getSize();
     return output;
 }
 
 graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
     auto clone = std::make_shared<graphics::Mesh>();
-    //[](graphics::Mesh* blah) {
-    //qCDebug(bufferhelper_logging) << "--- DELETING MESH POINTER" << blah;
-    //  delete blah;
-    //});
     clone->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
-    //qCInfo(bufferhelper_logging) << "+++ ALLOCATED MESH POINTER ScriptableMesh::cloneMesh" << clone->displayName << clone.get() << !!mesh;
     clone->setIndexBuffer(buffer_helpers::clone(mesh->getIndexBuffer()));
     clone->setPartBuffer(buffer_helpers::clone(mesh->getPartBuffer()));
     auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
@@ -447,18 +467,11 @@ graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
     return clone;
 }
 
-
-/// --- buffer view <-> variant helpers
-
 namespace {
     // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
     gpu::BufferView _expandedAttributeBuffer(const graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
         gpu::BufferView bufferView = buffer_helpers::getBufferView(mesh, slot);
         const auto& elementType = bufferView._element;
-        //auto vecN = element.getScalarCount();
-        //auto type = element.getType();
-        //gpu::Element elementType = getVecNElement(type, vecN);
-
         gpu::Size elementSize = elementType.getSize();
         auto nPositions = mesh->getNumVertices();
         auto vsize = nPositions * elementSize;
@@ -478,10 +491,9 @@ namespace {
         if (bufferView.getNumElements() < nPositions || diffTypes) {
             if (!bufferView._buffer || bufferView.getNumElements() == 0) {
                 qCInfo(bufferhelper_logging).nospace() << "ScriptableMesh -- adding missing mesh attribute '" << hint << "' for BufferView";
-                gpu::Byte *data = new gpu::Byte[vsize];
-                memset(data, 0, vsize);
-                auto buffer = new gpu::Buffer(vsize, (gpu::Byte*)data);
-                delete[] data;
+                std::unique_ptr<gpu::Byte[]> data{ new gpu::Byte[vsize] };
+                memset(data.get(), 0, vsize);
+                auto buffer = new gpu::Buffer(vsize, data.get());
                 bufferView = gpu::BufferView(buffer, elementType);
                 mesh->addAttribute(slot, bufferView);
             } else {
@@ -553,7 +565,6 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
     return attributeViews;
 }
 
-
 bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
     qCInfo(bufferhelper_logging) << "Recalculating normals" << !!mesh;
     if (!mesh) {
@@ -567,10 +578,8 @@ bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
     auto numPoints = indices.getNumElements();
     const auto TRIANGLE = 3;
     quint32 numFaces = (quint32)numPoints / TRIANGLE;
-    //QVector<Triangle> faces;
     QVector<glm::vec3> faceNormals;
     QMap<QString,QVector<quint32>> vertexToFaces;
-    //faces.resize(numFaces);
     faceNormals.resize(numFaces);
     auto numNormals = normals.getNumElements();
     qCInfo(bufferhelper_logging) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
@@ -590,7 +599,9 @@ bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
         };
         faceNormals[i] = face.getNormal();
         if (glm::isnan(faceNormals[i].x)) {
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
             qCInfo(bufferhelper_logging) << i << i0 << i1 << i2 << glmVecToVariant(face.v0) << glmVecToVariant(face.v1) << glmVecToVariant(face.v2);
+#endif
             break;
         }
         vertexToFaces[glm::to_string(face.v0).c_str()] << i;
@@ -615,10 +626,12 @@ bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
             normal = verts.get<glm::vec3>(j);
         }
         if (glm::isnan(normal.x)) {
+#ifdef DEBUG_BUFFERVIEW_SCRIPTING
             static int logged = 0;
             if (logged++ < 10) {
                 qCInfo(bufferhelper_logging) << "isnan(normal.x)" << j << glmVecToVariant(normal);
             }
+#endif
             break;
         }
         buffer_helpers::fromVariant(normals, j, glmVecToVariant(glm::normalize(normal)));
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h b/libraries/graphics/src/graphics/BufferViewHelpers.h
similarity index 91%
rename from libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
rename to libraries/graphics/src/graphics/BufferViewHelpers.h
index e0c2e1eee1..53fddfe581 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewHelpers.h
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.h
@@ -15,9 +15,6 @@ namespace gpu {
     class Element;
 }
 
-template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
-template <typename T> const T glmVecFromVariant(const QVariant& v);
-
 namespace graphics {
     class Mesh;
     using MeshPointer = std::shared_ptr<Mesh>;
@@ -27,6 +24,9 @@ class Extents;
 class AABox;
 
 struct buffer_helpers {
+    template <typename T> static QVariant glmVecToVariant(const T& v, bool asArray = false);
+    template <typename T> static const T glmVecFromVariant(const QVariant& v);
+
     static graphics::MeshPointer cloneMesh(graphics::MeshPointer mesh);
     static QMap<QString,int> ATTRIBUTES;
     static std::map<QString, gpu::BufferView> gatherBufferViews(graphics::MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index ffc93340b0..9dbef5c6fc 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -9,10 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QtCore/QLoggingCategory>
-namespace { QLoggingCategory wtf{ "tim.Model.cpp" }; }
-
-
 #include "Model.h"
 
 #include <QMetaType>
@@ -31,7 +27,7 @@ namespace { QLoggingCategory wtf{ "tim.Model.cpp" }; }
 #include <TBBHelpers.h>
 
 #include <graphics-scripting/Forward.h>
-#include <graphics-scripting/BufferViewHelpers.h>
+#include <graphics/BufferViewHelpers.h>
 #include <DualQuaternion.h>
 
 #include <glm/gtc/packing.hpp>
@@ -372,7 +368,7 @@ bool Model::updateGeometry() {
 #if FBX_PACK_NORMALS
                     glm::uint32 finalNormal;
                     glm::uint32 finalTangent;
-                    packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
+                    buffer_helpers::packNormalAndTangent(*normalIt, *tangentIt, finalNormal, finalTangent);
 #else
                     const auto finalNormal = *normalIt;
                     const auto finalTangent = *tangentIt;
@@ -569,25 +565,15 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
         auto newRenderGeometry = new MyGeometryMappingResource(
             _url, _renderGeometry, _newModel ? scriptable::make_qtowned<scriptable::ScriptableModelBase>(*_newModel) : nullptr
         );
-        //_needsUpdateTextures = true;
         _visualGeometryRequestFailed = false;
-        //invalidCalculatedMeshBoxes();
         deleteGeometry();
         _renderGeometry.reset(newRenderGeometry);
-        //onInvalidate();
-        //reset();
         _rig.destroyAnimGraph();
-        //assert(_rig.jointStatesEmpty());
         updateGeometry();
         calculateTriangleSets();
-        //computeMeshPartLocalBounds();
-        //_needsReload = false;
+        _needsReload = false;
         _needsFixupInScene = true;
-        //invalidCalculatedMeshBoxes();
         setRenderItemsNeedUpdate();
-        //_hasCalculatedTextureInfo = false;
-        //calculateTextureInfo();
-        //updateRenderItems();
     }
     return true;
 }
@@ -597,7 +583,7 @@ scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
     scriptable::ScriptableModelBase result;
 
     if (!isLoaded()) {
-        qCDebug(wtf) << "Model::getScriptableModel -- !isLoaded";
+        qCDebug(renderutils) << "Model::getScriptableModel -- !isLoaded";
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
index bc31abcb37..9b0e0bcf9a 100644
--- a/libraries/render-utils/src/Model_temporary_hack.cpp.h
+++ b/libraries/render-utils/src/Model_temporary_hack.cpp.h
@@ -1,15 +1,7 @@
-#include <graphics-scripting/BufferViewHelpers.h>
+#include <graphics/BufferViewHelpers.h>
 #include <graphics-scripting/GraphicsScriptingUtil.h>
 class MyGeometryMappingResource : public GeometryResource {
-//    Q_OBJECT
 public:
-    virtual void init(bool resetLoaded = true) override {
-        qCDebug(wtf) << "############################# Snarfing init()...";
-    }
-
-    virtual void deleter() override {
-        qCDebug(wtf) << "############################# Snarfing deleter()...";
-    }
     shared_ptr<FBXGeometry> fbxGeometry;
     MyGeometryMappingResource(const QUrl& url, Geometry::Pointer originalGeometry, std::shared_ptr<scriptable::ScriptableModelBase> newModel) : GeometryResource(url) {
         fbxGeometry = std::make_shared<FBXGeometry>();
@@ -77,6 +69,8 @@ public:
                 mesh.colors = buffer_helpers::toVector<glm::vec3>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::COLOR), "mesh.colors");
                 mesh.texCoords = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD0), "mesh.texCoords");
                 mesh.texCoords1 = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD1), "mesh.texCoords1");
+                mesh.createMeshTangents(true);
+                mesh.createBlendShapeTangents(false);
                 geometry.meshes << mesh;
                 // Copy mesh pointers
                 meshes->emplace_back(newMesh.getMeshPointer());//buffer_helpers::cloneMesh(ptr));
@@ -84,10 +78,9 @@ public:
                 const auto oldParts = mesh.parts;
                 mesh.parts.clear();
                 for (const FBXMeshPart& fbxPart : oldParts) {
-                    FBXMeshPart part; // copy;
+                    FBXMeshPart part; // new copy
                     part.materialID = fbxPart.materialID;
                     // Construct local parts
-                    ///qCDebug(wtf) << "GeometryMappingResource -- meshes part" << meshID << partID << part.materialID;
                     part.triangleIndices = buffer_helpers::toVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
                     mesh.parts << part;
                     auto p = std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]);
@@ -115,7 +108,6 @@ public:
         _animGraphOverrideUrl = originalGeometry ? originalGeometry->getAnimGraphOverrideUrl() : QUrl();
         _loaded = true;
         _fbxGeometry = fbxGeometry;
-        finishedLoading(true);
     };    
 };
 

From fe9b67344b854b31d537deea3b01452d0ce94a15 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 07:58:49 -0500
Subject: [PATCH 420/569] remove unnecessary UUID check

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1be22d5087..f344c94161 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -657,10 +657,8 @@ public:
         scriptable::ModelProviderPointer provider;
         auto avatarManager = DependencyManager::get<AvatarManager>();
         if (auto avatar = avatarManager->getAvatarBySessionID(sessionUUID)) {
-            if (avatar->getSessionUUID() == sessionUUID) {
-                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
-                provider->modelProviderType = NestableType::Avatar;
-            }
+            provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
+            provider->modelProviderType = NestableType::Avatar;
         }
         return provider;
     }

From 4fd3d9bf7bc4d1ef7f36a4de52b3e768864c44fe Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:18:38 -0500
Subject: [PATCH 421/569] cleanup; formalize data structures

---
 interface/src/ui/overlays/ModelOverlay.cpp            |  4 +++-
 interface/src/ui/overlays/Shape3DOverlay.cpp          |  5 +----
 .../avatars-renderer/src/avatars-renderer/Avatar.cpp  |  7 +------
 .../src/RenderableModelEntityItem.cpp                 |  4 +++-
 .../src/RenderablePolyVoxEntityItem.cpp               |  1 +
 .../src/RenderableShapeEntityItem.cpp                 | 11 ++---------
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index b6b79fd8c9..4ff5499a12 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -669,5 +669,7 @@ scriptable::ScriptableModelBase ModelOverlay::getScriptableModel(bool* ok) {
     if (!_model || !_model->isLoaded()) {
         return Base3DOverlay::getScriptableModel(ok);
     }
-    return _model->getScriptableModel(ok);
+    auto result = _model->getScriptableModel(ok);
+    result.objectID = getID();
+    return result;
 }
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 54423feef6..04557bcf5d 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -184,10 +184,7 @@ scriptable::ScriptableModelBase Shape3DOverlay::getScriptableModel(bool* ok) {
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto vertexColor = ColorUtils::toVec3(_color);
     scriptable::ScriptableModelBase result;
-    result.metadata = {
-        { "origin", "Shape3DOverlay::"+shapeStrings[_shape] },
-        { "overlayID", getID() },
-    };
+    result.objectID = getID();
     result.append(geometryCache->meshFromShape(_shape, vertexColor), {{ "shape", shapeStrings[_shape] }});
     if (ok) {
         *ok = true;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 5934ffed12..48f0c70dfa 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1801,12 +1801,7 @@ scriptable::ScriptableModelBase Avatar::getScriptableModel(bool* ok) {
     }
     scriptable::ScriptableModelBase result = _skeletonModel->getScriptableModel(ok);
     result.objectID = getSessionUUID();
-    result.mixin({
-        { "avatarID", getSessionUUID().toString() },
-        { "url", _skeletonModelURL.toString() },
-        { "origin", "Avatar/avatar::" + _displayName },
-        { "textures", _skeletonModel->getTextures() },
-    });
+    result.mixin({{ "textures", _skeletonModel->getTextures() }});
     // FIXME: for now access to attachment models are merged into the main avatar ScriptableModel set
     for (int i = 0; i < (int)_attachmentModels.size(); i++) {
         auto& model = _attachmentModels.at(i);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c93bcb2055..0e23ff3bff 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -968,7 +968,9 @@ scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScript
         return scriptable::ModelProvider::modelUnavailableError(ok);
     }
 
-    return _model->getScriptableModel(ok);
+    auto result = _model->getScriptableModel(ok);
+    result.objectID = getEntity()->getID();
+    return result;
 }
 
 bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index a547926343..37e03b2590 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1459,6 +1459,7 @@ scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel(
     bool success = false;
     glm::mat4 transform = voxelToLocalMatrix();
     scriptable::ScriptableModelBase result;
+    result.objectID = getThisPointer()->getID();
     withReadLock([&] {
         gpu::BufferView::Index numVertices = (gpu::BufferView::Index)_mesh->getNumVertices();
         if (!_meshReady) {
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 0ff8ac17f0..2e65eba5e5 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -166,11 +166,7 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
 
 scriptable::ScriptableModelBase ShapeEntityRenderer::getScriptableModel(bool* ok)  {
     scriptable::ScriptableModelBase result;
-    result.metadata = {
-        { "entityID", getEntity()->getID().toString() },
-        { "shape", entity::stringFromShape(_shape) },
-        { "userData", getEntity()->getUserData() },
-    };
+    result.objectID = getEntity()->getID();
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto geometryShape = geometryCache->getShapeForEntityShape(_shape);
     glm::vec3 vertexColor;
@@ -179,10 +175,7 @@ scriptable::ScriptableModelBase ShapeEntityRenderer::getScriptableModel(bool* ok
     }
     auto success = false;
     if (auto mesh = geometryCache->meshFromShape(geometryShape, vertexColor)) {
-        scriptable::ScriptableMeshBase base{ mesh, {
-            { "shape", entity::stringFromShape(_shape) },
-        }};
-        result.append(base);
+        result.append({ mesh, {{ "shape", entity::stringFromShape(_shape) }}});
         success = true;
     }
     if (ok) {

From e3c269d5820207e6521e8bf2ad64b2529205b3a1 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:22:13 -0500
Subject: [PATCH 422/569] remove debug string

---
 libraries/fbx/src/OBJWriter.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index a53a3c7c5d..ffc34573d4 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -156,16 +156,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
             // graphics::Mesh::TRIANGLES / graphics::Mesh::QUADS
             // TODO -- handle other formats
             uint32_t len = part._startIndex + part._numIndices;
-            auto stringFromTopology = [&](graphics::Mesh::Topology topo) -> QString {
-                return topo == graphics::Mesh::Topology::QUADS ? "QUADS" :
-                topo == graphics::Mesh::Topology::QUAD_STRIP ? "QUAD_STRIP" :
-                topo == graphics::Mesh::Topology::TRIANGLES ? "TRIANGLES" :
-                topo == graphics::Mesh::Topology::TRIANGLE_STRIP ? "TRIANGLE_STRIP" :
-                topo == graphics::Mesh::Topology::QUAD_STRIP ? "QUAD_STRIP" :
-                QString("topo:%1").arg((int)topo);
-            };
-
-            qCDebug(modelformat) << "OBJWriter -- part" << partIndex << "topo" << stringFromTopology(part._topology) << "index elements" << (shorts ? "uint16_t" : "uint32_t");
+            qCDebug(modelformat) << "OBJWriter -- part" << partIndex << "topo" << part._topology << "index elements" << (shorts ? "uint16_t" : "uint32_t");
             if (part._topology == graphics::Mesh::TRIANGLES && len % 3 != 0) {
                 qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 3" << len;
             }

From d52dce8e092847024e7cdece7091d0568fd9fa67 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:24:56 -0500
Subject: [PATCH 423/569] restore code for debugging

---
 libraries/fbx/src/FBXReader.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 837d7fe80e..278a68f312 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1979,7 +1979,22 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             }
         }
     }
-
+    {
+        int i = 0;
+        for (const auto& mesh : geometry.meshes) {
+            auto name = geometry.getModelNameOfMesh(i++);
+            if (!name.isEmpty()) {
+                if (mesh._mesh) {
+                    mesh._mesh->modelName = name.toStdString();
+                    if (!mesh._mesh->displayName.size()) {
+                        mesh._mesh->displayName = mesh._mesh->displayName + "#" + name;
+                    }
+                } else {
+                    qDebug() << "modelName but no mesh._mesh" << name;
+                }
+            }
+        }
+    }
     return geometryPtr;
 }
 

From ec4f9fdc11bc2584f289276b6dc577e2559699f5 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:31:05 -0500
Subject: [PATCH 424/569] fix displayName

---
 .../entities-renderer/src/RenderableModelEntityItem.cpp   | 8 ++++----
 libraries/fbx/src/FBXReader.cpp                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 0e23ff3bff..6eed62522f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1300,7 +1300,8 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
                 auto entityRenderer = static_cast<EntityRenderer*>(&data);
                 entityRenderer->clearSubRenderItemIDs();
             });
-            emit DependencyManager::get<scriptable::ModelProviderFactory>()->modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
+            emit DependencyManager::get<scriptable::ModelProviderFactory>()->
+                modelRemovedFromScene(entity->getEntityItemID(), NestableType::Entity, _model);
         }
         return;
     }
@@ -1311,10 +1312,9 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
         connect(model.get(), &Model::setURLFinished, this, [&](bool didVisualGeometryRequestSucceed) {
             setKey(didVisualGeometryRequestSucceed);
             emit requestRenderUpdate();
-            auto factory = DependencyManager::get<scriptable::ModelProviderFactory>().data();
-            qDebug() << "leopoly didVisualGeometryRequestSucceed" << didVisualGeometryRequestSucceed << QThread::currentThread() << _model.get();
             if(didVisualGeometryRequestSucceed) {
-                emit factory->modelAddedToScene(entity->getEntityItemID(), NestableType::Entity, _model);
+                emit DependencyManager::get<scriptable::ModelProviderFactory>()->
+                    modelAddedToScene(entity->getEntityItemID(), NestableType::Entity, _model);
             }
         });
         connect(model.get(), &Model::requestRenderUpdate, this, &ModelEntityRenderer::requestRenderUpdate);
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 278a68f312..1e59646795 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1987,7 +1987,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 if (mesh._mesh) {
                     mesh._mesh->modelName = name.toStdString();
                     if (!mesh._mesh->displayName.size()) {
-                        mesh._mesh->displayName = mesh._mesh->displayName + "#" + name;
+                        mesh._mesh->displayName = QString("#%1").arg(name).toStdString();
                     }
                 } else {
                     qDebug() << "modelName but no mesh._mesh" << name;

From b0f444e179824dd6c91a1da790dc923d098d4e32 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:36:37 -0500
Subject: [PATCH 425/569] remove dead code

---
 .../src/graphics-scripting/ScriptableModel.cpp  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 05ff043820..5d0d459446 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -131,20 +131,3 @@ quint32 scriptable::ScriptableModel::mapAttributeValues(QScriptValue callback) {
     }
     return result;
 }
-
-/*namespace {
-    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, scriptable::ScriptableModelPointer const &in) {
-        return qObjectToScriptValue(engine, in);
-    }
-    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
-        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableModel>(value);
-    }
-}
-
-namespace scriptable {
-    bool registerMetaTypes(QScriptEngine* engine) {
-        qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
-        return true;
-    }
-}
-*/

From 4d43e543466bdb2138f87042e55d889588359bc6 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:41:15 -0500
Subject: [PATCH 426/569] use shared buffer_helpers::clone

---
 libraries/render-utils/src/GeometryCache.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 525ef51a57..7455da13b6 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -32,6 +32,7 @@
 #include "gpu/StandardShaderLib.h"
 
 #include "graphics/TextureMap.h"
+#include "graphics/BufferViewHelpers.h"
 #include "render/Args.h"
 
 #include "standardTransformPNTC_vert.h"
@@ -2409,26 +2410,15 @@ graphics::MeshPointer GeometryCache::meshFromShape(Shape geometryShape, glm::vec
 
     qDebug() << "GeometryCache::getMeshProxyListFromShape" << shapeData << stringFromShape(geometryShape);
 
-    auto cloneBufferView = [](const gpu::BufferView& in) -> gpu::BufferView {
-        auto buffer = std::make_shared<gpu::Buffer>(*in._buffer); // copy
-        // FIXME: gpu::BufferView seems to have a bug where constructing a new instance from an existing one
-        //   results in over-multiplied buffer/view sizes -- hence constructing manually here from each input prop
-        auto out = gpu::BufferView(buffer, in._offset, in._size, in._stride, in._element);
-        Q_ASSERT(out.getNumElements() == in.getNumElements());
-        Q_ASSERT(out._size == in._size);
-        Q_ASSERT(out._buffer->getSize() == in._buffer->getSize());
-        return out;
-    };
-    
-    auto positionsBufferView = cloneBufferView(shapeData->_positionView);
-    auto normalsBufferView = cloneBufferView(shapeData->_normalView);
-    auto indexBufferView = cloneBufferView(shapeData->_indicesView);
+    auto positionsBufferView = buffer_helpers::clone(shapeData->_positionView);
+    auto normalsBufferView = buffer_helpers::clone(shapeData->_normalView);
+    auto indexBufferView = buffer_helpers::clone(shapeData->_indicesView);
 
     gpu::BufferView::Size numVertices = positionsBufferView.getNumElements();
     Q_ASSERT(numVertices == normalsBufferView.getNumElements());
 
     // apply input color across all vertices
-    auto colorsBufferView = cloneBufferView(shapeData->_normalView);
+    auto colorsBufferView = buffer_helpers::clone(shapeData->_normalView);
     for (gpu::BufferView::Size i = 0; i < numVertices; i++) {
         colorsBufferView.edit<glm::vec3>((gpu::BufferView::Index)i) = color;
     }

From 010c714abcd9f86464c07e52501048e856831c35 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 08:51:54 -0500
Subject: [PATCH 427/569] restore original Entities.getMeshes

---
 libraries/render-utils/src/Model.cpp | 38 ++++++++++++++++++++++++++++
 libraries/render-utils/src/Model.h   |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 9dbef5c6fc..783659a6a1 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -24,6 +24,7 @@
 #include <PerfStat.h>
 #include <ViewFrustum.h>
 #include <GLMHelpers.h>
+#include <model-networking/SimpleMeshProxy.h>
 #include <TBBHelpers.h>
 
 #include <graphics-scripting/Forward.h>
@@ -550,6 +551,43 @@ bool Model::convexHullContains(glm::vec3 point) {
     return false;
 }
 
+// TODO: deprecate and remove
+MeshProxyList Model::getMeshes() const {
+    MeshProxyList result;
+    const Geometry::Pointer& renderGeometry = getGeometry();
+    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
+
+    if (!isLoaded()) {
+        return result;
+    }
+
+    Transform offset;
+    offset.setScale(_scale);
+    offset.postTranslate(_offset);
+    glm::mat4 offsetMat = offset.getMatrix();
+
+    for (std::shared_ptr<const graphics::Mesh> mesh : meshes) {
+        if (!mesh) {
+            continue;
+        }
+
+        MeshProxy* meshProxy = new SimpleMeshProxy(
+            mesh->map(
+                [=](glm::vec3 position) {
+                    return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
+                },
+                [=](glm::vec3 color) { return color; },
+                [=](glm::vec3 normal) {
+                    return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
+                },
+                [&](uint32_t index) { return index; }));
+        meshProxy->setObjectName(mesh->displayName.c_str());
+        result << meshProxy;
+    }
+
+    return result;
+}
+
 // FIXME: temporary workaround that updates the whole FBXGeometry (to keep findRayIntersection in sync)
 #include "Model_temporary_hack.cpp.h"
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 3a86b3b7e4..5cbdb2d300 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -322,6 +322,8 @@ public:
 
     void scaleToFit();
 
+    Q_INVOKABLE MeshProxyList getMeshes() const;
+
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
 

From dd90c8c515561ec4c480d12975a84ae722ee2d15 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 09:36:17 -0500
Subject: [PATCH 428/569] fix ubuntu compile warnings

---
 interface/src/Application.cpp                 |  2 +-
 .../src/graphics-scripting/Forward.h          | 14 +++-------
 .../GraphicsScriptingInterface.cpp            |  2 +-
 .../src/graphics-scripting/ScriptableMesh.cpp | 13 ++--------
 .../src/graphics-scripting/ScriptableMesh.h   | 18 +++++--------
 .../graphics-scripting/ScriptableModel.cpp    | 10 +++++++
 .../src/graphics/BufferViewHelpers.cpp        | 26 +++++++++++++------
 7 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f344c94161..69be01fc0c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -607,7 +607,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
 
 class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
 public:
-    virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) {
+    virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) override {
         QString error;
 
         scriptable::ModelProviderPointer provider;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 95fcf51921..7b2126cf8f 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -42,7 +42,7 @@ namespace scriptable {
         ScriptableMeshBase(WeakModelProviderPointer provider, ScriptableModelBasePointer model, WeakMeshPointer mesh, const QVariantMap& metadata);
         ScriptableMeshBase(WeakMeshPointer mesh = WeakMeshPointer());
         ScriptableMeshBase(MeshPointer mesh, const QVariantMap& metadata);
-        ScriptableMeshBase(const ScriptableMeshBase& other) { *this = other; }
+        ScriptableMeshBase(const ScriptableMeshBase& other) : QObject() { *this = other; }
         ScriptableMeshBase& operator=(const ScriptableMeshBase& view);
         virtual ~ScriptableMeshBase();
         Q_INVOKABLE const scriptable::MeshPointer getMeshPointer() const { return mesh.lock(); }
@@ -60,16 +60,8 @@ namespace scriptable {
         QVector<scriptable::ScriptableMeshBase> meshes;
 
         ScriptableModelBase(QObject* parent = nullptr) : QObject(parent) {}
-        ScriptableModelBase(const ScriptableModelBase& other) { *this = other; }
-        ScriptableModelBase& operator=(const ScriptableModelBase& other) {
-            provider = other.provider;
-            objectID = other.objectID;
-            metadata = other.metadata;
-            for (auto& mesh : other.meshes) {
-                append(mesh);
-            }
-            return *this;
-        }
+        ScriptableModelBase(const ScriptableModelBase& other) : QObject() { *this = other; }
+        ScriptableModelBase& operator=(const ScriptableModelBase& other);
         virtual ~ScriptableModelBase();
 
         void mixin(const QVariantMap& other);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 58fcd7a064..28d5d0edfc 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -27,7 +27,7 @@
 
 #include "GraphicsScriptingInterface.moc"
 
-GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent) {
+GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent), QScriptable() {
     if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
         this->registerMetaTypes(scriptEngine);
     }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 28e57692f6..3678c54b7b 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -23,12 +23,12 @@
 #include "ScriptableMesh.moc"
 
 scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
-    : parentMesh(parentMesh), partIndex(partIndex)  {
+    : QObject(), parentMesh(parentMesh), partIndex(partIndex)  {
     setObjectName(QString("%1.part[%2]").arg(parentMesh ? parentMesh->objectName() : "").arg(partIndex));
 }
 
 scriptable::ScriptableMesh::ScriptableMesh(const ScriptableMeshBase& other)
-    : ScriptableMeshBase(other) {
+    : ScriptableMeshBase(other), QScriptable() {
     auto mesh = getMeshPointer();
     QString name = mesh ? QString::fromStdString(mesh->modelName) : "";
     if (name.isEmpty()) {
@@ -60,15 +60,6 @@ quint32 scriptable::ScriptableMesh::getNumVertices() const {
     return 0;
 }
 
-// glm::vec3 ScriptableMesh::getPos3(quint32 index) const {
-//     if (auto mesh = getMeshPointer()) {
-//         if (index < getNumVertices()) {
-//             return mesh->getPos3(index);
-//         }
-//     }
-//     return glm::vec3(NAN);
-// }
-
 QVector<quint32> scriptable::ScriptableMesh::findNearbyIndices(const glm::vec3& origin, float epsilon) const {
     QVector<quint32> result;
     if (auto mesh = getMeshPointer()) {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 2b9399d6ef..2cba33edde 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -33,14 +33,11 @@ namespace scriptable {
         bool hasValidOwnedMesh() const { return (bool)getOwnedMeshPointer(); }
 
         operator const ScriptableMeshBase*() const { return (qobject_cast<const scriptable::ScriptableMeshBase*>(this)); }
-        ScriptableMesh(scriptable::MeshPointer mesh) : ScriptableMeshBase(mesh) { ownedMesh = mesh; }
+        ScriptableMesh(scriptable::MeshPointer mesh) : ScriptableMeshBase(mesh), QScriptable() { ownedMesh = mesh; }
         ScriptableMesh(WeakModelProviderPointer provider, ScriptableModelBasePointer model, MeshPointer mesh, const QVariantMap& metadata)
-            : ScriptableMeshBase(provider, model, mesh, metadata) { ownedMesh = mesh; }
-        //ScriptableMesh& operator=(const ScriptableMesh& other)  { model=other.model; mesh=other.mesh; metadata=other.metadata; return *this; };
-        //ScriptableMesh() : QObject(), model(nullptr) {}
-        //ScriptableMesh(const ScriptableMesh& other) : QObject(), model(other.model), mesh(other.mesh), metadata(other.metadata) {}
+            : ScriptableMeshBase(provider, model, mesh, metadata), QScriptable() { ownedMesh = mesh; }
         ScriptableMesh(const ScriptableMeshBase& other);
-        ScriptableMesh(const ScriptableMesh& other) : ScriptableMeshBase(other) {};
+        ScriptableMesh(const ScriptableMesh& other) : ScriptableMeshBase(other), QScriptable() {};
         virtual ~ScriptableMesh();
 
         Q_INVOKABLE const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
@@ -91,12 +88,9 @@ namespace scriptable {
 
         Q_PROPERTY(QVariantMap metadata MEMBER metadata)
 
-        //Q_PROPERTY(scriptable::ScriptableMeshPointer parentMesh MEMBER parentMesh CONSTANT HIDE)
-
         ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
         ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
-        ScriptableMeshPart(const ScriptableMeshPart& other) : parentMesh(other.parentMesh), partIndex(other.partIndex) {}
-        // ~ScriptableMeshPart() { qDebug() << "~ScriptableMeshPart" << this; }
+        ScriptableMeshPart(const ScriptableMeshPart& other) : QObject(), QScriptable(), parentMesh(other.parentMesh), partIndex(other.partIndex) {}
 
     public slots:
         scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
@@ -148,8 +142,8 @@ namespace scriptable {
     class GraphicsScriptingInterface : public QObject, QScriptable {
         Q_OBJECT
     public:
-        GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent) {}
-        GraphicsScriptingInterface(const GraphicsScriptingInterface& other) {}
+        GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent), QScriptable() {}
+        GraphicsScriptingInterface(const GraphicsScriptingInterface& other) : QObject(), QScriptable() {}
     public slots:
         ScriptableMeshPartPointer exportMeshPart(ScriptableMeshPointer mesh, int part=0) {
             return ScriptableMeshPartPointer(new ScriptableMeshPart(mesh, part));
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 5d0d459446..cc882aa7bb 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -27,6 +27,16 @@ void scriptable::ScriptableModelBase::mixin(const QVariantMap& modelMetaData) {
     }
 }
 
+scriptable::ScriptableModelBase& scriptable::ScriptableModelBase::operator=(const scriptable::ScriptableModelBase& other) {
+    provider = other.provider;
+    objectID = other.objectID;
+    metadata = other.metadata;
+    for (auto& mesh : other.meshes) {
+        append(mesh);
+    }
+    return *this;
+}
+
 scriptable::ScriptableModelBase::~ScriptableModelBase() {
 #ifdef SCRIPTABLE_MESH_DEBUG
     qCDebug(graphics_scripting) << "~ScriptableModelBase" << this;
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index ea511d82f4..a15ce1b998 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -281,13 +281,22 @@ gpu::BufferView buffer_helpers::fromVector(const QVector<T>& elements, const gpu
     auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
     return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
+
+namespace {
+    template <typename T>
+    gpu::BufferView _fromVector(const QVector<T>& elements, const gpu::Element& elementType) {
+        auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
+        return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
+    }
+}
+
 template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(
     const QVector<unsigned int>& elements, const gpu::Element& elementType
-) { return fromVector(elements, elementType); }
+) { return _fromVector(elements, elementType); }
 
 template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(
     const QVector<glm::vec3>& elements, const gpu::Element& elementType
-) { return fromVector(elements, elementType); }
+) { return _fromVector(elements, elementType); }
 
 template <typename T> struct GpuVec4ToGlm;
 template <typename T> struct GpuScalarToGlm;
@@ -537,14 +546,14 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
         auto slot = a.second;
         auto view = getBufferView(mesh, slot);
         auto beforeCount = view.getNumElements();
+#if DEV_BUILD
         auto beforeTotal = view._size;
+#endif
         if (expandToMatchPositions.contains(name)) {
             expandAttributeToMatchPositions(mesh, slot);
         }
         if (beforeCount > 0) {
             auto element = view._element;
-            auto vecN = element.getScalarCount();
-            //auto type = element.getType();
             QString typeName = QString("%1").arg(element.getType());
 #ifdef DEBUG_BUFFERVIEW_SCRIPTING
             typeName = DebugNames::stringFrom(element.getType());
@@ -553,6 +562,7 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
             attributeViews[name] = getBufferView(mesh, slot);
 
 #if DEV_BUILD
+            const auto vecN = element.getScalarCount();
             auto afterTotal = attributeViews[name]._size;
             auto afterCount = attributeViews[name].getNumElements();
             if (beforeTotal != afterTotal || beforeCount != afterCount) {
@@ -604,14 +614,14 @@ bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
 #endif
             break;
         }
-        vertexToFaces[glm::to_string(face.v0).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v1).c_str()] << i;
-        vertexToFaces[glm::to_string(face.v2).c_str()] << i;
+        vertexToFaces[glm::to_string(glm::dvec3(face.v0)).c_str()] << i;
+        vertexToFaces[glm::to_string(glm::dvec3(face.v1)).c_str()] << i;
+        vertexToFaces[glm::to_string(glm::dvec3(face.v2)).c_str()] << i;
     }
     for (quint32 j = 0; j < numNormals; j++) {
         //auto v = verts.get<glm::vec3>(j);
         glm::vec3 normal { 0.0f, 0.0f, 0.0f };
-        QString key { glm::to_string(verts.get<glm::vec3>(j)).c_str() };
+        QString key { glm::to_string(glm::dvec3(verts.get<glm::vec3>(j))).c_str() };
         const auto& faces = vertexToFaces.value(key);
         if (faces.size()) {
             for (const auto i : faces) {

From bf4fd867a37dbf5892fb42484e303fb006f66327 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 22 Feb 2018 09:29:18 -0800
Subject: [PATCH 429/569] Add rejection for invalid manual backup names

---
 domain-server/src/DomainContentBackupManager.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 9c72d64eea..e8deb79814 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -44,6 +44,7 @@ static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
 static const QString AUTOMATIC_BACKUP_PREFIX { "autobackup-" };
 static const QString MANUAL_BACKUP_PREFIX { "backup-" };
+static const QString MANUAL_BACKUP_NAME_RE { "[a-zA-Z0-9\\-_ ]+" };
 
 void DomainContentBackupManager::addBackupHandler(BackupHandlerPointer handler) {
     _backupHandlers.push_back(std::move(handler));
@@ -561,9 +562,17 @@ void DomainContentBackupManager::createManualBackup(MiniPromise::Promise promise
         return;
     }
 
+
+    QRegExp nameRE { MANUAL_BACKUP_NAME_RE };
     bool success;
-    QString path;
-    std::tie(success, path) = createBackup(MANUAL_BACKUP_PREFIX, name);
+
+    if (!nameRE.exactMatch(name)) {
+        qDebug() << "Cannot create manual backup with invalid name: " << name;
+        success = false;
+    } else {
+        QString path;
+        std::tie(success, path) = createBackup(MANUAL_BACKUP_PREFIX, name);
+    }
 
     promise->resolve({
         { "success", success }

From 017d10de3d43a63405fb461342146216916b7faf Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 22 Feb 2018 09:29:59 -0800
Subject: [PATCH 430/569] Fix DomainContentBackupManager.* headers

---
 domain-server/src/DomainContentBackupManager.cpp | 7 ++++---
 domain-server/src/DomainContentBackupManager.h   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index e8deb79814..389ed31e47 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -1,9 +1,10 @@
 //
 //  DomainContentBackupManager.cpp
-//  libraries/octree/src
+//  libraries/domain-server/src
 //
-//  Created by Brad Hefta-Gaub on 8/21/13.
-//  Copyright 2013 High Fidelity, Inc.
+//  Created by Ryan Huffman on 1/01/18.
+//  Adapted from OctreePersistThread
+//  Copyright 2018 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
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 06a8d0394f..1455892c52 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -1,9 +1,10 @@
 //
 //  DomainContentBackupManager.h
-//  libraries/octree/src
+//  libraries/domain-server/src
 //
-//  Created by Brad Hefta-Gaub on 8/21/13.
-//  Copyright 2013 High Fidelity, Inc.
+//  Created by Ryan Huffman on 1/01/18.
+//  Adapted from OctreePersistThread
+//  Copyright 2018 High Fidelity, Inc.
 //
 //
 //

From 6dffffbbc0a53942c16c8b23a2df973f7d944bfd Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 22 Feb 2018 09:30:47 -0800
Subject: [PATCH 431/569] Update clang-format ctor initializer list format

---
 .clang-format | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 507b1eb232..505366dd9c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,8 +22,8 @@ BraceWrapping:
 
 AccessModifierOffset: -4
 AllowShortFunctionsOnASingleLine: InlineOnly
-BreakConstructorInitializers: BeforeColon
-BreakConstructorInitializersBeforeComma: true
+BreakConstructorInitializers: AfterColon
+BreakConstructorInitializersBeforeComma: false
 IndentCaseLabels: true
 ReflowComments: false
 Cpp11BracedListStyle: false

From a843a534277cdc3d2885bb5531d93a8e93bb3143 Mon Sep 17 00:00:00 2001
From: Nissim Hadar <nissim.hadar@gmail.com>
Date: Thu, 22 Feb 2018 10:17:20 -0800
Subject: [PATCH 432/569] Improved JSDoc comments.

---
 interface/src/scripting/WindowScriptingInterface.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 196863e362..9d773b8a2f 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -325,6 +325,7 @@ public slots:
      * {@link Window.stillSnapshotTaken|stillSnapshotTaken} is emitted; when a still image plus moving images are captured, 
      * {@link Window.processingGifStarted|processingGifStarted} and {@link Window.processingGifCompleted|processingGifCompleted}
      * are emitted. The path to store the snapshots and the length of the animated GIF to capture are specified in Settings >
+     * NOTE:  to provide a non-default value - all previous parameters must be provided.
      * General > Snapshots.
      * @function Window.takeSnapshot
      * @param {boolean} notify=true - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
@@ -334,8 +335,10 @@ public slots:
      * @param {number} aspectRatio=0 - The width/height ratio of the snapshot required. If the value is <code>0</code> the
      *     full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
      *     dimensions is adjusted in order to match the aspect ratio.
-     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ",jpg".
-	 *      otherwise, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
+     * @param {string} filename="" - If this parameter is not given, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
+     *     If this parameter is <code>""</code> then the image will be saved as ".jpg".
+     *     Otherwise, the image will be saved to this filename, with an appended ".jpg".
+     *
      * @example <caption>Using the snapshot function and signals.</caption>
      * function onStillSnapshotTaken(path, notify) {
      *     print("Still snapshot taken: " + path);
@@ -364,8 +367,11 @@ public slots:
 
     /**jsdoc
      * Takes a still snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
+     * NOTE:  to provide a non-default value - all previous parameters must be provided.
      * @function Window.takeSecondaryCameraSnapshot
-     * @param {string} filename="" - If this value is not given, or is <code>""</code> then the image will be saved to this filename, with an appended ".jpg".
+     * @param {string} filename="" - If this parameter is not given, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
+     *     If this parameter is <code>""</code> then the image will be saved as ".jpg".
+     *     Otherwise, the image will be saved to this filename, with an appended ".jpg".
      *
      * var filename = QString();
      */

From 3d4e6de6abb4d638d844478f68e4adba3b686cbf Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 10:49:11 -0800
Subject: [PATCH 433/569] Quick bugfix

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

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 27acb121ca..ab47bb28ad 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -722,7 +722,7 @@ Rectangle {
         }
         RalewaySemiBold {
             id: noPermissionText;
-            visible: !root.canRezCertifiedItems && root.itemType !== "wearable";
+            visible: !root.canRezCertifiedItems && root.itemType === "entity";
             text: '<font color="' + hifi.colors.redAccent + '"><a href="#">You do not have Certified Rez permissions in this domain.</a></font>'
             // Text size
             size: 16;

From 99c419c315cd3230e198791f49118e465fa5f603 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 11:03:31 -0800
Subject: [PATCH 434/569] disable click on restore during restore or for
 corrupted

---
 domain-server/resources/web/content/js/content.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index fc6d2ca205..5d3124ead0 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -271,10 +271,15 @@ $(document).ready(function(){
   }
 
   // handle click in table to restore a given content backup
-  $('body').on('click', '.' + BACKUP_RESTORE_LINK_CLASS, function(e){
+  $('body').on('click', '.' + BACKUP_RESTORE_LINK_CLASS, function(e) {
     // stop the default behaviour
     e.preventDefault();
 
+    // if this is a disabled link, don't proceed with the restore
+    if ($(this).parent().hasClass('disabled')) {
+      return false;
+    }
+
     // grab the name of this backup so we can show it in alerts
     var backupName = $(this).closest('tr').attr('data-backup-name');
 

From 7c5ed86e3e76b0b79bcf52fd8766d15c8b83e298 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 11:41:48 -0800
Subject: [PATCH 435/569] refuse to post manual content archive with invalid
 name

---
 domain-server/resources/web/content/js/content.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index fc6d2ca205..fff7c07bbf 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -386,6 +386,12 @@ $(document).ready(function(){
         return false;
       }
 
+      var MANUAL_ARCHIVE_NAME_REGEX = /^[a-zA-Z0-9\\-_ ]+$/;
+      if (!MANUAL_ARCHIVE_NAME_REGEX.test(inputValue)) {
+        swal.showInputError("Valid characters include A-z, 0-9, ' ', '_', and '-'.");
+        return false;
+      }
+
       // post the provided archive name to ask the server to kick off a manual backup
       $.ajax({
         type: 'POST',

From 269d8312e2e82a0976935dd319f2429eb0ac6dda Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Thu, 22 Feb 2018 13:03:16 -0800
Subject: [PATCH 436/569] wrap selection print in wantDebug to avoid spamming
 logs in HMD

---
 scripts/system/edit.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 2853355c5a..0e1718ac45 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -814,13 +814,16 @@ function findClickedEntity(event) {
 // Handles selections on overlays while in edit mode by querying entities from
 // entityIconOverlayManager.
 function handleOverlaySelectionToolUpdates(channel, message, sender) {
+    var wantDebug = false;
     if (sender !== MyAvatar.sessionUUID || channel !== 'entityToolUpdates')
         return;
 
     var data = JSON.parse(message);
 
     if (data.method === "selectOverlay") {
-        print("setting selection to overlay " + data.overlayID);
+        if (wantDebug) {
+            print("setting selection to overlay " + data.overlayID);
+        }
         var entity = entityIconOverlayManager.findEntity(data.overlayID);
 
         if (entity !== null) {

From c15cf33ca1f9a5ec776838dd1c19c976a57319c0 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Fri, 23 Feb 2018 00:36:00 +0300
Subject: [PATCH 437/569] 12518 - Help icon in toolbar does not highlight when
 help window is open

---
 scripts/system/help.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/system/help.js b/scripts/system/help.js
index 494b0a2cdb..cae5a11d79 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -15,6 +15,7 @@
 (function() { // BEGIN LOCAL_SCOPE
     
     var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+    var HELP_URL = Script.resourcesPath() + "html/tabletHelp.html";
     var buttonName = "HELP";
     var onHelpScreen = false;
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -40,7 +41,7 @@
     }
 
     function onScreenChanged(type, url) {
-        onHelpScreen = type === "Web" && url.startsWith("../../../html/tabletHelp.html");
+        onHelpScreen = type === "Web" && url.startsWith(HELP_URL);
         button.editProperties({ isActive: onHelpScreen });
     }
 

From 4d2d7fa51f5d8cd37d43ff5f245cf03cb41af110 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 13:56:46 -0800
Subject: [PATCH 438/569] lots of fun initial progress!

---
 interface/resources/fonts/hifi-glyphs.ttf     | Bin 32536 -> 32544 bytes
 .../qml/hifi/commerce/checkout/Checkout.qml   |   8 +-
 .../hifi/commerce/purchases/PurchasedItem.qml |   3 +
 interface/src/commerce/QmlCommerce.cpp        |  99 ++++++++++++++++++
 interface/src/commerce/QmlCommerce.h          |   8 +-
 scripts/system/marketplaces/marketplaces.js   |  10 +-
 6 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 8db0377f88864810e7f893132449ad8e258e68cd..7f7393da1811f3933a2d9c0deabfdbc245a25b47 100644
GIT binary patch
delta 216
zcmbR7k8#02Mhyl=1_lORh6V;^h5$FW5Z}t>Df<{0>RA{V7-ZaCT-_M<F|aW()IFJ~
zp)Y%ffq{V|J*P5FG;8)81_rhQ28M!;jMT&wz7D3>6H9y?UR&-AV_+!z!N9<{xgfu|
zq-^uwW(J0eH4F@F`e2I~85p9{zJ$f|+k9o<W?}$=Yg-<ChtZoD50!FGQsm~~<Thhr
z*?hXpl9Abn!Dupjg&vcU(Ps0CscZs#hDH{;nR&$}i8(pC28Iliuhdy`BbfmJ`r<)J

delta 208
zcmZ4Rk8#F7Mhyl=1_lORh6V;^h5$FW5Z}tyrfCceb$=Kb7-ZaCT-_M<F|aW()ZLk=
zp)Y%dfq{V|J*P5FG<)eB1_rhQ28M!;jMT&wzBGly6H9y?URi7nV_+!z!N9<{xgfu|
zL^NoYHv>b(8U_Y7h((MH4DuVzTjTj{zA|t#F@V6e#qS@(=uM1=N;&5$a&vHUo3S!)
qK3!(X$ZW`9FqyqVkIB$rvw6i-HV*d8yyB9?oSeyb>MXgD^a23O9zII|

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index ab47bb28ad..98f26887ae 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -146,7 +146,8 @@ Rectangle {
     }
 
     onItemTypeChanged: {
-        if (root.itemType === "entity" || root.itemType === "wearable" || root.itemType === "contentSet" || root.itemType === "avatar") {
+        if (root.itemType === "entity" || root.itemType === "wearable" ||
+            root.itemType === "contentSet" || root.itemType === "avatar" || root.itemType === "app") {
             root.isCertified = true;
         } else {
             root.isCertified = false;
@@ -679,7 +680,7 @@ Rectangle {
             id: rezNowButton;
             enabled: (root.itemType === "entity" && root.canRezCertifiedItems) ||
                 (root.itemType === "contentSet" && Entities.canReplaceContent()) ||
-                root.itemType === "wearable" || root.itemType === "avatar";
+                root.itemType === "wearable" || root.itemType === "avatar" || root.itemType === "app";
             buttonGlyph: (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)];
             color: hifi.buttons.red;
             colorScheme: hifi.colorSchemes.light;
@@ -712,6 +713,9 @@ Rectangle {
                     lightboxPopup.button2text = "CONFIRM";
                     lightboxPopup.button2method = "MyAvatar.useFullAvatarURL('" + root.itemHref + "'); root.visible = false;";
                     lightboxPopup.visible = true;
+                } else if (root.itemType === "app") {
+                    // "Run" button is separate.
+                    Commerce.installApp(root.itemHref);
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     rezzedNotifContainer.visible = true;
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index cc2bcd69aa..c96fc15f5c 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -506,6 +506,9 @@ Item {
                     sendToPurchases({method: 'showReplaceContentLightbox', itemHref: root.itemHref});
                 } else if (root.itemType === "avatar") {
                     sendToPurchases({method: 'showChangeAvatarLightbox', itemName: root.itemName, itemHref: root.itemHref});
+                } else if (root.itemType === "app") {
+                    // "Run" and "Uninstall" buttons are separate.
+                    Commerce.installApp(root.itemHref);
                 } else {
                     sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     root.showConfirmation = true;
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 36c1e422c5..0b583e6153 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -10,6 +10,7 @@
 //
 
 #include "QmlCommerce.h"
+#include "CommerceLogging.h"
 #include "Application.h"
 #include "DependencyManager.h"
 #include "Ledger.h"
@@ -17,6 +18,7 @@
 #include <AccountManager.h>
 #include <Application.h>
 #include <UserActivityLogger.h>
+#include <ScriptEngines.h>
 
 QmlCommerce::QmlCommerce() {
     auto ledger = DependencyManager::get<Ledger>();
@@ -183,3 +185,100 @@ void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
     auto ledger = DependencyManager::get<Ledger>();
     ledger->alreadyOwned(marketplaceId);
 }
+
+static QString APP_PATH = PathUtils::getAppDataPath() + "apps";
+bool QmlCommerce::isAppInstalled(const QString& itemHref) {
+    QUrl appHref(itemHref);
+
+    QFileInfo appFile(APP_PATH + "/" + appHref.fileName());
+    if (appFile.exists() && appFile.isFile()) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool QmlCommerce::installApp(const QString& itemHref) {
+    if (!QDir(APP_PATH).exists()) {
+        if (!QDir().mkdir(APP_PATH)) {
+            qCDebug(commerce) << "Couldn't make APP_PATH directory.";
+            return false;
+        }
+    }
+
+    QUrl appHref(itemHref);
+
+    auto request =
+        std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, appHref));
+
+    if (!request) {
+        qCDebug(commerce) << "Couldn't create resource request for app.";
+        return false;
+    }
+
+    QEventLoop loop;
+    connect(request.get(), &ResourceRequest::finished, &loop, &QEventLoop::quit);
+    request->send();
+    loop.exec();
+
+    if (request->getResult() != ResourceRequest::Success) {
+        qCDebug(commerce) << "Failed to get .app.json file from remote.";
+        return false;
+    }
+
+    // Copy the .app.json to the apps directory inside %AppData%/High Fidelity/Interface
+    auto requestData = request->getData();
+    QFile appFile(APP_PATH + "/" + appHref.fileName());
+    if (!appFile.open(QIODevice::WriteOnly)) {
+        qCDebug(commerce) << "Couldn't open local .app.json file for creation.";
+        return false;
+    }
+    if (appFile.write(requestData) == -1) {
+        qCDebug(commerce) << "Couldn't write to local .app.json file.";
+        return false;
+    }
+    // Close the file
+    appFile.close();
+
+    // Read from the returned datastream to know what .js to add to Running Scripts
+    QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(requestData);
+    QJsonObject appFileJsonObject = appFileJsonDocument.object();
+    QString scriptUrl = appFileJsonObject["scriptURL"].toString();
+
+    if ((DependencyManager::get<ScriptEngines>()->loadScript(scriptUrl.trimmed())).isNull()) {
+        qCDebug(commerce) << "Couldn't load script.";
+        return false;
+    }
+
+    emit appInstalled(appHref.fileName());
+    return true;
+}
+
+bool QmlCommerce::uninstallApp(const QString& itemHref) {
+    QUrl appHref(itemHref);
+
+    // Read from the file to know what .js script to stop
+    QFile appFile(APP_PATH + "/" + appHref.fileName());
+    if (!appFile.open(QIODevice::ReadOnly)) {
+        qCDebug(commerce) << "Couldn't open local .app.json file for deletion.";
+        return false;
+    }
+    QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(appFile.readAll());
+    QJsonObject appFileJsonObject = appFileJsonDocument.object();
+    QString scriptUrl = appFileJsonObject["scriptURL"].toString();
+
+    if (!DependencyManager::get<ScriptEngines>()->stopScript(scriptUrl.trimmed(), false)) {
+        qCDebug(commerce) << "Couldn't stop script.";
+        return false;
+    }
+
+    // Delete the .app.json from the filesystem
+    // remove() closes the file first.
+    if (!appFile.remove()) {
+        qCDebug(commerce) << "Couldn't delete local .app.json file.";
+        return false;
+    }
+
+    emit appUninstalled(appHref.fileName());
+    return true;
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index b621608190..60e52a441b 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -51,6 +51,9 @@ signals:
 
     void contentSetChanged(const QString& contentSetHref);
 
+    void appInstalled(const QString& appFileName);
+    void appUninstalled(const QString& appFileName);
+
 protected:
     Q_INVOKABLE void getWalletStatus();
 
@@ -76,8 +79,11 @@ protected:
     Q_INVOKABLE void transferHfcToNode(const QString& nodeID, const int& amount, const QString& optionalMessage);
     Q_INVOKABLE void transferHfcToUsername(const QString& username, const int& amount, const QString& optionalMessage);
 
-
     Q_INVOKABLE void replaceContentSet(const QString& itemHref);
+
+    Q_INVOKABLE bool isAppInstalled(const QString& itemHref);
+    Q_INVOKABLE bool installApp(const QString& itemHref);
+    Q_INVOKABLE bool uninstallApp(const QString& itemHref);
 };
 
 #endif // hifi_QmlCommerce_h
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 631b5e97ac..ecd1bf2a6e 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -551,11 +551,11 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 break;
             case 'checkout_rezClicked':
             case 'purchases_rezClicked':
-                if (message.itemType === "app") {
-                    console.log("How did you get here? You can't buy apps yet!");
-                } else {
-                    rezEntity(message.itemHref, message.itemType);
-                }
+                rezEntity(message.itemHref, message.itemType);
+                break;
+            case 'checkout_installClicked':
+            case 'purchases_installClicked':
+                
                 break;
             case 'header_marketplaceImageClicked':
             case 'purchases_backClicked':

From bb04f3f53328906baa542c16f8f6f9d1a22f249a Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Thu, 22 Feb 2018 13:57:46 -0800
Subject: [PATCH 439/569] CR corrections.

---
 .../entities/src/EntityItemProperties.cpp     |  2 +-
 .../src/EntityItemPropertiesDefaults.h        |  1 -
 libraries/entities/src/EntityPropertyFlags.h  |  2 +-
 .../entities/src/KeyLightPropertyGroup.cpp    | 19 +++++++++----------
 .../entities/src/KeyLightPropertyGroup.h      |  2 +-
 scripts/system/html/entityProperties.html     |  8 ++++----
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 0612810e1e..2eca612fc2 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1192,7 +1192,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_DIRECTION, KeyLightDirection, keyLightDirection, glm::vec3);
-        ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_CAST_SHADOWS, KeyLightCastShadows, keyLightCastShadows, bool);
+        ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_CAST_SHADOW, KeyLightCastShadows, keyLightCastShadows, bool);
 
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray);
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index 7a8db2591f..0e0c2994cd 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,7 +46,6 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
-const bool ENTITY_ITEM_DEFAULT_CAST_SHADOWS { false };
 const bool ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW { true };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index b787b16fb9..07908fe6cf 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -209,7 +209,7 @@ enum EntityPropertyList {
     PROP_KEYLIGHT_COLOR,
     PROP_KEYLIGHT_INTENSITY,
     PROP_KEYLIGHT_DIRECTION,
-    PROP_KEYLIGHT_CAST_SHADOWS,
+    PROP_KEYLIGHT_CAST_SHADOW,
 
     PROP_HAZE_RANGE,
     PROP_HAZE_COLOR,
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
index 70b9a5395a..b2c65c6f9d 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.cpp
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -29,7 +29,7 @@ void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desired
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_COLOR, KeyLight, keyLight, Color, color);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_INTENSITY, KeyLight, keyLight, Intensity, intensity);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_DIRECTION, KeyLight, keyLight, Direction, direction);
-    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_CAST_SHADOWS, KeyLight, keyLight, CastShadows, castShadows);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_CAST_SHADOW, KeyLight, keyLight, CastShadows, castShadows);
 }
 
 void KeyLightPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
@@ -88,14 +88,13 @@ bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, getCastShadows());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, getCastShadows());
 
     return true;
 }
 
 bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt, 
-    int& processedBytes) 
-{
+                                                 int& processedBytes) {
         
     int bytesRead = 0;
     bool overwriteLocalData = true;
@@ -104,12 +103,12 @@ bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFl
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, bool, setCastShadows);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, bool, setCastShadows);
 
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_COLOR, Color);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_INTENSITY, Intensity);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_DIRECTION, Direction);
-    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_CAST_SHADOWS, CastShadows);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_CAST_SHADOW, CastShadows);
 
     processedBytes += bytesRead;
 
@@ -131,7 +130,7 @@ EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_COLOR, color);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_INTENSITY, intensity);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_DIRECTION, direction);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_CAST_SHADOWS, castShadows);
+    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_CAST_SHADOW, castShadows);
 
     return changedProperties;
 }
@@ -160,7 +159,7 @@ EntityPropertyFlags KeyLightPropertyGroup::getEntityProperties(EncodeBitstreamPa
     requestedProperties += PROP_KEYLIGHT_COLOR;
     requestedProperties += PROP_KEYLIGHT_INTENSITY;
     requestedProperties += PROP_KEYLIGHT_DIRECTION;
-    requestedProperties += PROP_KEYLIGHT_CAST_SHADOWS;
+    requestedProperties += PROP_KEYLIGHT_CAST_SHADOW;
 
     return requestedProperties;
 }
@@ -178,7 +177,7 @@ void KeyLightPropertyGroup::appendSubclassData(OctreePacketData* packetData, Enc
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, getCastShadows());
+    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, getCastShadows());
 }
 
 int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
@@ -192,7 +191,7 @@ int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char*
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, bool, setCastShadows);
+    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, bool, setCastShadows);
 
     return bytesRead;
 }
diff --git a/libraries/entities/src/KeyLightPropertyGroup.h b/libraries/entities/src/KeyLightPropertyGroup.h
index d3c8597f95..5e13a6afa6 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.h
+++ b/libraries/entities/src/KeyLightPropertyGroup.h
@@ -83,7 +83,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_COLOR, Color, color, xColor, DEFAULT_KEYLIGHT_COLOR);
     DEFINE_PROPERTY(PROP_KEYLIGHT_INTENSITY, Intensity, intensity, float, DEFAULT_KEYLIGHT_INTENSITY);
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_DIRECTION, Direction, direction, glm::vec3, DEFAULT_KEYLIGHT_DIRECTION);
-    DEFINE_PROPERTY(PROP_KEYLIGHT_CAST_SHADOWS, CastShadows, castShadows, bool, DEFAULT_KEYLIGHT_CAST_SHADOWS);
+    DEFINE_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, CastShadows, castShadows, bool, DEFAULT_KEYLIGHT_CAST_SHADOWS);
 };
 
 #endif // hifi_KeyLightPropertyGroup_h
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 8c34d01358..d6710238fb 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -530,10 +530,10 @@
                         <div></div>
                     </div>
                 </div>
-				<div class="zone-group zone-section keylight-section property checkbox">
-					<input type="checkbox" id="property-zone-key-light-cast-shadows">
-					<label for="property-zone-key-light-cast-shadows">Cast Shadows</label>
-				</div>
+                <div class="zone-group zone-section keylight-section property checkbox">
+                    <input type="checkbox" id="property-zone-key-light-cast-shadows">
+                    <label for="property-zone-key-light-cast-shadows">Cast Shadows</label>
+                </div>
             <fieldset class="minor">
                 <legend class="sub-section-header zone-group zone-section background-section">
                     Skybox

From e9cad947d7f429be3a50e98c0acf5e0feeafd496 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 22 Feb 2018 14:01:56 -0800
Subject: [PATCH 440/569] add the deadlock watchdog stats to the stats
 metaverse checkin data

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2878515240..8c3e6f130d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1719,6 +1719,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();
         properties["hardware_stats"] = displayPlugin->getHardwareStats();
 
+        // deadlock watchdog related stats
+        properties["deadlock_watchdog_maxElapsed"] = (int)DeadlockWatchdogThread::_maxElapsed;
+        properties["deadlock_watchdog_maxElapsedAverage"] = (int)DeadlockWatchdogThread::_maxElapsedAverage;
+
         auto bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
         properties["packet_rate_in"] = bandwidthRecorder->getCachedTotalAverageInputPacketsPerSecond();
         properties["packet_rate_out"] = bandwidthRecorder->getCachedTotalAverageOutputPacketsPerSecond();

From de0eee52d6ccaa96d8db21f189d2f0028dd8d33d Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 14:45:32 -0800
Subject: [PATCH 441/569] cool

---
 .../hifi/commerce/purchases/PurchasedItem.qml | 45 +++++++++++++
 interface/src/commerce/QmlCommerce.cpp        | 67 +++++++++++++++----
 interface/src/commerce/QmlCommerce.h          | 10 ++-
 3 files changed, 107 insertions(+), 15 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index c96fc15f5c..76e2afd308 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -47,6 +47,7 @@ Item {
     property bool showConfirmation: false;
     property bool hasPermissionToRezThis;
     property bool permissionExplanationCardVisible;
+    property bool isInstalled: false;
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -62,6 +63,12 @@ Item {
                 showConfirmation = true;
             }
         }
+
+        onAppInstalled: {
+            if (appHref === root.itemHref) {
+                root.isInstalled = true;
+            }
+        }
     }
 
     Connections {
@@ -81,6 +88,10 @@ Item {
         } else {
             root.hasPermissionToRezThis = true;
         }
+
+        if (itemType === "app") {
+            root.isInstalled = Commerce.isAppInstalled(root.itemHref);
+        }
     }
 
     onPurchaseStatusChangedChanged: {
@@ -472,6 +483,40 @@ Item {
                 }
         }
 
+        Rectangle {
+            id: appButtonContainer;
+            color: hifi.colors.white;
+            z: 994;
+            visible: root.isInstalled;
+            anchors.fill: buttonContainer;
+
+            HifiControlsUit.Button {
+                id: openAppButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: parent.top;
+                anchors.right: parent.right;
+                height: 44;
+                text: "OPEN"
+                onClicked: {
+                    Commerce.openApp(root.itemHref);
+                }
+            }
+
+            HifiControlsUit.Button {
+                id: uninstallAppButton;
+                color: hifi.buttons.noneBorderless;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                height: 44;
+                text: "UNINSTALL"
+                onClicked: {
+                    Commerce.uninstallApp(root.itemHref);
+                }
+            }
+        }
+
         Button {
             id: buttonContainer;
             property int color: hifi.buttons.blue;
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 0b583e6153..f9bb0d2003 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -19,6 +19,8 @@
 #include <Application.h>
 #include <UserActivityLogger.h>
 #include <ScriptEngines.h>
+#include <ui/TabletScriptingInterface.h>
+#include "scripting/HMDScriptingInterface.h"
 
 QmlCommerce::QmlCommerce() {
     auto ledger = DependencyManager::get<Ledger>();
@@ -42,6 +44,8 @@ QmlCommerce::QmlCommerce() {
     connect(accountManager.data(), &AccountManager::usernameChanged, this, [&]() {
         setPassphrase("");
     });
+
+    _appsPath = PathUtils::getAppDataPath() + "Apps";
 }
 
 void QmlCommerce::getWalletStatus() {
@@ -186,22 +190,32 @@ void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
     ledger->alreadyOwned(marketplaceId);
 }
 
-static QString APP_PATH = PathUtils::getAppDataPath() + "apps";
 bool QmlCommerce::isAppInstalled(const QString& itemHref) {
     QUrl appHref(itemHref);
 
-    QFileInfo appFile(APP_PATH + "/" + appHref.fileName());
-    if (appFile.exists() && appFile.isFile()) {
-        return true;
-    } else {
+    // First check if .app.json exists
+    QFileInfo appFile(_appsPath + "/" + appHref.fileName());
+    if (!(appFile.exists() && appFile.isFile())) {
         return false;
     }
+
+    // Then check to see if script is running
+    auto runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
+    foreach(const QString& runningScript, runningScripts) {
+        QUrl runningScriptURL = QUrl(runningScript);
+        qCDebug(commerce) << "ZRF FIXME" << runningScriptURL;
+        if (runningScriptURL == appHref) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
 bool QmlCommerce::installApp(const QString& itemHref) {
-    if (!QDir(APP_PATH).exists()) {
-        if (!QDir().mkdir(APP_PATH)) {
-            qCDebug(commerce) << "Couldn't make APP_PATH directory.";
+    if (!QDir(_appsPath).exists()) {
+        if (!QDir().mkdir(_appsPath)) {
+            qCDebug(commerce) << "Couldn't make _appsPath directory.";
             return false;
         }
     }
@@ -228,7 +242,7 @@ bool QmlCommerce::installApp(const QString& itemHref) {
 
     // Copy the .app.json to the apps directory inside %AppData%/High Fidelity/Interface
     auto requestData = request->getData();
-    QFile appFile(APP_PATH + "/" + appHref.fileName());
+    QFile appFile(_appsPath + "/" + appHref.fileName());
     if (!appFile.open(QIODevice::WriteOnly)) {
         qCDebug(commerce) << "Couldn't open local .app.json file for creation.";
         return false;
@@ -250,7 +264,7 @@ bool QmlCommerce::installApp(const QString& itemHref) {
         return false;
     }
 
-    emit appInstalled(appHref.fileName());
+    emit appInstalled(itemHref);
     return true;
 }
 
@@ -258,7 +272,7 @@ bool QmlCommerce::uninstallApp(const QString& itemHref) {
     QUrl appHref(itemHref);
 
     // Read from the file to know what .js script to stop
-    QFile appFile(APP_PATH + "/" + appHref.fileName());
+    QFile appFile(_appsPath + "/" + appHref.fileName());
     if (!appFile.open(QIODevice::ReadOnly)) {
         qCDebug(commerce) << "Couldn't open local .app.json file for deletion.";
         return false;
@@ -279,6 +293,35 @@ bool QmlCommerce::uninstallApp(const QString& itemHref) {
         return false;
     }
 
-    emit appUninstalled(appHref.fileName());
+    emit appUninstalled(itemHref);
+    return true;
+}
+
+bool QmlCommerce::openApp(const QString& itemHref) {
+    QUrl appHref(itemHref);
+
+    // Read from the file to know what .html or .qml document to open
+    QFile appFile(_appsPath + "/" + appHref.fileName());
+    if (!appFile.open(QIODevice::ReadOnly)) {
+        qCDebug(commerce) << "Couldn't open local .app.json file.";
+        return false;
+    }
+    QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(appFile.readAll());
+    QJsonObject appFileJsonObject = appFileJsonDocument.object();
+    QString homeUrl = appFileJsonObject["homeURL"].toString();
+
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+    if (homeUrl.contains(".qml", Qt::CaseInsensitive)) {
+        tablet->loadQMLSource(homeUrl);
+    } else if (homeUrl.contains(".html", Qt::CaseInsensitive)) {
+        tablet->gotoWebScreen(homeUrl);
+    } else {
+        qCDebug(commerce) << "Attempted to open unknown type of homeURL!";
+        return false;
+    }
+
+    DependencyManager::get<HMDScriptingInterface>()->openTablet();
+
     return true;
 }
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 60e52a441b..e0c018878d 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -81,9 +81,13 @@ protected:
 
     Q_INVOKABLE void replaceContentSet(const QString& itemHref);
 
-    Q_INVOKABLE bool isAppInstalled(const QString& itemHref);
-    Q_INVOKABLE bool installApp(const QString& itemHref);
-    Q_INVOKABLE bool uninstallApp(const QString& itemHref);
+    Q_INVOKABLE bool isAppInstalled(const QString& appHref);
+    Q_INVOKABLE bool installApp(const QString& appHref);
+    Q_INVOKABLE bool uninstallApp(const QString& appHref);
+    Q_INVOKABLE bool openApp(const QString& appHref);
+
+private:
+    QString _appsPath;
 };
 
 #endif // hifi_QmlCommerce_h

From 7fcac581aea4b2a178d248b19bd45631bf8a632c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 15:06:14 -0800
Subject: [PATCH 442/569] fix regex for archive name, add general error message

---
 domain-server/resources/web/content/js/content.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 904f36edc7..f5525e9892 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -391,7 +391,7 @@ $(document).ready(function(){
         return false;
       }
 
-      var MANUAL_ARCHIVE_NAME_REGEX = /^[a-zA-Z0-9\\-_ ]+$/;
+      var MANUAL_ARCHIVE_NAME_REGEX = /^[a-zA-Z0-9\-_ ]+$/;
       if (!MANUAL_ARCHIVE_NAME_REGEX.test(inputValue)) {
         swal.showInputError("Valid characters include A-z, 0-9, ' ', '_', and '-'.");
         return false;
@@ -407,12 +407,14 @@ $(document).ready(function(){
       }).done(function(data) {
         // since we successfully setup a new content archive, reload the table of archives
         // which should show that this archive is pending creation
+        swal.close();
         reloadBackupInformation();
       }).fail(function(jqXHR, textStatus, errorThrown) {
-
+        showErrorMessage(
+          "Error",
+          "There was an unexpected error creating the manual content archive"
+        )
       });
-
-      swal.close();
     });
   });
 

From e367167709faaf00324924a145dab6c4c34604ad Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 22 Feb 2018 15:53:28 -0800
Subject: [PATCH 443/569] New HRTF with near-field audio spatialization

---
 libraries/audio/src/AudioHRTF.cpp | 221 ++++++++++++++++++++++++++----
 libraries/audio/src/AudioHRTF.h   |   4 +
 2 files changed, 195 insertions(+), 30 deletions(-)

diff --git a/libraries/audio/src/AudioHRTF.cpp b/libraries/audio/src/AudioHRTF.cpp
index f2f0235ccb..8ccb79b2a5 100644
--- a/libraries/audio/src/AudioHRTF.cpp
+++ b/libraries/audio/src/AudioHRTF.cpp
@@ -71,6 +71,28 @@ ALIGN32 static const float crossfadeTable[HRTF_BLOCK] = {
     0.0029059408f, 0.0022253666f, 0.0016352853f, 0.0011358041f, 0.0007270137f, 0.0004089886f, 0.0001817865f, 0.0000454487f, 
 };
 
+//
+// Model the normalized near-field Distance Variation Filter.
+//
+// This version is parameterized by the DC gain correction, instead of directly by azimuth and distance.
+// A first-order shelving filter is used to minimize the disturbance in ITD.
+//
+// Loosely based on data from S. Spagnol, "Distance rendering and perception of nearby virtual sound sources
+// with a near-field filter model,” Applied Acoustics (2017)
+// 
+static const int NNEARFIELD = 9;
+static const float nearFieldTable[NNEARFIELD][3] = {    // { b0, b1, a1 }
+    { 0.008410604f, -0.000262748f, -0.991852144f },     // gain = 1/256
+    { 0.016758914f, -0.000529590f, -0.983770676f },     // gain = 1/128
+    { 0.033270607f, -0.001075350f, -0.967804743f },     // gain = 1/64
+    { 0.065567740f, -0.002213762f, -0.936646021f },     // gain = 1/32
+    { 0.127361554f, -0.004667324f, -0.877305769f },     // gain = 1/16
+    { 0.240536414f, -0.010201827f, -0.769665412f },     // gain = 1/8
+    { 0.430858205f, -0.023243052f, -0.592384847f },     // gain = 1/4
+    { 0.703238106f, -0.054157913f, -0.350919807f },     // gain = 1/2
+    { 1.000000000f, -0.123144711f, -0.123144711f },     // gain = 1/1
+};
+
 //
 // Model the frequency-dependent attenuation of sound propogation in air.
 //
@@ -168,6 +190,8 @@ static const float lowpassTable[NLOWPASS][5] = {    // { b0, b1, b2, a1, a2 }
     { 0.000076480f, 0.000024509f, -0.000000991f, -1.985807957f, 0.985907955f },
 };
 
+static const float HALFPI = 1.570796327f;
+static const float PI = 3.141592654f;
 static const float TWOPI = 6.283185307f;
 
 //
@@ -716,7 +740,7 @@ static void distanceBiquad(float distance, float& b0, float& b1, float& b2, floa
     //
 
     float x = distance;
-    x = MIN(MAX(x, 1.0f), 1<<30);
+    x = MIN(x, 1<<30);
     x *= x;
     x *= x; // x = distance^4
 
@@ -747,33 +771,151 @@ static void distanceBiquad(float distance, float& b0, float& b1, float& b2, floa
     a2 = lowpassTable[e+0][4] + frac * (lowpassTable[e+1][4] - lowpassTable[e+0][4]);
 }
 
+//
+// Geometric correction of the azimuth, to the angle at each ear.
+// D. Brungart, "Auditory parallax effects in the HRTF for nearby sources," IEEE WASPAA (1999).
+//
+static void nearFieldAzimuth(float azimuth, float distance, float& azimuthL, float& azimuthR) {
+
+    // FIXME: optimize
+    float dx = distance * cosf(azimuth);
+    float dy = distance * sinf(azimuth);
+
+    azimuthL = atan2f(dy + HRTF_HEAD_RADIUS, dx);
+    azimuthR = atan2f(dy - HRTF_HEAD_RADIUS, dx);
+}
+
+//
+// Approximate the near-field DC gain correction at each ear.
+//
+static void nearFieldGain(float azimuth, float distance, float& gainL, float& gainR) {
+
+    // normalized distance factor = [0,1] as distance = [1,HRTF_HEAD_RADIUS]
+    assert(distance < 1.0f);
+    assert(distance > HRTF_HEAD_RADIUS);
+	float d = (1.0f - distance) * ( 1.0f / (1.0f - HRTF_HEAD_RADIUS));
+
+    // angle of incidence at each ear
+    float angleL = azimuth + HALFPI;
+    float angleR = azimuth - HALFPI;
+    if (angleL > +PI) {
+        angleL -= TWOPI;
+    }
+    if (angleR < -PI) {
+        angleR += TWOPI;
+    }
+    assert(angleL >= -PI);
+    assert(angleL <= +PI);
+    assert(angleR >= -PI);
+    assert(angleR <= +PI);
+
+    // normalized occlusion factor = [0,1] as angle of incidence = [0,pi]
+    angleL *= angleL;
+    angleR *= angleR;
+    float cL = ((-0.000452339132f * angleL - 0.00173192444f) * angleL + 0.162476536f) * angleL;
+    float cR = ((-0.000452339132f * angleR - 0.00173192444f) * angleR + 0.162476536f) * angleR;
+
+    // approximate the gain correction
+    // NOTE: this must converge to 1.0 when distance = 1.0m at all azimuth
+    gainL = 1.0f - d * cL;
+    gainR = 1.0f - d * cR;
+}
+
+//
+// Approximate the normalized near-field Distance Variation Function at each ear.
+// A. Kan, "Distance Variation Function for simulation of near-field virtual auditory space," IEEE ICASSP (2006)
+//
+static void nearFieldFilter(float gain, float& b0, float& b1, float& a1) {
+
+    //
+    // Computed from a lookup table quantized to gain = 2^(-N)
+    // and reconstructed by piecewise linear interpolation.
+    //
+
+    // split gain into e and frac, such that gain = 2^(e+0) + frac * (2^(e+1) - 2^(e+0))
+    int e;
+    float frac;
+    splitf(gain, e, frac);
+
+    // clamp to table limits
+    e += NNEARFIELD-1;
+    if (e < 0) {
+        e = 0;
+        frac = 0.0f;
+    } 
+    if (e > NNEARFIELD-2) {
+        e = NNEARFIELD-2;
+        frac = 1.0f;
+    }
+    assert(frac >= 0.0f);
+    assert(frac <= 1.0f);
+    assert(e+0 >= 0);
+    assert(e+1 < NNEARFIELD);
+
+    // piecewise linear interpolation
+    b0 = nearFieldTable[e+0][0] + frac * (nearFieldTable[e+1][0] - nearFieldTable[e+0][0]);
+    b1 = nearFieldTable[e+0][1] + frac * (nearFieldTable[e+1][1] - nearFieldTable[e+0][1]);
+    a1 = nearFieldTable[e+0][2] + frac * (nearFieldTable[e+1][2] - nearFieldTable[e+0][2]);
+}
+
+static void azimuthToIndex(float azimuth, int& index0, int& index1, float& frac) {
+
+    // convert from radians to table units
+    azimuth *= (HRTF_AZIMUTHS / TWOPI);
+
+    if (azimuth < 0.0f) {
+        azimuth += HRTF_AZIMUTHS;
+    }
+
+    // table parameters
+    index0 = (int)azimuth;
+    index1 = index0 + 1;
+    frac = azimuth - (float)index0;
+
+    if (index1 >= HRTF_AZIMUTHS) {
+        index1 -= HRTF_AZIMUTHS;
+    }
+
+    assert((index0 >= 0) && (index0 < HRTF_AZIMUTHS));
+    assert((index1 >= 0) && (index1 < HRTF_AZIMUTHS));
+    assert((frac >= 0.0f) && (frac < 1.0f));
+}
+
 // compute new filters for a given azimuth, distance and gain
 static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int delay[4], 
                        int index, float azimuth, float distance, float gain, int channel) {
 
-    // convert from radians to table units
-    azimuth *= HRTF_AZIMUTHS / TWOPI;
-
-    // wrap to principle value
-    while (azimuth < 0.0f) {
-        azimuth += HRTF_AZIMUTHS;
+    if (azimuth > PI) {
+        azimuth -= TWOPI;
     }
-    while (azimuth >= HRTF_AZIMUTHS) {
-        azimuth -= HRTF_AZIMUTHS;
+    assert(azimuth >= -PI);
+    assert(azimuth <= +PI);
+
+    distance = MAX(distance, HRTF_DISTANCE_MIN);
+
+    // compute the azimuth correction at each ear
+    float azimuthL, azimuthR;
+    nearFieldAzimuth(azimuth, distance, azimuthL, azimuthR);
+
+    // compute the DC gain correction at each ear
+    float gainL = 1.0f;
+    float gainR = 1.0f;
+    if (distance < 1.0f) {
+        nearFieldGain(azimuth, distance, gainL, gainR);
     }
 
-    // table parameters
-    int az0 = (int)azimuth;
-    int az1 = (az0 + 1) % HRTF_AZIMUTHS;
-    float frac = azimuth - (float)az0;
+    // parameters for table interpolation
+    int azL0, azR0, az0;
+    int azL1, azR1, az1;
+    float fracL, fracR, frac;
 
-    assert((az0 >= 0) && (az0 < HRTF_AZIMUTHS));
-    assert((az1 >= 0) && (az1 < HRTF_AZIMUTHS));
-    assert((frac >= 0.0f) && (frac < 1.0f));
+    azimuthToIndex(azimuthL, azL0, azL1, fracL);
+    azimuthToIndex(azimuthR, azR0, azR1, fracR);
+    azimuthToIndex(azimuth, az0, az1, frac);
 
     // interpolate FIR
-    interpolate(firCoef[channel+0], ir_table_table[index][az0][0], ir_table_table[index][az1][0], frac, gain);
-    interpolate(firCoef[channel+1], ir_table_table[index][az0][1], ir_table_table[index][az1][1], frac, gain);
+    interpolate(firCoef[channel+0], ir_table_table[index][azL0][0], ir_table_table[index][azL1][0], fracL, gain * gainL);
+    interpolate(firCoef[channel+1], ir_table_table[index][azR0][1], ir_table_table[index][azR1][1], fracR, gain * gainR);
 
     // interpolate ITD
     float itd = (1.0f - frac) * itd_table_table[index][az0] + frac * itd_table_table[index][az1];
@@ -832,21 +974,40 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
     }
 
     //
-    // Second biquad implements the distance filter.
+    // Second biquad implements the near-field or distance filter.
     //
-    distanceBiquad(distance, b0, b1, b2, a1, a2);
+    if (distance < 1.0f) {
+        nearFieldFilter(gainL, b0, b1, a1);
 
-    bqCoef[0][channel+4] = b0;
-    bqCoef[1][channel+4] = b1;
-    bqCoef[2][channel+4] = b2;
-    bqCoef[3][channel+4] = a1;
-    bqCoef[4][channel+4] = a2;
+        bqCoef[0][channel+4] = b0;
+        bqCoef[1][channel+4] = b1;
+        bqCoef[2][channel+4] = 0.0f;
+        bqCoef[3][channel+4] = a1;
+        bqCoef[4][channel+4] = 0.0f;
 
-    bqCoef[0][channel+5] = b0;
-    bqCoef[1][channel+5] = b1;
-    bqCoef[2][channel+5] = b2;
-    bqCoef[3][channel+5] = a1;
-    bqCoef[4][channel+5] = a2;
+        nearFieldFilter(gainR, b0, b1, a1);
+
+        bqCoef[0][channel+5] = b0;
+        bqCoef[1][channel+5] = b1;
+        bqCoef[2][channel+5] = 0.0f;
+        bqCoef[3][channel+5] = a1;
+        bqCoef[4][channel+5] = 0.0f;
+
+    } else {
+        distanceBiquad(distance, b0, b1, b2, a1, a2);
+
+        bqCoef[0][channel+4] = b0;
+        bqCoef[1][channel+4] = b1;
+        bqCoef[2][channel+4] = b2;
+        bqCoef[3][channel+4] = a1;
+        bqCoef[4][channel+4] = a2;
+
+        bqCoef[0][channel+5] = b0;
+        bqCoef[1][channel+5] = b1;
+        bqCoef[2][channel+5] = b2;
+        bqCoef[3][channel+5] = a1;
+        bqCoef[4][channel+5] = a2;
+    }
 }
 
 void AudioHRTF::render(int16_t* input, float* output, int index, float azimuth, float distance, float gain, int numFrames) {
diff --git a/libraries/audio/src/AudioHRTF.h b/libraries/audio/src/AudioHRTF.h
index a197264994..b8422b7c73 100644
--- a/libraries/audio/src/AudioHRTF.h
+++ b/libraries/audio/src/AudioHRTF.h
@@ -23,6 +23,10 @@ static const int HRTF_BLOCK = 240;      // block processing size
 
 static const float HRTF_GAIN = 1.0f;    // HRTF global gain adjustment
 
+// Near-field HRTF
+static const float HRTF_DISTANCE_MIN = 0.125f;
+static const float HRTF_HEAD_RADIUS = 0.0875f;  // average human head
+
 class AudioHRTF {
 
 public:

From f25b8e8df01c6256e2618dcc073eed89639b4650 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Thu, 22 Feb 2018 16:05:01 -0800
Subject: [PATCH 444/569] Refactor distance attenuation for near-field HRTF.
 Adds near-field attenuation from 0.125m to 1m, calibrated to 0dB at 1m.
 Overload will trigger dynamic range compression at the peak-limiter.

---
 .../src/audio/AudioMixerSlave.cpp             | 23 +++++--------------
 libraries/audio-client/src/AudioClient.cpp    | 13 +++--------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index abc2f7220d..e5ad9a681a 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -489,9 +489,6 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
     // avatar: skip attenuation - it is too costly to approximate
 
     // distance attenuation: approximate, ignore zone-specific attenuations
-    // this is a good approximation for streams further than ATTENUATION_START_DISTANCE
-    // those streams closer will be amplified; amplifying close streams is acceptable
-    // when throttling, as close streams are expected to be heard by a user
     float distance = glm::length(relativePosition);
     return gain / distance;
 
@@ -536,23 +533,15 @@ float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudi
             break;
         }
     }
+    // translate the zone setting to gain per log2(distance)
+    float g = glm::clamp(1.0f - attenuationPerDoublingInDistance, EPSILON, 1.0f);
 
-    // distance attenuation
-    const float ATTENUATION_START_DISTANCE = 1.0f;
     float distance = glm::length(relativePosition);
-    assert(ATTENUATION_START_DISTANCE > EPSILON);
-    if (distance >= ATTENUATION_START_DISTANCE) {
 
-        // translate the zone setting to gain per log2(distance)
-        float g = 1.0f - attenuationPerDoublingInDistance;
-        g = glm::clamp(g, EPSILON, 1.0f);
-
-        // calculate the distance coefficient using the distance to this node
-        float distanceCoefficient = fastExp2f(fastLog2f(g) * fastLog2f(distance/ATTENUATION_START_DISTANCE));
-
-        // multiply the current attenuation coefficient by the distance coefficient
-        gain *= distanceCoefficient;
-    }
+    // calculate the attenuation using the distance to this node
+    // reference attenuation of 0dB at distance = 1.0m
+    gain *= exp2f(log2f(g) * log2f(std::max(distance, HRTF_DISTANCE_MIN)));
+    gain = std::min(gain, 1.0f / HRTF_DISTANCE_MIN);
 
     return gain;
 }
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 579910d9f7..40a55c272c 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1824,16 +1824,9 @@ float AudioClient::azimuthForSource(const glm::vec3& relativePosition) {
 
 float AudioClient::gainForSource(float distance, float volume) {
 
-    const float ATTENUATION_BEGINS_AT_DISTANCE = 1.0f;
-
-    // I'm assuming that the AudioMixer's getting of the stream's attenuation
-    // factor is basically same as getting volume
-    float gain = volume;
-
-    // attenuate based on distance
-    if (distance >= ATTENUATION_BEGINS_AT_DISTANCE) {
-        gain /= (distance/ATTENUATION_BEGINS_AT_DISTANCE);  // attenuation = -6dB * log2(distance)
-    }
+    // attenuation = -6dB * log2(distance)
+    // reference attenuation of 0dB at distance = 1.0m
+    float gain = volume / std::max(distance, HRTF_DISTANCE_MIN);
 
     return gain;
 }

From 10fa3fa346a2d8a54b650497f421200cdc4ada17 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 16:09:01 -0800
Subject: [PATCH 445/569] It's working!

---
 .../hifi/commerce/purchases/PurchasedItem.qml | 15 ++++---
 .../qml/hifi/commerce/purchases/Purchases.qml | 12 +++++
 interface/src/commerce/QmlCommerce.cpp        | 44 ++++++++++++-------
 interface/src/commerce/QmlCommerce.h          |  6 +--
 scripts/system/commerce/wallet.js             |  2 +-
 5 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 76e2afd308..fb8e509cde 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -47,7 +47,7 @@ Item {
     property bool showConfirmation: false;
     property bool hasPermissionToRezThis;
     property bool permissionExplanationCardVisible;
-    property bool isInstalled: false;
+    property bool isInstalled;
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -69,6 +69,12 @@ Item {
                 root.isInstalled = true;
             }
         }
+
+        onAppUninstalled: {
+            if (appHref === root.itemHref) {
+                root.isInstalled = false;
+            }
+        }
     }
 
     Connections {
@@ -88,10 +94,6 @@ Item {
         } else {
             root.hasPermissionToRezThis = true;
         }
-
-        if (itemType === "app") {
-            root.isInstalled = Commerce.isAppInstalled(root.itemHref);
-        }
     }
 
     onPurchaseStatusChangedChanged: {
@@ -496,6 +498,8 @@ Item {
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: parent.top;
                 anchors.right: parent.right;
+                anchors.left: parent.left;
+                width: 92;
                 height: 44;
                 text: "OPEN"
                 onClicked: {
@@ -509,6 +513,7 @@ Item {
                 colorScheme: hifi.colorSchemes.light;
                 anchors.bottom: parent.bottom;
                 anchors.right: parent.right;
+                anchors.left: parent.left;
                 height: 44;
                 text: "UNINSTALL"
                 onClicked: {
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 9b333a60cd..896200a8e6 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -36,6 +36,7 @@ Rectangle {
     property bool isShowingMyItems: false;
     property bool isDebuggingFirstUseTutorial: false;
     property int pendingItemCount: 0;
+    property var installedApps;
     // Style
     color: hifi.colors.white;
     Connections {
@@ -61,6 +62,8 @@ Rectangle {
                     root.activeView = "firstUseTutorial";
                 } else if (!Settings.getValue("isFirstUseOfPurchases", true) && root.activeView === "initialize") {
                     root.activeView = "purchasesMain";
+                    root.installedApps = Commerce.getInstalledApps();
+                    console.log("ZRF! " + root.installedApps);
                     Commerce.inventory();
                 }
             } else {
@@ -269,6 +272,7 @@ Rectangle {
                     case 'tutorial_finished':
                         Settings.setValue("isFirstUseOfPurchases", false);
                         root.activeView = "purchasesMain";
+                        root.installedApps = Commerce.getInstalledApps();
                         Commerce.inventory();
                     break;
                 }
@@ -394,6 +398,7 @@ Rectangle {
                 limitedRun: model.limited_run;
                 displayedItemCount: model.displayedItemCount;
                 permissionExplanationCardVisible: model.permissionExplanationCardVisible;
+                isInstalled: model.isInstalled;
                 itemType: {
                     if (model.root_file_url.indexOf(".fst") > -1) {
                         "avatar";
@@ -680,9 +685,16 @@ Rectangle {
 
         if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== filterBar.previousText) {
             filteredPurchasesModel.clear();
+            var currentId;
             for (var i = 0; i < tempPurchasesModel.count; i++) {
+                currentId = tempPurchasesModel.get(i).id;
+                console.log("ZRF HERE 2 " + root.installedApps);
+                console.log("ZRF HERE 3 " + currentId);
+                console.log("ZRF HERE 4 " + ((root.installedApps).indexOf(currentId) > -1));
+
                 filteredPurchasesModel.append(tempPurchasesModel.get(i));
                 filteredPurchasesModel.setProperty(i, 'permissionExplanationCardVisible', false);
+                filteredPurchasesModel.setProperty(i, 'isInstalled', ((root.installedApps).indexOf(currentId) > -1));
             }
 
             populateDisplayedItemCounts();
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index f9bb0d2003..f80e88d175 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -45,7 +45,7 @@ QmlCommerce::QmlCommerce() {
         setPassphrase("");
     });
 
-    _appsPath = PathUtils::getAppDataPath() + "Apps";
+    _appsPath = PathUtils::getAppDataPath() + "Apps/";
 }
 
 void QmlCommerce::getWalletStatus() {
@@ -190,26 +190,38 @@ void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
     ledger->alreadyOwned(marketplaceId);
 }
 
-bool QmlCommerce::isAppInstalled(const QString& itemHref) {
-    QUrl appHref(itemHref);
+QStringList QmlCommerce::getInstalledApps() {
+    QStringList installedAppsFromMarketplace;
+    QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
 
-    // First check if .app.json exists
-    QFileInfo appFile(_appsPath + "/" + appHref.fileName());
-    if (!(appFile.exists() && appFile.isFile())) {
-        return false;
-    }
+    QDir directory(_appsPath);
+    qCDebug(commerce) << "ZRF FIXME" << _appsPath;
+    QStringList apps = directory.entryList(QStringList("*.app.json"));
+    foreach(QString appFileName, apps) {
+        installedAppsFromMarketplace.append(appFileName);
+        qCDebug(commerce) << "ZRF FIXME" << appFileName;
+        QFile appFile(_appsPath + appFileName);
+        if (appFile.open(QIODevice::ReadOnly)) {
+            QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(appFile.readAll());
 
-    // Then check to see if script is running
-    auto runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
-    foreach(const QString& runningScript, runningScripts) {
-        QUrl runningScriptURL = QUrl(runningScript);
-        qCDebug(commerce) << "ZRF FIXME" << runningScriptURL;
-        if (runningScriptURL == appHref) {
-            return true;
+            appFile.close();
+
+            QJsonObject appFileJsonObject = appFileJsonDocument.object();
+            QString scriptURL = appFileJsonObject["scriptURL"].toString();
+
+            // If the script .app.json is on the user's local disk but the associated script isn't running
+            // for some reason, start that script again.
+            if (!runningScripts.contains(scriptURL)) {
+                if ((DependencyManager::get<ScriptEngines>()->loadScript(scriptURL.trimmed())).isNull()) {
+                    qCDebug(commerce) << "Couldn't start script while checking installed apps.";
+                }
+            }
+        } else {
+            qCDebug(commerce) << "Couldn't open local .app.json file for reading.";
         }
     }
 
-    return false;
+    return installedAppsFromMarketplace;
 }
 
 bool QmlCommerce::installApp(const QString& itemHref) {
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index e0c018878d..2bf4959177 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -51,8 +51,8 @@ signals:
 
     void contentSetChanged(const QString& contentSetHref);
 
-    void appInstalled(const QString& appFileName);
-    void appUninstalled(const QString& appFileName);
+    void appInstalled(const QString& appHref);
+    void appUninstalled(const QString& appHref);
 
 protected:
     Q_INVOKABLE void getWalletStatus();
@@ -81,7 +81,7 @@ protected:
 
     Q_INVOKABLE void replaceContentSet(const QString& itemHref);
 
-    Q_INVOKABLE bool isAppInstalled(const QString& appHref);
+    Q_INVOKABLE QStringList getInstalledApps();
     Q_INVOKABLE bool installApp(const QString& appHref);
     Q_INVOKABLE bool uninstallApp(const QString& appHref);
     Q_INVOKABLE bool openApp(const QString& appHref);
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 8cf5b72b9a..9ff7038c09 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -39,7 +39,7 @@
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            tablet.loadQMLSource(WALLET_QML_SOURCE);
+            tablet.loadQMLSource(MARKETPLACE_PURCHASES_QML_PATH);
         }
     }
 

From 33f73fef0df20528ca3867a41d4a1257fc4791f9 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 16:26:35 -0800
Subject: [PATCH 446/569] YAY!

---
 .../resources/qml/hifi/commerce/purchases/Purchases.qml  | 6 +-----
 interface/src/commerce/QmlCommerce.cpp                   | 9 ++++-----
 interface/src/commerce/QmlCommerce.h                     | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 896200a8e6..3612de7323 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -36,7 +36,7 @@ Rectangle {
     property bool isShowingMyItems: false;
     property bool isDebuggingFirstUseTutorial: false;
     property int pendingItemCount: 0;
-    property var installedApps;
+    property string installedApps;
     // Style
     color: hifi.colors.white;
     Connections {
@@ -63,7 +63,6 @@ Rectangle {
                 } else if (!Settings.getValue("isFirstUseOfPurchases", true) && root.activeView === "initialize") {
                     root.activeView = "purchasesMain";
                     root.installedApps = Commerce.getInstalledApps();
-                    console.log("ZRF! " + root.installedApps);
                     Commerce.inventory();
                 }
             } else {
@@ -688,9 +687,6 @@ Rectangle {
             var currentId;
             for (var i = 0; i < tempPurchasesModel.count; i++) {
                 currentId = tempPurchasesModel.get(i).id;
-                console.log("ZRF HERE 2 " + root.installedApps);
-                console.log("ZRF HERE 3 " + currentId);
-                console.log("ZRF HERE 4 " + ((root.installedApps).indexOf(currentId) > -1));
 
                 filteredPurchasesModel.append(tempPurchasesModel.get(i));
                 filteredPurchasesModel.setProperty(i, 'permissionExplanationCardVisible', false);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index f80e88d175..6de5de1a9d 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -190,16 +190,15 @@ void QmlCommerce::alreadyOwned(const QString& marketplaceId) {
     ledger->alreadyOwned(marketplaceId);
 }
 
-QStringList QmlCommerce::getInstalledApps() {
-    QStringList installedAppsFromMarketplace;
+QString QmlCommerce::getInstalledApps() {
+    QString installedAppsFromMarketplace;
     QStringList runningScripts = DependencyManager::get<ScriptEngines>()->getRunningScripts();
 
     QDir directory(_appsPath);
-    qCDebug(commerce) << "ZRF FIXME" << _appsPath;
     QStringList apps = directory.entryList(QStringList("*.app.json"));
     foreach(QString appFileName, apps) {
-        installedAppsFromMarketplace.append(appFileName);
-        qCDebug(commerce) << "ZRF FIXME" << appFileName;
+        installedAppsFromMarketplace += appFileName;
+        installedAppsFromMarketplace += ",";
         QFile appFile(_appsPath + appFileName);
         if (appFile.open(QIODevice::ReadOnly)) {
             QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(appFile.readAll());
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 2bf4959177..09eb7137af 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -81,7 +81,7 @@ protected:
 
     Q_INVOKABLE void replaceContentSet(const QString& itemHref);
 
-    Q_INVOKABLE QStringList getInstalledApps();
+    Q_INVOKABLE QString getInstalledApps();
     Q_INVOKABLE bool installApp(const QString& appHref);
     Q_INVOKABLE bool uninstallApp(const QString& appHref);
     Q_INVOKABLE bool openApp(const QString& appHref);

From 80c0f2a21e6f549fff129a460d80b15a3f47d48f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 2 Feb 2018 11:28:25 -0800
Subject: [PATCH 447/569] Fix crash when passing --checkMinSpec flag

	That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
---
 assignment-client/src/main.cpp            |  3 +
 domain-server/src/main.cpp                |  2 +
 interface/src/main.cpp                    |  2 +
 libraries/shared/src/SettingInterface.cpp | 69 ++++++++++++++---------
 libraries/shared/src/SettingManager.cpp   |  6 +-
 libraries/shared/src/SharedUtil.cpp       |  9 ++-
 libraries/shared/src/SharedUtil.h         | 34 +----------
 tools/ac-client/src/main.cpp              |  5 +-
 tools/atp-client/src/main.cpp             |  3 +-
 tools/oven/src/main.cpp                   |  8 ++-
 10 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index 4f64bf8f7f..bf4497984f 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -23,9 +23,12 @@ int main(int argc, char* argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    setupGlobalInstances();
+
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
     qInfo() << "Starting.";
 
+
     AssignmentClientApp app(argc, argv);
     
     int acReturn = app.exec();
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index dc3ee54fe7..e258626223 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -29,6 +29,8 @@ int main(int argc, char* argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    setupGlobalInstances();
+    
     Setting::init();
 
 #ifndef WIN32
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 30e8439985..0f8134b253 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -62,6 +62,8 @@ int main(int argc, const char* argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    setupGlobalInstances();
+
     Setting::init();
 
     // Instance UserActivityLogger now that the settings are loaded
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index 327668574e..62f116795e 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -23,43 +23,53 @@
 #include "SharedUtil.h"
 
 namespace Setting {
-    static QSharedPointer<Manager> globalManager;
-
     // cleans up the settings private instance. Should only be run once at closing down.
     void cleanupPrivateInstance() {
+        auto globalManager = DependencyManager::get<Manager>();
+        Q_ASSERT(qApp && globalManager);
+
         // grab the thread before we nuke the instance
-        QThread* settingsManagerThread = DependencyManager::get<Manager>()->thread();
+        QThread* settingsManagerThread = globalManager->thread();
 
-        // tell the private instance to clean itself up on its thread
-        DependencyManager::destroy<Manager>();
-
-        globalManager.reset();
-
-        // quit the settings manager thread and wait on it to make sure it's gone
+        // quit the settings manager thread
         settingsManagerThread->quit();
         settingsManagerThread->wait();
+
+        // Save all settings
+        globalManager->saveAll();
+
+        qCDebug(shared) << "Settings thread stopped.";
     }
 
     void setupPrivateInstance() {
-        // Ensure Setting::init has already ran and qApp exists
-        if (qApp && globalManager) {
-            // Let's set up the settings Private instance on its own thread
-            QThread* thread = new QThread();
-            Q_CHECK_PTR(thread);
-            thread->setObjectName("Settings Thread");
+        auto globalManager = DependencyManager::get<Manager>();
+        Q_ASSERT(qApp && globalManager);
 
-            QObject::connect(thread, SIGNAL(started()), globalManager.data(), SLOT(startTimer()));
-            QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
-            QObject::connect(thread, SIGNAL(finished()), globalManager.data(), SLOT(deleteLater()));
-            globalManager->moveToThread(thread);
-            thread->start();
-            qCDebug(shared) << "Settings thread started.";
+        // Let's set up the settings private instance on its own thread
+        QThread* thread = new QThread(qApp);
+        Q_CHECK_PTR(thread);
+        thread->setObjectName("Settings Thread");
 
-            // Register cleanupPrivateInstance to run inside QCoreApplication's destructor.
-            qAddPostRoutine(cleanupPrivateInstance);
-        }
+        // Setup setting periodical save timer
+        QObject::connect(thread, &QThread::started, globalManager.data(), &Manager::startTimer);
+        QObject::connect(thread, &QThread::finished, globalManager.data(), &Manager::stopTimer);
+
+        // Setup manager threading affinity
+        globalManager->moveToThread(thread);
+        QObject::connect(thread, &QThread::finished, globalManager.data(), [] {
+            auto globalManager = DependencyManager::get<Manager>();
+            Q_ASSERT(qApp && globalManager);
+
+            // Move manager back to the main thread (has to be done on owning thread)
+            globalManager->moveToThread(qApp->thread());
+        });
+        
+        thread->start();
+        qCDebug(shared) << "Settings thread started.";
+
+        // Register cleanupPrivateInstance to run inside QCoreApplication's destructor.
+        qAddPostRoutine(cleanupPrivateInstance);
     }
-    FIXED_Q_COREAPP_STARTUP_FUNCTION(setupPrivateInstance)
 
     // Sets up the settings private instance. Should only be run once at startup. preInit() must be run beforehand,
     void init() {
@@ -68,6 +78,7 @@ namespace Setting {
         QSettings settings;
         qCDebug(shared) << "Settings file:" << settings.fileName();
 
+        // Backward compatibility for old settings file
         if (settings.allKeys().isEmpty()) {
             loadOldINIFile(settings);
         }
@@ -80,11 +91,13 @@ namespace Setting {
             qCDebug(shared) << (deleted ? "Deleted" : "Failed to delete") << "settings lock file" << settingsLockFilename;
         }
 
-        globalManager = DependencyManager::set<Manager>();
+        // Setup settings manager
+        DependencyManager::set<Manager>();
 
-        setupPrivateInstance();
+        // Add pre-routine to setup threading
+        qAddPreRoutine(setupPrivateInstance);
     }
-    
+
     void Interface::init() {
         if (!DependencyManager::isSet<Manager>()) {
             // WARNING: As long as we are using QSettings this should always be triggered for each Setting::Handle
diff --git a/libraries/shared/src/SettingManager.cpp b/libraries/shared/src/SettingManager.cpp
index 6c246d4cea..2e0850255a 100644
--- a/libraries/shared/src/SettingManager.cpp
+++ b/libraries/shared/src/SettingManager.cpp
@@ -23,11 +23,7 @@ namespace Setting {
         // Cleanup timer
         stopTimer();
         delete _saveTimer;
-
-        // Save all settings before exit
-        saveAll();
-
-        // sync will be called in the QSettings destructor
+        _saveTimer = nullptr;
     }
 
     // Custom deleter does nothing, because we need to shutdown later than the dependency manager
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 8e5c30711c..772340b631 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -63,12 +63,12 @@ extern "C" FILE * __cdecl __iob_func(void) {
 #include "OctalCode.h"
 #include "SharedLogging.h"
 
+static std::mutex stagedGlobalInstancesMutex;
 static std::unordered_map<std::string, QVariant> stagedGlobalInstances;
 
 
 std::mutex& globalInstancesMutex() {
-    static std::mutex mutex;
-    return mutex;
+    return stagedGlobalInstancesMutex;
 }
 
 static void commitGlobalInstances() {
@@ -78,7 +78,10 @@ static void commitGlobalInstances() {
     }
     stagedGlobalInstances.clear();
 }
-FIXED_Q_COREAPP_STARTUP_FUNCTION(commitGlobalInstances)
+
+void setupGlobalInstances() {
+    qAddPreRoutine(commitGlobalInstances);
+}
 
 QVariant getGlobalInstance(const char* propertyName) {
     if (qApp) {
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 5a1e48d9c0..64bbc6585b 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -25,23 +25,6 @@
 #include <QtCore/QCoreApplication>
 #include <QUuid>
 
-// Workaround for https://bugreports.qt.io/browse/QTBUG-54479
-// Wrap target function inside another function that holds
-// a unique string identifier and uses it to ensure it only runs once
-// by storing a state within the qApp
-// We cannot used std::call_once with a static once_flag because
-// this is used in shared libraries that are linked by several DLLs
-// (ie. plugins), meaning the static will be useless in that case
-#define FIXED_Q_COREAPP_STARTUP_FUNCTION(AFUNC)                        \
-    static void AFUNC ## _fixed() {                                    \
-        const auto propertyName = std::string(Q_FUNC_INFO) + __FILE__; \
-        if (!qApp->property(propertyName.c_str()).toBool()) {          \
-            AFUNC();                                                   \
-            qApp->setProperty(propertyName.c_str(), QVariant(true));   \
-        }                                                              \
-    }                                                                  \
-    Q_COREAPP_STARTUP_FUNCTION(AFUNC ## _fixed)
-
 // When writing out avatarEntities to a QByteArray, if the parentID is the ID of MyAvatar, use this ID instead.  This allows
 // the value to be reset when the sessionID changes.
 const QUuid AVATAR_SELF_ID = QUuid("{00000000-0000-0000-0000-000000000001}");
@@ -53,21 +36,7 @@ std::unique_ptr<T>& globalInstancePointer() {
     return instancePtr;
 }
 
-template <typename T>
-void setGlobalInstance(const char* propertyName, T* instance) {
-    globalInstancePointer<T>().reset(instance);
-}
-
-template <typename T>
-bool destroyGlobalInstance() {
-    std::unique_ptr<T>& instancePtr = globalInstancePointer<T>();
-    if (instancePtr.get()) {
-        instancePtr.reset();
-        return true;
-    }
-    return false;
-}
-
+void setupGlobalInstances();
 std::mutex& globalInstancesMutex();
 QVariant getGlobalInstance(const char* propertyName);
 void setGlobalInstance(const char* propertyName, const QVariant& variant);
@@ -78,7 +47,6 @@ void setGlobalInstance(const char* propertyName, const QVariant& variant);
 template <typename T, typename... Args>
 T* globalInstance(const char* propertyName, Args&&... args) {
     static T* resultInstance { nullptr };
-    static std::mutex mutex;
     if (!resultInstance) {
         std::unique_lock<std::mutex> lock(globalInstancesMutex());
         if (!resultInstance) {
diff --git a/tools/ac-client/src/main.cpp b/tools/ac-client/src/main.cpp
index c9affde3b5..139e44bc9a 100644
--- a/tools/ac-client/src/main.cpp
+++ b/tools/ac-client/src/main.cpp
@@ -19,15 +19,16 @@
 
 using namespace std;
 
-int main(int argc, char * argv[]) {
+int main(int argc, char* argv[]) {
     QCoreApplication::setApplicationName(BuildInfo::AC_CLIENT_SERVER_NAME);
     QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    setupGlobalInstances();
+    
     Setting::init();
 
     ACClientApp app(argc, argv);
-
     return app.exec();
 }
diff --git a/tools/atp-client/src/main.cpp b/tools/atp-client/src/main.cpp
index 830c049bc7..0a8274fedd 100644
--- a/tools/atp-client/src/main.cpp
+++ b/tools/atp-client/src/main.cpp
@@ -25,9 +25,10 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    setupGlobalInstances();
+    
     Setting::init();
 
     ATPClientApp app(argc, argv);
-
     return app.exec();
 }
diff --git a/tools/oven/src/main.cpp b/tools/oven/src/main.cpp
index 788470b75e..be0c22a0c6 100644
--- a/tools/oven/src/main.cpp
+++ b/tools/oven/src/main.cpp
@@ -10,11 +10,17 @@
 
 #include "Oven.h"
 
+#include <BuildInfo.h>
 #include <SettingInterface.h>
+#include <SharedUtil.h>
 
 int main (int argc, char** argv) {
-    QCoreApplication::setOrganizationName("High Fidelity");
     QCoreApplication::setApplicationName("Oven");
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
+    setupGlobalInstances();
 
     // init the settings interface so we can save and load settings
     Setting::init();

From 3150b963c0106f163ea5aec03a34a23c5220dda3 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Thu, 22 Feb 2018 16:29:58 -0800
Subject: [PATCH 448/569] Implemented call to abortTask().

---
 .../render-utils/src/RenderShadowTask.cpp     | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index be84482c63..ce4bf01dcf 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -120,11 +120,6 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
 
-	// Exit if current keylight does not cast shadows
-    if (!lightStage->getCurrentKeyLight() || !lightStage->getCurrentKeyLight()->getCastShadows()) {
-        return;
-    }
-
     auto shadow = lightStage->getCurrentKeyShadow();
     if (!shadow || _cascadeIndex >= shadow->getCascadeCount()) {
         return;
@@ -305,8 +300,14 @@ void RenderShadowSetup::setSlopeBias(int cascadeIndex, float value) {
 }
 
 void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
+    // Abort all jobs if not casting shadows
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
+    if (!lightStage->getCurrentKeyLight() || !lightStage->getCurrentKeyLight()->getCastShadows()) {
+        renderContext->taskFlow.abortTask();
+        return;
+    }
+
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
@@ -387,18 +388,6 @@ void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderCon
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
 
-    // Exit if current keylight does not cast shadows
-    if (!lightStage->getCurrentKeyLight()) {
-        return;
-    }
-
-    bool castShadows = lightStage->getCurrentKeyLight()->getCastShadows();
-    if (!castShadows) {
-        output.edit0() = ItemFilter::Builder::nothing();
-        output.edit1() = ViewFrustumPointer();
-        return;
-    }
-
     // Cache old render args
     RenderArgs* args = renderContext->args;
 

From f14673bc5079622d019919f004bb54e4539768d9 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 16:37:12 -0800
Subject: [PATCH 449/569] Fixup Checkout for apps

---
 .../qml/hifi/commerce/checkout/Checkout.qml      | 16 +++++++++++++---
 scripts/system/commerce/wallet.js                |  2 +-
 scripts/system/marketplaces/marketplaces.js      |  4 ----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 98f26887ae..10894109ef 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -48,6 +48,7 @@ Rectangle {
     property bool debugCheckoutSuccess: false;
     property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
     property string referrer;
+    property bool isInstalled;
     // Style
     color: hifi.colors.white;
     Connections {
@@ -122,6 +123,12 @@ Rectangle {
                 root.refreshBuyUI();
             }
         }
+
+        onAppInstalled: {
+            if (appHref === root.itemHref) {
+                root.isInstalled = true;
+            }
+        }
     }
 
     onItemIdChanged: {
@@ -689,7 +696,7 @@ Rectangle {
             height: 50;
             anchors.left: parent.left;
             anchors.right: parent.right;
-            text: (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
+            text: root.itemType === "app" && root.isInstalled ? "OPEN APP" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
             onClicked: {
                 if (root.itemType === "contentSet") {
                     lightboxPopup.titleText = "Replace Content";
@@ -714,8 +721,11 @@ Rectangle {
                     lightboxPopup.button2method = "MyAvatar.useFullAvatarURL('" + root.itemHref + "'); root.visible = false;";
                     lightboxPopup.visible = true;
                 } else if (root.itemType === "app") {
-                    // "Run" button is separate.
-                    Commerce.installApp(root.itemHref);
+                    if (root.isInstalled) {
+                        Commerce.openApp(root.itemHref);
+                    } else {
+                        Commerce.installApp(root.itemHref);
+                    }
                 } else {
                     sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, itemType: root.itemType});
                     rezzedNotifContainer.visible = true;
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 9ff7038c09..8cf5b72b9a 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -39,7 +39,7 @@
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
-            tablet.loadQMLSource(MARKETPLACE_PURCHASES_QML_PATH);
+            tablet.loadQMLSource(WALLET_QML_SOURCE);
         }
     }
 
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index ecd1bf2a6e..8f51d88f2d 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -552,10 +552,6 @@ var selectionDisplay = null; // for gridTool.js to ignore
             case 'checkout_rezClicked':
             case 'purchases_rezClicked':
                 rezEntity(message.itemHref, message.itemType);
-                break;
-            case 'checkout_installClicked':
-            case 'purchases_installClicked':
-                
                 break;
             case 'header_marketplaceImageClicked':
             case 'purchases_backClicked':

From 1251328d2b2e0aa3bde3a15e545b0b569c1b9444 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 16:53:49 -0800
Subject: [PATCH 450/569] reload backup information immediately when restore
 starts

---
 domain-server/resources/web/content/js/content.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index f5525e9892..6e80fde7f6 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -67,6 +67,10 @@ $(document).ready(function(){
           data: fileFormData
         }).done(function(data, textStatus, jqXHR) {
           isRestoring = true;
+
+          // immediately reload backup information since one should be restoring now
+          reloadBackupInformation();
+
           swal.close();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
@@ -297,6 +301,10 @@ $(document).ready(function(){
         // setup an AJAX POST to request content restore
         $.post('/api/backups/recover/' + backupID).done(function(data, textStatus, jqXHR) {
           isRestoring = true;
+
+          // immediately reload our backup information since one should be restoring now
+          reloadBackupInformation();
+
           swal.close();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(

From 3e4375b1e6a6ba58e1b2fe40126e867cd0c0e0de Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 16:54:56 -0800
Subject: [PATCH 451/569] set recovery filename during domain content archive
 recovery

---
 domain-server/src/DomainContentBackupManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index f94f62811e..eff69ee167 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -250,6 +250,7 @@ bool DomainContentBackupManager::recoverFromBackupZip(const QString& backupName,
         return false;
     } else {
         _isRecovering = true;
+        _recoveryFilename = backupName;
 
         for (auto& handler : _backupHandlers) {
             handler->recoverBackup(backupName, zip);

From d9d2b26519d611a3405bf3ae10043fa53ec30a60 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 16:55:35 -0800
Subject: [PATCH 452/569] delete baked content for unmapped files on AS startup

---
 assignment-client/src/assets/AssetServer.cpp | 35 +++++++++++++++++++-
 assignment-client/src/assets/AssetServer.h   |  3 ++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 4c6cba2e74..509f8095c9 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -394,6 +394,7 @@ void AssetServer::completeSetup() {
 
         if (_fileMappings.size() > 0) {
             cleanupUnmappedFiles();
+            cleanupBakedFilesForDeletedAssets();
         }
 
         nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
@@ -473,7 +474,7 @@ void AssetServer::replayRequests() {
 }
 
 void AssetServer::cleanupUnmappedFiles() {
-    QRegExp hashFileRegex { "^[a-f0-9]{" + QString::number(AssetUtils::SHA256_HASH_HEX_LENGTH) + "}" };
+    QRegExp hashFileRegex { AssetUtils::ASSET_HASH_REGEX_STRING };
 
     auto files = _filesDirectory.entryInfoList(QDir::Files);
 
@@ -505,6 +506,38 @@ void AssetServer::cleanupUnmappedFiles() {
     }
 }
 
+void AssetServer::cleanupBakedFilesForDeletedAssets() {
+    qCInfo(asset_server) << "Performing baked asset cleanup for deleted assets";
+
+    std::set<AssetUtils::AssetHash> bakedHashes;
+
+    for (auto it : _fileMappings) {
+        // check if this is a mapping to baked content
+        if (it.first.startsWith(AssetUtils::HIDDEN_BAKED_CONTENT_FOLDER)) {
+            // extract the hash from the baked mapping
+            AssetUtils::AssetHash hash = it.first.mid(AssetUtils::HIDDEN_BAKED_CONTENT_FOLDER.length(),
+                                                      AssetUtils::SHA256_HASH_HEX_LENGTH);
+
+            // add the hash to our set of hashes for which we have baked content
+            bakedHashes.insert(hash);
+        }
+    }
+
+    // enumerate the hashes for which we have baked content
+    for (auto hash : bakedHashes) {
+        // check if we have a mapping that points to this hash
+        auto matchingMapping = std::find_if(std::begin(_fileMappings), std::end(_fileMappings),
+                                            [&hash](const std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash> mappingPair) {
+            return mappingPair.second == hash;
+        });
+
+        if (matchingMapping == std::end(_fileMappings)) {
+            // we didn't find a mapping for this hash, remove any baked content we still have for it
+            removeBakedPathsForDeletedAsset(hash);
+        }
+    }
+}
+
 void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     using AssetMappingOperationType = AssetUtils::AssetMappingOperationType;
 
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index c85fb89175..f5a7d5f2da 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -88,6 +88,9 @@ private:
     /// Delete any unmapped files from the local asset directory
     void cleanupUnmappedFiles();
 
+    /// Delete any baked files for assets removed from the local asset directory
+    void cleanupBakedFilesForDeletedAssets();
+
     QString getPathToAssetHash(const AssetUtils::AssetHash& assetHash);
 
     std::pair<AssetUtils::BakingStatus, QString> getAssetStatus(const AssetUtils::AssetPath& path, const AssetUtils::AssetHash& hash);

From 1aaae94cc1f8e651ced6ecbb3cfd9b7bca731c7b Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Thu, 22 Feb 2018 17:04:27 -0800
Subject: [PATCH 453/569] checkpoint

---
 .../qml/hifi/commerce/checkout/Checkout.qml   | 10 +++++++-
 .../common/EmulatedMarketplaceHeader.qml      |  4 ++--
 .../qml/hifi/commerce/purchases/Purchases.qml | 10 +++++++-
 .../qml/hifi/commerce/wallet/Wallet.qml       | 14 ++++++++++-
 .../qml/hifi/commerce/wallet/WalletChoice.qml | 23 +++++++++++++++++++
 .../qml/hifi/commerce/wallet/WalletHome.qml   |  4 ++--
 interface/src/commerce/Ledger.cpp             | 23 +++++++++++++++----
 interface/src/commerce/Wallet.cpp             | 15 ++++++++----
 interface/src/commerce/Wallet.h               |  2 ++
 9 files changed, 90 insertions(+), 15 deletions(-)
 create mode 100644 interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 809f48361d..173cedc462 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -59,11 +59,19 @@ Rectangle {
                     notSetUpTimer.start();
                 }
             } else if (walletStatus === 2) {
+                if (root.activeView != "preexisting") {
+                    root.activeView = "preexisting";
+                }
+            } else if (walletStatus === 3) {
+                if (root.activeView != "conflicting") {
+                    root.activeView = "conflicting";
+                }
+            } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";
                     UserActivityLogger.commercePassphraseEntry("marketplace checkout");
                 }
-            } else if (walletStatus === 3) {
+            } else if (walletStatus === 5) {
                 authSuccessStep();
             } else {
                 console.log("ERROR in Checkout.qml: Unknown wallet status: " + walletStatus);
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index a4b0f57e8f..eb8159a4e7 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -37,9 +37,9 @@ Item {
         onWalletStatusResult: {
             if (walletStatus === 0) {
                 sendToParent({method: "needsLogIn"});
-            } else if (walletStatus === 3) {
+            } else if (walletStatus === 5) {
                 Commerce.getSecurityImage();
-            } else if (walletStatus > 3) {
+            } else if (walletStatus > 5) {
                 console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus);
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 2743677683..d7cbf04ed9 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -53,11 +53,19 @@ Rectangle {
                     notSetUpTimer.start();
                 }
             } else if (walletStatus === 2) {
+                if (root.activeView != "preexisting") {
+                    root.activeView = "preexisting";
+                }
+            } else if (walletStatus === 3) {
+                if (root.activeView != "conflicting") {
+                    root.activeView = "conflicting";
+                }
+            } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";
                     UserActivityLogger.commercePassphraseEntry("marketplace purchases");
                 }
-            } else if (walletStatus === 3) {
+            } else if (walletStatus === 5) {
                 if ((Settings.getValue("isFirstUseOfPurchases", true) || root.isDebuggingFirstUseTutorial) && root.activeView !== "firstUseTutorial") {
                     root.activeView = "firstUseTutorial";
                 } else if (!Settings.getValue("isFirstUseOfPurchases", true) && root.activeView === "initialize") {
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index ae42b8e3e1..0534c9fe1c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -56,11 +56,19 @@ Rectangle {
                         (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
                 }
             } else if (walletStatus === 2) {
+                if (root.activeView != "preexisting") {
+                    root.activeView = "preexisting";
+                }
+            } else if (walletStatus === 3) {
+                if (root.activeView != "conflicting") {
+                    root.activeView = "conflicting";
+                }
+            } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";
                     UserActivityLogger.commercePassphraseEntry("wallet app");
                 }
-            } else if (walletStatus === 3) {
+            } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
                     root.activeView = "walletHome";
                     Commerce.getSecurityImage();
@@ -168,6 +176,10 @@ Rectangle {
     //
     // TITLE BAR END
     //
+    WalletChoice {
+        visible: (root.activeView === "preexisiting") || (root.activeView === "conflicting");
+        activeView: root.activeView;
+    }
 
     WalletSetup {
         id: walletSetup;
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
new file mode 100644
index 0000000000..3c24a82c89
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -0,0 +1,23 @@
+//
+//  WalletChoice.qml
+//  qml/hifi/commerce/wallet
+//
+//  WalletChoice
+//
+//  Created by Howard Stearns
+//  Copyright 2018 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 Hifi 1.0 as Hifi
+import QtQuick 2.5
+import "../../../styles-uit"
+
+Rectangle {
+    property string activeView: "conflict";
+    RalewayRegular {
+        text: "You have a wallet elsewhere." + activeView;
+    }
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 83c1a2035d..ddcb4f7cee 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -318,8 +318,8 @@ Item {
 
                 RalewayRegular {
                     id: noActivityText;
-                text: "<b>The Wallet app is in closed Beta.</b><br><br>To request entry and <b>receive free HFC</b>, please contact " +
-                "<b>info@highfidelity.com</b> with your High Fidelity account username and the email address registered to that account.";
+                text: "To <b>receive free HFC</b>, please go to " +
+                '<a href="hifi://BankOfHighFidelity/415.049,5.55924,-254.583/0,0.995213,0,0.0977305">BankOfHighFidelity</a>';
                 // Text size
                 size: 24;
                 // Style
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 10ddd4c110..754b0d0903 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -22,6 +22,8 @@
 // inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}}
 // balance answers {status: 'success', data: {balance: integer}}
 // buy and receive_at answer {status: 'success'}
+// account synthesizes a result {status: 'success', data: {keyStatus: "preexisting"|"conflicting"|"ok"}}
+
 
 QJsonObject Ledger::apiResponse(const QString& label, QNetworkReply& reply) {
     QByteArray response = reply.readAll();
@@ -178,7 +180,7 @@ QString transactionString(const QJsonObject& valueObject) {
     } else {
         result += valueObject["message"].toString();
     }
-    
+
     // no matter what we append a smaller date to the bottom of this...
     result += QString("<br><font size='-2' color='#1080B8'>%1").arg(createdAt.toLocalTime().toString(Qt::DefaultLocaleShortDate));
     return result;
@@ -250,13 +252,26 @@ void Ledger::accountSuccess(QNetworkReply& reply) {
     wallet->setIv(iv);
     wallet->setCKey(ckey);
 
+    QString keyStatus = "ok";
     QStringList localPublicKeys = wallet->listPublicKeys();
-    if (remotePublicKey.isEmpty() && !localPublicKeys.isEmpty()) {
-        receiveAt(localPublicKeys.first(), "");
+    if (remotePublicKey.isEmpty()) {
+        if (!localPublicKeys.isEmpty()) {
+            receiveAt(localPublicKeys.first(), "");
+        }
+    } else {
+        if (localPublicKeys.isEmpty()) {
+            keyStatus = "preexisting";
+        } else if (localPublicKeys.first() != remotePublicKey) {
+            keyStatus = "conflicting";
+        }
     }
 
     // none of the hfc account info should be emitted
-    emit accountResult(QJsonObject{ {"status", "success"} });
+    QJsonObject json;
+    QJsonObject responseData{ { "status", "success"} };
+    json["keyStatus"] = keyStatus;
+    responseData["data"] = json;
+    emit accountResult(responseData);
 }
 
 void Ledger::accountFailure(QNetworkReply& reply) {
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 9599af827f..ad3d8725a1 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -300,17 +300,24 @@ Wallet::Wallet() {
     packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
     packetReceiver.registerListener(PacketType::ChallengeOwnershipRequest, this, "handleChallengeOwnershipPacket");
 
-    connect(ledger.data(), &Ledger::accountResult, this, [&]() {
+    connect(ledger.data(), &Ledger::accountResult, this, [&](QJsonObject result) {
         auto wallet = DependencyManager::get<Wallet>();
         auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
         uint status;
+        QString keyStatus = result.contains("data") ? result["data"].toObject()["keyStatus"].toString() : "";
 
         if (wallet->getKeyFilePath() == "" || !wallet->getSecurityImage()) {
-            status = (uint)WalletStatus::WALLET_STATUS_NOT_SET_UP;
+            if (keyStatus == "preexisting") {
+                status = (uint) WalletStatus::WALLET_STATUS_PREEXISTING;
+            } else{
+                status = (uint) WalletStatus::WALLET_STATUS_NOT_SET_UP;
+            }
         } else if (!wallet->walletIsAuthenticatedWithPassphrase()) {
-            status = (uint)WalletStatus::WALLET_STATUS_NOT_AUTHENTICATED;
+            status = (uint) WalletStatus::WALLET_STATUS_NOT_AUTHENTICATED;
+        } else if (keyStatus == "conflicting") {
+            status = (uint) WalletStatus::WALLET_STATUS_CONFLICTING;
         } else {
-            status = (uint)WalletStatus::WALLET_STATUS_READY;
+            status = (uint) WalletStatus::WALLET_STATUS_READY;
         }
 
         walletScriptingInterface->setWalletStatus(status);
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index fe3a9f1d5f..fd7aba4adc 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -53,6 +53,8 @@ public:
     enum WalletStatus {
         WALLET_STATUS_NOT_LOGGED_IN = 0,
         WALLET_STATUS_NOT_SET_UP,
+        WALLET_STATUS_PREEXISTING,
+        WALLET_STATUS_CONFLICTING,
         WALLET_STATUS_NOT_AUTHENTICATED,
         WALLET_STATUS_READY
     };

From 277e556b48666cddee5e04ac181caa1cd969fa8f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 22 Feb 2018 16:22:18 -0800
Subject: [PATCH 454/569] Create a standard function to init Hifi Apps

---
 assignment-client/src/main.cpp         | 16 ++--------------
 domain-server/src/main.cpp             | 16 +---------------
 ice-server/src/main.cpp                | 11 +++--------
 interface/src/Application.cpp          |  7 ++-----
 interface/src/main.cpp                 | 11 +----------
 libraries/shared/src/LogHandler.cpp    | 12 ++++++++++--
 libraries/shared/src/SharedUtil.cpp    | 20 ++++++++++++++++++++
 libraries/shared/src/SharedUtil.h      |  1 +
 tests/entities/src/main.cpp            |  3 +++
 tests/gpu-test/src/main.cpp            |  5 ++++-
 tests/ktx/src/KtxTests.cpp             |  3 ++-
 tests/qml/src/main.cpp                 | 12 ++----------
 tests/qt59/src/main.cpp                |  7 ++-----
 tests/recording/src/main.cpp           | 16 +++++-----------
 tests/render-perf/src/main.cpp         | 18 ++----------------
 tests/render-texture-load/src/main.cpp | 16 ++--------------
 tests/render-utils/src/main.cpp        | 17 +++--------------
 tests/shaders/src/main.cpp             | 16 +++-------------
 tools/ac-client/src/main.cpp           |  7 +------
 tools/atp-client/src/main.cpp          |  7 +------
 tools/auto-tester/src/main.cpp         |  2 +-
 tools/ice-client/src/main.cpp          |  4 ++++
 tools/oven/src/main.cpp                |  7 +------
 tools/skeleton-dump/src/main.cpp       |  4 ++++
 tools/udt-test/src/UDTTest.cpp         |  2 --
 tools/udt-test/src/main.cpp            |  4 ++++
 tools/vhacd-util/src/main.cpp          |  4 ++++
 27 files changed, 88 insertions(+), 160 deletions(-)

diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index bf4497984f..971e9ed272 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -9,25 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <LogHandler.h>
+#include <BuildInfo.h>
 #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);
-
-    setupGlobalInstances();
-
-    qInstallMessageHandler(LogHandler::verboseMessageHandler);
-    qInfo() << "Starting.";
-
+    setupHifiApplication(BuildInfo::ASSIGNMENT_CLIENT_NAME);
 
     AssignmentClientApp app(argc, argv);
     
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index e258626223..d7856bf867 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -22,24 +22,10 @@
 #include "DomainServer.h"
 
 int main(int argc, char* argv[]) {
-    disableQtBearerPoll(); // Fixes wifi ping spikes
+    setupHifiApplication(BuildInfo::DOMAIN_SERVER_NAME);
 
-    QCoreApplication::setApplicationName(BuildInfo::DOMAIN_SERVER_NAME);
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
-
-    setupGlobalInstances();
-    
     Setting::init();
 
-#ifndef WIN32
-    setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
-
-    qInstallMessageHandler(LogHandler::verboseMessageHandler);
-    qInfo() << "Starting.";
-
     int currentExitCode = 0;
 
     // use a do-while to handle domain-server restart
diff --git a/ice-server/src/main.cpp b/ice-server/src/main.cpp
index ec8b9957cf..aac6cc0422 100644
--- a/ice-server/src/main.cpp
+++ b/ice-server/src/main.cpp
@@ -11,18 +11,13 @@
 
 #include <QtCore/QCoreApplication>
 
-#include <LogHandler.h>
+#include <SharedUtil.h>
 
 #include "IceServer.h"
 
 int main(int argc, char* argv[]) {
-#ifndef WIN32
-    setvbuf(stdout, NULL, _IOLBF, 0);
-#endif
-
-    qInstallMessageHandler(LogHandler::verboseMessageHandler);
-    qInfo() << "Starting.";
+    setupHifiApplication("Ice Server");
     
     IceServer iceServer(argc, argv);
     return iceServer.exec();
-}
\ No newline at end of file
+}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3aa0f3d889..e956195ca6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -575,10 +575,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
     QString logMessage = LogHandler::getInstance().printMessage((LogMsgType) type, context, message);
 
     if (!logMessage.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(logMessage.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#elif defined Q_OS_ANDROID
+#ifdef Q_OS_ANDROID
         const char * local=logMessage.toStdString().c_str();
         switch (type) {
             case QtDebugMsg:
@@ -599,7 +596,7 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
                 abort();
         }
 #endif
-        qApp->getLogger()->addMessage(qPrintable(logMessage + "\n"));
+        qApp->getLogger()->addMessage(qPrintable(logMessage));
     }
 }
 
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 0f8134b253..e80dc1d213 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -38,6 +38,7 @@ extern "C" {
 #endif
 
 int main(int argc, const char* argv[]) {
+    setupHifiApplication(BuildInfo::INTERFACE_NAME);
 
 #ifdef Q_OS_LINUX
     QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
@@ -51,19 +52,9 @@ int main(int argc, const char* argv[]) {
     QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
 #endif
 
-    disableQtBearerPoll(); // Fixes wifi ping spikes
-
     QElapsedTimer startupTime;
     startupTime.start();
 
-    // Set application infos
-    QCoreApplication::setApplicationName(BuildInfo::INTERFACE_NAME);
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
-
-    setupGlobalInstances();
-
     Setting::init();
 
     // Instance UserActivityLogger now that the settings are loaded
diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp
index aa67c14c4b..ff0d68dcce 100644
--- a/libraries/shared/src/LogHandler.cpp
+++ b/libraries/shared/src/LogHandler.cpp
@@ -14,6 +14,10 @@
 
 #include <mutex>
 
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 #include <QtCore/QDebug>
@@ -184,8 +188,12 @@ QString LogHandler::printMessage(LogMsgType type, const QMessageLogContext& cont
         }
     }
 
-    QString logMessage = QString("%1 %2").arg(prefixString, message.split('\n').join('\n' + prefixString + " "));
-    fprintf(stdout, "%s\n", qPrintable(logMessage));
+    QString logMessage = QString("%1 %2\n").arg(prefixString, message.split('\n').join('\n' + prefixString + " "));
+
+    fprintf(stdout, "%s", qPrintable(logMessage));
+#ifdef Q_OS_WIN
+    OutputDebugStringA(qPrintable(logMessage));
+#endif
     return logMessage;
 }
 
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 772340b631..d05e940322 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -59,6 +59,9 @@ extern "C" FILE * __cdecl __iob_func(void) {
 #include <QSysInfo>
 #include <QThread>
 
+#include <BuildInfo.h>
+
+#include "LogHandler.h"
 #include "NumericalConstants.h"
 #include "OctalCode.h"
 #include "SharedLogging.h"
@@ -1179,6 +1182,23 @@ void watchParentProcess(int parentPID) {
 }
 #endif
 
+void setupHifiApplication(QString applicationName) {
+    disableQtBearerPoll(); // Fixes wifi ping spikes
+
+    QCoreApplication::setApplicationName(applicationName);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
+    setupGlobalInstances();
+
+#ifndef WIN32
+    setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
+
+    qInstallMessageHandler(LogHandler::verboseMessageHandler);
+    qInfo() << "Starting.";
+}
 
 #ifdef Q_OS_WIN
 QString getLastErrorAsString() {
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 64bbc6585b..7cb750d3e3 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -228,6 +228,7 @@ void watchParentProcess(int parentPID);
 
 bool processIsRunning(int64_t pid);
 
+void setupHifiApplication(QString applicationName);
 
 #ifdef Q_OS_WIN
 void* createProcessGroup();
diff --git a/tests/entities/src/main.cpp b/tests/entities/src/main.cpp
index 792ef7d9c6..bf79f9d3e9 100644
--- a/tests/entities/src/main.cpp
+++ b/tests/entities/src/main.cpp
@@ -20,6 +20,7 @@
 #include <EntityItemProperties.h>
 #include <Octree.h>
 #include <PathUtils.h>
+#include <SharedUtil.h>
 
 const QString& getTestResourceDir() {
     static QString dir;
@@ -136,6 +137,8 @@ void testPropertyFlags() {
 }
 
 int main(int argc, char** argv) {
+    setupHifiApplication("Entities Test");
+
     QCoreApplication app(argc, argv);
     {
         auto start = usecTimestampNow();
diff --git a/tests/gpu-test/src/main.cpp b/tests/gpu-test/src/main.cpp
index 6a509afe4e..77ce015e3f 100644
--- a/tests/gpu-test/src/main.cpp
+++ b/tests/gpu-test/src/main.cpp
@@ -45,6 +45,7 @@
 #include <TextureCache.h>
 #include <PerfStat.h>
 #include <PathUtils.h>
+#include <SharedUtil.h>
 #include <ViewFrustum.h>
 
 #include <gpu/Pipeline.h>
@@ -192,7 +193,9 @@ void testSparseRectify() {
     }
 }
 
-int main(int argc, char** argv) {   
+int main(int argc, char** argv) {
+    setupHifiApplication("GPU Test");
+
     testSparseRectify();
 
     // FIXME this test appears to be broken
diff --git a/tests/ktx/src/KtxTests.cpp b/tests/ktx/src/KtxTests.cpp
index 94e5d7e8e7..65d9cbec3d 100644
--- a/tests/ktx/src/KtxTests.cpp
+++ b/tests/ktx/src/KtxTests.cpp
@@ -149,7 +149,8 @@ static const QString TEST_FOLDER { "H:/ktx_cacheold" };
 static const QString EXTENSIONS { "*.ktx" };
 
 int mainTemp(int, char**) {
-    qInstallMessageHandler(messageHandler);
+    setupHifiApplication("KTX Tests");
+
     auto fileInfoList = QDir { TEST_FOLDER }.entryInfoList(QStringList  { EXTENSIONS });
     for (auto fileInfo : fileInfoList) {
         qDebug() << fileInfo.filePath();
diff --git a/tests/qml/src/main.cpp b/tests/qml/src/main.cpp
index 219efa5996..022f7290f4 100644
--- a/tests/qml/src/main.cpp
+++ b/tests/qml/src/main.cpp
@@ -179,18 +179,10 @@ void TestWindow::resizeEvent(QResizeEvent* ev) {
     resizeWindow(ev->size());
 }
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    if (!message.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(message.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#endif
-    }
-}
+int main(int argc, char** argv) {
+    setupHifiApplication("QML Test");
 
-int main(int argc, char** argv) {   
     QGuiApplication app(argc, argv);
-    qInstallMessageHandler(messageHandler);
     TestWindow window;
     app.exec();
     return 0;
diff --git a/tests/qt59/src/main.cpp b/tests/qt59/src/main.cpp
index 7b95cabd6c..19b922de9f 100644
--- a/tests/qt59/src/main.cpp
+++ b/tests/qt59/src/main.cpp
@@ -63,14 +63,11 @@ void Qt59TestApp::finish(int exitCode) {
 
 
 int main(int argc, char * argv[]) {
-    QCoreApplication::setApplicationName("Qt59Test");
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+    setupHifiApplication("Qt59Test");
 
     Qt59TestApp app(argc, argv);
 
     return app.exec();
 }
 
-#include "main.moc"
\ No newline at end of file
+#include "main.moc"
diff --git a/tests/recording/src/main.cpp b/tests/recording/src/main.cpp
index f4049b04b7..1b4e5adf6d 100644
--- a/tests/recording/src/main.cpp
+++ b/tests/recording/src/main.cpp
@@ -10,6 +10,8 @@
 #include <recording/Clip.h>
 #include <recording/Frame.h>
 
+#include <SharedUtil.h>
+
 #include "Constants.h"
 
 using namespace recording;
@@ -97,18 +99,10 @@ void testClipOrdering() {
     Q_UNUSED(lastFrameTimeOffset); // FIXME - Unix build not yet upgraded to Qt 5.5.1 we can remove this once it is
 }
 
-#ifdef Q_OS_WIN32
-void myMessageHandler(QtMsgType type, const QMessageLogContext & context, const QString & msg) {
-    OutputDebugStringA(msg.toLocal8Bit().toStdString().c_str());
-    OutputDebugStringA("\n");
-}
-#endif
-
 int main(int, const char**) {
-#ifdef Q_OS_WIN32
-    qInstallMessageHandler(myMessageHandler);
-#endif
+    setupHifiApplication("Recording Test");
+
     testFrameTypeRegistration();
     testFilePersist();
     testClipOrdering();
-}
\ No newline at end of file
+}
diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp
index 2bf0c74067..ec56555f68 100644
--- a/tests/render-perf/src/main.cpp
+++ b/tests/render-perf/src/main.cpp
@@ -1138,31 +1138,17 @@ private:
 
 bool QTestWindow::_cullingEnabled = true;
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    QString logMessage = LogHandler::getInstance().printMessage((LogMsgType)type, context, message);
-
-    if (!logMessage.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(logMessage.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#endif
-        logger->addMessage(qPrintable(logMessage + "\n"));
-    }
-}
-
 const char * LOG_FILTER_RULES = R"V0G0N(
 hifi.gpu=true
 )V0G0N";
 
 
 int main(int argc, char** argv) {
+    setupHifiApplication("RenderPerf");
+
     QApplication app(argc, argv);
-    QCoreApplication::setApplicationName("RenderPerf");
-    QCoreApplication::setOrganizationName("High Fidelity");
-    QCoreApplication::setOrganizationDomain("highfidelity.com");
     logger.reset(new FileLogger());
 
-    qInstallMessageHandler(messageHandler);
     QLoggingCategory::setFilterRules(LOG_FILTER_RULES);
     QTestWindow::setup();
     QTestWindow window;
diff --git a/tests/render-texture-load/src/main.cpp b/tests/render-texture-load/src/main.cpp
index 066b39fc40..62c970cab5 100644
--- a/tests/render-texture-load/src/main.cpp
+++ b/tests/render-texture-load/src/main.cpp
@@ -610,16 +610,6 @@ private:
     bool _ready { false };
 };
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    if (!message.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(message.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#endif
-        std::cout << message.toLocal8Bit().constData() << std::endl;
-    }
-}
-
 const char * LOG_FILTER_RULES = R"V0G0N(
 hifi.gpu=true
 )V0G0N";
@@ -645,11 +635,9 @@ void unzipTestData(const QByteArray& zipData) {
 }
 
 int main(int argc, char** argv) {
+    setupHifiApplication("RenderPerf");
+
     QApplication app(argc, argv);
-    QCoreApplication::setApplicationName("RenderPerf");
-    QCoreApplication::setOrganizationName("High Fidelity");
-    QCoreApplication::setOrganizationDomain("highfidelity.com");
-    qInstallMessageHandler(messageHandler);
     QLoggingCategory::setFilterRules(LOG_FILTER_RULES);
 
     if (!DATA_DIR.exists()) {
diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp
index 741fdbdddd..e30a80f3d9 100644
--- a/tests/render-utils/src/main.cpp
+++ b/tests/render-utils/src/main.cpp
@@ -179,25 +179,14 @@ void QTestWindow::draw() {
     }
 }
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    if (!message.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(message.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#else 
-        std::cout << message.toLocal8Bit().constData() << std::endl;
-#endif
-    }
-}
-
-
 const char * LOG_FILTER_RULES = R"V0G0N(
 hifi.gpu=true
 )V0G0N";
 
-int main(int argc, char** argv) {    
+int main(int argc, char** argv) {
+    setupHifiApplication("Render Utils Test");
+
     QGuiApplication app(argc, argv);
-    qInstallMessageHandler(messageHandler);
     QLoggingCategory::setFilterRules(LOG_FILTER_RULES);
     QTestWindow window;
     QTimer timer;
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 585bc432a9..a3b4196031 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -214,24 +214,14 @@ void QTestWindow::draw() {
     _context.swapBuffers(this);
 }
 
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    if (!message.isEmpty()) {
-#ifdef Q_OS_WIN
-        OutputDebugStringA(message.toLocal8Bit().constData());
-        OutputDebugStringA("\n");
-#else 
-        std::cout << message.toLocal8Bit().constData() << std::endl;
-#endif
-    }
-}
-
 const char * LOG_FILTER_RULES = R"V0G0N(
 hifi.gpu=true
 )V0G0N";
 
-int main(int argc, char** argv) {    
+int main(int argc, char** argv) {
+    setupHifiApplication("Shaders Test");
+
     QGuiApplication app(argc, argv);
-    qInstallMessageHandler(messageHandler);
     QLoggingCategory::setFilterRules(LOG_FILTER_RULES);
     QTestWindow window;
     QTimer timer;
diff --git a/tools/ac-client/src/main.cpp b/tools/ac-client/src/main.cpp
index 139e44bc9a..024a891d3c 100644
--- a/tools/ac-client/src/main.cpp
+++ b/tools/ac-client/src/main.cpp
@@ -20,12 +20,7 @@
 using namespace std;
 
 int main(int argc, char* argv[]) {
-    QCoreApplication::setApplicationName(BuildInfo::AC_CLIENT_SERVER_NAME);
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
-
-    setupGlobalInstances();
+    setupHifiApplication(BuildInfo::AC_CLIENT_SERVER_NAME);
     
     Setting::init();
 
diff --git a/tools/atp-client/src/main.cpp b/tools/atp-client/src/main.cpp
index 0a8274fedd..2a267c088c 100644
--- a/tools/atp-client/src/main.cpp
+++ b/tools/atp-client/src/main.cpp
@@ -20,12 +20,7 @@
 using namespace std;
 
 int main(int argc, char * argv[]) {
-    QCoreApplication::setApplicationName(BuildInfo::AC_CLIENT_SERVER_NAME);
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
-
-    setupGlobalInstances();
+    setupHifiApplication("ATP Client");
     
     Setting::init();
 
diff --git a/tools/auto-tester/src/main.cpp b/tools/auto-tester/src/main.cpp
index 45a3743482..6e5e06b732 100644
--- a/tools/auto-tester/src/main.cpp
+++ b/tools/auto-tester/src/main.cpp
@@ -17,4 +17,4 @@ int main(int argc, char *argv[]) {
     autoTester.show();
 
     return application.exec();
-}
\ No newline at end of file
+}
diff --git a/tools/ice-client/src/main.cpp b/tools/ice-client/src/main.cpp
index c70a7eb7d7..60a5d4e0e4 100644
--- a/tools/ice-client/src/main.cpp
+++ b/tools/ice-client/src/main.cpp
@@ -13,11 +13,15 @@
 #include <string>
 #include <vector>
 
+#include <SharedUtil.h>
+
 #include "ICEClientApp.h"
 
 using namespace std;
 
 int main(int argc, char * argv[]) {
+    setupHifiApplication("ICE Client");
+
     ICEClientApp app(argc, argv);
     return app.exec();
 }
diff --git a/tools/oven/src/main.cpp b/tools/oven/src/main.cpp
index be0c22a0c6..3f4afe1f15 100644
--- a/tools/oven/src/main.cpp
+++ b/tools/oven/src/main.cpp
@@ -15,12 +15,7 @@
 #include <SharedUtil.h>
 
 int main (int argc, char** argv) {
-    QCoreApplication::setApplicationName("Oven");
-    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
-
-    setupGlobalInstances();
+    setupHifiApplication("Oven");
 
     // init the settings interface so we can save and load settings
     Setting::init();
diff --git a/tools/skeleton-dump/src/main.cpp b/tools/skeleton-dump/src/main.cpp
index 6cf4d41f31..d5919c4a88 100644
--- a/tools/skeleton-dump/src/main.cpp
+++ b/tools/skeleton-dump/src/main.cpp
@@ -14,9 +14,13 @@
 #include <vector>
 #include <QDebug>
 
+#include <SharedUtil.h>
+
 #include "SkeletonDumpApp.h"
 
 int main(int argc, char * argv[]) {
+    setupHifiApplication("Skeleton Dump App");
+
     SkeletonDumpApp app(argc, argv);
     return app.getReturnCode();
 }
diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp
index 6161dbfdbc..ce89f04ce5 100644
--- a/tools/udt-test/src/UDTTest.cpp
+++ b/tools/udt-test/src/UDTTest.cpp
@@ -71,8 +71,6 @@ const QStringList SERVER_STATS_TABLE_HEADERS {
 UDTTest::UDTTest(int& argc, char** argv) :
     QCoreApplication(argc, argv)
 {
-    qInstallMessageHandler(LogHandler::verboseMessageHandler);
-    
     parseArguments();
     
     // randomize the seed for packet size randomization
diff --git a/tools/udt-test/src/main.cpp b/tools/udt-test/src/main.cpp
index ccb7d0af0f..d88218c0d0 100644
--- a/tools/udt-test/src/main.cpp
+++ b/tools/udt-test/src/main.cpp
@@ -10,9 +10,13 @@
 
 #include <QtCore/QCoreApplication>
 
+#include <SharedUtil.h>
+
 #include "UDTTest.h"
 
 int main(int argc, char* argv[]) {
+    setupHifiApplication("UDT Test);
+
     UDTTest app(argc, argv);
     return app.exec();
 }
diff --git a/tools/vhacd-util/src/main.cpp b/tools/vhacd-util/src/main.cpp
index 42c9db9513..817e77bf8e 100644
--- a/tools/vhacd-util/src/main.cpp
+++ b/tools/vhacd-util/src/main.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <vector>
 
+#include <SharedUtil.h>
+
 #include "VHACDUtilApp.h"
 
 using namespace std;
@@ -22,6 +24,8 @@ using namespace VHACD;
 
 
 int main(int argc, char * argv[]) {
+    setupHifiApplication("VHACD Util");
+
     VHACDUtilApp app(argc, argv);
     return app.getReturnCode();
 }

From 249f0568a14157e8a48f0071b65283127e9f93d1 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 22 Feb 2018 17:14:23 -0800
Subject: [PATCH 455/569] New loader

---
 .../qml/hifi/commerce/checkout/Checkout.qml     |   7 ++++---
 .../hifi/commerce/common/images/loader-blue.gif | Bin 0 -> 59768 bytes
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 interface/resources/qml/hifi/commerce/common/images/loader-blue.gif

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 10894109ef..d88ded6a15 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -319,7 +319,7 @@ Rectangle {
             z: 997;
             visible: !root.ownershipStatusReceived || !root.balanceReceived;
             anchors.fill: parent;
-            color: Qt.rgba(0.0, 0.0, 0.0, 0.7);
+            color: hifi.colors.white;
 
             // This object is always used in a popup.
             // This MouseArea is used to prevent a user from being
@@ -331,8 +331,9 @@ Rectangle {
             }
                 
             AnimatedImage {
-                source: "../common/images/loader.gif"
-                width: 96;
+                id: loadingImage;
+                source: "../common/images/loader-blue.gif"
+                width: 74;
                 height: width;
                 anchors.verticalCenter: parent.verticalCenter;
                 anchors.horizontalCenter: parent.horizontalCenter;
diff --git a/interface/resources/qml/hifi/commerce/common/images/loader-blue.gif b/interface/resources/qml/hifi/commerce/common/images/loader-blue.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8b9e17053b2420e2ea3dcf68e3677d172858a9b5
GIT binary patch
literal 59768
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
JQU6!<{{a1V;yeHV

literal 0
HcmV?d00001


From 902672f85ececbb87944a28e73efdde555d3a054 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 22 Feb 2018 17:20:36 -0800
Subject: [PATCH 456/569] add dynamic mode for scripted avatar motor

---
 interface/src/avatar/MyAvatar.cpp | 92 +++++++++++++++++++++++--------
 interface/src/avatar/MyAvatar.h   |  5 ++
 libraries/gl/src/gl/Context.cpp   |  2 +-
 3 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c25aaeeecd..445b176c15 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -79,6 +79,8 @@ float DEFAULT_SCRIPTED_MOTOR_TIMESCALE = 1.0e6f;
 const int SCRIPTED_MOTOR_CAMERA_FRAME = 0;
 const int SCRIPTED_MOTOR_AVATAR_FRAME = 1;
 const int SCRIPTED_MOTOR_WORLD_FRAME = 2;
+const int SCRIPTED_MOTOR_SIMPLE_MODE = 0;
+const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1;
 const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav";
 
 const float MyAvatar::ZOOM_MIN = 0.5f;
@@ -92,6 +94,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     _pitchSpeed(PITCH_SPEED_DEFAULT),
     _scriptedMotorTimescale(DEFAULT_SCRIPTED_MOTOR_TIMESCALE),
     _scriptedMotorFrame(SCRIPTED_MOTOR_CAMERA_FRAME),
+    _scriptedMotorMode(SCRIPTED_MOTOR_SIMPLE_MODE),
     _motionBehaviors(AVATAR_MOTION_DEFAULTS),
     _characterController(this),
     _eyeContactTarget(LEFT_EYE),
@@ -1623,32 +1626,38 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act
 void MyAvatar::updateMotors() {
     _characterController.clearMotors();
     glm::quat motorRotation;
+    glm::quat avatarOrientation = getWorldOrientation();
+
+    const float FLYING_MOTOR_TIMESCALE = 0.05f;
+    const float WALKING_MOTOR_TIMESCALE = 0.2f;
+    const float INVALID_MOTOR_TIMESCALE = 1.0e6f;
+
+    float horizontalMotorTimescale;
+    float verticalMotorTimescale;
+
+    if (_characterController.getState() == CharacterController::State::Hover ||
+            _characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
+        horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE;
+        verticalMotorTimescale = FLYING_MOTOR_TIMESCALE;
+    }
+    else {
+        horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE;
+        verticalMotorTimescale = INVALID_MOTOR_TIMESCALE;
+    }
+
     if (_motionBehaviors & AVATAR_MOTION_ACTION_MOTOR_ENABLED) {
-
-        const float FLYING_MOTOR_TIMESCALE = 0.05f;
-        const float WALKING_MOTOR_TIMESCALE = 0.2f;
-        const float INVALID_MOTOR_TIMESCALE = 1.0e6f;
-
-        float horizontalMotorTimescale;
-        float verticalMotorTimescale;
-
         if (_characterController.getState() == CharacterController::State::Hover ||
                 _characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
             motorRotation = getMyHead()->getHeadOrientation();
-            horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE;
-            verticalMotorTimescale = FLYING_MOTOR_TIMESCALE;
         } else {
             // non-hovering = walking: follow camera twist about vertical but not lift
             // we decompose camera's rotation and store the twist part in motorRotation
             // however, we need to perform the decomposition in the avatar-frame
             // using the local UP axis and then transform back into world-frame
-            glm::quat orientation = getWorldOrientation();
-            glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame
+            glm::quat headOrientation = glm::inverse(avatarOrientation) * getMyHead()->getHeadOrientation(); // avatar-frame
             glm::quat liftRotation;
             swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation);
-            motorRotation = orientation * motorRotation;
-            horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE;
-            verticalMotorTimescale = INVALID_MOTOR_TIMESCALE;
+            motorRotation = avatarOrientation * motorRotation;
         }
 
         if (_isPushing || _isBraking || !_isBeingPushed) {
@@ -1660,15 +1669,36 @@ void MyAvatar::updateMotors() {
         }
     }
     if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
-        if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
-            motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
-            motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        } else {
-            // world-frame
-            motorRotation = glm::quat();
+        if (_scriptedMotorMode == SCRIPTED_MOTOR_SIMPLE_MODE) {
+            if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
+                motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
+            }
+            else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
+                motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
+            }
+            else {
+                // world-frame
+                motorRotation = glm::quat();
+            }
+            _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale);
+        } else { 
+            // dynamic mode
+            glm::vec3 avatarFrameVelocity;
+            if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
+                // convert camera frame velocity to avatar frame
+                glm::quat cameraOrientation = qApp->getCamera().getOrientation();
+                avatarFrameVelocity = glm::inverse(avatarOrientation) * cameraOrientation * _scriptedMotorVelocity;
+            } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_WORLD_FRAME) {
+                // convert world frame velocity to avatar frame
+                avatarFrameVelocity = glm::inverse(avatarOrientation) * _scriptedMotorVelocity;
+            } else {
+                // avatar frame
+                avatarFrameVelocity = _scriptedMotorVelocity;
+            }
+            // dynamic mode for scripted motor uses avatar frame and piggybacks off of the default action motor's timescales
+            motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
+            _characterController.addMotor(avatarFrameVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale);
         }
-        _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale);
     }
 
     // legacy support for 'MyAvatar::applyThrust()', which has always been implemented as a
@@ -1752,6 +1782,14 @@ QString MyAvatar::getScriptedMotorFrame() const {
     return frame;
 }
 
+QString MyAvatar::getScriptedMotorMode() const {
+    QString mode = "simple";
+    if (_scriptedMotorMode == SCRIPTED_MOTOR_DYNAMIC_MODE) {
+        mode = "dynamic";
+    }
+    return mode;
+}
+
 void MyAvatar::setScriptedMotorVelocity(const glm::vec3& velocity) {
     float MAX_SCRIPTED_MOTOR_SPEED = 500.0f;
     _scriptedMotorVelocity = velocity;
@@ -1778,6 +1816,14 @@ void MyAvatar::setScriptedMotorFrame(QString frame) {
     }
 }
 
+void MyAvatar::setScriptedMotorMode(QString frame) {
+    if (frame.toLower() == "simple") {
+        _scriptedMotorMode = SCRIPTED_MOTOR_SIMPLE_MODE;
+    } else if (frame.toLower() == "dynamic") {
+        _scriptedMotorMode = SCRIPTED_MOTOR_DYNAMIC_MODE;
+    }
+}
+
 void MyAvatar::clearScriptableSettings() {
     _scriptedMotorVelocity = Vectors::ZERO;
     _scriptedMotorTimescale = DEFAULT_SCRIPTED_MOTOR_TIMESCALE;
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 28af8b62fd..464d94bce7 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -69,6 +69,7 @@ class MyAvatar : public Avatar {
      * @property motorTimescale {float} Specifies how quickly the avatar should accelerate to meet the motorVelocity,
      *   smaller values will result in higher acceleration.
      * @property motorReferenceFrame {string} Reference frame of the motorVelocity, must be one of the following: "avatar", "camera", "world"
+     * @property motorMode {string} Type of scripted motor behavior, "simple" = unmodified legacy behavior and "dynamic" = same as default motor
      * @property collisionSoundURL {string} Specifies the sound to play when the avatar experiences a collision.
      *   You can provide a mono or stereo 16-bit WAV file running at either 24 Khz or 48 Khz.
      *   The latter is downsampled by the audio mixer, so all audio effectively plays back at a 24 Khz sample rate.
@@ -124,6 +125,7 @@ class MyAvatar : public Avatar {
     Q_PROPERTY(glm::vec3 motorVelocity READ getScriptedMotorVelocity WRITE setScriptedMotorVelocity)
     Q_PROPERTY(float motorTimescale READ getScriptedMotorTimescale WRITE setScriptedMotorTimescale)
     Q_PROPERTY(QString motorReferenceFrame READ getScriptedMotorFrame WRITE setScriptedMotorFrame)
+    Q_PROPERTY(QString motorMode READ getScriptedMotorMode WRITE setScriptedMotorMode)
     Q_PROPERTY(QString collisionSoundURL READ getCollisionSoundURL WRITE setCollisionSoundURL)
     Q_PROPERTY(AudioListenerMode audioListenerMode READ getAudioListenerMode WRITE setAudioListenerMode)
     Q_PROPERTY(glm::vec3 customListenPosition READ getCustomListenPosition WRITE setCustomListenPosition)
@@ -662,9 +664,11 @@ private:
     glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
     float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
     QString getScriptedMotorFrame() const;
+    QString getScriptedMotorMode() const;
     void setScriptedMotorVelocity(const glm::vec3& velocity);
     void setScriptedMotorTimescale(float timescale);
     void setScriptedMotorFrame(QString frame);
+    void setScriptedMotorMode(QString frame);
     virtual void attach(const QString& modelURL, const QString& jointName = QString(),
                         const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(),
                         float scale = 1.0f, bool isSoft = false,
@@ -706,6 +710,7 @@ private:
     glm::vec3 _scriptedMotorVelocity; // target local-frame velocity of avatar (analog script)
     float _scriptedMotorTimescale; // timescale for avatar to achieve its target velocity
     int _scriptedMotorFrame;
+    int _scriptedMotorMode;
     quint32 _motionBehaviors;
     QString _collisionSoundURL;
 
diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 309839808e..155849bffa 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -147,7 +147,7 @@ static void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum s
     }
     // FIXME For high severity errors, force a sync to the log, since we might crash
     // before the log file was flushed otherwise.  Performance hit here
-    qCDebug(glLogging) << "OpenGL: " << message;
+    //qCDebug(glLogging) << "OpenGL: " << message;
 }
 
 static void setupPixelFormatSimple(HDC hdc) {

From 9f68accb302e6ea59120a9bb5717df00e2788fc7 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Thu, 22 Feb 2018 17:34:00 -0800
Subject: [PATCH 457/569] add menu for testing unresponsive interface

---
 interface/src/Application.cpp | 12 ++++++++++++
 interface/src/Application.h   |  1 +
 interface/src/Menu.cpp        |  1 +
 interface/src/Menu.h          |  1 +
 4 files changed, 15 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8c3e6f130d..e8264a398a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7542,6 +7542,18 @@ void Application::deadlockApplication() {
     }
 }
 
+// cause main thread to be unresponsive for 35 seconds
+void Application::unresponsiveApplication() {
+    // to avoid compiler warnings about a loop that will never exit
+    uint64_t start = usecTimestampNow();
+    uint64_t UNRESPONSIVE_FOR_SECONDS = 35;
+    uint64_t UNRESPONSIVE_FOR_USECS = UNRESPONSIVE_FOR_SECONDS * USECS_PER_SECOND;
+    qCDebug(interfaceapp) << "Intentionally cause Interface to be unresponsive for " << UNRESPONSIVE_FOR_SECONDS << " seconds";
+    while (usecTimestampNow() - start < UNRESPONSIVE_FOR_USECS) {
+        QThread::sleep(1);
+    }
+}
+
 void Application::setActiveDisplayPlugin(const QString& pluginName) {
     auto menu = Menu::getInstance();
     foreach(DisplayPluginPointer displayPlugin, PluginManager::getInstance()->getDisplayPlugins()) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index d4041aa3be..5ce9a1619a 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -367,6 +367,7 @@ public slots:
     void updateHeartbeat() const;
 
     static void deadlockApplication();
+    static void unresponsiveApplication(); // cause main thread to be unresponsive for 35 seconds
 
     void rotationModeChanged() const;
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 464de87fdb..5abc59356e 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -713,6 +713,7 @@ Menu::Menu() {
     MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
 
     addActionToQMenuAndActionHash(crashMenu, MenuOption::DeadlockInterface, 0, qApp, SLOT(deadlockApplication()));
+    addActionToQMenuAndActionHash(crashMenu, MenuOption::UnresponsiveInterface, 0, qApp, SLOT(unresponsiveApplication()));
 
     action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
     connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 8cb1804fd4..9c4efd6ac7 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -77,6 +77,7 @@ namespace MenuOption {
     const QString CrashNewFault = "New Fault";
     const QString CrashNewFaultThreaded = "New Fault (threaded)";
     const QString DeadlockInterface = "Deadlock Interface";
+    const QString UnresponsiveInterface = "Unresponsive Interface";
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DefaultSkybox = "Default Skybox";
     const QString DeleteAvatarBookmark = "Delete Avatar Bookmark...";

From acf04830eebd97b9c2f437df5ba95ad6573b1794 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 22 Feb 2018 17:43:04 -0800
Subject: [PATCH 458/569] Remove deleted file from the _assetsOnDisk set

---
 domain-server/src/AssetsBackupHandler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 70da40ef66..8a65d41a6c 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -106,7 +106,12 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
         });
         if (noCorruptedBackups) {
             for (const auto& hash : deprecatedAssets) {
-                QFile::remove(_assetsDirectory + hash);
+                auto success = QFile::remove(_assetsDirectory + hash);
+                if (success) {
+                    _assetsOnDisk.erase(hash);
+                } else {
+                    qCWarning(asset_backup) << "Could not delete asset:" << hash;
+                }
             }
         } else {
             qCWarning(asset_backup) << "Some backups did not load properly, aborting delete operation for safety.";

From d1c4bde677bb5949751488eeb8ed8937c83fe38a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 20:53:27 -0500
Subject: [PATCH 459/569] revert OBJWriter.cpp

---
 libraries/fbx/src/OBJWriter.cpp | 85 +++++++++++----------------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index ffc34573d4..4441ae6649 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -9,12 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "OBJWriter.h"
-
 #include <QFile>
 #include <QFileInfo>
-#include <graphics/BufferViewHelpers.h>
-#include <graphics/Geometry.h>
+#include "graphics/Geometry.h"
+#include "OBJWriter.h"
 #include "ModelFormatLogging.h"
 
 static QString formatFloat(double n) {
@@ -48,12 +46,9 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
     QList<int> meshNormalStartOffset;
     int currentVertexStartOffset = 0;
     int currentNormalStartOffset = 0;
-    int subMeshIndex = 0;
-    out << "# OBJWriter::writeOBJToTextStream\n";
 
     // write out vertices (and maybe colors)
     foreach (const MeshPointer& mesh, meshes) {
-        out << "# vertices::subMeshIndex " << subMeshIndex++ << "\n";
         meshVertexStartOffset.append(currentVertexStartOffset);
         const gpu::BufferView& vertexBuffer = mesh->getVertexBuffer();
 
@@ -70,10 +65,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
             out << formatFloat(v[1]) << " ";
             out << formatFloat(v[2]);
             if (colorIndex < numColors) {
-                glm::vec3 color = buffer_helpers::convert<glm::vec3>(colorsBufferView, colorIndex);
-                // TODO: still verifying that the above decodes properly; previous variations were:
-                // glm::vec3 color = buffer_helpers::glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(colorsBufferView, colorIndex));
-                // glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
+                glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
                 out << " " << formatFloat(color[0]);
                 out << " " << formatFloat(color[1]);
                 out << " " << formatFloat(color[2]);
@@ -89,17 +81,12 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
 
     // write out normals
     bool haveNormals = true;
-    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
-        out << "# normals::subMeshIndex " << subMeshIndex++ << "\n";
         meshNormalStartOffset.append(currentNormalStartOffset);
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
         for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
-            glm::vec3 normal = buffer_helpers::convert<glm::vec3>(normalsBufferView, i);
-            // TODO: still verifying that the above decodes properly; previous variations were:
-            // glm::vec3 normal = buffer_helpers::glmVecFromVariant<glm::vec3>(buffer_helpers::toVariant(normalsBufferView, i));
-            // glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
+            glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
             out << "vn ";
             out << formatFloat(normal[0]) << " ";
             out << formatFloat(normal[1]) << " ";
@@ -111,9 +98,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
 
     // write out faces
     int nth = 0;
-    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
-        out << "# faces::subMeshIndex " << subMeshIndex++ << "\n";
         currentVertexStartOffset = meshVertexStartOffset.takeFirst();
         currentNormalStartOffset = meshNormalStartOffset.takeFirst();
 
@@ -121,25 +106,35 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& indexBuffer = mesh->getIndexBuffer();
 
         graphics::Index partCount = (graphics::Index)mesh->getNumParts();
-        QString name = (!mesh->displayName.size() ? QString("mesh-%1-part").arg(nth) : QString::fromStdString(mesh->displayName))
-            .replace(QRegExp("[^-_a-zA-Z0-9]"), "_");
         for (int partIndex = 0; partIndex < partCount; partIndex++) {
             const graphics::Mesh::Part& part = partBuffer.get<graphics::Mesh::Part>(partIndex);
 
-            out << QString("g %1-%2-%3\n").arg(subMeshIndex, 3, 10, QChar('0')).arg(name).arg(partIndex);
+            out << "g part-" << nth++ << "\n";
 
-            const bool shorts = indexBuffer._element == gpu::Element::INDEX_UINT16;
-            auto face = [&](uint32_t i0, uint32_t i1, uint32_t i2) {
-                uint32_t index0, index1, index2;
-                if (shorts) {
-                    index0 = indexBuffer.get<uint16_t>(i0);
-                    index1 = indexBuffer.get<uint16_t>(i1);
-                    index2 = indexBuffer.get<uint16_t>(i2);
-                } else {
-                    index0 = indexBuffer.get<uint32_t>(i0);
-                    index1 = indexBuffer.get<uint32_t>(i1);
-                    index2 = indexBuffer.get<uint32_t>(i2);
+            // graphics::Mesh::TRIANGLES
+            // TODO -- handle other formats
+            gpu::BufferView::Iterator<const uint32_t> indexItr = indexBuffer.cbegin<uint32_t>();
+            indexItr += part._startIndex;
+
+            int indexCount = 0;
+            while (indexItr != indexBuffer.cend<uint32_t>() && indexCount < part._numIndices) {
+                uint32_t index0 = *indexItr;
+                indexItr++;
+                indexCount++;
+                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
+                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
+                    break;
                 }
+                uint32_t index1 = *indexItr;
+                indexItr++;
+                indexCount++;
+                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
+                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
+                    break;
+                }
+                uint32_t index2 = *indexItr;
+                indexItr++;
+                indexCount++;
 
                 out << "f ";
                 if (haveNormals) {
@@ -151,30 +146,6 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
                     out << currentVertexStartOffset + index1 + 1 << " ";
                     out << currentVertexStartOffset + index2 + 1 << "\n";
                 }
-            };
-
-            // graphics::Mesh::TRIANGLES / graphics::Mesh::QUADS
-            // TODO -- handle other formats
-            uint32_t len = part._startIndex + part._numIndices;
-            qCDebug(modelformat) << "OBJWriter -- part" << partIndex << "topo" << part._topology << "index elements" << (shorts ? "uint16_t" : "uint32_t");
-            if (part._topology == graphics::Mesh::TRIANGLES && len % 3 != 0) {
-                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 3" << len;
-            }
-            if (part._topology == graphics::Mesh::QUADS && len % 4 != 0) {
-                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 4" << len;
-            }
-            if (len > indexBuffer.getNumElements()) {
-                qCDebug(modelformat) << "OBJWriter -- len > index size" << len << indexBuffer.getNumElements();
-            }
-            if (part._topology == graphics::Mesh::QUADS) {
-                for (uint32_t idx = part._startIndex; idx+3 < len; idx += 4) {
-                    face(idx+0, idx+1, idx+3);
-                    face(idx+1, idx+2, idx+3);
-                }
-            } else if (part._topology == graphics::Mesh::TRIANGLES) {
-                for (uint32_t idx = part._startIndex; idx+2 < len; idx += 3) {
-                    face(idx+0, idx+1, idx+2);
-                }
             }
             out << "\n";
         }

From ba0ba96d81a096100948d11730b3ff2d7b3825a3 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Thu, 22 Feb 2018 17:54:03 -0800
Subject: [PATCH 460/569] undo

---
 libraries/gl/src/gl/Context.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 155849bffa..309839808e 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -147,7 +147,7 @@ static void debugMessageCallback(GLenum source, GLenum type, GLuint id, GLenum s
     }
     // FIXME For high severity errors, force a sync to the log, since we might crash
     // before the log file was flushed otherwise.  Performance hit here
-    //qCDebug(glLogging) << "OpenGL: " << message;
+    qCDebug(glLogging) << "OpenGL: " << message;
 }
 
 static void setupPixelFormatSimple(HDC hdc) {

From a0f7d4dd345dc122d2bd25fe27c635313424baf8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 22 Feb 2018 18:08:08 -0800
Subject: [PATCH 461/569] use const auto & where possible as per CR comments

---
 assignment-client/src/assets/AssetServer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 509f8095c9..f600f5edc2 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -511,7 +511,7 @@ void AssetServer::cleanupBakedFilesForDeletedAssets() {
 
     std::set<AssetUtils::AssetHash> bakedHashes;
 
-    for (auto it : _fileMappings) {
+    for (const auto& it : _fileMappings) {
         // check if this is a mapping to baked content
         if (it.first.startsWith(AssetUtils::HIDDEN_BAKED_CONTENT_FOLDER)) {
             // extract the hash from the baked mapping
@@ -524,7 +524,7 @@ void AssetServer::cleanupBakedFilesForDeletedAssets() {
     }
 
     // enumerate the hashes for which we have baked content
-    for (auto hash : bakedHashes) {
+    for (const auto& hash : bakedHashes) {
         // check if we have a mapping that points to this hash
         auto matchingMapping = std::find_if(std::begin(_fileMappings), std::end(_fileMappings),
                                             [&hash](const std::pair<AssetUtils::AssetPath, AssetUtils::AssetHash> mappingPair) {

From 0dd367216278a5bf640eca89774ddf1043c62b57 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Thu, 22 Feb 2018 21:20:56 -0500
Subject: [PATCH 462/569] CR feedback / cleanup

---
 .../BufferViewScripting.cpp                   | 13 +---
 .../src/graphics-scripting/DebugNames.h       | 72 -------------------
 .../GraphicsScriptingInterface.cpp            |  1 -
 .../GraphicsScriptingInterface.h              |  3 +-
 .../src/graphics-scripting/ScriptableMesh.cpp | 25 ++-----
 .../src/graphics-scripting/ScriptableMesh.h   |  2 +
 .../graphics-scripting/ScriptableModel.cpp    | 20 ++----
 .../src/graphics-scripting/ScriptableModel.h  |  1 +
 .../src/graphics/BufferViewHelpers.cpp        |  6 +-
 .../graphics/src/graphics/BufferViewHelpers.h |  3 +
 10 files changed, 22 insertions(+), 124 deletions(-)
 delete mode 100644 libraries/graphics-scripting/src/graphics-scripting/DebugNames.h

diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
index 31cf5ff8f3..9d7a0e1f30 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
@@ -11,15 +11,6 @@
 
 #include <graphics/BufferViewHelpers.h>
 
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    #include "DebugNames.h"
-#endif
-
-namespace {
-    const std::array<const char*, 4> XYZW = {{ "x", "y", "z", "w" }};
-    const std::array<const char*, 4> ZERO123 = {{ "0", "1", "2", "3" }};
-}
-
 template <typename T>
 QScriptValue getBufferViewElement(QScriptEngine* js, const gpu::BufferView& view, quint32 index, bool asArray = false) {
     return glmVecToScriptValue(js, view.get<T>(index), asArray);
@@ -45,7 +36,7 @@ bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferVi
 template <typename T>
 QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray) {
     static const auto len = T().length();
-    const auto& components = asArray ? ZERO123 : XYZW;
+    const auto& components = asArray ? buffer_helpers::ZERO123 : buffer_helpers::XYZW;
     auto obj = asArray ? js->newArray() : js->newObject();
     for (int i = 0; i < len ; i++) {
         const auto key = components[i];
@@ -65,7 +56,7 @@ QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray) {
 template <typename T>
 const T glmVecFromScriptValue(const QScriptValue& v) {
     static const auto len = T().length();
-    const auto& components = v.property("x").isValid() ? XYZW : ZERO123;
+    const auto& components = v.property("x").isValid() ? buffer_helpers::XYZW : buffer_helpers::ZERO123;
     T result;
     for (int i = 0; i < len ; i++) {
         const auto key = components[i];
diff --git a/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h b/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h
deleted file mode 100644
index e5edf1c9d8..0000000000
--- a/libraries/graphics-scripting/src/graphics-scripting/DebugNames.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-#include <QtCore>
-#include <QVariant>
-#include <QObject>
-#include <gpu/Format.h>
-#include <gpu/Stream.h>
-//#include <gpu/Buffer.h>
-
-Q_DECLARE_METATYPE(gpu::Type);
-#ifdef QT_MOC_RUN
-class DebugNames {
-        Q_OBJECT
-public:
-#else
-  namespace DebugNames {
-    Q_NAMESPACE
-        #endif
-    
-enum Type : uint8_t {
-
-    FLOAT = 0,
-    INT32,
-    UINT32,
-    HALF,
-    INT16,
-    UINT16,
-    INT8,
-    UINT8,
-
-    NINT32,
-    NUINT32,
-    NINT16,
-    NUINT16,
-    NINT8,
-    NUINT8,
-
-    COMPRESSED,
-
-    NUM_TYPES,
-
-    BOOL = UINT8,
-    NORMALIZED_START = NINT32,
-};
-    
-    Q_ENUM_NS(Type)
-    enum InputSlot {
-        POSITION = 0,
-        NORMAL = 1,
-        COLOR = 2,
-        TEXCOORD0 = 3,
-        TEXCOORD = TEXCOORD0,
-        TANGENT = 4,
-        SKIN_CLUSTER_INDEX = 5,
-        SKIN_CLUSTER_WEIGHT = 6,
-        TEXCOORD1 = 7,
-        TEXCOORD2 = 8,
-        TEXCOORD3 = 9,
-        TEXCOORD4 = 10,
-
-        NUM_INPUT_SLOTS,
-
-        DRAW_CALL_INFO = 15, // Reserve last input slot for draw call infos
-    };
-
-    Q_ENUM_NS(InputSlot)
-    inline QString stringFrom(Type t) { return QVariant::fromValue(t).toString(); }
-    inline QString stringFrom(InputSlot t) { return QVariant::fromValue(t).toString(); }
-    inline QString stringFrom(gpu::Type t) { return stringFrom((Type)t); }
-    inline QString stringFrom(gpu::Stream::Slot t) { return stringFrom((InputSlot)t); }
-
-    extern const QMetaObject staticMetaObject;
-  };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 28d5d0edfc..01e68c5328 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -11,7 +11,6 @@
 #include "GraphicsScriptingInterface.h"
 #include "BaseScriptEngine.h"
 #include "BufferViewScripting.h"
-#include "DebugNames.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
 #include "RegisteredMetaTypes.h"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index 6afa549a19..ab2e5467db 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -24,6 +24,7 @@ class GraphicsScriptingInterface : public QObject, public QScriptable, public De
     Q_OBJECT
 
 public:
+    static void registerMetaTypes(QScriptEngine* engine);
     GraphicsScriptingInterface(QObject* parent = nullptr);
 
 public slots:
@@ -39,8 +40,6 @@ public slots:
 
     QString meshToOBJ(const scriptable::ScriptableModel& in);
 
-    static void registerMetaTypes(QScriptEngine* engine);
-
 private:
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 3678c54b7b..643debf475 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -8,7 +8,6 @@
 #include "ScriptableMesh.h"
 
 #include "BufferViewScripting.h"
-#include "DebugNames.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
 #include <BaseScriptEngine.h>
@@ -508,14 +507,11 @@ scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool rec
         qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh -- !meshPointer";
         return nullptr;
     }
-    // qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
     auto clone = buffer_helpers::cloneMesh(mesh);
     
-    // qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh...";
     if (recalcNormals) {
         buffer_helpers::recalculateNormals(clone);
     }
-    //qCDebug(graphics_scripting) << clone.get();// << metadata;
     auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, metadata);
     clone.reset(); // free local reference
     // qCInfo(graphics_scripting) << "========= ScriptableMesh::cloneMesh..." << meshPointer << meshPointer->ownedMesh.use_count();
@@ -549,7 +545,6 @@ scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::MeshPointer mesh,
     : ScriptableMeshBase(WeakModelProviderPointer(), nullptr, mesh, metadata) {
     ownedMesh = mesh;
 }
-//scriptable::ScriptableMeshBase::ScriptableMeshBase(const scriptable::ScriptableMeshBase& other) { *this = other; }
 scriptable::ScriptableMeshBase& scriptable::ScriptableMeshBase::operator=(const scriptable::ScriptableMeshBase& view) {
     provider = view.provider;
     model = view.model;
@@ -617,22 +612,6 @@ namespace {
     void meshPartPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPartPointer &out) {
         out = scriptable::qpointer_qobject_cast<scriptable::ScriptableMeshPart>(value);
     }
-    
-    // FIXME: MESHFACES:
-    // QScriptValue meshFaceToScriptValue(QScriptEngine* engine, const mesh::MeshFace &meshFace) {
-    //     QScriptValue obj = engine->newObject();
-    //     obj.setProperty("vertices", qVectorIntToScriptValue(engine, meshFace.vertexIndices));
-    //     return obj;
-    // }
-    // void meshFaceFromScriptValue(const QScriptValue &object, mesh::MeshFace& meshFaceResult) {
-    //     qScriptValueToSequence(object.property("vertices"), meshFaceResult.vertexIndices);
-    // }
-    // QScriptValue qVectorMeshFaceToScriptValue(QScriptEngine* engine, const QVector<mesh::MeshFace>& vector) {
-    //     return qScriptValueFromSequence(engine, vector);
-    // }
-    // void qVectorMeshFaceFromScriptValue(const QScriptValue& array, QVector<mesh::MeshFace>& result) {
-    //     qScriptValueToSequence(array, result);
-    // }
 
     QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<scriptable::uint32>& vector) {
         return qScriptValueFromSequence(engine, vector);
@@ -700,11 +679,15 @@ bool scriptable::GraphicsScriptingInterface::updateMeshPart(ScriptableMeshPointe
     Q_ASSERT(part->parentMesh);
     auto tmp = exportMeshPart(mesh, part->partIndex);
     if (part->parentMesh == mesh) {
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "updateMeshPart -- update via clone" << mesh << part;
+#endif
         tmp->replaceMeshData(part->cloneMeshPart());
         return false;
     } else {
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "updateMeshPart -- update via inplace" << mesh << part;
+#endif
         tmp->replaceMeshData(part);
         return true;
     }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 2cba33edde..459613135a 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -16,6 +16,8 @@
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptable>
 
+#include "GraphicsScriptingUtil.h"
+
 namespace scriptable {
     class ScriptableMesh : public ScriptableMeshBase, QScriptable {
         Q_OBJECT
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index cc882aa7bb..229d56adab 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -41,34 +41,29 @@ scriptable::ScriptableModelBase::~ScriptableModelBase() {
 #ifdef SCRIPTABLE_MESH_DEBUG
     qCDebug(graphics_scripting) << "~ScriptableModelBase" << this;
 #endif
+    // makes cleanup order more deterministic to help with debugging
     for (auto& m : meshes) {
         m.ownedMesh.reset();
-        //qCDebug(graphics_scripting) << "~~~~ScriptableModelBase" << &m << m.mesh.use_count();
     }
     meshes.clear();
-    //qCDebug(graphics_scripting) << "//~ScriptableModelBase" << this;
 }
 
 void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
-    //qCDebug(graphics_scripting) << "+ APPEND WeakMeshPointer" << mesh.lock().get();
     meshes << ScriptableMeshBase{ provider, this, mesh, metadata };
 }
 
 void scriptable::ScriptableModelBase::append(const ScriptableMeshBase& mesh, const QVariantMap& modelMetaData) {
-    //qCDebug(graphics_scripting) << "+ APPEND ScriptableMeshBase" << &mesh;
     if (mesh.provider.lock().get() != provider.lock().get()) {
         qCDebug(graphics_scripting) << "warning: appending mesh from different provider..." << mesh.provider.lock().get() << " != " << provider.lock().get();
     }
-    //if (mesh.model && mesh.model != this) {
-    //    qCDebug(graphics_scripting) << "warning: appending mesh from different model..." << mesh.model << " != " << this;
-    //}                    
     meshes << mesh;
     mixin(modelMetaData);
 }
 
 void scriptable::ScriptableModelBase::append(const ScriptableModelBase& other, const QVariantMap& modelMetaData) {
-    //qCDebug(graphics_scripting) << "+ APPEND ScriptableModelBase" << &other;
-    for (const auto& mesh : other.meshes) { append(mesh); }
+    for (const auto& mesh : other.meshes) {
+        append(mesh);
+    }
     mixin(other.metadata);
     mixin(modelMetaData);
 }
@@ -82,21 +77,16 @@ QString scriptable::ScriptableModel::toString() const {
 
 scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const QVariantMap& options) {
     scriptable::ScriptableModelPointer clone = scriptable::ScriptableModelPointer(new scriptable::ScriptableModel(*this));
-    qCDebug(graphics_scripting) << "clone->getNumMeshes" << clone->getNumMeshes();
     clone->meshes.clear();
-    qCDebug(graphics_scripting) << "..clone->getNumMeshes" << clone->getNumMeshes();
     for (const auto &mesh : getConstMeshes()) {
         auto cloned = mesh->cloneMesh(options.value("recalculateNormals").toBool());
         if (auto tmp = qobject_cast<scriptable::ScriptableMeshBase*>(cloned)) {
-            qCDebug(graphics_scripting) << "++ APPEND"  << tmp << tmp->ownedMesh.use_count() << tmp->metadata.value("__ownership__") << tmp->metadata.value("__native__");
             clone->meshes << *tmp;
-            tmp->deleteLater();
-            qCDebug(graphics_scripting) << "//++ APPEND"  << clone->meshes.constLast().ownedMesh.use_count();;
+            tmp->deleteLater(); // schedule our copy for cleanup
         } else {
             qCDebug(graphics_scripting) << "error cloning mesh" << cloned;
         }
     }
-    qCDebug(graphics_scripting) << "//clone->getNumMeshes" << clone->getNumMeshes();
     return clone;
 }
 
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index bdfaac5d7c..a78c9a4ef5 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Forward.h"
+#include "GraphicsScriptingUtil.h"
 
 class QScriptValue;
 namespace scriptable {
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index a15ce1b998..ddf3d84c89 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -34,10 +34,12 @@ namespace glm {
 
 namespace {
     QLoggingCategory bufferhelper_logging{ "hifi.bufferview" };
-    const std::array<const char*, 4> XYZW = { { "x", "y", "z", "w" } };
-    const std::array<const char*, 4> ZERO123 = { { "0", "1", "2", "3" } };
 }
 
+
+const std::array<const char*, 4> buffer_helpers::XYZW = { { "x", "y", "z", "w" } };
+const std::array<const char*, 4> buffer_helpers::ZERO123 = { { "0", "1", "2", "3" } };
+
 gpu::BufferView buffer_helpers::getBufferView(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
     return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
 }
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.h b/libraries/graphics/src/graphics/BufferViewHelpers.h
index 53fddfe581..6d4908a2c7 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.h
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.h
@@ -49,4 +49,7 @@ struct buffer_helpers {
     static gpu::BufferView resize(const gpu::BufferView& input, quint32 numElements);
 
     static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent);
+
+    static const std::array<const char*, 4> XYZW;
+    static const std::array<const char*, 4> ZERO123;
 };

From 0469eafbe46bf2df42f9f0ea6104d1ad9d98273a Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Thu, 22 Feb 2018 18:35:16 -0800
Subject: [PATCH 463/569] Switch between dualQuats and matrix skinning based on
 model entity scale factor.

---
 .../src/RenderableModelEntityItem.cpp         |  7 ++++++-
 .../render-utils/src/MeshPartPayload.cpp      |  9 ++++++++-
 libraries/render-utils/src/MeshPartPayload.h  |  2 ++
 libraries/render-utils/src/Model.cpp          | 20 ++++++++++++-------
 libraries/render-utils/src/Model.h            |  1 +
 .../render-utils/src/RenderPipelines.cpp      |  2 +-
 libraries/shared/src/DualQuaternion.h         |  2 +-
 libraries/shared/src/GLMHelpers.cpp           |  3 +++
 libraries/shared/src/GLMHelpers.h             |  2 ++
 9 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 83ec675adf..d295e9e1fa 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -133,6 +133,9 @@ void RenderableModelEntityItem::doInitialModelSimulation() {
     model->setRotation(getWorldOrientation());
     model->setTranslation(getWorldPosition());
 
+    glm::vec3 scale = model->getScale();
+    model->setUseDualQuaternionSkinning(!isNonUniformScale(scale));
+
     if (_needsInitialSimulation) {
         model->simulate(0.0f);
         _needsInitialSimulation = false;
@@ -243,6 +246,8 @@ void RenderableModelEntityItem::updateModelBounds() {
     }
 
     if (updateRenderItems) {
+        glm::vec3 scale = model->getScale();
+        model->setUseDualQuaternionSkinning(!isNonUniformScale(scale));
         model->updateRenderItems();
     }
 }
@@ -1500,4 +1505,4 @@ void ModelEntityRenderer::processMaterials() {
             material.pop();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 4a0ea40f55..99048fe324 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -407,7 +407,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe
     if (isWireframe) {
         builder.withWireframe();
     }
-    if (_useDualQuaternionSkinning) {
+    if (_useDualQuaternionSkinning && isSkinned) {
         builder.withDualQuatSkinned();
     }
 
@@ -497,3 +497,10 @@ void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<Model::Tr
         }
     }
 }
+
+void ModelMeshPartPayload::setUseDualQuaternionSkinning(bool value) {
+    if (value != _useDualQuaternionSkinning) {
+        _clusterBuffer.reset();
+    }
+    _useDualQuaternionSkinning = value;
+}
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 88ffb99450..6f78fdbf51 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -120,6 +120,8 @@ public:
     // dual quaternion skinning
     void computeAdjustedLocalBound(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions);
 
+    void setUseDualQuaternionSkinning(bool value);
+
     gpu::BufferPointer _clusterBuffer;
 
     int _meshIndex;
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index da43e4fd8f..8318715732 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -288,6 +288,7 @@ void Model::updateRenderItems() {
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
                                                                   viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
+                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
                 if (useDualQuaternionSkinning) {
                     data.updateClusterBuffer(meshState.clusterDualQuaternions);
                 } else {
@@ -388,11 +389,8 @@ bool Model::updateGeometry() {
         const FBXGeometry& fbxGeometry = getFBXGeometry();
         foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
             MeshState state;
-            if (_useDualQuaternionSkinning) {
-                state.clusterDualQuaternions.resize(mesh.clusters.size());
-            } else {
-                state.clusterMatrices.resize(mesh.clusters.size());
-            }
+            state.clusterDualQuaternions.resize(mesh.clusters.size());
+            state.clusterMatrices.resize(mesh.clusters.size());
             _meshStates.push_back(state);
 
             // Note: we add empty buffers for meshes that lack blendshapes so we can access the buffers by index
@@ -1248,6 +1246,10 @@ void Model::snapToRegistrationPoint() {
     _snappedToRegistrationPoint = true;
 }
 
+void Model::setUseDualQuaternionSkinning(bool value) {
+    _useDualQuaternionSkinning = value;
+}
+
 void Model::simulate(float deltaTime, bool fullUpdate) {
     DETAILED_PROFILE_RANGE(simulation_detail, __FUNCTION__);
     fullUpdate = updateGeometry() || fullUpdate || (_scaleToFit && !_scaledToFit)
@@ -1583,11 +1585,13 @@ void Model::addMaterial(graphics::MaterialLayer material, const std::string& par
             bool wireframe = isWireframe();
             auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
             bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+            bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
             transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
-                invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+                invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
                 data.addMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
                 data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
                 data.setShapeKey(invalidatePayloadShapeKey, wireframe);
             });
         }
@@ -1608,11 +1612,13 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
             bool wireframe = isWireframe();
             auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
             bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+            bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
             transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
-                invalidatePayloadShapeKey, wireframe](ModelMeshPartPayload& data) {
+                invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
                 data.removeMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
                 data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
+                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
                 data.setShapeKey(invalidatePayloadShapeKey, wireframe);
             });
         }
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 61e699f30a..aef6a84a24 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -314,6 +314,7 @@ public:
 
     void scaleToFit();
     bool getUseDualQuaternionSkinning() const { return _useDualQuaternionSkinning; }
+    void setUseDualQuaternionSkinning(bool value);
 
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index cccc128b64..3fedae1778 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -447,7 +447,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withSpecular().withFade(),
         skinModelNormalMapFadeVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter);
 
-    // dual quatenion skinned
+    // dual quaternion skinned
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(),
         skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
diff --git a/libraries/shared/src/DualQuaternion.h b/libraries/shared/src/DualQuaternion.h
index 709c089fdc..af1011a6d8 100644
--- a/libraries/shared/src/DualQuaternion.h
+++ b/libraries/shared/src/DualQuaternion.h
@@ -55,7 +55,7 @@ protected:
 
 
 inline QDebug operator<<(QDebug debug, const DualQuaternion& dq) {
-    debug << "AnimPose, real = (" << dq._real.x << dq._real.y << dq._real.z << dq._real.w << "), dual = (" << dq._dual.x << dq._dual.y << dq._dual.z << dq._dual.w << ")";
+    debug << "DualQuaternion, real = (" << dq._real.x << dq._real.y << dq._real.z << dq._real.w << "), dual = (" << dq._dual.x << dq._dual.y << dq._dual.z << dq._dual.w << ")";
     return debug;
 }
 
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index ff1d29eed1..46e484cf2b 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -601,3 +601,6 @@ glm::vec3 randVector() {
     return glm::vec3(randFloat() - 0.5f, randFloat() - 0.5f, randFloat() - 0.5f) * 2.0f;
 }
 
+bool isNonUniformScale(const glm::vec3& scale) {
+    return fabsf(scale.x - scale.y) > EPSILON || fabsf(scale.y - scale.z) > EPSILON;
+}
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index 4f761a4aac..5c9a8b5ca1 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -260,6 +260,8 @@ glm::mat4 orthoInverse(const glm::mat4& m);
 //  Return a random vector of average length 1
 glm::vec3 randVector();
 
+bool isNonUniformScale(const glm::vec3& scale);
+
 //
 // Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128
 //

From e5c501a4cddfe89d83fe3c64bb510e24220e36c9 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 22 Feb 2018 18:07:44 -0800
Subject: [PATCH 464/569] Never delete assets on load

---
 domain-server/src/AssetsBackupHandler.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 8a65d41a6c..98ee3ec1b5 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -219,8 +219,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
     }
 
     checkForMissingAssets();
-    checkForAssetsToDelete();
-    return;
 }
 
 void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {

From cbabca5e3e14fe1c4fa0830df50b551c80791c1b Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 22 Feb 2018 18:36:36 -0800
Subject: [PATCH 465/569] Add loadingComplete callback

---
 domain-server/src/AssetsBackupHandler.cpp        | 3 +++
 domain-server/src/AssetsBackupHandler.h          | 1 +
 domain-server/src/BackupHandler.h                | 1 +
 domain-server/src/ContentSettingsBackupHandler.h | 2 ++
 domain-server/src/DomainContentBackupManager.cpp | 4 ++++
 domain-server/src/EntitiesBackupHandler.h        | 2 ++
 6 files changed, 13 insertions(+)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 98ee3ec1b5..c9447351eb 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -217,8 +217,11 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         backup.mappings[assetPath] = assetHash;
         _assetsInBackups.insert(assetHash);
     }
+}
 
+void AssetsBackupHandler::loadingComplete() {
     checkForMissingAssets();
+    checkForAssetsToDelete();
 }
 
 void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index 10aa7c5e7f..d3dd2dda40 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -35,6 +35,7 @@ public:
     std::pair<bool, float> getRecoveryStatus() override;
 
     void loadBackup(const QString& backupName, QuaZip& zip) override;
+    void loadingComplete() override;
     void createBackup(const QString& backupName, QuaZip& zip) override;
     void recoverBackup(const QString& backupName, QuaZip& zip) override;
     void deleteBackup(const QString& backupName) override;
diff --git a/domain-server/src/BackupHandler.h b/domain-server/src/BackupHandler.h
index 1e2450cce4..547339e01b 100644
--- a/domain-server/src/BackupHandler.h
+++ b/domain-server/src/BackupHandler.h
@@ -28,6 +28,7 @@ public:
     virtual std::pair<bool, float> getRecoveryStatus() = 0;
 
     virtual void loadBackup(const QString& backupName, QuaZip& zip) = 0;
+    virtual void loadingComplete() = 0;
     virtual void createBackup(const QString& backupName, QuaZip& zip) = 0;
     virtual void recoverBackup(const QString& backupName, QuaZip& zip) = 0;
     virtual void deleteBackup(const QString& backupName) = 0;
diff --git a/domain-server/src/ContentSettingsBackupHandler.h b/domain-server/src/ContentSettingsBackupHandler.h
index a33fa3ca3f..8454de0786 100644
--- a/domain-server/src/ContentSettingsBackupHandler.h
+++ b/domain-server/src/ContentSettingsBackupHandler.h
@@ -24,6 +24,8 @@ public:
 
     void loadBackup(const QString& backupName, QuaZip& zip) override {}
 
+    void loadingComplete() override {}
+
     void createBackup(const QString& backupName, QuaZip& zip) override;
 
     void recoverBackup(const QString& backupName, QuaZip& zip) override;
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index f94f62811e..2f7031ea87 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -470,6 +470,10 @@ void DomainContentBackupManager::load() {
 
         zip.close();
     }
+
+    for (auto& handler : _backupHandlers) {
+        handler->loadingComplete();
+    }
 }
 
 void DomainContentBackupManager::backup() {
diff --git a/domain-server/src/EntitiesBackupHandler.h b/domain-server/src/EntitiesBackupHandler.h
index 802c395b57..d95ad695a8 100644
--- a/domain-server/src/EntitiesBackupHandler.h
+++ b/domain-server/src/EntitiesBackupHandler.h
@@ -23,6 +23,8 @@ public:
 
     void loadBackup(const QString& backupName, QuaZip& zip) override {}
 
+    void loadingComplete() override {}
+
     // Create a skeleton backup
     void createBackup(const QString& backupName, QuaZip& zip) override;
 

From eeda07bba6b12d6701f625438784b46beb639dcf Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 22 Feb 2018 19:19:39 -0800
Subject: [PATCH 466/569] Actually remove Backup from list during delete

---
 domain-server/src/AssetsBackupHandler.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index c9447351eb..c50bf5e05d 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -339,7 +339,7 @@ void AssetsBackupHandler::deleteBackup(const QString& backupName) {
         return;
     }
 
-    const auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+    const auto it = remove_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
         return backup.name == backupName;
     });
     if (it == end(_backups)) {
@@ -347,6 +347,8 @@ void AssetsBackupHandler::deleteBackup(const QString& backupName) {
         return;
     }
 
+    _backups.erase(it, end(_backups));
+
     refreshAssetsInBackups();
     checkForAssetsToDelete();
     qDebug() << "Deleted asset backup:" << backupName;

From b8102cfbd72e3323d35351670c8e5f901cb11c42 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 23 Feb 2018 10:06:16 +0100
Subject: [PATCH 467/569] Make sure sort indicator is attached to the right of
 title

---
 .../resources/qml/controls-uit/Table.qml      | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controls-uit/Table.qml
index a3e4113d08..c5a605c69e 100644
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controls-uit/Table.qml
@@ -22,6 +22,7 @@ TableView {
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
     property bool expandSelectedRow: false
     property bool centerHeaderText: false
+    readonly property real headerSpacing: 3 //spacing between sort indicator and table header title
 
     model: ListModel { }
 
@@ -69,20 +70,18 @@ TableView {
         height: hifi.dimensions.tableHeaderHeight
         color: isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
 
+
         RalewayRegular {
             id: titleText
+            x: centerHeaderText ? parent.width/2 -
+                                  (paintedWidth/2 + (sortIndicatorVisible ? titleSort.paintedWidth/12 : 0)) :
+                                  hifi.dimensions.tablePadding
             text: styleData.value
             size: hifi.fontSizes.tableHeading
             font.capitalization: Font.AllUppercase
             color: hifi.colors.baseGrayHighlight
             horizontalAlignment: (centerHeaderText ? Text.AlignHCenter : Text.AlignLeft)
-            anchors {
-                left: parent.left
-                leftMargin: hifi.dimensions.tablePadding
-                right: parent.right
-                rightMargin: hifi.dimensions.tablePadding
-                verticalCenter: parent.verticalCenter
-            }
+            anchors.verticalCenter: parent.verticalCenter
         }
 
         HiFiGlyphs {
@@ -91,13 +90,9 @@ TableView {
             color: hifi.colors.darkGray
             opacity: 0.6;
             size: hifi.fontSizes.tableHeadingIcon
-            anchors {
-                left: titleText.right
-                leftMargin: -hifi.fontSizes.tableHeadingIcon / 3 - (centerHeaderText ? 15 : 10)
-                right: parent.right
-                rightMargin: hifi.dimensions.tablePadding
-                verticalCenter: titleText.verticalCenter
-            }
+            anchors.verticalCenter: titleText.verticalCenter
+            anchors.left: titleText.right
+            anchors.leftMargin: -(hifi.fontSizes.tableHeadingIcon / 3 + tableView.headerSpacing)
             visible: sortIndicatorVisible && sortIndicatorColumn === styleData.column
         }
 
@@ -152,7 +147,7 @@ TableView {
         color: styleData.selected
                ? hifi.colors.primaryHighlight
                : tableView.isLightColorScheme
-                   ? (styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd)
-                   : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
+                 ? (styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd)
+                 : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
     }
 }

From 6ea4b660b747745bde7c3466c3721713f6ee99c7 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 07:47:39 -0500
Subject: [PATCH 468/569] CR feedback; remove ok bool pointer and all metadata;
 cleanup

---
 interface/src/ui/overlays/Base3DOverlay.h     |   2 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |   8 +-
 interface/src/ui/overlays/ModelOverlay.h      |   2 +-
 interface/src/ui/overlays/Shape3DOverlay.cpp  |   7 +-
 interface/src/ui/overlays/Shape3DOverlay.h    |   2 +-
 .../src/avatars-renderer/Avatar.cpp           |  17 +-
 .../src/avatars-renderer/Avatar.h             |   2 +-
 .../src/RenderableEntityItem.h                |   2 +-
 .../src/RenderableModelEntityItem.cpp         |   8 +-
 .../src/RenderableModelEntityItem.h           |   2 +-
 .../src/RenderablePolyLineEntityItem.cpp      |   4 +-
 .../src/RenderablePolyLineEntityItem.h        |   2 +-
 .../src/RenderablePolyVoxEntityItem.cpp       |   7 +-
 .../src/RenderablePolyVoxEntityItem.h         |   6 +-
 .../src/RenderableShapeEntityItem.cpp         |  11 +-
 .../src/RenderableShapeEntityItem.h           |   2 +-
 .../src/graphics-scripting/Forward.h          |  26 +--
 .../GraphicsScriptingInterface.cpp            | 174 +++++++++++-------
 .../GraphicsScriptingInterface.h              |  22 ++-
 .../GraphicsScriptingUtil.h                   |  22 +--
 .../src/graphics-scripting/ScriptableMesh.cpp | 149 ++++++---------
 .../src/graphics-scripting/ScriptableMesh.h   |  68 ++-----
 .../graphics-scripting/ScriptableModel.cpp    |  41 ++---
 .../src/graphics-scripting/ScriptableModel.h  |  15 +-
 .../src/graphics/BufferViewHelpers.cpp        |  42 +----
 libraries/render-utils/src/Model.cpp          |  53 +++---
 libraries/render-utils/src/Model.h            |   2 +-
 .../src/Model_temporary_hack.cpp.h            |  46 +----
 tools/jsdoc/package-lock.json                 | 138 --------------
 29 files changed, 307 insertions(+), 575 deletions(-)
 delete mode 100644 tools/jsdoc/package-lock.json

diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index 25bacf2e7e..bbf064fddd 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -36,7 +36,7 @@ public:
     virtual bool is3D() const override { return true; }
 
     virtual uint32_t fetchMetaSubItems(render::ItemIDs& subItems) const override { subItems.push_back(getRenderItemID()); return (uint32_t) subItems.size(); }
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
+    virtual scriptable::ScriptableModelBase getScriptableModel() override { return scriptable::ScriptableModelBase(); }
 
     // TODO: consider implementing registration points in this class
     glm::vec3 getCenter() const { return getWorldPosition(); }
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 4ff5499a12..ffcc18032c 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -665,11 +665,11 @@ void ModelOverlay::processMaterials() {
     }
 }
 
-scriptable::ScriptableModelBase ModelOverlay::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase ModelOverlay::getScriptableModel() {
     if (!_model || !_model->isLoaded()) {
-        return Base3DOverlay::getScriptableModel(ok);
+        return Base3DOverlay::getScriptableModel();
     }
-    auto result = _model->getScriptableModel(ok);
+    auto result = _model->getScriptableModel();
     result.objectID = getID();
     return result;
-}
\ No newline at end of file
+}
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 60b970425d..fa399d40f9 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -62,7 +62,7 @@ public:
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 04557bcf5d..8f7f8b70d9 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -180,14 +180,13 @@ Transform Shape3DOverlay::evalRenderTransform() {
     return transform;
 }
 
-scriptable::ScriptableModelBase Shape3DOverlay::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase Shape3DOverlay::getScriptableModel() {
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto vertexColor = ColorUtils::toVec3(_color);
     scriptable::ScriptableModelBase result;
     result.objectID = getID();
-    result.append(geometryCache->meshFromShape(_shape, vertexColor), {{ "shape", shapeStrings[_shape] }});
-    if (ok) {
-        *ok = true;
+    if (auto mesh = geometryCache->meshFromShape(_shape, vertexColor)) {
+        result.append(mesh);
     }
     return result;
 }
diff --git a/interface/src/ui/overlays/Shape3DOverlay.h b/interface/src/ui/overlays/Shape3DOverlay.h
index f5246d95ac..447ee47e13 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.h
+++ b/interface/src/ui/overlays/Shape3DOverlay.h
@@ -37,7 +37,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 48f0c70dfa..25ddfba670 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1795,22 +1795,11 @@ void Avatar::processMaterials() {
     }
 }
 
-scriptable::ScriptableModelBase Avatar::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase Avatar::getScriptableModel() {
     if (!_skeletonModel || !_skeletonModel->isLoaded()) {
-        return scriptable::ModelProvider::modelUnavailableError(ok);
+        return scriptable::ScriptableModelBase();
     }
-    scriptable::ScriptableModelBase result = _skeletonModel->getScriptableModel(ok);
+    auto result = _skeletonModel->getScriptableModel();
     result.objectID = getSessionUUID();
-    result.mixin({{ "textures", _skeletonModel->getTextures() }});
-    // FIXME: for now access to attachment models are merged into the main avatar ScriptableModel set
-    for (int i = 0; i < (int)_attachmentModels.size(); i++) {
-        auto& model = _attachmentModels.at(i);
-        if (model->isLoaded()) {
-            result.append(model->getScriptableModel(ok), _attachmentData.at(i).toVariant().toMap());
-        }
-    }
-    if (ok) {
-        *ok = true;
-    }
     return result;
 }
\ No newline at end of file
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 3b3917ad4d..bf0adc5c05 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -276,7 +276,7 @@ public:
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 
 public slots:
 
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 5526927c13..d34a1127ae 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -58,7 +58,7 @@ public:
     virtual void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
     virtual void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override { return scriptable::ModelProvider::modelUnavailableError(ok); }
+    virtual scriptable::ScriptableModelBase getScriptableModel() override { return scriptable::ScriptableModelBase(); }
 
 protected:
     virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 6eed62522f..f3c99cde2d 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -960,15 +960,15 @@ bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
     return !result.isEmpty();
 }
 
-scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() {
     ModelPointer model;
     withReadLock([&] { model = _model; });
 
     if (!model || !model->isLoaded()) {
-        return scriptable::ModelProvider::modelUnavailableError(ok);
+        return scriptable::ScriptableModelBase();
     }
 
-    auto result = _model->getScriptableModel(ok);
+    auto result = _model->getScriptableModel();
     result.objectID = getEntity()->getID();
     return result;
 }
@@ -981,7 +981,7 @@ bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scrip
         return false;
     }
 
-   return model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
+    return model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
 }
 
 void RenderableModelEntityItem::simulateRelayedJoints() {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index dc73add823..7edaef264d 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -142,7 +142,7 @@ class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem
 
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
     virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index da2147701b..394ab08dfb 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -281,9 +281,9 @@ std::vector<PolyLineEntityRenderer::Vertex> PolyLineEntityRenderer::updateVertic
     return vertices;
 }
 
-scriptable::ScriptableModelBase PolyLineEntityRenderer::getScriptableModel(bool *ok) {
+scriptable::ScriptableModelBase PolyLineEntityRenderer::getScriptableModel() {
     // TODO: adapt polyline into a triangles mesh...
-    return EntityRenderer::getScriptableModel(ok);
+    return EntityRenderer::getScriptableModel();
 }
 
 void PolyLineEntityRenderer::doRender(RenderArgs* args) {
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index d9d770e64f..f460baac59 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -25,7 +25,7 @@ class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
 public:
     PolyLineEntityRenderer(const EntityItemPointer& entity);
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 protected:
     virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
     virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 37e03b2590..2b1de8d11b 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -1451,9 +1451,9 @@ bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
     return success;
 }
 
-scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel(bool * ok) {
+scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel() {
     if (!updateDependents() || !_mesh) {
-        return scriptable::ModelProvider::modelUnavailableError(ok);
+        return scriptable::ScriptableModelBase();
     }
 
     bool success = false;
@@ -1479,9 +1479,6 @@ scriptable::ScriptableModelBase RenderablePolyVoxEntityItem::getScriptableModel(
             ));
         }
     });
-    if (ok) {
-        *ok = success;
-    }
     return result;
 }
 
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index 295a4066ba..0a00d1cb73 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -114,7 +114,7 @@ public:
     void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
 
     bool getMeshes(MeshProxyList& result) override; // deprecated
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 
 private:
     bool updateOnCount(const ivec3& v, uint8_t toValue);
@@ -164,8 +164,8 @@ class PolyVoxEntityRenderer : public TypedEntityRenderer<RenderablePolyVoxEntity
 
 public:
     PolyVoxEntityRenderer(const EntityItemPointer& entity);
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override {
-        return asTypedEntity<RenderablePolyVoxEntityItem>()->getScriptableModel(ok);
+    virtual scriptable::ScriptableModelBase getScriptableModel() override {
+        return asTypedEntity<RenderablePolyVoxEntityItem>()->getScriptableModel();
     }
     
 protected:
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 2e65eba5e5..22cd98b08a 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -164,22 +164,17 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
     args->_details._trianglesRendered += (int)triCount;
 }
 
-scriptable::ScriptableModelBase ShapeEntityRenderer::getScriptableModel(bool* ok)  {
+scriptable::ScriptableModelBase ShapeEntityRenderer::getScriptableModel()  {
     scriptable::ScriptableModelBase result;
-    result.objectID = getEntity()->getID();
     auto geometryCache = DependencyManager::get<GeometryCache>();
     auto geometryShape = geometryCache->getShapeForEntityShape(_shape);
     glm::vec3 vertexColor;
     if (_materials["0"].top().material) {
         vertexColor = _materials["0"].top().material->getAlbedo();
     }
-    auto success = false;
     if (auto mesh = geometryCache->meshFromShape(geometryShape, vertexColor)) {
-        result.append({ mesh, {{ "shape", entity::stringFromShape(_shape) }}});
-        success = true;
-    }
-    if (ok) {
-        *ok = success;
+        result.objectID = getEntity()->getID();
+        result.append(mesh);
     }
     return result;
 }
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index bd6c77d81d..de855ce0c6 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -22,7 +22,7 @@ class ShapeEntityRenderer : public TypedEntityRenderer<ShapeEntityItem> {
 public:
     ShapeEntityRenderer(const EntityItemPointer& entity);
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 
 private:
     virtual bool needsRenderUpdate() const override;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 7b2126cf8f..94a96446a0 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -36,16 +36,14 @@ namespace scriptable {
     public:
         WeakModelProviderPointer provider;
         ScriptableModelBasePointer model;
-        WeakMeshPointer mesh;
-        MeshPointer ownedMesh;
-        QVariantMap metadata;
-        ScriptableMeshBase(WeakModelProviderPointer provider, ScriptableModelBasePointer model, WeakMeshPointer mesh, const QVariantMap& metadata);
-        ScriptableMeshBase(WeakMeshPointer mesh = WeakMeshPointer());
-        ScriptableMeshBase(MeshPointer mesh, const QVariantMap& metadata);
-        ScriptableMeshBase(const ScriptableMeshBase& other) : QObject() { *this = other; }
+        WeakMeshPointer weakMesh;
+        MeshPointer strongMesh;
+        ScriptableMeshBase(WeakModelProviderPointer provider, ScriptableModelBasePointer model, WeakMeshPointer weakMesh, QObject* parent);
+        ScriptableMeshBase(WeakMeshPointer weakMesh = WeakMeshPointer(), QObject* parent = nullptr);
+        ScriptableMeshBase(const ScriptableMeshBase& other, QObject* parent = nullptr) : QObject(parent) { *this = other; }
         ScriptableMeshBase& operator=(const ScriptableMeshBase& view);
         virtual ~ScriptableMeshBase();
-        Q_INVOKABLE const scriptable::MeshPointer getMeshPointer() const { return mesh.lock(); }
+        Q_INVOKABLE const scriptable::MeshPointer getMeshPointer() const { return weakMesh.lock(); }
         Q_INVOKABLE const scriptable::ModelProviderPointer getModelProviderPointer() const { return provider.lock(); }
         Q_INVOKABLE const scriptable::ScriptableModelBasePointer getModelBasePointer() const { return model; }
     };
@@ -56,18 +54,15 @@ namespace scriptable {
     public:
         WeakModelProviderPointer provider;
         QUuid objectID; // spatially nestable ID
-        QVariantMap metadata;
         QVector<scriptable::ScriptableMeshBase> meshes;
 
         ScriptableModelBase(QObject* parent = nullptr) : QObject(parent) {}
-        ScriptableModelBase(const ScriptableModelBase& other) : QObject() { *this = other; }
+        ScriptableModelBase(const ScriptableModelBase& other) : QObject(other.parent()) { *this = other; }
         ScriptableModelBase& operator=(const ScriptableModelBase& other);
         virtual ~ScriptableModelBase();
 
-        void mixin(const QVariantMap& other);
-        void append(const ScriptableModelBase& other, const QVariantMap& modelMetadata = QVariantMap());
-        void append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata = QVariantMap());
-        void append(const ScriptableMeshBase& mesh, const QVariantMap& metadata = QVariantMap());
+        void append(const ScriptableMeshBase& mesh);
+        void append(scriptable::WeakMeshPointer mesh);
         // TODO: in future containers for these could go here
         // QVariantMap shapes;
         // QVariantMap materials;
@@ -78,8 +73,7 @@ namespace scriptable {
     class ModelProvider {
     public:
         NestableType modelProviderType;
-        static scriptable::ScriptableModelBase modelUnavailableError(bool* ok) { if (ok) { *ok = false; } return {}; }
-        virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) = 0;
+        virtual scriptable::ScriptableModelBase getScriptableModel() = 0;
 
         virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) { return false; }
     };
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 01e68c5328..c336e77762 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -9,7 +9,6 @@
 //
 
 #include "GraphicsScriptingInterface.h"
-#include "BaseScriptEngine.h"
 #include "BufferViewScripting.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
@@ -24,86 +23,119 @@
 #include <graphics/BufferViewHelpers.h>
 #include <shared/QtHelpers.h>
 
-#include "GraphicsScriptingInterface.moc"
-
 GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent), QScriptable() {
     if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
         this->registerMetaTypes(scriptEngine);
     }
 }
 
-bool GraphicsScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex, int partIndex) {
-    auto model = scriptable::make_qtowned<scriptable::ScriptableModel>();
-    if (mesh) {
-        model->append(*mesh);
-    }
-    return updateMeshes(uuid, model.get());
-}
-
-bool GraphicsScriptingInterface::updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model) {
-    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
-    QString providerType = provider ? SpatiallyNestable::nestableTypeToString(provider->modelProviderType) : QString();
-    if (providerType.isEmpty()) {
-        providerType = "unknown";
-    }
-    bool success = false;
-    if (provider) {
-        auto scriptableMeshes = provider->getScriptableModel(&success);
-        if (success) {
-            const scriptable::ScriptableModelBasePointer base = model->operator scriptable::ScriptableModelBasePointer();
-            if (base) {
-                success = provider->replaceScriptableModelMeshPart(base, -1, -1);
-            }
-        }
-    }
-    return success;
-}
-
-QScriptValue GraphicsScriptingInterface::getMeshes(QUuid uuid) {
-    scriptable::ScriptableModel* meshes{ nullptr };
-    bool success = false;
-    QString error;
-
-    auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>();
-    qCDebug(graphics_scripting) << "appProvider" << appProvider.data();
-    scriptable::ModelProviderPointer provider = appProvider ? appProvider->lookupModelProvider(uuid) : nullptr;
-    QString providerType = provider ? SpatiallyNestable::nestableTypeToString(provider->modelProviderType) : QString();
-    if (providerType.isEmpty()) {
-        providerType = "unknown";
-    }
-    if (provider) {
-        auto scriptableMeshes = provider->getScriptableModel(&success);
-        if (success) {
-            meshes = scriptable::make_scriptowned<scriptable::ScriptableModel>(scriptableMeshes);
-            if (meshes->objectName().isEmpty()) {
-                meshes->setObjectName(providerType+"::meshes");
-            }
-            if (meshes->objectID.isNull()) {
-                meshes->objectID = uuid.toString();
-            }
-            meshes->metadata["provider"] = SpatiallyNestable::nestableTypeToString(provider->modelProviderType);
-        }
-    }
-    if (!success) {
-        error = QString("failed to get meshes from %1 provider for uuid %2").arg(providerType).arg(uuid.toString());
-    }
-
-    QPointer<BaseScriptEngine> scriptEngine = dynamic_cast<BaseScriptEngine*>(engine());    
-    QScriptValue result = error.isEmpty() ? scriptEngine->toScriptValue(meshes) : scriptEngine->makeError(error);
-    if (result.isError()) {
-        qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getMeshes ERROR" << result.toString();
-        if (context()) {
-            context()->throwValue(error);
+bool GraphicsScriptingInterface::updateModelObject(QUuid uuid, const scriptable::ScriptableModelPointer model) {
+    if (auto provider = getModelProvider(uuid)) {
+        if (auto base = model->operator scriptable::ScriptableModelBasePointer()) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+            qDebug() << "replaceScriptableModelMeshPart" << model->toString() << -1 << -1;
+#endif
+            return provider->replaceScriptableModelMeshPart(base, -1, -1);
         } else {
-            qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getMeshes ERROR" << result.toString();
+            qDebug() << "replaceScriptableModelMeshPart -- !base" << model << base << -1 << -1;
         }
-        return QScriptValue::NullValue;
+    } else {
+        qDebug() << "replaceScriptableModelMeshPart -- !provider";
     }
-    return scriptEngine->toScriptValue(meshes);
+
+    return false;
 }
 
-QString GraphicsScriptingInterface::meshToOBJ(const scriptable::ScriptableModel& _in) {
+scriptable::ModelProviderPointer GraphicsScriptingInterface::getModelProvider(QUuid uuid) {
+    QString error;
+    if (auto appProvider = DependencyManager::get<scriptable::ModelProviderFactory>()) {
+        if (auto provider = appProvider->lookupModelProvider(uuid)) {
+            return provider;
+        } else {
+            error = "provider unavailable for " + uuid.toString();
+        }
+    } else {
+        error = "appProvider unavailable";
+    }
+    if (context()) {
+        context()->throwError(error);
+    } else {
+        qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getModelProvider ERROR" << error;
+    }
+    return nullptr;
+}
+
+scriptable::ScriptableModelPointer GraphicsScriptingInterface::newModelObject(QVector<scriptable::ScriptableMeshPointer> meshes) {
+    auto modelWrapper = scriptable::make_scriptowned<scriptable::ScriptableModel>();
+    modelWrapper->setObjectName("js::model");
+    if (meshes.isEmpty()) {
+        if (context()) {
+            context()->throwError("expected [meshes] array as first argument");
+        }
+    } else {
+        int i = 0;
+        for (const auto& mesh : meshes) {
+            if (mesh) {
+                modelWrapper->append(*mesh);
+            } else if (context()) {
+                context()->throwError(QString("invalid mesh at index: %1").arg(i));
+            }
+            i++;
+        }
+    }
+    return modelWrapper;
+}
+
+scriptable::ScriptableModelPointer GraphicsScriptingInterface::getModelObject(QUuid uuid) {
+    QString error, providerType = "unknown";
+    if (auto provider = getModelProvider(uuid)) {
+        providerType = SpatiallyNestable::nestableTypeToString(provider->modelProviderType);
+        auto modelObject = provider->getScriptableModel();
+        if (modelObject.objectID == uuid) {
+            if (modelObject.meshes.size()) {
+                auto modelWrapper = scriptable::make_scriptowned<scriptable::ScriptableModel>(modelObject);
+                modelWrapper->setObjectName(providerType+"::"+uuid.toString()+"::model");
+                return modelWrapper;
+            } else {
+                error = "no meshes available: " + modelObject.objectID.toString();
+            }
+        } else {
+            error = "objectID mismatch: " + modelObject.objectID.toString();
+        }
+    } else {
+        error = "provider unavailable";
+    }
+    auto errorMessage = QString("failed to get meshes from %1 provider for uuid %2 (%3)").arg(providerType).arg(uuid.toString()).arg(error);
+    qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getModelObject ERROR" << errorMessage;
+    if (context()) {
+        context()->throwError(errorMessage);
+    }
+    return nullptr;
+}
+
+#ifdef SCRIPTABLE_MESH_TODO
+bool GraphicsScriptingInterface::updateMeshPart(scriptable::ScriptableMeshPointer mesh, scriptable::ScriptableMeshPartPointer part) {
+    Q_ASSERT(mesh);
+    Q_ASSERT(part);
+    Q_ASSERT(part->parentMesh);
+    auto tmp = exportMeshPart(mesh, part->partIndex);
+    if (part->parentMesh == mesh) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+        qCInfo(graphics_scripting) << "updateMeshPart -- update via clone" << mesh << part;
+#endif
+        tmp->replaceMeshData(part->cloneMeshPart());
+        return false;
+    } else {
+#ifdef SCRIPTABLE_MESH_DEBUG
+        qCInfo(graphics_scripting) << "updateMeshPart -- update via inplace" << mesh << part;
+#endif
+        tmp->replaceMeshData(part);
+        return true;
+    }
+}
+#endif
+
+QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::ScriptableModel& _in) {
     const auto& in = _in.getConstMeshes();
     if (in.size()) {
         QList<scriptable::MeshPointer> meshes;
@@ -152,3 +184,5 @@ MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMes
     }
     return mesh;
 }
+
+#include "GraphicsScriptingInterface.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index ab2e5467db..9866b5585c 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -29,16 +29,24 @@ public:
 
 public slots:
     /**jsdoc
-     * Returns the meshes associated with a UUID (entityID, overlayID, or avatarID)
+     * Returns the model/meshes associated with a UUID (entityID, overlayID, or avatarID)
      *
-     * @function GraphicsScriptingInterface.getMeshes
-     * @param {EntityID} entityID The ID of the entity whose meshes are to be retrieve
+     * @function GraphicsScriptingInterface.getModel
+     * @param {UUID} The objectID of the model whose meshes are to be retrieve
      */
-    QScriptValue getMeshes(QUuid uuid);
-    bool updateMeshes(QUuid uuid, const scriptable::ScriptableModelPointer model);
-    bool updateMeshes(QUuid uuid, const scriptable::ScriptableMeshPointer mesh, int meshIndex=0, int partIndex=0);
+    scriptable::ModelProviderPointer getModelProvider(QUuid uuid);
+    scriptable::ScriptableModelPointer getModelObject(QUuid uuid);
+    bool updateModelObject(QUuid uuid, const scriptable::ScriptableModelPointer model);
+    scriptable::ScriptableModelPointer newModelObject(QVector<scriptable::ScriptableMeshPointer> meshes);
 
-    QString meshToOBJ(const scriptable::ScriptableModel& in);
+#ifdef SCRIPTABLE_MESH_TODO
+    scriptable::ScriptableMeshPartPointer exportMeshPart(scriptable::ScriptableMeshPointer mesh, int part=0) {
+        return scriptable::make_scriptowned<scriptable::ScriptableMeshPart>(mesh, part);
+    }
+    bool updateMeshPart(scriptable::ScriptableMeshPointer mesh, scriptable::ScriptableMeshPartPointer part);
+#endif
+
+    QString exportModelToOBJ(const scriptable::ScriptableModel& in);
 
 private:
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
index 594e09bb32..9b86ddee82 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
@@ -43,23 +43,13 @@ namespace scriptable {
         return toDebugString(qobject_cast<QObject*>(tmp.get()));
     }
 
-    // C++ > QtOwned instance
-    template <typename T, class... Rest>
-    std::shared_ptr<T> make_qtowned(Rest... rest) {
-        T* tmp = new T(rest...);
-        if (tmp) {
-            tmp->metadata["__ownership__"] = QScriptEngine::QtOwnership;
-        }
-        return std::shared_ptr<T>(tmp);
-    }
-
-    // C++ > ScriptOwned JS instance
+    // Helper for creating C++ > ScriptOwned JS instances
+    // (NOTE: this also helps track in the code where we need to update later if switching to
+    //  std::shared_ptr's -- something currently non-trivial given mixed JS/C++ object ownership)
     template <typename T, class... Rest>
     QPointer<T> make_scriptowned(Rest... rest) {
-        T* tmp = new T(rest...);
-        if (tmp) {
-            tmp->metadata["__ownership__"] = QScriptEngine::ScriptOwnership;
-        }
-        return QPointer<T>(tmp);
+        auto instance = QPointer<T>(new T(rest...));
+        Q_ASSERT(instance && instance->parent());
+        return instance;
     }
 }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 643debf475..52cd225fba 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -5,6 +5,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Forward.h"
+
 #include "ScriptableMesh.h"
 
 #include "BufferViewScripting.h"
@@ -19,7 +21,7 @@
 #include <graphics/BufferViewHelpers.h>
 #include <graphics/Geometry.h>
 
-#include "ScriptableMesh.moc"
+// #define SCRIPTABLE_MESH_DEBUG 1
 
 scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
     : QObject(), parentMesh(parentMesh), partIndex(partIndex)  {
@@ -77,7 +79,9 @@ QVector<quint32> scriptable::ScriptableMesh::findNearbyIndices(const glm::vec3&
 QVector<quint32> scriptable::ScriptableMesh::getIndices() const {
     QVector<quint32> result;
     if (auto mesh = getMeshPointer()) {
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCDebug(graphics_scripting, "getTriangleIndices mesh %p", mesh.get());
+#endif
         gpu::BufferView indexBufferView = mesh->getIndexBuffer();
         if (quint32 count = (quint32)indexBufferView.getNumElements()) {
             result.resize(count);
@@ -121,20 +125,16 @@ QVector<QString> scriptable::ScriptableMesh::getAttributeNames() const {
     return result;
 }
 
-// override
 QVariantMap scriptable::ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
     return getVertexAttributes(vertexIndex, getAttributeNames());
 }
 
 bool scriptable::ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
-    //qCInfo(graphics_scripting)  << "setVertexAttributes" << vertexIndex << attributes;
-    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
     for (auto& a : buffer_helpers::gatherBufferViews(getMeshPointer())) {
         const auto& name = a.first;
         const auto& value = attributes.value(name);
         if (value.isValid()) {
             auto& view = a.second;
-            //qCDebug(graphics_scripting) << "setVertexAttributes" << vertexIndex << name;
             buffer_helpers::fromVariant(view, vertexIndex, value);
         } else {
             //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
@@ -269,7 +269,6 @@ quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
 #endif
     auto obj = js->newObject();
     auto attributeViews = buffer_helpers::gatherBufferViews(mesh, { "normal", "color" });
-    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
     uint32_t i = 0;
     for (; i < nPositions; i++) {
         for (const auto& a : attributeViews) {
@@ -303,13 +302,13 @@ quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
 }
 
 quint32 scriptable::ScriptableMeshPart::mapAttributeValues(QScriptValue callback) {
-    return parentMesh ? parentMesh->mapAttributeValues(callback) : 0; 
+    return parentMesh ? parentMesh->mapAttributeValues(callback) : 0;
 }
 
 bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
     auto mesh = getMeshPointer();
 #ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices" << !!mesh<< !!meshProxy;
+    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices" << !!mesh<< !!parentMesh;
 #endif
     if (!mesh) {
         return false;
@@ -321,8 +320,9 @@ bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
     auto buffer = new gpu::Buffer();
     buffer->resize(numPoints * sizeof(uint32_t));
     auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
-    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+#ifdef SCRIPTABLE_MESH_DEBUG
     qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices numPoints" << numPoints;
+#endif
     auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
     for (const auto& a : attributeViews) {
         auto& view = a.second;
@@ -330,15 +330,17 @@ bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
         auto buffer = new gpu::Buffer();
         buffer->resize(numPoints * sz);
         auto points = gpu::BufferView(buffer, view._element);
-        auto src = (uint8_t*)view._buffer->getData();
-        auto dest = (uint8_t*)points._buffer->getData();
         auto slot = buffer_helpers::ATTRIBUTES[a.first];
+#ifdef SCRIPTABLE_MESH_DEBUG
         if (0) {
+            auto src = (uint8_t*)view._buffer->getData();
+            auto dest = (uint8_t*)points._buffer->getData();
             qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices buffer" << a.first;
             qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices source" << view.getNumElements();
             qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices dest" << points.getNumElements();
             qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices sz" << sz << src << dest << slot;
         }
+#endif
         auto esize = indices._element.getSize();
         const char* hint= a.first.toStdString().c_str();
         for(quint32 i = 0; i < numPoints; i++) {
@@ -381,8 +383,6 @@ bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshP
         "target:" << QString::fromStdString(target->displayName) <<
         "attributes:" << attributes;
 
-    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
-
     // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
     if (attributeNames.isEmpty()) {
         auto attributeViews = buffer_helpers::gatherBufferViews(target);
@@ -438,7 +438,6 @@ bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
     uniqueVerts.reserve((int)numPositions);
     QMap<quint32,quint32> remapIndices;
 
-    metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
     for (quint32 i = 0; i < numPositions; i++) {
         const quint32 numUnique = uniqueVerts.size();
         const auto& position = positions.get<glm::vec3>(i);
@@ -508,63 +507,51 @@ scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool rec
         return nullptr;
     }
     auto clone = buffer_helpers::cloneMesh(mesh);
-    
+
     if (recalcNormals) {
         buffer_helpers::recalculateNormals(clone);
     }
-    auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, metadata);
-    clone.reset(); // free local reference
-    // qCInfo(graphics_scripting) << "========= ScriptableMesh::cloneMesh..." << meshPointer << meshPointer->ownedMesh.use_count();
-    //scriptable::MeshPointer* ppMesh = new scriptable::MeshPointer();
-    //*ppMesh = clone;
-
-    if (0 && meshPointer) {
-        scriptable::WeakMeshPointer delme = meshPointer->mesh;
-        QString debugString = scriptable::toDebugString(meshPointer);
-        QObject::connect(meshPointer, &QObject::destroyed, meshPointer, [=]() {
-            // qCWarning(graphics_scripting) << "*************** cloneMesh/Destroy";
-            // qCWarning(graphics_scripting) << "*************** " << debugString << delme.lock().get();
-            if (!delme.expired()) {
-                QTimer::singleShot(250, this, [=]{
-                    if (!delme.expired()) {
-                        qCWarning(graphics_scripting) << "cloneMesh -- potential memory leak..." << debugString << delme.use_count();
-                    }
-                });
-            }
-        });
-    }
-            
-    meshPointer->metadata["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, nullptr);
     return scriptable::ScriptableMeshPointer(meshPointer);
 }
 
-scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::WeakModelProviderPointer provider, scriptable::ScriptableModelBasePointer model, scriptable::WeakMeshPointer mesh, const QVariantMap& metadata)
-    : provider(provider), model(model), mesh(mesh), metadata(metadata) {}
-scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::WeakMeshPointer mesh) : scriptable::ScriptableMeshBase(scriptable::WeakModelProviderPointer(), nullptr, mesh, QVariantMap()) { }
-scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::MeshPointer mesh, const QVariantMap& metadata)
-    : ScriptableMeshBase(WeakModelProviderPointer(), nullptr, mesh, metadata) {
-    ownedMesh = mesh;
+
+
+// note: we don't always want the JS side to prevent mesh data from being freed
+
+scriptable::ScriptableMeshBase::ScriptableMeshBase(
+    scriptable::WeakModelProviderPointer provider, scriptable::ScriptableModelBasePointer model, scriptable::WeakMeshPointer weakMesh, QObject* parent
+    ) : QObject(parent), provider(provider), model(model), weakMesh(weakMesh) {
+    if (parent) {
+        qCDebug(graphics_scripting) << "ScriptableMeshBase -- have parent QObject, creating strong neshref" << weakMesh.lock().get() << parent;
+        strongMesh = weakMesh.lock();
+    }
 }
+
+scriptable::ScriptableMeshBase::ScriptableMeshBase(scriptable::WeakMeshPointer weakMesh, QObject* parent) :
+    scriptable::ScriptableMeshBase(scriptable::WeakModelProviderPointer(), nullptr, weakMesh, parent) {
+}
+
 scriptable::ScriptableMeshBase& scriptable::ScriptableMeshBase::operator=(const scriptable::ScriptableMeshBase& view) {
     provider = view.provider;
     model = view.model;
-    mesh = view.mesh;
-    ownedMesh = view.ownedMesh;
-    metadata = view.metadata;
+    weakMesh = view.weakMesh;
+    strongMesh = view.strongMesh;
     return *this;
 }
-                                                                                                                                                                                               scriptable::ScriptableMeshBase::~ScriptableMeshBase() {
-    ownedMesh.reset();
+
+scriptable::ScriptableMeshBase::~ScriptableMeshBase() {
 #ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "//~ScriptableMeshBase" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
+    qCInfo(graphics_scripting) << "//~ScriptableMeshBase" << this << "strongMesh:"  << strongMesh.use_count() << "weakMesh:" << weakMesh.use_count();
 #endif
+    strongMesh.reset();
 }
 
 scriptable::ScriptableMesh::~ScriptableMesh() {
-    ownedMesh.reset();
 #ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "//~ScriptableMesh" << this << "ownedMesh:"  << ownedMesh.use_count() << "mesh:" << mesh.use_count();
+    qCInfo(graphics_scripting) << "//~ScriptableMesh" << this << "strongMesh:"  << strongMesh.use_count() << "weakMesh:" << weakMesh.use_count();
 #endif
+    strongMesh.reset();
 }
 
 QString scriptable::ScriptableMeshPart::toOBJ() {
@@ -573,7 +560,7 @@ QString scriptable::ScriptableMeshPart::toOBJ() {
             context()->throwError(QString("null mesh"));
         } else {
             qCWarning(graphics_scripting) << "null mesh";
-        }            
+        }
         return QString();
     }
     return writeOBJToString({ getMeshPointer() });
@@ -585,12 +572,7 @@ namespace {
         if (!object) {
             return QScriptValue::NullValue;
         }
-        auto ownership = object->metadata.value("__ownership__");
-        return engine->newQObject(
-            object,
-            ownership.isValid() ? static_cast<QScriptEngine::ValueOwnership>(ownership.toInt()) : QScriptEngine::QtOwnership
-            //, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects
-        );
+        return engine->newQObject(object, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater);
     }
 
     QScriptValue meshPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableMeshPointer& in) {
@@ -637,7 +619,7 @@ namespace scriptable {
         qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPartPointer>>(engine);
         qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
         qScriptRegisterSequenceMetaType<QVector<scriptable::uint32>>(engine);
-        
+
         qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
         qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
         qScriptRegisterMetaType(engine, meshPointerToScriptValue, meshPointerFromScriptValue);
@@ -645,50 +627,41 @@ namespace scriptable {
 
         return metaTypeIds.size();
     }
+
     // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
     // still supporting extended Qt signal-like (scope, "methodName") and (scope, function(){}) "this" binding conventions
-    QScriptValue jsBindCallback(QScriptValue callback) {
-        if (callback.isObject() && callback.property("callback").isFunction()) {
-            return callback;
+    QScriptValue jsBindCallback(QScriptValue value) {
+        if (value.isObject() && value.property("callback").isFunction()) {
+            // value is already a bound callback
+            return value;
         }
-        auto engine = callback.engine();
+        auto engine = value.engine();
         auto context = engine ? engine->currentContext() : nullptr;
         auto length = context ? context->argumentCount() : 0;
         QScriptValue scope = context ? context->thisObject() : QScriptValue::NullValue;
         QScriptValue method;
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "jsBindCallback" << engine << length << scope.toQObject() << method.toString();
-        int i = 0;
-        for (; context && i < length; i++) {
-            if (context->argument(i).strictlyEquals(callback)) {
+#endif
+
+        // find position in the incoming JS Function.arguments array (so we can test for the two-argument case)
+        for (int i = 0; context && i < length; i++) {
+            if (context->argument(i).strictlyEquals(value)) {
                 method = context->argument(i+1);
             }
         }
         if (method.isFunction() || method.isString()) {
-            scope = callback;
+            // interpret as `API.func(..., scope, function callback(){})` or `API.func(..., scope, "methodName")`
+            scope = value;
         } else {
-            method = callback;
+            // interpret as `API.func(..., function callback(){})`
+            method = value;
         }
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCInfo(graphics_scripting) << "scope:" << scope.toQObject() << "method:" << method.toString();
+#endif
         return ::makeScopedHandlerObject(scope,  method);
     }
 }
 
-bool scriptable::GraphicsScriptingInterface::updateMeshPart(ScriptableMeshPointer mesh, ScriptableMeshPartPointer part) {
-    Q_ASSERT(mesh);
-    Q_ASSERT(part);
-    Q_ASSERT(part->parentMesh);
-    auto tmp = exportMeshPart(mesh, part->partIndex);
-    if (part->parentMesh == mesh) {
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "updateMeshPart -- update via clone" << mesh << part;
-#endif
-        tmp->replaceMeshData(part->cloneMeshPart());
-        return false;
-    } else {
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "updateMeshPart -- update via inplace" << mesh << part;
-#endif
-        tmp->replaceMeshData(part);
-        return true;
-    }
-}
+#include "ScriptableMesh.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 459613135a..f070fdf21e 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -1,3 +1,10 @@
+//
+//  Copyright 2018 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
+//
+
 #pragma once
 
 #include "ScriptableModel.h"
@@ -26,25 +33,26 @@ namespace scriptable {
         Q_PROPERTY(uint32 numAttributes READ getNumAttributes)
         Q_PROPERTY(uint32 numVertices READ getNumVertices)
         Q_PROPERTY(uint32 numIndices READ getNumIndices)
-        Q_PROPERTY(QVariantMap metadata MEMBER metadata)
         Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
         Q_PROPERTY(QVector<scriptable::ScriptableMeshPartPointer> parts READ getMeshParts)
         Q_PROPERTY(bool valid READ hasValidMesh)
-        bool hasValidMesh() const { return (bool)getMeshPointer(); }
-        Q_PROPERTY(bool validOwned READ hasValidOwnedMesh)
-        bool hasValidOwnedMesh() const { return (bool)getOwnedMeshPointer(); }
+        Q_PROPERTY(bool strong READ hasValidStrongMesh)
 
         operator const ScriptableMeshBase*() const { return (qobject_cast<const scriptable::ScriptableMeshBase*>(this)); }
-        ScriptableMesh(scriptable::MeshPointer mesh) : ScriptableMeshBase(mesh), QScriptable() { ownedMesh = mesh; }
-        ScriptableMesh(WeakModelProviderPointer provider, ScriptableModelBasePointer model, MeshPointer mesh, const QVariantMap& metadata)
-            : ScriptableMeshBase(provider, model, mesh, metadata), QScriptable() { ownedMesh = mesh; }
+
+        ScriptableMesh(WeakModelProviderPointer provider, ScriptableModelBasePointer model, MeshPointer mesh, QObject* parent)
+            : ScriptableMeshBase(provider, model, mesh, parent), QScriptable() { strongMesh = mesh; }
+        ScriptableMesh(MeshPointer mesh, QObject* parent)
+            : ScriptableMeshBase(WeakModelProviderPointer(), nullptr, mesh, parent), QScriptable() { strongMesh = mesh; }
         ScriptableMesh(const ScriptableMeshBase& other);
         ScriptableMesh(const ScriptableMesh& other) : ScriptableMeshBase(other), QScriptable() {};
         virtual ~ScriptableMesh();
 
         Q_INVOKABLE const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
-        Q_INVOKABLE const scriptable::MeshPointer getOwnedMeshPointer() const { return ownedMesh; }
+        Q_INVOKABLE const scriptable::MeshPointer getOwnedMeshPointer() const { return strongMesh; }
         scriptable::ScriptableMeshPointer getSelf() const { return const_cast<scriptable::ScriptableMesh*>(this); }
+        bool hasValidMesh() const { return !weakMesh.expired(); }
+        bool hasValidStrongMesh() const { return (bool)strongMesh; }
    public slots:
         uint32 getNumParts() const;
         uint32 getNumVertices() const;
@@ -65,9 +73,9 @@ namespace scriptable {
 
         int _getSlotNumber(const QString& attributeName) const;
 
-        scriptable::ScriptableMeshPointer cloneMesh(bool recalcNormals = false);        
+        scriptable::ScriptableMeshPointer cloneMesh(bool recalcNormals = false);
     public:
-        operator bool() const { return !mesh.expired(); }
+        operator bool() const { return !weakMesh.expired(); }
 
     public slots:
         // QScriptEngine-specific wrappers
@@ -88,11 +96,9 @@ namespace scriptable {
         Q_PROPERTY(uint32 numIndices READ getNumIndices)
         Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
 
-        Q_PROPERTY(QVariantMap metadata MEMBER metadata)
-
         ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
         ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
-        ScriptableMeshPart(const ScriptableMeshPart& other) : QObject(), QScriptable(), parentMesh(other.parentMesh), partIndex(other.partIndex) {}
+        ScriptableMeshPart(const ScriptableMeshPart& other) : QObject(other.parent()), QScriptable(), parentMesh(other.parentMesh), partIndex(other.partIndex) {}
 
     public slots:
         scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
@@ -134,23 +140,10 @@ namespace scriptable {
     public:
         scriptable::ScriptableMeshPointer parentMesh;
         uint32 partIndex;
-        QVariantMap metadata;
     protected:
         int _elementsPerFace{ 3 };
         QString _topology{ "triangles" };
-        scriptable::MeshPointer getMeshPointer() const { return parentMesh ? parentMesh->getMeshPointer() : nullptr; }    
-    };
-
-    class GraphicsScriptingInterface : public QObject, QScriptable {
-        Q_OBJECT
-    public:
-        GraphicsScriptingInterface(QObject* parent = nullptr) : QObject(parent), QScriptable() {}
-        GraphicsScriptingInterface(const GraphicsScriptingInterface& other) : QObject(), QScriptable() {}
-    public slots:
-        ScriptableMeshPartPointer exportMeshPart(ScriptableMeshPointer mesh, int part=0) {
-            return ScriptableMeshPartPointer(new ScriptableMeshPart(mesh, part));
-        }
-        bool updateMeshPart(ScriptableMeshPointer mesh, ScriptableMeshPartPointer part);
+        scriptable::MeshPointer getMeshPointer() const { return parentMesh ? parentMesh->getMeshPointer() : nullptr; }
     };
 
     // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
@@ -165,26 +158,5 @@ Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPartPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPartPointer>)
-Q_DECLARE_METATYPE(scriptable::GraphicsScriptingInterface)
-
-// FIXME: MESHFACES: faces were supported in the original Model.* API -- are they still needed/used/useful for anything yet?
-#include <memory>
-
-namespace mesh {
-    class MeshFace;
-    using MeshFaces = QVector<mesh::MeshFace>;
-    class MeshFace {
-    public:
-        MeshFace() {}
-        MeshFace(QVector<scriptable::uint32> vertexIndices) : vertexIndices(vertexIndices) {}
-        ~MeshFace() {}
-
-        QVector<scriptable::uint32> vertexIndices;
-        // TODO -- material...
-    };
-};
-
-Q_DECLARE_METATYPE(mesh::MeshFace)
-Q_DECLARE_METATYPE(QVector<mesh::MeshFace>)
 Q_DECLARE_METATYPE(scriptable::uint32)
 Q_DECLARE_METATYPE(QVector<scriptable::uint32>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 229d56adab..306f1b18af 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -13,25 +13,13 @@
 #include "ScriptableMesh.h"
 
 #include <QtScript/QScriptEngine>
-//#include "ScriptableModel.moc"
 
-void scriptable::ScriptableModelBase::mixin(const QVariantMap& modelMetaData) {
-    for (const auto& key : modelMetaData.keys()) {
-        const auto& value = modelMetaData[key];
-        if (metadata.contains(key) && metadata[key].type() == (QVariant::Type)QMetaType::QVariantList) {
-            qCDebug(graphics_scripting) << "CONCATENATING" << key << metadata[key].toList().size() << "+" << value.toList().size();
-            metadata[key] = metadata[key].toList() + value.toList();
-        } else {
-            metadata[key] = modelMetaData[key];
-        }
-    }
-}
+// #define SCRIPTABLE_MESH_DEBUG 1
 
 scriptable::ScriptableModelBase& scriptable::ScriptableModelBase::operator=(const scriptable::ScriptableModelBase& other) {
     provider = other.provider;
     objectID = other.objectID;
-    metadata = other.metadata;
-    for (auto& mesh : other.meshes) {
+    for (const auto& mesh : other.meshes) {
         append(mesh);
     }
     return *this;
@@ -43,36 +31,27 @@ scriptable::ScriptableModelBase::~ScriptableModelBase() {
 #endif
     // makes cleanup order more deterministic to help with debugging
     for (auto& m : meshes) {
-        m.ownedMesh.reset();
+        m.strongMesh.reset();
     }
     meshes.clear();
 }
 
-void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh, const QVariantMap& metadata) {
-    meshes << ScriptableMeshBase{ provider, this, mesh, metadata };
+void scriptable::ScriptableModelBase::append(scriptable::WeakMeshPointer mesh) {
+    meshes << ScriptableMeshBase{ provider, this, mesh, this /*parent*/ };
 }
 
-void scriptable::ScriptableModelBase::append(const ScriptableMeshBase& mesh, const QVariantMap& modelMetaData) {
+void scriptable::ScriptableModelBase::append(const ScriptableMeshBase& mesh) {
     if (mesh.provider.lock().get() != provider.lock().get()) {
         qCDebug(graphics_scripting) << "warning: appending mesh from different provider..." << mesh.provider.lock().get() << " != " << provider.lock().get();
     }
     meshes << mesh;
-    mixin(modelMetaData);
 }
 
-void scriptable::ScriptableModelBase::append(const ScriptableModelBase& other, const QVariantMap& modelMetaData) {
-    for (const auto& mesh : other.meshes) {
-        append(mesh);
-    }
-    mixin(other.metadata);
-    mixin(modelMetaData);
-}
-
-
 QString scriptable::ScriptableModel::toString() const {
-    return QString("[ScriptableModel%1%2]")
+    return QString("[ScriptableModel%1%2 numMeshes=%3]")
         .arg(objectID.isNull() ? "" : " objectID="+objectID.toString())
-        .arg(objectName().isEmpty() ? "" : " name=" +objectName());
+        .arg(objectName().isEmpty() ? "" : " name=" +objectName())
+        .arg(meshes.size());
 }
 
 scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const QVariantMap& options) {
@@ -131,3 +110,5 @@ quint32 scriptable::ScriptableModel::mapAttributeValues(QScriptValue callback) {
     }
     return result;
 }
+
+#include "ScriptableModel.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index a78c9a4ef5..4ed1cc9554 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -1,15 +1,22 @@
+//
+//  Copyright 2018 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
+//
+
 #pragma once
 
 #include "Forward.h"
 #include "GraphicsScriptingUtil.h"
 
 class QScriptValue;
+
 namespace scriptable {
     class ScriptableModel : public ScriptableModelBase {
         Q_OBJECT
     public:
         Q_PROPERTY(QUuid objectID MEMBER objectID CONSTANT)
-        Q_PROPERTY(QVariantMap metadata MEMBER metadata CONSTANT)
         Q_PROPERTY(uint32 numMeshes READ getNumMeshes)
         Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
 
@@ -27,11 +34,9 @@ namespace scriptable {
         QVector<scriptable::ScriptableMeshPointer> getMeshes();
         const QVector<scriptable::ScriptableMeshPointer> getConstMeshes() const;
         operator scriptable::ScriptableModelBasePointer() {
-            QPointer<scriptable::ScriptableModelBase> p;
-            p = qobject_cast<scriptable::ScriptableModelBase*>(this);
-            return p;
+            return QPointer<scriptable::ScriptableModelBase>(qobject_cast<scriptable::ScriptableModelBase*>(this));
         }
-        
+
 
         // QScriptEngine-specific wrappers
         Q_INVOKABLE uint32 mapAttributeValues(QScriptValue callback);
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index ddf3d84c89..29dcbd58e3 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -28,10 +28,6 @@ namespace glm {
     using hvec4 = glm::tvec4<glm::detail::hdata>;
 }
 
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-#include "../../graphics-scripting/src/graphics-scripting/DebugNames.h"
-#endif
-
 namespace {
     QLoggingCategory bufferhelper_logging{ "hifi.bufferview" };
 }
@@ -109,9 +105,7 @@ bool buffer_helpers::fromVariant(const gpu::BufferView& view, quint32 index, con
     const auto dataType = element.getType();
     const auto byteLength = element.getSize();
     const auto BYTES_PER_ELEMENT = byteLength / vecN;
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    qCDebug(bufferhelper_logging) << "bufferViewElementFromVariant" << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
-#endif
+
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
         case 2: setBufferViewElement<glm::u8vec2>(view, index, v); return true;
@@ -176,18 +170,12 @@ QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, b
         auto byteOffset = index * vecN * BYTES_PER_ELEMENT;
         auto maxByteOffset = (view._size - 1) * vecN * BYTES_PER_ELEMENT;
         if (byteOffset > maxByteOffset) {
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-            qDebug() << "toVariant -- " << DebugNames::stringFrom(dataType)
-#endif
             qDebug() << "toVariant -- byteOffset out of range " << byteOffset << " < " << maxByteOffset;
             qDebug() << "toVariant -- index: " << index << "numElements" << view.getNumElements();
             qDebug() << "toVariant -- vecN: " << vecN << "byteLength" << byteLength << "BYTES_PER_ELEMENT" << BYTES_PER_ELEMENT;
         }
         Q_ASSERT(byteOffset <= maxByteOffset);
     }
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-    qCDebug(bufferhelper_logging) << "toVariant -- " << index << DebugNames::stringFrom(dataType) << BYTES_PER_ELEMENT << vecN;
-#endif
     if (BYTES_PER_ELEMENT == 1) {
         switch(vecN) {
         case 2: return getBufferViewElement<glm::u8vec2>(view, index, asArray);
@@ -305,13 +293,8 @@ template <typename T> struct GpuScalarToGlm;
 
 struct GpuToGlmAdapter {
     static float error(const QString& name, const gpu::BufferView& view, quint32 index, const char *hint) {
-        QString debugName;
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-        debugName = DebugNames::stringFrom(view._element.getType())
-#endif
-        qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2(%3)) size=%4(per=%5) vec%6 hint=%7 #%8")
+        qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2) size=%3(per=%4) vec%5 hint=%6 #%7")
             .arg(name)
-            .arg(debugName)
             .arg(view._element.getType())
             .arg(view._element.getSize())
             .arg(view._element.getSize() / view._element.getScalarCount())
@@ -404,7 +387,7 @@ struct getVec {
         }
         return result;
     }
-    static T __to_scalar__(const gpu::BufferView& view, quint32 index, const char *hint) {
+    static T __to_value__(const gpu::BufferView& view, quint32 index, const char *hint) {
         assert(boundsCheck(view, index));
         return FUNC::get(view, index, hint);
     }
@@ -425,18 +408,18 @@ template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::Bu
 }
 
 
-// indexed conversion accessors (similar to "view.convert<T>(i)" existed)
+// indexed conversion accessors (like the hypothetical "view.convert<T>(i)")
 template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuScalarToGlm<int>,int>::__to_scalar__(view, index, hint);
+    return getVec<GpuScalarToGlm<int>,int>::__to_value__(view, index, hint);
 }
 template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_scalar__(view, index, hint);
+    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_value__(view, index, hint);
 }
 template <> glm::vec3 buffer_helpers::convert<glm::vec3>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_scalar__(view, index, hint);
+    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_value__(view, index, hint);
 }
 template <> glm::vec4 buffer_helpers::convert<glm::vec4>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_scalar__(view, index, hint);
+    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_value__(view, index, hint);
 }
 
 gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
@@ -492,9 +475,6 @@ namespace {
                           vsize > bufferView._size
             );
         QString hint = QString("%1").arg(slot);
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-        hint = DebugNames::stringFrom(slot);
-#endif
 #ifdef DEV_BUILD
         auto beforeCount = bufferView.getNumElements();
         auto beforeTotal = bufferView._size;
@@ -519,9 +499,6 @@ namespace {
         auto afterTotal = bufferView._size;
         if (beforeTotal != afterTotal || beforeCount != afterCount) {
             QString typeName = QString("%1").arg(bufferView._element.getType());
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-            typeName = DebugNames::stringFrom(bufferView._element.getType());
-#endif
             qCDebug(bufferhelper_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
                     hint.toStdString().c_str(), bufferView._element.getScalarCount(),
                     typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
@@ -557,9 +534,6 @@ std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::M
         if (beforeCount > 0) {
             auto element = view._element;
             QString typeName = QString("%1").arg(element.getType());
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-            typeName = DebugNames::stringFrom(element.getType());
-#endif
 
             attributeViews[name] = getBufferView(mesh, slot);
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 783659a6a1..a083b027f3 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -492,7 +492,6 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
                     { "v2", vec3toVariant(bestModelTriangle.v2) },
                 };
             }
-            
         }
     }
 
@@ -591,38 +590,41 @@ MeshProxyList Model::getMeshes() const {
 // FIXME: temporary workaround that updates the whole FBXGeometry (to keep findRayIntersection in sync)
 #include "Model_temporary_hack.cpp.h"
 
-bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer _newModel, int meshIndex, int partIndex) {
+bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
     QMutexLocker lock(&_mutex);
 
     if (!isLoaded()) {
+        qDebug() << "!isLoaded" << this;
         return false;
     }
 
-    {
-        // FIXME: temporary workaround for updating the whole FBXGeometry (to keep findRayIntersection in sync)
-        auto newRenderGeometry = new MyGeometryMappingResource(
-            _url, _renderGeometry, _newModel ? scriptable::make_qtowned<scriptable::ScriptableModelBase>(*_newModel) : nullptr
-        );
-        _visualGeometryRequestFailed = false;
-        deleteGeometry();
-        _renderGeometry.reset(newRenderGeometry);
-        _rig.destroyAnimGraph();
-        updateGeometry();
-        calculateTriangleSets();
-        _needsReload = false;
-        _needsFixupInScene = true;
-        setRenderItemsNeedUpdate();
+    if (!newModel || !newModel->meshes.size()) {
+        qDebug() << "!newModel.meshes.size()" << this;
+        return false;
     }
+
+    auto resource = new MyGeometryResource(_url, _renderGeometry, newModel);
+    _needsReload = false;
+    _needsUpdateTextures = false;
+    _visualGeometryRequestFailed = false;
+    _needsFixupInScene = true;
+
+    invalidCalculatedMeshBoxes();
+    deleteGeometry();
+    _renderGeometry.reset(resource);
+    updateGeometry();
+    calculateTriangleSets();
+    setRenderItemsNeedUpdate();
     return true;
 }
 
-scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
+scriptable::ScriptableModelBase Model::getScriptableModel() {
     QMutexLocker lock(&_mutex);
     scriptable::ScriptableModelBase result;
 
     if (!isLoaded()) {
         qCDebug(renderutils) << "Model::getScriptableModel -- !isLoaded";
-        return scriptable::ModelProvider::modelUnavailableError(ok);
+        return result;
     }
 
     const FBXGeometry& geometry = getFBXGeometry();
@@ -630,22 +632,9 @@ scriptable::ScriptableModelBase Model::getScriptableModel(bool* ok) {
     for (int i = 0; i < numberOfMeshes; i++) {
         const FBXMesh& fbxMesh = geometry.meshes.at(i);
         if (auto mesh = fbxMesh._mesh) {
-            auto name = geometry.getModelNameOfMesh(i);
-            result.append(std::const_pointer_cast<graphics::Mesh>(mesh), {
-                { "index", i },
-                { "name", name },
-                { "meshIndex", fbxMesh.meshIndex },
-                { "displayName", QString::fromStdString(mesh->displayName) },
-                { "modelName", QString::fromStdString(mesh->modelName) },
-                { "modelTransform", buffer_helpers::toVariant(fbxMesh.modelTransform) },
-                { "transform", buffer_helpers::toVariant(geometry.offset * fbxMesh.modelTransform) },
-                { "extents", buffer_helpers::toVariant(fbxMesh.meshExtents) },
-            });
+            result.append(mesh);
         }
     }
-    if (ok) {
-        *ok = true;
-    }
     return result;
 }
 
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 5cbdb2d300..603153d535 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -317,7 +317,7 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
-    virtual scriptable::ScriptableModelBase getScriptableModel(bool* ok = nullptr) override;
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
     virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void scaleToFit();
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
index 9b0e0bcf9a..51318656e0 100644
--- a/libraries/render-utils/src/Model_temporary_hack.cpp.h
+++ b/libraries/render-utils/src/Model_temporary_hack.cpp.h
@@ -1,9 +1,9 @@
 #include <graphics/BufferViewHelpers.h>
 #include <graphics-scripting/GraphicsScriptingUtil.h>
-class MyGeometryMappingResource : public GeometryResource {
+class MyGeometryResource : public GeometryResource {
 public:
     shared_ptr<FBXGeometry> fbxGeometry;
-    MyGeometryMappingResource(const QUrl& url, Geometry::Pointer originalGeometry, std::shared_ptr<scriptable::ScriptableModelBase> newModel) : GeometryResource(url) {
+    MyGeometryResource(const QUrl& url, Geometry::Pointer originalGeometry, scriptable::ScriptableModelBasePointer newModel) : GeometryResource(url) {
         fbxGeometry = std::make_shared<FBXGeometry>();
         FBXGeometry& geometry = *fbxGeometry.get();
         const FBXGeometry* original;
@@ -15,41 +15,12 @@ public:
             original = tmpGeometry.get();
         }
         geometry.originalURL = original->originalURL;
+        geometry.bindExtents = original->bindExtents;
 
-        geometry.author = original->author;
-        geometry.applicationName = original->applicationName;
         for (const auto &j : original->joints) {
             geometry.joints << j;
         }
-        geometry.jointIndices = QHash<QString,int>{ original->jointIndices };
-
-        geometry.animationFrames = QVector<FBXAnimationFrame>{ original->animationFrames };
-        geometry.meshIndicesToModelNames = QHash<int, QString>{ original->meshIndicesToModelNames };
-        geometry.blendshapeChannelNames = QList<QString>{ original->blendshapeChannelNames };
-
-        geometry.hasSkeletonJoints = original->hasSkeletonJoints;
-        geometry.offset = original->offset;
-        geometry.leftEyeJointIndex = original->leftEyeJointIndex;
-        geometry.rightEyeJointIndex = original->rightEyeJointIndex;
-        geometry.neckJointIndex = original->neckJointIndex;
-        geometry.rootJointIndex = original->rootJointIndex;
-        geometry.leanJointIndex = original->leanJointIndex;
-        geometry.headJointIndex = original->headJointIndex;
-        geometry.leftHandJointIndex = original->leftHandJointIndex;
-        geometry.rightHandJointIndex = original->rightHandJointIndex;
-        geometry.leftToeJointIndex = original->leftToeJointIndex;
-        geometry.rightToeJointIndex = original->rightToeJointIndex;
-        geometry.leftEyeSize = original->leftEyeSize;
-        geometry.rightEyeSize = original->rightEyeSize;
-        geometry.humanIKJointIndices = original->humanIKJointIndices;
-        geometry.palmDirection = original->palmDirection;
-        geometry.neckPivot = original->neckPivot;
-        geometry.bindExtents = original->bindExtents;
-
-        // Copy materials
-        QHash<QString, size_t> materialIDAtlas;
         for (const FBXMaterial& material : original->materials) {
-            materialIDAtlas[material.materialID] = _materials.size();
             _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
         }
         std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
@@ -58,6 +29,7 @@ public:
         if (newModel) {
             geometry.meshExtents.reset();
             for (const auto& newMesh : newModel->meshes) {
+                // qDebug() << "newMesh #" << meshID;
                 FBXMesh mesh;
                 if (meshID < original->meshes.size()) {
                     mesh = original->meshes.at(meshID); // copy
@@ -73,7 +45,7 @@ public:
                 mesh.createBlendShapeTangents(false);
                 geometry.meshes << mesh;
                 // Copy mesh pointers
-                meshes->emplace_back(newMesh.getMeshPointer());//buffer_helpers::cloneMesh(ptr));
+                meshes->emplace_back(newMesh.getMeshPointer());
                 int partID = 0;
                 const auto oldParts = mesh.parts;
                 mesh.parts.clear();
@@ -83,7 +55,7 @@ public:
                     // Construct local parts
                     part.triangleIndices = buffer_helpers::toVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
                     mesh.parts << part;
-                    auto p = std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]);
+                    auto p = std::make_shared<MeshPart>(meshID, partID, 0);
                     parts->push_back(p);
                     partID++;
                 }
@@ -94,20 +66,18 @@ public:
                         glm::vec3 transformedVertex = glm::vec3(mesh.modelTransform * glm::vec4(vertex, 1.0f));
                         geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
                         geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
-                        
+
                         mesh.meshExtents.minimum = glm::min(mesh.meshExtents.minimum, transformedVertex);
                         mesh.meshExtents.maximum = glm::max(mesh.meshExtents.maximum, transformedVertex);
                     }
                 }
-                            
                 meshID++;
             }
         }
         _meshes = meshes;
         _meshParts = parts;
-        _animGraphOverrideUrl = originalGeometry ? originalGeometry->getAnimGraphOverrideUrl() : QUrl();
         _loaded = true;
         _fbxGeometry = fbxGeometry;
-    };    
+    };
 };
 
diff --git a/tools/jsdoc/package-lock.json b/tools/jsdoc/package-lock.json
deleted file mode 100644
index 073bbf60f6..0000000000
--- a/tools/jsdoc/package-lock.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-  "name": "hifiJSDoc",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "babylon": {
-      "version": "7.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
-      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A=="
-    },
-    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-    },
-    "catharsis": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
-      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
-      "requires": {
-        "underscore-contrib": "0.3.0"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
-    },
-    "js2xmlparser": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
-      "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
-      "requires": {
-        "xmlcreate": "1.0.2"
-      }
-    },
-    "jsdoc": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
-      "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
-      "requires": {
-        "babylon": "7.0.0-beta.19",
-        "bluebird": "3.5.1",
-        "catharsis": "0.8.9",
-        "escape-string-regexp": "1.0.5",
-        "js2xmlparser": "3.0.0",
-        "klaw": "2.0.0",
-        "marked": "0.3.12",
-        "mkdirp": "0.5.1",
-        "requizzle": "0.2.1",
-        "strip-json-comments": "2.0.1",
-        "taffydb": "2.6.2",
-        "underscore": "1.8.3"
-      }
-    },
-    "klaw": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
-      "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
-      "requires": {
-        "graceful-fs": "4.1.11"
-      }
-    },
-    "marked": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
-      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA=="
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "requizzle": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
-      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
-      "requires": {
-        "underscore": "1.6.0"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
-        }
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
-    "taffydb": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg="
-    },
-    "underscore": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
-    },
-    "underscore-contrib": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
-      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
-      "requires": {
-        "underscore": "1.6.0"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
-        }
-      }
-    },
-    "xmlcreate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
-      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
-    }
-  }
-}

From ebdb5b3c173f7fe4e14e849ae64174772caee489 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 08:57:48 -0500
Subject: [PATCH 469/569] CR feedback; remove unrollVertices; update getFace;
 guard more debug logging

---
 .../src/graphics-scripting/ScriptableMesh.cpp | 81 ++++---------------
 .../src/graphics-scripting/ScriptableMesh.h   |  7 +-
 2 files changed, 19 insertions(+), 69 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 52cd225fba..0f689e3d2f 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -305,65 +305,6 @@ quint32 scriptable::ScriptableMeshPart::mapAttributeValues(QScriptValue callback
     return parentMesh ? parentMesh->mapAttributeValues(callback) : 0;
 }
 
-bool scriptable::ScriptableMeshPart::unrollVertices(bool recalcNormals) {
-    auto mesh = getMeshPointer();
-#ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices" << !!mesh<< !!parentMesh;
-#endif
-    if (!mesh) {
-        return false;
-    }
-
-    auto positions = mesh->getVertexBuffer();
-    auto indices = mesh->getIndexBuffer();
-    quint32 numPoints = (quint32)indices.getNumElements();
-    auto buffer = new gpu::Buffer();
-    buffer->resize(numPoints * sizeof(uint32_t));
-    auto newindices = gpu::BufferView(buffer, { gpu::SCALAR, gpu::UINT32, gpu::INDEX });
-#ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices numPoints" << numPoints;
-#endif
-    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto sz = view._element.getSize();
-        auto buffer = new gpu::Buffer();
-        buffer->resize(numPoints * sz);
-        auto points = gpu::BufferView(buffer, view._element);
-        auto slot = buffer_helpers::ATTRIBUTES[a.first];
-#ifdef SCRIPTABLE_MESH_DEBUG
-        if (0) {
-            auto src = (uint8_t*)view._buffer->getData();
-            auto dest = (uint8_t*)points._buffer->getData();
-            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices buffer" << a.first;
-            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices source" << view.getNumElements();
-            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices dest" << points.getNumElements();
-            qCInfo(graphics_scripting) << "ScriptableMeshPart::unrollVertices sz" << sz << src << dest << slot;
-        }
-#endif
-        auto esize = indices._element.getSize();
-        const char* hint= a.first.toStdString().c_str();
-        for(quint32 i = 0; i < numPoints; i++) {
-            quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
-            newindices.edit<uint32_t>(i) = i;
-            buffer_helpers::fromVariant(
-                points, i,
-                buffer_helpers::toVariant(view, index, false, hint)
-                    );
-        }
-        if (slot == gpu::Stream::POSITION) {
-            mesh->setVertexBuffer(points);
-        } else {
-            mesh->addAttribute(slot, points);
-        }
-    }
-    mesh->setIndexBuffer(newindices);
-    if (recalcNormals) {
-        recalculateNormals();
-    }
-    return true;
-}
-
 bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshPartPointer src, const QVector<QString>& attributeNames) {
     auto target = getMeshPointer();
     auto source = src ? src->getMeshPointer() : nullptr;
@@ -389,7 +330,9 @@ bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshP
         for (const auto& a : attributeViews) {
             auto slot = buffer_helpers::ATTRIBUTES[a.first];
             if (!attributes.contains(a.first)) {
+#ifdef SCRIPTABLE_MESH_DEBUG
                 qCInfo(graphics_scripting) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
+#endif
                 target->removeAttribute(slot);
             }
         }
@@ -404,21 +347,29 @@ bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshP
         if (slot == gpu::Stream::POSITION) {
             continue;
         }
+#ifdef SCRIPTABLE_MESH_DEBUG
         auto& before = target->getAttributeBuffer(slot);
+#endif
         auto& input = source->getAttributeBuffer(slot);
         if (input.getNumElements() == 0) {
+#ifdef SCRIPTABLE_MESH_DEBUG
             qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData buffer is empty -- pruning" << a << slot;
+#endif
             target->removeAttribute(slot);
         } else {
+#ifdef SCRIPTABLE_MESH_DEBUG
             if (before.getNumElements() == 0) {
                 qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer is empty -- adding" << a << slot;
             } else {
                 qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer exists -- updating" << a << slot;
             }
+#endif
             target->addAttribute(slot, buffer_helpers::clone(input));
         }
+#ifdef SCRIPTABLE_MESH_DEBUG
         auto& after = target->getAttributeBuffer(slot);
         qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
+#endif
     }
 
 
@@ -465,7 +416,6 @@ bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
     for (quint32 i = 0; i < numIndices; i++) {
         quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
         if (remapIndices.contains(index)) {
-            //qCInfo(graphics_scripting) << i << index << "->" << remapIndices[index];
             newIndices << remapIndices[index];
         } else {
             qCInfo(graphics_scripting) << i << index << "!remapIndices[index]";
@@ -483,9 +433,11 @@ bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
         if (slot == gpu::Stream::POSITION) {
             continue;
         }
-        qCInfo(graphics_scripting) << "ScriptableMeshPart::dedupeVertices" << a.first << slot << view.getNumElements();
         auto newView = buffer_helpers::resize(view, numUniqueVerts);
+#ifdef SCRIPTABLE_MESH_DEBUG
+        qCInfo(graphics_scripting) << "ScriptableMeshPart::dedupeVertices" << a.first << slot << view.getNumElements();
         qCInfo(graphics_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
+#endif
         quint32 numElements = (quint32)view.getNumElements();
         for (quint32 i = 0; i < numElements; i++) {
             quint32 fromVertexIndex = i;
@@ -493,7 +445,7 @@ bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
             buffer_helpers::fromVariant(
                 newView, toVertexIndex,
                 buffer_helpers::toVariant(view, fromVertexIndex, false, "dedupe")
-                );
+            );
         }
         mesh->addAttribute(slot, newView);
     }
@@ -515,10 +467,7 @@ scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool rec
     return scriptable::ScriptableMeshPointer(meshPointer);
 }
 
-
-
-// note: we don't always want the JS side to prevent mesh data from being freed
-
+// note: we don't always want the JS side to prevent mesh data from being freed (hence weak pointers unless parented QObject)
 scriptable::ScriptableMeshBase::ScriptableMeshBase(
     scriptable::WeakModelProviderPointer provider, scriptable::ScriptableModelBasePointer model, scriptable::WeakMeshPointer weakMesh, QObject* parent
     ) : QObject(parent), provider(provider), model(model), weakMesh(weakMesh) {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index f070fdf21e..48ef6c3a81 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -108,8 +108,10 @@ namespace scriptable {
         uint32 getNumFaces() const { return parentMesh ? parentMesh->getNumIndices() / _elementsPerFace : 0; }
         QVector<QString> getAttributeNames() const { return parentMesh ? parentMesh->getAttributeNames() : QVector<QString>(); }
         QVector<uint32> getFace(uint32 faceIndex) const {
-            auto inds = parentMesh ? parentMesh->getIndices() : QVector<uint32>();
-            return faceIndex+2 < (uint32)inds.size() ? inds.mid(faceIndex*3, 3) : QVector<uint32>();
+            if (parentMesh && faceIndex + 2 < parentMesh->getNumIndices()) {
+                return parentMesh->getIndices().mid(faceIndex*3, 3);
+            }
+            return QVector<uint32>();
         }
         QVariantMap scaleToFit(float unitScale);
         QVariantMap translate(const glm::vec3& translation);
@@ -118,7 +120,6 @@ namespace scriptable {
         QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
         QVariantMap transform(const glm::mat4& transform);
 
-        bool unrollVertices(bool recalcNormals = false);
         bool dedupeVertices(float epsilon = 1e-6);
         bool recalculateNormals() { return buffer_helpers::recalculateNormals(getMeshPointer()); }
 

From f8fe06213d56156687333a28878f36219bf3f45a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 09:11:23 -0500
Subject: [PATCH 470/569] CR feedback; whitespace / remove unnecessary diffs

---
 .../src/graphics-scripting/ScriptableModel.cpp                | 4 ++--
 libraries/render-utils/src/Model.cpp                          | 4 ++--
 libraries/render-utils/src/Model.h                            | 3 +--
 libraries/render-utils/src/Model_temporary_hack.cpp.h         | 1 +
 libraries/script-engine/src/AssetScriptingInterface.cpp       | 2 +-
 libraries/script-engine/src/ScriptEngines.cpp                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 306f1b18af..8ceb7de6a2 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -72,7 +72,7 @@ scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const
 
 const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
     QVector<scriptable::ScriptableMeshPointer> out;
-    for(const auto& mesh : meshes) {
+    for (const auto& mesh : meshes) {
         const scriptable::ScriptableMesh* m = qobject_cast<const scriptable::ScriptableMesh*>(&mesh);
         if (!m) {
             m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
@@ -87,7 +87,7 @@ const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::ge
 
 QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
     QVector<scriptable::ScriptableMeshPointer> out;
-    for(auto& mesh : meshes) {
+    for (auto& mesh : meshes) {
         scriptable::ScriptableMesh* m = qobject_cast<scriptable::ScriptableMesh*>(&mesh);
         if (!m) {
             m = scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index a083b027f3..6d735497c0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -24,9 +24,9 @@
 #include <PerfStat.h>
 #include <ViewFrustum.h>
 #include <GLMHelpers.h>
-#include <model-networking/SimpleMeshProxy.h>
 #include <TBBHelpers.h>
 
+#include <model-networking/SimpleMeshProxy.h>
 #include <graphics-scripting/Forward.h>
 #include <graphics/BufferViewHelpers.h>
 #include <DualQuaternion.h>
@@ -885,7 +885,7 @@ void Model::renderDebugMeshBoxes(gpu::Batch& batch) {
 
     DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, false, false, true, true);
 
-    for(const auto& triangleSet : _modelSpaceMeshTriangleSets) {
+    for (const auto& triangleSet : _modelSpaceMeshTriangleSets) {
         auto box = triangleSet.getBounds();
 
         if (_debugMeshBoxesID == GeometryCache::UNKNOWN_ID) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 603153d535..b3c7551eb3 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -317,13 +317,12 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
+    Q_INVOKABLE MeshProxyList getMeshes() const;
     virtual scriptable::ScriptableModelBase getScriptableModel() override;
     virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void scaleToFit();
 
-    Q_INVOKABLE MeshProxyList getMeshes() const;
-
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName);
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName);
 
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
index 51318656e0..cfa6945571 100644
--- a/libraries/render-utils/src/Model_temporary_hack.cpp.h
+++ b/libraries/render-utils/src/Model_temporary_hack.cpp.h
@@ -1,3 +1,4 @@
+// FIXME: temporary workaround for duplicating the FBXModel when dynamically replacing an underlying mesh part
 #include <graphics/BufferViewHelpers.h>
 #include <graphics-scripting/GraphicsScriptingUtil.h>
 class MyGeometryResource : public GeometryResource {
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 750e612781..68c24ecc33 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -440,7 +440,7 @@ void AssetScriptingInterface::saveToCache(const QUrl& rawURL, const QByteArray&
     JS_VERIFY(url.scheme() == "atp" || url.scheme() == "cache", "only 'atp' and 'cache' URL schemes supported");
     JS_VERIFY(hash.isEmpty() || hash == hashDataHex(data), QString("invalid checksum hash for atp:HASH style URL (%1 != %2)").arg(hash, hashDataHex(data)));
 
-    //qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
+    // qCDebug(scriptengine) << "saveToCache" << url.toDisplayString() << data << hash << metadata;
 
     jsPromiseReady(Parent::saveToCache(url, data, metadata), scope, callback);
 }
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 873c205706..871705d74b 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -535,7 +535,6 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
 }
 
 int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
-    // register our application services and set it off on its own thread
     int ii=0;
     for (auto initializer : _scriptInitializers) {
         ii++;
@@ -554,6 +553,7 @@ void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
         loadScript(scriptName, userLoaded, false, false, true);
     });
 
+    // register our application services and set it off on its own thread
     runScriptInitializers(scriptEngine);
 
     // FIXME disabling 'shift key' debugging for now.  If you start up the application with

From 058e4d1926874246054870581415b933f4de1ab9 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 09:12:33 -0500
Subject: [PATCH 471/569] CR feedback; whitespace / remove unnecessary diffs

---
 libraries/render-utils/src/Model.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index b3c7551eb3..bbb323d1e7 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -143,7 +143,7 @@ public:
     /// Returns a reference to the shared collision geometry.
     const Geometry::Pointer& getCollisionGeometry() const { return _collisionGeometry; }
 
-    const QVariantMap getTextures() const { assert(isLoaded()); return getGeometry()->getTextures(); }
+    const QVariantMap getTextures() const { assert(isLoaded()); return _renderGeometry->getTextures(); }
     Q_INVOKABLE virtual void setTextures(const QVariantMap& textures);
 
     /// Provided as a convenience, will crash if !isLoaded()

From 7c571cd43198f7cce1594983ed1f887b67c0971c Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Fri, 23 Feb 2018 10:31:57 -0500
Subject: [PATCH 472/569] cleanup / addition error message detail

---
 .../src/graphics-scripting/GraphicsScriptingInterface.cpp       | 2 +-
 .../src/graphics-scripting/ScriptableMesh.cpp                   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index c336e77762..787905520a 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -100,7 +100,7 @@ scriptable::ScriptableModelPointer GraphicsScriptingInterface::getModelObject(QU
                 error = "no meshes available: " + modelObject.objectID.toString();
             }
         } else {
-            error = "objectID mismatch: " + modelObject.objectID.toString();
+            error = QString("objectID mismatch: %1 (containing %2 meshes)").arg(modelObject.objectID.toString()).arg(modelObject.meshes.size());
         }
     } else {
         error = "provider unavailable";
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 0f689e3d2f..76741947fd 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -472,7 +472,9 @@ scriptable::ScriptableMeshBase::ScriptableMeshBase(
     scriptable::WeakModelProviderPointer provider, scriptable::ScriptableModelBasePointer model, scriptable::WeakMeshPointer weakMesh, QObject* parent
     ) : QObject(parent), provider(provider), model(model), weakMesh(weakMesh) {
     if (parent) {
+#ifdef SCRIPTABLE_MESH_DEBUG
         qCDebug(graphics_scripting) << "ScriptableMeshBase -- have parent QObject, creating strong neshref" << weakMesh.lock().get() << parent;
+#endif
         strongMesh = weakMesh.lock();
     }
 }

From a27a5a7e1f3e676b763a5729cb9f9d9ebef8dc5e Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Fri, 23 Feb 2018 18:16:38 +0100
Subject: [PATCH 473/569] export boolean properties properly

---
 libraries/entities/src/EntityItemPropertiesMacros.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/entities/src/EntityItemPropertiesMacros.h b/libraries/entities/src/EntityItemPropertiesMacros.h
index 51a23b6867..3bbff6cfa6 100644
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@@ -105,6 +105,7 @@ inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::vec2& v) { r
 inline QScriptValue convertScriptValue(QScriptEngine* e, const glm::vec3& v) { return vec3toScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, float v) { return QScriptValue(v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, int v) { return QScriptValue(v); }
+inline QScriptValue convertScriptValue(QScriptEngine* e, bool v) { return QScriptValue(v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, quint16 v) { return QScriptValue(v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, quint32 v) { return QScriptValue(v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, quint64 v) { return QScriptValue((qsreal)v); }

From 59bd05aa554ad6d433d50edae5b223a400a0765f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 23 Feb 2018 09:21:13 -0800
Subject: [PATCH 474/569] make shadow-related shader compile on osx

---
 libraries/render-utils/src/Shadow.slh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index abb04a4498..36eb35c757 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -89,7 +89,9 @@ float evalShadowCascadeAttenuation(int cascadeIndex, ShadowSampleOffsets offsets
 
 float evalShadowAttenuation(vec3 worldLightDir, vec4 worldPosition, float viewDepth, vec3 worldNormal) {
     ShadowSampleOffsets offsets = evalShadowFilterOffsets(worldPosition);
-    vec4 cascadeShadowCoords[2] = { vec4(0), vec4(0) };
+    vec4 cascadeShadowCoords[2];
+    cascadeShadowCoords[0] = vec4(0);
+    cascadeShadowCoords[1] = vec4(0);
     ivec2 cascadeIndices;
     float cascadeMix = determineShadowCascadesOnPixel(worldPosition, viewDepth, cascadeShadowCoords, cascadeIndices);
 	

From 5ee28297f33693ce5c90e9fc1745cbdd7f461110 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 10:19:00 -0800
Subject: [PATCH 475/569] Don't use eventLoop, since that will block the UI

---
 interface/src/commerce/QmlCommerce.cpp | 70 +++++++++++++-------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 6de5de1a9d..e7d62930cf 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -233,49 +233,47 @@ bool QmlCommerce::installApp(const QString& itemHref) {
 
     QUrl appHref(itemHref);
 
-    auto request =
-        std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, appHref));
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(this, appHref);
 
     if (!request) {
         qCDebug(commerce) << "Couldn't create resource request for app.";
         return false;
     }
 
-    QEventLoop loop;
-    connect(request.get(), &ResourceRequest::finished, &loop, &QEventLoop::quit);
+    connect(request, &ResourceRequest::finished, this, [=]() {
+        if (request->getResult() != ResourceRequest::Success) {
+            qCDebug(commerce) << "Failed to get .app.json file from remote.";
+            return false;
+        }
+
+        // Copy the .app.json to the apps directory inside %AppData%/High Fidelity/Interface
+        auto requestData = request->getData();
+        QFile appFile(_appsPath + "/" + appHref.fileName());
+        if (!appFile.open(QIODevice::WriteOnly)) {
+            qCDebug(commerce) << "Couldn't open local .app.json file for creation.";
+            return false;
+        }
+        if (appFile.write(requestData) == -1) {
+            qCDebug(commerce) << "Couldn't write to local .app.json file.";
+            return false;
+        }
+        // Close the file
+        appFile.close();
+
+        // Read from the returned datastream to know what .js to add to Running Scripts
+        QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(requestData);
+        QJsonObject appFileJsonObject = appFileJsonDocument.object();
+        QString scriptUrl = appFileJsonObject["scriptURL"].toString();
+
+        if ((DependencyManager::get<ScriptEngines>()->loadScript(scriptUrl.trimmed())).isNull()) {
+            qCDebug(commerce) << "Couldn't load script.";
+            return false;
+        }
+
+        emit appInstalled(itemHref);
+        return true;
+    });
     request->send();
-    loop.exec();
-
-    if (request->getResult() != ResourceRequest::Success) {
-        qCDebug(commerce) << "Failed to get .app.json file from remote.";
-        return false;
-    }
-
-    // Copy the .app.json to the apps directory inside %AppData%/High Fidelity/Interface
-    auto requestData = request->getData();
-    QFile appFile(_appsPath + "/" + appHref.fileName());
-    if (!appFile.open(QIODevice::WriteOnly)) {
-        qCDebug(commerce) << "Couldn't open local .app.json file for creation.";
-        return false;
-    }
-    if (appFile.write(requestData) == -1) {
-        qCDebug(commerce) << "Couldn't write to local .app.json file.";
-        return false;
-    }
-    // Close the file
-    appFile.close();
-
-    // Read from the returned datastream to know what .js to add to Running Scripts
-    QJsonDocument appFileJsonDocument = QJsonDocument::fromJson(requestData);
-    QJsonObject appFileJsonObject = appFileJsonDocument.object();
-    QString scriptUrl = appFileJsonObject["scriptURL"].toString();
-
-    if ((DependencyManager::get<ScriptEngines>()->loadScript(scriptUrl.trimmed())).isNull()) {
-        qCDebug(commerce) << "Couldn't load script.";
-        return false;
-    }
-
-    emit appInstalled(itemHref);
     return true;
 }
 

From d0ec84b6c8739ad6eab55eefe7bc6efd71038eb2 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 23 Feb 2018 10:45:59 -0800
Subject: [PATCH 476/569] remove menu option for booking marking avatar
 entities

---
 interface/src/Application.cpp             |   4 -
 interface/src/AvatarBookmarks.cpp         |  96 +++++++++++--
 interface/src/AvatarBookmarks.h           |   1 +
 interface/src/AvatarEntitiesBookmarks.cpp | 168 ----------------------
 interface/src/AvatarEntitiesBookmarks.h   |  45 ------
 interface/src/Menu.cpp                    |   5 -
 interface/src/Menu.h                      |   1 -
 7 files changed, 82 insertions(+), 238 deletions(-)
 delete mode 100644 interface/src/AvatarEntitiesBookmarks.cpp
 delete mode 100644 interface/src/AvatarEntitiesBookmarks.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 60e4c7c948..ffd2bbef97 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -68,7 +68,6 @@
 #include <Midi.h>
 #include <AudioInjectorManager.h>
 #include <AvatarBookmarks.h>
-#include <AvatarEntitiesBookmarks.h>
 #include <CursorManager.h>
 #include <DebugDraw.h>
 #include <DeferredLightingEffect.h>
@@ -785,7 +784,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<GooglePolyScriptingInterface>();
     DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
     DependencyManager::set<AvatarBookmarks>();
-    DependencyManager::set<AvatarEntitiesBookmarks>();
     DependencyManager::set<LocationBookmarks>();
     DependencyManager::set<Snapshot>();
     DependencyManager::set<CloseEventSender>();
@@ -2606,7 +2604,6 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
     surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
     surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
-    surfaceContext->setContextProperty("AvatarEntitiesBookmarks", DependencyManager::get<AvatarEntitiesBookmarks>().data());
     surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
     // Caches
@@ -5987,7 +5984,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
     scriptEngine->registerGlobalObject("AudioScope", DependencyManager::get<AudioScope>().data());
     scriptEngine->registerGlobalObject("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
-    scriptEngine->registerGlobalObject("AvatarEntitiesBookmarks", DependencyManager::get<AvatarEntitiesBookmarks>().data());
     scriptEngine->registerGlobalObject("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
     scriptEngine->registerGlobalObject("RayPick", DependencyManager::get<RayPickScriptingInterface>().data());
diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index 0f177e3d15..7845158a80 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -19,6 +19,11 @@
 #include <Application.h>
 #include <OffscreenUi.h>
 #include <avatar/AvatarManager.h>
+#include <EntityItemID.h>
+#include <EntityTree.h>
+#include <PhysicalEntitySimulation.h>
+#include <EntityEditPacketSender.h>
+#include <VariantMapToScriptValue.h>
 
 #include "MainWindow.h"
 #include "Menu.h"
@@ -29,6 +34,62 @@
 
 #include <QtQuick/QQuickWindow>
 
+
+void addAvatarEntities(const QVariantList& avatarEntities) {
+    auto nodeList = DependencyManager::get<NodeList>();
+    const QUuid myNodeID = nodeList->getSessionUUID();
+    EntityTreePointer entityTree = DependencyManager::get<EntityTreeRenderer>()->getTree();
+    if (!entityTree) {
+        return;
+    }
+    EntitySimulationPointer entitySimulation = entityTree->getSimulation();
+    PhysicalEntitySimulationPointer physicalEntitySimulation = std::static_pointer_cast<PhysicalEntitySimulation>(entitySimulation);
+    EntityEditPacketSender* entityPacketSender = physicalEntitySimulation->getPacketSender();
+    QScriptEngine scriptEngine;
+    for (int index = 0; index < avatarEntities.count(); index++) {
+        const QVariantMap& avatarEntityProperties = avatarEntities.at(index).toMap();
+        QVariant variantProperties = avatarEntityProperties["properties"];
+        QVariantMap asMap = variantProperties.toMap();
+        QScriptValue scriptProperties = variantMapToScriptValue(asMap, scriptEngine);
+        EntityItemProperties entityProperties;
+        EntityItemPropertiesFromScriptValueHonorReadOnly(scriptProperties, entityProperties);
+
+        entityProperties.setParentID(myNodeID);
+        entityProperties.setClientOnly(true);
+        entityProperties.setOwningAvatarID(myNodeID);
+        entityProperties.setSimulationOwner(myNodeID, AVATAR_ENTITY_SIMULATION_PRIORITY);
+        entityProperties.markAllChanged();
+
+        EntityItemID id = EntityItemID(QUuid::createUuid());
+        bool success = true;
+        entityTree->withWriteLock([&] {
+            EntityItemPointer entity = entityTree->addEntity(id, entityProperties);
+            if (entity) {
+                if (entityProperties.queryAACubeRelatedPropertyChanged()) {
+                    // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
+                    bool success;
+                    AACube queryAACube = entity->getQueryAACube(success);
+                    if (success) {
+                        entityProperties.setQueryAACube(queryAACube);
+                    }
+                }
+
+                entity->setLastBroadcast(usecTimestampNow());
+                // since we're creating this object we will immediately volunteer to own its simulation
+                entity->flagForOwnershipBid(VOLUNTEER_SIMULATION_PRIORITY);
+                entityProperties.setLastEdited(entity->getLastEdited());
+            } else {
+                qCDebug(entities) << "AvatarEntitiesBookmark failed to add new Entity to local Octree";
+                success = false;
+            }
+        });
+
+        if (success) {
+            entityPacketSender->queueEditEntityMessage(PacketType::EntityAdd, entityTree, id, entityProperties);
+        }
+    }
+}
+
 AvatarBookmarks::AvatarBookmarks() {
     _bookmarksFilename = PathUtils::getAppDataPath() + "/" + AVATARBOOKMARKS_FILENAME;
     readFromFile();
@@ -38,7 +99,7 @@ void AvatarBookmarks::readFromFile() {
     // migrate old avatarbookmarks.json, used to be in 'local' folder on windows
     QString oldConfigPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AVATARBOOKMARKS_FILENAME;
     QFile oldConfig(oldConfigPath);
-    
+
     // I imagine that in a year from now, this code for migrating (as well as the two lines above)
     // may be removed since all bookmarks should have been migrated by then
     // - Robbie Uvanni (6.8.2017)
@@ -48,9 +109,9 @@ void AvatarBookmarks::readFromFile() {
         } else {
             qCDebug(interfaceapp) << "Failed to migrate" << AVATARBOOKMARKS_FILENAME;
         }
-    } 
-    
-    Bookmarks::readFromFile();     
+    }
+
+    Bookmarks::readFromFile();
 }
 
 void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
@@ -81,23 +142,27 @@ void AvatarBookmarks::changeToBookmarkedAvatar() {
         myAvatar->useFullAvatarURL(action->data().toString());
         qCDebug(interfaceapp) << " Using Legacy V1 Avatar Bookmark ";
     } else {
-        
+
         const QMap<QString, QVariant> bookmark = action->data().toMap();
-        // Not magic value. This is the current made version, and if it changes this interpreter should be updated to 
+        // Not magic value. This is the current made version, and if it changes this interpreter should be updated to
         // handle the new one separately.
         // This is where the avatar bookmark entry is parsed. If adding new Value, make sure to have backward compatability with previous
         if (bookmark.value(ENTRY_VERSION) == 3) {
-                const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
-                myAvatar->useFullAvatarURL(avatarUrl);
-                qCDebug(interfaceapp) << "Avatar On " << avatarUrl;
-                const QList<QVariant>& attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
+            myAvatar->removeAvatarEntities();
+            const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
+            myAvatar->useFullAvatarURL(avatarUrl);
+            qCDebug(interfaceapp) << "Avatar On " << avatarUrl;
+            const QList<QVariant>& attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
 
-                qCDebug(interfaceapp) << "Attach " << attachments;
-                myAvatar->setAttachmentsVariant(attachments);
+            qCDebug(interfaceapp) << "Attach " << attachments;
+            myAvatar->setAttachmentsVariant(attachments);
+
+            const float& qScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
+            myAvatar->setAvatarScale(qScale);
+
+            const QVariantList& avatarEntities = bookmark.value(ENTRY_AVATAR_ENTITIES, QVariantList()).toList();
+            addAvatarEntities(avatarEntities);
 
-                const float& qScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
-                myAvatar->setAvatarScale(qScale);
-     
         } else {
             qCDebug(interfaceapp) << " Bookmark entry does not match client version, make sure client has a handler for the new AvatarBookmark";
         }
@@ -126,6 +191,7 @@ void AvatarBookmarks::addBookmark() {
         bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
         bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
         bookmark.insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant());
+        bookmark.insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant());
 
         Bookmarks::addBookmarkToFile(bookmarkName, bookmark);
     });
diff --git a/interface/src/AvatarBookmarks.h b/interface/src/AvatarBookmarks.h
index 0529eeb516..7e2f64379e 100644
--- a/interface/src/AvatarBookmarks.h
+++ b/interface/src/AvatarBookmarks.h
@@ -34,6 +34,7 @@ private:
     const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json";
     const QString ENTRY_AVATAR_URL = "avatarUrl";
     const QString ENTRY_AVATAR_ATTACHMENTS = "attachments";
+    const QString ENTRY_AVATAR_ENTITIES = "avatarEntites";
     const QString ENTRY_AVATAR_SCALE = "avatarScale";
     const QString ENTRY_VERSION = "version";
 
diff --git a/interface/src/AvatarEntitiesBookmarks.cpp b/interface/src/AvatarEntitiesBookmarks.cpp
deleted file mode 100644
index 21d3657346..0000000000
--- a/interface/src/AvatarEntitiesBookmarks.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-//
-//  AvatarEntitiesBookmarks.cpp
-//  interface/src
-//
-//  Created by Dante Ruiz on 15/01/18.
-//  Copyright 2018 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 <QAction>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QStandardPaths>
-#include <QQmlContext>
-#include <QList>
-
-#include <Application.h>
-#include <OffscreenUi.h>
-#include <EntityItemProperties.h>
-#include <GLMHelpers.h>
-#include <avatar/AvatarManager.h>
-#include <EntityItemID.h>
-#include <EntityTree.h>
-#include <PhysicalEntitySimulation.h>
-#include <EntityEditPacketSender.h>
-#include <VariantMapToScriptValue.h>
-
-#include "MainWindow.h"
-#include "Menu.h"
-#include "AvatarEntitiesBookmarks.h"
-#include "InterfaceLogging.h"
-
-#include "QVariantGLM.h"
-
-#include <QtQuick/QQuickWindow>
-
-void addAvatarEntities(const QVariantList& avatarEntities) {
-    auto nodeList = DependencyManager::get<NodeList>();
-    const QUuid myNodeID = nodeList->getSessionUUID();
-    EntityTreePointer entityTree = DependencyManager::get<EntityTreeRenderer>()->getTree();
-    if (!entityTree) {
-        return;
-    }
-    EntitySimulationPointer entitySimulation = entityTree->getSimulation();
-    PhysicalEntitySimulationPointer physicalEntitySimulation = std::static_pointer_cast<PhysicalEntitySimulation>(entitySimulation);
-    EntityEditPacketSender* entityPacketSender = physicalEntitySimulation->getPacketSender();
-    QScriptEngine scriptEngine;
-    for (int index = 0; index < avatarEntities.count(); index++) {
-        const QVariantMap& avatarEntityProperties = avatarEntities.at(index).toMap();
-        QVariant variantProperties = avatarEntityProperties["properties"];
-        QVariantMap asMap = variantProperties.toMap();
-        QScriptValue scriptProperties = variantMapToScriptValue(asMap, scriptEngine);
-        EntityItemProperties entityProperties;
-        EntityItemPropertiesFromScriptValueHonorReadOnly(scriptProperties, entityProperties);
-
-        entityProperties.setParentID(myNodeID);
-        entityProperties.setClientOnly(true);
-        entityProperties.setOwningAvatarID(myNodeID);
-        entityProperties.setSimulationOwner(myNodeID, AVATAR_ENTITY_SIMULATION_PRIORITY);
-        entityProperties.markAllChanged();
-
-        EntityItemID id = EntityItemID(QUuid::createUuid());
-        bool success = true;
-        entityTree->withWriteLock([&] {
-            EntityItemPointer entity = entityTree->addEntity(id, entityProperties);
-            if (entity) {
-                if (entityProperties.queryAACubeRelatedPropertyChanged()) {
-                    // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
-                    bool success;
-                    AACube queryAACube = entity->getQueryAACube(success);
-                    if (success) {
-                        entityProperties.setQueryAACube(queryAACube);
-                    }
-                }
-
-                entity->setLastBroadcast(usecTimestampNow());
-                // since we're creating this object we will immediately volunteer to own its simulation
-                entity->flagForOwnershipBid(VOLUNTEER_SIMULATION_PRIORITY);
-                entityProperties.setLastEdited(entity->getLastEdited());
-            } else {
-                qCDebug(entities) << "AvatarEntitiesBookmark failed to add new Entity to local Octree";
-                success = false;
-            }
-        });
-
-        if (success) {
-            entityPacketSender->queueEditEntityMessage(PacketType::EntityAdd, entityTree, id, entityProperties);
-        }
-    }
-}
-
-AvatarEntitiesBookmarks::AvatarEntitiesBookmarks() {
-    _bookmarksFilename = PathUtils::getAppDataPath() + "/" + AVATAR_ENTITIES_BOOKMARKS_FILENAME;
-    Bookmarks::readFromFile();
-}
-
-void AvatarEntitiesBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
-    auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkAvatarEntities);
-    QObject::connect(bookmarkAction, SIGNAL(triggered()), this, SLOT(addBookmark()), Qt::QueuedConnection);
-    _bookmarksMenu = menu->addMenu(MenuOption::AvatarEntitiesBookmarks);
-    _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteAvatarEntitiesBookmark);
-    QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
-
-    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
-        addBookmarkToMenu(menubar, it.key(), it.value());
-    }
-
-    Bookmarks::sortActions(menubar, _bookmarksMenu);
-}
-
-void AvatarEntitiesBookmarks::applyBookmarkedAvatarEntities() {
-    QAction* action = qobject_cast<QAction*>(sender());
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-
-    const QMap<QString, QVariant> bookmark = action->data().toMap();
-
-    if (bookmark.value(ENTRY_VERSION) == AVATAR_ENTITIES_BOOKMARK_VERSION) {
-        myAvatar->removeAvatarEntities();
-        const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
-        myAvatar->useFullAvatarURL(avatarUrl);
-        const QVariantList& avatarEntities = bookmark.value(ENTRY_AVATAR_ENTITIES, QVariantList()).toList();
-        addAvatarEntities(avatarEntities);
-        const float& avatarScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
-        myAvatar->setAvatarScale(avatarScale);
-    } else {
-        qCDebug(interfaceapp) << " Bookmark entry does not match client version, make sure client has a handler for the new AvatarEntitiesBookmark";
-    }
-}
-
-void AvatarEntitiesBookmarks::addBookmark() {
-    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar Entities", "Name", QString());
-    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
-        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-        auto bookmarkName = response.toString();
-        bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
-        if (bookmarkName.length() == 0) {
-            return;
-        }
-
-        auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-
-        const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString();
-        const QVariant& avatarScale = myAvatar->getAvatarScale();
-
-        QVariantMap bookmark;
-        bookmark.insert(ENTRY_VERSION, AVATAR_ENTITIES_BOOKMARK_VERSION);
-        bookmark.insert(ENTRY_AVATAR_URL, avatarUrl);
-        bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale);
-        bookmark.insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant());
-
-        Bookmarks::addBookmarkToFile(bookmarkName, bookmark);
-    });
-}
-
-void AvatarEntitiesBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) {
-    QAction* changeAction = _bookmarksMenu->newAction();
-    changeAction->setData(bookmark);
-    connect(changeAction, SIGNAL(triggered()), this, SLOT(applyBookmarkedAvatarEntities()));
-    if (!_isMenuSorted) {
-        menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction, name, 0, QAction::NoRole);
-    } else {
-        // TODO: this is aggressive but other alternatives have proved less fruitful so far.
-        menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction, name, 0, QAction::NoRole);
-        Bookmarks::sortActions(menubar, _bookmarksMenu);
-    }
-}
diff --git a/interface/src/AvatarEntitiesBookmarks.h b/interface/src/AvatarEntitiesBookmarks.h
deleted file mode 100644
index 0c70e4dbc0..0000000000
--- a/interface/src/AvatarEntitiesBookmarks.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  AvatarEntitiesBookmarks.h
-//  interface/src
-//
-//  Created by Dante Ruiz on 15/01/18.
-//  Copyright 2018 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_AvatarEntitiesBookmarks_h
-#define hifi_AvatarEntitiesBookmarks_h
-
-#include <DependencyManager.h>
-#include "Bookmarks.h"
-
-class AvatarEntitiesBookmarks: public Bookmarks, public Dependency {
-  Q_OBJECT
-  SINGLETON_DEPENDENCY
-
-public:
-    AvatarEntitiesBookmarks();
-    void setupMenus(Menu* menubar, MenuWrapper* menu) override;
-
-public slots:
-    void addBookmark();
-
-protected:
-    void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) override;
-
-private:
-    const QString AVATAR_ENTITIES_BOOKMARKS_FILENAME = "AvatarEntitiesBookmarks.json";
-    const QString ENTRY_AVATAR_URL = "AvatarUrl";
-    const QString ENTRY_AVATAR_SCALE = "AvatarScale";
-    const QString ENTRY_AVATAR_ENTITIES = "AvatarEntities";
-    const QString ENTRY_VERSION = "version";
-
-    const int AVATAR_ENTITIES_BOOKMARK_VERSION = 1;
-
-private slots:
-  void applyBookmarkedAvatarEntities();
-};
-
-#endif
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 464de87fdb..40f7ad09ed 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -34,7 +34,6 @@
 #include "audio/AudioScope.h"
 #include "avatar/AvatarManager.h"
 #include "AvatarBookmarks.h"
-#include "AvatarEntitiesBookmarks.h"
 #include "devices/DdeFaceTracker.h"
 #include "MainWindow.h"
 #include "render/DrawStatus.h"
@@ -207,10 +206,6 @@ Menu::Menu() {
     auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
     avatarBookmarks->setupMenus(this, avatarMenu);
 
-    auto avatarEntitiesBookmarks = DependencyManager::get<AvatarEntitiesBookmarks>();
-    avatarEntitiesBookmarks->setupMenus(this, avatarMenu);
-
-
     // Display menu ----------------------------------
     // FIXME - this is not yet matching Alan's spec because it doesn't have
     // menus for "2D"/"3D" - we need to add support for detecting the appropriate
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 8cb1804fd4..24a4af9506 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -46,7 +46,6 @@ namespace MenuOption {
     const QString AutoMuteAudio = "Auto Mute Microphone";
     const QString AvatarReceiveStats = "Show Receive Stats";
     const QString AvatarBookmarks = "Avatar Bookmarks";
-    const QString AvatarEntitiesBookmarks = "Avatar Entities  Bookmarks";
     const QString Back = "Back";
     const QString BinaryEyelidControl = "Binary Eyelid Control";
     const QString BookmarkAvatar = "Bookmark Avatar";

From c368c84f59d18e32b8b4c4febd75b0f1a88e2e00 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 23 Feb 2018 10:57:35 -0800
Subject: [PATCH 477/569] Make BakeAssetTask::abort thread-safe

---
 assignment-client/src/assets/AssetServer.cpp  |  3 +++
 .../src/assets/BakeAssetTask.cpp              | 19 ++++++++++++++++---
 assignment-client/src/assets/BakeAssetTask.h  |  4 +++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index f600f5edc2..c69ef2d9cc 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -289,6 +289,7 @@ void AssetServer::aboutToFinish() {
         if (pendingRunnable) {
             it = _pendingBakes.erase(it);
         } else {
+            qDebug() << "Aborting bake for" << it.key();
             it.value()->abort();
             ++it;
         }
@@ -1387,6 +1388,8 @@ void AssetServer::handleCompletedBake(QString originalAssetHash, QString origina
 }
 
 void AssetServer::handleAbortedBake(QString originalAssetHash, QString assetPath) {
+    qDebug() << "Aborted bake:" << originalAssetHash;
+
     // for an aborted bake we don't do anything but remove the BakeAssetTask from our pending bakes
     _pendingBakes.remove(originalAssetHash);
 }
diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp
index 5b9add7467..ecb4ede5d8 100644
--- a/assignment-client/src/assets/BakeAssetTask.cpp
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -69,8 +69,10 @@ void BakeAssetTask::run() {
 
     _ovenProcess.reset(new QProcess());
 
+    QEventLoop loop;
+
     connect(_ovenProcess.get(), static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
-            this, [this, tempOutputDir](int exitCode, QProcess::ExitStatus exitStatus) {
+            this, [&loop, this, tempOutputDir](int exitCode, QProcess::ExitStatus exitStatus) {
         qDebug() << "Baking process finished: " << exitCode << exitStatus;
 
         if (exitStatus == QProcess::CrashExit) {
@@ -108,6 +110,7 @@ void BakeAssetTask::run() {
             emit bakeFailed(_assetHash, _assetPath, errors);
         }
 
+        loop.quit();
     });
 
     qDebug() << "Starting oven for " << _assetPath;
@@ -117,11 +120,21 @@ void BakeAssetTask::run() {
         emit bakeFailed(_assetHash, _assetPath, errors);
         return;
     }
-    _ovenProcess->waitForFinished();
+
+    _isBaking = true;
+
+    loop.exec();
 }
 
 void BakeAssetTask::abort() {
-    if (!_wasAborted.exchange(true)) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "abort");
+        return;
+    }
+    qDebug() << "Aborting BakeAssetTask for" << _assetHash;
+    if (_ovenProcess->state() != QProcess::NotRunning) {
+        qDebug() << "Teminating oven process for" << _assetHash;
+        _wasAborted = true;
         _ovenProcess->terminate();
     }
 }
diff --git a/assignment-client/src/assets/BakeAssetTask.h b/assignment-client/src/assets/BakeAssetTask.h
index 7b003fa1bd..24b070d08a 100644
--- a/assignment-client/src/assets/BakeAssetTask.h
+++ b/assignment-client/src/assets/BakeAssetTask.h
@@ -27,12 +27,14 @@ class BakeAssetTask : public QObject, public QRunnable {
 public:
     BakeAssetTask(const AssetUtils::AssetHash& assetHash, const AssetUtils::AssetPath& assetPath, const QString& filePath);
 
+    // Thread-safe inspection methods
     bool isBaking() { return _isBaking.load(); }
+    bool wasAborted() const { return _wasAborted.load(); }
 
     void run() override;
 
+public slots:
     void abort();
-    bool wasAborted() const { return _wasAborted.load(); }
 
 signals:
     void bakeComplete(QString assetHash, QString assetPath, QString tempOutputDir, QVector<QString> outputFiles);

From 84f9bff33054488d660cc8af75ad1f9f8cf3976a Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 13:56:56 -0800
Subject: [PATCH 478/569] basic element, but not pretty and not functioning

---
 .../qml/hifi/commerce/wallet/Wallet.qml       | 16 ++++--
 .../qml/hifi/commerce/wallet/WalletChoice.qml | 51 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 0534c9fe1c..38df6eff64 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -76,6 +76,7 @@ Rectangle {
             } else {
                 console.log("ERROR in Wallet.qml: Unknown wallet status: " + walletStatus);
             }
+            console.log("FIXME wallet status:", walletStatus, "activeView:", root.activeView);
         }
 
         onLoginStatusResult: {
@@ -176,10 +177,6 @@ Rectangle {
     //
     // TITLE BAR END
     //
-    WalletChoice {
-        visible: (root.activeView === "preexisiting") || (root.activeView === "conflicting");
-        activeView: root.activeView;
-    }
 
     WalletSetup {
         id: walletSetup;
@@ -730,6 +727,17 @@ Rectangle {
         }
     }
 
+    WalletChoice {
+        visible: (root.activeView === "preexisting") || (root.activeView === "conflicting");
+        activeView: root.activeView;
+        width: parent.width;
+        anchors {
+            top: titleBarContainer.bottom;
+            bottom: parent.bottom;
+        }
+    }
+
+
     //
     // FUNCTION DEFINITIONS START
     //
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 3c24a82c89..ebc56261eb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -14,10 +14,57 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
 
-Rectangle {
+
+Column {
     property string activeView: "conflict";
+    property bool isMissing: activeView === "preeexisting";
+    RalewayBold {
+        text: isMissing 
+            ? "Where are your private keys?"
+            : "Hmmm, your keys are different";
+    }
     RalewayRegular {
-        text: "You have a wallet elsewhere." + activeView;
+        text: isMissing 
+            ? "Our records indicate that you created a wallet but the private keys are not in the folder where we checked."
+            : "Our records indicate that you created a wallet with different keys than the keys you're providing."
+   }
+    HifiControlsUit.Button {
+        text: isMissing
+            ? "LOCATE MY KEYS"
+            : "LOCATE OTHER KEYS";
+        color: hifi.buttons.blue;
+        colorScheme: hifi.colorSchemes.dark;
+        onClicked: walletChooser();
+    }
+    HifiControlsUit.Button {
+        text: isMissing
+            ? "CREATE NEW WALLET"
+            : "CONTINUE WITH THESE KEYS"
+        color: hifi.buttons.blue;
+        colorScheme: hifi.colorSchemes.dark;
+        onClicked: {
+            console.log("FIXME CREATE");
+        }
+    }
+    RalewayRegular {
+        text: "What's this?";
+    }
+    function onFileOpenChanged(filename) {
+        console.log('fixme selected', filename);
+        // disconnect the event, otherwise the requests will stack up
+        try {
+            // Not all calls to onFileOpenChanged() connect an event.
+            Window.browseChanged.disconnect(onFileOpenChanged);
+        } catch (e) {
+            console.log('ignoring', e);
+        }
+        console.log('fixme do something with', filename);
+    }
+    function walletChooser() {
+        console.log("GOT CLICK");
+        Window.browseChanged.connect(onFileOpenChanged); 
+        Window.browseAsync("Choose wallet file", "", "*.hifikey");
     }
 }

From 09091d29f763b73877686bbd5d5e51a1039f98f2 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 14:35:30 -0800
Subject: [PATCH 479/569] more logic framework

---
 .../qml/hifi/commerce/wallet/Wallet.qml       |  7 +++++
 .../qml/hifi/commerce/wallet/WalletChoice.qml | 26 +++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 38df6eff64..be484c262b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -730,6 +730,13 @@ Rectangle {
     WalletChoice {
         visible: (root.activeView === "preexisting") || (root.activeView === "conflicting");
         activeView: root.activeView;
+        proceedFunction: function (isReset) {
+            console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
+            if (isReset) {
+                root.activeView = "initialize";
+                Commerce.getWalletStatus();
+            }
+        }
         width: parent.width;
         anchors {
             top: titleBarContainer.bottom;
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index ebc56261eb..7c981a85f7 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -20,6 +20,7 @@ import "../../../controls-uit" as HifiControlsUit
 Column {
     property string activeView: "conflict";
     property bool isMissing: activeView === "preeexisting";
+    property var proceedFunction: nil;
     RalewayBold {
         text: isMissing 
             ? "Where are your private keys?"
@@ -45,26 +46,35 @@ Column {
         color: hifi.buttons.blue;
         colorScheme: hifi.colorSchemes.dark;
         onClicked: {
-            console.log("FIXME CREATE");
+            console.log("FIXME open modal that says Are you sure, where the yes button calls proceed directly instead of this next line.")
+            proceed(true);
         }
     }
     RalewayRegular {
         text: "What's this?";
     }
+
     function onFileOpenChanged(filename) {
-        console.log('fixme selected', filename);
         // disconnect the event, otherwise the requests will stack up
-        try {
-            // Not all calls to onFileOpenChanged() connect an event.
+        try { // Not all calls to onFileOpenChanged() connect an event.
             Window.browseChanged.disconnect(onFileOpenChanged);
         } catch (e) {
-            console.log('ignoring', e);
+            console.log('WalletChoice.qml ignoring', e);
         }
-        console.log('fixme do something with', filename);
+        if (filename) {
+            console.log("FIXME copy file to the right place");
+            proceed(false);
+        } // Else we're still at WalletChoice
     }
     function walletChooser() {
-        console.log("GOT CLICK");
         Window.browseChanged.connect(onFileOpenChanged); 
-        Window.browseAsync("Choose wallet file", "", "*.hifikey");
+        Window.browseAsync("Locate your .hifikey file", "", "*.hifikey");
+    }
+    function proceed(isReset) {
+        if (!proceedFunction) {
+            console.log("Provide a function of no arguments to WalletChoice.qml.");
+        } else {
+            proceedFunction(isReset);
+        }
     }
 }

From 9b54ab10809e6e33882b43344b2b0bc19864e709 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 14:42:05 -0800
Subject: [PATCH 480/569] UI changes, V1

---
 .../qml/hifi/commerce/wallet/Wallet.qml       |  32 +--
 .../qml/hifi/commerce/wallet/WalletChoice.qml | 266 +++++++++++++++---
 2 files changed, 248 insertions(+), 50 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index be484c262b..2bd764e5fc 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -178,6 +178,21 @@ Rectangle {
     // TITLE BAR END
     //
 
+    WalletChoice {
+        id: walletChoice;
+        proceedFunction: function (isReset) {
+            console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
+            if (isReset) {
+                root.activeView = "initialize";
+                Commerce.getWalletStatus();
+            }
+        }
+        z: 997;
+        visible: (root.activeView === "preexisting") || (root.activeView === "conflicting");
+        activeView: root.activeView;
+        anchors.fill: parent;
+    }
+
     WalletSetup {
         id: walletSetup;
         visible: root.activeView === "walletSetup";
@@ -727,23 +742,6 @@ Rectangle {
         }
     }
 
-    WalletChoice {
-        visible: (root.activeView === "preexisting") || (root.activeView === "conflicting");
-        activeView: root.activeView;
-        proceedFunction: function (isReset) {
-            console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
-            if (isReset) {
-                root.activeView = "initialize";
-                Commerce.getWalletStatus();
-            }
-        }
-        width: parent.width;
-        anchors {
-            top: titleBarContainer.bottom;
-            bottom: parent.bottom;
-        }
-    }
-
 
     //
     // FUNCTION DEFINITIONS START
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 7c981a85f7..a3dd7492ab 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -17,43 +17,240 @@ import "../../../styles-uit"
 import "../../../controls-uit" as HifiControlsUit
 
 
-Column {
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
     property string activeView: "conflict";
-    property bool isMissing: activeView === "preeexisting";
     property var proceedFunction: nil;
-    RalewayBold {
-        text: isMissing 
-            ? "Where are your private keys?"
-            : "Hmmm, your keys are different";
-    }
-    RalewayRegular {
-        text: isMissing 
-            ? "Our records indicate that you created a wallet but the private keys are not in the folder where we checked."
-            : "Our records indicate that you created a wallet with different keys than the keys you're providing."
-   }
-    HifiControlsUit.Button {
-        text: isMissing
-            ? "LOCATE MY KEYS"
-            : "LOCATE OTHER KEYS";
-        color: hifi.buttons.blue;
-        colorScheme: hifi.colorSchemes.dark;
-        onClicked: walletChooser();
-    }
-    HifiControlsUit.Button {
-        text: isMissing
-            ? "CREATE NEW WALLET"
-            : "CONTINUE WITH THESE KEYS"
-        color: hifi.buttons.blue;
-        colorScheme: hifi.colorSchemes.dark;
-        onClicked: {
-            console.log("FIXME open modal that says Are you sure, where the yes button calls proceed directly instead of this next line.")
-            proceed(true);
-        }
-    }
-    RalewayRegular {
-        text: "What's this?";
+
+    Image {
+        anchors.fill: parent;
+        source: "images/wallet-bg.jpg";
     }
 
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+    }
+
+    //
+    // TITLE BAR START
+    //
+    Item {
+        id: titleBarContainer;
+        // Size
+        height: 50;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+        anchors.right: parent.right;
+
+        // Wallet icon
+        HiFiGlyphs {
+            id: walletIcon;
+            text: hifi.glyphs.wallet;
+            // Size
+            size: parent.height * 0.8;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            anchors.verticalCenter: parent.verticalCenter;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        // Title Bar text
+        RalewayRegular {
+            id: titleBarText;
+            text: "Wallet Setup";
+            // Text size
+            size: hifi.fontSizes.overlayTitle;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: walletIcon.right;
+            anchors.leftMargin: 8;
+            anchors.bottom: parent.bottom;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+
+    //
+    // MAIN PAGE START
+    //
+    Item {
+        id: preexistingContainer;
+        // Anchors
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        HiFiGlyphs {
+            id: bigKeyIcon;
+            text: hifi.glyphs.walletKey;
+            // Size
+            size: 180;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 40;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            // Style
+            color: hifi.colors.white;
+        }
+
+        RalewayRegular {
+            id: text01;
+            text: root.activeView === "preexisting" ? 
+                "Where are your private keys?" :
+                "Hmm, your keys are different"
+            // Text size
+            size: 26;
+            // Anchors
+            anchors.top: bigKeyIcon.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        RalewayRegular {
+            id: text02;
+            text: root.activeView === "preexisting" ? 
+                "Our records indicate that you created a wallet, but the private keys are not in the folder where we checked." :
+                "Our records indicate that you created a wallet with different keys than the keys you're providing."
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: text01.bottom;
+            anchors.topMargin: 40;
+            anchors.left: parent.left;
+            anchors.leftMargin: 65;
+            anchors.right: parent.right;
+            anchors.rightMargin: 65;
+            height: paintedHeight;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // "Locate" button
+        HifiControlsUit.Button {
+            id: locateButton;
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: text02.bottom;
+            anchors.topMargin: 40;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            width: parent.width/2;
+            height: 50;
+            text: root.activeView === "preexisting" ? 
+                "LOCATE MY KEYS" :
+                "LOCATE OTHER KEYS"
+            onClicked: {
+                walletChooser();
+            }
+        }
+
+        // "Create New" OR "Continue" button
+        HifiControlsUit.Button {
+            id: button02;
+            color: hifi.buttons.none;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: locateButton.bottom;
+            anchors.topMargin: 20;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            width: parent.width/2;
+            height: 50;
+            text: root.activeView === "preexisting" ? 
+                "CREATE NEW WALLET" :
+                "CONTINUE WITH THESE KEYS"
+            onClicked: {
+                if (root.activeView === "preexisting") {
+                    lightboxPopup.titleText = "Are you sure?";
+                    lightboxPopup.bodyText = "Taking this step will abandon your old wallet and you will no " +
+                        "longer be able to access your money and your past purchases.<br><br>" +
+                        "This step should only be used if you cannot find your keys.<br><br>" +
+                        "This step cannot be undone.";
+                    lightboxPopup.button1text = "YES, CREATE NEW WALLET";
+                    lightboxPopup.button1method = "proceed(true);";
+                    lightboxPopup.button2text = "CLOSE";
+                    lightboxPopup.button2method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                } else {
+                    console.log('FIXME');
+                }
+            }
+        }
+
+        // "What's This?" link
+        RalewayRegular {
+            id: whatsThisLink;
+            text: '<font color="#FFFFFF"><a href="#">What's this?</a></font>';
+            // Anchors
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 24;
+            width: parent.width;
+            height: paintedHeight;
+            // Text size
+            size: 18;
+            // Style
+            color: hifi.colors.white;
+            horizontalAlignment: Text.AlignHCenter;
+
+            onLinkActivated: {
+                if (root.activeView === "preexisting") {
+                    lightboxPopup.titleText = "Your wallet's private keys are not in the folder we expected";
+                    lightboxPopup.bodyText = "We see that you have created a wallet but the private keys " +
+                        "for it seem to have been moved to a different folder.<br><br>" +
+                        "To tell us where the keys are, click 'Locate My Keys'. <br><br>" +
+                        "If you'd prefer to create a new wallet (not recommended - you will lose your money and past " +
+                        "purchases), click 'Create New Wallet'.";
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                } else {
+                    lightboxPopup.titleText = "You may have set up more than one wallet";
+                    lightboxPopup.bodyText = "We see that the private keys stored on your computer are different " +
+                        "from the ones you used last time. This may mean that you set up more than one wallet. " +
+                        "If you would like to use these keys, click 'Continue With These Keys'.<br><br>" +
+                        "If you would prefer to use another wallet, click 'Locate Other Keys' to show us where " +
+                        "you've stored the private keys for that wallet.";
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                }
+            }
+        }
+    }
+    //
+    // MAIN PAGE END
+    //
+    
+    //
+    // FUNCTION DEFINITIONS START
+    //
     function onFileOpenChanged(filename) {
         // disconnect the event, otherwise the requests will stack up
         try { // Not all calls to onFileOpenChanged() connect an event.
@@ -77,4 +274,7 @@ Column {
             proceedFunction(isReset);
         }
     }
+    //
+    // FUNCTION DEFINITIONS END
+    //
 }

From 050df2ac2ac1e9cb78a9f1efdcfffdaef0655dbc Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 14:46:13 -0800
Subject: [PATCH 481/569] merge

---
 .../qml/hifi/commerce/wallet/Wallet.qml       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 2bd764e5fc..880efe92e0 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -47,13 +47,7 @@ Rectangle {
                 }
             } else if (walletStatus === 1) {
                 if (root.activeView !== "walletSetup") {
-                    root.activeView = "walletSetup";
-                    Commerce.resetLocalWalletOnly();
-                    var timestamp = new Date();
-                    walletSetup.startingTimestamp = timestamp;
-                    walletSetup.setupAttemptID = generateUUID();
-                    UserActivityLogger.commerceWalletSetupStarted(timestamp, setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
-                        (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
+                    walletSetup();
                 }
             } else if (walletStatus === 2) {
                 if (root.activeView != "preexisting") {
@@ -183,6 +177,7 @@ Rectangle {
         proceedFunction: function (isReset) {
             console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
             if (isReset) {
+            } else {
                 root.activeView = "initialize";
                 Commerce.getWalletStatus();
             }
@@ -742,7 +737,6 @@ Rectangle {
         }
     }
 
-
     //
     // FUNCTION DEFINITIONS START
     //
@@ -793,6 +787,16 @@ Rectangle {
             return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
         });
     }
+
+    function walletSetup() {
+        root.activeView = "walletSetup";
+        Commerce.resetLocalWalletOnly();
+        var timestamp = new Date();
+        walletSetup.startingTimestamp = timestamp;
+        walletSetup.setupAttemptID = generateUUID();
+        UserActivityLogger.commerceWalletSetupStarted(timestamp, setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
+            (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
+    }
     //
     // FUNCTION DEFINITIONS END
     //

From 3c2626894cd12ec4d90a50aa300a9bf781c33d48 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 14:54:03 -0800
Subject: [PATCH 482/569] fixes

---
 .../qml/hifi/commerce/wallet/WalletChoice.qml         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index a3dd7492ab..3a4fc56c01 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -13,6 +13,7 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
+import "../common" as HifiCommerceCommon
 import "../../../styles-uit"
 import "../../../controls-uit" as HifiControlsUit
 
@@ -34,6 +35,14 @@ Item {
         visible: false;
         anchors.fill: parent;
     }
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+        hoverEnabled: true;
+    }
 
     //
     // TITLE BAR START
@@ -207,7 +216,7 @@ Item {
         // "What's This?" link
         RalewayRegular {
             id: whatsThisLink;
-            text: '<font color="#FFFFFF"><a href="#">What's this?</a></font>';
+            text: '<font color="#FFFFFF"><a href="#">What\'s this?</a></font>';
             // Anchors
             anchors.bottom: parent.bottom;
             anchors.bottomMargin: 24;

From a418129bea79b5f7cb2e0724305377d7db067258 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 23 Feb 2018 15:00:23 -0800
Subject: [PATCH 483/569] simplify to just changing timescales

---
 interface/src/avatar/MyAvatar.cpp | 44 +++++++++++--------------------
 interface/src/avatar/MyAvatar.h   |  4 +--
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index d5d85b3365..4a58af9378 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1626,7 +1626,6 @@ controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action act
 void MyAvatar::updateMotors() {
     _characterController.clearMotors();
     glm::quat motorRotation;
-    glm::quat avatarOrientation = getWorldOrientation();
 
     const float FLYING_MOTOR_TIMESCALE = 0.05f;
     const float WALKING_MOTOR_TIMESCALE = 0.2f;
@@ -1654,10 +1653,11 @@ void MyAvatar::updateMotors() {
             // we decompose camera's rotation and store the twist part in motorRotation
             // however, we need to perform the decomposition in the avatar-frame
             // using the local UP axis and then transform back into world-frame
-            glm::quat headOrientation = glm::inverse(avatarOrientation) * getMyHead()->getHeadOrientation(); // avatar-frame
+            glm::quat orientation = getWorldOrientation();
+            glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame
             glm::quat liftRotation;
             swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation);
-            motorRotation = avatarOrientation * motorRotation;
+            motorRotation = orientation * motorRotation;
         }
 
         if (_isPushing || _isBraking || !_isBeingPushed) {
@@ -1669,35 +1669,21 @@ void MyAvatar::updateMotors() {
         }
     }
     if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
+        if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
+            motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
+        }
+        else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
+            motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
+        }
+        else {
+            // world-frame
+            motorRotation = glm::quat();
+        }
         if (_scriptedMotorMode == SCRIPTED_MOTOR_SIMPLE_MODE) {
-            if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
-                motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-            }
-            else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
-                motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
-            }
-            else {
-                // world-frame
-                motorRotation = glm::quat();
-            }
             _characterController.addMotor(_scriptedMotorVelocity, motorRotation, _scriptedMotorTimescale);
-        } else { 
+        } else {
             // dynamic mode
-            glm::vec3 avatarFrameVelocity;
-            if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
-                // convert camera frame velocity to avatar frame
-                glm::quat cameraOrientation = qApp->getCamera().getOrientation();
-                avatarFrameVelocity = glm::inverse(avatarOrientation) * cameraOrientation * _scriptedMotorVelocity;
-            } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_WORLD_FRAME) {
-                // convert world frame velocity to avatar frame
-                avatarFrameVelocity = glm::inverse(avatarOrientation) * _scriptedMotorVelocity;
-            } else {
-                // avatar frame
-                avatarFrameVelocity = _scriptedMotorVelocity;
-            }
-            // dynamic mode for scripted motor uses avatar frame and piggybacks off of the default action motor's timescales
-            motorRotation = avatarOrientation * glm::angleAxis(PI, Vectors::UNIT_Y);
-            _characterController.addMotor(avatarFrameVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale);
+            _characterController.addMotor(_scriptedMotorVelocity, motorRotation, horizontalMotorTimescale, verticalMotorTimescale);
         }
     }
 
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 464d94bce7..fa5206e128 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -69,7 +69,7 @@ class MyAvatar : public Avatar {
      * @property motorTimescale {float} Specifies how quickly the avatar should accelerate to meet the motorVelocity,
      *   smaller values will result in higher acceleration.
      * @property motorReferenceFrame {string} Reference frame of the motorVelocity, must be one of the following: "avatar", "camera", "world"
-     * @property motorMode {string} Type of scripted motor behavior, "simple" = unmodified legacy behavior and "dynamic" = same as default motor
+     * @property motorMode {string} Type of scripted motor behavior, "simple" = use motorTimescale property (default mode) and "dynamic" = use action motor's timescales
      * @property collisionSoundURL {string} Specifies the sound to play when the avatar experiences a collision.
      *   You can provide a mono or stereo 16-bit WAV file running at either 24 Khz or 48 Khz.
      *   The latter is downsampled by the audio mixer, so all audio effectively plays back at a 24 Khz sample rate.
@@ -668,7 +668,7 @@ private:
     void setScriptedMotorVelocity(const glm::vec3& velocity);
     void setScriptedMotorTimescale(float timescale);
     void setScriptedMotorFrame(QString frame);
-    void setScriptedMotorMode(QString frame);
+    void setScriptedMotorMode(QString mode);
     virtual void attach(const QString& modelURL, const QString& jointName = QString(),
                         const glm::vec3& translation = glm::vec3(), const glm::quat& rotation = glm::quat(),
                         float scale = 1.0f, bool isSoft = false,

From da391564a8577676875c34335f5f31fcc742a1e9 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 23 Feb 2018 15:01:29 -0800
Subject: [PATCH 484/569] CR changes

---
 interface/src/avatar/MyAvatar.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 4a58af9378..28cfb3e8f4 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1638,8 +1638,7 @@ void MyAvatar::updateMotors() {
             _characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE;
         verticalMotorTimescale = FLYING_MOTOR_TIMESCALE;
-    }
-    else {
+    } else {
         horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE;
         verticalMotorTimescale = INVALID_MOTOR_TIMESCALE;
     }
@@ -1671,11 +1670,9 @@ void MyAvatar::updateMotors() {
     if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
         if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
             motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        }
-        else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
+        } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
             motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
-        }
-        else {
+        } else {
             // world-frame
             motorRotation = glm::quat();
         }

From 283b5724ba42b69edec649ed15a0a60335c29e1d Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 23 Feb 2018 15:02:51 -0800
Subject: [PATCH 485/569] CR changes

---
 interface/src/avatar/MyAvatar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 28cfb3e8f4..b6fa3fde96 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1799,10 +1799,10 @@ void MyAvatar::setScriptedMotorFrame(QString frame) {
     }
 }
 
-void MyAvatar::setScriptedMotorMode(QString frame) {
-    if (frame.toLower() == "simple") {
+void MyAvatar::setScriptedMotorMode(QString mode) {
+    if (mode.toLower() == "simple") {
         _scriptedMotorMode = SCRIPTED_MOTOR_SIMPLE_MODE;
-    } else if (frame.toLower() == "dynamic") {
+    } else if (mode.toLower() == "dynamic") {
         _scriptedMotorMode = SCRIPTED_MOTOR_DYNAMIC_MODE;
     }
 }

From 432e647f7a4e7ba1182551ffd3fac9531a465f9a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 15:08:33 -0800
Subject: [PATCH 486/569] Fix 'What's This' link

---
 .../qml/hifi/commerce/wallet/WalletChoice.qml | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 3a4fc56c01..f011fe7203 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -35,6 +35,7 @@ Item {
         visible: false;
         anchors.fill: parent;
     }
+
     // This object is always used in a popup.
     // This MouseArea is used to prevent a user from being
     //     able to click on a button/mouseArea underneath the popup.
@@ -216,39 +217,43 @@ Item {
         // "What's This?" link
         RalewayRegular {
             id: whatsThisLink;
-            text: '<font color="#FFFFFF"><a href="#">What\'s this?</a></font>';
+            text: '<font color="#FFFFFF"><a href="#whatsthis">What\'s this?</a></font>';
             // Anchors
             anchors.bottom: parent.bottom;
-            anchors.bottomMargin: 24;
-            width: parent.width;
+            anchors.bottomMargin: 48;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            width: paintedWidth;
             height: paintedHeight;
             // Text size
             size: 18;
             // Style
             color: hifi.colors.white;
-            horizontalAlignment: Text.AlignHCenter;
 
-            onLinkActivated: {
-                if (root.activeView === "preexisting") {
-                    lightboxPopup.titleText = "Your wallet's private keys are not in the folder we expected";
-                    lightboxPopup.bodyText = "We see that you have created a wallet but the private keys " +
-                        "for it seem to have been moved to a different folder.<br><br>" +
-                        "To tell us where the keys are, click 'Locate My Keys'. <br><br>" +
-                        "If you'd prefer to create a new wallet (not recommended - you will lose your money and past " +
-                        "purchases), click 'Create New Wallet'.";
-                    lightboxPopup.button1text = "CLOSE";
-                    lightboxPopup.button1method = "root.visible = false;"
-                    lightboxPopup.visible = true;
-                } else {
-                    lightboxPopup.titleText = "You may have set up more than one wallet";
-                    lightboxPopup.bodyText = "We see that the private keys stored on your computer are different " +
-                        "from the ones you used last time. This may mean that you set up more than one wallet. " +
-                        "If you would like to use these keys, click 'Continue With These Keys'.<br><br>" +
-                        "If you would prefer to use another wallet, click 'Locate Other Keys' to show us where " +
-                        "you've stored the private keys for that wallet.";
-                    lightboxPopup.button1text = "CLOSE";
-                    lightboxPopup.button1method = "root.visible = false;"
-                    lightboxPopup.visible = true;
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    if (root.activeView === "preexisting") {
+                        lightboxPopup.titleText = "Your wallet's private keys are not in the folder we expected";
+                        lightboxPopup.bodyText = "We see that you have created a wallet but the private keys " +
+                            "for it seem to have been moved to a different folder.<br><br>" +
+                            "To tell us where the keys are, click 'Locate My Keys'. <br><br>" +
+                            "If you'd prefer to create a new wallet (not recommended - you will lose your money and past " +
+                            "purchases), click 'Create New Wallet'.";
+                        lightboxPopup.button1text = "CLOSE";
+                        lightboxPopup.button1method = "root.visible = false;"
+                        lightboxPopup.visible = true;
+                    } else {
+                        lightboxPopup.titleText = "You may have set up more than one wallet";
+                        lightboxPopup.bodyText = "We see that the private keys stored on your computer are different " +
+                            "from the ones you used last time. This may mean that you set up more than one wallet. " +
+                            "If you would like to use these keys, click 'Continue With These Keys'.<br><br>" +
+                            "If you would prefer to use another wallet, click 'Locate Other Keys' to show us where " +
+                            "you've stored the private keys for that wallet.";
+                        lightboxPopup.button1text = "CLOSE";
+                        lightboxPopup.button1method = "root.visible = false;"
+                        lightboxPopup.visible = true;
+                    }
                 }
             }
         }

From 34253082d49d84bf945100f9dc106eeaa1bbf6ac Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 15:11:08 -0800
Subject: [PATCH 487/569] always reset when asked

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml      | 1 +
 .../resources/qml/hifi/commerce/wallet/WalletChoice.qml      | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 880efe92e0..8cac728dec 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -177,6 +177,7 @@ Rectangle {
         proceedFunction: function (isReset) {
             console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
             if (isReset) {
+                walletSetup();
             } else {
                 root.activeView = "initialize";
                 Commerce.getWalletStatus();
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index f011fe7203..f9e37f0325 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -197,7 +197,6 @@ Item {
                 "CREATE NEW WALLET" :
                 "CONTINUE WITH THESE KEYS"
             onClicked: {
-                if (root.activeView === "preexisting") {
                     lightboxPopup.titleText = "Are you sure?";
                     lightboxPopup.bodyText = "Taking this step will abandon your old wallet and you will no " +
                         "longer be able to access your money and your past purchases.<br><br>" +
@@ -208,9 +207,7 @@ Item {
                     lightboxPopup.button2text = "CLOSE";
                     lightboxPopup.button2method = "root.visible = false;"
                     lightboxPopup.visible = true;
-                } else {
-                    console.log('FIXME');
-                }
+
             }
         }
 

From 47b25740de46a748bd93b0ab2b3508cb85a991b3 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 15:23:51 -0800
Subject: [PATCH 488/569] Update commerceLightBox

---
 .../hifi/commerce/common/CommerceLightbox.qml | 50 +++++++++++++++----
 .../qml/hifi/commerce/wallet/WalletChoice.qml |  4 +-
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 8b0ec17232..547d876275 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -25,10 +25,13 @@ Rectangle {
     property string titleText;
     property string bodyImageSource;
     property string bodyText;
+    property string button1color: hifi.buttons.noneBorderlessGray;
     property string button1text;
     property string button1method;
+    property string button2color: hifi.buttons.noneBorderless;
     property string button2text;
     property string button2method;
+    property string buttonLayout: "leftright";
 
     readonly property string securityPicBodyText: "When you see your Security Pic, your actions and data are securely making use of your " +
         "Wallet's private keys.<br><br>You can change your Security Pic in your Wallet.";
@@ -39,6 +42,12 @@ Rectangle {
     color: Qt.rgba(0, 0, 0, 0.5);
     z: 999;
 
+    onVisibleChanged: {
+        if (!visible) {
+            resetLightbox();
+        }
+    }
+
     // This object is always used in a popup.
     // This MouseArea is used to prevent a user from being
     //     able to click on a button/mouseArea underneath the popup.
@@ -108,18 +117,21 @@ Rectangle {
             anchors.topMargin: 30;
             anchors.left: parent.left;
             anchors.right: parent.right;
-            height: 70;
+            height: root.buttonLayout === "leftright" ? 70 : 150;
 
             // Button 1
             HifiControlsUit.Button {
-                color: hifi.buttons.noneBorderlessGray;
+                id: button1;
+                color: root.button1color;
                 colorScheme: hifi.colorSchemes.light;
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.bottomMargin: 20;
+                anchors.top: root.buttonLayout === "leftright" ? parent.top : parent.top;
                 anchors.left: parent.left;
                 anchors.leftMargin: 10;
-                width: root.button2text ? parent.width/2 - anchors.leftMargin*2 : parent.width - anchors.leftMargin * 2;
+                anchors.right: root.buttonLayout === "leftright" ? undefined : parent.right;
+                anchors.rightMargin: root.buttonLayout === "leftright" ? undefined : 10;
+                width: root.buttonLayout === "leftright" ? (root.button2text ? parent.width/2 - anchors.leftMargin*2 : parent.width - anchors.leftMargin * 2) :
+                    (undefined);
+                height: 50;
                 text: root.button1text;
                 onClicked: {
                     eval(button1method);
@@ -128,15 +140,18 @@ Rectangle {
 
             // Button 2
             HifiControlsUit.Button {
+                id: button2;
                 visible: root.button2text;
-                color: hifi.buttons.noneBorderless;
+                color: root.button2color;
                 colorScheme: hifi.colorSchemes.light;
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.bottomMargin: 20;
+                anchors.top: root.buttonLayout === "leftright" ? parent.top : button1.bottom;
+                anchors.topMargin: root.buttonLayout === "leftright" ? undefined : 20;
+                anchors.left: root.buttonLayout === "leftright" ? undefined : parent.left;
+                anchors.leftMargin: root.buttonLayout === "leftright" ? undefined : 10;
                 anchors.right: parent.right;
                 anchors.rightMargin: 10;
-                width: parent.width/2 - anchors.rightMargin*2;
+                width: root.buttonLayout === "leftright" ? parent.width/2 - anchors.rightMargin*2 : undefined;
+                height: 50;
                 text: root.button2text;
                 onClicked: {
                     eval(button2method);
@@ -149,6 +164,19 @@ Rectangle {
     // FUNCTION DEFINITIONS START
     //
     signal sendToParent(var msg);
+
+    function resetLightbox() {
+        root.titleText = "";
+        root.bodyImageSource = "";
+        root.bodyText = "";
+        root.button1color = hifi.buttons.noneBorderlessGray;
+        root.button1text = "";
+        root.button1method = "";
+        root.button2color = hifi.buttons.noneBorderless;
+        root.button2text = "";
+        root.button2method = "";
+        root.buttonLayout = "leftright";
+    }
     //
     // FUNCTION DEFINITIONS END
     //
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index f9e37f0325..6e191d54e3 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -202,10 +202,12 @@ Item {
                         "longer be able to access your money and your past purchases.<br><br>" +
                         "This step should only be used if you cannot find your keys.<br><br>" +
                         "This step cannot be undone.";
+                    lightboxPopup.button1color = hifi.buttons.red;
                     lightboxPopup.button1text = "YES, CREATE NEW WALLET";
                     lightboxPopup.button1method = "proceed(true);";
-                    lightboxPopup.button2text = "CLOSE";
+                    lightboxPopup.button2text = "CANCEL";
                     lightboxPopup.button2method = "root.visible = false;"
+                    lightboxPopup.buttonLayout = "topbottom";
                     lightboxPopup.visible = true;
 
             }

From 53614a1d9f7169034d7fc25783842c0309e528b5 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 16:12:01 -0800
Subject: [PATCH 489/569] almost working

---
 .../resources/qml/hifi/commerce/wallet/Wallet.qml      |  7 ++++---
 .../qml/hifi/commerce/wallet/WalletChoice.qml          |  8 ++++++--
 interface/src/commerce/QmlCommerce.cpp                 |  5 +++++
 interface/src/commerce/QmlCommerce.h                   |  1 +
 interface/src/commerce/Wallet.cpp                      | 10 ++++++++++
 interface/src/commerce/Wallet.h                        |  1 +
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 8cac728dec..63ed5294be 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -47,7 +47,7 @@ Rectangle {
                 }
             } else if (walletStatus === 1) {
                 if (root.activeView !== "walletSetup") {
-                    walletSetup();
+                    walletResetSetup();
                 }
             } else if (walletStatus === 2) {
                 if (root.activeView != "preexisting") {
@@ -177,12 +177,13 @@ Rectangle {
         proceedFunction: function (isReset) {
             console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
             if (isReset) {
-                walletSetup();
+                walletResetSetup();
             } else {
                 root.activeView = "initialize";
                 Commerce.getWalletStatus();
             }
         }
+        copyFunction: Commerce.copyKeyFileFrom;
         z: 997;
         visible: (root.activeView === "preexisting") || (root.activeView === "conflicting");
         activeView: root.activeView;
@@ -789,7 +790,7 @@ Rectangle {
         });
     }
 
-    function walletSetup() {
+    function walletResetSetup() {
         root.activeView = "walletSetup";
         Commerce.resetLocalWalletOnly();
         var timestamp = new Date();
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 6e191d54e3..47c438f72b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -24,6 +24,7 @@ Item {
     id: root;
     property string activeView: "conflict";
     property var proceedFunction: nil;
+    property var copyFunction: nil;
 
     Image {
         anchors.fill: parent;
@@ -272,8 +273,11 @@ Item {
             console.log('WalletChoice.qml ignoring', e);
         }
         if (filename) {
-            console.log("FIXME copy file to the right place");
-            proceed(false);
+            if (copyFunction && copyFunction(filename)) {
+                proceed(false);
+             } else {
+                console.log("WalletChoice.qml copyFunction", copyFunction, "failed.");
+             }
         } // Else we're still at WalletChoice
     }
     function walletChooser() {
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index c9caa393ce..d57b94e4dd 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -52,6 +52,11 @@ void QmlCommerce::getKeyFilePathIfExists() {
     emit keyFilePathIfExistsResult(wallet->getKeyFilePath());
 }
 
+bool QmlCommerce::copyKeyFileFrom(const QString& pathname) {
+    auto wallet = DependencyManager::get<Wallet>();
+    return wallet->copyKeyFileFrom(pathname);
+}
+
 void QmlCommerce::getWalletAuthenticatedStatus() {
     auto wallet = DependencyManager::get<Wallet>();
     emit walletAuthenticatedStatusResult(wallet->walletIsAuthenticatedWithPassphrase());
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index b261ee6de6..bf982f5955 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -55,6 +55,7 @@ protected:
     Q_INVOKABLE void getKeyFilePathIfExists();
     Q_INVOKABLE void getSecurityImage();
     Q_INVOKABLE void getWalletAuthenticatedStatus();
+    Q_INVOKABLE bool copyKeyFileFrom(const QString& pathname);
 
     Q_INVOKABLE void chooseSecurityImage(const QString& imageFile);
     Q_INVOKABLE void setPassphrase(const QString& passphrase);
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index ad3d8725a1..0e566bc019 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -59,6 +59,16 @@ QString keyFilePath() {
     auto accountManager = DependencyManager::get<AccountManager>();
     return PathUtils::getAppDataFilePath(QString("%1.%2").arg(accountManager->getAccountInfo().getUsername(), KEY_FILE));
 }
+bool Wallet::copyKeyFileFrom(const QString& pathname) {
+    QString existing = getKeyFilePath();
+    if (!existing.isEmpty()) {
+        if (!QFile::rename(existing, existing + ".backup" + QDateTime::currentDateTime().toString(Qt::ISODate))) {
+            qCCritical(commerce) << "Unable to backup" << existing;
+            return false;
+        }
+    }
+    return QFile::copy(pathname, keyFilePath());
+}
 
 // use the cached _passphrase if it exists, otherwise we need to prompt
 int passwordCallback(char* password, int maxPasswordSize, int rwFlag, void* u) {
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index fd7aba4adc..9abc1d871b 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -35,6 +35,7 @@ public:
     void chooseSecurityImage(const QString& imageFile);
     bool getSecurityImage();
     QString getKeyFilePath();
+    bool copyKeyFileFrom(const QString& pathname);
 
     void setSalt(const QByteArray& salt) { _salt = salt; }
     QByteArray getSalt() { return _salt; }

From cc98eb64246810983d5dda6172fdcefa91ed16ca Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 16:14:42 -0800
Subject: [PATCH 490/569] Fix lightbox stuck

---
 interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 47c438f72b..6234d82139 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -205,12 +205,11 @@ Item {
                         "This step cannot be undone.";
                     lightboxPopup.button1color = hifi.buttons.red;
                     lightboxPopup.button1text = "YES, CREATE NEW WALLET";
-                    lightboxPopup.button1method = "proceed(true);";
+                    lightboxPopup.button1method = "proceed(true);root.visible = false;";
                     lightboxPopup.button2text = "CANCEL";
                     lightboxPopup.button2method = "root.visible = false;"
                     lightboxPopup.buttonLayout = "topbottom";
                     lightboxPopup.visible = true;
-
             }
         }
 

From 800d15b4055d30076855735652af5f082cdd40db Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 23 Feb 2018 16:23:50 -0800
Subject: [PATCH 491/569] Make sure settings timer is running

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e956195ca6..3dd75e2c25 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1512,6 +1512,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         settingsTimer->setSingleShot(false);
         settingsTimer->setInterval(SAVE_SETTINGS_INTERVAL); // 10s, Qt::CoarseTimer acceptable
         QObject::connect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
+        settingsTimer->start();
     }, QThread::LowestPriority);
 
     if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {

From fe515e949ba740dbb8cb0370f8b34414d9ec2bff Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 23 Feb 2018 16:36:20 -0800
Subject: [PATCH 492/569] New UI for new HFC users

---
 .../qml/hifi/commerce/wallet/WalletHome.qml   | 52 +++++++++++++------
 scripts/system/commerce/wallet.js             |  3 ++
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index ddcb4f7cee..27660b5e9e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -310,7 +310,7 @@ Item {
                 height: parent.height;
 
                 HifiControlsUit.Separator {
-                colorScheme: 1;
+                    colorScheme: 1;
                     anchors.left: parent.left;
                     anchors.right: parent.right;
                     anchors.top: parent.top;
@@ -318,20 +318,42 @@ Item {
 
                 RalewayRegular {
                     id: noActivityText;
-                text: "To <b>receive free HFC</b>, please go to " +
-                '<a href="hifi://BankOfHighFidelity/415.049,5.55924,-254.583/0,0.995213,0,0.0977305">BankOfHighFidelity</a>';
-                // Text size
-                size: 24;
-                // Style
-                color: hifi.colors.blueAccent;
-                anchors.left: parent.left;
-                anchors.leftMargin: 12;
-                anchors.right: parent.right;
-                anchors.rightMargin: 12;
-                anchors.verticalCenter: parent.verticalCenter;
-                height: paintedHeight;
-                wrapMode: Text.WordWrap;
-                horizontalAlignment: Text.AlignHCenter;
+                    text: "Congrats! Your wallet is all set!<br><br>" +
+                        "<b>Where's my HFC?</b><br>" +
+                        "High Fidelity commerce is in open beta right now. Want more HFC? Get it by meeting with a banker at " +
+                        "<a href='#goToBank'>BankOfHighFidelity</a>!"
+                    // Text size
+                    size: 22;
+                    // Style
+                    color: hifi.colors.blueAccent;
+                    anchors.top: parent.top;
+                    anchors.topMargin: 36;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 12;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 12;
+                    height: paintedHeight;
+                    wrapMode: Text.WordWrap;
+                    horizontalAlignment: Text.AlignHCenter;
+
+                    onLinkActivated: {
+                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
+                    }
+                }
+
+                HifiControlsUit.Button {
+                    id: bankButton;
+                    color: hifi.buttons.blue;
+                    colorScheme: hifi.colorSchemes.dark;
+                    anchors.top: noActivityText.bottom;
+                    anchors.topMargin: 30;
+                    anchors.horizontalCenter: parent.horizontalCenter;
+                    width: parent.width/2;
+                    height: 50;
+                    text: "VISIT BANK OF HIGH FIDELITY";
+                    onClicked: {
+                        sendSignalToWallet({ method: "transactionHistory_goToBank" });
+                    }
                 }
             }
             
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 8cf5b72b9a..51b81b76bf 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -688,6 +688,9 @@
                 updateSendMoneyParticleEffect();
                 sendMoneyParticleEffectUpdateTimer = Script.setInterval(updateSendMoneyParticleEffect, SEND_MONEY_PARTICLE_TIMER_UPDATE);
                 break;
+            case 'transactionHistory_goToBank':
+                Window.location = "hifi://BankOfHighFidelity";
+                break;
             default:
                 print('Unrecognized message from QML:', JSON.stringify(message));
         }

From 726c1ed8169241ee1eeca7a8c153c2125ea4e974 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Fri, 23 Feb 2018 17:05:46 -0800
Subject: [PATCH 493/569] receiveAt with new key

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml       | 1 -
 interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml | 2 +-
 interface/src/commerce/Wallet.cpp                             | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 63ed5294be..90db00268c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -792,7 +792,6 @@ Rectangle {
 
     function walletResetSetup() {
         root.activeView = "walletSetup";
-        Commerce.resetLocalWalletOnly();
         var timestamp = new Date();
         walletSetup.startingTimestamp = timestamp;
         walletSetup.setupAttemptID = generateUUID();
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 6234d82139..20d5212ecb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -205,7 +205,7 @@ Item {
                         "This step cannot be undone.";
                     lightboxPopup.button1color = hifi.buttons.red;
                     lightboxPopup.button1text = "YES, CREATE NEW WALLET";
-                    lightboxPopup.button1method = "proceed(true);root.visible = false;";
+                    lightboxPopup.button1method = "root.visible = false;proceed(true);";
                     lightboxPopup.button2text = "CANCEL";
                     lightboxPopup.button2method = "root.visible = false;"
                     lightboxPopup.buttonLayout = "topbottom";
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 0e566bc019..a53f3cba56 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -541,7 +541,6 @@ bool Wallet::generateKeyPair() {
 
     // TODO: redo this soon -- need error checking and so on
     writeSecurityImage(_securityImage, keyFilePath());
-    QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last();
     QString key = keyPair.first->toBase64();
     _publicKeys.push_back(key);
     qCDebug(commerce) << "public key:" << key;
@@ -551,7 +550,7 @@ bool Wallet::generateKeyPair() {
     // 2. It is maximally private, and we can step back from that later if desired.
     // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
     auto ledger = DependencyManager::get<Ledger>();
-    return ledger->receiveAt(key, oldKey);
+    return ledger->receiveAt(key, "");
 }
 
 QStringList Wallet::listPublicKeys() {

From 62f2ba0dadb6acf852966af445a1bd0f2ba04b2c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sat, 24 Feb 2018 09:32:08 +0100
Subject: [PATCH 494/569] More intellectual calculation of title positions
 taking in account actual sort indicator glyph size

---
 interface/resources/qml/controls-uit/Table.qml | 18 +++++++++++++++---
 interface/resources/qml/hifi/Pal.qml           | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controls-uit/Table.qml
index c5a605c69e..3c1d0fcd3c 100644
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controls-uit/Table.qml
@@ -23,6 +23,9 @@ TableView {
     property bool expandSelectedRow: false
     property bool centerHeaderText: false
     readonly property real headerSpacing: 3 //spacing between sort indicator and table header title
+    property var titlePaintedPos: [] // storing extra data position behind painted
+                                     // title text and sort indicatorin table's header
+    signal titlePaintedPosSignal(int column) //signal that extradata position gets changed
 
     model: ListModel { }
 
@@ -73,8 +76,10 @@ TableView {
 
         RalewayRegular {
             id: titleText
-            x: centerHeaderText ? parent.width/2 -
-                                  (paintedWidth/2 + (sortIndicatorVisible ? titleSort.paintedWidth/12 : 0)) :
+            x: centerHeaderText ? (parent.width - paintedWidth -
+                                  ((sortIndicatorVisible &&
+                                    sortIndicatorColumn === styleData.column) ?
+                                       (titleSort.paintedWidth / 5 + tableView.headerSpacing) : 0)) / 2 :
                                   hifi.dimensions.tablePadding
             text: styleData.value
             size: hifi.fontSizes.tableHeading
@@ -84,6 +89,8 @@ TableView {
             anchors.verticalCenter: parent.verticalCenter
         }
 
+        //actual image of sort indicator in glyph font only 20% of real font size
+        //i.e. if the charachter size set to 60 pixels, actual image is 12 pixels
         HiFiGlyphs {
             id: titleSort
             text:  sortIndicatorOrder == Qt.AscendingOrder ? hifi.glyphs.caratUp : hifi.glyphs.caratDn
@@ -92,8 +99,13 @@ TableView {
             size: hifi.fontSizes.tableHeadingIcon
             anchors.verticalCenter: titleText.verticalCenter
             anchors.left: titleText.right
-            anchors.leftMargin: -(hifi.fontSizes.tableHeadingIcon / 3 + tableView.headerSpacing)
+            anchors.leftMargin: -(hifi.fontSizes.tableHeadingIcon / 2.5) + tableView.headerSpacing
             visible: sortIndicatorVisible && sortIndicatorColumn === styleData.column
+            onXChanged: {
+                titlePaintedPos[styleData.column] = titleText.x + titleText.paintedWidth +
+                        paintedWidth / 5 + tableView.headerSpacing*2
+                titlePaintedPosSignal(styleData.column)
+            }
         }
 
         Rectangle {
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index bb54ba9e57..8fb27714ee 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -30,7 +30,7 @@ Rectangle {
     property int myCardWidth: width - upperRightInfoContainer.width;
     property int myCardHeight: 100;
     property int rowHeight: 60;
-    property int actionButtonWidth: 55;
+    property int actionButtonWidth: 65;
     property int locationColumnWidth: 170;
     property int nearbyNameCardWidth: nearbyTable.width - (iAmAdmin ? (actionButtonWidth * 4) : (actionButtonWidth * 2)) - 4 - hifi.dimensions.scrollbarBackgroundWidth;
     property int connectionsNameCardWidth: connectionsTable.width - locationColumnWidth - actionButtonWidth - 4 - hifi.dimensions.scrollbarBackgroundWidth;
@@ -415,6 +415,7 @@ Rectangle {
                 movable: false;
                 resizable: false;
             }
+
             TableViewColumn {
                 role: "ignore";
                 title: "IGNORE";
@@ -599,13 +600,23 @@ Rectangle {
         }
         // This Rectangle refers to the [?] popup button next to "NAMES"
         Rectangle {
+            id: questionRect
             color: hifi.colors.tableBackgroundLight;
             width: 20;
             height: hifi.dimensions.tableHeaderHeight - 2;
             anchors.left: nearbyTable.left;
             anchors.top: nearbyTable.top;
             anchors.topMargin: 1;
-            anchors.leftMargin: actionButtonWidth + nearbyNameCardWidth/2 + displayNameHeaderMetrics.width/2 + 6;
+
+            Connections {
+                target: nearbyTable
+                onTitlePaintedPosSignal: {
+                    if (column === 1) { // name column
+                        questionRect.anchors.leftMargin = actionButtonWidth + nearbyTable.titlePaintedPos[column]
+                    }
+                }
+            }
+
             RalewayRegular {
                 id: helpText;
                 text: "[?]";

From 300f611c47c14ca9b2b566393a959a9d7d10ee13 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 25 Feb 2018 14:06:06 -0800
Subject: [PATCH 495/569] working, with soft reset

---
 .../qml/hifi/commerce/wallet/Wallet.qml          |  3 ++-
 interface/src/commerce/Ledger.cpp                | 13 +++++++++----
 interface/src/commerce/Ledger.h                  |  2 +-
 interface/src/commerce/QmlCommerce.cpp           |  5 +++++
 interface/src/commerce/QmlCommerce.h             |  1 +
 interface/src/commerce/Wallet.cpp                | 16 ++++++++++++----
 interface/src/commerce/Wallet.h                  |  3 +++
 7 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 90db00268c..7506b66d01 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -176,6 +176,7 @@ Rectangle {
         id: walletChoice;
         proceedFunction: function (isReset) {
             console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
+            Commerce.setSoftReset();
             if (isReset) {
                 walletResetSetup();
             } else {
@@ -795,7 +796,7 @@ Rectangle {
         var timestamp = new Date();
         walletSetup.startingTimestamp = timestamp;
         walletSetup.setupAttemptID = generateUUID();
-        UserActivityLogger.commerceWalletSetupStarted(timestamp, setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
+        UserActivityLogger.commerceWalletSetupStarted(timestamp, walletSetup.setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
             (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
     }
     //
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 41fb8a2ced..82ebf283de 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -101,7 +101,7 @@ void Ledger::buy(const QString& hfc_key, int cost, const QString& asset_id, cons
     signedSend("transaction", transactionString, hfc_key, "buy", "buySuccess", "buyFailure", controlled_failure);
 }
 
-bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key) {
+bool Ledger::receiveAt(const QString& hfc_key, const QString& signing_key) {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (!accountManager->isLoggedIn()) {
         qCWarning(commerce) << "Cannot set receiveAt when not logged in.";
@@ -110,7 +110,7 @@ bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key) {
         return false; // We know right away that we will fail, so tell the caller.
     }
 
-    signedSend("public_key", hfc_key.toUtf8(), old_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
+    signedSend("public_key", hfc_key.toUtf8(), signing_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
     return true; // Note that there may still be an asynchronous signal of failure that callers might be interested in.
 }
 
@@ -248,6 +248,7 @@ void Ledger::accountSuccess(QNetworkReply& reply) {
     auto iv = QByteArray::fromBase64(data["iv"].toString().toUtf8());
     auto ckey = QByteArray::fromBase64(data["ckey"].toString().toUtf8());
     QString remotePublicKey = data["public_key"].toString();
+    bool isOverride = wallet->wasSoftReset();
 
     wallet->setSalt(salt);
     wallet->setIv(iv);
@@ -255,9 +256,13 @@ void Ledger::accountSuccess(QNetworkReply& reply) {
 
     QString keyStatus = "ok";
     QStringList localPublicKeys = wallet->listPublicKeys();
-    if (remotePublicKey.isEmpty()) {
+    qDebug() << "FIXME isOverride:" << isOverride;
+    qDebug() << "remote:" << remotePublicKey;
+    qDebug() << " local:" << (localPublicKeys.isEmpty() ? "" : localPublicKeys.first());
+    if (remotePublicKey.isEmpty() || isOverride) {
         if (!localPublicKeys.isEmpty()) {
-            receiveAt(localPublicKeys.first(), "");
+            QString key = localPublicKeys.first();
+            receiveAt(key, key);
         }
     } else {
         if (localPublicKeys.isEmpty()) {
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index ac9fe950d9..703ebda2dc 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -26,7 +26,7 @@ class Ledger : public QObject, public Dependency {
 
 public:
     void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false);
-    bool receiveAt(const QString& hfc_key, const QString& old_key);
+    bool receiveAt(const QString& hfc_key, const QString& signing_key);
     void balance(const QStringList& keys);
     void inventory(const QStringList& keys);
     void history(const QStringList& keys, const int& pageNumber);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 8969d18cf5..6d4497999b 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -127,6 +127,11 @@ void QmlCommerce::changePassphrase(const QString& oldPassphrase, const QString&
     }
 }
 
+void QmlCommerce::setSoftReset() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->setSoftReset();
+}
+
 void QmlCommerce::setPassphrase(const QString& passphrase) {
     auto wallet = DependencyManager::get<Wallet>();
     wallet->setPassphrase(passphrase);
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 2b520f8377..a2f5820b20 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -63,6 +63,7 @@ protected:
     Q_INVOKABLE void chooseSecurityImage(const QString& imageFile);
     Q_INVOKABLE void setPassphrase(const QString& passphrase);
     Q_INVOKABLE void changePassphrase(const QString& oldPassphrase, const QString& newPassphrase);
+    Q_INVOKABLE void setSoftReset();
 
     Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
     Q_INVOKABLE void balance();
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index a53f3cba56..fad82115d6 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -61,13 +61,20 @@ QString keyFilePath() {
 }
 bool Wallet::copyKeyFileFrom(const QString& pathname) {
     QString existing = getKeyFilePath();
+    qCDebug(commerce) << "Old keyfile" << existing;
     if (!existing.isEmpty()) {
-        if (!QFile::rename(existing, existing + ".backup" + QDateTime::currentDateTime().toString(Qt::ISODate))) {
-            qCCritical(commerce) << "Unable to backup" << existing;
+        QString backup = QString(existing).insert(existing.indexOf(KEY_FILE) - 1,
+            QDateTime::currentDateTime().toString(Qt::ISODate).replace(":", ""));
+        qCDebug(commerce) << "Renaming old keyfile to" << backup;
+        if (!QFile::rename(existing, backup)) {
+            qCCritical(commerce) << "Unable to backup" << existing << "to" << backup;
             return false;
         }
     }
-    return QFile::copy(pathname, keyFilePath());
+    QString destination = keyFilePath();
+    bool result = QFile::copy(pathname, destination);
+    qCDebug(commerce) << "copy" << pathname << "to" << destination << "=>" << result;
+    return result;
 }
 
 // use the cached _passphrase if it exists, otherwise we need to prompt
@@ -544,13 +551,14 @@ bool Wallet::generateKeyPair() {
     QString key = keyPair.first->toBase64();
     _publicKeys.push_back(key);
     qCDebug(commerce) << "public key:" << key;
+    _isOverridingServer = false;
 
     // It's arguable whether we want to change the receiveAt every time, but:
     // 1. It's certainly needed the first time, when createIfNeeded answers true.
     // 2. It is maximally private, and we can step back from that later if desired.
     // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
     auto ledger = DependencyManager::get<Ledger>();
-    return ledger->receiveAt(key, "");
+    return ledger->receiveAt(key, key);
 }
 
 QStringList Wallet::listPublicKeys() {
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index 9abc1d871b..d771f404e5 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -49,6 +49,8 @@ public:
     bool getPassphraseIsCached() { return !(_passphrase->isEmpty()); }
     bool walletIsAuthenticatedWithPassphrase();
     bool changePassphrase(const QString& newPassphrase);
+    void setSoftReset() { _isOverridingServer = true;  }
+    bool wasSoftReset() { bool was = _isOverridingServer; _isOverridingServer = false; return was; }
 
     void getWalletStatus();
     enum WalletStatus {
@@ -76,6 +78,7 @@ private:
     QByteArray _iv;
     QByteArray _ckey;
     QString* _passphrase { new QString("") };
+    bool _isOverridingServer { false };
 
     bool writeWallet(const QString& newPassphrase = QString(""));
     void updateImageProvider();

From 8b46bdd9a159875a8a646e2d3bb95877583515da Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 25 Feb 2018 15:17:28 -0800
Subject: [PATCH 496/569] make bank link testable in staging

---
 scripts/system/commerce/wallet.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 51b81b76bf..bda668246a 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -689,7 +689,11 @@
                 sendMoneyParticleEffectUpdateTimer = Script.setInterval(updateSendMoneyParticleEffect, SEND_MONEY_PARTICLE_TIMER_UPDATE);
                 break;
             case 'transactionHistory_goToBank':
-                Window.location = "hifi://BankOfHighFidelity";
+                if (Account.metaverseServerURL.indexOf("staging") >= 0) {
+                    Window.location = "hifi://hifiqa-master-metaverse-staging"; // So that we can test in staging.
+                } else {
+                    Window.location = "hifi://BankOfHighFidelity";
+                }
                 break;
             default:
                 print('Unrecognized message from QML:', JSON.stringify(message));

From 5e78de61ee90a9ec773e7b5194bb50dd55524f1a Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 25 Feb 2018 15:24:08 -0800
Subject: [PATCH 497/569] remove debugging

---
 interface/src/commerce/Ledger.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 82ebf283de..712c505e8a 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -256,9 +256,6 @@ void Ledger::accountSuccess(QNetworkReply& reply) {
 
     QString keyStatus = "ok";
     QStringList localPublicKeys = wallet->listPublicKeys();
-    qDebug() << "FIXME isOverride:" << isOverride;
-    qDebug() << "remote:" << remotePublicKey;
-    qDebug() << " local:" << (localPublicKeys.isEmpty() ? "" : localPublicKeys.first());
     if (remotePublicKey.isEmpty() || isOverride) {
         if (!localPublicKeys.isEmpty()) {
             QString key = localPublicKeys.first();

From dee3df5299d5d1028934026c413a1cd5d6617692 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 25 Feb 2018 15:26:18 -0800
Subject: [PATCH 498/569] remove debugging

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 7506b66d01..3a037fb9b9 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -70,7 +70,6 @@ Rectangle {
             } else {
                 console.log("ERROR in Wallet.qml: Unknown wallet status: " + walletStatus);
             }
-            console.log("FIXME wallet status:", walletStatus, "activeView:", root.activeView);
         }
 
         onLoginStatusResult: {

From f824edd04e98d3cbd5da12a4a60f5779f4c5bd7a Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 26 Feb 2018 04:58:22 -0500
Subject: [PATCH 499/569] * remove Model_temporary_hack * split gpuhelpers and
 mesh part * fix objwriter * more work on bufferview helpers * cr cleanup

---
 interface/src/Application.cpp                 |  31 +-
 interface/src/ui/overlays/Cube3DOverlay.cpp   |  11 +
 interface/src/ui/overlays/Cube3DOverlay.h     |   1 +
 interface/src/ui/overlays/ModelOverlay.cpp    |  10 +
 interface/src/ui/overlays/ModelOverlay.h      |   3 +
 interface/src/ui/overlays/Sphere3DOverlay.cpp |  12 +
 interface/src/ui/overlays/Sphere3DOverlay.h   |   1 +
 .../src/avatars-renderer/Avatar.cpp           |   2 +-
 .../src/RenderableModelEntityItem.cpp         |  12 +-
 .../src/RenderableModelEntityItem.h           |   1 +
 libraries/fbx/src/OBJWriter.cpp               | 110 +--
 libraries/gpu/src/gpu/Stream.cpp              |   2 +-
 libraries/gpu/src/gpu/Stream.h                |   4 +
 .../BufferViewScripting.cpp                   |  72 --
 .../graphics-scripting/BufferViewScripting.h  |  11 -
 .../src/graphics-scripting/Forward.h          |   3 +-
 .../GraphicsScriptingInterface.cpp            | 310 ++++++--
 .../GraphicsScriptingInterface.h              |  15 +-
 .../GraphicsScriptingUtil.cpp                 | 111 +++
 .../GraphicsScriptingUtil.h                   |  57 +-
 .../src/graphics-scripting/ScriptableMesh.cpp | 622 +++++----------
 .../src/graphics-scripting/ScriptableMesh.h   | 142 +---
 .../graphics-scripting/ScriptableMeshPart.cpp | 438 +++++++++++
 .../graphics-scripting/ScriptableMeshPart.h   | 106 +++
 .../graphics-scripting/ScriptableModel.cpp    |  18 +-
 .../src/graphics-scripting/ScriptableModel.h  |  29 +-
 .../src/graphics/BufferViewHelpers.cpp        | 733 ++++++++----------
 .../graphics/src/graphics/BufferViewHelpers.h |  57 +-
 .../graphics/src/graphics/GpuHelpers.cpp      | 122 +++
 libraries/graphics/src/graphics/GpuHelpers.h  |  47 ++
 libraries/render-utils/src/Model.cpp          |  76 +-
 libraries/render-utils/src/Model.h            |   2 +-
 .../src/Model_temporary_hack.cpp.h            |  84 --
 33 files changed, 1938 insertions(+), 1317 deletions(-)
 delete mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
 delete mode 100644 libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
 create mode 100644 libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
 create mode 100644 libraries/graphics/src/graphics/GpuHelpers.cpp
 create mode 100644 libraries/graphics/src/graphics/GpuHelpers.h
 delete mode 100644 libraries/render-utils/src/Model_temporary_hack.cpp.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 69be01fc0c..e8847849dc 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -608,22 +608,25 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
 class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
 public:
     virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) override {
-        QString error;
-
-        scriptable::ModelProviderPointer provider;
-        if (uuid.isNull()) {
-            provider = nullptr;
-        } else if (auto entityInterface = getEntityModelProvider(static_cast<EntityItemID>(uuid))) {
-            provider = entityInterface;
-        } else if (auto overlayInterface = getOverlayModelProvider(static_cast<OverlayID>(uuid))) {
-            provider = overlayInterface;
-        } else if (auto avatarInterface = getAvatarModelProvider(uuid)) {
-            provider = avatarInterface;
+        bool success;
+        if (auto nestable = DependencyManager::get<SpatialParentFinder>()->find(uuid, success).lock()) {
+            auto type = nestable->getNestableType();
+#ifdef SCRIPTABLE_MESH_DEBUG
+            qCDebug(interfaceapp) << "ApplicationMeshProvider::lookupModelProvider" << uuid << SpatiallyNestable::nestableTypeToString(type);
+#endif
+            switch (type) {
+            case NestableType::Entity:
+                return getEntityModelProvider(static_cast<EntityItemID>(uuid));
+            case NestableType::Overlay:
+                return getOverlayModelProvider(static_cast<OverlayID>(uuid));
+            case NestableType::Avatar:
+                return getAvatarModelProvider(uuid);
+            }
         }
-
-        return provider;
+        return nullptr;
     }
 
+private:
     scriptable::ModelProviderPointer getEntityModelProvider(EntityItemID entityID) {
         scriptable::ModelProviderPointer provider;
         auto entityTreeRenderer = qApp->getEntities();
@@ -649,6 +652,8 @@ public:
             } else {
                 qCWarning(interfaceapp) << "no renderer for overlay ID" << overlayID.toString();
             }
+        } else {
+            qCWarning(interfaceapp) << "overlay not found" << overlayID.toString();
         }
         return provider;
     }
diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp
index f13f782482..810c7b0fca 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@@ -200,3 +200,14 @@ Transform Cube3DOverlay::evalRenderTransform() {
     transform.setRotation(rotation);
     return transform;
 }
+
+scriptable::ScriptableModelBase Cube3DOverlay::getScriptableModel() {
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    auto vertexColor = ColorUtils::toVec3(_color);
+    scriptable::ScriptableModelBase result;
+    if (auto mesh = geometryCache->meshFromShape(GeometryCache::Cube, vertexColor)) {
+        result.objectID = getID();
+        result.append(mesh);
+    }
+    return result;
+}
diff --git a/interface/src/ui/overlays/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h
index e7b58ad911..0b1748c00f 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.h
+++ b/interface/src/ui/overlays/Cube3DOverlay.h
@@ -36,6 +36,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index ffcc18032c..6603a44d46 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -665,6 +665,16 @@ void ModelOverlay::processMaterials() {
     }
 }
 
+bool ModelOverlay::canReplaceModelMeshPart(int meshIndex, int partIndex) {
+    // TODO: bounds checking; for now just used to indicate provider generally supports mesh updates
+    return _model && _model->isLoaded();
+}
+
+bool ModelOverlay::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
+    return canReplaceModelMeshPart(meshIndex, partIndex) &&
+        _model->replaceScriptableModelMeshPart(newModel, meshIndex, partIndex);
+}
+
 scriptable::ScriptableModelBase ModelOverlay::getScriptableModel() {
     if (!_model || !_model->isLoaded()) {
         return Base3DOverlay::getScriptableModel();
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index fa399d40f9..88a1729d68 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -63,6 +63,9 @@ public:
     void removeMaterial(graphics::MaterialPointer material, const std::string& parentMaterialName) override;
 
     virtual scriptable::ScriptableModelBase getScriptableModel() override;
+    virtual bool canReplaceModelMeshPart(int meshIndex, int partIndex) override;
+    virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
+
 protected:
     Transform evalRenderTransform() override;
 
diff --git a/interface/src/ui/overlays/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp
index 3021aa4404..4743e1ed3a 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.cpp
+++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp
@@ -123,3 +123,15 @@ Transform Sphere3DOverlay::evalRenderTransform() {
 
     return transform;
 }
+
+
+scriptable::ScriptableModelBase Sphere3DOverlay::getScriptableModel() {
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    auto vertexColor = ColorUtils::toVec3(_color);
+    scriptable::ScriptableModelBase result;
+    if (auto mesh = geometryCache->meshFromShape(GeometryCache::Sphere, vertexColor)) {
+        result.objectID = getID();
+        result.append(mesh);
+    }
+    return result;
+}
diff --git a/interface/src/ui/overlays/Sphere3DOverlay.h b/interface/src/ui/overlays/Sphere3DOverlay.h
index ebe6dc8d83..9a434e7182 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.h
+++ b/interface/src/ui/overlays/Sphere3DOverlay.h
@@ -28,6 +28,7 @@ public:
 
     virtual Sphere3DOverlay* createClone() const override;
 
+    virtual scriptable::ScriptableModelBase getScriptableModel() override;
 protected:
     Transform evalRenderTransform() override;
 };
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 25ddfba670..f493bb14dd 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1800,6 +1800,6 @@ scriptable::ScriptableModelBase Avatar::getScriptableModel() {
         return scriptable::ScriptableModelBase();
     }
     auto result = _skeletonModel->getScriptableModel();
-    result.objectID = getSessionUUID();
+    result.objectID = getSessionUUID().isNull() ? AVATAR_SELF_ID : getSessionUUID();
     return result;
 }
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index f3c99cde2d..ae7bb26e87 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -961,8 +961,7 @@ bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
 }
 
 scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() {
-    ModelPointer model;
-    withReadLock([&] { model = _model; });
+    auto model = resultWithReadLock<ModelPointer>([this]{ return _model; });
 
     if (!model || !model->isLoaded()) {
         return scriptable::ScriptableModelBase();
@@ -973,9 +972,14 @@ scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScript
     return result;
 }
 
+bool render::entities::ModelEntityRenderer::canReplaceModelMeshPart(int meshIndex, int partIndex) {
+    // TODO: for now this method is just used to indicate that this provider generally supports mesh updates
+    auto model = resultWithReadLock<ModelPointer>([this]{ return _model; });
+    return model && model->isLoaded();
+}
+
 bool render::entities::ModelEntityRenderer::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
-    ModelPointer model;
-    withReadLock([&] { model = _model; });
+    auto model = resultWithReadLock<ModelPointer>([this]{ return _model; });
 
     if (!model || !model->isLoaded()) {
         return false;
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 7edaef264d..5d7d84b7bc 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -143,6 +143,7 @@ class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem
 public:
     ModelEntityRenderer(const EntityItemPointer& entity);
     virtual scriptable::ScriptableModelBase getScriptableModel() override;
+    virtual bool canReplaceModelMeshPart(int meshIndex, int partIndex) override;
     virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) override;
 
     void addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) override;
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 4441ae6649..630ac95b9e 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -9,10 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OBJWriter.h"
+
 #include <QFile>
 #include <QFileInfo>
-#include "graphics/Geometry.h"
-#include "OBJWriter.h"
+#include <graphics/BufferViewHelpers.h>
+#include <graphics/Geometry.h>
 #include "ModelFormatLogging.h"
 
 static QString formatFloat(double n) {
@@ -46,59 +48,60 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
     QList<int> meshNormalStartOffset;
     int currentVertexStartOffset = 0;
     int currentNormalStartOffset = 0;
+    int subMeshIndex = 0;
+    out << "# OBJWriter::writeOBJToTextStream\n";
 
     // write out vertices (and maybe colors)
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# vertices::subMeshIndex " << subMeshIndex++ << "\n";
         meshVertexStartOffset.append(currentVertexStartOffset);
-        const gpu::BufferView& vertexBuffer = mesh->getVertexBuffer();
 
-        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(gpu::Stream::COLOR);
-        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
-        gpu::BufferView::Index colorIndex = 0;
+        auto vertices = buffer_helpers::bufferToVector<glm::vec3>(mesh->getVertexBuffer(), "mesh.vertices");
+        auto colors = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh, gpu::Stream::COLOR);
 
-        int vertexCount = 0;
-        gpu::BufferView::Iterator<const glm::vec3> vertexItr = vertexBuffer.cbegin<const glm::vec3>();
-        while (vertexItr != vertexBuffer.cend<const glm::vec3>()) {
-            glm::vec3 v = *vertexItr;
+        gpu::BufferView::Index numColors = colors.size();
+
+        int i = 0;
+        for (const auto& v : vertices) {
             out << "v ";
             out << formatFloat(v[0]) << " ";
             out << formatFloat(v[1]) << " ";
             out << formatFloat(v[2]);
-            if (colorIndex < numColors) {
-                glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
+            if (i < numColors) {
+                const glm::vec3& color = colors[i];
                 out << " " << formatFloat(color[0]);
                 out << " " << formatFloat(color[1]);
                 out << " " << formatFloat(color[2]);
-                colorIndex++;
             }
             out << "\n";
-            vertexItr++;
-            vertexCount++;
+            i++;
         }
-        currentVertexStartOffset += vertexCount;
+        currentVertexStartOffset += i;
     }
     out << "\n";
 
     // write out normals
     bool haveNormals = true;
+    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# normals::subMeshIndex " << subMeshIndex++ << "\n";
         meshNormalStartOffset.append(currentNormalStartOffset);
-        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
-        gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
-        for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
-            glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
+        auto normals = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh, gpu::Stream::NORMAL);
+        for (const auto& normal : normals) {
             out << "vn ";
             out << formatFloat(normal[0]) << " ";
             out << formatFloat(normal[1]) << " ";
             out << formatFloat(normal[2]) << "\n";
         }
-        currentNormalStartOffset += numNormals;
+        currentNormalStartOffset += normals.size();
     }
     out << "\n";
 
     // write out faces
     int nth = 0;
+    subMeshIndex = 0;
     foreach (const MeshPointer& mesh, meshes) {
+        out << "# faces::subMeshIndex " << subMeshIndex++ << "\n";
         currentVertexStartOffset = meshVertexStartOffset.takeFirst();
         currentNormalStartOffset = meshNormalStartOffset.takeFirst();
 
@@ -106,45 +109,46 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
         const gpu::BufferView& indexBuffer = mesh->getIndexBuffer();
 
         graphics::Index partCount = (graphics::Index)mesh->getNumParts();
+        QString name = (!mesh->displayName.size() ? QString("mesh-%1-part").arg(nth) : QString::fromStdString(mesh->displayName))
+            .replace(QRegExp("[^-_a-zA-Z0-9]"), "_");
         for (int partIndex = 0; partIndex < partCount; partIndex++) {
             const graphics::Mesh::Part& part = partBuffer.get<graphics::Mesh::Part>(partIndex);
 
-            out << "g part-" << nth++ << "\n";
-
-            // graphics::Mesh::TRIANGLES
-            // TODO -- handle other formats
-            gpu::BufferView::Iterator<const uint32_t> indexItr = indexBuffer.cbegin<uint32_t>();
-            indexItr += part._startIndex;
-
-            int indexCount = 0;
-            while (indexItr != indexBuffer.cend<uint32_t>() && indexCount < part._numIndices) {
-                uint32_t index0 = *indexItr;
-                indexItr++;
-                indexCount++;
-                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
-                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
-                    break;
-                }
-                uint32_t index1 = *indexItr;
-                indexItr++;
-                indexCount++;
-                if (indexItr == indexBuffer.cend<uint32_t>() || indexCount >= part._numIndices) {
-                    qCDebug(modelformat) << "OBJWriter -- index buffer length isn't multiple of 3";
-                    break;
-                }
-                uint32_t index2 = *indexItr;
-                indexItr++;
-                indexCount++;
+            out << QString("g %1-%2-%3\n").arg(subMeshIndex, 3, 10, QChar('0')).arg(name).arg(partIndex);
 
+            auto indices = buffer_helpers::bufferToVector<gpu::uint32>(mesh->getIndexBuffer(), "mesh.indices");
+            auto face = [&](uint32_t i0, uint32_t i1, uint32_t i2) {
                 out << "f ";
                 if (haveNormals) {
-                    out << currentVertexStartOffset + index0 + 1 << "//" << currentVertexStartOffset + index0 + 1 << " ";
-                    out << currentVertexStartOffset + index1 + 1 << "//" << currentVertexStartOffset + index1 + 1 << " ";
-                    out << currentVertexStartOffset + index2 + 1 << "//" << currentVertexStartOffset + index2 + 1 << "\n";
+                    out << currentVertexStartOffset + indices[i0] + 1 << "//" << currentVertexStartOffset + indices[i0] + 1 << " ";
+                    out << currentVertexStartOffset + indices[i1] + 1 << "//" << currentVertexStartOffset + indices[i1] + 1 << " ";
+                    out << currentVertexStartOffset + indices[i2] + 1 << "//" << currentVertexStartOffset + indices[i2] + 1 << "\n";
                 } else {
-                    out << currentVertexStartOffset + index0 + 1 << " ";
-                    out << currentVertexStartOffset + index1 + 1 << " ";
-                    out << currentVertexStartOffset + index2 + 1 << "\n";
+                    out << currentVertexStartOffset + indices[i0] + 1 << " ";
+                    out << currentVertexStartOffset + indices[i1] + 1 << " ";
+                    out << currentVertexStartOffset + indices[i2] + 1 << "\n";
+                }
+            };
+
+            uint32_t len = part._startIndex + part._numIndices;
+            qCDebug(modelformat) << "OBJWriter -- part" << partIndex << "topo" << part._topology << "index elements";
+            if (part._topology == graphics::Mesh::TRIANGLES && len % 3 != 0) {
+                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 3" << len;
+            }
+            if (part._topology == graphics::Mesh::QUADS && len % 4 != 0) {
+                qCDebug(modelformat) << "OBJWriter -- index buffer length isn't a multiple of 4" << len;
+            }
+            if (len > indexBuffer.getNumElements()) {
+                qCDebug(modelformat) << "OBJWriter -- len > index size" << len << indexBuffer.getNumElements();
+            }
+            if (part._topology == graphics::Mesh::QUADS) {
+                for (uint32_t idx = part._startIndex; idx+3 < len; idx += 4) {
+                    face(idx+0, idx+1, idx+3);
+                    face(idx+1, idx+2, idx+3);
+                }
+            } else if (part._topology == graphics::Mesh::TRIANGLES) {
+                for (uint32_t idx = part._startIndex; idx+2 < len; idx += 3) {
+                    face(idx+0, idx+1, idx+2);
                 }
             }
             out << "\n";
diff --git a/libraries/gpu/src/gpu/Stream.cpp b/libraries/gpu/src/gpu/Stream.cpp
index caa1ecbc06..f83900be42 100644
--- a/libraries/gpu/src/gpu/Stream.cpp
+++ b/libraries/gpu/src/gpu/Stream.cpp
@@ -19,7 +19,7 @@ using namespace gpu;
 
 using ElementArray = std::array<Element, Stream::NUM_INPUT_SLOTS>;
 
-const ElementArray& getDefaultElements() {
+const ElementArray& Stream::getDefaultElements() {
     static ElementArray defaultElements{{
         //POSITION = 0,
         Element::VEC3F_XYZ,
diff --git a/libraries/gpu/src/gpu/Stream.h b/libraries/gpu/src/gpu/Stream.h
index 5562980a91..0def1ab201 100644
--- a/libraries/gpu/src/gpu/Stream.h
+++ b/libraries/gpu/src/gpu/Stream.h
@@ -23,6 +23,8 @@
 
 namespace gpu {
 
+class Element;
+
 // Stream namespace class
 class Stream {
 public:
@@ -49,6 +51,8 @@ public:
 
     typedef uint8 Slot;
 
+    static const std::array<Element, InputSlot::NUM_INPUT_SLOTS>& getDefaultElements();
+
     // Frequency describer
     enum Frequency {
         PER_VERTEX = 0,
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
deleted file mode 100644
index 9d7a0e1f30..0000000000
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "BufferViewScripting.h"
-
-#include <QDebug>
-#include <QVariant>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptEngine>
-
-#include <gpu/Buffer.h>
-#include <gpu/Format.h>
-#include <gpu/Stream.h>
-
-#include <graphics/BufferViewHelpers.h>
-
-template <typename T>
-QScriptValue getBufferViewElement(QScriptEngine* js, const gpu::BufferView& view, quint32 index, bool asArray = false) {
-    return glmVecToScriptValue(js, view.get<T>(index), asArray);
-}
-
-QScriptValue bufferViewElementToScriptValue(QScriptEngine* engine, const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
-    QVariant result = buffer_helpers::toVariant(view, index, asArray, hint);
-    if (!result.isValid()) {
-        return QScriptValue::NullValue;
-    }
-    return engine->toScriptValue(result);
-}
-
-template <typename T>
-void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QScriptValue& v) {
-    view.edit<T>(index) = glmVecFromScriptValue<T>(v);
-}
-
-bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferView& view, quint32 index) {
-    return buffer_helpers::fromVariant(view, index, v.toVariant());
-}
-
-template <typename T>
-QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray) {
-    static const auto len = T().length();
-    const auto& components = asArray ? buffer_helpers::ZERO123 : buffer_helpers::XYZW;
-    auto obj = asArray ? js->newArray() : js->newObject();
-    for (int i = 0; i < len ; i++) {
-        const auto key = components[i];
-        const auto value = v[i];
-        if (value != value) { // NAN
-#ifdef DEV_BUILD
-            qWarning().nospace()<< "vec" << len << "." << key << " converting NAN to javascript NaN.... " << value;
-#endif
-            obj.setProperty(key, js->globalObject().property("NaN"));
-        } else {
-            obj.setProperty(key, value);
-        }
-    }
-    return obj;
-}
-
-template <typename T>
-const T glmVecFromScriptValue(const QScriptValue& v) {
-    static const auto len = T().length();
-    const auto& components = v.property("x").isValid() ? buffer_helpers::XYZW : buffer_helpers::ZERO123;
-    T result;
-    for (int i = 0; i < len ; i++) {
-        const auto key = components[i];
-        const auto value = v.property(key).toNumber();
-#ifdef DEV_BUILD
-        if (value != value) { // NAN
-            qWarning().nospace()<< "vec" << len << "." << key << " NAN received from script.... " << v.toVariant().toString();
-        }
-#endif
-        result[i] = value;
-    }
-    return result;
-}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h b/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
deleted file mode 100644
index f2e3fe734e..0000000000
--- a/libraries/graphics-scripting/src/graphics-scripting/BufferViewScripting.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <QtCore>
-
-namespace gpu { class BufferView;  }
-class QScriptValue;
-class QScriptEngine;
-template <typename T> QScriptValue glmVecToScriptValue(QScriptEngine *js, const T& v, bool asArray = false);
-template <typename T> const T glmVecFromScriptValue(const QScriptValue& v);
-QScriptValue bufferViewElementToScriptValue(QScriptEngine* engine, const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
-bool bufferViewElementFromScriptValue(const QScriptValue& v, const gpu::BufferView& view, quint32 index);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 94a96446a0..2f2f191dce 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -74,7 +74,7 @@ namespace scriptable {
     public:
         NestableType modelProviderType;
         virtual scriptable::ScriptableModelBase getScriptableModel() = 0;
-
+        virtual bool canReplaceModelMeshPart(int meshIndex, int partIndex) { return false; }
         virtual bool replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer model, int meshIndex, int partIndex) { return false; }
     };
 
@@ -88,7 +88,6 @@ namespace scriptable {
         void modelRemovedFromScene(const QUuid& objectID, NestableType nestableType, const ModelPointer& sender);
     };
 
-    using uint32 = quint32;
     class ScriptableModel;
     using ScriptableModelPointer = QPointer<ScriptableModel>;
     class ScriptableMesh;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 787905520a..22ef346df6 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -15,13 +15,16 @@
 #include "RegisteredMetaTypes.h"
 #include "ScriptEngineLogging.h"
 #include "ScriptableMesh.h"
+#include "ScriptableMeshPart.h"
 #include <GeometryUtil.h>
 #include <QUuid>
 #include <QtScript/QScriptEngine>
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptValueIterator>
 #include <graphics/BufferViewHelpers.h>
+#include <graphics/GpuHelpers.h>
 #include <shared/QtHelpers.h>
+#include <SpatiallyNestable.h>
 
 GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent), QScriptable() {
     if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
@@ -29,21 +32,45 @@ GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObjec
     }
 }
 
-bool GraphicsScriptingInterface::updateModelObject(QUuid uuid, const scriptable::ScriptableModelPointer model) {
-    if (auto provider = getModelProvider(uuid)) {
-        if (auto base = model->operator scriptable::ScriptableModelBasePointer()) {
-#ifdef SCRIPTABLE_MESH_DEBUG
-            qDebug() << "replaceScriptableModelMeshPart" << model->toString() << -1 << -1;
-#endif
-            return provider->replaceScriptableModelMeshPart(base, -1, -1);
-        } else {
-            qDebug() << "replaceScriptableModelMeshPart -- !base" << model << base << -1 << -1;
-        }
+void GraphicsScriptingInterface::jsThrowError(const QString& error) {
+    if (context()) {
+        context()->throwError(error);
     } else {
-        qDebug() << "replaceScriptableModelMeshPart -- !provider";
+        qCWarning(graphics_scripting) << "GraphicsScriptingInterface::jsThrowError (without valid JS context):" << error;
+    }
+}
+
+bool GraphicsScriptingInterface::canUpdateModel(QUuid uuid, int meshIndex, int partNumber) {
+    auto provider = getModelProvider(uuid);
+    return provider && provider->canReplaceModelMeshPart(meshIndex, partNumber);
+}
+
+bool GraphicsScriptingInterface::updateModel(QUuid uuid, const scriptable::ScriptableModelPointer& model) {
+    if (!model) {
+        jsThrowError("null model argument");
     }
 
-    return false;
+    auto base = model->operator scriptable::ScriptableModelBasePointer();
+    if (!base) {
+        jsThrowError("could not get base model pointer");
+        return false;
+    }
+
+    auto provider = getModelProvider(uuid);
+    if (!provider) {
+        jsThrowError("provider unavailable");
+        return false;
+    }
+
+    if (!provider->canReplaceModelMeshPart(-1, -1)) {
+        jsThrowError("provider does not support updating mesh parts");
+        return false;
+    }
+
+#ifdef SCRIPTABLE_MESH_DEBUG
+    qDebug() << "replaceScriptableModelMeshPart" << model->toString() << -1 << -1;
+#endif
+    return provider->replaceScriptableModelMeshPart(base, -1, -1);
 }
 
 scriptable::ModelProviderPointer GraphicsScriptingInterface::getModelProvider(QUuid uuid) {
@@ -57,28 +84,26 @@ scriptable::ModelProviderPointer GraphicsScriptingInterface::getModelProvider(QU
     } else {
         error = "appProvider unavailable";
     }
-    if (context()) {
-        context()->throwError(error);
-    } else {
-        qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getModelProvider ERROR" << error;
-    }
+    jsThrowError(error);
     return nullptr;
 }
 
-scriptable::ScriptableModelPointer GraphicsScriptingInterface::newModelObject(QVector<scriptable::ScriptableMeshPointer> meshes) {
+scriptable::ScriptableModelPointer GraphicsScriptingInterface::newModel(const scriptable::ScriptableMeshes& meshes) {
     auto modelWrapper = scriptable::make_scriptowned<scriptable::ScriptableModel>();
     modelWrapper->setObjectName("js::model");
     if (meshes.isEmpty()) {
-        if (context()) {
-            context()->throwError("expected [meshes] array as first argument");
-        }
+        jsThrowError("expected [meshes] array as first argument");
     } else {
         int i = 0;
         for (const auto& mesh : meshes) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+            qDebug() << "newModel" << i << meshes.size() << mesh;
+#endif
             if (mesh) {
                 modelWrapper->append(*mesh);
-            } else if (context()) {
-                context()->throwError(QString("invalid mesh at index: %1").arg(i));
+            } else {
+                jsThrowError(QString("invalid mesh at index: %1").arg(i));
+                break;
             }
             i++;
         }
@@ -86,30 +111,37 @@ scriptable::ScriptableModelPointer GraphicsScriptingInterface::newModelObject(QV
     return modelWrapper;
 }
 
-scriptable::ScriptableModelPointer GraphicsScriptingInterface::getModelObject(QUuid uuid) {
-    QString error, providerType = "unknown";
-    if (auto provider = getModelProvider(uuid)) {
-        providerType = SpatiallyNestable::nestableTypeToString(provider->modelProviderType);
-        auto modelObject = provider->getScriptableModel();
-        if (modelObject.objectID == uuid) {
-            if (modelObject.meshes.size()) {
-                auto modelWrapper = scriptable::make_scriptowned<scriptable::ScriptableModel>(modelObject);
-                modelWrapper->setObjectName(providerType+"::"+uuid.toString()+"::model");
-                return modelWrapper;
+scriptable::ScriptableModelPointer GraphicsScriptingInterface::getModel(QUuid uuid) {
+    QString error;
+    bool success;
+    QString providerType = "unknown";
+    if (auto nestable = DependencyManager::get<SpatialParentFinder>()->find(uuid, success).lock()) {
+        providerType = SpatiallyNestable::nestableTypeToString(nestable->getNestableType());
+        if (auto provider = getModelProvider(uuid)) {
+            auto modelObject = provider->getScriptableModel();
+            const bool found = !modelObject.objectID.isNull();
+            if (found && uuid == AVATAR_SELF_ID) {
+                // special case override so that scripts can rely on matching intput/output UUIDs
+                modelObject.objectID = AVATAR_SELF_ID;
+            }
+            if (modelObject.objectID == uuid) {
+                if (modelObject.meshes.size()) {
+                    auto modelWrapper = scriptable::make_scriptowned<scriptable::ScriptableModel>(modelObject);
+                    modelWrapper->setObjectName(providerType+"::"+uuid.toString()+"::model");
+                    return modelWrapper;
+                } else {
+                    error = "no meshes available: " + modelObject.objectID.toString();
+                }
             } else {
-                error = "no meshes available: " + modelObject.objectID.toString();
+                error = QString("objectID mismatch: %1 (result contained %2 meshes)").arg(modelObject.objectID.toString()).arg(modelObject.meshes.size());
             }
         } else {
-            error = QString("objectID mismatch: %1 (containing %2 meshes)").arg(modelObject.objectID.toString()).arg(modelObject.meshes.size());
+            error = "model provider unavailable";
         }
     } else {
-        error = "provider unavailable";
-    }
-    auto errorMessage = QString("failed to get meshes from %1 provider for uuid %2 (%3)").arg(providerType).arg(uuid.toString()).arg(error);
-    qCWarning(graphics_scripting) << "GraphicsScriptingInterface::getModelObject ERROR" << errorMessage;
-    if (context()) {
-        context()->throwError(errorMessage);
+        error = "model object not found";
     }
+    jsThrowError(QString("failed to get meshes from %1 provider for uuid %2 (%3)").arg(providerType).arg(uuid.toString()).arg(error));
     return nullptr;
 }
 
@@ -135,6 +167,85 @@ bool GraphicsScriptingInterface::updateMeshPart(scriptable::ScriptableMeshPointe
 }
 #endif
 
+scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVariantMap& ifsMeshData) {
+    // TODO: this is bare-bones way for now to improvise a new mesh from the scripting side
+    //  in the future we want to support a formal C++ structure data type here instead
+    QString meshName = ifsMeshData.value("name").toString();
+    QString topologyName = ifsMeshData.value("topology").toString();
+    QVector<glm::uint32> indices = buffer_helpers::variantToVector<glm::uint32>(ifsMeshData.value("indices"));
+    QVector<glm::vec3> vertices = buffer_helpers::variantToVector<glm::vec3>(ifsMeshData.value("positions"));
+    QVector<glm::vec3> normals = buffer_helpers::variantToVector<glm::vec3>(ifsMeshData.value("normals"));
+    QVector<glm::vec3> colors = buffer_helpers::variantToVector<glm::vec3>(ifsMeshData.value("colors"));
+    QVector<glm::vec2> texCoords0 = buffer_helpers::variantToVector<glm::vec2>(ifsMeshData.value("texCoords0"));
+
+    const auto numVertices = vertices.size();
+    const auto numIndices = indices.size();
+    const auto topology = graphics::Mesh::TRIANGLES;
+
+    // sanity checks
+    QString error;
+    if (!topologyName.isEmpty() && topologyName != "triangles") {
+        error = "expected 'triangles' or undefined for .topology";
+    } else if (!numIndices) {
+        error = QString("expected non-empty [uint32,...] array for .indices (got type=%1)").arg(ifsMeshData.value("indices").typeName());
+    } else if (numIndices % 3 != 0) {
+        error = QString("expected 'triangle faces' for .indices (ie: length to be divisible by 3) length=%1").arg(numIndices);
+    } else if (!numVertices) {
+        error = "expected non-empty [glm::vec3(),...] array for .positions";
+    } else {
+        const gpu::uint32 maxVertexIndex = numVertices;
+        int i = 0;
+        for (const auto& ind : indices) {
+            if (ind >= maxVertexIndex) {
+                error = QString("index out of .indices[%1] index=%2 >= maxVertexIndex=%3").arg(i).arg(ind).arg(maxVertexIndex);
+                break;
+            }
+            i++;
+        }
+    }
+    if (!error.isEmpty()) {
+        jsThrowError(error);
+        return nullptr;
+    }
+
+    if (ifsMeshData.contains("normals") && normals.size() < numVertices) {
+        qCInfo(graphics_scripting) << "newMesh -- expanding .normals to #" << numVertices;
+        normals.resize(numVertices);
+    }
+    if (ifsMeshData.contains("colors") && colors.size() < numVertices) {
+        qCInfo(graphics_scripting) << "newMesh -- expanding .colors to #" << numVertices;
+        colors.resize(numVertices);
+    }
+    if (ifsMeshData.contains("texCoords0") && texCoords0.size() < numVertices) {
+        qCInfo(graphics_scripting) << "newMesh -- expanding .texCoords0 to #" << numVertices;
+        texCoords0.resize(numVertices);
+    }
+    if (ifsMeshData.contains("texCoords1")) {
+        qCWarning(graphics_scripting) << "newMesh - texCoords1 not yet supported; ignoring";
+    }
+
+    graphics::MeshPointer mesh(new graphics::Mesh());
+    mesh->modelName = "graphics::newMesh";
+    mesh->displayName = meshName.toStdString();
+
+    // TODO: newFromVector does no conversion -- later we could autodetect if fitting into gpu::INDEX_UINT16
+    //  and also pack other values (like NORMAL / TEXCOORD0 where relevant)
+    mesh->setIndexBuffer(buffer_helpers::newFromVector(indices, gpu::Format::INDEX_INT32));
+    mesh->setVertexBuffer(buffer_helpers::newFromVector(vertices, gpu::Format::VEC3F_XYZ));
+    if (normals.size()) {
+        mesh->addAttribute(gpu::Stream::NORMAL, buffer_helpers::newFromVector(normals, gpu::Format::VEC3F_XYZ));
+    }
+    if (colors.size()) {
+        mesh->addAttribute(gpu::Stream::COLOR, buffer_helpers::newFromVector(colors, gpu::Format::VEC3F_XYZ));
+    }
+    if (texCoords0.size()) {
+        mesh->addAttribute(gpu::Stream::TEXCOORD0, buffer_helpers::newFromVector(texCoords0, gpu::Format::VEC2F_UV));
+    }
+    QVector<graphics::Mesh::Part> parts = {{ 0, indices.size(), 0, topology}};
+    mesh->setPartBuffer(buffer_helpers::newFromVector(parts, gpu::Element::PART_DRAWCALL));
+    return scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh, nullptr);
+}
+
 QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::ScriptableModel& _in) {
     const auto& in = _in.getConstMeshes();
     if (in.size()) {
@@ -148,11 +259,10 @@ QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::Scriptabl
             return writeOBJToString(meshes);
         }
     }
-    if (context()) {
-        context()->throwError(QString("null mesh"));
-    }
+    jsThrowError("null mesh");
     return QString();
 }
+
 void GraphicsScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
     scriptable::registerMetaTypes(engine);
 }
@@ -166,23 +276,115 @@ MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMes
 MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMeshPointer meshProxy) {
     MeshPointer result;
     if (!meshProxy) {
-        if (context()){
-            context()->throwError("expected meshProxy as first parameter");
-        } else {
-            qCDebug(graphics_scripting) << "expected meshProxy as first parameter";
-        }
+        jsThrowError("expected meshProxy as first parameter");
         return result;
     }
     auto mesh = meshProxy->getMeshPointer();
     if (!mesh) {
-        if (context()) {
-            context()->throwError("expected valid meshProxy as first parameter");
-        } else {
-            qCDebug(graphics_scripting) << "expected valid meshProxy as first parameter";
-        }
+        jsThrowError("expected valid meshProxy as first parameter");
         return result;
     }
     return mesh;
 }
 
+namespace {
+    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<glm::uint32>& vector) {
+        return qScriptValueFromSequence(engine, vector);
+    }
+
+    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<glm::uint32>& result) {
+        qScriptValueToSequence(array, result);
+    }
+
+    QVector<int> metaTypeIds{
+        qRegisterMetaType<glm::uint32>("uint32"),
+        qRegisterMetaType<glm::uint32>("glm::uint32"),
+        qRegisterMetaType<QVector<glm::uint32>>(),
+        qRegisterMetaType<QVector<glm::uint32>>("QVector<uint32>"),
+        qRegisterMetaType<scriptable::ScriptableMeshes>(),
+        qRegisterMetaType<scriptable::ScriptableMeshes>("ScriptableMeshes"),
+        qRegisterMetaType<scriptable::ScriptableMeshes>("scriptable::ScriptableMeshes"),
+        qRegisterMetaType<QVector<scriptable::ScriptableMeshPointer>>("QVector<scriptable::ScriptableMeshPointer>"),
+        qRegisterMetaType<scriptable::ScriptableMeshPointer>(),
+        qRegisterMetaType<scriptable::ScriptableModelPointer>(),
+        qRegisterMetaType<scriptable::ScriptableMeshPartPointer>(),
+        qRegisterMetaType<graphics::Mesh::Topology>(),
+    };
+}
+
+namespace scriptable {
+    template <typename T> int registerQPointerThing(QScriptEngine* engine) {
+        qScriptRegisterSequenceMetaType<QVector<QPointer<T>>>(engine);
+        return qScriptRegisterMetaType<QPointer<T>>(
+            engine,
+            [](QScriptEngine* engine, const QPointer<T>& object) -> QScriptValue {
+                if (!object) {
+                    return QScriptValue::NullValue;
+                }
+                return engine->newQObject(object, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::AutoCreateDynamicProperties);
+            },
+            [](const QScriptValue& value, QPointer<T>& out) {
+                auto obj = value.toQObject();
+#ifdef SCRIPTABLE_MESH_DEBUG
+                qCInfo(graphics_scripting) << "qpointer_qobject_cast" << obj << value.toString();
+#endif
+                if (auto tmp = qobject_cast<T*>(obj)) {
+                    out = QPointer<T>(tmp);
+                    return;
+                }
+#if 0
+                if (auto tmp = static_cast<T*>(obj)) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+                    qCInfo(graphics_scripting) << "qpointer_qobject_cast -- via static_cast" << obj << tmp << value.toString();
+#endif
+                    out = QPointer<T>(tmp);
+                    return;
+                }
+#endif
+                out = nullptr;
+            }
+        );
+    }
+
+    template <typename T> int registerDebugEnum(QScriptEngine* engine, const DebugEnums<T>& debugEnums) {
+        static const DebugEnums<T>& poop = debugEnums;
+        return qScriptRegisterMetaType<T>(
+            engine,
+            [](QScriptEngine* engine, const T& topology) -> QScriptValue {
+                return poop.value(topology);
+            },
+            [](const QScriptValue& value, T& topology) {
+                topology = poop.key(value.toString());
+            }
+        );
+    }
+
+    bool registerMetaTypes(QScriptEngine* engine) {
+        qScriptRegisterSequenceMetaType<QVector<glm::uint32>>(engine);
+
+        qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
+
+        registerQPointerThing<scriptable::ScriptableModel>(engine);
+        registerQPointerThing<scriptable::ScriptableMesh>(engine);
+        registerQPointerThing<scriptable::ScriptableMeshPart>(engine);
+        qScriptRegisterMetaType<QVector<scriptable::ScriptableMeshPointer>>(
+            engine,
+            [](QScriptEngine* engine, const QVector<scriptable::ScriptableMeshPointer>& vector) -> QScriptValue {
+                return qScriptValueFromSequence(engine, vector);
+            },
+            [](const QScriptValue& array, QVector<scriptable::ScriptableMeshPointer>& result) {
+                qScriptValueToSequence(array, result);
+            }
+        );
+
+        registerDebugEnum<graphics::Mesh::Topology>(engine, graphics::TOPOLOGIES);
+        registerDebugEnum<gpu::Type>(engine, gpu::TYPES);
+        registerDebugEnum<gpu::Semantic>(engine, gpu::SEMANTICS);
+        registerDebugEnum<gpu::Dimension>(engine, gpu::DIMENSIONS);
+
+        return metaTypeIds.size();
+    }
+
+}
+
 #include "GraphicsScriptingInterface.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index 9866b5585c..a66e382bc7 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -34,13 +34,14 @@ public slots:
      * @function GraphicsScriptingInterface.getModel
      * @param {UUID} The objectID of the model whose meshes are to be retrieve
      */
-    scriptable::ModelProviderPointer getModelProvider(QUuid uuid);
-    scriptable::ScriptableModelPointer getModelObject(QUuid uuid);
-    bool updateModelObject(QUuid uuid, const scriptable::ScriptableModelPointer model);
-    scriptable::ScriptableModelPointer newModelObject(QVector<scriptable::ScriptableMeshPointer> meshes);
+    scriptable::ScriptableModelPointer getModel(QUuid uuid);
+    bool updateModel(QUuid uuid, const scriptable::ScriptableModelPointer& model);
+    bool canUpdateModel(QUuid uuid, int meshIndex = -1, int partNumber = -1);
+    scriptable::ScriptableModelPointer newModel(const scriptable::ScriptableMeshes& meshes);
+    scriptable::ScriptableMeshPointer newMesh(const QVariantMap& ifsMeshData);
 
 #ifdef SCRIPTABLE_MESH_TODO
-    scriptable::ScriptableMeshPartPointer exportMeshPart(scriptable::ScriptableMeshPointer mesh, int part=0) {
+    scriptable::ScriptableMeshPartPointer exportMeshPart(scriptable::ScriptableMeshPointer mesh, int partNumber = -1) {
         return scriptable::make_scriptowned<scriptable::ScriptableMeshPart>(mesh, part);
     }
     bool updateMeshPart(scriptable::ScriptableMeshPointer mesh, scriptable::ScriptableMeshPartPointer part);
@@ -49,10 +50,14 @@ public slots:
     QString exportModelToOBJ(const scriptable::ScriptableModel& in);
 
 private:
+    scriptable::ModelProviderPointer getModelProvider(QUuid uuid);
+    void jsThrowError(const QString& error);
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMeshPointer meshProxy);
     scriptable::MeshPointer getMeshPointer(scriptable::ScriptableMesh& meshProxy);
     scriptable::MeshPointer getMeshPointer(const scriptable::ScriptableMesh& meshProxy);
 
 };
 
+Q_DECLARE_METATYPE(scriptable::ModelProviderPointer)
+
 #endif // hifi_GraphicsScriptingInterface_h
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
index aabf83ff66..da582b2d21 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
@@ -1,3 +1,114 @@
+//
+//  Copyright 2018 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 "GraphicsScriptingUtil.h"
 
+#include <BaseScriptEngine.h>
+
+#include <graphics/BufferViewHelpers.h>
+#include <AABox.h>
+#include <Extents.h>
+
+using buffer_helpers::glmVecToVariant;
+
 Q_LOGGING_CATEGORY(graphics_scripting, "hifi.scripting.graphics")
+
+namespace scriptable {
+
+QVariant toVariant(const glm::mat4& mat4) {
+    QVector<float> floats;
+    floats.resize(16);
+    memcpy(floats.data(), &mat4, sizeof(glm::mat4));
+    QVariant v;
+    v.setValue<QVector<float>>(floats);
+    return v;
+};
+
+QVariant toVariant(const Extents& box) {
+    return QVariantMap{
+        { "center", glmVecToVariant(box.minimum + (box.size() / 2.0f)) },
+        { "minimum", glmVecToVariant(box.minimum) },
+        { "maximum", glmVecToVariant(box.maximum) },
+        { "dimensions", glmVecToVariant(box.size()) },
+    };
+}
+
+QVariant toVariant(const AABox& box) {
+    return QVariantMap{
+        { "brn", glmVecToVariant(box.getCorner()) },
+        { "tfl", glmVecToVariant(box.calcTopFarLeft()) },
+        { "center", glmVecToVariant(box.calcCenter()) },
+        { "minimum", glmVecToVariant(box.getMinimumPoint()) },
+        { "maximum", glmVecToVariant(box.getMaximumPoint()) },
+        { "dimensions", glmVecToVariant(box.getDimensions()) },
+    };
+}
+
+QVariant toVariant(const gpu::Element& element) {
+    return QVariantMap{
+        { "type", gpu::toString(element.getType()) },
+        { "semantic", gpu::toString(element.getSemantic()) },
+        { "dimension", gpu::toString(element.getDimension()) },
+        { "scalarCount", element.getScalarCount() },
+        { "byteSize", element.getSize() },
+        { "BYTES_PER_ELEMENT", element.getSize() / element.getScalarCount() },
+     };
+}
+
+QScriptValue jsBindCallback(QScriptValue value) {
+    if (value.isObject() && value.property("callback").isFunction()) {
+        // value is already a bound callback
+        return value;
+    }
+    auto engine = value.engine();
+    auto context = engine ? engine->currentContext() : nullptr;
+    auto length = context ? context->argumentCount() : 0;
+    QScriptValue scope = context ? context->thisObject() : QScriptValue::NullValue;
+    QScriptValue method;
+#ifdef SCRIPTABLE_MESH_DEBUG
+    qCInfo(graphics_scripting) << "jsBindCallback" << engine << length << scope.toQObject() << method.toString();
+#endif
+
+    // find position in the incoming JS Function.arguments array (so we can test for the two-argument case)
+    for (int i = 0; context && i < length; i++) {
+        if (context->argument(i).strictlyEquals(value)) {
+            method = context->argument(i+1);
+        }
+    }
+    if (method.isFunction() || method.isString()) {
+        // interpret as `API.func(..., scope, function callback(){})` or `API.func(..., scope, "methodName")`
+        scope = value;
+    } else {
+        // interpret as `API.func(..., function callback(){})`
+        method = value;
+    }
+#ifdef SCRIPTABLE_MESH_DEBUG
+    qCInfo(graphics_scripting) << "scope:" << scope.toQObject() << "method:" << method.toString();
+#endif
+    return ::makeScopedHandlerObject(scope,  method);
+}
+
+template <typename T>
+T this_qobject_cast(QScriptEngine* engine) {
+    auto context = engine ? engine->currentContext() : nullptr;
+    return qscriptvalue_cast<T>(context ? context->thisObject() : QScriptValue::NullValue);
+}
+QString toDebugString(QObject* tmp) {
+    QString s;
+    QTextStream out(&s);
+    out << tmp;
+    return s;
+    // return QString("%0 (0x%1%2)")
+    //     .arg(tmp ? tmp->metaObject()->className() : "QObject")
+    //     .arg(qulonglong(tmp), 16, 16, QChar('0'))
+    //     .arg(tmp && tmp->objectName().size() ? " name=" + tmp->objectName() : "");
+}
+template <typename T> QString toDebugString(std::shared_ptr<T> tmp) {
+    return toDebugString(qobject_cast<QObject*>(tmp.get()));
+}
+
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
index 9b86ddee82..1ca62277ff 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.h
@@ -8,46 +8,39 @@
 #include <QDebug>
 #include <memory>
 #include <functional>
+#include <glm/glm.hpp>
+
+class Extents;
+class AABox;
+namespace gpu {
+    class Element;
+}
 Q_DECLARE_LOGGING_CATEGORY(graphics_scripting)
 
 namespace scriptable {
-    // derive current context's C++ QObject (based on current JS "this" value)
-    template <typename T>
-    T this_qobject_cast(QScriptEngine* engine) {
-        auto context = engine ? engine->currentContext() : nullptr;
-        return qscriptvalue_cast<T>(context ? context->thisObject() : QScriptValue::NullValue);
-    }
+    QVariant toVariant(const Extents& box);
+    QVariant toVariant(const AABox& box);
+    QVariant toVariant(const gpu::Element& element);
+    QVariant toVariant(const glm::mat4& mat4);
 
-    // JS => QPointer<QObject>
-    template <typename T>
-    QPointer<T> qpointer_qobject_cast(const QScriptValue& value) {
-        auto obj = value.toQObject();
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "qpointer_qobject_cast" << obj << value.toString();
-#endif
-        if (auto tmp = qobject_cast<T*>(obj)) {
-            return QPointer<T>(tmp);
-        }
-        if (auto tmp = static_cast<T*>(obj)) {
-            return QPointer<T>(tmp);
-        }
-        return nullptr;
-    }
-    inline QString toDebugString(QObject* tmp) {
-        return QString("%0 (0x%1%2)")
-            .arg(tmp ? tmp->metaObject()->className() : "QObject")
-            .arg(qulonglong(tmp), 16, 16, QChar('0'))
-            .arg(tmp && tmp->objectName().size() ? " name=" + tmp->objectName() : "");
-    }
-    template <typename T> QString toDebugString(std::shared_ptr<T> tmp) {
-        return toDebugString(qobject_cast<QObject*>(tmp.get()));
-    }
+    // helper that automatically resolves Qt-signal-like scoped callbacks
+    // ... C++ side: `void MyClass::asyncMethod(..., QScriptValue callback)` 
+    // ... JS side:
+    //     * `API.asyncMethod(..., function(){})`
+    //     * `API.asyncMethod(..., scope, function(){})`
+    //     * `API.asyncMethod(..., scope, "methodName")`
+    QScriptValue jsBindCallback(QScriptValue callback);
+
+    // cast engine->thisObject() => C++ class instance
+    template <typename T> T this_qobject_cast(QScriptEngine* engine);
+
+    QString toDebugString(QObject* tmp);
+    template <typename T> QString toDebugString(std::shared_ptr<T> tmp);
 
     // Helper for creating C++ > ScriptOwned JS instances
     // (NOTE: this also helps track in the code where we need to update later if switching to
     //  std::shared_ptr's -- something currently non-trivial given mixed JS/C++ object ownership)
-    template <typename T, class... Rest>
-    QPointer<T> make_scriptowned(Rest... rest) {
+    template <typename T, class... Rest> inline QPointer<T> make_scriptowned(Rest... rest) {
         auto instance = QPointer<T>(new T(rest...));
         Q_ASSERT(instance && instance->parent());
         return instance;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 76741947fd..2cef4fef64 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -8,6 +8,7 @@
 #include "Forward.h"
 
 #include "ScriptableMesh.h"
+#include "ScriptableMeshPart.h"
 
 #include "BufferViewScripting.h"
 #include "GraphicsScriptingUtil.h"
@@ -19,15 +20,11 @@
 #include <glm/gtx/norm.hpp>
 #include <glm/gtx/transform.hpp>
 #include <graphics/BufferViewHelpers.h>
+#include <graphics/GpuHelpers.h>
 #include <graphics/Geometry.h>
 
 // #define SCRIPTABLE_MESH_DEBUG 1
 
-scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
-    : QObject(), parentMesh(parentMesh), partIndex(partIndex)  {
-    setObjectName(QString("%1.part[%2]").arg(parentMesh ? parentMesh->objectName() : "").arg(partIndex));
-}
-
 scriptable::ScriptableMesh::ScriptableMesh(const ScriptableMeshBase& other)
     : ScriptableMeshBase(other), QScriptable() {
     auto mesh = getMeshPointer();
@@ -41,74 +38,55 @@ scriptable::ScriptableMesh::ScriptableMesh(const ScriptableMeshBase& other)
 
 QVector<scriptable::ScriptableMeshPartPointer> scriptable::ScriptableMesh::getMeshParts() const {
     QVector<scriptable::ScriptableMeshPartPointer> out;
-    for (quint32 i = 0; i < getNumParts(); i++) {
+    for (glm::uint32 i = 0; i < getNumParts(); i++) {
         out << scriptable::make_scriptowned<scriptable::ScriptableMeshPart>(getSelf(), i);
     }
     return out;
 }
 
-quint32 scriptable::ScriptableMesh::getNumIndices() const {
+glm::uint32 scriptable::ScriptableMesh::getNumIndices() const {
     if (auto mesh = getMeshPointer()) {
-        return (quint32)mesh->getNumIndices();
+        return (glm::uint32)mesh->getNumIndices();
     }
     return 0;
 }
 
-quint32 scriptable::ScriptableMesh::getNumVertices() const {
+glm::uint32 scriptable::ScriptableMesh::getNumVertices() const {
     if (auto mesh = getMeshPointer()) {
-        return (quint32)mesh->getNumVertices();
+        return (glm::uint32)mesh->getNumVertices();
     }
     return 0;
 }
 
-QVector<quint32> scriptable::ScriptableMesh::findNearbyIndices(const glm::vec3& origin, float epsilon) const {
-    QVector<quint32> result;
-    if (auto mesh = getMeshPointer()) {
-        const auto& pos = buffer_helpers::getBufferView(mesh, gpu::Stream::POSITION);
-        const uint32_t num = (uint32_t)pos.getNumElements();
-        for (uint32_t i = 0; i < num; i++) {
-            const auto& position = pos.get<glm::vec3>(i);
-            if (glm::distance(position, origin) <= epsilon) {
-                result << i;
-            }
+QVector<glm::uint32> scriptable::ScriptableMesh::findNearbyVertexIndices(const glm::vec3& origin, float epsilon) const {
+    QVector<glm::uint32> result;
+    if (!isValid()) {
+        return result;
+    }
+    const auto epsilon2 = epsilon*epsilon;
+    buffer_helpers::forEach<glm::vec3>(buffer_helpers::mesh::getBufferView(getMeshPointer(), gpu::Stream::POSITION), [&](glm::uint32 index, const glm::vec3& position) {
+        if (glm::length2(position - origin) <= epsilon2) {
+            result << index;
         }
-    }
+        return true;
+    });
     return result;
 }
 
-QVector<quint32> scriptable::ScriptableMesh::getIndices() const {
-    QVector<quint32> result;
+QVector<glm::uint32> scriptable::ScriptableMesh::getIndices() const {
     if (auto mesh = getMeshPointer()) {
 #ifdef SCRIPTABLE_MESH_DEBUG
-        qCDebug(graphics_scripting, "getTriangleIndices mesh %p", mesh.get());
+        qCDebug(graphics_scripting, "getIndices mesh %p", mesh.get());
 #endif
-        gpu::BufferView indexBufferView = mesh->getIndexBuffer();
-        if (quint32 count = (quint32)indexBufferView.getNumElements()) {
-            result.resize(count);
-            switch(indexBufferView._element.getType()) {
-            case gpu::UINT32:
-                // memcpy(result.data(), buffer->getData(), result.size()*sizeof(quint32));
-                for (quint32 i = 0; i < count; i++) {
-                    result[i] = indexBufferView.get<quint32>(i);
-                }
-                break;
-            case gpu::UINT16:
-                for (quint32 i = 0; i < count; i++) {
-                    result[i] = indexBufferView.get<quint16>(i);
-                }
-                break;
-            default:
-                assert(false);
-                Q_ASSERT(false);
-            }
-        }
+        return buffer_helpers::bufferToVector<glm::uint32>(mesh->getIndexBuffer());
     }
-    return result;
+    return QVector<glm::uint32>();
 }
 
-quint32 scriptable::ScriptableMesh::getNumAttributes() const {
+
+glm::uint32 scriptable::ScriptableMesh::getNumAttributes() const {
     if (auto mesh = getMeshPointer()) {
-        return (quint32)mesh->getNumAttributes();
+        return (glm::uint32)mesh->getNumAttributes() + 1;
     }
     return 0;
 }
@@ -116,7 +94,7 @@ QVector<QString> scriptable::ScriptableMesh::getAttributeNames() const {
     QVector<QString> result;
     if (auto mesh = getMeshPointer()) {
         for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
-            auto bufferView = buffer_helpers::getBufferView(mesh, a.second);
+            auto bufferView = buffer_helpers::mesh::getBufferView(mesh, a.second);
             if (bufferView.getNumElements() > 0) {
                 result << a.first;
             }
@@ -125,22 +103,20 @@ QVector<QString> scriptable::ScriptableMesh::getAttributeNames() const {
     return result;
 }
 
-QVariantMap scriptable::ScriptableMesh::getVertexAttributes(quint32 vertexIndex) const {
-    return getVertexAttributes(vertexIndex, getAttributeNames());
+QVariantMap scriptable::ScriptableMesh::getVertexAttributes(glm::uint32 vertexIndex) const {
+    if (!isValidIndex(vertexIndex)) {
+        return QVariantMap();
+    }
+    return buffer_helpers::mesh::getVertexAttributes(getMeshPointer(), vertexIndex).toMap();
 }
 
-bool scriptable::ScriptableMesh::setVertexAttributes(quint32 vertexIndex, QVariantMap attributes) {
-    for (auto& a : buffer_helpers::gatherBufferViews(getMeshPointer())) {
-        const auto& name = a.first;
-        const auto& value = attributes.value(name);
-        if (value.isValid()) {
-            auto& view = a.second;
-            buffer_helpers::fromVariant(view, vertexIndex, value);
-        } else {
-            //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
+bool scriptable::ScriptableMesh::setVertexAttributes(glm::uint32 vertexIndex, const QVariantMap& attributes) {
+    for (const auto& name : attributes.keys()) {
+        if (!isValidIndex(vertexIndex, name)) {
+            return false;
         }
     }
-    return true;
+    return buffer_helpers::mesh::setVertexAttributes(getMeshPointer(), vertexIndex, attributes);
 }
 
 int scriptable::ScriptableMesh::_getSlotNumber(const QString& attributeName) const {
@@ -150,112 +126,133 @@ int scriptable::ScriptableMesh::_getSlotNumber(const QString& attributeName) con
     return -1;
 }
 
-
-QVariantMap scriptable::ScriptableMesh::getMeshExtents() const {
-    auto mesh = getMeshPointer();
-    auto box = mesh ? mesh->evalPartsBound(0, (int)mesh->getNumParts()) : AABox();
-    return buffer_helpers::toVariant(box).toMap();
+QVariantMap scriptable::ScriptableMesh::getBufferFormats() const {
+    QVariantMap result;
+    for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
+        auto bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), a.second);
+        result[a.first] = QVariantMap{
+            { "slot", a.second },
+            { "length", (quint32)bufferView.getNumElements() },
+            { "byteLength", (quint32)bufferView._size },
+            { "offset", (quint32) bufferView._offset },
+            { "stride", (quint32)bufferView._stride },
+            { "element", scriptable::toVariant(bufferView._element) },
+        };
+    }
+    return result;
 }
 
-quint32 scriptable::ScriptableMesh::getNumParts() const {
-    if (auto mesh = getMeshPointer()) {
-        return (quint32)mesh->getNumParts();
+bool scriptable::ScriptableMesh::removeAttribute(const QString& attributeName) {
+    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    if (slot < 0) {
+        return 0;
+    }
+    if (slot == gpu::Stream::POSITION) {
+        context()->throwError("cannot remove .position attribute");
+        return false;
+    }
+    if (buffer_helpers::mesh::getBufferView(getMeshPointer(), slot).getNumElements()) {
+        getMeshPointer()->removeAttribute(slot);
+        return true;
+    }
+    return false;
+}
+
+glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeName, const QVariant& defaultValue) {
+    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    if (slot < 0) {
+        return 0;
+    }
+    auto mesh = getMeshPointer();
+    auto numVertices = getNumVertices();
+    if (!getAttributeNames().contains(attributeName)) {
+        QVector<QVariant> values;
+        values.fill(defaultValue, numVertices);
+        mesh->addAttribute(slot, buffer_helpers::newFromVector(values, gpu::Stream::getDefaultElements()[slot]));
+        return values.size();
+    } else {
+        auto bufferView = buffer_helpers::mesh::getBufferView(mesh, slot);
+        auto current = bufferView.getNumElements();
+        if (current < numVertices) {
+            bufferView = buffer_helpers::resized(bufferView, numVertices);
+            for (glm::uint32 i = current; i < numVertices; i++) {
+                buffer_helpers::setValue<QVariant>(bufferView, i, defaultValue);
+            }
+            return numVertices - current;
+        } else if (current > numVertices) {
+            qCDebug(graphics_scripting) << QString("current=%1 > numVertices=%2").arg(current).arg(numVertices);
+            return 0;
+        }
     }
     return 0;
 }
 
-QVariantMap scriptable::ScriptableMeshPart::scaleToFit(float unitScale) {
-    if (auto mesh = getMeshPointer()) {
-        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
-        auto center = box.calcCenter();
-        float maxDimension = glm::distance(box.getMaximumPoint(), box.getMinimumPoint());
-        return scale(glm::vec3(unitScale / maxDimension), center);
+glm::uint32 scriptable::ScriptableMesh::fillAttribute(const QString& attributeName, const QVariant& value) {
+    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    if (slot < 0) {
+        return 0;
     }
-    return {};
-}
-QVariantMap scriptable::ScriptableMeshPart::translate(const glm::vec3& translation) {
-    return transform(glm::translate(translation));
-}
-QVariantMap scriptable::ScriptableMeshPart::scale(const glm::vec3& scale, const glm::vec3& origin) {
-    if (auto mesh = getMeshPointer()) {
-        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
-        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
-        return transform(glm::translate(center) * glm::scale(scale));
-    }
-    return {};
-}
-QVariantMap scriptable::ScriptableMeshPart::rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin) {
-    return rotate(glm::quat(glm::radians(eulerAngles)), origin);
-}
-QVariantMap scriptable::ScriptableMeshPart::rotate(const glm::quat& rotation, const glm::vec3& origin) {
-    if (auto mesh = getMeshPointer()) {
-        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
-        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
-        return transform(glm::translate(center) * glm::toMat4(rotation));
-    }
-    return {};
-}
-QVariantMap scriptable::ScriptableMeshPart::transform(const glm::mat4& transform) {
-    if (auto mesh = getMeshPointer()) {
-        const auto& pos = buffer_helpers::getBufferView(mesh, gpu::Stream::POSITION);
-        const uint32_t num = (uint32_t)pos.getNumElements();
-        for (uint32_t i = 0; i < num; i++) {
-            auto& position = pos.edit<glm::vec3>(i);
-            position = transform * glm::vec4(position, 1.0f);
-        }
-        return parentMesh->getMeshExtents();
-    }
-    return {};
+    auto mesh = getMeshPointer();
+    auto numVertices = getNumVertices();
+    QVector<QVariant> values;
+    values.fill(value, numVertices);
+    mesh->addAttribute(slot, buffer_helpers::newFromVector(values, gpu::Stream::getDefaultElements()[slot]));
+    return true;
 }
 
-QVariantList scriptable::ScriptableMesh::getAttributeValues(const QString& attributeName) const {
-    QVariantList result;
-    auto slotNum = _getSlotNumber(attributeName);
-    if (slotNum >= 0) {
-        auto slot = (gpu::Stream::Slot)slotNum;
-        const auto& bufferView = buffer_helpers::getBufferView(getMeshPointer(), slot);
-        if (auto len = bufferView.getNumElements()) {
-            bool asArray = bufferView._element.getType() != gpu::FLOAT;
-            for (quint32 i = 0; i < len; i++) {
-                result << buffer_helpers::toVariant(bufferView, i, asArray, attributeName.toStdString().c_str());
-            }
-        }
-    }
-    return result;
-}
-QVariantMap scriptable::ScriptableMesh::getVertexAttributes(quint32 vertexIndex, QVector<QString> names) const {
-    QVariantMap result;
+QVariantMap scriptable::ScriptableMesh::getMeshExtents() const {
     auto mesh = getMeshPointer();
-    if (!mesh || vertexIndex >= getNumVertices()) {
+    auto box = mesh ? mesh->evalPartsBound(0, (int)mesh->getNumParts()) : AABox();
+    return scriptable::toVariant(box).toMap();
+}
+
+glm::uint32 scriptable::ScriptableMesh::getNumParts() const {
+    if (auto mesh = getMeshPointer()) {
+        return (glm::uint32)mesh->getNumParts();
+    }
+    return 0;
+}
+
+QVariantList scriptable::ScriptableMesh::queryVertexAttributes(QVariant selector) const {
+    QVariantList result;
+    const auto& attributeName = selector.toString();
+    if (!isValidIndex(0, attributeName)) {
         return result;
     }
-    for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
-        auto name = a.first;
-        if (!names.contains(name)) {
-            continue;
-        }
-        auto slot = a.second;
-        const gpu::BufferView& bufferView = buffer_helpers::getBufferView(mesh, slot);
-        if (vertexIndex < bufferView.getNumElements()) {
-            bool asArray = bufferView._element.getType() != gpu::FLOAT;
-            result[name] = buffer_helpers::toVariant(bufferView, vertexIndex, asArray, name.toStdString().c_str());
-        }
+    auto slotNum = _getSlotNumber(attributeName);
+    const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
+    glm::uint32 numElements = bufferView.getNumElements();
+    for (glm::uint32 i = 0; i < numElements; i++) {
+        result << buffer_helpers::getValue<QVariant>(bufferView, i, qUtf8Printable(attributeName));
     }
     return result;
 }
 
-quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
+QVariant scriptable::ScriptableMesh::getVertexProperty(glm::uint32 vertexIndex, const QString& attributeName) const {
+    if (!isValidIndex(vertexIndex, attributeName)) {
+        return QVariant();
+    }
+    auto slotNum = _getSlotNumber(attributeName);
+    const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
+    return buffer_helpers::getValue<QVariant>(bufferView, vertexIndex, qUtf8Printable(attributeName));
+}
+
+bool scriptable::ScriptableMesh::setVertexProperty(glm::uint32 vertexIndex, const QString& attributeName, const QVariant& value) {
+    if (!isValidIndex(vertexIndex, attributeName)) {
+        return false;
+    }
+    auto slotNum = _getSlotNumber(attributeName);
+    const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
+    return buffer_helpers::setValue(bufferView, vertexIndex, value);
+}
+
+glm::uint32 scriptable::ScriptableMesh::forEachVertex(QScriptValue _callback) {
     auto mesh = getMeshPointer();
     if (!mesh) {
         return 0;
     }
     auto scopedHandler = jsBindCallback(_callback);
 
-    // input buffers
-    gpu::BufferView positions = mesh->getVertexBuffer();
-
-    const auto nPositions = positions.getNumElements();
-
     // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
     auto scope = scopedHandler.property("scope");
     auto callback = scopedHandler.property("callback");
@@ -264,205 +261,104 @@ quint32 scriptable::ScriptableMesh::mapAttributeValues(QScriptValue _callback) {
         return 0;
     }
     auto meshPart = js ? js->toScriptValue(getSelf()) : QScriptValue::NullValue;
-#ifdef SCRIPTABLE_MESH_DEBUG
-    qCInfo(graphics_scripting) << "mapAttributeValues" << mesh.get() << js->currentContext()->thisObject().toQObject();
-#endif
-    auto obj = js->newObject();
-    auto attributeViews = buffer_helpers::gatherBufferViews(mesh, { "normal", "color" });
-    uint32_t i = 0;
-    for (; i < nPositions; i++) {
-        for (const auto& a : attributeViews) {
-            bool asArray = a.second._element.getType() != gpu::FLOAT;
-            obj.setProperty(a.first, bufferViewElementToScriptValue(js, a.second, i, asArray, a.first.toStdString().c_str()));
-        }
-        auto result = callback.call(scope, { obj, i, meshPart });
+    int numProcessed = 0;
+    buffer_helpers::mesh::forEachVertex(mesh, [&](glm::uint32 index, const QVariantMap& values) {
+        auto result = callback.call(scope, { js->toScriptValue(values), index, meshPart });
         if (js->hasUncaughtException()) {
             js->currentContext()->throwValue(js->uncaughtException());
-            return i;
+            return false;
         }
+        numProcessed++;
+        return true;
+    });
+    return numProcessed;
+}
 
+
+glm::uint32 scriptable::ScriptableMesh::updateVertexAttributes(QScriptValue _callback) {
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return 0;
+    }
+    auto scopedHandler = jsBindCallback(_callback);
+
+    // destructure so we can still invoke callback scoped, but with a custom signature (obj, i, jsMesh)
+    auto scope = scopedHandler.property("scope");
+    auto callback = scopedHandler.property("callback");
+    auto js = engine() ? engine() : scopedHandler.engine(); // cache value to avoid resolving each iteration
+    if (!js) {
+        return 0;
+    }
+    auto meshPart = js ? js->toScriptValue(getSelf()) : QScriptValue::NullValue;
+    int numProcessed = 0;
+    auto attributeViews = buffer_helpers::mesh::getAllBufferViews(mesh);
+    buffer_helpers::mesh::forEachVertex(mesh, [&](glm::uint32 index, const QVariantMap& values) {
+        auto obj = js->toScriptValue(values);
+        auto result = callback.call(scope, { obj, index, meshPart });
+        if (js->hasUncaughtException()) {
+            js->currentContext()->throwValue(js->uncaughtException());
+            return false;
+        }
         if (result.isBool() && !result.toBool()) {
             // bail without modifying data if user explicitly returns false
-            continue;
+            return true;
         }
         if (result.isObject() && !result.strictlyEquals(obj)) {
             // user returned a new object (ie: instead of modifying input properties)
             obj = result;
         }
-
         for (const auto& a : attributeViews) {
             const auto& attribute = obj.property(a.first);
-            auto& view = a.second;
             if (attribute.isValid()) {
-                bufferViewElementFromScriptValue(attribute, view, i);
+                buffer_helpers::setValue(a.second, index, attribute.toVariant());
             }
         }
+        numProcessed++;
+        return true;
+    });
+    return numProcessed;
+}
+
+// protect against user scripts sending bogus values
+bool scriptable::ScriptableMesh::isValidIndex(glm::uint32 vertexIndex, const QString& attributeName) const {
+    if (!isValid()) {
+        return false;
     }
-    return i;
-}
-
-quint32 scriptable::ScriptableMeshPart::mapAttributeValues(QScriptValue callback) {
-    return parentMesh ? parentMesh->mapAttributeValues(callback) : 0;
-}
-
-bool scriptable::ScriptableMeshPart::replaceMeshData(scriptable::ScriptableMeshPartPointer src, const QVector<QString>& attributeNames) {
-    auto target = getMeshPointer();
-    auto source = src ? src->getMeshPointer() : nullptr;
-    if (!target || !source) {
+    const auto last = getNumVertices() - 1;
+    if (vertexIndex > last) {
         if (context()) {
-            context()->throwError("ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
-        } else {
-            qCWarning(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers";
+            context()->throwError(QString("vertexIndex=%1 out of range (firstVertexIndex=%2, lastVertexIndex=%3)").arg(vertexIndex).arg(0).arg(last));
         }
         return false;
     }
-
-    QVector<QString> attributes = attributeNames.isEmpty() ? src->parentMesh->getAttributeNames() : attributeNames;
-
-    qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- " <<
-        "source:" << QString::fromStdString(source->displayName) <<
-        "target:" << QString::fromStdString(target->displayName) <<
-        "attributes:" << attributes;
-
-    // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
-    if (attributeNames.isEmpty()) {
-        auto attributeViews = buffer_helpers::gatherBufferViews(target);
-        for (const auto& a : attributeViews) {
-            auto slot = buffer_helpers::ATTRIBUTES[a.first];
-            if (!attributes.contains(a.first)) {
-#ifdef SCRIPTABLE_MESH_DEBUG
-                qCInfo(graphics_scripting) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
-#endif
-                target->removeAttribute(slot);
+    if (!attributeName.isEmpty()) {
+        auto slotNum = _getSlotNumber(attributeName);
+        if (slotNum < 0) {
+            if (context()) {
+                context()->throwError(QString("invalid attributeName=%1").arg(attributeName));
             }
+            return false;
         }
-    }
-
-    target->setVertexBuffer(buffer_helpers::clone(source->getVertexBuffer()));
-    target->setIndexBuffer(buffer_helpers::clone(source->getIndexBuffer()));
-    target->setPartBuffer(buffer_helpers::clone(source->getPartBuffer()));
-
-    for (const auto& a : attributes) {
-        auto slot = buffer_helpers::ATTRIBUTES[a];
-        if (slot == gpu::Stream::POSITION) {
-            continue;
-        }
-#ifdef SCRIPTABLE_MESH_DEBUG
-        auto& before = target->getAttributeBuffer(slot);
-#endif
-        auto& input = source->getAttributeBuffer(slot);
-        if (input.getNumElements() == 0) {
-#ifdef SCRIPTABLE_MESH_DEBUG
-            qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData buffer is empty -- pruning" << a << slot;
-#endif
-            target->removeAttribute(slot);
-        } else {
-#ifdef SCRIPTABLE_MESH_DEBUG
-            if (before.getNumElements() == 0) {
-                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer is empty -- adding" << a << slot;
-            } else {
-                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer exists -- updating" << a << slot;
+        auto view = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
+        if (vertexIndex >= view.getNumElements()) {
+            if (context()) {
+                context()->throwError(QString("vertexIndex=%1 out of range (attribute=%2, numElements=%3)").arg(vertexIndex).arg(attributeName).arg(view.getNumElements()));
             }
-#endif
-            target->addAttribute(slot, buffer_helpers::clone(input));
+            return false;
         }
-#ifdef SCRIPTABLE_MESH_DEBUG
-        auto& after = target->getAttributeBuffer(slot);
-        qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
-#endif
-    }
-
-
-    return true;
-}
-
-bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
-    auto mesh = getMeshPointer();
-    if (!mesh) {
-        return false;
-    }
-    auto positions = mesh->getVertexBuffer();
-    auto numPositions = positions.getNumElements();
-    const auto epsilon2 = epsilon*epsilon;
-
-    QVector<glm::vec3> uniqueVerts;
-    uniqueVerts.reserve((int)numPositions);
-    QMap<quint32,quint32> remapIndices;
-
-    for (quint32 i = 0; i < numPositions; i++) {
-        const quint32 numUnique = uniqueVerts.size();
-        const auto& position = positions.get<glm::vec3>(i);
-        bool unique = true;
-        for (quint32 j = 0; j < numUnique; j++) {
-            if (glm::length2(uniqueVerts[j] - position) <= epsilon2) {
-                remapIndices[i] = j;
-                unique = false;
-                break;
-            }
-        }
-        if (unique) {
-            uniqueVerts << position;
-            remapIndices[i] = numUnique;
-        }
-    }
-
-    qCInfo(graphics_scripting) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
-
-    auto indices = mesh->getIndexBuffer();
-    auto numIndices = indices.getNumElements();
-    auto esize = indices._element.getSize();
-    QVector<quint32> newIndices;
-    newIndices.reserve((int)numIndices);
-    for (quint32 i = 0; i < numIndices; i++) {
-        quint32 index = esize == 4 ? indices.get<quint32>(i) : indices.get<quint16>(i);
-        if (remapIndices.contains(index)) {
-            newIndices << remapIndices[index];
-        } else {
-            qCInfo(graphics_scripting) << i << index << "!remapIndices[index]";
-        }
-    }
-
-    mesh->setIndexBuffer(buffer_helpers::fromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
-    mesh->setVertexBuffer(buffer_helpers::fromVector(uniqueVerts, { gpu::VEC3, gpu::FLOAT, gpu::XYZ }));
-
-    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
-    quint32 numUniqueVerts = uniqueVerts.size();
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto slot = buffer_helpers::ATTRIBUTES[a.first];
-        if (slot == gpu::Stream::POSITION) {
-            continue;
-        }
-        auto newView = buffer_helpers::resize(view, numUniqueVerts);
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "ScriptableMeshPart::dedupeVertices" << a.first << slot << view.getNumElements();
-        qCInfo(graphics_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
-#endif
-        quint32 numElements = (quint32)view.getNumElements();
-        for (quint32 i = 0; i < numElements; i++) {
-            quint32 fromVertexIndex = i;
-            quint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
-            buffer_helpers::fromVariant(
-                newView, toVertexIndex,
-                buffer_helpers::toVariant(view, fromVertexIndex, false, "dedupe")
-            );
-        }
-        mesh->addAttribute(slot, newView);
     }
     return true;
 }
 
-scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh(bool recalcNormals) {
+
+scriptable::ScriptableMeshPointer scriptable::ScriptableMesh::cloneMesh() {
     auto mesh = getMeshPointer();
     if (!mesh) {
         qCInfo(graphics_scripting) << "ScriptableMesh::cloneMesh -- !meshPointer";
         return nullptr;
     }
-    auto clone = buffer_helpers::cloneMesh(mesh);
+    auto clone = buffer_helpers::mesh::clone(mesh);
 
-    if (recalcNormals) {
-        buffer_helpers::recalculateNormals(clone);
-    }
     auto meshPointer = scriptable::make_scriptowned<scriptable::ScriptableMesh>(provider, model, clone, nullptr);
     return scriptable::ScriptableMeshPointer(meshPointer);
 }
@@ -505,114 +401,6 @@ scriptable::ScriptableMesh::~ScriptableMesh() {
     strongMesh.reset();
 }
 
-QString scriptable::ScriptableMeshPart::toOBJ() {
-    if (!getMeshPointer()) {
-        if (context()) {
-            context()->throwError(QString("null mesh"));
-        } else {
-            qCWarning(graphics_scripting) << "null mesh";
-        }
-        return QString();
-    }
-    return writeOBJToString({ getMeshPointer() });
-}
-
-namespace {
-    template <typename T>
-    QScriptValue qObjectToScriptValue(QScriptEngine* engine, const T& object) {
-        if (!object) {
-            return QScriptValue::NullValue;
-        }
-        return engine->newQObject(object, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater);
-    }
-
-    QScriptValue meshPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableMeshPointer& in) {
-        return qObjectToScriptValue(engine, in);
-    }
-    QScriptValue meshPartPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableMeshPartPointer& in) {
-        return qObjectToScriptValue(engine, in);
-    }
-    QScriptValue modelPointerToScriptValue(QScriptEngine* engine, const scriptable::ScriptableModelPointer& in) {
-        return qObjectToScriptValue(engine, in);
-    }
-
-    void meshPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPointer &out) {
-        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableMesh>(value);
-    }
-    void modelPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableModelPointer &out) {
-        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableModel>(value);
-    }
-    void meshPartPointerFromScriptValue(const QScriptValue& value, scriptable::ScriptableMeshPartPointer &out) {
-        out = scriptable::qpointer_qobject_cast<scriptable::ScriptableMeshPart>(value);
-    }
-
-    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<scriptable::uint32>& vector) {
-        return qScriptValueFromSequence(engine, vector);
-    }
-
-    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<scriptable::uint32>& result) {
-        qScriptValueToSequence(array, result);
-    }
-
-    QVector<int> metaTypeIds{
-        qRegisterMetaType<scriptable::uint32>("uint32"),
-        qRegisterMetaType<scriptable::uint32>("scriptable::uint32"),
-        qRegisterMetaType<QVector<scriptable::uint32>>(),
-        qRegisterMetaType<QVector<scriptable::uint32>>("QVector<uint32>"),
-        qRegisterMetaType<scriptable::ScriptableMeshPointer>(),
-        qRegisterMetaType<scriptable::ScriptableModelPointer>(),
-        qRegisterMetaType<scriptable::ScriptableMeshPartPointer>(),
-    };
-}
-
-namespace scriptable {
-    bool registerMetaTypes(QScriptEngine* engine) {
-        qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPartPointer>>(engine);
-        qScriptRegisterSequenceMetaType<QVector<scriptable::ScriptableMeshPointer>>(engine);
-        qScriptRegisterSequenceMetaType<QVector<scriptable::uint32>>(engine);
-
-        qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
-        qScriptRegisterMetaType(engine, modelPointerToScriptValue, modelPointerFromScriptValue);
-        qScriptRegisterMetaType(engine, meshPointerToScriptValue, meshPointerFromScriptValue);
-        qScriptRegisterMetaType(engine, meshPartPointerToScriptValue, meshPartPointerFromScriptValue);
-
-        return metaTypeIds.size();
-    }
-
-    // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
-    // still supporting extended Qt signal-like (scope, "methodName") and (scope, function(){}) "this" binding conventions
-    QScriptValue jsBindCallback(QScriptValue value) {
-        if (value.isObject() && value.property("callback").isFunction()) {
-            // value is already a bound callback
-            return value;
-        }
-        auto engine = value.engine();
-        auto context = engine ? engine->currentContext() : nullptr;
-        auto length = context ? context->argumentCount() : 0;
-        QScriptValue scope = context ? context->thisObject() : QScriptValue::NullValue;
-        QScriptValue method;
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "jsBindCallback" << engine << length << scope.toQObject() << method.toString();
-#endif
-
-        // find position in the incoming JS Function.arguments array (so we can test for the two-argument case)
-        for (int i = 0; context && i < length; i++) {
-            if (context->argument(i).strictlyEquals(value)) {
-                method = context->argument(i+1);
-            }
-        }
-        if (method.isFunction() || method.isString()) {
-            // interpret as `API.func(..., scope, function callback(){})` or `API.func(..., scope, "methodName")`
-            scope = value;
-        } else {
-            // interpret as `API.func(..., function callback(){})`
-            method = value;
-        }
-#ifdef SCRIPTABLE_MESH_DEBUG
-        qCInfo(graphics_scripting) << "scope:" << scope.toQObject() << "method:" << method.toString();
-#endif
-        return ::makeScopedHandlerObject(scope,  method);
-    }
-}
 
 #include "ScriptableMesh.moc"
+
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 48ef6c3a81..16393de8c7 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -25,18 +25,23 @@
 
 #include "GraphicsScriptingUtil.h"
 
+#include <graphics/Geometry.h>
+
 namespace scriptable {
     class ScriptableMesh : public ScriptableMeshBase, QScriptable {
         Q_OBJECT
     public:
-        Q_PROPERTY(uint32 numParts READ getNumParts)
-        Q_PROPERTY(uint32 numAttributes READ getNumAttributes)
-        Q_PROPERTY(uint32 numVertices READ getNumVertices)
-        Q_PROPERTY(uint32 numIndices READ getNumIndices)
+        Q_PROPERTY(glm::uint32 numParts READ getNumParts)
+        Q_PROPERTY(glm::uint32 numAttributes READ getNumAttributes)
+        Q_PROPERTY(glm::uint32 numVertices READ getNumVertices)
+        Q_PROPERTY(glm::uint32 numIndices READ getNumIndices)
         Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
         Q_PROPERTY(QVector<scriptable::ScriptableMeshPartPointer> parts READ getMeshParts)
-        Q_PROPERTY(bool valid READ hasValidMesh)
+        Q_PROPERTY(bool valid READ isValid)
         Q_PROPERTY(bool strong READ hasValidStrongMesh)
+        Q_PROPERTY(QVariantMap extents READ getMeshExtents)
+        Q_PROPERTY(QVariantMap bufferFormats READ getBufferFormats)
+        QVariantMap getBufferFormats() const;
 
         operator const ScriptableMeshBase*() const { return (qobject_cast<const scriptable::ScriptableMeshBase*>(this)); }
 
@@ -48,116 +53,49 @@ namespace scriptable {
         ScriptableMesh(const ScriptableMesh& other) : ScriptableMeshBase(other), QScriptable() {};
         virtual ~ScriptableMesh();
 
-        Q_INVOKABLE const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
-        Q_INVOKABLE const scriptable::MeshPointer getOwnedMeshPointer() const { return strongMesh; }
+        const scriptable::MeshPointer getOwnedMeshPointer() const { return strongMesh; }
         scriptable::ScriptableMeshPointer getSelf() const { return const_cast<scriptable::ScriptableMesh*>(this); }
-        bool hasValidMesh() const { return !weakMesh.expired(); }
+        bool isValid() const { return !weakMesh.expired(); }
         bool hasValidStrongMesh() const { return (bool)strongMesh; }
-   public slots:
-        uint32 getNumParts() const;
-        uint32 getNumVertices() const;
-        uint32 getNumAttributes() const;
-        uint32 getNumIndices() const;
+        glm::uint32 getNumParts() const;
+        glm::uint32 getNumVertices() const;
+        glm::uint32 getNumAttributes() const;
+        glm::uint32 getNumIndices() const;
         QVector<QString> getAttributeNames() const;
         QVector<scriptable::ScriptableMeshPartPointer> getMeshParts() const;
-
-        QVariantMap getVertexAttributes(uint32 vertexIndex) const;
-        QVariantMap getVertexAttributes(uint32 vertexIndex, QVector<QString> attributes) const;
-
-        QVector<uint32> getIndices() const;
-        QVector<uint32> findNearbyIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
         QVariantMap getMeshExtents() const;
-        bool setVertexAttributes(uint32 vertexIndex, QVariantMap attributes);
 
-        QVariantList getAttributeValues(const QString& attributeName) const;
-
-        int _getSlotNumber(const QString& attributeName) const;
-
-        scriptable::ScriptableMeshPointer cloneMesh(bool recalcNormals = false);
-    public:
+        // TODO: remove Q_INVOKABLE (curently exposed for debugging )
+        Q_INVOKABLE int _getSlotNumber(const QString& attributeName) const;
         operator bool() const { return !weakMesh.expired(); }
 
     public slots:
+        const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
+        QVector<glm::uint32> getIndices() const;
+        QVector<glm::uint32> findNearbyVertexIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
+
+        glm::uint32 addAttribute(const QString& attributeName, const QVariant& defaultValue = QVariant());
+        glm::uint32 fillAttribute(const QString& attributeName, const QVariant& value);
+        bool removeAttribute(const QString& attributeName);
+
+        QVariantList queryVertexAttributes(QVariant selector) const;
+        QVariantMap getVertexAttributes(glm::uint32 vertexIndex) const;
+        bool setVertexAttributes(glm::uint32 vertexIndex, const QVariantMap& attributeValues);
+
+        QVariant getVertexProperty(glm::uint32 vertexIndex, const QString& attributeName) const;
+        bool setVertexProperty(glm::uint32 vertexIndex, const QString& attributeName, const QVariant& value);
+
+        scriptable::ScriptableMeshPointer cloneMesh();
+
         // QScriptEngine-specific wrappers
-        uint32 mapAttributeValues(QScriptValue callback);
+        glm::uint32 updateVertexAttributes(QScriptValue callback);
+        glm::uint32 forEachVertex(QScriptValue callback);
+        bool isValidIndex(glm::uint32 vertexIndex, const QString& attributeName = QString()) const;
     };
 
-    // TODO: part-specific wrapper for working with raw geometries
-    class ScriptableMeshPart : public QObject, QScriptable {
-        Q_OBJECT
-    public:
-        Q_PROPERTY(uint32 partIndex MEMBER partIndex CONSTANT)
-        Q_PROPERTY(int numElementsPerFace MEMBER _elementsPerFace CONSTANT)
-        Q_PROPERTY(QString topology MEMBER _topology CONSTANT)
-
-        Q_PROPERTY(uint32 numFaces READ getNumFaces)
-        Q_PROPERTY(uint32 numAttributes READ getNumAttributes)
-        Q_PROPERTY(uint32 numVertices READ getNumVertices)
-        Q_PROPERTY(uint32 numIndices READ getNumIndices)
-        Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
-
-        ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
-        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
-        ScriptableMeshPart(const ScriptableMeshPart& other) : QObject(other.parent()), QScriptable(), parentMesh(other.parentMesh), partIndex(other.partIndex) {}
-
-    public slots:
-        scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
-        uint32 getNumAttributes() const { return parentMesh ? parentMesh->getNumAttributes() : 0; }
-        uint32 getNumVertices() const { return parentMesh ? parentMesh->getNumVertices() : 0; }
-        uint32 getNumIndices() const { return parentMesh ? parentMesh->getNumIndices() : 0; }
-        uint32 getNumFaces() const { return parentMesh ? parentMesh->getNumIndices() / _elementsPerFace : 0; }
-        QVector<QString> getAttributeNames() const { return parentMesh ? parentMesh->getAttributeNames() : QVector<QString>(); }
-        QVector<uint32> getFace(uint32 faceIndex) const {
-            if (parentMesh && faceIndex + 2 < parentMesh->getNumIndices()) {
-                return parentMesh->getIndices().mid(faceIndex*3, 3);
-            }
-            return QVector<uint32>();
-        }
-        QVariantMap scaleToFit(float unitScale);
-        QVariantMap translate(const glm::vec3& translation);
-        QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
-        QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
-        QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
-        QVariantMap transform(const glm::mat4& transform);
-
-        bool dedupeVertices(float epsilon = 1e-6);
-        bool recalculateNormals() { return buffer_helpers::recalculateNormals(getMeshPointer()); }
-
-        bool replaceMeshData(scriptable::ScriptableMeshPartPointer source, const QVector<QString>& attributeNames = QVector<QString>());
-        scriptable::ScriptableMeshPartPointer cloneMeshPart(bool recalcNormals = false) {
-            if (parentMesh) {
-                if (auto clone = parentMesh->cloneMesh(recalcNormals)) {
-                    return clone->getMeshParts().value(partIndex);
-                }
-            }
-            return nullptr;
-        }
-        QString toOBJ();
-
-    public slots:
-        // QScriptEngine-specific wrappers
-        uint32 mapAttributeValues(QScriptValue callback);
-
-    public:
-        scriptable::ScriptableMeshPointer parentMesh;
-        uint32 partIndex;
-    protected:
-        int _elementsPerFace{ 3 };
-        QString _topology{ "triangles" };
-        scriptable::MeshPointer getMeshPointer() const { return parentMesh ? parentMesh->getMeshPointer() : nullptr; }
-    };
-
-    // callback helper that lets C++ method signatures remain simple (ie: taking a single callback argument) while
-    // still supporting extended Qt signal-like (scope, "methodName") and (scope, function(){}) "this" binding conventions
-    QScriptValue jsBindCallback(QScriptValue callback);
-
-    // derive a corresponding C++ class instance from the current script engine's thisObject
-    template <typename T> T this_qobject_cast(QScriptEngine* engine);
 }
 
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
-Q_DECLARE_METATYPE(scriptable::ScriptableMeshPartPointer)
-Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPartPointer>)
-Q_DECLARE_METATYPE(scriptable::uint32)
-Q_DECLARE_METATYPE(QVector<scriptable::uint32>)
+Q_DECLARE_METATYPE(glm::uint32)
+Q_DECLARE_METATYPE(QVector<glm::uint32>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
new file mode 100644
index 0000000000..0d4bb7bdc5
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
@@ -0,0 +1,438 @@
+//
+//  Copyright 2018 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 "Forward.h"
+
+#include "ScriptableMeshPart.h"
+
+#include "BufferViewScripting.h"
+#include "GraphicsScriptingUtil.h"
+#include "OBJWriter.h"
+#include <BaseScriptEngine.h>
+#include <QtScript/QScriptValue>
+#include <RegisteredMetaTypes.h>
+#include <glm/glm.hpp>
+#include <glm/gtx/norm.hpp>
+#include <glm/gtx/transform.hpp>
+#include <graphics/BufferViewHelpers.h>
+#include <graphics/GpuHelpers.h>
+#include <graphics/Geometry.h>
+
+QString scriptable::ScriptableMeshPart::toOBJ() {
+    if (!getMeshPointer()) {
+        if (context()) {
+            context()->throwError(QString("null mesh"));
+        } else {
+            qCWarning(graphics_scripting) << "null mesh";
+        }
+        return QString();
+    }
+    return writeOBJToString({ getMeshPointer() });
+}
+
+
+bool scriptable::ScriptableMeshPart::isValidIndex(glm::uint32 vertexIndex, const QString& attributeName) const {
+    return isValid() && parentMesh->isValidIndex(vertexIndex, attributeName);
+}
+
+bool scriptable::ScriptableMeshPart::setVertexAttributes(glm::uint32 vertexIndex, const QVariantMap& attributes) {
+    if (!isValidIndex(vertexIndex)) {
+        return false;
+    }
+    return buffer_helpers::mesh::setVertexAttributes(getMeshPointer(), vertexIndex, attributes);
+}
+
+QVariantMap scriptable::ScriptableMeshPart::getVertexAttributes(glm::uint32 vertexIndex) const {
+    if (!isValidIndex(vertexIndex)) {
+        return QVariantMap();
+    }
+    return parentMesh->getVertexAttributes(vertexIndex);
+}
+
+bool scriptable::ScriptableMeshPart::setVertexProperty(glm::uint32 vertexIndex, const QString& attributeName, const QVariant& value) {
+    if (!isValidIndex(vertexIndex, attributeName)) {
+        return false;
+    }
+    auto slotNum = parentMesh->_getSlotNumber(attributeName);
+    const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
+    return buffer_helpers::setValue(bufferView, vertexIndex, value);
+}
+
+QVariant scriptable::ScriptableMeshPart::getVertexProperty(glm::uint32 vertexIndex, const QString& attributeName) const {
+    if (!isValidIndex(vertexIndex, attributeName)) {
+        return false;
+    }
+    return parentMesh->getVertexProperty(vertexIndex, attributeName);
+}
+
+QVariantList scriptable::ScriptableMeshPart::queryVertexAttributes(QVariant selector) const {
+    QVariantList result;
+    if (!isValid()) {
+        return result;
+    }
+    return parentMesh->queryVertexAttributes(selector);
+}
+
+glm::uint32 scriptable::ScriptableMeshPart::forEachVertex(QScriptValue _callback) {
+    // TODO: limit to vertices within the part's indexed range?
+    return isValid() ? parentMesh->forEachVertex(_callback) : 0;
+}
+
+glm::uint32 scriptable::ScriptableMeshPart::updateVertexAttributes(QScriptValue _callback) {
+    // TODO: limit to vertices within the part's indexed range?
+    return isValid() ? parentMesh->updateVertexAttributes(_callback) : 0;
+}
+
+bool scriptable::ScriptableMeshPart::replaceMeshPartData(scriptable::ScriptableMeshPartPointer src, const QVector<QString>& attributeNames) {
+    auto target = getMeshPointer();
+    auto source = src ? src->getMeshPointer() : nullptr;
+    if (!target || !source) {
+        if (context()) {
+            context()->throwError("ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers");
+        } else {
+            qCWarning(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- expected dest and src to be valid mesh proxy pointers";
+        }
+        return false;
+    }
+
+    QVector<QString> attributes = attributeNames.isEmpty() ? src->parentMesh->getAttributeNames() : attributeNames;
+
+    qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData -- " <<
+        "source:" << QString::fromStdString(source->displayName) <<
+        "target:" << QString::fromStdString(target->displayName) <<
+        "attributes:" << attributes;
+
+    // remove attributes only found on target mesh, unless user has explicitly specified the relevant attribute names
+    if (attributeNames.isEmpty()) {
+        auto attributeViews = buffer_helpers::mesh::getAllBufferViews(target);
+        for (const auto& a : attributeViews) {
+            auto slot = buffer_helpers::ATTRIBUTES[a.first];
+            if (!attributes.contains(a.first)) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+                qCInfo(graphics_scripting) << "ScriptableMesh::replaceMeshData -- pruning target attribute" << a.first << slot;
+#endif
+                target->removeAttribute(slot);
+            }
+        }
+    }
+
+    target->setVertexBuffer(buffer_helpers::clone(source->getVertexBuffer()));
+    target->setIndexBuffer(buffer_helpers::clone(source->getIndexBuffer()));
+    target->setPartBuffer(buffer_helpers::clone(source->getPartBuffer()));
+
+    for (const auto& a : attributes) {
+        auto slot = buffer_helpers::ATTRIBUTES[a];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+#ifdef SCRIPTABLE_MESH_DEBUG
+        auto& before = target->getAttributeBuffer(slot);
+#endif
+        auto& input = source->getAttributeBuffer(slot);
+        if (input.getNumElements() == 0) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+            qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData buffer is empty -- pruning" << a << slot;
+#endif
+            target->removeAttribute(slot);
+        } else {
+#ifdef SCRIPTABLE_MESH_DEBUG
+            if (before.getNumElements() == 0) {
+                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer is empty -- adding" << a << slot;
+            } else {
+                qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData target buffer exists -- updating" << a << slot;
+            }
+#endif
+            target->addAttribute(slot, buffer_helpers::clone(input));
+        }
+#ifdef SCRIPTABLE_MESH_DEBUG
+        auto& after = target->getAttributeBuffer(slot);
+        qCInfo(graphics_scripting) << "ScriptableMeshPart::replaceMeshData" << a << slot << before.getNumElements() << " -> " << after.getNumElements();
+#endif
+    }
+
+
+    return true;
+}
+
+bool scriptable::ScriptableMeshPart::dedupeVertices(float epsilon) {
+    auto mesh = getMeshPointer();
+    if (!mesh) {
+        return false;
+    }
+    auto positions = mesh->getVertexBuffer();
+    auto numPositions = positions.getNumElements();
+    const auto epsilon2 = epsilon*epsilon;
+
+    QVector<glm::vec3> uniqueVerts;
+    uniqueVerts.reserve((int)numPositions);
+    QMap<glm::uint32,glm::uint32> remapIndices;
+
+    for (glm::uint32 i = 0; i < numPositions; i++) {
+        const glm::uint32 numUnique = uniqueVerts.size();
+        const auto& position = positions.get<glm::vec3>(i);
+        bool unique = true;
+        for (glm::uint32 j = 0; j < numUnique; j++) {
+            if (glm::length2(uniqueVerts[j] - position) <= epsilon2) {
+                remapIndices[i] = j;
+                unique = false;
+                break;
+            }
+        }
+        if (unique) {
+            uniqueVerts << position;
+            remapIndices[i] = numUnique;
+        }
+    }
+
+    qCInfo(graphics_scripting) << "//VERTS before" << numPositions << "after" << uniqueVerts.size();
+
+    auto indices = mesh->getIndexBuffer();
+    auto numIndices = indices.getNumElements();
+    auto esize = indices._element.getSize();
+    QVector<glm::uint32> newIndices;
+    newIndices.reserve((int)numIndices);
+    for (glm::uint32 i = 0; i < numIndices; i++) {
+        glm::uint32 index = esize == 4 ? indices.get<glm::uint32>(i) : indices.get<quint16>(i);
+        if (remapIndices.contains(index)) {
+            newIndices << remapIndices[index];
+        } else {
+            qCInfo(graphics_scripting) << i << index << "!remapIndices[index]";
+        }
+    }
+
+    mesh->setIndexBuffer(buffer_helpers::newFromVector(newIndices, { gpu::SCALAR, gpu::UINT32, gpu::INDEX }));
+    mesh->setVertexBuffer(buffer_helpers::newFromVector(uniqueVerts, gpu::Element::VEC3F_XYZ));
+
+    auto attributeViews = buffer_helpers::mesh::getAllBufferViews(mesh);
+    glm::uint32 numUniqueVerts = uniqueVerts.size();
+    for (const auto& a : attributeViews) {
+        auto& view = a.second;
+        auto slot = buffer_helpers::ATTRIBUTES[a.first];
+        if (slot == gpu::Stream::POSITION) {
+            continue;
+        }
+        auto newView = buffer_helpers::resized(view, numUniqueVerts);
+#ifdef SCRIPTABLE_MESH_DEBUG
+        qCInfo(graphics_scripting) << "ScriptableMeshPart::dedupeVertices" << a.first << slot << view.getNumElements();
+        qCInfo(graphics_scripting) << a.first << "before: #" << view.getNumElements() << "after: #" << newView.getNumElements();
+#endif
+        glm::uint32 numElements = (glm::uint32)view.getNumElements();
+        for (glm::uint32 i = 0; i < numElements; i++) {
+            glm::uint32 fromVertexIndex = i;
+            glm::uint32 toVertexIndex = remapIndices.contains(fromVertexIndex) ? remapIndices[fromVertexIndex] : fromVertexIndex;
+            buffer_helpers::setValue<QVariant>(newView, toVertexIndex, buffer_helpers::getValue<QVariant>(view, fromVertexIndex, "dedupe"));
+        }
+        mesh->addAttribute(slot, newView);
+    }
+    return true;
+}
+
+bool scriptable::ScriptableMeshPart::removeAttribute(const QString& attributeName) {
+    return isValid() && parentMesh->removeAttribute(attributeName);
+}
+
+glm::uint32 scriptable::ScriptableMeshPart::addAttribute(const QString& attributeName, const QVariant& defaultValue) {
+    return isValid() ? parentMesh->addAttribute(attributeName, defaultValue): 0;
+}
+
+glm::uint32 scriptable::ScriptableMeshPart::fillAttribute(const QString& attributeName, const QVariant& value) {
+    return isValid() ? parentMesh->fillAttribute(attributeName, value) : 0;
+}
+
+QVector<glm::uint32> scriptable::ScriptableMeshPart::findNearbyPartVertexIndices(const glm::vec3& origin, float epsilon) const {
+    QSet<glm::uint32> result;
+    if (!isValid()) {
+        return result.toList().toVector();
+    }
+    auto mesh = getMeshPointer();
+    auto offset = getFirstVertexIndex();
+    auto numIndices = getNumIndices();
+    auto vertexBuffer = mesh->getVertexBuffer();
+    auto indexBuffer = mesh->getIndexBuffer();
+    const auto epsilon2 = epsilon*epsilon;
+
+    for (glm::uint32 i = 0; i < numIndices; i++) {
+        auto vertexIndex = buffer_helpers::getValue<glm::uint32>(indexBuffer, offset + i);
+        if (result.contains(vertexIndex)) {
+            continue;
+        }
+        const auto& position = buffer_helpers::getValue<glm::vec3>(vertexBuffer, vertexIndex);
+        if (glm::length2(position - origin) <= epsilon2) {
+            result << vertexIndex;
+        }
+    }
+    return result.toList().toVector();
+}
+
+scriptable::ScriptableMeshPartPointer scriptable::ScriptableMeshPart::cloneMeshPart() {
+    if (parentMesh) {
+        if (auto clone = parentMesh->cloneMesh()) {
+            return clone->getMeshParts().value(partIndex);
+        }
+    }
+    return nullptr;
+}
+
+QVariantMap scriptable::ScriptableMeshPart::scaleToFit(float unitScale) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        auto center = box.calcCenter();
+        float maxDimension = glm::distance(box.getMaximumPoint(), box.getMinimumPoint());
+        return scale(glm::vec3(unitScale / maxDimension), center);
+    }
+    return {};
+}
+QVariantMap scriptable::ScriptableMeshPart::translate(const glm::vec3& translation) {
+    return transform(glm::translate(translation));
+}
+QVariantMap scriptable::ScriptableMeshPart::scale(const glm::vec3& scale, const glm::vec3& origin) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
+        return transform(glm::translate(center) * glm::scale(scale));
+    }
+    return {};
+}
+QVariantMap scriptable::ScriptableMeshPart::rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin) {
+    return rotate(glm::quat(glm::radians(eulerAngles)), origin);
+}
+QVariantMap scriptable::ScriptableMeshPart::rotate(const glm::quat& rotation, const glm::vec3& origin) {
+    if (auto mesh = getMeshPointer()) {
+        auto box = mesh->evalPartsBound(0, (int)mesh->getNumParts());
+        glm::vec3 center = glm::isnan(origin.x) ? box.calcCenter() : origin;
+        return transform(glm::translate(center) * glm::toMat4(rotation));
+    }
+    return {};
+}
+QVariantMap scriptable::ScriptableMeshPart::transform(const glm::mat4& transform) {
+    if (auto mesh = getMeshPointer()) {
+        const auto& pos = buffer_helpers::mesh::getBufferView(mesh, gpu::Stream::POSITION);
+        const glm::uint32 num = (glm::uint32)pos.getNumElements();
+        for (glm::uint32 i = 0; i < num; i++) {
+            auto& position = pos.edit<glm::vec3>(i);
+            position = transform * glm::vec4(position, 1.0f);
+        }
+        return parentMesh->getMeshExtents();
+    }
+    return {};
+}
+
+
+scriptable::ScriptableMeshPart::ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex)
+    : QObject(), parentMesh(parentMesh), partIndex(partIndex)  {
+    setObjectName(QString("%1.part[%2]").arg(parentMesh ? parentMesh->objectName() : "").arg(partIndex));
+}
+
+QVector<glm::uint32> scriptable::ScriptableMeshPart::getIndices() const {
+    if (auto mesh = getMeshPointer()) {
+#ifdef SCRIPTABLE_MESH_DEBUG
+        qCDebug(graphics_scripting, "getIndices mesh %p", mesh.get());
+#endif
+        return buffer_helpers::bufferToVector<glm::uint32>(mesh->getIndexBuffer());
+    }
+    return QVector<glm::uint32>();
+}
+
+bool scriptable::ScriptableMeshPart::setFirstVertexIndex( glm::uint32 vertexIndex) {
+    if (!isValidIndex(vertexIndex)) {
+        return false;
+    }
+    auto& part = getMeshPointer()->getPartBuffer().edit<graphics::Mesh::Part>(partIndex);
+    part._startIndex = vertexIndex;
+    return true;
+}
+
+bool scriptable::ScriptableMeshPart::setBaseVertexIndex( glm::uint32 vertexIndex) {
+    if (!isValidIndex(vertexIndex)) {
+        return false;
+    }
+    auto& part = getMeshPointer()->getPartBuffer().edit<graphics::Mesh::Part>(partIndex);
+    part._baseVertex = vertexIndex;
+    return true;
+}
+
+bool scriptable::ScriptableMeshPart::setLastVertexIndex( glm::uint32 vertexIndex) {
+    if (!isValidIndex(vertexIndex) || vertexIndex <= getFirstVertexIndex()) {
+        return false;
+    }
+    auto& part = getMeshPointer()->getPartBuffer().edit<graphics::Mesh::Part>(partIndex);
+    part._numIndices = vertexIndex - part._startIndex;
+    return true;
+}
+
+bool scriptable::ScriptableMeshPart::setIndices(const QVector<glm::uint32>& indices) {
+    if (!isValid()) {
+        return false;
+    }
+    glm::uint32 len = indices.size();
+    if (len != getNumVertices()) {
+        context()->throwError(QString("setIndices: currently new indicies must be assign 1:1 across old indicies (indicies.size()=%1, numIndices=%2)")
+                              .arg(len).arg(getNumIndices()));
+    }
+    auto mesh = getMeshPointer();
+    auto indexBuffer = mesh->getIndexBuffer();
+
+    // first loop to validate all indices are valid
+    for (glm::uint32 i = 0; i < len; i++) {
+        if (!isValidIndex(indices.at(i))) {
+            return false;
+        }
+    }
+    const auto first = getFirstVertexIndex();
+    // now actually apply them
+    for (glm::uint32 i = 0; i < len; i++) {
+        buffer_helpers::setValue(indexBuffer, first + i, indices.at(i));
+    }
+    return true;
+}
+
+const graphics::Mesh::Part& scriptable::ScriptableMeshPart::getMeshPart() const {
+    static const graphics::Mesh::Part invalidPart;
+    if (!isValid()) {
+        return invalidPart;
+    }
+    return getMeshPointer()->getPartBuffer().get<graphics::Mesh::Part>(partIndex);
+}
+
+bool scriptable::ScriptableMeshPart::setTopology(graphics::Mesh::Topology topology) {
+    if (!isValid()) {
+        return false;
+    }
+    auto& part = getMeshPointer()->getPartBuffer().edit<graphics::Mesh::Part>(partIndex);
+    if (topology == graphics::Mesh::Topology::POINTS ||
+        topology == graphics::Mesh::Topology::LINES ||
+        topology == graphics::Mesh::Topology::TRIANGLES) {
+        part._topology = topology;
+        return true;
+    }
+    return false;
+}
+
+glm::uint32 scriptable::ScriptableMeshPart::getTopologyLength() const {
+    switch(getTopology()) {
+    case graphics::Mesh::Topology::POINTS: return 1;
+    case graphics::Mesh::Topology::LINES: return 2;
+    case graphics::Mesh::Topology::TRIANGLES: return 3;
+    default: qCDebug(graphics_scripting) << "getTopologyLength -- unrecognized topology" << getTopology();
+    }
+    return 0;
+}
+
+QVector<glm::uint32> scriptable::ScriptableMeshPart::getFace(glm::uint32 faceIndex) const {
+    if (faceIndex < getNumFaces()) {
+        return getIndices().mid(faceIndex * getTopologyLength(), getTopologyLength());
+    }
+    return QVector<glm::uint32>();
+}
+
+QVariantMap scriptable::ScriptableMeshPart::getPartExtents() const {
+    graphics::Box box;
+    if (auto mesh = getMeshPointer()) {
+        box = mesh->evalPartBound(partIndex);
+    }
+    return scriptable::toVariant(box).toMap();
+}
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
new file mode 100644
index 0000000000..4ef0465ca3
--- /dev/null
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
@@ -0,0 +1,106 @@
+//
+//  Copyright 2018 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
+//
+
+#pragma once
+
+#include "ScriptableMesh.h"
+
+namespace scriptable {
+    class ScriptableMeshPart : public QObject, QScriptable {
+        Q_OBJECT
+        Q_PROPERTY(bool valid READ isValid)
+        Q_PROPERTY(glm::uint32 partIndex MEMBER partIndex CONSTANT)
+        Q_PROPERTY(glm::uint32 firstVertexIndex READ getFirstVertexIndex WRITE setFirstVertexIndex)
+        Q_PROPERTY(glm::uint32 baseVertexIndex READ getBaseVertexIndex WRITE setBaseVertexIndex)
+        Q_PROPERTY(glm::uint32 lastVertexIndex READ getLastVertexIndex WRITE setLastVertexIndex)
+        Q_PROPERTY(int numVerticesPerFace READ getTopologyLength)
+        Q_PROPERTY(graphics::Mesh::Topology topology READ getTopology WRITE setTopology)
+
+        Q_PROPERTY(glm::uint32 numFaces READ getNumFaces)
+        Q_PROPERTY(glm::uint32 numAttributes READ getNumAttributes)
+        Q_PROPERTY(glm::uint32 numVertices READ getNumVertices)
+        Q_PROPERTY(glm::uint32 numIndices READ getNumIndices WRITE setNumIndices)
+
+        Q_PROPERTY(QVariantMap extents READ getPartExtents)
+        Q_PROPERTY(QVector<QString> attributeNames READ getAttributeNames)
+        Q_PROPERTY(QVariantMap bufferFormats READ getBufferFormats)
+
+    public:
+        ScriptableMeshPart(scriptable::ScriptableMeshPointer parentMesh, int partIndex);
+        ScriptableMeshPart& operator=(const ScriptableMeshPart& view) { parentMesh=view.parentMesh; return *this; };
+        ScriptableMeshPart(const ScriptableMeshPart& other) : QObject(other.parent()), QScriptable(), parentMesh(other.parentMesh), partIndex(other.partIndex) {}
+        bool isValid() const { auto mesh = getMeshPointer(); return mesh && partIndex < mesh->getNumParts(); }
+
+    public slots:
+        QVector<glm::uint32> getIndices() const;
+        bool setIndices(const QVector<glm::uint32>& indices);
+        QVector<glm::uint32> findNearbyPartVertexIndices(const glm::vec3& origin, float epsilon = 1e-6) const;
+        QVariantList queryVertexAttributes(QVariant selector) const;
+        QVariantMap getVertexAttributes(glm::uint32 vertexIndex) const;
+        bool setVertexAttributes(glm::uint32 vertexIndex, const QVariantMap& attributeValues);
+
+        QVariant getVertexProperty(glm::uint32 vertexIndex, const QString& attributeName) const;
+        bool setVertexProperty(glm::uint32 vertexIndex, const QString& attributeName, const QVariant& attributeValues);
+
+        QVector<glm::uint32> getFace(glm::uint32 faceIndex) const;
+
+        QVariantMap scaleToFit(float unitScale);
+        QVariantMap translate(const glm::vec3& translation);
+        QVariantMap scale(const glm::vec3& scale, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap rotateDegrees(const glm::vec3& eulerAngles, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap rotate(const glm::quat& rotation, const glm::vec3& origin = glm::vec3(NAN));
+        QVariantMap transform(const glm::mat4& transform);
+
+        glm::uint32 addAttribute(const QString& attributeName, const QVariant& defaultValue = QVariant());
+        glm::uint32 fillAttribute(const QString& attributeName, const QVariant& value);
+        bool removeAttribute(const QString& attributeName);
+        bool dedupeVertices(float epsilon = 1e-6);
+
+        scriptable::ScriptableMeshPointer getParentMesh() const { return parentMesh; }
+
+        bool replaceMeshPartData(scriptable::ScriptableMeshPartPointer source, const QVector<QString>& attributeNames = QVector<QString>());
+        scriptable::ScriptableMeshPartPointer cloneMeshPart();
+
+        QString toOBJ();
+
+        // QScriptEngine-specific wrappers
+        glm::uint32 updateVertexAttributes(QScriptValue callback);
+        glm::uint32 forEachVertex(QScriptValue callback);
+
+        bool isValidIndex(glm::uint32 vertexIndex, const QString& attributeName = QString()) const;
+    public:
+        scriptable::ScriptableMeshPointer parentMesh;
+        glm::uint32 partIndex;
+
+    protected:
+        const graphics::Mesh::Part& getMeshPart() const;
+        scriptable::MeshPointer getMeshPointer() const { return parentMesh ? parentMesh->getMeshPointer() : nullptr; }
+        QVariantMap getBufferFormats() { return isValid()  ? parentMesh->getBufferFormats() : QVariantMap(); }
+        glm::uint32 getNumAttributes() const { return isValid() ? parentMesh->getNumAttributes() : 0; }
+
+        bool setTopology(graphics::Mesh::Topology topology);
+        graphics::Mesh::Topology getTopology() const { return isValid() ? getMeshPart()._topology : graphics::Mesh::Topology(); }
+        glm::uint32 getTopologyLength() const;
+        glm::uint32 getNumIndices() const { return isValid() ? getMeshPart()._numIndices : 0; }
+        bool setNumIndices(glm::uint32 numIndices) { return setLastVertexIndex(getFirstVertexIndex() + numIndices); }
+        glm::uint32 getNumVertices() const { return isValid() ? parentMesh->getNumVertices() : 0; }
+
+        bool setFirstVertexIndex(glm::uint32 vertexIndex);
+        glm::uint32 getFirstVertexIndex() const { return isValid() ? getMeshPart()._startIndex : 0; }
+        bool setLastVertexIndex(glm::uint32 vertexIndex);
+        glm::uint32 getLastVertexIndex() const { return isValid() ? getFirstVertexIndex() + getNumIndices() - 1 : 0; }
+        bool setBaseVertexIndex(glm::uint32 vertexIndex);
+        glm::uint32 getBaseVertexIndex() const { return isValid() ? getMeshPart()._baseVertex : 0; }
+
+        glm::uint32 getNumFaces() const { return getNumIndices() / getTopologyLength(); }
+        QVector<QString> getAttributeNames() const { return isValid() ? parentMesh->getAttributeNames() : QVector<QString>(); }
+        QVariantMap getPartExtents() const;
+    };
+}
+
+Q_DECLARE_METATYPE(scriptable::ScriptableMeshPartPointer)
+Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPartPointer>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 8ceb7de6a2..36322d170d 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -58,7 +58,7 @@ scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const
     scriptable::ScriptableModelPointer clone = scriptable::ScriptableModelPointer(new scriptable::ScriptableModel(*this));
     clone->meshes.clear();
     for (const auto &mesh : getConstMeshes()) {
-        auto cloned = mesh->cloneMesh(options.value("recalculateNormals").toBool());
+        auto cloned = mesh->cloneMesh();
         if (auto tmp = qobject_cast<scriptable::ScriptableMeshBase*>(cloned)) {
             clone->meshes << *tmp;
             tmp->deleteLater(); // schedule our copy for cleanup
@@ -70,8 +70,8 @@ scriptable::ScriptableModelPointer scriptable::ScriptableModel::cloneModel(const
 }
 
 
-const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getConstMeshes() const {
-    QVector<scriptable::ScriptableMeshPointer> out;
+const scriptable::ScriptableMeshes scriptable::ScriptableModel::getConstMeshes() const {
+    scriptable::ScriptableMeshes out;
     for (const auto& mesh : meshes) {
         const scriptable::ScriptableMesh* m = qobject_cast<const scriptable::ScriptableMesh*>(&mesh);
         if (!m) {
@@ -85,8 +85,8 @@ const QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::ge
     return out;
 }
 
-QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshes() {
-    QVector<scriptable::ScriptableMeshPointer> out;
+scriptable::ScriptableMeshes scriptable::ScriptableModel::getMeshes() {
+    scriptable::ScriptableMeshes out;
     for (auto& mesh : meshes) {
         scriptable::ScriptableMesh* m = qobject_cast<scriptable::ScriptableMesh*>(&mesh);
         if (!m) {
@@ -100,9 +100,10 @@ QVector<scriptable::ScriptableMeshPointer> scriptable::ScriptableModel::getMeshe
     return out;
 }
 
-quint32 scriptable::ScriptableModel::mapAttributeValues(QScriptValue callback) {
-    quint32 result = 0;
-    QVector<scriptable::ScriptableMeshPointer> in = getMeshes();
+#if 0
+glm::uint32 scriptable::ScriptableModel::forEachVertexAttribute(QScriptValue callback) {
+    glm::uint32 result = 0;
+    scriptable::ScriptableMeshes in = getMeshes();
     if (in.size()) {
         foreach (scriptable::ScriptableMeshPointer meshProxy, in) {
             result += meshProxy->mapAttributeValues(callback);
@@ -110,5 +111,6 @@ quint32 scriptable::ScriptableModel::mapAttributeValues(QScriptValue callback) {
     }
     return result;
 }
+#endif
 
 #include "ScriptableModel.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index 4ed1cc9554..d821f1224d 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -13,35 +13,34 @@
 class QScriptValue;
 
 namespace scriptable {
+
+    using ScriptableMeshes = QVector<scriptable::ScriptableMeshPointer>;
     class ScriptableModel : public ScriptableModelBase {
         Q_OBJECT
-    public:
         Q_PROPERTY(QUuid objectID MEMBER objectID CONSTANT)
-        Q_PROPERTY(uint32 numMeshes READ getNumMeshes)
-        Q_PROPERTY(QVector<scriptable::ScriptableMeshPointer> meshes READ getMeshes)
+        Q_PROPERTY(glm::uint32 numMeshes READ getNumMeshes)
+        Q_PROPERTY(ScriptableMeshes meshes READ getMeshes)
 
+    public:
         ScriptableModel(QObject* parent = nullptr) : ScriptableModelBase(parent) {}
         ScriptableModel(const ScriptableModel& other) : ScriptableModelBase(other) {}
         ScriptableModel(const ScriptableModelBase& other) : ScriptableModelBase(other) {}
         ScriptableModel& operator=(const ScriptableModelBase& view) {  ScriptableModelBase::operator=(view); return *this; }
-
-        Q_INVOKABLE scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
-        // TODO: in future accessors for these could go here
-        // QVariantMap shapes;
-        // QVariantMap materials;
-        // QVariantMap armature;
-
-        QVector<scriptable::ScriptableMeshPointer> getMeshes();
-        const QVector<scriptable::ScriptableMeshPointer> getConstMeshes() const;
         operator scriptable::ScriptableModelBasePointer() {
             return QPointer<scriptable::ScriptableModelBase>(qobject_cast<scriptable::ScriptableModelBase*>(this));
         }
+        ScriptableMeshes getMeshes();
+        const ScriptableMeshes getConstMeshes() const;
 
+    public slots:
+        scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
+        QString toString() const;
 
         // QScriptEngine-specific wrappers
-        Q_INVOKABLE uint32 mapAttributeValues(QScriptValue callback);
-        Q_INVOKABLE QString toString() const;
-        Q_INVOKABLE uint32 getNumMeshes() { return meshes.size(); }
+        //glm::uint32 forEachMeshVertexAttribute(QScriptValue callback);
+    protected:
+        glm::uint32 getNumMeshes() { return meshes.size(); }
+
     };
 
 }
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index 29dcbd58e3..46bd39bb45 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -15,11 +15,11 @@
 #include <gpu/Stream.h>
 
 #include "Geometry.h"
+#include "GpuHelpers.h"
 
-#include <Extents.h>
 #include <AABox.h>
+#include <Extents.h>
 
-#include <glm/gtx/string_cast.hpp>
 #include <glm/gtc/packing.hpp>
 #include <glm/detail/type_vec.hpp>
 
@@ -32,11 +32,10 @@ namespace {
     QLoggingCategory bufferhelper_logging{ "hifi.bufferview" };
 }
 
-
 const std::array<const char*, 4> buffer_helpers::XYZW = { { "x", "y", "z", "w" } };
 const std::array<const char*, 4> buffer_helpers::ZERO123 = { { "0", "1", "2", "3" } };
 
-gpu::BufferView buffer_helpers::getBufferView(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
+gpu::BufferView buffer_helpers::mesh::getBufferView(const graphics::MeshPointer& mesh, gpu::Stream::Slot slot) {
     return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
 }
 
@@ -56,21 +55,13 @@ QMap<QString,int> buffer_helpers::ATTRIBUTES{
 
 
 namespace {
-    bool boundsCheck(const gpu::BufferView& view, quint32 index) {
+    bool boundsCheck(const gpu::BufferView& view, glm::uint32 index) {
         const auto byteLength = view._element.getSize();
         return (
             index < view.getNumElements() &&
             index * byteLength < (view._size - 1) * byteLength
         );
     }
-
-    template <typename T> QVariant getBufferViewElement(const gpu::BufferView& view, quint32 index, bool asArray = false) {
-        return buffer_helpers::glmVecToVariant(view.get<T>(index), asArray);
-    }
-
-    template <typename T> void setBufferViewElement(const gpu::BufferView& view, quint32 index, const QVariant& v) {
-        view.edit<T>(index) = buffer_helpers::glmVecFromVariant<T>(v);
-    }
 }
 
 void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
@@ -99,127 +90,23 @@ void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, g
     packedTangent = tangentStruct.pack;
 }
 
-bool buffer_helpers::fromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v) {
-    const auto& element = view._element;
-    const auto vecN = element.getScalarCount();
-    const auto dataType = element.getType();
-    const auto byteLength = element.getSize();
-    const auto BYTES_PER_ELEMENT = byteLength / vecN;
-
-    if (BYTES_PER_ELEMENT == 1) {
-        switch(vecN) {
-        case 2: setBufferViewElement<glm::u8vec2>(view, index, v); return true;
-        case 3: setBufferViewElement<glm::u8vec3>(view, index, v); return true;
-        case 4: {
-            if (element == gpu::Element::COLOR_RGBA_32) {
-                glm::uint32 rawColor;// = glm::packUnorm4x8(glm::vec4(glmVecFromVariant<glm::vec3>(v), 0.0f));
-                glm::uint32 unused;
-                packNormalAndTangent(glmVecFromVariant<glm::vec3>(v), glm::vec3(), rawColor, unused);
-                view.edit<glm::uint32>(index) = rawColor;
-                return true;
-            } else if (element == gpu::Element::VEC4F_NORMALIZED_XYZ10W2) {
-                glm::uint32 packedNormal;// = glm::packSnorm3x10_1x2(glm::vec4(glmVecFromVariant<glm::vec3>(v), 0.0f));
-                glm::uint32 unused;
-                packNormalAndTangent(glm::vec3(), glmVecFromVariant<glm::vec3>(v), unused, packedNormal);
-                view.edit<glm::uint32>(index) = packedNormal;
-                return true;
-            }
-            setBufferViewElement<glm::u8vec4>(view, index, v); return true;
-        }
-        }
-    } else if (BYTES_PER_ELEMENT == 2) {
-        if (dataType == gpu::HALF) {
-            switch(vecN) {
-            case 2: view.edit<glm::int16>(index) = glm::packSnorm2x8(glmVecFromVariant<glm::vec2>(v)); return true;
-            case 4: view.edit<glm::int32>(index) = glm::packSnorm4x8(glmVecFromVariant<glm::vec4>(v)); return true;
-            default: return false;
-            }
-        }
-        switch(vecN) {
-        case 2: setBufferViewElement<glm::u16vec2>(view, index, v); return true;
-        case 3: setBufferViewElement<glm::u16vec3>(view, index, v); return true;
-        case 4: setBufferViewElement<glm::u16vec4>(view, index, v); return true;
-        }
-    } else if (BYTES_PER_ELEMENT == 4) {
-        if (dataType == gpu::FLOAT) {
-            switch(vecN) {
-            case 2: setBufferViewElement<glm::vec2>(view, index, v); return true;
-            case 3: setBufferViewElement<glm::vec3>(view, index, v); return true;
-            case 4: setBufferViewElement<glm::vec4>(view, index, v); return true;
-            }
-        } else {
-            switch(vecN) {
-            case 2: setBufferViewElement<glm::u32vec2>(view, index, v); return true;
-            case 3: setBufferViewElement<glm::u32vec3>(view, index, v); return true;
-            case 4: setBufferViewElement<glm::u32vec4>(view, index, v); return true;
+namespace {
+    template <typename T>
+    glm::uint32 forEachGlmVec(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func) {
+        QVector<glm::uint32> result;
+        const glm::uint32 num = (glm::uint32)view.getNumElements();
+        glm::uint32 i = 0;
+        for (; i < num; i++) {
+            if (!func(i, view.get<T>(i))) {
+                break;
             }
         }
+        return i;
     }
-    return false;
 }
 
-QVariant buffer_helpers::toVariant(const gpu::BufferView& view, quint32 index, bool asArray, const char* hint) {
-    const auto& element = view._element;
-    const auto vecN = element.getScalarCount();
-    const auto dataType = element.getType();
-    const auto byteLength = element.getSize();
-    const auto BYTES_PER_ELEMENT = byteLength / vecN;
-    Q_ASSERT(index < view.getNumElements());
-    if (!boundsCheck(view, index)) {
-        // sanity checks
-        auto byteOffset = index * vecN * BYTES_PER_ELEMENT;
-        auto maxByteOffset = (view._size - 1) * vecN * BYTES_PER_ELEMENT;
-        if (byteOffset > maxByteOffset) {
-            qDebug() << "toVariant -- byteOffset out of range " << byteOffset << " < " << maxByteOffset;
-            qDebug() << "toVariant -- index: " << index << "numElements" << view.getNumElements();
-            qDebug() << "toVariant -- vecN: " << vecN << "byteLength" << byteLength << "BYTES_PER_ELEMENT" << BYTES_PER_ELEMENT;
-        }
-        Q_ASSERT(byteOffset <= maxByteOffset);
-    }
-    if (BYTES_PER_ELEMENT == 1) {
-        switch(vecN) {
-        case 2: return getBufferViewElement<glm::u8vec2>(view, index, asArray);
-        case 3: return getBufferViewElement<glm::u8vec3>(view, index, asArray);
-        case 4: {
-            if (element == gpu::Element::COLOR_RGBA_32) {
-                auto rawColor = view.get<glm::uint32>(index);
-                return glmVecToVariant(glm::vec3(glm::unpackUnorm4x8(rawColor)));
-            } else if (element == gpu::Element::VEC4F_NORMALIZED_XYZ10W2) {
-                auto packedNormal = view.get<glm::uint32>(index);
-                return glmVecToVariant(glm::vec3(glm::unpackSnorm3x10_1x2(packedNormal)));
-            }
-
-            return getBufferViewElement<glm::u8vec4>(view, index, asArray);
-        }
-        }
-    } else if (BYTES_PER_ELEMENT == 2) {
-        if (dataType == gpu::HALF) {
-            switch(vecN) {
-            case 2: return glmVecToVariant(glm::vec2(glm::unpackSnorm2x8(view.get<glm::int16>(index))));
-            case 4: return glmVecToVariant(glm::vec4(glm::unpackSnorm4x8(view.get<glm::int32>(index))));
-            }
-        }
-        switch(vecN) {
-        case 2: return getBufferViewElement<glm::u16vec2>(view, index, asArray);
-        case 3: return getBufferViewElement<glm::u16vec3>(view, index, asArray);
-        case 4: return getBufferViewElement<glm::u16vec4>(view, index, asArray);
-        }
-    } else if (BYTES_PER_ELEMENT == 4) {
-        if (dataType == gpu::FLOAT) {
-            switch(vecN) {
-            case 2: return getBufferViewElement<glm::vec2>(view, index, asArray);
-            case 3: return getBufferViewElement<glm::vec3>(view, index, asArray);
-            case 4: return getBufferViewElement<glm::vec4>(view, index, asArray);
-            }
-        } else {
-            switch(vecN) {
-            case 2: return getBufferViewElement<glm::u32vec2>(view, index, asArray);
-            case 3: return getBufferViewElement<glm::u32vec3>(view, index, asArray);
-            case 4: return getBufferViewElement<glm::u32vec4>(view, index, asArray);
-            }
-        }
-    }
-    return QVariant();
+template<> glm::uint32 buffer_helpers::forEach<glm::vec3>(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const glm::vec3& value)> func) {
+    return forEachGlmVec<glm::vec3>(view, func);
 }
 
 template <typename T>
@@ -256,59 +143,63 @@ const T buffer_helpers::glmVecFromVariant(const QVariant& v) {
         } else {
             value = list.value(i).toFloat();
         }
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
+#ifdef DEBUG_BUFFERVIEW_HELPERS
         if (value != value) { // NAN
             qWarning().nospace()<< "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
         }
-#endif        
+#endif
         result[i] = value;
     }
     return result;
 }
 
+// QVector<T> => BufferView
 template <typename T>
-gpu::BufferView buffer_helpers::fromVector(const QVector<T>& elements, const gpu::Element& elementType) {
+gpu::BufferView buffer_helpers::newFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
     auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
     return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
 
 namespace {
     template <typename T>
-    gpu::BufferView _fromVector(const QVector<T>& elements, const gpu::Element& elementType) {
+    gpu::BufferView bufferViewFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
         auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
         return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
     }
 }
-
-template<> gpu::BufferView buffer_helpers::fromVector<unsigned int>(
-    const QVector<unsigned int>& elements, const gpu::Element& elementType
-) { return _fromVector(elements, elementType); }
-
-template<> gpu::BufferView buffer_helpers::fromVector<glm::vec3>(
-    const QVector<glm::vec3>& elements, const gpu::Element& elementType
-) { return _fromVector(elements, elementType); }
-
-template <typename T> struct GpuVec4ToGlm;
-template <typename T> struct GpuScalarToGlm;
+template<> gpu::BufferView buffer_helpers::newFromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec2>(const QVector<glm::vec2>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec3>( const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec4>(const QVector<glm::vec4>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView buffer_helpers::newFromVector<graphics::Mesh::Part>(const QVector<graphics::Mesh::Part>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
 
 struct GpuToGlmAdapter {
-    static float error(const QString& name, const gpu::BufferView& view, quint32 index, const char *hint) {
-        qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2) size=%3(per=%4) vec%5 hint=%6 #%7")
+    static float error(const QString& name, const gpu::BufferView& view, glm::uint32 index, const char *hint) {
+        qDebug() << QString("GpuToGlmAdapter:: unhandled type=%1(element=%2) size=%3(location=%4,per=%5) vec%6 hint=%7 #%8 %9 %10")
             .arg(name)
-            .arg(view._element.getType())
+            .arg(gpu::toString(view._element.getType()))
             .arg(view._element.getSize())
+            .arg(view._element.getLocationSize())
             .arg(view._element.getSize() / view._element.getScalarCount())
             .arg(view._element.getScalarCount())
             .arg(hint)
-            .arg(view.getNumElements());
+            .arg(view.getNumElements())
+            .arg(gpu::toString(view._element.getSemantic()))
+            .arg(gpu::toString(view._element.getDimension()));
         Q_ASSERT(false);
         assert(false);
         return NAN;
     }
 };
 
+#define CHECK_SIZE(T) if (view._element.getSize() != sizeof(T)) { qDebug() << "invalid elementSize" << hint << view._element.getSize() << "expected:" << sizeof(T); break; }
+
 template <typename T> struct GpuScalarToGlm : GpuToGlmAdapter {
-    static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
+    static T get(const gpu::BufferView& view, glm::uint32 index, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuScalarToGlm::get::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
         case gpu::UINT32: return view.get<glm::uint32>(index);
         case gpu::UINT16: return view.get<glm::uint16>(index);
         case gpu::UINT8: return view.get<glm::uint8>(index);
@@ -316,44 +207,101 @@ template <typename T> struct GpuScalarToGlm : GpuToGlmAdapter {
         case gpu::INT16: return view.get<glm::int16>(index);
         case gpu::INT8: return view.get<glm::int8>(index);
         case gpu::FLOAT: return view.get<glm::float32>(index);
-        case gpu::HALF: return T(glm::unpackSnorm1x8(view.get<glm::int8>(index)));
+        case gpu::HALF: return T(glm::unpackHalf1x16(view.get<glm::uint16>(index)));
+        case gpu::NUINT8: return T(glm::unpackUnorm1x8(view.get<glm::uint8>(index)));
         default: break;
-        } return T(error("GpuScalarToGlm", view, index, hint));
+        } return T(error("GpuScalarToGlm::get", view, index, hint));
+    }
+    static bool set(const gpu::BufferView& view, glm::uint32 index, const T& value, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuScalarToGlm::set::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+    case gpu::UINT32: view.edit<glm::uint32>(index) = value; return true;
+    case gpu::UINT16: view.edit<glm::uint16>(index) = value; return true;
+    case gpu::UINT8: view.edit<glm::uint8>(index) = value; return true;
+    case gpu::INT32: view.edit<glm::int32>(index) = value; return true;
+    case gpu::INT16: view.edit<glm::int16>(index) = value; return true;
+    case gpu::INT8: view.edit<glm::int8>(index) = value; return true;
+    case gpu::FLOAT: view.edit<glm::float32>(index) = value; return true;
+    case gpu::HALF:  view.edit<glm::uint16>(index) = glm::packHalf1x16(value); return true;
+    case gpu::NUINT8: view.edit<glm::uint8>(index) = glm::packUnorm1x8(value); return true;
+    default: break;
+    } error("GpuScalarToGlm::set", view, index, hint); return false;
     }
 };
 
-template <typename T> struct GpuVec2ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
-        case gpu::UINT32: return view.get<glm::u32vec2>(index);
-        case gpu::UINT16: return view.get<glm::u16vec2>(index);
-        case gpu::UINT8: return view.get<glm::u8vec2>(index);
-        case gpu::INT32: return view.get<glm::i32vec2>(index);
-        case gpu::INT16: return view.get<glm::i16vec2>(index);
-        case gpu::INT8: return view.get<glm::i8vec2>(index);
-        case gpu::FLOAT: return view.get<glm::fvec2>(index);
-        case gpu::HALF: return glm::unpackSnorm2x8(view.get<glm::int16>(index));
-        default: break;
-        } return T(error("GpuVec2ToGlm", view, index, hint)); }};
+template <typename T> struct GpuVec2ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, glm::uint32 index, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec2ToGlm::get::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+    case gpu::UINT32: return view.get<glm::u32vec2>(index);
+    case gpu::UINT16: return view.get<glm::u16vec2>(index);
+    case gpu::UINT8: return view.get<glm::u8vec2>(index);
+    case gpu::INT32: return view.get<glm::i32vec2>(index);
+    case gpu::INT16: return view.get<glm::i16vec2>(index);
+    case gpu::INT8: return view.get<glm::i8vec2>(index);
+    case gpu::FLOAT: return view.get<glm::fvec2>(index);
+    case gpu::HALF: CHECK_SIZE(glm::uint32); return glm::unpackHalf2x16(view.get<glm::uint32>(index));
+    case gpu::NUINT16: CHECK_SIZE(glm::uint32); return glm::unpackUnorm2x16(view.get<glm::uint32>(index));
+    case gpu::NUINT8: CHECK_SIZE(glm::uint16); return glm::unpackUnorm2x8(view.get<glm::uint16>(index));
+    default: break;
+    } return T(error("GpuVec2ToGlm::get", view, index, hint)); }
 
+    static bool set(const gpu::BufferView& view, glm::uint32 index, const T& value, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec2ToGlm::set::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+        // TODO: flush out GpuVec2ToGlm<T>::set(value)
+    case gpu::FLOAT: view.edit<glm::fvec2>(index) = value; return true;
+    case gpu::HALF:  view.edit<glm::uint32>(index) = glm::packHalf2x16(value); return true;
+    case gpu::NUINT16: view.edit<glm::uint32>(index) = glm::packUnorm2x16(value); return true;
+    case gpu::NUINT8: view.edit<glm::uint16>(index) = glm::packUnorm2x8(value); return true;
+    default: break;
+    } error("GpuVec2ToGlm::set", view, index, hint); return false;
+    }
+};
 
-template <typename T> struct GpuVec3ToGlm  : GpuToGlmAdapter  { static T get(const gpu::BufferView& view, quint32 index, const char *hint) { switch(view._element.getType()) {
-        case gpu::UINT32: return view.get<glm::u32vec3>(index);
-        case gpu::UINT16: return view.get<glm::u16vec3>(index);
-        case gpu::UINT8: return view.get<glm::u8vec3>(index);
-        case gpu::INT32: return view.get<glm::i32vec3>(index);
-        case gpu::INT16: return view.get<glm::i16vec3>(index);
-        case gpu::INT8: return view.get<glm::i8vec3>(index);
-        case gpu::FLOAT: return view.get<glm::fvec3>(index);
-        case gpu::HALF:
-        case gpu::NUINT8:
-        case gpu::NINT2_10_10_10:
-            if (view._element.getSize() == sizeof(glm::int32)) {
-                return GpuVec4ToGlm<T>::get(view, index, hint);
-            }
-        default: break;
-        } return T(error("GpuVec3ToGlm", view, index, hint)); }};
+template <typename T> struct GpuVec4ToGlm;
 
-template <typename T> struct GpuVec4ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, quint32 index, const char *hint) {
-    assert(view._element.getSize() == sizeof(glm::int32));
+template <typename T> struct GpuVec3ToGlm  : GpuToGlmAdapter  { static T get(const gpu::BufferView& view, glm::uint32 index, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec3ToGlm::get::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+    case gpu::UINT32: return view.get<glm::u32vec3>(index);
+    case gpu::UINT16: return view.get<glm::u16vec3>(index);
+    case gpu::UINT8: return view.get<glm::u8vec3>(index);
+    case gpu::INT32: return view.get<glm::i32vec3>(index);
+    case gpu::INT16: return view.get<glm::i16vec3>(index);
+    case gpu::INT8: return view.get<glm::i8vec3>(index);
+    case gpu::FLOAT: return view.get<glm::fvec3>(index);
+    case gpu::HALF: CHECK_SIZE(glm::uint64); return T(glm::unpackHalf4x16(view.get<glm::uint64>(index)));
+    case gpu::NUINT8: CHECK_SIZE(glm::uint32); return T(glm::unpackUnorm4x8(view.get<glm::uint32>(index)));
+    case gpu::NINT2_10_10_10: return T(glm::unpackSnorm3x10_1x2(view.get<glm::uint32>(index)));
+    default: break;
+    } return T(error("GpuVec3ToGlm::get", view, index, hint)); }
+    static bool set(const gpu::BufferView& view, glm::uint32 index, const T& value, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec3ToGlm::set::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+        // TODO: flush out GpuVec3ToGlm<T>::set(value)
+    case gpu::FLOAT: view.edit<glm::fvec3>(index) = value; return true;
+    case gpu::NUINT8: CHECK_SIZE(glm::uint32); view.edit<glm::uint32>(index) = glm::packUnorm4x8(glm::fvec4(value,0.0f)); return true;
+    case gpu::UINT8: view.edit<glm::u8vec3>(index) = value; return true;
+    case gpu::NINT2_10_10_10: view.edit<glm::uint32>(index) = glm::packSnorm3x10_1x2(glm::fvec4(value,0.0f)); return true;
+    default: break;
+    } error("GpuVec3ToGlm::set", view, index, hint); return false;
+    }
+};
+
+template <typename T> struct GpuVec4ToGlm : GpuToGlmAdapter { static T get(const gpu::BufferView& view, glm::uint32 index, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec4ToGlm::get::out of bounds", view, index, hint));
+#endif
     switch(view._element.getType()) {
     case gpu::UINT32: return view.get<glm::u32vec4>(index);
     case gpu::UINT16: return view.get<glm::u16vec4>(index);
@@ -362,8 +310,8 @@ template <typename T> struct GpuVec4ToGlm : GpuToGlmAdapter { static T get(const
     case gpu::INT16: return view.get<glm::i16vec4>(index);
     case gpu::INT8: return view.get<glm::i8vec4>(index);
     case gpu::NUINT32: break;
-    case gpu::NUINT16: break;
-    case gpu::NUINT8: return glm::unpackUnorm4x8(view.get<glm::uint32>(index));
+    case gpu::NUINT16: CHECK_SIZE(glm::uint64); return glm::unpackUnorm4x16(view.get<glm::uint64>(index));
+    case gpu::NUINT8: CHECK_SIZE(glm::uint32); return glm::unpackUnorm4x8(view.get<glm::uint32>(index));
     case gpu::NUINT2: break;
     case gpu::NINT32: break;
     case gpu::NINT16: break;
@@ -371,56 +319,221 @@ template <typename T> struct GpuVec4ToGlm : GpuToGlmAdapter { static T get(const
     case gpu::COMPRESSED: break;
     case gpu::NUM_TYPES: break;
     case gpu::FLOAT: return view.get<glm::fvec4>(index);
-    case gpu::HALF: return glm::unpackSnorm4x8(view.get<glm::int32>(index));
+    case gpu::HALF: CHECK_SIZE(glm::uint64); return glm::unpackHalf4x16(view.get<glm::uint64>(index));
     case gpu::NINT2_10_10_10: return glm::unpackSnorm3x10_1x2(view.get<glm::uint32>(index));
-    } return T(error("GpuVec4ToGlm", view, index, hint)); }};
-
+    } return T(error("GpuVec4ToGlm::get", view, index, hint)); }
+    static bool set(const gpu::BufferView& view, glm::uint32 index, const T& value, const char *hint) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+    if(!boundsCheck(view, index))return T(error("GpuVec4ToGlm::set::out of bounds", view, index, hint));
+#endif
+    switch(view._element.getType()) {
+    case gpu::FLOAT: view.edit<glm::fvec4>(index) = value; return true;
+    case gpu::HALF: CHECK_SIZE(glm::uint64); view.edit<glm::uint64_t>(index) = glm::packHalf4x16(value); return true;
+    case gpu::UINT8: view.edit<glm::u8vec4>(index) = value; return true;
+    case gpu::NINT2_10_10_10: view.edit<glm::uint32>(index) = glm::packSnorm3x10_1x2(value); return true;
+    case gpu::NUINT16: CHECK_SIZE(glm::uint64); view.edit<glm::uint64>(index) = glm::packUnorm4x16(value); return true;
+    case gpu::NUINT8: CHECK_SIZE(glm::uint32);  view.edit<glm::uint32>(index) = glm::packUnorm4x8(value); return true;
+    default: break;
+    } error("GpuVec4ToGlm::set", view, index, hint); return false;
+    }
+};
+#undef CHECK_SIZE
 
 template <typename FUNC, typename T>
-struct getVec {
-    static QVector<T> __to_vector__(const gpu::BufferView& view, const char *hint) {
+struct GpuValueResolver {
+    static QVector<T> toVector(const gpu::BufferView& view, const char *hint) {
         QVector<T> result;
-        const quint32 count = (quint32)view.getNumElements();
+        const glm::uint32 count = (glm::uint32)view.getNumElements();
         result.resize(count);
-        for (quint32 i = 0; i < count; i++) {
+        for (glm::uint32 i = 0; i < count; i++) {
             result[i] = FUNC::get(view, i, hint);
         }
         return result;
     }
-    static T __to_value__(const gpu::BufferView& view, quint32 index, const char *hint) {
-        assert(boundsCheck(view, index));
+    static T toValue(const gpu::BufferView& view, glm::uint32 index, const char *hint) {
         return FUNC::get(view, index, hint);
     }
 };
 
 // BufferView => QVector<T>
-template <> QVector<int> buffer_helpers::toVector<int>(const gpu::BufferView& view, const char *hint) {
-    return getVec<GpuScalarToGlm<int>,int>::__to_vector__(view, hint);
-}
-template <> QVector<glm::vec2> buffer_helpers::toVector<glm::vec2>(const gpu::BufferView& view, const char *hint) {
-    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_vector__(view, hint);
-}
-template <> QVector<glm::vec3> buffer_helpers::toVector<glm::vec3>(const gpu::BufferView& view, const char *hint) {
-    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_vector__(view, hint);
-}
-template <> QVector<glm::vec4> buffer_helpers::toVector<glm::vec4>(const gpu::BufferView& view, const char *hint) {
-    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_vector__(view, hint);
+template <typename U> QVector<U> buffer_helpers::bufferToVector(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<U>,U>::toVector(view, hint); }
+
+template<> QVector<int> buffer_helpers::bufferToVector<int>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<int>,int>::toVector(view, hint); }
+template<> QVector<glm::uint16> buffer_helpers::bufferToVector<glm::uint16>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint16>,glm::uint16>::toVector(view, hint); }
+template<> QVector<glm::uint32> buffer_helpers::bufferToVector<glm::uint32>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint32>,glm::uint32>::toVector(view, hint); }
+template<> QVector<glm::vec2> buffer_helpers::bufferToVector<glm::vec2>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec2ToGlm<glm::vec2>,glm::vec2>::toVector(view, hint); }
+template<> QVector<glm::vec3> buffer_helpers::bufferToVector<glm::vec3>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec3ToGlm<glm::vec3>,glm::vec3>::toVector(view, hint); }
+template<> QVector<glm::vec4> buffer_helpers::bufferToVector<glm::vec4>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec4ToGlm<glm::vec4>,glm::vec4>::toVector(view, hint); }
+
+// view.get<T> with conversion between types
+template<> int buffer_helpers::getValue<int>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<int>::get(view, index, hint); }
+template<> glm::uint32 buffer_helpers::getValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<glm::uint32>::get(view, index, hint); }
+template<> glm::vec2 buffer_helpers::getValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec2ToGlm<glm::vec2>::get(view, index, hint); }
+template<> glm::vec3 buffer_helpers::getValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec3ToGlm<glm::vec3>::get(view, index, hint); }
+template<> glm::vec4 buffer_helpers::getValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec4ToGlm<glm::vec4>::get(view, index, hint); }
+
+// bufferView => QVariant
+template<> QVariant buffer_helpers::getValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const char* hint) {
+    if (!boundsCheck(view, index)) {
+        qDebug() << "getValue<QVariant> -- out of bounds" << index << hint;
+        return false;
+    }
+    const auto dataType = view._element.getType();
+    switch(view._element.getScalarCount()) {
+    case 1:
+        if (dataType == gpu::Type::FLOAT) {
+            return GpuScalarToGlm<glm::float32>::get(view, index, hint);
+        } else {
+            switch(dataType) {
+            case gpu::INT8: case gpu::INT16: case gpu::INT32:
+            case gpu::NINT8: case gpu::NINT16: case gpu::NINT32:
+            case gpu::NINT2_10_10_10:
+                // signed
+                return GpuScalarToGlm<glm::int32>::get(view, index, hint);
+            default:
+                // unsigned
+                return GpuScalarToGlm<glm::uint32>::get(view, index, hint);
+            }
+        }
+    case 2: return glmVecToVariant(GpuVec2ToGlm<glm::vec2>::get(view, index, hint));
+    case 3: return glmVecToVariant(GpuVec3ToGlm<glm::vec3>::get(view, index, hint));
+    case 4: return glmVecToVariant(GpuVec4ToGlm<glm::vec4>::get(view, index, hint));
+    }
+    return QVariant();
 }
 
+glm::uint32 buffer_helpers::mesh::forEachVertex(const graphics::MeshPointer& mesh, std::function<bool(glm::uint32 index, const QVariantMap& values)> func) {
+    glm::uint32 i = 0;
+    auto attributeViews = getAllBufferViews(mesh);
+    auto nPositions = mesh->getNumVertices();
+    for (; i < nPositions; i++) {
+        QVariantMap values;
+        for (const auto& a : attributeViews) {
+            values[a.first] = buffer_helpers::getValue<QVariant>(a.second, i, qUtf8Printable(a.first));
+        }
+        if (!func(i, values)) {
+            break;
+        }
+    }
+    return i;
+}
 
-// indexed conversion accessors (like the hypothetical "view.convert<T>(i)")
-template <> int buffer_helpers::convert<int>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuScalarToGlm<int>,int>::__to_value__(view, index, hint);
+// view.edit<T> with conversion between types
+template<> bool buffer_helpers::setValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const QVariant& v, const char* hint) {
+    if (!boundsCheck(view, index)) {
+        qDebug() << "setValue<QVariant> -- out of bounds" << index << hint;
+        return false;
+    }
+    const auto dataType = view._element.getType();
+
+    switch(view._element.getScalarCount()) {
+    case 1:
+        if (dataType == gpu::Type::FLOAT) {
+            return GpuScalarToGlm<glm::float32>::set(view, index, v.toFloat(), hint);
+        } else {
+            switch(dataType) {
+            case gpu::INT8: case gpu::INT16: case gpu::INT32:
+            case gpu::NINT8: case gpu::NINT16: case gpu::NINT32:
+            case gpu::NINT2_10_10_10:
+                // signed
+                return GpuScalarToGlm<glm::int32>::set(view, index, v.toInt(), hint);
+            default:
+                // unsigned
+                return GpuScalarToGlm<glm::uint32>::set(view, index, v.toUInt(), hint);
+            }
+        }
+        return false;
+    case 2: return GpuVec2ToGlm<glm::vec2>::set(view, index, glmVecFromVariant<glm::vec2>(v), hint);
+    case 3: return GpuVec3ToGlm<glm::vec3>::set(view, index, glmVecFromVariant<glm::vec3>(v), hint);
+    case 4: return GpuVec4ToGlm<glm::vec4>::set(view, index, glmVecFromVariant<glm::vec4>(v), hint);
+    }
+    return false;
 }
-template <> glm::vec2 buffer_helpers::convert<glm::vec2>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec2ToGlm<glm::vec2>,glm::vec2>::__to_value__(view, index, hint);
+
+template<> bool buffer_helpers::setValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const glm::uint32& value, const char* hint) {
+    return GpuScalarToGlm<glm::uint32>::set(view, index, value, hint);
 }
-template <> glm::vec3 buffer_helpers::convert<glm::vec3>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec3ToGlm<glm::vec3>,glm::vec3>::__to_value__(view, index, hint);
+template<> bool buffer_helpers::setValue<glm::uint16>(const gpu::BufferView& view, glm::uint32 index, const glm::uint16& value, const char* hint) {
+    return GpuScalarToGlm<glm::uint16>::set(view, index, value, hint);
 }
-template <> glm::vec4 buffer_helpers::convert<glm::vec4>(const gpu::BufferView& view, quint32 index, const char *hint) {
-    return getVec<GpuVec4ToGlm<glm::vec4>,glm::vec4>::__to_value__(view, index, hint);
+template<> bool buffer_helpers::setValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const glm::vec2& value, const char* hint) {
+    return GpuVec2ToGlm<glm::vec2>::set(view, index, value, hint);
 }
+template<> bool buffer_helpers::setValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const glm::vec3& value, const char* hint) {
+    return GpuVec3ToGlm<glm::vec3>::set(view, index, value, hint);
+}
+template<> bool buffer_helpers::setValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const glm::vec4& value, const char* hint) {
+    return GpuVec4ToGlm<glm::vec4>::set(view, index, value, hint);
+}
+
+bool buffer_helpers::mesh::setVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 index, const QVariantMap& attributes) {
+    bool ok = true;
+    for (auto& a : getAllBufferViews(mesh)) {
+        const auto& name = a.first;
+        if (attributes.contains(name)) {
+            const auto& value = attributes.value(name);
+            if (value.isValid()) {
+                auto& view = a.second;
+                buffer_helpers::setValue<QVariant>(view, index, value);
+            } else {
+                ok = false;
+                //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
+            }
+        }
+    }
+    return ok;
+}
+
+QVariant buffer_helpers::mesh::getVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 vertexIndex) {
+    auto attributeViews = getAllBufferViews(mesh);
+    QVariantMap values;
+    for (const auto& a : attributeViews) {
+        values[a.first] = buffer_helpers::getValue<QVariant>(a.second, vertexIndex, qUtf8Printable(a.first));
+    }
+    return values;
+}
+
+// QVariantList => QVector<T>
+namespace {
+    template <class T> QVector<T> qVariantListToGlmVector(const QVariantList& list) {
+        QVector<T> output;
+        output.resize(list.size());
+        int i = 0;
+        for (const auto& v : list) {
+            output[i++] = buffer_helpers::glmVecFromVariant<T>(v);
+        }
+        return output;
+    }
+    template <typename T> QVector<T> qVariantListToScalarVector(const QVariantList& list) {
+        QVector<T> output;
+        output.resize(list.size());
+        int i = 0;
+        for (const auto& v : list) {
+            output[i++] = v.value<T>();
+        }
+        return output;
+    }
+}
+
+template <class T> QVector<T> buffer_helpers::variantToVector(const QVariant& value) { qDebug() << "variantToVector[class]"; return qVariantListToGlmVector<T>(value.toList()); }
+template<> QVector<glm::float32> buffer_helpers::variantToVector<glm::float32>(const QVariant& value) { return qVariantListToScalarVector<glm::float32>(value.toList()); }
+template<> QVector<glm::uint32> buffer_helpers::variantToVector<glm::uint32>(const QVariant& value) { return qVariantListToScalarVector<glm::uint32>(value.toList()); }
+template<> QVector<glm::int32> buffer_helpers::variantToVector<glm::int32>(const QVariant& value) { return qVariantListToScalarVector<glm::int32>(value.toList()); }
+template<> QVector<glm::vec2> buffer_helpers::variantToVector<glm::vec2>(const QVariant& value) { return qVariantListToGlmVector<glm::vec2>(value.toList()); }
+template<> QVector<glm::vec3> buffer_helpers::variantToVector<glm::vec3>(const QVariant& value) { return qVariantListToGlmVector<glm::vec3>(value.toList()); }
+template<> QVector<glm::vec4> buffer_helpers::variantToVector<glm::vec4>(const QVariant& value) { return qVariantListToGlmVector<glm::vec4>(value.toList()); }
+
+template<> gpu::BufferView buffer_helpers::newFromVector<QVariant>(const QVector<QVariant>& _elements, const gpu::Element& elementType) {
+    glm::uint32 numElements = _elements.size();
+    auto buffer = new gpu::Buffer();
+    buffer->resize(elementType.getSize() * numElements);
+    auto bufferView = gpu::BufferView(buffer, elementType);
+    for (glm::uint32 i = 0; i < numElements; i++) {
+        setValue<QVariant>(bufferView, i, _elements[i]);
+    }
+    return bufferView;
+}
+
 
 gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
     return gpu::BufferView(
@@ -429,25 +542,29 @@ gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
     );
 }
 
-// TODO: preserve existing data
-gpu::BufferView buffer_helpers::resize(const gpu::BufferView& input, quint32 numElements) {
+gpu::BufferView buffer_helpers::resized(const gpu::BufferView& input, glm::uint32 numElements) {
+#ifdef DEBUG_BUFFERVIEW_HELPERS
     auto effectiveSize = input._buffer->getSize() / input.getNumElements();
     qCDebug(bufferhelper_logging) << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
+#endif
     auto vsize = input._element.getSize() * numElements;
     std::unique_ptr<gpu::Byte[]> data{ new gpu::Byte[vsize] };
     memset(data.get(), 0, vsize);
     auto buffer = new gpu::Buffer(vsize, data.get());
+    memcpy(data.get(), input._buffer->getData(), std::min(vsize, (glm::uint32)input._buffer->getSize()));
     auto output = gpu::BufferView(buffer, input._element);
+#ifdef DEBUG_BUFFERVIEW_HELPERS
     qCDebug(bufferhelper_logging) << "resized output" << output.getNumElements() << output._buffer->getSize();
+#endif
     return output;
 }
 
-graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
+graphics::MeshPointer buffer_helpers::mesh::clone(const graphics::MeshPointer& mesh) {
     auto clone = std::make_shared<graphics::Mesh>();
     clone->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
     clone->setIndexBuffer(buffer_helpers::clone(mesh->getIndexBuffer()));
     clone->setPartBuffer(buffer_helpers::clone(mesh->getPartBuffer()));
-    auto attributeViews = buffer_helpers::gatherBufferViews(mesh);
+    auto attributeViews = buffer_helpers::mesh::getAllBufferViews(mesh);
     for (const auto& a : attributeViews) {
         auto& view = a.second;
         auto slot = buffer_helpers::ATTRIBUTES[a.first];
@@ -461,195 +578,17 @@ graphics::MeshPointer buffer_helpers::cloneMesh(graphics::MeshPointer mesh) {
     return clone;
 }
 
-namespace {
-    // expand the corresponding attribute buffer (creating it if needed) so that it matches POSITIONS size and specified element type
-    gpu::BufferView _expandedAttributeBuffer(const graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
-        gpu::BufferView bufferView = buffer_helpers::getBufferView(mesh, slot);
-        const auto& elementType = bufferView._element;
-        gpu::Size elementSize = elementType.getSize();
-        auto nPositions = mesh->getNumVertices();
-        auto vsize = nPositions * elementSize;
-        auto diffTypes = (elementType.getType() != bufferView._element.getType()  ||
-                          elementType.getSize() > bufferView._element.getSize() ||
-                          elementType.getScalarCount() > bufferView._element.getScalarCount() ||
-                          vsize > bufferView._size
-            );
-        QString hint = QString("%1").arg(slot);
-#ifdef DEV_BUILD
-        auto beforeCount = bufferView.getNumElements();
-        auto beforeTotal = bufferView._size;
-#endif
-        if (bufferView.getNumElements() < nPositions || diffTypes) {
-            if (!bufferView._buffer || bufferView.getNumElements() == 0) {
-                qCInfo(bufferhelper_logging).nospace() << "ScriptableMesh -- adding missing mesh attribute '" << hint << "' for BufferView";
-                std::unique_ptr<gpu::Byte[]> data{ new gpu::Byte[vsize] };
-                memset(data.get(), 0, vsize);
-                auto buffer = new gpu::Buffer(vsize, data.get());
-                bufferView = gpu::BufferView(buffer, elementType);
-                mesh->addAttribute(slot, bufferView);
-            } else {
-                qCInfo(bufferhelper_logging) << "ScriptableMesh -- resizing Buffer current:" << hint << bufferView._buffer->getSize() << "wanted:" << vsize;
-                bufferView._element = elementType;
-                bufferView._buffer->resize(vsize);
-                bufferView._size = bufferView._buffer->getSize();
-            }
-        }
-#ifdef DEV_BUILD
-        auto afterCount = bufferView.getNumElements();
-        auto afterTotal = bufferView._size;
-        if (beforeTotal != afterTotal || beforeCount != afterCount) {
-            QString typeName = QString("%1").arg(bufferView._element.getType());
-            qCDebug(bufferhelper_logging, "NOTE:: _expandedAttributeBuffer.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                    hint.toStdString().c_str(), bufferView._element.getScalarCount(),
-                    typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
-        }
-#endif
-        return bufferView;
-    }
-
-    gpu::BufferView expandAttributeToMatchPositions(graphics::MeshPointer mesh, gpu::Stream::Slot slot) {
-        if (slot == gpu::Stream::POSITION) {
-            return buffer_helpers::getBufferView(mesh, slot);
-        }
-        return _expandedAttributeBuffer(mesh, slot);
-    }
-}
-
-std::map<QString, gpu::BufferView> buffer_helpers::gatherBufferViews(graphics::MeshPointer mesh, const QStringList& expandToMatchPositions) {
+std::map<QString, gpu::BufferView> buffer_helpers::mesh::getAllBufferViews(const graphics::MeshPointer& mesh) {
     std::map<QString, gpu::BufferView> attributeViews;
     if (!mesh) {
         return attributeViews;
     }
     for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
-        auto name = a.first;
-        auto slot = a.second;
-        auto view = getBufferView(mesh, slot);
-        auto beforeCount = view.getNumElements();
-#if DEV_BUILD
-        auto beforeTotal = view._size;
-#endif
-        if (expandToMatchPositions.contains(name)) {
-            expandAttributeToMatchPositions(mesh, slot);
-        }
-        if (beforeCount > 0) {
-            auto element = view._element;
-            QString typeName = QString("%1").arg(element.getType());
-
-            attributeViews[name] = getBufferView(mesh, slot);
-
-#if DEV_BUILD
-            const auto vecN = element.getScalarCount();
-            auto afterTotal = attributeViews[name]._size;
-            auto afterCount = attributeViews[name].getNumElements();
-            if (beforeTotal != afterTotal || beforeCount != afterCount) {
-                qCDebug(bufferhelper_logging, "NOTE:: gatherBufferViews.%s vec%d %s (before count=%lu bytes=%lu // after count=%lu bytes=%lu)",
-                        name.toStdString().c_str(), vecN, typeName.toStdString().c_str(), beforeCount, beforeTotal, afterCount, afterTotal);
-            }
-#endif
+        auto bufferView = getBufferView(mesh, a.second);
+        if (bufferView.getNumElements()) {
+            attributeViews[a.first] = bufferView;
         }
     }
     return attributeViews;
 }
 
-bool buffer_helpers::recalculateNormals(graphics::MeshPointer mesh) {
-    qCInfo(bufferhelper_logging) << "Recalculating normals" << !!mesh;
-    if (!mesh) {
-        return false;
-    }
-    buffer_helpers::gatherBufferViews(mesh, { "normal", "color" }); // ensures #normals >= #positions
-    auto normals = mesh->getAttributeBuffer(gpu::Stream::NORMAL);
-    auto verts = mesh->getVertexBuffer();
-    auto indices = mesh->getIndexBuffer();
-    auto esize = indices._element.getSize();
-    auto numPoints = indices.getNumElements();
-    const auto TRIANGLE = 3;
-    quint32 numFaces = (quint32)numPoints / TRIANGLE;
-    QVector<glm::vec3> faceNormals;
-    QMap<QString,QVector<quint32>> vertexToFaces;
-    faceNormals.resize(numFaces);
-    auto numNormals = normals.getNumElements();
-    qCInfo(bufferhelper_logging) << QString("numFaces: %1, numNormals: %2, numPoints: %3").arg(numFaces).arg(numNormals).arg(numPoints);
-    if (normals.getNumElements() != verts.getNumElements()) {
-        return false;
-    }
-    for (quint32 i = 0; i < numFaces; i++) {
-        quint32 I = TRIANGLE * i;
-        quint32 i0 = esize == 4 ? indices.get<quint32>(I+0) : indices.get<quint16>(I+0);
-        quint32 i1 = esize == 4 ? indices.get<quint32>(I+1) : indices.get<quint16>(I+1);
-        quint32 i2 = esize == 4 ? indices.get<quint32>(I+2) : indices.get<quint16>(I+2);
-
-        Triangle face = {
-            verts.get<glm::vec3>(i1),
-            verts.get<glm::vec3>(i2),
-            verts.get<glm::vec3>(i0)
-        };
-        faceNormals[i] = face.getNormal();
-        if (glm::isnan(faceNormals[i].x)) {
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-            qCInfo(bufferhelper_logging) << i << i0 << i1 << i2 << glmVecToVariant(face.v0) << glmVecToVariant(face.v1) << glmVecToVariant(face.v2);
-#endif
-            break;
-        }
-        vertexToFaces[glm::to_string(glm::dvec3(face.v0)).c_str()] << i;
-        vertexToFaces[glm::to_string(glm::dvec3(face.v1)).c_str()] << i;
-        vertexToFaces[glm::to_string(glm::dvec3(face.v2)).c_str()] << i;
-    }
-    for (quint32 j = 0; j < numNormals; j++) {
-        //auto v = verts.get<glm::vec3>(j);
-        glm::vec3 normal { 0.0f, 0.0f, 0.0f };
-        QString key { glm::to_string(glm::dvec3(verts.get<glm::vec3>(j))).c_str() };
-        const auto& faces = vertexToFaces.value(key);
-        if (faces.size()) {
-            for (const auto i : faces) {
-                normal += faceNormals[i];
-            }
-            normal *= 1.0f / (float)faces.size();
-        } else {
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(bufferhelper_logging) << "no faces for key!?" << key;
-            }
-            normal = verts.get<glm::vec3>(j);
-        }
-        if (glm::isnan(normal.x)) {
-#ifdef DEBUG_BUFFERVIEW_SCRIPTING
-            static int logged = 0;
-            if (logged++ < 10) {
-                qCInfo(bufferhelper_logging) << "isnan(normal.x)" << j << glmVecToVariant(normal);
-            }
-#endif
-            break;
-        }
-        buffer_helpers::fromVariant(normals, j, glmVecToVariant(glm::normalize(normal)));
-    }
-    return true;
-}
-
-QVariant buffer_helpers::toVariant(const glm::mat4& mat4) {
-    QVector<float> floats;
-    floats.resize(16);
-    memcpy(floats.data(), &mat4, sizeof(glm::mat4));
-    QVariant v;
-    v.setValue<QVector<float>>(floats);
-    return v;
-};
-
-QVariant buffer_helpers::toVariant(const Extents& box) {
-    return QVariantMap{
-        { "center", glmVecToVariant(box.minimum + (box.size() / 2.0f)) },
-        { "minimum", glmVecToVariant(box.minimum) },
-        { "maximum", glmVecToVariant(box.maximum) },
-        { "dimensions", glmVecToVariant(box.size()) },
-    };
-}
-
-QVariant buffer_helpers::toVariant(const AABox& box) {
-    return QVariantMap{
-        { "brn", glmVecToVariant(box.getCorner()) },
-        { "tfl", glmVecToVariant(box.calcTopFarLeft()) },
-        { "center", glmVecToVariant(box.calcCenter()) },
-        { "minimum", glmVecToVariant(box.getMinimumPoint()) },
-        { "maximum", glmVecToVariant(box.getMaximumPoint()) },
-        { "dimensions", glmVecToVariant(box.getDimensions()) },
-    };
-}
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.h b/libraries/graphics/src/graphics/BufferViewHelpers.h
index 6d4908a2c7..f877341d50 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.h
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.h
@@ -10,10 +10,7 @@
 #include <memory>
 #include <glm/glm.hpp>
 
-namespace gpu {
-    class BufferView;
-    class Element;
-}
+#include "GpuHelpers.h"
 
 namespace graphics {
     class Mesh;
@@ -23,33 +20,41 @@ namespace graphics {
 class Extents;
 class AABox;
 
-struct buffer_helpers {
-    template <typename T> static QVariant glmVecToVariant(const T& v, bool asArray = false);
-    template <typename T> static const T glmVecFromVariant(const QVariant& v);
+namespace buffer_helpers {
+    extern QMap<QString,int> ATTRIBUTES;
+    extern const std::array<const char*, 4> XYZW;
+    extern const std::array<const char*, 4> ZERO123;
 
-    static graphics::MeshPointer cloneMesh(graphics::MeshPointer mesh);
-    static QMap<QString,int> ATTRIBUTES;
-    static std::map<QString, gpu::BufferView> gatherBufferViews(graphics::MeshPointer mesh, const QStringList& expandToMatchPositions = QStringList());
-    static bool recalculateNormals(graphics::MeshPointer meshProxy);
-    static gpu::BufferView getBufferView(graphics::MeshPointer mesh, quint8 slot);
+    template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
+    template <typename T> const T glmVecFromVariant(const QVariant& v);
 
-    static QVariant toVariant(const Extents& box);
-    static QVariant toVariant(const AABox& box);
-    static QVariant toVariant(const glm::mat4& mat4);
-    static QVariant toVariant(const gpu::BufferView& view, quint32 index, bool asArray = false, const char* hint = "");
+    glm::uint32 forEachVariant(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const QVariant& value)> func, const char* hint = "");
+    template <typename T> glm::uint32 forEach(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func);
 
-    static bool fromVariant(const gpu::BufferView& view, quint32 index, const QVariant& v);
+    template <typename T> gpu::BufferView newFromVector(const QVector<T>& elements, const gpu::Element& elementType);
+    template <typename T> gpu::BufferView newFromVariantList(const QVariantList& list, const gpu::Element& elementType);
 
-    template <typename T> static gpu::BufferView fromVector(const QVector<T>& elements, const gpu::Element& elementType);
+    template <typename T> QVector<T> variantToVector(const QVariant& list);
+    template <typename T> QVector<T> bufferToVector(const gpu::BufferView& view, const char *hint = "");
 
-    template <typename T> static QVector<T> toVector(const gpu::BufferView& view, const char *hint = "");
-    template <typename T> static T convert(const gpu::BufferView& view, quint32 index, const char* hint = "");
+    // note: these do value conversions from the underlying buffer type into the template type
+    template <typename T> T getValue(const gpu::BufferView& view, glm::uint32 index, const char* hint = "");
+    template <typename T> bool setValue(const gpu::BufferView& view, glm::uint32 index, const T& value, const char* hint = "");
 
-    static gpu::BufferView clone(const gpu::BufferView& input);
-    static gpu::BufferView resize(const gpu::BufferView& input, quint32 numElements);
+    gpu::BufferView clone(const gpu::BufferView& input);
+    gpu::BufferView resized(const gpu::BufferView& input, glm::uint32 numElements);
 
-    static void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent);
+    void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent);
 
-    static const std::array<const char*, 4> XYZW;
-    static const std::array<const char*, 4> ZERO123;
-};
+    namespace mesh {
+        glm::uint32 forEachVertex(const graphics::MeshPointer& mesh, std::function<bool(glm::uint32 index, const QVariantMap& attributes)> func);
+        bool setVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 index, const QVariantMap& attributes);
+        QVariant getVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 index);
+        graphics::MeshPointer clone(const graphics::MeshPointer& mesh);
+        gpu::BufferView getBufferView(const graphics::MeshPointer& mesh, quint8 slot);
+        std::map<QString, gpu::BufferView> getAllBufferViews(const graphics::MeshPointer& mesh);
+        template <typename T> QVector<T> attributeToVector(const graphics::MeshPointer& mesh, gpu::Stream::InputSlot slot) {
+            return bufferToVector<T>(getBufferView(mesh, slot), qUtf8Printable(gpu::toString(slot)));
+        }
+    }
+}
diff --git a/libraries/graphics/src/graphics/GpuHelpers.cpp b/libraries/graphics/src/graphics/GpuHelpers.cpp
new file mode 100644
index 0000000000..63393df5e1
--- /dev/null
+++ b/libraries/graphics/src/graphics/GpuHelpers.cpp
@@ -0,0 +1,122 @@
+//
+//  Copyright 2018 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 "GpuHelpers.h"
+
+namespace graphics {
+    DebugEnums<Mesh::Topology> TOPOLOGIES{
+       { Mesh::Topology::POINTS, "points" },
+       { Mesh::Topology::LINES, "lines" },
+       { Mesh::Topology::LINE_STRIP, "line_strip" },
+       { Mesh::Topology::TRIANGLES, "triangles" },
+       { Mesh::Topology::TRIANGLE_STRIP, "triangle_strip" },
+       { Mesh::Topology::QUADS, "quads" },
+       { Mesh::Topology::QUAD_STRIP, "quad_strip" },
+       { Mesh::Topology::NUM_TOPOLOGIES, "num_topologies" },
+    };
+}
+namespace gpu {
+
+     DebugEnums<Type> TYPES{
+        { Type::FLOAT, "float" },
+        { Type::INT32, "int32" },
+        { Type::UINT32, "uint32" },
+        { Type::HALF, "half" },
+        { Type::INT16, "int16" },
+        { Type::UINT16, "uint16" },
+        { Type::INT8, "int8" },
+        { Type::UINT8, "uint8" },
+        { Type::NINT32, "nint32" },
+        { Type::NUINT32, "nuint32" },
+        { Type::NINT16, "nint16" },
+        { Type::NUINT16, "nuint16" },
+        { Type::NINT8, "nint8" },
+        { Type::NUINT8, "nuint8" },
+        { Type::NUINT2, "nuint2" },
+        { Type::NINT2_10_10_10, "nint2_10_10_10" },
+        { Type::COMPRESSED, "compressed" },
+        { Type::NUM_TYPES, "num_types" },
+    };
+    DebugEnums<Dimension> DIMENSIONS{
+        { Dimension::SCALAR, "scalar" },
+        { Dimension::VEC2, "vec2" },
+        { Dimension::VEC3, "vec3" },
+        { Dimension::VEC4, "vec4" },
+        { Dimension::MAT2, "mat2" },
+        { Dimension::MAT3, "mat3" },
+        { Dimension::MAT4, "mat4" },
+        { Dimension::TILE4x4, "tile4x4" },
+        { Dimension::NUM_DIMENSIONS, "num_dimensions" },
+    };
+    DebugEnums<Semantic> SEMANTICS{
+        { Semantic::RAW, "raw" },
+
+        { Semantic::RED, "red" },
+        { Semantic::RGB, "rgb" },
+        { Semantic::RGBA, "rgba" },
+        { Semantic::BGRA, "bgra" },
+
+        { Semantic::XY, "xy" },
+        { Semantic::XYZ, "xyz" },
+        { Semantic::XYZW, "xyzw" },
+        { Semantic::QUAT, "quat" },
+        { Semantic::UV, "uv" },
+        { Semantic::INDEX, "index" },
+        { Semantic::PART, "part" },
+
+        { Semantic::DEPTH, "depth" },
+        { Semantic::STENCIL, "stencil" },
+        { Semantic::DEPTH_STENCIL, "depth_stencil" },
+
+        { Semantic::SRED, "sred" },
+        { Semantic::SRGB, "srgb" },
+        { Semantic::SRGBA, "srgba" },
+        { Semantic::SBGRA, "sbgra" },
+
+        { Semantic::_FIRST_COMPRESSED, "_first_compressed" },
+
+        { Semantic::COMPRESSED_BC1_SRGB, "compressed_bc1_srgb" },
+        { Semantic::COMPRESSED_BC1_SRGBA, "compressed_bc1_srgba" },
+        { Semantic::COMPRESSED_BC3_SRGBA, "compressed_bc3_srgba" },
+        { Semantic::COMPRESSED_BC4_RED, "compressed_bc4_red" },
+        { Semantic::COMPRESSED_BC5_XY, "compressed_bc5_xy" },
+        { Semantic::COMPRESSED_BC6_RGB, "compressed_bc6_rgb" },
+        { Semantic::COMPRESSED_BC7_SRGBA, "compressed_bc7_srgba" },
+
+        { Semantic::_LAST_COMPRESSED, "_last_compressed" },
+
+        { Semantic::R11G11B10, "r11g11b10" },
+        { Semantic::RGB9E5, "rgb9e5" },
+
+        { Semantic::UNIFORM, "uniform" },
+        { Semantic::UNIFORM_BUFFER, "uniform_buffer" },
+        { Semantic::RESOURCE_BUFFER, "resource_buffer" },
+        { Semantic::SAMPLER, "sampler" },
+        { Semantic::SAMPLER_MULTISAMPLE, "sampler_multisample" },
+        { Semantic::SAMPLER_SHADOW, "sampler_shadow" },
+
+
+        { Semantic::NUM_SEMANTICS, "num_semantics" },
+    };
+    DebugEnums<Stream::InputSlot> SLOTS{
+        { Stream::InputSlot::POSITION, "position" },
+        { Stream::InputSlot::NORMAL, "normal" },
+        { Stream::InputSlot::COLOR, "color" },
+        { Stream::InputSlot::TEXCOORD0, "texcoord0" },
+        { Stream::InputSlot::TEXCOORD, "texcoord" },
+        { Stream::InputSlot::TANGENT, "tangent" },
+        { Stream::InputSlot::SKIN_CLUSTER_INDEX, "skin_cluster_index" },
+        { Stream::InputSlot::SKIN_CLUSTER_WEIGHT, "skin_cluster_weight" },
+        { Stream::InputSlot::TEXCOORD1, "texcoord1" },
+        { Stream::InputSlot::TEXCOORD2, "texcoord2" },
+        { Stream::InputSlot::TEXCOORD3, "texcoord3" },
+        { Stream::InputSlot::TEXCOORD4, "texcoord4" },
+        { Stream::InputSlot::NUM_INPUT_SLOTS, "num_input_slots" },
+        { Stream::InputSlot::DRAW_CALL_INFO, "draw_call_info" },
+    };
+}
diff --git a/libraries/graphics/src/graphics/GpuHelpers.h b/libraries/graphics/src/graphics/GpuHelpers.h
new file mode 100644
index 0000000000..ceae823f83
--- /dev/null
+++ b/libraries/graphics/src/graphics/GpuHelpers.h
@@ -0,0 +1,47 @@
+//
+//  Copyright 2018 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
+//
+#pragma once
+
+#include <QtCore>
+#include <gpu/Format.h>
+#include <gpu/Stream.h>
+#include "Geometry.h"
+
+template <typename T>
+using DebugEnums = QMap<T, QString>;
+
+namespace graphics {
+    extern DebugEnums<Mesh::Topology> TOPOLOGIES;
+    inline QDebug operator<<(QDebug dbg, Mesh::Topology type) { return dbg << TOPOLOGIES.value(type);}
+    inline const QString toString(Mesh::Topology v) { return TOPOLOGIES.value(v); }
+}
+
+namespace gpu {
+    extern DebugEnums<Type> TYPES;
+    extern DebugEnums<Dimension> DIMENSIONS;
+    extern DebugEnums<Semantic> SEMANTICS;
+    extern DebugEnums<Stream::InputSlot> SLOTS;
+    inline QDebug operator<<(QDebug dbg, gpu::Type type) { return dbg << TYPES.value(type); }
+    inline QDebug operator<<(QDebug dbg, gpu::Dimension type) { return dbg << DIMENSIONS.value(type); }
+    inline QDebug operator<<(QDebug dbg, gpu::Semantic type) { return dbg << SEMANTICS.value(type); }
+    inline QDebug operator<<(QDebug dbg, gpu::Stream::InputSlot type) { return dbg << SLOTS.value(type); }
+    inline const QString toString(gpu::Type v) { return TYPES.value(v); }
+    inline const QString toString(gpu::Dimension v) { return DIMENSIONS.value(v); }
+    inline const QString toString(gpu::Semantic v) { return SEMANTICS.value(v); }
+    inline const QString toString(gpu::Stream::InputSlot v) { return SLOTS.value(v); }
+    inline const QString toString(gpu::Element v) {
+        return QString("[Element semantic=%1 type=%1 dimension=%2]")
+            .arg(toString(v.getSemantic()))
+            .arg(toString(v.getType()))
+            .arg(toString(v.getDimension()));
+    }
+}
+
+Q_DECLARE_METATYPE(gpu::Type)
+Q_DECLARE_METATYPE(gpu::Dimension)
+Q_DECLARE_METATYPE(gpu::Semantic)
+Q_DECLARE_METATYPE(graphics::Mesh::Topology)
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 6d735497c0..0abeb70254 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -440,7 +440,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
         const FBXGeometry& geometry = getFBXGeometry();
 
         if (!_triangleSetsValid) {
-            calculateTriangleSets();
+            calculateTriangleSets(geometry);
         }
 
         glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
@@ -525,7 +525,7 @@ bool Model::convexHullContains(glm::vec3 point) {
         QMutexLocker locker(&_mutex);
 
         if (!_triangleSetsValid) {
-            calculateTriangleSets();
+            calculateTriangleSets(getFBXGeometry());
         }
 
         // If we are inside the models box, then consider the submeshes...
@@ -587,9 +587,6 @@ MeshProxyList Model::getMeshes() const {
     return result;
 }
 
-// FIXME: temporary workaround that updates the whole FBXGeometry (to keep findRayIntersection in sync)
-#include "Model_temporary_hack.cpp.h"
-
 bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointer newModel, int meshIndex, int partIndex) {
     QMutexLocker lock(&_mutex);
 
@@ -603,18 +600,60 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
         return false;
     }
 
-    auto resource = new MyGeometryResource(_url, _renderGeometry, newModel);
-    _needsReload = false;
-    _needsUpdateTextures = false;
-    _visualGeometryRequestFailed = false;
-    _needsFixupInScene = true;
+    const auto& meshes = newModel->meshes;
+    render::Transaction transaction;
+    const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
 
-    invalidCalculatedMeshBoxes();
-    deleteGeometry();
-    _renderGeometry.reset(resource);
-    updateGeometry();
-    calculateTriangleSets();
-    setRenderItemsNeedUpdate();
+    meshIndex = meshIndex >= 0 ? meshIndex : 0;
+    partIndex = partIndex >= 0 ? partIndex : 0;
+
+    if (meshIndex >= meshes.size()) {
+        qDebug() << meshIndex << "meshIndex >= newModel.meshes.size()" << meshes.size();
+        return false;
+    }
+
+    auto mesh = meshes[meshIndex].getMeshPointer();
+    {
+        // update visual geometry
+        render::Transaction transaction;
+        for (int i = 0; i < (int) _modelMeshRenderItemIDs.size(); i++) {
+            auto itemID = _modelMeshRenderItemIDs[i];
+            auto shape = _modelMeshRenderItemShapes[i];
+            // TODO: check to see if .partIndex matches too
+            if (shape.meshIndex == meshIndex) {
+                transaction.updateItem<ModelMeshPartPayload>(itemID, [=](ModelMeshPartPayload& data) {
+                    data.updateMeshPart(mesh, partIndex);
+                });
+            }
+        }
+        scene->enqueueTransaction(transaction);
+    }
+    // update triangles for ray picking
+    {
+        FBXGeometry geometry;
+        for (const auto& newMesh : meshes) {
+            FBXMesh mesh;
+            mesh._mesh = newMesh.getMeshPointer();
+            mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION);
+            int numParts = newMesh.getMeshPointer()->getNumParts();
+            for (int partID = 0; partID < numParts; partID++) {
+                FBXMeshPart part;
+                part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
+                mesh.parts << part;
+            }
+            {
+                foreach (const glm::vec3& vertex, mesh.vertices) {
+                    glm::vec3 transformedVertex = glm::vec3(mesh.modelTransform * glm::vec4(vertex, 1.0f));
+                    geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
+                    geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
+                    mesh.meshExtents.minimum = glm::min(mesh.meshExtents.minimum, transformedVertex);
+                    mesh.meshExtents.maximum = glm::max(mesh.meshExtents.maximum, transformedVertex);
+                }
+            }
+            geometry.meshes << mesh;
+        }
+        calculateTriangleSets(geometry);
+    }
     return true;
 }
 
@@ -638,10 +677,9 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
     return result;
 }
 
-void Model::calculateTriangleSets() {
+void Model::calculateTriangleSets(const FBXGeometry& geometry) {
     PROFILE_RANGE(render, __FUNCTION__);
 
-    const FBXGeometry& geometry = getFBXGeometry();
     int numberOfMeshes = geometry.meshes.size();
 
     _triangleSetsValid = true;
@@ -664,7 +702,7 @@ void Model::calculateTriangleSets() {
             int totalTriangles = (numberOfQuads * TRIANGLES_PER_QUAD) + numberOfTris;
             _modelSpaceMeshTriangleSets[i].reserve(totalTriangles);
 
-            auto meshTransform = getFBXGeometry().offset * mesh.modelTransform;
+            auto meshTransform = geometry.offset * mesh.modelTransform;
 
             if (part.quadIndices.size() > 0) {
                 int vIndex = 0;
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index bbb323d1e7..f6a9a64e83 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -419,7 +419,7 @@ protected:
 
     bool _overrideModelTransform { false };
     bool _triangleSetsValid { false };
-    void calculateTriangleSets();
+    void calculateTriangleSets(const FBXGeometry& geometry);
     QVector<TriangleSet> _modelSpaceMeshTriangleSets; // model space triangles for all sub meshes
 
 
diff --git a/libraries/render-utils/src/Model_temporary_hack.cpp.h b/libraries/render-utils/src/Model_temporary_hack.cpp.h
deleted file mode 100644
index cfa6945571..0000000000
--- a/libraries/render-utils/src/Model_temporary_hack.cpp.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// FIXME: temporary workaround for duplicating the FBXModel when dynamically replacing an underlying mesh part
-#include <graphics/BufferViewHelpers.h>
-#include <graphics-scripting/GraphicsScriptingUtil.h>
-class MyGeometryResource : public GeometryResource {
-public:
-    shared_ptr<FBXGeometry> fbxGeometry;
-    MyGeometryResource(const QUrl& url, Geometry::Pointer originalGeometry, scriptable::ScriptableModelBasePointer newModel) : GeometryResource(url) {
-        fbxGeometry = std::make_shared<FBXGeometry>();
-        FBXGeometry& geometry = *fbxGeometry.get();
-        const FBXGeometry* original;
-        shared_ptr<FBXGeometry> tmpGeometry;
-        if (originalGeometry) {
-            original = &originalGeometry->getFBXGeometry();
-        } else {
-            tmpGeometry = std::make_shared<FBXGeometry>();
-            original = tmpGeometry.get();
-        }
-        geometry.originalURL = original->originalURL;
-        geometry.bindExtents = original->bindExtents;
-
-        for (const auto &j : original->joints) {
-            geometry.joints << j;
-        }
-        for (const FBXMaterial& material : original->materials) {
-            _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
-        }
-        std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
-        std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
-        int meshID = 0;
-        if (newModel) {
-            geometry.meshExtents.reset();
-            for (const auto& newMesh : newModel->meshes) {
-                // qDebug() << "newMesh #" << meshID;
-                FBXMesh mesh;
-                if (meshID < original->meshes.size()) {
-                    mesh = original->meshes.at(meshID); // copy
-                }
-                mesh._mesh = newMesh.getMeshPointer();
-                // duplicate the buffers
-                mesh.vertices = buffer_helpers::toVector<glm::vec3>(mesh._mesh->getVertexBuffer(), "mesh.vertices");
-                mesh.normals = buffer_helpers::toVector<glm::vec3>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::NORMAL), "mesh.normals");
-                mesh.colors = buffer_helpers::toVector<glm::vec3>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::COLOR), "mesh.colors");
-                mesh.texCoords = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD0), "mesh.texCoords");
-                mesh.texCoords1 = buffer_helpers::toVector<glm::vec2>(buffer_helpers::getBufferView(mesh._mesh, gpu::Stream::TEXCOORD1), "mesh.texCoords1");
-                mesh.createMeshTangents(true);
-                mesh.createBlendShapeTangents(false);
-                geometry.meshes << mesh;
-                // Copy mesh pointers
-                meshes->emplace_back(newMesh.getMeshPointer());
-                int partID = 0;
-                const auto oldParts = mesh.parts;
-                mesh.parts.clear();
-                for (const FBXMeshPart& fbxPart : oldParts) {
-                    FBXMeshPart part; // new copy
-                    part.materialID = fbxPart.materialID;
-                    // Construct local parts
-                    part.triangleIndices = buffer_helpers::toVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
-                    mesh.parts << part;
-                    auto p = std::make_shared<MeshPart>(meshID, partID, 0);
-                    parts->push_back(p);
-                    partID++;
-                }
-                {
-                    // accumulate local transforms
-                    // compute the mesh extents from the transformed vertices
-                    foreach (const glm::vec3& vertex, mesh.vertices) {
-                        glm::vec3 transformedVertex = glm::vec3(mesh.modelTransform * glm::vec4(vertex, 1.0f));
-                        geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
-                        geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
-
-                        mesh.meshExtents.minimum = glm::min(mesh.meshExtents.minimum, transformedVertex);
-                        mesh.meshExtents.maximum = glm::max(mesh.meshExtents.maximum, transformedVertex);
-                    }
-                }
-                meshID++;
-            }
-        }
-        _meshes = meshes;
-        _meshParts = parts;
-        _loaded = true;
-        _fbxGeometry = fbxGeometry;
-    };
-};
-

From 54dc0240b0cb5c30fc4c7480391812e9930ae6b5 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 26 Feb 2018 05:26:35 -0500
Subject: [PATCH 500/569] remove bufferviewscripting refs; fix compiler
 warnings

---
 .../GraphicsScriptingInterface.cpp            |   1 -
 .../src/graphics-scripting/ScriptableMesh.cpp |   1 -
 .../graphics-scripting/ScriptableMeshPart.cpp |   1 -
 .../src/graphics/BufferViewHelpers.cpp        | 300 +++++++++---------
 4 files changed, 149 insertions(+), 154 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 22ef346df6..ed8982b9c7 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -9,7 +9,6 @@
 //
 
 #include "GraphicsScriptingInterface.h"
-#include "BufferViewScripting.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
 #include "RegisteredMetaTypes.h"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 2cef4fef64..e5e58b847a 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -10,7 +10,6 @@
 #include "ScriptableMesh.h"
 #include "ScriptableMeshPart.h"
 
-#include "BufferViewScripting.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
 #include <BaseScriptEngine.h>
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
index 0d4bb7bdc5..9d6359bee3 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
@@ -9,7 +9,6 @@
 
 #include "ScriptableMeshPart.h"
 
-#include "BufferViewScripting.h"
 #include "GraphicsScriptingUtil.h"
 #include "OBJWriter.h"
 #include <BaseScriptEngine.h>
diff --git a/libraries/graphics/src/graphics/BufferViewHelpers.cpp b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
index 46bd39bb45..5c7e6ff892 100644
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@@ -32,14 +32,12 @@ namespace {
     QLoggingCategory bufferhelper_logging{ "hifi.bufferview" };
 }
 
-const std::array<const char*, 4> buffer_helpers::XYZW = { { "x", "y", "z", "w" } };
-const std::array<const char*, 4> buffer_helpers::ZERO123 = { { "0", "1", "2", "3" } };
+namespace buffer_helpers {
 
-gpu::BufferView buffer_helpers::mesh::getBufferView(const graphics::MeshPointer& mesh, gpu::Stream::Slot slot) {
-    return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
-}
+const std::array<const char*, 4> XYZW = { { "x", "y", "z", "w" } };
+const std::array<const char*, 4> ZERO123 = { { "0", "1", "2", "3" } };
 
-QMap<QString,int> buffer_helpers::ATTRIBUTES{
+QMap<QString,int> ATTRIBUTES{
     {"position", gpu::Stream::POSITION },
     {"normal", gpu::Stream::NORMAL },
     {"color", gpu::Stream::COLOR },
@@ -64,7 +62,7 @@ namespace {
     }
 }
 
-void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
+void packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, glm::uint32& packedNormal, glm::uint32& packedTangent) {
     auto absNormal = glm::abs(normal);
     auto absTangent = glm::abs(tangent);
     normal /= glm::max(1e-6f, glm::max(glm::max(absNormal.x, absNormal.y), absNormal.z));
@@ -90,27 +88,25 @@ void buffer_helpers::packNormalAndTangent(glm::vec3 normal, glm::vec3 tangent, g
     packedTangent = tangentStruct.pack;
 }
 
-namespace {
-    template <typename T>
-    glm::uint32 forEachGlmVec(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func) {
-        QVector<glm::uint32> result;
-        const glm::uint32 num = (glm::uint32)view.getNumElements();
-        glm::uint32 i = 0;
-        for (; i < num; i++) {
-            if (!func(i, view.get<T>(i))) {
-                break;
-            }
+template <typename T>
+glm::uint32 forEachGlmVec(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func) {
+    QVector<glm::uint32> result;
+    const glm::uint32 num = (glm::uint32)view.getNumElements();
+    glm::uint32 i = 0;
+    for (; i < num; i++) {
+        if (!func(i, view.get<T>(i))) {
+            break;
         }
-        return i;
     }
+    return i;
 }
 
-template<> glm::uint32 buffer_helpers::forEach<glm::vec3>(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const glm::vec3& value)> func) {
+template<> glm::uint32 forEach<glm::vec3>(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const glm::vec3& value)> func) {
     return forEachGlmVec<glm::vec3>(view, func);
 }
 
 template <typename T>
-QVariant buffer_helpers::glmVecToVariant(const T& v, bool asArray /*= false*/) {
+QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
     static const auto len = T().length();
     if (asArray) {
         QVariantList list;
@@ -128,7 +124,7 @@ QVariant buffer_helpers::glmVecToVariant(const T& v, bool asArray /*= false*/) {
 }
 
 template <typename T>
-const T buffer_helpers::glmVecFromVariant(const QVariant& v) {
+const T glmVecFromVariant(const QVariant& v) {
     auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
     static const auto len = T().length();
     const auto& components = isMap ? XYZW : ZERO123;
@@ -155,23 +151,21 @@ const T buffer_helpers::glmVecFromVariant(const QVariant& v) {
 
 // QVector<T> => BufferView
 template <typename T>
-gpu::BufferView buffer_helpers::newFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
+gpu::BufferView newFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
     auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
     return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
 
-namespace {
-    template <typename T>
-    gpu::BufferView bufferViewFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
-        auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
-        return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
-    }
+template <typename T>
+gpu::BufferView bufferViewFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
+    auto vertexBuffer = std::make_shared<gpu::Buffer>(elements.size() * sizeof(T), (gpu::Byte*)elements.data());
+    return { vertexBuffer, 0, vertexBuffer->getSize(),sizeof(T), elementType };
 }
-template<> gpu::BufferView buffer_helpers::newFromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
-template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec2>(const QVector<glm::vec2>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
-template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec3>( const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
-template<> gpu::BufferView buffer_helpers::newFromVector<glm::vec4>(const QVector<glm::vec4>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
-template<> gpu::BufferView buffer_helpers::newFromVector<graphics::Mesh::Part>(const QVector<graphics::Mesh::Part>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView newFromVector<unsigned int>(const QVector<unsigned int>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView newFromVector<glm::vec2>(const QVector<glm::vec2>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView newFromVector<glm::vec3>( const QVector<glm::vec3>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView newFromVector<glm::vec4>(const QVector<glm::vec4>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
+template<> gpu::BufferView newFromVector<graphics::Mesh::Part>(const QVector<graphics::Mesh::Part>& elements, const gpu::Element& elementType) { return bufferViewFromVector(elements, elementType); }
 
 struct GpuToGlmAdapter {
     static float error(const QString& name, const gpu::BufferView& view, glm::uint32 index, const char *hint) {
@@ -356,24 +350,24 @@ struct GpuValueResolver {
 };
 
 // BufferView => QVector<T>
-template <typename U> QVector<U> buffer_helpers::bufferToVector(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<U>,U>::toVector(view, hint); }
+template <typename U> QVector<U> bufferToVector(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<U>,U>::toVector(view, hint); }
 
-template<> QVector<int> buffer_helpers::bufferToVector<int>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<int>,int>::toVector(view, hint); }
-template<> QVector<glm::uint16> buffer_helpers::bufferToVector<glm::uint16>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint16>,glm::uint16>::toVector(view, hint); }
-template<> QVector<glm::uint32> buffer_helpers::bufferToVector<glm::uint32>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint32>,glm::uint32>::toVector(view, hint); }
-template<> QVector<glm::vec2> buffer_helpers::bufferToVector<glm::vec2>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec2ToGlm<glm::vec2>,glm::vec2>::toVector(view, hint); }
-template<> QVector<glm::vec3> buffer_helpers::bufferToVector<glm::vec3>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec3ToGlm<glm::vec3>,glm::vec3>::toVector(view, hint); }
-template<> QVector<glm::vec4> buffer_helpers::bufferToVector<glm::vec4>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec4ToGlm<glm::vec4>,glm::vec4>::toVector(view, hint); }
+template<> QVector<int> bufferToVector<int>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<int>,int>::toVector(view, hint); }
+template<> QVector<glm::uint16> bufferToVector<glm::uint16>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint16>,glm::uint16>::toVector(view, hint); }
+template<> QVector<glm::uint32> bufferToVector<glm::uint32>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuScalarToGlm<glm::uint32>,glm::uint32>::toVector(view, hint); }
+template<> QVector<glm::vec2> bufferToVector<glm::vec2>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec2ToGlm<glm::vec2>,glm::vec2>::toVector(view, hint); }
+template<> QVector<glm::vec3> bufferToVector<glm::vec3>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec3ToGlm<glm::vec3>,glm::vec3>::toVector(view, hint); }
+template<> QVector<glm::vec4> bufferToVector<glm::vec4>(const gpu::BufferView& view, const char *hint) { return GpuValueResolver<GpuVec4ToGlm<glm::vec4>,glm::vec4>::toVector(view, hint); }
 
 // view.get<T> with conversion between types
-template<> int buffer_helpers::getValue<int>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<int>::get(view, index, hint); }
-template<> glm::uint32 buffer_helpers::getValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<glm::uint32>::get(view, index, hint); }
-template<> glm::vec2 buffer_helpers::getValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec2ToGlm<glm::vec2>::get(view, index, hint); }
-template<> glm::vec3 buffer_helpers::getValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec3ToGlm<glm::vec3>::get(view, index, hint); }
-template<> glm::vec4 buffer_helpers::getValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec4ToGlm<glm::vec4>::get(view, index, hint); }
+template<> int getValue<int>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<int>::get(view, index, hint); }
+template<> glm::uint32 getValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuScalarToGlm<glm::uint32>::get(view, index, hint); }
+template<> glm::vec2 getValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec2ToGlm<glm::vec2>::get(view, index, hint); }
+template<> glm::vec3 getValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec3ToGlm<glm::vec3>::get(view, index, hint); }
+template<> glm::vec4 getValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const char *hint) { return GpuVec4ToGlm<glm::vec4>::get(view, index, hint); }
 
 // bufferView => QVariant
-template<> QVariant buffer_helpers::getValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const char* hint) {
+template<> QVariant getValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const char* hint) {
     if (!boundsCheck(view, index)) {
         qDebug() << "getValue<QVariant> -- out of bounds" << index << hint;
         return false;
@@ -402,24 +396,8 @@ template<> QVariant buffer_helpers::getValue<QVariant>(const gpu::BufferView& vi
     return QVariant();
 }
 
-glm::uint32 buffer_helpers::mesh::forEachVertex(const graphics::MeshPointer& mesh, std::function<bool(glm::uint32 index, const QVariantMap& values)> func) {
-    glm::uint32 i = 0;
-    auto attributeViews = getAllBufferViews(mesh);
-    auto nPositions = mesh->getNumVertices();
-    for (; i < nPositions; i++) {
-        QVariantMap values;
-        for (const auto& a : attributeViews) {
-            values[a.first] = buffer_helpers::getValue<QVariant>(a.second, i, qUtf8Printable(a.first));
-        }
-        if (!func(i, values)) {
-            break;
-        }
-    }
-    return i;
-}
-
 // view.edit<T> with conversion between types
-template<> bool buffer_helpers::setValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const QVariant& v, const char* hint) {
+template<> bool setValue<QVariant>(const gpu::BufferView& view, glm::uint32 index, const QVariant& v, const char* hint) {
     if (!boundsCheck(view, index)) {
         qDebug() << "setValue<QVariant> -- out of bounds" << index << hint;
         return false;
@@ -450,80 +428,51 @@ template<> bool buffer_helpers::setValue<QVariant>(const gpu::BufferView& view,
     return false;
 }
 
-template<> bool buffer_helpers::setValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const glm::uint32& value, const char* hint) {
+template<> bool setValue<glm::uint32>(const gpu::BufferView& view, glm::uint32 index, const glm::uint32& value, const char* hint) {
     return GpuScalarToGlm<glm::uint32>::set(view, index, value, hint);
 }
-template<> bool buffer_helpers::setValue<glm::uint16>(const gpu::BufferView& view, glm::uint32 index, const glm::uint16& value, const char* hint) {
+template<> bool setValue<glm::uint16>(const gpu::BufferView& view, glm::uint32 index, const glm::uint16& value, const char* hint) {
     return GpuScalarToGlm<glm::uint16>::set(view, index, value, hint);
 }
-template<> bool buffer_helpers::setValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const glm::vec2& value, const char* hint) {
+template<> bool setValue<glm::vec2>(const gpu::BufferView& view, glm::uint32 index, const glm::vec2& value, const char* hint) {
     return GpuVec2ToGlm<glm::vec2>::set(view, index, value, hint);
 }
-template<> bool buffer_helpers::setValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const glm::vec3& value, const char* hint) {
+template<> bool setValue<glm::vec3>(const gpu::BufferView& view, glm::uint32 index, const glm::vec3& value, const char* hint) {
     return GpuVec3ToGlm<glm::vec3>::set(view, index, value, hint);
 }
-template<> bool buffer_helpers::setValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const glm::vec4& value, const char* hint) {
+template<> bool setValue<glm::vec4>(const gpu::BufferView& view, glm::uint32 index, const glm::vec4& value, const char* hint) {
     return GpuVec4ToGlm<glm::vec4>::set(view, index, value, hint);
 }
 
-bool buffer_helpers::mesh::setVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 index, const QVariantMap& attributes) {
-    bool ok = true;
-    for (auto& a : getAllBufferViews(mesh)) {
-        const auto& name = a.first;
-        if (attributes.contains(name)) {
-            const auto& value = attributes.value(name);
-            if (value.isValid()) {
-                auto& view = a.second;
-                buffer_helpers::setValue<QVariant>(view, index, value);
-            } else {
-                ok = false;
-                //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
-            }
-        }
-    }
-    return ok;
-}
-
-QVariant buffer_helpers::mesh::getVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 vertexIndex) {
-    auto attributeViews = getAllBufferViews(mesh);
-    QVariantMap values;
-    for (const auto& a : attributeViews) {
-        values[a.first] = buffer_helpers::getValue<QVariant>(a.second, vertexIndex, qUtf8Printable(a.first));
-    }
-    return values;
-}
-
 // QVariantList => QVector<T>
-namespace {
-    template <class T> QVector<T> qVariantListToGlmVector(const QVariantList& list) {
-        QVector<T> output;
-        output.resize(list.size());
-        int i = 0;
-        for (const auto& v : list) {
-            output[i++] = buffer_helpers::glmVecFromVariant<T>(v);
-        }
-        return output;
+template <class T> QVector<T> qVariantListToGlmVector(const QVariantList& list) {
+    QVector<T> output;
+    output.resize(list.size());
+    int i = 0;
+    for (const auto& v : list) {
+        output[i++] = glmVecFromVariant<T>(v);
     }
-    template <typename T> QVector<T> qVariantListToScalarVector(const QVariantList& list) {
-        QVector<T> output;
-        output.resize(list.size());
-        int i = 0;
-        for (const auto& v : list) {
-            output[i++] = v.value<T>();
-        }
-        return output;
+    return output;
+}
+template <typename T> QVector<T> qVariantListToScalarVector(const QVariantList& list) {
+    QVector<T> output;
+    output.resize(list.size());
+    int i = 0;
+    for (const auto& v : list) {
+        output[i++] = v.value<T>();
     }
+    return output;
 }
 
-template <class T> QVector<T> buffer_helpers::variantToVector(const QVariant& value) { qDebug() << "variantToVector[class]"; return qVariantListToGlmVector<T>(value.toList()); }
-template<> QVector<glm::float32> buffer_helpers::variantToVector<glm::float32>(const QVariant& value) { return qVariantListToScalarVector<glm::float32>(value.toList()); }
-template<> QVector<glm::uint32> buffer_helpers::variantToVector<glm::uint32>(const QVariant& value) { return qVariantListToScalarVector<glm::uint32>(value.toList()); }
-template<> QVector<glm::int32> buffer_helpers::variantToVector<glm::int32>(const QVariant& value) { return qVariantListToScalarVector<glm::int32>(value.toList()); }
-template<> QVector<glm::vec2> buffer_helpers::variantToVector<glm::vec2>(const QVariant& value) { return qVariantListToGlmVector<glm::vec2>(value.toList()); }
-template<> QVector<glm::vec3> buffer_helpers::variantToVector<glm::vec3>(const QVariant& value) { return qVariantListToGlmVector<glm::vec3>(value.toList()); }
-template<> QVector<glm::vec4> buffer_helpers::variantToVector<glm::vec4>(const QVariant& value) { return qVariantListToGlmVector<glm::vec4>(value.toList()); }
+template <class T> QVector<T> variantToVector(const QVariant& value) { qDebug() << "variantToVector[class]"; return qVariantListToGlmVector<T>(value.toList()); }
+template<> QVector<glm::float32> variantToVector<glm::float32>(const QVariant& value) { return qVariantListToScalarVector<glm::float32>(value.toList()); }
+template<> QVector<glm::uint32> variantToVector<glm::uint32>(const QVariant& value) { return qVariantListToScalarVector<glm::uint32>(value.toList()); }
+template<> QVector<glm::int32> variantToVector<glm::int32>(const QVariant& value) { return qVariantListToScalarVector<glm::int32>(value.toList()); }
+template<> QVector<glm::vec2> variantToVector<glm::vec2>(const QVariant& value) { return qVariantListToGlmVector<glm::vec2>(value.toList()); }
+template<> QVector<glm::vec3> variantToVector<glm::vec3>(const QVariant& value) { return qVariantListToGlmVector<glm::vec3>(value.toList()); }
+template<> QVector<glm::vec4> variantToVector<glm::vec4>(const QVariant& value) { return qVariantListToGlmVector<glm::vec4>(value.toList()); }
 
-template<> gpu::BufferView buffer_helpers::newFromVector<QVariant>(const QVector<QVariant>& _elements, const gpu::Element& elementType) {
+template<> gpu::BufferView newFromVector<QVariant>(const QVector<QVariant>& _elements, const gpu::Element& elementType) {
     glm::uint32 numElements = _elements.size();
     auto buffer = new gpu::Buffer();
     buffer->resize(elementType.getSize() * numElements);
@@ -535,14 +484,14 @@ template<> gpu::BufferView buffer_helpers::newFromVector<QVariant>(const QVector
 }
 
 
-gpu::BufferView buffer_helpers::clone(const gpu::BufferView& input) {
+gpu::BufferView clone(const gpu::BufferView& input) {
     return gpu::BufferView(
         std::make_shared<gpu::Buffer>(input._buffer->getSize(), input._buffer->getData()),
         input._offset, input._size, input._stride, input._element
     );
 }
 
-gpu::BufferView buffer_helpers::resized(const gpu::BufferView& input, glm::uint32 numElements) {
+gpu::BufferView resized(const gpu::BufferView& input, glm::uint32 numElements) {
 #ifdef DEBUG_BUFFERVIEW_HELPERS
     auto effectiveSize = input._buffer->getSize() / input.getNumElements();
     qCDebug(bufferhelper_logging) << "resize input" << input.getNumElements() << input._buffer->getSize() << "effectiveSize" << effectiveSize;
@@ -559,36 +508,85 @@ gpu::BufferView buffer_helpers::resized(const gpu::BufferView& input, glm::uint3
     return output;
 }
 
-graphics::MeshPointer buffer_helpers::mesh::clone(const graphics::MeshPointer& mesh) {
-    auto clone = std::make_shared<graphics::Mesh>();
-    clone->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
-    clone->setIndexBuffer(buffer_helpers::clone(mesh->getIndexBuffer()));
-    clone->setPartBuffer(buffer_helpers::clone(mesh->getPartBuffer()));
-    auto attributeViews = buffer_helpers::mesh::getAllBufferViews(mesh);
-    for (const auto& a : attributeViews) {
-        auto& view = a.second;
-        auto slot = buffer_helpers::ATTRIBUTES[a.first];
-        auto points = buffer_helpers::clone(view);
-        if (slot == gpu::Stream::POSITION) {
-            clone->setVertexBuffer(points);
-        } else {
-            clone->addAttribute(slot, points);
-        }
+// mesh helpers
+namespace mesh {
+    gpu::BufferView getBufferView(const graphics::MeshPointer& mesh, gpu::Stream::Slot slot) {
+        return slot == gpu::Stream::POSITION ? mesh->getVertexBuffer() : mesh->getAttributeBuffer(slot);
     }
-    return clone;
-}
 
-std::map<QString, gpu::BufferView> buffer_helpers::mesh::getAllBufferViews(const graphics::MeshPointer& mesh) {
-    std::map<QString, gpu::BufferView> attributeViews;
-    if (!mesh) {
+    glm::uint32 forEachVertex(const graphics::MeshPointer& mesh, std::function<bool(glm::uint32 index, const QVariantMap& values)> func) {
+        glm::uint32 i = 0;
+        auto attributeViews = getAllBufferViews(mesh);
+        auto nPositions = mesh->getNumVertices();
+        for (; i < nPositions; i++) {
+            QVariantMap values;
+            for (const auto& a : attributeViews) {
+                values[a.first] = getValue<QVariant>(a.second, i, qUtf8Printable(a.first));
+            }
+            if (!func(i, values)) {
+                break;
+            }
+        }
+        return i;
+    }
+    bool setVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 index, const QVariantMap& attributes) {
+        bool ok = true;
+        for (auto& a : getAllBufferViews(mesh)) {
+            const auto& name = a.first;
+            if (attributes.contains(name)) {
+                const auto& value = attributes.value(name);
+                if (value.isValid()) {
+                    auto& view = a.second;
+                    setValue<QVariant>(view, index, value);
+                } else {
+                    ok = false;
+                    //qCDebug(graphics_scripting) << "(skipping) setVertexAttributes" << vertexIndex << name;
+                }
+            }
+        }
+        return ok;
+    }
+
+    QVariant getVertexAttributes(const graphics::MeshPointer& mesh, glm::uint32 vertexIndex) {
+        auto attributeViews = getAllBufferViews(mesh);
+        QVariantMap values;
+        for (const auto& a : attributeViews) {
+            values[a.first] = getValue<QVariant>(a.second, vertexIndex, qUtf8Printable(a.first));
+        }
+        return values;
+    }
+
+    graphics::MeshPointer clone(const graphics::MeshPointer& mesh) {
+        auto clonedMesh = std::make_shared<graphics::Mesh>();
+        clonedMesh->displayName = (QString::fromStdString(mesh->displayName) + "-clone").toStdString();
+        clonedMesh->setIndexBuffer(buffer_helpers::clone(mesh->getIndexBuffer()));
+        clonedMesh->setPartBuffer(buffer_helpers::clone(mesh->getPartBuffer()));
+        auto attributeViews = getAllBufferViews(mesh);
+        for (const auto& a : attributeViews) {
+            auto& view = a.second;
+            auto slot = ATTRIBUTES[a.first];
+            auto points = buffer_helpers::clone(view);
+            if (slot == gpu::Stream::POSITION) {
+                clonedMesh->setVertexBuffer(points);
+            } else {
+                clonedMesh->addAttribute(slot, points);
+            }
+        }
+        return clonedMesh;
+    }
+
+    std::map<QString, gpu::BufferView> getAllBufferViews(const graphics::MeshPointer& mesh) {
+        std::map<QString, gpu::BufferView> attributeViews;
+        if (!mesh) {
+            return attributeViews;
+        }
+        for (const auto& a : ATTRIBUTES.toStdMap()) {
+            auto bufferView = getBufferView(mesh, a.second);
+            if (bufferView.getNumElements()) {
+                attributeViews[a.first] = bufferView;
+            }
+        }
         return attributeViews;
     }
-    for (const auto& a : buffer_helpers::ATTRIBUTES.toStdMap()) {
-        auto bufferView = getBufferView(mesh, a.second);
-        if (bufferView.getNumElements()) {
-            attributeViews[a.first] = bufferView;
-        }
-    }
-    return attributeViews;
-}
-
+} // mesh
+} // buffer_helpers

From 3dbe5d79bb9900f43dd8edfd6e1e8db164d3eb3d Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 26 Feb 2018 06:01:16 -0500
Subject: [PATCH 501/569] fix windows punctilious warnings

---
 .../src/graphics-scripting/ScriptableMesh.cpp      | 14 +++++++-------
 libraries/render-utils/src/Model.cpp               |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index e5e58b847a..5ff916275e 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -131,10 +131,10 @@ QVariantMap scriptable::ScriptableMesh::getBufferFormats() const {
         auto bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), a.second);
         result[a.first] = QVariantMap{
             { "slot", a.second },
-            { "length", (quint32)bufferView.getNumElements() },
-            { "byteLength", (quint32)bufferView._size },
-            { "offset", (quint32) bufferView._offset },
-            { "stride", (quint32)bufferView._stride },
+            { "length", (glm::uint32)bufferView.getNumElements() },
+            { "byteLength", (glm::uint32)bufferView._size },
+            { "offset", (glm::uint32) bufferView._offset },
+            { "stride", (glm::uint32)bufferView._stride },
             { "element", scriptable::toVariant(bufferView._element) },
         };
     }
@@ -171,7 +171,7 @@ glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeNam
         return values.size();
     } else {
         auto bufferView = buffer_helpers::mesh::getBufferView(mesh, slot);
-        auto current = bufferView.getNumElements();
+        auto current = (glm::uint32)bufferView.getNumElements();
         if (current < numVertices) {
             bufferView = buffer_helpers::resized(bufferView, numVertices);
             for (glm::uint32 i = current; i < numVertices; i++) {
@@ -220,7 +220,7 @@ QVariantList scriptable::ScriptableMesh::queryVertexAttributes(QVariant selector
     }
     auto slotNum = _getSlotNumber(attributeName);
     const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
-    glm::uint32 numElements = bufferView.getNumElements();
+    glm::uint32 numElements = (glm::uint32)bufferView.getNumElements();
     for (glm::uint32 i = 0; i < numElements; i++) {
         result << buffer_helpers::getValue<QVariant>(bufferView, i, qUtf8Printable(attributeName));
     }
@@ -339,7 +339,7 @@ bool scriptable::ScriptableMesh::isValidIndex(glm::uint32 vertexIndex, const QSt
             return false;
         }
         auto view = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
-        if (vertexIndex >= view.getNumElements()) {
+        if (vertexIndex >= (glm::uint32)view.getNumElements()) {
             if (context()) {
                 context()->throwError(QString("vertexIndex=%1 out of range (attribute=%2, numElements=%3)").arg(vertexIndex).arg(attributeName).arg(view.getNumElements()));
             }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 0abeb70254..f6e3ce20f0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -635,7 +635,7 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
             FBXMesh mesh;
             mesh._mesh = newMesh.getMeshPointer();
             mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION);
-            int numParts = newMesh.getMeshPointer()->getNumParts();
+            int numParts = (int)newMesh.getMeshPointer()->getNumParts();
             for (int partID = 0; partID < numParts; partID++) {
                 FBXMeshPart part;
                 part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");

From 77ef0e05a1c3662cbd431b50b6b26bb22483a81f Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 26 Feb 2018 13:43:50 +0100
Subject: [PATCH 502/569] Search main window by checking object name

---
 libraries/ui/src/OffscreenUi.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 4309789b03..7a938f39c8 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -625,8 +625,7 @@ private:
         auto windows = qApp->topLevelWindows();
         QWindow* result = nullptr;
         for (auto window : windows) {
-            QVariant isMainWindow = window->property("MainWindow");
-            if (!qobject_cast<QQuickWindow*>(window)) {
+            if (window->objectName().contains("MainWindow")) {
                 result = window;
                 break;
             }

From 0404b722e4c9766f8f7b6f7ca2e50cb03e40c83d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 26 Feb 2018 10:00:32 -0800
Subject: [PATCH 503/569] Code review feedback

---
 .../render-utils/src/CauterizedModel.cpp      |  2 +-
 .../render-utils/src/MeshPartPayload.cpp      | 31 ++++++++++++-------
 libraries/render-utils/src/MeshPartPayload.h  |  8 ++---
 libraries/render-utils/src/Model.cpp          |  9 ++----
 libraries/shared/src/GLMHelpers.cpp           |  2 +-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index fb1d31d273..6806b41647 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -275,7 +275,7 @@ void CauterizedModel::updateRenderItems() {
                     data.setEnableCauterization(enableCauterization);
                     data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, render::ItemKey::TAG_BITS_ALL);
                     data.setLayer(isLayeredInFront, isLayeredInHUD);
-                    data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
+                    data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
                 });
             }
 
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 99048fe324..2637d24d67 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -223,7 +223,7 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
 
     assert(model && model->isLoaded());
 
-    _useDualQuaternionSkinning = model->getUseDualQuaternionSkinning();
+    bool useDualQuaternionSkinning = model->getUseDualQuaternionSkinning();
 
     _blendedVertexBuffer = model->_blendedVertexBuffers[_meshIndex];
     auto& modelMesh = model->getGeometry()->getMeshes().at(_meshIndex);
@@ -231,7 +231,7 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
 
     updateMeshPart(modelMesh, partIndex);
 
-    if (_useDualQuaternionSkinning) {
+    if (useDualQuaternionSkinning) {
         computeAdjustedLocalBound(state.clusterDualQuaternions);
     } else {
         computeAdjustedLocalBound(state.clusterMatrices);
@@ -239,7 +239,7 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
 
     updateTransform(transform, offsetTransform);
     Transform renderTransform = transform;
-    if (_useDualQuaternionSkinning) {
+    if (useDualQuaternionSkinning) {
         if (state.clusterDualQuaternions.size() == 1) {
             const auto& dq = state.clusterDualQuaternions[0];
             Transform transform(dq.getRotation(),
@@ -281,6 +281,13 @@ void ModelMeshPartPayload::notifyLocationChanged() {
 }
 
 void ModelMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices) {
+
+    // reset cluster buffer if we change the cluster buffer type
+    if (_clusterBufferType != ClusterBufferType::Matrices) {
+        _clusterBuffer.reset();
+    }
+    _clusterBufferType = ClusterBufferType::Matrices;
+
     // Once computed the cluster matrices, update the buffer(s)
     if (clusterMatrices.size() > 1) {
         if (!_clusterBuffer) {
@@ -295,6 +302,13 @@ void ModelMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clu
 }
 
 void ModelMeshPartPayload::updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions) {
+
+    // reset cluster buffer if we change the cluster buffer type
+    if (_clusterBufferType != ClusterBufferType::DualQuaternions) {
+        _clusterBuffer.reset();
+    }
+    _clusterBufferType = ClusterBufferType::DualQuaternions;
+
     // Once computed the cluster matrices, update the buffer(s)
     if (clusterDualQuaternions.size() > 1) {
         if (!_clusterBuffer) {
@@ -360,7 +374,7 @@ int ModelMeshPartPayload::getLayer() const {
     return _layer;
 }
 
-void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe) {
+void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning) {
     if (invalidateShapeKey) {
         _shapeKey = ShapeKey::Builder::invalid();
         return;
@@ -407,7 +421,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe
     if (isWireframe) {
         builder.withWireframe();
     }
-    if (_useDualQuaternionSkinning && isSkinned) {
+    if (isSkinned && useDualQuaternionSkinning) {
         builder.withDualQuatSkinned();
     }
 
@@ -497,10 +511,3 @@ void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<Model::Tr
         }
     }
 }
-
-void ModelMeshPartPayload::setUseDualQuaternionSkinning(bool value) {
-    if (value != _useDualQuaternionSkinning) {
-        _clusterBuffer.reset();
-    }
-    _useDualQuaternionSkinning = value;
-}
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 6f78fdbf51..bac5146d99 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -108,7 +108,7 @@ public:
     void render(RenderArgs* args) override;
 
     void setLayer(bool isLayeredInFront, bool isLayeredInHUD);
-    void setShapeKey(bool invalidateShapeKey, bool isWireframe);
+    void setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning);
 
     // ModelMeshPartPayload functions to perform render
     void bindMesh(gpu::Batch& batch) override;
@@ -120,17 +120,17 @@ public:
     // dual quaternion skinning
     void computeAdjustedLocalBound(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions);
 
-    void setUseDualQuaternionSkinning(bool value);
-
     gpu::BufferPointer _clusterBuffer;
 
+    enum class ClusterBufferType { Matrices, DualQuaternions };
+    ClusterBufferType _clusterBufferType { ClusterBufferType::Matrices };
+
     int _meshIndex;
     int _shapeID;
 
     bool _isSkinned{ false };
     bool _isBlendShaped { false };
     bool _hasTangents { false };
-    bool _useDualQuaternionSkinning { false };
 
 private:
     void initCache(const ModelPointer& model);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 8318715732..4198193fc9 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -288,7 +288,6 @@ void Model::updateRenderItems() {
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
                                                                   viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
                 if (useDualQuaternionSkinning) {
                     data.updateClusterBuffer(meshState.clusterDualQuaternions);
                 } else {
@@ -314,7 +313,7 @@ void Model::updateRenderItems() {
 
                 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
-                data.setShapeKey(invalidatePayloadShapeKey, isWireframe);
+                data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
             });
         }
 
@@ -1591,8 +1590,7 @@ void Model::addMaterial(graphics::MaterialLayer material, const std::string& par
                 data.addMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
                 data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
-                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
-                data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+                data.setShapeKey(invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning);
             });
         }
     }
@@ -1618,8 +1616,7 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
                 data.removeMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
                 data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
-                data.setUseDualQuaternionSkinning(useDualQuaternionSkinning);
-                data.setShapeKey(invalidatePayloadShapeKey, wireframe);
+                data.setShapeKey(invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning);
             });
         }
     }
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index 46e484cf2b..ad2c991c49 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -602,5 +602,5 @@ glm::vec3 randVector() {
 }
 
 bool isNonUniformScale(const glm::vec3& scale) {
-    return fabsf(scale.x - scale.y) > EPSILON || fabsf(scale.y - scale.z) > EPSILON;
+    return fabsf(scale.x - scale.y) > EPSILON || fabsf(scale.y - scale.z) > EPSILON || fabsf(scale.z - scale.x);
 }

From c8af9c6f04c85e2e29334b6f1ef92854e6466e6f Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Mon, 26 Feb 2018 10:05:15 -0800
Subject: [PATCH 504/569] Missing EPSILON

---
 libraries/shared/src/GLMHelpers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index ad2c991c49..72710a6a7d 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -602,5 +602,5 @@ glm::vec3 randVector() {
 }
 
 bool isNonUniformScale(const glm::vec3& scale) {
-    return fabsf(scale.x - scale.y) > EPSILON || fabsf(scale.y - scale.z) > EPSILON || fabsf(scale.z - scale.x);
+    return fabsf(scale.x - scale.y) > EPSILON || fabsf(scale.y - scale.z) > EPSILON || fabsf(scale.z - scale.x) > EPSILON;
 }

From 4e4aebc7ee66ff152c3f782fae9343b9ae557443 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Mon, 26 Feb 2018 12:02:56 -0800
Subject: [PATCH 505/569] get WalletChoice setup flow from My Purchases and
 confirmation. Still not correct referrer.

---
 .../resources/qml/hifi/commerce/checkout/Checkout.qml  | 10 +---------
 .../qml/hifi/commerce/purchases/Purchases.qml          | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 730396af08..372fb3c774 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -59,19 +59,11 @@ Rectangle {
                 if (root.activeView !== "needsLogIn") {
                     root.activeView = "needsLogIn";
                 }
-            } else if (walletStatus === 1) {
+            } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
                 if (root.activeView !== "notSetUp") {
                     root.activeView = "notSetUp";
                     notSetUpTimer.start();
                 }
-            } else if (walletStatus === 2) {
-                if (root.activeView != "preexisting") {
-                    root.activeView = "preexisting";
-                }
-            } else if (walletStatus === 3) {
-                if (root.activeView != "conflicting") {
-                    root.activeView = "conflicting";
-                }
             } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 97cddc453a..c505baebf4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -47,19 +47,11 @@ Rectangle {
                 if (root.activeView !== "needsLogIn") {
                     root.activeView = "needsLogIn";
                 }
-            } else if (walletStatus === 1) {
+            } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
                 if (root.activeView !== "notSetUp") {
                     root.activeView = "notSetUp";
                     notSetUpTimer.start();
                 }
-            } else if (walletStatus === 2) {
-                if (root.activeView != "preexisting") {
-                    root.activeView = "preexisting";
-                }
-            } else if (walletStatus === 3) {
-                if (root.activeView != "conflicting") {
-                    root.activeView = "conflicting";
-                }
             } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";

From 8223ebf393ad5f04a49f162abf338351a29f4ef7 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 26 Feb 2018 12:44:41 -0800
Subject: [PATCH 506/569] Correctly handle referrer from WalletChoice

---
 .../qml/hifi/commerce/wallet/Wallet.qml       | 25 +++++++++++--------
 .../qml/hifi/commerce/wallet/WalletChoice.qml |  1 +
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 3a037fb9b9..f779588f17 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -179,8 +179,8 @@ Rectangle {
             if (isReset) {
                 walletResetSetup();
             } else {
-                root.activeView = "initialize";
-                Commerce.getWalletStatus();
+                var msg = { referrer: walletChoice.referrer }
+                followReferrer(msg);
             }
         }
         copyFunction: Commerce.copyKeyFileFrom;
@@ -199,14 +199,7 @@ Rectangle {
         Connections {
             onSendSignalToWallet: {
                 if (msg.method === 'walletSetup_finished') {
-                    if (msg.referrer === '' || msg.referrer === 'marketplace cta') {
-                        root.activeView = "initialize";
-                        Commerce.getWalletStatus();
-                    } else if (msg.referrer === 'purchases') {
-                        sendToScript({method: 'goToPurchases'});
-                    } else {
-                        sendToScript({method: 'goToMarketplaceItemPage', itemId: msg.referrer});
-                    }
+                    followReferrer(msg);
                 } else if (msg.method === 'walletSetup_raiseKeyboard') {
                     root.keyboardRaised = true;
                     root.isPassword = msg.isPasswordField;
@@ -759,6 +752,7 @@ Rectangle {
         switch (message.method) {
             case 'updateWalletReferrer':
                 walletSetup.referrer = message.referrer;
+                walletChoice.referrer = message.referrer;
             break;
             case 'inspectionCertificate_resetCert':
                 // NOP
@@ -798,6 +792,17 @@ Rectangle {
         UserActivityLogger.commerceWalletSetupStarted(timestamp, walletSetup.setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
             (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
     }
+
+    function followReferrer(msg) {
+        if (msg.referrer === '' || msg.referrer === 'marketplace cta') {
+            root.activeView = "initialize";
+            Commerce.getWalletStatus();
+        } else if (msg.referrer === 'purchases') {
+            sendToScript({method: 'goToPurchases'});
+        } else {
+            sendToScript({method: 'goToMarketplaceItemPage', itemId: msg.referrer});
+        }
+    }
     //
     // FUNCTION DEFINITIONS END
     //
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 20d5212ecb..457db55fd1 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -25,6 +25,7 @@ Item {
     property string activeView: "conflict";
     property var proceedFunction: nil;
     property var copyFunction: nil;
+    property string referrer: "";
 
     Image {
         anchors.fill: parent;

From dbfbee5406764b47b8aa0f9996be11ab1df06a22 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 13:43:33 -0800
Subject: [PATCH 507/569] CR

---
 assignment-client/src/octree/OctreeServer.cpp |  2 -
 .../src/DomainContentBackupManager.cpp        | 92 ++++++++-----------
 .../src/DomainContentBackupManager.h          | 11 ++-
 domain-server/src/DomainServer.cpp            |  3 +-
 domain-server/src/EntitiesBackupHandler.cpp   |  5 +-
 libraries/octree/src/Octree.cpp               |  2 -
 libraries/octree/src/OctreePersistThread.h    |  2 +-
 libraries/octree/src/OctreeUtils.cpp          |  4 +-
 libraries/shared/src/GenericThread.cpp        |  2 -
 9 files changed, 53 insertions(+), 70 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 05d070606a..f3859e99cf 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -1041,8 +1041,6 @@ void OctreeServer::readConfiguration() {
             _persistFilePath = getMyDefaultPersistFilename();
         }
 
-        // If persist filename does not exist, let's see if there is one beside the application binary
-        // If there is, let's copy it over to our target persist directory
         QDir persistPath { _persistFilePath };
 
         if (persistPath.isRelative()) {
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index ecb242f7f8..7c5fd35752 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -38,8 +38,7 @@
 
 #include "DomainServer.h"
 
-const int DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL = 1000 * 30;  // every 30 seconds
-
+const std::chrono::milliseconds DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL { 30 * 1000 };  // every 30 seconds 
 // Backup format looks like: daily_backup-TIMESTAMP.zip
 static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
@@ -53,12 +52,11 @@ void DomainContentBackupManager::addBackupHandler(BackupHandlerPointer handler)
 
 DomainContentBackupManager::DomainContentBackupManager(const QString& backupDirectory,
                                                        const QVariantList& backupRules,
-                                                       int persistInterval,
-                                                       bool debugTimestampNow)
-    : _backupDirectory(backupDirectory),
-    _persistInterval(persistInterval),
-    _lastCheck(usecTimestampNow())
+                                                       std::chrono::milliseconds persistInterval,
+                                                       bool debugTimestampNow) :
+    _backupDirectory(backupDirectory), _persistInterval(persistInterval), _lastCheck(p_high_resolution_clock::now())
 {
+
     setObjectName("DomainContentBackupManager");
 
     // Make sure the backup directory exists.
@@ -121,7 +119,32 @@ int64_t DomainContentBackupManager::getMostRecentBackupTimeInSecs(const QString&
 }
 
 void DomainContentBackupManager::setup() {
-    load();
+    auto backups = getAllBackups();
+    for (auto& backup : backups) {
+        QFile backupFile { backup.absolutePath };
+        if (!backupFile.open(QIODevice::ReadOnly)) {
+            qCritical() << "Could not open file:" << backup.absolutePath;
+            qCritical() << "    ERROR:" << backupFile.errorString();
+            continue;
+        }
+
+        QuaZip zip { &backupFile };
+        if (!zip.open(QuaZip::mdUnzip)) {
+            qCritical() << "Could not open backup archive:" << backup.absolutePath;
+            qCritical() << "    ERROR:" << zip.getZipError();
+            continue;
+        }
+
+        for (auto& handler : _backupHandlers) {
+            handler->loadBackup(backup.id, zip);
+        }
+
+        zip.close();
+    }
+
+    for (auto& handler : _backupHandlers) {
+        handler->loadingComplete();
+    }
 }
 
 bool DomainContentBackupManager::process() {
@@ -130,10 +153,6 @@ bool DomainContentBackupManager::process() {
         constexpr int64_t USECS_TO_SLEEP = 10 * MSECS_TO_USECS;  // every 10ms
         std::this_thread::sleep_for(std::chrono::microseconds(USECS_TO_SLEEP));
 
-        int64_t now = usecTimestampNow();
-        int64_t sinceLastSave = now - _lastCheck;
-        int64_t intervalToCheck = _persistInterval * MSECS_TO_USECS;
-
         if (_isRecovering) {
             bool isStillRecovering = any_of(begin(_backupHandlers), end(_backupHandlers), [](const BackupHandlerPointer& handler) {
                 return handler->getRecoveryStatus().first;
@@ -146,7 +165,9 @@ bool DomainContentBackupManager::process() {
             }
         }
 
-        if (sinceLastSave > intervalToCheck) {
+        auto now = p_high_resolution_clock::now();
+        auto sinceLastSave = now - _lastCheck;
+        if (sinceLastSave > _persistInterval) {
             _lastCheck = now;
 
             if (!_isRecovering) {
@@ -279,7 +300,8 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
 
     bool success { false };
     QDir backupDir { _backupDirectory };
-    QFile backupFile { backupDir.filePath(backupName) };
+    auto backupFilePath { backupDir.filePath(backupName) };
+    QFile backupFile { backupFilePath };
     if (backupFile.open(QIODevice::ReadOnly)) {
         QuaZip zip { &backupFile };
 
@@ -288,7 +310,7 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
         backupFile.close();
     } else {
         success = false;
-        qWarning() << "Invalid id: " << backupName;
+        qWarning() << "Failed to open backup file for reading: " << backupFilePath;
     }
 
     promise->resolve({
@@ -339,19 +361,10 @@ std::vector<BackupItemInfo> DomainContentBackupManager::getAllBackups() {
             auto dateTime = backupNameFormat.cap(3);
             auto createdAt = QDateTime::fromString(dateTime, DATETIME_FORMAT);
             if (!createdAt.isValid()) {
+                qDebug().nospace() << "Skipping backup (" << fileName << ") with invalid timestamp: " << dateTime;
                 continue;
             }
 
-            bool isAvailable { true };
-            float availabilityProgress { 0.0f };
-            for (auto& handler : _backupHandlers) {
-                bool handlerIsAvailable { true };
-                float progress { 0.0f };
-                std::tie(handlerIsAvailable, progress) = handler->isAvailable(fileName);
-                isAvailable &= handlerIsAvailable;
-                availabilityProgress += progress / _backupHandlers.size();
-            }
-
             backups.emplace_back(fileInfo.fileName(), name, fileInfo.absoluteFilePath(), createdAt,
                                  type == MANUAL_BACKUP_PREFIX);
         }
@@ -448,35 +461,6 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
     }
 }
 
-void DomainContentBackupManager::load() {
-    auto backups = getAllBackups();
-    for (auto& backup : backups) {
-        QFile backupFile { backup.absolutePath };
-        if (!backupFile.open(QIODevice::ReadOnly)) {
-            qCritical() << "Could not open file:" << backup.absolutePath;
-            qCritical() << "    ERROR:" << backupFile.errorString();
-            continue;
-        }
-
-        QuaZip zip { &backupFile };
-        if (!zip.open(QuaZip::mdUnzip)) {
-            qCritical() << "Could not open backup archive:" << backup.absolutePath;
-            qCritical() << "    ERROR:" << zip.getZipError();
-            continue;
-        }
-
-        for (auto& handler : _backupHandlers) {
-            handler->loadBackup(backup.id, zip);
-        }
-
-        zip.close();
-    }
-
-    for (auto& handler : _backupHandlers) {
-        handler->loadingComplete();
-    }
-}
-
 void DomainContentBackupManager::backup() {
     auto nowDateTime = QDateTime::currentDateTime();
     auto nowSeconds = nowDateTime.toSecsSinceEpoch();
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 75f0f1341c..a3ee9e5eb1 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -25,6 +25,8 @@
 
 #include <shared/MiniPromises.h>
 
+#include <PortableHighResolutionClock.h>
+
 struct BackupItemInfo {
     BackupItemInfo(QString pId, QString pName, QString pAbsolutePath, QDateTime pCreatedAt, bool pIsManualBackup) :
         id(pId), name(pName), absolutePath(pAbsolutePath), createdAt(pCreatedAt), isManualBackup(pIsManualBackup) { };
@@ -48,11 +50,11 @@ public:
         qint64 lastBackupSeconds;
     };
 
-    static const int DEFAULT_PERSIST_INTERVAL;
+    static const std::chrono::milliseconds DEFAULT_PERSIST_INTERVAL;
 
     DomainContentBackupManager(const QString& rootBackupDirectory,
                                const QVariantList& settings,
-                               int persistInterval = DEFAULT_PERSIST_INTERVAL,
+                               std::chrono::milliseconds persistInterval = DEFAULT_PERSIST_INTERVAL,
                                bool debugTimestampNow = false);
 
     std::vector<BackupItemInfo> getAllBackups();
@@ -78,7 +80,6 @@ protected:
     virtual bool process() override;
     virtual void shutdown() override;
 
-    void load();
     void backup();
     void removeOldBackupVersions(const BackupRule& rule);
     void refreshBackupRules();
@@ -93,12 +94,12 @@ protected:
 private:
     const QString _backupDirectory;
     std::vector<BackupHandlerPointer> _backupHandlers;
-    int _persistInterval { 0 };
+    std::chrono::milliseconds _persistInterval { 0 };
 
     std::atomic<bool> _isRecovering { false };
     QString _recoveryFilename { };
 
-    int64_t _lastCheck { 0 };
+    std::chrono::time_point<std::chrono::high_resolution_clock> _lastCheck;
     std::vector<BackupRule> _backupRules;
 };
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 4311a3ee69..a33840462b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -3354,8 +3354,7 @@ void DomainServer::maybeHandleReplacementEntityFile() {
         if (!replacementFile.remove()) {
             // If we can't remove the replacement file, we are at risk of getting into a state where
             // we continually replace the primary entity file with the replacement entity file.
-            qCWarning(domain_server)
-                << "Unable to remove replacement file, bailing";
+            qCWarning(domain_server) << "Unable to remove replacement file, bailing";
         } else {
             data.resetIdAndVersion();
             auto gzippedData = data.toGzippedByteArray();
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index e15e8c5419..c9488df51f 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -31,7 +31,10 @@ void EntitiesBackupHandler::createBackup(const QString& backupName, QuaZip& zip)
 
     if (entitiesFile.open(QIODevice::ReadOnly)) {
         QuaZipFile zipFile { &zip };
-        zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ENTITIES_BACKUP_FILENAME, _entitiesFilePath));
+        if (!zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(ENTITIES_BACKUP_FILENAME, _entitiesFilePath))) {
+            qCritical().nospace() << "Failed to open " << ENTITIES_BACKUP_FILENAME << " for writing in zip";
+            return;
+        }
         zipFile.write(entitiesFile.readAll());
         zipFile.close();
         if (zipFile.getZipError() != UNZ_OK) {
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index d62cbad765..334299185e 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1816,8 +1816,6 @@ bool Octree::toGzippedJSON(QByteArray* data, const OctreeElementPointer& element
     if (!gzip(jsonData, *data, -1)) {
         qCritical("Unable to gzip data while saving to json.");
         return false;
-    } else {
-        qDebug() <<"Did gzip!";
     }
 
     return true;
diff --git a/libraries/octree/src/OctreePersistThread.h b/libraries/octree/src/OctreePersistThread.h
index 3fdad2c3f7..bde207001f 100644
--- a/libraries/octree/src/OctreePersistThread.h
+++ b/libraries/octree/src/OctreePersistThread.h
@@ -35,7 +35,7 @@ public:
     OctreePersistThread(OctreePointer tree, const QString& filename, const QString& backupDirectory,
                         int persistInterval = DEFAULT_PERSIST_INTERVAL, bool wantBackup = false,
                         const QJsonObject& settings = QJsonObject(), bool debugTimestampNow = false,
-                        QString persistAsFileType="json.gz", const QByteArray& replacementData = QByteArray());
+                        QString persistAsFileType = "json.gz", const QByteArray& replacementData = QByteArray());
 
     bool isInitialLoadComplete() const { return _initialLoadComplete; }
     quint64 getLoadElapsedTime() const { return _loadTimeUSecs; }
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index 739c2661b3..fd0d496a9d 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -17,6 +17,7 @@
 
 #include <AABox.h>
 #include <Gzip.h>
+#include <udt/PacketHeaders.h>
 
 #include <QJsonObject>
 #include <QJsonDocument>
@@ -140,10 +141,11 @@ bool OctreeUtils::readOctreeDataInfoFromFile(QString path, OctreeUtils::RawOctre
 }
 
 QByteArray OctreeUtils::RawOctreeData::toByteArray() {
+    const auto protocolVersion = (int)versionForPacketType(PacketType::EntityData);
     QJsonObject obj {
         { "DataVersion", QJsonValue((qint64)version) },
         { "Id", QJsonValue(id.toString()) },
-        { "Version", QJsonValue(5) },
+        { "Version", protocolVersion },
         { "Entities", octreeData }
     };
 
diff --git a/libraries/shared/src/GenericThread.cpp b/libraries/shared/src/GenericThread.cpp
index 50655820af..230b9590f1 100644
--- a/libraries/shared/src/GenericThread.cpp
+++ b/libraries/shared/src/GenericThread.cpp
@@ -37,8 +37,6 @@ void GenericThread::initialize(bool isThreaded, QThread::Priority priority) {
         // match the thread name to our object name
         _thread->setObjectName(objectName());
 
-        // when the worker thread is started, call our engine's run..
-        
         connect(_thread, &QThread::started, this, &GenericThread::started);
         connect(_thread, &QThread::started, this, &GenericThread::threadRoutine);
         connect(_thread, &QThread::finished, this, &GenericThread::finished);

From 0802bd2c219f6520543e1d2ae9565066183eac37 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 26 Feb 2018 14:27:59 -0800
Subject: [PATCH 508/569] Fix going to marketplace main page from WalletChoice

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 2 ++
 scripts/system/commerce/wallet.js                       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index f779588f17..952390a7a4 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -799,6 +799,8 @@ Rectangle {
             Commerce.getWalletStatus();
         } else if (msg.referrer === 'purchases') {
             sendToScript({method: 'goToPurchases'});
+        } else if (msg.referrer === 'marketplace cta' || msg.referrer === 'mainPage') {
+            sendToScript({method: 'goToMarketplaceMainPage', itemId: msg.referrer});
         } else {
             sendToScript({method: 'goToMarketplaceItemPage', itemId: msg.referrer});
         }
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index bda668246a..26ffb08796 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -655,6 +655,9 @@
             case 'goToPurchases':
                 tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
                 break;
+            case 'goToMarketplaceMainPage':
+                tablet.gotoWebScreen(MARKETPLACE_URL, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
             case 'goToMarketplaceItemPage':
                 tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL);
                 break;

From cd9cdea3e8512816582c203903a29c79253b10ae Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 14:29:13 -0800
Subject: [PATCH 509/569] Update backup formats to filter out non-whitelisted
 characters

---
 domain-server/src/DomainContentBackupManager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 7c5fd35752..93cb5385ab 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -74,7 +74,9 @@ void DomainContentBackupManager::parseBackupRules(const QVariantList& backupRule
         int interval = map["backupInterval"].toInt();
         int count = map["maxBackupVersions"].toInt();
         auto name = map["Name"].toString();
-        auto format = name.replace(" ", "_").toLower();
+        auto format = name.toLower();
+        QRegExp matchDisallowedCharacters { "[^a-zA-Z0-9\\-_]+" };
+        format.replace(matchDisallowedCharacters, "_");
 
         qCDebug(domain_server) << "    Name:" << name;
         qCDebug(domain_server) << "        format:" << format;

From 2872412f9c3feb50ae1f630c49f95e38d76ccc2c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 26 Feb 2018 12:10:20 -0800
Subject: [PATCH 510/569] fixes for comments from code reviews

---
 .../resources/web/content/js/content.js       | 16 +++----
 .../src/ContentSettingsBackupHandler.cpp      | 29 +++++++-----
 domain-server/src/DomainGatekeeper.cpp        |  2 +-
 domain-server/src/DomainServer.cpp            |  3 +-
 .../src/DomainServerSettingsManager.cpp       | 45 ++++++++++---------
 .../src/DomainServerSettingsManager.h         | 17 +++++--
 6 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 6e80fde7f6..3fec5a9000 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -36,9 +36,7 @@ $(document).ready(function(){
 
   // when the selected file is changed, enable the button if there's a selected file
   $('body').on('change', '#' + RESTORE_SETTINGS_FILE_ID, function() {
-    if ($(this).val()) {
-        $('#' + RESTORE_SETTINGS_UPLOAD_ID).attr('disabled', false);
-    }
+    $('#' + RESTORE_SETTINGS_UPLOAD_ID).attr('disabled', $(this).val().length == 0);
   });
 
   // when the upload button is clicked, send the file to the DS
@@ -48,7 +46,7 @@ $(document).ready(function(){
     e.preventDefault();
 
     swalAreYouSure(
-      "Your domain content will be replaced by the uploaded Content Archive or entity file",
+      "Your domain content will be replaced by the uploaded content archive or entity file",
       "Restore content",
       function() {
         var files = $('#' + RESTORE_SETTINGS_FILE_ID).prop('files');
@@ -100,7 +98,7 @@ $(document).ready(function(){
     // construct the HTML needed for the content archives panel
     var html = "<div id='" + CONTENT_ARCHIVES_NORMAL_ID + "'><div class='form-group'>";
     html += "<label class='control-label'>Automatic Content Archives</label>";
-    html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your domain content and settings backups. "
+    html += "<span class='help-block'>Your domain server makes regular archives of the content in your domain. In the list below, you can see and download all of your backups of domain content and content settings."
     html += "<a href='/settings/#automatic_content_archives' id='" + AUTO_ARCHIVES_SETTINGS_LINK_ID + "'>Click here to manage automatic content archive intervals.</a></span>";
     html += "</div>";
     html += "<table class='table sortable' id='" + AUTOMATIC_ARCHIVES_TABLE_ID + "'>";
@@ -149,6 +147,7 @@ $(document).ready(function(){
       if (isRestoring && !data.status.isRecovering) {
         // we were recovering and we finished - the DS is going to restart so show the restart modal
         showRestartModal();
+        return;
       }
 
       isRestoring = data.status.isRecovering;
@@ -171,7 +170,7 @@ $(document).ready(function(){
 
       function updateProgressBars($progressBar, value) {
         $progressBar.attr('aria-valuenow', value).attr('style', 'width: ' + value + '%');
-        $progressBar.find('.sr-only').html(data.status.recoveryProgress + "% Complete");
+        $progressBar.find('.sr-only').html(value + "% Complete");
       }
 
       // before we add any new rows and update existing ones
@@ -218,12 +217,9 @@ $(document).ready(function(){
         $backupRow.addClass(ACTIVE_BACKUP_ROW_CLASS);
       }
 
-      var automaticRows = "";
-
       if (automaticBackups.length > 0) {
         for (var backupIndex in automaticBackups) {
           updateOrAddTableRow(automaticBackups[backupIndex], AUTOMATIC_ARCHIVES_TBODY_ID);
-
         }
       }
 
@@ -382,7 +378,7 @@ $(document).ready(function(){
 
     // show a sweet alert to ask the user to provide a name for their content archive
     swal({
-      title: "Generate a Content Archive",
+      title: "Generate a content archive",
       type: "input",
       text: "This will capture the state of all the content in your domain right now, which you can save as a backup and restore from later.",
       confirmButtonText: "Generate Archive",
diff --git a/domain-server/src/ContentSettingsBackupHandler.cpp b/domain-server/src/ContentSettingsBackupHandler.cpp
index 7848cb1701..8ffd25b7a4 100644
--- a/domain-server/src/ContentSettingsBackupHandler.cpp
+++ b/domain-server/src/ContentSettingsBackupHandler.cpp
@@ -23,20 +23,31 @@ static const QString CONTENT_SETTINGS_BACKUP_FILENAME = "content-settings.json";
 
 void ContentSettingsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
 
-    // grab the content settings as JSON,excluding default values and values hidden from backup
-    QJsonObject contentSettingsJSON = _settingsManager.settingsResponseObjectForType("", true, false, true, false, true);
+    // grab the content settings as JSON, excluding default values and values hidden from backup
+    QJsonObject contentSettingsJSON = _settingsManager.settingsResponseObjectForType(
+        "", // include all settings types
+        DomainServerSettingsManager::Authenticated, DomainServerSettingsManager::NoDomainSettings,
+        DomainServerSettingsManager::IncludeContentSettings, DomainServerSettingsManager::NoDefaultSettings,
+        DomainServerSettingsManager::ForBackup
+    );
 
-    // make a QJSonDocument using the object
+    // make a QJsonDocument using the object
     QJsonDocument contentSettingsDocument { contentSettingsJSON };
 
     QuaZipFile zipFile { &zip };
 
-    zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(CONTENT_SETTINGS_BACKUP_FILENAME));
-    zipFile.write(contentSettingsDocument.toJson());
-    zipFile.close();
+    if (zipFile.open(QIODevice::WriteOnly, QuaZipNewInfo(CONTENT_SETTINGS_BACKUP_FILENAME))) {
+        if (zipFile.write(contentSettingsDocument.toJson()) == -1) {
+            qCritical().nospace() << "Failed to write to " << CONTENT_SETTINGS_BACKUP_FILENAME << ": " << zipFile.getZipError();
+        }
 
-    if (zipFile.getZipError() != UNZ_OK) {
-        qCritical().nospace() << "Failed to zip " << CONTENT_SETTINGS_BACKUP_FILENAME << ": " << zipFile.getZipError();
+        zipFile.close();
+
+        if (zipFile.getZipError() != UNZ_OK) {
+            qCritical().nospace() << "Failed to zip " << CONTENT_SETTINGS_BACKUP_FILENAME << ": " << zipFile.getZipError();
+        }
+    } else {
+        qCritical().nospace() << "Failed to open " << CONTENT_SETTINGS_BACKUP_FILENAME << ": " << zipFile.getZipError();
     }
 }
 
@@ -59,7 +70,5 @@ void ContentSettingsBackupHandler::recoverBackup(const QString& backupName, QuaZ
 
     if (!_settingsManager.restoreSettingsFromObject(jsonDocument.object(), ContentSettings)) {
         qCritical() << "Failed to restore settings from" << CONTENT_SETTINGS_BACKUP_FILENAME << "in content archive";
-        return;
     }
-
 }
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index ac94d953d5..7d0b538f6e 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -613,7 +613,7 @@ bool DomainGatekeeper::isWithinMaxCapacity() {
     // find out what our maximum capacity is
     QVariant maximumUserCapacityVariant =
         _server->_settingsManager.valueForKeyPath(MAXIMUM_USER_CAPACITY);
-    unsigned int maximumUserCapacity = !maximumUserCapacityVariant.isValid() ? maximumUserCapacityVariant.toUInt() : 0;
+    unsigned int maximumUserCapacity = maximumUserCapacityVariant.isValid() ? maximumUserCapacityVariant.toUInt() : 0;
 
     if (maximumUserCapacity > 0) {
         unsigned int connectedUsers = _server->countConnectedUsers();
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 4311a3ee69..0aace84aef 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -751,7 +751,7 @@ bool DomainServer::resetAccountManagerAccessToken() {
         if (accessToken.isEmpty()) {
             QVariant accessTokenVariant = _settingsManager.valueForKeyPath(ACCESS_TOKEN_KEY_PATH);
 
-            if (accessTokenVariant.isValid() && accessTokenVariant.canConvert(QMetaType::QString)) {
+            if (accessTokenVariant.canConvert(QMetaType::QString)) {
                 accessToken = accessTokenVariant.toString();
             } else {
                 qWarning() << "No access token is present. Some operations that use the metaverse API will fail.";
@@ -1637,7 +1637,6 @@ void DomainServer::sendHeartbeatToIceServer() {
             qWarning() << "Waiting for keypair generation to complete before sending ICE heartbeat.";
 
             if (!limitedNodeList->getSessionUUID().isNull()) {
-                qDebug() << "generating keypair";
                 accountManager->generateNewDomainKeypair(limitedNodeList->getSessionUUID());
             } else {
                 qWarning() << "Attempting to send ICE server heartbeat with no domain ID. This is not supported";
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index f910799f9e..c46b2eda49 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -33,7 +33,6 @@
 #include <SettingHelpers.h>
 #include <AvatarData.h> //for KillAvatarReason
 #include <FingerprintUtils.h>
-#include <shared/QtHelpers.h>
 
 #include "DomainServerNodeData.h"
 
@@ -686,12 +685,12 @@ void DomainServerSettingsManager::unpackPermissions() {
 
 #ifdef WANT_DEBUG
     qDebug() << "--------------- permissions ---------------------";
-    std::list<NodePermissionsMap*> permissionsSets {
+    std::array<NodePermissionsMap*, 7> permissionsSets {{
         &_standardAgentPermissions, &_agentPermissions,
         &_groupPermissions, &_groupForbiddens,
         &_ipPermissions, &_macPermissions,
         &_machineFingerprintPermissions
-    };
+    }};
 
     foreach (auto permissionSet, permissionsSets) {
         auto& permissionKeyMap = permissionSet->get();
@@ -1169,17 +1168,20 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
 
             QJsonObject rootObject;
 
-            bool forDomainSettings = (url.path() == SETTINGS_PATH_JSON);
-            bool forContentSettings = (url.path() == CONTENT_SETTINGS_PATH_JSON);;
+            DomainSettingsInclusion domainSettingsInclusion = (url.path() == SETTINGS_PATH_JSON)
+                ? IncludeDomainSettings : NoDomainSettings;
+            ContentSettingsInclusion contentSettingsInclusion = (url.path() == CONTENT_SETTINGS_PATH_JSON)
+                ? IncludeContentSettings : NoContentSettings;
 
-            rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = forDomainSettings
+            rootObject[SETTINGS_RESPONSE_DESCRIPTION_KEY] = (url.path() == SETTINGS_PATH_JSON)
                 ? _domainSettingsDescription : _contentSettingsDescription;
 
             // grab a domain settings object for all types, filtered for the right class of settings
             // and exclude default values
-            rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
-                                                                                    forDomainSettings, forContentSettings,
-                                                                                    true);
+            rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", Authenticated,
+                                                                                    domainSettingsInclusion,
+                                                                                    contentSettingsInclusion,
+                                                                                    IncludeDefaultSettings);
 
             connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");
 
@@ -1191,7 +1193,8 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
         } else if (url.path() == SETTINGS_BACKUP_PATH) {
             // grab the settings backup as an authenticated user
             // for the domain settings type only, excluding hidden and default values
-            auto currentDomainSettingsJSON = settingsResponseObjectForType("", true, true, false, false, true);
+            auto currentDomainSettingsJSON = settingsResponseObjectForType("", Authenticated, IncludeDomainSettings,
+                                                                           NoContentSettings, NoDefaultSettings, ForBackup);
 
             // setup headers that tell the client to download the file wth a special name
             Headers downloadHeaders;
@@ -1343,13 +1346,15 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
     }
 }
 
-QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated,
-                                                                       bool includeDomainSettings,
-                                                                       bool includeContentSettings,
-                                                                       bool includeDefaults, bool isForBackup) {
+QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QString& typeValue,
+                                                                       SettingsRequestAuthentication authentication,
+                                                                       DomainSettingsInclusion domainSettingsInclusion,
+                                                                       ContentSettingsInclusion contentSettingsInclusion,
+                                                                       DefaultSettingsInclusion defaultSettingsInclusion,
+                                                                       SettingsBackupFlag settingsBackupFlag) {
     QJsonObject responseObject;
 
-    if (!typeValue.isEmpty() || isAuthenticated) {
+    if (!typeValue.isEmpty() || authentication == Authenticated) {
         // convert the string type value to a QJsonValue
         QJsonValue queryType = typeValue.isEmpty() ? QJsonValue() : QJsonValue(typeValue.toInt());
 
@@ -1358,9 +1363,9 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
         // only enumerate the requested settings type (domain setting or content setting)
         QJsonArray* filteredDescriptionArray = &_descriptionArray;
 
-        if (includeDomainSettings && !includeContentSettings) {
+        if (domainSettingsInclusion == IncludeDomainSettings && contentSettingsInclusion != IncludeContentSettings) {
             filteredDescriptionArray = &_domainSettingsDescription;
-        } else if (includeContentSettings && !includeDomainSettings) {
+        } else if (contentSettingsInclusion == IncludeContentSettings && domainSettingsInclusion != IncludeDomainSettings) {
             filteredDescriptionArray = &_contentSettingsDescription;
         }
 
@@ -1383,14 +1388,14 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
                 bool includedInBackups = !settingObject.contains(DESCRIPTION_BACKUP_FLAG_KEY)
                     || settingObject[DESCRIPTION_BACKUP_FLAG_KEY].toBool();
 
-                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && (!isForBackup || includedInBackups)) {
+                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && (settingsBackupFlag != ForBackup || includedInBackups)) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
                         affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     }
 
                     if (affectedTypesArray.contains(queryType) ||
-                        (queryType.isNull() && isAuthenticated)) {
+                        (queryType.isNull() && authentication == Authenticated)) {
                         QString settingName = settingObject[DESCRIPTION_NAME_KEY].toString();
 
                         // we need to check if the settings map has a value for this setting
@@ -1408,7 +1413,7 @@ QJsonObject DomainServerSettingsManager::settingsResponseObjectForType(const QSt
 
                         // final check for inclusion
                         // either we include default values or we don't but this isn't a default value
-                        if (includeDefaults || variantValue.isValid()) {
+                        if ((defaultSettingsInclusion == IncludeDefaultSettings) || variantValue.isValid()) {
                             QJsonValue result;
 
                             if (!variantValue.isValid()) {
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index d81547410b..252ff79ae2 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -110,10 +110,19 @@ public:
 
     void debugDumpGroupsState();
 
+    enum SettingsRequestAuthentication { NotAuthenticated, Authenticated };
+    enum DomainSettingsInclusion { NoDomainSettings, IncludeDomainSettings };
+    enum ContentSettingsInclusion { NoContentSettings, IncludeContentSettings };
+    enum DefaultSettingsInclusion { NoDefaultSettings, IncludeDefaultSettings };
+    enum SettingsBackupFlag { NotForBackup, ForBackup };
+
     /// thread safe method to retrieve a JSON representation of settings
-    Q_INVOKABLE QJsonObject settingsResponseObjectForType(const QString& typeValue, bool isAuthenticated = false,
-                                              bool includeDomainSettings = true, bool includeContentSettings = true,
-                                              bool includeDefaults = true, bool isForBackup = false);
+    QJsonObject settingsResponseObjectForType(const QString& typeValue,
+                                              SettingsRequestAuthentication authentication = NotAuthenticated,
+                                              DomainSettingsInclusion domainSettingsInclusion = IncludeDomainSettings,
+                                              ContentSettingsInclusion contentSettingsInclusion = IncludeContentSettings,
+                                              DefaultSettingsInclusion defaultSettingsInclusion = IncludeDefaultSettings,
+                                              SettingsBackupFlag settingsBackupFlag = NotForBackup);
     /// thread safe method to restore settings from a JSON object
     Q_INVOKABLE bool restoreSettingsFromObject(QJsonObject settingsToRestore, SettingsType settingsType);
 
@@ -156,7 +165,7 @@ private:
     QJsonArray _contentSettingsDescription;
     QJsonObject _settingsMenuGroups;
 
-    // any method that calls _valueForKeyPath on this _configMap must get a write lock it keeps until it
+    // any method that calls valueForKeyPath on this _configMap must get a write lock it keeps until it
     // is done with the returned QVariant*
     HifiConfigVariantMap _configMap;
 

From 65a4b3d316761e38904439199e01bf980576bb46 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 14:43:50 -0800
Subject: [PATCH 511/569] Revert change to packet reading in Socket.cpp

---
 libraries/networking/src/udt/Socket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 019ae07c16..f22026cd70 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -328,7 +328,7 @@ void Socket::checkForReadyReadBackup() {
 void Socket::readPendingDatagrams() {
     int packetSizeWithHeader = -1;
 
-    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) > 0) {
+    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
 
         // we're reading a packet so re-start the readyRead backup timer
         _readyReadBackupTimer->start();

From 3592fcf3c2d89b893dd77737ac3e618d5632d273 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 26 Feb 2018 14:48:59 -0800
Subject: [PATCH 512/569] CR

---
 assignment-client/src/assets/AssetServer.cpp |  2 +-
 domain-server/src/AssetsBackupHandler.cpp    | 29 ++++++++++----------
 domain-server/src/AssetsBackupHandler.h      |  3 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index c69ef2d9cc..87827a27d9 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -447,7 +447,7 @@ void AssetServer::replayRequests() {
     RequestQueue queue;
     {
         QMutexLocker lock { &_queuedRequestsMutex };
-        qSwap(queue, _queuedRequests);
+        std::swap(queue, _queuedRequests);
         _isQueueingRequests = false;
     }
 
diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index c50bf5e05d..16dbfd8434 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -24,12 +24,13 @@
 #include <MappingRequest.h>
 #include <PathUtils.h>
 
-static const QString ASSETS_DIR = "/assets/";
-static const QString MAPPINGS_FILE = "mappings.json";
-static const QString ZIP_ASSETS_FOLDER = "files";
-
 using namespace std;
 
+static const QString ASSETS_DIR { "/assets/" };
+static const QString MAPPINGS_FILE { "mappings.json" };
+static const QString ZIP_ASSETS_FOLDER { "files" };
+static const chrono::minutes MAX_REFRESH_TIME { 15 };
+
 Q_DECLARE_LOGGING_CATEGORY(asset_backup)
 Q_LOGGING_CATEGORY(asset_backup, "hifi.asset-backup");
 
@@ -50,7 +51,7 @@ void AssetsBackupHandler::setupRefreshTimer() {
     QObject::connect(&_mappingsRefreshTimer, &QTimer::timeout, this, &AssetsBackupHandler::refreshMappings);
 
     auto nodeList = DependencyManager::get<LimitedNodeList>();
-    QObject::connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, [this](SharedNodePointer node) {
+    QObject::connect(nodeList.data(), &LimitedNodeList::nodeActivated, this, [this](SharedNodePointer node) {
         if (node->getType() == NodeType::AssetServer) {
             // run immediately for the first time.
             _mappingsRefreshTimer.start(0);
@@ -188,7 +189,7 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
 
     QuaZipFile zipFile { &zip };
     if (!zipFile.open(QFile::ReadOnly)) {
-        qCCritical(asset_backup) << "Could not unzip backup file for load:" << backupName;
+        qCCritical(asset_backup) << "Could not unzip backup file for load:" << MAPPINGS_FILE;
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
         return;
@@ -197,7 +198,7 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
     QJsonParseError error;
     auto document = QJsonDocument::fromJson(zipFile.readAll(), &error);
     if (document.isNull() || !document.isObject()) {
-        qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << backupName;
+        qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << MAPPINGS_FILE;
         qCCritical(asset_backup) << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
         return;
@@ -232,13 +233,12 @@ void AssetsBackupHandler::createBackup(const QString& backupName, QuaZip& zip) {
         return;
     }
 
-    if (_lastMappingsRefresh == 0) {
+    if (_lastMappingsRefresh.time_since_epoch().count() == 0) {
         qCWarning(asset_backup) << "Current mappings not yet loaded.";
         return;
     }
 
-    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
-    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
+    if ((p_high_resolution_clock::now() - _lastMappingsRefresh) > MAX_REFRESH_TIME) {
         qCWarning(asset_backup) << "Backing up asset mappings that might be stale.";
     }
 
@@ -275,14 +275,13 @@ void AssetsBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip)
         return;
     }
 
-    if (_lastMappingsRefresh == 0) {
+    if (_lastMappingsRefresh.time_since_epoch().count() == 0) {
         qCWarning(asset_backup) << "Current mappings not yet loaded.";
         return;
     }
 
-    static constexpr quint64 MAX_REFRESH_TIME = 15 * 60 * 1000 * 1000;
-    if (usecTimestampNow() - _lastMappingsRefresh > MAX_REFRESH_TIME) {
-        qCWarning(asset_backup) << "Current asset mappings that might be stale.";
+    if ((p_high_resolution_clock::now() - _lastMappingsRefresh) > MAX_REFRESH_TIME) {
+        qCWarning(asset_backup) << "Recovering while current asset mappings might be stale.";
     }
 
     auto it = find_if(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
@@ -412,7 +411,7 @@ void AssetsBackupHandler::refreshMappings() {
                     _currentMappings.insert({ mapping.first, mapping.second.hash });
                 }
             }
-            _lastMappingsRefresh = usecTimestampNow();
+            _lastMappingsRefresh = p_high_resolution_clock::now();
 
             downloadMissingFiles(_currentMappings);
         } else {
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index d3dd2dda40..82d684c2c3 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -22,6 +22,7 @@
 
 #include <AssetUtils.h>
 #include <ReceivedMessage.h>
+#include <PortableHighResolutionClock.h>
 
 #include "BackupHandler.h"
 
@@ -66,7 +67,7 @@ private:
     QString _assetsDirectory;
 
     QTimer _mappingsRefreshTimer;
-    quint64 _lastMappingsRefresh { 0 };
+    p_high_resolution_clock::time_point _lastMappingsRefresh;
     AssetUtils::Mappings _currentMappings;
 
     struct AssetServerBackup {

From 767569bc4015e61bb5211e8ffc6da77ca2d2b19d Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 26 Feb 2018 18:00:22 -0500
Subject: [PATCH 513/569] * changes per CR feedback * make MeshPart.topology
 read-only * JS Graphics API starter documentation * remove redundant
 qscriptvalue sequence registrations

---
 .../src/graphics-scripting/Forward.h          |  7 +-
 .../GraphicsScriptingInterface.cpp            | 74 +++++++------------
 .../GraphicsScriptingInterface.h              | 35 +++++++--
 .../src/graphics-scripting/ScriptableMesh.h   | 11 ++-
 .../graphics-scripting/ScriptableMeshPart.cpp | 29 ++++++--
 .../graphics-scripting/ScriptableMeshPart.h   | 15 +++-
 .../src/graphics-scripting/ScriptableModel.h  | 10 ++-
 .../graphics/src/graphics/GpuHelpers.cpp      |  3 +-
 8 files changed, 116 insertions(+), 68 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 2f2f191dce..38f45fbfd0 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -94,7 +94,12 @@ namespace scriptable {
     using ScriptableMeshPointer = QPointer<ScriptableMesh>;
     class ScriptableMeshPart;
     using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
-    bool registerMetaTypes(QScriptEngine* engine);
 }
 
+Q_DECLARE_METATYPE(glm::uint32)
+Q_DECLARE_METATYPE(QVector<glm::uint32>)
 Q_DECLARE_METATYPE(NestableType)
+Q_DECLARE_METATYPE(scriptable::MeshPointer)
+Q_DECLARE_METATYPE(scriptable::WeakMeshPointer)
+Q_DECLARE_METATYPE(scriptable::ModelProviderPointer)
+
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index ed8982b9c7..f3ba5e8406 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -26,9 +26,6 @@
 #include <SpatiallyNestable.h>
 
 GraphicsScriptingInterface::GraphicsScriptingInterface(QObject* parent) : QObject(parent), QScriptable() {
-    if (auto scriptEngine = qobject_cast<QScriptEngine*>(parent)) {
-        this->registerMetaTypes(scriptEngine);
-    }
 }
 
 void GraphicsScriptingInterface::jsThrowError(const QString& error) {
@@ -179,12 +176,17 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar
 
     const auto numVertices = vertices.size();
     const auto numIndices = indices.size();
-    const auto topology = graphics::Mesh::TRIANGLES;
+    const auto topology = graphics::TOPOLOGIES.key(topologyName);
+
+    // TODO: support additional topologies (POINTS and LINES ought to "just work" --
+    //   if MeshPartPayload::drawCall is updated to actually check the Mesh::Part::_topology value
+    //   (TRIANGLE_STRIP, TRIANGLE_FAN, QUADS, QUAD_STRIP may need additional conversion code though)
+    static const QStringList acceptableTopologies{ "triangles" };
 
     // sanity checks
     QString error;
-    if (!topologyName.isEmpty() && topologyName != "triangles") {
-        error = "expected 'triangles' or undefined for .topology";
+    if (!topologyName.isEmpty() && !acceptableTopologies.contains(topologyName)) {
+        error = QString("expected .topology to be %1").arg(acceptableTopologies.join(" | "));
     } else if (!numIndices) {
         error = QString("expected non-empty [uint32,...] array for .indices (got type=%1)").arg(ifsMeshData.value("indices").typeName());
     } else if (numIndices % 3 != 0) {
@@ -227,8 +229,8 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar
     mesh->modelName = "graphics::newMesh";
     mesh->displayName = meshName.toStdString();
 
-    // TODO: newFromVector does no conversion -- later we could autodetect if fitting into gpu::INDEX_UINT16
-    //  and also pack other values (like NORMAL / TEXCOORD0 where relevant)
+    // TODO: newFromVector does inbound type conversion, but not compression or packing
+    //  (later we should autodetect if fitting into gpu::INDEX_UINT16 and reduce / pack normals etc.)
     mesh->setIndexBuffer(buffer_helpers::newFromVector(indices, gpu::Format::INDEX_INT32));
     mesh->setVertexBuffer(buffer_helpers::newFromVector(vertices, gpu::Format::VEC3F_XYZ));
     if (normals.size()) {
@@ -240,7 +242,7 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar
     if (texCoords0.size()) {
         mesh->addAttribute(gpu::Stream::TEXCOORD0, buffer_helpers::newFromVector(texCoords0, gpu::Format::VEC2F_UV));
     }
-    QVector<graphics::Mesh::Part> parts = {{ 0, indices.size(), 0, topology}};
+    QVector<graphics::Mesh::Part> parts = {{ 0, indices.size(), 0, topology }};
     mesh->setPartBuffer(buffer_helpers::newFromVector(parts, gpu::Element::PART_DRAWCALL));
     return scriptable::make_scriptowned<scriptable::ScriptableMesh>(mesh, nullptr);
 }
@@ -262,10 +264,6 @@ QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::Scriptabl
     return QString();
 }
 
-void GraphicsScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
-    scriptable::registerMetaTypes(engine);
-}
-
 MeshPointer GraphicsScriptingInterface::getMeshPointer(const scriptable::ScriptableMesh& meshProxy) {
     return meshProxy.getMeshPointer();
 }
@@ -287,14 +285,6 @@ MeshPointer GraphicsScriptingInterface::getMeshPointer(scriptable::ScriptableMes
 }
 
 namespace {
-    QScriptValue qVectorUInt32ToScriptValue(QScriptEngine* engine, const QVector<glm::uint32>& vector) {
-        return qScriptValueFromSequence(engine, vector);
-    }
-
-    void qVectorUInt32FromScriptValue(const QScriptValue& array, QVector<glm::uint32>& result) {
-        qScriptValueToSequence(array, result);
-    }
-
     QVector<int> metaTypeIds{
         qRegisterMetaType<glm::uint32>("uint32"),
         qRegisterMetaType<glm::uint32>("glm::uint32"),
@@ -312,7 +302,7 @@ namespace {
 }
 
 namespace scriptable {
-    template <typename T> int registerQPointerThing(QScriptEngine* engine) {
+    template <typename T> int registerQPointerMetaType(QScriptEngine* engine) {
         qScriptRegisterSequenceMetaType<QVector<QPointer<T>>>(engine);
         return qScriptRegisterMetaType<QPointer<T>>(
             engine,
@@ -346,44 +336,32 @@ namespace scriptable {
     }
 
     template <typename T> int registerDebugEnum(QScriptEngine* engine, const DebugEnums<T>& debugEnums) {
-        static const DebugEnums<T>& poop = debugEnums;
+        static const DebugEnums<T>& instance = debugEnums;
         return qScriptRegisterMetaType<T>(
             engine,
             [](QScriptEngine* engine, const T& topology) -> QScriptValue {
-                return poop.value(topology);
+                return instance.value(topology);
             },
             [](const QScriptValue& value, T& topology) {
-                topology = poop.key(value.toString());
+                topology = instance.key(value.toString());
             }
         );
     }
+}
 
-    bool registerMetaTypes(QScriptEngine* engine) {
-        qScriptRegisterSequenceMetaType<QVector<glm::uint32>>(engine);
+void GraphicsScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
+    qScriptRegisterSequenceMetaType<QVector<glm::uint32>>(engine);
 
-        qScriptRegisterMetaType(engine, qVectorUInt32ToScriptValue, qVectorUInt32FromScriptValue);
+    scriptable::registerQPointerMetaType<scriptable::ScriptableModel>(engine);
+    scriptable::registerQPointerMetaType<scriptable::ScriptableMesh>(engine);
+    scriptable::registerQPointerMetaType<scriptable::ScriptableMeshPart>(engine);
 
-        registerQPointerThing<scriptable::ScriptableModel>(engine);
-        registerQPointerThing<scriptable::ScriptableMesh>(engine);
-        registerQPointerThing<scriptable::ScriptableMeshPart>(engine);
-        qScriptRegisterMetaType<QVector<scriptable::ScriptableMeshPointer>>(
-            engine,
-            [](QScriptEngine* engine, const QVector<scriptable::ScriptableMeshPointer>& vector) -> QScriptValue {
-                return qScriptValueFromSequence(engine, vector);
-            },
-            [](const QScriptValue& array, QVector<scriptable::ScriptableMeshPointer>& result) {
-                qScriptValueToSequence(array, result);
-            }
-        );
-
-        registerDebugEnum<graphics::Mesh::Topology>(engine, graphics::TOPOLOGIES);
-        registerDebugEnum<gpu::Type>(engine, gpu::TYPES);
-        registerDebugEnum<gpu::Semantic>(engine, gpu::SEMANTICS);
-        registerDebugEnum<gpu::Dimension>(engine, gpu::DIMENSIONS);
-
-        return metaTypeIds.size();
-    }
+    scriptable::registerDebugEnum<graphics::Mesh::Topology>(engine, graphics::TOPOLOGIES);
+    scriptable::registerDebugEnum<gpu::Type>(engine, gpu::TYPES);
+    scriptable::registerDebugEnum<gpu::Semantic>(engine, gpu::SEMANTICS);
+    scriptable::registerDebugEnum<gpu::Dimension>(engine, gpu::DIMENSIONS);
 
+    Q_UNUSED(metaTypeIds);
 }
 
 #include "GraphicsScriptingInterface.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index a66e382bc7..2e86ab01e2 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -20,6 +20,12 @@
 #include "ScriptableMesh.h"
 #include <DependencyManager.h>
 
+
+/**jsdoc
+ * The experimental Graphics API <em>(experimental)</em> lets you query and manage certain graphics-related structures (like underlying meshes and textures) from scripting.
+ * @namespace Graphics
+ */
+
 class GraphicsScriptingInterface : public QObject, public QScriptable, public Dependency {
     Q_OBJECT
 
@@ -29,15 +35,36 @@ public:
 
 public slots:
     /**jsdoc
-     * Returns the model/meshes associated with a UUID (entityID, overlayID, or avatarID)
+     * Returns a model reference object associated with the specified UUID ({@link EntityID}, {@link OverlayID}, or {@link AvatarID}).
      *
-     * @function GraphicsScriptingInterface.getModel
-     * @param {UUID} The objectID of the model whose meshes are to be retrieve
+     * @function Graphics.getModel
+     * @param {UUID} The objectID of the model whose meshes are to be retrieved.
+     * @return {Graphics.Model} the resulting Model object
      */
     scriptable::ScriptableModelPointer getModel(QUuid uuid);
+
     bool updateModel(QUuid uuid, const scriptable::ScriptableModelPointer& model);
+
     bool canUpdateModel(QUuid uuid, int meshIndex = -1, int partNumber = -1);
+
     scriptable::ScriptableModelPointer newModel(const scriptable::ScriptableMeshes& meshes);
+
+    /**jsdoc
+     * Create a new Mesh / Mesh Part with the specified data buffers.
+     *
+     * @function Graphics.newMesh
+     * @param {Graphics.IFSData} ifsMeshData Index-Faced Set (IFS) arrays used to create the new mesh.
+     * @return {Graphics.Mesh} the resulting Mesh / Mesh Part object
+     */
+    /**jsdoc
+    * @typedef {object} Graphics.IFSData
+    * @property {string} [name] - mesh name (useful for debugging / debug prints).
+    * @property {number[]} indices - vertex indices to use for the mesh faces.
+    * @property {Vec3[]} vertices - vertex positions (model space)
+    * @property {Vec3[]} [normals] - vertex normals (normalized)
+    * @property {Vec3[]} [colors] - vertex colors (normalized)
+    * @property {Vec2[]} [texCoords0] - vertex texture coordinates (normalized)
+    */
     scriptable::ScriptableMeshPointer newMesh(const QVariantMap& ifsMeshData);
 
 #ifdef SCRIPTABLE_MESH_TODO
@@ -58,6 +85,4 @@ private:
 
 };
 
-Q_DECLARE_METATYPE(scriptable::ModelProviderPointer)
-
 #endif // hifi_GraphicsScriptingInterface_h
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 16393de8c7..50299b8d20 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -28,6 +28,15 @@
 #include <graphics/Geometry.h>
 
 namespace scriptable {
+    /**jsdoc
+     * @typedef {object} Graphics.Mesh
+     * @property {Graphics.MeshPart[]} parts - Array of submesh part references.
+     * @property {string[]} attributeNames - Vertex attribute names (color, normal, etc.)
+     * @property {number} numParts - The number of parts contained in the mesh.
+     * @property {number} numIndices - Total number of vertex indices in the mesh.
+     * @property {number} numVertices - Total number of vertices in the Mesh.
+     * @property {number} numAttributes - Number of currently defined vertex attributes.
+     */
     class ScriptableMesh : public ScriptableMeshBase, QScriptable {
         Q_OBJECT
     public:
@@ -97,5 +106,3 @@ namespace scriptable {
 
 Q_DECLARE_METATYPE(scriptable::ScriptableMeshPointer)
 Q_DECLARE_METATYPE(QVector<scriptable::ScriptableMeshPointer>)
-Q_DECLARE_METATYPE(glm::uint32)
-Q_DECLARE_METATYPE(QVector<glm::uint32>)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
index 9d6359bee3..ac48b23323 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
@@ -21,6 +21,7 @@
 #include <graphics/GpuHelpers.h>
 #include <graphics/Geometry.h>
 
+
 QString scriptable::ScriptableMeshPart::toOBJ() {
     if (!getMeshPointer()) {
         if (context()) {
@@ -371,6 +372,7 @@ bool scriptable::ScriptableMeshPart::setIndices(const QVector<glm::uint32>& indi
     if (len != getNumVertices()) {
         context()->throwError(QString("setIndices: currently new indicies must be assign 1:1 across old indicies (indicies.size()=%1, numIndices=%2)")
                               .arg(len).arg(getNumIndices()));
+        return false;
     }
     auto mesh = getMeshPointer();
     auto indexBuffer = mesh->getIndexBuffer();
@@ -397,18 +399,24 @@ const graphics::Mesh::Part& scriptable::ScriptableMeshPart::getMeshPart() const
     return getMeshPointer()->getPartBuffer().get<graphics::Mesh::Part>(partIndex);
 }
 
+// FIXME: how we handle topology will need to be reworked if wanting to support TRIANGLE_STRIP, QUADS and QUAD_STRIP
 bool scriptable::ScriptableMeshPart::setTopology(graphics::Mesh::Topology topology) {
     if (!isValid()) {
         return false;
     }
     auto& part = getMeshPointer()->getPartBuffer().edit<graphics::Mesh::Part>(partIndex);
-    if (topology == graphics::Mesh::Topology::POINTS ||
-        topology == graphics::Mesh::Topology::LINES ||
-        topology == graphics::Mesh::Topology::TRIANGLES) {
+    switch (topology) {
+#ifdef DEV_BUILD
+    case graphics::Mesh::Topology::POINTS:
+    case graphics::Mesh::Topology::LINES:
+#endif
+    case graphics::Mesh::Topology::TRIANGLES:
         part._topology = topology;
         return true;
+    default:
+        context()->throwError("changing topology to " + graphics::toString(topology) + " is not yet supported");
+        return false;
     }
-    return false;
 }
 
 glm::uint32 scriptable::ScriptableMeshPart::getTopologyLength() const {
@@ -416,16 +424,23 @@ glm::uint32 scriptable::ScriptableMeshPart::getTopologyLength() const {
     case graphics::Mesh::Topology::POINTS: return 1;
     case graphics::Mesh::Topology::LINES: return 2;
     case graphics::Mesh::Topology::TRIANGLES: return 3;
+    case graphics::Mesh::Topology::QUADS: return 4;
     default: qCDebug(graphics_scripting) << "getTopologyLength -- unrecognized topology" << getTopology();
     }
     return 0;
 }
 
 QVector<glm::uint32> scriptable::ScriptableMeshPart::getFace(glm::uint32 faceIndex) const {
-    if (faceIndex < getNumFaces()) {
-        return getIndices().mid(faceIndex * getTopologyLength(), getTopologyLength());
+    switch (getTopology()) {
+    case graphics::Mesh::Topology::POINTS:
+    case graphics::Mesh::Topology::LINES:
+    case graphics::Mesh::Topology::TRIANGLES:
+    case graphics::Mesh::Topology::QUADS:
+        if (faceIndex < getNumFaces()) {
+            return getIndices().mid(faceIndex * getTopologyLength(), getTopologyLength());
+        }
+    default: return QVector<glm::uint32>();
     }
-    return QVector<glm::uint32>();
 }
 
 QVariantMap scriptable::ScriptableMeshPart::getPartExtents() const {
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
index 4ef0465ca3..dd71d9b998 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.h
@@ -10,6 +10,18 @@
 #include "ScriptableMesh.h"
 
 namespace scriptable {
+    /**jsdoc
+     * @typedef {object} Graphics.MeshPart
+     * @property {number} partIndex - The part index (within the containing Mesh).
+     * @property {Graphics.Topology} topology - element interpretation (currently only 'triangles' is supported).
+     * @property {string[]} attributeNames - Vertex attribute names (color, normal, etc.)
+     * @property {number} numIndices - Number of vertex indices that this mesh part refers to.
+     * @property {number} numVerticesPerFace - Number of vertices per face (eg: 3 when topology is 'triangles').
+     * @property {number} numFaces - Number of faces represented by the mesh part (numIndices / numVerticesPerFace).
+     * @property {number} numVertices - Total number of vertices in the containing Mesh.
+     * @property {number} numAttributes - Number of currently defined vertex attributes.
+     */
+
     class ScriptableMeshPart : public QObject, QScriptable {
         Q_OBJECT
         Q_PROPERTY(bool valid READ isValid)
@@ -18,7 +30,8 @@ namespace scriptable {
         Q_PROPERTY(glm::uint32 baseVertexIndex READ getBaseVertexIndex WRITE setBaseVertexIndex)
         Q_PROPERTY(glm::uint32 lastVertexIndex READ getLastVertexIndex WRITE setLastVertexIndex)
         Q_PROPERTY(int numVerticesPerFace READ getTopologyLength)
-        Q_PROPERTY(graphics::Mesh::Topology topology READ getTopology WRITE setTopology)
+        // NOTE: making read-only for now (see also GraphicsScriptingInterface::newMesh and MeshPartPayload::drawCall)
+        Q_PROPERTY(graphics::Mesh::Topology topology READ getTopology)
 
         Q_PROPERTY(glm::uint32 numFaces READ getNumFaces)
         Q_PROPERTY(glm::uint32 numAttributes READ getNumAttributes)
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index d821f1224d..d496323c1c 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -15,6 +15,14 @@ class QScriptValue;
 namespace scriptable {
 
     using ScriptableMeshes = QVector<scriptable::ScriptableMeshPointer>;
+
+    /**jsdoc
+     * @typedef {object} Graphics.Model
+     * @property {Uuid} objectID - UUID of corresponding inworld object (if model is associated)
+     * @property {number} numMeshes - The number of submeshes contained in the model.
+     * @property {Graphics.Mesh[]} meshes - Array of submesh references.
+     */
+
     class ScriptableModel : public ScriptableModelBase {
         Q_OBJECT
         Q_PROPERTY(QUuid objectID MEMBER objectID CONSTANT)
@@ -45,8 +53,6 @@ namespace scriptable {
 
 }
 
-Q_DECLARE_METATYPE(scriptable::MeshPointer)
-Q_DECLARE_METATYPE(scriptable::WeakMeshPointer)
 Q_DECLARE_METATYPE(scriptable::ScriptableModelPointer)
 Q_DECLARE_METATYPE(scriptable::ScriptableModelBase)
 Q_DECLARE_METATYPE(scriptable::ScriptableModelBasePointer)
diff --git a/libraries/graphics/src/graphics/GpuHelpers.cpp b/libraries/graphics/src/graphics/GpuHelpers.cpp
index 63393df5e1..0c3bd945e1 100644
--- a/libraries/graphics/src/graphics/GpuHelpers.cpp
+++ b/libraries/graphics/src/graphics/GpuHelpers.cpp
@@ -21,8 +21,7 @@ namespace graphics {
     };
 }
 namespace gpu {
-
-     DebugEnums<Type> TYPES{
+    DebugEnums<Type> TYPES{
         { Type::FLOAT, "float" },
         { Type::INT32, "int32" },
         { Type::UINT32, "uint32" },

From f23f751e80e93d8203303d9f34ff9a230985b833 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 15:27:19 -0800
Subject: [PATCH 514/569] Add check to make sure entity data gets written to
 zip

---
 domain-server/src/EntitiesBackupHandler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index c9488df51f..76b32094a6 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -35,7 +35,12 @@ void EntitiesBackupHandler::createBackup(const QString& backupName, QuaZip& zip)
             qCritical().nospace() << "Failed to open " << ENTITIES_BACKUP_FILENAME << " for writing in zip";
             return;
         }
-        zipFile.write(entitiesFile.readAll());
+        auto entityData = entitiesFile.readAll();
+        if (zipFile.write(entityData) != entityData.size()) {
+            qCritical() << "Failed to write entities file to backup";
+            zipFile.close();
+            return;
+        }
         zipFile.close();
         if (zipFile.getZipError() != UNZ_OK) {
             qCritical().nospace() << "Failed to zip " << ENTITIES_BACKUP_FILENAME << ": " << zipFile.getZipError();

From 975bfa6809dc58ecf9d6b9b4ce96bbfcaaa27438 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 15:39:33 -0800
Subject: [PATCH 515/569] Clean up std::chrono usage in
 DomainContentBackupManager

---
 domain-server/src/DomainContentBackupManager.cpp | 2 +-
 domain-server/src/DomainContentBackupManager.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 93cb5385ab..60327be1dd 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -38,7 +38,7 @@
 
 #include "DomainServer.h"
 
-const std::chrono::milliseconds DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL { 30 * 1000 };  // every 30 seconds 
+const std::chrono::seconds DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL { 30 };
 // Backup format looks like: daily_backup-TIMESTAMP.zip
 static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index a3ee9e5eb1..fbc8084ac6 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -50,7 +50,7 @@ public:
         qint64 lastBackupSeconds;
     };
 
-    static const std::chrono::milliseconds DEFAULT_PERSIST_INTERVAL;
+    static const std::chrono::seconds DEFAULT_PERSIST_INTERVAL;
 
     DomainContentBackupManager(const QString& rootBackupDirectory,
                                const QVariantList& settings,
@@ -99,7 +99,7 @@ private:
     std::atomic<bool> _isRecovering { false };
     QString _recoveryFilename { };
 
-    std::chrono::time_point<std::chrono::high_resolution_clock> _lastCheck;
+    p_high_resolution_clock::time_point _lastCheck;
     std::vector<BackupRule> _backupRules;
 };
 

From 8580d181cec6c3c56ef647ceee7d0ce60d9b3554 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 26 Feb 2018 15:40:57 -0800
Subject: [PATCH 516/569] Change refresh threshold to 5 minutes.

---
 domain-server/src/AssetsBackupHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index 16dbfd8434..2369b01690 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -29,7 +29,7 @@ using namespace std;
 static const QString ASSETS_DIR { "/assets/" };
 static const QString MAPPINGS_FILE { "mappings.json" };
 static const QString ZIP_ASSETS_FOLDER { "files" };
-static const chrono::minutes MAX_REFRESH_TIME { 15 };
+static const chrono::minutes MAX_REFRESH_TIME { 5 };
 
 Q_DECLARE_LOGGING_CATEGORY(asset_backup)
 Q_LOGGING_CATEGORY(asset_backup, "hifi.asset-backup");

From d3bae870660a43c24e8b8738dfc6be51ac63e2a3 Mon Sep 17 00:00:00 2001
From: humbletim <humbletim@gmail.com>
Date: Mon, 26 Feb 2018 19:07:55 -0500
Subject: [PATCH 517/569] * remove unneeded Q_DECLARE_METATYPEs * CR feedback

---
 .../src/graphics-scripting/Forward.h           |  8 --------
 .../GraphicsScriptingInterface.h               |  4 ++++
 .../src/graphics-scripting/ScriptableMesh.cpp  | 18 +++++++++---------
 .../src/graphics-scripting/ScriptableMesh.h    |  3 +--
 .../graphics-scripting/ScriptableMeshPart.cpp  |  4 ++--
 .../src/graphics-scripting/ScriptableModel.h   |  5 +----
 libraries/render-utils/src/Model.cpp           | 11 ++++++++---
 7 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/Forward.h b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
index 38f45fbfd0..a0e186dda5 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/Forward.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/Forward.h
@@ -95,11 +95,3 @@ namespace scriptable {
     class ScriptableMeshPart;
     using ScriptableMeshPartPointer = QPointer<ScriptableMeshPart>;
 }
-
-Q_DECLARE_METATYPE(glm::uint32)
-Q_DECLARE_METATYPE(QVector<glm::uint32>)
-Q_DECLARE_METATYPE(NestableType)
-Q_DECLARE_METATYPE(scriptable::MeshPointer)
-Q_DECLARE_METATYPE(scriptable::WeakMeshPointer)
-Q_DECLARE_METATYPE(scriptable::ModelProviderPointer)
-
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
index 2e86ab01e2..84c6cb6fa8 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
@@ -85,4 +85,8 @@ private:
 
 };
 
+Q_DECLARE_METATYPE(glm::uint32)
+Q_DECLARE_METATYPE(QVector<glm::uint32>)
+Q_DECLARE_METATYPE(NestableType)
+
 #endif // hifi_GraphicsScriptingInterface_h
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 5ff916275e..bc31d45229 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -118,7 +118,7 @@ bool scriptable::ScriptableMesh::setVertexAttributes(glm::uint32 vertexIndex, co
     return buffer_helpers::mesh::setVertexAttributes(getMeshPointer(), vertexIndex, attributes);
 }
 
-int scriptable::ScriptableMesh::_getSlotNumber(const QString& attributeName) const {
+int scriptable::ScriptableMesh::getSlotNumber(const QString& attributeName) const {
     if (auto mesh = getMeshPointer()) {
         return buffer_helpers::ATTRIBUTES.value(attributeName, -1);
     }
@@ -142,9 +142,9 @@ QVariantMap scriptable::ScriptableMesh::getBufferFormats() const {
 }
 
 bool scriptable::ScriptableMesh::removeAttribute(const QString& attributeName) {
-    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    auto slot = isValid() ? getSlotNumber(attributeName) : -1;
     if (slot < 0) {
-        return 0;
+        return false;
     }
     if (slot == gpu::Stream::POSITION) {
         context()->throwError("cannot remove .position attribute");
@@ -158,7 +158,7 @@ bool scriptable::ScriptableMesh::removeAttribute(const QString& attributeName) {
 }
 
 glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeName, const QVariant& defaultValue) {
-    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    auto slot = isValid() ? getSlotNumber(attributeName) : -1;
     if (slot < 0) {
         return 0;
     }
@@ -187,7 +187,7 @@ glm::uint32 scriptable::ScriptableMesh::addAttribute(const QString& attributeNam
 }
 
 glm::uint32 scriptable::ScriptableMesh::fillAttribute(const QString& attributeName, const QVariant& value) {
-    auto slot = isValid() ? _getSlotNumber(attributeName) : -1;
+    auto slot = isValid() ? getSlotNumber(attributeName) : -1;
     if (slot < 0) {
         return 0;
     }
@@ -218,7 +218,7 @@ QVariantList scriptable::ScriptableMesh::queryVertexAttributes(QVariant selector
     if (!isValidIndex(0, attributeName)) {
         return result;
     }
-    auto slotNum = _getSlotNumber(attributeName);
+    auto slotNum = getSlotNumber(attributeName);
     const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
     glm::uint32 numElements = (glm::uint32)bufferView.getNumElements();
     for (glm::uint32 i = 0; i < numElements; i++) {
@@ -231,7 +231,7 @@ QVariant scriptable::ScriptableMesh::getVertexProperty(glm::uint32 vertexIndex,
     if (!isValidIndex(vertexIndex, attributeName)) {
         return QVariant();
     }
-    auto slotNum = _getSlotNumber(attributeName);
+    auto slotNum = getSlotNumber(attributeName);
     const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
     return buffer_helpers::getValue<QVariant>(bufferView, vertexIndex, qUtf8Printable(attributeName));
 }
@@ -240,7 +240,7 @@ bool scriptable::ScriptableMesh::setVertexProperty(glm::uint32 vertexIndex, cons
     if (!isValidIndex(vertexIndex, attributeName)) {
         return false;
     }
-    auto slotNum = _getSlotNumber(attributeName);
+    auto slotNum = getSlotNumber(attributeName);
     const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
     return buffer_helpers::setValue(bufferView, vertexIndex, value);
 }
@@ -331,7 +331,7 @@ bool scriptable::ScriptableMesh::isValidIndex(glm::uint32 vertexIndex, const QSt
         return false;
     }
     if (!attributeName.isEmpty()) {
-        auto slotNum = _getSlotNumber(attributeName);
+        auto slotNum = getSlotNumber(attributeName);
         if (slotNum < 0) {
             if (context()) {
                 context()->throwError(QString("invalid attributeName=%1").arg(attributeName));
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
index 50299b8d20..62a67aa5e6 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.h
@@ -74,9 +74,8 @@ namespace scriptable {
         QVector<scriptable::ScriptableMeshPartPointer> getMeshParts() const;
         QVariantMap getMeshExtents() const;
 
-        // TODO: remove Q_INVOKABLE (curently exposed for debugging )
-        Q_INVOKABLE int _getSlotNumber(const QString& attributeName) const;
         operator bool() const { return !weakMesh.expired(); }
+        int getSlotNumber(const QString& attributeName) const;
 
     public slots:
         const scriptable::ScriptableModelPointer getParentModel() const { return qobject_cast<scriptable::ScriptableModel*>(model); }
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
index ac48b23323..4414b0ad7e 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMeshPart.cpp
@@ -57,7 +57,7 @@ bool scriptable::ScriptableMeshPart::setVertexProperty(glm::uint32 vertexIndex,
     if (!isValidIndex(vertexIndex, attributeName)) {
         return false;
     }
-    auto slotNum = parentMesh->_getSlotNumber(attributeName);
+    auto slotNum = parentMesh->getSlotNumber(attributeName);
     const auto& bufferView = buffer_helpers::mesh::getBufferView(getMeshPointer(), static_cast<gpu::Stream::Slot>(slotNum));
     return buffer_helpers::setValue(bufferView, vertexIndex, value);
 }
@@ -369,7 +369,7 @@ bool scriptable::ScriptableMeshPart::setIndices(const QVector<glm::uint32>& indi
         return false;
     }
     glm::uint32 len = indices.size();
-    if (len != getNumVertices()) {
+    if (len != getNumIndices()) {
         context()->throwError(QString("setIndices: currently new indicies must be assign 1:1 across old indicies (indicies.size()=%1, numIndices=%2)")
                               .arg(len).arg(getNumIndices()));
         return false;
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
index d496323c1c..9a4c4f695b 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.h
@@ -44,8 +44,6 @@ namespace scriptable {
         scriptable::ScriptableModelPointer cloneModel(const QVariantMap& options = QVariantMap());
         QString toString() const;
 
-        // QScriptEngine-specific wrappers
-        //glm::uint32 forEachMeshVertexAttribute(QScriptValue callback);
     protected:
         glm::uint32 getNumMeshes() { return meshes.size(); }
 
@@ -54,5 +52,4 @@ namespace scriptable {
 }
 
 Q_DECLARE_METATYPE(scriptable::ScriptableModelPointer)
-Q_DECLARE_METATYPE(scriptable::ScriptableModelBase)
-Q_DECLARE_METATYPE(scriptable::ScriptableModelBasePointer)
+Q_DECLARE_METATYPE(QVector<scriptable::ScriptableModelPointer>)
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index f6e3ce20f0..700ced1502 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -604,15 +604,20 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
     render::Transaction transaction;
     const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
 
-    meshIndex = meshIndex >= 0 ? meshIndex : 0;
-    partIndex = partIndex >= 0 ? partIndex : 0;
+    meshIndex = max(meshIndex, 0);
+    partIndex = max(partIndex, 0);
 
-    if (meshIndex >= meshes.size()) {
+    if (meshIndex >= (int)meshes.size()) {
         qDebug() << meshIndex << "meshIndex >= newModel.meshes.size()" << meshes.size();
         return false;
     }
 
     auto mesh = meshes[meshIndex].getMeshPointer();
+
+    if (partIndex >= (int)mesh->getNumParts()) {
+        qDebug() << partIndex << "partIndex >= mesh->getNumParts()" << mesh->getNumParts();
+        return false;
+    }
     {
         // update visual geometry
         render::Transaction transaction;

From 2a204533f4344ccf4f116de169f6fd2ff75087ea Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 26 Feb 2018 15:56:11 -0800
Subject: [PATCH 518/569] Add comments to startup processes

---
 libraries/shared/src/LogHandler.cpp       |  1 +
 libraries/shared/src/SettingInterface.cpp | 31 ++++++++++++---------
 libraries/shared/src/SettingManager.h     |  4 +--
 libraries/shared/src/SharedUtil.cpp       | 33 ++++++++++++++++++++---
 libraries/shared/src/SharedUtil.h         |  5 ++++
 5 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp
index ff0d68dcce..cb3c0d07b2 100644
--- a/libraries/shared/src/LogHandler.cpp
+++ b/libraries/shared/src/LogHandler.cpp
@@ -192,6 +192,7 @@ QString LogHandler::printMessage(LogMsgType type, const QMessageLogContext& cont
 
     fprintf(stdout, "%s", qPrintable(logMessage));
 #ifdef Q_OS_WIN
+    // On windows, this will output log lines into the Visual Studio "output" tab
     OutputDebugStringA(qPrintable(logMessage));
 #endif
     return logMessage;
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index 62f116795e..04da35656e 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -23,25 +23,27 @@
 #include "SharedUtil.h"
 
 namespace Setting {
-    // cleans up the settings private instance. Should only be run once at closing down.
-    void cleanupPrivateInstance() {
+    // This should only run as a post-routine in the QCoreApplication destructor
+    void cleanupSettingsSaveThread() {
         auto globalManager = DependencyManager::get<Manager>();
         Q_ASSERT(qApp && globalManager);
 
-        // grab the thread before we nuke the instance
+        // Grab the settings thread to shut it down
         QThread* settingsManagerThread = globalManager->thread();
 
-        // quit the settings manager thread
+        // Quit the settings manager thread and wait for it so we
+        // don't get concurrent accesses when we save all settings below
         settingsManagerThread->quit();
         settingsManagerThread->wait();
 
-        // Save all settings
+        // [IMPORTANT] Save all settings when the QApplication goes down
         globalManager->saveAll();
 
         qCDebug(shared) << "Settings thread stopped.";
     }
 
-    void setupPrivateInstance() {
+    // This should only run as a pre-routine in the QCoreApplication constructor
+    void setupSettingsSaveThread() {
         auto globalManager = DependencyManager::get<Manager>();
         Q_ASSERT(qApp && globalManager);
 
@@ -55,6 +57,9 @@ namespace Setting {
         QObject::connect(thread, &QThread::finished, globalManager.data(), &Manager::stopTimer);
 
         // Setup manager threading affinity
+        // This makes the timer fire on the settings thread so we don't block the main
+        // thread with a lot of file I/O.
+        // We bring back the manager to the main thread when the QApplication goes down
         globalManager->moveToThread(thread);
         QObject::connect(thread, &QThread::finished, globalManager.data(), [] {
             auto globalManager = DependencyManager::get<Manager>();
@@ -63,15 +68,17 @@ namespace Setting {
             // Move manager back to the main thread (has to be done on owning thread)
             globalManager->moveToThread(qApp->thread());
         });
-        
+
+        // Start the settings save thread
         thread->start();
         qCDebug(shared) << "Settings thread started.";
 
-        // Register cleanupPrivateInstance to run inside QCoreApplication's destructor.
-        qAddPostRoutine(cleanupPrivateInstance);
+        // Register cleanupSettingsSaveThread to run inside QCoreApplication's destructor.
+        // This will cleanup the settings thread and save all settings before shut down.
+        qAddPostRoutine(cleanupSettingsSaveThread);
     }
 
-    // Sets up the settings private instance. Should only be run once at startup. preInit() must be run beforehand,
+    // Sets up the settings private instance. Should only be run once at startup.
     void init() {
         // Set settings format
         QSettings::setDefaultFormat(JSON_FORMAT);
@@ -91,11 +98,11 @@ namespace Setting {
             qCDebug(shared) << (deleted ? "Deleted" : "Failed to delete") << "settings lock file" << settingsLockFilename;
         }
 
-        // Setup settings manager
+        // Setup settings manager, the manager will live until the process shuts down
         DependencyManager::set<Manager>();
 
         // Add pre-routine to setup threading
-        qAddPreRoutine(setupPrivateInstance);
+        qAddPreRoutine(setupSettingsSaveThread);
     }
 
     void Interface::init() {
diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h
index ffdd4ba42a..6696a1ecf4 100644
--- a/libraries/shared/src/SettingManager.h
+++ b/libraries/shared/src/SettingManager.h
@@ -50,8 +50,8 @@ namespace Setting {
         QHash<QString, QVariant> _pendingChanges;
 
         friend class Interface;
-        friend void cleanupPrivateInstance();
-        friend void setupPrivateInstance();
+        friend void cleanupSettingsSaveThread();
+        friend void setupSettingsSaveThread();
     };
 }
 
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index d05e940322..412ea59dfe 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -66,10 +66,23 @@ extern "C" FILE * __cdecl __iob_func(void) {
 #include "OctalCode.h"
 #include "SharedLogging.h"
 
+//     Global instances are stored inside the QApplication properties
+// to provide a single instance across DLL boundaries.
+// This is something we cannot do here since several DLLs
+// and our main binaries statically link this "shared" library
+// resulting in multiple static memory blocks in different constexts
+//     But we need to be able to use global instances before the QApplication
+// is setup, so to accomplish that we stage the global instances in a local
+// map and setup a pre routine (commitGlobalInstances) that will run in the
+// QApplication constructor and commit all the staged instances to the
+// QApplication properties.
+//     Note: One of the side effects of this, is that no DLL loaded before
+// the QApplication is constructed, can expect to access the existing staged
+// global instanced. For this reason, we advise all DLLs be loaded after
+// the QApplication is instanced.
 static std::mutex stagedGlobalInstancesMutex;
 static std::unordered_map<std::string, QVariant> stagedGlobalInstances;
 
-
 std::mutex& globalInstancesMutex() {
     return stagedGlobalInstancesMutex;
 }
@@ -82,6 +95,9 @@ static void commitGlobalInstances() {
     stagedGlobalInstances.clear();
 }
 
+// This call is necessary for global instances to work across DLL boundaries
+// Ideally, this founction would be called at the top of the main function.
+// See description at the top of the file.
 void setupGlobalInstances() {
     qAddPreRoutine(commitGlobalInstances);
 }
@@ -819,8 +835,8 @@ bool similarStrings(const QString& stringA, const QString& stringB) {
 }
 
 void disableQtBearerPoll() {
-    // to disable the Qt constant wireless scanning, set the env for polling interval
-    qDebug() << "Disabling Qt wireless polling by using a negative value for QTimer::setInterval";
+    // To disable the Qt constant wireless scanning, set the env for polling interval to -1
+    // The constant polling causes ping spikes on windows every 10 seconds or so that affect the audio
     const QByteArray DISABLE_BEARER_POLL_TIMEOUT = QString::number(-1).toLocal8Bit();
     qputenv("QT_BEARER_POLL_TIMEOUT", DISABLE_BEARER_POLL_TIMEOUT);
 }
@@ -1185,19 +1201,28 @@ void watchParentProcess(int parentPID) {
 void setupHifiApplication(QString applicationName) {
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
+    // Those calls are necessary to format the log correctly
+    // and to direct the application to the correct location
+    // for read/writes into AppData and other platform equivalents.
     QCoreApplication::setApplicationName(applicationName);
     QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
+    // This ensures the global instances mechanism is correctly setup.
+    // You can find more details as to why this is important in the SharedUtil.h/cpp files
     setupGlobalInstances();
 
 #ifndef WIN32
+    // Windows tends to hold onto log lines until it has a sizeable buffer
+    // This makes the log feel unresponsive and trap useful log data in the log buffer
+    // when a crash occurs.
+    //Force windows to flush the buffer on each new line character to avoid this.
     setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
 
+    // Install the standard hifi message handler so we get consistant log formatting
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
-    qInfo() << "Starting.";
 }
 
 #ifdef Q_OS_WIN
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 7cb750d3e3..51a84bed06 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -36,7 +36,12 @@ std::unique_ptr<T>& globalInstancePointer() {
     return instancePtr;
 }
 
+// Sets up the global instances for use
+// This NEEDS to be called on startup
+// for any binary planing on using global instances
+// More details in cpp file
 void setupGlobalInstances();
+
 std::mutex& globalInstancesMutex();
 QVariant getGlobalInstance(const char* propertyName);
 void setGlobalInstance(const char* propertyName, const QVariant& variant);

From 3fa538d42d596e474b071f55bc10d34ecb361a17 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 16:24:57 -0800
Subject: [PATCH 519/569] Add RawEntityData subclass

---
 assignment-client/src/octree/OctreeServer.cpp |  4 +-
 .../src/DomainContentBackupManager.cpp        |  1 +
 domain-server/src/DomainServer.cpp            | 18 ++++----
 domain-server/src/EntitiesBackupHandler.cpp   |  4 +-
 libraries/entities/src/EntityTree.h           |  2 +
 libraries/networking/src/udt/Socket.cpp       |  2 +-
 libraries/octree/src/Octree.h                 |  3 +-
 libraries/octree/src/OctreePersistThread.cpp  |  4 +-
 libraries/octree/src/OctreeUtils.cpp          | 43 +++++++++++++------
 libraries/octree/src/OctreeUtils.h            | 24 +++++++++--
 10 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index f3859e99cf..f11e96963b 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -1157,7 +1157,7 @@ void OctreeServer::domainSettingsRequestComplete() {
 
     OctreeUtils::RawOctreeData data;
     qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
-    if (OctreeUtils::readOctreeDataInfoFromFile(_persistAbsoluteFilePath, &data)) {
+    if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
         qCDebug(octree_server) << "Current octree data: ID(" << data.id << ") DataVersion(" << data.version << ")";
         packet->writePrimitive(true);
         auto id = data.id.toRfc4122();
@@ -1189,7 +1189,7 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
         
         OctreeUtils::RawOctreeData data;
         qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
-        if (OctreeUtils::readOctreeDataInfoFromFile(_persistAbsoluteFilePath, &data)) {
+        if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
             if (data.id.isNull()) {
                 qCDebug(octree_server) << "Current octree data has a null id, updating";
                 data.resetIdAndVersion();
diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 60327be1dd..85040d8c35 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -39,6 +39,7 @@
 #include "DomainServer.h"
 
 const std::chrono::seconds DomainContentBackupManager::DEFAULT_PERSIST_INTERVAL { 30 };
+
 // Backup format looks like: daily_backup-TIMESTAMP.zip
 static const QString DATETIME_FORMAT { "yyyy-MM-dd_HH-mm-ss" };
 static const QString DATETIME_FORMAT_RE { "\\d{4}-\\d{2}-\\d{2}_\\d{2}-\\d{2}-\\d{2}" };
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index a33840462b..7ec86c8b3a 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1745,9 +1745,9 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
     QFile f(filePath);
     if (f.open(QIODevice::WriteOnly)) {
         f.write(data);
-        OctreeUtils::RawOctreeData octreeData;
-        if (OctreeUtils::readOctreeDataInfoFromData(data, &octreeData)) {
-            qCDebug(domain_server) << "Wrote new entities file" << octreeData.id << octreeData.version;
+        OctreeUtils::RawEntityData entityData;
+        if (entityData.readOctreeDataInfoFromData(data)) {
+            qCDebug(domain_server) << "Wrote new entities file" << entityData.id << entityData.version;
         } else {
             qCDebug(domain_server) << "Failed to read new octree data info";
         }
@@ -1793,8 +1793,8 @@ void DomainServer::processOctreeDataRequestMessage(QSharedPointer<ReceivedMessag
     auto entityFilePath = getEntitiesFilePath();
 
     auto reply = NLPacketList::create(PacketType::OctreeDataFileReply, QByteArray(), true, true);
-    OctreeUtils::RawOctreeData data;
-    if (OctreeUtils::readOctreeDataInfoFromFile(entityFilePath, &data)) {
+    OctreeUtils::RawEntityData data;
+    if (data.readOctreeDataInfoFromFile(entityFilePath)) {
         if (data.id == id && data.version <= version) {
             qCDebug(domain_server) << "ES has sufficient octree data, not sending data";
             reply->writePrimitive(false);
@@ -3344,8 +3344,8 @@ void DomainServer::setupGroupCacheRefresh() {
 
 void DomainServer::maybeHandleReplacementEntityFile() {
     const auto replacementFilePath = getEntitiesReplacementFilePath();
-    OctreeUtils::RawOctreeData data;
-    if (!OctreeUtils::readOctreeDataInfoFromFile(replacementFilePath, &data)) {
+    OctreeUtils::RawEntityData data;
+    if (!data.readOctreeDataInfoFromFile(replacementFilePath)) {
         qCWarning(domain_server) << "Replacement file could not be read, it either doesn't exist or is invalid.";
     } else {
         qCDebug(domain_server) << "Replacing existing entity date with replacement file";
@@ -3381,8 +3381,8 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) {
         jsonOctree = compressedOctree;
     }
 
-    OctreeUtils::RawOctreeData data;
-    if (OctreeUtils::readOctreeDataInfoFromData(jsonOctree, &data)) {
+    OctreeUtils::RawEntityData data;
+    if (data.readOctreeDataInfoFromData(jsonOctree)) {
         data.resetIdAndVersion();
 
         gzip(data.toByteArray(), compressedOctree);
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index 76b32094a6..9b4ff786a2 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -62,8 +62,8 @@ void EntitiesBackupHandler::recoverBackup(const QString& backupName, QuaZip& zip
 
     zipFile.close();
 
-    OctreeUtils::RawOctreeData data;
-    if (!OctreeUtils::readOctreeDataInfoFromData(rawData, &data)) {
+    OctreeUtils::RawEntityData data;
+    if (!data.readOctreeDataInfoFromData(rawData)) {
         qCritical() << "Unable to parse octree data during backup recovery";
         return;
     }
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index cb3d6d57e4..672cfbc931 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -115,6 +115,8 @@ public:
 
     virtual void update() override { update(true); }
 
+    std::unique_ptr<OctreeUtils::RawOctreeData> getRawOctreeData();
+
     void update(bool simulate);
 
     // The newer API...
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index f22026cd70..019ae07c16 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -328,7 +328,7 @@ void Socket::checkForReadyReadBackup() {
 void Socket::readPendingDatagrams() {
     int packetSizeWithHeader = -1;
 
-    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) != -1) {
+    while ((packetSizeWithHeader = _udpSocket.pendingDatagramSize()) > 0) {
 
         // we're reading a packet so re-start the readyRead backup timer
         _readyReadBackupTimer->start();
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 8954e53f8b..cb281593b1 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -28,6 +28,7 @@
 #include "OctreeElementBag.h"
 #include "OctreePacketData.h"
 #include "OctreeSceneStats.h"
+#include "OctreeUtils.h"
 
 class ReadBitstreamToTreeParams;
 class Octree;
@@ -328,7 +329,7 @@ public:
     virtual void dumpTree() { }
     virtual void pruneTree() { }
 
-    void setEntityVersionInfo(QUuid id, int64_t dataVersion) {
+    void setOctreeVersionInfo(QUuid id, int64_t dataVersion) {
         _persistID = id;
         _persistDataVersion = dataVersion;
     }
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index a669b7d3bb..d35bc6c869 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -176,9 +176,9 @@ bool OctreePersistThread::process() {
         }
 
         OctreeUtils::RawOctreeData data;
-        if (OctreeUtils::readOctreeDataInfoFromFile(_filename, &data)) {
+        if (data.readOctreeDataInfoFromFile(_filename)) {
             qDebug() << "Setting entity version info to: " << data.id << data.version;
-            _tree->setEntityVersionInfo(data.id, data.version);
+            _tree->setOctreeVersionInfo(data.id, data.version);
         }
 
         bool persistentFileRead;
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index fd0d496a9d..d1608280d7 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -84,7 +84,7 @@ float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust
 // Reads octree file and parses it into a QJsonDocument. Handles both gzipped and non-gzipped files.
 // Returns true if the file was successfully opened and parsed, otherwise false.
 // Example failures: file does not exist, gzipped file cannot be unzipped, invalid JSON.
-bool OctreeUtils::readOctreeFile(QString path, QJsonDocument* doc) {
+bool readOctreeFile(QString path, QJsonDocument* doc) {
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
         qCritical() << "Cannot open json file for reading: " << path;
@@ -102,18 +102,16 @@ bool OctreeUtils::readOctreeFile(QString path, QJsonDocument* doc) {
     return !doc->isNull();
 }
 
-bool readOctreeDataInfoFromJSON(QJsonObject root, OctreeUtils::RawOctreeData* octreeData) {
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromJSON(QJsonObject root) {
     if (root.contains("Id") && root.contains("DataVersion")) {
-        octreeData->id = root["Id"].toVariant().toUuid();
-        octreeData->version = root["DataVersion"].toInt();
-    }
-    if (root.contains("Entities")) {
-        octreeData->octreeData = root["Entities"].toArray();
+        id = root["Id"].toVariant().toUuid();
+        version = root["DataVersion"].toInt();
     }
+    readSubclassData(root);
     return true;
 }
 
-bool OctreeUtils::readOctreeDataInfoFromData(QByteArray data, OctreeUtils::RawOctreeData* octreeData) {
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromData(QByteArray data) {
     QByteArray jsonData;
     if (gunzip(data, jsonData)) {
         data = jsonData;
@@ -125,30 +123,31 @@ bool OctreeUtils::readOctreeDataInfoFromData(QByteArray data, OctreeUtils::RawOc
     }
 
     auto root = doc.object();
-    return readOctreeDataInfoFromJSON(root, octreeData);
+    return readOctreeDataInfoFromJSON(root);
 }
 
 // Reads octree file and parses it into a RawOctreeData object.
 // Returns false if readOctreeFile fails.
-bool OctreeUtils::readOctreeDataInfoFromFile(QString path, OctreeUtils::RawOctreeData* octreeData) {
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) {
     QJsonDocument doc;
-    if (!OctreeUtils::readOctreeFile(path, &doc)) {
+    if (!readOctreeFile(path, &doc)) {
         return false;
     }
 
     auto root = doc.object();
-    return readOctreeDataInfoFromJSON(root, octreeData);
+    return readOctreeDataInfoFromJSON(root);
 }
 
 QByteArray OctreeUtils::RawOctreeData::toByteArray() {
-    const auto protocolVersion = (int)versionForPacketType(PacketType::EntityData);
+    const auto protocolVersion = (int)versionForPacketType(dataPacketType());
     QJsonObject obj {
         { "DataVersion", QJsonValue((qint64)version) },
         { "Id", QJsonValue(id.toString()) },
         { "Version", protocolVersion },
-        { "Entities", octreeData }
     };
 
+    writeSubclassData(obj);
+
     QJsonDocument doc;
     doc.setObject(obj);
 
@@ -167,8 +166,24 @@ QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
     return gzData;
 }
 
+PacketType OctreeUtils::RawOctreeData::dataPacketType() const {
+    Q_ASSERT(false);
+    qCritical() << "Attemping to read packet type for incomplete base type 'RawOctreeData'";
+    return (PacketType)0;
+}
+
 void OctreeUtils::RawOctreeData::resetIdAndVersion() {
     id = QUuid::createUuid();
     version = OctreeUtils::INITIAL_VERSION;
     qDebug() << "Reset octree data to: " << id << version;
+}
+
+void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) {
+    if (root.contains("Entities")) {
+        entityData = root["Entities"].toArray();
+    }
+}
+
+void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const {
+    root["Entities"] = entityData;
 }
\ No newline at end of file
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index 6fb0e62bcb..dd761c2a76 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -17,6 +17,10 @@
 #include <QUuid>
 #include <QJsonArray>
 
+#include <udt/PacketHeaders.h>
+
+#include <QJsonObject>
+
 class AABox;
 class QJsonDocument;
 
@@ -31,19 +35,31 @@ public:
     QUuid id { QUuid() };
     Version version { -1 };
 
-    QJsonArray octreeData;
+    virtual PacketType dataPacketType() const;
+
+    virtual void readSubclassData(QJsonObject root) { }
+    virtual void writeSubclassData(QJsonObject root) const { }
 
     void resetIdAndVersion();
     QByteArray toByteArray();
     QByteArray toGzippedByteArray();
+
+    bool readOctreeDataInfoFromData(QByteArray data);
+    bool readOctreeDataInfoFromFile(QString path);
+    bool readOctreeDataInfoFromJSON(QJsonObject root);
 };
 
-bool readOctreeFile(QString path, QJsonDocument* doc);
-bool readOctreeDataInfoFromData(QByteArray data, RawOctreeData* octreeData);
-bool readOctreeDataInfoFromFile(QString path, RawOctreeData* octreeData);
+class RawEntityData : public RawOctreeData {
+    PacketType dataPacketType() const override { return PacketType::EntityData; }
+    void readSubclassData(QJsonObject root) override;
+    void writeSubclassData(QJsonObject root) const override;
+
+    QJsonArray entityData;
+};
 
 }
 
+
 /// renderAccuracy represents a floating point "visibility" of an object based on it's view from the camera. At a simple
 /// level it returns 0.0f for things that are so small for the current settings that they could not be visible.
 float calculateRenderAccuracy(const glm::vec3& position,

From ec210e17504b188404dc65e65c685cf13b7415ab Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 16:51:42 -0800
Subject: [PATCH 520/569] Move OctreeUtils to OctreeDataUtils

---
 assignment-client/src/octree/OctreeServer.cpp |   2 +-
 domain-server/src/DomainServer.cpp            |   2 +-
 domain-server/src/EntitiesBackupHandler.cpp   |   2 +-
 libraries/entities/src/EntityTree.h           |   2 -
 libraries/octree/src/OctreeDataUtils.cpp      | 128 ++++++++++++++++++
 libraries/octree/src/OctreeDataUtils.h        |  57 ++++++++
 libraries/octree/src/OctreePersistThread.cpp  |   1 +
 libraries/octree/src/OctreeUtils.cpp          | 113 ----------------
 libraries/octree/src/OctreeUtils.h            |  43 ------
 9 files changed, 189 insertions(+), 161 deletions(-)
 create mode 100644 libraries/octree/src/OctreeDataUtils.cpp
 create mode 100644 libraries/octree/src/OctreeDataUtils.h

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index f11e96963b..0ca2bb9763 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -33,7 +33,7 @@
 #include <PathUtils.h>
 #include <QtCore/QDir>
 
-#include <OctreeUtils.h>
+#include <OctreeDataUtils.h>
 
 Q_LOGGING_CATEGORY(octree_server, "hifi.octree-server")
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 7ec86c8b3a..fef96b9700 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -53,7 +53,7 @@
 
 #include <Gzip.h>
 
-#include <OctreeUtils.h>
+#include <OctreeDataUtils.h>
 
 Q_LOGGING_CATEGORY(domain_server, "hifi.domain_server")
 
diff --git a/domain-server/src/EntitiesBackupHandler.cpp b/domain-server/src/EntitiesBackupHandler.cpp
index 9b4ff786a2..599a730107 100644
--- a/domain-server/src/EntitiesBackupHandler.cpp
+++ b/domain-server/src/EntitiesBackupHandler.cpp
@@ -16,7 +16,7 @@
 #include <quazip5/quazip.h>
 #include <quazip5/quazipfile.h>
 
-#include <OctreeUtils.h>
+#include <OctreeDataUtils.h>
 
 EntitiesBackupHandler::EntitiesBackupHandler(QString entitiesFilePath, QString entitiesReplacementFilePath) :
     _entitiesFilePath(entitiesFilePath),
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 672cfbc931..cb3d6d57e4 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -115,8 +115,6 @@ public:
 
     virtual void update() override { update(true); }
 
-    std::unique_ptr<OctreeUtils::RawOctreeData> getRawOctreeData();
-
     void update(bool simulate);
 
     // The newer API...
diff --git a/libraries/octree/src/OctreeDataUtils.cpp b/libraries/octree/src/OctreeDataUtils.cpp
new file mode 100644
index 0000000000..9c965a128b
--- /dev/null
+++ b/libraries/octree/src/OctreeDataUtils.cpp
@@ -0,0 +1,128 @@
+//
+//  OctreeDataUtils.cpp
+//  libraries/octree/src
+//
+//  Created by Ryan Huffman 2018-02-26
+//  Copyright 2018 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 "OctreeDataUtils.h"
+
+#include <Gzip.h>
+#include <udt/PacketHeaders.h>
+
+#include <QDebug>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QFile>
+
+// Reads octree file and parses it into a QJsonDocument. Handles both gzipped and non-gzipped files.
+// Returns true if the file was successfully opened and parsed, otherwise false.
+// Example failures: file does not exist, gzipped file cannot be unzipped, invalid JSON.
+bool readOctreeFile(QString path, QJsonDocument* doc) {
+    QFile file(path);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCritical() << "Cannot open json file for reading: " << path;
+        return false;
+    }
+
+    QByteArray data = file.readAll();
+    QByteArray jsonData;
+
+    if (!gunzip(data, jsonData)) {
+        jsonData = data;
+    }
+
+    *doc = QJsonDocument::fromJson(jsonData);
+    return !doc->isNull();
+}
+
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromJSON(QJsonObject root) {
+    if (root.contains("Id") && root.contains("DataVersion")) {
+        id = root["Id"].toVariant().toUuid();
+        version = root["DataVersion"].toInt();
+    }
+    readSubclassData(root);
+    return true;
+}
+
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromData(QByteArray data) {
+    QByteArray jsonData;
+    if (gunzip(data, jsonData)) {
+        data = jsonData;
+    }
+
+    auto doc = QJsonDocument::fromJson(data);
+    if (doc.isNull()) {
+        return false;
+    }
+
+    auto root = doc.object();
+    return readOctreeDataInfoFromJSON(root);
+}
+
+// Reads octree file and parses it into a RawOctreeData object.
+// Returns false if readOctreeFile fails.
+bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) {
+    QJsonDocument doc;
+    if (!readOctreeFile(path, &doc)) {
+        return false;
+    }
+
+    auto root = doc.object();
+    return readOctreeDataInfoFromJSON(root);
+}
+
+QByteArray OctreeUtils::RawOctreeData::toByteArray() {
+    const auto protocolVersion = (int)versionForPacketType((PacketTypeEnum::Value)dataPacketType());
+    QJsonObject obj {
+        { "DataVersion", QJsonValue((qint64)version) },
+        { "Id", QJsonValue(id.toString()) },
+        { "Version", protocolVersion },
+    };
+
+    writeSubclassData(obj);
+
+    QJsonDocument doc;
+    doc.setObject(obj);
+
+    return doc.toJson();
+}
+
+QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
+    auto data = toByteArray();
+    QByteArray gzData;
+
+    if (!gzip(data, gzData, -1)) {
+        qCritical("Unable to gzip data while converting json.");
+        return QByteArray();
+    }
+
+    return gzData;
+}
+
+PacketType OctreeUtils::RawOctreeData::dataPacketType() const {
+    Q_ASSERT(false);
+    qCritical() << "Attemping to read packet type for incomplete base type 'RawOctreeData'";
+    return (PacketType)0;
+}
+
+void OctreeUtils::RawOctreeData::resetIdAndVersion() {
+    id = QUuid::createUuid();
+    version = OctreeUtils::INITIAL_VERSION;
+    qDebug() << "Reset octree data to: " << id << version;
+}
+
+void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) {
+    if (root.contains("Entities")) {
+        entityData = root["Entities"].toArray();
+    }
+}
+
+void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const {
+    root["Entities"] = entityData;
+}
+
+PacketType OctreeUtils::RawEntityData::dataPacketType() const { return PacketType::EntityData; }
\ No newline at end of file
diff --git a/libraries/octree/src/OctreeDataUtils.h b/libraries/octree/src/OctreeDataUtils.h
new file mode 100644
index 0000000000..ba70f3d079
--- /dev/null
+++ b/libraries/octree/src/OctreeDataUtils.h
@@ -0,0 +1,57 @@
+//
+//  OctreeDataUtils.h
+//  libraries/octree/src
+//
+//  Created by Ryan Huffman 2018-02-26
+//  Copyright 2018 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_OctreeDataUtils_h
+#define hifi_OctreeDataUtils_h
+
+#include <udt/PacketHeaders.h>
+
+#include <QJsonObject>
+#include <QUuid>
+#include <QJsonArray>
+
+namespace OctreeUtils {
+
+using Version = int64_t;
+constexpr Version INITIAL_VERSION = 0;
+
+//using PacketType = uint8_t;
+
+// RawOctreeData is an intermediate format between JSON and a fully deserialized Octree.
+class RawOctreeData {
+public:
+    QUuid id { QUuid() };
+    Version version { -1 };
+
+    virtual PacketType dataPacketType() const;
+
+    virtual void readSubclassData(QJsonObject root) { }
+    virtual void writeSubclassData(QJsonObject root) const { }
+
+    void resetIdAndVersion();
+    QByteArray toByteArray();
+    QByteArray toGzippedByteArray();
+
+    bool readOctreeDataInfoFromData(QByteArray data);
+    bool readOctreeDataInfoFromFile(QString path);
+    bool readOctreeDataInfoFromJSON(QJsonObject root);
+};
+
+class RawEntityData : public RawOctreeData {
+    PacketType dataPacketType() const override;
+    void readSubclassData(QJsonObject root) override;
+    void writeSubclassData(QJsonObject root) const override;
+
+    QJsonArray entityData;
+};
+
+}
+
+#endif // hifi_OctreeDataUtils_h
\ No newline at end of file
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index d35bc6c869..23d6b6c2aa 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -32,6 +32,7 @@
 #include "OctreeLogging.h"
 #include "OctreePersistThread.h"
 #include "OctreeUtils.h"
+#include "OctreeDataUtils.h"
 
 const int OctreePersistThread::DEFAULT_PERSIST_INTERVAL = 1000 * 30; // every 30 seconds
 
diff --git a/libraries/octree/src/OctreeUtils.cpp b/libraries/octree/src/OctreeUtils.cpp
index d1608280d7..8980504431 100644
--- a/libraries/octree/src/OctreeUtils.cpp
+++ b/libraries/octree/src/OctreeUtils.cpp
@@ -16,12 +16,6 @@
 #include <glm/glm.hpp>
 
 #include <AABox.h>
-#include <Gzip.h>
-#include <udt/PacketHeaders.h>
-
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QFile>
 
 float calculateRenderAccuracy(const glm::vec3& position,
         const AABox& bounds,
@@ -79,111 +73,4 @@ float getOrthographicAccuracySize(float octreeSizeScale, int boundaryLevelAdjust
     // Smallest visible element is 1cm
     const float smallestSize = 0.01f;
     return (smallestSize * MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT) / boundaryDistanceForRenderLevel(boundaryLevelAdjust, octreeSizeScale);
-}
-
-// Reads octree file and parses it into a QJsonDocument. Handles both gzipped and non-gzipped files.
-// Returns true if the file was successfully opened and parsed, otherwise false.
-// Example failures: file does not exist, gzipped file cannot be unzipped, invalid JSON.
-bool readOctreeFile(QString path, QJsonDocument* doc) {
-    QFile file(path);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCritical() << "Cannot open json file for reading: " << path;
-        return false;
-    }
-
-    QByteArray data = file.readAll();
-    QByteArray jsonData;
-
-    if (!gunzip(data, jsonData)) {
-        jsonData = data;
-    }
-
-    *doc = QJsonDocument::fromJson(jsonData);
-    return !doc->isNull();
-}
-
-bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromJSON(QJsonObject root) {
-    if (root.contains("Id") && root.contains("DataVersion")) {
-        id = root["Id"].toVariant().toUuid();
-        version = root["DataVersion"].toInt();
-    }
-    readSubclassData(root);
-    return true;
-}
-
-bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromData(QByteArray data) {
-    QByteArray jsonData;
-    if (gunzip(data, jsonData)) {
-        data = jsonData;
-    }
-
-    auto doc = QJsonDocument::fromJson(data);
-    if (doc.isNull()) {
-        return false;
-    }
-
-    auto root = doc.object();
-    return readOctreeDataInfoFromJSON(root);
-}
-
-// Reads octree file and parses it into a RawOctreeData object.
-// Returns false if readOctreeFile fails.
-bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) {
-    QJsonDocument doc;
-    if (!readOctreeFile(path, &doc)) {
-        return false;
-    }
-
-    auto root = doc.object();
-    return readOctreeDataInfoFromJSON(root);
-}
-
-QByteArray OctreeUtils::RawOctreeData::toByteArray() {
-    const auto protocolVersion = (int)versionForPacketType(dataPacketType());
-    QJsonObject obj {
-        { "DataVersion", QJsonValue((qint64)version) },
-        { "Id", QJsonValue(id.toString()) },
-        { "Version", protocolVersion },
-    };
-
-    writeSubclassData(obj);
-
-    QJsonDocument doc;
-    doc.setObject(obj);
-
-    return doc.toJson();
-}
-
-QByteArray OctreeUtils::RawOctreeData::toGzippedByteArray() {
-    auto data = toByteArray();
-    QByteArray gzData;
-
-    if (!gzip(data, gzData, -1)) {
-        qCritical("Unable to gzip data while converting json.");
-        return QByteArray();
-    }
-
-    return gzData;
-}
-
-PacketType OctreeUtils::RawOctreeData::dataPacketType() const {
-    Q_ASSERT(false);
-    qCritical() << "Attemping to read packet type for incomplete base type 'RawOctreeData'";
-    return (PacketType)0;
-}
-
-void OctreeUtils::RawOctreeData::resetIdAndVersion() {
-    id = QUuid::createUuid();
-    version = OctreeUtils::INITIAL_VERSION;
-    qDebug() << "Reset octree data to: " << id << version;
-}
-
-void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) {
-    if (root.contains("Entities")) {
-        entityData = root["Entities"].toArray();
-    }
-}
-
-void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const {
-    root["Entities"] = entityData;
 }
\ No newline at end of file
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index dd761c2a76..d5008376ea 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -14,52 +14,9 @@
 
 #include "OctreeConstants.h"
 
-#include <QUuid>
-#include <QJsonArray>
-
-#include <udt/PacketHeaders.h>
-
-#include <QJsonObject>
-
 class AABox;
 class QJsonDocument;
 
-namespace OctreeUtils {
-
-using Version = int64_t;
-constexpr Version INITIAL_VERSION = 0;
-
-// RawOctreeData is an intermediate format between JSON and a fully deserialized Octree.
-class RawOctreeData {
-public:
-    QUuid id { QUuid() };
-    Version version { -1 };
-
-    virtual PacketType dataPacketType() const;
-
-    virtual void readSubclassData(QJsonObject root) { }
-    virtual void writeSubclassData(QJsonObject root) const { }
-
-    void resetIdAndVersion();
-    QByteArray toByteArray();
-    QByteArray toGzippedByteArray();
-
-    bool readOctreeDataInfoFromData(QByteArray data);
-    bool readOctreeDataInfoFromFile(QString path);
-    bool readOctreeDataInfoFromJSON(QJsonObject root);
-};
-
-class RawEntityData : public RawOctreeData {
-    PacketType dataPacketType() const override { return PacketType::EntityData; }
-    void readSubclassData(QJsonObject root) override;
-    void writeSubclassData(QJsonObject root) const override;
-
-    QJsonArray entityData;
-};
-
-}
-
-
 /// renderAccuracy represents a floating point "visibility" of an object based on it's view from the camera. At a simple
 /// level it returns 0.0f for things that are so small for the current settings that they could not be visible.
 float calculateRenderAccuracy(const glm::vec3& position,

From 2f6e2f6b841af1f264c70c27891a5c0de4178121 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Mon, 26 Feb 2018 16:52:41 -0800
Subject: [PATCH 521/569] new wallet help

---
 .../qml/hifi/commerce/wallet/Help.qml         | 72 ++++++++++++++-----
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index f0f123f6c0..9a94b4b1cf 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -60,48 +60,86 @@ Item {
 
         ListElement {
             isExpanded: false;
-            question: "How can I get HFC?"
-            answer: qsTr("High Fidelity commerce is in closed beta right now.<br><br>To request entry and get free HFC, <b>please contact info@highfidelity.com with your High Fidelity account username and the email address registered to that account.</b>");
+            question: "How can I get HFC?";
+            answer: "High Fidelity commerce is in open beta right now. Want more HFC? Get it by going to BankOfHighFidelity and meeting with the banker!";
         }
         ListElement {
             isExpanded: false;
-            question: "What are private keys?"
-            answer: qsTr("A private key is a secret piece of text that is used to prove ownership, unlock confidential information, and sign transactions.<br><br>In High Fidelity, <b>your private keys are used to securely access the contents of your Wallet and Purchases.</b>");
+            question: "What are private keys and where are they stored?";
+            answer: 
+                "A private key is a secret piece of text that is used to prove ownership, unlock confidential information, and sign transactions. \
+In High Fidelity, your private key is used to securely access the contents of your Wallet and Purchases. \
+After wallet setup, a hifikey file is stored on your computer in High Fidelity Interface's AppData directory. \
+Your hifikey file contains your private key and is protected by your wallet passphrase. \
+<br><br>It is very important to back up your hifikey file! \
+<b><font color='#0093C5'><a href='#privateKeyPath'>Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>"
         }
         ListElement {
             isExpanded: false;
-            question: "Where are my private keys stored?"
-            answer: qsTr('By default, your private keys are <b>only stored on your hard drive</b> in High Fidelity Interface\'s AppData directory.<br><br><b><font color="#0093C5"><a href="#privateKeyPath">Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>');
+            question: "How do I back up my private keys?";
+            answer: "You can back up your hifikey file (which contains your private key) by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. \
+Restore your hifikey file by replacing the file in Interface's AppData directory with your backup copy. \
+(The file is encrypted using your passphrase, so if your passphrase is good, someone with access to your back up should not be able to spend your HFC.) \
+<b><font color='#0093C5'><a href='#privateKeyPath'>Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>";
         }
         ListElement {
             isExpanded: false;
-            question: "How can I backup my private keys?"
-            answer: qsTr('You may backup the file containing your private keys by copying it to a USB flash drive, or to a service like Dropbox or Google Drive.<br><br>Restore your backup by replacing the file in Interface\'s AppData directory with your backed-up copy.<br><br><b><font color="#0093C5"><a href="#privateKeyPath">Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>');
+            question: "What happens if I lose my private keys?";
+            answer: "We cannot stress enough that you should keep a backup of your private keys! For security reasons, High Fidelity does not keep a copy, and cannot restore it for you. \
+If you lose your private key, you will no longer have access to the contents of your Wallet or My Purchases. \
+Here are some things to try:<ul>\
+<li>If you have backed up your hifikey file before, search your backup location</li>\
+<li>Search your AppData directory in the last machine you used to set up the Wallet</li>\
+<li>If you are a developer and have installed multiple builds of High Fidelity, your hifikey file might be in a previous developer build AppData folder</li>\
+</ul><br><br>If you still cannot find your original hifikey file after trying all of the above, you can set up your Wallet again and generate a new hifikey file, which contains new private key. \
+Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
         }
         ListElement {
             isExpanded: false;
-            question: "What happens if I lose my passphrase?"
-            answer: qsTr("Your passphrase is used to encrypt your private keys. If you lose your passphrase, you will no longer be able to decrypt your private key file. You will also no longer have access to the contents of your Wallet or My Purchases.<br><br><b>Nobody can help you recover your passphrase, including High Fidelity.</b> Please write it down and store it securely.");
+            question: "What happens if I forget my wallet passphrase?";
+            answer: "Your wallet passphrase is used to encrypt your private keys. Please write it down and store it securely! \
+<br><br>If you forget your passphrase, you will no longer be able to decrypt the hifikey file that the passphrase protects. \
+You will also no longer have access to the contents of your Wallet or My Purchases. \
+For security reasons, High Fidelity does not keep a copy of your passphrase, and can't restore it for you. \
+<br><br>If you still cannot remember your wallet passphrase, you can set up your Wallet again and generate a new hifikey file, which contains a new private key. \
+Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
         }
         ListElement {
             isExpanded: false;
-            question: "What is a 'Security Pic'?"
-            answer: qsTr("Your Security Pic is an encrypted image that you selected during Wallet Setup. <b>It acts as an extra layer of Wallet security.</b><br><br>When you see your Security Pic, you know that your actions and data are securely making use of your private keys.<br><br><b>If you don't see your Security Pic on a page that is asking you for your Wallet passphrase, someone untrustworthy may be trying to gain access to your Wallet.</b><br><br>The encrypted Pic is stored on your hard drive inside the same file as your private keys.");
+            question: "How do I send HFC to other people?";
+            answer: "You can send HFC to a High Fidelity connection (someone you've shaken hands with in-world) or somebody Nearby (currently in the same domain as you). \
+In your Wallet's Send Money tab, choose from your list of connections, or choose Nearby and select the glowing sphere of the person's avatar.";
         }
         ListElement {
             isExpanded: false;
-            question: "My HFC balance isn't what I expect it to be. Why?"
-            answer: qsTr('High Fidelity Coin (HFC) transactions are backed by a <b>blockchain</b>, which takes time to update. The status of a transaction usually updates within a few seconds.<br><br><b><font color="#0093C5"><a href="#blockchain">Tap here to learn more about the blockchain.</a></font></b>');
+            question: "What is a Security Pic?"
+            answer: "Your Security Pic is an encrypted image that you select during Wallet Setup. \
+It acts as an extra layer of Wallet security. \
+When you see your Security Pic, you know that your actions and data are securely making use of your private keys.\
+<br><br>Don't enter your passphrase anywhere that doesn't display your Security Pic! \
+If you don't see your Security Pic on a page that requests your Wallet passphrase, someone untrustworthy may be trying to access your Wallet.";
         }
         ListElement {
             isExpanded: false;
-            question: "Do I get charged money if a transaction fails?"
-            answer: qsTr("<b>No.</b> Your HFC balance only changes after a transaction is confirmed.");
+            question: "My HFC balance doesn't update instantly. Why?";
+            answer: "HFC transactions sometimes takes a few seconds to update as they are backed by a blockchain. \
+<br><br><b><font color='#0093C5'><a href='#blockchain'>Tap here to learn more about the blockchain.</a></font></b>";
+        }
+        ListElement {
+            isExpanded: false;
+            question: "Do I get charged money if a transaction fails?";
+            answer: "<b>No.</b> Your HFC balance only changes after a transaction is confirmed.";
         }
         ListElement {
             isExpanded: false;
             question: "How do I convert HFC to other currencies?"
-            answer: qsTr("We are still building the tools needed to support a vibrant economy in High Fidelity. <b>There is currently no way to convert HFC to other currencies.</b>");
+            answer: "We are hard at work building the tools needed to support a vibrant economy in High Fidelity. \
+At the moment, there is currently no way to convert HFC to other currencies. Stay tuned...";
+        }
+        ListElement {
+            isExpanded: false;
+            question: "Who can I reach out to for additional questions?";
+            answer: "Please email us if you have any issues or questions: support@highfidelity.com";
         }
     }
 

From 8a8830bbd43f30dc7accfce81134967b710ce457 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Feb 2018 17:06:25 -0800
Subject: [PATCH 522/569] Fix writeSubclassData in octree data

---
 libraries/octree/src/OctreeDataUtils.cpp | 4 ++--
 libraries/octree/src/OctreeDataUtils.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/octree/src/OctreeDataUtils.cpp b/libraries/octree/src/OctreeDataUtils.cpp
index 9c965a128b..b57ab8db31 100644
--- a/libraries/octree/src/OctreeDataUtils.cpp
+++ b/libraries/octree/src/OctreeDataUtils.cpp
@@ -115,13 +115,13 @@ void OctreeUtils::RawOctreeData::resetIdAndVersion() {
     qDebug() << "Reset octree data to: " << id << version;
 }
 
-void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) {
+void OctreeUtils::RawEntityData::readSubclassData(const QJsonObject& root) {
     if (root.contains("Entities")) {
         entityData = root["Entities"].toArray();
     }
 }
 
-void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const {
+void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject& root) const {
     root["Entities"] = entityData;
 }
 
diff --git a/libraries/octree/src/OctreeDataUtils.h b/libraries/octree/src/OctreeDataUtils.h
index ba70f3d079..485599096d 100644
--- a/libraries/octree/src/OctreeDataUtils.h
+++ b/libraries/octree/src/OctreeDataUtils.h
@@ -32,8 +32,8 @@ public:
 
     virtual PacketType dataPacketType() const;
 
-    virtual void readSubclassData(QJsonObject root) { }
-    virtual void writeSubclassData(QJsonObject root) const { }
+    virtual void readSubclassData(const QJsonObject& root) { }
+    virtual void writeSubclassData(QJsonObject& root) const { }
 
     void resetIdAndVersion();
     QByteArray toByteArray();
@@ -46,8 +46,8 @@ public:
 
 class RawEntityData : public RawOctreeData {
     PacketType dataPacketType() const override;
-    void readSubclassData(QJsonObject root) override;
-    void writeSubclassData(QJsonObject root) const override;
+    void readSubclassData(const QJsonObject& root) override;
+    void writeSubclassData(QJsonObject& root) const override;
 
     QJsonArray entityData;
 };

From eb683d479367dfa9299d3a6e0f40ff516f0d8c29 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Mon, 26 Feb 2018 17:09:33 -0800
Subject: [PATCH 523/569] mail is a link

---
 interface/resources/qml/hifi/commerce/wallet/Help.qml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 9a94b4b1cf..fec8b6cae1 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -139,7 +139,8 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
         ListElement {
             isExpanded: false;
             question: "Who can I reach out to for additional questions?";
-            answer: "Please email us if you have any issues or questions: support@highfidelity.com";
+            answer: "Please email us if you have any issues or questions: \
+<b><font color='#0093C5'><a href='#support'>support@highfidelity.com</a></font></b>";
         }
     }
 
@@ -250,7 +251,9 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                             Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
-                        }
+                        } else if (link === "#support") {
+			    Qt.openUrlExternally("mailto:support@highfidelity.com");
+			}
                     }
                 }
             }

From 88931d9c95afb7eeb5e8e1e94b9c421899c514eb Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 27 Feb 2018 08:33:20 -0800
Subject: [PATCH 524/569] Fix entity data not being stored when Id and
 DataVersion are null

---
 assignment-client/src/octree/OctreeServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 0ca2bb9763..0dbd24fe9c 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -1187,7 +1187,7 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
     } else {
         qDebug() << "Got reply to octree data file request, current entity data is sufficient";
         
-        OctreeUtils::RawOctreeData data;
+        OctreeUtils::RawEntityData data;
         qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
         if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
             if (data.id.isNull()) {

From 053640f2166f501bd0a84d2431274ecead31c249 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Tue, 27 Feb 2018 08:36:45 -0800
Subject: [PATCH 525/569] a guess a linking bank

---
 interface/resources/qml/hifi/commerce/wallet/Help.qml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index fec8b6cae1..a75d090370 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -61,7 +61,8 @@ Item {
         ListElement {
             isExpanded: false;
             question: "How can I get HFC?";
-            answer: "High Fidelity commerce is in open beta right now. Want more HFC? Get it by going to BankOfHighFidelity and meeting with the banker!";
+            answer: "High Fidelity commerce is in open beta right now. Want more HFC? \
+Get it by going to <br><br><b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity.</a></font></b> and meeting with the banker!";
         }
         ListElement {
             isExpanded: false;
@@ -251,9 +252,11 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                             Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
+                        } else if (link === "#bank") {
+                            Qt.openUrlExternally("hifi://BankOfHighFidelity";)
                         } else if (link === "#support") {
-			    Qt.openUrlExternally("mailto:support@highfidelity.com");
-			}
+                            Qt.openUrlExternally("mailto:support@highfidelity.com");
+                        }
                     }
                 }
             }

From bb2f3cac2cc7140d4e971e414a930a5e1a56fabe Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 27 Feb 2018 08:51:55 -0800
Subject: [PATCH 526/569] Use named constant for the onset of near-field
 corrections (1 meter)

---
 assignment-client/src/audio/AudioMixerSlave.cpp |  4 ++--
 libraries/audio-client/src/AudioClient.cpp      |  2 +-
 libraries/audio/src/AudioHRTF.cpp               | 12 ++++++------
 libraries/audio/src/AudioHRTF.h                 |  5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index e5ad9a681a..04b818adee 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -540,8 +540,8 @@ float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudi
 
     // calculate the attenuation using the distance to this node
     // reference attenuation of 0dB at distance = 1.0m
-    gain *= exp2f(log2f(g) * log2f(std::max(distance, HRTF_DISTANCE_MIN)));
-    gain = std::min(gain, 1.0f / HRTF_DISTANCE_MIN);
+    gain *= exp2f(log2f(g) * log2f(std::max(distance, HRTF_NEARFIELD_MIN)));
+    gain = std::min(gain, 1.0f / HRTF_NEARFIELD_MIN);
 
     return gain;
 }
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 40a55c272c..8379151d1c 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1826,7 +1826,7 @@ float AudioClient::gainForSource(float distance, float volume) {
 
     // attenuation = -6dB * log2(distance)
     // reference attenuation of 0dB at distance = 1.0m
-    float gain = volume / std::max(distance, HRTF_DISTANCE_MIN);
+    float gain = volume / std::max(distance, HRTF_NEARFIELD_MIN);
 
     return gain;
 }
diff --git a/libraries/audio/src/AudioHRTF.cpp b/libraries/audio/src/AudioHRTF.cpp
index 8ccb79b2a5..a6451b1771 100644
--- a/libraries/audio/src/AudioHRTF.cpp
+++ b/libraries/audio/src/AudioHRTF.cpp
@@ -790,10 +790,10 @@ static void nearFieldAzimuth(float azimuth, float distance, float& azimuthL, flo
 //
 static void nearFieldGain(float azimuth, float distance, float& gainL, float& gainR) {
 
-    // normalized distance factor = [0,1] as distance = [1,HRTF_HEAD_RADIUS]
-    assert(distance < 1.0f);
+    // normalized distance factor = [0,1] as distance = [HRTF_NEARFIELD_MAX,HRTF_HEAD_RADIUS]
+    assert(distance < HRTF_NEARFIELD_MAX);
     assert(distance > HRTF_HEAD_RADIUS);
-	float d = (1.0f - distance) * ( 1.0f / (1.0f - HRTF_HEAD_RADIUS));
+	float d = (HRTF_NEARFIELD_MAX - distance) * ( 1.0f / (HRTF_NEARFIELD_MAX - HRTF_HEAD_RADIUS));
 
     // angle of incidence at each ear
     float angleL = azimuth + HALFPI;
@@ -816,7 +816,7 @@ static void nearFieldGain(float azimuth, float distance, float& gainL, float& ga
     float cR = ((-0.000452339132f * angleR - 0.00173192444f) * angleR + 0.162476536f) * angleR;
 
     // approximate the gain correction
-    // NOTE: this must converge to 1.0 when distance = 1.0m at all azimuth
+    // NOTE: this must converge to 1.0 when distance = HRTF_NEARFIELD_MAX at all azimuth
     gainL = 1.0f - d * cL;
     gainR = 1.0f - d * cR;
 }
@@ -891,7 +891,7 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
     assert(azimuth >= -PI);
     assert(azimuth <= +PI);
 
-    distance = MAX(distance, HRTF_DISTANCE_MIN);
+    distance = MAX(distance, HRTF_NEARFIELD_MIN);
 
     // compute the azimuth correction at each ear
     float azimuthL, azimuthR;
@@ -900,7 +900,7 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
     // compute the DC gain correction at each ear
     float gainL = 1.0f;
     float gainR = 1.0f;
-    if (distance < 1.0f) {
+    if (distance < HRTF_NEARFIELD_MAX) {
         nearFieldGain(azimuth, distance, gainL, gainR);
     }
 
diff --git a/libraries/audio/src/AudioHRTF.h b/libraries/audio/src/AudioHRTF.h
index b8422b7c73..f0f4dd849b 100644
--- a/libraries/audio/src/AudioHRTF.h
+++ b/libraries/audio/src/AudioHRTF.h
@@ -24,8 +24,9 @@ static const int HRTF_BLOCK = 240;      // block processing size
 static const float HRTF_GAIN = 1.0f;    // HRTF global gain adjustment
 
 // Near-field HRTF
-static const float HRTF_DISTANCE_MIN = 0.125f;
-static const float HRTF_HEAD_RADIUS = 0.0875f;  // average human head
+static const float HRTF_NEARFIELD_MAX = 1.0f;   // distance in meters
+static const float HRTF_NEARFIELD_MIN = 0.125f; // distance in meters
+static const float HRTF_HEAD_RADIUS = 0.0875f;  // average human head in meters
 
 class AudioHRTF {
 

From cc7b9a254b63cc50579ab8541cfbeb48a65c4c63 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 27 Feb 2018 09:02:03 -0800
Subject: [PATCH 527/569] Optimized compute of distance attenuation

---
 assignment-client/src/audio/AudioMixerSlave.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index 04b818adee..4ec4a0f67f 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -49,7 +49,7 @@ void sendEnvironmentPacket(const SharedNodePointer& node, AudioMixerClientData&
 inline float approximateGain(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
         const glm::vec3& relativePosition);
 inline float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudioStream& listeningNodeStream,
-        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, bool isEcho);
+        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, float distance, bool isEcho);
 inline float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const PositionalAudioStream& streamToAdd,
         const glm::vec3& relativePosition);
 
@@ -276,7 +276,7 @@ void AudioMixerSlave::addStream(AudioMixerClientData& listenerNodeData, const QU
     glm::vec3 relativePosition = streamToAdd.getPosition() - listeningNodeStream.getPosition();
 
     float distance = glm::max(glm::length(relativePosition), EPSILON);
-    float gain = computeGain(listenerNodeData, listeningNodeStream, streamToAdd, relativePosition, isEcho);
+    float gain = computeGain(listenerNodeData, listeningNodeStream, streamToAdd, relativePosition, distance, isEcho);
     float azimuth = isEcho ? 0.0f : computeAzimuth(listeningNodeStream, listeningNodeStream, relativePosition);
     const int HRTF_DATASET_INDEX = 1;
 
@@ -496,7 +496,7 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
 }
 
 float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudioStream& listeningNodeStream,
-        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, bool isEcho) {
+        const PositionalAudioStream& streamToAdd, const glm::vec3& relativePosition, float distance, bool isEcho) {
     float gain = 1.0f;
 
     // injector: apply attenuation
@@ -536,11 +536,9 @@ float computeGain(const AudioMixerClientData& listenerNodeData, const AvatarAudi
     // translate the zone setting to gain per log2(distance)
     float g = glm::clamp(1.0f - attenuationPerDoublingInDistance, EPSILON, 1.0f);
 
-    float distance = glm::length(relativePosition);
-
     // calculate the attenuation using the distance to this node
     // reference attenuation of 0dB at distance = 1.0m
-    gain *= exp2f(log2f(g) * log2f(std::max(distance, HRTF_NEARFIELD_MIN)));
+    gain *= fastExp2f(fastLog2f(g) * fastLog2f(std::max(distance, HRTF_NEARFIELD_MIN)));
     gain = std::min(gain, 1.0f / HRTF_NEARFIELD_MIN);
 
     return gain;

From efba6bb5246d56de989f55e827a6bcb96e8cc6ef Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 27 Feb 2018 09:11:14 -0800
Subject: [PATCH 528/569] Adding a counter for the other parts of the gameloop

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

diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 80f57bfe0e..bbc8de5987 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -482,7 +482,7 @@ void Stats::updateStats(bool force) {
             float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
             _gameUpdateStats = QString("/idle/update = %1 ms").arg(dt);
 
-            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "misc" };
+            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "pickManager", "postUpdateLambdas", "misc" };
             for (int32_t j = 0; j < categories.size(); ++j) {
                 QString recordKey = "/idle/update/" + categories[j];
                 itr = allRecords.find(recordKey);

From 917024431207c5dd77efa6a96c26f142ae69bbd6 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 27 Feb 2018 09:36:02 -0800
Subject: [PATCH 529/569] Make WindowScriptingInterface available to tablet

---
 interface/src/ui/overlays/Web3DOverlay.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index d1a2ff3943..b324bf39c4 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -26,6 +26,7 @@
 #include <GeometryUtil.h>
 #include <gl/GLHelpers.h>
 #include <scripting/HMDScriptingInterface.h>
+#include <scripting/WindowScriptingInterface.h>
 #include <ui/OffscreenQmlSurface.h>
 #include <ui/OffscreenQmlSurfaceCache.h>
 #include <ui/TabletScriptingInterface.h>
@@ -233,6 +234,7 @@ void Web3DOverlay::setupQmlSurface() {
         _webSurface->getSurfaceContext()->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("Pointers", DependencyManager::get<PointerScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("Web3DOverlay", this);
+        _webSurface->getSurfaceContext()->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
 
         _webSurface->getSurfaceContext()->setContextProperty("pathToFonts", "../../");
 

From 0fca56eef06609e9624ab9571ebcf1d9deef4a5e Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 27 Feb 2018 11:33:05 -0800
Subject: [PATCH 530/569] Revert "Merge pull request #12407 from
 NissimHadar/shadowControlsOffZvork"

This reverts commit 3201d2ba21f8b0e131bf362a7cbb6142db09e329, reversing
changes made to c0f20900a055c457b3c240f2fe2e81eabb7066af.
---
 .../dialogs/GraphicsPreferencesDialog.qml     | 19 ++++++
 .../hifi/tablet/TabletGraphicsPreferences.qml | 37 +++++++++++
 interface/src/Menu.cpp                        | 14 ++---
 interface/src/Menu.h                          |  2 -
 interface/src/avatar/MyAvatar.cpp             | 11 ++--
 interface/src/avatar/MyAvatar.h               |  2 +
 .../src/RenderableEntityItem.cpp              |  8 +--
 .../src/RenderableEntityItem.h                |  1 -
 .../src/RenderableModelEntityItem.cpp         |  4 --
 .../src/RenderableZoneEntityItem.cpp          |  1 -
 libraries/entities/src/EntityItem.cpp         | 27 --------
 libraries/entities/src/EntityItem.h           |  5 --
 .../entities/src/EntityItemProperties.cpp     | 13 ----
 libraries/entities/src/EntityItemProperties.h |  2 -
 .../src/EntityItemPropertiesDefaults.h        |  1 -
 libraries/entities/src/EntityPropertyFlags.h  | 10 ++-
 .../entities/src/KeyLightPropertyGroup.cpp    | 34 +++-------
 .../entities/src/KeyLightPropertyGroup.h      |  2 -
 libraries/entities/src/ModelEntityItem.cpp    |  8 +--
 libraries/entities/src/ShapeEntityItem.cpp    |  3 +-
 libraries/entities/src/ShapeEntityItem.h      |  2 -
 libraries/graphics/src/graphics/Light.cpp     |  9 +--
 libraries/graphics/src/graphics/Light.h       |  5 --
 .../networking/src/udt/PacketHeaders.cpp      |  2 +-
 libraries/networking/src/udt/PacketHeaders.h  |  3 +-
 .../render-utils/src/CauterizedModel.cpp      |  5 +-
 .../src/DeferredLightingEffect.cpp            | 20 ++----
 .../render-utils/src/DeferredLightingEffect.h |  2 +-
 .../render-utils/src/MeshPartPayload.cpp      | 13 +---
 libraries/render-utils/src/MeshPartPayload.h  |  5 +-
 libraries/render-utils/src/Model.cpp          | 63 ++++++-------------
 libraries/render-utils/src/Model.h            |  6 --
 .../render-utils/src/RenderShadowTask.cpp     | 14 +----
 libraries/render-utils/src/RenderShadowTask.h |  2 +-
 libraries/render/src/render/Item.h            |  1 +
 scripts/system/html/entityProperties.html     | 44 +++++++------
 scripts/system/html/js/entityProperties.js    | 32 +---------
 37 files changed, 147 insertions(+), 285 deletions(-)
 create mode 100644 interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
 create mode 100644 interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml

diff --git a/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml b/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
new file mode 100644
index 0000000000..d95bafd0a9
--- /dev/null
+++ b/interface/resources/qml/hifi/dialogs/GraphicsPreferencesDialog.qml
@@ -0,0 +1,19 @@
+import QtQuick 2.5
+import Qt.labs.settings 1.0
+
+import "../../dialogs"
+
+PreferencesDialog {
+    id: root
+    objectName: "GraphicsPreferencesDialog"
+    title: "Graphics Settings"
+    showCategories: ["Graphics"]
+    property var settings: Settings {
+        category: root.objectName
+        property alias x: root.x
+        property alias y: root.y
+        property alias width: root.width
+        property alias height: root.height
+    }
+}
+
diff --git a/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
new file mode 100644
index 0000000000..25b5be05f2
--- /dev/null
+++ b/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml
@@ -0,0 +1,37 @@
+//
+//  TabletGraphicsPreferences.qml
+//
+//  Created by Vlad Stelmahovsky on 12 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 "tabletWindows"
+import "../../dialogs"
+
+StackView {
+    id: profileRoot
+    initialItem: root
+    objectName: "stack"
+    property string title: "Graphics Settings"
+
+    signal sendToScript(var message);
+
+    function pushSource(path) {
+        profileRoot.push(Qt.resolvedUrl(path));
+    }
+
+    function popSource() {
+        profileRoot.pop();
+    }
+
+    TabletPreferencesDialog {
+        id: root
+        objectName: "TabletGraphicsPreferences"
+        showCategories: ["Graphics"]
+    }
+}
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 17b670a343..8c0ac584c5 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -43,7 +43,6 @@
 #include "ui/StandAloneJSConsole.h"
 #include "InterfaceLogging.h"
 #include "LocationBookmarks.h"
-#include "DeferredLightingEffect.h"
 
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #include "SpeechRecognizer.h"
@@ -362,15 +361,10 @@ Menu::Menu() {
     MenuWrapper* developerMenu = addMenu("Developer", "Developer");
 
     // Developer > Graphics...
-    MenuWrapper* graphicsOptionsMenu = developerMenu->addMenu("Render");
-    action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::Shadows, 0, true);
-    connect(action, &QAction::triggered, [action] {
-        DependencyManager::get<DeferredLightingEffect>()->setShadowMapEnabled(action->isChecked());
-    });
-
-    action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::AmbientOcclusion, 0, false);
-    connect(action, &QAction::triggered, [action] {
-        DependencyManager::get<DeferredLightingEffect>()->setAmbientOcclusionEnabled(action->isChecked());
+    action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
+    connect(action, &QAction::triggered, [] {
+        qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
+            QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
     });
 
     // Developer > UI >>>
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 1d37b74ffe..34588535ec 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -204,8 +204,6 @@ namespace MenuOption {
     const QString WorldAxes = "World Axes";
     const QString DesktopTabletToToolbar = "Desktop Tablet Becomes Toolbar";
     const QString HMDTabletToToolbar = "HMD Tablet Becomes Toolbar";
-    const QString Shadows = "Shadows";
-    const QString AmbientOcclusion = "AmbientOcclusion";
 }
 
 #endif // hifi_Menu_h
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 2ada31e1ed..b6fa3fde96 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1115,7 +1115,6 @@ void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
     _skeletonModel->setVisibleInScene(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
-    _skeletonModel->setCanCastShadow(isEnabled, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
 }
 
 void MyAvatar::setEnableInverseKinematics(bool isEnabled) {
@@ -1468,7 +1467,6 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     int skeletonModelChangeCount = _skeletonModelChangeCount;
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
-    _skeletonModel->setCanCastShadow(true, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
     _headBoneSet.clear();
     _cauterizationNeedsUpdate = true;
 
@@ -1850,6 +1848,12 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName,
     Avatar::attach(modelURL, jointName, translation, rotation, scale, isSoft, allowDuplicates, useSaved);
 }
 
+void MyAvatar::setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visible) {
+    if (model->isActive() && model->isRenderable()) {
+        model->setVisibleInScene(visible, scene, render::ItemKey::TAG_BITS_NONE, true);
+    }
+}
+
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
     if (_skeletonModel->isLoaded()) {
@@ -2039,11 +2043,8 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
                 _attachmentData[i].jointName.compare("RightEye", Qt::CaseInsensitive) == 0 ||
                 _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
                 _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
-
                 _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene(),
                                                         render::ItemKey::TAG_BITS_NONE, true);
-
-                _attachmentModels[i]->setCanCastShadow(shouldDrawHead, qApp->getMain3DScene(), render::ItemKey::TAG_BITS_NONE, true);
             }
         }
     }
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 2615f8fa0f..fa5206e128 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -681,6 +681,8 @@ private:
     // These are made private for MyAvatar so that you will use the "use" methods instead
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
 
+    void setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visiblity);
+
     virtual void updatePalms() override {}
     void lateUpdatePalms();
 
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index c33b87e5cf..d3c9f3d4bd 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -164,12 +164,7 @@ ItemKey EntityRenderer::getKey() {
         return ItemKey::Builder::transparentShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
     }
 
-    // This allows shapes to cast shadows
-    if (_canCastShadow) {
-        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1).withShadowCaster();
-    } else {
-        return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
-    }
+    return ItemKey::Builder::opaqueShape().withTypeMeta().withTagBits(render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_1);
 }
 
 uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) {
@@ -382,7 +377,6 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa
 
         _moving = entity->isMovingRelativeToParent();
         _visible = entity->getVisible();
-        _canCastShadow = entity->getCanCastShadow();
         _cauterized = entity->getCauterized();
         _needsRenderUpdate = false;
     });
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index ada57c8ab0..d34a1127ae 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -129,7 +129,6 @@ protected:
     bool _isFading{ _entitiesShouldFadeFunction() };
     bool _prevIsTransparent { false };
     bool _visible { false };
-    bool _canCastShadow { false };
     bool _cauterized { false };
     bool _moving { false };
     bool _needsRenderUpdate { false };
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index b7c5caf8ee..5f926d1bb9 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -1395,10 +1395,6 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
     }
     // TODO? early exit here when not visible?
 
-    if (model->canCastShadow() != _canCastShadow) {
-        model->setCanCastShadow(_canCastShadow, scene, viewTaskBits, false);
-    }
-
     if (_needsCollisionGeometryUpdate) {
         setCollisionMeshKey(entity->getCollisionMeshKey());
         _needsCollisionGeometryUpdate = false;
diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index 322c91e3d3..34703804cd 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -330,7 +330,6 @@ void ZoneEntityRenderer::updateKeySunFromEntity(const TypedEntityPointer& entity
     sunLight->setColor(ColorUtils::toVec3(_keyLightProperties.getColor()));
     sunLight->setIntensity(_keyLightProperties.getIntensity());
     sunLight->setDirection(entity->getTransform().getRotation() * _keyLightProperties.getDirection());
-    sunLight->setCastShadows(_keyLightProperties.getCastShadows());
 }
 
 void ZoneEntityRenderer::updateAmbientLightFromEntity(const TypedEntityPointer& entity) {
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index f77d8a59c3..ec0bdbd2ae 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -91,7 +91,6 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_REGISTRATION_POINT;
     requestedProperties += PROP_ANGULAR_DAMPING;
     requestedProperties += PROP_VISIBLE;
-    requestedProperties += PROP_CAN_CAST_SHADOW;
     requestedProperties += PROP_COLLISIONLESS;
     requestedProperties += PROP_COLLISION_MASK;
     requestedProperties += PROP_DYNAMIC;
@@ -250,7 +249,6 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_REGISTRATION_POINT, getRegistrationPoint());
         APPEND_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, getAngularDamping());
         APPEND_ENTITY_PROPERTY(PROP_VISIBLE, getVisible());
-        APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, getCanCastShadow());
         APPEND_ENTITY_PROPERTY(PROP_COLLISIONLESS, getCollisionless());
         APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, getCollisionMask());
         APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, getDynamic());
@@ -801,7 +799,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
     READ_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, float, setAngularDamping);
     READ_ENTITY_PROPERTY(PROP_VISIBLE, bool, setVisible);
-    READ_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY(PROP_COLLISIONLESS, bool, setCollisionless);
     READ_ENTITY_PROPERTY(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
     READ_ENTITY_PROPERTY(PROP_DYNAMIC, bool, setDynamic);
@@ -1237,7 +1234,6 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(angularDamping, getAngularDamping);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(localRenderAlpha, getLocalRenderAlpha);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(visible, getVisible);
-    COPY_ENTITY_PROPERTY_TO_PROPERTIES(canCastShadow, getCanCastShadow);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionless, getCollisionless);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(collisionMask, getCollisionMask);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(dynamic, getDynamic);
@@ -1350,7 +1346,6 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(collisionSoundURL, setCollisionSoundURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(localRenderAlpha, setLocalRenderAlpha);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(visible, setVisible);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(canCastShadow, setCanCastShadow);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(userData, setUserData);
 
     // Certifiable Properties
@@ -2728,28 +2723,6 @@ void EntityItem::setVisible(bool value) {
     }
 }
 
-bool EntityItem::getCanCastShadow() const {
-    bool result;
-    withReadLock([&] {
-        result = _canCastShadow;
-    });
-    return result;
-}
-
-void EntityItem::setCanCastShadow(bool value) {
-    bool changed = false;
-    withWriteLock([&] {
-        if (_canCastShadow != value) {
-            changed = true;
-            _canCastShadow = value;
-        }
-    });
-
-    if (changed) {
-        emit requestRenderUpdate();
-    }
-}
-
 bool EntityItem::isChildOfMyAvatar() const {
     QUuid ancestorID = findAncestorOfType(NestableType::Avatar);
     return !ancestorID.isNull() && (ancestorID == Physics::getSessionUUID() || ancestorID == AVATAR_SELF_ID);
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index d08c5514e9..b12417c496 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -274,10 +274,6 @@ public:
 
     bool getVisible() const;
     void setVisible(bool value);
-
-    bool getCanCastShadow() const;
-    void setCanCastShadow(bool value);
-
     inline bool isVisible() const { return getVisible(); }
     inline bool isInvisible() const { return !getVisible(); }
 
@@ -555,7 +551,6 @@ protected:
     glm::vec3 _registrationPoint { ENTITY_ITEM_DEFAULT_REGISTRATION_POINT };
     float _angularDamping { ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING };
     bool _visible { ENTITY_ITEM_DEFAULT_VISIBLE };
-    bool _canCastShadow{ ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
     bool _collisionless { ENTITY_ITEM_DEFAULT_COLLISIONLESS };
     uint8_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
     bool _dynamic { ENTITY_ITEM_DEFAULT_DYNAMIC };
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 2eca612fc2..a2724c4cbf 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -316,7 +316,6 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_MODEL_URL, modelURL);
     CHECK_PROPERTY_CHANGE(PROP_COMPOUND_SHAPE_URL, compoundShapeURL);
     CHECK_PROPERTY_CHANGE(PROP_VISIBLE, visible);
-    CHECK_PROPERTY_CHANGE(PROP_CAN_CAST_SHADOW, canCastShadow);
     CHECK_PROPERTY_CHANGE(PROP_REGISTRATION_POINT, registrationPoint);
     CHECK_PROPERTY_CHANGE(PROP_ANGULAR_VELOCITY, angularVelocity);
     CHECK_PROPERTY_CHANGE(PROP_ANGULAR_DAMPING, angularDamping);
@@ -491,7 +490,6 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ANGULAR_VELOCITY, angularVelocity);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ANGULAR_DAMPING, angularDamping);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_VISIBLE, visible);
-    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CAN_CAST_SHADOW, canCastShadow);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISIONLESS, collisionless);
     COPY_PROXY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_COLLISIONLESS, collisionless, ignoreForCollisions, getCollisionless()); // legacy support
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISION_MASK, collisionMask);
@@ -753,7 +751,6 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(angularVelocity, glmVec3, setAngularVelocity);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(angularDamping, float, setAngularDamping);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(visible, bool, setVisible);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE(canCastShadow, bool, setCanCastShadow);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(color, xColor, setColor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(colorSpread, xColor, setColorSpread);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(colorStart, xColor, setColorStart);
@@ -925,7 +922,6 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(angularVelocity);
     COPY_PROPERTY_IF_CHANGED(angularDamping);
     COPY_PROPERTY_IF_CHANGED(visible);
-    COPY_PROPERTY_IF_CHANGED(canCastShadow);
     COPY_PROPERTY_IF_CHANGED(color);
     COPY_PROPERTY_IF_CHANGED(colorSpread);
     COPY_PROPERTY_IF_CHANGED(colorStart);
@@ -1098,7 +1094,6 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
 
     std::call_once(initMap, [](){
         ADD_PROPERTY_TO_MAP(PROP_VISIBLE, Visible, visible, bool);
-        ADD_PROPERTY_TO_MAP(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool);
         ADD_PROPERTY_TO_MAP(PROP_POSITION, Position, position, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_DIMENSIONS, Dimensions, dimensions, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_ROTATION, Rotation, rotation, glm::quat);
@@ -1192,8 +1187,6 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_DIRECTION, KeyLightDirection, keyLightDirection, glm::vec3);
-        ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_CAST_SHADOW, KeyLightCastShadows, keyLightCastShadows, bool);
-
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3);
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray);
         ADD_PROPERTY_TO_MAP(PROP_VOXEL_SURFACE_STYLE, VoxelSurfaceStyle, voxelSurfaceStyle, uint16_t);
@@ -1419,7 +1412,6 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
             APPEND_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, properties.getAngularVelocity());
             APPEND_ENTITY_PROPERTY(PROP_ANGULAR_DAMPING, properties.getAngularDamping());
             APPEND_ENTITY_PROPERTY(PROP_VISIBLE, properties.getVisible());
-            APPEND_ENTITY_PROPERTY(PROP_CAN_CAST_SHADOW, properties.getCanCastShadow());
             APPEND_ENTITY_PROPERTY(PROP_COLLISIONLESS, properties.getCollisionless());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_MASK, properties.getCollisionMask());
             APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, properties.getDynamic());
@@ -1792,7 +1784,6 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ANGULAR_VELOCITY, glm::vec3, setAngularVelocity);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ANGULAR_DAMPING, float, setAngularDamping);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VISIBLE, bool, setVisible);
-    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CAN_CAST_SHADOW, bool, setCanCastShadow);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISIONLESS, bool, setCollisionless);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_MASK, uint8_t, setCollisionMask);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DYNAMIC, bool, setDynamic);
@@ -2062,7 +2053,6 @@ void EntityItemProperties::markAllChanged() {
     _angularDampingChanged = true;
     _nameChanged = true;
     _visibleChanged = true;
-    _canCastShadowChanged = true;
     _colorChanged = true;
     _alphaChanged = true;
     _modelURLChanged = true;
@@ -2260,9 +2250,6 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (visibleChanged()) {
         out += "visible";
     }
-    if (canCastShadowChanged()) {
-        out += "canCastShadow";
-    }
     if (rotationChanged()) {
         out += "rotation";
     }
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 0838bb937a..36ca47291c 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -117,7 +117,6 @@ public:
     // bool _fooChanged { false };
 
     DEFINE_PROPERTY(PROP_VISIBLE, Visible, visible, bool, ENTITY_ITEM_DEFAULT_VISIBLE);
-    DEFINE_PROPERTY(PROP_CAN_CAST_SHADOW, CanCastShadow, canCastShadow, bool, ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW);
     DEFINE_PROPERTY_REF_WITH_SETTER(PROP_POSITION, Position, position, glm::vec3, ENTITY_ITEM_ZERO_VEC3);
     DEFINE_PROPERTY_REF(PROP_DIMENSIONS, Dimensions, dimensions, glm::vec3, ENTITY_ITEM_DEFAULT_DIMENSIONS);
     DEFINE_PROPERTY_REF(PROP_ROTATION, Rotation, rotation, glm::quat, ENTITY_ITEM_DEFAULT_ROTATION);
@@ -427,7 +426,6 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Velocity, velocity, "in meters");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Name, name, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Visible, visible, "");
-    DEBUG_PROPERTY_IF_CHANGED(debug, properties, CanCastShadow, canCastShadow, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Rotation, rotation, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Density, density, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, Gravity, gravity, "");
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index 0e0c2994cd..eb09a64628 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -46,7 +46,6 @@ const quint32 ENTITY_ITEM_DEFAULT_STATIC_CERTIFICATE_VERSION = 0;
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
-const bool ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW { true };
 
 const QString ENTITY_ITEM_DEFAULT_SCRIPT = QString("");
 const quint64 ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP = 0;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index 07908fe6cf..b65d5d1a3f 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -20,7 +20,6 @@ enum EntityPropertyList {
 
     // these properties are supported by the EntityItem base class
     PROP_VISIBLE,
-    PROP_CAN_CAST_SHADOW,
     PROP_POSITION,
     PROP_DIMENSIONS,
     PROP_ROTATION,
@@ -206,11 +205,6 @@ enum EntityPropertyList {
 
     PROP_HAZE_MODE,
 
-    PROP_KEYLIGHT_COLOR,
-    PROP_KEYLIGHT_INTENSITY,
-    PROP_KEYLIGHT_DIRECTION,
-    PROP_KEYLIGHT_CAST_SHADOW,
-
     PROP_HAZE_RANGE,
     PROP_HAZE_COLOR,
     PROP_HAZE_GLARE_COLOR,
@@ -260,6 +254,10 @@ enum EntityPropertyList {
     // Aliases/Piggyback properties for Zones. These properties intentionally reuse the enum values for
     // other properties which will never overlap with each other. We do this so that we don't have to expand
     // the size of the properties bitflags mask
+    PROP_KEYLIGHT_COLOR = PROP_COLOR,
+    PROP_KEYLIGHT_INTENSITY = PROP_INTENSITY,
+    PROP_KEYLIGHT_DIRECTION = PROP_EXPONENT,
+
     PROP_SKYBOX_COLOR = PROP_ANIMATION_URL,
     PROP_SKYBOX_URL = PROP_ANIMATION_FPS,
 
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
index b2c65c6f9d..c476b4c23c 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.cpp
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -21,7 +21,6 @@ const xColor KeyLightPropertyGroup::DEFAULT_KEYLIGHT_COLOR = { 255, 255, 255 };
 const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_INTENSITY = 1.0f;
 const float KeyLightPropertyGroup::DEFAULT_KEYLIGHT_AMBIENT_INTENSITY = 0.5f;
 const glm::vec3 KeyLightPropertyGroup::DEFAULT_KEYLIGHT_DIRECTION = { 0.0f, -1.0f, 0.0f };
-const bool KeyLightPropertyGroup::DEFAULT_KEYLIGHT_CAST_SHADOWS { false };
 
 void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, 
     QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
@@ -29,27 +28,23 @@ void KeyLightPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desired
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_COLOR, KeyLight, keyLight, Color, color);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_INTENSITY, KeyLight, keyLight, Intensity, intensity);
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_DIRECTION, KeyLight, keyLight, Direction, direction);
-    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_KEYLIGHT_CAST_SHADOW, KeyLight, keyLight, CastShadows, castShadows);
 }
 
 void KeyLightPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, color, xColor, setColor);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, intensity, float, setIntensity);
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, direction, glmVec3, setDirection);
-    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(keyLight, castShadows, bool, setCastShadows);
-
+    
     // legacy property support
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightColor, xColor, setColor, getColor);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightIntensity, float, setIntensity, getIntensity);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightDirection, glmVec3, setDirection, getDirection);
-    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(keyLightCastShadows, bool, setCastShadows, getCastShadows);
 }
 
 void KeyLightPropertyGroup::merge(const KeyLightPropertyGroup& other) {
     COPY_PROPERTY_IF_CHANGED(color);
     COPY_PROPERTY_IF_CHANGED(intensity);
     COPY_PROPERTY_IF_CHANGED(direction);
-    COPY_PROPERTY_IF_CHANGED(castShadows);
 }
 
 void KeyLightPropertyGroup::debugDump() const {
@@ -57,7 +52,6 @@ void KeyLightPropertyGroup::debugDump() const {
     qCDebug(entities) << "        color:" << getColor(); // << "," << getColor()[1] << "," << getColor()[2];
     qCDebug(entities) << "        intensity:" << getIntensity();
     qCDebug(entities) << "        direction:" << getDirection();
-    qCDebug(entities) << "        castShadows:" << getCastShadows();
 }
 
 void KeyLightPropertyGroup::listChangedProperties(QList<QString>& out) {
@@ -70,9 +64,6 @@ void KeyLightPropertyGroup::listChangedProperties(QList<QString>& out) {
     if (directionChanged()) {
         out << "keyLight-direction";
     }
-    if (castShadowsChanged()) {
-        out << "keyLight-castShadows";
-    }
 }
 
 bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
@@ -80,21 +71,19 @@ bool KeyLightPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
     EntityPropertyFlags& propertyFlags,
     EntityPropertyFlags& propertiesDidntFit,
     int& propertyCount, 
-    OctreeElement::AppendState& appendState) const 
-{
+    OctreeElement::AppendState& appendState) const {
 
     bool successPropertyFits = true;
     
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, getCastShadows());
-
+    
     return true;
 }
 
 bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt, 
-                                                 int& processedBytes) {
+    int& processedBytes) {
         
     int bytesRead = 0;
     bool overwriteLocalData = true;
@@ -103,13 +92,11 @@ bool KeyLightPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFl
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, bool, setCastShadows);
-
+   
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_COLOR, Color);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_INTENSITY, Intensity);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_DIRECTION, Direction);
-    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_KEYLIGHT_CAST_SHADOW, CastShadows);
-
+    
     processedBytes += bytesRead;
 
     Q_UNUSED(somethingChanged);
@@ -121,7 +108,6 @@ void KeyLightPropertyGroup::markAllChanged() {
     _colorChanged = true;
     _intensityChanged = true;
     _directionChanged = true;
-    _castShadowsChanged = true;
 }
 
 EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
@@ -130,8 +116,7 @@ EntityPropertyFlags KeyLightPropertyGroup::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_COLOR, color);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_INTENSITY, intensity);
     CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_DIRECTION, direction);
-    CHECK_PROPERTY_CHANGE(PROP_KEYLIGHT_CAST_SHADOW, castShadows);
-
+    
     return changedProperties;
 }
 
@@ -139,7 +124,6 @@ void KeyLightPropertyGroup::getProperties(EntityItemProperties& properties) cons
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Color, getColor);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Intensity, getIntensity);
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, Direction, getDirection);
-    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(KeyLight, CastShadows, getCastShadows);
 }
 
 bool KeyLightPropertyGroup::setProperties(const EntityItemProperties& properties) {
@@ -148,7 +132,6 @@ bool KeyLightPropertyGroup::setProperties(const EntityItemProperties& properties
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Color, color, setColor);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Intensity, intensity, setIntensity);
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, Direction, direction, setDirection);
-    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(KeyLight, CastShadows, castShadows, setCastShadows);
 
     return somethingChanged;
 }
@@ -159,7 +142,6 @@ EntityPropertyFlags KeyLightPropertyGroup::getEntityProperties(EncodeBitstreamPa
     requestedProperties += PROP_KEYLIGHT_COLOR;
     requestedProperties += PROP_KEYLIGHT_INTENSITY;
     requestedProperties += PROP_KEYLIGHT_DIRECTION;
-    requestedProperties += PROP_KEYLIGHT_CAST_SHADOW;
 
     return requestedProperties;
 }
@@ -177,7 +159,6 @@ void KeyLightPropertyGroup::appendSubclassData(OctreePacketData* packetData, Enc
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, getColor());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, getIntensity());
     APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, getDirection());
-    APPEND_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, getCastShadows());
 }
 
 int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead, 
@@ -191,7 +172,6 @@ int KeyLightPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char*
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_COLOR, xColor, setColor);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_INTENSITY, float, setIntensity);
     READ_ENTITY_PROPERTY(PROP_KEYLIGHT_DIRECTION, glm::vec3, setDirection);
-    READ_ENTITY_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, bool, setCastShadows);
 
     return bytesRead;
 }
diff --git a/libraries/entities/src/KeyLightPropertyGroup.h b/libraries/entities/src/KeyLightPropertyGroup.h
index 5e13a6afa6..f33ebb282d 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.h
+++ b/libraries/entities/src/KeyLightPropertyGroup.h
@@ -78,12 +78,10 @@ public:
     static const float DEFAULT_KEYLIGHT_INTENSITY;
     static const float DEFAULT_KEYLIGHT_AMBIENT_INTENSITY;
     static const glm::vec3 DEFAULT_KEYLIGHT_DIRECTION;
-    static const bool DEFAULT_KEYLIGHT_CAST_SHADOWS;
 
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_COLOR, Color, color, xColor, DEFAULT_KEYLIGHT_COLOR);
     DEFINE_PROPERTY(PROP_KEYLIGHT_INTENSITY, Intensity, intensity, float, DEFAULT_KEYLIGHT_INTENSITY);
     DEFINE_PROPERTY_REF(PROP_KEYLIGHT_DIRECTION, Direction, direction, glm::vec3, DEFAULT_KEYLIGHT_DIRECTION);
-    DEFINE_PROPERTY(PROP_KEYLIGHT_CAST_SHADOW, CastShadows, castShadows, bool, DEFAULT_KEYLIGHT_CAST_SHADOWS);
 };
 
 #endif // hifi_KeyLightPropertyGroup_h
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index e4a3a958b6..bec7bc1906 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -53,7 +53,6 @@ void ModelEntityItem::setTextures(const QString& textures) {
 
 EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
-
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(modelURL, getModelURL);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL);
@@ -65,7 +64,6 @@ EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredP
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(jointTranslations, getJointTranslations);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(relayParentJoints, getRelayParentJoints);
     _animationProperties.getProperties(properties);
-
     return properties;
 }
 
@@ -193,6 +191,8 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_JOINT_TRANSLATIONS, getJointTranslations());
 }
 
+
+
 // added update function back for property fix
 void ModelEntityItem::update(const quint64& now) {
 
@@ -571,16 +571,15 @@ QVector<bool> ModelEntityItem::getJointTranslationsSet() const {
     return result;
 }
 
+
 xColor ModelEntityItem::getXColor() const { 
     xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; 
 }
-
 bool ModelEntityItem::hasModel() const { 
     return resultWithReadLock<bool>([&] {
         return !_modelURL.isEmpty();
     });
 }
-
 bool ModelEntityItem::hasCompoundShapeURL() const {
     return !_compoundShapeURL.get().isEmpty();
 }
@@ -660,6 +659,7 @@ bool ModelEntityItem::getAnimationLoop() const {
     });
 }
 
+
 void ModelEntityItem::setAnimationHold(bool hold) { 
     withWriteLock([&] {
         _animationProperties.setHold(hold);
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 7b4a452bcc..2425208a87 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -92,7 +92,6 @@ EntityItemProperties ShapeEntityItem::getProperties(EntityPropertyFlags desiredP
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
     properties.setColor(getXColor());
     properties.setShape(entity::stringFromShape(getShape()));
-    
     return properties;
 }
 
@@ -167,7 +166,6 @@ EntityPropertyFlags ShapeEntityItem::getEntityProperties(EncodeBitstreamParams&
     requestedProperties += PROP_SHAPE;
     requestedProperties += PROP_COLOR;
     requestedProperties += PROP_ALPHA;
-
     return requestedProperties;
 }
 
@@ -370,3 +368,4 @@ void ShapeEntityItem::computeShapeInfo(ShapeInfo& info) {
 ShapeType ShapeEntityItem::getShapeType() const {
     return _collisionShapeType;
 }
+
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 3011482184..7ad1b3c1c2 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -114,8 +114,6 @@ protected:
     //! ellipsoids.
     ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
 
-    bool _canCastShadow { ENTITY_ITEM_DEFAULT_CAN_CAST_SHADOW };
-
     std::shared_ptr<graphics::Material> _material;
 };
 
diff --git a/libraries/graphics/src/graphics/Light.cpp b/libraries/graphics/src/graphics/Light.cpp
index 76d8a6030a..9da14fec4f 100755
--- a/libraries/graphics/src/graphics/Light.cpp
+++ b/libraries/graphics/src/graphics/Light.cpp
@@ -65,14 +65,6 @@ const Vec3& Light::getDirection() const {
     return _lightSchemaBuffer->volume.direction;
 }
 
-void Light::setCastShadows(const bool castShadows) {
-    _castShadows = castShadows;
-}
-
-bool Light::getCastShadows() const {
-    return _castShadows;
-}
-
 void Light::setColor(const Color& color) {
     _lightSchemaBuffer.edit().irradiance.color = color;
     updateLightRadius();
@@ -140,6 +132,7 @@ void Light::setSpotExponent(float exponent) {
     _lightSchemaBuffer.edit().irradiance.falloffSpot = exponent;
 }
 
+
 void Light::setAmbientIntensity(float intensity) {
     _ambientSchemaBuffer.edit().intensity = intensity;
 }
diff --git a/libraries/graphics/src/graphics/Light.h b/libraries/graphics/src/graphics/Light.h
index bb9fb3e5b9..e6ef1e35c5 100755
--- a/libraries/graphics/src/graphics/Light.h
+++ b/libraries/graphics/src/graphics/Light.h
@@ -103,9 +103,6 @@ public:
     void setDirection(const Vec3& direction);
     const Vec3& getDirection() const;
 
-    void setCastShadows(const bool castShadows);
-    bool getCastShadows() const;
-
     void setOrientation(const Quat& orientation);
     const glm::quat& getOrientation() const { return _transform.getRotation(); }
 
@@ -194,8 +191,6 @@ protected:
 
     void updateLightRadius();
 
-    bool _castShadows{ false };
-
 };
 typedef std::shared_ptr< Light > LightPointer;
 
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index a83924ee58..5c202fa70c 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -30,7 +30,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return static_cast<PacketVersion>(EntityVersion::ShadowControl);
+            return static_cast<PacketVersion>(EntityVersion::MaterialEntities);
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::RemovedJurisdictions);
         case PacketType::AvatarIdentity:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index ea785f24f2..670324c4b7 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -218,8 +218,7 @@ enum class EntityVersion : PacketVersion {
     ZoneLightInheritModes = 82,
     ZoneStageRemoved,
     SoftEntities,
-    MaterialEntities,
-    ShadowControl
+    MaterialEntities
 };
 
 enum class EntityScriptCallMethodVersion : PacketVersion {
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index fdb57dace7..6806b41647 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -214,7 +214,6 @@ void CauterizedModel::updateRenderItems() {
 
             bool isWireframe = self->isWireframe();
             bool isVisible = self->isVisible();
-            bool canCastShadow = self->canCastShadow();
             bool isLayeredInFront = self->isLayeredInFront();
             bool isLayeredInHUD = self->isLayeredInHUD();
             bool enableCauterization = self->getEnableCauterization();
@@ -232,7 +231,7 @@ void CauterizedModel::updateRenderItems() {
                 bool useDualQuaternionSkinning = self->getUseDualQuaternionSkinning();
 
                 transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, meshState, useDualQuaternionSkinning, cauterizedMeshState, invalidatePayloadShapeKey,
-                        isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, canCastShadow, enableCauterization](CauterizedMeshPartPayload& data) {
+                        isWireframe, isVisible, isLayeredInFront, isLayeredInHUD, enableCauterization](CauterizedMeshPartPayload& data) {
                     if (useDualQuaternionSkinning) {
                         data.updateClusterBuffer(meshState.clusterDualQuaternions,
                                                  cauterizedMeshState.clusterDualQuaternions);
@@ -274,7 +273,7 @@ void CauterizedModel::updateRenderItems() {
                     data.updateTransformForCauterizedMesh(renderTransform);
 
                     data.setEnableCauterization(enableCauterization);
-                    data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, render::ItemKey::TAG_BITS_ALL);
+                    data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, render::ItemKey::TAG_BITS_ALL);
                     data.setLayer(isLayeredInFront, isLayeredInHUD);
                     data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
                 });
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 78bc3ba195..e2c0073d2f 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -492,7 +492,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
         batch.setResourceTexture(DEFERRED_BUFFER_DEPTH_UNIT, deferredFramebuffer->getPrimaryDepthTexture());
         
         // FIXME: Different render modes should have different tasks
-        if (args->_renderMode == RenderArgs::DEFAULT_RENDER_MODE && deferredLightingEffect->isAmbientOcclusionEnabled() && ambientOcclusionFramebuffer) {
+        if (args->_renderMode == RenderArgs::DEFAULT_RENDER_MODE && deferredLightingEffect->isAmbientOcclusionEnabled()) {
             batch.setResourceTexture(DEFERRED_BUFFER_OBSCURANCE_UNIT, ambientOcclusionFramebuffer->getOcclusionTexture());
         } else {
             // need to assign the white texture if ao is off
@@ -537,25 +537,15 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
         auto keyLight = lightAndShadow.first;
 
-        graphics::LightPointer ambientLight;
+        graphics::LightPointer keyAmbientLight;
         if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
-            ambientLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
+            keyAmbientLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
         }
-        bool hasAmbientMap = (ambientLight != nullptr);
+        bool hasAmbientMap = (keyAmbientLight != nullptr);
 
         // Setup the global directional pass pipeline
         {
-            // Check if keylight casts shadows
-            bool keyLightCastShadows { false };
-
-            if (lightStage && lightStage->_currentFrame._sunLights.size()) {
-                graphics::LightPointer keyLight = lightStage->getLight(lightStage->_currentFrame._sunLights.front());
-                if (keyLight) {
-                    keyLightCastShadows = keyLight->getCastShadows();
-                }
-            }
-
-            if (deferredLightingEffect->_shadowMapEnabled && keyLightCastShadows) {
+            if (deferredLightingEffect->_shadowMapEnabled) {
 
                 // If the keylight has an ambient Map then use the Skybox version of the pass
                 // otherwise use the ambient sphere version
diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h
index ce7ecacbbe..1b776e6409 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.h
+++ b/libraries/render-utils/src/DeferredLightingEffect.h
@@ -61,7 +61,7 @@ public:
 private:
     DeferredLightingEffect() = default;
 
-    bool _shadowMapEnabled{ true };  // note that this value is overwritten in the ::configure method
+    bool _shadowMapEnabled{ false };
     bool _ambientOcclusionEnabled{ false };
 
     graphics::MeshPointer _pointLightMesh;
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 98ecc4c941..2637d24d67 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -77,7 +77,7 @@ void MeshPartPayload::removeMaterial(graphics::MaterialPointer material) {
     _drawMaterials.remove(material);
 }
 
-void MeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
+void MeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 
@@ -91,10 +91,6 @@ void MeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShad
         builder.withLayered();
     }
 
-    if (canCastShadow) {
-        builder.withShadowCaster();
-    }
-
     if (isGroupCulled) {
         builder.withSubMetaCulled();
     }
@@ -332,8 +328,7 @@ void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& render
     _worldBound.transform(boundTransform);
 }
 
-// Note that this method is called for models but not for shapes
-void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled) {
+void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled) {
     ItemKey::Builder builder;
     builder.withTypeShape();
 
@@ -347,10 +342,6 @@ void ModelMeshPartPayload::updateKey(bool isVisible, bool isLayered, bool canCas
         builder.withLayered();
     }
 
-    if (canCastShadow) {
-        builder.withShadowCaster();
-    }
-
     if (isGroupCulled) {
         builder.withSubMetaCulled();
     }
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index f1877d9ef6..3ad222d90c 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -32,7 +32,7 @@ public:
     typedef render::Payload<MeshPartPayload> Payload;
     typedef Payload::DataPointer Pointer;
 
-    virtual void updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled = false);
+    virtual void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false);
 
     virtual void updateMeshPart(const std::shared_ptr<const graphics::Mesh>& drawMesh, int partIndex);
 
@@ -92,14 +92,13 @@ public:
 
     void notifyLocationChanged() override;
 
-    void updateKey(bool isVisible, bool isLayered, bool canCastShadow, uint8_t tagBits, bool isGroupCulled = false) override;
+    void updateKey(bool isVisible, bool isLayered, uint8_t tagBits, bool isGroupCulled = false) override;
 
     // matrix palette skinning
     void updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices);
 
     // dual quaternion skinning
     void updateClusterBuffer(const std::vector<Model::TransformDualQuaternion>& clusterDualQuaternions);
-
     void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
     // Render Item interface
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 593780709a..12d6659849 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -104,7 +104,6 @@ Model::Model(QObject* parent, SpatiallyNestable* spatiallyNestableOverride) :
     _snappedToRegistrationPoint(false),
     _url(HTTP_INVALID_COM),
     _isVisible(true),
-    _canCastShadow(false),
     _blendNumber(0),
     _appliedBlendNumber(0),
     _isWireframe(false)
@@ -271,7 +270,6 @@ void Model::updateRenderItems() {
 
         bool isWireframe = self->isWireframe();
         bool isVisible = self->isVisible();
-        bool canCastShadow = self->canCastShadow();
         uint8_t viewTagBits = self->getViewTagBits();
         bool isLayeredInFront = self->isLayeredInFront();
         bool isLayeredInHUD = self->isLayeredInHUD();
@@ -290,7 +288,7 @@ void Model::updateRenderItems() {
 
             transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, meshState, useDualQuaternionSkinning,
                                                                   invalidatePayloadShapeKey, isWireframe, isVisible,
-                                                                  canCastShadow, viewTagBits, isLayeredInFront,
+                                                                  viewTagBits, isLayeredInFront,
                                                                   isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
                 if (useDualQuaternionSkinning) {
                     data.updateClusterBuffer(meshState.clusterDualQuaternions);
@@ -315,7 +313,7 @@ void Model::updateRenderItems() {
                 }
                 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
                 data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
             });
@@ -775,66 +773,46 @@ void Model::setVisibleInScene(bool isVisible, const render::ScenePointer& scene,
 
         bool isLayeredInFront = _isLayeredInFront;
         bool isLayeredInHUD = _isLayeredInHUD;
-        bool canCastShadow = _canCastShadow;
+
         render::Transaction transaction;
         foreach (auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
             });
         }
         scene->enqueueTransaction(transaction);
     }
 }
 
-void Model::setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled) {
-    if (_canCastShadow != canCastShadow) {
-        _canCastShadow = canCastShadow;
-
-        bool isVisible = _isVisible;
-        bool isLayeredInFront = _isLayeredInFront;
-        bool isLayeredInHUD = _isLayeredInHUD;
-
-        render::Transaction transaction;
-        foreach (auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, 
-                [isVisible, viewTagBits, canCastShadow, isLayeredInFront, isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                    data.updateKey(isVisible, viewTagBits, canCastShadow, isLayeredInFront || isLayeredInHUD, isGroupCulled);
-                });
-        }
-
-        scene->enqueueTransaction(transaction);
-    }
-}
 
 void Model::setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene) {
     if (_isLayeredInFront != isLayeredInFront) {
         _isLayeredInFront = isLayeredInFront;
 
         bool isVisible = _isVisible;
-        bool canCastShadow = _canCastShadow;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInHUD = _isLayeredInHUD;
         bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
@@ -847,23 +825,22 @@ void Model::setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& sce
         _isLayeredInHUD = isLayeredInHUD;
 
         bool isVisible = _isVisible;
-        bool canCastShadow = _canCastShadow;
         uint8_t viewTagBits = _viewTagBits;
         bool isLayeredInFront = _isLayeredInFront;
         bool isGroupCulled = _isGroupCulled;
 
         render::Transaction transaction;
         foreach(auto item, _modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
         foreach(auto item, _collisionRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(item, [isVisible, viewTagBits, isLayeredInFront,
                                                                 isLayeredInHUD, isGroupCulled](ModelMeshPartPayload& data) {
-                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
+                data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, viewTagBits, isGroupCulled);
                 data.setLayer(isLayeredInFront, isLayeredInHUD);
             });
         }
@@ -1673,16 +1650,15 @@ void Model::addMaterial(graphics::MaterialLayer material, const std::string& par
             uint8_t viewTagBits = getViewTagBits();
             bool layeredInFront = isLayeredInFront();
             bool layeredInHUD = isLayeredInHUD();
-            bool canCastShadow = _canCastShadow;
             bool wireframe = isWireframe();
             auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
             bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
             bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
                 invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
                 data.addMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
-                data.updateKey(visible, layeredInFront || layeredInHUD, canCastShadow, viewTagBits);
+                data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
                 data.setShapeKey(invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning);
             });
         }
@@ -1700,16 +1676,15 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
             uint8_t viewTagBits = getViewTagBits();
             bool layeredInFront = isLayeredInFront();
             bool layeredInHUD = isLayeredInHUD();
-            bool canCastShadow = _canCastShadow;
             bool wireframe = isWireframe();
             auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
             bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
             bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits, canCastShadow,
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [material, visible, layeredInFront, layeredInHUD, viewTagBits,
                 invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
                 data.removeMaterial(material);
                 // if the material changed, we might need to update our item key or shape key
-                data.updateKey(visible, layeredInFront || layeredInHUD, canCastShadow, viewTagBits);
+                data.updateKey(visible, layeredInFront || layeredInHUD, viewTagBits);
                 data.setShapeKey(invalidatePayloadShapeKey, wireframe, useDualQuaternionSkinning);
             });
         }
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 2b14a7c055..9c98ac2b8b 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -88,10 +88,6 @@ public:
 
     // new Scene/Engine rendering support
     void setVisibleInScene(bool isVisible, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
-
-    bool canCastShadow() const { return _canCastShadow; }
-    void setCanCastShadow(bool canCastShadow, const render::ScenePointer& scene, uint8_t viewTagBits, bool isGroupCulled);
-
     void setLayeredInFront(bool isLayeredInFront, const render::ScenePointer& scene);
     void setLayeredInHUD(bool isLayeredInHUD, const render::ScenePointer& scene);
     bool needsFixupInScene() const;
@@ -407,8 +403,6 @@ protected:
     bool _isVisible;
     uint8_t _viewTagBits{ render::ItemKey::TAG_BITS_ALL };
 
-    bool _canCastShadow;
-
     gpu::Buffers _blendedVertexBuffers;
 
     QVector<QVector<QSharedPointer<Texture> > > _dilatedTextures;
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index ce4bf01dcf..e8963c2e4e 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -218,10 +218,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
     const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
     // Fetch and cull the items from the scene
-
-    // Enable models to not cast shadows (otherwise, models will always cast shadows)
-    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask).withShadowCaster();
-
+    static const auto shadowCasterFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
     const auto fetchInput = FetchSpatialTree::Inputs(shadowCasterFilter, queryResolution).asVarying();
     const auto shadowSelection = task.addJob<FetchSpatialTree>("FetchShadowTree", fetchInput);
     const auto selectionInputs = FetchSpatialSelection::Inputs(shadowSelection, shadowCasterFilter).asVarying();
@@ -300,14 +297,8 @@ void RenderShadowSetup::setSlopeBias(int cascadeIndex, float value) {
 }
 
 void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
-    // Abort all jobs if not casting shadows
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
-    if (!lightStage->getCurrentKeyLight() || !lightStage->getCurrentKeyLight()->getCastShadows()) {
-        renderContext->taskFlow.abortTask();
-        return;
-    }
-
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
@@ -387,13 +378,12 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
 void RenderShadowCascadeSetup::run(const render::RenderContextPointer& renderContext, Outputs& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     assert(lightStage);
-
     // Cache old render args
     RenderArgs* args = renderContext->args;
 
     const auto globalShadow = lightStage->getCurrentKeyShadow();
     if (globalShadow && _cascadeIndex<globalShadow->getCascadeCount()) {
-        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask).withShadowCaster();
+        output.edit0() = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(_tagBits, _tagMask);
 
         // Set the keylight render args
         auto& cascade = globalShadow->getCascade(_cascadeIndex);
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 98b70c0c9f..7f127a558c 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -38,7 +38,7 @@ class RenderShadowTaskConfig : public render::Task::Config::Persistent {
     Q_OBJECT
     Q_PROPERTY(bool enabled MEMBER enabled NOTIFY dirty)
 public:
-    RenderShadowTaskConfig() : render::Task::Config::Persistent(QStringList() << "Render" << "Engine" << "Shadows", true) {}
+    RenderShadowTaskConfig() : render::Task::Config::Persistent(QStringList() << "Render" << "Engine" << "Shadows", false) {}
 
 signals:
     void dirty();
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index f6cd6a19e1..e4dcc7ee03 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -226,6 +226,7 @@ public:
         Builder& withVisible()          { _value.reset(ItemKey::INVISIBLE); _mask.set(ItemKey::INVISIBLE); return (*this); }
         Builder& withInvisible()        { _value.set(ItemKey::INVISIBLE);  _mask.set(ItemKey::INVISIBLE); return (*this); }
 
+        Builder& withNoShadowCaster()   { _value.reset(ItemKey::SHADOW_CASTER); _mask.set(ItemKey::SHADOW_CASTER); return (*this); }
         Builder& withShadowCaster()     { _value.set(ItemKey::SHADOW_CASTER);  _mask.set(ItemKey::SHADOW_CASTER); return (*this); }
 
         Builder& withoutLayered()       { _value.reset(ItemKey::LAYERED); _mask.set(ItemKey::LAYERED); return (*this); }
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index d6710238fb..c53a2fa5bd 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -42,28 +42,25 @@
             </div>
         </fieldset>
 
+
         <fieldset id="general" class="major">
             <div class="shape-group shape-section property dropdown" id="shape-list">
                 <label for="property-shape">Shape</label>
                 <select name="SelectShape" id="property-shape">
-                    <option value="Cube">Box</option>
-                    <option value="Sphere">Sphere</option>
-                    <option value="Tetrahedron">Tetrahedron</option>
-                    <option value="Octahedron">Octahedron</option>
-                    <option value="Icosahedron">Icosahedron</option>
-                    <option value="Dodecahedron">Dodecahedron</option>
-                    <option value="Hexagon">Hexagon</option>
-                    <option value="Triangle">Triangle</option>
-                    <option value="Octagon">Octagon</option>
-                    <option value="Cylinder">Cylinder</option>
-                    <option value="Cone">Cone</option>
-                    <option value="Circle">Circle</option>
-                    <option value="Quad">Quad</option>
-                </select>
-            </div>
-            <div class="can-cast-shadow-section property checkbox">
-                <input type="checkbox" id="property-can-cast-shadow">
-                <label for="property-can-cast-shadow">Can cast shadow</label>
+                        <option value="Cube">Box</option>
+                        <option value="Sphere">Sphere</option>
+                        <option value="Tetrahedron">Tetrahedron</option>
+                        <option value="Octahedron">Octahedron</option>
+                        <option value="Icosahedron">Icosahedron</option>
+                        <option value="Dodecahedron">Dodecahedron</option>
+                        <option value="Hexagon">Hexagon</option>
+                        <option value="Triangle">Triangle</option>
+                        <option value="Octagon">Octagon</option>
+                        <option value="Cylinder">Cylinder</option>
+                        <option value="Cone">Cone</option>
+                        <option value="Circle">Circle</option>
+                        <option value="Quad">Quad</option>
+                    </select>
             </div>
             <div class="property text">
                 <label for="property-name">Name</label>
@@ -296,6 +293,7 @@
             </div>
         </fieldset>
 
+
         <fieldset id="behavior" class="major">
             <legend class="section-header behavior-group">
                 Behavior<span class=".collapse-icon">M</span>
@@ -367,6 +365,8 @@
             </div>
         </fieldset>
 
+
+
         <fieldset id="light" class="major">
             <legend class="section-header light-group light-section">
                 Light<span class=".collapse-icon">M</span>
@@ -400,6 +400,7 @@
             </fieldset>
         </fieldset>
 
+
         <fieldset id="model" class="major">
             <legend class="section-header model-group model-section zone-section">
                 Model<span class=".collapse-icon">M</span>
@@ -483,6 +484,7 @@
             </fieldset>
         </fieldset>
 
+
         <fieldset id="zone" class="major">
             <legend class="section-header zone-group zone-section">
                 Zone<span class=".collapse-icon">M</span>
@@ -530,10 +532,6 @@
                         <div></div>
                     </div>
                 </div>
-                <div class="zone-group zone-section keylight-section property checkbox">
-                    <input type="checkbox" id="property-zone-key-light-cast-shadows">
-                    <label for="property-zone-key-light-cast-shadows">Cast Shadows</label>
-                </div>
             <fieldset class="minor">
                 <legend class="sub-section-header zone-group zone-section background-section">
                     Skybox
@@ -678,7 +676,7 @@
                         min="-1000" max="50000" step="10"></div>
                     </div>
                 </fieldset-->
-            </fieldset>
+           </fieldset>
         </fieldset>
         <fieldset id="text" class="major">
             <legend class="section-header text-group text-section">
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 4db9bd00c6..2b29fbf041 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -616,8 +616,6 @@ function loaded() {
 
         var elShape = document.getElementById("property-shape");
 
-        var elCanCastShadow = document.getElementById("property-can-cast-shadow");
-
         var elLightSpotLight = document.getElementById("property-light-spot-light");
         var elLightColor = document.getElementById("property-light-color");
         var elLightColorRed = document.getElementById("property-light-color-red");
@@ -689,8 +687,6 @@ function loaded() {
         var elZoneKeyLightDirectionX = document.getElementById("property-zone-key-light-direction-x");
         var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
 
-        var elZoneKeyLightCastShadows = document.getElementById("property-zone-key-light-cast-shadows");
-
         // Skybox
         var elZoneSkyboxModeInherit = document.getElementById("property-zone-skybox-mode-inherit");
         var elZoneSkyboxModeDisabled = document.getElementById("property-zone-skybox-mode-disabled");
@@ -848,6 +844,7 @@ function loaded() {
 
                         elLocked.checked = properties.locked;
 
+
                         elName.value = properties.name;
 
                         elVisible.checked = properties.visible;
@@ -1014,12 +1011,6 @@ function loaded() {
                                                                      properties.color.green + "," + properties.color.blue + ")";
                         }
 
-                        if (properties.type === "Model" ||
-                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
-
-                            elCanCastShadow.checked = properties.canCastShadow;
-                        }
-
                         if (properties.type === "Model") {
                             elModelURL.value = properties.modelURL;
                             elShapeType.value = properties.shapeType;
@@ -1069,6 +1060,7 @@ function loaded() {
                             elLightFalloffRadius.value = properties.falloffRadius.toFixed(1);
                             elLightExponent.value = properties.exponent.toFixed(2);
                             elLightCutoff.value = properties.cutoff.toFixed(2);
+
                         } else if (properties.type === "Zone") {
                             // Key light
                             elZoneKeyLightModeInherit.checked = (properties.keyLightMode === 'inherit');
@@ -1084,8 +1076,6 @@ function loaded() {
                             elZoneKeyLightDirectionX.value = properties.keyLight.direction.x.toFixed(2);
                             elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
 
-                            elZoneKeyLightCastShadows.checked = properties.keyLight.castShadows;
-
                             // Skybox
                             elZoneSkyboxModeInherit.checked = (properties.skyboxMode === 'inherit');
                             elZoneSkyboxModeDisabled.checked = (properties.skyboxMode === 'disabled');
@@ -1149,15 +1139,13 @@ function loaded() {
                             // Show/hide sections as required
                             showElements(document.getElementsByClassName('skybox-section'),
                                 elZoneSkyboxModeEnabled.checked);
-
                             showElements(document.getElementsByClassName('keylight-section'),
                                 elZoneKeyLightModeEnabled.checked);
-
                             showElements(document.getElementsByClassName('ambient-section'),
                                 elZoneAmbientLightModeEnabled.checked);
-
                             showElements(document.getElementsByClassName('haze-section'),
                                 elZoneHazeModeEnabled.checked);
+
                         } else if (properties.type === "PolyVox") {
                             elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2);
                             elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2);
@@ -1188,15 +1176,6 @@ function loaded() {
                             elMaterialMappingRot.value = properties.materialMappingRot.toFixed(2);
                         }
 
-                        // Only these types can cast a shadow
-                        if (properties.type === "Model" ||
-                            properties.type === "Shape" || properties.type === "Box" || properties.type === "Sphere") {
-
-                            showElements(document.getElementsByClassName('can-cast-shadow-section'), true);
-                        } else {
-                            showElements(document.getElementsByClassName('can-cast-shadow-section'), false);
-                        }
-
                         if (properties.locked) {
                             disableProperties();
                             elLocked.removeAttribute('disabled');
@@ -1453,8 +1432,6 @@ function loaded() {
 
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
-        elCanCastShadow.addEventListener('change', createEmitCheckedPropertyUpdateFunction('canCastShadow'));
- 
         elImageURL.addEventListener('change', createImageURLUpdateFunction('textures'));
 
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));
@@ -1613,9 +1590,6 @@ function loaded() {
         elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
         elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
 
-        elZoneKeyLightCastShadows.addEventListener('change',
-            createEmitGroupCheckedPropertyUpdateFunction('keyLight', 'castShadows'));
-
         // Skybox
         var skyboxModeChanged = createZoneComponentModeChangedFunction('skyboxMode',
             elZoneSkyboxModeInherit, elZoneSkyboxModeDisabled, elZoneSkyboxModeEnabled);

From 1119998c7a903dfecb68d82bdd525c169aa21ba7 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 27 Feb 2018 11:45:59 -0800
Subject: [PATCH 531/569] Fix semicolon

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

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index a75d090370..ee6c96278e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -253,7 +253,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
                         } else if (link === "#bank") {
-                            Qt.openUrlExternally("hifi://BankOfHighFidelity";)
+                            Qt.openUrlExternally("hifi://BankOfHighFidelity");
                         } else if (link === "#support") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
                         }

From 53b976b40051ff47cfc8759402638597de2f9339 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Tue, 27 Feb 2018 11:46:06 -0800
Subject: [PATCH 532/569] fix typo in bank href

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

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index a75d090370..ee6c96278e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -253,7 +253,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                         } else if (link === "#blockchain") {
                             Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
                         } else if (link === "#bank") {
-                            Qt.openUrlExternally("hifi://BankOfHighFidelity";)
+                            Qt.openUrlExternally("hifi://BankOfHighFidelity");
                         } else if (link === "#support") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
                         }

From 30896c264b23aeb7782a2e9ef2a1d78ff7e06a08 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Tue, 27 Feb 2018 12:04:41 -0800
Subject: [PATCH 533/569] reduced text

---
 .../qml/hifi/commerce/wallet/Help.qml         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index ee6c96278e..d76fe0d8a2 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -78,31 +78,31 @@ Your hifikey file contains your private key and is protected by your wallet pass
         ListElement {
             isExpanded: false;
             question: "How do I back up my private keys?";
-            answer: "You can back up your hifikey file (which contains your private key) by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. \
+            answer: "You can back up your hifikey file (which contains your private key and is encrypted using your wallet passphrase) by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. \
 Restore your hifikey file by replacing the file in Interface's AppData directory with your backup copy. \
-(The file is encrypted using your passphrase, so if your passphrase is good, someone with access to your back up should not be able to spend your HFC.) \
+Others with access to your back up should not be able to spend your HFC without your passphrase. \
 <b><font color='#0093C5'><a href='#privateKeyPath'>Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>";
         }
         ListElement {
             isExpanded: false;
             question: "What happens if I lose my private keys?";
-            answer: "We cannot stress enough that you should keep a backup of your private keys! For security reasons, High Fidelity does not keep a copy, and cannot restore it for you. \
+            answer: "We cannot stress enough that you should keep a backup! For security reasons, High Fidelity does not keep a copy, and cannot restore it for you. \
 If you lose your private key, you will no longer have access to the contents of your Wallet or My Purchases. \
 Here are some things to try:<ul>\
 <li>If you have backed up your hifikey file before, search your backup location</li>\
 <li>Search your AppData directory in the last machine you used to set up the Wallet</li>\
-<li>If you are a developer and have installed multiple builds of High Fidelity, your hifikey file might be in a previous developer build AppData folder</li>\
-</ul><br><br>If you still cannot find your original hifikey file after trying all of the above, you can set up your Wallet again and generate a new hifikey file, which contains new private key. \
+<li>If you are a developer and have installed multiple builds of High Fidelity, your hifikey file might be in another folder</li>\
+</ul><br><br>As a last resort, you can set up your Wallet again and generate a new hifikey file. \
 Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
         }
         ListElement {
             isExpanded: false;
-            question: "What happens if I forget my wallet passphrase?";
+            question: "What if I forget my wallet passphrase?";
             answer: "Your wallet passphrase is used to encrypt your private keys. Please write it down and store it securely! \
 <br><br>If you forget your passphrase, you will no longer be able to decrypt the hifikey file that the passphrase protects. \
 You will also no longer have access to the contents of your Wallet or My Purchases. \
 For security reasons, High Fidelity does not keep a copy of your passphrase, and can't restore it for you. \
-<br><br>If you still cannot remember your wallet passphrase, you can set up your Wallet again and generate a new hifikey file, which contains a new private key. \
+<br><br>If you still cannot remember your wallet passphrase, you can set up your Wallet again and generate a new hifikey file. \
 Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
         }
         ListElement {
@@ -122,8 +122,8 @@ If you don't see your Security Pic on a page that requests your Wallet passphras
         }
         ListElement {
             isExpanded: false;
-            question: "My HFC balance doesn't update instantly. Why?";
-            answer: "HFC transactions sometimes takes a few seconds to update as they are backed by a blockchain. \
+            question: "Why does my HFC balance not update instantly?";
+            answer: "HFC transations sometimes takes a few seconds to update as they are backed by a blockchain. \
 <br><br><b><font color='#0093C5'><a href='#blockchain'>Tap here to learn more about the blockchain.</a></font></b>";
         }
         ListElement {
@@ -139,7 +139,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
         }
         ListElement {
             isExpanded: false;
-            question: "Who can I reach out to for additional questions?";
+            question: "Who can I reach out to with questions?";
             answer: "Please email us if you have any issues or questions: \
 <b><font color='#0093C5'><a href='#support'>support@highfidelity.com</a></font></b>";
         }

From 41ccf6afd8640d6f4547d4f72ce46804caf55267 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 27 Feb 2018 12:49:32 -0800
Subject: [PATCH 534/569] Compensate the near-field azimuth correction for the
 parallax baked into the HRTF dataset

---
 libraries/audio/src/AudioHRTF.cpp | 37 +++++++++++++++++++++----------
 libraries/audio/src/AudioHRTF.h   |  1 +
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/libraries/audio/src/AudioHRTF.cpp b/libraries/audio/src/AudioHRTF.cpp
index a6451b1771..f0679a3684 100644
--- a/libraries/audio/src/AudioHRTF.cpp
+++ b/libraries/audio/src/AudioHRTF.cpp
@@ -775,20 +775,28 @@ static void distanceBiquad(float distance, float& b0, float& b1, float& b2, floa
 // Geometric correction of the azimuth, to the angle at each ear.
 // D. Brungart, "Auditory parallax effects in the HRTF for nearby sources," IEEE WASPAA (1999).
 //
-static void nearFieldAzimuth(float azimuth, float distance, float& azimuthL, float& azimuthR) {
+static void nearFieldAzimuthCorrection(float azimuth, float distance, float& azimuthL, float& azimuthR) {
 
-    // FIXME: optimize
     float dx = distance * cosf(azimuth);
     float dy = distance * sinf(azimuth);
 
-    azimuthL = atan2f(dy + HRTF_HEAD_RADIUS, dx);
-    azimuthR = atan2f(dy - HRTF_HEAD_RADIUS, dx);
+    // at reference distance, the azimuth parallax is correct
+    float dx0 = HRTF_AZIMUTH_REF * cosf(azimuth);
+    float dy0 = HRTF_AZIMUTH_REF * sinf(azimuth);
+
+    float deltaL = atan2f(dy + HRTF_HEAD_RADIUS, dx) - atan2f(dy0 + HRTF_HEAD_RADIUS, dx0);
+    float deltaR = atan2f(dy - HRTF_HEAD_RADIUS, dx) - atan2f(dy0 - HRTF_HEAD_RADIUS, dx0);
+
+    // add the azimuth correction
+    // NOTE: must converge to 0 when distance = HRTF_AZIMUTH_REF
+    azimuthL += deltaL;
+    azimuthR += deltaR;
 }
 
 //
 // Approximate the near-field DC gain correction at each ear.
 //
-static void nearFieldGain(float azimuth, float distance, float& gainL, float& gainR) {
+static void nearFieldGainCorrection(float azimuth, float distance, float& gainL, float& gainR) {
 
     // normalized distance factor = [0,1] as distance = [HRTF_NEARFIELD_MAX,HRTF_HEAD_RADIUS]
     assert(distance < HRTF_NEARFIELD_MAX);
@@ -816,9 +824,9 @@ static void nearFieldGain(float azimuth, float distance, float& gainL, float& ga
     float cR = ((-0.000452339132f * angleR - 0.00173192444f) * angleR + 0.162476536f) * angleR;
 
     // approximate the gain correction
-    // NOTE: this must converge to 1.0 when distance = HRTF_NEARFIELD_MAX at all azimuth
-    gainL = 1.0f - d * cL;
-    gainR = 1.0f - d * cR;
+    // NOTE: must converge to 0 when distance = HRTF_NEARFIELD_MAX
+    gainL -= d * cL;
+    gainR -= d * cR;
 }
 
 //
@@ -894,14 +902,17 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
     distance = MAX(distance, HRTF_NEARFIELD_MIN);
 
     // compute the azimuth correction at each ear
-    float azimuthL, azimuthR;
-    nearFieldAzimuth(azimuth, distance, azimuthL, azimuthR);
+    float azimuthL = azimuth;
+    float azimuthR = azimuth;
+    if (distance < HRTF_AZIMUTH_REF) {
+        nearFieldAzimuthCorrection(azimuth, distance, azimuthL, azimuthR);
+    }
 
     // compute the DC gain correction at each ear
     float gainL = 1.0f;
     float gainR = 1.0f;
     if (distance < HRTF_NEARFIELD_MAX) {
-        nearFieldGain(azimuth, distance, gainL, gainR);
+        nearFieldGainCorrection(azimuth, distance, gainL, gainR);
     }
 
     // parameters for table interpolation
@@ -976,7 +987,8 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
     //
     // Second biquad implements the near-field or distance filter.
     //
-    if (distance < 1.0f) {
+    if (distance < HRTF_NEARFIELD_MAX) {
+
         nearFieldFilter(gainL, b0, b1, a1);
 
         bqCoef[0][channel+4] = b0;
@@ -994,6 +1006,7 @@ static void setFilters(float firCoef[4][HRTF_TAPS], float bqCoef[5][8], int dela
         bqCoef[4][channel+5] = 0.0f;
 
     } else {
+
         distanceBiquad(distance, b0, b1, b2, a1, a2);
 
         bqCoef[0][channel+4] = b0;
diff --git a/libraries/audio/src/AudioHRTF.h b/libraries/audio/src/AudioHRTF.h
index f0f4dd849b..8993842d6e 100644
--- a/libraries/audio/src/AudioHRTF.h
+++ b/libraries/audio/src/AudioHRTF.h
@@ -24,6 +24,7 @@ static const int HRTF_BLOCK = 240;      // block processing size
 static const float HRTF_GAIN = 1.0f;    // HRTF global gain adjustment
 
 // Near-field HRTF
+static const float HRTF_AZIMUTH_REF = 2.0f;     // IRCAM Listen HRTF was recorded at 2 meters
 static const float HRTF_NEARFIELD_MAX = 1.0f;   // distance in meters
 static const float HRTF_NEARFIELD_MIN = 0.125f; // distance in meters
 static const float HRTF_HEAD_RADIUS = 0.0875f;  // average human head in meters

From 00f3682bbee19058d6f39caa2d1390d36694362f Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 27 Feb 2018 14:09:31 -0800
Subject: [PATCH 535/569] NOT WORKING YET.

---
 .../render-utils/src/RenderPipelines.cpp      | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 3fedae1778..6e3d3c85e7 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -490,7 +490,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withFade(),
-        skinModelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+        skinModelFadeDualQuatVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents().withFade(),
         skinModelNormalMapFadeDualQuatVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter);
@@ -521,10 +521,15 @@ void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::Ba
     // Vertex shaders
     auto modelVertex = model_vert::getShader();
     auto modelNormalMapVertex = model_normal_map_vert::getShader();
+
     auto skinModelVertex = skin_model_vert::getShader();
     auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
     auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
 
+    auto skinModelDualQuatVertex = skin_model_dq_vert::getShader();
+    auto skinModelNormalMapDualQuatVertex = skin_model_normal_map_dq_vert::getShader();
+    auto skinModelNormalMapFadeDualQuatVertex = skin_model_normal_map_fade_dq_vert::getShader();
+
     // Pixel shaders
     auto modelPixel = forward_model_frag::getShader();
     auto modelUnlitPixel = forward_model_unlit_frag::getShader();
@@ -568,6 +573,22 @@ void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::Ba
             Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
             skinModelNormalMapFadeVertex, modelNormalMapFadePixel, batchSetter, itemSetter, nullptr, nullptr);
 
+    // Dual Quaternion
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned(),
+        skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTangents(),
+        skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned(),
+        skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTangents().withSpecular(),
+        skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
+        skinModelNormalMapFadeDualQuatVertex, modelNormalMapFadePixel, batchSetter, itemSetter, nullptr, nullptr);
 }
 
 void addPlumberPipeline(ShapePlumber& plumber,

From f52f146db5f70832d4ce6fb8c16beff7bcfc4012 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 27 Feb 2018 16:28:46 -0800
Subject: [PATCH 536/569] WIP.

---
 .../render-utils/src/RenderPipelines.cpp      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 6e3d3c85e7..6264d82187 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -515,13 +515,22 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     addPipeline(
         Key::Builder().withSkinned().withDepthOnly().withFade(),
         skinModelShadowFadeVertex, modelShadowFadePixel, batchSetter, itemSetter);
+
+    // Now repeat for dual quaternion
+    // Depth-only
+    addPipeline(
+        Key::Builder().withSkinned().withDepthOnly().withDualQuatSkinned(),
+        skinModelShadowDualQuatVertex, modelShadowPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withSkinned().withDepthOnly().withFade().withDualQuatSkinned(),
+        skinModelShadowDualQuatVertex, modelShadowFadePixel, batchSetter, itemSetter);
 }
 
 void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
     // Vertex shaders
     auto modelVertex = model_vert::getShader();
     auto modelNormalMapVertex = model_normal_map_vert::getShader();
-
     auto skinModelVertex = skin_model_vert::getShader();
     auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
     auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
@@ -575,19 +584,19 @@ void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::Ba
 
     // Dual Quaternion
     addPipeline(
-        Key::Builder().withMaterial().withSkinned(),
+        Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(),
         skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
     addPipeline(
-        Key::Builder().withMaterial().withSkinned().withTangents(),
+        Key::Builder().withMaterial().withSkinned().withTangents().withDualQuatSkinned(),
         skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned(),
         skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
     addPipeline(
-        Key::Builder().withMaterial().withSkinned().withTangents().withSpecular(),
+        Key::Builder().withMaterial().withSkinned().withTangents().withSpecular().withDualQuatSkinned(),
         skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
     addPipeline(
-        Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
+        Key::Builder().withMaterial().withSkinned().withTangents().withFade().withDualQuatSkinned(),
         skinModelNormalMapFadeDualQuatVertex, modelNormalMapFadePixel, batchSetter, itemSetter, nullptr, nullptr);
 }
 

From b8fd640ddf1653c6efb0cb38d7d0a0ef2c17c536 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 27 Feb 2018 16:44:45 -0800
Subject: [PATCH 537/569] fixed log spam undefined error

---
 scripts/system/libraries/entitySelectionTool.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 8a07ff0d20..a419e9d49c 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1322,8 +1322,9 @@ SelectionDisplay = (function() {
                                        isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
                                        isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
 
-        var showOutlineForZone = (SelectionManager.selections.length === 1 &&
-                                  SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
+        var showOutlineForZone = (SelectionManager.selections.length === 1 && 
+                                    typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
+                                    SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
         that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
                                                               !isActiveTool(handleRotateYawRing) &&
                                                               !isActiveTool(handleRotateRollRing)));

From 7cae04883e85a747e6472049515a07b0093cc473 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 27 Feb 2018 17:19:02 -0800
Subject: [PATCH 538/569] WIP.

---
 libraries/render-utils/src/RenderPipelines.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 6264d82187..6ad86dfd37 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -718,6 +718,17 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withFade(),
         skinFadeProgram, state);
+
+    //Added for dual quaternions
+    auto skinDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    gpu::ShaderPointer skinFadeDualQuatProgram = gpu::Shader::createProgram(skinFadeVertex, skinFadePixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
+        skinDualQuatVertex, state);
+    
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
+        skinDualQuatVertex, state);
 }
 
 #include "RenderPipelines.h"

From bc7b983f4871c5b4bf2e7e28a57525762eed2c20 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Wed, 28 Feb 2018 04:44:20 -0800
Subject: [PATCH 539/569] Fast approximation of the azimuth parallax correction

---
 libraries/audio/src/AudioHRTF.cpp | 50 +++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/libraries/audio/src/AudioHRTF.cpp b/libraries/audio/src/AudioHRTF.cpp
index f0679a3684..aa951210a6 100644
--- a/libraries/audio/src/AudioHRTF.cpp
+++ b/libraries/audio/src/AudioHRTF.cpp
@@ -71,6 +71,25 @@ ALIGN32 static const float crossfadeTable[HRTF_BLOCK] = {
     0.0029059408f, 0.0022253666f, 0.0016352853f, 0.0011358041f, 0.0007270137f, 0.0004089886f, 0.0001817865f, 0.0000454487f, 
 };
 
+//
+// Fast approximation of the azimuth parallax correction,
+// for azimuth = [-pi,pi] and distance = [0.125,2].
+//
+// Correction becomes 0 at distance = 2.
+// Correction is continuous and smooth.
+//
+static const int NAZIMUTH = 8;
+static const float azimuthTable[NAZIMUTH][3] = {
+    {  0.018719007f,  0.097263971f, 0.080748954f },     // [-4pi/4,-3pi/4]
+    {  0.066995833f,  0.319754290f, 0.336963269f },     // [-3pi/4,-2pi/4]
+    { -0.066989851f, -0.101178847f, 0.006359474f },     // [-2pi/4,-1pi/4]
+    { -0.018727343f, -0.020357568f, 0.040065626f },     // [-1pi/4,-0pi/4]
+    { -0.005519051f, -0.018744412f, 0.040065629f },     // [ 0pi/4, 1pi/4]
+    { -0.001201296f, -0.025103593f, 0.042396711f },     // [ 1pi/4, 2pi/4]
+    {  0.001198959f, -0.032642381f, 0.048316220f },     // [ 2pi/4, 3pi/4]
+    {  0.005519640f, -0.053424870f, 0.073296888f },     // [ 3pi/4, 4pi/4]
+};
+
 //
 // Model the normalized near-field Distance Variation Filter.
 //
@@ -777,20 +796,39 @@ static void distanceBiquad(float distance, float& b0, float& b1, float& b2, floa
 //
 static void nearFieldAzimuthCorrection(float azimuth, float distance, float& azimuthL, float& azimuthR) {
 
+#ifdef HRTF_AZIMUTH_EXACT
     float dx = distance * cosf(azimuth);
     float dy = distance * sinf(azimuth);
 
-    // at reference distance, the azimuth parallax is correct
     float dx0 = HRTF_AZIMUTH_REF * cosf(azimuth);
     float dy0 = HRTF_AZIMUTH_REF * sinf(azimuth);
 
-    float deltaL = atan2f(dy + HRTF_HEAD_RADIUS, dx) - atan2f(dy0 + HRTF_HEAD_RADIUS, dx0);
-    float deltaR = atan2f(dy - HRTF_HEAD_RADIUS, dx) - atan2f(dy0 - HRTF_HEAD_RADIUS, dx0);
+    azimuthL += atan2f(dy + HRTF_HEAD_RADIUS, dx) - atan2f(dy0 + HRTF_HEAD_RADIUS, dx0);
+    azimuthR += atan2f(dy - HRTF_HEAD_RADIUS, dx) - atan2f(dy0 - HRTF_HEAD_RADIUS, dx0);
+#else
+    // at reference distance, the azimuth parallax is correct
+    float fy = (HRTF_AZIMUTH_REF - distance) / distance;
 
-    // add the azimuth correction
+    float x0 = +azimuth;
+    float x1 = -azimuth;    // compute using symmetry
+
+    const float RAD_TO_INDEX = 1.2732394f;  // 8/(2*pi), rounded down
+    int k0 = (int)(RAD_TO_INDEX * x0 + 4.0f);
+    int k1 = (NAZIMUTH-1) - k0;
+    assert(k0 >= 0);
+    assert(k1 >= 0);
+    assert(k0 < NAZIMUTH);
+    assert(k1 < NAZIMUTH);
+
+    // piecewise polynomial approximation over azimuth=[-pi,pi]
+    float fx0 = (azimuthTable[k0][0] * x0 + azimuthTable[k0][1]) * x0 + azimuthTable[k0][2];
+    float fx1 = (azimuthTable[k1][0] * x1 + azimuthTable[k1][1]) * x1 + azimuthTable[k1][2];
+
+    // approximate the azimuth correction
     // NOTE: must converge to 0 when distance = HRTF_AZIMUTH_REF
-    azimuthL += deltaL;
-    azimuthR += deltaR;
+    azimuthL += fx0 * fy;
+    azimuthR -= fx1 * fy;
+#endif
 }
 
 //

From 5764a21c4a7da429db29e510501cb528deb0ea03 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 28 Feb 2018 08:12:48 -0800
Subject: [PATCH 540/569] WIP.

---
 libraries/render-utils/src/RenderPipelines.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 6ad86dfd37..14e1993239 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -720,15 +720,11 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
         skinFadeProgram, state);
 
     //Added for dual quaternions
-    auto skinDualQuatVertex = skin_model_shadow_dq_vert::getShader();
-    gpu::ShaderPointer skinFadeDualQuatProgram = gpu::Shader::createProgram(skinFadeVertex, skinFadePixel);
+    auto skinModelDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    gpu::ShaderPointer skinModelDualQuatProgram = gpu::Shader::createProgram(skinModelDualQuatVertex, skinPixel);
     shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
-        skinDualQuatVertex, state);
-    
-    shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
-        skinDualQuatVertex, state);
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned(),
+        skinModelDualQuatProgram, state);
 }
 
 #include "RenderPipelines.h"

From faad930e352ecb28b5223457cb421a5487b778b8 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 28 Feb 2018 08:44:01 -0800
Subject: [PATCH 541/569] WIP.

---
 .../render-utils/src/RenderPipelines.cpp      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 14e1993239..1d3bd00940 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -100,6 +100,7 @@
 #include "model_shadow_vert.h"
 #include "skin_model_shadow_vert.h"
 #include "skin_model_shadow_dq_vert.h"
+#include "skin_model_shadow_fade_dq_vert.h"
 
 #include "model_shadow_frag.h"
 #include "skin_model_shadow_frag.h"
@@ -217,6 +218,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     auto skinModelDualQuatVertex = skin_model_dq_vert::getShader();
     auto skinModelNormalMapDualQuatVertex = skin_model_normal_map_dq_vert::getShader();
     auto skinModelShadowDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    auto skinModelShadowFadeDualQuatVertex = skin_model_shadow_fade_dq_vert::getShader();
     auto skinModelFadeDualQuatVertex = skin_model_fade_dq_vert::getShader();
     auto skinModelNormalMapFadeDualQuatVertex = skin_model_normal_map_fade_dq_vert::getShader();
     auto skinModelTranslucentDualQuatVertex = skinModelFadeDualQuatVertex;  // We use the same because it ouputs world position per vertex
@@ -519,12 +521,12 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     // Now repeat for dual quaternion
     // Depth-only
     addPipeline(
-        Key::Builder().withSkinned().withDepthOnly().withDualQuatSkinned(),
+        Key::Builder().withSkinned().withDualQuatSkinned().withDepthOnly(),
         skinModelShadowDualQuatVertex, modelShadowPixel, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
-        Key::Builder().withSkinned().withDepthOnly().withFade().withDualQuatSkinned(),
-        skinModelShadowDualQuatVertex, modelShadowFadePixel, batchSetter, itemSetter);
+        Key::Builder().withSkinned().withDualQuatSkinned().withDepthOnly().withFade(),
+        skinModelShadowFadeDualQuatVertex, modelShadowFadePixel, batchSetter, itemSetter);
 }
 
 void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
@@ -720,11 +722,17 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
         skinFadeProgram, state);
 
     //Added for dual quaternions
-    auto skinModelDualQuatVertex = skin_model_shadow_dq_vert::getShader();
-    gpu::ShaderPointer skinModelDualQuatProgram = gpu::Shader::createProgram(skinModelDualQuatVertex, skinPixel);
+    auto skinModelShadowDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    gpu::ShaderPointer skinModelDualQuatProgram = gpu::Shader::createProgram(skinModelShadowDualQuatVertex, skinPixel);
     shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned(),
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
         skinModelDualQuatProgram, state);
+
+    auto skinModelShadowFadeDualQuatVertex = skin_model_shadow_fade_dq_vert::getShader();
+    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(skinModelShadowFadeDualQuatVertex, skinPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
+        skinModelShadowDualQuatProgram, state);
 }
 
 #include "RenderPipelines.h"

From 9e5ed7b905bc95d5e8a17686e6f9cfea31cf3117 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 28 Feb 2018 10:48:35 -0800
Subject: [PATCH 542/569] Add more timing stats in explanded mode

---
 interface/resources/qml/Stats.qml |  6 +++++-
 interface/src/ui/Stats.cpp        | 29 +++++++++++++++++++++++++++++
 interface/src/ui/Stats.h          |  2 ++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index 4626d9bcda..a12bd4b2c0 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -257,7 +257,11 @@ Item {
                     id: octreeCol
                     spacing: 4; x: 4; y: 4;
                     StatText {
-                        text: "Engine: " + root.engineFrameTime.toFixed(1) + " ms"
+                        text: "Render Engine: " + root.engineFrameTime.toFixed(1) + " ms"
+                    }
+                    StatText {
+                        visible: root.expanded
+                        text: root.renderEngineStats
                     }
                     StatText {
                         text: "Batch: " + root.batchFrameTime.toFixed(1) + " ms"
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index bbc8de5987..ff42ed09e7 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -502,10 +502,39 @@ void Stats::updateStats(bool force) {
             _gameUpdateStats = "";
             emit gameUpdateStatsChanged();
         }
+
+        itr = allRecords.find("/paintGL/display/EngineRun/Engine");
+        std::priority_queue<SortableStat> renderEngineStats;
+        if (itr != allRecords.end()) {
+            float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
+            _renderEngineStats = QString("/render = %1 ms").arg(dt);
+
+            QVector<QString> categories = { "RenderMainView", "SecondaryCameraJob", "UpdateScene"};
+            for (int32_t j = 0; j < categories.size(); ++j) {
+                QString recordKey = "/paintGL/display/EngineRun/Engine/" + categories[j];
+                itr = allRecords.find(recordKey);
+                if (itr != allRecords.end()) {
+                    float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
+                    QString message = QString("\n    %1 = %2").arg(categories[j]).arg(dt);
+                    renderEngineStats.push(SortableStat(message, dt));
+                }
+            }
+            while (!renderEngineStats.empty()) {
+                SortableStat stat = renderEngineStats.top();
+                _renderEngineStats += stat.message;
+                renderEngineStats.pop();
+            }
+            emit renderEngineStatsChanged();
+        } else if (_renderEngineStats != "") {
+            _renderEngineStats = "";
+            emit renderEngineStatsChanged();
+        }
     } else if (_showGameUpdateStats) {
         _showGameUpdateStats = false;
         _gameUpdateStats = "";
+        _renderEngineStats = "";
         emit gameUpdateStatsChanged();
+        emit renderEngineStatsChanged();
     }
 }
 
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index af3189f20b..e5fc0beaf6 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -106,6 +106,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(QString, lodStatus, QString())
     STATS_PROPERTY(QString, timingStats, QString())
     STATS_PROPERTY(QString, gameUpdateStats, QString())
+    STATS_PROPERTY(QString, renderEngineStats, QString())
     STATS_PROPERTY(int, serverElements, 0)
     STATS_PROPERTY(int, serverInternal, 0)
     STATS_PROPERTY(int, serverLeaves, 0)
@@ -239,6 +240,7 @@ signals:
     void localLeavesChanged();
     void timingStatsChanged();
     void gameUpdateStatsChanged();
+    void renderEngineStatsChanged();
     void glContextSwapchainMemoryChanged();
     void qmlTextureMemoryChanged();
     void texturePendingTransfersChanged();

From 5d7e6651a761b0f96db5b9f81cb8f9cc437a3596 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 28 Feb 2018 11:05:02 -0800
Subject: [PATCH 543/569] Use correct pixel shader.

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

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 1d3bd00940..2ae59ec59e 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -723,16 +723,16 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
 
     //Added for dual quaternions
     auto skinModelShadowDualQuatVertex = skin_model_shadow_dq_vert::getShader();
-    gpu::ShaderPointer skinModelDualQuatProgram = gpu::Shader::createProgram(skinModelShadowDualQuatVertex, skinPixel);
+    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(skinModelShadowDualQuatVertex, skinPixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
-        skinModelDualQuatProgram, state);
+        skinModelShadowDualQuatProgram, state);
 
     auto skinModelShadowFadeDualQuatVertex = skin_model_shadow_fade_dq_vert::getShader();
-    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(skinModelShadowFadeDualQuatVertex, skinPixel);
+    gpu::ShaderPointer skinModelShadowFadeDualQuatProgram = gpu::Shader::createProgram(skinModelShadowFadeDualQuatVertex, skinFadePixel);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
-        skinModelShadowDualQuatProgram, state);
+        skinModelShadowFadeDualQuatProgram, state);
 }
 
 #include "RenderPipelines.h"

From a7542d5b9084954d8ee5556e68962ce74fb0173e Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Wed, 28 Feb 2018 17:46:22 -0800
Subject: [PATCH 544/569] fixing the shadow

---
 libraries/render-utils/src/RenderPipelines.cpp  | 17 +++++++++++++++--
 libraries/render-utils/src/RenderShadowTask.cpp | 15 ++++++++++++++-
 .../src/skin_model_normal_map_fade_dq.slv       |  2 ++
 libraries/render/src/render/ShapePipeline.h     |  6 ++++--
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 3fedae1778..1c2535e0aa 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -672,7 +672,7 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
     auto skinPixel = skin_model_shadow_frag::getShader();
     gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, skinPixel);
     shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned().withoutFade(),
+        ShapeKey::Filter::Builder().withSkinned().withoutDualQuatSkinned().withoutFade(),
         skinProgram, state);
 
     auto modelFadeVertex = model_shadow_fade_vert::getShader();
@@ -686,8 +686,21 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
     auto skinFadePixel = skin_model_shadow_fade_frag::getShader();
     gpu::ShaderPointer skinFadeProgram = gpu::Shader::createProgram(skinFadeVertex, skinFadePixel);
     shapePlumber.addPipeline(
-        ShapeKey::Filter::Builder().withSkinned().withFade(),
+        ShapeKey::Filter::Builder().withSkinned().withoutDualQuatSkinned().withFade(),
         skinFadeProgram, state);
+
+    //Added for dual quaternions
+    auto skinModelShadowDualQuatVertex = skin_model_shadow_dq_vert::getShader();
+    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(skinModelShadowDualQuatVertex, skinPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
+        skinModelShadowDualQuatProgram, state);
+/*
+    auto skinModelShadowFadeDualQuatVertex = skin_model_shadow_fade_dq_vert::getShader();
+    gpu::ShaderPointer skinModelShadowFadeDualQuatProgram = gpu::Shader::createProgram(skinModelShadowFadeDualQuatVertex, skinFadePixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
+        skinModelShadowFadeDualQuatProgram, state);*/
 }
 
 #include "RenderPipelines.h"
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index e8963c2e4e..b5a329cc91 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -163,8 +163,10 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
 
         auto shadowPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder);
         auto shadowSkinnedPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned());
+        auto shadowSkinnedDQPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned().withDualQuatSkinned());
 
         std::vector<ShapeKey> skinnedShapeKeys{};
+        std::vector<ShapeKey> skinnedDQShapeKeys{};
         std::vector<ShapeKey> ownPipelineShapeKeys{};
 
         // Iterate through all inShapes and render the unskinned
@@ -172,7 +174,11 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
         batch.setPipeline(shadowPipeline->pipeline);
         for (auto items : inShapes) {
             if (items.first.isSkinned()) {
-                skinnedShapeKeys.push_back(items.first);
+                if (items.first.isDualQuatSkinned()) {
+                    skinnedDQShapeKeys.push_back(items.first);
+                } else {
+                    skinnedShapeKeys.push_back(items.first);
+                }
             } else if (!items.first.hasOwnPipeline()) {
                 renderItems(renderContext, items.second);
             } else {
@@ -187,6 +193,13 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, con
             renderItems(renderContext, inShapes.at(key));
         }
 
+        // Reiterate to render the DQ skinned
+        args->_shapePipeline = shadowSkinnedDQPipeline;
+        batch.setPipeline(shadowSkinnedDQPipeline->pipeline);
+        for (const auto& key : skinnedDQShapeKeys) {
+            renderItems(renderContext, inShapes.at(key));
+        }
+
         // Finally render the items with their own pipeline last to prevent them from breaking the
         // render state. This is probably a temporary code as there is probably something better
         // to do in the render call of objects that have their own pipeline.
diff --git a/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv b/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
index 02b3742f6f..d6e07575b1 100644
--- a/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
+++ b/libraries/render-utils/src/skin_model_normal_map_fade_dq.slv
@@ -30,6 +30,7 @@ out vec3 _normal;
 out vec3 _tangent;
 out vec3 _color;
 out float _alpha;
+out vec4 _worldPosition;
 
 void main(void) {
     vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
@@ -53,6 +54,7 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
     <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, interpolatedNormal.xyz)$>
     <$transformModelToWorldDir(cam, obj, interpolatedTangent.xyz, interpolatedTangent.xyz)$>
 
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index f175bab99a..e0e675ce83 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -135,8 +135,8 @@ public:
             Builder& withSkinned() { _flags.set(SKINNED); _mask.set(SKINNED); return (*this); }
             Builder& withoutSkinned() { _flags.reset(SKINNED); _mask.set(SKINNED); return (*this); }
 
-            Builder& withDualQuatSkinned() { _flags.set(DUAL_QUAT_SKINNED); _mask.set(SKINNED); return (*this); }
-            Builder& withoutDualQuatSkinned() { _flags.reset(DUAL_QUAT_SKINNED); _mask.set(SKINNED); return (*this); }
+            Builder& withDualQuatSkinned() { _flags.set(DUAL_QUAT_SKINNED); _mask.set(DUAL_QUAT_SKINNED); return (*this); }
+            Builder& withoutDualQuatSkinned() { _flags.reset(DUAL_QUAT_SKINNED); _mask.set(DUAL_QUAT_SKINNED); return (*this); }
 
             Builder& withDepthOnly() { _flags.set(DEPTH_ONLY); _mask.set(DEPTH_ONLY); return (*this); }
             Builder& withoutDepthOnly() { _flags.reset(DEPTH_ONLY); _mask.set(DEPTH_ONLY); return (*this); }
@@ -176,6 +176,7 @@ public:
     bool isUnlit() const { return _flags[UNLIT]; }
     bool isTranslucent() const { return _flags[TRANSLUCENT]; }
     bool isSkinned() const { return _flags[SKINNED]; }
+    bool isDualQuatSkinned() const { return _flags[DUAL_QUAT_SKINNED]; }
     bool isDepthOnly() const { return _flags[DEPTH_ONLY]; }
     bool isDepthBiased() const { return _flags[DEPTH_BIAS]; }
     bool isWireframe() const { return _flags[WIREFRAME]; }
@@ -216,6 +217,7 @@ inline QDebug operator<<(QDebug debug, const ShapeKey& key) {
                 << "isUnlit:" << key.isUnlit()
                 << "isTranslucent:" << key.isTranslucent()
                 << "isSkinned:" << key.isSkinned()
+                << "isDualQuatSkinned:" << key.isDualQuatSkinned()
                 << "isDepthOnly:" << key.isDepthOnly()
                 << "isDepthBiased:" << key.isDepthBiased()
                 << "isWireframe:" << key.isWireframe()

From 9f9214e808df300810b2eb7b610262caa137656e Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 1 Mar 2018 09:33:48 -0800
Subject: [PATCH 545/569] getting back the RC65 version for a few files

---
 interface/resources/qml/Stats.qml             |  6 +---
 interface/src/ui/Stats.cpp                    | 31 +------------------
 interface/src/ui/Stats.h                      |  2 --
 .../system/libraries/entitySelectionTool.js   |  5 ++-
 4 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index a12bd4b2c0..4626d9bcda 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -257,11 +257,7 @@ Item {
                     id: octreeCol
                     spacing: 4; x: 4; y: 4;
                     StatText {
-                        text: "Render Engine: " + root.engineFrameTime.toFixed(1) + " ms"
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: root.renderEngineStats
+                        text: "Engine: " + root.engineFrameTime.toFixed(1) + " ms"
                     }
                     StatText {
                         text: "Batch: " + root.batchFrameTime.toFixed(1) + " ms"
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index ff42ed09e7..80f57bfe0e 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -482,7 +482,7 @@ void Stats::updateStats(bool force) {
             float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
             _gameUpdateStats = QString("/idle/update = %1 ms").arg(dt);
 
-            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "pickManager", "postUpdateLambdas", "misc" };
+            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "misc" };
             for (int32_t j = 0; j < categories.size(); ++j) {
                 QString recordKey = "/idle/update/" + categories[j];
                 itr = allRecords.find(recordKey);
@@ -502,39 +502,10 @@ void Stats::updateStats(bool force) {
             _gameUpdateStats = "";
             emit gameUpdateStatsChanged();
         }
-
-        itr = allRecords.find("/paintGL/display/EngineRun/Engine");
-        std::priority_queue<SortableStat> renderEngineStats;
-        if (itr != allRecords.end()) {
-            float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
-            _renderEngineStats = QString("/render = %1 ms").arg(dt);
-
-            QVector<QString> categories = { "RenderMainView", "SecondaryCameraJob", "UpdateScene"};
-            for (int32_t j = 0; j < categories.size(); ++j) {
-                QString recordKey = "/paintGL/display/EngineRun/Engine/" + categories[j];
-                itr = allRecords.find(recordKey);
-                if (itr != allRecords.end()) {
-                    float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
-                    QString message = QString("\n    %1 = %2").arg(categories[j]).arg(dt);
-                    renderEngineStats.push(SortableStat(message, dt));
-                }
-            }
-            while (!renderEngineStats.empty()) {
-                SortableStat stat = renderEngineStats.top();
-                _renderEngineStats += stat.message;
-                renderEngineStats.pop();
-            }
-            emit renderEngineStatsChanged();
-        } else if (_renderEngineStats != "") {
-            _renderEngineStats = "";
-            emit renderEngineStatsChanged();
-        }
     } else if (_showGameUpdateStats) {
         _showGameUpdateStats = false;
         _gameUpdateStats = "";
-        _renderEngineStats = "";
         emit gameUpdateStatsChanged();
-        emit renderEngineStatsChanged();
     }
 }
 
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index e5fc0beaf6..af3189f20b 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -106,7 +106,6 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(QString, lodStatus, QString())
     STATS_PROPERTY(QString, timingStats, QString())
     STATS_PROPERTY(QString, gameUpdateStats, QString())
-    STATS_PROPERTY(QString, renderEngineStats, QString())
     STATS_PROPERTY(int, serverElements, 0)
     STATS_PROPERTY(int, serverInternal, 0)
     STATS_PROPERTY(int, serverLeaves, 0)
@@ -240,7 +239,6 @@ signals:
     void localLeavesChanged();
     void timingStatsChanged();
     void gameUpdateStatsChanged();
-    void renderEngineStatsChanged();
     void glContextSwapchainMemoryChanged();
     void qmlTextureMemoryChanged();
     void texturePendingTransfersChanged();
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index a419e9d49c..8a07ff0d20 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1322,9 +1322,8 @@ SelectionDisplay = (function() {
                                        isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
                                        isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
 
-        var showOutlineForZone = (SelectionManager.selections.length === 1 && 
-                                    typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
-                                    SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
+        var showOutlineForZone = (SelectionManager.selections.length === 1 &&
+                                  SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
         that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
                                                               !isActiveTool(handleRotateYawRing) &&
                                                               !isActiveTool(handleRotateRollRing)));

From 5440f62860ae8ca02943e1f9d27f5b80f99b6963 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 1 Mar 2018 10:46:47 -0800
Subject: [PATCH 546/569] fixing a bad key /pipeline pair

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

diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index b3a1d40257..84a144e6db 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -592,8 +592,8 @@ void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::Ba
         Key::Builder().withMaterial().withSkinned().withTangents().withDualQuatSkinned(),
         skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
     addPipeline(
-        Key::Builder().withMaterial().withSkinned(),
-        skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
+        Key::Builder().withMaterial().withSkinned().withSpecular().withDualQuatSkinned(),
+       skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTangents().withSpecular().withDualQuatSkinned(),
         skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);

From 70bdedc4b398293d30168666517f34904573cef3 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 1 Mar 2018 16:37:19 -0800
Subject: [PATCH 547/569] Fix Edit -> Export Entities exporting gzipped json

We were not respecting the doGzip flag.
---
 libraries/octree/src/Octree.cpp              | 21 +++++++++++---------
 libraries/octree/src/Octree.h                |  4 ++--
 libraries/octree/src/OctreePersistThread.cpp |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index 334299185e..7e0c82506b 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1778,7 +1778,7 @@ bool Octree::writeToFile(const char* fileName, const OctreeElementPointer& eleme
     return success;
 }
 
-bool Octree::toJSON(QJsonDocument* doc, const OctreeElementPointer& element) {
+bool Octree::toJSONDocument(QJsonDocument* doc, const OctreeElementPointer& element) {
     QVariantMap entityDescription;
 
     OctreeElementPointer top;
@@ -1804,18 +1804,22 @@ bool Octree::toJSON(QJsonDocument* doc, const OctreeElementPointer& element) {
     return true;
 }
 
-bool Octree::toGzippedJSON(QByteArray* data, const OctreeElementPointer& element) {
+bool Octree::toJSON(QByteArray* data, const OctreeElementPointer& element, bool doGzip) {
     QJsonDocument doc;
-    if (!toJSON(&doc, element)) {
+    if (!toJSONDocument(&doc, element)) {
         qCritical("Failed to convert Entities to QVariantMap while converting to json.");
         return false;
     }
 
-    QByteArray jsonData = doc.toJson();
+    if (doGzip) {
+        QByteArray jsonData = doc.toJson();
 
-    if (!gzip(jsonData, *data, -1)) {
-        qCritical("Unable to gzip data while saving to json.");
-        return false;
+        if (!gzip(jsonData, *data, -1)) {
+            qCritical("Unable to gzip data while saving to json.");
+            return false;
+        }
+    } else {
+        *data = doc.toJson();
     }
 
     return true;
@@ -1825,7 +1829,7 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
     qCDebug(octree, "Saving JSON SVO to file %s...", fileName);
 
     QByteArray jsonDataForFile;
-    if (!toGzippedJSON(&jsonDataForFile)) {
+    if (!toJSON(&jsonDataForFile, element, doGzip)) {
         return false;
     }
 
@@ -1837,7 +1841,6 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
         qCritical("Could not write to JSON description of entities.");
     }
 
-
     return success;
 }
 
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index cb281593b1..c4c4508138 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -284,8 +284,8 @@ public:
     void loadOctreeFile(const char* fileName);
 
     // Octree exporters
-    bool toJSON(QJsonDocument* doc, const OctreeElementPointer& element = nullptr);
-    bool toGzippedJSON(QByteArray* data, const OctreeElementPointer& element = nullptr);
+    bool toJSONDocument(QJsonDocument* doc, const OctreeElementPointer& element = nullptr);
+    bool toJSON(QByteArray* data, const OctreeElementPointer& element = nullptr, bool doGzip = false);
     bool writeToFile(const char* filename, const OctreeElementPointer& element = nullptr, QString persistAsFileType = "json.gz");
     bool writeToJSONFile(const char* filename, const OctreeElementPointer& element = nullptr, bool doGzip = false);
     virtual bool writeToMap(QVariantMap& entityDescription, OctreeElementPointer element, bool skipDefaultValues,
diff --git a/libraries/octree/src/OctreePersistThread.cpp b/libraries/octree/src/OctreePersistThread.cpp
index 23d6b6c2aa..7c5b7eb45c 100644
--- a/libraries/octree/src/OctreePersistThread.cpp
+++ b/libraries/octree/src/OctreePersistThread.cpp
@@ -341,7 +341,7 @@ void OctreePersistThread::sendLatestEntityDataToDS() {
     const DomainHandler& domainHandler = nodeList->getDomainHandler();
 
     QByteArray data;
-    if (_tree->toGzippedJSON(&data)) {
+    if (_tree->toJSON(&data, nullptr, true)) {
         auto message = NLPacketList::create(PacketType::OctreeDataPersist, QByteArray(), true, true);
         message->write(data);
         nodeList->sendPacketList(std::move(message), domainHandler.getSockAddr());

From a5a109e4f1d25a4ff33e7dbd11598eb8e1a63f2b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Mar 2018 16:40:24 -0800
Subject: [PATCH 548/569] Fix undefined request from JS

---
 scripts/modules/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/modules/request.js b/scripts/modules/request.js
index c7bf98d815..3516554567 100644
--- a/scripts/modules/request.js
+++ b/scripts/modules/request.js
@@ -71,7 +71,7 @@ module.exports = {
             }
         }
         httpRequest.open(options.method, options.uri, true);
-        httpRequest.send(options.body);
+        httpRequest.send(options.body || null);
         }
 };
 

From d7725f1d73e99870fffae195399556151e224777 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Sun, 4 Mar 2018 00:18:59 +0100
Subject: [PATCH 549/569] make the grabbable checkbox again, respect default
 true setting

---
 scripts/system/html/js/entityProperties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 2b29fbf041..7e87586b4f 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1281,7 +1281,7 @@ function loaded() {
             if (elCloneable.checked) {
                 elGrabbable.checked = false;
             }
-            userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, properties.dynamic);
+            userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, true);
         });
         elCloneableDynamic.addEventListener('change', function(event) {
             userDataChanger("grabbableKey", "cloneDynamic", event.target, elUserData, -1);

From 15c1f5ba307ad36562456c252e3d2a1fb27e4720 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 27 Feb 2018 16:44:45 -0800
Subject: [PATCH 550/569] fixed log spam undefined error

---
 scripts/system/libraries/entitySelectionTool.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 8a07ff0d20..a419e9d49c 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1322,8 +1322,9 @@ SelectionDisplay = (function() {
                                        isActiveTool(handleScaleRTFCube) || isActiveTool(handleStretchXSphere) || 
                                        isActiveTool(handleStretchYSphere) || isActiveTool(handleStretchZSphere));
 
-        var showOutlineForZone = (SelectionManager.selections.length === 1 &&
-                                  SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
+        var showOutlineForZone = (SelectionManager.selections.length === 1 && 
+                                    typeof SelectionManager.savedProperties[SelectionManager.selections[0]] !== "undefined" &&
+                                    SelectionManager.savedProperties[SelectionManager.selections[0]].type === "Zone");
         that.setHandleScaleEdgeVisible(showOutlineForZone || (!isActiveTool(handleRotatePitchRing) &&
                                                               !isActiveTool(handleRotateYawRing) &&
                                                               !isActiveTool(handleRotateRollRing)));

From b74be92fd8965ae297ad442ede65c4cd933b5fb8 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 6 Mar 2018 11:29:43 -0800
Subject: [PATCH 551/569] redo scale handles to fix scaling into avatar
 collision causing chaos

---
 .../system/libraries/entitySelectionTool.js   | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 8a07ff0d20..3c794f14fb 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -458,12 +458,12 @@ SelectionDisplay = (function() {
         borderSize: 1.4
     };
     var handleScaleLBNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x, -y, -z)
-    var handleScaleRBNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x, -y,  z)
-    var handleScaleLBFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x, -y, -z)
+    var handleScaleRBNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x, -y, -z)
+    var handleScaleLBFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x, -y,  z)
     var handleScaleRBFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x, -y,  z)
     var handleScaleLTNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x,  y, -z)
-    var handleScaleRTNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x,  y,  z)
-    var handleScaleLTFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x,  y, -z)
+    var handleScaleRTNCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x,  y, -z)
+    var handleScaleLTFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // (-x,  y,  z)
     var handleScaleRTFCube = Overlays.addOverlay("cube", handlePropertiesScaleCubes); // ( x,  y,  z)
 
     var handlePropertiesScaleEdge = {
@@ -1021,7 +1021,6 @@ SelectionDisplay = (function() {
             return;
         }
 
-
         if (SelectionManager.hasSelection()) {
             var position = SelectionManager.worldPosition;
             var rotation = spaceMode === SPACE_LOCAL ? SelectionManager.localRotation : SelectionManager.worldRotation;
@@ -1147,14 +1146,14 @@ SelectionDisplay = (function() {
                 rotation: scaleCubeRotation,
                 dimensions: scaleCubeDimensions
             });
-            var scaleRBNCubePosition = { x:-scaleCubeOffsetX, y:-scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            var scaleRBNCubePosition = { x:scaleCubeOffsetX, y:-scaleCubeOffsetY, z:-scaleCubeOffsetZ };
             scaleRBNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRBNCubePosition));
             Overlays.editOverlay(handleScaleRBNCube, { 
                 position: scaleRBNCubePosition, 
                 rotation: scaleCubeRotation,
                 dimensions: scaleCubeDimensions
             });
-            var scaleLBFCubePosition = { x:scaleCubeOffsetX, y:-scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            var scaleLBFCubePosition = { x:-scaleCubeOffsetX, y:-scaleCubeOffsetY, z:scaleCubeOffsetZ };
             scaleLBFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLBFCubePosition));
             Overlays.editOverlay(handleScaleLBFCube, { 
                 position: scaleLBFCubePosition, 
@@ -1175,14 +1174,14 @@ SelectionDisplay = (function() {
                 rotation: scaleCubeRotation,
                 dimensions: scaleCubeDimensions
             });
-            var scaleRTNCubePosition = { x:-scaleCubeOffsetX, y:scaleCubeOffsetY, z:scaleCubeOffsetZ };
+            var scaleRTNCubePosition = { x:scaleCubeOffsetX, y:scaleCubeOffsetY, z:-scaleCubeOffsetZ };
             scaleRTNCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleRTNCubePosition));
             Overlays.editOverlay(handleScaleRTNCube, { 
                 position: scaleRTNCubePosition, 
                 rotation: scaleCubeRotation,
                 dimensions: scaleCubeDimensions
             });
-            var scaleLTFCubePosition = { x:scaleCubeOffsetX, y:scaleCubeOffsetY, z:-scaleCubeOffsetZ };
+            var scaleLTFCubePosition = { x:-scaleCubeOffsetX, y:scaleCubeOffsetY, z:scaleCubeOffsetZ };
             scaleLTFCubePosition = Vec3.sum(position, Vec3.multiplyQbyV(rotation, scaleLTFCubePosition));
             Overlays.editOverlay(handleScaleLTFCube, { 
                 position: scaleLTFCubePosition, 
@@ -1236,9 +1235,11 @@ SelectionDisplay = (function() {
             });
 
             // UPDATE STRETCH HIGHLIGHT PANELS
-            var scaleLTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleLTFCubePosition);
             var scaleRBFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRBFCubePosition);
-            var stretchPanelXDimensions = Vec3.subtract(scaleLTFCubePositionRotated, scaleRBFCubePositionRotated);
+            var scaleRTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTFCubePosition);
+            var scaleLTNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleLTNCubePosition);
+            var scaleRTNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTNCubePosition);
+            var stretchPanelXDimensions = Vec3.subtract(scaleRTNCubePositionRotated, scaleRBFCubePositionRotated);
             var tempY = Math.abs(stretchPanelXDimensions.y);
             stretchPanelXDimensions.x = STRETCH_PANEL_WIDTH;
             stretchPanelXDimensions.y = Math.abs(stretchPanelXDimensions.z);
@@ -1249,8 +1250,6 @@ SelectionDisplay = (function() {
                 rotation: rotationZ,
                 dimensions: stretchPanelXDimensions
             });
-            var scaleLTNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleLTNCubePosition);
-            var scaleRTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTFCubePosition);
             var stretchPanelYDimensions = Vec3.subtract(scaleLTNCubePositionRotated, scaleRTFCubePositionRotated);
             var tempX = Math.abs(stretchPanelYDimensions.x);
             stretchPanelYDimensions.x = Math.abs(stretchPanelYDimensions.z);
@@ -1262,9 +1261,7 @@ SelectionDisplay = (function() {
                 rotation: rotationY,
                 dimensions: stretchPanelYDimensions
             });
-            var scaleRTFCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRTFCubePosition);
-            var scaleRBNCubePositionRotated = Vec3.multiplyQbyV(rotationInverse, scaleRBNCubePosition);
-            var stretchPanelZDimensions = Vec3.subtract(scaleRTFCubePositionRotated, scaleRBNCubePositionRotated);
+            var stretchPanelZDimensions = Vec3.subtract(scaleLTNCubePositionRotated, scaleRBFCubePositionRotated);
             var tempX = Math.abs(stretchPanelZDimensions.x);
             stretchPanelZDimensions.x = Math.abs(stretchPanelZDimensions.y);
             stretchPanelZDimensions.y = tempX;
@@ -1957,7 +1954,11 @@ SelectionDisplay = (function() {
         };
 
         var onMove = function(event) {
-            var proportional = (spaceMode === SPACE_WORLD) || event.isShifted || directionEnum === STRETCH_DIRECTION.ALL;
+			if (event.x === undefined || event.y === undefined) {
+				return;
+			}
+			
+            var proportional = (spaceMode === SPACE_WORLD) || directionEnum === STRETCH_DIRECTION.ALL;
             
             var position, dimensions, rotation;
             if (spaceMode === SPACE_LOCAL) {
@@ -1998,12 +1999,6 @@ SelectionDisplay = (function() {
             vector = grid.snapToSpacing(vector);
     
             var changeInDimensions = Vec3.multiply(NEGATE_VECTOR, vec3Mult(localSigns, vector));
-            if (directionEnum === STRETCH_DIRECTION.ALL) {
-                var toCameraDistance = getDistanceToCamera(position);
-                var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;
-                changeInDimensions = Vec3.multiply(changeInDimensions, dimensionsMultiple);
-            }
-
             var newDimensions;
             if (proportional) {
                 var absoluteX = Math.abs(changeInDimensions.x);
@@ -2085,31 +2080,38 @@ SelectionDisplay = (function() {
     function addHandleScaleTool(overlay, mode, directionEnum) {
         var directionVector, offset, selectedHandle;
         if (directionEnum === SCALE_DIRECTION.LBN) {
-            directionVector = { x:1, y:1, z:1 };
+            directionVector = { x:1, y:0, z:1 };
+			offset = { x:-1, y:-1, z:-1 };
             selectedHandle = handleScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
-            directionVector = { x:1, y:1, z:-1 };
+            directionVector = { x:-1, y:0, z:1 };
+			offset = { x:1, y:-1, z:-1 };
             selectedHandle = handleScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
-            directionVector = { x:-1, y:1, z:1 };
+            directionVector = { x:1, y:0, z:-1 };
+			offset = { x:-1, y:-1, z:1 };
             selectedHandle = handleScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
-            directionVector = { x:-1, y:1, z:-1 };
+            directionVector = { x:-1, y:0, z:-1 };
+			offset = { x:1, y:-1, z:1 };
             selectedHandle = handleScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
-            directionVector = { x:1, y:-1, z:1 };
+            directionVector = { x:1, y:0, z:1 };
+			offset = { x:-1, y:1, z:-1 };
             selectedHandle = handleScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
-            directionVector = { x:1, y:-1, z:-1 };
+            directionVector = { x:-1, y:0, z:1 };
+			offset = { x:1, y:1, z:-1 };
             selectedHandle = handleScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
-            directionVector = { x:-1, y:-1, z:1 };
+            directionVector = { x:1, y:0, z:-1 };
+			offset = { x:-1, y:1, z:1 };
             selectedHandle = handleScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
-            directionVector = { x:-1, y:-1, z:-1 };
+            directionVector = { x:-1, y:0, z:-1 };
+			offset = { x:1, y:1, z:1 };
             selectedHandle = handleScaleRTFCube;
         }
-        offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
         var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVector, 
                                    directionVector, offset, null, selectedHandle);
         return addHandleTool(overlay, tool);

From a23884d0e03407841616b4d0bfc6109cc961bcac Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 2 Mar 2018 17:33:28 -0800
Subject: [PATCH 552/569] Prevent crash during long backup web requests

---
 domain-server/src/DomainServer.cpp | 54 ++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index d2ef1a4156..178345a144 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1937,6 +1937,8 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
     const QString UUID_REGEX_STRING = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 
+    QPointer<HTTPConnection> connectionPtr { connection };
+
     auto nodeList = DependencyManager::get<LimitedNodeList>();
 
     auto getSetting = [this](QString keyPath, QVariant value) -> bool {
@@ -2120,30 +2122,38 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             return true;
         } else if (url.path() == URI_API_BACKUPS) {
             auto deferred = makePromise("getAllBackupsAndStatus");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+            deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                if (!connectionPtr) {
+                    return;
+                }
+
                 QJsonDocument docJSON(QJsonObject::fromVariantMap(result));
 
-                connection->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
+                connectionPtr->respond(HTTPConnection::StatusCode200, docJSON.toJson(), JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->getAllBackupsAndStatus(deferred);
             return true;
         } else if (url.path().startsWith(URI_API_BACKUPS_ID)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());
             auto deferred = makePromise("consolidateBackup");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+            deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                if (!connectionPtr) {
+                    return;
+                }
+
                 QJsonObject rootJSON;
                 auto success = result["success"].toBool();
                 if (success) {
                     auto path = result["backupFilePath"].toString();
                     auto file { std::unique_ptr<QFile>(new QFile(path)) };
                     if (file->open(QIODevice::ReadOnly)) {
-                        connection->respond(HTTPConnection::StatusCode200, std::move(file));
+                        connectionPtr->respond(HTTPConnection::StatusCode200, std::move(file));
                     } else {
                         qCritical(domain_server) << "Unable to load consolidated backup at:" << path << result;
-                        connection->respond(HTTPConnection::StatusCode500, "Error opening backup");
+                        connectionPtr->respond(HTTPConnection::StatusCode500, "Error opening backup");
                     }
                 } else {
-                    connection->respond(HTTPConnection::StatusCode400);
+                    connectionPtr->respond(HTTPConnection::StatusCode400);
                 }
             });
             _contentManager->consolidateBackup(deferred, id);
@@ -2264,12 +2274,16 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 } else if (uploadedFilename.endsWith(".zip", Qt::CaseInsensitive)) {
                     auto deferred = makePromise("recoverFromUploadedBackup");
 
-                    deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                    deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                        if (!connectionPtr) {
+                            return;
+                        }
+
                         QJsonObject rootJSON;
                         auto success = result["success"].toBool();
                         rootJSON["success"] = success;
                         QJsonDocument docJSON(rootJSON);
-                        connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                        connectionPtr->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
                                             JSON_MIME_TYPE.toUtf8());
                     });
 
@@ -2297,12 +2311,16 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             }
 
             auto deferred = makePromise("createManualBackup");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+            deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                if (!connectionPtr) {
+                    return;
+                }
+
                 QJsonObject rootJSON;
                 auto success = result["success"].toBool();
                 rootJSON["success"] = success;
                 QJsonDocument docJSON(rootJSON);
-                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                connectionPtr->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
                                     JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->createManualBackup(deferred, it.value());
@@ -2322,12 +2340,16 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         } else if (url.path().startsWith(URI_API_BACKUPS_RECOVER)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_RECOVER).length());
             auto deferred = makePromise("recoverFromBackup");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+            deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                if (!connectionPtr) {
+                    return;
+                }
+
                 QJsonObject rootJSON;
                 auto success = result["success"].toBool();
                 rootJSON["success"] = success;
                 QJsonDocument docJSON(rootJSON);
-                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                connectionPtr->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
                                     JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->recoverFromBackup(deferred, id);
@@ -2423,12 +2445,16 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         if (url.path().startsWith(URI_API_BACKUPS_ID)) {
             auto id = url.path().mid(QString(URI_API_BACKUPS_ID).length());
             auto deferred = makePromise("deleteBackup");
-            deferred->then([connection, JSON_MIME_TYPE](QString error, QVariantMap result) {
+            deferred->then([connectionPtr, JSON_MIME_TYPE](QString error, QVariantMap result) {
+                if (!connectionPtr) {
+                    return;
+                }
+
                 QJsonObject rootJSON;
                 auto success = result["success"].toBool();
                 rootJSON["success"] = success;
                 QJsonDocument docJSON(rootJSON);
-                connection->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
+                connectionPtr->respond(success ? HTTPConnection::StatusCode200 : HTTPConnection::StatusCode400, docJSON.toJson(),
                                     JSON_MIME_TYPE.toUtf8());
             });
             _contentManager->deleteBackup(deferred, id);

From a83b54e10dd63f312d143b6b9ac1b850410f7900 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 6 Mar 2018 13:52:41 -0800
Subject: [PATCH 553/569] fix for getSetting QVariant ref in DomainServer

---
 domain-server/src/DomainServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index d2ef1a4156..cf99ca4344 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1939,7 +1939,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 
     auto nodeList = DependencyManager::get<LimitedNodeList>();
 
-    auto getSetting = [this](QString keyPath, QVariant value) -> bool {
+    auto getSetting = [this](QString keyPath, QVariant& value) -> bool {
 
         value = _settingsManager.valueForKeyPath(keyPath);
         if (!value.isValid()) {

From 47e8e26255d267f450d7143f0c35ea2d8eece588 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Tue, 6 Mar 2018 14:04:15 -0800
Subject: [PATCH 554/569] CR indent fixes

---
 .../system/libraries/entitySelectionTool.js   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 3c794f14fb..a4acbbf67c 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1954,10 +1954,10 @@ SelectionDisplay = (function() {
         };
 
         var onMove = function(event) {
-			if (event.x === undefined || event.y === undefined) {
-				return;
-			}
-			
+            if (event.x === undefined || event.y === undefined) {
+                return;
+            }
+            
             var proportional = (spaceMode === SPACE_WORLD) || directionEnum === STRETCH_DIRECTION.ALL;
             
             var position, dimensions, rotation;
@@ -2081,35 +2081,35 @@ SelectionDisplay = (function() {
         var directionVector, offset, selectedHandle;
         if (directionEnum === SCALE_DIRECTION.LBN) {
             directionVector = { x:1, y:0, z:1 };
-			offset = { x:-1, y:-1, z:-1 };
+            offset = { x:-1, y:-1, z:-1 };
             selectedHandle = handleScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
             directionVector = { x:-1, y:0, z:1 };
-			offset = { x:1, y:-1, z:-1 };
+            offset = { x:1, y:-1, z:-1 };
             selectedHandle = handleScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
             directionVector = { x:1, y:0, z:-1 };
-			offset = { x:-1, y:-1, z:1 };
+            offset = { x:-1, y:-1, z:1 };
             selectedHandle = handleScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
             directionVector = { x:-1, y:0, z:-1 };
-			offset = { x:1, y:-1, z:1 };
+            offset = { x:1, y:-1, z:1 };
             selectedHandle = handleScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
             directionVector = { x:1, y:0, z:1 };
-			offset = { x:-1, y:1, z:-1 };
+            offset = { x:-1, y:1, z:-1 };
             selectedHandle = handleScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
             directionVector = { x:-1, y:0, z:1 };
-			offset = { x:1, y:1, z:-1 };
+            offset = { x:1, y:1, z:-1 };
             selectedHandle = handleScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
             directionVector = { x:1, y:0, z:-1 };
-			offset = { x:-1, y:1, z:1 };
+            offset = { x:-1, y:1, z:1 };
             selectedHandle = handleScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
             directionVector = { x:-1, y:0, z:-1 };
-			offset = { x:1, y:1, z:1 };
+            offset = { x:1, y:1, z:1 };
             selectedHandle = handleScaleRTFCube;
         }
         var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVector, 

From 17c12fde9c66ca0fd723b478eee7aa4b93fab588 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 6 Mar 2018 16:32:04 -0800
Subject: [PATCH 555/569] Fix for HandshakeRequest logic

---
 libraries/networking/src/udt/Connection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp
index 77ed589e0b..b34c05106f 100644
--- a/libraries/networking/src/udt/Connection.cpp
+++ b/libraries/networking/src/udt/Connection.cpp
@@ -578,6 +578,7 @@ void Connection::processControl(ControlPacketPointer controlPacket) {
 #ifdef UDT_CONNECTION_DEBUG
                 qCDebug(networking) << "Got handshake request, stopping SendQueue";
 #endif
+                _hasReceivedHandshakeACK = false;
                 stopSendQueue();
             }
             break;

From 251e4a312736cba17c7e4a51e0f38cd7029dc561 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 6 Mar 2018 16:35:49 -0800
Subject: [PATCH 556/569] Fixed blocks importer textures being interpreted as
 image entities

---
 interface/src/Application.cpp | 18 +++++++++---------
 interface/src/Application.h   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index af159263ed..189b4c02bc 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6607,17 +6607,17 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
 
     addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server.");
 
-    addAssetToWorldWithNewMapping(path, mapping, 0);
+    addAssetToWorldWithNewMapping(path, mapping, 0, isBlocks);
 }
 
-void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy) {
+void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isBlocks) {
     auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
 
     QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
         const int MAX_COPY_COUNT = 100;  // Limit number of duplicate assets; recursion guard.
         auto result = request->getError();
         if (result == GetMappingRequest::NotFound) {
-            addAssetToWorldUpload(filePath, mapping);
+            addAssetToWorldUpload(filePath, mapping, isBlocks);
         } else if (result != GetMappingRequest::NoError) {
             QString errorInfo = "Could not map asset name: "
                 + mapping.left(mapping.length() - QString::number(copy).length() - 1);
@@ -6629,7 +6629,7 @@ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mappin
             }
             copy++;
             mapping = mapping.insert(mapping.lastIndexOf("."), "-" + QString::number(copy));
-            addAssetToWorldWithNewMapping(filePath, mapping, copy);
+            addAssetToWorldWithNewMapping(filePath, mapping, copy, isBlocks);
         } else {
             QString errorInfo = "Too many copies of asset name: "
                 + mapping.left(mapping.length() - QString::number(copy).length() - 1);
@@ -6642,7 +6642,7 @@ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mappin
     request->start();
 }
 
-void Application::addAssetToWorldUpload(QString filePath, QString mapping) {
+void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isBlocks) {
     qInfo(interfaceapp) << "Uploading" << filePath << "to Asset Server as" << mapping;
     auto upload = DependencyManager::get<AssetClient>()->createUpload(filePath);
     QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
@@ -6651,7 +6651,7 @@ void Application::addAssetToWorldUpload(QString filePath, QString mapping) {
             qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
-            addAssetToWorldSetMapping(filePath, mapping, hash);
+            addAssetToWorldSetMapping(filePath, mapping, hash, isBlocks);
         }
 
         // Remove temporary directory created by Clara.io market place download.
@@ -6668,7 +6668,7 @@ void Application::addAssetToWorldUpload(QString filePath, QString mapping) {
     upload->start();
 }
 
-void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash) {
+void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isBlocks) {
     auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
     connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
         if (request->getError() != SetMappingRequest::NoError) {
@@ -6677,8 +6677,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
             // to prevent files that aren't models from being loaded into world automatically
-            if (filePath.endsWith(OBJ_EXTENSION) || filePath.endsWith(FBX_EXTENSION) || 
-                filePath.endsWith(JPG_EXTENSION) || filePath.endsWith(PNG_EXTENSION)) {
+            if (filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
+                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) && (!isBlocks)) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {
                 qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ad12a4dc67..8b8e76d584 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -322,9 +322,9 @@ public slots:
     void addAssetToWorldFromURLRequestFinished();
     void addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks);
     void addAssetToWorldUnzipFailure(QString filePath);
-    void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy);
-    void addAssetToWorldUpload(QString filePath, QString mapping);
-    void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash);
+    void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isBlocks);
+    void addAssetToWorldUpload(QString filePath, QString mapping, bool isBlocks);
+    void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isBlocks);
     void addAssetToWorldAddEntity(QString filePath, QString mapping);
 
     void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip, bool isBlocks);

From c6e5f4c9c83774d323f7408f1d7b7a8f4e452765 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Tue, 6 Mar 2018 19:24:09 -0800
Subject: [PATCH 557/569] zip file drags don't auto add model textures

---
 interface/src/Application.cpp                   | 17 +++++++++--------
 interface/src/Application.h                     |  8 ++++----
 .../src/FileScriptingInterface.cpp              | 13 +++++++++++++
 .../script-engine/src/FileScriptingInterface.h  |  1 +
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 189b4c02bc..9a04a9509e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6607,17 +6607,17 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
 
     addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server.");
 
-    addAssetToWorldWithNewMapping(path, mapping, 0, isBlocks);
+    addAssetToWorldWithNewMapping(path, mapping, 0, isZip, isBlocks);
 }
 
-void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isBlocks) {
+void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isZip, bool isBlocks) {
     auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
 
     QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
         const int MAX_COPY_COUNT = 100;  // Limit number of duplicate assets; recursion guard.
         auto result = request->getError();
         if (result == GetMappingRequest::NotFound) {
-            addAssetToWorldUpload(filePath, mapping, isBlocks);
+            addAssetToWorldUpload(filePath, mapping, isZip, isBlocks);
         } else if (result != GetMappingRequest::NoError) {
             QString errorInfo = "Could not map asset name: "
                 + mapping.left(mapping.length() - QString::number(copy).length() - 1);
@@ -6629,7 +6629,7 @@ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mappin
             }
             copy++;
             mapping = mapping.insert(mapping.lastIndexOf("."), "-" + QString::number(copy));
-            addAssetToWorldWithNewMapping(filePath, mapping, copy, isBlocks);
+            addAssetToWorldWithNewMapping(filePath, mapping, copy, isZip, isBlocks);
         } else {
             QString errorInfo = "Too many copies of asset name: "
                 + mapping.left(mapping.length() - QString::number(copy).length() - 1);
@@ -6642,7 +6642,7 @@ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mappin
     request->start();
 }
 
-void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isBlocks) {
+void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isZip, bool isBlocks) {
     qInfo(interfaceapp) << "Uploading" << filePath << "to Asset Server as" << mapping;
     auto upload = DependencyManager::get<AssetClient>()->createUpload(filePath);
     QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
@@ -6651,7 +6651,7 @@ void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool
             qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
-            addAssetToWorldSetMapping(filePath, mapping, hash, isBlocks);
+            addAssetToWorldSetMapping(filePath, mapping, hash, isZip, isBlocks);
         }
 
         // Remove temporary directory created by Clara.io market place download.
@@ -6668,7 +6668,7 @@ void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool
     upload->start();
 }
 
-void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isBlocks) {
+void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isZip, bool isBlocks) {
     auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
     connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
         if (request->getError() != SetMappingRequest::NoError) {
@@ -6678,7 +6678,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
         } else {
             // to prevent files that aren't models from being loaded into world automatically
             if (filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
-                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) && (!isBlocks)) {
+                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) &&
+                (!isBlocks) && (!isZip)) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {
                 qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 8b8e76d584..e4d784f2d5 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -320,11 +320,11 @@ public slots:
     // FIXME: Move addAssetToWorld* methods to own class?
     void addAssetToWorldFromURL(QString url);
     void addAssetToWorldFromURLRequestFinished();
-    void addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks);
+    void addAssetToWorld(QString filePath, QString zipFile, bool isZip = false, bool isBlocks = false);
     void addAssetToWorldUnzipFailure(QString filePath);
-    void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isBlocks);
-    void addAssetToWorldUpload(QString filePath, QString mapping, bool isBlocks);
-    void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isBlocks);
+    void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isZip = false, bool isBlocks = false);
+    void addAssetToWorldUpload(QString filePath, QString mapping, bool isZip = false, bool isBlocks = false);
+    void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isZip = false, bool isBlocks = false);
     void addAssetToWorldAddEntity(QString filePath, QString mapping);
 
     void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip, bool isBlocks);
diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp
index 1472e53045..3bf044fd8b 100644
--- a/libraries/script-engine/src/FileScriptingInterface.cpp
+++ b/libraries/script-engine/src/FileScriptingInterface.cpp
@@ -68,6 +68,10 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool
     if (path.contains("vr.google.com/downloads")) {
         isZip = true;
     }
+    if (!hasModel(fileList)) {
+        isZip = false;
+    }
+
     emit unzipResult(path, fileList, autoAdd, isZip, isBlocks);
 
 }
@@ -107,6 +111,15 @@ bool FileScriptingInterface::isTempDir(QString tempDir) {
     return (testContainer == tempContainer);
 }
 
+bool FileScriptingInterface::hasModel(QStringList fileList) {
+    for (int i = 0; i < fileList.size(); i++) {
+        if (fileList.at(i).toLower().contains(".fbx") || fileList.at(i).toLower().contains(".obj")) {
+            return true;
+        }
+    }
+    return false;
+}
+
 QString FileScriptingInterface::getTempDir() {
     QTemporaryDir dir;
     dir.setAutoRemove(false);
diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h
index e4c27dbf7f..5cbe417130 100644
--- a/libraries/script-engine/src/FileScriptingInterface.h
+++ b/libraries/script-engine/src/FileScriptingInterface.h
@@ -32,6 +32,7 @@ signals:
 
 private:
     bool isTempDir(QString tempDir);
+    bool hasModel(QStringList fileList);
     QStringList unzipFile(QString path, QString tempDir);
     void recursiveFileScan(QFileInfo file, QString* dirName);
     void downloadZip(QString path, const QString link);

From 28589094c2b6f4b7b569ed40a3efd152f2b5cc46 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 7 Mar 2018 10:18:40 -0800
Subject: [PATCH 558/569] hopefully fixed mac/ubuntu builds

---
 interface/src/Application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9a04a9509e..7a9ce6f649 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6677,8 +6677,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
             // to prevent files that aren't models from being loaded into world automatically
-            if (filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
-                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) &&
+            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
+                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
                 (!isBlocks) && (!isZip)) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {

From 9ae2da7e4b3a3b9f2560b39602d955874a5bf934 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 7 Mar 2018 13:18:36 -0800
Subject: [PATCH 559/569] fixed logic for texture files/non-models

---
 interface/src/Application.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7a9ce6f649..7fff296323 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6676,10 +6676,10 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
-            // to prevent files that aren't models from being loaded into world automatically
-            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
-                filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
-                (!isBlocks) && (!isZip)) {
+            // to prevent files that aren't models or texture files from being loaded into world automatically
+            if (filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
+                (filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) &&
+                ((!isBlocks) && (!isZip)))) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {
                 qCDebug(interfaceapp) << "Zipped contents are not supported entity files";

From 2987c90f965ff2f92eb7d847097d4c716be85731 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 7 Mar 2018 13:48:35 -0800
Subject: [PATCH 560/569] fixed syntax for ubuntu

---
 interface/src/Application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7fff296323..429348c593 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6677,8 +6677,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
             // to prevent files that aren't models or texture files from being loaded into world automatically
-            if (filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) || 
-                (filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION) &&
+            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || 
+                ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
                 ((!isBlocks) && (!isZip)))) {
                 addAssetToWorldAddEntity(filePath, mapping);
             } else {

From a0eb7e0712373cdd87901e85f283ee56db9ad23c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 7 Mar 2018 15:01:12 -0800
Subject: [PATCH 561/569] Don't default unknown Marketplace item types to
 'Entity'

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 372fb3c774..96ffa390bf 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -147,8 +147,7 @@ Rectangle {
         } else if (root.itemHref.indexOf('.json') > -1) {
             root.itemType = "entity"; // "wearable" type handled later
         } else {
-            console.log("WARNING - Item type is UNKNOWN!");
-            root.itemType = "entity";
+            root.itemType = "unknown";
         }
     }
 

From 9681f0eb779278c7170ccbb6647cef940cbdff56 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 7 Mar 2018 18:20:26 -0800
Subject: [PATCH 562/569] restore old scale math, disable avatar collisions
 while scaling

---
 .../system/libraries/entitySelectionTool.js   | 64 +++++++++++++------
 1 file changed, 43 insertions(+), 21 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 54254f6548..53769650e2 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -272,17 +272,19 @@ SelectionDisplay = (function() {
     var STRETCH_SPHERE_OFFSET = 0.06;
     var STRETCH_SPHERE_CAMERA_DISTANCE_MULTIPLE = 0.01;
     var STRETCH_MINIMUM_DIMENSION = 0.001;
-    var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 2;
+    var STRETCH_ALL_MINIMUM_DIMENSION = 0.01;
+    var STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE = 6;
     var STRETCH_PANEL_WIDTH = 0.01;
 
     var SCALE_CUBE_OFFSET = 0.5;
     var SCALE_CUBE_CAMERA_DISTANCE_MULTIPLE = 0.015;
-    var SCALE_MINIMUM_DIMENSION = 0.02;
 
     var CLONER_OFFSET = { x:0.9, y:-0.9, z:0.9 };    
     
     var CTRL_KEY_CODE = 16777249;
 
+    var AVATAR_COLLISIONS_OPTION = "Enable Avatar Collisions";
+
     var TRANSLATE_DIRECTION = {
         X : 0,
         Y : 1,
@@ -336,6 +338,8 @@ SelectionDisplay = (function() {
 
     var ctrlPressed = false;
 
+    var handleStretchCollisionOverride = false;
+
     var handlePropertiesTranslateArrowCones = {
         shape: "Cone",
         solid: true,
@@ -597,6 +601,11 @@ SelectionDisplay = (function() {
     var activeTool = null;
     var handleTools = {};
 
+    that.shutdown = function() {
+        that.restoreAvatarCollisionsFromStretch();
+    }
+    Script.scriptEnding.connect(that.shutdown);
+
     // We get mouseMoveEvents from the handControllers, via handControllerPointer.
     // But we dont' get mousePressEvents.
     that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
@@ -1740,6 +1749,13 @@ SelectionDisplay = (function() {
         };
     };
 
+    that.restoreAvatarCollisionsFromStretch = function() {
+        if (handleStretchCollisionOverride) {
+            Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, true);
+            handleStretchCollisionOverride = false;
+        }
+    }
+
     // TOOL DEFINITION: HANDLE STRETCH TOOL   
     function makeStretchTool(stretchMode, directionEnum, directionVec, pivot, offset, stretchPanel, scaleHandle) {
         var directionFor3DStretch = directionVec;
@@ -1942,6 +1958,10 @@ SelectionDisplay = (function() {
             if (scaleHandle != null) {
                 Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
             }
+            if (Menu.isOptionChecked(AVATAR_COLLISIONS_OPTION)) {
+                Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, false);
+                handleStretchCollisionOverride = true;
+            }
         };
 
         var onEnd = function(event, reason) {    
@@ -1951,6 +1971,7 @@ SelectionDisplay = (function() {
             if (scaleHandle != null) {
                 Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE });
             }
+            that.restoreAvatarCollisionsFromStretch();
             pushCommandForSelections();
         };
 
@@ -2000,6 +2021,12 @@ SelectionDisplay = (function() {
             vector = grid.snapToSpacing(vector);
     
             var changeInDimensions = Vec3.multiply(NEGATE_VECTOR, vec3Mult(localSigns, vector));
+            if (directionEnum === STRETCH_DIRECTION.ALL) {	
+                var toCameraDistance = getDistanceToCamera(position);	
+                var dimensionsMultiple = toCameraDistance * STRETCH_DIRECTION_ALL_CAMERA_DISTANCE_MULTIPLE;	
+                changeInDimensions = Vec3.multiply(changeInDimensions, dimensionsMultiple);	
+            }
+
             var newDimensions;
             if (proportional) {
                 var absoluteX = Math.abs(changeInDimensions.x);
@@ -2022,9 +2049,11 @@ SelectionDisplay = (function() {
                 newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
             }
     
-            newDimensions.x = Math.max(newDimensions.x, STRETCH_MINIMUM_DIMENSION);
-            newDimensions.y = Math.max(newDimensions.y, STRETCH_MINIMUM_DIMENSION);
-            newDimensions.z = Math.max(newDimensions.z, STRETCH_MINIMUM_DIMENSION);
+            var minimumDimension = directionEnum === STRETCH_DIRECTION.ALL ? STRETCH_ALL_MINIMUM_DIMENSION : 
+                                                                             STRETCH_MINIMUM_DIMENSION;
+            newDimensions.x = Math.max(newDimensions.x, minimumDimension);
+            newDimensions.y = Math.max(newDimensions.y, minimumDimension);
+            newDimensions.z = Math.max(newDimensions.z, minimumDimension);
     
             var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
             if (directionEnum === STRETCH_DIRECTION.ALL) {
@@ -2081,38 +2110,31 @@ SelectionDisplay = (function() {
     function addHandleScaleTool(overlay, mode, directionEnum) {
         var directionVector, offset, selectedHandle;
         if (directionEnum === SCALE_DIRECTION.LBN) {
-            directionVector = { x:1, y:0, z:1 };
-            offset = { x:-1, y:-1, z:-1 };
+            directionVector = { x:1, y:1, z:1 };
             selectedHandle = handleScaleLBNCube;
         } else if (directionEnum === SCALE_DIRECTION.RBN) {
-            directionVector = { x:-1, y:0, z:1 };
-            offset = { x:1, y:-1, z:-1 };
+            directionVector = { x:-1, y:1, z:1 };
             selectedHandle = handleScaleRBNCube;
         } else if (directionEnum === SCALE_DIRECTION.LBF) {
-            directionVector = { x:1, y:0, z:-1 };
-            offset = { x:-1, y:-1, z:1 };
+            directionVector = { x:1, y:1, z:-1 };
             selectedHandle = handleScaleLBFCube;
         } else if (directionEnum === SCALE_DIRECTION.RBF) {
-            directionVector = { x:-1, y:0, z:-1 };
-            offset = { x:1, y:-1, z:1 };
+            directionVector = { x:-1, y:1, z:-1 };
             selectedHandle = handleScaleRBFCube;
         } else if (directionEnum === SCALE_DIRECTION.LTN) { 
-            directionVector = { x:1, y:0, z:1 };
-            offset = { x:-1, y:1, z:-1 };
+            directionVector = { x:1, y:-1, z:1 };
             selectedHandle = handleScaleLTNCube;
         } else if (directionEnum === SCALE_DIRECTION.RTN) {
-            directionVector = { x:-1, y:0, z:1 };
-            offset = { x:1, y:1, z:-1 };
+            directionVector = { x:-1, y:-1, z:1 };
             selectedHandle = handleScaleRTNCube;
         } else if (directionEnum === SCALE_DIRECTION.LTF) {
-            directionVector = { x:1, y:0, z:-1 };
-            offset = { x:-1, y:1, z:1 };
+            directionVector = { x:1, y:-1, z:-1 };
             selectedHandle = handleScaleLTFCube;
         } else if (directionEnum === SCALE_DIRECTION.RTF) {
-            directionVector = { x:-1, y:0, z:-1 };
-            offset = { x:1, y:1, z:1 };
+            directionVector = { x:-1, y:-1, z:-1 };
             selectedHandle = handleScaleRTFCube;
         }
+        offset = Vec3.multiply(directionVector, NEGATE_VECTOR);
         var tool = makeStretchTool(mode, STRETCH_DIRECTION.ALL, directionVector, 
                                    directionVector, offset, null, selectedHandle);
         return addHandleTool(overlay, tool);

From 554c37d14b5c1b25669eff2c9e9568d0e554b39f Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Wed, 7 Mar 2018 19:34:08 -0800
Subject: [PATCH 563/569] removed undefined event checks in scaling

---
 scripts/system/libraries/entitySelectionTool.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 53769650e2..fced5fc4e9 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1976,10 +1976,6 @@ SelectionDisplay = (function() {
         };
 
         var onMove = function(event) {
-            if (event.x === undefined || event.y === undefined) {
-                return;
-            }
-            
             var proportional = (spaceMode === SPACE_WORLD) || directionEnum === STRETCH_DIRECTION.ALL;
             
             var position, dimensions, rotation;

From 22f18dbf56598b3644cddd9739e8e54c59856217 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 8 Mar 2018 13:12:13 -0800
Subject: [PATCH 564/569] Don't hit certain Commerce backend endpoints when
 wallet isn't yet auth'd

---
 interface/src/commerce/Ledger.cpp | 41 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 712c505e8a..858af9b13d 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -80,9 +80,13 @@ void Ledger::signedSend(const QString& propertyName, const QByteArray& text, con
 
 void Ledger::keysQuery(const QString& endpoint, const QString& success, const QString& fail, QJsonObject& requestParams) {
     auto wallet = DependencyManager::get<Wallet>();
-    requestParams["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
-
-    send(endpoint, success, fail, QNetworkAccessManager::PostOperation, AccountManagerAuth::Required, requestParams);
+    QStringList cachedPublicKeys = wallet->listPublicKeys();
+    if (!cachedPublicKeys.isEmpty()) {
+        requestParams["public_keys"] = QJsonArray::fromStringList(cachedPublicKeys);
+        send(endpoint, success, fail, QNetworkAccessManager::PostOperation, AccountManagerAuth::Required, requestParams);
+    } else {
+        qDebug(commerce) << "User attempted to call keysQuery, but cachedPublicKeys was empty!";
+    }
 }
 
 void Ledger::keysQuery(const QString& endpoint, const QString& success, const QString& fail) {
@@ -296,14 +300,18 @@ void Ledger::updateLocation(const QString& asset_id, const QString location, con
         emit walletScriptingInterface->walletNotSetup();
         qDebug(commerce) << "User attempted to update the location of a certificate, but their wallet wasn't ready. Status:" << walletStatus;
     } else {
-        QStringList keys = wallet->listPublicKeys();
-        QString key = keys[0];
-        QJsonObject transaction;
-        transaction["certificate_id"] = asset_id;
-        transaction["place_name"] = location;
-        QJsonDocument transactionDoc{ transaction };
-        auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
-        signedSend("transaction", transactionString, key, "location", "updateLocationSuccess", "updateLocationFailure", controlledFailure);
+        QStringList cachedPublicKeys = wallet->listPublicKeys();
+        if (!cachedPublicKeys.isEmpty()) {
+            QString key = cachedPublicKeys[0];
+            QJsonObject transaction;
+            transaction["certificate_id"] = asset_id;
+            transaction["place_name"] = location;
+            QJsonDocument transactionDoc{ transaction };
+            auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
+            signedSend("transaction", transactionString, key, "location", "updateLocationSuccess", "updateLocationFailure", controlledFailure);
+        } else {
+            qDebug(commerce) << "User attempted to update the location of a certificate, but cachedPublicKeys was empty!";
+        }
     }
 }
 
@@ -359,7 +367,12 @@ void Ledger::alreadyOwned(const QString& marketplaceId) {
     auto wallet = DependencyManager::get<Wallet>();
     QString endpoint = "already_owned";
     QJsonObject request;
-    request["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
-    request["marketplace_item_id"] = marketplaceId;
-    send(endpoint, "alreadyOwnedSuccess", "alreadyOwnedFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, request);
+    QStringList cachedPublicKeys = wallet->listPublicKeys();
+    if (!cachedPublicKeys.isEmpty()) {
+        request["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
+        request["marketplace_item_id"] = marketplaceId;
+        send(endpoint, "alreadyOwnedSuccess", "alreadyOwnedFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, request);
+    } else {
+        qDebug(commerce) << "User attempted to use the alreadyOwned endpoint, but cachedPublicKeys was empty!";
+    }
 }

From 747a6b07ceeb55148edb8bdd807e01a1c19f982e Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 8 Mar 2018 11:19:49 -0800
Subject: [PATCH 565/569] Fix font loading for MacOS via different font loading
 method

---
 interface/resources/qml/CurrentAPI.qml               |  2 --
 .../resources/qml/controls-uit/CheckBoxQQC2.qml      |  4 ++--
 interface/resources/qml/controls-uit/Keyboard.qml    |  9 +++------
 interface/resources/qml/controls-uit/SpinBox.qml     |  3 +--
 interface/resources/qml/controls-uit/TextEdit.qml    |  6 +++---
 interface/resources/qml/controls-uit/TextField.qml   |  4 +---
 interface/resources/qml/controls/FontAwesome.qml     |  3 +--
 interface/resources/qml/dialogs/FileDialog.qml       |  5 +----
 interface/resources/qml/dialogs/TabletFileDialog.qml |  5 +----
 .../qml/dialogs/assetDialog/AssetDialogContent.qml   |  5 +----
 interface/resources/qml/hifi/AssetServer.qml         | 10 ++++++----
 interface/resources/qml/hifi/ComboDialog.qml         |  2 --
 .../resources/qml/hifi/DesktopLetterboxMessage.qml   |  7 +++----
 interface/resources/qml/hifi/LetterboxMessage.qml    |  7 +++----
 interface/resources/qml/hifi/NameCard.qml            |  3 +--
 interface/resources/qml/hifi/Pal.qml                 |  3 +--
 .../commerce/common/EmulatedMarketplaceHeader.qml    |  3 +--
 .../qml/hifi/commerce/wallet/sendMoney/SendMoney.qml |  5 ++---
 .../resources/qml/hifi/dialogs/TabletAssetServer.qml | 12 +++++++-----
 .../hifi/tablet/tabletWindows/TabletFileDialog.qml   |  5 +----
 .../resources/qml/styles-uit/AnonymousProRegular.qml |  3 +--
 .../resources/qml/styles-uit/FiraSansRegular.qml     |  3 +--
 .../resources/qml/styles-uit/FiraSansSemiBold.qml    |  3 +--
 interface/resources/qml/styles-uit/HiFiGlyphs.qml    |  3 +--
 interface/resources/qml/styles-uit/RalewayBold.qml   |  5 ++---
 interface/resources/qml/styles-uit/RalewayLight.qml  |  3 +--
 .../resources/qml/styles-uit/RalewayRegular.qml      |  3 +--
 .../resources/qml/styles-uit/RalewaySemiBold.qml     |  4 ++--
 interface/src/Application.cpp                        |  9 +++++++++
 29 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/interface/resources/qml/CurrentAPI.qml b/interface/resources/qml/CurrentAPI.qml
index 37984965d9..96bfb5c36b 100644
--- a/interface/resources/qml/CurrentAPI.qml
+++ b/interface/resources/qml/CurrentAPI.qml
@@ -33,8 +33,6 @@ Item {
         width: parent.width
         height: parent.height
     }
-    
-    FontLoader { id: ralewayRegular; source: pathToFonts + "fonts/Raleway-Regular.ttf"; }
 
     Timer {
         id: updateList
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
index 12b8c80003..8a9686ff5e 100644
--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@@ -109,9 +109,9 @@ CheckBox {
 
     contentItem: Text {
         id: root
-        FontLoader { id: ralewaySemiBold; source: pathToFonts + "fonts/Raleway-SemiBold.ttf"; }
         font.pixelSize: hifi.fontSizes.inputLabel
-        font.family: ralewaySemiBold.name
+        font.family: "Raleway"
+        font.weight: Font.DemiBold
         text: checkBox.text
         color: checkBox.color
         x: 2
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controls-uit/Keyboard.qml
index 76b66178d4..ea76d44aaa 100644
--- a/interface/resources/qml/controls-uit/Keyboard.qml
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
@@ -125,8 +125,7 @@ Rectangle {
         TextInput {
             id: mirrorText
             visible: showMirrorText
-            FontLoader { id: font; source: "../../fonts/FiraSans-Regular.ttf"; }
-            font.family: font.name
+            font.family: "Fira Sans"
             font.pixelSize: 20
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
@@ -165,8 +164,6 @@ Rectangle {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
 
-        FontLoader { id: hiFiGlyphs; source: pathToFonts + "fonts/hifi-glyphs.ttf"; }
-
         Column {
             id: columnAlpha
             width: keyboardWidth
@@ -250,7 +247,7 @@ Rectangle {
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
                 Key {
-                    fontFamily: hiFiGlyphs.name;
+                    fontFamily: "hifi-glyphs";
                     fontPixelSize: 48;
                     letterAnchors.topMargin: -4;
                     verticalAlignment: Text.AlignVCenter;
@@ -343,7 +340,7 @@ Rectangle {
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
                 Key {
-                    fontFamily: hiFiGlyphs.name;
+                    fontFamily: "hifi-glyphs";
                     fontPixelSize: 48;
                     letterAnchors.topMargin: -4;
                     verticalAlignment: Text.AlignVCenter;
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml
index a1237d4bc7..30f6682d5a 100644
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@@ -25,8 +25,7 @@ SpinBox {
     property color colorLabelInside: hifi.colors.white
     property real controlHeight: height + (spinBoxLabel.visible ? spinBoxLabel.height + spinBoxLabel.anchors.bottomMargin : 0)
 
-    FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-    font.family: firaSansSemiBold.name
+    font.family: "Fira Sans SemiBold"
     font.pixelSize: hifi.fontSizes.textFieldInput
     height: hifi.fontSizes.textFieldInput + 13  // Match height of TextField control.
 
diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controls-uit/TextEdit.qml
index 5ee9ce94ba..0fe03150f4 100644
--- a/interface/resources/qml/controls-uit/TextEdit.qml
+++ b/interface/resources/qml/controls-uit/TextEdit.qml
@@ -16,9 +16,9 @@ import "../styles-uit"
 TextEdit {
 
     property real size: 32
-
-    FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
-    font.family: ralewaySemiBold.name
+    
+    font.family: "Raleway"
+    font.weight: Font.DemiBold
     font.pointSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 3fc5d83129..782ab454b5 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -34,9 +34,7 @@ TextField {
 
     placeholderText: textField.placeholderText
 
-    FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
-    FontLoader { id: hifiGlyphs; source: "../../fonts/hifi-glyphs.ttf"; }
-    font.family: firaSansRegular.name
+    font.family: "Fira Sans"
     font.pixelSize: hifi.fontSizes.textFieldInput
     height: implicitHeight + 3  // Make surrounding box higher so that highlight is vertically centered.
     property alias textFieldLabel: textFieldLabel
diff --git a/interface/resources/qml/controls/FontAwesome.qml b/interface/resources/qml/controls/FontAwesome.qml
index 50d7e96fb5..2c897b6347 100644
--- a/interface/resources/qml/controls/FontAwesome.qml
+++ b/interface/resources/qml/controls/FontAwesome.qml
@@ -4,13 +4,12 @@ import QtQuick.Controls.Styles 1.3
 
 Text {
     id: root
-    FontLoader { id: iconFont; source: "../../fonts/fontawesome-webfont.ttf"; }
     property int size: 32
     width: size
     height: size
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: iconFont.name
+    font.family: "FontAwesome"
 }
 
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 0b5da8a5f5..572e7a7918 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -532,9 +532,6 @@ ModalWindow {
             itemDelegate: Item {
                 clip: true
 
-                FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
-
                 FiraSansSemiBold {
                     text: getText();
                     elide: styleData.elideMode
@@ -548,7 +545,7 @@ ModalWindow {
                     size: hifi.fontSizes.tableText
                     color: hifi.colors.baseGrayHighlight
                     font.family: (styleData.row !== -1 && fileTableView.model.get(styleData.row).fileIsDir)
-                        ? firaSansSemiBold.name : firaSansRegular.name
+                        ? "Fira Sans SemiBold" : "Fira Sans"
 
                     function getText() {
                         if (styleData.row === -1) {
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index d3b738469e..c635095ac6 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -496,9 +496,6 @@ TabletModalWindow {
             itemDelegate: Item {
                 clip: true
 
-                //FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                //FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
-
                 FiraSansSemiBold {
                     text: getText();
                     elide: styleData.elideMode
@@ -512,7 +509,7 @@ TabletModalWindow {
                     size: hifi.fontSizes.tableText
                     color: hifi.colors.baseGrayHighlight
                     //font.family: (styleData.row !== -1 && fileTableView.model.get(styleData.row).fileIsDir)
-                        //? firaSansSemiBold.name : firaSansRegular.name
+                        //? "Fira Sans SemiBold" : "Fira Sans"
 
                     function getText() {
                         if (styleData.row === -1) {
diff --git a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
index 8c0501e3b4..84f4c694ff 100644
--- a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
+++ b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
@@ -345,9 +345,6 @@ Item {
             itemDelegate: Item {
                 clip: true
 
-                FontLoader { id: firaSansSemiBold; source: "../../../fonts/FiraSans-SemiBold.ttf"; }
-                FontLoader { id: firaSansRegular; source: "../../../fonts/FiraSans-Regular.ttf"; }
-
                 FiraSansSemiBold {
                     text: styleData.value
                     elide: styleData.elideMode
@@ -361,7 +358,7 @@ Item {
                     size: hifi.fontSizes.tableText
                     color: hifi.colors.baseGrayHighlight
                     font.family: (styleData.row !== -1 && assetTableView.model.get(styleData.row).fileIsDir)
-                        ? firaSansSemiBold.name : firaSansRegular.name
+                        ? "Fira Sans SemiBold" : "Fira Sans"
                 }
             }
 
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index fea275999e..34be11d4df 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -187,9 +187,10 @@ Windows.ScrollingWindow {
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
+            var collisionless = true;
             var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
             var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
-            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, collisionless, position, gravity);
         } else {
             var SHAPE_TYPE_NONE = 0;
             var SHAPE_TYPE_SIMPLE_HULL = 1;
@@ -234,6 +235,7 @@ Windows.ScrollingWindow {
                     var result = JSON.parse(jsonResult);
                     var url = result.textInput.trim();
                     var shapeType;
+                    var collisionless = false;
                     switch (result.comboBox) {
                         case SHAPE_TYPE_SIMPLE_HULL:
                             shapeType = "simple-hull";
@@ -252,6 +254,7 @@ Windows.ScrollingWindow {
                             break;
                         default:
                             shapeType = "none";
+                            collisionless = true;
                     }
 
                     var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
@@ -273,7 +276,7 @@ Windows.ScrollingWindow {
                         print("Asset browser - adding asset " + url + " (" + name + ") to world.");
 
                         // Entities.addEntity doesn't work from QML, so we use this.
-                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, addPosition, gravity);
                     }
                 }
             });
@@ -657,8 +660,7 @@ Windows.ScrollingWindow {
 
                         text: styleData.value
 
-                        FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                        font.family: firaSansSemiBold.name
+                        font.family: "Fira Sans SemiBold"
                         font.pixelSize: hifi.fontSizes.textFieldInput
                         height: hifi.dimensions.tableRowHeight
 
diff --git a/interface/resources/qml/hifi/ComboDialog.qml b/interface/resources/qml/hifi/ComboDialog.qml
index 83fcad18c7..06254bb7fb 100644
--- a/interface/resources/qml/hifi/ComboDialog.qml
+++ b/interface/resources/qml/hifi/ComboDialog.qml
@@ -25,8 +25,6 @@ Item {
     property int dialogHeight;
     property int comboOptionTextSize: 16;
     property int comboBodyTextSize: 16;
-    FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
-    FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
     visible: false;
     id: combo;
     anchors.fill: parent;
diff --git a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
index bafa518eb9..ede8590bfb 100644
--- a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
+++ b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
@@ -24,8 +24,6 @@ Item {
     property real headerTextMargin: -5
     property real headerGlyphMargin: -15
     property bool isDesktop: false
-    FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
-    FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
     visible: false
     id: letterbox
     anchors.fill: parent
@@ -78,7 +76,8 @@ Item {
                     // Text Size
                     font.pixelSize: headerTextPixelSize
                     // Style
-                    font.family: ralewaySemiBold.name
+                    font.family: "Raleway"
+                    font.weight: Font.DemiBold
                     color: hifi.colors.darkGray
                     horizontalAlignment: Text.AlignHLeft
                     verticalAlignment: Text.AlignVCenter
@@ -101,7 +100,7 @@ Item {
                 horizontalAlignment: Text.AlignHLeft
                 // Style
                 font.pixelSize: popupTextPixelSize
-                font.family: ralewayRegular.name
+                font.family: "Raleway"
                 color: hifi.colors.darkGray
                 wrapMode: Text.WordWrap
                 textFormat: Text.StyledText
diff --git a/interface/resources/qml/hifi/LetterboxMessage.qml b/interface/resources/qml/hifi/LetterboxMessage.qml
index 7ce66adf11..0e9ce89ddb 100644
--- a/interface/resources/qml/hifi/LetterboxMessage.qml
+++ b/interface/resources/qml/hifi/LetterboxMessage.qml
@@ -23,8 +23,6 @@ Item {
     property real popupTextPixelSize: 16
     property real headerTextMargin: -5
     property real headerGlyphMargin: -15
-    FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
-    FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
     visible: false
     id: letterbox
     anchors.fill: parent
@@ -82,7 +80,8 @@ Item {
                     // Text Size
                     font.pixelSize: headerTextPixelSize
                     // Style
-                    font.family: ralewaySemiBold.name
+                    font.family: "Raleway"
+                    font.weight: Font.DemiBold
                     color: hifi.colors.darkGray
                     horizontalAlignment: Text.AlignHLeft
                     verticalAlignment: Text.AlignVCenter
@@ -127,7 +126,7 @@ Item {
                 horizontalAlignment: Text.AlignHLeft
                 // Style
                 font.pixelSize: popupTextPixelSize
-                font.family: ralewayRegular.name
+                font.family: "Raleway"
                 color: hifi.colors.darkGray
                 wrapMode: Text.WordWrap
                 textFormat: Text.StyledText
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index e08fdc53ff..c97a802f10 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -177,8 +177,7 @@ Item {
             anchors.right: parent.right
             anchors.rightMargin: editGlyph.width + editGlyph.anchors.rightMargin
             // Style
-            FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-            font.family: firaSansSemiBold.name
+            font.family: "Fira Sans SemiBold"
             font.pixelSize: displayNameTextPixelSize
             selectionColor: hifi.colors.blueAccent
             selectedTextColor: "black"
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 8fb27714ee..d779b4ba42 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -908,7 +908,6 @@ Rectangle {
                 anchors.horizontalCenter: parent.horizontalCenter;
             }
 
-            FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
             Text {
                 id: connectionHelpText;
                 // Anchors
@@ -923,7 +922,7 @@ Rectangle {
                 horizontalAlignment: Text.AlignHLeft
                 // Style
                 font.pixelSize: 18;
-                font.family: ralewayRegular.name
+                font.family: "Raleway"
                 color: hifi.colors.darkGray
                 wrapMode: Text.WordWrap
                 textFormat: Text.StyledText;
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index eb8159a4e7..8a7e809b3d 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -141,10 +141,9 @@ Item {
                 }
             }
 
-            FontLoader { id: ralewayRegular; source: "../../../../fonts/Raleway-Regular.ttf"; }
             TextMetrics {
                 id: textMetrics;
-                font.family: ralewayRegular.name
+                font.family: "Raleway"
                 text: usernameText.text;
             }
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
index f5b7f42a3f..d0aa89923f 100644
--- a/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
@@ -924,14 +924,13 @@ Item {
             anchors.right: parent.right;
             anchors.rightMargin: 20;
             height: 95;
-                
-            FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; }
+
             TextArea {
                 id: optionalMessage;
                 property int maximumLength: 72;
                 property string previousText: text;
                 placeholderText: "<i>Optional Public Message (" + maximumLength + " character limit)</i>";
-                font.family: firaSansSemiBold.name;
+                font.family: "Fira Sans SemiBold";
                 font.pixelSize: 20;
                 // Anchors
                 anchors.fill: parent;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 19297a3251..a85e5d4498 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -144,7 +144,7 @@ Rectangle {
     }
 
     function canAddToWorld(path) {
-        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
         
         if (selectedItemCount > 1) {
             return false;
@@ -188,9 +188,10 @@ Rectangle {
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
+            var collisionless = true;
             var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
             var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
-            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, collisionless, position, gravity);
         } else {
             var SHAPE_TYPE_NONE = 0;
             var SHAPE_TYPE_SIMPLE_HULL = 1;
@@ -235,6 +236,7 @@ Rectangle {
                     var result = JSON.parse(jsonResult);
                     var url = result.textInput.trim();
                     var shapeType;
+                    var collisionless = false;
                     switch (result.comboBox) {
                         case SHAPE_TYPE_SIMPLE_HULL:
                             shapeType = "simple-hull";
@@ -253,6 +255,7 @@ Rectangle {
                             break;
                         default:
                             shapeType = "none";
+                            collisionless = true;
                     }
 
                     var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
@@ -274,7 +277,7 @@ Rectangle {
                         print("Asset browser - adding asset " + url + " (" + name + ") to world.");
 
                         // Entities.addEntity doesn't work from QML, so we use this.
-                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, addPosition, gravity);
                     }
                 }
             });
@@ -656,8 +659,7 @@ Rectangle {
 
                         text: styleData.value
 
-                        FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                        font.family: firaSansSemiBold.name
+                        font.family: "Fira Sans SemiBold"
                         font.pixelSize: hifi.fontSizes.textFieldInput
                         height: hifi.dimensions.tableRowHeight
 
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
index 7b91cfeba9..08b0104fce 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
@@ -478,9 +478,6 @@ Rectangle {
             itemDelegate: Item {
                 clip: true
 
-                //FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                //FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
-
                 FiraSansSemiBold {
                     text: getText();
                     elide: styleData.elideMode
@@ -494,7 +491,7 @@ Rectangle {
                     size: hifi.fontSizes.tableText
                     color: hifi.colors.baseGrayHighlight
                     //font.family: (styleData.row !== -1 && fileTableView.model.get(styleData.row).fileIsDir)
-                        //? firaSansSemiBold.name : firaSansRegular.name
+                        //? "Fira Sans SemiBold" : "Fira Sans"
 
                     function getText() {
                         if (styleData.row === -1) {
diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
index 789689973b..d7e13423b6 100644
--- a/interface/resources/qml/styles-uit/AnonymousProRegular.qml
+++ b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
@@ -14,10 +14,9 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: anonymousProRegular; source: "../../fonts/AnonymousPro-Regular.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: anonymousProRegular.name
+    font.family: "Anonymous Pro"
 }
diff --git a/interface/resources/qml/styles-uit/FiraSansRegular.qml b/interface/resources/qml/styles-uit/FiraSansRegular.qml
index 4ae0826772..1166fa5cba 100644
--- a/interface/resources/qml/styles-uit/FiraSansRegular.qml
+++ b/interface/resources/qml/styles-uit/FiraSansRegular.qml
@@ -14,10 +14,9 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: firaSansRegular; source: "../../fonts/FiraSans-Regular.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: firaSansRegular.name
+    font.family: "Fira Sans"
 }
diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
index b3f3324090..2f095c57a6 100644
--- a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
+++ b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
@@ -14,10 +14,9 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: firaSansSemiBold; source: pathToFonts + "fonts/FiraSans-SemiBold.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: firaSansSemiBold.name
+    font.family: "Fira Sans SemiBold"
 }
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
index f78d6c6f59..07f0212f0c 100644
--- a/interface/resources/qml/styles-uit/HiFiGlyphs.qml
+++ b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
@@ -12,12 +12,11 @@ import QtQuick 2.5
 
 Text {
     id: root
-    FontLoader { id: hiFiGlyphs; source: pathToFonts + "fonts/hifi-glyphs.ttf"; }
     property int size: 32
     font.pixelSize: size
     width: size
     height: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: hiFiGlyphs.name
+    font.family: "hifi-glyphs"
 }
diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/styles-uit/RalewayBold.qml
index 433fdb7ae6..5f42ecd90b 100644
--- a/interface/resources/qml/styles-uit/RalewayBold.qml
+++ b/interface/resources/qml/styles-uit/RalewayBold.qml
@@ -14,11 +14,10 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: ralewayBold; source: pathToFonts + "fonts/Raleway-Bold.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: ralewayBold.name
-    font.bold: true  // Font seems to need this in order to display bold.
+    font.family: "Raleway"
+    font.bold: true
 }
diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/styles-uit/RalewayLight.qml
index 913918afd7..e6b12fca9c 100644
--- a/interface/resources/qml/styles-uit/RalewayLight.qml
+++ b/interface/resources/qml/styles-uit/RalewayLight.qml
@@ -14,10 +14,9 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: ralewayLight; source: "../../fonts/Raleway-Light.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: ralewayLight.name
+    font.family: "Raleway Light"
 }
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/styles-uit/RalewayRegular.qml
index aab31ecf33..5c9b87dc8a 100644
--- a/interface/resources/qml/styles-uit/RalewayRegular.qml
+++ b/interface/resources/qml/styles-uit/RalewayRegular.qml
@@ -14,10 +14,9 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: ralewayRegular; source: pathToFonts + "fonts/Raleway-Regular.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: ralewayRegular.name
+    font.family: "Raleway"
 }
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
index b6c79e02a4..0b25f900bc 100644
--- a/interface/resources/qml/styles-uit/RalewaySemiBold.qml
+++ b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
@@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
-    FontLoader { id: ralewaySemiBold; source: pathToFonts + "fonts/Raleway-SemiBold.ttf"; }
     property real size: 32
     font.pixelSize: size
     verticalAlignment: Text.AlignVCenter
     horizontalAlignment: Text.AlignLeft
-    font.family: ralewaySemiBold.name
+    font.family: "Raleway"
+    font.weight: Font.DemiBold
 }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 429348c593..15f772b02a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -978,6 +978,15 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     qInstallMessageHandler(messageHandler);
 
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
+    QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/hifi-glyphs.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/AnonymousPro-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/FiraSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/FiraSans-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/Raleway-Light.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/Raleway-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/Raleway-Bold.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/Raleway-SemiBold.ttf");
     _window->setWindowTitle("High Fidelity Interface");
 
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us

From ec6f66ee521631525f00c31931be64c313d24898 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 8 Mar 2018 13:51:34 -0800
Subject: [PATCH 566/569] Try this

---
 interface/src/Application.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 15f772b02a..a25c9e43cb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -978,15 +978,15 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     qInstallMessageHandler(messageHandler);
 
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
-    QFontDatabase::addApplicationFont(":/fonts/fontawesome-webfont.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/hifi-glyphs.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/AnonymousPro-Regular.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/FiraSans-Regular.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/FiraSans-SemiBold.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Raleway-Light.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Raleway-Regular.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Raleway-Bold.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Raleway-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/fontawesome-webfont.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/hifi-glyphs.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/AnonymousPro-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Light.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
     _window->setWindowTitle("High Fidelity Interface");
 
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us

From 883528488cde5c3acc41c23a2c289065a70aa121 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Thu, 8 Mar 2018 14:24:44 -0800
Subject: [PATCH 567/569] clear wallet when picking a new one

---
 .../qml/hifi/commerce/wallet/Wallet.qml       |  3 ++-
 interface/src/commerce/QmlCommerce.cpp        |  5 ++++
 interface/src/commerce/QmlCommerce.h          |  1 +
 interface/src/commerce/Wallet.cpp             | 24 +++++++++++--------
 interface/src/commerce/Wallet.h               |  3 ++-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 952390a7a4..1d5f749598 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -174,11 +174,12 @@ Rectangle {
     WalletChoice {
         id: walletChoice;
         proceedFunction: function (isReset) {
-            console.log(isReset ? "Reset wallet." : "Trying again with new wallet.");
+            console.log("WalletChoice", isReset ? "Reset wallet." : "Trying again with new wallet.");
             Commerce.setSoftReset();
             if (isReset) {
                 walletResetSetup();
             } else {
+                Commerce.clearWallet();
                 var msg = { referrer: walletChoice.referrer }
                 followReferrer(msg);
             }
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 557193c074..53ec59049f 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -138,6 +138,11 @@ void QmlCommerce::setSoftReset() {
     wallet->setSoftReset();
 }
 
+void QmlCommerce::clearWallet() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->clear();
+}
+
 void QmlCommerce::setPassphrase(const QString& passphrase) {
     auto wallet = DependencyManager::get<Wallet>();
     wallet->setPassphrase(passphrase);
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 6a4eaa2be2..b4af4393e3 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -67,6 +67,7 @@ protected:
     Q_INVOKABLE void setPassphrase(const QString& passphrase);
     Q_INVOKABLE void changePassphrase(const QString& oldPassphrase, const QString& newPassphrase);
     Q_INVOKABLE void setSoftReset();
+    Q_INVOKABLE void clearWallet();
 
     Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
     Q_INVOKABLE void balance();
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index fad82115d6..060f8de09b 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -343,19 +343,23 @@ Wallet::Wallet() {
     auto accountManager = DependencyManager::get<AccountManager>();
     connect(accountManager.data(), &AccountManager::usernameChanged, this, [&]() {
         getWalletStatus();
-        _publicKeys.clear();
-
-        if (_securityImage) {
-            delete _securityImage;
-        }
-        _securityImage = nullptr;
-
-        // tell the provider we got nothing
-        updateImageProvider();
-        _passphrase->clear();
+        clear();
     });
 }
 
+void Wallet::clear() {
+    _publicKeys.clear();
+
+    if (_securityImage) {
+        delete _securityImage;
+    }
+    _securityImage = nullptr;
+
+    // tell the provider we got nothing
+    updateImageProvider();
+    _passphrase->clear();
+}
+
 Wallet::~Wallet() {
     if (_securityImage) {
         delete _securityImage;
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index d771f404e5..8a7d6b8c07 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -49,8 +49,9 @@ public:
     bool getPassphraseIsCached() { return !(_passphrase->isEmpty()); }
     bool walletIsAuthenticatedWithPassphrase();
     bool changePassphrase(const QString& newPassphrase);
-    void setSoftReset() { _isOverridingServer = true;  }
+    void setSoftReset() { _isOverridingServer = true; }
     bool wasSoftReset() { bool was = _isOverridingServer; _isOverridingServer = false; return was; }
+    void clear();
 
     void getWalletStatus();
     enum WalletStatus {

From c22d79041db348344ec3b16c3e9703410394ea29 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 8 Mar 2018 14:35:56 -0800
Subject: [PATCH 568/569] Cleanup after cherry-pick

---
 interface/resources/qml/hifi/AssetServer.qml             | 7 ++-----
 .../resources/qml/hifi/dialogs/TabletAssetServer.qml     | 9 +++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 34be11d4df..7a9e0707c1 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -187,10 +187,9 @@ Windows.ScrollingWindow {
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
-            var collisionless = true;
             var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
             var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
-            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, collisionless, position, gravity);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
         } else {
             var SHAPE_TYPE_NONE = 0;
             var SHAPE_TYPE_SIMPLE_HULL = 1;
@@ -235,7 +234,6 @@ Windows.ScrollingWindow {
                     var result = JSON.parse(jsonResult);
                     var url = result.textInput.trim();
                     var shapeType;
-                    var collisionless = false;
                     switch (result.comboBox) {
                         case SHAPE_TYPE_SIMPLE_HULL:
                             shapeType = "simple-hull";
@@ -254,7 +252,6 @@ Windows.ScrollingWindow {
                             break;
                         default:
                             shapeType = "none";
-                            collisionless = true;
                     }
 
                     var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
@@ -276,7 +273,7 @@ Windows.ScrollingWindow {
                         print("Asset browser - adding asset " + url + " (" + name + ") to world.");
 
                         // Entities.addEntity doesn't work from QML, so we use this.
-                        Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, addPosition, gravity);
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
                     }
                 }
             });
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index a85e5d4498..a61241ff7c 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -144,7 +144,7 @@ Rectangle {
     }
 
     function canAddToWorld(path) {
-        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i, /\.jpg\b/i, /\.png\b/i];
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
         
         if (selectedItemCount > 1) {
             return false;
@@ -188,10 +188,9 @@ Rectangle {
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
-            var collisionless = true;
             var position = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
             var gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0);
-            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, collisionless, position, gravity);
+            Entities.addModelEntity(name, modelURL, textures, shapeType, dynamic, position, gravity);
         } else {
             var SHAPE_TYPE_NONE = 0;
             var SHAPE_TYPE_SIMPLE_HULL = 1;
@@ -236,7 +235,6 @@ Rectangle {
                     var result = JSON.parse(jsonResult);
                     var url = result.textInput.trim();
                     var shapeType;
-                    var collisionless = false;
                     switch (result.comboBox) {
                         case SHAPE_TYPE_SIMPLE_HULL:
                             shapeType = "simple-hull";
@@ -255,7 +253,6 @@ Rectangle {
                             break;
                         default:
                             shapeType = "none";
-                            collisionless = true;
                     }
 
                     var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
@@ -277,7 +274,7 @@ Rectangle {
                         print("Asset browser - adding asset " + url + " (" + name + ") to world.");
 
                         // Entities.addEntity doesn't work from QML, so we use this.
-                        Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, addPosition, gravity);
+                        Entities.addModelEntity(name, url, "", shapeType, dynamic, addPosition, gravity);
                     }
                 }
             });

From b427d6c326222ac8e7057b68c994ac368d79a20a Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Thu, 8 Mar 2018 23:07:12 +0300
Subject: [PATCH 569/569] FB12956 - Audio Meter Toggle Button Broken

---
 .../qml/{AvatarInputs.qml => AvatarInputsBar.qml}          | 6 +++---
 interface/src/Application.cpp                              | 7 ++++++-
 interface/src/ui/AvatarInputs.cpp                          | 7 ++-----
 interface/src/ui/AvatarInputs.h                            | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)
 rename interface/resources/qml/{AvatarInputs.qml => AvatarInputsBar.qml} (88%)

diff --git a/interface/resources/qml/AvatarInputs.qml b/interface/resources/qml/AvatarInputsBar.qml
similarity index 88%
rename from interface/resources/qml/AvatarInputs.qml
rename to interface/resources/qml/AvatarInputsBar.qml
index be4bf03465..a88a42080e 100644
--- a/interface/resources/qml/AvatarInputs.qml
+++ b/interface/resources/qml/AvatarInputsBar.qml
@@ -14,9 +14,9 @@ import Qt.labs.settings 1.0
 
 import "./hifi/audio" as HifiAudio
 
-Hifi.AvatarInputs {
+Item {
     id: root;
-    objectName: "AvatarInputs"
+    objectName: "AvatarInputsBar"
     property int modality: Qt.NonModal
     width: audio.width;
     height: audio.height;
@@ -26,7 +26,7 @@ Hifi.AvatarInputs {
 
     HifiAudio.MicBar {
         id: audio;
-        visible: root.showAudioTools;
+        visible: AvatarInputs.showAudioTools;
         standalone: true;
 	    dragTarget: parent;
     }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 429348c593..8fd43c95a6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2716,7 +2716,12 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
 
 void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
     Stats::show();
-    AvatarInputs::show();
+    auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
+    surfaceContext->setContextProperty("Stats", Stats::getInstance());
+
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
+    offscreenUi->show(qml, "AvatarInputsBar");
 }
 
 void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
diff --git a/interface/src/ui/AvatarInputs.cpp b/interface/src/ui/AvatarInputs.cpp
index fe79bec6ef..3053cb8855 100644
--- a/interface/src/ui/AvatarInputs.cpp
+++ b/interface/src/ui/AvatarInputs.cpp
@@ -16,22 +16,19 @@
 #include "Application.h"
 #include "Menu.h"
 
-HIFI_QML_DEF(AvatarInputs)
-
 static AvatarInputs* INSTANCE{ nullptr };
 
 Setting::Handle<bool> showAudioToolsSetting { QStringList { "AvatarInputs", "showAudioTools" }, false };
 
 AvatarInputs* AvatarInputs::getInstance() {
     if (!INSTANCE) {
-        AvatarInputs::registerType();
+        INSTANCE = new AvatarInputs();
         Q_ASSERT(INSTANCE);
     }
     return INSTANCE;
 }
 
-AvatarInputs::AvatarInputs(QQuickItem* parent) :  QQuickItem(parent) {
-    INSTANCE = this;
+AvatarInputs::AvatarInputs(QObject* parent) : QObject(parent) {
     _showAudioTools = showAudioToolsSetting.get();
 }
 
diff --git a/interface/src/ui/AvatarInputs.h b/interface/src/ui/AvatarInputs.h
index fb48df9d73..47f520a639 100644
--- a/interface/src/ui/AvatarInputs.h
+++ b/interface/src/ui/AvatarInputs.h
@@ -19,7 +19,7 @@ public: \
 private: \
     type _##name{ initialValue };
 
-class AvatarInputs : public QQuickItem {
+class AvatarInputs : public QObject {
     Q_OBJECT
     HIFI_QML_DECL
 
@@ -32,7 +32,7 @@ class AvatarInputs : public QQuickItem {
 public:
     static AvatarInputs* getInstance();
     Q_INVOKABLE float loudnessToAudioLevel(float loudness);
-    AvatarInputs(QQuickItem* parent = nullptr);
+    AvatarInputs(QObject* parent = nullptr);
     void update();
     bool showAudioTools() const   { return _showAudioTools; }