Deprecate CursorLoader and delete it from Desktop.cfg file

jme3-android/src/main/java/com/jme3/input/android/AndroidMouseInput24.java

@@ -114,7 +114,7 @@ public void setCursorVisible(boolean visible) {
     public void setNativeCursor(JmeCursor cursor) {
         if(inputHandler.getView()!=null) {
             if(cursor!=null) {
-                // Translate into Android Bitmap format ARGB888. Assuming input image as RGBA
+                // Translate into Android Bitmap format ARGB888. Assuming input image as RGBA where each channel is an integer.
                 int bufferSize = cursor.getHeight()*cursor.getWidth();
                 int[] outputBitmap=new int[bufferSize];
                 IntBuffer inputImage = cursor.getImagesData().asReadOnlyBuffer();

jme3-core/src/main/java/com/jme3/math/ColorRGBA.java

@@ -673,6 +673,25 @@ public int asIntABGR() {
         return toInt(a, b, g, r);
     }
 
+    /**
+     * Retrieves the component values of this <code>ColorRGBA</code> as an
+     * <code>int[]</code> of lenght four in r,g,b,a order.
+     * Where:
+     *      int[0] = red value in range of 0-255.
+     *      int[1] = green value in range of 0-255.
+     *      int[2] = blue value in range of 0-255.
+     *      int[3] = alpha value in range of 0-255.
+     *
+     * @return The integer array representation of this <code>ColorRGBA</code> in r,g,b,a order.
+     */
+    public int[] asIntsRGBA() {
+        int intR = ((int) (r * 255) & 0xFF);
+        int intG = ((int) (g * 255) & 0xFF);
+        int intB = ((int) (b * 255) & 0xFF);
+        int intA = ((int) (a * 255) & 0xFF);
+        return new int[] {intR, intG, intB, intA};
+    }
+
     /**
      * Sets the component values of this <code>ColorRGBA</code> with the given
      * combined ARGB <code>int</code>.
@@ -824,10 +843,10 @@ private float fromByte(int channelByte) {
      * Helper method to combine four float channels into an int.
      */
     private int toInt(float c1, float c2, float c3, float c4) {
-        int r = ((int) (c1 * 255) & 0xFF);
-        int g = ((int) (c2 * 255) & 0xFF);
-        int b = ((int) (c3 * 255) & 0xFF);
-        int a = ((int) (c4 * 255) & 0xFF);
-        return (r << 24) | (g << 16) | (b << 8) | a;
+        int intC1 = ((int) (c1 * 255) & 0xFF);
+        int intC2 = ((int) (c2 * 255) & 0xFF);
+        int intC3 = ((int) (c3 * 255) & 0xFF);
+        int intC4 = ((int) (c4 * 255) & 0xFF);
+        return (intC1 << 24) | (intC2 << 16) | (intC3 << 8) | intC4;
     }
 }

jme3-core/src/main/java/com/jme3/texture/Image.java

@@ -79,16 +79,16 @@ public enum Format {
         Reserved2(0),
 
         /**
-         * half-precision floating-point grayscale/luminance.
-         *
-         * Requires {@link Caps#HalfFloatTexture}.
+         * half-precision floating-point grayscale/luminance.
+         *
+         * Requires {@link Caps#HalfFloatTexture}.
          */
         Luminance16F(16,true),
 
         /**
          * single-precision floating-point grayscale/luminance.
          * 
-         * Requires {@link Caps#FloatTexture}.
+         * Requires {@link Caps#FloatTexture}.
          */
         Luminance32F(32,true),
 
@@ -101,9 +101,9 @@ public enum Format {
         Reserved3(0),
 
         /**
-         * half-precision floating-point grayscale/luminance and alpha.
-         *
-         * Requires {@link Caps#HalfFloatTexture}.
+         * half-precision floating-point grayscale/luminance and alpha.
+         *
+         * Requires {@link Caps#HalfFloatTexture}.
          */
         Luminance16FAlpha16F(32,true),
 
@@ -255,7 +255,7 @@ public enum Format {
          * but will be converted to {@link Format#RGB111110F} when sent
          * to the video hardware.
          * 
-         * Requires {@link Caps#HalfFloatTexture} and {@link Caps#PackedFloatTexture}.
+         * Requires {@link Caps#HalfFloatTexture} and {@link Caps#PackedFloatTexture}.
          */
         RGB16F_to_RGB111110F(48,true),
 
@@ -271,7 +271,7 @@ public enum Format {
          * but will be converted to {@link Format#RGB9E5} when sent
          * to the video hardware.
          * 
-         * Requires {@link Caps#HalfFloatTexture} and {@link Caps#SharedExponentTexture}.
+         * Requires {@link Caps#HalfFloatTexture} and {@link Caps#SharedExponentTexture}.
          */
         RGB16F_to_RGB9E5(48,true),
 
@@ -283,32 +283,32 @@ public enum Format {
         RGB9E5(32,true),
 
         /**
-         * half-precision floating point red, green, and blue.
-         *
-         * Requires {@link Caps#HalfFloatTexture}.
+         * half-precision floating point red, green, and blue.
+         *
+         * Requires {@link Caps#HalfFloatTexture}.
          * May be supported for renderbuffers, but the OpenGL specification does not require it.
          */
         RGB16F(48,true),
 
         /**
          * half-precision floating point red, green, blue, and alpha.
          * 
-         * Requires {@link Caps#HalfFloatTexture}.
+         * Requires {@link Caps#HalfFloatTexture}.
          */
         RGBA16F(64,true),
 
         /**
-         * single-precision floating point red, green, and blue.
-         *
-         * Requires {@link Caps#FloatTexture}.
+         * single-precision floating point red, green, and blue.
+         *
+         * Requires {@link Caps#FloatTexture}.
          * May be supported for renderbuffers, but the OpenGL specification does not require it.
          */
         RGB32F(96,true),
 
         /**
-         * single-precision floating point red, green, blue and alpha.
-         *
-         * Requires {@link Caps#FloatTexture}.
+         * single-precision floating point red, green, blue and alpha.
+         *
+         * Requires {@link Caps#FloatTexture}.
          */
         RGBA32F(128,true),
 
@@ -507,21 +507,21 @@ public enum Format {
         /**
          * half-precision floating point red.
          * 
-         * Requires {@link Caps#HalfFloatTexture}.
+         * Requires {@link Caps#HalfFloatTexture}.
          */
         R16F(16,true),
 
         /**
-         * single-precision floating point red.
-         *
-         * Requires {@link Caps#FloatTexture}.
+         * single-precision floating point red.
+         *
+         * Requires {@link Caps#FloatTexture}.
          */
         R32F(32,true),
 
         /**
          * half-precision floating point red and green.
          * 
-         * Requires {@link Caps#HalfFloatTexture}.
+         * Requires {@link Caps#HalfFloatTexture}.
          */
         RG16F(32,true),
 
@@ -719,7 +719,8 @@ public long getUniqueId() {
     }
 
     /**
-     * @return A shallow clone of this image. The data is not cloned.
+     * @return a shallow clone of this image. The data is not cloned.
+     * @see #deepClone() Deep clone.
      */
     @Override
     public Image clone(){
@@ -731,6 +732,27 @@ public Image clone(){
         return clone;
     }
 
+    /**
+     * @return a deep clone of this image. The data is cloned.
+     * @see #clone() Shallow clone.
+     */
+    public Image deepClone() {
+        Image clone = (Image) super.clone();
+        clone.mipMapSizes = mipMapSizes != null ? mipMapSizes.clone() : null;
+        clone.data = data != null ? dataDeepClone() : null;
+        clone.lastTextureState = new LastTextureState();
+        clone.setUpdateNeeded();
+        return clone;
+    }
+
+    private ArrayList<ByteBuffer> dataDeepClone() {
+        ArrayList<ByteBuffer> clone = new ArrayList<ByteBuffer>(data.size());
+        for (ByteBuffer originalBuffer : data) {
+            clone.add(BufferUtils.clone(originalBuffer));
+        }
+        return clone;
+    }
+
     /**
      * Constructor instantiates a new <code>Image</code> object. All values
      * are undefined.

jme3-core/src/main/resources/com/jme3/asset/Desktop.cfg

@@ -1,4 +1,3 @@
 INCLUDE com/jme3/asset/General.cfg
 
 # Desktop-specific loaders
-LOADER com.jme3.cursors.plugins.CursorLoader : ani, cur, ico