From c740b263a8ffe0c3cee2bd5722afe2961d1be9be Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Tue, 23 Aug 2016 14:55:46 -0700
Subject: [PATCH] detect unset skybox

---
 interface/src/Application.cpp                            | 2 +-
 libraries/model/src/model/Skybox.h                       | 1 +
 libraries/procedural/src/procedural/Procedural.h         | 1 +
 libraries/procedural/src/procedural/ProceduralSkybox.cpp | 4 ++++
 libraries/procedural/src/procedural/ProceduralSkybox.h   | 7 ++++---
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ef27f4b9b0..30e2cfd9c6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4326,7 +4326,7 @@ namespace render {
            }
             case model::SunSkyStage::SKY_BOX: {
                 auto skybox = skyStage->getSkybox();
-                if (skybox) {
+                if (!skybox->empty()) {
                     PerformanceTimer perfTimer("skybox");
                     skybox->render(batch, args->getViewFrustum());
                     break;
diff --git a/libraries/model/src/model/Skybox.h b/libraries/model/src/model/Skybox.h
index 8c9e7bb1d6..b2e004a2e9 100755
--- a/libraries/model/src/model/Skybox.h
+++ b/libraries/model/src/model/Skybox.h
@@ -35,6 +35,7 @@ public:
     void setCubemap(const gpu::TexturePointer& cubemap);
     const gpu::TexturePointer& getCubemap() const { return _cubemap; }
 
+    virtual bool empty() { return _schemaBuffer.get<Schema>().color == vec3(0) && !_cubemap; }
     virtual void clear() { setCubemap(nullptr); }
 
     void prepare(gpu::Batch& batch, int textureSlot = SKYBOX_SKYMAP_SLOT, int bufferSlot = SKYBOX_CONSTANTS_SLOT) const;
diff --git a/libraries/procedural/src/procedural/Procedural.h b/libraries/procedural/src/procedural/Procedural.h
index fdca85bbae..c128da0be0 100644
--- a/libraries/procedural/src/procedural/Procedural.h
+++ b/libraries/procedural/src/procedural/Procedural.h
@@ -38,6 +38,7 @@ public:
     void parse(const QString& userDataJson);
 
     bool ready();
+    bool enabled() { return _enabled; }
     void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation);
     const gpu::ShaderPointer& getShader() const { return _shader; }
 
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
index 843df3aa8d..83122578e7 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
@@ -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));
 }
 
+bool ProceduralSkybox::empty() {
+    return !_procedural.enabled() && Skybox::empty();
+}
+
 void ProceduralSkybox::clear() {
     // Parse and prepare a procedural with no shaders to release textures
     parse(QString());
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.h b/libraries/procedural/src/procedural/ProceduralSkybox.h
index b38e481317..30412d559c 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.h
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.h
@@ -20,13 +20,14 @@
 class ProceduralSkybox: public model::Skybox {
 public:
     ProceduralSkybox();
-    virtual ~ProceduralSkybox() {};
+    ~ProceduralSkybox() override {};
 
     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);
 
 protected: