From: Carsten W. <ca...@us...> - 2007-01-10 14:41:12
|
Update of /cvsroot/jake2/jake2/src/jake2/render/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14776/src/jake2/render/opengl Modified Files: Jsr231GL.java LwjglGL.java JoglGL.java DummyGL.java QGL.java QGLConst.java CountGL.java Log Message: add glHint(int target, int mode) e.g. for perspective correction hint Index: QGL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/QGL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QGL.java 21 Nov 2006 00:49:54 -0000 1.2 --- QGL.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 81,84 **** --- 81,86 ---- String glGetString(int name); + + void glHint(int target, int mode); void glInterleavedArrays(int format, int stride, FloatBuffer pointer); Index: LwjglGL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/LwjglGL.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LwjglGL.java 10 Jan 2007 02:11:09 -0000 1.3 --- LwjglGL.java 10 Jan 2007 14:41:02 -0000 1.4 *************** *** 137,140 **** --- 137,144 ---- } + public void glHint(int target, int mode) { + GL11.glHint(target, mode); + } + public final void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { Index: DummyGL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/DummyGL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DummyGL.java 21 Nov 2006 00:49:54 -0000 1.2 --- DummyGL.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 146,149 **** --- 146,153 ---- } } + + public void glHint(int target, int mode) { + // do nothing + } public void glInterleavedArrays(int format, int stride, Index: JoglGL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/JoglGL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JoglGL.java 21 Nov 2006 00:49:54 -0000 1.2 --- JoglGL.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 144,147 **** --- 144,151 ---- } + public void glHint(int target, int mode) { + jogl.glHint(target, mode); + } + public void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { Index: Jsr231GL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231GL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jsr231GL.java 21 Nov 2006 00:49:54 -0000 1.2 --- Jsr231GL.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 143,146 **** --- 143,150 ---- return gl.glGetString(name); } + + public void glHint(int target, int mode) { + gl.glHint(target, mode); + } public void glInterleavedArrays(int format, int stride, Index: QGLConst.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/QGLConst.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QGLConst.java 21 Nov 2006 00:49:54 -0000 1.2 --- QGLConst.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 131,136 **** /* ! * hint modes */ public static final int GL_DONT_CARE = 0x1100; --- 131,138 ---- /* ! * hints */ + public static final int GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50; + public static final int GL_DONT_CARE = 0x1100; Index: CountGL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/CountGL.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CountGL.java 21 Nov 2006 00:49:54 -0000 1.2 --- CountGL.java 10 Jan 2007 14:41:02 -0000 1.3 *************** *** 19,124 **** public void glAlphaFunc(int func, float ref) { ! count++; } public void glBegin(int mode) { ! count++; } public void glBindTexture(int target, int texture) { ! count++; } public void glBlendFunc(int sfactor, int dfactor) { ! count++; } public void glClear(int mask) { ! count++; } public void glClearColor(float red, float green, float blue, float alpha) { ! count++; } public void glColor3f(float red, float green, float blue) { ! count++; } public void glColor3ub(byte red, byte green, byte blue) { ! count++; } public void glColor4f(float red, float green, float blue, float alpha) { ! count++; } public void glColor4ub(byte red, byte green, byte blue, byte alpha) { ! count++; } public void glColorPointer(int size, boolean unsigned, int stride, ByteBuffer pointer) { ! count++; } public void glColorPointer(int size, int stride, FloatBuffer pointer) { ! count++; } public void glCullFace(int mode) { ! count++; } public void glDeleteTextures(IntBuffer textures) { ! count++; } public void glDepthFunc(int func) { ! count++; } public void glDepthMask(boolean flag) { ! count++; } public void glDepthRange(double zNear, double zFar) { ! count++; } public void glDisable(int cap) { ! count++; } public void glDisableClientState(int cap) { ! count++; } public void glDrawArrays(int mode, int first, int count) { ! count++; } public void glDrawBuffer(int mode) { ! count++; } public void glDrawElements(int mode, IntBuffer indices) { ! count++; } public void glEnable(int cap) { ! count++; } public void glEnableClientState(int cap) { ! count++; } public void glEnd() { ! count++; } public void glFinish() { ! count++; } --- 19,124 ---- public void glAlphaFunc(int func, float ref) { ! ++count; } public void glBegin(int mode) { ! ++count; } public void glBindTexture(int target, int texture) { ! ++count; } public void glBlendFunc(int sfactor, int dfactor) { ! ++count; } public void glClear(int mask) { ! ++count; } public void glClearColor(float red, float green, float blue, float alpha) { ! ++count; } public void glColor3f(float red, float green, float blue) { ! ++count; } public void glColor3ub(byte red, byte green, byte blue) { ! ++count; } public void glColor4f(float red, float green, float blue, float alpha) { ! ++count; } public void glColor4ub(byte red, byte green, byte blue, byte alpha) { ! ++count; } public void glColorPointer(int size, boolean unsigned, int stride, ByteBuffer pointer) { ! ++count; } public void glColorPointer(int size, int stride, FloatBuffer pointer) { ! ++count; } public void glCullFace(int mode) { ! ++count; } public void glDeleteTextures(IntBuffer textures) { ! ++count; } public void glDepthFunc(int func) { ! ++count; } public void glDepthMask(boolean flag) { ! ++count; } public void glDepthRange(double zNear, double zFar) { ! ++count; } public void glDisable(int cap) { ! ++count; } public void glDisableClientState(int cap) { ! ++count; } public void glDrawArrays(int mode, int first, int count) { ! ++count; } public void glDrawBuffer(int mode) { ! ++count; } public void glDrawElements(int mode, IntBuffer indices) { ! ++count; } public void glEnable(int cap) { ! ++count; } public void glEnableClientState(int cap) { ! ++count; } public void glEnd() { ! ++count; } public void glFinish() { ! ++count; } *************** *** 130,134 **** public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) { ! count++; } --- 130,134 ---- public void glFrustum(double left, double right, double bottom, double top, double zNear, double zFar) { ! ++count; } *************** *** 138,142 **** public void glGetFloat(int pname, FloatBuffer params) { ! count++; } --- 138,142 ---- public void glGetFloat(int pname, FloatBuffer params) { ! ++count; } *************** *** 150,226 **** } public void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { ! count++; } public void glLoadIdentity() { ! count++; } public void glLoadMatrix(FloatBuffer m) { ! count++; } public void glMatrixMode(int mode) { ! count++; } public void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) { ! count++; } public void glPixelStorei(int pname, int param) { ! count++; } public void glPointSize(float size) { ! count++; } public void glPolygonMode(int face, int mode) { ! count++; } public void glPopMatrix() { ! count++; } public void glPushMatrix() { ! count++; } public void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels) { ! count++; } public void glRotatef(float angle, float x, float y, float z) { ! count++; } public void glScalef(float x, float y, float z) { ! count++; } public void glScissor(int x, int y, int width, int height) { ! count++; } public void glShadeModel(int mode) { ! count++; } public void glTexCoord2f(float s, float t) { ! count++; } public void glTexCoordPointer(int size, int stride, FloatBuffer pointer) { ! count++; } public void glTexEnvi(int target, int pname, int param) { ! count++; } --- 150,230 ---- } + public void glHint(int target, int mode) { + ++count; + } + public void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { ! ++count; } public void glLoadIdentity() { ! ++count; } public void glLoadMatrix(FloatBuffer m) { ! ++count; } public void glMatrixMode(int mode) { ! ++count; } public void glOrtho(double left, double right, double bottom, double top, double zNear, double zFar) { ! ++count; } public void glPixelStorei(int pname, int param) { ! ++count; } public void glPointSize(float size) { ! ++count; } public void glPolygonMode(int face, int mode) { ! ++count; } public void glPopMatrix() { ! ++count; } public void glPushMatrix() { ! ++count; } public void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels) { ! ++count; } public void glRotatef(float angle, float x, float y, float z) { ! ++count; } public void glScalef(float x, float y, float z) { ! ++count; } public void glScissor(int x, int y, int width, int height) { ! ++count; } public void glShadeModel(int mode) { ! ++count; } public void glTexCoord2f(float s, float t) { ! ++count; } public void glTexCoordPointer(int size, int stride, FloatBuffer pointer) { ! ++count; } public void glTexEnvi(int target, int pname, int param) { ! ++count; } *************** *** 228,232 **** int width, int height, int border, int format, int type, ByteBuffer pixels) { ! count++; } --- 232,236 ---- int width, int height, int border, int format, int type, ByteBuffer pixels) { ! ++count; } *************** *** 234,246 **** int width, int height, int border, int format, int type, IntBuffer pixels) { ! count++; } public void glTexParameterf(int target, int pname, float param) { ! count++; } public void glTexParameteri(int target, int pname, int param) { ! count++; } --- 238,250 ---- int width, int height, int border, int format, int type, IntBuffer pixels) { ! ++count; } public void glTexParameterf(int target, int pname, float param) { ! ++count; } public void glTexParameteri(int target, int pname, int param) { ! ++count; } *************** *** 248,309 **** int yoffset, int width, int height, int format, int type, IntBuffer pixels) { ! count++; } public void glTranslatef(float x, float y, float z) { ! count++; } public void glVertex2f(float x, float y) { ! count++; } public void glVertex3f(float x, float y, float z) { ! count++; } public void glVertexPointer(int size, int stride, FloatBuffer pointer) { ! count++; } public void glViewport(int x, int y, int width, int height) { ! count++; } public void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { ! count++; } public void glActiveTextureARB(int texture) { ! count++; } public void glClientActiveTextureARB(int texture) { ! count++; } public void glPointParameterEXT(int pname, FloatBuffer pfParams) { ! count++; } public void glPointParameterfEXT(int pname, float param) { ! count++; } public void glLockArraysEXT(int first, int count) { ! count++; } public void glArrayElement(int index) { ! count++; } public void glUnlockArraysEXT() { ! count++; } public void glMultiTexCoord2f(int target, float s, float t) { ! count++; } --- 252,313 ---- int yoffset, int width, int height, int format, int type, IntBuffer pixels) { ! ++count; } public void glTranslatef(float x, float y, float z) { ! ++count; } public void glVertex2f(float x, float y) { ! ++count; } public void glVertex3f(float x, float y, float z) { ! ++count; } public void glVertexPointer(int size, int stride, FloatBuffer pointer) { ! ++count; } public void glViewport(int x, int y, int width, int height) { ! ++count; } public void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { ! ++count; } public void glActiveTextureARB(int texture) { ! ++count; } public void glClientActiveTextureARB(int texture) { ! ++count; } public void glPointParameterEXT(int pname, FloatBuffer pfParams) { ! ++count; } public void glPointParameterfEXT(int pname, float param) { ! ++count; } public void glLockArraysEXT(int first, int count) { ! ++count; } public void glArrayElement(int index) { ! ++count; } public void glUnlockArraysEXT() { ! ++count; } public void glMultiTexCoord2f(int target, float s, float t) { ! ++count; } |