Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 4 files). Show all
Unified · Split
| @@ -53,8 +53,8 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 52 unmodified lines | |||
| 53 | // CPU only, create the list of renderedOpaques items | 53 | // CPU only, create the list of renderedOpaques items |
| 54 | _jobs.push_back(Job(new FetchItems::JobModel("FetchOpaque", | 54 | _jobs.push_back(Job(new FetchItems::JobModel("FetchOpaque", |
| 55 | FetchItems([](const RenderContextPointer& context, int count) { | 55 | FetchItems([](const RenderContextPointer& context, int count) { |
| 56 | context->getItemsMeta()._opaque._numFeed = count; | 56 | context->getItemsConfig()._opaque._numFeed = count; |
| 57 | auto& opaque = context->getItemsMeta()._opaque; | 57 | auto& opaque = context->getItemsConfig()._opaque; |
| 58 | }) | 58 | }) |
| 59 | ))); | 59 | ))); |
| 60 | _jobs.push_back(Job(new CullItemsOpaque::JobModel("CullOpaque", _jobs.back().getOutput()))); | 60 | _jobs.push_back(Job(new CullItemsOpaque::JobModel("CullOpaque", _jobs.back().getOutput()))); |
| @@ -65,7 +65,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 4 unmodified lines | |||
| 65 | _jobs.push_back(Job(new FetchItems::JobModel("FetchTransparent", | 65 | _jobs.push_back(Job(new FetchItems::JobModel("FetchTransparent", |
| 66 | FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(), | 66 | FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(), |
| 67 | [](const RenderContextPointer& context, int count) { | 67 | [](const RenderContextPointer& context, int count) { |
| 68 | context->getItemsMeta()._transparent._numFeed = count; | 68 | context->getItemsConfig()._transparent._numFeed = count; |
| 69 | }) | 69 | }) |
| 70 | ))); | 70 | ))); |
| 71 | _jobs.push_back(Job(new CullItemsTransparent::JobModel("CullTransparent", _jobs.back().getOutput()))); | 71 | _jobs.push_back(Job(new CullItemsTransparent::JobModel("CullTransparent", _jobs.back().getOutput()))); |
| @@ -187,7 +187,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 115 unmodified lines | |||
| 187 | batch.setStateScissorRect(args->_viewport); | 187 | batch.setStateScissorRect(args->_viewport); |
| 188 | args->_batch = &batch; | 188 | args->_batch = &batch; |
| 189 | 189 | ||
| 190 | auto& opaque = renderContext->getItemsMeta()._opaque; | 190 | auto& opaque = renderContext->getItemsConfig()._opaque; |
| 191 | opaque._numDrawn = (int)inItems.size(); | 191 | opaque._numDrawn = (int)inItems.size(); |
| 192 | 192 | ||
| 193 | glm::mat4 projMat; | 193 | glm::mat4 projMat; |
| @@ -217,7 +217,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 23 unmodified lines | |||
| 217 | batch.setStateScissorRect(args->_viewport); | 217 | batch.setStateScissorRect(args->_viewport); |
| 218 | args->_batch = &batch; | 218 | args->_batch = &batch; |
| 219 | 219 | ||
| 220 | auto& transparent = renderContext->getItemsMeta()._transparent; | 220 | auto& transparent = renderContext->getItemsConfig()._transparent; |
| 221 | transparent._numDrawn = (int)inItems.size(); | 221 | transparent._numDrawn = (int)inItems.size(); |
| 222 | 222 | ||
| 223 | glm::mat4 projMat; | 223 | glm::mat4 projMat; |
| @@ -270,7 +270,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 46 unmodified lines | |||
| 270 | inItems.emplace_back(id); | 270 | inItems.emplace_back(id); |
| 271 | } | 271 | } |
| 272 | } | 272 | } |
| 273 | auto& overlay3D = renderContext->getItemsMeta()._overlay3D; | 273 | auto& overlay3D = renderContext->getItemsConfig()._overlay3D; |
| 274 | overlay3D._numFeed = (int)inItems.size(); | 274 | overlay3D._numFeed = (int)inItems.size(); |
| 275 | overlay3D._numDrawn = (int)inItems.size(); | 275 | overlay3D._numDrawn = (int)inItems.size(); |
| 276 | 276 | ||
| @@ -304,7 +304,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 27 unmodified lines | |||
| 304 | 304 | ||
| 305 | batch.setPipeline(getOpaquePipeline()); | 305 | batch.setPipeline(getOpaquePipeline()); |
| 306 | batch.setResourceTexture(0, args->_whiteTexture); | 306 | batch.setResourceTexture(0, args->_whiteTexture); |
| 307 | renderItems(sceneContext, renderContext, inItems, renderContext->getItemsMeta()._overlay3D._maxDrawn); | 307 | renderItems(sceneContext, renderContext, inItems, renderContext->getItemsConfig()._overlay3D._maxDrawn); |
| 308 | }); | 308 | }); |
| 309 | args->_batch = nullptr; | 309 | args->_batch = nullptr; |
| 310 | args->_whiteTexture.reset(); | 310 | args->_whiteTexture.reset(); |