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

detect unset skybox

Browse source
This commit is contained in:
Zach Pomerantz 2016-08-23 14:55:46 -07:00
parent 89b00883dd
commit c740b263a8
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -4326,7 +4326,7 @@ namespace render {
} }
case model::SunSkyStage::SKY_BOX: { case model::SunSkyStage::SKY_BOX: {
auto skybox = skyStage->getSkybox(); auto skybox = skyStage->getSkybox();
if (skybox) { if (!skybox->empty()) {
PerformanceTimer perfTimer("skybox"); PerformanceTimer perfTimer("skybox");
skybox->render(batch, args->getViewFrustum()); skybox->render(batch, args->getViewFrustum());
break; break;

1
libraries/model/src/model/Skybox.h
View file

@ -35,6 +35,7 @@ public:
void setCubemap(const gpu::TexturePointer& cubemap); void setCubemap(const gpu::TexturePointer& cubemap);
const gpu::TexturePointer& getCubemap() const { return _cubemap; } const gpu::TexturePointer& getCubemap() const { return _cubemap; }
virtual bool empty() { return _schemaBuffer.get<Schema>().color == vec3(0) && !_cubemap; }
virtual void clear() { setCubemap(nullptr); } virtual void clear() { setCubemap(nullptr); }
void prepare(gpu::Batch& batch, int textureSlot = SKYBOX_SKYMAP_SLOT, int bufferSlot = SKYBOX_CONSTANTS_SLOT) const; void prepare(gpu::Batch& batch, int textureSlot = SKYBOX_SKYMAP_SLOT, int bufferSlot = SKYBOX_CONSTANTS_SLOT) const;

1
libraries/procedural/src/procedural/Procedural.h
View file

@ -38,6 +38,7 @@ public:
void parse(const QString& userDataJson); void parse(const QString& userDataJson);
bool ready(); bool ready();
bool enabled() { return _enabled; }
void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation); void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation);
const gpu::ShaderPointer& getShader() const { return _shader; } const gpu::ShaderPointer& getShader() const { return _shader; }

4
libraries/procedural/src/procedural/ProceduralSkybox.cpp
View file

@ -26,6 +26,10 @@ ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
_procedural._opaqueState->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP)); _procedural._opaqueState->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
} }
bool ProceduralSkybox::empty() {
return !_procedural.enabled() && Skybox::empty();
}
void ProceduralSkybox::clear() { void ProceduralSkybox::clear() {
// Parse and prepare a procedural with no shaders to release textures // Parse and prepare a procedural with no shaders to release textures
parse(QString()); parse(QString());

7
libraries/procedural/src/procedural/ProceduralSkybox.h
View file

@ -20,13 +20,14 @@
class ProceduralSkybox: public model::Skybox { class ProceduralSkybox: public model::Skybox {
public: public:
ProceduralSkybox(); ProceduralSkybox();
virtual ~ProceduralSkybox() {}; ~ProceduralSkybox() override {};
void parse(const QString& userData) { _procedural.parse(userData); } void parse(const QString& userData) { _procedural.parse(userData); }
virtual void clear() override; bool empty() override;
void clear() override;
virtual void render(gpu::Batch& batch, const ViewFrustum& frustum) const override; void render(gpu::Batch& batch, const ViewFrustum& frustum) const override;
static void render(gpu::Batch& batch, const ViewFrustum& frustum, const ProceduralSkybox& skybox); static void render(gpu::Batch& batch, const ViewFrustum& frustum, const ProceduralSkybox& skybox);
protected: protected: