From ac9c5e73862fa852b34ca2a74bab3147433e1f2f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 27 Oct 2014 14:54:34 -0700
Subject: [PATCH] some initial adds to properties

---
 libraries/entities/src/EntityItemProperties.h | 18 ++++++++++++++++--
 libraries/entities/src/LightEntityItem.cpp    |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index fa047a6cf9..293b868f0f 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -32,7 +32,6 @@
 #include "EntityItemPropertiesMacros.h"
 #include "EntityTypes.h"
 
-// PropertyFlags support
 enum EntityPropertyList {
     PROP_PAGED_PROPERTY,
     PROP_CUSTOM_PROPERTIES_INCLUDED,
@@ -52,6 +51,7 @@ enum EntityPropertyList {
 
     // these properties are supported by some derived classes
     PROP_COLOR,
+    PROP_DIFFUSE_COLOR = PROP_COLOR, // used by light class
     PROP_MODEL_URL,
     PROP_ANIMATION_URL,
     PROP_ANIMATION_FPS,
@@ -67,8 +67,15 @@ enum EntityPropertyList {
 
     // property used by Light entity
     PROP_IS_SPOTLIGHT,
+    PROP_AMBIENT_COLOR,
+    PROP_SPECULAR_COLOR,
+    PROP_CONSTANT_ATTENUATION,
+    PROP_LINEAR_ATTENUATION,
+    PROP_QUADRATIC_ATTENUATION,
+    PROP_EXPONENT,
+    PROP_CUTOFF,
 
-    PROP_LAST_ITEM = PROP_IS_SPOTLIGHT
+    PROP_LAST_ITEM = PROP_CUTOFF
 };
 
 typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;
@@ -240,6 +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) { }
+    
+
     void setLastEdited(quint64 usecTime) { _lastEdited = usecTime; }
 
 private:
@@ -309,6 +321,8 @@ private:
     bool _glowLevelChanged;
     bool _localRenderAlphaChanged;
     bool _isSpotlightChanged;
+    bool _ambientColorChanged;
+    bool _specularColorChanged;
 
     bool _defaultSettings;
 };
diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp
index 1ee12ece34..c8e7b92a0d 100644
--- a/libraries/entities/src/LightEntityItem.cpp
+++ b/libraries/entities/src/LightEntityItem.cpp
@@ -64,8 +64,8 @@ bool LightEntityItem::setProperties(const EntityItemProperties& properties, bool
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setDiffuseColor);
     //SET_ENTITY_PROPERTY_FROM_PROPERTIES(diffuseColor, setDiffuseColor);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(ambientColor, setAmbientColor);
-    SET_ENTITY_PROPERTY_FROM_PROPERTIES(specularColor, setSpecularColor);
+    //SET_ENTITY_PROPERTY_FROM_PROPERTIES(ambientColor, setAmbientColor);
+    //SET_ENTITY_PROPERTY_FROM_PROPERTIES(specularColor, setSpecularColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(isSpotlight, setIsSpotlight);
 
     if (somethingChanged) {