[fixed] GLCommon is now implemented. Nice.

diff --git a/gdx/src/com/badlogic/gdx/graphics/GL10.java b/gdx/src/com/badlogic/gdx/graphics/GL10.java
index 783f86b..b7bfb80 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/GL10.java
+++ b/gdx/src/com/badlogic/gdx/graphics/GL10.java
@@ -268,77 +268,31 @@ public interface GL10 extends GLCommon
        public static final int GL_POINT = 0x1B00;\r
        public static final int GL_LINE = 0x1B01;\r
        public static final int GL_FILL = 0x1B02;\r
-       \r
-       public void glActiveTexture ( int texture );\r
 \r
        public void glAlphaFunc ( int func, float ref );\r
 \r
        public void glAlphaFuncx ( int func, int ref );\r
 \r
-       public void glBindTexture ( int target, int texture );\r
-\r
-       public void glBlendFunc ( int sfactor, int dfactor );\r
-\r
-       public void glClear ( int mask );\r
-\r
-       public void glClearColor ( float red, float green, float blue, float alpha );\r
-\r
        public void glClearColorx ( int red, int green, int blue, int alpha );\r
 \r
-       public void glClearDepthf ( float depth );\r
-\r
        public void glClearDepthx ( int depth );\r
 \r
-       public void glClearStencil ( int s );\r
-\r
        public void glClientActiveTexture ( int texture );\r
 \r
        public void glColor4f ( float red, float green, float blue, float alpha );\r
 \r
        public void glColor4x ( int red, int green, int blue, int alpha );\r
 \r
-       public void glColorMask ( boolean red, boolean green, boolean blue, boolean alpha );\r
-\r
        public void glColorPointer ( int size, int type, int stride, Buffer pointer );\r
 \r
-       public void glCompressedTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data );\r
-\r
-       public void glCompressedTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data );\r
-\r
-       public void glCopyTexImage2D ( int target, int level, int internalformat, int x, int y, int width, int height, int border );\r
-\r
-       public void glCopyTexSubImage2D ( int target, int level, int xoffset, int yoffset, int x, int y, int width, int height );\r
-\r
-       public void glCullFace ( int mode );\r
-\r
        public void glDeleteTextures( int n, int[] textures, int offset );\r
-       \r
-       public void glDeleteTextures ( int n, IntBuffer textures );\r
-\r
-       public void glDepthFunc ( int func );\r
-\r
-       public void glDepthMask ( boolean flag );\r
-\r
-       public void glDepthRangef ( float zNear, float zFar );\r
 \r
        public void glDepthRangex ( int zNear, int zFar );\r
 \r
-       public void glDisable ( int cap );\r
-\r
        public void glDisableClientState ( int array );\r
 \r
-       public void glDrawArrays ( int mode, int first, int count );\r
-\r
-       public void glDrawElements ( int mode, int count, int type, Buffer indices );\r
-\r
-       public void glEnable ( int cap );\r
-\r
        public void glEnableClientState ( int array );\r
 \r
-       public void glFinish (  );\r
-\r
-       public void glFlush (  );\r
-\r
        public void glFogf ( int pname, float param );\r
 \r
        public void glFogfv ( int pname, float[] params, int offset );\r
@@ -351,25 +305,13 @@ public interface GL10 extends GLCommon
        \r
        public void glFogxv ( int pname, IntBuffer params );\r
 \r
-       public void glFrontFace ( int mode );\r
-\r
        public void glFrustumf ( float left, float right, float bottom, float top, float zNear, float zFar );\r
 \r
        public void glFrustumx ( int left, int right, int bottom, int top, int zNear, int zFar );\r
 \r
        public void glGenTextures ( int n, int[] textures, int offset );\r
-       \r
-       public void glGenTextures ( int n, IntBuffer textures );\r
-\r
-       public int glGetError (  );\r
 \r
        public void glGetIntegerv ( int pname, int[] params, int offset );\r
-       \r
-       public void glGetIntegerv ( int pname, IntBuffer params );\r
-\r
-       public String glGetString ( int name );\r
-\r
-       public void glHint ( int target, int mode );\r
 \r
        public void glLightModelf ( int pname, float param );\r
 \r
@@ -395,8 +337,6 @@ public interface GL10 extends GLCommon
        \r
        public void glLightxv ( int light, int pname, IntBuffer params );\r
 \r
-       public void glLineWidth ( float width );\r
-\r
        public void glLineWidthx ( int width );\r
 \r
        public void glLoadIdentity (  );\r
@@ -447,22 +387,16 @@ public interface GL10 extends GLCommon
 \r
        public void glOrthox ( int left, int right, int bottom, int top, int zNear, int zFar );\r
 \r
