Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 23 files). Show all
Unified · Split
| @@ -42,7 +42,7 @@ · 41 unmodified lines | |||
| 42 | #include "ToneMappingEffect.h" | 42 | #include "ToneMappingEffect.h" |
| 43 | #include "SubsurfaceScattering.h" | 43 | #include "SubsurfaceScattering.h" |
| 44 | #include "DrawHaze.h" | 44 | #include "DrawHaze.h" |
| 45 | #include "OutlineEffect.h" | 45 | #include "HighlightEffect.h" |
| 46 | 46 | ||
| 47 | #include <gpu/StandardShaderLib.h> | 47 | #include <gpu/StandardShaderLib.h> |
| 48 | 48 | ||
| @@ -183,15 +183,15 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 134 unmodified lines | |||
| 183 | const auto toneMappingInputs = ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer).asVarying(); | 183 | const auto toneMappingInputs = ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer).asVarying(); |
| 184 | task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs); | 184 | task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs); |
| 185 | 185 | ||
| 186 | const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginOutlineRangeTimer", "Outline"); | 186 | const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginHighlightRangeTimer", "Highlight"); |
| 187 | // Select items that need to be outlined | 187 | // Select items that need to be outlined |
| 188 | const auto selectionBaseName = "contextOverlayHighlightList"; | 188 | const auto selectionBaseName = "contextOverlayHighlightList"; |
| 189 | const auto selectedItems = addSelectItemJobs(task, selectionBaseName, metas, opaques, transparents); | 189 | const auto selectedItems = addSelectItemJobs(task, selectionBaseName, metas, opaques, transparents); |
| 190 | 190 | ||
| 191 | const auto outlineInputs = DrawOutlineTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying(); | 191 | const auto outlineInputs = DrawHighlightTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying(); |
| 192 | task.addJob<DrawOutlineTask>("DrawOutline", outlineInputs); | 192 | task.addJob<DrawHighlightTask>("DrawHighlight", outlineInputs); |
| 193 | 193 | ||
| 194 | task.addJob<EndGPURangeTimer>("OutlineRangeTimer", outlineRangeTimer); | 194 | task.addJob<EndGPURangeTimer>("HighlightRangeTimer", outlineRangeTimer); |
| 195 | 195 | ||
| 196 | { // DEbug the bounds of the rendered items, still look at the zbuffer | 196 | { // DEbug the bounds of the rendered items, still look at the zbuffer |
| 197 | task.addJob<DrawBounds>("DrawMetaBounds", metas); | 197 | task.addJob<DrawBounds>("DrawMetaBounds", metas); |