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

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

Modified Files:
	org_lwjgl_opengl_NVProgram.cpp 
Log Message:
Various fixes

Index: org_lwjgl_opengl_NVProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_NVProgram.cpp	9 Mar 2004 09:25:10 -0000	1.5
+++ org_lwjgl_opengl_NVProgram.cpp	9 Apr 2004 21:52:42 -0000	1.6
@@ -181,5 +181,5 @@
 	};
 	int num_functions = NUMFUNCTIONS(functions);
 	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/NVProgram");
-	extgl_InitializeClass(env, clazz, NULL, "<NVProgram>", num_functions, functions);
+	extgl_InitializeClass(env, clazz, NULL, NULL, num_functions, functions);
 }

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

Modified Files:
	org_lwjgl_opengl_ARBProgram.cpp 
Log Message:
Various fixes

Index: org_lwjgl_opengl_ARBProgram.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_opengl_ARBProgram.cpp	9 Mar 2004 09:25:09 -0000	1.5
+++ org_lwjgl_opengl_ARBProgram.cpp	9 Apr 2004 21:52:41 -0000	1.6
@@ -238,6 +238,6 @@
 	};
 	int num_functions = NUMFUNCTIONS(functions);
 	jclass clazz = ext_ResetClass(env, "org/lwjgl/opengl/ARBProgram");
-	extgl_InitializeClass(env, clazz, NULL, "<ARBProgram>", num_functions, functions);
+	extgl_InitializeClass(env, clazz, NULL, NULL, num_functions, functions);
 }
 

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

Modified Files:
	common_tools.cpp extal.cpp 
Log Message:
Various fixes

Index: extal.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extal.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- extal.cpp	27 Mar 2004 14:42:47 -0000	1.19
+++ extal.cpp	9 Apr 2004 21:52:41 -0000	1.20
@@ -82,9 +82,6 @@
 /* Loads OpenAL ALC functions */
 extern bool LoadALC(JNIEnv *env);
 
-/* Loads any extensions to OpenAL */
-static bool LoadALExtensions(void);
-
 static void *NativeGetFunctionPointer(const char *function) {
 #ifdef _WIN32
 	return GetProcAddress(handleOAL, function);
@@ -251,13 +248,6 @@
 		throwException(env, "Could not load ALC function pointers.");
 		return;
 	}
-
-	//load OpenAL extensions
-	if(!LoadALExtensions()) {
-		DeInitializeOpenAL();
-		throwException(env, "Could not load AL extension function pointers.");
-		return;
-	}
 }
 
 /**
@@ -268,15 +258,6 @@
 	handleOAL = 0;
 }
 
-/**
- * Loads the OpenAL extensions functions
- *
- * @return true if all methods were loaded, false if one of the methods could not be loaded
- */
-static bool LoadALExtensions() {
-	return true;
-}
-
 bool extal_InitializeClass(JNIEnv *env, jclass clazz, jobject ext_set, const char *ext_name, int num_functions, JavaMethodAndExtFunction *functions) {
 	return ext_InitializeClass(env, clazz, ext_set, ext_name, &extal_GetProcAddress, num_functions, functions);
 }

Index: common_tools.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- common_tools.cpp	27 Mar 2004 15:05:24 -0000	1.17
+++ common_tools.cpp	9 Apr 2004 21:52:41 -0000	1.18
@@ -105,11 +105,9 @@
 	return num_events;
 }
 