-       public void glPixelStorei ( int pname, int param );\r
-\r
        public void glPointSize ( float size );\r
 \r
        public void glPointSizex ( int size );\r
 \r
-       public void glPolygonOffset ( float factor, float units );\r
-\r
        public void glPolygonOffsetx ( int factor, int units );\r
 \r
        public void glPopMatrix (  );\r
 \r
        public void glPushMatrix (  );\r
 \r
-       public void glReadPixels ( int x, int y, int width, int height, int format, int type, Buffer pixels );\r
-\r
        public void glRotatef ( float angle, float x, float y, float z );\r
 \r
        public void glRotatex ( int angle, int x, int y, int z );\r
@@ -475,16 +409,8 @@ public interface GL10 extends GLCommon
 \r
        public void glScalex ( int x, int y, int z );\r
 \r
-       public void glScissor ( int x, int y, int width, int height );\r
-\r
        public void glShadeModel ( int mode );\r
 \r
-       public void glStencilFunc ( int func, int ref, int mask );\r
-\r
-       public void glStencilMask ( int mask );\r
-\r
-       public void glStencilOp ( int fail, int zfail, int zpass );\r
-\r
        public void glTexCoordPointer ( int size, int type, int stride, Buffer pointer );\r
 \r
        public void glTexEnvf ( int target, int pname, float param );\r
@@ -499,21 +425,13 @@ public interface GL10 extends GLCommon
        \r
        public void glTexEnvxv ( int target, int pname, IntBuffer params );\r
 \r
-       public void glTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels );\r
-\r
-       public void glTexParameterf ( int target, int pname, float param );\r
-\r
        public void glTexParameterx ( int target, int pname, int param );\r
 \r
-       public void glTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels );\r
-\r
        public void glTranslatef ( float x, float y, float z );\r
 \r
        public void glTranslatex ( int x, int y, int z );\r
 \r
        public void glVertexPointer ( int size, int type, int stride, Buffer pointer );\r
 \r
-       public void glViewport ( int x, int y, int width, int height );\r
-\r
        public void glPolygonMode( int face, int mode );\r
 }\r

diff --git a/gdx/src/com/badlogic/gdx/graphics/GL20.java b/gdx/src/com/badlogic/gdx/graphics/GL20.java
index 226fc44..48db205 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/GL20.java
+++ b/gdx/src/com/badlogic/gdx/graphics/GL20.java
@@ -329,8 +329,6 @@ public interface GL20 extends GLCommon
        public static final int GL_MAX_RENDERBUFFER_SIZE = 0x84E8;\r
        public static final int GL_INVALID_FRAMEBUFFER_OPERATION = 0x0506;\r
 \r
-       public void glActiveTexture ( int texture );\r
-\r
        public void glAttachShader ( int program, int shader );\r
 \r
        public void glBindAttribLocation ( int program, int index, String name );\r
@@ -341,16 +339,12 @@ public interface GL20 extends GLCommon
 \r
        public void glBindRenderbuffer ( int target, int renderbuffer );\r
 \r
-       public void glBindTexture ( int target, int texture );\r
-\r
        public void glBlendColor ( float red, float green, float blue, float alpha );\r
 \r
        public void glBlendEquation (  int mode  );\r
 \r
        public void glBlendEquationSeparate ( int modeRGB, int modeAlpha );\r
 \r
-       public void glBlendFunc ( int sfactor, int dfactor );\r
-\r
        public void glBlendFuncSeparate ( int srcRGB, int dstRGB, int srcAlpha, int dstAlpha );\r
 \r
        public void glBufferData ( int target, int size, Buffer data, int usage );\r
@@ -359,32 +353,12 @@ public interface GL20 extends GLCommon
 \r
        public int glCheckFramebufferStatus ( int target );\r
 \r
-       public void glClear ( int mask );\r
-\r
-       public void glClearColor ( float red, float green, float blue, float alpha );\r
-\r
-       public void glClearDepthf ( float depth );\r
-\r
-       public void glClearStencil ( int s );\r
-\r
-       public void glColorMask ( boolean red, boolean green, boolean blue, boolean alpha );\r
-\r
        public void glCompileShader ( int shader );\r
 \r
-       public void glCompressedTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data );\r
-\r
-       public void glCompressedTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data );\r
-\r
-       public void glCopyTexImage2D ( int target, int level, int internalformat, int x, int y, int width, int height, int border );\r
-\r
-       public void glCopyTexSubImage2D ( int target, int level, int xoffset, int yoffset, int x, int y, int width, int height );\r
-\r
        public int glCreateProgram (  );\r
 \r
        public int glCreateShader ( int type );\r
 \r
-       public void glCullFace ( int mode );\r
-\r
        public void glDeleteBuffers ( int n, IntBuffer buffers );\r
 \r
        public void glDeleteFramebuffers ( int n, IntBuffer framebuffers );\r
