History

Renamed outline to highlight

Olivier Prat committed 9 years ago

Commit 3cc445f1 parent 84be02623 files · +403 −402Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+5−5
@@ -42,7 +42,7 @@ · 41 unmodified lines
4242 #include "ToneMappingEffect.h"
4343 #include "SubsurfaceScattering.h"
4444 #include "DrawHaze.h"
45−#include "OutlineEffect.h"
45+#include "HighlightEffect.h"
4646
4747 #include <gpu/StandardShaderLib.h>
4848
@@ -183,15 +183,15 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 134 unmodified lines
183183 const auto toneMappingInputs = ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer).asVarying();
184184 task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
185185
186− const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginOutlineRangeTimer", "Outline");
186+ const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginHighlightRangeTimer", "Highlight");
187187 // Select items that need to be outlined
188188 const auto selectionBaseName = "contextOverlayHighlightList";
189189 const auto selectedItems = addSelectItemJobs(task, selectionBaseName, metas, opaques, transparents);
190190
191− const auto outlineInputs = DrawOutlineTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
192− task.addJob<DrawOutlineTask>("DrawOutline", outlineInputs);
191+ const auto outlineInputs = DrawHighlightTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
192+ task.addJob<DrawHighlightTask>("DrawHighlight", outlineInputs);
193193
194− task.addJob<EndGPURangeTimer>("OutlineRangeTimer", outlineRangeTimer);
194+ task.addJob<EndGPURangeTimer>("HighlightRangeTimer", outlineRangeTimer);
195195
196196 { // DEbug the bounds of the rendered items, still look at the zbuffer
197197 task.addJob<DrawBounds>("DrawMetaBounds", metas);

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