Merge remote-tracking branch 'upstream/master' into animSplineIK

android/build_android.sh

@@ -3,7 +3,7 @@ set -xeuo pipefail
 ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
 
 # This is the actual output from gradle, which no longer attempts to muck with the naming of the APK
-OUTPUT_APK=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_DIR}/${ANDROID_APP}-${ANDROID_BUILD_DIR}.apk
+OUTPUT_APK=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_DIR}/${ANDROID_BUILT_APK_NAME}
 # This is the APK name requested by Jenkins
 TARGET_APK=./${ANDROID_APK_NAME}
 # Make sure this matches up with the new ARTIFACT_EXPRESSION for jenkins builds, which should be "android/*.apk"

android/containerized_build.sh

@@ -16,6 +16,7 @@ docker run \
    -e RELEASE_NUMBER \
    -e RELEASE_TYPE \
    -e ANDROID_APP \
+   -e ANDROID_BUILT_APK_NAME \
    -e ANDROID_APK_NAME \
    -e ANDROID_BUILD_TARGET \
    -e ANDROID_BUILD_DIR \

assignment-client/CMakeLists.txt

@@ -14,7 +14,7 @@ link_hifi_libraries(
   audio avatars octree gpu graphics shaders fbx hfm entities
   networking animation recording shared script-engine embedded-webserver
   controllers physics plugins midi image
-  model-networking ktx shaders
+  material-networking model-networking ktx shaders
 )
 
 add_dependencies(${TARGET_NAME} oven)

assignment-client/src/octree/OctreeSendThread.cpp