-/*int getEventBufferSize(event_queue_t *event_queue) {
-	return EVENT_BUFFER_SIZE;
-}
-*/
 static void throwGeneralException(JNIEnv * env, const char *exception_name, const char * err) {
+	if (env->ExceptionCheck() == JNI_TRUE)
+		return; // The JVM crashes if we try to throw two exceptions from one native call
 	jclass cls = env->FindClass(exception_name);
 	env->ThrowNew(cls, err);
 	env->DeleteLocalRef(cls);
@@ -169,9 +167,11 @@
 		if (function->ext_function_name != NULL) {
 			void *ext_func_pointer = gpa(function->ext_function_name);
 			if (ext_func_pointer == NULL) {
-				printf("NOTICE: %s disabled because of missing driver symbols\n", ext_name);
-				if (ext_set != NULL)
-					ext_removeExtension(env, ext_set, ext_name);
+				if (ext_name != NULL) {
+					printfDebug("NOTICE: %s disabled because of missing driver symbols\n", ext_name);
+					if (ext_set != NULL)
+						ext_removeExtension(env, ext_set, ext_name);
+				}
 				free(methods);
 				return false;
 			}
@@ -185,9 +185,12 @@
 	}
 	jint result = env->RegisterNatives(clazz, methods, num_functions);
 	free(methods);
-	if (result != 0)
-		printfDebug("Could not register natives for extension %s\n", ext_name);
-	return true;
+	if (result != 0) {
+		if (ext_name != NULL)
+			printfDebug("Could not register natives for extension %s\n", ext_name);
+		return false;
+	} else
+		return true;
 }
 
 bool getBooleanProperty(JNIEnv *env, const char* propertyName) {

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

Modified Files:
	EAXTest.java MovingSoundTest.java OpenALCreationTest.java 
	PlayTestMemory.java StressTest.java 
Log Message:
Fix rest of the openal examples

Index: PlayTestMemory.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTestMemory.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- PlayTestMemory.java	26 Feb 2004 21:51:58 -0000	1.15
+++ PlayTestMemory.java	9 Apr 2004 21:38:31 -0000	1.16
@@ -111,14 +111,14 @@
         //ALUTLoadWAVData file = alut.loadWAVMemory(Sys.getDirectBufferAddress(filebuffer));
         if(usingVorbis) {
           // pass directly to buffer data
-          AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1);
+          AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1);
           filebuffer.clear();
         } else {
           // load wave data from buffer
           WaveData wavefile = WaveData.create(filebuffer.array());
 
           //copy to buffers
-          AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate);
+          AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.samplerate);
         
           //unload file again
           wavefile.dispose();        

Index: StressTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/StressTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- StressTest.java	26 Feb 2004 21:51:58 -0000	1.11
+++ StressTest.java	9 Apr 2004 21:38:31 -0000	1.12
@@ -108,7 +108,6 @@
         buffers.get(i - 1),
         data.format,
         data.data,
-        data.data.capacity(),
         data.samplerate);
 
       if (AL10.alGetError() != AL10.AL_NO_ERROR) {
@@ -218,4 +217,4 @@
     StressTest stressTest = new StressTest();
     stressTest.execute(args);
   }
-}
\ No newline at end of file
+}

Index: MovingSoundTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/MovingSoundTest.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- MovingSoundTest.java	26 Feb 2004 21:51:58 -0000	1.27
+++ MovingSoundTest.java	9 Apr 2004 21:38:31 -0000	1.28
@@ -116,7 +116,6 @@
 			buffers.get(0),
 			wavefile.format,
 			wavefile.data,
-			wavefile.data.capacity(),
 			wavefile.samplerate);
 		if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) {
 			exit(lastError);

Index: EAXTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/EAXTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- EAXTest.java	26 Feb 2004 21:51:58 -0000	1.12
+++ EAXTest.java	9 Apr 2004 21:38:30 -0000	1.13
@@ -121,7 +121,7 @@
     // load sound files (left, center, right).wav
     Sys.log("Loading Footsteps.wav");
     WaveData footsteps = WaveData.create("Footsteps.wav");
-    AL10.alBufferData(soundBuffers.get(0), footsteps.format, footsteps.data, footsteps.data.capacity(), footsteps.samplerate);
+    AL10.alBufferData(soundBuffers.get(0), footsteps.format, footsteps.data, footsteps.samplerate);
     AL10.alSourcef(soundSources.get(0), AL10.AL_PITCH, 1.0f);
     AL10.alSourcef(soundSources.get(0), AL10.AL_GAIN, 1.0f);
     AL10.alSourcei(soundSources.get(0), AL10.AL_BUFFER, soundBuffers.get(0));
@@ -286,4 +286,4 @@
     EAXTest eaxTest = new EAXTest();
     eaxTest.execute(args);
   }
