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

Revision: 2730
          http://svn.sourceforge.net/java-game-lib/?rev=2730&view=rev
Author:   elias_naur
Date:     2007-01-17 04:58:38 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Remove the rest of the implementation reflection

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 12:49:20 UTC (rev 2729)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 12:58:38 UTC (rev 2730)
@@ -108,7 +108,6 @@
 	}
 
 	private static SysImplementation createImplementation() {
-		String class_name;
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
 				return new LinuxSysImplementation();

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2007-01-17 12:49:20 UTC (rev 2729)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java	2007-01-17 12:58:38 UTC (rev 2730)
@@ -86,30 +86,20 @@
 
 	static {
 		Sys.initialize();
-		String class_name;
+		implementation = createImplementation();
+	}
+
+	private static AWTCanvasImplementation createImplementation() {
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
-				class_name = "org.lwjgl.opengl.LinuxCanvasImplementation";
-				break;
+				return new LinuxCanvasImplementation();
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.opengl.WindowsCanvasImplementation";
-				break;
+				return new WindowsCanvasImplementation();
 			case LWJGLUtil.PLATFORM_MACOSX:
-				class_name = "org.lwjgl.opengl.MacOSXCanvasImplementation";
-				break;
+				return new MacOSXCanvasImplementation();
 			default:
 				throw new IllegalStateException("Unsupported platform");
 		}
-		try {
-			Class impl_class = Class.forName(class_name);
-			implementation = (AWTCanvasImplementation)impl_class.newInstance();
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InstantiationException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	/**

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java	2007-01-17 12:49:20 UTC (rev 2729)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java	2007-01-17 12:58:38 UTC (rev 2730)
@@ -73,30 +73,20 @@
 
 	static {
 		Sys.initialize();
-		String class_name;
+		implementation = createImplementation();
+	}
+
+	private static ContextImplementation createImplementation() {
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
-				class_name = "org.lwjgl.opengl.LinuxContextImplementation";
-				break;
+				return new LinuxContextImplementation();
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.opengl.WindowsContextImplementation";
-				break;
+				return new WindowsContextImplementation();
 			case LWJGLUtil.PLATFORM_MACOSX:
-				class_name = "org.lwjgl.opengl.MacOSXContextImplementation";
-				break;
+				return new MacOSXContextImplementation();
 			default:
 				throw new IllegalStateException("Unsupported platform");
 		}
-		try {
-			Class impl_class = Class.forName(class_name);
-			implementation = (ContextImplementation)impl_class.newInstance();
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InstantiationException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	PeerInfo getPeerInfo() {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-01-17 12:49:20 UTC (rev 2729)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-01-17 12:58:38 UTC (rev 2730)
@@ -133,30 +133,16 @@
 	}
 
 	private static DisplayImplementation createDisplayImplementation() {
-		String class_name;
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
-			class_name = "org.lwjgl.opengl.LinuxDisplay";
-				break;
+				return new LinuxDisplay();
 			case LWJGLUtil.PLATFORM_WINDOWS:
-			class_name = "org.lwjgl.opengl.WindowsDisplay";
-				break;
+				return new WindowsDisplay();
 			case LWJGLUtil.PLATFORM_MACOSX:
-			class_name = "org.lwjgl.opengl.MacOSXDisplay";
-				break;
+				return new MacOSXDisplay();
 			default:
 				throw new IllegalStateException("Unsupported platform");
 		}
-		try {
-			Class display_class = Class.forName(class_name);
-			return (DisplayImplementation)display_class.newInstance();
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InstantiationException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2729
          http://svn.sourceforge.net/java-game-lib/?rev=2729&view=rev
Author:   elias_naur
Date:     2007-01-17 04:49:20 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Sys.java: Don't use reflection to create platform specific implementations

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 08:22:31 UTC (rev 2728)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 12:49:20 UTC (rev 2729)
@@ -111,27 +111,14 @@
 		String class_name;
 		switch (LWJGLUtil.getPlatform()) {
 			case LWJGLUtil.PLATFORM_LINUX:
-				class_name = "org.lwjgl.LinuxSysImplementation";
-				break;
+				return new LinuxSysImplementation();
 			case LWJGLUtil.PLATFORM_WINDOWS:
-				class_name = "org.lwjgl.WindowsSysImplementation";
-				break;
+				return new org.lwjgl.WindowsSysImplementation();
 			case LWJGLUtil.PLATFORM_MACOSX:
-				class_name = "org.lwjgl.MacOSXSysImplementation";
-				break;
+				return new org.lwjgl.MacOSXSysImplementation();
 			default:
 				throw new IllegalStateException("Unsupported platform");
 		}
-		try {
-			Class impl_class = Class.forName(class_name);
-			return (SysImplementation)impl_class.newInstance();
-		} catch (ClassNotFoundException e) {
-			throw new RuntimeException(e);
-		} catch (IllegalAccessException e) {
-			throw new RuntimeException(e);
-		} catch (InstantiationException e) {
-			throw new RuntimeException(e);
-		}
 	}
 
 	/**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2728
          http://svn.sourceforge.net/java-game-lib/?rev=2728&view=rev
Author:   elias_naur
Date:     2007-01-17 00:22:31 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Bumped native version because of internal linux API change

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 08:16:16 UTC (rev 2727)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-01-17 08:22:31 UTC (rev 2728)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.0-rc1";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 7;
+	static final int JNI_VERSION = 8;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2727
          http://svn.sourceforge.net/java-game-lib/?rev=2727&view=rev
Author:   elias_naur
Date:     2007-01-17 00:16:16 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Linux: Fixed wrong return type in LinuxEvent.nGetKeyAddress

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxEvent.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java	2007-01-17 08:01:49 UTC (rev 2726)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java	2007-01-17 08:16:16 UTC (rev 2727)
@@ -149,7 +149,7 @@
 	public final long getKeyAddress() {
 		return nGetKeyAddress(event_buffer);
 	}
-	private static native int nGetKeyAddress(ByteBuffer event_buffer);
+	private static native long nGetKeyAddress(ByteBuffer event_buffer);
 
 	public final long getKeyTime() {
 		return nGetKeyTime(event_buffer);

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxEvent.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxEvent.c	2007-01-17 08:01:49 UTC (rev 2726)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxEvent.c	2007-01-17 08:16:16 UTC (rev 2727)
@@ -135,9 +135,10 @@
 	return event->xbutton.y;
 }
 
-JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxEvent_nGetKeyAddress(JNIEnv *env, jclass unused, jobject event_buffer) {
+JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxEvent_nGetKeyAddress(JNIEnv *env, jclass unused, jobject event_buffer) {
 	XEvent *event = (XEvent *)(*env)->GetDirectBufferAddress(env, event_buffer);
-	return (jlong)(intptr_t)&(event->xkey);
+	XKeyEvent *key_event = &(event->xkey);
+	return (jlong)(intptr_t)key_event;
 }
 
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxEvent_nGetKeyTime(JNIEnv *env, jclass unused, jobject event_buffer) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2726
          http://svn.sourceforge.net/java-game-lib/?rev=2726&view=rev
Author:   elias_naur
Date:     2007-01-17 00:01:49 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Auto generated files update

Modified Paths:
--------------
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVFramebufferMultisampleCoverage.c

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVFramebufferMultisampleCoverage.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVFramebufferMultisampleCoverage.c	2007-01-17 08:01:37 UTC (rev 2725)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_NVFramebufferMultisampleCoverage.c	2007-01-17 08:01:49 UTC (rev 2726)
@@ -3,10 +3,10 @@
 #include <jni.h>
 #include "extgl.h"
 
-typedef void (APIENTRY *glRenderbufferStorageMultsampleCoverageNVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRY *glRenderbufferStorageMultisampleCoverageNVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFramebufferMultisampleCoverage_nglRenderbufferStorageMultsampleCoverageNV(JNIEnv *env, jclass clazz, jint target, jint coverageSamples, jint colorSamples, jint internalformat, jint width, jint height, jlong function_pointer) {
-	glRenderbufferStorageMultsampleCoverageNVPROC glRenderbufferStorageMultsampleCoverageNV = (glRenderbufferStorageMultsampleCoverageNVPROC)((intptr_t)function_pointer);
-	glRenderbufferStorageMultsampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height);
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVFramebufferMultisampleCoverage_nglRenderbufferStorageMultisampleCoverageNV(JNIEnv *env, jclass clazz, jint target, jint coverageSamples, jint colorSamples, jint internalformat, jint width, jint height, jlong function_pointer) {
+	glRenderbufferStorageMultisampleCoverageNVPROC glRenderbufferStorageMultisampleCoverageNV = (glRenderbufferStorageMultisampleCoverageNVPROC)((intptr_t)function_pointer);
+	glRenderbufferStorageMultisampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2725
          http://svn.sourceforge.net/java-game-lib/?rev=2725&view=rev
Author:   elias_naur
Date:     2007-01-17 00:01:37 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Auto generated files update

Modified Paths:
--------------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2007-01-17 08:00:54 UTC (rev 2724)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ContextCapabilities.java	2007-01-17 08:01:37 UTC (rev 2725)
@@ -989,7 +989,7 @@
 	long NV_fragment_program_glProgramNamedParameter4dNV_pointer;
 	long NV_fragment_program_glGetProgramNamedParameterfvNV_pointer;
 	long NV_fragment_program_glGetProgramNamedParameterdvNV_pointer;
-	long NV_framebuffer_multisample_coverage_glRenderbufferStorageMultsampleCoverageNV_pointer;
+	long NV_framebuffer_multisample_coverage_glRenderbufferStorageMultisampleCoverageNV_pointer;
 	long NV_geometry_program4_glProgramVertexLimitNV_pointer;
 	long NV_geometry_program4_glFramebufferTextureEXT_pointer;
 	long NV_geometry_program4_glFramebufferTextureLayerEXT_pointer;
@@ -2214,7 +2214,7 @@
 
 	private boolean NV_framebuffer_multisample_coverage_initNativeFunctionAddresses() {
 		return 
-			(NV_framebuffer_multisample_coverage_glRenderbufferStorageMultsampleCoverageNV_pointer = GLContext.getFunctionAddress("glRenderbufferStorageMultsampleCoverageNV")) != 0;
+			(NV_framebuffer_multisample_coverage_glRenderbufferStorageMultisampleCoverageNV_pointer = GLContext.getFunctionAddress("glRenderbufferStorageMultisampleCoverageNV")) != 0;
 	}
 
 	private boolean NV_geometry_program4_initNativeFunctionAddresses() {

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java	2007-01-17 08:00:54 UTC (rev 2724)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/NVFramebufferMultisampleCoverage.java	2007-01-17 08:01:37 UTC (rev 2725)
@@ -17,11 +17,11 @@
 	}
 
 
-	public static void glRenderbufferStorageMultsampleCoverageNV(int target, int coverageSamples, int colorSamples, int internalformat, int width, int height) {
+	public static void glRenderbufferStorageMultisampleCoverageNV(int target, int coverageSamples, int colorSamples, int internalformat, int width, int height) {
 		ContextCapabilities caps = GLContext.getCapabilities();
-		long function_pointer = caps.NV_framebuffer_multisample_coverage_glRenderbufferStorageMultsampleCoverageNV_pointer;
+		long function_pointer = caps.NV_framebuffer_multisample_coverage_glRenderbufferStorageMultisampleCoverageNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglRenderbufferStorageMultsampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height, function_pointer);
+		nglRenderbufferStorageMultisampleCoverageNV(target, coverageSamples, colorSamples, internalformat, width, height, function_pointer);
 	}
-	private static native void nglRenderbufferStorageMultsampleCoverageNV(int target, int coverageSamples, int colorSamples, int internalformat, int width, int height, long function_pointer);
+	private static native void nglRenderbufferStorageMultisampleCoverageNV(int target, int coverageSamples, int colorSamples, int internalformat, int width, int height, long function_pointer);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2724
          http://svn.sourceforge.net/java-game-lib/?rev=2724&view=rev
Author:   elias_naur
Date:     2007-01-17 00:00:54 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Fixed type in NV_framebuffer_multisample_coverage.java

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java	2007-01-13 19:24:05 UTC (rev 2723)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_framebuffer_multisample_coverage.java	2007-01-17 08:00:54 UTC (rev 2724)
@@ -40,6 +40,6 @@
 	int GL_RENDERBUFFER_COVERAGE_SAMPLES_NV = 0x8CAB;
 	int GL_RENDERBUFFER_COLOR_SAMPLES_NV = 0x8E10;
 
-	void glRenderbufferStorageMultsampleCoverageNV(@GLenum int target, @GLsizei int coverageSamples, @GLsizei int colorSamples,
+	void glRenderbufferStorageMultisampleCoverageNV(@GLenum int target, @GLsizei int coverageSamples, @GLsizei int colorSamples,
 												   @GLenum int internalformat, @GLsizei int width, @GLsizei int height);
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.