Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 6 files). Show all
Unified · Split
| @@ -48,19 +48,21 @@ using namespace render; · 47 unmodified lines | ||
| 48 | 48 | extern void initOverlay3DPipelines(render::ShapePlumber& plumber); |
| 49 | 49 | extern void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter); |
| 50 | 50 | |
| 51 | +RenderDeferredTask::RenderDeferredTask() { | |
| 52 | + DependencyManager::set<FadeEffect>(); | |
| 53 | +} | |
| 54 | + | |
| 51 | 55 | void RenderDeferredTask::configure(const Config& config) |
| 52 | 56 | { |
| 53 | 57 | } |
| 54 | 58 | |
| 55 | 59 | void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) { |
| 56 | 60 | const auto& items = input.get<Input>(); |
| 57 | − | |
| 58 | − auto editedFadeCategory = task.addJob<FadeJob>("Fade"); | |
| 59 | − auto& fadeJob = task._jobs.back().get<FadeJob>(); | |
| 61 | + auto fadeEffect = DependencyManager::get<FadeEffect>(); | |
| 60 | 62 | |
| 61 | 63 | // Prepare the ShapePipelines |
| 62 | 64 | ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>(); |
| 63 | − initDeferredPipelines(*shapePlumber, fadeJob.getBatchSetter(), fadeJob.getItemSetter()); | |
| 65 | + initDeferredPipelines(*shapePlumber, fadeEffect->getBatchSetter(), fadeEffect->getItemSetter()); | |
| 64 | 66 | |
| 65 | 67 | // Extract opaques / transparents / lights / metas / overlays / background |
| 66 | 68 | const auto& opaques = items.get0()[RenderFetchCullSortTask::OPAQUE_SHAPE]; |
| @@ -72,8 +74,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 5 unmodified lines | ||
| 72 | 74 | //const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND]; |
| 73 | 75 | const auto& spatialSelection = items[1]; |
| 74 | 76 | |
| 75 | − const auto fadeEditInput = FadeEditJob::Input(opaques, editedFadeCategory).asVarying(); | |
| 76 | − task.addJob<FadeEditJob>("FadeEdit", fadeEditInput); | |
| 77 | + fadeEffect->build(task, opaques); | |
| 77 | 78 | |
| 78 | 79 | // Filter the non antialiaased overlays |
| 79 | 80 | const int LAYER_NO_AA = 3; |