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

org.oscim.backend: docs and cleanups

Browse Source
This commit is contained in:
Hannes Janetzek
2013-09-25 05:30:34 +02:00
parent a9d9c97bff
commit 2db1cf8b6c
17 changed files with 171 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vtm-gdx-android/src/org/oscim/android/canvas/AndroidBitmap.java
View File

@@ -16,9 +16,10 @@ package org.oscim.android.canvas;
import java.io.InputStream;
import org.oscim.backend.GL20;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.opengl.GLES20;
import android.opengl.GLUtils;
public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
@@ -66,18 +67,16 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
}
@Override
public int uploadToTexture(boolean replace) {
public void uploadToTexture(boolean replace) {
int format = GLUtils.getInternalFormat(mBitmap);
int type = GLUtils.getType(mBitmap);
if (replace)
GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, mBitmap, format,
GLUtils.texSubImage2D(GL20.GL_TEXTURE_2D, 0, 0, 0, mBitmap, format,
type);
else
GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, format, mBitmap, type, 0);
return 0;
GLUtils.texImage2D(GL20.GL_TEXTURE_2D, 0, format, mBitmap, type, 0);
}
@Override

24
vtm-gdx-android/src/org/oscim/android/canvas/AndroidGraphics.java
View File

@@ -49,35 +49,11 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(inputStream);
}
@Override
public int getColor(Color color) {
switch (color) {
case BLACK:
return android.graphics.Color.BLACK;
case CYAN:
return android.graphics.Color.CYAN;
case TRANSPARENT:
return android.graphics.Color.TRANSPARENT;
case WHITE:
return android.graphics.Color.WHITE;
}
throw new IllegalArgumentException("unknown color value: " + color);
}
@Override
public Paint getPaint() {
return new AndroidPaint();
}
@Override
public int parseColor(String colorString) {
return android.graphics.Color.parseColor(colorString);
}
@Override
public Bitmap getBitmap(int width, int height, int format) {
return new AndroidBitmap(width, height, format);