History

Rename RenderContext::ItemsMeta to ItemsConfig

Zach Pomerantz committed 10 years ago

Commit d0572391 parent cdcb2d54 files · +18 −18Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 4 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+7−7
@@ -53,8 +53,8 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 52 unmodified lines
5353 // CPU only, create the list of renderedOpaques items
5454 _jobs.push_back(Job(new FetchItems::JobModel("FetchOpaque",
5555 FetchItems([](const RenderContextPointer& context, int count) {
56− context->getItemsMeta()._opaque._numFeed = count;
57− auto& opaque = context->getItemsMeta()._opaque;
56+ context->getItemsConfig()._opaque._numFeed = count;
57+ auto& opaque = context->getItemsConfig()._opaque;
5858 })
5959 )));
6060 _jobs.push_back(Job(new CullItemsOpaque::JobModel("CullOpaque", _jobs.back().getOutput())));
@@ -65,7 +65,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 4 unmodified lines
6565 _jobs.push_back(Job(new FetchItems::JobModel("FetchTransparent",
6666 FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(),
6767 [](const RenderContextPointer& context, int count) {
68− context->getItemsMeta()._transparent._numFeed = count;
68+ context->getItemsConfig()._transparent._numFeed = count;
6969 })
7070 )));
7171 _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
187187 batch.setStateScissorRect(args->_viewport);
188188 args->_batch = &batch;
189189
190− auto& opaque = renderContext->getItemsMeta()._opaque;
190+ auto& opaque = renderContext->getItemsConfig()._opaque;
191191 opaque._numDrawn = (int)inItems.size();
192192
193193 glm::mat4 projMat;
@@ -217,7 +217,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 23 unmodified lines
217217 batch.setStateScissorRect(args->_viewport);
218218 args->_batch = &batch;
219219
220− auto& transparent = renderContext->getItemsMeta()._transparent;
220+ auto& transparent = renderContext->getItemsConfig()._transparent;
221221 transparent._numDrawn = (int)inItems.size();
222222
223223 glm::mat4 projMat;
@@ -270,7 +270,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 46 unmodified lines
270270 inItems.emplace_back(id);
271271 }
272272 }
273− auto& overlay3D = renderContext->getItemsMeta()._overlay3D;
273+ auto& overlay3D = renderContext->getItemsConfig()._overlay3D;
274274 overlay3D._numFeed = (int)inItems.size();
275275 overlay3D._numDrawn = (int)inItems.size();
276276
@@ -304,7 +304,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 27 unmodified lines
304304
305305 batch.setPipeline(getOpaquePipeline());
306306 batch.setResourceTexture(0, args->_whiteTexture);
307− renderItems(sceneContext, renderContext, inItems, renderContext->getItemsMeta()._overlay3D._maxDrawn);
307+ renderItems(sceneContext, renderContext, inItems, renderContext->getItemsConfig()._overlay3D._maxDrawn);
308308 });
309309 args->_batch = nullptr;
310310 args->_whiteTexture.reset();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t