@@ -324,12 +324,6 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
     if (isFullScene) {
         // we're forcing a full scene, clear the force in OctreeQueryNode so we don't force it next time again
         nodeData->setShouldForceFullScene(false);
-    } else {
-        // we aren't forcing a full scene, check if something else suggests we should
-        isFullScene = nodeData->haveJSONParametersChanged() ||
-                      (nodeData->hasConicalViews() &&
-                       (nodeData->getViewFrustumJustStoppedChanging() ||
-                        nodeData->hasLodChanged()));
     }
 
     if (nodeData->isPacketWaiting()) {

interface/CMakeLists.txt

@@ -205,8 +205,8 @@ endif()
 # link required hifi libraries
 link_hifi_libraries(
   shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
-  pointers
-  recording hfm fbx networking model-networking model-baker entities avatars trackers
+  pointers recording hfm fbx networking material-networking
+  model-networking model-baker entities avatars trackers
   audio audio-client animation script-engine physics
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers

interface/resources/qml/dialogs/MessageDialog.qml

@@ -75,7 +75,7 @@ ModalWindow {
 
         QtObject {
             id: d
-            readonly property int minWidth: 480
+            readonly property int minWidth: 1100
             readonly property int maxWidth: 1280
             readonly property int minHeight: 120
             readonly property int maxHeight: 720
@@ -95,6 +95,7 @@ ModalWindow {
             id: mainTextContainer
             onTextChanged: d.resize();
             wrapMode: Text.WordWrap
+            width: messageBox.width
             size: hifi.fontSizes.menuItem
             color: hifi.colors.baseGrayHighlight
             anchors {

interface/resources/qml/hifi/avatarPackager/AvatarDoctorDiagnose.qml

@@ -0,0 +1,127 @@
+import QtQuick 2.0
+
+import "../../controlsUit" 1.0 as HifiControls
+import "../../stylesUit" 1.0
+
+Item {
+    id: root
+
+    visible: false
+
+    property var avatarDoctor: null
+    property var errors: []
+
+    property int minimumDiagnoseTimeMS: 1000
+
+    signal doneDiagnosing
+
+    onVisibleChanged: {
+        if (root.avatarDoctor !== null) {
+            root.avatarDoctor.complete.disconnect(_private.avatarDoctorComplete);
+            root.avatarDoctor = null;
+        }
+        if (doneTimer.running) {
+            doneTimer.stop();
+        }
+
+        if (!root.visible) {
+            return;
+        }
+
+        root.avatarDoctor = AvatarPackagerCore.currentAvatarProject.diagnose();
+        root.avatarDoctor.complete.connect(this, _private.avatarDoctorComplete);
+        _private.startTime = Date.now();
+        root.avatarDoctor.startDiagnosing();
+    }
+
+    QtObject {
+        id: _private
+        property real startTime: 0
+
+        function avatarDoctorComplete(errors) {
+            if (!root.visible) {
+                return;
+            }
+
+            console.warn("avatarDoctor.complete " + JSON.stringify(errors));
+            root.errors = errors;
+            AvatarPackagerCore.currentAvatarProject.hasErrors = errors.length > 0;
+            AvatarPackagerCore.addCurrentProjectToRecentProjects();
+
+            let timeSpendDiagnosingMS = Date.now() - _private.startTime;
+            let timeLeftMS = root.minimumDiagnoseTimeMS - timeSpendDiagnosingMS;
+            doneTimer.interval = timeLeftMS < 0 ? 0 : timeLeftMS;
+            doneTimer.start();
+        }
+    }
+
+    Timer {
+        id: doneTimer
+        repeat: false
+        running: false
+        onTriggered: {
+            doneDiagnosing();
+        }
+    }
+
+    property var footer: Item {
+        anchors.fill: parent
+        anchors.rightMargin: 17
+        HifiControls.Button {
+            id: cancelButton
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            height: 30
+            width: 133
+            text: qsTr("Cancel")
+            onClicked: {
+                avatarPackager.state = AvatarPackagerState.main;
+            }
+        }
+    }
+
+    LoadingCircle {
+        id: loadingCircle
+        anchors {
+            top: parent.top
+            topMargin: 46
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: 163
+        height: 163
+    }
+
+    RalewayRegular {
+        id: testingPackageTitle
+
+        anchors {
+            horizontalCenter:  parent.horizontalCenter
+            top: loadingCircle.bottom
+            topMargin: 5
+        }
+
+        text: "Testing package for errors"
+        size: 28
+        color: "white"
+    }
+
+    RalewayRegular {
+        id: testingPackageText
+
+        anchors {
+            top: testingPackageTitle.bottom
+            topMargin: 26
+            left: parent.left
+            leftMargin: 21
+            right: parent.right
+            rightMargin: 16
+        }
+
+        text: "We are trying to find errors in your project so you can quickly understand and resolve them."
+        size: 21
+        color: "white"
+        lineHeight: 33
+        lineHeightMode: Text.FixedHeight
+        wrapMode: Text.Wrap
+    }
+}

interface/resources/qml/hifi/avatarPackager/AvatarDoctorErrorReport.qml

@@ -0,0 +1,104 @@
+import QtQuick 2.0
+
+import "../../controlsUit" 1.0 as HifiControls
+import "../../stylesUit" 1.0
+
+Item {
+    id: errorReport
+
+    visible: false
+
+    property alias errors: errorRepeater.model
+
+    property var footer: Item {
+        anchors.fill: parent
+        anchors.rightMargin: 17
+        HifiControls.Button {
+            id: tryAgainButton
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: continueButton.left
+            anchors.rightMargin: 22
+            height: 40
+            width: 134
+            text: qsTr("Try Again")
+            onClicked: {
+                avatarPackager.state = AvatarPackagerState.avatarDoctorDiagnose;
+            }
+        }
+
+        HifiControls.Button {
+            id: continueButton
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            height: 40
+            width: 133
+            text: qsTr("Continue")
+            color: hifi.buttons.blue
+            colorScheme: root.colorScheme
+            onClicked: {
+                avatarPackager.state = AvatarPackagerState.project;
+            }
+        }
+    }
+
+    HiFiGlyphs {
+        id: errorReportIcon
+        text: hifi.glyphs.alert
+        size: 315
+        color: "#EA4C5F"
+        anchors {
+            top: parent.top
+            topMargin: -20
+            horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            top: errorReportIcon.bottom
+            topMargin: -40
+            leftMargin: 13
+            rightMargin: 13
+        }
+        spacing: 7
+
+        Repeater {
+            id: errorRepeater
+            Item {
+                height: 37
+                width: parent.width
+
+                HiFiGlyphs {
+                    id: errorIcon
+                    text: hifi.glyphs.alert
+                    size: 56
+                    color: "#EA4C5F"
+                    anchors {
+                        top: parent.top
+                        left: parent.left
+                        leftMargin: -5
+                    }
+                }
+
+                RalewayRegular {
+                    id: errorLink
+                    anchors {
+                        top: parent.top
+                        topMargin: 5
+                        left: errorIcon.right
+                        right: parent.right
+                    }
+                    color: "#00B4EF"
+                    linkColor: "#00B4EF"
+                    size: 28
+                    text: "<a href='javascript:void'>" + modelData.message + "</a>"
+                    onLinkActivated: Qt.openUrlExternally(modelData.url)
+                    elide: Text.ElideRight
+                }
+            }
+        }
+    }
+}

interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml

@@ -143,6 +143,18 @@ Item {
                 PropertyChanges { target: createAvatarProject; visible: true }
                 PropertyChanges { target: avatarPackagerFooter; content: createAvatarProject.footer }
             },
+            State {
+                name: AvatarPackagerState.avatarDoctorDiagnose
+                PropertyChanges { target: avatarPackagerHeader; title: AvatarPackagerCore.currentAvatarProject.name }
+                PropertyChanges { target: avatarDoctorDiagnose; visible: true }
+                PropertyChanges { target: avatarPackagerFooter; content: avatarDoctorDiagnose.footer }
+            },
+            State {
+                name: AvatarPackagerState.avatarDoctorErrorReport
+                PropertyChanges { target: avatarPackagerHeader; title: AvatarPackagerCore.currentAvatarProject.name }
+                PropertyChanges { target: avatarDoctorErrorReport; visible: true }
+                PropertyChanges { target: avatarPackagerFooter; content: avatarDoctorErrorReport.footer }
+            },
             State {
                 name: AvatarPackagerState.project
                 PropertyChanges { target: avatarPackagerHeader; title: AvatarPackagerCore.currentAvatarProject.name; canRename: true }
@@ -168,7 +180,7 @@ Item {
                 return status;
             }
             avatarProject.reset();
-            avatarPackager.state = AvatarPackagerState.project;
+            avatarPackager.state = AvatarPackagerState.avatarDoctorDiagnose;
             return status;
         }
 
@@ -242,6 +254,23 @@ Item {
                 color: "#404040"
             }
 
+            AvatarDoctorDiagnose {
+                id: avatarDoctorDiagnose
+                anchors.fill: parent
+                onErrorsChanged: {
+                    avatarDoctorErrorReport.errors = avatarDoctorDiagnose.errors;
+                }
+                onDoneDiagnosing: {
+                    avatarPackager.state = avatarDoctorDiagnose.errors.length > 0 ? AvatarPackagerState.avatarDoctorErrorReport
+                                                                                  : AvatarPackagerState.project;
+                }
+            }
+
+            AvatarDoctorErrorReport {
+                id: avatarDoctorErrorReport
+                anchors.fill: parent
+            }
+
             AvatarProject {
                 id: avatarProject
                 colorScheme: root.colorScheme
@@ -383,6 +412,7 @@ Item {
                                 title: modelData.name
                                 path: modelData.projectPath
                                 onOpen: avatarPackager.openProject(modelData.path)
+                                hasError: modelData.hadErrors
                             }
                         }
                     }

interface/resources/qml/hifi/avatarPackager/AvatarPackagerState.qml

@@ -7,4 +7,6 @@ Item {
     readonly property string project: "project"
     readonly property string createProject: "createProject"
     readonly property string projectUpload: "projectUpload"
+    readonly property string avatarDoctorDiagnose: "avatarDoctorDiagnose"
+    readonly property string avatarDoctorErrorReport: "avatarDoctorErrorReport"
 }

interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml

@@ -12,6 +12,7 @@ Item {
 
     property alias title: title.text
     property alias path: path.text
+    property alias hasError: errorIcon.visible
 
     property color textColor: "#E3E3E3"
     property color hoverTextColor: "#121212"
@@ -54,7 +55,7 @@ Item {
 
         RalewayBold {
             id: title
-            elide: "ElideRight"
+            elide: Text.ElideRight
             anchors {
                 top: parent.top
                 topMargin: 13
@@ -76,12 +77,24 @@ Item {
                 right: background.right
                 rightMargin: 16
             }
-            elide: "ElideLeft"
+            elide: Text.ElideLeft
             horizontalAlignment: Text.AlignRight
             text: "<path missing>"
             size: 20
         }
 
+        HiFiGlyphs {
+            id: errorIcon
+            visible: false
+            text: hifi.glyphs.alert
+            size: 56
+            color: "#EA4C5F"
+            anchors {
+                top: parent.top
+                right: parent.right
+            }
+        }
+
         MouseArea {
             id: mouseArea
             anchors.fill: parent

interface/resources/qml/hifi/avatarPackager/CreateAvatarProject.qml

@@ -32,7 +32,7 @@ Item {
                     return;
                 }
                 avatarProject.reset();
-                avatarPackager.state = AvatarPackagerState.project;
+                avatarPackager.state = AvatarPackagerState.avatarDoctorDiagnose;
             }
         }
     }

interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml

@@ -31,8 +31,9 @@ Rectangle {
     id: root
 
     property string activeView: "initialize"
-    property int currentSortIndex: 0
+    property int currentSortIndex: 1
     property string sortString: "recent"
+    property bool isAscending: false
     property string categoryString: ""
     property string searchString: ""
     property bool keyboardEnabled: HMD.active
@@ -316,23 +317,28 @@ Rectangle {
                 font.pixelSize: hifi.fontSizes.textFieldInput
                 placeholderText: "Search Marketplace"
 
+                Timer {
+                    id: keypressTimer
+                    running: false
+                    repeat: false
+                    interval: 300
+                    onTriggered: searchField.accepted()
+
+                }
+
                 // workaround for https://bugreports.qt.io/browse/QTBUG-49297
                 Keys.onPressed: {
                     switch (event.key) {
                         case Qt.Key_Return: 
                         case Qt.Key_Enter: 
                             event.accepted = true;
+                            searchField.text = "";
 
-                            // emit accepted signal manually
-                            if (acceptableInput) {
-                                searchField.accepted();
-                                searchField.forceActiveFocus();
-                            }
+                            getMarketplaceItems();
+                            searchField.forceActiveFocus();
                         break;
-                        case Qt.Key_Backspace:
-                            if (searchField.text === "") {
-                                primaryFilter_index = -1;
-                            }
+                        default:
+                            keypressTimer.restart();
                         break;
                     }
                 }
@@ -498,6 +504,7 @@ Rectangle {
                     "",
                     "",
                     root.sortString,
+                    root.isAscending,
                     WalletScriptingInterface.limitedCommerce,
                     marketBrowseModel.currentPageToRetrieve,
                     marketBrowseModel.itemsPerPage
@@ -726,7 +733,7 @@ Rectangle {
                             top: parent.top
                             leftMargin: 20
                         }
-                        width: root.isLoggedIn ? 322 : 242
+                        width: root.isLoggedIn ? 342 : 262
                         height: 36
 
                         radius: 4
@@ -737,27 +744,27 @@ Rectangle {
                             id: sortModel
 
                             ListElement {
-                                name: "Name";
-                                glyph: ";"
+                                name: "Name"
                                 sortString: "alpha"
+                                ascending: true
                             }
 
                             ListElement {
-                                name: "Date";
-                                glyph: ";";
-                                sortString: "recent";
+                                name: "Date"
+                                sortString: "recent"
+                                ascending: false
                             }
 
                             ListElement {
-                                name: "Popular";
-                                glyph: ";";
-                                sortString: "likes";
+                                name: "Popular"
+                                sortString: "likes"
+                                ascending: false
                             }
 
                             ListElement {
-                                name: "My Likes";
-                                glyph: ";";
-                                sortString: "my_likes";
+                                name: "My Likes"
+                                sortString: "my_likes"
+                                ascending: false
                             }
                         }
                     
@@ -783,10 +790,10 @@ Rectangle {
                             currentIndex: 1;
                             
                             delegate: SortButton {
-                                width: 80
+                                width: 85
                                 height: parent.height
 
-                                glyph: model.glyph
+                                ascending: model.ascending
                                 text: model.name
                                 
                                 visible: root.isLoggedIn || model.sortString != "my_likes"
@@ -794,6 +801,12 @@ Rectangle {
                                 checked: ListView.isCurrentItem
 
                                 onClicked: {
+                                    if(root.currentSortIndex == index) {
+                                        ascending = !ascending;
+                                    } else {
+                                        ascending = model.ascending;
+                                    }
+                                    root.isAscending = ascending;
                                     root.currentSortIndex = index;
                                     sortListView.positionViewAtIndex(index, ListView.Beginning);
                                     sortListView.currentIndex = index;
@@ -802,7 +815,7 @@ Rectangle {
                                 }                            
                             }
                             highlight: Rectangle {
-                                width: 80
+                                width: 85
                                 height: parent.height
 
                                 color: hifi.colors.faintGray
@@ -1125,6 +1138,8 @@ Rectangle {
                 fill: parent
             }
 
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+
             RalewayRegular {
                 id: licenseText
 

interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml

@@ -520,7 +520,7 @@ Rectangle {
                         } else if (root.license === "Attribution-NonCommercial-NoDerivs (CC BY-NC-ND)") {
                           url = "https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.txt"
                         } else if (root.license === "Proof of Provenance License (PoP License)") {
-                          url = "https://digitalassetregistry.com/PoP-License/v1/"
+                          url = "licenses/Popv1.txt"
                         }
                         if(url) {
                             showLicense(url)

interface/resources/qml/hifi/commerce/marketplace/SortButton.qml

@@ -28,58 +28,60 @@ Item {
     
     id: root;
     
+    property string ascGlyph: "\u2193"
+    property string descGlyph: "\u2191"
+    property string text: ""
+    property bool ascending: false
+    property bool checked: false
+    signal clicked()
     
-    property string glyph: "";
-    property string text: "";
-    property bool checked: false;
-    signal clicked();
-    
-    width: childrenRect.width;
-    height: parent.height;
+    width: childrenRect.width
+    height: parent.height
 
     Rectangle {
-        anchors.top: parent.top;
-        anchors.left: parent.left;
-        height: parent.height;
-        width: 2;
-        color: hifi.colors.faintGray;
-        visible: index > 0;
+        anchors.top: parent.top
+        anchors.left: parent.left
+        height: parent.height
+        width: 2
+        color: hifi.colors.faintGray
+        visible: index > 0
     }
     
-    HiFiGlyphs {
-        id: buttonGlyph;
-        text: root.glyph;
+    RalewayRegular {
+        id: buttonGlyph
+        text: root.ascending ? root.ascGlyph : root.descGlyph
         // Size
-        size: 14;
+        size: 14
         // Anchors
-        anchors.left: parent.left;
-        anchors.leftMargin: 0;
-        anchors.top: parent.top;
-        anchors.verticalCenter: parent.verticalCenter;
-        height: parent.height;
-        horizontalAlignment: Text.AlignHCenter;
+        anchors.left: parent.left
+        anchors.leftMargin: 10
+        anchors.top: parent.top
+        anchors.topMargin: 6
+        anchors.bottom: parent.bottom
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignTop
         // Style
-        color: hifi.colors.lightGray;
+        color: hifi.colors.lightGray
     }
     RalewayRegular {
-        id: buttonText;
-        text: root.text;
+        id: buttonText
+        text: root.text
         // Text size
-        size: 14;
+        size: 14
         // Style
-        color: hifi.colors.lightGray;
-        elide: Text.ElideRight;
-        horizontalAlignment: Text.AlignHCenter;
-        verticalAlignment: Text.AlignVCenter;
+        color: hifi.colors.lightGray
+        elide: Text.ElideRight
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
         // Anchors
-        anchors.left: parent.left;
-        anchors.leftMargin: 20;
-        anchors.top: parent.top;
-        height: parent.height;
+        anchors.left: buttonGlyph.right
+        anchors.leftMargin: 5
+        anchors.top: parent.top
+        height: parent.height
     }
     MouseArea {
-        anchors.fill: parent;
-        hoverEnabled: enabled;
+        anchors.fill: parent
+        hoverEnabled: enabled
         onClicked: {
             root.clicked();
         }

interface/resources/qml/hifi/commerce/marketplace/licenses/Popv1.txt

@@ -0,0 +1,12 @@
+
+<h2>Proof of Provenance License (PoP License) v1.0</h2>
+<br>
+<p>
+  Subject to the terms and conditions of this license, the Copyright Holder grants a worldwide, non-exclusive, non-sublicensable, non-transferable (except by transfer of the Certificate or beneficial ownership thereof) license (i) to the Certificate Holder to display ONE COPY of the Item at a time across any and all virtual worlds WITHOUT MODIFICATION; (ii) to any party to view and interact with the Item as displayed by the Certificate Holder. Redistributions of source code must retain the all copyright notices.  Notwithstanding the foregoing, modification of the Item may be permitted pursuant to terms provided in the Certificate.
+</p>
+<p>
+  THE ITEM IS PROVIDED BY THE COPYRIGHT HOLDER 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 HOLDER OR A CONTRIBUTOR 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 ITEM, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+<p><i>
+  Reference to the “Certificate” means the Proof of Provenance Certificate containing a hash of the code used to generate the Item;  ‘Item’ means the visual representation produced by the execution of the code hashed in the Certificate (which term includes the code itself); and “Certificate Holder” means a single holder of the private key for the Certificate.
+</i></p>

interface/src/AboutUtil.h

@@ -16,15 +16,23 @@
 #include <QObject>
 
 /**jsdoc
+ * The <code>HifiAbout</code> API provides information about the version of Interface that is currently running. It also 
+ * provides the ability to open a Web page in an Interface browser window.
+ *
  * @namespace HifiAbout
  *
  * @hifi-interface
  * @hifi-client-entity
  * @hifi-avatar
  *
- * @property {string} buildDate
- * @property {string} buildVersion
- * @property {string} qtVersion
+ * @property {string} buildDate - The build date of Interface that is currently running. <em>Read-only.</em>
+ * @property {string} buildVersion - The build version of Interface that is currently running. <em>Read-only.</em>
+ * @property {string} qtVersion - The Qt version used in Interface that is currently running. <em>Read-only.</em>
+ *
+ * @example <caption>Report build information for the version of Interface currently running.</caption>
+ * print("HiFi build date: " + HifiAbout.buildDate);  // 11 Feb 2019
+ * print("HiFi version: " + HifiAbout.buildVersion);  // 0.78.0
+ * print("Qt version: " + HifiAbout.qtVersion);  // 5.10.1
  */
 
 class AboutUtil : public QObject {
@@ -44,8 +52,9 @@ public:
 public slots:
 
     /**jsdoc
+     * Display a Web page in an Interface browser window.
      * @function HifiAbout.openUrl
-     * @param {string} url
+     * @param {string} url - The URL of the Web page to display.
      */
     void openUrl(const QString &url) const;
 private:

interface/src/Application.cpp

@@ -102,7 +102,7 @@
 #include <MessagesClient.h>
 #include <hfm/ModelFormatRegistry.h>
 #include <model-networking/ModelCacheScriptingInterface.h>
-#include <model-networking/TextureCacheScriptingInterface.h>
+#include <material-networking/TextureCacheScriptingInterface.h>
 #include <ModelEntityItem.h>
 #include <NetworkAccessManager.h>
 #include <NetworkingConstants.h>
@@ -154,7 +154,7 @@
 #include <RenderableEntityItem.h>
 #include <RenderableTextEntityItem.h>
 #include <RenderableWebEntityItem.h>
-#include <model-networking/MaterialCache.h>
+#include <material-networking/MaterialCache.h>
 #include "recording/ClipCache.h"
 
 #include "AudioClient.h"
@@ -6988,17 +6988,19 @@ void Application::nodeActivated(SharedNodePointer node) {
 
 #if !defined(DISABLE_QML)
         auto offscreenUi = getOffscreenUI();
-        auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
 
-        if (assetDialog) {
+        if (offscreenUi) {
             auto nodeList = DependencyManager::get<NodeList>();
 
             if (nodeList->getThisNodeCanWriteAssets()) {
                 // call reload on the shown asset browser dialog to get the mappings (if permissions allow)
-                QMetaObject::invokeMethod(assetDialog, "reload");
+                auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
+                if (assetDialog) {
+                    QMetaObject::invokeMethod(assetDialog, "reload");
+                }
             } else {
                 // we switched to an Asset Server that we can't modify, hide the Asset Browser
-                assetDialog->setVisible(false);
+                offscreenUi->hide("AssetServer");
             }
         }
 #endif

interface/src/avatar/AvatarDoctor.cpp

@@ -0,0 +1,196 @@
+//
+//  AvatarDoctor.cpp
+//
+//
+//  Created by Thijs Wenker on 2/12/2019.
+//  Copyright 2019 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 "AvatarDoctor.h"
+#include <model-networking/ModelCache.h>
+#include <AvatarConstants.h>
+#include <ResourceManager.h>
+
+
+AvatarDoctor::AvatarDoctor(QUrl avatarFSTFileUrl) :
+    _avatarFSTFileUrl(avatarFSTFileUrl) {
+
+    connect(this, &AvatarDoctor::complete, this, [this](QVariantList errors) {
+        _isDiagnosing = false;
+    });
+}
+
+void AvatarDoctor::startDiagnosing() {
+    if (_isDiagnosing) {
+        // One diagnose at a time for now
+        return;
+    }
+    _isDiagnosing = true;
+    
+    _errors.clear();
+
+    _externalTextureCount = 0;
+    _checkedTextureCount = 0;
+    _missingTextureCount = 0;
+    _unsupportedTextureCount = 0;
+
+    const auto resource = DependencyManager::get<ModelCache>()->getGeometryResource(_avatarFSTFileUrl);
+    resource->refresh();
+    const QUrl DEFAULT_URL = QUrl("https://docs.highfidelity.com/create/avatars/create-avatars.html#create-your-own-avatar");
+    const auto resourceLoaded = [this, resource, DEFAULT_URL](bool success) {
+        // MODEL
+        if (!success) {
+            _errors.push_back({ "Model file cannot be opened", DEFAULT_URL });
+            emit complete(getErrors());
+            return;
+        }
+        const auto model = resource.data();
+        const auto avatarModel = resource.data()->getHFMModel();
+        if (!avatarModel.originalURL.endsWith(".fbx")) {
+            _errors.push_back({ "Unsupported avatar model format", DEFAULT_URL });
+            emit complete(getErrors());
+            return;
+        }
+
+        // RIG
+        if (avatarModel.joints.isEmpty()) {
+            _errors.push_back({ "Avatar has no rig", DEFAULT_URL });
+        } else {
+            if (avatarModel.joints.length() > 256) {
+                _errors.push_back({ "Avatar has over 256 bones", DEFAULT_URL });
+            }
+            // Avatar does not have Hips bone mapped	
+            if (!avatarModel.getJointNames().contains("Hips")) {
+                _errors.push_back({ "Hips are not mapped", DEFAULT_URL });
+            }
+            if (!avatarModel.getJointNames().contains("Spine")) {
+                _errors.push_back({ "Spine is not mapped", DEFAULT_URL });
+            }
+            if (!avatarModel.getJointNames().contains("Head")) {
+                _errors.push_back({ "Head is not mapped", DEFAULT_URL });
+            }
+        }
+
+        // SCALE
+        const float RECOMMENDED_MIN_HEIGHT = DEFAULT_AVATAR_HEIGHT * 0.25f;
+        const float RECOMMENDED_MAX_HEIGHT = DEFAULT_AVATAR_HEIGHT * 1.5f;
+        
+        const float avatarHeight = avatarModel.bindExtents.largestDimension();
+        if (avatarHeight < RECOMMENDED_MIN_HEIGHT) {
+            _errors.push_back({ "Avatar is possibly too small.", DEFAULT_URL });
+        } else if (avatarHeight > RECOMMENDED_MAX_HEIGHT) {
+            _errors.push_back({ "Avatar is possibly too large.", DEFAULT_URL });
+        }
+
+        // TEXTURES
+        QStringList externalTextures{};
+        QSet<QString> textureNames{};
+        auto addTextureToList = [&externalTextures](hfm::Texture texture) mutable {
+            if (!texture.filename.isEmpty() && texture.content.isEmpty() && !externalTextures.contains(texture.name)) {
+                externalTextures << texture.name;
+            }
+        };
+        
+        foreach(const HFMMaterial material, avatarModel.materials) {
+            addTextureToList(material.normalTexture);
+            addTextureToList(material.albedoTexture);
+            addTextureToList(material.opacityTexture);
+            addTextureToList(material.glossTexture);
+            addTextureToList(material.roughnessTexture);
+            addTextureToList(material.specularTexture);
+            addTextureToList(material.metallicTexture);
+            addTextureToList(material.emissiveTexture);
+            addTextureToList(material.occlusionTexture);
+            addTextureToList(material.scatteringTexture);
+            addTextureToList(material.lightmapTexture);
+        }
+
+        if (!externalTextures.empty()) {
+            // Check External Textures:
+            auto modelTexturesURLs = model->getTextures();
+            _externalTextureCount = externalTextures.length();
+            foreach(const QString textureKey, externalTextures) {
+                if (!modelTexturesURLs.contains(textureKey)) {
+                    _missingTextureCount++;
+                    _checkedTextureCount++;
+                    continue;
+                }
+
+                const QUrl textureURL = modelTexturesURLs[textureKey].toUrl();
+
+                auto textureResource = DependencyManager::get<TextureCache>()->getTexture(textureURL);
+                auto checkTextureLoadingComplete = [this, DEFAULT_URL] () mutable {
+                    qDebug() << "checkTextureLoadingComplete" << _checkedTextureCount << "/" << _externalTextureCount;
+
+                    if (_checkedTextureCount == _externalTextureCount) {
+                        if (_missingTextureCount > 0) {
+                            _errors.push_back({ tr("Missing %n texture(s).","", _missingTextureCount), DEFAULT_URL });
+                        }
+                        if (_unsupportedTextureCount > 0) {
+                            _errors.push_back({ tr("%n unsupported texture(s) found.", "", _unsupportedTextureCount), DEFAULT_URL });
+                        }
+                        emit complete(getErrors());
+                    }
+                };
+
+                auto textureLoaded = [this, textureResource, checkTextureLoadingComplete] (bool success) mutable {
+                    if (!success) {
+                        auto normalizedURL = DependencyManager::get<ResourceManager>()->normalizeURL(textureResource->getURL());
+                        if (normalizedURL.isLocalFile()) {
+                            QFile textureFile(normalizedURL.toLocalFile());
+                            if (textureFile.exists()) {
+                                _unsupportedTextureCount++;
+                            } else {
+                                _missingTextureCount++;
+                            }
+                        } else {
+                            _missingTextureCount++;
+                        }
+                    }
+                    _checkedTextureCount++;
+                    checkTextureLoadingComplete();
+                };
+
+                if (textureResource) {
+                    textureResource->refresh();
+                    if (textureResource->isLoaded()) {
+                        textureLoaded(!textureResource->isFailed());
+                    } else {
+                        connect(textureResource.data(), &NetworkTexture::finished, this, textureLoaded);
+                    }
+                } else {
+                    _missingTextureCount++;
+                    _checkedTextureCount++;
+                    checkTextureLoadingComplete();
+                }
+            }
+        } else {
+            emit complete(getErrors());
+        }
+    };
+
+    if (resource) {
+        if (resource->isLoaded()) {
+            resourceLoaded(!resource->isFailed());
+        } else {
+            connect(resource.data(), &GeometryResource::finished, this, resourceLoaded);
+        }
+    } else {
+        _errors.push_back({ "Model file cannot be opened", DEFAULT_URL });
+        emit complete(getErrors());
+    }    
+}
+
+QVariantList AvatarDoctor::getErrors() const {
+    QVariantList result;
+    for (const auto& error : _errors) {
+        QVariantMap errorVariant;
+        errorVariant.insert("message", error.message);
+        errorVariant.insert("url", error.url);
+        result.append(errorVariant);
+    }
+    return result;
+}

interface/src/avatar/AvatarDoctor.h

@@ -0,0 +1,51 @@
+//
+//  AvatarDoctor.h
+//
+//
+//  Created by Thijs Wenker on 02/12/2019.
+//  Copyright 2019 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_AvatarDoctor_h
+#define hifi_AvatarDoctor_h
+
+#include <QUrl>
+#include <QVector>
+#include <QVariantMap>
+
+struct AvatarDiagnosticResult {
+    QString message;
+    QUrl url;
+};
+Q_DECLARE_METATYPE(AvatarDiagnosticResult)
+Q_DECLARE_METATYPE(QVector<AvatarDiagnosticResult>)
+
+class AvatarDoctor : public QObject {
+    Q_OBJECT
+public:
+    AvatarDoctor(QUrl avatarFSTFileUrl);
+
+    Q_INVOKABLE void startDiagnosing();
+
+    Q_INVOKABLE QVariantList getErrors() const;
+
+signals:
+    void complete(QVariantList errors);
+
+private:
+    QUrl _avatarFSTFileUrl;
+    QVector<AvatarDiagnosticResult> _errors;
+
+    int _externalTextureCount = 0;
+    int _checkedTextureCount = 0;
+    int _missingTextureCount = 0;
+    int _unsupportedTextureCount = 0;
+
+    bool _isDiagnosing = false;
+};
+
+#endif  // hifi_AvatarDoctor_h

interface/src/avatar/AvatarPackager.cpp

@@ -31,6 +31,7 @@ AvatarPackager::AvatarPackager() {
         qmlRegisterType<MarketplaceItemUploader>();
         qRegisterMetaType<AvatarPackager*>();
         qRegisterMetaType<AvatarProject*>();
+        qRegisterMetaType<AvatarDoctor*>();
         qRegisterMetaType<AvatarProjectStatus::AvatarProjectStatus>();
         qmlRegisterUncreatableMetaObject(
             AvatarProjectStatus::staticMetaObject,
@@ -84,7 +85,7 @@ void AvatarPackager::addCurrentProjectToRecentProjects() {
         _recentProjects.removeOne(removeProject);
     }
 
-    const auto newRecentProject = RecentAvatarProject(_currentAvatarProject->getProjectName(), fstPath);
+    const auto newRecentProject = RecentAvatarProject(_currentAvatarProject->getProjectName(), fstPath, _currentAvatarProject->getHasErrors());
     _recentProjects.prepend(newRecentProject);
 
     while (_recentProjects.size() > MAX_RECENT_PROJECTS) {
@@ -101,6 +102,7 @@ QVariantList AvatarPackager::recentProjectsToVariantList(bool includeProjectPath
         QVariantMap projectVariant;
         projectVariant.insert("name", project.getProjectName());
         projectVariant.insert("path", project.getProjectFSTPath());
+        projectVariant.insert("hadErrors", project.getHadErrors());
         if (includeProjectPaths) {
             projectVariant.insert("projectPath", project.getProjectPath());
         }
@@ -113,7 +115,10 @@ void AvatarPackager::recentProjectsFromVariantList(QVariantList projectsVariant)
     _recentProjects.clear();
     for (const auto& projectVariant : projectsVariant) {
         auto map = projectVariant.toMap();
-        _recentProjects.append(RecentAvatarProject(map.value("name").toString(), map.value("path").toString()));
+        _recentProjects.append(RecentAvatarProject(
+            map.value("name").toString(),
+            map.value("path").toString(),
+            map.value("hadErrors", false).toBool()));
     }
 }
 

interface/src/avatar/AvatarPackager.h

@@ -26,19 +26,23 @@ public:
     RecentAvatarProject() = default;
     
 
-    RecentAvatarProject(QString projectName, QString projectFSTPath) {
+    RecentAvatarProject(QString projectName, QString projectFSTPath, bool hadErrors) {
         _projectName = projectName;
         _projectFSTPath = projectFSTPath;
+        _hadErrors = hadErrors;
     }
     RecentAvatarProject(const RecentAvatarProject& other) {
         _projectName = other._projectName;
         _projectFSTPath = other._projectFSTPath;
+        _hadErrors = other._hadErrors;
     }
 
     QString getProjectName() const { return _projectName; }
 
     QString getProjectFSTPath() const { return _projectFSTPath; }
 
+    bool getHadErrors() const { return _hadErrors; }
+
     QString getProjectPath() const {
         return QFileInfo(_projectFSTPath).absoluteDir().absolutePath();
     }
@@ -50,6 +54,7 @@ public:
 private:
     QString _projectName;
     QString _projectFSTPath;
+    bool _hadErrors;
 
 };
 
@@ -73,6 +78,8 @@ public:
         return AvatarProject::isValidNewProjectName(projectPath, projectName);
     }
 
+    Q_INVOKABLE void addCurrentProjectToRecentProjects();
+
 signals:
     void avatarProjectChanged();
     void recentProjectsChanged();
@@ -84,8 +91,6 @@ private:
 
     void setAvatarProject(AvatarProject* avatarProject);
 
-    void addCurrentProjectToRecentProjects();
-
     AvatarProject* _currentAvatarProject { nullptr };
     QVector<RecentAvatarProject> _recentProjects;
 

interface/src/avatar/AvatarProject.cpp

@@ -243,6 +243,10 @@ MarketplaceItemUploader* AvatarProject::upload(bool updateExisting) {
     return uploader;
 }
 
+AvatarDoctor* AvatarProject::diagnose() {
+    return new AvatarDoctor(QUrl(getFSTPath()));
+}
+
 void AvatarProject::openInInventory() const {
     constexpr int TIME_TO_WAIT_FOR_INVENTORY_TO_OPEN_MS { 1000 };
 

interface/src/avatar/AvatarProject.h

@@ -14,6 +14,7 @@
 #define hifi_AvatarProject_h
 
 #include "MarketplaceItemUploader.h"
+#include "AvatarDoctor.h"
 #include "ProjectFile.h"
 #include "FST.h"
 
@@ -53,11 +54,14 @@ class AvatarProject : public QObject {
     Q_PROPERTY(QString projectFSTPath READ getFSTPath CONSTANT)
     Q_PROPERTY(QString projectFBXPath READ getFBXPath CONSTANT)
     Q_PROPERTY(QString name READ getProjectName WRITE setProjectName NOTIFY nameChanged)
+    Q_PROPERTY(bool hasErrors READ getHasErrors WRITE setHasErrors NOTIFY hasErrorsChanged)
 
 public:
     Q_INVOKABLE MarketplaceItemUploader* upload(bool updateExisting);
     Q_INVOKABLE void openInInventory() const;
     Q_INVOKABLE QStringList getProjectFiles() const;
+    Q_INVOKABLE AvatarDoctor* diagnose();
+
 
     Q_INVOKABLE QString getProjectName() const { return _fst->getName(); }
     Q_INVOKABLE void setProjectName(const QString& newProjectName) {
@@ -72,6 +76,8 @@ public:
     Q_INVOKABLE QString getFBXPath() const {
         return QDir::cleanPath(QDir(_projectPath).absoluteFilePath(_fst->getModelPath()));
     }
+    Q_INVOKABLE bool getHasErrors() const { return _hasErrors; }
+    Q_INVOKABLE void setHasErrors(bool hasErrors) { _hasErrors = hasErrors; }
 
     /**
      * returns the AvatarProject or a nullptr on failure.
@@ -92,6 +98,7 @@ public:
 signals:
     void nameChanged();
     void projectFilesChanged();
+    void hasErrorsChanged();
 
 private:
     AvatarProject(const QString& fstPath, const QByteArray& data);
@@ -110,6 +117,8 @@ private:
     QDir _directory;
     QList<ProjectFilePath> _projectFiles{};
     QString _projectPath;
+
+    bool _hasErrors { false };
 };
 
 #endif  // hifi_AvatarProject_h

interface/src/commerce/QmlMarketplace.cpp

@@ -50,9 +50,10 @@ void QmlMarketplace::getMarketplaceItems(
     const QString& adminFilter,
     const QString& adminFilterCost,
     const QString& sort,
-    const bool isFree,
-    const int& page,
-    const int& perPage) {
+    bool isAscending,
+    bool isFree,
+    int page,
+    int perPage) {
 
     QString endpoint = "items";
     QUrlQuery request;
@@ -62,6 +63,7 @@ void QmlMarketplace::getMarketplaceItems(
     request.addQueryItem("adminFilter", adminFilter);
     request.addQueryItem("adminFilterCost", adminFilterCost);
     request.addQueryItem("sort", sort);
+    request.addQueryItem("sort_dir", isAscending ? "asc" : "desc");
     if (isFree) {
         request.addQueryItem("isFree", "true");
     }

interface/src/commerce/QmlMarketplace.h

@@ -46,9 +46,10 @@ protected:
         const QString& adminFilter = QString("published"),
         const QString& adminFilterCost = QString(),
         const QString& sort = QString(),
-        const bool isFree = false,
-        const int& page = 1,
-        const int& perPage = 20);
+        bool isAscending = false,
+        bool isFree = false,
+        int page = 1,
+        int perPage = 20);
     Q_INVOKABLE void getMarketplaceItem(const QString& marketplaceItemId);
     Q_INVOKABLE void marketplaceItemLike(const QString& marketplaceItemId, const bool like = true);
     Q_INVOKABLE void getMarketplaceCategories();

interface/src/commerce/Wallet.h

@@ -54,6 +54,29 @@ public:
     void clear();
 
     void getWalletStatus();
+    
+    /**jsdoc
+     * <p>A <code>WalletStatus</code> may have one of the following values:</p>
+     * <table>
+     *   <thead>
+     *     <tr><th>Value</th><th>Meaning</th><th>Description</th></tr>
+     *   </thead>
+     *   <tbody>
+     *     <tr><td><code>0</code></td><td>Not logged in</td><td>The user isn't logged in.</td></tr>
+     *     <tr><td><code>1</code></td><td>Not set up</td><td>The user's wallet isn't set up.</td></tr>
+     *     <tr><td><code>2</code></td><td>Pre-existing</td><td>There is a wallet present on the server but not one 
+     *       locally.</td></tr>
+     *     <tr><td><code>3</code></td><td>Conflicting</td><td>There is a wallet present on the server plus one present locally, 
+     *       and they don't match.</td></tr>
+     *     <tr><td><code>4</code></td><td>Not authenticated</td><td>There is a wallet present locally but the user hasn't 
+     *       logged into it.</td></tr>
+     *     <tr><td><code>5</code></td><td>Ready</td><td>The wallet is ready for use.</td></tr>
+     *   </tbody>
+     * </table>
+     * <p>Wallets used to be stored locally but now they're stored on the server, unless the computer once had a wallet stored
+     * locally in which case the wallet may be present in both places.</p>
+     * @typedef {number} WalletScriptingInterface.WalletStatus
+     */
     enum WalletStatus {
         WALLET_STATUS_NOT_LOGGED_IN = 0,
         WALLET_STATUS_NOT_SET_UP,

interface/src/scripting/AccountServicesScriptingInterface.cpp

@@ -112,6 +112,12 @@ DownloadInfoResult::DownloadInfoResult() :
 {
 }
 
+/**jsdoc
+ * Information on the assets currently being downloaded and pending download.
+ * @typedef {object} AccountServices.DownloadInfoResult
+ * @property {number[]} downloading - The percentage complete for each asset currently being downloaded.
+ * @property {number} pending - The number of assets waiting to be download.
+ */
 QScriptValue DownloadInfoResultToScriptValue(QScriptEngine* engine, const DownloadInfoResult& result) {
     QScriptValue object = engine->newObject();
 

interface/src/scripting/AccountServicesScriptingInterface.h

@@ -38,17 +38,25 @@ class AccountServicesScriptingInterface : public QObject {
     Q_OBJECT
 
     /**jsdoc
-     * The AccountServices API contains helper functions related to user connectivity
+     * The <code>AccountServices</code> API provides functions related to user connectivity, visibility, and asset download 
+     * progress.
      * 
      * @hifi-interface
      * @hifi-client-entity
      * @hifi-avatar
      *
      * @namespace AccountServices
-     * @property {string} username <em>Read-only.</em>
-     * @property {boolean} loggedIn <em>Read-only.</em>
-     * @property {string} findableBy
-     * @property {string} metaverseServerURL <em>Read-only.</em>
+     * @property {string} username - The user name if the user is logged in, otherwise <code>"Unknown user"</code>.
+     *     <em>Read-only.</em>
+     * @property {boolean} loggedIn - <code>true</code> if the user is logged in, otherwise <code>false</code>. 
+     *     <em>Read-only.</em>
+     * @property {string} findableBy - The user's visibility to other people:<br />
+     *     <code>"none"</code> - user appears offline.<br />
+     *     <code>"friends"</code> - user is visible only to friends.<br />
+     *     <code>"connections"</code> - user is visible to friends and connections.<br />
+     *     <code>"all"</code> - user is visible to everyone.
+     * @property {string} metaverseServerURL - The metaverse server that the user is authenticated against when logged in 
+     *     &mdash; typically <code>"https://metaverse.highfidelity.com"</code>. <em>Read-only.</em>
      */
 
     Q_PROPERTY(QString username READ getUsername NOTIFY myUsernameChanged)
@@ -66,29 +74,38 @@ public:
 public slots:
 
     /**jsdoc
+     * Get information on the progress of downloading assets in the domain.
      * @function AccountServices.getDownloadInfo
-     * @returns {DownloadInfoResult}
+     * @returns {AccountServices.DownloadInfoResult} Information on the progress of assets download.
      */
     DownloadInfoResult getDownloadInfo();
 
     /**jsdoc
+     * Cause a {@link AccountServices.downloadInfoChanged|downloadInfoChanged} signal to be triggered with information on the 
+     * current progress of the download of assets in the domain.
      * @function AccountServices.updateDownloadInfo
      */
     void updateDownloadInfo();
 
     /**jsdoc
+     * Check whether the user is logged in.
      * @function AccountServices.isLoggedIn
-     * @returns {boolean}
+     * @returns {boolean} <code>true</code> if the user is logged in, <code>false</code> otherwise.
+     * @example <caption>Report whether you are logged in.</caption>
+     * var isLoggedIn = AccountServices.isLoggedIn();
+     * print("You are logged in: " + isLoggedIn);  // true or false
      */
     bool isLoggedIn();
 
     /**jsdoc
+     * Prompts the user to log in (the login dialog is displayed) if they're not already logged in.
      * @function AccountServices.checkAndSignalForAccessToken
-     * @returns {boolean}
+     * @returns {boolean} <code>true</code> if the user is already logged in, <code>false</code> otherwise.
      */
     bool checkAndSignalForAccessToken();
 
     /**jsdoc
+     * Logs the user out.
      * @function AccountServices.logOut
      */
     void logOut();
@@ -106,43 +123,75 @@ private slots:
 signals:
 
     /**jsdoc
+     * Not currently used.
      * @function AccountServices.connected
      * @returns {Signal}
      */
     void connected();
 
     /**jsdoc
+     * Triggered when the user logs out.
      * @function AccountServices.disconnected
-     * @param {string} reason
+     * @param {string} reason - Has the value, <code>"logout"</code>.
      * @returns {Signal}
      */
     void disconnected(const QString& reason);
 
     /**jsdoc
+     * Triggered when the username logged in with changes, i.e., when the user logs in or out.
      * @function AccountServices.myUsernameChanged
-     * @param {string} username
+     * @param {string} username - The username logged in with if the user is logged in, otherwise <code>""</code>.
      * @returns {Signal}
+     * @example <caption>Report when your username changes.</caption>
+     * AccountServices.myUsernameChanged.connect(function (username) {
+     *     print("Username changed: " + username);
+     * });
      */
     void myUsernameChanged(const QString& username);
 
     /**jsdoc
+     * Triggered when the progress of the download of assets for the domain changes.
      * @function AccountServices.downloadInfoChanged
-     * @param {} info
+     * @param {AccountServices.DownloadInfoResult} downloadInfo - Information on the progress of assets download.
      * @returns {Signal}
      */
     void downloadInfoChanged(DownloadInfoResult info);
 
     /**jsdoc
+     * Triggered when the user's visibility to others changes.
      * @function AccountServices.findableByChanged
-     * @param {string} discoverabilityMode
+     * @param {string} findableBy - The user's visibility to other people:<br />
+     *     <code>"none"</code> - user appears offline.<br />
+     *     <code>"friends"</code> - user is visible only to friends.<br />
+     *     <code>"connections"</code> - user is visible to friends and connections.<br />
+     *     <code>"all"</code> - user is visible to everyone.
      * @returns {Signal}
+     * @example <caption>Report when your visiblity changes.</caption>
+     * AccountServices.findableByChanged.connect(function (findableBy) {
+     *     print("Findable by changed: " + findableBy);
+     * });
+     * 
+     * var originalFindableBy = AccountServices.findableBy;
+     * Script.setTimeout(function () {
+     *     // Change visiblity.
+     *     AccountServices.findableBy = originalFindableBy === "none" ? "all" : "none";
+     * }, 2000);
+     * Script.setTimeout(function () {
+     *     // Restore original visibility.
+     *     AccountServices.findableBy = originalFindableBy;
+     * }, 4000);
      */
     void findableByChanged(const QString& discoverabilityMode);
 
     /**jsdoc
+     * Triggered when the login status of the user changes.
      * @function AccountServices.loggedInChanged
-     * @param {boolean} loggedIn
+     * @param {boolean} loggedIn - <code>true</code> if the user is logged in, otherwise <code>false</code>.
      * @returns {Signal}
+     * @example <caption>Report when your login status changes.</caption>
+     * AccountServices.loggedInChanged.connect(function(loggedIn) {
+     *     print("Logged in: " + loggedIn);
+     * });
      */
     void loggedInChanged(bool loggedIn);
 

interface/src/scripting/WalletScriptingInterface.h

@@ -1,4 +1,4 @@
-
+//
 //  WalletScriptingInterface.h
 //  interface/src/scripting
 //
@@ -30,14 +30,19 @@ public:
 };
 
 /**jsdoc
- * @namespace Wallet
+ * The <code>WalletScriptingInterface</code> API provides functions related to the user's wallet and verification of certified 
+ * avatar entities.
+ *
+ * @namespace WalletScriptingInterface
  *
  * @hifi-interface
  * @hifi-client-entity
  * @hifi-avatar
  *
- * @property {number} walletStatus
- * @property {bool} limitedCommerce
+ * @property {WalletScriptingInterface.WalletStatus} walletStatus - The status of the user's wallet. <em>Read-only.</em>
+ * @property {boolean} limitedCommerce - <code>true</code> if Interface is running in limited commerce mode. In limited commerce 
+ *     mode, certain Interface functionality is disabled, e.g., users can't buy non-free items from the Marketplace. The Oculus 
+ *     Store version of Interface runs in limited commerce mode. <em>Read-only.</em>
  */
 class WalletScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
@@ -50,19 +55,56 @@ public:
     WalletScriptingInterface();
 
     /**jsdoc
+     * Check and update the user's wallet status.
      * @function WalletScriptingInterface.refreshWalletStatus
      */
     Q_INVOKABLE void refreshWalletStatus();
 
     /**jsdoc
+     * Get the current status of the user's wallet.
      * @function WalletScriptingInterface.getWalletStatus
-     * @returns {number}
+     * @returns {WalletScriptingInterface.WalletStatus}
+     * @example <caption>Two ways to report your wallet status.</caption>
+     * print("Wallet status: " + WalletScriptingInterface.walletStatus);  // Same value as next line.
+     * print("Wallet status: " + WalletScriptingInterface.getWalletStatus());
      */
     Q_INVOKABLE uint getWalletStatus() { return _walletStatus; }
 
     /**jsdoc
+     * Check that a certified avatar entity is owned by the avatar whose entity it is. The result of the check is provided via 
+     * the {@link WalletScriptingInterface.ownershipVerificationSuccess|ownershipVerificationSuccess} and 
+     * {@link WalletScriptingInterface.ownershipVerificationFailed|ownershipVerificationFailed} signals.<br />
+     * <strong>Warning:</strong> Neither of these signals fire if the entity is not an avatar entity or it's not a certified 
+     * entity.
      * @function WalletScriptingInterface.proveAvatarEntityOwnershipVerification
-     * @param {Uuid} entityID
+     * @param {Uuid} entityID - The ID of the avatar entity to check.
+     * @example <caption>Check ownership of all nearby certified avatar entities.</caption>
+     * // Set up response handling.
+     * function ownershipSuccess(entityID) {
+     *     print("Ownership test succeeded for: " + entityID);
+     * }
+     * function ownershipFailed(entityID) {
+     *     print("Ownership test failed for: " + entityID);
+     * }
+     * WalletScriptingInterface.ownershipVerificationSuccess.connect(ownershipSuccess);
+     * WalletScriptingInterface.ownershipVerificationFailed.connect(ownershipFailed);
+     * 
+     * // Check ownership of all nearby certified avatar entities.
+     * var entityIDs = Entities.findEntities(MyAvatar.position, 10);
+     * var i, length;
+     * for (i = 0, length = entityIDs.length; i < length; i++) {
+     *     var properties = Entities.getEntityProperties(entityIDs[i], ["entityHostType", "certificateID"]);
+     *     if (properties.entityHostType === "avatar" && properties.certificateID !== "") {
+     *         print("Prove ownership of: " + entityIDs[i]);
+     *         WalletScriptingInterface.proveAvatarEntityOwnershipVerification(entityIDs[i]);
+     *     }
+     * }
+     * 
+     * // Tidy up.
+     * Script.scriptEnding.connect(function () {
+     *     WalletScriptingInterface.ownershipVerificationFailed.disconnect(ownershipFailed);
+     *     WalletScriptingInterface.ownershipVerificationSuccess.disconnect(ownershipSuccess);
+     * });
      */
     Q_INVOKABLE void proveAvatarEntityOwnershipVerification(const QUuid& entityID);
 
@@ -76,33 +118,45 @@ public:
 signals:
 
     /**jsdoc
+     * Triggered when the status of the user's wallet changes.
      * @function WalletScriptingInterface.walletStatusChanged
      * @returns {Signal}
+     * @example <caption>Report when your wallet status changes, e.g., when you log in and out.</caption>
+     * WalletScriptingInterface.walletStatusChanged.connect(function () {
+     *     print("Wallet status changed to: " + WalletScriptingInterface.walletStatus");
+     * });
      */
     void walletStatusChanged();
 
     /**jsdoc
+     * Triggered when the user's limited commerce status changes.
      * @function WalletScriptingInterface.limitedCommerceChanged
      * @returns {Signal}
      */
     void limitedCommerceChanged();
 
     /**jsdoc
+     * Triggered when the user rezzes a certified entity but the user's wallet is not ready and so the certified location of the 
+     * entity cannot be updated in the metaverse.
      * @function WalletScriptingInterface.walletNotSetup
      * @returns {Signal}
      */
     void walletNotSetup();
 
     /**jsdoc
+     * Triggered when a certified avatar entity's ownership check requested via 
+     * {@link WalletScriptingInterface.proveAvatarEntityOwnershipVerification|proveAvatarEntityOwnershipVerification} succeeds. 
      * @function WalletScriptingInterface.ownershipVerificationSuccess
-     * @param {Uuid} entityID
+     * @param {Uuid} entityID - The ID of the avatar entity checked.
      * @returns {Signal}
      */
     void ownershipVerificationSuccess(const QUuid& entityID);
 
     /**jsdoc
+     * Triggered when a certified avatar entity's ownership check requested via
+     * {@link WalletScriptingInterface.proveAvatarEntityOwnershipVerification|proveAvatarEntityOwnershipVerification} fails.
      * @function WalletScriptingInterface.ownershipVerificationFailed
-     * @param {Uuid} entityID
+     * @param {Uuid} entityID - The ID of the avatar entity checked.
      * @returns {Signal}
      */
     void ownershipVerificationFailed(const QUuid& entityID);

libraries/animation/src/AnimationCache.cpp

@@ -41,7 +41,7 @@ QSharedPointer<Resource> AnimationCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> AnimationCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new Animation(*resource.staticCast<Animation>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new Animation(*resource.staticCast<Animation>()), &Resource::deleter);
 }
 
 AnimationReader::AnimationReader(const QUrl& url, const QByteArray& data) :

libraries/audio/src/SoundCache.cpp

@@ -40,5 +40,5 @@ QSharedPointer<Resource> SoundCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> SoundCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new Sound(*resource.staticCast<Sound>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new Sound(*resource.staticCast<Sound>()), &Resource::deleter);
 }

libraries/avatars-renderer/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME avatars-renderer)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared shaders gpu graphics animation model-networking script-engine render render-utils image trackers entities-renderer)
+link_hifi_libraries(shared shaders gpu graphics animation material-networking model-networking script-engine render render-utils image trackers entities-renderer)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(hfm)

libraries/display-plugins/CMakeLists.txt

@@ -2,6 +2,7 @@ set(TARGET_NAME display-plugins)
 setup_hifi_library(Gui)
 link_hifi_libraries(shared shaders plugins ui-plugins gl ui render-utils ${PLATFORM_GL_BACKEND})
 include_hifi_library_headers(gpu)
+include_hifi_library_headers(material-networking)
 include_hifi_library_headers(model-networking)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(graphics)

libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp

@@ -720,7 +720,7 @@ void OpenGLDisplayPlugin::present() {
         }
 
         gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory());
-    } else {
+    } else if (alwaysPresent()) {
         internalPresent();
     }
     _movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent));

libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h

@@ -88,6 +88,11 @@ protected:
 
     glm::uvec2 getSurfaceSize() const;
     glm::uvec2 getSurfacePixels() const;
+    // Some display plugins require us to always execute some present logic,
+    // whether we have a frame or not (Oculus Mobile plugin)
+    // Such plugins must be prepared to do the right thing if the `_currentFrame`
+    // is not populated
+    virtual bool alwaysPresent() const { return false; }
 
     void updateCompositeFramebuffer();
 

libraries/entities-renderer/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME entities-renderer)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared workload gpu shaders procedural graphics model-networking script-engine render render-utils image qml ui pointers)
+link_hifi_libraries(shared workload gpu shaders procedural graphics material-networking 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)

libraries/entities/CMakeLists.txt

@@ -6,4 +6,4 @@ include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)
-link_hifi_libraries(shared shaders networking octree avatars graphics model-networking)
+link_hifi_libraries(shared shaders networking octree avatars graphics material-networking model-networking)

libraries/entities/src/MaterialEntityItem.h

@@ -13,7 +13,7 @@
 
 #include "MaterialMappingMode.h"
 #include <model-networking/ModelCache.h>
-#include <model-networking/MaterialCache.h>
+#include <material-networking/MaterialCache.h>
 
 class MaterialEntityItem : public EntityItem {
     using Pointer = std::shared_ptr<MaterialEntityItem>;

libraries/fbx/src/FBXSerializer.cpp

@@ -1326,7 +1326,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
     hfmModel.meshExtents.reset();
 
     // Create the Material Library
-    consolidateHFMMaterials(mapping);
+    consolidateHFMMaterials();
 
     // We can't allow the scaling of a given image to different sizes, because the hash used for the KTX cache is based on the original image
     // Allowing scaling of the same image to different sizes would cause different KTX files to target the same cache key

libraries/fbx/src/FBXSerializer.h

@@ -153,7 +153,7 @@ public:
     QHash<QString, HFMMaterial> _hfmMaterials;
     QHash<QString, MaterialParam> _materialParams;
 
-    void consolidateHFMMaterials(const QVariantHash& mapping);
+    void consolidateHFMMaterials();
 
     bool _loadLightmaps { true };
     float _lightmapOffset { 0.0f };

libraries/fbx/src/FBXSerializer_Material.cpp

@@ -75,15 +75,7 @@ HFMTexture FBXSerializer::getTexture(const QString& textureID, const QString& ma
     return texture;
 }
 
-void FBXSerializer::consolidateHFMMaterials(const QVariantHash& mapping) {
-    QJsonObject materialMap;
-    if (mapping.contains("materialMap")) {
-        QByteArray materialMapValue = mapping.value("materialMap").toByteArray();
-        materialMap = QJsonDocument::fromJson(materialMapValue).object();
-        if (materialMap.isEmpty()) {
-            qCDebug(modelformat) << "fbx Material Map found but did not produce valid JSON:" << materialMapValue;
-        }
-    }
+void FBXSerializer::consolidateHFMMaterials() {
     for (QHash<QString, HFMMaterial>::iterator it = _hfmMaterials.begin(); it != _hfmMaterials.end(); it++) {
         HFMMaterial& material = (*it);
 
@@ -266,23 +258,6 @@ void FBXSerializer::consolidateHFMMaterials(const QVariantHash& mapping) {
         }
         qCDebug(modelformat) << " fbx material Name:" << material.name;
 
-        if (materialMap.contains(material.name)) {
-            QJsonObject materialOptions = materialMap.value(material.name).toObject();
-            qCDebug(modelformat) << "Mapping fbx material:" << material.name << " with HifiMaterial: " << materialOptions;
-
-            if (materialOptions.contains("scattering")) {
-                float scattering = (float) materialOptions.value("scattering").toDouble();
-                material._material->setScattering(scattering);
-            }
-
-            if (materialOptions.contains("scatteringMap")) {
-                QByteArray scatteringMap = materialOptions.value("scatteringMap").toVariant().toByteArray();
-                material.scatteringTexture = HFMTexture();
-                material.scatteringTexture.name = material.name + ".scatteringMap";
-                material.scatteringTexture.filename = scatteringMap;
-            }
-        }
-
         if (material.opacity <= 0.0f) {
             material._material->setOpacity(1.0f);
         } else {

libraries/fbx/src/GLTFSerializer.cpp

@@ -892,6 +892,23 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const QUrl& url) {
                         for (int n = 0; n < colors.size() - 3; n += stride) {
                             mesh.colors.push_back(glm::vec3(colors[n], colors[n + 1], colors[n + 2]));
                         }
+                    } else if (key == "TANGENT") {
+                        QVector<float> tangents;
+                        success = addArrayOfType(buffer.blob, 
+                            bufferview.byteOffset + accBoffset, 
+                            accessor.count, 
+                            tangents,
+                            accessor.type, 
+                            accessor.componentType);
+                        if (!success) {
+                            qWarning(modelformat) << "There was a problem reading glTF TANGENT data for model " << _url;
+                            continue;
+                        }
+                        int stride = (accessor.type == GLTFAccessorType::VEC4) ? 4 : 3;
+                        for (int n = 0; n < tangents.size() - 3; n += stride) {
+                            float tanW = stride == 4 ? tangents[n + 3] : 1; 
+                            mesh.tangents.push_back(glm::vec3(tanW * tangents[n], tangents[n + 1], tangents[n + 2]));
+                        }
                     } else if (key == "TEXCOORD_0") {
                         QVector<float> texcoords;
                         success = addArrayOfType(buffer.blob, 
@@ -931,7 +948,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const QUrl& url) {
                 }
                 mesh.parts.push_back(part);
 
-                // populate the texture coordenates if they don't exist
+                // populate the texture coordinates if they don't exist
                 if (mesh.texCoords.size() == 0) {
                     for (int i = 0; i < part.triangleIndices.size(); i++) mesh.texCoords.push_back(glm::vec2(0.0, 1.0));
                 }

libraries/gpu/src/gpu/State.h

@@ -246,7 +246,7 @@ public:
 
     struct Flags {
         Flags() :
-            frontFaceClockwise(false), depthClampEnable(false), scissorEnable(false), multisampleEnable(false),
+            frontFaceClockwise(false), depthClampEnable(false), scissorEnable(false), multisampleEnable(true),
             antialisedLineEnable(true), alphaToCoverageEnable(false), _spare1(0) {}
         bool frontFaceClockwise : 1;
         bool depthClampEnable : 1;

libraries/graphics-scripting/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(TARGET_NAME graphics-scripting)
 setup_hifi_library()
-link_hifi_libraries(shared networking graphics fbx image model-networking script-engine)
+link_hifi_libraries(shared networking graphics fbx image material-networking model-networking script-engine)
 include_hifi_library_headers(gpu)

libraries/material-networking/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(TARGET_NAME material-networking)
+setup_hifi_library()
+link_hifi_libraries(shared shaders networking graphics ktx image gl)
+include_hifi_library_headers(gpu)
+include_hifi_library_headers(hfm)

libraries/material-networking/src/material-networking/MaterialCache.cpp

@@ -425,5 +425,311 @@ QSharedPointer<Resource> MaterialCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> MaterialCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new NetworkMaterialResource(*resource.staticCast<NetworkMaterialResource>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new NetworkMaterialResource(*resource.staticCast<NetworkMaterialResource>()), &Resource::deleter);
+}
+
+NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
+    Material(m),
+    _textures(m._textures),
+    _albedoTransform(m._albedoTransform),
+    _lightmapTransform(m._lightmapTransform),
+    _lightmapParams(m._lightmapParams),
+    _isOriginal(m._isOriginal)
+{}
+
+const QString NetworkMaterial::NO_TEXTURE = QString();
+
+const QString& NetworkMaterial::getTextureName(MapChannel channel) {
+    if (_textures[channel].texture) {
+        return _textures[channel].name;
+    }
+    return NO_TEXTURE;
+}
+
+QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const HFMTexture& texture) {
+    if (texture.content.isEmpty()) {
+        // External file: search relative to the baseUrl, in case filename is relative
+        return baseUrl.resolved(QUrl(texture.filename));
+    } else {
+        // Inlined file: cache under the fbx file to avoid namespace clashes
+        // NOTE: We cannot resolve the path because filename may be an absolute path
+        assert(texture.filename.size() > 0);
+        auto baseUrlStripped = baseUrl.toDisplayString(QUrl::RemoveFragment | QUrl::RemoveQuery | QUrl::RemoveUserInfo);
+        if (texture.filename.at(0) == '/') {
+            return baseUrlStripped + texture.filename;
+        } else {
+            return baseUrlStripped + '/' + texture.filename;
+        }
+    }
+}
+
+graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
+                                                             image::TextureUsage::Type type, MapChannel channel) {
+
+    if (baseUrl.isEmpty()) {
+        return nullptr;
+    }
+
+    const auto url = getTextureUrl(baseUrl, hfmTexture);
+    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels, hfmTexture.sourceChannel);
+    _textures[channel] = Texture { hfmTexture.name, texture };
+
+    auto map = std::make_shared<graphics::TextureMap>();
+    if (texture) {
+        map->setTextureSource(texture->_textureSource);
+    }
+    map->setTextureTransform(hfmTexture.transform);
+
+    return map;
+}
+
+graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel) {
+    auto textureCache = DependencyManager::get<TextureCache>();
+    if (textureCache && !url.isEmpty()) {
+        auto texture = textureCache->getTexture(url, type);
+        _textures[channel].texture = texture;
+
+        auto map = std::make_shared<graphics::TextureMap>();
+        if (texture) {
+            map->setTextureSource(texture->_textureSource);
+        }
+
+        return map;
+    }
+    return nullptr;
+}
+
+void NetworkMaterial::setAlbedoMap(const QUrl& url, bool useAlphaChannel) {
+    auto map = fetchTextureMap(url, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
+    if (map) {
+        map->setUseAlphaChannel(useAlphaChannel);
+        setTextureMap(MapChannel::ALBEDO_MAP, map);
+    }
+}
+
+void NetworkMaterial::setNormalMap(const QUrl& url, bool isBumpmap) {
+    auto map = fetchTextureMap(url, isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE, MapChannel::NORMAL_MAP);
+    if (map) {
+        setTextureMap(MapChannel::NORMAL_MAP, map);
+    }
+}
+
+void NetworkMaterial::setRoughnessMap(const QUrl& url, bool isGloss) {
+    auto map = fetchTextureMap(url, isGloss ? image::TextureUsage::GLOSS_TEXTURE : image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
+    if (map) {
+        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
+    }
+}
+
+void NetworkMaterial::setMetallicMap(const QUrl& url, bool isSpecular) {
+    auto map = fetchTextureMap(url, isSpecular ? image::TextureUsage::SPECULAR_TEXTURE : image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
+    if (map) {
+        setTextureMap(MapChannel::METALLIC_MAP, map);
+    }
+}
+
+void NetworkMaterial::setOcclusionMap(const QUrl& url) {
+    auto map = fetchTextureMap(url, image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
+    if (map) {
+        setTextureMap(MapChannel::OCCLUSION_MAP, map);
+    }
+}
+
+void NetworkMaterial::setEmissiveMap(const QUrl& url) {
+    auto map = fetchTextureMap(url, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
+    if (map) {
+        setTextureMap(MapChannel::EMISSIVE_MAP, map);
+    }
+}
+
+void NetworkMaterial::setScatteringMap(const QUrl& url) {
+    auto map = fetchTextureMap(url, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
+    if (map) {
+        setTextureMap(MapChannel::SCATTERING_MAP, map);
+    }
+}
+
+void NetworkMaterial::setLightmapMap(const QUrl& url) {
+    auto map = fetchTextureMap(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 HFMMaterial& material, const QUrl& textureBaseUrl) :
+    graphics::Material(*material._material),
+    _textures(MapChannel::NUM_MAP_CHANNELS)
+{
+    _name = material.name.toStdString();
+    if (!material.albedoTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
+        if (map) {
+            _albedoTransform = material.albedoTexture.transform;
+            map->setTextureTransform(_albedoTransform);
+
+            if (!material.opacityTexture.filename.isEmpty()) {
+                if (material.albedoTexture.filename == material.opacityTexture.filename) {
+                    // Best case scenario, just indicating that the albedo map contains transparency
+                    // TODO: Different albedo/opacity maps are not currently supported
+                    map->setUseAlphaChannel(true);
+                }
+            }
+        }
+
+        setTextureMap(MapChannel::ALBEDO_MAP, map);
+    }
+
+
+    if (!material.normalTexture.filename.isEmpty()) {
+        auto type = (material.normalTexture.isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE);
+        auto map = fetchTextureMap(textureBaseUrl, material.normalTexture, type, MapChannel::NORMAL_MAP);
+        setTextureMap(MapChannel::NORMAL_MAP, map);
+    }
+
+    if (!material.roughnessTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.roughnessTexture, image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
+        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
+    } else if (!material.glossTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.glossTexture, image::TextureUsage::GLOSS_TEXTURE, MapChannel::ROUGHNESS_MAP);
+        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
+    }
+
+    if (!material.metallicTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.metallicTexture, image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
+        setTextureMap(MapChannel::METALLIC_MAP, map);
+    } else if (!material.specularTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.specularTexture, image::TextureUsage::SPECULAR_TEXTURE, MapChannel::METALLIC_MAP);
+        setTextureMap(MapChannel::METALLIC_MAP, map);
+    }
+
+    if (!material.occlusionTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.occlusionTexture, image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
+        if (map) {
+            map->setTextureTransform(material.occlusionTexture.transform);
+        }
+        setTextureMap(MapChannel::OCCLUSION_MAP, map);
+    }
+
+    if (!material.emissiveTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.emissiveTexture, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
+        setTextureMap(MapChannel::EMISSIVE_MAP, map);
+    }
+
+    if (!material.scatteringTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.scatteringTexture, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
+        setTextureMap(MapChannel::SCATTERING_MAP, map);
+    }
+
+    if (!material.lightmapTexture.filename.isEmpty()) {
+        auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
+        if (map) {
+            _lightmapTransform = material.lightmapTexture.transform;
+            _lightmapParams = material.lightmapParams;
+            map->setTextureTransform(_lightmapTransform);
+            map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
+        }
+        setTextureMap(MapChannel::LIGHTMAP_MAP, map);
+    }
+}
+
+void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
+    _isOriginal = false;
+
+    const auto& albedoName = getTextureName(MapChannel::ALBEDO_MAP);
+    const auto& normalName = getTextureName(MapChannel::NORMAL_MAP);
+    const auto& roughnessName = getTextureName(MapChannel::ROUGHNESS_MAP);
+    const auto& metallicName = getTextureName(MapChannel::METALLIC_MAP);
+    const auto& occlusionName = getTextureName(MapChannel::OCCLUSION_MAP);
+    const auto& emissiveName = getTextureName(MapChannel::EMISSIVE_MAP);
+    const auto& lightmapName = getTextureName(MapChannel::LIGHTMAP_MAP);
+    const auto& scatteringName = getTextureName(MapChannel::SCATTERING_MAP);
+
+    if (!albedoName.isEmpty()) {
+        auto url = textureMap.contains(albedoName) ? textureMap[albedoName].toUrl() : QUrl();
+        auto map = fetchTextureMap(url, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
+        if (map) {
+            map->setTextureTransform(_albedoTransform);
+            // when reassigning the albedo texture we also check for the alpha channel used as opacity
+            map->setUseAlphaChannel(true);
+        }
+        setTextureMap(MapChannel::ALBEDO_MAP, map);
+    }
+
+    if (!normalName.isEmpty()) {
+        auto url = textureMap.contains(normalName) ? textureMap[normalName].toUrl() : QUrl();
+        auto map = fetchTextureMap(url, image::TextureUsage::NORMAL_TEXTURE, MapChannel::NORMAL_MAP);
+        setTextureMap(MapChannel::NORMAL_MAP, map);
+    }
+
+    if (!roughnessName.isEmpty()) {
+        auto url = textureMap.contains(roughnessName) ? textureMap[roughnessName].toUrl() : QUrl();
+        // FIXME: If passing a gloss map instead of a roughmap how do we know?
+        auto map = fetchTextureMap(url, image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
+        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
+    }
+
+    if (!metallicName.isEmpty()) {
+        auto url = textureMap.contains(metallicName) ? textureMap[metallicName].toUrl() : QUrl();
+        // FIXME: If passing a specular map instead of a metallic how do we know?
+        auto map = fetchTextureMap(url, image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
+        setTextureMap(MapChannel::METALLIC_MAP, map);
+    }
+
+    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);
+    }
+
+    if (!emissiveName.isEmpty()) {
+        auto url = textureMap.contains(emissiveName) ? textureMap[emissiveName].toUrl() : QUrl();
+        auto map = fetchTextureMap(url, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
+        setTextureMap(MapChannel::EMISSIVE_MAP, map);
+    }
+
+    if (!scatteringName.isEmpty()) {
+        auto url = textureMap.contains(scatteringName) ? textureMap[scatteringName].toUrl() : QUrl();
+        auto map = fetchTextureMap(url, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
+        setTextureMap(MapChannel::SCATTERING_MAP, map);
+    }
+
+    if (!lightmapName.isEmpty()) {
+        auto url = textureMap.contains(lightmapName) ? textureMap[lightmapName].toUrl() : QUrl();
+        auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
+        if (map) {
+            map->setTextureTransform(_lightmapTransform);
+            map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
+        }
+        setTextureMap(MapChannel::LIGHTMAP_MAP, map);
+    }
+}
+
+bool NetworkMaterial::isMissingTexture() {
+    for (auto& networkTexture : _textures) {
+        auto& texture = networkTexture.texture;
+        if (!texture) {
+            continue;
+        }
+        // Failed texture downloads need to be considered as 'loaded'
+        // or the object will never fade in
+        bool finished = texture->isFailed() || (texture->isLoaded() && texture->getGPUTexture() && texture->getGPUTexture()->isDefined());
+        if (!finished) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void NetworkMaterial::checkResetOpacityMap() {
+    // If material textures are loaded, check the material translucency
+    // FIXME: This should not be done here.  The opacity map should already be reset in Material::setTextureMap.
+    // However, currently that code can be called before the albedo map is defined, so resetOpacityMap will fail.
+    // Geometry::areTexturesLoaded() is called repeatedly until it returns true, so we do the check here for now
+    const auto& albedoTexture = _textures[NetworkMaterial::MapChannel::ALBEDO_MAP];
+    if (albedoTexture.texture) {
+        resetOpacityMap();
+    }
 }

libraries/material-networking/src/material-networking/MaterialCache.h

@@ -0,0 +1,117 @@
+//
+//  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 "glm/glm.hpp"
+
+#include <ResourceCache.h>
+#include <graphics/Material.h>
+#include <hfm/HFM.h>
+
+#include "TextureCache.h"
+
+class NetworkMaterial : public graphics::Material {
+public:
+    using MapChannel = graphics::Material::MapChannel;
+
+    NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
+    NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl);
+    NetworkMaterial(const NetworkMaterial& material);
+
+    void setAlbedoMap(const QUrl& url, bool useAlphaChannel);
+    void setNormalMap(const QUrl& url, bool isBumpmap);
+    void setRoughnessMap(const QUrl& url, bool isGloss);
+    void setMetallicMap(const QUrl& url, bool isSpecular);
+    void setOcclusionMap(const QUrl& url);
+    void setEmissiveMap(const QUrl& url);
+    void setScatteringMap(const QUrl& url);
+    void setLightmapMap(const QUrl& url);
+
+    bool isMissingTexture();
+    void checkResetOpacityMap();
+
+protected:
+    friend class Geometry;
+
+    class Texture {
+    public:
+        QString name;
+        NetworkTexturePointer texture;
+    };
+    using Textures = std::vector<Texture>;
+
+    Textures _textures;
+
+    static const QString NO_TEXTURE;
+    const QString& getTextureName(MapChannel channel);
+
+    void setTextures(const QVariantMap& textureMap);
+
+    const bool& isOriginal() const { return _isOriginal; }
+
+private:
+    // Helpers for the ctors
+    QUrl getTextureUrl(const QUrl& baseUrl, const HFMTexture& hfmTexture);
+    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
+                                                image::TextureUsage::Type type, MapChannel channel);
+    graphics::TextureMapPointer fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel);
+
+    Transform _albedoTransform;
+    Transform _lightmapTransform;
+    vec2 _lightmapParams;
+
+    bool _isOriginal { true };
+};
+
+class NetworkMaterialResource : public Resource {
+public:
+    NetworkMaterialResource() : Resource() {}
+    NetworkMaterialResource(const QUrl& url);
+
+    QString getType() const override { return "NetworkMaterial"; }
+
+    virtual void downloadFinished(const QByteArray& data) override;
+
+    typedef struct ParsedMaterials {
+        uint version { 1 };
+        std::vector<std::string> names;
+        std::unordered_map<std::string, std::shared_ptr<NetworkMaterial>> networkMaterials;
+
+        void reset() {
+            version = 1;
+            names.clear();
+            networkMaterials.clear();
+        }
+
+    } ParsedMaterials;
+
+    ParsedMaterials parsedMaterials;
+
+    static ParsedMaterials parseJSONMaterials(const QJsonDocument& materialJSON, const QUrl& baseUrl);
+    static std::pair<std::string, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON, const QUrl& baseUrl);
+
+private:
+    static bool parseJSONColor(const QJsonValue& array, glm::vec3& color, bool& isSRGB);
+};
+
+using NetworkMaterialResourcePointer = QSharedPointer<NetworkMaterialResource>;
+using MaterialMapping = std::vector<std::pair<std::string, NetworkMaterialResourcePointer>>;
+
+class MaterialCache : public ResourceCache {
+public:
+    static MaterialCache& instance();
+
+    NetworkMaterialResourcePointer getMaterial(const QUrl& url);
+
+protected:
+    virtual QSharedPointer<Resource> createResource(const QUrl& url) override;
+    QSharedPointer<Resource> createResourceCopy(const QSharedPointer<Resource>& resource) override;
+};
+
+#endif

libraries/material-networking/src/material-networking/MaterialNetworkingLogging.cpp

@@ -0,0 +1,11 @@
+//
+//  Created by Sam Gondelman on 2/7/2019
+//  Copyright 2019 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 "MaterialNetworkingLogging.h"
+
+Q_LOGGING_CATEGORY(materialnetworking, "hifi.gpu-material-network")

libraries/material-networking/src/material-networking/MaterialNetworkingLogging.h

@@ -0,0 +1,11 @@
+//
+//  Created by Sam Gondelman on 2/7/2019
+//  Copyright 2019 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 <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(materialnetworking)

libraries/material-networking/src/material-networking/ShaderCache.cpp

@@ -29,5 +29,5 @@ QSharedPointer<Resource> ShaderCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> ShaderCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new NetworkShader(*resource.staticCast<NetworkShader>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new NetworkShader(*resource.staticCast<NetworkShader>()), &Resource::deleter);
 }

libraries/material-networking/src/material-networking/TextureCache.cpp

@@ -44,7 +44,7 @@
 #include <Profile.h>
 
 #include "NetworkLogging.h"
-#include "ModelNetworkingLogging.h"
+#include "MaterialNetworkingLogging.h"
 #include "NetworkingConstants.h"
 #include <Trace.h>
 #include <StatTracker.h>
@@ -198,16 +198,16 @@ public:
 namespace std {
     template <>
     struct hash<QByteArray> {
-        size_t operator()(const QByteArray& a) const {
-            return qHash(a);
+        size_t operator()(const QByteArray& byteArray) const {
+            return qHash(byteArray);
         }
     };
 
     template <>
     struct hash<TextureExtra> {
-        size_t operator()(const TextureExtra& a) const {
+        size_t operator()(const TextureExtra& textureExtra) const {
             size_t result = 0;
-            hash_combine(result, (int)a.type, a.content, a.maxNumPixels, (int)a.sourceChannel);
+            hash_combine(result, (int)textureExtra.type, textureExtra.content, textureExtra.maxNumPixels, (int)textureExtra.sourceChannel);
             return result;
         }
     };
@@ -329,15 +329,14 @@ QSharedPointer<Resource> TextureCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> TextureCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new NetworkTexture(*resource.staticCast<NetworkTexture>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new NetworkTexture(*resource.staticCast<NetworkTexture>()), &Resource::deleter);
 }
 
 int networkTexturePointerMetaTypeId = qRegisterMetaType<QWeakPointer<NetworkTexture>>();
 
 NetworkTexture::NetworkTexture(const QUrl& url, bool resourceTexture) :
     Resource(url),
-    Texture(),
-    _maxNumPixels(100)
+    Texture()
 {
     if (resourceTexture) {
         _textureSource = std::make_shared<gpu::TextureSource>(url);
@@ -369,16 +368,17 @@ static bool isLocalUrl(const QUrl& url) {
     return (scheme == HIFI_URL_SCHEME_FILE || scheme == URL_SCHEME_QRC || scheme == RESOURCE_SCHEME);
 }
 
-void NetworkTexture::setExtra(void* extra) {
+void NetworkTexture::setExtra(void* extra, bool isNewExtra) {
     const TextureExtra* textureExtra = static_cast<const TextureExtra*>(extra);
     _type = textureExtra ? textureExtra->type : image::TextureUsage::DEFAULT_TEXTURE;
     _maxNumPixels = textureExtra ? textureExtra->maxNumPixels : ABSOLUTE_MAX_TEXTURE_NUM_PIXELS;
     _sourceChannel = textureExtra ? textureExtra->sourceChannel : image::ColorChannel::NONE;
 
-    if (_textureSource) {
-        _textureSource->setUrl(_url);
-        _textureSource->setType((int)_type);
-    } else {
+    if (isNewExtra && !_loaded) {
+        _startedLoading = false;
+    }
+
+    if (!_textureSource || isNewExtra) {
         _textureSource = std::make_shared<gpu::TextureSource>(_url, (int)_type);
     }
     _lowestRequestedMipLevel = 0;
@@ -955,7 +955,7 @@ void NetworkTexture::handleFinishedInitialLoad() {
             cache::FilePointer file;
             auto& ktxCache = textureCache->_ktxCache;
             if (!memKtx || !(file = ktxCache->writeFile(data, KTXCache::Metadata(filename, length)))) {
-                qCWarning(modelnetworking) << url << " failed to write cache file";
+                qCWarning(materialnetworking) << url << " failed to write cache file";
                 QMetaObject::invokeMethod(resource.data(), "setImage",
                     Q_ARG(gpu::TexturePointer, nullptr),
                     Q_ARG(int, 0),
@@ -1145,7 +1145,7 @@ void ImageReader::listSupportedImageFormats() {
     static std::once_flag once;
     std::call_once(once, []{
         auto supportedFormats = QImageReader::supportedImageFormats();
-        qCDebug(modelnetworking) << "List of supported Image formats:" << supportedFormats.join(", ");
+        qCDebug(materialnetworking) << "List of supported Image formats:" << supportedFormats.join(", ");
     });
 }
 
@@ -1194,7 +1194,7 @@ void ImageReader::read() {
                 if (texture) {
                     texture = textureCache->cacheTextureByHash(hash, texture);
                 } else {
-                    qCWarning(modelnetworking) << "Invalid cached KTX " << _url << " under hash " << hash.c_str() << ", recreating...";
+                    qCWarning(materialnetworking) << "Invalid cached KTX " << _url << " under hash " << hash.c_str() << ", recreating...";
                 }
             }
         }

libraries/material-networking/src/material-networking/TextureCache.h

@@ -64,7 +64,7 @@ public:
 
     Q_INVOKABLE void setOriginalDescriptor(ktx::KTXDescriptor* descriptor) { _originalKtxDescriptor.reset(descriptor); }
 
-    void setExtra(void* extra) override;
+    void setExtra(void* extra, bool isNewExtra) override;
 
 signals:
     void networkTextureCreated(const QWeakPointer<NetworkTexture>& self);

libraries/model-baker/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(TARGET_NAME model-baker)
 setup_hifi_library()
 
-link_hifi_libraries(shared task gpu graphics hfm)
-
+link_hifi_libraries(shared shaders task gpu graphics hfm material-networking)
+include_hifi_library_headers(networking)
 include_hifi_library_headers(image)
+include_hifi_library_headers(ktx)

libraries/model-baker/src/model-baker/Baker.cpp

@@ -101,7 +101,7 @@ namespace baker {
 
     class BuildModelTask {
     public:
-        using Input = VaryingSet5<hfm::Model::Pointer, std::vector<hfm::Mesh>, std::vector<hfm::Joint>, QMap<int, glm::quat> /*jointRotationOffsets*/, QHash<QString, int> /*jointIndices*/>;
+        using Input = VaryingSet5<hfm::Model::Pointer, std::vector<hfm::Mesh>, std::vector<hfm::Joint>, QMap<int, glm::quat>, QHash<QString, int>>;
         using Output = hfm::Model::Pointer;
         using JobModel = Job::ModelIO<BuildModelTask, Input, Output>;
 
@@ -118,9 +118,9 @@ namespace baker {
     class BakerEngineBuilder {
     public:
         using Input = VaryingSet2<hfm::Model::Pointer, QVariantHash>;
-        using Output = hfm::Model::Pointer;
+        using Output = VaryingSet2<hfm::Model::Pointer, MaterialMapping>;
         using JobModel = Task::ModelIO<BakerEngineBuilder, Input, Output>;
-        void build(JobModel& model, const Varying& input, Varying& hfmModelOut) {
+        void build(JobModel& model, const Varying& input, Varying& output) {
             const auto& hfmModelIn = input.getN<Input>(0);
             const auto& mapping = input.getN<Input>(1);
 
@@ -154,13 +154,18 @@ namespace baker {
             const auto jointRotationOffsets = jointInfoOut.getN<PrepareJointsTask::Output>(1);
             const auto jointIndices = jointInfoOut.getN<PrepareJointsTask::Output>(2);
 
+            // Parse material mapping
+            const auto materialMapping = model.addJob<ParseMaterialMappingTask>("ParseMaterialMapping", mapping);
+
             // Combine the outputs into a new hfm::Model
             const auto buildBlendshapesInputs = BuildBlendshapesTask::Input(blendshapesPerMeshIn, normalsPerBlendshapePerMesh, tangentsPerBlendshapePerMesh).asVarying();
             const auto blendshapesPerMeshOut = model.addJob<BuildBlendshapesTask>("BuildBlendshapes", buildBlendshapesInputs);
             const auto buildMeshesInputs = BuildMeshesTask::Input(meshesIn, graphicsMeshes, normalsPerMesh, tangentsPerMesh, blendshapesPerMeshOut).asVarying();
             const auto meshesOut = model.addJob<BuildMeshesTask>("BuildMeshes", buildMeshesInputs);
             const auto buildModelInputs = BuildModelTask::Input(hfmModelIn, meshesOut, jointsOut, jointRotationOffsets, jointIndices).asVarying();
-            hfmModelOut = model.addJob<BuildModelTask>("BuildModel", buildModelInputs);
+            const auto hfmModelOut = model.addJob<BuildModelTask>("BuildModel", buildModelInputs);
+
+            output = Output(hfmModelOut, materialMapping);
         }
     };
 
@@ -172,7 +177,8 @@ namespace baker {
 
     void Baker::run() {
         _engine->run();
-        hfmModel = _engine->getOutput().get<BakerEngineBuilder::Output>();
+        hfmModel = _engine->getOutput().get<BakerEngineBuilder::Output>().get0();
+        materialMapping = _engine->getOutput().get<BakerEngineBuilder::Output>().get1();
     }
 
 };

libraries/model-baker/src/model-baker/Baker.h

@@ -18,6 +18,8 @@
 
 #include "Engine.h"
 
+#include "ParseMaterialMappingTask.h"
+
 namespace baker {
     class Baker {
     public:
@@ -27,6 +29,7 @@ namespace baker {
 
         // Outputs, available after run() is called
         hfm::Model::Pointer hfmModel;
+        MaterialMapping materialMapping;
 
     protected:
         EnginePointer _engine;

libraries/model-baker/src/model-baker/ParseMaterialMappingTask.cpp

@@ -0,0 +1,76 @@
+//
+//  Created by Sam Gondelman on 2/7/2019
+//  Copyright 2019 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 "ParseMaterialMappingTask.h"
+
+#include "ModelBakerLogging.h"
+
+void ParseMaterialMappingTask::run(const baker::BakeContextPointer& context, const Input& mapping, Output& output) {
+    MaterialMapping materialMapping;
+
+    auto mappingIter = mapping.find("materialMap");
+    if (mappingIter != mapping.end()) {
+        QByteArray materialMapValue = mappingIter.value().toByteArray();
+        QJsonObject materialMap = QJsonDocument::fromJson(materialMapValue).object();
+        if (materialMap.isEmpty()) {
+            qCDebug(model_baker) << "Material Map found but did not produce valid JSON:" << materialMapValue;
+        } else {
+            auto mappingKeys = materialMap.keys();
+            for (auto mapping : mappingKeys) {
+                auto mappingJSON = materialMap[mapping];
+                if (mappingJSON.isObject()) {
+                    auto mappingValue = mappingJSON.toObject();
+
+                    // Old subsurface scattering mapping
+                    {
+                        auto scatteringIter = mappingValue.find("scattering");
+                        auto scatteringMapIter = mappingValue.find("scatteringMap");
+                        if (scatteringIter != mappingValue.end() || scatteringMapIter != mappingValue.end()) {
+                            std::shared_ptr<NetworkMaterial> material = std::make_shared<NetworkMaterial>();
+
+                            if (scatteringIter != mappingValue.end()) {
+                                float scattering = (float)scatteringIter.value().toDouble();
+                                material->setScattering(scattering);
+                            }
+
+                            if (scatteringMapIter != mappingValue.end()) {
+                                QString scatteringMap = scatteringMapIter.value().toString();
+                                material->setScatteringMap(scatteringMap);
+                            }
+
+                            material->setDefaultFallthrough(true);
+
+                            NetworkMaterialResourcePointer materialResource = NetworkMaterialResourcePointer(new NetworkMaterialResource(), [](NetworkMaterialResource* ptr) { ptr->deleteLater(); });
+                            materialResource->moveToThread(qApp->thread());
+                            materialResource->parsedMaterials.names.push_back("scattering");
+                            materialResource->parsedMaterials.networkMaterials["scattering"] = material;
+
+                            materialMapping.push_back(std::pair<std::string, NetworkMaterialResourcePointer>("mat::" + mapping.toStdString(), materialResource));
+                            continue;
+                        }
+                    }
+
+                    // Material JSON description
+                    {
+                        NetworkMaterialResourcePointer materialResource = NetworkMaterialResourcePointer(new NetworkMaterialResource(), [](NetworkMaterialResource* ptr) { ptr->deleteLater(); });
+                        materialResource->moveToThread(qApp->thread());
+                        // TODO: add baseURL to allow FSTs to reference relative files next to them
+                        materialResource->parsedMaterials = NetworkMaterialResource::parseJSONMaterials(QJsonDocument(mappingValue), QUrl());
+                        materialMapping.push_back(std::pair<std::string, NetworkMaterialResourcePointer>(mapping.toStdString(), materialResource));
+                    }
+
+                } else if (mappingJSON.isString()) {
+                    auto mappingValue = mappingJSON.toString();
+                    materialMapping.push_back(std::pair<std::string, NetworkMaterialResourcePointer>(mapping.toStdString(), MaterialCache::instance().getMaterial(mappingValue)));
+                }
+            }
+        }
+    }
+
+    output = materialMapping;
+}

libraries/model-baker/src/model-baker/ParseMaterialMappingTask.h

@@ -0,0 +1,29 @@
+//
+//  Created by Sam Gondelman on 2/7/2019
+//  Copyright 2019 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_ParseMaterialMappingTask_h
+#define hifi_ParseMaterialMappingTask_h
+
+#include <QHash>
+
+#include <hfm/HFM.h>
+
+#include "Engine.h"
+
+#include <material-networking/MaterialCache.h>
+
+class ParseMaterialMappingTask {
+public:
+    using Input = QVariantHash;
+    using Output = MaterialMapping;
+    using JobModel = baker::Job::ModelIO<ParseMaterialMappingTask, Input, Output>;
+
+    void run(const baker::BakeContextPointer& context, const Input& input, Output& output);
+};
+
+#endif // hifi_ParseMaterialMappingTask_h

libraries/model-networking/CMakeLists.txt

@@ -1,6 +1,8 @@
 set(TARGET_NAME model-networking)
 setup_hifi_library()
-link_hifi_libraries(shared shaders networking graphics fbx ktx image gl model-baker)
-include_hifi_library_headers(gpu)
+link_hifi_libraries(shared shaders networking graphics fbx material-networking model-baker)
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(task)
+include_hifi_library_headers(gpu)
+include_hifi_library_headers(image)
+include_hifi_library_headers(ktx)

libraries/model-networking/src/model-networking/MaterialCache.h

@@ -1,60 +0,0 @@
-//
-//  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;
-
-    typedef struct ParsedMaterials {
-        uint version { 1 };
-        std::vector<std::string> names;
-        std::unordered_map<std::string, std::shared_ptr<NetworkMaterial>> networkMaterials;
-
-        void reset() {
-            version = 1;
-            names.clear();
-            networkMaterials.clear();
-        }
-
-    } ParsedMaterials;
-
-    ParsedMaterials parsedMaterials;
-
-    static ParsedMaterials parseJSONMaterials(const QJsonDocument& materialJSON, const QUrl& baseUrl);
-    static std::pair<std::string, std::shared_ptr<NetworkMaterial>> parseJSONMaterial(const QJsonObject& materialJSON, const QUrl& baseUrl);
-
-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) override;
-    QSharedPointer<Resource> createResourceCopy(const QSharedPointer<Resource>& resource) override;
-};
-
-#endif

libraries/model-networking/src/model-networking/ModelCache.cpp

@@ -76,9 +76,9 @@ namespace std {
 
     template <>
     struct hash<GeometryExtra> {
-        size_t operator()(const GeometryExtra& a) const {
+        size_t operator()(const GeometryExtra& geometryExtra) const {
             size_t result = 0;
-            hash_combine(result, a.mapping, a.textureBaseUrl, a.combineParts);
+            hash_combine(result, geometryExtra.mapping, geometryExtra.textureBaseUrl, geometryExtra.combineParts);
             return result;
         }
     };
@@ -174,6 +174,7 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
 void GeometryMappingResource::onGeometryMappingLoaded(bool success) {
     if (success && _geometryResource) {
         _hfmModel = _geometryResource->_hfmModel;
+        _materialMapping = _geometryResource->_materialMapping;
         _meshParts = _geometryResource->_meshParts;
         _meshes = _geometryResource->_meshes;
         _materials = _geometryResource->_materials;
@@ -308,7 +309,7 @@ public:
 
     virtual void downloadFinished(const QByteArray& data) override;
 
-    void setExtra(void* extra) override;
+    void setExtra(void* extra, bool isNewExtra) override;
 
 protected:
     Q_INVOKABLE void setGeometryDefinition(HFMModel::Pointer hfmModel, QVariantHash mapping);
@@ -319,7 +320,7 @@ private:
     bool _combineParts;
 };
 
-void GeometryDefinitionResource::setExtra(void* extra) {
+void GeometryDefinitionResource::setExtra(void* extra, bool isNewExtra) {
     const GeometryExtra* geometryExtra = static_cast<const GeometryExtra*>(extra);
     _mapping = geometryExtra ? geometryExtra->mapping : QVariantHash();
     _textureBaseUrl = geometryExtra ? resolveTextureBaseUrl(_url, geometryExtra->textureBaseUrl) : QUrl();
@@ -341,6 +342,7 @@ void GeometryDefinitionResource::setGeometryDefinition(HFMModel::Pointer hfmMode
 
     // Assume ownership of the processed HFMModel
     _hfmModel = modelBaker.hfmModel;
+    _materialMapping = modelBaker.materialMapping;
 
     // Copy materials
     QHash<QString, size_t> materialIDAtlas;
@@ -392,7 +394,7 @@ QSharedPointer<Resource> ModelCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> ModelCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new GeometryDefinitionResource(*resource.staticCast<GeometryDefinitionResource>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new GeometryDefinitionResource(*resource.staticCast<GeometryDefinitionResource>()), &Resource::deleter);
 }
 
 GeometryResource::Pointer ModelCache::getGeometryResource(const QUrl& url,
@@ -437,6 +439,7 @@ const QVariantMap Geometry::getTextures() const {
 // FIXME: The materials should only be copied when modified, but the Model currently caches the original
 Geometry::Geometry(const Geometry& geometry) {
     _hfmModel = geometry._hfmModel;
+    _materialMapping = geometry._materialMapping;
     _meshes = geometry._meshes;
     _meshParts = geometry._meshParts;
 
@@ -556,310 +559,4 @@ void GeometryResourceWatcher::resourceRefreshed() {
     // _instance.reset();
 }
 
-NetworkMaterial::NetworkMaterial(const NetworkMaterial& m) :
-    Material(m),
-    _textures(m._textures),
-    _albedoTransform(m._albedoTransform),
-    _lightmapTransform(m._lightmapTransform),
-    _lightmapParams(m._lightmapParams),
-    _isOriginal(m._isOriginal)
-{}
-
-const QString NetworkMaterial::NO_TEXTURE = QString();
-
-const QString& NetworkMaterial::getTextureName(MapChannel channel) {
-    if (_textures[channel].texture) {
-        return _textures[channel].name;
-    }
-    return NO_TEXTURE;
-}
-
-QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const HFMTexture& texture) {
-    if (texture.content.isEmpty()) {
-        // External file: search relative to the baseUrl, in case filename is relative
-        return baseUrl.resolved(QUrl(texture.filename));
-    } else {
-        // Inlined file: cache under the fbx file to avoid namespace clashes
-        // NOTE: We cannot resolve the path because filename may be an absolute path
-        assert(texture.filename.size() > 0);
-        auto baseUrlStripped = baseUrl.toDisplayString(QUrl::RemoveFragment | QUrl::RemoveQuery | QUrl::RemoveUserInfo);
-        if (texture.filename.at(0) == '/') {
-            return baseUrlStripped + texture.filename;
-        } else {
-            return baseUrlStripped + '/' + texture.filename;
-        }
-    }
-}
-
-graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
-                                                          image::TextureUsage::Type type, MapChannel channel) {
-
-    if (baseUrl.isEmpty()) {
-        return nullptr;
-    }
-
-    const auto url = getTextureUrl(baseUrl, hfmTexture);
-    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels, hfmTexture.sourceChannel);
-    _textures[channel] = Texture { hfmTexture.name, texture };
-
-    auto map = std::make_shared<graphics::TextureMap>();
-    if (texture) {
-        map->setTextureSource(texture->_textureSource);
-    }
-    map->setTextureTransform(hfmTexture.transform);
-
-    return map;
-}
-
-graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel) {
-    auto textureCache = DependencyManager::get<TextureCache>();
-    if (textureCache && !url.isEmpty()) {
-        auto texture = textureCache->getTexture(url, type);
-        _textures[channel].texture = texture;
-
-        auto map = std::make_shared<graphics::TextureMap>();
-        if (texture) {
-            map->setTextureSource(texture->_textureSource);
-        }
-
-        return map;
-    }
-    return nullptr;
-}
-
-void NetworkMaterial::setAlbedoMap(const QUrl& url, bool useAlphaChannel) {
-    auto map = fetchTextureMap(url, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
-    if (map) {
-        map->setUseAlphaChannel(useAlphaChannel);
-        setTextureMap(MapChannel::ALBEDO_MAP, map);
-    }
-}
-
-void NetworkMaterial::setNormalMap(const QUrl& url, bool isBumpmap) {
-    auto map = fetchTextureMap(url, isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE, MapChannel::NORMAL_MAP);
-    if (map) {
-        setTextureMap(MapChannel::NORMAL_MAP, map);
-    }
-}
-
-void NetworkMaterial::setRoughnessMap(const QUrl& url, bool isGloss) {
-    auto map = fetchTextureMap(url, isGloss ? image::TextureUsage::GLOSS_TEXTURE : image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
-    if (map) {
-        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
-    }
-}
-
-void NetworkMaterial::setMetallicMap(const QUrl& url, bool isSpecular) {
-    auto map = fetchTextureMap(url, isSpecular ? image::TextureUsage::SPECULAR_TEXTURE : image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
-    if (map) {
-        setTextureMap(MapChannel::METALLIC_MAP, map);
-    }
-}
-
-void NetworkMaterial::setOcclusionMap(const QUrl& url) {
-    auto map = fetchTextureMap(url, image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
-    if (map) {
-        setTextureMap(MapChannel::OCCLUSION_MAP, map);
-    }
-}
-
-void NetworkMaterial::setEmissiveMap(const QUrl& url) {
-    auto map = fetchTextureMap(url, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
-    if (map) {
-        setTextureMap(MapChannel::EMISSIVE_MAP, map);
-    }
-}
-
-void NetworkMaterial::setScatteringMap(const QUrl& url) {
-    auto map = fetchTextureMap(url, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
-    if (map) {
-        setTextureMap(MapChannel::SCATTERING_MAP, map);
-    }
-}
-
-void NetworkMaterial::setLightmapMap(const QUrl& url) {
-    auto map = fetchTextureMap(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 HFMMaterial& material, const QUrl& textureBaseUrl) :
-    graphics::Material(*material._material),
-    _textures(MapChannel::NUM_MAP_CHANNELS)
-{
-    _name = material.name.toStdString();
-    if (!material.albedoTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.albedoTexture, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
-        if (map) {
-            _albedoTransform = material.albedoTexture.transform;
-            map->setTextureTransform(_albedoTransform);
-
-            if (!material.opacityTexture.filename.isEmpty()) {
-                if (material.albedoTexture.filename == material.opacityTexture.filename) {
-                    // Best case scenario, just indicating that the albedo map contains transparency
-                    // TODO: Different albedo/opacity maps are not currently supported
-                    map->setUseAlphaChannel(true);
-                }
-            }
-        }
-
-        setTextureMap(MapChannel::ALBEDO_MAP, map);
-    }
-
-
-    if (!material.normalTexture.filename.isEmpty()) {
-        auto type = (material.normalTexture.isBumpmap ? image::TextureUsage::BUMP_TEXTURE : image::TextureUsage::NORMAL_TEXTURE);
-        auto map = fetchTextureMap(textureBaseUrl, material.normalTexture, type, MapChannel::NORMAL_MAP);
-        setTextureMap(MapChannel::NORMAL_MAP, map);
-    }
-
-    if (!material.roughnessTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.roughnessTexture, image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
-        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
-    } else if (!material.glossTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.glossTexture, image::TextureUsage::GLOSS_TEXTURE, MapChannel::ROUGHNESS_MAP);
-        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
-    }
-
-    if (!material.metallicTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.metallicTexture, image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
-        setTextureMap(MapChannel::METALLIC_MAP, map);
-    } else if (!material.specularTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.specularTexture, image::TextureUsage::SPECULAR_TEXTURE, MapChannel::METALLIC_MAP);
-        setTextureMap(MapChannel::METALLIC_MAP, map);
-    }
-
-    if (!material.occlusionTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.occlusionTexture, image::TextureUsage::OCCLUSION_TEXTURE, MapChannel::OCCLUSION_MAP);
-        if (map) {
-            map->setTextureTransform(material.occlusionTexture.transform);
-        }
-        setTextureMap(MapChannel::OCCLUSION_MAP, map);
-    }
-
-    if (!material.emissiveTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.emissiveTexture, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
-        setTextureMap(MapChannel::EMISSIVE_MAP, map);
-    }
-
-    if (!material.scatteringTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.scatteringTexture, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
-        setTextureMap(MapChannel::SCATTERING_MAP, map);
-    }
-
-    if (!material.lightmapTexture.filename.isEmpty()) {
-        auto map = fetchTextureMap(textureBaseUrl, material.lightmapTexture, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
-        if (map) {
-            _lightmapTransform = material.lightmapTexture.transform;
-            _lightmapParams = material.lightmapParams;
-            map->setTextureTransform(_lightmapTransform);
-            map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
-        }
-        setTextureMap(MapChannel::LIGHTMAP_MAP, map);
-    }
-}
-
-void NetworkMaterial::setTextures(const QVariantMap& textureMap) {
-    _isOriginal = false;
-
-    const auto& albedoName = getTextureName(MapChannel::ALBEDO_MAP);
-    const auto& normalName = getTextureName(MapChannel::NORMAL_MAP);
-    const auto& roughnessName = getTextureName(MapChannel::ROUGHNESS_MAP);
-    const auto& metallicName = getTextureName(MapChannel::METALLIC_MAP);
-    const auto& occlusionName = getTextureName(MapChannel::OCCLUSION_MAP);
-    const auto& emissiveName = getTextureName(MapChannel::EMISSIVE_MAP);
-    const auto& lightmapName = getTextureName(MapChannel::LIGHTMAP_MAP);
-    const auto& scatteringName = getTextureName(MapChannel::SCATTERING_MAP);
-
-    if (!albedoName.isEmpty()) {
-        auto url = textureMap.contains(albedoName) ? textureMap[albedoName].toUrl() : QUrl();
-        auto map = fetchTextureMap(url, image::TextureUsage::ALBEDO_TEXTURE, MapChannel::ALBEDO_MAP);
-        if (map) {
-            map->setTextureTransform(_albedoTransform);
-            // when reassigning the albedo texture we also check for the alpha channel used as opacity
-            map->setUseAlphaChannel(true);
-        }
-        setTextureMap(MapChannel::ALBEDO_MAP, map);
-    }
-
-    if (!normalName.isEmpty()) {
-        auto url = textureMap.contains(normalName) ? textureMap[normalName].toUrl() : QUrl();
-        auto map = fetchTextureMap(url, image::TextureUsage::NORMAL_TEXTURE, MapChannel::NORMAL_MAP);
-        setTextureMap(MapChannel::NORMAL_MAP, map);
-    }
-
-    if (!roughnessName.isEmpty()) {
-        auto url = textureMap.contains(roughnessName) ? textureMap[roughnessName].toUrl() : QUrl();
-        // FIXME: If passing a gloss map instead of a roughmap how do we know?
-        auto map = fetchTextureMap(url, image::TextureUsage::ROUGHNESS_TEXTURE, MapChannel::ROUGHNESS_MAP);
-        setTextureMap(MapChannel::ROUGHNESS_MAP, map);
-    }
-
-    if (!metallicName.isEmpty()) {
-        auto url = textureMap.contains(metallicName) ? textureMap[metallicName].toUrl() : QUrl();
-        // FIXME: If passing a specular map instead of a metallic how do we know?
-        auto map = fetchTextureMap(url, image::TextureUsage::METALLIC_TEXTURE, MapChannel::METALLIC_MAP);
-        setTextureMap(MapChannel::METALLIC_MAP, map);
-    }
-
-    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);
-    }
-
-    if (!emissiveName.isEmpty()) {
-        auto url = textureMap.contains(emissiveName) ? textureMap[emissiveName].toUrl() : QUrl();
-        auto map = fetchTextureMap(url, image::TextureUsage::EMISSIVE_TEXTURE, MapChannel::EMISSIVE_MAP);
-        setTextureMap(MapChannel::EMISSIVE_MAP, map);
-    }
-
-    if (!scatteringName.isEmpty()) {
-        auto url = textureMap.contains(scatteringName) ? textureMap[scatteringName].toUrl() : QUrl();
-        auto map = fetchTextureMap(url, image::TextureUsage::SCATTERING_TEXTURE, MapChannel::SCATTERING_MAP);
-        setTextureMap(MapChannel::SCATTERING_MAP, map);
-    }
-
-    if (!lightmapName.isEmpty()) {
-        auto url = textureMap.contains(lightmapName) ? textureMap[lightmapName].toUrl() : QUrl();
-        auto map = fetchTextureMap(url, image::TextureUsage::LIGHTMAP_TEXTURE, MapChannel::LIGHTMAP_MAP);
-        if (map) {
-            map->setTextureTransform(_lightmapTransform);
-            map->setLightmapOffsetScale(_lightmapParams.x, _lightmapParams.y);
-        }
-        setTextureMap(MapChannel::LIGHTMAP_MAP, map);
-    }
-}
-
-bool NetworkMaterial::isMissingTexture() {
-    for (auto& networkTexture : _textures) {
-        auto& texture = networkTexture.texture;
-        if (!texture) {
-            continue;
-        }
-        // Failed texture downloads need to be considered as 'loaded'
-        // or the object will never fade in
-        bool finished = texture->isFailed() || (texture->isLoaded() && texture->getGPUTexture() && texture->getGPUTexture()->isDefined());
-        if (!finished) {
-            return true;
-        }
-    }
-    return false;
-}
-
-void NetworkMaterial::checkResetOpacityMap() {
-    // If material textures are loaded, check the material translucency
-    // FIXME: This should not be done here.  The opacity map should already be reset in Material::setTextureMap.
-    // However, currently that code can be called before the albedo map is defined, so resetOpacityMap will fail.
-    // Geometry::areTexturesLoaded() is called repeatedly until it returns true, so we do the check here for now
-    const auto& albedoTexture = _textures[NetworkMaterial::MapChannel::ALBEDO_MAP];
-    if (albedoTexture.texture) {
-        resetOpacityMap();
-    }
-}
-
 #include "ModelCache.moc"

libraries/model-networking/src/model-networking/ModelCache.h

@@ -15,17 +15,13 @@
 #include <DependencyManager.h>
 #include <ResourceCache.h>
 
-#include <graphics/Material.h>
 #include <graphics/Asset.h>
 
 #include "FBXSerializer.h"
-#include "TextureCache.h"
+#include <material-networking/MaterialCache.h>
+#include <material-networking/TextureCache.h>
 #include "ModelLoader.h"
 
-// Alias instead of derive to avoid copying
-
-class NetworkTexture;
-class NetworkMaterial;
 class MeshPart;
 
 class GeometryMappingResource;
@@ -49,6 +45,7 @@ public:
     bool isHFMModelLoaded() const { return (bool)_hfmModel; }
 
     const HFMModel& getHFMModel() const { return *_hfmModel; }
+    const MaterialMapping& getMaterialMapping() const { return _materialMapping; }
     const GeometryMeshes& getMeshes() const { return *_meshes; }
     const std::shared_ptr<NetworkMaterial> getShapeMaterial(int shapeID) const;
 
@@ -64,6 +61,7 @@ protected:
 
     // Shared across all geometries, constant throughout lifetime
     std::shared_ptr<const HFMModel> _hfmModel;
+    MaterialMapping _materialMapping;
     std::shared_ptr<const GeometryMeshes> _meshes;
     std::shared_ptr<const GeometryMeshParts> _meshParts;
 
@@ -166,59 +164,6 @@ private:
     ModelLoader _modelLoader;
 };
 
-class NetworkMaterial : public graphics::Material {
-public:
-    using MapChannel = graphics::Material::MapChannel;
-
-    NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
-    NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl);
-    NetworkMaterial(const NetworkMaterial& material);
-
-    void setAlbedoMap(const QUrl& url, bool useAlphaChannel);
-    void setNormalMap(const QUrl& url, bool isBumpmap);
-    void setRoughnessMap(const QUrl& url, bool isGloss);
-    void setMetallicMap(const QUrl& url, bool isSpecular);
-    void setOcclusionMap(const QUrl& url);
-    void setEmissiveMap(const QUrl& url);
-    void setScatteringMap(const QUrl& url);
-    void setLightmapMap(const QUrl& url);
-
-    bool isMissingTexture();
-    void checkResetOpacityMap();
-
-protected:
-    friend class Geometry;
-
-    class Texture {
-    public:
-        QString name;
-        NetworkTexturePointer texture;
-    };
-    using Textures = std::vector<Texture>;
-
-    Textures _textures;
-
-    static const QString NO_TEXTURE;
-    const QString& getTextureName(MapChannel channel);
-
-    void setTextures(const QVariantMap& textureMap);
-
-    const bool& isOriginal() const { return _isOriginal; }
-
-private:
-    // Helpers for the ctors
-    QUrl getTextureUrl(const QUrl& baseUrl, const HFMTexture& hfmTexture);
-    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
-                                             image::TextureUsage::Type type, MapChannel channel);
-    graphics::TextureMapPointer fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel);
-
-    Transform _albedoTransform;
-    Transform _lightmapTransform;
-    vec2 _lightmapParams;
-
-    bool _isOriginal { true };
-};
-
 class MeshPart {
 public:
     MeshPart(int mesh, int part, int material) : meshID { mesh }, partID { part }, materialID { material } {}

libraries/model-networking/src/model-networking/ModelNetworkingLogging.cpp

@@ -8,4 +8,4 @@
 
 #include "ModelNetworkingLogging.h"
 
-Q_LOGGING_CATEGORY(modelnetworking, "hifi.gpu-network")
+Q_LOGGING_CATEGORY(modelnetworking, "hifi.gpu-model-network")

libraries/networking/src/ResourceCache.cpp

@@ -355,7 +355,7 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
         } else if (resourcesWithExtraHash.size() > 0.0f) {
             // We haven't seen this extra info before, but we've already downloaded the resource.  We need a new copy of this object (with any old hash).
             resource = createResourceCopy(resourcesWithExtraHash.begin().value().lock());
-            resource->setExtra(extra);
+            resource->setExtra(extra, true);
             resource->setExtraHash(extraHash);
             resource->setSelf(resource);
             resource->setCache(this);
@@ -375,7 +375,7 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
 
     if (!resource) {
         resource = createResource(url);
-        resource->setExtra(extra);
+        resource->setExtra(extra, false);
         resource->setExtraHash(extraHash);
         resource->setSelf(resource);
         resource->setCache(this);

libraries/networking/src/ResourceCache.h

@@ -360,13 +360,13 @@ class Resource : public QObject {
     Q_OBJECT
 
 public:
-
+    Resource() : QObject(), _loaded(true) {}
     Resource(const Resource& other);
     Resource(const QUrl& url);
     virtual ~Resource();
 
     virtual QString getType() const { return "Resource"; }
-    
+
     /// Returns the key last used to identify this resource in the unused map.
     int getLRUKey() const { return _lruKey; }
 
@@ -375,13 +375,13 @@ public:
 
     /// Sets the load priority for one owner.
     virtual void setLoadPriority(const QPointer<QObject>& owner, float priority);
-    
+
     /// Sets a set of priorities at once.
     virtual void setLoadPriorities(const QHash<QPointer<QObject>, float>& priorities);
-    
+
     /// Clears the load priority for one owner.
     virtual void clearLoadPriority(const QPointer<QObject>& owner);
-    
+
     /// Returns the highest load priority across all owners.
     float getLoadPriority();
 
@@ -417,7 +417,7 @@ public:
     unsigned int getDownloadAttempts() { return _attempts; }
     unsigned int getDownloadAttemptsRemaining() { return _attemptsRemaining; }
 
-    virtual void setExtra(void* extra) {};
+    virtual void setExtra(void* extra, bool isNewExtra) {};
     void setExtraHash(size_t extraHash) { _extraHash = extraHash; }
     size_t getExtraHash() const { return _extraHash; }
 
@@ -491,14 +491,14 @@ protected:
     QWeakPointer<Resource> _self;
     QPointer<ResourceCache> _cache;
 
-    qint64 _bytesReceived{ 0 };
-    qint64 _bytesTotal{ 0 };
-    qint64 _bytes{ 0 };
+    qint64 _bytesReceived { 0 };
+    qint64 _bytesTotal { 0 };
+    qint64 _bytes { 0 };
 
     int _requestID;
-    ResourceRequest* _request{ nullptr };
+    ResourceRequest* _request { nullptr };
 
-    size_t _extraHash;
+    size_t _extraHash { std::numeric_limits<size_t>::max() };
 
 public slots:
     void handleDownloadProgress(uint64_t bytesReceived, uint64_t bytesTotal);

libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h

@@ -57,6 +57,7 @@ protected:
     void internalPresent() override;
     void hmdPresent() override { throw std::runtime_error("Unused"); }
     bool isHmdMounted() const override;
+    bool alwaysPresent() const override { return true; }
 
     static const char* NAME;
     mutable gl::Context* _mainContext{ nullptr };

libraries/physics/CMakeLists.txt

@@ -7,6 +7,7 @@ include_hifi_library_headers(avatars)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(animation)
+include_hifi_library_headers(material-networking)
 include_hifi_library_headers(model-networking)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)

libraries/procedural/CMakeLists.txt

@@ -1,3 +1,4 @@
 set(TARGET_NAME procedural)
 setup_hifi_library()
-link_hifi_libraries(shared gpu shaders networking graphics model-networking ktx image)
+
+link_hifi_libraries(shared gpu shaders networking graphics material-networking ktx image)

libraries/procedural/src/procedural/Procedural.h

@@ -19,8 +19,8 @@
 #include <gpu/Shader.h>
 #include <gpu/Pipeline.h>
 #include <gpu/Batch.h>
-#include <model-networking/ShaderCache.h>
-#include <model-networking/TextureCache.h>
+#include <material-networking/ShaderCache.h>
+#include <material-networking/TextureCache.h>
 
 using UniformLambdas = std::list<std::function<void(gpu::Batch& batch)>>;
 const size_t MAX_PROCEDURAL_TEXTURE_CHANNELS{ 4 };

libraries/recording/src/recording/ClipCache.cpp

@@ -54,5 +54,5 @@ QSharedPointer<Resource> ClipCache::createResource(const QUrl& url) {
 }
 
 QSharedPointer<Resource> ClipCache::createResourceCopy(const QSharedPointer<Resource>& resource) {
-    return QSharedPointer<Resource>(new NetworkClipLoader(*resource.staticCast<NetworkClipLoader>().data()), &Resource::deleter);
+    return QSharedPointer<Resource>(new NetworkClipLoader(*resource.staticCast<NetworkClipLoader>()), &Resource::deleter);
 }

libraries/render-utils/CMakeLists.txt

@@ -3,7 +3,7 @@ set(TARGET_NAME render-utils)
 # 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 task ktx gpu shaders graphics graphics-scripting model-networking render animation fbx image procedural)
+link_hifi_libraries(shared task ktx gpu shaders graphics graphics-scripting material-networking model-networking render animation fbx image procedural)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)

libraries/render-utils/src/Model.cpp

@@ -756,7 +756,16 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
 
             int numParts = (int)mesh->getNumParts();
             for (int partIndex = 0; partIndex < numParts; partIndex++) {
-                result.appendMaterial(graphics::MaterialLayer(getGeometry()->getShapeMaterial(shapeID), 0), shapeID, _modelMeshMaterialNames[shapeID]);
+                auto& materialName = _modelMeshMaterialNames[shapeID];
+                result.appendMaterial(graphics::MaterialLayer(getGeometry()->getShapeMaterial(shapeID), 0), shapeID, materialName);
+
+                auto mappedMaterialIter = _materialMapping.find(shapeID);
+                if (mappedMaterialIter != _materialMapping.end()) {
+                    auto mappedMaterials = mappedMaterialIter->second;
+                    for (auto& mappedMaterial : mappedMaterials) {
+                        result.appendMaterial(mappedMaterial, shapeID, materialName);
+                    }
+                }
                 shapeID++;
             }
         }
@@ -956,6 +965,7 @@ bool Model::addToScene(const render::ScenePointer& scene,
     }
 
     if (somethingAdded) {
+        applyMaterialMapping();
         _addedToScene = true;
         updateRenderItems();
         _needsFixupInScene = false;
@@ -973,6 +983,7 @@ void Model::removeFromScene(const render::ScenePointer& scene, render::Transacti
     _modelMeshRenderItems.clear();
     _modelMeshMaterialNames.clear();
     _modelMeshRenderItemShapes.clear();
+    _priorityMap.clear();
 
     _blendshapeOffsets.clear();
     _blendshapeOffsetsInitialized = false;
@@ -1519,17 +1530,65 @@ std::set<unsigned int> Model::getMeshIDsFromMaterialID(QString parentMaterialNam
     return toReturn;
 }
 
+void Model::applyMaterialMapping() {
+    auto renderItemsKey = _renderItemKeyGlobalFlags;
+    PrimitiveMode primitiveMode = getPrimitiveMode();
+    bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
+
+    auto& materialMapping = getMaterialMapping();
+    for (auto& mapping : materialMapping) {
+        std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(mapping.first.c_str()));
+        auto networkMaterialResource = mapping.second;
+        if (!networkMaterialResource || shapeIDs.size() == 0) {
+            continue;
+        }
+
+        auto materialLoaded = [this, networkMaterialResource, shapeIDs, renderItemsKey, primitiveMode, useDualQuaternionSkinning]() {
+            if (networkMaterialResource->isFailed() || networkMaterialResource->parsedMaterials.names.size() == 0) {
+                return;
+            }
+            render::Transaction transaction;
+            auto networkMaterial = networkMaterialResource->parsedMaterials.networkMaterials[networkMaterialResource->parsedMaterials.names[0]];
+            for (auto shapeID : shapeIDs) {
+                if (shapeID < _modelMeshRenderItemIDs.size()) {
+                    auto itemID = _modelMeshRenderItemIDs[shapeID];
+                    auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
+                    bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
+                    graphics::MaterialLayer material = graphics::MaterialLayer(networkMaterial, ++_priorityMap[shapeID]);
+                    _materialMapping[shapeID].push_back(material);
+                    transaction.updateItem<ModelMeshPartPayload>(itemID, [material, renderItemsKey,
+                            invalidatePayloadShapeKey, primitiveMode, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
+                        data.addMaterial(material);
+                        // if the material changed, we might need to update our item key or shape key
+                        data.updateKey(renderItemsKey);
+                        data.setShapeKey(invalidatePayloadShapeKey, primitiveMode, useDualQuaternionSkinning);
+                    });
+                }
+            }
+            AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+        };
+
+        if (networkMaterialResource->isLoaded()) {
+            materialLoaded();
+        } else {
+            connect(networkMaterialResource.data(), &Resource::finished, materialLoaded);
+        }
+    }
+}
+
 void Model::addMaterial(graphics::MaterialLayer material, const std::string& parentMaterialName) {
     std::set<unsigned int> shapeIDs = getMeshIDsFromMaterialID(QString(parentMaterialName.c_str()));
+
+    auto renderItemsKey = _renderItemKeyGlobalFlags;
+    PrimitiveMode primitiveMode = getPrimitiveMode();
+    bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
+
     render::Transaction transaction;
     for (auto shapeID : shapeIDs) {
         if (shapeID < _modelMeshRenderItemIDs.size()) {
             auto itemID = _modelMeshRenderItemIDs[shapeID];
-            auto renderItemsKey = _renderItemKeyGlobalFlags;
-            PrimitiveMode primitiveMode = getPrimitiveMode();
             auto meshIndex = _modelMeshRenderItemShapes[shapeID].meshIndex;
             bool invalidatePayloadShapeKey = shouldInvalidatePayloadShapeKey(meshIndex);
-            bool useDualQuaternionSkinning = _useDualQuaternionSkinning;
             transaction.updateItem<ModelMeshPartPayload>(itemID, [material, renderItemsKey,
                 invalidatePayloadShapeKey, primitiveMode, useDualQuaternionSkinning](ModelMeshPartPayload& data) {
                 data.addMaterial(material);

libraries/render-utils/src/Model.h

@@ -183,6 +183,7 @@ public:
     /// Provided as a convenience, will crash if !isLoaded()
     // And so that getHFMModel() isn't chained everywhere
     const HFMModel& getHFMModel() const { assert(isLoaded()); return _renderGeometry->getHFMModel(); }
+    const MaterialMapping& getMaterialMapping() const { assert(isLoaded()); return _renderGeometry->getMaterialMapping(); }
 
     bool isActive() const { return isLoaded(); }
 
@@ -373,6 +374,10 @@ signals:
 
 protected:
 
+    std::unordered_map<unsigned int, quint16> _priorityMap; // only used for materialMapping
+    std::unordered_map<unsigned int, std::vector<graphics::MaterialLayer>> _materialMapping; // generated during applyMaterialMapping
+    void applyMaterialMapping();
+
     void setBlendshapeCoefficients(const QVector<float>& coefficients) { _blendshapeCoefficients = coefficients; }
     const QVector<float>& getBlendshapeCoefficients() const { return _blendshapeCoefficients; }
 

libraries/render-utils/src/RenderCommonTask.cpp

@@ -101,7 +101,7 @@ void DrawLayered3D::run(const RenderContextPointer& renderContext, const Inputs&
     }
 }
 
-void CompositeHUD::run(const RenderContextPointer& renderContext) {
+void CompositeHUD::run(const RenderContextPointer& renderContext, const gpu::FramebufferPointer& inputs) {
     assert(renderContext->args);
     assert(renderContext->args->_context);
 
@@ -119,6 +119,9 @@ void CompositeHUD::run(const RenderContextPointer& renderContext) {
         renderContext->args->getViewFrustum().evalViewTransform(viewMat);
         batch.setProjectionTransform(projMat);
         batch.setViewTransform(viewMat, true);
+        if (inputs) {
+            batch.setFramebuffer(inputs);
+        }
         if (renderContext->args->_hudOperator) {
             renderContext->args->_hudOperator(batch, renderContext->args->_hudTexture, renderContext->args->_renderMode == RenderArgs::RenderMode::MIRROR_RENDER_MODE);
         }
@@ -197,7 +200,73 @@ void Blit::run(const RenderContextPointer& renderContext, const gpu::Framebuffer
     });
 }
 
-void ExtractFrustums::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& output) {
+
+void ResolveFramebuffer::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    RenderArgs* args = renderContext->args;
+    auto srcFbo = inputs.get0();
+    auto destFbo = inputs.get1();
+
+    if (!destFbo) {
+        destFbo = args->_blitFramebuffer;
+    }
+    outputs = destFbo;
+
+    // Check valid src and dest
+    if (!srcFbo || !destFbo) {
+        return;
+    }
+    
+    // Check valid size for sr and dest
+    auto frameSize(srcFbo->getSize());
+    if (destFbo->getSize() != frameSize) {
+        return;
+    }
+
+    gpu::Vec4i rectSrc;
+    rectSrc.z = frameSize.x;
+    rectSrc.w = frameSize.y;
+    gpu::doInBatch("Resolve", args->_context, [&](gpu::Batch& batch) { 
+        batch.blit(srcFbo, rectSrc, destFbo, rectSrc);
+    });
+}
+
+void ResolveNewFramebuffer::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    RenderArgs* args = renderContext->args;
+    auto srcFbo = inputs;
+    outputs.reset();
+
+    // Check valid src
+    if (!srcFbo) {
+        return;
+    }
+
+    // Check valid size for sr and dest
+    auto frameSize(srcFbo->getSize());
+
+    // Resizing framebuffers instead of re-building them seems to cause issues with threaded rendering
+    if (_outputFramebuffer && _outputFramebuffer->getSize() != frameSize) {
+        _outputFramebuffer.reset();
+    }
+
+    if (!_outputFramebuffer) {
+        _outputFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("resolvedNew.out"));
+        auto colorFormat = gpu::Element::COLOR_SRGBA_32;
+        auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR);
+        auto colorTexture = gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler);
+        _outputFramebuffer->setRenderBuffer(0, colorTexture);
+    }
+
+    gpu::Vec4i rectSrc;
+    rectSrc.z = frameSize.x;
+    rectSrc.w = frameSize.y;
+    gpu::doInBatch("ResolveNew", args->_context, [&](gpu::Batch& batch) { batch.blit(srcFbo, rectSrc, _outputFramebuffer, rectSrc); });
+
+    outputs = _outputFramebuffer;
+}
+
+
+
+ void ExtractFrustums::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& output) {
     assert(renderContext->args);
     assert(renderContext->args->_context);
 

libraries/render-utils/src/RenderCommonTask.h

@@ -77,10 +77,12 @@ protected:
 
 class CompositeHUD {
 public:
-    using JobModel = render::Job::Model<CompositeHUD>;
+    // IF specified the input Framebuffer is actively set by the batch of this job before calling the HUDOperator.
+    // If not, the current Framebuffer is left unchanged.
+    //using Inputs = gpu::FramebufferPointer;
+    using JobModel = render::Job::ModelI<CompositeHUD, gpu::FramebufferPointer>;
 
-    CompositeHUD() {}
-    void run(const render::RenderContextPointer& renderContext);
+    void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& inputs);
 };
 
 class Blit {
@@ -90,6 +92,28 @@ public:
     void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& srcFramebuffer);
 };
 
+
+class ResolveFramebuffer {
+public:
+    using Inputs = render::VaryingSet2<gpu::FramebufferPointer, gpu::FramebufferPointer>;
+    using Outputs = gpu::FramebufferPointer;
+    using JobModel = render::Job::ModelIO<ResolveFramebuffer, Inputs, Outputs>;
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& source, Outputs& dest);
+};
+
+class ResolveNewFramebuffer {
+public:
+    using Inputs = gpu::FramebufferPointer;
+    using Outputs = gpu::FramebufferPointer;
+    using JobModel = render::Job::ModelIO<ResolveNewFramebuffer, Inputs, Outputs>;
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& source, Outputs& dest);
+private:
+    gpu::FramebufferPointer _outputFramebuffer;
+};
+
+
 class ExtractFrustums {
 public:
 

libraries/render-utils/src/RenderDeferredTask.cpp

@@ -257,8 +257,8 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     // Upscale to finale resolution
     const auto primaryFramebuffer = task.addJob<render::Upsample>("PrimaryBufferUpscale", scaledPrimaryFramebuffer);
 
-    // Composite the HUD and HUD layered objects
-    task.addJob<CompositeHUD>("HUD");
+    // Composite the HUD and HUD overlays
+    task.addJob<CompositeHUD>("HUD", primaryFramebuffer);
 
     const auto nullJitter = Varying(glm::vec2(0.0f, 0.0f));
     const auto hudOpaquesInputs = DrawLayered3D::Inputs(hudOpaque, lightingModel, nullJitter).asVarying();

libraries/render-utils/src/RenderForwardTask.cpp

@@ -126,14 +126,24 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
         task.addJob<DebugZoneLighting>("DrawZoneStack", debugZoneInputs);
     }
 
+    // Just resolve the msaa
+    const auto resolveInputs =
+        ResolveFramebuffer::Inputs(framebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
+    const auto resolvedFramebuffer = task.addJob<ResolveFramebuffer>("Resolve", resolveInputs);
+    //auto resolvedFramebuffer = task.addJob<ResolveNewFramebuffer>("Resolve", framebuffer);
+
+#if defined(Q_OS_ANDROID)
+#else
     // Lighting Buffer ready for tone mapping
     // Forward rendering on GLES doesn't support tonemapping to and from the same FBO, so we specify 
     // the output FBO as null, which causes the tonemapping to target the blit framebuffer
-    const auto toneMappingInputs = ToneMappingDeferred::Inputs(framebuffer, static_cast<gpu::FramebufferPointer>(nullptr) ).asVarying();
+    const auto toneMappingInputs = ToneMappingDeferred::Inputs(resolvedFramebuffer, static_cast<gpu::FramebufferPointer>(nullptr)).asVarying();
     task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
+#endif
 
-    // Composite the HUD and HUD layered objects
-    task.addJob<CompositeHUD>("HUD");
+    // Layered Overlays
+    // Composite the HUD and HUD overlays
+    task.addJob<CompositeHUD>("HUD", resolvedFramebuffer);
 
     const auto hudOpaquesInputs = DrawLayered3D::Inputs(hudOpaque, lightingModel, nullJitter).asVarying();
     const auto hudTransparentsInputs = DrawLayered3D::Inputs(hudTransparent, lightingModel, nullJitter).asVarying();
@@ -145,26 +155,32 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
     // task.addJob<Blit>("Blit", framebuffer);
 }
 
+void PrepareFramebuffer::configure(const Config& config) {
+    _numSamples = config.getNumSamples();
+}
+
 void PrepareFramebuffer::run(const RenderContextPointer& renderContext, gpu::FramebufferPointer& framebuffer) {
     glm::uvec2 frameSize(renderContext->args->_viewport.z, renderContext->args->_viewport.w);
 
     // Resizing framebuffers instead of re-building them seems to cause issues with threaded rendering
-    if (_framebuffer && _framebuffer->getSize() != frameSize) {
+    if (_framebuffer && (_framebuffer->getSize() != frameSize || _framebuffer->getNumSamples() != _numSamples)) {
         _framebuffer.reset();
     }
 
     if (!_framebuffer) {
         _framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("forward"));
 
+        int numSamples = _numSamples;
+
         auto colorFormat = gpu::Element::COLOR_SRGBA_32;
-        auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
+        auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR);
         auto colorTexture =
-            gpu::Texture::createRenderBuffer(colorFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler);
+            gpu::Texture::createRenderBufferMultisample(colorFormat, frameSize.x, frameSize.y, numSamples, defaultSampler);
         _framebuffer->setRenderBuffer(0, colorTexture);
 
         auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL);  // Depth24_Stencil8 texel format
         auto depthTexture =
-            gpu::Texture::createRenderBuffer(depthFormat, frameSize.x, frameSize.y, gpu::Texture::SINGLE_MIP, defaultSampler);
+           gpu::Texture::createRenderBufferMultisample(depthFormat, frameSize.x, frameSize.y, numSamples, defaultSampler);
         _framebuffer->setDepthStencilBuffer(depthTexture, depthFormat);
     }
 

libraries/render-utils/src/RenderForwardTask.h

@@ -27,16 +27,37 @@ public:
     void build(JobModel& task, const render::Varying& input, render::Varying& output);
 };
 
+
+class PrepareFramebufferConfig : public render::Job::Config {
+    Q_OBJECT
+    Q_PROPERTY(int numSamples WRITE setNumSamples READ getNumSamples NOTIFY dirty)
+public:
+    int getNumSamples() const { return numSamples; }
+    void setNumSamples(int num) {
+        numSamples = std::max(1, std::min(32, num));
+        emit dirty();
+    }
+
+signals:
+    void dirty();
+
+protected:
+    int numSamples{ 4 };
+};
+
 class PrepareFramebuffer {
 public:
     using Inputs = gpu::FramebufferPointer;
-    using JobModel = render::Job::ModelO<PrepareFramebuffer, Inputs>;
+    using Config = PrepareFramebufferConfig;
+    using JobModel = render::Job::ModelO<PrepareFramebuffer, Inputs, Config>;
 
+    void configure(const Config& config);
     void run(const render::RenderContextPointer& renderContext,
             gpu::FramebufferPointer& framebuffer);
 
 private:
     gpu::FramebufferPointer _framebuffer;
+    int _numSamples;
 };
 
 class PrepareForward {

libraries/render-utils/src/RenderPipelines.cpp

@@ -15,7 +15,7 @@
 #include <functional>
 
 #include <gpu/Context.h>
-#include <model-networking/TextureCache.h>
+#include <material-networking/TextureCache.h>
 #include <render/DrawTask.h>
 #include <shaders/Shaders.h>
 #include <graphics/ShaderConstants.h>

libraries/render-utils/src/TextureCache.h

@@ -1,2 +1,2 @@
 // Compatibility
-#include <model-networking/TextureCache.h>
+#include <material-networking/TextureCache.h>

libraries/script-engine/CMakeLists.txt

@@ -17,6 +17,6 @@ if (NOT ANDROID)
 
 endif ()
 
-link_hifi_libraries(shared networking octree shaders gpu procedural graphics model-networking ktx recording avatars fbx hfm entities controllers animation audio physics image midi)
+link_hifi_libraries(shared networking octree shaders gpu procedural graphics material-networking model-networking ktx recording avatars fbx hfm entities controllers animation audio physics image midi)
 # ui includes gl, but link_hifi_libraries does not use transitive includes, so gl must be explicit
 include_hifi_library_headers(gl)

plugins/openvr/CMakeLists.txt

@@ -11,7 +11,7 @@ if (WIN32 AND (NOT USE_GLES))
     setup_hifi_plugin(Gui Qml Multimedia)
     link_hifi_libraries(shared task gl qml networking controllers ui 
         plugins display-plugins ui-plugins input-plugins script-engine
-        audio-client render-utils graphics shaders gpu render model-networking model-baker hfm fbx ktx image procedural ${PLATFORM_GL_BACKEND})
+        audio-client render-utils graphics shaders gpu render material-networking model-networking model-baker hfm fbx ktx image procedural ${PLATFORM_GL_BACKEND})
     include_hifi_library_headers(octree)
 
     target_openvr()

scripts/system/html/js/marketplacesInject.js

@@ -1,744 +0,0 @@
-/* global $, window, MutationObserver */
-
-//
-//  marketplacesInject.js
-//
-//  Created by David Rowe on 12 Nov 2016.
-//  Copyright 2016 High Fidelity, Inc.
-//
-//  Injected into marketplace Web pages.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function () {
-    // Event bridge messages.
-    var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
-    var CLARA_IO_STATUS = "CLARA.IO STATUS";
-    var CLARA_IO_CANCEL_DOWNLOAD = "CLARA.IO CANCEL DOWNLOAD";
-    var CLARA_IO_CANCELLED_DOWNLOAD = "CLARA.IO CANCELLED DOWNLOAD";
-    var GOTO_DIRECTORY = "GOTO_DIRECTORY";
-    var GOTO_MARKETPLACE = "GOTO_MARKETPLACE";
-    var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
-    var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
-    var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
-
-    var canWriteAssets = false;
-    var xmlHttpRequest = null;
-    var isPreparing = false; // Explicitly track download request status.
-
-    var limitedCommerce = false;
-    var commerceMode = false;
-    var userIsLoggedIn = false;
-    var walletNeedsSetup = false;
-    var marketplaceBaseURL = "https://highfidelity.com";
-    var messagesWaiting = false;
-
-    function injectCommonCode(isDirectoryPage) {
-        // Supporting styles from marketplaces.css.
-        // Glyph font family, size, and spacing adjusted because HiFi-Glyphs cannot be used cross-domain.
-        $("head").append(
-            '<style>' +
-                '#marketplace-navigation { font-family: Arial, Helvetica, sans-serif; width: 100%; height: 50px; background: #00b4ef; position: fixed; bottom: 0; z-index: 1000; }' +
-                '#marketplace-navigation .glyph { margin-left: 10px; margin-right: 3px; font-family: sans-serif; color: #fff; font-size: 24px; line-height: 50px; }' +
-                '#marketplace-navigation .text { color: #fff; font-size: 16px; line-height: 50px; vertical-align: top; position: relative; top: 1px; }' +
-                '#marketplace-navigation input#back-button { position: absolute; left: 20px; margin-top: 12px; padding-left: 0; padding-right: 5px; }' +
-                '#marketplace-navigation input#all-markets { position: absolute; right: 20px; margin-top: 12px; padding-left: 15px; padding-right: 15px; }' +
-                '#marketplace-navigation .right { position: absolute; right: 20px; }' +
-            '</style>'
-        );
-
-        // Supporting styles from edit-style.css.
-        // Font family, size, and position adjusted because Raleway-Bold cannot be used cross-domain.
-        $("head").append(
-            '<style>' +
-                'input[type=button] { font-family: Arial, Helvetica, sans-serif; font-weight: bold; font-size: 12px; text-transform: uppercase; vertical-align: center; height: 28px; min-width: 100px; padding: 0 15px; border-radius: 5px; border: none; color: #fff; background-color: #000; background: linear-gradient(#343434 20%, #000 100%); cursor: pointer; }' +
-                'input[type=button].white { color: #121212; background-color: #afafaf; background: linear-gradient(#fff 20%, #afafaf 100%); }' +
-                'input[type=button].white:enabled:hover { background: linear-gradient(#fff, #fff); border: none; }' +
-                'input[type=button].white:active { background: linear-gradient(#afafaf, #afafaf); }' +
-            '</style>'
-        );
-
-        // Footer.
-        var isInitialHiFiPage = location.href === (marketplaceBaseURL + "/marketplace?");
-        $("body").append(
-            '<div id="marketplace-navigation">' +
-                (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
-                (isInitialHiFiPage ? '<span class="glyph">&#x1f6c8;</span> <span class="text">Get items from Clara.io!</span>' : '') +
-                (!isDirectoryPage ? '<input id="all-markets" type="button" class="white" value="See All Markets" />' : '') +
-                (isDirectoryPage ? '<span class="right"><span class="glyph">&#x1f6c8;</span> <span class="text">Select a marketplace to explore.</span><span>' : '') +
-            '</div>'
-        );
-
-        // Footer actions.
-        $("#back-button").on("click", function () {
-            if (document.referrer !== "") {
-                window.history.back();
-            } else {
-                var params = { type: GOTO_MARKETPLACE };
-                var itemIdMatch = location.search.match(/itemId=([^&]*)/);
-                if (itemIdMatch && itemIdMatch.length === 2) {
-                    params.itemId = itemIdMatch[1];
-                }
-                EventBridge.emitWebEvent(JSON.stringify(params));
-            }
-        });
-        $("#all-markets").on("click", function () {
-            EventBridge.emitWebEvent(JSON.stringify({
-                type: GOTO_DIRECTORY
-            }));
-        });
-    }
-
-    function injectDirectoryCode() {
-
-        // Remove e-mail hyperlink.
-        var letUsKnow = $("#letUsKnow");
-        letUsKnow.replaceWith(letUsKnow.html());
-
-        // Add button links.
-
-        $('#exploreClaraMarketplace').on('click', function () {
-            window.location = "https://clara.io/library?gameCheck=true&public=true";
-        });
-        $('#exploreHifiMarketplace').on('click', function () {
-            EventBridge.emitWebEvent(JSON.stringify({
-                type: GOTO_MARKETPLACE
-            }));
-        });
-    }
-
-    emitWalletSetupEvent = function () {
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: "WALLET_SETUP"
-        }));
-    };
-
-    function maybeAddSetupWalletButton() {
-        if (!$('body').hasClass("walletsetup-injected") && userIsLoggedIn && walletNeedsSetup) {
-            $('body').addClass("walletsetup-injected");
-
-            var resultsElement = document.getElementById('results');
-            var setupWalletElement = document.createElement('div');
-            setupWalletElement.classList.add("row");
-            setupWalletElement.id = "setupWalletDiv";
-            setupWalletElement.style = "height:60px;margin:20px 10px 10px 10px;padding:12px 5px;" +
-                "background-color:#D6F4D8;border-color:#aee9b2;border-width:2px;border-style:solid;border-radius:5px;";
-
-            var span = document.createElement('span');
-            span.style = "margin:10px 5px;color:#1b6420;font-size:15px;";
-            span.innerHTML = "<a href='#' onclick='emitWalletSetupEvent(); return false;'>Activate your Wallet</a> to get money and shop in Marketplace.";
-
-            var xButton = document.createElement('a');
-            xButton.id = "xButton";
-            xButton.setAttribute('href', "#");
-            xButton.style = "width:50px;height:100%;margin:0;color:#ccc;font-size:20px;";
-            xButton.innerHTML = "X";
-            xButton.onclick = function () {
-                setupWalletElement.remove();
-                dummyRow.remove();
-            };
-
-            setupWalletElement.appendChild(span);
-            setupWalletElement.appendChild(xButton);
-
-            resultsElement.insertBefore(setupWalletElement, resultsElement.firstChild);
-
-            // Dummy row for padding
-            var dummyRow = document.createElement('div');
-            dummyRow.classList.add("row");
-            dummyRow.style = "height:15px;";
-            resultsElement.insertBefore(dummyRow, resultsElement.firstChild);
-        }
-    }
-
-    function maybeAddLogInButton() {
-        if (!$('body').hasClass("login-injected") && !userIsLoggedIn) {
-            $('body').addClass("login-injected");
-            var resultsElement = document.getElementById('results');
-            if (!resultsElement) { // If we're on the main page, this will evaluate to `true`
-                resultsElement = document.getElementById('item-show');
-                resultsElement.style = 'margin-top:0;';
-            }
-            var logInElement = document.createElement('div');
-            logInElement.classList.add("row");
-            logInElement.id = "logInDiv";
-            logInElement.style = "height:60px;margin:20px 10px 10px 10px;padding:5px;" +
-                "background-color:#D6F4D8;border-color:#aee9b2;border-width:2px;border-style:solid;border-radius:5px;";
-
-            var button = document.createElement('a');
-            button.classList.add("btn");
-            button.classList.add("btn-default");
-            button.id = "logInButton";
-            button.setAttribute('href', "#");
-            button.innerHTML = "LOG IN";
-            button.style = "width:80px;height:100%;margin-top:0;margin-left:10px;padding:13px;font-weight:bold;background:linear-gradient(white, #ccc);";
-            button.onclick = function () {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: "LOGIN"
-                }));
-            };
-
-            var span = document.createElement('span');
-            span.style = "margin:10px;color:#1b6420;font-size:15px;";
-            span.innerHTML = "to get items from the Marketplace.";
-
-            var xButton = document.createElement('a');
-            xButton.id = "xButton";
-            xButton.setAttribute('href', "#");
-            xButton.style = "width:50px;height:100%;margin:0;color:#ccc;font-size:20px;";
-            xButton.innerHTML = "X";
-            xButton.onclick = function () {
-                logInElement.remove();
-                dummyRow.remove();
-            };
-
-            logInElement.appendChild(button);
-            logInElement.appendChild(span);
-            logInElement.appendChild(xButton);
-
-            resultsElement.insertBefore(logInElement, resultsElement.firstChild);
-
-            // Dummy row for padding
-            var dummyRow = document.createElement('div');
-            dummyRow.classList.add("row");
-            dummyRow.style = "height:15px;";
-            resultsElement.insertBefore(dummyRow, resultsElement.firstChild);
-        }
-    }
-
-    function changeDropdownMenu() {
-        var logInOrOutButton = document.createElement('a');
-        logInOrOutButton.id = "logInOrOutButton";
-        logInOrOutButton.setAttribute('href', "#");
-        logInOrOutButton.innerHTML = userIsLoggedIn ? "Log Out" : "Log In";
-        logInOrOutButton.onclick = function () {
-            EventBridge.emitWebEvent(JSON.stringify({
-                type: "LOGIN"
-            }));
-        };
-
-        $($('.dropdown-menu').find('li')[0]).append(logInOrOutButton);
-
-        $('a[href="/marketplace?view=mine"]').each(function () {
-            $(this).attr('href', '#');
-            $(this).on('click', function () {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: "MY_ITEMS"
-                }));
-            });
-        });
-    }
-
-    function buyButtonClicked(id, referrer, edition) {
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: "CHECKOUT",
-            itemId: id,
-            referrer: referrer,
-            itemEdition: edition
-        }));
-    }
-
-    function injectBuyButtonOnMainPage() {
-        var cost;
-
-        // Unbind original mouseenter and mouseleave behavior
-        $('body').off('mouseenter', '#price-or-edit .price');
-        $('body').off('mouseleave', '#price-or-edit .price');
-
-        $('.grid-item').find('#price-or-edit').each(function () {
-            $(this).css({ "margin-top": "0" });
-        });
-
-        $('.grid-item').find('#price-or-edit').find('a').each(function() {
-            if ($(this).attr('href') !== '#') { // Guard necessary because of the AJAX nature of Marketplace site
-                $(this).attr('data-href', $(this).attr('href'));
-                $(this).attr('href', '#');
-            }
-            cost = $(this).closest('.col-xs-3').find('.item-cost').text();
-            var costInt = parseInt(cost, 10);
-
-            $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
-            $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
-
-            var priceElement = $(this).find('.price');
-            var available = true;
-
-            if (priceElement.text() === 'invalidated' ||
-                priceElement.text() === 'sold out' ||
-                priceElement.text() === 'not for sale') {
-                available = false;
-                priceElement.css({
-                    "padding": "3px 5px 10px 5px",
-                    "height": "40px",
-                    "background": "linear-gradient(#a2a2a2, #fefefe)",
-                    "color": "#000",
-                    "font-weight": "600",
-                    "line-height": "34px"
-                });
-            } else {
-                priceElement.css({
-                    "padding": "3px 5px",
-                    "height": "40px",
-                    "background": "linear-gradient(#00b4ef, #0093C5)",
-                    "color": "#FFF",
-                    "font-weight": "600",
-                    "line-height": "34px"
-                });
-            }
-
-            if (parseInt(cost) > 0) {
-                priceElement.css({ "width": "auto" });
-
-                if (available) {
-                    priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
-                        'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
-                }
-                
-                priceElement.css({ "min-width": priceElement.width() + 30 });
-            }
-        });
-
-        // change pricing to GET/BUY on button hover
-        $('body').on('mouseenter', '#price-or-edit .price', function () {
-            var $this = $(this);
-            var buyString = "BUY";
-            var getString = "GET";
-            // Protection against the button getting stuck in the "BUY"/"GET" state.
-            // That happens when the browser gets two MOUSEENTER events before getting a
-            // MOUSELEAVE event. Also, if not available for sale, just return.
-            if ($this.text() === buyString ||
-                $this.text() === getString ||
-                $this.text() === 'invalidated' ||
-                $this.text() === 'sold out' ||
-                $this.text() === 'not for sale' ) {
-                return;
-            }
-            $this.data('initialHtml', $this.html());
-
-            var cost = $(this).parent().siblings().text();
-            if (parseInt(cost) > 0) {
-                $this.text(buyString);
-            }
-            if (parseInt(cost) == 0) {
-                $this.text(getString);
-            }
-        });
-
-        $('body').on('mouseleave', '#price-or-edit .price', function () {
-            var $this = $(this);
-            $this.html($this.data('initialHtml'));
-        });
-
-
-        $('.grid-item').find('#price-or-edit').find('a').on('click', function () {
-            var price = $(this).closest('.grid-item').find('.price').text();
-            if (price === 'invalidated' ||
-                price === 'sold out' ||
-                price === 'not for sale') {
-                return false;
-            }
-            buyButtonClicked($(this).closest('.grid-item').attr('data-item-id'),
-                "mainPage",
-                -1);
-        });
-    }
-
-    function injectUnfocusOnSearch() {
-        // unfocus input field on search, thus hiding virtual keyboard
-        $('#search-box').on('submit', function () {
-            if (document.activeElement) {
-                document.activeElement.blur();
-            }
-        });
-    }
-
-    // fix for 10108 - marketplace category cannot scroll
-    function injectAddScrollbarToCategories() {
-        $('#categories-dropdown').on('show.bs.dropdown', function () {
-            $('body > div.container').css('display', 'none')
-            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': 'auto', 'height': 'calc(100vh - 110px)' });
-        });
-
-        $('#categories-dropdown').on('hide.bs.dropdown', function () {
-            $('body > div.container').css('display', '');
-            $('#categories-dropdown > ul.dropdown-menu').css({ 'overflow': '', 'height': '' });
-        });
-    }
-
-    function injectHiFiCode() {
-        if (commerceMode) {
-            maybeAddLogInButton();
-            maybeAddSetupWalletButton();
-
-            if (!$('body').hasClass("code-injected")) {
-
-                $('body').addClass("code-injected");
-                changeDropdownMenu();
-
-                var target = document.getElementById('templated-items');
-                // MutationObserver is necessary because the DOM is populated after the page is loaded.
-                // We're searching for changes to the element whose ID is '#templated-items' - this is
-                //     the element that gets filled in by the AJAX.
-                var observer = new MutationObserver(function (mutations) {
-                    mutations.forEach(function (mutation) {
-                        injectBuyButtonOnMainPage();
-                    });
-                });
-                var config = { attributes: true, childList: true, characterData: true };
-                observer.observe(target, config);
-
-                // Try this here in case it works (it will if the user just pressed the "back" button,
-                //     since that doesn't trigger another AJAX request.
-                injectBuyButtonOnMainPage();
-            }
-        }
-
-        injectUnfocusOnSearch();
-        injectAddScrollbarToCategories();
-    }
-
-    function injectHiFiItemPageCode() {
-        if (commerceMode) {
-            maybeAddLogInButton();
-
-            if (!$('body').hasClass("code-injected")) {
-
-                $('body').addClass("code-injected");
-                changeDropdownMenu();
-
-                var purchaseButton = $('#side-info').find('.btn').first();
-
-                var href = purchaseButton.attr('href');
-                purchaseButton.attr('href', '#');
-                var cost = $('.item-cost').text();
-                var costInt = parseInt(cost, 10);
-                var availability = $.trim($('.item-availability').text());
-                if (limitedCommerce && (costInt > 0)) {
-                    availability = '';
-                }
-                if (availability === 'available') {
-                    purchaseButton.css({
-                        "background": "linear-gradient(#00b4ef, #0093C5)",
-                        "color": "#FFF",
-                        "font-weight": "600",
-                        "padding-bottom": "10px"
-                    });
-                } else {
-                    purchaseButton.css({
-                        "background": "linear-gradient(#a2a2a2, #fefefe)",
-                        "color": "#000",
-                        "font-weight": "600",
-                        "padding-bottom": "10px"
-                    });
-                }
-
-                var type = $('.item-type').text();
-                var isUpdating = window.location.href.indexOf('edition=') > -1;
-                var urlParams = new URLSearchParams(window.location.search);
-                if (isUpdating) {
-                    purchaseButton.html('UPDATE FOR FREE');
-                } else if (availability !== 'available') {
-                    purchaseButton.html('UNAVAILABLE ' + (availability ? ('(' + availability + ')') : ''));
-                } else if (parseInt(cost) > 0 && $('#side-info').find('#buyItemButton').size() === 0) {
-                    purchaseButton.html('PURCHASE <span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
-                        'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
-                }
-
-                purchaseButton.on('click', function () {
-                    if ('available' === availability || isUpdating) {
-                        buyButtonClicked(window.location.pathname.split("/")[3],
-                            "itemPage",
-                            urlParams.get('edition'));
-                    }
-                });
-            }
-        }
-
-        injectUnfocusOnSearch();
-    }
-
-    function updateClaraCode() {
-        // Have to repeatedly update Clara page because its content can change dynamically without location.href changing.
-
-        // Clara library page.
-        if (location.href.indexOf("clara.io/library") !== -1) {
-            // Make entries navigate to "Image" view instead of default "Real Time" view.
-            var elements = $("a.thumbnail");
-            for (var i = 0, length = elements.length; i < length; i++) {
-                var value = elements[i].getAttribute("href");
-                if (value.slice(-6) !== "/image") {
-                    elements[i].setAttribute("href", value + "/image");
-                }
-            }
-        }
-
-        // Clara item page.
-        if (location.href.indexOf("clara.io/view/") !== -1) {
-            // Make site navigation links retain gameCheck etc. parameters.
-            var element = $("a[href^=\'/library\']")[0];
-            var parameters = "?gameCheck=true&public=true";
-            var href = element.getAttribute("href");
-            if (href.slice(-parameters.length) !== parameters) {
-                element.setAttribute("href", href + parameters);
-            }
-
-            // Remove unwanted buttons and replace download options with a single "Download to High Fidelity" button.
-            var buttons = $("a.embed-button").parent("div");
-            var downloadFBX;
-            if (buttons.find("div.btn-group").length > 0) {
-                buttons.children(".btn-primary, .btn-group , .embed-button").each(function () { this.remove(); });
-                if ($("#hifi-download-container").length === 0) {  // Button hasn't been moved already.
-                    downloadFBX = $('<a class="btn btn-primary"><i class=\'glyphicon glyphicon-download-alt\'></i> Download to High Fidelity</a>');
-                    buttons.prepend(downloadFBX);
-                    downloadFBX[0].addEventListener("click", startAutoDownload);
-                }
-            }
-
-            // Move the "Download to High Fidelity" button to be more visible on tablet.
-            if ($("#hifi-download-container").length === 0 && window.innerWidth < 700) {
-                var downloadContainer = $('<div id="hifi-download-container"></div>');
-                $(".top-title .col-sm-4").append(downloadContainer);
-                downloadContainer.append(downloadFBX);
-            }
-        }
-    }
-
-    // Automatic download to High Fidelity.
-    function startAutoDownload() {
-        // One file request at a time.
-        if (isPreparing) {
-            console.log("WARNING: Clara.io FBX: Prepare only one download at a time");
-            return;
-        }
-
-        // User must be able to write to Asset Server.
-        if (!canWriteAssets) {
-            console.log("ERROR: Clara.io FBX: File download cancelled because no permissions to write to Asset Server");
-            EventBridge.emitWebEvent(JSON.stringify({
-                type: WARN_USER_NO_PERMISSIONS
-            }));
-            return;
-        }
-
-        // User must be logged in.
-        var loginButton = $("#topnav a[href='/signup']");
-        if (loginButton.length > 0) {
-            loginButton[0].click();
-            return;
-        }
-
-        // Obtain zip file to download for requested asset.
-        // Reference: https://clara.io/learn/sdk/api/export
-
-        //var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?zip=true&centerScene=true&alignSceneGround=true&fbxUnit=Meter&fbxVersion=7&fbxEmbedTextures=true&imageFormat=WebGL";
-        // 13 Jan 2017: Specify FBX version 5 and remove some options in order to make Clara.io site more likely to
-        // be successful in generating zip files.
-        var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?fbxUnit=Meter&fbxVersion=5&fbxEmbedTextures=true&imageFormat=WebGL";
-
-        var uuid = location.href.match(/\/view\/([a-z0-9\-]*)/)[1];
-        var url = XMLHTTPREQUEST_URL.replace("{uuid}", uuid);
-
-        xmlHttpRequest = new XMLHttpRequest();
-        var responseTextIndex = 0;
-        var zipFileURL = "";
-
-        xmlHttpRequest.onreadystatechange = function () {
-            // Messages are appended to responseText; process the new ones.
-            var message = this.responseText.slice(responseTextIndex);
-            var statusMessage = "";
-
-            if (isPreparing) {  // Ignore messages in flight after finished/cancelled.
-                var lines = message.split(/[\n\r]+/);
-
-                for (var i = 0, length = lines.length; i < length; i++) {
-                    if (lines[i].slice(0, 5) === "data:") {
-                        // Parse line.
-                        var data;
-                        try {
-                            data = JSON.parse(lines[i].slice(5));
-                        }
-                        catch (e) {
-                            data = {};
-                        }
-
-                        // Extract zip file URL.
-                        if (data.hasOwnProperty("files") && data.files.length > 0) {
-                            zipFileURL = data.files[0].url;
-                        }
-                    }
-                }
-
-                if (statusMessage !== "") {
-                    // Update the UI with the most recent status message.
-                    EventBridge.emitWebEvent(JSON.stringify({
-                        type: CLARA_IO_STATUS,
-                        status: statusMessage
-                    }));
-                }
-            }
-
-            responseTextIndex = this.responseText.length;
-        };
-
-        // Note: onprogress doesn't have computable total length so can't use it to determine % complete.
-
-        xmlHttpRequest.onload = function () {
-            var statusMessage = "";
-
-            if (!isPreparing) {
-                return;
-            }
-
-            isPreparing = false;
-
-            var HTTP_OK = 200;
-            if (this.status !== HTTP_OK) {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: CLARA_IO_STATUS,
-                    status: statusMessage
-                }));
-            } else if (zipFileURL.slice(-4) !== ".zip") {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: CLARA_IO_STATUS,
-                    status: (statusMessage + ": " + zipFileURL)
-                }));
-            } else {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: CLARA_IO_DOWNLOAD
-                }));
-            }
-
-            xmlHttpRequest = null;
-        }
-
-        isPreparing = true;
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: CLARA_IO_STATUS,
-            status: "Initiating download"
-        }));
-
-        xmlHttpRequest.open("POST", url, true);
-        xmlHttpRequest.setRequestHeader("Accept", "text/event-stream");
-        xmlHttpRequest.send();
-    }
-
-    function injectClaraCode() {
-
-        // Make space for marketplaces footer in Clara pages.
-        $("head").append(
-            '<style>' +
-                '#app { margin-bottom: 135px; }' +
-                '.footer { bottom: 50px; }' +
-            '</style>'
-        );
-
-        // Condense space.
-        $("head").append(
-            '<style>' +
-                'div.page-title { line-height: 1.2; font-size: 13px; }' +
-                'div.page-title-row { padding-bottom: 0; }' +
-            '</style>'
-        );
-
-        // Move "Download to High Fidelity" button.
-        $("head").append(
-            '<style>' +
-                '#hifi-download-container { position: absolute; top: 6px; right: 16px; }' +
-            '</style>'
-        );
-
-        // Update code injected per page displayed.
-        var updateClaraCodeInterval = undefined;
-        updateClaraCode();
-        updateClaraCodeInterval = setInterval(function () {
-            updateClaraCode();
-        }, 1000);
-
-        window.addEventListener("unload", function () {
-            clearInterval(updateClaraCodeInterval);
-            updateClaraCodeInterval = undefined;
-        });
-
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: QUERY_CAN_WRITE_ASSETS
-        }));
-    }
-
-    function cancelClaraDownload() {
-        isPreparing = false;
-
-        if (xmlHttpRequest) {
-            xmlHttpRequest.abort();
-            xmlHttpRequest = null;
-            console.log("Clara.io FBX: File download cancelled");
-            EventBridge.emitWebEvent(JSON.stringify({
-                type: CLARA_IO_CANCELLED_DOWNLOAD
-            }));
-        }
-    }
-
-    function injectCode() {
-        var DIRECTORY = 0;
-        var HIFI = 1;
-        var CLARA = 2;
-        var HIFI_ITEM_PAGE = 3;
-        var pageType = DIRECTORY;
-
-        if (location.href.indexOf(marketplaceBaseURL + "/") !== -1) { pageType = HIFI; }
-        if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
-        if (location.href.indexOf(marketplaceBaseURL + "/marketplace/items/") !== -1) { pageType = HIFI_ITEM_PAGE; }
-
-        injectCommonCode(pageType === DIRECTORY);
-        switch (pageType) {
-            case DIRECTORY:
-                injectDirectoryCode();
-                break;
-            case HIFI:
-                injectHiFiCode();
-                break;
-            case CLARA:
-                injectClaraCode();
-                break;
-            case HIFI_ITEM_PAGE:
-                injectHiFiItemPageCode();
-                break;
-
-        }
-    }
-
-    function onLoad() {
-        EventBridge.scriptEventReceived.connect(function (message) {
-            message = JSON.parse(message);
-            if (message.type === CAN_WRITE_ASSETS) {
-                canWriteAssets = message.canWriteAssets;
-            } else if (message.type === CLARA_IO_CANCEL_DOWNLOAD) {
-                cancelClaraDownload();
-            } else if (message.type === "marketplaces") {
-                if (message.action === "commerceSetting") {
-                    limitedCommerce = !!message.data.limitedCommerce;
-                    commerceMode = !!message.data.commerceMode;
-                    userIsLoggedIn = !!message.data.userIsLoggedIn;
-                    walletNeedsSetup = !!message.data.walletNeedsSetup;
-                    marketplaceBaseURL = message.data.metaverseServerURL;
-                    if (marketplaceBaseURL.indexOf('metaverse.') !== -1) {
-                        marketplaceBaseURL = marketplaceBaseURL.replace('metaverse.', '');
-                    }
-                    messagesWaiting = message.data.messagesWaiting;
-                    injectCode();
-                }
-            }
-        });
-
-        // Request commerce setting
-        // Code is injected into the webpage after the setting comes back.
-        EventBridge.emitWebEvent(JSON.stringify({
-            type: "REQUEST_SETTING"
-        }));
-    }
-
-    // Load / unload.
-    window.addEventListener("load", onLoad); // More robust to Web site issues than using $(document).ready().
-    window.addEventListener("page:change", onLoad); // Triggered after Marketplace HTML is changed
-}());

scripts/system/libraries/entitySelectionTool.js

@@ -285,6 +285,10 @@ SelectionManager = (function() {
                     properties.localPosition = properties.position;
                     properties.localRotation = properties.rotation;
                 }
+
+                properties.localVelocity = Vec3.ZERO;
+                properties.localAngularVelocity = Vec3.ZERO;
+
                 delete properties.actionData;
                 var newEntityID = Entities.addEntity(properties);
 

tools/CMakeLists.txt

@@ -20,7 +20,7 @@ endfunction()
 
 if (BUILD_TOOLS)
     # Allow different tools for stable builds
-    if (STABLE_BUILD)
+    if (RELEASE_TYPE STREQUAL "PRODUCTION")
         set(ALL_TOOLS 
             udt-test 
             vhacd-util

tools/nitpick/README.md

@@ -1,271 +1,330 @@
-# nitpick
-
-Nitpick is a stand alone application that provides a mechanism for regression testing.  The general idea is simple: 
-* Each test folder has a script that produces a set of snapshots.
-* The snapshots are compared to a 'canonical' set of images that have been produced beforehand.
-* The result, if any test failed, is a zipped folder describing the failure.
-
-Nitpick has 5 functions, separated into separate tabs:
-
-1. Creating tests, MD files and recursive scripts
-1. Windows task bar utility (Windows only)
-1. Running tests
-1. Evaluating the results of running tests
-1. Web interface
-
-## Installation
-`nitpick` is packaged with High Fidelity PR and Development builds.
-### Windows
-1.  (First time) download and install Python 3 from https://hifi-qa.s3.amazonaws.com/nitpick/Windows/python-3.7.0-amd64.exe (also located at https://www.python.org/downloads/)
-    1. Click the "add python to path" checkbox on the python installer  
-    1. After installation - add the path to python.exe to the Windows PATH environment variable.
-1.  (First time) download and install AWS CLI from https://hifi-qa.s3.amazonaws.com/nitpick/Windows/AWSCLI64PY3.msi (also available at https://aws.amazon.com/cli/
-    1.  Open a new command prompt and run  
-        `aws configure`
-    1.  Enter the AWS account number
-    1.  Enter the secret key
-    1.  Leave region name and ouput format as default [None]
-    1.  Install the latest release of Boto3 via pip:  
-        `pip install boto3`
-
-1.  (First time) Download adb (Android Debug Bridge) from *https://dl.google.com/android/repository/platform-tools-latest-windows.zip*
-    1.  Copy the downloaded file to (for example) **C:\adb** and extract in place.  
-        Verify you see *adb.exe* in **C:\adb\platform-tools\\**.
-    1.  After installation - add the path to adb.exe to the Windows PATH environment variable (note that it is in *adb\platform-tools*).
-### Mac
-1.  (first time) Install brew
-    In a terminal:  
-  `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`  
-    Note that you will need to press RETURN again, and will then be asked for your password.
-1.  (First time) install Qt:
-    In a terminal:  
-`brew install qt`
-1.  (First time) install Python from https://www.python.org/downloads/release/python-370/ (*macOS 64-bit installer* or *macOS 64-bit/32-bit installer*)
-    1. After installation - In a terminal: run  
-      `open "/Applications/Python 3.7/Install Certificates.command"`.  
-This is needed because the Mac Python supplied no longer links with the deprecated Apple-supplied system OpenSSL libraries but rather supplies a private copy of OpenSSL 1.0.2 which does not automatically access the system default root certificates.  
-    1. Verify that `/usr/local/bin/python3` exists.  
-1.  (First time - AWS interface) Install pip with the script provided by the Python Packaging Authority:  
-    In a terminal:  
-    `curl -O https://bootstrap.pypa.io/get-pip.py`  
-    In a terminal:  
-    `python3 get-pip.py --user`  
-    1.  Use pip to install the AWS CLI.  
-        `pip3 install awscli --upgrade --user`  
-        This will install aws in your user.  For user XXX, aws will be located in ~/Library/Python/3.7/bin  
-    1.  Open a new command prompt and run  
-        `~/Library/Python/3.7/bin/aws configure`  
-    1.  Enter the AWS account number
-    1.  Enter the secret key
-    1.  Leave region name and ouput format as default [None]
-    1.  Install the latest release of Boto3 via pip:  pip3 install boto3  
-1.  (First time)Install adb (the Android Debug Bridge) - in a terminal:  
-    `brew cask install android-platform-tools`
-# Usage
-## Create
-![](./Create.PNG)
-
-The Create tab provides functions to create tests from snapshots, MD files, a test outline and recursive scripts.
-### Create Tests
-#### Usage
-This function is used to create/update Expected Images after a successful run of a test, or multiple tests.
-
-The user will be asked for the snapshot folder and then the tests root folder.  All snapshots located in the snapshot folder will be used to create or update the expected images in the relevant tests.
-#### Details
-As an example - if the snapshots folder contains an image named `tests.content.entity.zone.zoneOrientation.00003.png`, then this file will be copied to `tests/contente/enity/zone/zoneOrientation/ExpectedImage0003.png`.
-### Create Tests Outline
-#### Usage
-This function creates an MD file in the (user-selected) tests root folder.  The file provides links to both the tests and the MD files.
-### Create MD file
-#### Usage
-This function creates a file named `test.md` from a `test.js` script.  The user will be asked for the folder containing the test script:
-#### Details
-The process to produce the MD file is a simplistic parse of the test script.
-- The string in the `nitpick.perform(...)` function call will be the title of the file
-
-- Instructions to run the script are then provided: 
-
-**Run this script URL: [Manual]()   [Auto]()(from menu/Edit/Open and Run scripts from URL...).**
-
-- The step description is the string in the addStep/addStepStepSnapshot commands
-
-- Image links are provided where applicable to the local Expected Images files
-### Create all MD files
-#### Usage
-This function creates all MD files recursively from the user-selected root folder.  This can be any folder in the tests hierarchy (e.g. all engine\material tests).
-
-The file provides a hierarchal list of all the tests 
-### Create testAuto script
-#### Usage
-This function creates a script named `testAuto.js` in a user-selected test folder.
-#### Details
-The script created runs the `test.js` script in the folder in automatic mode.  The script is the same for all tests.
-### Create all testAuto scripts
-#### Usage
-This function creates all testAuto scripts recursively from the user-selected root folder.  This can be any folder in the tests hierarchy (e.g. all engine\material tests).
-
-The file provides a hierarchical list of all the tests 
-### Create Recursive Script
-#### Usage
-After the user selects a folder within the tests hierarchy, a script is created, named `testRecursive.js`.  This script calls all `test.js` scripts in the sub-folders.
-#### Details
-The various scripts are called in alphabetical order.
-
-An example of a recursive script is as follows:  
-```
-// This is an automatically generated file, created by nitpick on Jul 5 2018, 10:19
-
-PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js";
-Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE);
-var nitpick = createNitpick(Script.resolvePath("."));
-
-var testsRootPath = nitpick.getTestsRootPath();
-
-if (typeof Test !== 'undefined') {
-    Test.wait(10000);
-};
-
-nitpick.enableRecursive();
-nitpick.enableAuto();
-
-Script.include(testsRootPath + "content/overlay/layer/drawInFront/shape/test.js");
-Script.include(testsRootPath + "content/overlay/layer/drawInFront/model/test.js");
-Script.include(testsRootPath + "content/overlay/layer/drawHUDLayer/test.js");
-
-nitpick.runRecursive();
-```
-### Create all Recursive Scripts
-#### Usage
-In this case all recursive scripts, from the selected folder down, are created.
-
-Running this function in the tests root folder will create (or update) all the recursive scripts.
-## Windows (only)
-![](./Windows.PNG)
-
-This tab is Windows-specific.  It provides buttons to hide and show the task bar.
-
-The task bar should be hidden for all tests that use the primary camera.  This is required to ensure that the snapshots are the right size.
-## Run
-![](./Run.PNG)
-The run tab is used to run tests in automatic mode.  The tests require the location of a folder to store files in; this folder can safely be re-used for any number of runs (the "Working Folder"). 
-The test script that is run is `https://github.com/highfidelity/hifi_tests/blob/master/tests/testRecursive.js`.  The user can use a different branch' or even repository, if required.  
-Tests can be run server-less, or with the local host.  In the second case, the domain-server and assignment-clients are run before starting Interface.  
-The default is to run the latest build.  The user can select a specific build or PR if desired.
-Testing can be started immediately, or run on a schedule.  
-
-A test run is performed in a number of steps:  
-1.  If the latest run has been selected then the `dev-builds.xml` file is downloaded to identify the latest build.  
-1.  The installer is then downloaded.  
-1.  After downloading the High Fidelity application is installed.  This requires that UAC be disabled!
-1.  Any instances of the server-console, assignment-client, domain-server or Interface are killed before running the tests.  
-1.  Interface is run with the appropriate command line parameters.  
-1.  The expected images are then downloaded from GitHub and compared to the actual images from the tests.
-
-The working folder will ultimately contain the following:  
-1.  A folder named `High Fidelity`.  This is where High Fidelity is installed.  
-1.  A folder named `snapshots`.  This folder contains the zipped results folders (one for each run).  It also contains both the actual images and the expected images from the last run; note that these are deleted before running tests (All PNG files in the folder are deleted.  In addition - a text file named `tests_completed.txt` is created at the end of the test script - this signals that Interface did not crash during the test run.  
-1.  The `dev-builds.xml` file, if it was downloaded.  
-1.  The HighFidelity installer.  Note that this is always named `HighFidelity-Beta-latest-dev` so as not to store too many installers over time.  
-1.  A log file describing the runs.  This file is appended to after each run.
-## Evaluate
-![](./Evaluate.PNG)
-
-The Evaluate tab provides a single function - evaluating the results of a test run.
-
-A checkbox (defaulting to checked) runs the evaluation in interactive mode.  In this mode - every failure is shown to the user, who can then decide whether to pass the test, fail it or abort the whole evaluation.
-
-If any tests have failed, then a zipped folder will be created in the snapshots folder, with a description of each failed step in each test.
-#### Usage
-Before starting the evaluation, make sure the GitHub user and branch are set correctly.  The user should not normally be changed, but the branch may need to be set to the appropriate RC.
-
-After setting the check-box as required and pressing Evaluate - the user will be asked for the snapshots folder.
-#### Details
-Evaluation proceeds in a number of steps:
-
-1. A folder is created to store any failures
-
-1. The expected images are download from GitHub.  They are named slightly differently from the snapshots (e.g. `tests.engine.render.effect.highlight.coverage.00000.png` and `tests.engine.render.effect.highlight.coverage.00000_EI.png`).
-
-1. The images are then pair-wise compared, using the SSIM algorithm.  A fixed threshold is used to define a mismatch.
-
-1.  In interactive mode - a window is opened showing the expected image, actual image, difference image and error:
-![](./nitpickMismatchExample.PNG)
-
-1.  If not in interactive mode, or the user has defined the results as an error, an error is written into the error folder.  The error itself is a folder with the 3 images and a small text file containing details.
-
-1.  At the end of the test, the folder is zipped and the original folder is deleted.  If there are no errors then the zipped folder will be empty.
-
-## Web Interface
-![](./WebInterface.PNG)
-This tab has two functions:  updating the TestRail cases, runs and results, and creating web page reports that are stored on AWS.  
-
-Before updating TestRail, make sure the GitHub user and branch are set correctly.  The user should not normally be changed, but the branch may need to be set to the appropriate RC.
-
-Any access to TestRail will require the TestRail account (default is High Fidelity's account), a user-name and a password:
-
-![](./TestRailSelector.PNG)
-
-- The default test rail user is shown, and can be changed as needed.
-- The user-name is usually the user's email.
-- The Project ID defaults to 14 - Interface.
-- The Suite ID defaults to 1147 - Rendering.
-- The TestRail page provides 3 functions for writing to TestRail.
-### Create Test Cases
-#### Usage
-This function can either create an XML file that can then be imported into TestRail through TestRail itself, or automatically create the appropriate TestRail Sections.
-
-The user will be first asked for the tests root folder and a folder to store temporary files (this is the output folder).
-
-If XML has been selected, then the XML file will be created in the output folder.
-
-If Python is selected, the user will then be prompted for TestRail data.  After pressing `Accept` - the Release combo will be populated (as it needs to be read from TestRail).
-
-After selecting the appropriate Release, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
-
-A busy window will appear until the process is complete.
-#### Details
-A number of Python scripts are created:
-- `testrail.py` is the TestRail interface code.
-- `stack.py` is a simple stack class
-- `getReleases.py` reads the release names from TestRail
-- `addTestCases` is the script that writes to TestRail.
-
-In addition - a file containing all the releases will be created - `releases.txt`
-### Create Run
-A Run is created from previously created Test Cases.
-
-The user will first be prompted for a temporary folder (for the Python scripts).
-
-After entering TestRail data and pressing `Accept` - the Sections combo will be populated (as it needs to be read from TestRail).
-
-After selecting the appropriate Section, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
-
-A busy window will appear until the process is complete.
-#### Details
-A number of Python scripts are created:
-- `testrail.py` is the TestRail interface code.
-- `stack.py` is a simple stack class
-- `getSections.py` reads the release names from TestRail
-- `addRun` is the script that writes to TestRail.
-
-In addition - a file containing all the releases will be created - `sections.txt`
-### Update Run Results
-This function updates a Run with the results of an automated test.
-
-The user will first be prompted to enter the zipped results folder and a folder to store temporary files (this is the output folder).
-
-After entering TestRail data and pressing `Accept` - the Run combo will be populated (as it needs to be read from TestRail).
-
-After selecting the appropriate Run, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
-
-A busy window will appear until the process is complete.
-#### Details
-A number of Python scripts are created:
-- `testrail.py` is the TestRail interface code.
-- `getRuns.py` reads the release names from TestRail
-- `addRun` is the script that writes to TestRail.
-
-In addition - a file containing all the releases will be created - `runs.txt`.
-### Create Web Page
-This function requests a zipped results folder and converts it to a web page.  The page is created in a user-selecetd working folder.  
-If the `Update AWS` checkbox is checked then the page will also be copied to AWS, and the appropriate URL will be displayed in the window below the button.
+# nitpick
+
+Nitpick is a stand alone application that provides a mechanism for regression testing.  The general idea is simple:  
+* Each test folder has a script that produces a set of snapshots.  
+* The snapshots are compared to a 'canonical' set of images that have been produced beforehand.  
+* The result, if any test failed, is a zipped folder describing the failure.
+
+Nitpick has 6 functions, separated into separate tabs:
+
+1. Creating tests, MD files and recursive scripts
+1. Windows task bar utility (Windows only)
+1. Running tests on desktop (i.e. locally)
+1. Running tests on an attached device
+1. Evaluating the results of running tests
+1. Web interface
+## Creating Installers (for developers)
+Nitpick is built as part of the High Fidelity build.
+### Creating installers
+#### Windows
+Note that X.X.X is the latest version.
+1.  Verify that 7Zip is installed.
+1.  cd to the `build\tools\nitpick\Release` directory
+1.  Delete any existing installers (named nitpick-installer-vX.X.X.exe)
+1.  Select all, right-click and select 7-Zip->Add to archive...
+1.  Set Archive format to 7z
+1.  Check "Create SFX archive
+1.  Enter installer name (i.e. `nitpick-installer-vX.X.X.exe`)
+1.  Click "OK"
+1.  Copy created installer to https://hifi-qa.s3.amazonaws.com/nitpick/Windows/nitpick-installer-vX.X.X.exe: aws s3 cp nitpick-installer-v1.2.exe s3://hifi-qa/nitpick/Mac/nitpick-installer-vX.X.X.exe
+#### Mac
+These steps assume the hifi repository has been cloned to `~/hifi`.
+1.  (first time) Install brew  
+    In a terminal: `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
+1.  (First time) install create-dmg:
+    In a terminal: `brew install create-dmg`
+1.  In a terminal: cd to the `build/tools/nitpick/Release` folder
+1.  Copy the quazip dynamic library (note final period):
+    In a terminal: `cp ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib .`
+1.  Change the loader instruction to find the dynamic library locally
+    In a terminal: `install_name_tool -change ~/hifi/build/ext/Xcode/quazip/project/lib/libquazip5.1.dylib libquazip5.1.dylib nitpick`
+1.  Delete any existing disk images. In a terminal: `rm *.dmg`
+1.  Create installer (note final period).In a terminal: `create-dmg --volname nitpick-installer-vX.X.X nitpick-installer-vX.X.X.dmg .`  
+    Make sure to wait for completion.
+1.  Copy created installer to AWS: `~/Library/Python/3.7/bin/aws s3 cp nitpick-installer-vX.X.X.dmg s3://hifi-qa/nitpick/Mac/nitpick-installer-vX.X.X.dmg`
+## Installation
+`nitpick` is packaged with High Fidelity PR and Development builds.
+### Windows
+1.  (First time) download and install Python 3 from https://hifi-qa.s3.amazonaws.com/nitpick/Windows/python-3.7.0-amd64.exe (also located at https://www.python.org/downloads/)
+    1. Click the "add python to path" checkbox on the python installer  
+    1. After installation - add the path to python.exe to the Windows PATH environment variable.
+1.  (First time) download and install AWS CLI from https://hifi-qa.s3.amazonaws.com/nitpick/Windows/AWSCLI64PY3.msi (also available at https://aws.amazon.com/cli/
+    1.  Open a new command prompt and run  
+        `aws configure`
+    1.  Enter the AWS account number
+    1.  Enter the secret key
+    1.  Leave region name and ouput format as default [None]
+    1.  Install the latest release of Boto3 via pip:  
+        `pip install boto3`
+
+1.  (First time) Download adb (Android Debug Bridge) from *https://dl.google.com/android/repository/platform-tools-latest-windows.zip*
+    1.  Copy the downloaded file to (for example) **C:\adb** and extract in place.  
+        Verify you see *adb.exe* in **C:\adb\platform-tools\\**.
+    1.  After installation - add the path to adb.exe to the Windows PATH environment variable (note that it is in *adb\platform-tools*).
+1.  `nitpick` is included in the High Fidelity installer but can also be downloaded from:  
+[here](<https://hifi-qa.s3.amazonaws.com/nitpick/Windows/nitpick-installer-vX.X.X.dmg>).* 
+### Mac
+1.  (first time) Install brew
+    In a terminal:  
+  `/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`  
+    Note that you will need to press RETURN again, and will then be asked for your password.
+1.  (First time) install Qt:
+    In a terminal:  
+`brew install qt`
+1.  (First time) install Python from https://www.python.org/downloads/release/python-370/ (*macOS 64-bit installer* or *macOS 64-bit/32-bit installer*)
+    1. After installation - In a terminal: run  
+      `open "/Applications/Python 3.7/Install Certificates.command"`.  
+This is needed because the Mac Python supplied no longer links with the deprecated Apple-supplied system OpenSSL libraries but rather supplies a private copy of OpenSSL 1.0.2 which does not automatically access the system default root certificates.  
+    1. Verify that `/usr/local/bin/python3` exists.  
+1.  (First time - AWS interface) Install pip with the script provided by the Python Packaging Authority:  
+    In a terminal:  
+    `curl -O https://bootstrap.pypa.io/get-pip.py`  
+    In a terminal:  
+    `python3 get-pip.py --user`  
+    1.  Use pip to install the AWS CLI.  
+        `pip3 install awscli --upgrade --user`  
+        This will install aws in your user.  For user XXX, aws will be located in ~/Library/Python/3.7/bin  
+    1.  Open a new command prompt and run  
+        `~/Library/Python/3.7/bin/aws configure`  
+    1.  Enter the AWS account number
+    1.  Enter the secret key
+    1.  Leave region name and ouput format as default [None]
+    1.  Install the latest release of Boto3 via pip:  pip3 install boto3  
+1.  (First time)Install adb (the Android Debug Bridge) - in a terminal:  
+    `brew cask install android-platform-tools`
+1.  `nitpick` is included in the High Fidelity installer but can also be downloaded from:  
+[here](<https://hifi-qa.s3.amazonaws.com/nitpick/Mac/nitpick-installer-vX.X.X.dmg>).* 
+# Usage
+## Menu
+File->Close: Closes `nitpick`  
+Help->About: Provides the build date  
+Help->Online readme: Links to this file on GitHub
+## Create
+![](./Create.PNG)
+
+The Create tab provides functions to create tests from snapshots, MD files, a test outline and recursive scripts.
+### Create Tests
+#### Usage
+This function is used to create/update Expected Images after a successful run of a test, or multiple tests.
+
+The user will be asked for the snapshot folder and then the tests root folder.  All snapshots located in the snapshot folder will be used to create or update the expected images in the relevant tests.
+#### Details
+As an example - if the snapshots folder contains an image named `tests.content.entity.zone.zoneOrientation.00003.png`, then this file will be copied to `tests/contente/enity/zone/zoneOrientation/ExpectedImage0003.png`.
+### Create Tests Outline
+#### Usage
+This function creates an MD file in the (user-selected) tests root folder.  The file provides links to both the tests and the MD files.
+### Create MD file
+#### Usage
+This function creates a file named `test.md` from a `test.js` script.  The user will be asked for the folder containing the test script:
+#### Details
+The process to produce the MD file is a simplistic parse of the test script.
+- The string in the `nitpick.perform(...)` function call will be the title of the file
+
+- Instructions to run the script are then provided: 
+
+**Run this script URL: [Manual]()   [Auto]()(from menu/Edit/Open and Run scripts from URL...).**
+
+- The step description is the string in the addStep/addStepStepSnapshot commands
+
+- Image links are provided where applicable to the local Expected Images files
+### Create all MD files
+#### Usage
+This function creates all MD files recursively from the user-selected root folder.  This can be any folder in the tests hierarchy (e.g. all engine\material tests).
+
+The file provides a hierarchal list of all the tests 
+### Create testAuto script
+#### Usage
+This function creates a script named `testAuto.js` in a user-selected test folder.
+#### Details
+The script created runs the `test.js` script in the folder in automatic mode.  The script is the same for all tests.
+### Create all testAuto scripts
+#### Usage
+This function creates all testAuto scripts recursively from the user-selected root folder.  This can be any folder in the tests hierarchy (e.g. all engine\material tests).
+
+The file provides a hierarchical list of all the tests 
+### Create Recursive Script
+#### Usage
+After the user selects a folder within the tests hierarchy, a script is created, named `testRecursive.js`.  This script calls all `test.js` scripts in the sub-folders.
+#### Details
+The various scripts are called in alphabetical order.
+
+An example of a recursive script is as follows:  
+```
+// This is an automatically generated file, created by nitpick on Jul 5 2018, 10:19
+
+PATH_TO_THE_REPO_PATH_UTILS_FILE = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/tests/utils/branchUtils.js";
+Script.include(PATH_TO_THE_REPO_PATH_UTILS_FILE);
+var nitpick = createNitpick(Script.resolvePath("."));
+
+var testsRootPath = nitpick.getTestsRootPath();
+
+if (typeof Test !== 'undefined') {
+    Test.wait(10000);
+};
+
+nitpick.enableRecursive();
+nitpick.enableAuto();
+
+Script.include(testsRootPath + "content/overlay/layer/drawInFront/shape/test.js");
+Script.include(testsRootPath + "content/overlay/layer/drawInFront/model/test.js");
+Script.include(testsRootPath + "content/overlay/layer/drawHUDLayer/test.js");
+
+nitpick.runRecursive();
+```
+### Create all Recursive Scripts
+#### Usage
+In this case all recursive scripts, from the selected folder down, are created.
+
+Running this function in the tests root folder will create (or update) all the recursive scripts.
+## Windows (only on Windows)
+![](./Windows.PNG)
+
+This tab is Windows-specific.  It provides buttons to hide and show the task bar.
+
+The task bar should be hidden for all tests that use the primary camera.  This is required to ensure that the snapshots are the right size.
+## Test on Desktop
+![](./TestOnDesktop.PNG)
+The TestOnDesktop tab is used to run tests on desktop in automatic mode.  The tests require the location of a folder to store files in; this folder can safely be re-used for any number of runs (the "Working Folder").  
+The test script that is run is `https://github.com/highfidelity/hifi_tests/blob/master/tests/testRecursive.js`.  The user can use a different branch' or even repository, if required.  
+Tests can be run server-less, or with the local host.  In the second case, the domain-server and assignment-clients are run before starting Interface.  
+The default is to run the latest build.  The user can select a specific build or PR if desired.
+Testing can be started immediately, or run on a schedule.  
+
+A test run is performed in a number of steps:  
+1.  If the latest run has been selected then the `dev-builds.xml` file is downloaded to identify the latest build.  
+1.  The installer is then downloaded.  
+1.  After downloading the High Fidelity application is installed.  This requires that UAC be disabled!
+1.  Any instances of the server-console, assignment-client, domain-server or Interface are killed before running the tests.  
+1.  Interface is run with the appropriate command line parameters.  
+1.  The expected images are then downloaded from GitHub and compared to the actual images from the tests.
+
+The working folder will ultimately contain the following:  
+1.  A folder named `High Fidelity`.  This is where High Fidelity is installed.  
+1.  A folder named `snapshots`.  This folder contains the zipped results folders (one for each run).  It also contains both the actual images and the expected images from the last run; note that these are deleted before running tests (All PNG files in the folder are deleted.  In addition - a text file named `tests_completed.txt` is created at the end of the test script - this signals that Interface did not crash during the test run.  
+1.  The `dev-builds.xml` file, if it was downloaded.  
+1.  The HighFidelity installer.  Note that this is always named `HighFidelity-Beta-latest-dev` so as not to store too many installers over time.  
+1.  A log file describing the runs.  This file is appended to after each run.
+## Test on Mobile
+![](./TestOnMobile.PNG)
+The TestOnMobile tab is used to run tests on a mobile device connected to the desktop running `nitpick`.  
+The test script that is run is `https://github.com/highfidelity/hifi_tests/blob/master/tests/testRecursive.js`.  The user can use a different branch' or even repository, if required.  
+Tests can be run server-less, or with the local host.  In the second case, the domain-server and assignment-clients are run before starting Interface.  
+The default is to run the latest build.  The user can select a specific build or PR if desired.  
+### Set Working Folder  
+This mode needs a working folder to store downloads and temporary files.  All other commands are disabled until this folder has been selected.
+### Connect Device
+Clicking this button will initiate and attempt to connect to a connected device.  If successful, the following will appear (as appropriate for the device):
+![](./ConnectedDevice.PNG)
+
+### Download APK
+Leaving the Run Latest checkbox checked will download the latest APK.  Unchecking will enable entering a URL to a desired APK (such as a PR build).  
+Clicking the Download APK button will set the status to *Downloading installer*; this status will change to *Installer Download complete" when the download has completed.  The APK will be located in the working folder.
+### Installing APK
+After download it is possible to install the APK on the selected device.  
+When installation completes, the status will be *Installation complete*
+### Run Interface
+Pressing this button will run the full test suite on the device.  Snapshots will be stored on the device in */sdcard/DCIM/TEST.
+### Pull Folder
+This button is used to copy the snapshots from a test to the local device for evaluation.  The default is the default snapshot folder on the device.
+## Evaluate
+![](./Evaluate.PNG)
+
+The Evaluate tab provides a single function - evaluating the results of a test run.
+
+A checkbox (defaulting to checked) runs the evaluation in interactive mode.  In this mode - every failure is shown to the user, who can then decide whether to pass the test, fail it or abort the whole evaluation.
+
+If any tests have failed, then a zipped folder will be created in the snapshots folder, with a description of each failed step in each test.
+#### Usage
+Before starting the evaluation, make sure the GitHub user and branch are set correctly.  The user should not normally be changed, but the branch may need to be set to the appropriate RC.
+
+After setting the check-box as required and pressing Evaluate - the user will be asked for the snapshots folder.
+#### Details
+Evaluation proceeds in a number of steps:
+
+1. A folder is created to store any failures
+
+1. The expected images are download from GitHub.  They are named slightly differently from the snapshots (e.g. `tests.engine.render.effect.highlight.coverage.00000.png` and `tests.engine.render.effect.highlight.coverage.00000_EI.png`).
+
+1. The images are then pair-wise compared, using the SSIM algorithm.  A fixed threshold is used to define a mismatch.
+
+1.  In interactive mode - a window is opened showing the expected image, actual image, difference image and error:
+![](./nitpickMismatchExample.PNG)
+
+1.  If not in interactive mode, or the user has defined the results as an error, an error is written into the error folder.  The error itself is a folder with the 3 images and a small text file containing details.
+
+1.  At the end of the test, the folder is zipped and the original folder is deleted.  If there are no errors then the zipped folder will be empty.
+
+## Web Interface
+![](./WebInterface.PNG)
+This tab has two functions:  updating the TestRail cases, runs and results, and creating web page reports that are stored on AWS.  
+
+Before updating TestRail, make sure the GitHub user and branch are set correctly.  The user should not normally be changed, but the branch may need to be set to the appropriate RC.
+
+Any access to TestRail will require the TestRail account (default is High Fidelity's account), a user-name and a password:
+
+![](./TestRailSelector.PNG)
+
+- The default test rail user is shown, and can be changed as needed.
+- The user-name is usually the user's email.
+- The Project ID defaults to 14 - Interface.
+- The Suite ID defaults to 1147 - Rendering.
+- The TestRail page provides 3 functions for writing to TestRail.
+### Create Test Cases
+#### Usage
+This function can either create an XML file that can then be imported into TestRail through TestRail itself, or automatically create the appropriate TestRail Sections.
+
+The user will be first asked for the tests root folder and a folder to store temporary files (this is the output folder).
+
+If XML has been selected, then the XML file will be created in the output folder.
+
+If Python is selected, the user will then be prompted for TestRail data.  After pressing `Accept` - the Release combo will be populated (as it needs to be read from TestRail).
+
+After selecting the appropriate Release, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
+
+A busy window will appear until the process is complete.
+#### Details
+A number of Python scripts are created:
+- `testrail.py` is the TestRail interface code.
+- `stack.py` is a simple stack class
+- `getReleases.py` reads the release names from TestRail
+- `addTestCases` is the script that writes to TestRail.
+
+In addition - a file containing all the releases will be created - `releases.txt`
+### Create Run
+A Run is created from previously created Test Cases.
+
+The user will first be prompted for a temporary folder (for the Python scripts).
+
+After entering TestRail data and pressing `Accept` - the Sections combo will be populated (as it needs to be read from TestRail).
+
+After selecting the appropriate Section, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
+
+A busy window will appear until the process is complete.
+#### Details
+A number of Python scripts are created:
+- `testrail.py` is the TestRail interface code.
+- `stack.py` is a simple stack class
+- `getSections.py` reads the release names from TestRail
+- `addRun` is the script that writes to TestRail.
+
+In addition - a file containing all the releases will be created - `sections.txt`
+### Update Run Results
+This function updates a Run with the results of an automated test.
+
+The user will first be prompted to enter the zipped results folder and a folder to store temporary files (this is the output folder).
+
+After entering TestRail data and pressing `Accept` - the Run combo will be populated (as it needs to be read from TestRail).
+
+After selecting the appropriate Run, press OK.  The Python script will be created in the output folder, and the user will be prompted to run it.
+
+A busy window will appear until the process is complete.
+#### Details
+A number of Python scripts are created:
+- `testrail.py` is the TestRail interface code.
+- `getRuns.py` reads the release names from TestRail
+- `addRun` is the script that writes to TestRail.
+
+In addition - a file containing all the releases will be created - `runs.txt`.
+### Create Web Page
+This function requests a zipped results folder and converts it to a web page.  The page is created in a user-selecetd working folder.  
+If the `Update AWS` checkbox is checked then the page will also be copied to AWS, and the appropriate URL will be displayed in the window below the button.