@@ -395,40 +369,18 @@ public interface GL20 extends GLCommon
 \r
        public void glDeleteShader ( int shader );\r
 \r
-       public void glDeleteTextures ( int n, IntBuffer textures );\r
-\r
-       public void glDepthFunc ( int func );\r
-\r
-       public void glDepthMask ( boolean flag );\r
-\r
-       public void glDepthRangef ( float zNear, float zFar );\r
-\r
        public void glDetachShader ( int program, int shader );\r
 \r
-       public void glDisable ( int cap );\r
-\r
        public void glDisableVertexAttribArray ( int index );\r
-\r
-       public void glDrawArrays ( int mode, int first, int count );\r
-\r
-       public void glDrawElements ( int mode, int count, int type, Buffer indices );\r
        \r
        public void glDrawElements ( int mode, int count, int type, int indices );\r
 \r
-       public void glEnable ( int cap );\r
-\r
        public void glEnableVertexAttribArray ( int index );\r
 \r
-       public void glFinish (  );\r
-\r
-       public void glFlush (  );\r
-\r
        public void glFramebufferRenderbuffer ( int target, int attachment, int renderbuffertarget, int renderbuffer );\r
 \r
        public void glFramebufferTexture2D ( int target, int attachment, int textarget, int texture, int level );\r
 \r
-       public void glFrontFace ( int mode );\r
-\r
        public void glGenBuffers ( int n, IntBuffer buffers );\r
 \r
        public void glGenerateMipmap ( int target );\r
@@ -437,8 +389,6 @@ public interface GL20 extends GLCommon
 \r
        public void glGenRenderbuffers ( int n, IntBuffer renderbuffers );\r
 \r
-       public void glGenTextures ( int n, IntBuffer textures );\r
-\r
        // deviates\r
        public String glGetActiveAttrib ( int program, int index, IntBuffer size, Buffer type );\r
 \r
@@ -453,14 +403,10 @@ public interface GL20 extends GLCommon
 \r
        public void glGetBufferParameteriv ( int target, int pname, IntBuffer params );\r
 \r
-       public int glGetError (  );\r
-\r
        public void glGetFloatv ( int pname, FloatBuffer params );\r
 \r
        public void glGetFramebufferAttachmentParameteriv ( int target, int attachment, int pname, IntBuffer params );\r
 \r
-       public void glGetIntegerv ( int pname, IntBuffer params );\r
-\r
        public void glGetProgramiv ( int program, int pname, IntBuffer params );\r
 \r
        // deviates\r
@@ -477,8 +423,6 @@ public interface GL20 extends GLCommon
 \r
        public void glGetShaderSource ( int shader, int bufsize, Buffer length, String source );\r
 \r
-       public String glGetString ( int name );\r
-\r
        public void glGetTexParameterfv ( int target, int pname, FloatBuffer params );\r
 \r
        public void glGetTexParameteriv ( int target, int pname, IntBuffer params );\r
@@ -495,8 +439,6 @@ public interface GL20 extends GLCommon
 \r
        public void glGetVertexAttribPointerv ( int index, int pname, Buffer pointer );\r
 \r
-       public void glHint ( int target, int mode );\r
-\r
        public boolean glIsBuffer ( int buffer );\r
 \r
        public boolean glIsEnabled ( int cap );\r
@@ -511,53 +453,31 @@ public interface GL20 extends GLCommon
 \r
        public boolean glIsTexture ( int texture );\r
 \r
-       public void glLineWidth ( float width );\r
-\r
        public void glLinkProgram ( int program );\r
 \r
-       public void glPixelStorei ( int pname, int param );\r
-\r
-       public void glPolygonOffset ( float factor, float units );\r
-\r
-       public void glReadPixels ( int x, int y, int width, int height, int format, int type, Buffer pixels );\r
-\r
        public void glReleaseShaderCompiler (  );\r
 \r
        public void glRenderbufferStorage ( int target, int internalformat, int width, int height );\r
 \r
        public void glSampleCoverage ( float value, boolean invert );\r
 \r
-       public void glScissor ( int x, int y, int width, int height );\r
-\r
        public void glShaderBinary ( int n, IntBuffer shaders, int binaryformat, Buffer binary, int length );\r
 \r
        // Deviates\r
        public void glShaderSource ( int shader, String string );\r
 \r
-       public void glStencilFunc ( int func, int ref, int mask );\r
-\r
        public void glStencilFuncSeparate ( int face, int func, int ref, int mask );\r
 \r
-       public void glStencilMask ( int mask );\r
-\r
        public void glStencilMaskSeparate ( int face, int mask );\r
 \r
