xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

desktop: fix awt bitmap to texture

Browse Source
This commit is contained in:
Hannes Janetzek 2013-07-01 04:12:35 +02:00
parent d87376353c
commit ead0594d81
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java
View File

@ -14,7 +14,6 @@ import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.utils.BufferUtils; import com.badlogic.gdx.utils.BufferUtils;
public class AwtBitmap implements Bitmap { public class AwtBitmap implements Bitmap {
BufferedImage bitmap; BufferedImage bitmap;
int width; int width;
int height; int height;
@ -28,6 +27,7 @@ public class AwtBitmap implements Bitmap {
} }
AwtBitmap(InputStream inputStream) throws IOException { AwtBitmap(InputStream inputStream) throws IOException {
this.bitmap = ImageIO.read(inputStream); this.bitmap = ImageIO.read(inputStream);
this.width = this.bitmap.getWidth(); this.width = this.bitmap.getWidth();
this.height = this.bitmap.getHeight(); this.height = this.bitmap.getHeight();
@ -62,20 +62,24 @@ public class AwtBitmap implements Bitmap {
int[] pixels; int[] pixels;
IntBuffer buffer; IntBuffer buffer;
if (width == 512 && height == 256) { if (width * height < 512 * 256) {
pixels = tmpPixel; pixels = tmpPixel;
buffer = tmpBuffer; buffer = tmpBuffer;
buffer.clear(); buffer.clear();
//Log.d("AwtBitmap", "default texture");
} else { } else {
pixels = new int[width * height]; pixels = new int[width * height];
buffer = BufferUtils.newIntBuffer(width * height); buffer = BufferUtils.newIntBuffer(width * height);
//Log.d("AwtBitmap", "create texture buffer " + width + "x" + height);
} }
bitmap.getRGB(0, 0, width, height, pixels, 0, width); bitmap.getRGB(0, 0, width, height, pixels, 0, width);
buffer.put(pixels); for (int i = 0, n = width * height; i < n; i++){
int c = pixels[i];
// flip blue with red - silly Java
pixels[i] = (c & 0xff00ff00) | (c & 0x00ff0000) >>> 16 | (c & 0x000000ff) << 16;
}
buffer.put(pixels, 0, width * height);
buffer.flip(); buffer.flip();
Gdx.gl20.glTexImage2D(GL20.GL_TEXTURE_2D, 0, GL20.GL_RGBA, width, Gdx.gl20.glTexImage2D(GL20.GL_TEXTURE_2D, 0, GL20.GL_RGBA, width,

2
vtm-gdx-desktop/src/org/oscim/awt/AwtPaint.java
View File

@ -28,8 +28,6 @@ import java.util.Map;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
import com.badlogic.gdx.Gdx;
public class AwtPaint implements Paint { public class AwtPaint implements Paint {
private static int getCap(Cap cap) { private static int getCap(Cap cap) {