Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-11 19:10:51 -07:00
parent ea6b9ed28e
commit 832f9fb6e3
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -337,7 +337,7 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity)
const auto& haze = editHaze(); const auto& haze = editHaze();
const uint32_t hazeMode = entity->getHazeMode(); const uint32_t hazeMode = entity->getHazeMode();
haze->setHazeActive(hazeMode == HAZE_MODE_RANGE_ONLY); haze->setHazeActive(hazeMode == HAZE_MODE_ENABLED);
//// haze->setAltitudeBased(hazeMode == HAZE_MODE_RANGE_ALTITUDE); //// haze->setAltitudeBased(hazeMode == HAZE_MODE_RANGE_ALTITUDE);
haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange())); haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange()));

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -224,7 +224,7 @@ using HazePair = std::pair<const HazeMode, const QString>;
const std::array<HazePair, HAZE_MODE_ITEM_COUNT> HAZE_MODES = { { const std::array<HazePair, HAZE_MODE_ITEM_COUNT> HAZE_MODES = { {
HazePair{ HAZE_MODE_INHERIT,{ "inherit" } }, HazePair{ HAZE_MODE_INHERIT,{ "inherit" } },
HazePair{ HAZE_MODE_DISABLED,{ "disabled" } }, HazePair{ HAZE_MODE_DISABLED,{ "disabled" } },
HazePair{ HAZE_MODE_RANGE_ONLY,{ "range only" } } HazePair{ HAZE_MODE_ENABLED,{ "range only" } }
} }; } };
QString EntityItemProperties::getHazeModeAsString() const { QString EntityItemProperties::getHazeModeAsString() const {

2
libraries/shared/src/HazeMode.h
View file

@ -15,7 +15,7 @@
enum HazeMode { enum HazeMode {
HAZE_MODE_INHERIT, HAZE_MODE_INHERIT,
HAZE_MODE_DISABLED, HAZE_MODE_DISABLED,
HAZE_MODE_RANGE_ONLY, HAZE_MODE_ENABLED,
HAZE_MODE_ITEM_COUNT HAZE_MODE_ITEM_COUNT
}; };

2
scripts/system/html/entityProperties.html
View file

@ -552,7 +552,7 @@
<select name="SelectHazeMode" id="property-zone-haze-mode"> <select name="SelectHazeMode" id="property-zone-haze-mode">
<option value="inherit">Inherit</option> <option value="inherit">Inherit</option>
<option value="disabled">Disabled</option> <option value="disabled">Disabled</option>
<option value="range only">Range Only</option> <option value="range only">Enabled</option>
</select> </select>
</div> </div>
<fieldset class="zone-group zone-section haze-section property gen fstuple"> <fieldset class="zone-group zone-section haze-section property gen fstuple">