History

Use variadic for addJob for cleaner construction

Zach Pomerantz committed 10 years ago

Commit 0f6d9a41 parent f902c402 files · +33 −37Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+27−29
@@ -52,63 +52,61 @@ void ToneMappingDeferred::run(const SceneContextPointer& sceneContext, const Ren · 51 unmodified lines
5252
5353 RenderDeferredTask::RenderDeferredTask() : Task() {
5454 // CPU only, create the list of renderedOpaques items
55− addJob("FetchOpaque", std::make_shared<FetchItems::JobModel>(
56− FetchItems([](const RenderContextPointer& context, int count) {
57− context->getItemsConfig().opaque.numFeed = count;
58− })
59− ));
60− addJob("CullOpaque", std::make_shared<CullItemsOpaque::JobModel>(_jobs.back().getOutput()));
61− addJob("DepthSortOpaque", std::make_shared<DepthSortItems::JobModel>(_jobs.back().getOutput()));
55+ addJob<FetchItems>("FetchOpaque", FetchItems([](const RenderContextPointer& context, int count) {
56+ context->getItemsConfig().opaque.numFeed = count;
57+ }));
58+ addJob<CullItemsOpaque>("CullOpaque", _jobs.back().getOutput());
59+ addJob<DepthSortItems>("DepthSortOpaque", _jobs.back().getOutput());
6260 auto& renderedOpaques = _jobs.back().getOutput();
6361
6462 // CPU only, create the list of renderedTransparents items
65− addJob("FetchTransparent", std::make_shared<FetchItems::JobModel>(
66− FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(),
67− [](const RenderContextPointer& context, int count) {
68− context->getItemsConfig().transparent.numFeed = count;
69− })
63+ addJob<FetchItems>("FetchTransparent", FetchItems(
64+ ItemFilter::Builder::transparentShape().withoutLayered(),
65+ [](const RenderContextPointer& context, int count) {
66+ context->getItemsConfig().transparent.numFeed = count;
67+ }
7068 ));
71− addJob("CullTransparent", std::make_shared<CullItemsTransparent::JobModel>(_jobs.back().getOutput()));
72− addJob("DepthSortTransparent", std::make_shared<DepthSortItems::JobModel>(_jobs.back().getOutput(), DepthSortItems(false)));
69+ addJob<CullItemsTransparent>("CullTransparent", _jobs.back().getOutput());
70+ addJob<DepthSortItems>("DepthSortTransparent", _jobs.back().getOutput(), DepthSortItems(false));
7371 auto& renderedTransparents = _jobs.back().getOutput();
7472
7573 // GPU Jobs: Start preparing the deferred and lighting buffer
76− addJob("PrepareDeferred", std::make_shared<PrepareDeferred::JobModel>());
74+ addJob<PrepareDeferred>("PrepareDeferred");
7775
7876 // Render opaque objects in DeferredBuffer
79− addJob("DrawOpaqueDeferred", std::make_shared<DrawOpaqueDeferred::JobModel>(renderedOpaques));
77+ addJob<DrawOpaqueDeferred>("DrawOpaqueDeferred", renderedOpaques);
8078
8179 // Once opaque is all rendered create stencil background
82− addJob("DrawOpaqueStencil", std::make_shared<DrawStencilDeferred::JobModel>());
80+ addJob<DrawStencilDeferred>("DrawOpaqueStencil");
8381
8482 // Use Stencil and start drawing background in Lighting buffer
85− addJob("DrawBackgroundDeferred", std::make_shared<DrawBackgroundDeferred::JobModel>());
83+ addJob<DrawBackgroundDeferred>("DrawBackgroundDeferred");
8684
8785 // Draw Lights just add the lights to the current list of lights to deal with. NOt really gpu job for now.
88− addJob("DrawLight", std::make_shared<DrawLight::JobModel>());
86+ addJob<DrawLight>("DrawLight");
8987
9088 // DeferredBuffer is complete, now let's shade it into the LightingBuffer
91− addJob("RenderDeferred", std::make_shared<RenderDeferred::JobModel>());
89+ addJob<RenderDeferred>("RenderDeferred");
9290
9391 // AO job, to be revisited
94− addJob("AmbientOcclusion", std::make_shared<AmbientOcclusion::JobModel>());
92+ addJob<AmbientOcclusion>("AmbientOcclusion");
9593 _jobs.back().setEnabled(false);
9694 _occlusionJobIndex = (int)_jobs.size() - 1;
9795
9896 // AA job to be revisited
99− addJob("Antialiasing", std::make_shared<Antialiasing::JobModel>());
97+ addJob<Antialiasing>("Antialiasing");
10098 _jobs.back().setEnabled(false);
10199 _antialiasingJobIndex = (int)_jobs.size() - 1;
102100
103101 // Render transparent objects forward in LigthingBuffer
104− addJob("TransparentDeferred", std::make_shared<DrawTransparentDeferred::JobModel>(renderedTransparents));
102+ addJob<DrawTransparentDeferred>("TransparentDeferred", renderedTransparents);
105103
106104 // Lighting Buffer ready for tone mapping
107− addJob("ToneMapping", std::make_shared<ToneMappingDeferred::JobModel>());
105+ addJob<ToneMappingDeferred>("ToneMapping");
108106 _toneMappingJobIndex = (int)_jobs.size() - 1;
109107
110108 // Debugging Deferred buffer job
111− addJob("DebugDeferredBuffer", std::make_shared<DebugDeferredBuffer::JobModel>());
109+ addJob<DebugDeferredBuffer>("DebugDeferredBuffer");
112110 _jobs.back().setEnabled(false);
113111 _drawDebugDeferredBufferIndex = (int)_jobs.size() - 1;
114112
@@ -117,18 +115,18 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 2 unmodified lines
117115 // Grab a texture map representing the different status icons and assign that to the drawStatsuJob
118116 auto iconMapPath = PathUtils::resourcesPath() + "icons/statusIconAtlas.svg";
119117 auto statusIconMap = DependencyManager::get<TextureCache>()->getImageTexture(iconMapPath);
120− addJob("DrawStatus", std::make_shared<DrawStatus::JobModel>(renderedOpaques, DrawStatus(statusIconMap)));
118+ addJob<DrawStatus>("DrawStatus", renderedOpaques, DrawStatus(statusIconMap));
121119 _jobs.back().setEnabled(false);
122120 _drawStatusJobIndex = (int)_jobs.size() - 1;
123121 }
124122
125− addJob("DrawOverlay3D", std::make_shared<DrawOverlay3D::JobModel>());
123+ addJob<DrawOverlay3D>("DrawOverlay3D");
126124
127− addJob("HitEffect", std::make_shared<HitEffect::JobModel>());
125+ addJob<HitEffect>("HitEffect");
128126 _jobs.back().setEnabled(false);
129127 _drawHitEffectJobIndex = (int)_jobs.size() -1;
130128
131− addJob("Blit", std::make_shared<Blit::JobModel>());
129+ addJob<Blit>("Blit");
132130 }
133131
134132 void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext) {

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