-       public void glStencilOp ( int fail, int zfail, int zpass );\r
-\r
        public void glStencilOpSeparate ( int face, int fail, int zfail, int zpass );\r
 \r
-       public void glTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels );\r
-\r
-       public void glTexParameterf ( int target, int pname, float param );\r
-\r
        public void glTexParameterfv ( int target, int pname, FloatBuffer params );\r
 \r
        public void glTexParameteri ( int target, int pname, int param );\r
 \r
        public void glTexParameteriv ( int target, int pname, IntBuffer params );\r
 \r
-       public void glTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels );\r
-\r
        public void glUniform1f ( int location, float x );\r
 \r
        public void glUniform1fv ( int location, int count, FloatBuffer v );\r
@@ -619,7 +539,4 @@ public interface GL20 extends GLCommon
        public void glVertexAttribPointer ( int indx, int size, int type, boolean normalized, int stride, Buffer ptr );\r
        \r
        public void glVertexAttribPointer ( int indx, int size, int type, boolean normalized, int stride, int ptr );\r
-\r
-       public void glViewport ( int x, int y, int width, int height );\r
-\r
 }\r

diff --git a/gdx/src/com/badlogic/gdx/graphics/GLCommon.java b/gdx/src/com/badlogic/gdx/graphics/GLCommon.java
index e4f5040..7b360b8 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/GLCommon.java
+++ b/gdx/src/com/badlogic/gdx/graphics/GLCommon.java
@@ -1,5 +1,8 @@
 package com.badlogic.gdx.graphics;\r
 \r
+import java.nio.Buffer;\r
+import java.nio.IntBuffer;\r
+\r
 /**\r
  * This interface defines methods common to GL10, GL11 and GL20.\r
  * @author mzechner\r
@@ -7,5 +10,85 @@ package com.badlogic.gdx.graphics;
  */\r
 public interface GLCommon \r
 {\r
+       public void glActiveTexture ( int texture );\r
+\r
+       public void glBindTexture ( int target, int texture );\r
+       \r
+       public void glBlendFunc ( int sfactor, int dfactor );\r
+\r
+       public void glClear ( int mask );\r
+\r
+       public void glClearColor ( float red, float green, float blue, float alpha );\r
+       \r
+       public void glClearDepthf ( float depth );\r
+       \r
+       public void glClearStencil ( int s );\r
+\r
+       public void glColorMask ( boolean red, boolean green, boolean blue, boolean alpha );\r
+\r
+       public void glCompressedTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data );\r
+\r
+       public void glCompressedTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data );\r
+\r
+       public void glCopyTexImage2D ( int target, int level, int internalformat, int x, int y, int width, int height, int border );\r
+\r
+       public void glCopyTexSubImage2D ( int target, int level, int xoffset, int yoffset, int x, int y, int width, int height );\r
+       \r
+       public void glCullFace ( int mode );\r
+\r
+       public void glDeleteTextures ( int n, IntBuffer textures );\r
+\r
+       public void glDepthFunc ( int func );\r
+\r
+       public void glDepthMask ( boolean flag );\r
+\r
+       public void glDepthRangef ( float zNear, float zFar );\r
+       \r
+       public void glDisable ( int cap );\r
+       \r
+       public void glDrawArrays ( int mode, int first, int count );\r
+\r
+       public void glDrawElements ( int mode, int count, int type, Buffer indices );\r
+       \r
+       public void glEnable ( int cap );\r
+       \r
+       public void glFinish (  );\r
+\r
+       public void glFlush (  );\r
+       \r
+       public void glFrontFace ( int mode );\r
+\r
+       public void glGenTextures ( int n, IntBuffer textures );\r
+\r
+       public int glGetError (  );\r
+       \r
+       public void glGetIntegerv ( int pname, IntBuffer params );\r
+       \r
+       public String glGetString ( int name );\r
+       \r
+       public void glHint ( int target, int mode );\r
+\r
+       public void glLineWidth ( float width );\r
+\r
+       public void glPixelStorei ( int pname, int param );\r
+\r
+       public void glPolygonOffset ( float factor, float units );\r
+\r
+       public void glReadPixels ( int x, int y, int width, int height, int format, int type, Buffer pixels );\r
+\r
+       public void glScissor ( int x, int y, int width, int height );\r
+\r
+       public void glStencilFunc ( int func, int ref, int mask );\r
+\r
+       public void glStencilMask ( int mask );\r
+\r
+       public void glStencilOp ( int fail, int zfail, int zpass );\r
+\r
+       public void glTexImage2D ( int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels );\r
+\r
+       public void glTexParameterf ( int target, int pname, float param );\r
+\r
+       public void glTexSubImage2D ( int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels );\r
 \r
+       public void glViewport ( int x, int y, int width, int height );\r
 }\r