Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 15:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Haze Range works.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-04 21:47:20 -07:00
parent 97f775f6f1
commit 6dcd8b7b57
6 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,6 @@ void ZoneEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity
} }
} }
#pragma optimize("", off)
void ZoneEntityRenderer::doRender(RenderArgs* args) { void ZoneEntityRenderer::doRender(RenderArgs* args) {
#if 0 #if 0
if (ZoneEntityItem::getDrawZoneBoundaries()) { if (ZoneEntityItem::getDrawZoneBoundaries()) {
@ -339,20 +338,20 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity)
haze->setHazeActive(entity->getHazeMode() == HAZE_MODE_ENABLED); haze->setHazeActive(entity->getHazeMode() == HAZE_MODE_ENABLED);
haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(entity->getHazeRange())); haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange()));
xColor hazeBlendInColor = entity->getHazeBlendInColor(); xColor hazeBlendInColor = _hazeProperties.getHazeBlendInColor();
haze->setHazeColor(glm::vec3(hazeBlendInColor.red / 255.0, hazeBlendInColor.green / 255.0, hazeBlendInColor.blue / 255.0)); haze->setHazeColor(glm::vec3(hazeBlendInColor.red / 255.0, hazeBlendInColor.green / 255.0, hazeBlendInColor.blue / 255.0));
xColor hazeBlendOutColor = entity->getHazeBlendOutColor(); xColor hazeBlendOutColor = _hazeProperties.getHazeBlendOutColor();
haze->setHazeColor(glm::vec3(hazeBlendOutColor.red / 255.0, hazeBlendOutColor.green / 255.0, hazeBlendOutColor.blue / 255.0)); haze->setHazeColor(glm::vec3(hazeBlendOutColor.red / 255.0, hazeBlendOutColor.green / 255.0, hazeBlendOutColor.blue / 255.0));
haze->setDirectionalLightBlend(model::convertDirectionalLightAngleToPower(entity->getHazeLightBlendAngle())); haze->setDirectionalLightBlend(model::convertDirectionalLightAngleToPower(_hazeProperties.getHazeLightBlendAngle()));
haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(entity->getHazeAltitude())); haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(_hazeProperties.getHazeAltitude()));
haze->setHazeBaseReference(entity->getHazeBaseRef()); haze->setHazeBaseReference(_hazeProperties.getHazeBaseRef());
haze->setHazeBackgroundBlendValue(entity->getHazeBackgroundBlend()); haze->setHazeBackgroundBlendValue(_hazeProperties.getHazeBackgroundBlend());
haze->setHazeKeyLightRangeFactor(model::convertHazeRangeToHazeRangeFactor(entity->getHazeRange())); haze->setHazeKeyLightRangeFactor(model::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeKeyLightRange()));
haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(entity->getHazeAltitude())); haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(_hazeProperties.getHazeAltitude()));
} }
void ZoneEntityRenderer::updateKeyBackgroundFromEntity(const TypedEntityPointer& entity) { void ZoneEntityRenderer::updateKeyBackgroundFromEntity(const TypedEntityPointer& entity) {

12
libraries/entities/src/HazePropertyGroup.h
View file

@ -91,18 +91,18 @@ public:
DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, DEFAULT_HAZE_RANGE); DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, DEFAULT_HAZE_RANGE);
DEFINE_PROPERTY_REF(PROP_HAZE_BLEND_IN_COLOR, HazeBlendInColor, hazeBlendInColor, xColor, DEFAULT_HAZE_BLEND_IN_COLOR); DEFINE_PROPERTY_REF(PROP_HAZE_BLEND_IN_COLOR, HazeBlendInColor, hazeBlendInColor, xColor, DEFAULT_HAZE_BLEND_IN_COLOR);
DEFINE_PROPERTY_REF(PROP_HAZE_BLEND_OUT_COLOR, HazeBlendOutColor, hazeBlendOutColor, xColor, DEFAULT_HAZE_BLEND_OUT_COLOR); DEFINE_PROPERTY_REF(PROP_HAZE_BLEND_OUT_COLOR, HazeBlendOutColor, hazeBlendOutColor, xColor, DEFAULT_HAZE_BLEND_OUT_COLOR);
DEFINE_PROPERTY(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle, hazeLightBlendAngle, float, DEFAULT_HAZE_LIGHT_BLEND_ANGLE); DEFINE_PROPERTY_REF(PROP_HAZE_LIGHT_BLEND_ANGLE, HazeLightBlendAngle, hazeLightBlendAngle, float, DEFAULT_HAZE_LIGHT_BLEND_ANGLE);
// Range & Altitude parameters // Range & Altitude parameters
DEFINE_PROPERTY(PROP_HAZE_ALTITUDE, HazeAltitude, hazeAltitude, float, DEFAULT_HAZE_ALTITUDE); DEFINE_PROPERTY_REF(PROP_HAZE_ALTITUDE, HazeAltitude, hazeAltitude, float, DEFAULT_HAZE_ALTITUDE);
DEFINE_PROPERTY(PROP_HAZE_BASE_REF, HazeBaseRef, hazeBaseRef, float, DEFAULT_HAZE_BASE_REF); DEFINE_PROPERTY_REF(PROP_HAZE_BASE_REF, HazeBaseRef, hazeBaseRef, float, DEFAULT_HAZE_BASE_REF);
// Background (skybox) blend value // Background (skybox) blend value
DEFINE_PROPERTY(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend, hazeBackgroundBlend, float, DEFAULT_HAZE_BACKGROUND_BLEND); DEFINE_PROPERTY_REF(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend, hazeBackgroundBlend, float, DEFAULT_HAZE_BACKGROUND_BLEND);
// hazeDirectional light attenuation // hazeDirectional light attenuation
DEFINE_PROPERTY(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange, hazeKeyLightRange, float, DEFAULT_HAZE_KEYLIGHT_RANGE); DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange, hazeKeyLightRange, float, DEFAULT_HAZE_KEYLIGHT_RANGE);
DEFINE_PROPERTY(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude, hazeKeyLightAltitude, float, DEFAULT_HAZE_KEYLIGHT_ALTITUDE); DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude, hazeKeyLightAltitude, float, DEFAULT_HAZE_KEYLIGHT_ALTITUDE);
}; };
#endif // hifi_HazePropertyGroup_h #endif // hifi_HazePropertyGroup_h

