History

Rename the _pipeline into _shapePipeline in the render::Args

Sam Gateau committed 9 years ago

Commit 4edea431 parent a8086769 files · +31 −31Browse files

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

Unified · Split

libraries/render-utils/src/RenderShadowTask.cpp+3−3
@@ -68,7 +68,7 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, · 67 unmodified lines
68 std::vector<ShapeKey> skinnedShapeKeys{};68 std::vector<ShapeKey> skinnedShapeKeys{};
69 69
70 // Iterate through all inShapes and render the unskinned70 // Iterate through all inShapes and render the unskinned
71 args->_pipeline = shadowPipeline;71 args->_shapePipeline = shadowPipeline;
72 batch.setPipeline(shadowPipeline->pipeline);72 batch.setPipeline(shadowPipeline->pipeline);
73 for (auto items : inShapes) {73 for (auto items : inShapes) {
74 if (items.first.isSkinned()) {74 if (items.first.isSkinned()) {
@@ -79,13 +79,13 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext, · 4 unmodified lines
79 }79 }
80 80
81 // Reiterate to render the skinned81 // Reiterate to render the skinned
82 args->_pipeline = shadowSkinnedPipeline;82 args->_shapePipeline = shadowSkinnedPipeline;
83 batch.setPipeline(shadowSkinnedPipeline->pipeline);83 batch.setPipeline(shadowSkinnedPipeline->pipeline);
84 for (const auto& key : skinnedShapeKeys) {84 for (const auto& key : skinnedShapeKeys) {
85 renderItems(renderContext, inShapes.at(key));85 renderItems(renderContext, inShapes.at(key));
86 }86 }
87 87
88 args->_pipeline = nullptr;88 args->_shapePipeline = nullptr;
89 args->_batch = nullptr;89 args->_batch = nullptr;
90 });90 });
91}91}

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