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

Keep fixing the cascading behavior to the zone render item

Browse source
This commit is contained in:
samcake 2017-05-15 17:19:46 -07:00
parent 2df6d0df48
commit 8626e1f3d1
1 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,12 +54,17 @@ public:
void setSkyboxURL(const QString& skyboxUrl); void setSkyboxURL(const QString& skyboxUrl);
void setBackgroundMode(BackgroundMode mode);
void setSkyboxColor(const glm::vec3& color);
void setProceduralUserData(QString userData);
protected: protected:
render::Item::Bound _bound; render::Item::Bound _bound;
model::LightPointer _sunLight; model::LightPointer _sunLight;
model::LightPointer _ambientLight; model::LightPointer _ambientLight;
model::SunSkyStagePointer _background; model::SunSkyStagePointer _background;
BackgroundMode _backgroundMode { BACKGROUND_MODE_INHERIT };
LightStagePointer _stage; LightStagePointer _stage;
LightStage::Index _sunIndex { LightStage::INVALID_INDEX }; LightStage::Index _sunIndex { LightStage::INVALID_INDEX };
@ -89,6 +94,7 @@ protected:
bool _pendingSkyboxTexture { false }; bool _pendingSkyboxTexture { false };
bool _validSkyboxTexture { false }; bool _validSkyboxTexture { false };
QString _proceduralUserData;
}; };
// Sphere entities should fit inside a cube entity of the same size, so a sphere that has dimensions 1x1x1 // Sphere entities should fit inside a cube entity of the same size, so a sphere that has dimensions 1x1x1
@ -364,8 +370,9 @@ void RenderableZoneEntityItem::updateKeyAmbientFromEntity(RenderableZoneEntityIt
void RenderableZoneEntityItem::updateKeyBackgroundFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) { void RenderableZoneEntityItem::updateKeyBackgroundFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) {
auto background = keyZonePayload.editBackground(); auto background = keyZonePayload.editBackground();
this->getBackgroundMode(); keyZonePayload.setBackgroundMode(this->getBackgroundMode());
keyZonePayload.setSkyboxColor(this->getSkyboxProperties().getColorVec3());
keyZonePayload.setProceduralUserData(this->getUserData());
keyZonePayload.setSkyboxURL(this->getSkyboxProperties().getURL()); keyZonePayload.setSkyboxURL(this->getSkyboxProperties().getURL());
} }
@ -547,6 +554,22 @@ void RenderableZoneEntityItemMeta::updateSkyboxMap() {
} }
} }
void RenderableZoneEntityItemMeta::setBackgroundMode(BackgroundMode mode) {
_backgroundMode = mode;
}
void RenderableZoneEntityItemMeta::setSkyboxColor(const glm::vec3& color) {
editSkybox()->setColor(color);
}
void RenderableZoneEntityItemMeta::setProceduralUserData(QString userData) {
if (_proceduralUserData != userData) {
_proceduralUserData = userData;
std::dynamic_pointer_cast<ProceduralSkybox>(editSkybox())->parse(_proceduralUserData);
}
}
void RenderableZoneEntityItemMeta::render(RenderArgs* args) { void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
// entity->render(args); // entity->render(args);
@ -602,8 +625,17 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
if (isVisible()) { if (isVisible()) {
// FInally, push the light visible in the frame // FInally, push the light visible in the frame
// THe directional key light for sure
_stage->_currentFrame.pushSunLight(_sunIndex); _stage->_currentFrame.pushSunLight(_sunIndex);
_stage->_currentFrame.pushAmbientLight(_ambientIndex);
_backgroundStage->_currentFrame.pushBackground(_backgroundIndex); // The ambient light only if it has a valid texture to render with
if (_validAmbientTexture || _validSkyboxTexture) {
_stage->_currentFrame.pushAmbientLight(_ambientIndex);
}
// The background only if the mode is not inherit
if (_backgroundMode != BACKGROUND_MODE_INHERIT) {
_backgroundStage->_currentFrame.pushBackground(_backgroundIndex);
}
} }
} }