From 04f6b01d2e01b6ab8b5a0ab7898b70f39395cffd Mon Sep 17 00:00:00 2001 From: Nehon Date: Tue, 12 May 2015 21:13:17 +0200 Subject: [PATCH] Reverted commit https://github.com/jMonkeyEngine/jmonkeyengine/commit/3f3ef99b8693cfab8ebc2e74c766ddb504ca4a16 as it was not valid and introducing another issue. --- jme3-core/src/main/java/com/jme3/post/Filter.java | 5 ++--- .../src/main/java/com/jme3/post/FilterPostProcessor.java | 4 ++-- 2 files changed, 4 insertions(+), 5 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 a3c136e55..a6e2e3c01 100644 --- a/jme3-core/src/main/java/com/jme3/post/Filter.java +++ b/jme3-core/src/main/java/com/jme3/post/Filter.java @@ -233,12 +233,11 @@ 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, int numSamples) { + protected final void init(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) { // cleanup(renderManager.getRenderer()); defaultPass = new Pass(); - defaultPass.init(renderManager.getRenderer(), w, h, getDefaultPassTextureFormat(), getDefaultPassDepthFormat(), numSamples); + defaultPass.init(renderManager.getRenderer(), w, h, getDefaultPassTextureFormat(), getDefaultPassDepthFormat()); 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 462f03314..2cd8b83f8 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, numSamples); + filter.init(assetManager, renderManager, vp, width, height); filter.setDepthTexture(depthTexture); } else { - filter.init(assetManager, renderManager, vp, width, height, numSamples); + filter.init(assetManager, renderManager, vp, width, height); } }