sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #603 from JavaSaBr/fix_editing_color_overlay_filter

Browse Source 
Fix editing color overlay filter
This commit is contained in:
Rémy Bouquet 2017-01-23 08:33:09 +01:00 committed by GitHub
commit 4c664f8df3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jme3-effects/src/main/java/com/jme3/post/filters/ColorOverlayFilter.java
View File

@ -41,6 +41,7 @@ import com.jme3.math.ColorRGBA;
import com.jme3.post.Filter; import com.jme3.post.Filter;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort; import com.jme3.renderer.ViewPort;
import java.io.IOException; import java.io.IOException;
/** /**
@ -69,8 +70,6 @@ public class ColorOverlayFilter extends Filter {
@Override @Override
protected Material getMaterial() { protected Material getMaterial() {
material.setColor("Color", color);
return material; return material;
} }
@ -86,13 +85,17 @@ public class ColorOverlayFilter extends Filter {
* sets the color * sets the color
* @param color * @param color
*/ */
public void setColor(ColorRGBA color) { public void setColor(final ColorRGBA color) {
this.color = color; this.color = color;
if (material != null) {
material.setColor("Color", color);
}
} }
@Override @Override
protected void initFilter(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) { protected void initFilter(AssetManager manager, RenderManager renderManager, ViewPort vp, int w, int h) {
material = new Material(manager, "Common/MatDefs/Post/Overlay.j3md"); material = new Material(manager, "Common/MatDefs/Post/Overlay.j3md");
material.setColor("Color", color);
} }
@Override @Override