From bb1eacce7d39bc99b5d4c30d80a1b675b84fee27 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 27 Oct 2014 15:37:52 -0700 Subject: [PATCH] more tweaks for new light properties --- libraries/entities/src/EntityItemProperties.h | 8 ++++---- libraries/entities/src/LightEntityItem.cpp | 1 - libraries/entities/src/SphereEntityItem.cpp | 3 --- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 293b868f0f..699aa5a612 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -247,11 +247,11 @@ public: bool getIsSpotlight() const { return _isSpotlight; } void setIsSpotlight(bool value) { _isSpotlight = value; _isSpotlightChanged = true; } - void setDiffuseColor(const xColor& value) { } - void setAmbientColor(const xColor& value) { } - void setSpecularColor(const xColor& value) { } + // total hack for now + void setDiffuseColor(const xColor& value) { setColor(value); } + void setAmbientColor(const xColor& value) { setColor(value); } + void setSpecularColor(const xColor& value) { setColor(value); } - void setLastEdited(quint64 usecTime) { _lastEdited = usecTime; } private: diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp index c8e7b92a0d..1dc25494d8 100644 --- a/libraries/entities/src/LightEntityItem.cpp +++ b/libraries/entities/src/LightEntityItem.cpp @@ -53,7 +53,6 @@ EntityItemProperties LightEntityItem::getProperties() const { properties.setDiffuseColor(getDiffuseXColor()); properties.setAmbientColor(getAmbientXColor()); properties.setSpecularColor(getSpecularXColor()); - properties.setGlowLevel(getGlowLevel()); properties.setIsSpotlight(getIsSpotlight()); return properties; diff --git a/libraries/entities/src/SphereEntityItem.cpp b/libraries/entities/src/SphereEntityItem.cpp index 5da218c11a..f5b8eb27e9 100644 --- a/libraries/entities/src/SphereEntityItem.cpp +++ b/libraries/entities/src/SphereEntityItem.cpp @@ -33,10 +33,7 @@ SphereEntityItem::SphereEntityItem(const EntityItemID& entityItemID, const Entit EntityItemProperties SphereEntityItem::getProperties() const { EntityItemProperties properties = EntityItem::getProperties(); // get the properties from our base class - properties.setColor(getXColor()); - properties.setGlowLevel(getGlowLevel()); - return properties; }