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

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

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