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

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

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