Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

some initial adds to properties

Browse source
This commit is contained in:
ZappoMan 2014-10-27 14:54:34 -07:00
parent c17ffe9433
commit ac9c5e7386
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/entities/src/EntityItemProperties.h
View file

@ -32,7 +32,6 @@
#include "EntityItemPropertiesMacros.h" #include "EntityItemPropertiesMacros.h"
#include "EntityTypes.h" #include "EntityTypes.h"
// PropertyFlags support
enum EntityPropertyList { enum EntityPropertyList {
PROP_PAGED_PROPERTY, PROP_PAGED_PROPERTY,
PROP_CUSTOM_PROPERTIES_INCLUDED, PROP_CUSTOM_PROPERTIES_INCLUDED,
@ -52,6 +51,7 @@ enum EntityPropertyList {
// these properties are supported by some derived classes // these properties are supported by some derived classes
PROP_COLOR, PROP_COLOR,
PROP_DIFFUSE_COLOR = PROP_COLOR, // used by light class
PROP_MODEL_URL, PROP_MODEL_URL,
PROP_ANIMATION_URL, PROP_ANIMATION_URL,
PROP_ANIMATION_FPS, PROP_ANIMATION_FPS,
@ -67,8 +67,15 @@ enum EntityPropertyList {
// property used by Light entity // property used by Light entity
PROP_IS_SPOTLIGHT, 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; typedef PropertyFlags<EntityPropertyList> EntityPropertyFlags;
@ -240,6 +247,11 @@ public:
bool getIsSpotlight() const { return _isSpotlight; } bool getIsSpotlight() const { return _isSpotlight; }
void setIsSpotlight(bool value) { _isSpotlight = value; _isSpotlightChanged = true; } 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; } void setLastEdited(quint64 usecTime) { _lastEdited = usecTime; }
private: private:
@ -309,6 +321,8 @@ private:
bool _glowLevelChanged; bool _glowLevelChanged;
bool _localRenderAlphaChanged; bool _localRenderAlphaChanged;
bool _isSpotlightChanged; bool _isSpotlightChanged;
bool _ambientColorChanged;
bool _specularColorChanged;
bool _defaultSettings; bool _defaultSettings;
}; };

4
libraries/entities/src/LightEntityItem.cpp
View file

@ -64,8 +64,8 @@ bool LightEntityItem::setProperties(const EntityItemProperties& properties, bool
SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setDiffuseColor); SET_ENTITY_PROPERTY_FROM_PROPERTIES(color, setDiffuseColor);
//SET_ENTITY_PROPERTY_FROM_PROPERTIES(diffuseColor, setDiffuseColor); //SET_ENTITY_PROPERTY_FROM_PROPERTIES(diffuseColor, setDiffuseColor);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(ambientColor, setAmbientColor); //SET_ENTITY_PROPERTY_FROM_PROPERTIES(ambientColor, setAmbientColor);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(specularColor, setSpecularColor); //SET_ENTITY_PROPERTY_FROM_PROPERTIES(specularColor, setSpecularColor);
SET_ENTITY_PROPERTY_FROM_PROPERTIES(isSpotlight, setIsSpotlight); SET_ENTITY_PROPERTY_FROM_PROPERTIES(isSpotlight, setIsSpotlight);
if (somethingChanged) { if (somethingChanged) {