java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv12310/common

Modified Files:
	extgl.cpp 
Log Message:


Index: extgl.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extgl.cpp	26 Sep 2003 13:59:49 -0000	1.1
+++ extgl.cpp	26 Sep 2003 18:36:54 -0000	1.2
@@ -1579,7 +1579,7 @@
 /*-----------------------------------------------------*/
 #ifdef _AGL
 
-static int extgl_InitializeAGL()
+static int extgl_InitializeAGL(JNIEnv *env, jobject ext_set)
 {
 	// add in AGL extensions here
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv12310/macosx

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:


Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.5
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 18:36:54 -0000	1.6
@@ -95,13 +95,13 @@
 //	dumpRootMenu();
 }
 
-static pascal OSStatus doWindowClose(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
+static pascal OSStatus doQuit(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
 printf("Close requested\n");
 	close_requested = true;
 	return noErr;
 }
 
-static void registerEventHandlers(void) {
+static void registerEventHandlers(JNIEnv *env) {
 	/*EventTargetRef event_target = GetWindowEventTarget(win_ref);
 	status = InstallStandardEventHandler(event_target);
 	if (noErr != status) {
@@ -109,12 +109,28 @@
 		throwException(env, "Could not install default window event handler");
 		return;
 	}*/
-	EventTypeSpec eventType;
-	eventType.eventClass = kEventClassWindow;
-	eventType.eventKind  = kEventWindowClose;
-	EventHandlerUPP handlerUPP = NewEventHandlerUPP(doWindowClose);
-	InstallWindowEventHandler(win_ref, handlerUPP, 1, &eventType, NULL, NULL);
-	DisposeEventHandlerUPP(handlerUPP);
+	EventTypeSpec event_types[1];
+	OSStatus err;
+	EventHandlerUPP handler_upp = NewEventHandlerUPP(doQuit);
+	event_types[0].eventClass = kEventClassWindow;
+	event_types[0].eventKind  = kEventWindowClose;
+	err = InstallWindowEventHandler(win_ref, handler_upp, 1, event_types, NULL, NULL);
+	if (noErr != err) {
+		DisposeEventHandlerUPP(handler_upp);
+		throwException(env, "Could not register window event handler");
+		return;
+	}
+	event_types[0].eventClass = kEventClassApplication;
+	event_types[0].eventKind = kEventAppQuit;
+	/*event_types[1].eventClass = kEventClassAppleEvent;
+	event_types[1].eventKind = kEventAppleEvent;*/
+	err = InstallApplicationEventHandler(handler_upp, 1, event_types, NULL, NULL);
+	if (noErr != err) {
+		DisposeEventHandlerUPP(handler_upp);
+		throwException(env, "Could not register application event handler");
+		return;
+	}
+	DisposeEventHandlerUPP(handler_upp);
 }
 
 
@@ -124,10 +140,11 @@
 	return saved;
 }
 
-OSErr aehandler(const AppleEvent * theAppleEvent, AppleEvent * reply, SInt32 handlerRefcon) {
+/*OSErr aehandler(const AppleEvent * theAppleEvent, AppleEvent * reply, SInt32 handlerRefcon) {
 	printf("handler called\n");
 	return noErr;
 }
+*/
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jobject ext_set) {
 	Rect rect;
@@ -157,11 +174,13 @@
 	}*/
 	/*ProcessSerialNumber PSN;
  	GetCurrentProcess(&PSN);
- 	SetFrontProcess(&PSN);
- 	EventQueueRef queue = GetCurrentEventQueue();
-	if (queue == NULL)
-		printf("null event queue\n");*/
-
+ 	SetFrontProcess(&PSN);*/
+ 	EventLoopRef queue = GetCurrentEventLoop();
+	EventLoopRef main = GetMainEventLoop();
+	QuitEventLoop(queue);
+	QuitEventLoop(main);
+	/*if (queue == main)
+		printf("equals\n");*/
 	SetRect(&rect, x, y, x + width, y + height);
 	close_requested = false;
 	
@@ -170,7 +189,7 @@
 		throwException(env, "Could not create window");
 		return;
 	}
-	registerEventHandlers();
+	registerEventHandlers(env);
 	setWindowTitle(env, title);
 	const RGBColor background_color = { 0, 0, 0 };
 	SetWindowContentColor(win_ref, &background_color);
@@ -183,14 +202,13 @@
 	SelectWindow(win_ref);
 	InitCursor();
 //QuitApplicationEventLoop();
