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

Removed ...ALTITUDE_MODE from combo.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-11 18:58:59 -07:00
parent 3070778b39
commit ea6b9ed28e
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,9 +337,8 @@ 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();
const bool isHazeActive = ((hazeMode == HAZE_MODE_RANGE_ONLY) || (hazeMode == HAZE_MODE_RANGE_ALTITUDE)); haze->setHazeActive(hazeMode == HAZE_MODE_RANGE_ONLY);
haze->setHazeActive(isHazeActive); //// 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()));
xColor hazeBlendInColor = _hazeProperties.getHazeBlendInColor(); xColor hazeBlendInColor = _hazeProperties.getHazeBlendInColor();

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

@ -224,8 +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_RANGE_ONLY,{ "range only" } }
HazePair{ HAZE_MODE_RANGE_ALTITUDE,{ "range+altitude" } }
} }; } };
QString EntityItemProperties::getHazeModeAsString() const { QString EntityItemProperties::getHazeModeAsString() const {

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

@ -16,7 +16,6 @@ enum HazeMode {
HAZE_MODE_INHERIT, HAZE_MODE_INHERIT,
HAZE_MODE_DISABLED, HAZE_MODE_DISABLED,
HAZE_MODE_RANGE_ONLY, HAZE_MODE_RANGE_ONLY,
HAZE_MODE_RANGE_ALTITUDE,
HAZE_MODE_ITEM_COUNT HAZE_MODE_ITEM_COUNT
}; };

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

@ -553,7 +553,6 @@
<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">Range Only</option>
<option value="range+altitude">Range+Altitude</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">