History

Separated fade categories from transition event types

Olivier Prat committed 9 years ago

Commit aba8be51 parent 9758a6d9 files · +183 −123Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+2−2
@@ -55,7 +55,7 @@ void RenderDeferredTask::configure(const Config& config) · 54 unmodified lines
55void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {55void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
56 const auto& items = input.get<Input>();56 const auto& items = input.get<Input>();
57 57
58 auto editedTransitionType = task.addJob<FadeJob>("Fade");58 auto editedFadeCategory = task.addJob<FadeJob>("Fade");
59 auto& fadeJob = task._jobs.back().get<FadeJob>();59 auto& fadeJob = task._jobs.back().get<FadeJob>();
60 60
61 // Prepare the ShapePipelines61 // Prepare the ShapePipelines
@@ -72,7 +72,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 10 unmodified lines
72 //const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND];72 //const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND];
73 const auto& spatialSelection = items[1];73 const auto& spatialSelection = items[1];
74 74
75 const auto fadeEditInput = FadeEditJob::Input(opaques, editedTransitionType).asVarying();75 const auto fadeEditInput = FadeEditJob::Input(opaques, editedFadeCategory).asVarying();
76 task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);76 task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
77 77
78 // Filter the non antialiaased overlays78 // Filter the non antialiaased overlays