History

Render using ShapeRender, pickPipeline in renderItems

Zach Pomerantz committed 10 years ago

Commit 7913ca71 parent c725fd110 files · +57 −493Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+4−5
@@ -193,7 +193,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 192 unmodified lines
193193 batch.setProjectionTransform(projMat);
194194 batch.setViewTransform(viewMat);
195195
196− renderItems(sceneContext, renderContext, inItems, opaque.maxDrawn);
196+ renderItems(sceneContext, renderContext, this, inItems, opaque.maxDrawn);
197197 args->_batch = nullptr;
198198 });
199199 }
@@ -219,7 +219,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 19 unmodified lines
219219 batch.setProjectionTransform(projMat);
220220 batch.setViewTransform(viewMat);
221221
222− renderItems(sceneContext, renderContext, inItems, transparent.maxDrawn);
222+ renderItems(sceneContext, renderContext, this, inItems, transparent.maxDrawn);
223223 args->_batch = nullptr;
224224 });
225225 }
@@ -292,7 +292,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 66 unmodified lines
292292
293293 batch.setPipeline(getOpaquePipeline());
294294 batch.setResourceTexture(0, args->_whiteTexture);
295− renderItems(sceneContext, renderContext, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);
295+ renderItems(sceneContext, renderContext, this, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);
296296 });
297297 args->_batch = nullptr;
298298 args->_whiteTexture.reset();
@@ -381,8 +381,7 @@ void DrawBackgroundDeferred::run(const SceneContextPointer& sceneContext, const · 82 unmodified lines
381381 batch.setProjectionTransform(projMat);
382382 batch.setViewTransform(viewMat);
383383
384− renderItems(sceneContext, renderContext, inItems);
385−
384+ renderItems(sceneContext, renderContext, nullptr, inItems);
386385 });
387386 args->_batch = nullptr;
388387 }

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