Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl/test/opengl FullScreenWindowedTest.java,1.8,1.9 Grass.java,1.15,1.16 PbufferTest.java,1.5,1.6
|
From: Elias N. <eli...@us...> - 2003-07-28 10:10:00
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv9017/src/java/org/lwjgl/test/opengl Modified Files: FullScreenWindowedTest.java Grass.java PbufferTest.java Log Message: Moved GL capabilities to GLCaps Index: FullScreenWindowedTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/FullScreenWindowedTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- FullScreenWindowedTest.java 26 Jul 2003 08:32:23 -0000 1.8 +++ FullScreenWindowedTest.java 28 Jul 2003 10:09:57 -0000 1.9 @@ -321,7 +321,8 @@ GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f); //sync frame (only works on windows) - if (gl.WGL_EXT_swap_control) { + GLCaps.determineAvailableExtensions(); + if (GLCaps.WGL_EXT_swap_control) { GL.wglSwapIntervalEXT(1); } } Index: Grass.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/Grass.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Grass.java 20 Jul 2003 16:01:41 -0000 1.15 +++ Grass.java 28 Jul 2003 10:09:57 -0000 1.16 @@ -131,8 +131,9 @@ public static void main(String[] args) { ByteBuffer byte_buf = ByteBuffer.allocateDirect(4); byte_buf.order(ByteOrder.nativeOrder()); - System.out.println("Vertex program supported: " + gl.GL_NV_vertex_program); - GL.glGenProgramsNV(1, byte_buf.asIntBuffer()); + GLCaps.determineAvailableExtensions(); + System.out.println("Vertex program supported: " + GLCaps.GL_NV_vertex_program); + GL.glGenProgramsNV(1, byte_buf.asIntBuffer()); IntBuffer int_buf = byte_buf.asIntBuffer(); if (int_buf.get(0) == 0) throw new RuntimeException("Could not allocate new vertex program id!"); @@ -144,7 +145,7 @@ program_buf.rewind(); program_buf.put(program); program_buf.rewind(); - GL.glLoadProgramNV( + GL.glLoadProgramNV( GL.GL_VERTEX_PROGRAM_NV, program_handle, program_buf.remaining(), @@ -162,29 +163,24 @@ light_buf_f.rewind(); light_buf_f.put(LightDiffuse); - GL.glLightfv( + GL.glLightfv( GL.GL_LIGHT0, GL.GL_DIFFUSE, light_buf_f); light_buf_f.rewind(); light_buf_f.put(LightPosition); - GL.glLightfv( + GL.glLightfv( GL.GL_LIGHT0, GL.GL_POSITION, light_buf_f); - GL.glEnable(GL.GL_LIGHT0); - - GL.glEnable(GL.GL_LIGHTING); - - GL.glEnable(GL.GL_DEPTH_TEST); - - GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); - GL.glEnable(GL.GL_BLEND); - - GL.glMatrixMode(GL.GL_PROJECTION); - GLU.gluPerspective(40.0, 1.0, 1.0, 50.0); - - GL.glMatrixMode(GL.GL_MODELVIEW); + GL.glEnable(GL.GL_LIGHT0); + GL.glEnable(GL.GL_LIGHTING); + GL.glEnable(GL.GL_DEPTH_TEST); + GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); + GL.glEnable(GL.GL_BLEND); + GL.glMatrixMode(GL.GL_PROJECTION); + GLU.gluPerspective(40.0, 1.0, 1.0, 50.0); + GL.glMatrixMode(GL.GL_MODELVIEW); GLU.gluLookAt(14.0, 10.0, -16.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0); @@ -200,7 +196,7 @@ degree *= (0.5 + myrand()); ptrAnimate(degree); - GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); + GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT); //ptrDraw(); @@ -246,16 +242,16 @@ fRigid = ((fRigid = myrand()) < 0.2f) ? 0.2f : fRigid; if (myrand() < 0.3) - GL.glBegin(GL.GL_LINE_STRIP); + GL.glBegin(GL.GL_LINE_STRIP); else - GL.glBegin(GL.GL_QUAD_STRIP); + GL.glBegin(GL.GL_QUAD_STRIP); for (cFaces = 0; cFaces < numFaces; cFaces++) { for (cWidth = frndWidth; cWidth >= -frndWidth; cWidth -= (frndWidth * 2.0f)) { - GL.glColor4f(fX, fRigid, fZ, (float) cFaces / (float) numFaces); - GL.glVertex3f( + GL.glColor4f(fX, fRigid, fZ, (float) cFaces / (float) numFaces); + GL.glVertex3f( (float) (((cFaces - 2) * 0.1f) * java.lang.Math.cos(fRotate) + (cWidth) * java.lang.Math.sin(fRotate)), @@ -266,7 +262,7 @@ } frndWidth -= fDecWidth; } - GL.glEnd(); + GL.glEnd(); } @@ -275,110 +271,109 @@ fArea = 20.0f; mesh = GL.glGenLists(1); - GL.glNewList(mesh, GL.GL_COMPILE); + GL.glNewList(mesh, GL.GL_COMPILE); for (cI = -fArea / 2; cI < fArea / 2; cI += 0.25f) { for (cJ = -fArea / 2; cJ < fArea / 2; cJ += 0.25f) { genGrass(0.5f, 0.1f, cI, cJ); } } - GL.glEndList(); - + GL.glEndList(); } private static void grsDraw() { - GL.glEnable(GL.GL_VERTEX_PROGRAM_NV); - GL.glBindProgramNV(GL.GL_VERTEX_PROGRAM_NV, program_handle); - GL.glTrackMatrixNV( + GL.glEnable(GL.GL_VERTEX_PROGRAM_NV); + GL.glBindProgramNV(GL.GL_VERTEX_PROGRAM_NV, program_handle); + GL.glTrackMatrixNV( GL.GL_VERTEX_PROGRAM_NV, 0, GL.GL_MODELVIEW_PROJECTION_NV, GL.GL_IDENTITY_NV); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 4, 0.0f, 0.0f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 5, 0.0f, 0.0f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 6, 1.763609f, 0.496495f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 7, -0.943599f, 3.203737f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 8, 4.101107f, 0.943413f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 9, -1.218603f, 6.259399f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 10, 7.214299f, 1.352961f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 11, -1.540748f, 10.080958f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 12, 10.880035f, 1.759046f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 13, -1.852705f, 14.468674f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 14, 14.292879f, 1.973329f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 15, -1.973387f, 18.506531f, 0.0f, 0.0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 16, (float) (java.lang.Math.sin(aslod.angle) @@ -388,54 +383,54 @@ * (aslod.value + aslod.ripple)), 0.0f); - GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 17, 1.7f, 5f, 2f, 0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 17, 1.7f, 5f, 2f, 0f); + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 18, -0.0187293f, 0.074261f, 0.2121144f, 1.570729f); - GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 20, 0f, 0.5f, 1f, 0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 20, 0f, 0.5f, 1f, 0f); + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 21, 0.25f, -9f, 0.75f, 0.1591549f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 22, 24.9808f, -24.9808f, -60.14581f, 60.14581f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 23, 85.45379f, -85.45379f, -64.93935f, 64.93935f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 24, 19.73921f, -19.73921f, -1f, 1f); - GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 25, 0f, 4f, 0f, 0f); - GL.glProgramParameter4fNV( + GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 25, 0f, 4f, 0f, 0f); + GL.glProgramParameter4fNV( GL.GL_VERTEX_PROGRAM_NV, 19, 1f, 3.141593f, 0.5f, 1f); - GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 26, 0.7f, 0.4f, 0f, 0f); - GL.glCallList(mesh); - GL.glDisable(GL.GL_VERTEX_PROGRAM_NV); + GL.glProgramParameter4fNV(GL.GL_VERTEX_PROGRAM_NV, 26, 0.7f, 0.4f, 0f, 0f); + GL.glCallList(mesh); + GL.glDisable(GL.GL_VERTEX_PROGRAM_NV); } Index: PbufferTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/PbufferTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PbufferTest.java 26 Jul 2003 08:32:23 -0000 1.5 +++ PbufferTest.java 28 Jul 2003 10:09:57 -0000 1.6 @@ -392,7 +392,8 @@ */ private void glInit() { //sync frame (only works on windows) - if (gl.WGL_EXT_swap_control) { + GLCaps.determineAvailableExtensions(); + if (GLCaps.WGL_EXT_swap_control) { GL.wglSwapIntervalEXT(1); } GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE); |
