From 8cabd1c9530c2395053df294ea76546a180c0837 Mon Sep 17 00:00:00 2001 From: Olivier Prat Date: Wed, 18 Oct 2017 15:06:54 +0200 Subject: [PATCH] Fixed graphics bug with filled --- libraries/render-utils/src/OutlineEffect.cpp | 6 +++--- libraries/render-utils/src/OutlineEffect.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/OutlineEffect.cpp b/libraries/render-utils/src/OutlineEffect.cpp index d00819d0f2..d028e028d4 100644 --- a/libraries/render-utils/src/OutlineEffect.cpp +++ b/libraries/render-utils/src/OutlineEffect.cpp @@ -178,13 +178,13 @@ void DrawOutline::configure(const Config& config) { void DrawOutline::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) { auto outlineFrameBuffer = inputs.get1(); - auto outlineRect = inputs.get4(); + auto outlineRect = inputs.get3(); if (outlineFrameBuffer && outlineRect.z>0 && outlineRect.w>0) { auto sceneDepthBuffer = inputs.get2(); const auto frameTransform = inputs.get0(); auto outlinedDepthTexture = outlineFrameBuffer->getDepthTexture(); - auto destinationFrameBuffer = inputs.get3(); + auto destinationFrameBuffer = outlineFrameBuffer->getColorFramebuffer(); auto framebufferSize = glm::ivec2(outlinedDepthTexture->getDimensions()); if (sceneDepthBuffer) { @@ -391,7 +391,7 @@ void DrawOutlineTask::build(JobModel& task, const render::Varying& inputs, rende stream << "OutlineEffect" << i; name = stream.str(); } - const auto drawOutlineInputs = DrawOutline::Inputs(deferredFrameTransform, outlineRessources, sceneFrameBuffer, primaryFramebuffer, outlinedRect).asVarying(); + const auto drawOutlineInputs = DrawOutline::Inputs(deferredFrameTransform, outlineRessources, sceneFrameBuffer, outlinedRect).asVarying(); task.addJob(name, drawOutlineInputs); } diff --git a/libraries/render-utils/src/OutlineEffect.h b/libraries/render-utils/src/OutlineEffect.h index b1c2e3c3dd..a099166267 100644 --- a/libraries/render-utils/src/OutlineEffect.h +++ b/libraries/render-utils/src/OutlineEffect.h @@ -110,7 +110,7 @@ signals: class DrawOutline { public: - using Inputs = render::VaryingSet5; + using Inputs = render::VaryingSet4; using Config = DrawOutlineConfig; using JobModel = render::Job::ModelI;