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

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

Modified Files:
	Display.java 
Log Message:
Only initialize Controller on win32

Index: Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Display.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Display.java	2 Nov 2004 18:15:39 -0000	1.27
+++ Display.java	3 Nov 2004 13:58:06 -0000	1.28
@@ -107,6 +107,8 @@
 			class_name = "org.lwjgl.opengl.LinuxDisplay";
 		} else if (os_name.startsWith("Windows")) {
 			class_name = "org.lwjgl.opengl.Win32Display";
+		} else if (os_name.startsWith("Mac")) {
+			class_name = "org.lwjgl.opengl.MacOSXDisplay";
 		} else
 			throw new IllegalStateException("The platform " + os_name + " is not supported");
 		try {
@@ -577,7 +579,7 @@
 					}
 				}
 			}
-			if (!Controller.isCreated() && !Boolean.getBoolean("org.lwjgl.opengl.Display.nocontroller")) {
+			if (System.getProperty("os.name").startsWith("Win") && !Controller.isCreated() && !Boolean.getBoolean("org.lwjgl.opengl.Display.nocontroller")) {
 				try {
 					Controller.create();
 				} catch (LWJGLException e) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11455/input

Modified Files:
	Mouse.java 
Log Message:
Don't set native cursor if not supported by the platform

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- Mouse.java	2 Nov 2004 12:48:57 -0000	1.67
+++ Mouse.java	3 Nov 2004 13:49:08 -0000	1.68
@@ -194,7 +194,7 @@
 	 */
 	public static Cursor setNativeCursor(Cursor cursor) throws LWJGLException {
 		if ((getNativeCursorCaps() & CURSOR_ONE_BIT_TRANSPARENCY) == 0)
-				throw new IllegalStateException("Mouse doesn't support native cursors");
+			throw new IllegalStateException("Mouse doesn't support native cursors");
 		Cursor oldCursor = currentCursor;
 		currentCursor = cursor;
 		if (isCreated()) {
@@ -275,7 +275,8 @@
 		buttonCount = Display.getImplementation().getButtonCount();
 		buttons = BufferUtils.createByteBuffer(buttonCount);
 		coord_buffer = BufferUtils.createIntBuffer(3);
-		setNativeCursor(currentCursor);
+		if (currentCursor != null)
+			setNativeCursor(currentCursor);
 		setGrabbed(isGrabbed);
 	}
 

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

Removed Files:
	org_lwjgl_Sys.cpp 
Log Message:


--- org_lwjgl_Sys.cpp DELETED ---

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

Modified Files:
	extal.c extal.h extgl.c org_lwjgl_openal_AL10.c 
	org_lwjgl_openal_ALC.c 
Log Message:
Added initialization to all global symbols, to please MacOSX

Index: org_lwjgl_openal_AL10.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_openal_AL10.c	10 Sep 2004 08:13:48 -0000	1.1
+++ org_lwjgl_openal_AL10.c	3 Nov 2004 12:10:20 -0000	1.2
@@ -98,11 +98,11 @@
 typedef ALvoid	    (ALAPIENTRY *alDopplerFactorPROC)( ALfloat value );
 typedef ALvoid	    (ALAPIENTRY *alDopplerVelocityPROC)( ALfloat value );
 
-alIsExtensionPresentPROC alIsExtensionPresent;
-alGetStringPROC alGetString;
-alGetErrorPROC alGetError;
+alIsExtensionPresentPROC alIsExtensionPresent = NULL;
+alGetStringPROC alGetString = NULL;
+alGetErrorPROC alGetError = NULL;
 
-alEnablePROC alEnable;
+alEnablePROC alEnable = NULL;
 static alDisablePROC alDisable;
 static alIsEnabledPROC alIsEnabled;
 //static alHintPROC alHint;

Index: extal.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- extal.h	2 Nov 2004 15:51:08 -0000	1.29
+++ extal.h	3 Nov 2004 12:10:20 -0000	1.30
@@ -46,8 +46,8 @@
 #include <alctypes.h>
 #endif
 #ifdef _MACOSX
-#include <OpenAL/alctypes.h>
-#include <OpenAL/altypes.h>
+#include <AL/alctypes.h>
+#include <AL/altypes.h>
 #endif
 
 #include <jni.h>
@@ -59,7 +59,7 @@
 extern "C" {
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32)
  #ifdef _OPENAL32LIB
   #define ALCAPI __declspec(dllexport)
  #else
@@ -71,49 +71,43 @@
 
  #define ALCAPIENTRY __cdecl
 #else
- #ifdef _MACOSX
-  #if _MACOSX
- typedef struct ALCdevice_struct ALCdevice;
- typedef struct ALCcontext_struct ALCcontext;
- 
-  #endif
- #endif
- #define ALCAPI
- #define ALCAPIENTRY
-
-/** ALC boolean type. */
-typedef char ALCboolean;
+  #define ALCAPI
+  #define ALCAPIENTRY
 
-/** ALC 8bit signed byte. */
-typedef char ALCbyte;
+  #ifdef _X11
+   /** ALC boolean type. */
+   typedef char ALCboolean;
 
-/** ALC 8bit unsigned byte. */
-typedef unsigned char ALCubyte;
+   /** ALC 8bit signed byte. */
+   typedef char ALCbyte;
 
-/** ALC 16bit signed short integer type. */
-typedef short ALCshort;
+   /** ALC 8bit unsigned byte. */
+   typedef unsigned char ALCubyte;
 
-/** ALC 16bit unsigned short integer type. */
-typedef unsigned short ALCushort;
+   /** ALC 16bit signed short integer type. */
+   typedef short ALCshort;
 
-/** ALC 32bit unsigned integer type. */
-typedef unsigned ALCuint;
+   /** ALC 16bit unsigned short integer type. */
+   typedef unsigned short ALCushort;
 
-/** ALC 32bit signed integer type. */
-typedef int ALCint;
+   /** ALC 32bit unsigned integer type. */
+   typedef unsigned ALCuint;
 
-/** ALC 32bit floating point type. */
-typedef float ALCfloat;
+   /** ALC 32bit signed integer type. */
+   typedef int ALCint;
 
-/** ALC 64bit double point type. */
-typedef double ALCdouble;
+   /** ALC 32bit floating point type. */
+   typedef float ALCfloat;
 
-/** ALC 32bit type. */
-typedef unsigned int ALCsizei;
+   /** ALC 64bit double point type. */
+   typedef double ALCdouble;
 
-/** ALC void type */
-typedef void ALCvoid;
+   /** ALC 32bit type. */
+   typedef unsigned int ALCsizei;
 
+   /** ALC void type */
+   typedef void ALCvoid;
+  #endif
 #endif
 
 #ifdef _WIN32

Index: extal.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- extal.c	2 Nov 2004 15:51:08 -0000	1.16
+++ extal.c	3 Nov 2004 12:10:20 -0000	1.17
@@ -65,10 +65,10 @@
 #include <mach-o/dyld.h>
 #include <stdlib.h>
 #include <string.h>
-const struct mach_header* handleOAL;
+const struct mach_header* handleOAL = NULL;
 #endif
 
-alGetProcAddressPROC alGetProcAddress;
+alGetProcAddressPROC alGetProcAddress = NULL;
 
 /* Loads OpenAL */
 static bool LoadOpenAL(JNIEnv *env, jobjectArray oalPaths);

Index: extgl.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- extgl.c	2 Nov 2004 15:51:08 -0000	1.26
+++ extgl.c	3 Nov 2004 12:10:20 -0000	1.27
@@ -85,7 +85,6 @@
 aglSurfaceTexturePROC aglSurfaceTexture = NULL;
 #endif
 
-
 struct ExtensionTypes extgl_Extensions;
 
 #ifdef _WIN32
@@ -269,7 +268,8 @@
 /*-----------------------------------------------------*/
 #ifdef _MACOSX
 
-bool extgl_InitAGL(JNIEnv *env)
+// Commecnted out as AGL is not needed
+/*bool extgl_InitAGL(JNIEnv *env)
 {
 	aglChoosePixelFormat = (aglChoosePixelFormatPROC)extgl_GetProcAddress("aglChoosePixelFormat");
 	aglDestroyPixelFormat = (aglDestroyPixelFormatPROC)extgl_GetProcAddress("aglDestroyPixelFormat");
@@ -306,7 +306,7 @@
 	aglSurfaceTexture = (aglSurfaceTexturePROC)extgl_GetProcAddress("aglSurfaceTexture");
 	return !extgl_error; // Split out AGL into extgl_agl.cpp like wgl and glx and replace with InitializeFunctions
 }
-
+*/
 #endif
 /*-----------------------------------------------------*/
 /* AGL stuff END*/

Index: org_lwjgl_openal_ALC.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_ALC.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_openal_ALC.c	10 Sep 2004 09:56:26 -0000	1.2
+++ org_lwjgl_openal_ALC.c	3 Nov 2004 12:10:20 -0000	1.3
@@ -59,7 +59,7 @@
 //typedef ALCvoid*    (ALCAPIENTRY *alcGetProcAddressPROC)(ALCdevice *device,ALCubyte *funcName);
 typedef ALCenum	    (ALCAPIENTRY *alcGetEnumValuePROC)(ALCdevice *device,ALCubyte *enumName);
 
-alcGetCurrentContextPROC alcGetCurrentContext;
+alcGetCurrentContextPROC alcGetCurrentContext = NULL;
 static alcGetStringPROC alcGetString;
 static alcGetIntegervPROC alcGetIntegerv;
 static alcOpenDevicePROC alcOpenDevice;