Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 20:34:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more tweaks for new light properties

Browse source
This commit is contained in:
ZappoMan 2014-10-27 15:37:52 -07:00
parent ac9c5e7386
commit bb1eacce7d
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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:

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

@ -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;

3
libraries/entities/src/SphereEntityItem.cpp
View file

@ -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;
}