Explorar o código

Replace Function with Predicate

Riccardo Balbo hai 1 ano
pai
achega
8314499aa6

+ 2 - 2
jme3-core/src/main/java/com/jme3/environment/EnvironmentProbeControl.java

@@ -33,7 +33,7 @@ package com.jme3.environment;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import com.jme3.asset.AssetManager;
@@ -92,7 +92,7 @@ public class EnvironmentProbeControl extends LightProbe implements Control {
     private String uuid = "none";
     private boolean enabled = true;
 
-    private Function<Geometry, Boolean> filter = (s) -> {
+    private Predicate<Geometry> filter = (s) -> {
         return s.getUserData("tags.env") != null || s.getUserData("tags.env.env" + uuid) != null;
     };
 

+ 2 - 2
jme3-core/src/main/java/com/jme3/environment/baker/EnvBaker.java

@@ -32,7 +32,7 @@
 
 package com.jme3.environment.baker;
 
-import java.util.function.Function;
+import java.util.function.Predicate;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
@@ -58,7 +58,7 @@ public interface EnvBaker {
      * @param filter
      *            A filter to select which geometries to bake
      */
-    public void bakeEnvironment(Spatial scene, Vector3f position, float frustumNear, float frustumFar, Function<Geometry, Boolean> filter);
+    public void bakeEnvironment(Spatial scene, Vector3f position, float frustumNear, float frustumFar, Predicate<Geometry> filter);
 
     /**
      * Get the environment map

+ 3 - 3
jme3-core/src/main/java/com/jme3/environment/baker/GenericEnvBaker.java

@@ -36,7 +36,7 @@ import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import com.jme3.asset.AssetManager;
@@ -167,7 +167,7 @@ public abstract class GenericEnvBaker implements EnvBaker {
     }
 
     @Override
-    public void bakeEnvironment(Spatial scene, Vector3f position, float frustumNear, float frustumFar, Function<Geometry, Boolean> filter) {
+    public void bakeEnvironment(Spatial scene, Vector3f position, float frustumNear, float frustumFar, Predicate<Geometry> filter) {
         FrameBuffer envbakers[] = new FrameBuffer[6];
         for (int i = 0; i < 6; i++) {
             envbakers[i] = new FrameBuffer(env.getImage().getWidth(), env.getImage().getHeight(), 1);
@@ -192,7 +192,7 @@ public abstract class GenericEnvBaker implements EnvBaker {
             scene.updateLogicalState(0);
             scene.updateGeometricState();
 
-            Function<Geometry, Boolean> ofilter = renderManager.getRenderFilter();
+            Predicate<Geometry> ofilter = renderManager.getRenderFilter();
 
             renderManager.setRenderFilter(filter);
             renderManager.renderViewPort(viewPort, 0.16f);

+ 5 - 5
jme3-core/src/main/java/com/jme3/renderer/RenderManager.java

@@ -66,7 +66,7 @@ import com.jme3.util.SafeArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.logging.Logger;
 
 /**
@@ -105,7 +105,7 @@ public class RenderManager {
     private TechniqueDef.LightMode preferredLightMode = TechniqueDef.LightMode.MultiPass;
     private int singlePassLightBatchSize = 1;
     private MatParamOverride boundDrawBufferId=new MatParamOverride(VarType.Int,"BoundDrawBuffer",0);
-    private Function<Geometry, Boolean> renderFilter;
+    private Predicate<Geometry> renderFilter;
 
 
     /**
@@ -628,7 +628,7 @@ public class RenderManager {
      * @see com.jme3.material.Material#render(com.jme3.scene.Geometry, com.jme3.renderer.RenderManager)
      */
     public void renderGeometry(Geometry geom) {
-        if (renderFilter != null && !renderFilter.apply(geom)) return;
+        if (renderFilter != null && !renderFilter.test(geom)) return;
         this.renderer.pushDebugGroup(geom.getName());
         if (geom.isIgnoreTransform()) {
             setWorldMatrix(Matrix4f.IDENTITY);
@@ -1345,7 +1345,7 @@ public class RenderManager {
      * 
      * @param filter
      */
-    public void setRenderFilter(Function<Geometry, Boolean> filter) {
+    public void setRenderFilter(Predicate<Geometry> filter) {
         renderFilter = filter;
     }
 
@@ -1355,7 +1355,7 @@ public class RenderManager {
      * @param filter
      *            the render filter
      */
-    public Function<Geometry, Boolean> getRenderFilter() {
+    public Predicate<Geometry> getRenderFilter() {
         return renderFilter;
     }