From d8a119c1b37948d2ede6500257dce60b94afa9f8 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 8 Sep 2020 22:10:24 +1200
Subject: [PATCH 1/2] Support relative JSON URLs in model textures poperty

---
 .../octree/src/OctreeEntitiesFileParser.cpp   | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/libraries/octree/src/OctreeEntitiesFileParser.cpp b/libraries/octree/src/OctreeEntitiesFileParser.cpp
index 348a211dc6..aeb9e8be71 100644
--- a/libraries/octree/src/OctreeEntitiesFileParser.cpp
+++ b/libraries/octree/src/OctreeEntitiesFileParser.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Simon Walton on Oct 15, 2018.
 //  Copyright 2018 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -247,8 +248,7 @@ bool OctreeEntitiesFileParser::readEntitiesArray(QVariantList& entitiesArray) {
                 // model
                 "modelURL",
                 "animation.url",
-                // FIXME: Handle models' "textures" and "originalTextures" properties which include URLs. Note that Particles
-                // also has a "textures" property.
+                "textures",
                 // image
                 "imageURL",
                 // web
@@ -258,7 +258,7 @@ bool OctreeEntitiesFileParser::readEntitiesArray(QVariantList& entitiesArray) {
                 "ambientLight.ambientURL",
                 "skybox.url",
                 // particles
-                "textures",
+                //"textures",  Already specified for model entity type.
                 // materials
                 "materialURL",
                 // ...shared
@@ -292,11 +292,30 @@ bool OctreeEntitiesFileParser::readEntitiesArray(QVariantList& entitiesArray) {
                     }
                 } else {
                     if (entityObject.contains(key) && entityObject[key].isString()) {
-                        const QString url = entityObject[key].toString();
+                        const QString value = entityObject[key].toString();
 
-                        if (url.startsWith("./") || url.startsWith("../")) {
-                            entityObject[key] = _relativeURL.resolved(url).toString();
+                        if (value.startsWith("./") || value.startsWith("../")) {
+                            // URL value.
+                            entityObject[key] = _relativeURL.resolved(value).toString();
                             isDirty = true;
+                        } else if (value.startsWith("{")) {
+                            // Object with URL values.
+                            auto document = QJsonDocument::fromJson(value.toUtf8());
+                            if (!document.isNull()) {
+                                auto object = document.object();
+                                bool isObjectUpdated = false;
+                                for (const QString& key : object.keys()) {
+                                    auto value = object[key].toString();
+                                    if (value.startsWith("./") || value.startsWith("../")) {
+                                        object[key] = _relativeURL.resolved(value).toString();
+                                        isObjectUpdated = true;
+                                    }
+                                }
+                                if (isObjectUpdated) {
+                                    entityObject[key] = QString(QJsonDocument(object).toJson());
+                                    isDirty = true;
+                                }
+                            }
                         }
                     }
                 }

From dc04622a1d1d9f75efe6051b8d5eefdaca957c5d Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 8 Sep 2020 22:10:40 +1200
Subject: [PATCH 2/2] Fix some JSDoc noticed in passing

---
 libraries/entities/src/EntityItemProperties.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index d671d46c22..af7a0f8cc9 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Brad Hefta-Gaub on 12/4/13.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1040,7 +1041,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * @property {boolean} groupCulled=false - <code>true</code> if the mesh parts of the model are LOD culled as a group,
  *     <code>false</code> if separate mesh parts are LOD culled individually.
  *
- * @example <caption>Rez a Vive tracker puck.</caption>
+ * @example <caption>Rez a cowboy hat.</caption>
  * var entity = Entities.addEntity({
  *     type: "Model",
  *     position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -2 })),