sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used correct colorSpace in android Image loaders

Browse Source
This commit is contained in:
Nehon 2014-07-02 20:55:02 +02:00
parent 7356b727c3
commit 1b7421a153
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jme3-android/src/main/java/com/jme3/renderer/android/TextureUtil.java
View File

@ -6,7 +6,6 @@ import android.opengl.ETC1Util.ETC1Texture;
import android.opengl.GLES20;
import android.opengl.GLUtils;
import com.jme3.asset.AndroidImageInfo;
import com.jme3.math.FastMath;
import com.jme3.renderer.RendererException;
import com.jme3.texture.Image;
import com.jme3.texture.Image.Format;

4
jme3-android/src/main/java/com/jme3/texture/plugins/AndroidImageLoader.java
View File

@ -5,6 +5,7 @@ import com.jme3.asset.AndroidImageInfo;
import com.jme3.asset.AssetInfo;
import com.jme3.asset.AssetLoader;
import com.jme3.texture.Image;
import com.jme3.texture.image.ColorSpace;
import java.io.IOException;
public class AndroidImageLoader implements AssetLoader {
@ -13,7 +14,8 @@ public class AndroidImageLoader implements AssetLoader {
AndroidImageInfo imageInfo = new AndroidImageInfo(info);
Bitmap bitmap = imageInfo.getBitmap();
Image image = new Image(imageInfo.getFormat(), bitmap.getWidth(), bitmap.getHeight(), null);
Image image = new Image(imageInfo.getFormat(), bitmap.getWidth(), bitmap.getHeight(), null, ColorSpace.sRGB);
image.setEfficentData(imageInfo);
return image;
}

3
jme3-android/src/main/java/com/jme3/texture/plugins/AndroidNativeImageLoader.java
View File

@ -5,6 +5,7 @@ import com.jme3.asset.AssetLoadException;
import com.jme3.asset.AssetLoader;
import com.jme3.asset.TextureKey;
import com.jme3.texture.Image;
import com.jme3.texture.image.ColorSpace;
import com.jme3.util.BufferUtils;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -90,7 +91,7 @@ public class AndroidNativeImageLoader implements AssetLoader {
BufferUtils.destroyDirectBuffer(origDataBuffer);
BufferUtils.destroyDirectBuffer(headerDataBuffer);
Image img = new Image(getImageFormat(numComponents), width, height, imageDataBuffer);
Image img = new Image(getImageFormat(numComponents), width, height, imageDataBuffer, ColorSpace.sRGB);
return img;
}