diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index 3efe991baa..d9eea1f1e5 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -337,9 +337,8 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity) const auto& haze = editHaze(); const uint32_t hazeMode = entity->getHazeMode(); - const bool isHazeActive = ((hazeMode == HAZE_MODE_RANGE_ONLY) || (hazeMode == HAZE_MODE_RANGE_ALTITUDE)); - haze->setHazeActive(isHazeActive); - haze->setAltitudeBased(hazeMode == HAZE_MODE_RANGE_ALTITUDE); + haze->setHazeActive(hazeMode == HAZE_MODE_RANGE_ONLY); +//// haze->setAltitudeBased(hazeMode == HAZE_MODE_RANGE_ALTITUDE); haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange())); xColor hazeBlendInColor = _hazeProperties.getHazeBlendInColor(); diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 3f87cb374b..38b5892117 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -224,8 +224,7 @@ using HazePair = std::pair; const std::array HAZE_MODES = { { HazePair{ HAZE_MODE_INHERIT,{ "inherit" } }, HazePair{ HAZE_MODE_DISABLED,{ "disabled" } }, - HazePair{ HAZE_MODE_RANGE_ONLY,{ "range only" } }, - HazePair{ HAZE_MODE_RANGE_ALTITUDE,{ "range+altitude" } } + HazePair{ HAZE_MODE_RANGE_ONLY,{ "range only" } } } }; QString EntityItemProperties::getHazeModeAsString() const { diff --git a/libraries/shared/src/HazeMode.h b/libraries/shared/src/HazeMode.h index c5deeed9a3..f2dedfa4bd 100644 --- a/libraries/shared/src/HazeMode.h +++ b/libraries/shared/src/HazeMode.h @@ -16,7 +16,6 @@ enum HazeMode { HAZE_MODE_INHERIT, HAZE_MODE_DISABLED, HAZE_MODE_RANGE_ONLY, - HAZE_MODE_RANGE_ALTITUDE, HAZE_MODE_ITEM_COUNT }; diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html index 5545be6a1e..650e120e6e 100644 --- a/scripts/system/html/entityProperties.html +++ b/scripts/system/html/entityProperties.html @@ -553,7 +553,6 @@ -