Merge pull request #658 from jmecn/master

Fix issue #654

jme3-desktop/src/main/resources/com/jme3/app/SettingsDialog_zh_CN.properties

@@ -0,0 +1,18 @@
+frame.title={0} \u663E\u793A\u8BBE\u7F6E
+
+button.ok=\u542F\u52A8
+button.cancel=\u53D6\u6D88
+
+checkbox.fullscreen=\u5168\u5C4F\u663E\u793A?
+checkbox.vsync=\u5782\u76F4\u540C\u6B65?
+checkbox.gamma=\u4F3D\u9A6C\u6821\u6B63
+
+label.resolutions=\u5206\u8FA8\u7387
+label.colordepth=\u8272\u5F69\u6DF1\u5EA6
+label.refresh=\u5237\u65B0\u7387
+label.antialias=\u6297\u952F\u9F7F
+
+antialias.disabled=\u7981\u7528
+refresh.na=N/A
+
+error.unsupportedmode=\u60A8\u7684\u663E\u793A\u5668\u4E0D\u652F\u6301\u6240\u9009\u5206\u8FA8\u7387\u3002\n\u4E0D\u652F\u6301\u8BE5\u5206\u8FA8\u7387\u548C\u8272\u6DF1\u7684\u7EC4\u5408\u3002

jme3-effects/src/main/java/com/jme3/water/WaterFilter.java

@@ -332,6 +332,11 @@ public class WaterFilter extends Filter {
         oc.write(causticsIntensity, "causticsIntensity", 0.5f);
 
         oc.write(useCaustics, "useCaustics", true);
+        
+        //positional attributes
+        oc.write(center, "center", null);
+        oc.write(radius, "radius", 0f);
+        oc.write(shapeType.ordinal(), "shapeType", AreaShape.Circular.ordinal());
     }
 
     @Override
@@ -377,6 +382,11 @@ public class WaterFilter extends Filter {
 
         useCaustics = ic.readBoolean("useCaustics", true);
 
+        //positional attributes
+        center = (Vector3f) ic.readSavable("center", null);
+        radius = ic.readFloat("radius", 0f);
+        int shapeType = ic.readInt("shapeType", AreaShape.Circular.ordinal());
+        this.shapeType = AreaShape.values()[shapeType];
     }
 
     /**