From c8c48347d917aca3b3ac5ebd160ebe87b5181fe7 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Tue, 9 Aug 2011 15:39:10 +0000 Subject: [PATCH] sdk : - Added support for FXAA filter to JMP - Fixed a typo in SSAO filter git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7993 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../gde/core/filters/impl/JmeFXAAFilter.java | 87 +++++++++++++++++++ .../gde/core/filters/impl/JmeSSAOFilter.java | 4 +- .../filters/impl/NewFXAAFilterAction.java | 54 ++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java create mode 100644 sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewFXAAFilterAction.java diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java new file mode 100644 index 000000000..996e2fefd --- /dev/null +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeFXAAFilter.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2009-2010 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.jme3.gde.core.filters.impl; + +import com.jme3.gde.core.filters.AbstractFilterNode; +import com.jme3.gde.core.filters.FilterNode; +import com.jme3.post.filters.FXAAFilter; +import com.jme3.post.ssao.SSAOFilter; +import org.openide.loaders.DataObject; +import org.openide.nodes.Node; +import org.openide.nodes.Sheet; + +/** + * + * @author Rémy Bouquet + */ +@org.openide.util.lookup.ServiceProvider(service = FilterNode.class) +public class JmeFXAAFilter extends AbstractFilterNode { + + public JmeFXAAFilter() { + } + + public JmeFXAAFilter(FXAAFilter filter, DataObject object, boolean readOnly) { + super(filter); + this.dataObject = object; + this.readOnly = readOnly; + } + + @Override + protected Sheet createSheet() { + Sheet sheet = super.createSheet(); + + Sheet.Set set = Sheet.createPropertiesSet(); + set.setDisplayName("FXAA"); + set.setName("FXAA"); + FXAAFilter obj = (FXAAFilter) filter; + + if (obj == null) { + return sheet; + } + + createFields(FXAAFilter.class, set, obj); + + sheet.put(set); + return sheet; + + } + + @Override + public Class getExplorerObjectClass() { + return FXAAFilter.class; + } + + @Override + public Node[] createNodes(Object key, DataObject dataObject, boolean readOnly) { + return new Node[]{new JmeFXAAFilter((FXAAFilter) key, dataObject, readOnly)}; + } +} diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java index 295e76ed0..853f05840 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/JmeSSAOFilter.java @@ -61,8 +61,8 @@ public class JmeSSAOFilter extends AbstractFilterNode { Sheet sheet = super.createSheet(); Sheet.Set set = Sheet.createPropertiesSet(); - set.setDisplayName("Water"); - set.setName("Water"); + set.setDisplayName("SSAO"); + set.setName("SSAO"); SSAOFilter obj = (SSAOFilter) filter; if (obj == null) { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewFXAAFilterAction.java b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewFXAAFilterAction.java new file mode 100644 index 000000000..f968ef3ae --- /dev/null +++ b/sdk/jme3-core/src/com/jme3/gde/core/filters/impl/NewFXAAFilterAction.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2009-2010 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.jme3.gde.core.filters.impl; + +import com.jme3.gde.core.filters.actions.AbstractNewFilterAction; +import com.jme3.gde.core.filters.actions.NewFilterAction; +import com.jme3.post.Filter; +import com.jme3.post.filters.FXAAFilter; + +/** + * + * @author normenhansen + */ +@org.openide.util.lookup.ServiceProvider(service = NewFilterAction.class) +public class NewFXAAFilterAction extends AbstractNewFilterAction { + + public NewFXAAFilterAction() { + name = "FXAA"; + } + + @Override + protected Filter doCreateFilter() { + return new FXAAFilter(); + } +}