From: Caspian Rychlik-P. <ci...@us...> - 2002-08-16 21:53:06
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory usw-pr-cvs1:/tmp/cvs-serv12257/src/java/org/lwjgl/opengl Modified Files: GL.java GLConstants.java GLU.java Removed Files: GLUT.java GLUTConstants.java Log Message: Removed StructBuffer Index: GL.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GL.java 15 Aug 2002 16:18:12 -0000 1.3 +++ GL.java 16 Aug 2002 21:53:02 -0000 1.4 @@ -43,10 +43,1480 @@ * @version $Revision$ */ public class GL extends CoreGL implements GLConstants { + public native void activeStencilFaceEXT(int face); + + public native void activeTextureARB(int texture); + + public native void alphaFragmentOp1ATI( + int op, + int dst, + int dstMod, [...1458 lines suppressed...] + public boolean NV_texture_shader3; + public boolean NV_vertex_array_range; + public boolean NV_vertex_array_range2; + public boolean NV_vertex_program; + public boolean NV_vertex_program1_1; + public boolean SGIS_generate_mipmap; + public boolean SGIX_shadow; + public boolean SGIX_depth_texture; /** * Constructor for GL. @@ -66,7 +1536,7 @@ */ protected void init() { super.init(); - + // Right after creation we can go and find out what extensions are // available. We can't actually determine this beforehand of course // because the available extensions can only be determined when there's Index: GLConstants.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GLConstants.java 15 Aug 2002 16:18:12 -0000 1.3 +++ GLConstants.java 16 Aug 2002 21:53:02 -0000 1.4 @@ -32,6 +32,26 @@ package org.lwjgl.opengl; +import org.lwjgl.opengl.arb.*; +import org.lwjgl.opengl.ati.*; +import org.lwjgl.opengl.ati.ATIElementArray; +import org.lwjgl.opengl.ati.ATIEnvmapBumpmap; +import org.lwjgl.opengl.atix.ATIXPointSprites; +import org.lwjgl.opengl.atix.ATIXTextureEnvRoute; +import org.lwjgl.opengl.ext.*; +import org.lwjgl.opengl.ext.EXTAgbr; +import org.lwjgl.opengl.ext.EXTCompiledVertexArray; +import org.lwjgl.opengl.hp.HPOcclusionTest; +import org.lwjgl.opengl.nv.*; +import org.lwjgl.opengl.nv.NVCopyDepthToColor; +import org.lwjgl.opengl.nv.NVDepthClamp; +import org.lwjgl.opengl.sgis.SGISGenerateMipmap; +import org.lwjgl.opengl.sgix.SGIXDepthTexture; +import org.lwjgl.opengl.sgix.SGIXShadow; +import org.lwjgl.opengl.wgl.*; +import org.lwjgl.opengl.wgl.WGLBufferRegion; +import org.lwjgl.opengl.wgl.WGLMakeCurrentRead; + /** * $Id$ * @@ -41,6 +61,77 @@ * @version $Revision$ */ -public interface GLConstants extends CoreGLConstants { +public interface GLConstants + extends + CoreGLConstants, + ARBCubeMap, + ARBDepthTexture, + ARBMatrixPalette, + ARBMultisample, + ARBMultitexture, + ARBPointParameters, + ARBShadow, + ARBShadowAmbient, + ARBTextureBorderClamp, + ARBTextureCompression, + ARBTextureEnvCombine, + ARBTextureEnvDot3, + ARBTextureMirroredRepeat, + ARBTransposeMatrix, + ARBVertexBlend, + ARBVertexProgram, + ATIElementArray, + ATIEnvmapBumpmap, + ATIFragmentShader, + ATIPnTriangles, + ATITextureMirrorOnce, + ATIVertexArrayObject, + ATIVertexStreams, + ATIXPointSprites, + ATIXTextureEnvRoute, + EXTAgbr, + EXTCompiledVertexArray, + EXTDrawRangeElements, + EXTFogCoord, + EXTPointParameters, + EXTSecondaryColor, + EXTStencilTwoSide, + EXTStencilWrap, + EXTTextureCompressionS3TC, + EXTTextureFilterAnisotropic, + EXTTextureLODBias, + EXTVertexShader, + EXTVertexWeighting, + HPOcclusionTest, + NVCopyDepthToColor, + NVDepthClamp, + NVEvaluators, + NVFence, + NVFogDistance, + NVLightMaxExponent, + NVOcclusionQuery, + NVPackedDepthStencil, + NVPointSprite, + NVRegisterCombiners, + NVRegisterCombiners2, + NVTexgenReflection, + NVTextureEnvCombine4, + NVTextureRectangle, + NVTextureShader, + NVTextureShader2, + NVTextureShader3, + NVVertexArrayRange, + NVVertexArrayRange2, + NVVertexProgram, + SGISGenerateMipmap, + SGIXDepthTexture, + SGIXShadow, + WGLBufferRegion, + WGLMakeCurrentRead, + WGLMultisample, + WGLPBuffer, + WGLPixelFormat, + WGLRenderTexture +{ } Index: GLU.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLU.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- GLU.java 15 Aug 2002 16:18:12 -0000 1.3 +++ GLU.java 16 Aug 2002 21:53:02 -0000 1.4 @@ -43,7 +43,7 @@ * @version $Revision$ */ public class GLU implements GLUConstants { - + static { System.loadLibrary(Sys.LIBRARY_NAME); } @@ -57,5 +57,92 @@ public GLU(GL gl) { this.gl = gl; } + + public native String errorString(int errCode); + + public native String getString(int name); + + public native void ortho2D( + double left, + double right, + double bottom, + double top); + + public native void perspective( + double fovy, + double aspect, + double zNear, + double zFar); + + public native void pickMatrix( + double x, + double y, + double width, + double height, + int viewport /*int*/ + ); + + public native void lookAt( + double eyex, + double eyey, + double eyez, + double centerx, + double centery, + double centerz, + double upx, + double upy, + double upz); + + public native int project( + double objx, + double objy, + double objz, + int modelMatrix /*double*/ + , int projMatrix /*double*/ + , int viewport /*int*/ + , int winx /*double*/ + , int winy /*double*/ + , int winz /*double*/ + ); + + public native int unProject( + double winx, + double winy, + double winz, + int modelMatrix /*double*/ + , int projMatrix /*double*/ + , int viewport /*int*/ + , int objx /*double*/ + , int objy /*double*/ + , int objz /*double*/ + ); + + public native int scaleImage( + int format, + int widthin, + int heightin, + int typein, + int datain /*void*/ + , int widthout, int heightout, int typeout, int dataout /*void*/ + ); + + public native int build1DMipmaps( + int target, + int components, + int width, + int format, + int type, + int data /*void*/ + ); + + public native int build2DMipmaps( + int target, + int components, + int width, + int height, + int format, + int type, + int data /*void*/ + ); } --- GLUT.java DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLUT.java --- GLUTConstants.java DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLUTConstants.java |