Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implemented Haze mode default.

Browse source
This commit is contained in:
Nissim 2017-10-20 13:32:27 -07:00
parent 0f519da76e
commit b0ca1353e4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,6 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID) : EntityItem(en
_compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL; _compoundShapeURL = DEFAULT_COMPOUND_SHAPE_URL;
_backgroundMode = BACKGROUND_MODE_INHERIT; _backgroundMode = BACKGROUND_MODE_INHERIT;
_hazeMode = (uint32_t)COMPONENT_MODE_INHERIT;
} }
EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const { EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {

4
libraries/entities/src/ZoneEntityItem.h
View file

@ -138,6 +138,8 @@ public:
static const bool DEFAULT_GHOSTING_ALLOWED; static const bool DEFAULT_GHOSTING_ALLOWED;
static const QString DEFAULT_FILTER_URL; static const QString DEFAULT_FILTER_URL;
static const uint32_t DEFAULT_HAZE_MODE{ (uint32_t)COMPONENT_MODE_INHERIT };
protected: protected:
KeyLightPropertyGroup _keyLightProperties; KeyLightPropertyGroup _keyLightProperties;
@ -146,7 +148,7 @@ protected:
BackgroundMode _backgroundMode = BACKGROUND_MODE_INHERIT; BackgroundMode _backgroundMode = BACKGROUND_MODE_INHERIT;
uint32_t _hazeMode{ (uint32_t)COMPONENT_MODE_INHERIT }; uint32_t _hazeMode{ DEFAULT_HAZE_MODE };
float _hazeRange{ HazePropertyGroup::DEFAULT_HAZE_RANGE }; float _hazeRange{ HazePropertyGroup::DEFAULT_HAZE_RANGE };
xColor _hazeColor{ HazePropertyGroup::DEFAULT_HAZE_COLOR }; xColor _hazeColor{ HazePropertyGroup::DEFAULT_HAZE_COLOR };