From ffe14e11d544150c925c7aeef153606a5b0a719c Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 10 Oct 2014 05:02:36 +0200
Subject: [PATCH] bring vtm-android-gdx back to life
---
vtm-android-gdx/build.gradle | 4 +-
.../oscim/android/canvas/AndroidBitmap.java | 40 +-
.../oscim/android/canvas/AndroidCanvas.java | 10 +-
.../oscim/android/canvas/AndroidGraphics.java | 44 +-
.../oscim/android/canvas/AndroidPaint.java | 7 +-
.../src/org/oscim/gdx/AndroidGL.java | 850 ++++++++++++++++++
.../src/org/oscim/gdx/MainActivity.java | 7 +-
vtm-ext-libs | 2 +-
8 files changed, 914 insertions(+), 50 deletions(-)
create mode 100644 vtm-android-gdx/src/org/oscim/gdx/AndroidGL.java
diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle
index 708e57ab..03e955f5 100644
--- a/vtm-android-gdx/build.gradle
+++ b/vtm-android-gdx/build.gradle
@@ -22,7 +22,7 @@ dependencies {
compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
- compile files("${rootDir}/vtm-ext-libs/gdx-native-libs.jar")
+ compile files("${rootDir}/vtm-ext-libs/gdx/gdx-native-libs.jar")
compile files("${rootDir}/vtm-ext-libs/native-libs.jar")
}
@@ -75,7 +75,7 @@ eclipse {
entry.path.contains('native-libs') }*.exported = false
classpath.entries.removeAll { entry ->
- entry.path.contains('gdx-1.0-SNAPSHOT') }
+ entry.path.contains('gdx-2') }
}
diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidBitmap.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidBitmap.java
index 5363e3e9..35b68e5b 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidBitmap.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidBitmap.java
@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
- *
+ *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
* This program is free software: you can redistribute it and/or modify it under the
@@ -16,19 +16,31 @@
*/
package org.oscim.android.canvas;
-import java.io.InputStream;
+import static android.graphics.Bitmap.Config.ARGB_8888;
-import org.oscim.backend.GL20;
+import java.io.InputStream;
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 {
final Bitmap mBitmap;
public AndroidBitmap(InputStream inputStream) {
- mBitmap = BitmapFactory.decodeStream(inputStream);
+ Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+ try {
+ GLUtils.getType(bitmap);
+ } catch (IllegalArgumentException e) {
+ bitmap = bitmap.copy(ARGB_8888, false);
+ }
+ mBitmap = bitmap;
+ }
+
+ @Override
+ public boolean isValid() {
+ return mBitmap != null;
}
/**
@@ -36,10 +48,10 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
*/
public AndroidBitmap(int width, int height, int format) {
mBitmap = android.graphics.Bitmap
- .createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888);
+ .createBitmap(width, height, ARGB_8888);
}
- AndroidBitmap(android.graphics.Bitmap bitmap) {
+ public AndroidBitmap(android.graphics.Bitmap bitmap) {
mBitmap = bitmap;
}
@@ -70,24 +82,22 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
@Override
public void uploadToTexture(boolean replace) {
-
int format = GLUtils.getInternalFormat(mBitmap);
int type = GLUtils.getType(mBitmap);
if (replace)
- GLUtils.texSubImage2D(GL20.TEXTURE_2D, 0, 0, 0, mBitmap, format,
- type);
+ GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0,
+ mBitmap, format, type);
else
- GLUtils.texImage2D(GL20.TEXTURE_2D, 0, format, mBitmap, type, 0);
+ GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, format,
+ mBitmap, type, 0);
}
@Override
public void recycle() {
+ if (mBitmap == null)
+ return;
+
mBitmap.recycle();
}
-
- @Override
- public boolean isValid() {
- return mBitmap != null;
- }
}
diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidCanvas.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidCanvas.java
index b5c14291..ab5675c1 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidCanvas.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidCanvas.java
@@ -24,23 +24,23 @@ public class AndroidCanvas implements Canvas {
final android.graphics.Canvas canvas;
public AndroidCanvas() {
- this.canvas = new android.graphics.Canvas();
+ canvas = new android.graphics.Canvas();
}
@Override
public void setBitmap(Bitmap bitmap) {
- this.canvas.setBitmap(((AndroidBitmap) bitmap).mBitmap);
+ canvas.setBitmap(((AndroidBitmap) bitmap).mBitmap);
}
@Override
public void drawText(String string, float x, float y, Paint stroke) {
- this.canvas.drawText(string, x, y, ((AndroidPaint) stroke).mPaint);
-
+ if (string != null)
+ canvas.drawText(string, x, y, ((AndroidPaint) stroke).mPaint);
}
@Override
public void drawBitmap(Bitmap bitmap, float x, float y) {
- this.canvas.drawBitmap(((AndroidBitmap) bitmap).mBitmap, x, y, null);
+ canvas.drawBitmap(((AndroidBitmap) bitmap).mBitmap, x, y, null);
}
diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
index 86df550e..35245558 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -1,9 +1,8 @@
/*
* Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2013 Hannes Janetzek
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
- *
+ *
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
@@ -38,10 +37,6 @@ public final class AndroidGraphics extends CanvasAdapter {
CanvasAdapter.init(new AndroidGraphics());
}
- // public static android.graphics.Bitmap getAndroidBitmap(Bitmap bitmap) {
- // return ((AndroidBitmap) bitmap).bitmap;
- // }
-
public static android.graphics.Paint getAndroidPaint(Paint paint) {
return ((AndroidPaint) paint).mPaint;
}
@@ -55,6 +50,16 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(inputStream);
}
+ @Override
+ public Bitmap loadBitmapAssetImpl(String fileName) {
+ try {
+ return createBitmap(fileName);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
@Override
public Paint newPaintImpl() {
return new AndroidPaint();
@@ -88,23 +93,28 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(bitmap);
}
- public static MarkerSymbol makeMarker(Resources res, int id, HotspotPlace place) {
+ public static Bitmap drawableToBitmap(Resources res, int resId) {
+ return new AndroidBitmap(res.openRawResource(resId));
+ }
+ /**
+ * @deprecated
+ */
+ public static MarkerSymbol makeMarker(Drawable drawable, HotspotPlace place) {
if (place == null)
place = HotspotPlace.CENTER;
- Drawable drawable = res.getDrawable(id);
-
return new MarkerSymbol(drawableToBitmap(drawable), place);
}
- @Override
- public Bitmap loadBitmapAssetImpl(String fileName) {
- try {
- return createBitmap(fileName);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return null;
+ /**
+ * @deprecated
+ */
+ public static MarkerSymbol makeMarker(Resources res, int resId, HotspotPlace place) {
+ if (place == null)
+ place = HotspotPlace.CENTER;
+
+ InputStream in = res.openRawResource(resId);
+ return new MarkerSymbol(new AndroidBitmap(in), place);
}
}
diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
index 8f90a761..e63e9aeb 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
@@ -1,9 +1,8 @@
/*
* Copyright 2010, 2011, 2012 mapsforge.org
- * Copyright 2013 Hannes Janetzek
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
- *
+ *
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
@@ -58,7 +57,8 @@ class AndroidPaint implements Paint {
final android.graphics.Paint mPaint;
AndroidPaint() {
- mPaint = new android.graphics.Paint(android.graphics.Paint.ANTI_ALIAS_FLAG);
+ mPaint = new android.graphics.Paint(
+ android.graphics.Paint.ANTI_ALIAS_FLAG);
}
@Override
@@ -90,7 +90,6 @@ class AndroidPaint implements Paint {
@Override
public void setTextAlign(Align align) {
-
//mPaint.setTextAlign(android.graphics.Paint.Align.valueOf(align.name()));
}
diff --git a/vtm-android-gdx/src/org/oscim/gdx/AndroidGL.java b/vtm-android-gdx/src/org/oscim/gdx/AndroidGL.java
new file mode 100644
index 00000000..695878f7
--- /dev/null
+++ b/vtm-android-gdx/src/org/oscim/gdx/AndroidGL.java
@@ -0,0 +1,850 @@
+/*
+ * Copyright 2013 Hannes Janetzek
+ *
+ * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.gdx;
+
+import java.nio.Buffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+import org.oscim.backend.GL;
+
+import android.annotation.SuppressLint;
+import android.opengl.GLES20;
+
+@SuppressLint("NewApi")
+public class AndroidGL implements GL {
+
+ @Override
+ public void attachShader(int program, int shader) {
+ GLES20.glAttachShader(program, shader);
+ }
+
+ @Override
+ public void bindAttribLocation(int program, int index, String name) {
+ GLES20.glBindAttribLocation(program, index, name);
+ }
+
+ @Override
+ public void bindBuffer(int target, int buffer) {
+ GLES20.glBindBuffer(target, buffer);
+ }
+
+ @Override
+ public void bindFramebuffer(int target, int framebuffer) {
+ GLES20.glBindFramebuffer(target, framebuffer);
+ }
+
+ @Override
+ public void bindRenderbuffer(int target, int renderbuffer) {
+ GLES20.glBindRenderbuffer(target, renderbuffer);
+ }
+
+ @Override
+ public void blendColor(float red, float green, float blue, float alpha) {
+ GLES20.glBlendColor(red, green, blue, alpha);
+ }
+
+ @Override
+ public void blendEquation(int mode) {
+ GLES20.glBlendEquation(mode);
+ }
+
+ @Override
+ public void blendEquationSeparate(int modeRGB, int modeAlpha) {
+ GLES20.glBlendEquationSeparate(modeRGB, modeAlpha);
+ }
+
+ @Override
+ public void blendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
+ GLES20.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
+ }
+
+ @Override
+ public void bufferData(int target, int size, Buffer data, int usage) {
+ GLES20.glBufferData(target, size, data, usage);
+ }
+
+ @Override
+ public void bufferSubData(int target, int offset, int size, Buffer data) {
+ GLES20.glBufferSubData(target, offset, size, data);
+ }
+
+ @Override
+ public int checkFramebufferStatus(int target) {
+ return GLES20.glCheckFramebufferStatus(target);
+ }
+
+ @Override
+ public void compileShader(int shader) {
+ GLES20.glCompileShader(shader);
+ }
+
+ @Override
+ public int createProgram() {
+ return GLES20.glCreateProgram();
+ }
+
+ @Override
+ public int createShader(int type) {
+ return GLES20.glCreateShader(type);
+ }
+
+ @Override
+ public void deleteBuffers(int n, IntBuffer buffers) {
+ GLES20.glDeleteBuffers(n, buffers);
+ }
+
+ @Override
+ public void deleteFramebuffers(int n, IntBuffer framebuffers) {
+ GLES20.glDeleteFramebuffers(n, framebuffers);
+ }
+
+ @Override
+ public void deleteProgram(int program) {
+ GLES20.glDeleteProgram(program);
+ }
+
+ @Override
+ public void deleteRenderbuffers(int n, IntBuffer renderbuffers) {
+ GLES20.glDeleteRenderbuffers(n, renderbuffers);
+ }
+
+ @Override
+ public void deleteShader(int shader) {
+ GLES20.glDeleteShader(shader);
+ }
+
+ @Override
+ public void detachShader(int program, int shader) {
+ GLES20.glDetachShader(program, shader);
+ }
+
+ @Override
+ public void disableVertexAttribArray(int index) {
+ GLES20.glDisableVertexAttribArray(index);
+ }
+
+ @Override
+ public void drawElements(int mode, int count, int type, int offset) {
+ GLES20.glDrawElements(mode, count, type, offset);
+ }
+
+ @Override
+ public void enableVertexAttribArray(int index) {
+ GLES20.glEnableVertexAttribArray(index);
+ }
+
+ @Override
+ public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget,
+ int renderbuffer) {
+ GLES20.glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+ }
+
+ @Override
+ public void framebufferTexture2D(int target, int attachment, int textarget, int texture,
+ int level) {
+ GLES20.glFramebufferTexture2D(target, attachment, textarget, texture, level);
+ }
+
+ @Override
+ public void genBuffers(int n, IntBuffer buffers) {
+ GLES20.glGenBuffers(n, buffers);
+ }
+
+ @Override
+ public void generateMipmap(int target) {
+ GLES20.glGenerateMipmap(target);
+ }
+
+ @Override
+ public void genFramebuffers(int n, IntBuffer framebuffers) {
+ GLES20.glGenFramebuffers(n, framebuffers);
+ }
+
+ @Override
+ public void genRenderbuffers(int n, IntBuffer renderbuffers) {
+ GLES20.glGenRenderbuffers(n, renderbuffers);
+ }
+
+ @Override
+ public String getActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
+ return GLES20.glGetActiveAttrib(program, index, size, (IntBuffer) type);
+ }
+
+ @Override
+ public String getActiveUniform(int program, int index, IntBuffer size, Buffer type) {
+ //return GLES20.glGetActiveUniform(program, index, bufsize, length, size, type, name);
+ throw new UnsupportedOperationException("missing implementation");
+ }
+
+ @Override
+ public void getAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
+ throw new UnsupportedOperationException("missing implementation");
+ //GLES20.glGetAttachedShaders(program, maxcount, count, shaders);
+ }
+
+ @Override
+ public int getAttribLocation(int program, String name) {
+ return GLES20.glGetAttribLocation(program, name);
+ }
+
+ @Override
+ public void getBooleanv(int pname, Buffer params) {
+ throw new UnsupportedOperationException("missing implementation");
+ //GLES20.glGetBooleanv(pname, params);
+ }
+
+ @Override
+ public void getBufferParameteriv(int target, int pname, IntBuffer params) {
+ GLES20.glGetBufferParameteriv(target, pname, params);
+
+ }
+
+ @Override
+ public void getFloatv(int pname, FloatBuffer params) {
+ GLES20.glGetFloatv(pname, params);
+
+ }
+
+ @Override
+ public void getFramebufferAttachmentParameteriv(int target, int attachment, int pname,
+ IntBuffer params) {
+ GLES20.glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+ }
+
+ @Override
+ public void getProgramiv(int program, int pname, IntBuffer params) {
+ GLES20.glGetProgramiv(program, pname, params);
+
+ }
+
+ @Override
+ public String getProgramInfoLog(int program) {
+ return GLES20.glGetProgramInfoLog(program);
+ }
+
+ @Override
+ public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) {
+ GLES20.glGetRenderbufferParameteriv(target, pname, params);
+
+ }
+
+ @Override
+ public void getShaderiv(int shader, int pname, IntBuffer params) {
+ GLES20.glGetShaderiv(shader, pname, params);
+
+ }
+
+ @Override
+ public String getShaderInfoLog(int shader) {
+ return GLES20.glGetShaderInfoLog(shader);
+ }
+
+ @Override
+ public void getShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range,
+ IntBuffer precision) {
+ GLES20.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+ }
+
+ @Override
+ public void getShaderSource(int shader, int bufsize, Buffer length, String source) {
+ throw new UnsupportedOperationException("missing implementation");
+ }
+
+ @Override
+ public void getTexParameterfv(int target, int pname, FloatBuffer params) {
+ GLES20.glGetTexParameterfv(target, pname, params);
+
+ }
+
+ @Override
+ public void getTexParameteriv(int target, int pname, IntBuffer params) {
+ GLES20.glGetTexParameteriv(target, pname, params);
+
+ }
+
+ @Override
+ public void getUniformfv(int program, int location, FloatBuffer params) {
+ GLES20.glGetUniformfv(program, location, params);
+
+ }
+
+ @Override
+ public void getUniformiv(int program, int location, IntBuffer params) {
+ GLES20.glGetUniformiv(program, location, params);
+
+ }
+
+ @Override
+ public int getUniformLocation(int program, String name) {
+ return GLES20.glGetUniformLocation(program, name);
+ }
+
+ @Override
+ public void getVertexAttribfv(int index, int pname, FloatBuffer params) {
+ GLES20.glGetVertexAttribfv(index, pname, params);
+
+ }
+
+ @Override
+ public void getVertexAttribiv(int index, int pname, IntBuffer params) {
+ GLES20.glGetVertexAttribiv(index, pname, params);
+
+ }
+
+ @Override
+ public void getVertexAttribPointerv(int index, int pname, Buffer pointer) {
+ //GLES20.glGetVertexAttribPointerv(index, pname, pointer);
+ throw new UnsupportedOperationException("missing implementation");
+ }
+
+ @Override
+ public boolean isBuffer(int buffer) {
+ return GLES20.glIsBuffer(buffer);
+ }
+
+ @Override
+ public boolean isEnabled(int cap) {
+ return GLES20.glIsEnabled(cap);
+ }
+
+ @Override
+ public boolean isFramebuffer(int framebuffer) {
+ return GLES20.glIsFramebuffer(framebuffer);
+ }
+
+ @Override
+ public boolean isProgram(int program) {
+ return GLES20.glIsProgram(program);
+ }
+
+ @Override
+ public boolean isRenderbuffer(int renderbuffer) {
+ return GLES20.glIsRenderbuffer(renderbuffer);
+ }
+
+ @Override
+ public boolean isShader(int shader) {
+ return GLES20.glIsShader(shader);
+ }
+
+ @Override
+ public boolean isTexture(int texture) {
+ return GLES20.glIsTexture(texture);
+ }
+
+ @Override
+ public void linkProgram(int program) {
+ GLES20.glLinkProgram(program);
+
+ }
+
+ @Override
+ public void releaseShaderCompiler() {
+ GLES20.glReleaseShaderCompiler();
+
+ }
+
+ @Override
+ public void renderbufferStorage(int target, int internalformat, int width, int height) {
+ GLES20.glRenderbufferStorage(target, internalformat, width, height);
+
+ }
+
+ @Override
+ public void sampleCoverage(float value, boolean invert) {
+ GLES20.glSampleCoverage(value, invert);
+
+ }
+
+ @Override
+ public void shaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
+ GLES20.glShaderBinary(n, shaders, binaryformat, binary, length);
+
+ }
+
+ @Override
+ public void shaderSource(int shader, String string) {
+ GLES20.glShaderSource(shader, string);
+
+ }
+
+ @Override
+ public void stencilFuncSeparate(int face, int func, int ref, int mask) {
+ GLES20.glStencilFuncSeparate(face, func, ref, mask);
+
+ }
+
+ @Override
+ public void stencilMaskSeparate(int face, int mask) {
+ GLES20.glStencilMaskSeparate(face, mask);
+
+ }
+
+ @Override
+ public void stencilOpSeparate(int face, int fail, int zfail, int zpass) {
+ GLES20.glStencilOpSeparate(face, fail, zfail, zpass);
+
+ }
+
+ @Override
+ public void texParameterfv(int target, int pname, FloatBuffer params) {
+ GLES20.glTexParameterfv(target, pname, params);
+
+ }
+
+ @Override
+ public void texParameteri(int target, int pname, int param) {
+ GLES20.glTexParameteri(target, pname, param);
+
+ }
+
+ @Override
+ public void texParameteriv(int target, int pname, IntBuffer params) {
+ GLES20.glTexParameteriv(target, pname, params);
+
+ }
+
+ @Override
+ public void uniform1f(int location, float x) {
+ GLES20.glUniform1f(location, x);
+
+ }
+
+ @Override
+ public void uniform1fv(int location, int count, FloatBuffer v) {
+ GLES20.glUniform1fv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform1i(int location, int x) {
+ GLES20.glUniform1i(location, x);
+
+ }
+
+ @Override
+ public void uniform1iv(int location, int count, IntBuffer v) {
+ GLES20.glUniform1iv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform2f(int location, float x, float y) {
+ GLES20.glUniform2f(location, x, y);
+
+ }
+
+ @Override
+ public void uniform2fv(int location, int count, FloatBuffer v) {
+ GLES20.glUniform2fv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform2i(int location, int x, int y) {
+ GLES20.glUniform2i(location, x, y);
+
+ }
+
+ @Override
+ public void uniform2iv(int location, int count, IntBuffer v) {
+ GLES20.glUniform2iv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform3f(int location, float x, float y, float z) {
+ GLES20.glUniform3f(location, x, y, z);
+
+ }
+
+ @Override
+ public void uniform3fv(int location, int count, FloatBuffer v) {
+ GLES20.glUniform3fv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform3i(int location, int x, int y, int z) {
+ GLES20.glUniform3i(location, x, y, z);
+
+ }
+
+ @Override
+ public void uniform3iv(int location, int count, IntBuffer v) {
+ GLES20.glUniform3iv(location, count, v);
+
+ }
+
+ @Override
+ public void uniform4f(int location, float x, float y, float z, float w) {
+ GLES20.glUniform4f(location, x, y, z, w);
+ }
+
+ @Override
+ public void uniform4fv(int location, int count, FloatBuffer v) {
+ GLES20.glUniform4fv(location, count, v);
+ }
+
+ @Override
+ public void uniform4i(int location, int x, int y, int z, int w) {
+ GLES20.glUniform4i(location, x, y, z, w);
+
+ }
+
+ @Override
+ public void uniform4iv(int location, int count, IntBuffer v) {
+ GLES20.glUniform4iv(location, count, v);
+
+ }
+
+ @Override
+ public void uniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
+ GLES20.glUniformMatrix2fv(location, count, transpose, value);
+
+ }
+
+ @Override
+ public void uniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
+ GLES20.glUniformMatrix3fv(location, count, transpose, value);
+
+ }
+
+ @Override
+ public void uniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
+ GLES20.glUniformMatrix4fv(location, count, transpose, value);
+
+ }
+
+ @Override
+ public void useProgram(int program) {
+ GLES20.glUseProgram(program);
+
+ }
+
+ @Override
+ public void validateProgram(int program) {
+ GLES20.glValidateProgram(program);
+
+ }
+
+ @Override
+ public void vertexAttrib1f(int indx, float x) {
+ GLES20.glVertexAttrib1f(indx, x);
+
+ }
+
+ @Override
+ public void vertexAttrib1fv(int indx, FloatBuffer values) {
+ GLES20.glVertexAttrib1fv(indx, values);
+
+ }
+
+ @Override
+ public void vertexAttrib2f(int indx, float x, float y) {
+ GLES20.glVertexAttrib2f(indx, x, y);
+
+ }
+
+ @Override
+ public void vertexAttrib2fv(int indx, FloatBuffer values) {
+ GLES20.glVertexAttrib2fv(indx, values);
+
+ }
+
+ @Override
+ public void vertexAttrib3f(int indx, float x, float y, float z) {
+ GLES20.glVertexAttrib3f(indx, x, y, z);
+
+ }
+
+ @Override
+ public void vertexAttrib3fv(int indx, FloatBuffer values) {
+ GLES20.glVertexAttrib3fv(indx, values);
+
+ }
+
+ @Override
+ public void vertexAttrib4f(int indx, float x, float y, float z, float w) {
+ GLES20.glVertexAttrib4f(indx, x, y, z, w);
+
+ }
+
+ @Override
+ public void vertexAttrib4fv(int indx, FloatBuffer values) {
+ GLES20.glVertexAttrib4fv(indx, values);
+
+ }
+
+ @Override
+ public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
+ Buffer ptr) {
+ GLES20.glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
+ }
+
+ @Override
+ public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
+ int offset) {
+ // FIXME check implementation!
+ GLES20.glVertexAttribPointer(indx, size, type, normalized, stride, offset);
+ //throw new UnsupportedOperationException("missing implementation");
+ }
+
+ @Override
+ public void activeTexture(int texture) {
+ GLES20.glActiveTexture(texture);
+
+ }
+
+ @Override
+ public void bindTexture(int target, int texture) {
+ GLES20.glBindTexture(target, texture);
+
+ }
+
+ @Override
+ public void blendFunc(int sfactor, int dfactor) {
+ GLES20.glBlendFunc(sfactor, dfactor);
+
+ }
+
+ @Override
+ public void clear(int mask) {
+ GLES20.glClear(mask);
+
+ }
+
+ @Override
+ public void clearColor(float red, float green, float blue, float alpha) {
+ GLES20.glClearColor(red, green, blue, alpha);
+
+ }
+
+ @Override
+ public void clearDepthf(float depth) {
+ GLES20.glClearDepthf(depth);
+
+ }
+
+ @Override
+ public void clearStencil(int s) {
+ GLES20.glClearStencil(s);
+
+ }
+
+ @Override
+ public void colorMask(boolean red, boolean green, boolean blue, boolean alpha) {
+ GLES20.glColorMask(red, green, blue, alpha);
+
+ }
+
+ @Override
+ public void compressedTexImage2D(int target, int level, int internalformat, int width,
+ int height, int border, int imageSize, Buffer data) {
+ throw new UnsupportedOperationException("missing implementation");
+
+ }
+
+ @Override
+ public void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset,
+ int width, int height, int format, int imageSize, Buffer data) {
+ throw new UnsupportedOperationException("missing implementation");
+
+ }
+
+ @Override
+ public void copyTexImage2D(int target, int level, int internalformat, int x, int y,
+ int width, int height, int border) {
+ GLES20.glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+ }
+
+ @Override
+ public void copyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
+ int width, int height) {
+ GLES20.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+ }
+
+ @Override
+ public void cullFace(int mode) {
+ GLES20.glCullFace(mode);
+
+ }
+
+ @Override
+ public void deleteTextures(int n, IntBuffer textures) {
+ GLES20.glDeleteTextures(n, textures);
+
+ }
+
+ @Override
+ public void depthFunc(int func) {
+ GLES20.glDepthFunc(func);
+
+ }
+
+ @Override
+ public void depthMask(boolean flag) {
+ GLES20.glDepthMask(flag);
+
+ }
+
+ @Override
+ public void depthRangef(float zNear, float zFar) {
+ GLES20.glDepthRangef(zNear, zFar);
+
+ }
+
+ @Override
+ public void disable(int cap) {
+ GLES20.glDisable(cap);
+
+ }
+
+ @Override
+ public void drawArrays(int mode, int first, int count) {
+ GLES20.glDrawArrays(mode, first, count);
+
+ }
+
+ @Override
+ public void drawElements(int mode, int count, int type, Buffer indices) {
+ GLES20.glDrawElements(mode, count, type, indices);
+
+ }
+
+ @Override
+ public void enable(int cap) {
+ GLES20.glEnable(cap);
+
+ }
+
+ @Override
+ public void finish() {
+ GLES20.glFinish();
+
+ }
+
+ @Override
+ public void flush() {
+ GLES20.glFlush();
+
+ }
+
+ @Override
+ public void frontFace(int mode) {
+ GLES20.glFrontFace(mode);
+
+ }
+
+ @Override
+ public void genTextures(int n, IntBuffer textures) {
+ GLES20.glGenTextures(n, textures);
+
+ }
+
+ @Override
+ public int getError() {
+ return GLES20.glGetError();
+ }
+
+ @Override
+ public void getIntegerv(int pname, IntBuffer params) {
+ GLES20.glGetIntegerv(pname, params);
+
+ }
+
+ @Override
+ public String getString(int name) {
+ return GLES20.glGetString(name);
+ }
+
+ @Override
+ public void hint(int target, int mode) {
+ GLES20.glHint(target, mode);
+ }
+
+ @Override
+ public void lineWidth(float width) {
+ GLES20.glLineWidth(width);
+
+ }
+
+ @Override
+ public void pixelStorei(int pname, int param) {
+ GLES20.glPixelStorei(pname, param);
+
+ }
+
+ @Override
+ public void polygonOffset(float factor, float units) {
+ GLES20.glPolygonOffset(factor, units);
+
+ }
+
+ @Override
+ public void readPixels(int x, int y, int width, int height, int format, int type,
+ Buffer pixels) {
+ GLES20.glReadPixels(x, y, width, height, format, type, pixels);
+ }
+
+ @Override
+ public void scissor(int x, int y, int width, int height) {
+ GLES20.glScissor(x, y, width, height);
+ }
+
+ @Override
+ public void stencilFunc(int func, int ref, int mask) {
+ GLES20.glStencilFunc(func, ref, mask);
+ }
+
+ @Override
+ public void stencilMask(int mask) {
+ GLES20.glStencilMask(mask);
+ }
+
+ @Override
+ public void stencilOp(int fail, int zfail, int zpass) {
+ GLES20.glStencilOp(fail, zfail, zpass);
+ }
+
+ @Override
+ public void texImage2D(int target, int level, int internalformat, int width, int height,
+ int border, int format, int type, Buffer pixels) {
+ GLES20.glTexImage2D(target, level, internalformat, width, height, border, format, type,
+ pixels);
+ }
+
+ @Override
+ public void texParameterf(int target, int pname, float param) {
+ GLES20.glTexParameterf(target, pname, param);
+ }
+
+ @Override
+ public void texSubImage2D(int target, int level, int xoffset, int yoffset, int width,
+ int height, int format, int type, Buffer pixels) {
+ GLES20
+ .glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+
+ }
+
+ @Override
+ public void viewport(int x, int y, int width, int height) {
+ GLES20.glViewport(x, y, width, height);
+ }
+
+}
diff --git a/vtm-android-gdx/src/org/oscim/gdx/MainActivity.java b/vtm-android-gdx/src/org/oscim/gdx/MainActivity.java
index 40ae07c0..8ec109d3 100644
--- a/vtm-android-gdx/src/org/oscim/gdx/MainActivity.java
+++ b/vtm-android-gdx/src/org/oscim/gdx/MainActivity.java
@@ -17,7 +17,6 @@
package org.oscim.gdx;
import org.oscim.android.canvas.AndroidGraphics;
-import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile;
import org.oscim.tiling.TileSource;
@@ -27,21 +26,17 @@ import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-import com.badlogic.gdx.backends.android.AndroidGL20;
import com.badlogic.gdx.utils.SharedLibraryLoader;
public class MainActivity extends AndroidApplication {
- private final class AndroidGLAdapter extends AndroidGL20 implements GL20 {
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndroidGraphics.init();
GdxAssets.init("");
- GLAdapter.init(new AndroidGLAdapter());
+ GLAdapter.init(new AndroidGL());
Tile.SIZE = 400;
AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
diff --git a/vtm-ext-libs b/vtm-ext-libs
index 8959fe9f..194dac64 160000
--- a/vtm-ext-libs
+++ b/vtm-ext-libs
@@ -1 +1 @@
-Subproject commit 8959fe9f2517d919a17258a062a8b499d224491c
+Subproject commit 194dac648666d3e6aac3fd8fbee05684718fa156