Bugfix texturing, imagefactory GB format from BGR

Author: rsahlin

graphics-by-opengl-j2se/src/main/java/com/nucleus/opengl/assets/GLAssetManager.java

@@ -282,6 +282,7 @@ protected void loadTextures(NucleusRenderer renderer, GLTF gltf, Material materi
             // Material has both metallicroughness and occlusion in the same texture
             loadTexture(renderer, gltf, mrInfo, ImageFormat.RGB, ColorModel.LINEAR);
         } else {
+            //TODO ImageFormat.RG actually means picking GB pixels and putting into RG (2 pixels)
             Texture mr = loadTexture(renderer, gltf, mrInfo, ImageFormat.RG,
                     ColorModel.LINEAR);
             if (mr != null) {
@@ -302,7 +303,7 @@ protected void loadTextures(NucleusRenderer renderer, GLTF gltf, Material materi
      * @param gltf
      * @param texInfo
      * @param destFormat Optional destination image format, if null then same as source
-     * @param colorMode If model is linear or srgb
+     * @param colorModel If model is linear or srgb
      * @return The loaded texture object
      * @throws IOException
      */

graphics-by-opengl-j2se/src/main/java/com/nucleus/texturing/BaseImageFactory.java

@@ -197,7 +197,7 @@ protected void copyPixels(byte[] source, SourceFormat sourceFormat, BufferImage
                         break;
                     case RG:
                     case LUMINANCE_ALPHA:
-                        copyPixels_4BYTE_ABGR_TO_RG(source, buffer, destination.getWidth(), destination.getHeight());
+                        copyPixels_4BYTE_ABGR_TO_GB(source, buffer, destination.getWidth(), destination.getHeight());
                         break;
 
                     default:
@@ -219,6 +219,10 @@ protected void copyPixels(byte[] source, SourceFormat sourceFormat, BufferImage
                     case RGB5_A1:
                         copyPixels_4BYTE_RGBA_TO_RGB5551(source, buffer);
                         break;
+                    case RG:
+                    case LUMINANCE_ALPHA:
+                        copyPixels_4BYTE_ARGB_TO_GB(source, buffer, destination.getWidth(), destination.getHeight());
+                        break;
                     default:
                         throw new IllegalArgumentException(
                                 ErrorMessage.NOT_IMPLEMENTED.message + destination.getFormat());
@@ -231,7 +235,7 @@ protected void copyPixels(byte[] source, SourceFormat sourceFormat, BufferImage
                         break;
                     case RG:
                     case LUMINANCE_ALPHA:
-                        copyPixels_3BYTE_BGR_TO_RG(source, buffer, destination.getWidth(),
+                        copyPixels_3BYTE_BGR_TO_GB(source, buffer, destination.getWidth(),
                                 destination.getHeight());
                         break;
                     case RGBA:
@@ -263,7 +267,7 @@ protected void copyPixels(byte[] source, SourceFormat sourceFormat, BufferImage
                         break;
                     case RG:
                     case LUMINANCE_ALPHA:
-                        copyPixels_3BYTE_BGR_TO_RG(source, buffer, destination.getWidth(),
+                        copyPixels_3BYTE_BGR_TO_GB(source, buffer, destination.getWidth(),
                                 destination.getHeight());
                         break;
                     default:
@@ -419,24 +423,24 @@ protected void copyPixels_3BYTE_BGR_TO_RGB(byte[] source, ByteBuffer destination
     }
 
     /**
-     * Copies the 3 byte BGR to 16 bit 2 elements, RG, GB or LA depending on destination format
+     * Copies the 3 byte BGR to 16 bit 2 elements GB format
      * 
      * @param source
      * @param destination
      * @param width
      * @param height
      */
-    protected void copyPixels_3BYTE_BGR_TO_RG(byte[] source, ByteBuffer destination, int width, int height) {
+    protected void copyPixels_3BYTE_BGR_TO_GB(byte[] source, ByteBuffer destination, int width, int height) {
         int count = width * height;
-        byte[] rg = new byte[count * 2];
-        int length = rg.length;
+        byte[] gb = new byte[count * 2];
+        int length = gb.length;
         int sourceIndex = 0;
         for (int destIndex = 0; destIndex < length;) {
-            rg[destIndex++] = source[sourceIndex + 1];
-            rg[destIndex++] = source[sourceIndex];
+            gb[destIndex++] = source[sourceIndex + 1];
+            gb[destIndex++] = source[sourceIndex];
             sourceIndex += 3;
         }
-        destination.put(rg, 0, rg.length);
+        destination.put(gb, 0, gb.length);
     }
 
     /**
@@ -480,24 +484,45 @@ protected void copyPixels_4BYTE_ABGR_TO_RGB5551(byte[] source, ByteBuffer destin
     }
 
     /**
-     * Copies the 4 byte ABGR to 16 bit 2 ELEMENTS, RG, GB or LA depending on destination texture format.
+     * Copies the 4 byte ABGR to 16 bit 2 ELEMENTS GB format.
      * 
      * @param source
      * @param destination
      * @param width
      * @param height
      */
-    protected void copyPixels_4BYTE_ABGR_TO_RG(byte[] source, ByteBuffer destination, int width, int height) {
+    protected void copyPixels_4BYTE_ABGR_TO_GB(byte[] source, ByteBuffer destination, int width, int height) {
+        int count = width * height;
+        byte[] gb = new byte[count * 2];
+        int length = gb.length;
+        int sourceIndex = 0;
+        for (int destIndex = 0; destIndex < length;) {
+            gb[destIndex++] = source[sourceIndex + 1];
+            gb[destIndex++] = source[sourceIndex + 2];
+            sourceIndex += 4;
+        }
+        destination.put(gb, 0, gb.length);
+    }
+
+    /**
+     * Copies the 4 byte ARGB to 16 bit 2 ELEMENTS GB format.
+     *
+     * @param source
+     * @param destination
+     * @param width
+     * @param height
+     */
+    protected void copyPixels_4BYTE_ARGB_TO_GB(byte[] source, ByteBuffer destination, int width, int height) {
         int count = width * height;
-        byte[] rg = new byte[count * 2];
-        int length = rg.length;
+        byte[] gb = new byte[count * 2];
+        int length = gb.length;
         int sourceIndex = 0;
         for (int destIndex = 0; destIndex < length;) {
-            rg[destIndex++] = source[sourceIndex + 2];
-            rg[destIndex++] = source[sourceIndex + 1];
+            gb[destIndex++] = source[sourceIndex + 2];
+            gb[destIndex++] = source[sourceIndex + 3];
             sourceIndex += 4;
         }
-        destination.put(rg, 0, rg.length);
+        destination.put(gb, 0, gb.length);
     }
 
 }