From 5e82093e69643868cc7053fae3cfaebd51bdc04a Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 25 Aug 2016 18:08:03 -0700
Subject: [PATCH] set skybox clear color to empty color
---
libraries/model/src/model/Skybox.cpp | 5 +++++
libraries/model/src/model/Skybox.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index cb3fb43630..4a66c18f98 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -49,6 +49,11 @@ void Skybox::updateSchemaBuffer() const {
}
}
+void Skybox::clear() {
+ _schemaBuffer.edit<Schema>().color = vec3(0);
+ setCubemap(nullptr);
+}
+
void Skybox::prepare(gpu::Batch& batch, int textureSlot, int bufferSlot) const {
if (bufferSlot > -1) {
batch.setUniformBuffer(bufferSlot, _schemaBuffer);
diff --git a/libraries/model/src/model/Skybox.h b/libraries/model/src/model/Skybox.h
index f12d259411..1e6d30bbc1 100755
--- a/libraries/model/src/model/Skybox.h
+++ b/libraries/model/src/model/Skybox.h
@@ -36,7 +36,7 @@ public:
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();
void prepare(gpu::Batch& batch, int textureSlot = SKYBOX_SKYMAP_SLOT, int bufferSlot = SKYBOX_CONSTANTS_SLOT) const;
virtual void render(gpu::Batch& batch, const ViewFrustum& frustum) const;