-DebugPrintAllWindowGroups();
 //RunApplicationEventLoop();
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update
   (JNIEnv *env, jclass clazz) 
 {
-	EventRef event;
+	/*EventRef event;
 	OSStatus err;
 	int num_events = GetNumEventsInQueue(GetCurrentEventQueue());
 	for (int i = 0; i < num_events; i++) {
@@ -203,7 +221,7 @@
 		err = ReceiveNextEvent(0, NULL, 0, true, &event);
 	/*	if (kind == kEventClassAppleEvent)
 			AEProcessAppleEvent(event);*/
-	        ReleaseEvent(event);
+	  /*      ReleaseEvent(event);
 	}
 	//RunCurrentEventLoop(0);
 /*	if (eventLoopTimedOutErr != RunCurrentEventLoop(0))

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv14594/src/native/win32

Modified Files:
	org_lwjgl_opengl_Window.cpp 
Log Message:
Changed from wglSwapBuffers back to SwapBuffers.

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.7
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 16:26:10 -0000	1.8
@@ -529,7 +529,8 @@
   (JNIEnv * env, jclass clazz)
 {
 	dirty = false;
-	wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE);
+	SwapBuffers(hdc);
+//	wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE);
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector
In directory sc8-pr-cvs1:/tmp/cvs-serv13408/src/java/org/lwjgl/vector

Modified Files:
	Vector3f.java Vector2f.java Vector.java Vector4f.java 
Added Files:
	ReadableVector4f.java ReadableVector.java 
	ReadableVector3f.java ReadableVector2f.java 
Log Message:
New "const" style interfaces for Vectors

--- NEW FILE: ReadableVector4f.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/ReadableVector4f.java
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.vector;

/**
 * @author foo
 */
public interface ReadableVector4f extends ReadableVector3f {
	
	/**
	 * @return w
	 */
	public float getW();

}

--- NEW FILE: ReadableVector.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/ReadableVector.java
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.vector;

import java.nio.FloatBuffer;

/**
 * @author foo
 */
public interface ReadableVector {
	/**
	 * @return the length of the vector
	 */
	public float length();
	/**
	 * @return the length squared of the vector
	 */
	public float lengthSquared();
	/**
	 * Store this vector in a FloatBuffer
	 * @param buf The buffer to store it in, at the current position
	 * @return this
	 */
	public Vector store(FloatBuffer buf);
}
--- NEW FILE: ReadableVector3f.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/ReadableVector3f.java
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.vector;

/**
 * @author foo
 */
public interface ReadableVector3f extends ReadableVector2f {
	/**
	 * @return z
	 */
	public float getZ();
}
--- NEW FILE: ReadableVector2f.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/ReadableVector2f.java
/* 
 * Copyright (c) 2003 Shaven Puppy Ltd
 * All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are 
 * met:
 * 
 * * Redistributions of source code must retain the above copyright 
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Shaven Puppy' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
package org.lwjgl.vector;

/**
 * @author foo
 */
public interface ReadableVector2f extends ReadableVector {
	/**
	 * @return x
	 */
	public float getX();
	/**
	 * @return y
	 */
	public float getY();
}
Index: Vector3f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector3f.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Vector3f.java	17 Aug 2003 16:38:57 -0000	1.15
+++ Vector3f.java	26 Sep 2003 16:19:18 -0000	1.16
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector3f extends Vector implements Serializable {
+public class Vector3f extends Vector implements Serializable, ReadableVector3f {
 
 	public float x, y, z;
 
@@ -57,7 +57,7 @@
 	/**
 	 * Constructor
 	 */
-	public Vector3f(Vector3f src) {
+	public Vector3f(ReadableVector3f src) {
 		set(src);
 	}
 	
@@ -84,10 +84,10 @@
 	 * @param src The source vector
 	 * @return this
 	 */
-	public Vector3f set(Vector3f src) {
-		x = src.x;
-		y = src.y;
-		z = src.z;
+	public Vector3f set(ReadableVector3f src) {
+		x = src.getX();
+		y = src.getY();
+		z = src.getZ();
 		return this;
 	}
 	
@@ -290,5 +290,48 @@
 		return sb.toString();
 	}
 
+	/**
+	 * @return x
+	 */
+	public final float getX() {
+		return x;
+	}
+	
+	/**
+	 * @return y
+	 */
+	public final float getY() {
+		return y;
+	}
+	
+	/**
+	 * Set X
+	 * @param x
+	 */
+	public final void setX(float x) {
+		this.x = x;
+	}
+	
+	/**
+	 * Set Y
+	 * @param y
+	 */
+	public final void setY(float y) {
+		this.y = y;
+	}
 
+	/**
+	 * Set Z
+	 * @param z
+	 */
+	public void setZ(float z) {
+		this.z = z;
+	}
+
+	/* (Overrides)
+	 * @see org.lwjgl.vector.ReadableVector3f#getZ()
+	 */
+	public float getZ() {
+		return z;
+	}
 }

Index: Vector2f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector2f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector2f.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Vector2f.java	30 Aug 2003 14:25:09 -0000	1.13
+++ Vector2f.java	26 Sep 2003 16:19:18 -0000	1.14
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector2f extends Vector implements Serializable {
+public class Vector2f extends Vector implements Serializable, ReadableVector2f {
 	
 	public float x, y;
 
@@ -57,7 +57,7 @@
 	/**
 	 * Constructor
 	 */
-	public Vector2f(Vector2f src) {
+	public Vector2f(ReadableVector2f src) {
 		set(src);
 	}
 
@@ -83,9 +83,9 @@
 	 * @param src The source vector
 	 * @return this
 	 */
-	public Vector2f set(Vector2f src) {
-		x = src.x;
-		y = src.y;
+	public Vector2f set(ReadableVector2f src) {
+		x = src.getX();
+		y = src.getY();
 		return this;
 	}
 	
@@ -254,4 +254,35 @@
 		sb.append(']');
 		return sb.toString();
 	}
+	
+	/**
+	 * @return x
+	 */
+	public final float getX() {
+		return x;
+	}
+	
+	/**
+	 * @return y
+	 */
+	public final float getY() {
+		return y;
+	}
+	
+	/**
+	 * Set X
+	 * @param x
+	 */
+	public final void setX(float x) {
+		this.x = x;
+	}
+	
+	/**
+	 * Set Y
+	 * @param y
+	 */
+	public final void setY(float y) {
+		this.y = y;
+	}
+
 }

Index: Vector.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Vector.java	30 Aug 2003 14:25:09 -0000	1.10
+++ Vector.java	26 Sep 2003 16:19:18 -0000	1.11
@@ -42,7 +42,7 @@
  * @author cix_foo <ci...@us...>
  * @version $Revision$
  */
-public abstract class Vector implements Serializable {
+public abstract class Vector implements Serializable, ReadableVector {
 
 	/**
 	 * Constructor for Vector.

Index: Vector4f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector4f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector4f.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Vector4f.java	17 Aug 2003 09:04:12 -0000	1.11
+++ Vector4f.java	26 Sep 2003 16:19:18 -0000	1.12
@@ -43,7 +43,7 @@
  * @version $Revision$
  */
 
-public class Vector4f extends Vector implements Serializable {
+public class Vector4f extends Vector implements Serializable, ReadableVector4f {
 
 	public float x, y, z, w;
 
@@ -57,7 +57,7 @@
 	/**
 	 * Constructor
 	 */
-	public Vector4f(Vector4f src) {
+	public Vector4f(ReadableVector4f src) {
 		set(src);
 	}
 	
@@ -85,11 +85,11 @@
 	 * @param src The source vector
 	 * @return this
 	 */
-	public Vector4f set(Vector4f src) {
-		x = src.x;
-		y = src.y;
-		z = src.z;
-		w = src.w;
+	public Vector4f set(ReadableVector4f src) {
+		x = src.getX();
+		y = src.getY();
+		z = src.getZ();
+		w = src.getW();
 		return this;
 	}
 	
@@ -255,4 +255,66 @@
 	public String toString() {
 		return "Vector4f: " + x + " " + y + " " + z + " " + w;
 	}
+	
+	/**
+	 * @return x
+	 */
+	public final float getX() {
+		return x;
+	}
+	
+	/**
+	 * @return y
+	 */
+	public final float getY() {
+		return y;
+	}
+	
+	/**
+	 * Set X
+	 * @param x
+	 */
+	public final void setX(float x) {
+		this.x = x;
+	}
+	
+	/**
+	 * Set Y
+	 * @param y
+	 */
+	public final void setY(float y) {
+		this.y = y;
+	}
+
+	/**
+	 * Set Z
+	 * @param z
+	 */
+	public void setZ(float z) {
+		this.z = z;
+	}
+
+	/* (Overrides)
+	 * @see org.lwjgl.vector.ReadableVector3f#getZ()
+	 */
+	public float getZ() {
+		return z;
+	}
+	
+	/**
+	 * Set W
+	 * @param w
+	 */
+	public void setW(float w) {
+		this.w = w;
+	}
+
+	/* (Overrides)
+	 * @see org.lwjgl.vector.ReadableVector3f#getZ()
+	 */
+	public float getW() {
+		return w;
+	}
+	
+		
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/native/win32

Modified Files:
	org_lwjgl_opengl_Pbuffer.cpp org_lwjgl_opengl_Window.cpp 
Removed Files:
	org_lwjgl_opengl_GLCaps.cpp 
Log Message:
Don't ignore lying drivers

Index: org_lwjgl_opengl_Pbuffer.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Pbuffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_Pbuffer.cpp	20 May 2003 12:20:13 -0000	1.1
+++ org_lwjgl_opengl_Pbuffer.cpp	26 Sep 2003 13:59:50 -0000	1.2
@@ -17,7 +17,7 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_Pbuffer_getPbufferCaps
   (JNIEnv *env, jclass clazz)
 {
-	return extgl_Extensions.wgl.ARB_pbuffer ? org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED : 0;
+	return extgl_Extensions.WGL_ARB_pbuffer ? org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED : 0;
 }
 
 /*

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_Window.cpp	11 Sep 2003 08:00:28 -0000	1.6
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.7
@@ -166,7 +166,7 @@
 	}
 
 	// 4. Initialise other things now
-	if (extgl_Open() != 0) {
+	if (!extgl_Open()) {
 		throwException(env, "Failed to open extgl");
 		return -1;
 	}
@@ -538,7 +538,7 @@
  * Signature: (Ljava/lang/String;IIIIZIIII)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
-  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil)
+  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jobject ext_set)
 {
 	closerequested = false;
 	minimized = false;
@@ -577,7 +577,7 @@
 	wglMakeCurrent(hdc, hglrc);
 
 	// Initialise GL extensions
-	if (extgl_Initialize() != 0) {
+	if (!extgl_Initialize(env, ext_set)) {
 		closeWindow();
 		throwException(env, "Failed to initialize GL extensions");
 		return;

--- org_lwjgl_opengl_GLCaps.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_GLCaps.cpp

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/native/macosx

Modified Files:
	Makefile.am org_lwjgl_opengl_Window.cpp 
Log Message:
Don't ignore lying drivers

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	8 Sep 2003 16:40:52 -0000	1.4
+++ Makefile.am	26 Sep 2003 13:59:50 -0000	1.5
@@ -11,6 +11,5 @@
 #  org_lwjgl_input_Mouse.cpp \
 #  org_lwjgl_input_Cursor.cpp \
   org_lwjgl_opengl_Window.cpp
-#  org_lwjgl_opengl_GLCaps.cpp \
 #  org_lwjgl_opengl_Pbuffer.cpp
   

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_Window.cpp	23 Sep 2003 11:00:37 -0000	1.4
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.5
@@ -129,7 +129,7 @@
 	return noErr;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate(JNIEnv *env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jobject ext_set) {
 	Rect rect;
 	OSStatus status;
 	const WindowAttributes window_attr = kWindowCloseBoxAttribute|

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/native/linux

Modified Files:
	Makefile.am org_lwjgl_opengl_Pbuffer.cpp 
	org_lwjgl_opengl_Window.cpp 
Removed Files:
	org_lwjgl_opengl_GLCaps.cpp 
Log Message:
Don't ignore lying drivers

Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	7 Sep 2003 16:11:15 -0000	1.11
+++ Makefile.am	26 Sep 2003 13:59:50 -0000	1.12
@@ -11,7 +11,6 @@
   org_lwjgl_input_Mouse.cpp \
   org_lwjgl_input_Cursor.cpp \
   org_lwjgl_opengl_Window.cpp \
-  org_lwjgl_opengl_GLCaps.cpp \
   org_lwjgl_opengl_Pbuffer.cpp \
   extxcursor.cpp
   

Index: org_lwjgl_opengl_Pbuffer.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Pbuffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_Pbuffer.cpp	20 May 2003 12:20:12 -0000	1.1
+++ org_lwjgl_opengl_Pbuffer.cpp	26 Sep 2003 13:59:50 -0000	1.2
@@ -29,7 +29,7 @@
   (JNIEnv *env, jclass clazz)
 {
 	// Only support thw GLX 1.3 Pbuffers and ignore the GLX_SGIX_pbuffer extension
-	return extgl_Extensions.glx.GLX13 ? org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED : 0;
+	return extgl_Extensions.GLX13 ? org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED : 0;
 }
 
 /*

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_Window.cpp	17 Aug 2003 18:40:58 -0000	1.6
+++ org_lwjgl_opengl_Window.cpp	26 Sep 2003 13:59:50 -0000	1.7
@@ -51,7 +51,7 @@
 #include "Window.h"
 #include "org_lwjgl_opengl_Window.h"
 
-#define USEGLX13 true
+#define USEGLX13 extgl_Extensions.GLX13
 
 static GLXContext context = NULL; // OpenGL rendering context
 static GLXWindow glx_window;
@@ -286,14 +286,14 @@
 }
 
 void makeCurrent(void) {
-	if (USEGLX13 && extgl_Extensions.glx.GLX13)
+	if (USEGLX13)
 		glXMakeContextCurrent(getCurrentDisplay(), glx_window, glx_window, context);
 	else
 		glXMakeCurrent(getCurrentDisplay(), getCurrentWindow(), context);
 }
 
 static void releaseContext(void) {
-	if (USEGLX13 && extgl_Extensions.glx.GLX13)
+	if (USEGLX13)
 		glXMakeContextCurrent(getCurrentDisplay(), None, None, NULL);
 	else
 		glXMakeCurrent(getCurrentDisplay(), None, NULL);
@@ -367,7 +367,7 @@
 
 static void destroy(void) {
 	releaseContext();
-	if (USEGLX13 && extgl_Extensions.glx.GLX13)
+	if (USEGLX13)
 		glXDestroyWindow(getCurrentDisplay(), glx_window);
 	glXDestroyContext(getCurrentDisplay(), context); 
 	context = NULL;
@@ -446,7 +446,7 @@
  * Signature: (IIII)Z
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
-  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil)
+  (JNIEnv * env, jclass clazz, jstring title, jint x, jint y, jint width, jint height, jboolean fullscreen, jint bpp, jint alpha, jint depth, jint stencil, jobject ext_set)
 {
 	int screen;
 	Display *disp;
@@ -454,7 +454,7 @@
 	if (fullscreen == JNI_TRUE)
 		fscreen = true;
 
-	if (extgl_Open() != 0) {
+	if (!extgl_Open()) {
 		throwException(env, "Could not load gl libs");
 		return;
 	}
@@ -464,14 +464,14 @@
 		return;
 	}
 	screen = XDefaultScreen(disp);
-	if (extgl_InitGLX(disp, screen) != 0) {
+	if (!extgl_InitGLX(env, ext_set, disp, screen)) {
 		XCloseDisplay(disp);
 		extgl_Close();
 		throwException(env, "Could not init GLX");
 		return;
 	}
 	bool create_success;
-	if (USEGLX13 && extgl_Extensions.glx.GLX13) {
+	if (USEGLX13) {
 		create_success = initWindowGLX13(env, disp, screen, title, x, y, width, height, bpp, depth, alpha, stencil, fscreen);
 	} else {
 		create_success = initWindowGLX(env, disp, screen, title, x, y, width, height, bpp, depth, alpha, stencil, fscreen);
@@ -481,7 +481,7 @@
 		extgl_Close();
 		return;
 	}
-	if (extgl_Initialize() != 0) {
+	if (!extgl_Initialize(env, ext_set)) {
 		destroy();
 		throwException(env, "Could not init gl function pointers");
 		return;
@@ -511,7 +511,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_swapBuffers(JNIEnv * env, jclass clazz)
 {
 	dirty = false;
-	if (USEGLX13 && extgl_Extensions.glx.GLX13)
+	if (USEGLX13)
 		glXSwapBuffers(getCurrentDisplay(), glx_window);
 	else
 		glXSwapBuffers(getCurrentDisplay(), getCurrentWindow());

--- org_lwjgl_opengl_GLCaps.cpp DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_GLCaps.cpp

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/native/common

Modified Files:
	Makefile.am extgl.h org_lwjgl_opengl_Window.h 
Added Files:
	extgl.cpp 
Removed Files:
	extgl.c org_lwjgl_opengl_GLCaps.h 
Log Message:
Don't ignore lying drivers

--- NEW FILE: extgl.cpp ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.cpp
/* ----------------------------------------------------------------------------
Copyright (c) 2001-2002, Lev Povalahev
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, 
are permitted provided that the following conditions are met:

	* Redistributions of source code must retain the above copyright notice, 
	  this list of conditions and the following disclaimer.
	* Redistributions in binary form must reproduce the above copyright notice, 
	  this list of conditions and the following disclaimer in the documentation 
	  and/or other materials provided with the distribution.
	* The name of the author may be used to endorse or promote products 
	  derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
[...3266 lines suppressed...]
{
#ifdef _X11
	dlclose(lib_glu_handle);
	dlclose(lib_gl_handle);
#endif
#ifdef _WIN32
	FreeLibrary(lib_gl_handle);
	FreeLibrary(lib_glu_handle);
#endif
#ifdef _AGL
	aglDellocEntryPoints();
#endif 
}

/* turn on the warning for the borland compiler*/
#ifdef __BORLANDC__
#pragma warn .8064
#pragma warn .8065
#endif /* __BORLANDC__	*/


Index: Makefile.am
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	3 Sep 2003 15:42:37 -0000	1.11
+++ Makefile.am	26 Sep 2003 13:59:49 -0000	1.12
@@ -5,7 +5,7 @@
 COMMON = \
   extal.cpp \
   extal.h \
-  extgl.c \
+  extgl.cpp \
   extgl.h \
   org_lwjgl_Display.h \
   org_lwjgl_Sys.h \

Index: extgl.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- extgl.h	7 Sep 2003 16:11:15 -0000	1.14
+++ extgl.h	26 Sep 2003 13:59:49 -0000	1.15
@@ -165,6 +165,8 @@
 #ifndef __EXTGL_H__
 #define __EXTGL_H__
 
+#include <jni.h>
+
 
 /*-----------------------------------------*/
 /*-----------------------------------------*/
@@ -598,9 +600,6 @@
 /*************************************************************/
 /* GLU functions */
[...1709 lines suppressed...]
 
 extern struct ExtensionTypes extgl_Extensions;
 
-
 /* initializes everything, call this right after the rc is created. the function returns 0 if successful */
-int extgl_Initialize();
-int extgl_Open(void);
+bool extgl_Initialize(JNIEnv *env, jobject gl_extensions);
+bool extgl_Open(void);
 #ifdef _X11
-int extgl_InitGLX(Display *disp, int screen);
+bool extgl_InitGLX(JNIEnv *env, jobject ext_set, Display *disp, int screen);
 #endif
 
 void extgl_Close(void);
-
-int glInitialize(); /* deprecated, please do not use */
 
 #ifdef __cplusplus
 }

Index: org_lwjgl_opengl_Window.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_Window.h	17 Aug 2003 18:40:58 -0000	1.5
+++ org_lwjgl_opengl_Window.h	26 Sep 2003 13:59:50 -0000	1.6
@@ -88,10 +88,10 @@
 /*
  * Class:     org_lwjgl_opengl_Window
  * Method:    nCreate
- * Signature: (Ljava/lang/String;IIIIZIIII)V
+ * Signature: (Ljava/lang/String;IIIIZIIIILjava/util/Vector;)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nCreate
-  (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jboolean, jint, jint, jint, jint);
+  (JNIEnv *, jclass, jstring, jint, jint, jint, jint, jboolean, jint, jint, jint, jint, jobject);
 
 /*
  * Class:     org_lwjgl_opengl_Window

--- extgl.c DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c

--- org_lwjgl_opengl_GLCaps.h DELETED ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GLCaps.h

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/java/org/lwjgl/test/opengl

Modified Files:
	FullScreenWindowedTest.java Grass.java PbufferTest.java 
	VBOIndexTest.java VBOTest.java 
Log Message:
Don't ignore lying drivers

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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- FullScreenWindowedTest.java	17 Aug 2003 18:40:58 -0000	1.18
+++ FullScreenWindowedTest.java	26 Sep 2003 13:59:49 -0000	1.19
@@ -315,7 +315,6 @@
     GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
     //sync frame (only works on windows)
-    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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Grass.java	17 Aug 2003 16:58:19 -0000	1.21
+++ Grass.java	26 Sep 2003 13:59:49 -0000	1.22
@@ -129,7 +129,6 @@
 	public static void main(String[] args) {
 		ByteBuffer byte_buf = ByteBuffer.allocateDirect(4);
 		byte_buf.order(ByteOrder.nativeOrder());
-		            GLCaps.determineAvailableExtensions();
 		System.out.println("Vertex program supported: " + GLCaps.GL_NV_vertex_program);
 		GL.glGenProgramsNV(byte_buf.asIntBuffer());
 		IntBuffer int_buf = byte_buf.asIntBuffer();

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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- PbufferTest.java	17 Aug 2003 18:40:58 -0000	1.16
+++ PbufferTest.java	26 Sep 2003 13:59:49 -0000	1.17
@@ -386,7 +386,6 @@
    */
   private void glInit() {
     //sync frame (only works on windows)
-    GLCaps.determineAvailableExtensions();
     if (GLCaps.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }

Index: VBOIndexTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOIndexTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- VBOIndexTest.java	17 Aug 2003 18:40:58 -0000	1.7
+++ VBOIndexTest.java	26 Sep 2003 13:59:49 -0000	1.8
@@ -189,7 +189,6 @@
          Sys.setProcessPriority(Sys.HIGH_PRIORITY);
          System.out.println("Timer resolution: " + Sys.getTimerResolution());
          // Go into orthographic projection mode.
-	GLCaps.determineAvailableExtensions();
        GL.glMatrixMode(GL.GL_PROJECTION);
        GL.glLoadIdentity();
          GLU.gluOrtho2D(0, Display.getWidth(), 0, Display.getHeight());

Index: VBOTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/VBOTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- VBOTest.java	17 Aug 2003 18:40:58 -0000	1.13
+++ VBOTest.java	26 Sep 2003 13:59:49 -0000	1.14
@@ -173,7 +173,6 @@
          Sys.setProcessPriority(Sys.HIGH_PRIORITY);
          System.out.println("Timer resolution: " + Sys.getTimerResolution());
          // Go into orthographic projection mode.
-	GLCaps.determineAvailableExtensions();
        GL.glMatrixMode(GL.GL_PROJECTION);
        GL.glLoadIdentity();
          GLU.gluOrtho2D(0, Display.getWidth(), 0, Display.getHeight());

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/java/org/lwjgl/opengl

Modified Files:
	GLCaps.java Window.java 
Log Message:
Don't ignore lying drivers

Index: GLCaps.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLCaps.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GLCaps.java	25 Aug 2003 09:07:03 -0000	1.7
+++ GLCaps.java	26 Sep 2003 13:59:48 -0000	1.8
@@ -36,7 +36,8 @@
 import java.lang.reflect.*;
 import java.lang.reflect.Field;
 import java.util.HashMap;
-import java.util.StringTokenizer;
+import java.util.HashSet;
+import java.util.Iterator;
 
 /**
  * $Id$
@@ -137,7 +138,6 @@
 	public static boolean GL_SGIS_generate_mipmap;
 	public static boolean GL_SGIX_shadow;
 	public static boolean GL_SGIX_depth_texture;
-	public static boolean OpenGL10;
 	public static boolean OpenGL11;
 	public static boolean OpenGL12;
 	public static boolean OpenGL13;
@@ -158,10 +158,13 @@
 		System.loadLibrary(Sys.getLibraryName());
 	}
 
-	private static void setExtensionFields(String exts, HashMap field_map) {
-		StringTokenizer st = new StringTokenizer(exts);
-		while (st.hasMoreTokens()) {
-			String ext = st.nextToken();
+	private static void setExtensionFields(HashSet exts, HashMap field_map) {
+		if(org.lwjgl.Sys.DEBUG) {
+			System.out.println("Available extensions:");
+		}
+		Iterator it = exts.iterator();
+		while (it.hasNext()) {
+			String ext = (String)it.next();
 			if(org.lwjgl.Sys.DEBUG) {
 				System.out.println(ext);
 			}
@@ -182,8 +185,7 @@
 	 * Determine which extensions are available. Use this to initialize capability fields.
 	 * Can only be called _after_ a GLWindow or Pbuffer has been created.
 	 */
-	public static void determineAvailableExtensions() {
-
+	public static void determineAvailableExtensions(HashSet exts) {
 		// Grab all the public static booleans out of this class
 		Field[] fields = GLCaps.class.getDeclaredFields();
 		HashMap map = new HashMap(fields.length);
@@ -200,67 +202,6 @@
 			}
 		}
 
-		determineAvailableWGLExtensions(map);
-		String exts = CoreGL11.glGetString(CoreGL11.GL_EXTENSIONS);
-		if(org.lwjgl.Sys.DEBUG) {
-			System.out.println("Available GL extensions:");
-		}
 		setExtensionFields(exts, map);
-
-		// Let's see what openGL version we are too:
-		String version = CoreGL11.glGetString(CoreGL11.GL_VERSION);
-		int i = version.indexOf("1.");
-		if (i > -1) {
-			char c = version.charAt(i + 2);
-			// Each case intentionally falls through!
-			switch (c) {
-				case '4':
-					OpenGL14 = true;
-				case '3':
-					OpenGL13 = true;
-				case '2':
-					OpenGL12 = true;
-				case '1':
-					OpenGL11 = true;
-				case '0':
-					OpenGL10 = true;
-					break ;
-				default:
-					// Unexpected character - ignore
-			}
-		}
-	}
-
-	private static native boolean isWGLEXTExtensionsStringAvailable();
-
-	private static native boolean isWGLARBExtensionsStringAvailable();
-
-	/**
-	 * Determine which WGL extensions are available
-	 */
-	private static void determineAvailableWGLExtensions(HashMap field_map) {
-
-		// First we must determine if WGL_EXT_extensions_string is available
-		WGL_ARB_extensions_string = isWGLARBExtensionsStringAvailable();
-		WGL_EXT_extensions_string = isWGLEXTExtensionsStringAvailable();
-		if (!WGL_EXT_extensions_string && !WGL_ARB_extensions_string)
-			return;
-		final String exts;
-
-		if (WGL_ARB_extensions_string)
-			exts = GL.wglGetExtensionsStringARB();
-		// Remember - this is an HWND not an HDC, which is what's required. The native
-		// code on the other side of wglGetExtensionsStringARB gets the HDC from the HWND
-		// behind the scenes.
-		else
-			exts = GL.wglGetExtensionsStringEXT();
-
-		if (exts == null)
-			return;
-
-		if(org.lwjgl.Sys.DEBUG) {
-			System.out.println("Available WGL extensions:");
-		}
-		setExtensionFields(exts, field_map);
 	}
 }

Index: Window.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Window.java	23 Sep 2003 11:00:37 -0000	1.10
+++ Window.java	26 Sep 2003 13:59:48 -0000	1.11
@@ -24,6 +24,8 @@
 import org.lwjgl.Display;
 import org.lwjgl.Sys;
 
+import java.util.HashSet;
+
 public final class Window {
 
 	static {
@@ -119,13 +121,13 @@
 		return title;
 	}
   
-  /**
-   * @return whether this window is in fullscreen mode
-   */
-  public static boolean isFullscreen() {
-    assert isCreated() : "Cannot determine state of uncreated window";
-    return fullscreen;
-  }
+	/**
+	 * @return whether this window is in fullscreen mode
+	 */
+	public static boolean isFullscreen() {
+		assert isCreated() : "Cannot determine state of uncreated window";
+		return fullscreen;
+	}
 
 	/**
 	 * Set the title of the window. This may be ignored by the underlying OS.
@@ -298,11 +300,14 @@
 		int bpp,
 		int alpha,
 		int depth,
-		int stencil)
+		int stencil,
+		HashSet extensions)
 		throws Exception;
 
 	private static void createWindow() throws Exception {
-		nCreate(title, x, y, width, height, fullscreen, color, alpha, depth, stencil);
+		HashSet extensions = new HashSet();
+		nCreate(title, x, y, width, height, fullscreen, color, alpha, depth, stencil, extensions);
+		GLCaps.determineAvailableExtensions(extensions);
 		created = true;
 	}
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input
In directory sc8-pr-cvs1:/tmp/cvs-serv17606/src/java/org/lwjgl/test/input

Modified Files:
	HWCursorTest.java 
Log Message:
Don't ignore lying drivers

Index: HWCursorTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/HWCursorTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- HWCursorTest.java	8 Sep 2003 16:39:04 -0000	1.17
+++ HWCursorTest.java	26 Sep 2003 13:59:49 -0000	1.18
@@ -337,7 +337,6 @@
     GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
     //sync frame (only works on windows)
-    GLCaps.determineAvailableExtensions();
     if (GLCaps.WGL_EXT_swap_control) {
       GL.wglSwapIntervalEXT(1);
     }