From 3f3ef99b8693cfab8ebc2e74c766ddb504ca4a16 Mon Sep 17 00:00:00 2001 From: Nehon Date: Fri, 8 May 2015 11:18:27 +0200 Subject: [PATCH] Fixed an issue where AA was not taken into account when using SSAO filter --- jme3-core/src/main/java/com/jme3/post/Filter.java | 5 +++-- .../src/main/java/com/jme3/post/FilterPostProcessor.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/post/Filter.java b/jme3-core/src/main/java/com/jme3/post/Filter.java index a6e2e3c01..a3c136e55 100644 --- a/jme3-core/src/main/java/com/jme3/post/Filter.java +++ b/jme3-core/src/main/java/com/jme3/post/Filter.java @@ -233,11 +233,12 @@ public abstract class Filter implements Savable { * @param vp the viewport * @param w the width * @param h the height + * @param numSamples the number of samples for anti aliasing */ - protected final void init(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) { + protected final void init(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h, int numSamples) { // cleanup(renderManager.getRenderer()); defaultPass = new Pass(); - defaultPass.init(renderManager.getRenderer(), w, h, getDefaultPassTextureFormat(), getDefaultPassDepthFormat()); + defaultPass.init(renderManager.getRenderer(), w, h, getDefaultPassTextureFormat(), getDefaultPassDepthFormat(), numSamples); initFilter(manager, renderManager, vp, w, h); } diff --git a/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java b/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java index 2cd8b83f8..462f03314 100644 --- a/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java +++ b/jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java @@ -170,10 +170,10 @@ public class FilterPostProcessor implements SceneProcessor, Savable { renderFrameBuffer.setDepthTexture(depthTexture); } computeDepth = true; - filter.init(assetManager, renderManager, vp, width, height); + filter.init(assetManager, renderManager, vp, width, height, numSamples); filter.setDepthTexture(depthTexture); } else { - filter.init(assetManager, renderManager, vp, width, height); + filter.init(assetManager, renderManager, vp, width, height, numSamples); } }