-}
\ No newline at end of file
+}

Index: OpenALCreationTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/OpenALCreationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- OpenALCreationTest.java	26 Feb 2004 21:51:58 -0000	1.9
+++ OpenALCreationTest.java	9 Apr 2004 21:38:31 -0000	1.10
@@ -157,7 +157,6 @@
 			buffers.get(0),
 			wavefile.format,
 			wavefile.data,
-			wavefile.data.capacity(),
 			wavefile.samplerate);
 		if ((lastError = AL10.alGetError()) != AL10.AL_NO_ERROR) {
 			exit(lastError);
@@ -221,4 +220,4 @@
 		OpenALCreationTest oalCreationTest = new OpenALCreationTest();
 		oalCreationTest.execute(args);
 	}
-}
\ No newline at end of file
+}

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

Modified Files:
	org_lwjgl_openal_AL10.cpp 
Log Message:


Index: org_lwjgl_openal_AL10.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_AL10.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_openal_AL10.cpp	22 Mar 2004 06:30:39 -0000	1.5
+++ org_lwjgl_openal_AL10.cpp	9 Apr 2004 19:26:53 -0000	1.6
@@ -776,7 +776,7 @@
 		{"nalGenBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalGenBuffers, "alGenBuffers", (void**)&alGenBuffers},
 		{"nalDeleteBuffers", "(ILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalDeleteBuffers, "alDeleteBuffers", (void**)&alDeleteBuffers},
 		{"alIsBuffer", "(I)Z", (void*)&Java_org_lwjgl_openal_AL10_alIsBuffer, "alIsBuffer", (void**)&alIsBuffer},
-		{"nalBufferData", "(IILjava/nio/ByteBuffer;III)V", (void*)&Java_org_lwjgl_openal_AL10_nalBufferData, "alBufferData", (void**)&alBufferData},
+		{"nalBufferData", "(IILjava/nio/Buffer;III)V", (void*)&Java_org_lwjgl_openal_AL10_nalBufferData, "alBufferData", (void**)&alBufferData},
 		{"alGetBufferi", "(II)I", (void*)&Java_org_lwjgl_openal_AL10_alGetBufferi, "alGetBufferi", (void**)&alGetBufferi},
 		{"alGetBufferf", "(II)F", (void*)&Java_org_lwjgl_openal_AL10_alGetBufferf, "alGetBufferf", (void**)&alGetBufferf},
 		{"nalSourceQueueBuffers", "(IILjava/nio/IntBuffer;I)V", (void*)&Java_org_lwjgl_openal_AL10_nalSourceQueueBuffers, "alSourceQueueBuffers", (void**)&alSourceQueueBuffers},

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

Modified Files:
	BasicTest.java PlayTest.java PositionTest.java 
Log Message:
removed size argument from alBufferData and added additional buffer types

Index: PositionTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PositionTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- PositionTest.java	4 Apr 2004 12:49:09 -0000	1.18
+++ PositionTest.java	9 Apr 2004 15:22:20 -0000	1.19
@@ -164,7 +164,7 @@
 
     Sys.log("Loading left.wav");
     WaveData left = WaveData.create("left.wav");
-    AL10.alBufferData(soundBuffers.get(LEFT), left.format, left.data, left.data.capacity(), left.samplerate);
+    AL10.alBufferData(soundBuffers.get(LEFT), left.format, left.data, left.samplerate);
     AL10.alSourcef(soundSources.get(LEFT), AL10.AL_PITCH, 1.0f);
     AL10.alSourcef(soundSources.get(LEFT), AL10.AL_GAIN, 1.0f);
     AL10.alSource(soundSources.get(LEFT), AL10.AL_POSITION, leftPosition);
@@ -174,7 +174,7 @@
 
     Sys.log("Loading center.wav");
     WaveData center = WaveData.create("center.wav");
-    AL10.alBufferData(soundBuffers.get(CENTER), center.format, center.data, center.data.capacity(), center.samplerate);
+    AL10.alBufferData(soundBuffers.get(CENTER), center.format, center.data, center.samplerate);
     AL10.alSourcef(soundSources.get(CENTER), AL10.AL_PITCH, 1.0f);
     AL10.alSourcef(soundSources.get(CENTER), AL10.AL_GAIN, 1.0f);
     AL10.alSource(soundSources.get(CENTER), AL10.AL_POSITION, centerPosition);
@@ -184,7 +184,7 @@
 
     Sys.log("Loading right.wav");
     WaveData right = WaveData.create("right.wav");
-    AL10.alBufferData(soundBuffers.get(RIGHT), right.format, right.data, right.data.capacity(), right.samplerate);
+    AL10.alBufferData(soundBuffers.get(RIGHT), right.format, right.data, right.samplerate);
     AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_PITCH, 1.0f);
     AL10.alSourcef(soundSources.get(RIGHT), AL10.AL_GAIN, 1.0f);
     AL10.alSource(soundSources.get(RIGHT), AL10.AL_POSITION, rightPosition);
@@ -513,4 +513,4 @@
 
     }
   }
