From 467609f2b69e0b6c9382071a99523f978735b5b2 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 17 Jun 2015 09:44:26 -0700 Subject: [PATCH] standardize skybox and atmosphere batch --- interface/src/Application.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1ead8fe4f8..8d5f8810fd 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3332,12 +3332,6 @@ namespace render { "Application::displaySide() ... atmosphere..."); background->_environment->renderAtmospheres(batch, *(args->_viewFrustum)); - - // FIX ME - If I don't call this renderBatch() here, then the atmosphere doesn't render, but it - // seems like these payloadRender() methods shouldn't be doing this. We need to investigate why - // the engine isn't rendering our batch - gpu::GLBackend::renderBatch(batch, true); - } } @@ -3346,12 +3340,13 @@ namespace render { skybox = skyStage->getSkybox(); if (skybox) { - gpu::Batch batch; model::Skybox::render(batch, *(Application::getInstance()->getDisplayViewFrustum()), *skybox); - gpu::GLBackend::renderBatch(batch, true); - glUseProgram(0); } } + // FIX ME - If I don't call this renderBatch() here, then the atmosphere and skybox don't render, but it + // seems like these payloadRender() methods shouldn't be doing this. We need to investigate why the engine + // isn't rendering our batch + gpu::GLBackend::renderBatch(batch, true); } }