History

Added OutlineStyleStage

Olivier Prat committed 9 years ago

Commit 9e6472b1 parent 09ee69d13 files · +427 −119Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+4−12
@@ -64,11 +64,11 @@ const render::Varying RenderDeferredTask::addSelectItemJobs(JobModel& task, cons · 63 unmodified lines
6464 const render::Varying& metas,
6565 const render::Varying& opaques,
6666 const render::Varying& transparents) {
67− const auto selectMetaInput = SelectItems::Inputs(metas, Varying()).asVarying();
67+ const auto selectMetaInput = SelectItems::Inputs(metas, Varying(), std::string()).asVarying();
6868 const auto selectedMetas = task.addJob<SelectItems>("MetaSelection", selectMetaInput, selectionName);
69− const auto selectMetaAndOpaqueInput = SelectItems::Inputs(opaques, selectedMetas).asVarying();
69+ const auto selectMetaAndOpaqueInput = SelectItems::Inputs(opaques, selectedMetas, std::string()).asVarying();
7070 const auto selectedMetasAndOpaques = task.addJob<SelectItems>("OpaqueSelection", selectMetaAndOpaqueInput, selectionName);
71− const auto selectItemInput = SelectItems::Inputs(transparents, selectedMetasAndOpaques).asVarying();
71+ const auto selectItemInput = SelectItems::Inputs(transparents, selectedMetasAndOpaques, std::string()).asVarying();
7272 return task.addJob<SelectItems>("TransparentSelection", selectItemInput, selectionName);
7373 }
7474
@@ -187,16 +187,8 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 112 unmodified lines
187187 // Select items that need to be outlined
188188 const auto selectionBaseName = "contextOverlayHighlightList";
189189 const auto selectedItems = addSelectItemJobs(task, selectionBaseName, metas, opaques, transparents);
190− DrawOutlineTask::Groups outlineGroups;
191− outlineGroups[0] = selectedItems;
192− for (auto i = 1; i < render::Scene::MAX_OUTLINE_COUNT; i++) {
193− std::ostringstream selectionName;
194− selectionName << selectionBaseName;
195− selectionName << i;
196− outlineGroups[i] = addSelectItemJobs(task, selectionName.str().c_str(), metas, opaques, transparents);
197− }
198190
199− const auto outlineInputs = DrawOutlineTask::Inputs(outlineGroups, deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
191+ const auto outlineInputs = DrawOutlineTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
200192 task.addJob<DrawOutlineTask>("DrawOutline", outlineInputs);
201193
202194 task.addJob<EndGPURangeTimer>("OutlineRangeTimer", outlineRangeTimer);

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