-}
\ No newline at end of file
+}

Index: PlayTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/PlayTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PlayTest.java	26 Feb 2004 21:51:58 -0000	1.14
+++ PlayTest.java	9 Apr 2004 15:22:19 -0000	1.15
@@ -103,14 +103,14 @@
           ByteBuffer filebuffer = getData(args[0]);
           
           // pass directly to buffer data
-          AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1, -1);
+          AL10.alBufferData(buffers.get(0), AL10.AL_FORMAT_VORBIS_EXT, filebuffer, -1);
           filebuffer.clear();
         } else {
           // load wave data from buffer
           WaveData wavefile = WaveData.create(args[0]);
 
           //copy to buffers
-          AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.data.capacity(), wavefile.samplerate);
+          AL10.alBufferData(buffers.get(0), wavefile.format, wavefile.data, wavefile.samplerate);
           
           //unload file again
           wavefile.dispose();        
@@ -215,4 +215,4 @@
         PlayTest playTest = new PlayTest();
         playTest.execute(args);
     }
-}
\ No newline at end of file
+}

Index: BasicTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/openal/BasicTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- BasicTest.java	25 Mar 2004 22:44:31 -0000	1.16
+++ BasicTest.java	9 Apr 2004 15:22:19 -0000	1.17
@@ -133,4 +133,4 @@
     alExit();
     System.exit(-1);
   }
-}
\ No newline at end of file
+}

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

Modified Files:
	AL10.java 
Log Message:
removed size argument from alBufferData and added additional buffer types

Index: AL10.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL10.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AL10.java	27 Mar 2004 11:55:06 -0000	1.3
+++ AL10.java	9 Apr 2004 15:22:19 -0000	1.4
@@ -31,9 +31,11 @@
  */
 package org.lwjgl.openal;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
 import java.nio.IntBuffer;
+import java.nio.FloatBuffer;
 /**
  * $Id$
  * <br>
@@ -972,15 +974,27 @@
 		int buffer,
 		int format,
 		ByteBuffer data,
-		int size,
 		int freq) {
-			// TODO: add an assertion here?
 			nalBufferData(buffer, format, data, data.position(), data.remaining(), freq);
 		}
+	public static void alBufferData(
+		int buffer,
+		int format,
+		ShortBuffer data,
+		int freq) {
+			nalBufferData(buffer, format, data, data.position() << 1, data.remaining() << 1, freq);
+		}
+	public static void alBufferData(
+		int buffer,
+		int format,
+		IntBuffer data,
+		int freq) {
+			nalBufferData(buffer, format, data, data.position() << 2, data.remaining() << 2, freq);
+		}
 	private static native void nalBufferData(
 		int buffer,
 		int format,
-		ByteBuffer data,
+		Buffer data,
 		int offset,
 		int size,
 		int freq);