Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 19:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix AA toggle

Browse source
This commit is contained in:
SamGondelman 2019-05-20 17:21:10 -07:00
parent 2e666836c7
commit 43874fbfb3
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/AntialiasingEffect.cpp
View file

@ -378,6 +378,8 @@ void JitterSample::configure(const Config& config) {
} }
} else if (config.stop) { } else if (config.stop) {
_sampleSequence.currentIndex = -1; _sampleSequence.currentIndex = -1;
} else {
_sampleSequence.currentIndex = config.getIndex();
} }
_scale = config.scale; _scale = config.scale;
} }
@ -392,10 +394,10 @@ void JitterSample::run(const render::RenderContextPointer& renderContext, Output
} }
} }
jitter.x = 0.0f;
jitter.y = 0.0f;
if (current >= 0) { if (current >= 0) {
jitter = _sampleSequence.offsets[current]; jitter = _sampleSequence.offsets[current];
} else {
jitter = glm::vec2(0.0f);
} }
} }

1
libraries/render-utils/src/AntialiasingEffect.h
View file

@ -107,6 +107,7 @@ public:
AntialiasingConfig() : render::Job::Config(true) {} AntialiasingConfig() : render::Job::Config(true) {}
void setDebugFXAA(bool debug) { debugFXAAX = (debug ? 0.0f : 1.0f); emit dirty();} void setDebugFXAA(bool debug) { debugFXAAX = (debug ? 0.0f : 1.0f); emit dirty();}
bool debugFXAA() const { return (debugFXAAX == 0.0f ? true : false); }
float blend{ 0.25f }; float blend{ 0.25f };
float sharpen{ 0.05f }; float sharpen{ 0.05f };

2
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -248,7 +248,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
// Debugging task is happening in the "over" layer after tone mapping and just before HUD // Debugging task is happening in the "over" layer after tone mapping and just before HUD
{ // Debug the bounds of the rendered items, still look at the zbuffer { // Debug the bounds of the rendered items, still look at the zbuffer
const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, ambientOcclusionFramebuffer, scatteringResource, velocityBuffer); const auto extraDebugBuffers = RenderDeferredTaskDebug::ExtraBuffers(linearDepthTarget, surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, ambientOcclusionUniforms, scatteringResource, velocityBuffer);
const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, shadowTaskOutputs, lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers, const auto debugInputs = RenderDeferredTaskDebug::Input(fetchedItems, shadowTaskOutputs, lightingStageInputs, lightClusters, prepareDeferredOutputs, extraDebugBuffers,
deferredFrameTransform, jitter, lightingModel).asVarying(); deferredFrameTransform, jitter, lightingModel).asVarying();
task.addJob<RenderDeferredTaskDebug>("DebugRenderDeferredTask", debugInputs); task.addJob<RenderDeferredTaskDebug>("DebugRenderDeferredTask", debugInputs);