fixed depth of field filter import-export

jMonkeyEngine · Jun 23, 2024 · 42f5ab6 · 42f5ab6
1 parent 09d4eba
commit 42f5ab6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/jme3-core/src/main/java/com/jme3/math/FastMath.java b/jme3-core/src/main/java/com/jme3/math/FastMath.java
@@ -848,8 +848,7 @@ public static float determinant(double m00, double m01, double m02,
      *
      * @param min the desired minimum value
      * @param max the desired maximum value
-     * @return A random float between <tt>min</tt> (inclusive) to
-     * <tt>max</tt> (inclusive).
+     * @return A random float between min (inclusive) to max (inclusive).
      */
     public static float nextRandomFloat(float min, float max) {
         float f = (nextRandomFloat() * (max - min + 1.0f)) + min;

diff --git a/jme3-core/src/main/java/com/jme3/renderer/framegraph/passes/RenderPass.java b/jme3-core/src/main/java/com/jme3/renderer/framegraph/passes/RenderPass.java
@@ -941,7 +941,6 @@ public static String groupTicketName(String group, int i) {
     /**
      * 
      * @param group
-     * @param i
      * @return 
      */
     public static String listTicketName(String group) {

diff --git a/jme3-core/src/main/java/com/jme3/shader/bufferobject/layout/BufferLayout.java b/jme3-core/src/main/java/com/jme3/shader/bufferobject/layout/BufferLayout.java
@@ -85,7 +85,7 @@ protected ObjectSerializer<?> getSerializer(Object obj) {
     /**
      * Register a serializer
      * 
-     * @param type
+     * @param serializer
      */
     protected void registerSerializer(ObjectSerializer<?> serializer) {
         serializers.add(serializer);

diff --git a/jme3-core/src/main/java/com/jme3/util/struct/StructStd140BufferObject.java b/jme3-core/src/main/java/com/jme3/util/struct/StructStd140BufferObject.java
@@ -56,15 +56,15 @@ public class StructStd140BufferObject extends BufferObject {
     private final Std140Layout std140 = new Std140Layout();
 
     /**
-     * Create an empty Struct buffer
-     * 
-     * @param str
+     * Create an empty Struct buffer.
      */
     public StructStd140BufferObject() {
     }
 
     /**
-     * Internal only
+     * Internal only.
+     * 
+     * @param id
      */
     public StructStd140BufferObject(int id) {
         super(id);

diff --git a/jme3-effects/src/main/java/com/jme3/post/filters/DepthOfFieldFilter.java b/jme3-effects/src/main/java/com/jme3/post/filters/DepthOfFieldFilter.java
@@ -95,7 +95,29 @@ protected void initFilter(AssetManager assets, RenderManager renderManager,
         material.setFloat("XScale", blurScale * xScale);
         material.setFloat("YScale", blurScale * yScale);
     }
+
+    @Override
+    public void write(JmeExporter ex) throws IOException {
+        super.write(ex);
+        OutputCapsule out = ex.getCapsule(this);
+        out.write(focusDistance, "focusDistance", 50f);
+        out.write(focusRange, "focusRange", 10f);
+        out.write(blurScale, "blurScale", 1f);
+        out.write(blurThreshold, "blurThreshold", 0.2f);
+        out.write(debugUnfocus, "debugUnfocus", false);
+    }
 
+    @Override
+    public void read(JmeImporter im) throws IOException {
+        super.read(im);
+        InputCapsule in = im.getCapsule(this);
+        focusDistance = in.readFloat("focusDistance", 50f);
+        focusRange = in.readFloat("focusRange", 10f);
+        blurScale = in.readFloat("blurScale", 1f);
+        blurThreshold = in.readFloat("blurThreshold", 0.2f);
+        debugUnfocus = in.readBoolean("debugUnfocus", false);
+    }
+
     /**
      *  Sets the distance at which objects are purely in focus.
      *