From 9c9dfc721146022395402bc3a2eae121ff19bc70 Mon Sep 17 00:00:00 2001 From: Nissim Hadar Date: Fri, 13 Oct 2017 13:36:46 -0700 Subject: [PATCH] Replace light blend with glare. --- .../src/RenderableZoneEntityItem.cpp | 2 +- .../entities/src/EntityItemProperties.cpp | 2 +- libraries/entities/src/EntityPropertyFlags.h | 2 +- libraries/entities/src/HazePropertyGroup.cpp | 32 +++++++++---------- libraries/entities/src/HazePropertyGroup.h | 2 +- libraries/entities/src/ZoneEntityItem.cpp | 8 ++--- libraries/entities/src/ZoneEntityItem.h | 6 ++-- libraries/model/src/model/Haze.cpp | 6 ++-- libraries/model/src/model/Haze.h | 2 +- libraries/model/src/model/Stage.h | 6 ++-- libraries/render-utils/src/DrawHaze.cpp | 6 ++-- libraries/render-utils/src/DrawHaze.h | 10 +++--- libraries/render-utils/src/HazeStage.cpp | 2 +- libraries/render-utils/src/HazeStage.h | 6 ++-- .../src/SceneScriptingInterface.cpp | 8 ++--- .../src/SceneScriptingInterface.h | 6 ++-- scripts/system/html/js/entityProperties.js | 6 ++-- 17 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index 864b95ba63..b67342ece4 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -345,7 +345,7 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity) haze->setHazeColor(glm::vec3(hazeColor.red / 255.0, hazeColor.green / 255.0, hazeColor.blue / 255.0)); xColor hazeGlareColor = _hazeProperties.getHazeGlareColor(); haze->setDirectionalLightColor(glm::vec3(hazeGlareColor.red / 255.0, hazeGlareColor.green / 255.0, hazeGlareColor.blue / 255.0)); - haze->setHazeEnableLightBlend(_hazeProperties.getHazeEnableLightBlend()); + haze->setHazeEnableGlare(_hazeProperties.getHazeEnableGlare()); haze->setDirectionalLightBlend(model::convertDirectionalLightAngleToPower(_hazeProperties.getHazeLightBlendAngle())); float hazeAltitude = _hazeProperties.getHazeCeiling() - _hazeProperties.getHazeBaseRef(); diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 7098d0a79d..259b6b4935 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1158,7 +1158,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_RANGE, Haze, haze, HazeRange, hazeRange); ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor); ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor); - ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ENABLE_LIGHT_BLEND, Haze, haze, HazeEnableLightBlend, hazeEnableLightBlend); + ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare); ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_LIGHT_BLEND_ANGLE, Haze, haze, HazeLightBlendAngle, hazeLightBlendAngle); ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEfect); diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h index 4496ba34cb..e9a3b9e9d6 100644 --- a/libraries/entities/src/EntityPropertyFlags.h +++ b/libraries/entities/src/EntityPropertyFlags.h @@ -237,7 +237,7 @@ enum EntityPropertyList { PROP_HAZE_RANGE = PROP_INTENSITY, PROP_HAZE_COLOR = PROP_CUTOFF, PROP_HAZE_GLARE_COLOR = PROP_EXPONENT, - PROP_HAZE_ENABLE_LIGHT_BLEND = PROP_IS_SPOTLIGHT, + PROP_HAZE_ENABLE_GLARE = PROP_IS_SPOTLIGHT, PROP_HAZE_LIGHT_BLEND_ANGLE = PROP_DIFFUSE_COLOR, PROP_HAZE_ALTITUDE_EFFECT = PROP_AMBIENT_COLOR_UNUSED, diff --git a/libraries/entities/src/HazePropertyGroup.cpp b/libraries/entities/src/HazePropertyGroup.cpp index 62e6fd7e84..e21f509489 100644 --- a/libraries/entities/src/HazePropertyGroup.cpp +++ b/libraries/entities/src/HazePropertyGroup.cpp @@ -32,7 +32,7 @@ void HazePropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProp COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_RANGE, Haze, haze, HazeRange, hazeRange); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor); - COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ENABLE_LIGHT_BLEND, Haze, haze, HazeEnableLightBlend, hazeEnableLightBlend); + COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_LIGHT_BLEND_ANGLE, Haze, haze, HazeLightBlendAngle, hazeLightBlendAngle); COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEffect); @@ -50,7 +50,7 @@ void HazePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _d COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeRange, float, setHazeRange); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeColor, xColor, setHazeColor); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeGlareColor, xColor, setHazeGlareColor); - COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeEnableLightBlend, bool, setHazeEnableLightBlend); + COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeEnableGlare, bool, setHazeEnableGlare); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeLightBlendAngle, float, setHazeLightBlendAngle); COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeAltitudeEffect, bool, setHazeAltitudeEffect); @@ -68,7 +68,7 @@ void HazePropertyGroup::merge(const HazePropertyGroup& other) { COPY_PROPERTY_IF_CHANGED(hazeRange); COPY_PROPERTY_IF_CHANGED(hazeColor); COPY_PROPERTY_IF_CHANGED(hazeGlareColor); - COPY_PROPERTY_IF_CHANGED(hazeEnableLightBlend); + COPY_PROPERTY_IF_CHANGED(hazeEnableGlare); COPY_PROPERTY_IF_CHANGED(hazeLightBlendAngle); COPY_PROPERTY_IF_CHANGED(hazeAltitudeEffect); @@ -88,7 +88,7 @@ void HazePropertyGroup::debugDump() const { qCDebug(entities) << " _hazeRange:" << _hazeRange; qCDebug(entities) << " _hazeColor:" << _hazeColor; qCDebug(entities) << " _hazeGlareColor:" << _hazeGlareColor; - qCDebug(entities) << " _hazeEnableLightBlend:" << _hazeEnableLightBlend; + qCDebug(entities) << " _hazeEnableGlare:" << _hazeEnableGlare; qCDebug(entities) << " _hazeLightBlendAngle:" << _hazeLightBlendAngle; qCDebug(entities) << " _hazeAltitudeEffect:" << _hazeAltitudeEffect; @@ -112,8 +112,8 @@ void HazePropertyGroup::listChangedProperties(QList& out) { if (hazeGlareColorChanged()) { out << "haze-hazeGlareColor"; } - if (hazeEnableLightBlendChanged()) { - out << "haze-hazeEnableLightBlend"; + if (hazeEnableGlareChanged()) { + out << "haze-hazeEnableGlare"; } if (hazeLightBlendAngleChanged()) { out << "haze-hazeLightBlendAngle"; @@ -156,7 +156,7 @@ bool HazePropertyGroup::appendToEditPacket(OctreePacketData* packetData, APPEND_ENTITY_PROPERTY(PROP_HAZE_RANGE, getHazeRange()); APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor()); APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor()); - APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_LIGHT_BLEND, getHazeEnableLightBlend()); + APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare()); APPEND_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, getHazeLightBlendAngle()); APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect()); @@ -181,7 +181,7 @@ bool HazePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, READ_ENTITY_PROPERTY(PROP_HAZE_RANGE, float, setHazeRange); READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor); READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor); - READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_LIGHT_BLEND, bool, setHazeEnableLightBlend); + READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare); READ_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, float, setHazeLightBlendAngle); READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect); @@ -197,7 +197,7 @@ bool HazePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_RANGE, HazeRange); DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_COLOR, HazeColor); DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_GLARE_COLOR, HazeGlareColor); - DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ENABLE_LIGHT_BLEND, HazeEnableLightBlend); + DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare); DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle); DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect); @@ -221,7 +221,7 @@ void HazePropertyGroup::markAllChanged() { _hazeRangeChanged = true; _hazeColorChanged = true; _hazeGlareColorChanged = true; - _hazeEnableLightBlendChanged = true; + _hazeEnableGlareChanged = true; _hazeLightBlendAngleChanged = true; _hazeAltitudeEffectChanged = true; @@ -241,7 +241,7 @@ EntityPropertyFlags HazePropertyGroup::getChangedProperties() const { CHECK_PROPERTY_CHANGE(PROP_HAZE_RANGE, hazeRange); CHECK_PROPERTY_CHANGE(PROP_HAZE_COLOR, hazeColor); CHECK_PROPERTY_CHANGE(PROP_HAZE_GLARE_COLOR, hazeGlareColor); - CHECK_PROPERTY_CHANGE(PROP_HAZE_ENABLE_LIGHT_BLEND, hazeEnableLightBlend); + CHECK_PROPERTY_CHANGE(PROP_HAZE_ENABLE_GLARE, hazeEnableGlare); CHECK_PROPERTY_CHANGE(PROP_HAZE_LIGHT_BLEND_ANGLE, hazeLightBlendAngle); CHECK_PROPERTY_CHANGE(PROP_HAZE_ALTITUDE_EFFECT, hazeAltitudeEffect); @@ -261,7 +261,7 @@ void HazePropertyGroup::getProperties(EntityItemProperties& properties) const { COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeRange, getHazeRange); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeColor, getHazeColor); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeGlareColor, getHazeGlareColor); - COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeEnableLightBlend, getHazeEnableLightBlend); + COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeEnableGlare, getHazeEnableGlare); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeLightBlendAngle, getHazeLightBlendAngle); COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeAltitudeEffect, getHazeAltitudeEffect); @@ -281,7 +281,7 @@ bool HazePropertyGroup::setProperties(const EntityItemProperties& properties) { SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeRange, hazeRange, setHazeRange); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeColor, hazeColor, setHazeColor); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeGlareColor, hazeGlareColor, setHazeGlareColor); - SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeEnableLightBlend, hazeEnableLightBlend, setHazeEnableLightBlend); + SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeEnableGlare, hazeEnableGlare, setHazeEnableGlare); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeLightBlendAngle, hazeLightBlendAngle, setHazeLightBlendAngle); SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeAltitudeEffect, hazeAltitudeEffect, setHazeAltitudeEffect); @@ -303,7 +303,7 @@ EntityPropertyFlags HazePropertyGroup::getEntityProperties(EncodeBitstreamParams requestedProperties += PROP_HAZE_RANGE; requestedProperties += PROP_HAZE_COLOR; requestedProperties += PROP_HAZE_GLARE_COLOR; - requestedProperties += PROP_HAZE_ENABLE_LIGHT_BLEND; + requestedProperties += PROP_HAZE_ENABLE_GLARE; requestedProperties += PROP_HAZE_LIGHT_BLEND_ANGLE; requestedProperties += PROP_HAZE_CEILING; @@ -331,7 +331,7 @@ void HazePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeB APPEND_ENTITY_PROPERTY(PROP_HAZE_RANGE, getHazeRange()); APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor()); APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor()); - APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_LIGHT_BLEND, getHazeEnableLightBlend()); + APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare()); APPEND_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, getHazeLightBlendAngle()); APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect()); @@ -356,7 +356,7 @@ int HazePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* dat READ_ENTITY_PROPERTY(PROP_HAZE_RANGE, float, setHazeRange); READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor); READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor); - READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_LIGHT_BLEND, bool, setHazeEnableLightBlend); + READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare); READ_ENTITY_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, float, setHazeLightBlendAngle); READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect); diff --git a/libraries/entities/src/HazePropertyGroup.h b/libraries/entities/src/HazePropertyGroup.h index d1ce32c472..1afd857e5e 100644 --- a/libraries/entities/src/HazePropertyGroup.h +++ b/libraries/entities/src/HazePropertyGroup.h @@ -91,7 +91,7 @@ public: DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, DEFAULT_HAZE_RANGE); DEFINE_PROPERTY_REF(PROP_HAZE_COLOR, HazeColor, hazeColor, xColor, DEFAULT_HAZE_COLOR); DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_COLOR, HazeGlareColor, hazeGlareColor, xColor, DEFAULT_HAZE_GLARE_COLOR); - DEFINE_PROPERTY(PROP_HAZE_ENABLE_LIGHT_BLEND, HazeEnableLightBlend, hazeEnableLightBlend, bool, false); + DEFINE_PROPERTY(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare, hazeEnableGlare, bool, false); DEFINE_PROPERTY_REF(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle, hazeLightBlendAngle, float, DEFAULT_HAZE_LIGHT_BLEND_ANGLE); // Altitude parameters diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp index 6d5e9099d9..0ac0a20985 100644 --- a/libraries/entities/src/ZoneEntityItem.cpp +++ b/libraries/entities/src/ZoneEntityItem.cpp @@ -356,13 +356,13 @@ xColor ZoneEntityItem::getHazeGlareColor()const { return _hazeGlareColor; } -void ZoneEntityItem::setHazeEnableLightBlend(const bool hazeEnableLightBlend) { - _hazeEnableLightBlend = hazeEnableLightBlend; +void ZoneEntityItem::setHazeEnableGlare(const bool hazeEnableGlare) { + _hazeEnableGlare = hazeEnableGlare; _hazePropertiesChanged = true; } -bool ZoneEntityItem::getHazeEnableLightBlend()const { - return _hazeEnableLightBlend; +bool ZoneEntityItem::getHazeEnableGlare()const { + return _hazeEnableGlare; } void ZoneEntityItem::setHazeLightBlendAngle(const float hazeLightBlendAngle) { diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h index ebfac294b6..df26b37414 100644 --- a/libraries/entities/src/ZoneEntityItem.h +++ b/libraries/entities/src/ZoneEntityItem.h @@ -79,8 +79,8 @@ public: xColor getHazeColor() const; void setHazeGlareColor(const xColor hazeGlareColor); xColor getHazeGlareColor() const; - void setHazeEnableLightBlend(const bool hazeEnableLightBlend); - bool getHazeEnableLightBlend() const; + void setHazeEnableGlare(const bool hazeEnableGlare); + bool getHazeEnableGlare() const; void setHazeLightBlendAngle(const float hazeLightBlendAngle); float getHazeLightBlendAngle() const; @@ -151,7 +151,7 @@ protected: float _hazeRange{ HazePropertyGroup::DEFAULT_HAZE_RANGE }; xColor _hazeColor{ HazePropertyGroup::DEFAULT_HAZE_COLOR }; xColor _hazeGlareColor{ HazePropertyGroup::DEFAULT_HAZE_GLARE_COLOR }; - bool _hazeEnableLightBlend{ false }; + bool _hazeEnableGlare{ false }; float _hazeLightBlendAngle{ HazePropertyGroup::DEFAULT_HAZE_LIGHT_BLEND_ANGLE }; float _hazeCeiling{ HazePropertyGroup::DEFAULT_HAZE_CEILING }; diff --git a/libraries/model/src/model/Haze.cpp b/libraries/model/src/model/Haze.cpp index c98c44b7a2..f5fc04f55e 100644 --- a/libraries/model/src/model/Haze.cpp +++ b/libraries/model/src/model/Haze.cpp @@ -45,13 +45,13 @@ void Haze::setHazeColor(const glm::vec3 hazeColor) { } } -void Haze::setHazeEnableLightBlend(const bool isHazeEnableLightBlend) { +void Haze::setHazeEnableGlare(const bool isHazeEnableGlare) { auto& params = _hazeParametersBuffer.get(); - if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) == HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && !isHazeEnableLightBlend) { + if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) == HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && !isHazeEnableGlare) { _hazeParametersBuffer.edit().hazeMode &= ~HAZE_MODE_IS_ENABLE_LIGHT_BLEND; } - else if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) != HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && isHazeEnableLightBlend) { + else if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) != HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && isHazeEnableGlare) { _hazeParametersBuffer.edit().hazeMode |= HAZE_MODE_IS_ENABLE_LIGHT_BLEND; } } diff --git a/libraries/model/src/model/Haze.h b/libraries/model/src/model/Haze.h index 2340f2fa05..1467c9ce77 100644 --- a/libraries/model/src/model/Haze.h +++ b/libraries/model/src/model/Haze.h @@ -82,7 +82,7 @@ namespace model { void setAltitudeBased(const bool isAltitudeBased); void setHazeAttenuateKeyLight(const bool isHazeAttenuateKeyLight); void setModulateColorActive(const bool isModulateColorActive); - void setHazeEnableLightBlend(const bool isHazeEnableLightBlend); + void setHazeEnableGlare(const bool isHazeEnableGlare); void setHazeRangeFactor(const float hazeRange); void setHazeAltitudeFactor(const float hazeAltitude); diff --git a/libraries/model/src/model/Stage.h b/libraries/model/src/model/Stage.h index b8f1a3908a..4f704effa7 100644 --- a/libraries/model/src/model/Stage.h +++ b/libraries/model/src/model/Stage.h @@ -192,8 +192,8 @@ public: xColor getHazeColor() { return _hazeColor; } void setHazeGlareColor(const xColor hazeGlareColor) { _hazeGlareColor = hazeGlareColor; } xColor getHazeGlareColor() const { return _hazeGlareColor; } - void setHazeEnableLightBlend(bool hazeEnableLightBlend) { _hazeEnableLightBlend = hazeEnableLightBlend; } - bool getHazeEnableLightBlend() const { return _hazeEnableLightBlend; } + void setHazeEnableGlare(bool hazeEnableGlare) { _hazeEnableGlare = hazeEnableGlare; } + bool getHazeEnableGlare() const { return _hazeEnableGlare; } void setHazeLightBlendAngle(float hazeLightBlendAngle) { _hazeLightBlendAngle = hazeLightBlendAngle; } float getHazeLightBlendAngle() const { return _hazeLightBlendAngle; } @@ -222,7 +222,7 @@ protected: float _hazeRange; xColor _hazeColor; xColor _hazeGlareColor; - bool _hazeEnableLightBlend; + bool _hazeEnableGlare; float _hazeLightBlendAngle; bool _hazeAltitudeEffect; diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp index 320aa06c6d..369f5df5e2 100644 --- a/libraries/render-utils/src/DrawHaze.cpp +++ b/libraries/render-utils/src/DrawHaze.cpp @@ -69,8 +69,8 @@ void HazeConfig::setModulateColorActive(const bool active) { isModulateColorActive = active; } -void HazeConfig::setHazeEnableLightBlend(const bool active) { - isHazeEnableLightBlend = active; +void HazeConfig::setHazeEnableGlare(const bool active) { + isHazeEnableGlare = active; } void HazeConfig::setHazeRange_m(const float value) { @@ -108,7 +108,7 @@ void MakeHaze::configure(const Config& config) { _haze->setAltitudeBased(config.isAltitudeBased); _haze->setHazeAttenuateKeyLight(config.isHazeAttenuateKeyLight); _haze->setModulateColorActive(config.isModulateColorActive); - _haze->setHazeEnableLightBlend(config.isHazeEnableLightBlend); + _haze->setHazeEnableGlare(config.isHazeEnableGlare); _haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(config.hazeRange_m)); _haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(config.hazeAltitude_m)); diff --git a/libraries/render-utils/src/DrawHaze.h b/libraries/render-utils/src/DrawHaze.h index 919ccdb368..4a7b2135bd 100644 --- a/libraries/render-utils/src/DrawHaze.h +++ b/libraries/render-utils/src/DrawHaze.h @@ -43,7 +43,7 @@ class MakeHazeConfig : public render::Job::Config { Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty); Q_PROPERTY(bool isHazeAttenuateKeyLight MEMBER isHazeAttenuateKeyLight WRITE setHazeAttenuateKeyLight NOTIFY dirty); Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty); - Q_PROPERTY(bool isHazeEnableLightBlend MEMBER isHazeEnableLightBlend WRITE setHazeEnableLightBlend NOTIFY dirty); + Q_PROPERTY(bool isHazeEnableGlare MEMBER isHazeEnableGlare WRITE setHazeEnableGlare NOTIFY dirty); Q_PROPERTY(float hazeRange_m MEMBER hazeRange_m WRITE setHazeRange_m NOTIFY dirty); Q_PROPERTY(float hazeAltitude_m MEMBER hazeAltitude_m WRITE setHazeAltitude_m NOTIFY dirty); @@ -70,7 +70,7 @@ public: bool isAltitudeBased{ false }; bool isHazeAttenuateKeyLight{ false }; bool isModulateColorActive{ false }; - bool isHazeEnableLightBlend{ false }; + bool isHazeEnableGlare{ false }; float hazeRange_m{ model::initialHazeRange_m }; float hazeAltitude_m{ model::initialHazeAltitude_m }; @@ -95,7 +95,7 @@ public slots: void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); } void setHazeAttenuateKeyLight(const bool active) { isHazeAttenuateKeyLight = active; emit dirty(); } void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); } - void setHazeEnableLightBlend(const bool active) { isHazeEnableLightBlend = active; emit dirty(); } + void setHazeEnableGlare(const bool active) { isHazeEnableGlare = active; emit dirty(); } void setHazeRange_m(const float value) { hazeRange_m = value; emit dirty(); } void setHazeAltitude_m(const float value) { hazeAltitude_m = value; emit dirty(); } @@ -142,7 +142,7 @@ public: bool isAltitudeBased{ false }; bool isHazeAttenuateKeyLight{ false }; bool isModulateColorActive{ false }; - bool isHazeEnableLightBlend{ false }; + bool isHazeEnableGlare{ false }; float hazeRange_m{ model::initialHazeRange_m }; float hazeAltitude_m{ model::initialHazeAltitude_m }; @@ -167,7 +167,7 @@ public: void setAltitudeBased(const bool active); void setHazeAttenuateKeyLight(const bool active); void setModulateColorActive(const bool active); - void setHazeEnableLightBlend(const bool active); + void setHazeEnableGlare(const bool active); void setHazeRange_m(const float value); void setHazeAltitude_m(const float value); diff --git a/libraries/render-utils/src/HazeStage.cpp b/libraries/render-utils/src/HazeStage.cpp index c09fcaa488..aa7a7f554c 100644 --- a/libraries/render-utils/src/HazeStage.cpp +++ b/libraries/render-utils/src/HazeStage.cpp @@ -30,7 +30,7 @@ void FetchHazeStage::configure(const Config& config) { _haze->setAltitudeBased(config.isAltitudeBased); _haze->setHazeAttenuateKeyLight(config.isHazeAttenuateKeyLight); _haze->setModulateColorActive(config.isModulateColorActive); - _haze->setHazeEnableLightBlend(config.isHazeEnableLightBlend); + _haze->setHazeEnableGlare(config.isHazeEnableGlare); _haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(config.hazeRange_m)); _haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(config.hazeAltitude_m)); diff --git a/libraries/render-utils/src/HazeStage.h b/libraries/render-utils/src/HazeStage.h index 349985ee3b..7cc0c659b0 100644 --- a/libraries/render-utils/src/HazeStage.h +++ b/libraries/render-utils/src/HazeStage.h @@ -97,7 +97,7 @@ class FetchHazeConfig : public render::Job::Config { Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty); Q_PROPERTY(bool isHazeAttenuateKeyLight MEMBER isHazeAttenuateKeyLight WRITE setHazeAttenuateKeyLight NOTIFY dirty); Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty); - Q_PROPERTY(bool isHazeEnableLightBlend MEMBER isHazeEnableLightBlend WRITE setHazeEnableLightBlend NOTIFY dirty); + Q_PROPERTY(bool isHazeEnableGlare MEMBER isHazeEnableGlare WRITE setHazeEnableGlare NOTIFY dirty); Q_PROPERTY(float hazeRange_m MEMBER hazeRange_m WRITE setHazeRange_m NOTIFY dirty); Q_PROPERTY(float hazeAltitude_m MEMBER hazeAltitude_m WRITE setHazeAltitude_m NOTIFY dirty); @@ -124,7 +124,7 @@ public: bool isAltitudeBased{ false }; bool isHazeAttenuateKeyLight{ false }; bool isModulateColorActive{ false }; - bool isHazeEnableLightBlend{ false }; + bool isHazeEnableGlare{ false }; float hazeRange_m{ model::initialHazeRange_m }; float hazeAltitude_m{ model::initialHazeAltitude_m }; @@ -149,7 +149,7 @@ public slots: void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); } void setHazeAttenuateKeyLight(const bool active) { isHazeAttenuateKeyLight = active; emit dirty(); } void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); } - void setHazeEnableLightBlend(const bool active) { isHazeEnableLightBlend = active; emit dirty(); } + void setHazeEnableGlare(const bool active) { isHazeEnableGlare = active; emit dirty(); } void setHazeRange_m(const float value) { hazeRange_m = value; emit dirty(); } void setHazeAltitude_m(const float value) { hazeAltitude_m = value; emit dirty(); } diff --git a/libraries/script-engine/src/SceneScriptingInterface.cpp b/libraries/script-engine/src/SceneScriptingInterface.cpp index 41eb10be19..233ecc8b15 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.cpp +++ b/libraries/script-engine/src/SceneScriptingInterface.cpp @@ -167,11 +167,11 @@ void SceneScripting::Stage::setHazeGlareColor(const xColor hazeGlareColor) { xColor SceneScripting::Stage::getHazeGlareColor() const { return _skyStage->getHazeGlareColor(); } -void SceneScripting::Stage::setHazeEnableLightBlend(const bool hazeEnableLightBlend) { - _skyStage->setHazeEnableLightBlend(hazeEnableLightBlend); +void SceneScripting::Stage::setHazeEnableGlare(const bool hazeEnableGlare) { + _skyStage->setHazeEnableGlare(hazeEnableGlare); } -bool SceneScripting::Stage::getHazeEnableLightBlend() const { - return _skyStage->getHazeEnableLightBlend(); +bool SceneScripting::Stage::getHazeEnableGlare() const { + return _skyStage->getHazeEnableGlare(); } void SceneScripting::Stage::setHazeLightBlendAngle(const float hazeLightBlendAngle) { _skyStage->setHazeLightBlendAngle(hazeLightBlendAngle); diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h index ed3158848b..f19e565450 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.h +++ b/libraries/script-engine/src/SceneScriptingInterface.h @@ -137,9 +137,9 @@ namespace SceneScripting { void setHazeGlareColor(xColor value); xColor getHazeGlareColor() const; - Q_PROPERTY(bool hazeEnableLightBlend READ getHazeEnableLightBlend WRITE setHazeEnableLightBlend) - void setHazeEnableLightBlend(bool value); - bool getHazeEnableLightBlend() const; + Q_PROPERTY(bool hazeEnableGlare READ getHazeEnableGlare WRITE setHazeEnableGlare) + void setHazeEnableGlare(bool value); + bool getHazeEnableGlare() const; Q_PROPERTY(float hazeLightBlendAngle READ getHazeLightBlendAngle WRITE setHazeLightBlendAngle) void setHazeLightBlendAngle(float value); diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js index bbb59cab04..1266f88917 100644 --- a/scripts/system/html/js/entityProperties.js +++ b/scripts/system/html/js/entityProperties.js @@ -686,7 +686,7 @@ function loaded() { var elZoneHazeGlareColorRed = document.getElementById("property-zone-haze-blend-out-color-red"); var elZoneHazeGlareColorGreen = document.getElementById("property-zone-haze-blend-out-color-green"); var elZoneHazeGlareColorBlue = document.getElementById("property-zone-haze-blend-out-color-blue"); - var elZoneHazeEnableLightBlend = document.getElementById("property-zone-haze-enable-light-blend"); + var elZoneHazeEnableGlare = document.getElementById("property-zone-haze-enable-light-blend"); var elZoneHazeLightBlendAngle = document.getElementById("property-zone-haze-blend-angle"); var elZoneHazeAltitudeEffect = document.getElementById("property-zone-haze-altitude-effect"); @@ -1060,7 +1060,7 @@ function loaded() { elZoneHazeGlareColorGreen.value = properties.haze.hazeGlareColor.green; elZoneHazeGlareColorBlue.value = properties.haze.hazeGlareColor.blue; - elZoneHazeEnableLightBlend.checked = properties.haze.hazeEnableLightBlend; + elZoneHazeEnableGlare.checked = properties.haze.hazeEnableGlare; elZoneHazeLightBlendAngle.value = properties.haze.hazeLightBlendAngle.toFixed(0); elZoneHazeAltitudeEffect.checked = properties.haze.hazeAltitudeEffect; @@ -1524,7 +1524,7 @@ function loaded() { elZoneHazeGlareColorGreen.addEventListener('change', zoneHazeGlareColorChangeFunction); elZoneHazeGlareColorBlue.addEventListener('change', zoneHazeGlareColorChangeFunction); - elZoneHazeEnableLightBlend.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeEnableLightBlend')); + elZoneHazeEnableGlare.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeEnableGlare')); elZoneHazeLightBlendAngle.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeLightBlendAngle')); elZoneHazeAltitudeEffect.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAltitudeEffect'));