From 7e39cc7753a7cfc3d15a887ccc7350b60c0e399e Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 23 Feb 2016 10:53:33 -0800 Subject: [PATCH] clean up a bit the 2 globals RenderItem in APplication.cpp --- interface/src/Application.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 704940433a..89ec196fad 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3773,8 +3773,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se // The pending changes collecting the changes here render::PendingChanges pendingChanges; + // FIXME: Move this out of here!, Background / skybox should be driven by the enityt content just like the other entities // Background rendering decision - if (BackgroundRenderData::_item == 0) { + if (!render::Item::isValidID(BackgroundRenderData::_item)) { auto backgroundRenderData = make_shared(); auto backgroundRenderPayload = make_shared(backgroundRenderData); BackgroundRenderData::_item = _main3DScene->allocateID(); @@ -3799,8 +3800,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se } } + // FIXME: Move this out of here!, WorldBox should be driven by the entity content just like the other entities // Make sure the WorldBox is in the scene - if (WorldBoxRenderData::_item == 0) { + if (!render::Item::isValidID(WorldBoxRenderData::_item)) { auto worldBoxRenderData = make_shared(); auto worldBoxRenderPayload = make_shared(worldBoxRenderData);