2
libraries/model/src/model/Stage.cpp
View file

@ -257,7 +257,7 @@ void SunSkyStage::setSkybox(const SkyboxPointer& skybox) {
} }
// Haze // Haze
void SunSkyStage::setHazeMode(uint8_t mode) { void SunSkyStage::setHazeMode(uint32_t mode) {
_hazeMode = mode; _hazeMode = mode;
invalidate(); invalidate();
} }

4
libraries/model/src/model/Stage.h
View file

@ -183,8 +183,8 @@ public:
NUM_HAZE_MODES NUM_HAZE_MODES
}; };
void setHazeMode(uint8_t mode); void setHazeMode(uint32_t mode);
uint8_t getHazeMode() const { return _hazeMode; } uint32_t getHazeMode() const { return _hazeMode; }
void setHazeRange(float hazeRange) { _hazeRange = hazeRange; } void setHazeRange(float hazeRange) { _hazeRange = hazeRange; }
float getHazeRange() const { return _hazeRange; } float getHazeRange() const { return _hazeRange; }

1
libraries/render-utils/src/DrawHaze.cpp
View file

@ -126,7 +126,6 @@ const int HazeEffect_LinearDepthMapSlot = 3;
void DrawHaze::configure(const Config& config) { void DrawHaze::configure(const Config& config) {
} }
#pragma optimize("", off)
void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) { void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
const auto haze = inputs.get0(); const auto haze = inputs.get0();
if (haze == nullptr) { if (haze == nullptr) {

1
libraries/render-utils/src/HazeStage.cpp
View file

@ -84,7 +84,6 @@ void HazeStageSetup::run(const render::RenderContextPointer& renderContext) {
} }
} }
#pragma optimize("", off)
void FetchHazeStage::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) { void FetchHazeStage::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) {
auto hazeStage = renderContext->_scene->getStage<HazeStage>(); auto hazeStage = renderContext->_scene->getStage<HazeStage>();
assert(hazeStage); assert(hazeStage);