History

Rename ShapeRender to DeferredPipelineLib

Zach Pomerantz committed 10 years ago

Commit 56aba411 parent d8a3ae76 files · +26 −26Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+3−3
@@ -193,7 +193,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 192 unmodified lines
193 batch.setProjectionTransform(projMat);193 batch.setProjectionTransform(projMat);
194 batch.setViewTransform(viewMat);194 batch.setViewTransform(viewMat);
195 195
196 renderShapes(sceneContext, renderContext, _renderer, inItems, opaque.maxDrawn);196 renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, opaque.maxDrawn);
197 args->_batch = nullptr;197 args->_batch = nullptr;
198 });198 });
199}199}
@@ -219,7 +219,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const · 19 unmodified lines
219 batch.setProjectionTransform(projMat);219 batch.setProjectionTransform(projMat);
220 batch.setViewTransform(viewMat);220 batch.setViewTransform(viewMat);
221 221
222 renderShapes(sceneContext, renderContext, _renderer, inItems, transparent.maxDrawn);222 renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, transparent.maxDrawn);
223 args->_batch = nullptr;223 args->_batch = nullptr;
224 });224 });
225}225}
@@ -292,7 +292,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon · 66 unmodified lines
292 292
293 batch.setPipeline(getOpaquePipeline());293 batch.setPipeline(getOpaquePipeline());
294 batch.setResourceTexture(0, args->_whiteTexture);294 batch.setResourceTexture(0, args->_whiteTexture);
295 renderShapes(sceneContext, renderContext, _renderer, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);295 renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);
296 });296 });
297 args->_batch = nullptr;297 args->_batch = nullptr;
298 args->_whiteTexture.reset();298 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