History

haze on most entities, working on skybox

SamGondelman committed 7 years ago

Commit d545ba51 parent bd2003f39 files · +262 −176Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+5−5
@@ -207,7 +207,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 206 unmodified lines
207207 task.addJob<RenderDeferred>("RenderDeferred", deferredLightingInputs);
208208
209209 // Similar to light stage, background stage has been filled by several potential render items and resolved for the frame in this job
210− const auto backgroundInputs = DrawBackgroundStage::Inputs(lightingModel, backgroundFrame).asVarying();
210+ const auto backgroundInputs = DrawBackgroundStage::Inputs(lightingModel, backgroundFrame, hazeFrame).asVarying();
211211 task.addJob<DrawBackgroundStage>("DrawBackgroundDeferred", backgroundInputs);
212212
213213 const auto drawHazeInputs = render::Varying(DrawHaze::Inputs(hazeFrame, lightingFramebuffer, linearDepthTarget, deferredFrameTransform, lightingModel, lightFrame));
@@ -225,8 +225,8 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 11 unmodified lines
225225 task.addJob<EndGPURangeTimer>("HighlightRangeTimer", outlineRangeTimer);
226226
227227 // Layered Over (in front)
228− const auto inFrontOpaquesInputs = DrawLayered3D::Inputs(inFrontOpaque, lightingModel, jitter).asVarying();
229− const auto inFrontTransparentsInputs = DrawLayered3D::Inputs(inFrontTransparent, lightingModel, jitter).asVarying();
228+ const auto inFrontOpaquesInputs = DrawLayered3D::Inputs(inFrontOpaque, lightingModel, hazeFrame, jitter).asVarying();
229+ const auto inFrontTransparentsInputs = DrawLayered3D::Inputs(inFrontTransparent, lightingModel, hazeFrame, jitter).asVarying();
230230 task.addJob<DrawLayered3D>("DrawInFrontOpaque", inFrontOpaquesInputs, true);
231231 task.addJob<DrawLayered3D>("DrawInFrontTransparent", inFrontTransparentsInputs, false);
232232
@@ -254,7 +254,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren · 21 unmodified lines
254254 const auto primaryFramebuffer = task.addJob<render::UpsampleToBlitFramebuffer>("PrimaryBufferUpscale", toneMappedBuffer);
255255
256256 // HUD Layer
257− const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(primaryFramebuffer, lightingModel, hudOpaque, hudTransparent).asVarying();
257+ const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(primaryFramebuffer, lightingModel, hudOpaque, hudTransparent, hazeFrame).asVarying();
258258 task.addJob<RenderHUDLayerTask>("RenderHUDLayer", renderHUDLayerInputs);
259259 }
260260
@@ -506,7 +506,7 @@ void RenderTransparentDeferred::run(const RenderContextPointer& renderContext, c · 245 unmodified lines
506506 if (hazeStage && hazeFrame->_hazes.size() > 0) {
507507 const auto& hazePointer = hazeStage->getHaze(hazeFrame->_hazes.front());
508508 if (hazePointer) {
509− batch.setUniformBuffer(ru::Buffer::HazeParams, hazePointer->getHazeParametersBuffer());
509+ batch.setUniformBuffer(graphics::slot::buffer::Buffer::HazeParams, hazePointer->getHazeParametersBuffer());
510510 }
511511 }
512512

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