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

api changes

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-28 04:34:14 +02:00
parent 8661ac524b
commit dad16ea796
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
View File

@ -27,7 +27,7 @@ public class MainActivity extends AndroidApplication {
// set our globals // set our globals
CanvasAdapter.g = AndroidGraphics.INSTANCE; CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.INSTANCE = new AndroidGLAdapter(); GLAdapter.g = new AndroidGLAdapter();
Log.logger = new AndroidLog(); Log.logger = new AndroidLog();
// TODO make this dpi dependent // TODO make this dpi dependent
Tile.SIZE = 400; Tile.SIZE = 400;

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

@ -7,7 +7,6 @@ import java.nio.IntBuffer;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.oscim.backend.Log;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;

11
vtm-gdx-desktop/src/org/oscim/awt/AwtGraphics.java
View File

@ -10,6 +10,7 @@ import java.io.InputStream;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Canvas; import org.oscim.backend.canvas.Canvas;
import org.oscim.backend.BitmapUtils;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
@ -86,5 +87,13 @@ public class AwtGraphics extends CanvasAdapter {
} }
} }
@Override
public Bitmap loadBitmapAsset(String fileName) {
try {
return BitmapUtils.createBitmap(fileName);
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
} }

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

@ -66,26 +66,21 @@ public class AwtPaint implements Paint {
@Override @Override
public int getColor() { public int getColor() {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public int getTextHeight(String text) { public int getTextHeight(String text) {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public int getTextWidth(String text) { public int getTextWidth(String text) {
// TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public void setBitmapShader(Bitmap bitmap) { public void setBitmapShader(Bitmap bitmap) {
// TODO Auto-generated method stub
} }
@Override @Override

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

@ -23,7 +23,7 @@ public class Main {
// set our globals // set our globals
CanvasAdapter.g = AwtGraphics.INSTANCE; CanvasAdapter.g = AwtGraphics.INSTANCE;
GLAdapter.INSTANCE = new GdxGLAdapter(); GLAdapter.g = new GdxGLAdapter();
Tile.SIZE = 256; Tile.SIZE = 256;
new SharedLibraryLoader().load("vtm-jni"); new SharedLibraryLoader().load("vtm-jni");