From deb303838d8e0e6fbbdfd5198c7db12e9e1cce3e Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Thu, 7 May 2015 17:15:45 -0700 Subject: [PATCH] Cleaning code --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 ++-- libraries/model/src/model/Skybox.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 84f12fca2d..b268ba6031 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -456,9 +456,9 @@ void EntityTreeRenderer::render(RenderArgs::RenderMode renderMode, if (_bestZone->getSkyboxProperties().getURL().isEmpty()) { stage->getSkybox()->clearCubemap(); } else { + // Update the Texture of the Skybox with the one pointed by this zone auto cubeMap = DependencyManager::get()->getTexture(_bestZone->getSkyboxProperties().getURL(), CUBE_TEXTURE); - - stage->getSkybox()->setCubemap(cubeMap->getGPUTexture()); // NOTE: this should be changed to do something to set the cubemap + stage->getSkybox()->setCubemap(cubeMap->getGPUTexture()); } stage->setBackgroundMode(model::SunSkyStage::SKY_BOX); } diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp index c01d07edfa..00a64c9606 100755 --- a/libraries/model/src/model/Skybox.cpp +++ b/libraries/model/src/model/Skybox.cpp @@ -20,7 +20,8 @@ using namespace model; Skybox::Skybox() { -/* + +/* // PLease create a default engineer skybox _cubemap.reset( gpu::Texture::createCube(gpu::Element::COLOR_RGBA_32, 1)); unsigned char texels[] = { 255, 0, 0, 255,