android: implement GLAdapter

- remove the Gdx implementation
This commit is contained in:
Hannes Janetzek
2013-07-26 02:32:23 +02:00
parent 136db862d2
commit 7ca6ae05b4
3 changed files with 123 additions and 616 deletions

View File

@@ -16,6 +16,7 @@
package org.oscim.android;
import org.oscim.android.canvas.AndroidGraphics;
import org.oscim.android.gl.AndroidGL;
import org.oscim.android.input.AndroidMotionEvent;
import org.oscim.backend.AssetAdapter;
import org.oscim.backend.CanvasAdapter;
@@ -29,8 +30,6 @@ import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.widget.RelativeLayout;
import com.badlogic.gdx.backends.android.AndroidGL20;
/**
* A MapView shows a map on the display of the device. It handles all user input
* and touch gestures to move and zoom the map.
@@ -63,7 +62,7 @@ public class AndroidMapView extends RelativeLayout {
//System.loadLibrary("tessellate");
CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.g = new AndroidGL20();
GLAdapter.g = new AndroidGL();
Log.logger = new AndroidLog();
}

View File

@@ -22,7 +22,8 @@ import org.oscim.backend.GL20;
import android.opengl.GLES20;
public class AndroidGL implements GL20{
public class AndroidGL implements GL20 {
@Override
public void glAttachShader(int program, int shader) {
@@ -178,676 +179,651 @@ public class AndroidGL implements GL20{
@Override
public String glGetActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
return GLES20.glGetActiveAttrib(program, index, size, (IntBuffer)type);
return GLES20.glGetActiveAttrib(program, index, size, (IntBuffer) type);
}
@Override
public String glGetActiveUniform(int program, int index, IntBuffer size, Buffer type) {
// TODO Auto-generated method stub
return null;
//return GLES20.glGetActiveUniform(program, index, bufsize, length, size, type, name);
throw new UnsupportedOperationException("missing implementation");
}
@Override
public void glGetAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("missing implementation");
//GLES20.glGetAttachedShaders(program, maxcount, count, shaders);
}
@Override
public int glGetAttribLocation(int program, String name) {
// TODO Auto-generated method stub
return 0;
return GLES20.glGetAttribLocation(program, name);
}
@Override
public void glGetBooleanv(int pname, Buffer params) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("missing implementation");
//GLES20.glGetBooleanv(pname, params);
}
@Override
public void glGetBufferParameteriv(int target, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetBufferParameteriv(target, pname, params);
}
@Override
public void glGetFloatv(int pname, FloatBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetFloatv(pname, params);
}
@Override
public void glGetFramebufferAttachmentParameteriv(int target, int attachment, int pname,
IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
}
@Override
public void glGetProgramiv(int program, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetProgramiv(program, pname, params);
}
@Override
public String glGetProgramInfoLog(int program) {
// TODO Auto-generated method stub
return null;
return GLES20.glGetProgramInfoLog(program);
}
@Override
public void glGetRenderbufferParameteriv(int target, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetRenderbufferParameteriv(target, pname, params);
}
@Override
public void glGetShaderiv(int shader, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetShaderiv(shader, pname, params);
}
@Override
public String glGetShaderInfoLog(int shader) {
// TODO Auto-generated method stub
return null;
return GLES20.glGetShaderInfoLog(shader);
}
@Override
public void glGetShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range,
IntBuffer precision) {
// TODO Auto-generated method stub
GLES20.glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
}
@Override
public void glGetShaderSource(int shader, int bufsize, Buffer length, String source) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("missing implementation");
}
@Override
public void glGetTexParameterfv(int target, int pname, FloatBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetTexParameterfv(target, pname, params);
}
@Override
public void glGetTexParameteriv(int target, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetTexParameteriv(target, pname, params);
}
@Override
public void glGetUniformfv(int program, int location, FloatBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetUniformfv(program, location, params);
}
@Override
public void glGetUniformiv(int program, int location, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetUniformiv(program, location, params);
}
@Override
public int glGetUniformLocation(int program, String name) {
// TODO Auto-generated method stub
return 0;
return GLES20.glGetUniformLocation(program, name);
}
@Override
public void glGetVertexAttribfv(int index, int pname, FloatBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetVertexAttribfv(index, pname, params);
}
@Override
public void glGetVertexAttribiv(int index, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetVertexAttribiv(index, pname, params);
}
@Override
public void glGetVertexAttribPointerv(int index, int pname, Buffer pointer) {
// TODO Auto-generated method stub
//GLES20.glGetVertexAttribPointerv(index, pname, pointer);
throw new UnsupportedOperationException("missing implementation");
}
@Override
public boolean glIsBuffer(int buffer) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsBuffer(buffer);
}
@Override
public boolean glIsEnabled(int cap) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsEnabled(cap);
}
@Override
public boolean glIsFramebuffer(int framebuffer) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsFramebuffer(framebuffer);
}
@Override
public boolean glIsProgram(int program) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsProgram(program);
}
@Override
public boolean glIsRenderbuffer(int renderbuffer) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsRenderbuffer(renderbuffer);
}
@Override
public boolean glIsShader(int shader) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsShader(shader);
}
@Override
public boolean glIsTexture(int texture) {
// TODO Auto-generated method stub
return false;
return GLES20.glIsTexture(texture);
}
@Override
public void glLinkProgram(int program) {
// TODO Auto-generated method stub
GLES20.glLinkProgram(program);
}
@Override
public void glReleaseShaderCompiler() {
// TODO Auto-generated method stub
GLES20.glReleaseShaderCompiler();
}
@Override
public void glRenderbufferStorage(int target, int internalformat, int width, int height) {
// TODO Auto-generated method stub
GLES20.glRenderbufferStorage(target, internalformat, width, height);
}
@Override
public void glSampleCoverage(float value, boolean invert) {
// TODO Auto-generated method stub
GLES20.glSampleCoverage(value, invert);
}
@Override
public void glShaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
// TODO Auto-generated method stub
GLES20.glShaderBinary(n, shaders, binaryformat, binary, length);
}
@Override
public void glShaderSource(int shader, String string) {
// TODO Auto-generated method stub
GLES20.glShaderSource(shader, string);
}
@Override
public void glStencilFuncSeparate(int face, int func, int ref, int mask) {
// TODO Auto-generated method stub
GLES20.glStencilFuncSeparate(face, func, ref, mask);
}
@Override
public void glStencilMaskSeparate(int face, int mask) {
// TODO Auto-generated method stub
GLES20.glStencilMaskSeparate(face, mask);
}
@Override
public void glStencilOpSeparate(int face, int fail, int zfail, int zpass) {
// TODO Auto-generated method stub
GLES20.glStencilOpSeparate(face, fail, zfail, zpass);
}
@Override
public void glTexParameterfv(int target, int pname, FloatBuffer params) {
// TODO Auto-generated method stub
GLES20.glTexParameterfv(target, pname, params);
}
@Override
public void glTexParameteri(int target, int pname, int param) {
// TODO Auto-generated method stub
GLES20.glTexParameteri(target, pname, param);
}
@Override
public void glTexParameteriv(int target, int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glTexParameteriv(target, pname, params);
}
@Override
public void glUniform1f(int location, float x) {
// TODO Auto-generated method stub
GLES20.glUniform1f(location, x);
}
@Override
public void glUniform1fv(int location, int count, FloatBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform1fv(location, count, v);
}
@Override
public void glUniform1i(int location, int x) {
// TODO Auto-generated method stub
GLES20.glUniform1i(location, x);
}
@Override
public void glUniform1iv(int location, int count, IntBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform1iv(location, count, v);
}
@Override
public void glUniform2f(int location, float x, float y) {
// TODO Auto-generated method stub
GLES20.glUniform2f(location, x, y);
}
@Override
public void glUniform2fv(int location, int count, FloatBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform2fv(location, count, v);
}
@Override
public void glUniform2i(int location, int x, int y) {
// TODO Auto-generated method stub
GLES20.glUniform2i(location, x, y);
}
@Override
public void glUniform2iv(int location, int count, IntBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform2iv(location, count, v);
}
@Override
public void glUniform3f(int location, float x, float y, float z) {
// TODO Auto-generated method stub
GLES20.glUniform3f(location, x, y, z);
}
@Override
public void glUniform3fv(int location, int count, FloatBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform3fv(location, count, v);
}
@Override
public void glUniform3i(int location, int x, int y, int z) {
// TODO Auto-generated method stub
GLES20.glUniform3i(location, x, y, z);
}
@Override
public void glUniform3iv(int location, int count, IntBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform3iv(location, count, v);
}
@Override
public void glUniform4f(int location, float x, float y, float z, float w) {
// TODO Auto-generated method stub
GLES20.glUniform4f(location, x, y, z, w);
}
@Override
public void glUniform4fv(int location, int count, FloatBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform4fv(location, count, v);
}
@Override
public void glUniform4i(int location, int x, int y, int z, int w) {
// TODO Auto-generated method stub
GLES20.glUniform4i(location, x, y, z, w);
}
@Override
public void glUniform4iv(int location, int count, IntBuffer v) {
// TODO Auto-generated method stub
GLES20.glUniform4iv(location, count, v);
}
@Override
public void glUniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
// TODO Auto-generated method stub
GLES20.glUniformMatrix2fv(location, count, transpose, value);
}
@Override
public void glUniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
// TODO Auto-generated method stub
GLES20.glUniformMatrix3fv(location, count, transpose, value);
}
@Override
public void glUniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
// TODO Auto-generated method stub
GLES20.glUniformMatrix4fv(location, count, transpose, value);
}
@Override
public void glUseProgram(int program) {
// TODO Auto-generated method stub
GLES20.glUseProgram(program);
}
@Override
public void glValidateProgram(int program) {
// TODO Auto-generated method stub
GLES20.glValidateProgram(program);
}
@Override
public void glVertexAttrib1f(int indx, float x) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib1f(indx, x);
}
@Override
public void glVertexAttrib1fv(int indx, FloatBuffer values) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib1fv(indx, values);
}
@Override
public void glVertexAttrib2f(int indx, float x, float y) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib2f(indx, x, y);
}
@Override
public void glVertexAttrib2fv(int indx, FloatBuffer values) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib2fv(indx, values);
}
@Override
public void glVertexAttrib3f(int indx, float x, float y, float z) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib3f(indx, x, y, z);
}
@Override
public void glVertexAttrib3fv(int indx, FloatBuffer values) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib3fv(indx, values);
}
@Override
public void glVertexAttrib4f(int indx, float x, float y, float z, float w) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib4f(indx, x, y, z, w);
}
@Override
public void glVertexAttrib4fv(int indx, FloatBuffer values) {
// TODO Auto-generated method stub
GLES20.glVertexAttrib4fv(indx, values);
}
@Override
public void glVertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
Buffer ptr) {
// TODO Auto-generated method stub
GLES20.glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
}
@Override
public void glVertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
int ptr) {
// TODO Auto-generated method stub
int offset) {
// FIXME check implementation!
GLES20.glVertexAttribPointer(indx, size, type, normalized, stride, offset);
//throw new UnsupportedOperationException("missing implementation");
}
@Override
public void glActiveTexture(int texture) {
// TODO Auto-generated method stub
GLES20.glActiveTexture(texture);
}
@Override
public void glBindTexture(int target, int texture) {
// TODO Auto-generated method stub
GLES20.glBindTexture(target, texture);
}
@Override
public void glBlendFunc(int sfactor, int dfactor) {
// TODO Auto-generated method stub
GLES20.glBlendFunc(sfactor, dfactor);
}
@Override
public void glClear(int mask) {
// TODO Auto-generated method stub
GLES20.glClear(mask);
}
@Override
public void glClearColor(float red, float green, float blue, float alpha) {
// TODO Auto-generated method stub
GLES20.glClearColor(red, green, blue, alpha);
}
@Override
public void glClearDepthf(float depth) {
// TODO Auto-generated method stub
GLES20.glClearDepthf(depth);
}
@Override
public void glClearStencil(int s) {
// TODO Auto-generated method stub
GLES20.glClearStencil(s);
}
@Override
public void glColorMask(boolean red, boolean green, boolean blue, boolean alpha) {
// TODO Auto-generated method stub
GLES20.glColorMask(red, green, blue, alpha);
}
@Override
public void glCompressedTexImage2D(int target, int level, int internalformat, int width,
int height, int border, int imageSize, Buffer data) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("missing implementation");
}
@Override
public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset,
int width, int height, int format, int imageSize, Buffer data) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("missing implementation");
}
@Override
public void glCopyTexImage2D(int target, int level, int internalformat, int x, int y,
int width, int height, int border) {
// TODO Auto-generated method stub
GLES20.glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
}
@Override
public void glCopyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
int width, int height) {
// TODO Auto-generated method stub
GLES20.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
}
@Override
public void glCullFace(int mode) {
// TODO Auto-generated method stub
GLES20.glCullFace(mode);
}
@Override
public void glDeleteTextures(int n, IntBuffer textures) {
// TODO Auto-generated method stub
GLES20.glDeleteTextures(n, textures);
}
@Override
public void glDepthFunc(int func) {
// TODO Auto-generated method stub
GLES20.glDepthFunc(func);
}
@Override
public void glDepthMask(boolean flag) {
// TODO Auto-generated method stub
GLES20.glDepthMask(flag);
}
@Override
public void glDepthRangef(float zNear, float zFar) {
// TODO Auto-generated method stub
GLES20.glDepthRangef(zNear, zFar);
}
@Override
public void glDisable(int cap) {
// TODO Auto-generated method stub
GLES20.glDisable(cap);
}
@Override
public void glDrawArrays(int mode, int first, int count) {
// TODO Auto-generated method stub
GLES20.glDrawArrays(mode, first, count);
}
@Override
public void glDrawElements(int mode, int count, int type, Buffer indices) {
// TODO Auto-generated method stub
GLES20.glDrawElements(mode, count, type, indices);
}
@Override
public void glEnable(int cap) {
// TODO Auto-generated method stub
GLES20.glEnable(cap);
}
@Override
public void glFinish() {
// TODO Auto-generated method stub
GLES20.glFinish();
}
@Override
public void glFlush() {
// TODO Auto-generated method stub
GLES20.glFlush();
}
@Override
public void glFrontFace(int mode) {
// TODO Auto-generated method stub
GLES20.glFrontFace(mode);
}
@Override
public void glGenTextures(int n, IntBuffer textures) {
// TODO Auto-generated method stub
GLES20.glGenTextures(n, textures);
}
@Override
public int glGetError() {
// TODO Auto-generated method stub
return 0;
return GLES20.glGetError();
}
@Override
public void glGetIntegerv(int pname, IntBuffer params) {
// TODO Auto-generated method stub
GLES20.glGetIntegerv(pname, params);
}
@Override
public String glGetString(int name) {
// TODO Auto-generated method stub
return null;
return GLES20.glGetString(name);
}
@Override
public void glHint(int target, int mode) {
// TODO Auto-generated method stub
GLES20.glHint(target, mode);
}
@Override
public void glLineWidth(float width) {
// TODO Auto-generated method stub
GLES20.glLineWidth(width);
}
@Override
public void glPixelStorei(int pname, int param) {
// TODO Auto-generated method stub
GLES20.glPixelStorei(pname, param);
}
@Override
public void glPolygonOffset(float factor, float units) {
// TODO Auto-generated method stub
GLES20.glPolygonOffset(factor, units);
}
@Override
public void glReadPixels(int x, int y, int width, int height, int format, int type,
Buffer pixels) {
// TODO Auto-generated method stub
GLES20.glReadPixels(x, y, width, height, format, type, pixels);
}
@Override
public void glScissor(int x, int y, int width, int height) {
// TODO Auto-generated method stub
GLES20.glScissor(x, y, width, height);
}
@Override
public void glStencilFunc(int func, int ref, int mask) {
// TODO Auto-generated method stub
GLES20.glStencilFunc(func, ref, mask);
}
@Override
public void glStencilMask(int mask) {
// TODO Auto-generated method stub
GLES20.glStencilMask(mask);
}
@Override
public void glStencilOp(int fail, int zfail, int zpass) {
// TODO Auto-generated method stub
GLES20.glStencilOp(fail, zfail, zpass);
}
@Override
public void glTexImage2D(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);
GLES20.glTexImage2D(target, level, internalformat, width, height, border, format, type,
pixels);
}
@Override