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

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

Modified Files:
	org_lwjgl_fmod3_FSound.cpp 
Log Message:
last of the 3d functions

Index: org_lwjgl_fmod3_FSound.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_fmod3_FSound.cpp	21 Jul 2004 14:48:15 -0000	1.4
+++ org_lwjgl_fmod3_FSound.cpp	10 Aug 2004 17:14:56 -0000	1.5
@@ -581,7 +581,7 @@
 * Signature: (IIIIIII)Z
 */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1SetLevels(JNIEnv * env, jclass clazz, jint, jint, jint, jint, jint, jint, jint) {
-  //XBOX only
+  //XBOX only - snowballs chance in hell we will get to support that!
   return false;
 }
 
@@ -875,9 +875,16 @@
 * Method:    nFSOUND_3D_Listener_GetAttributes
 * Signature: (Ljava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;ILjava/nio/FloatBuffer;I)V
 */
-JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_13D_1Listener_1GetAttributes(JNIEnv * env, jclass clazz, jobject, jint, jobject, jint, jobject, jint, jobject, jint, jobject, jint, jobject, jint, jobject, jint, jobject, jint) {
-  //XXX
-  throwFMODException(env, "missing implementation");
+JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_13D_1Listener_1GetAttributes(JNIEnv * env, jclass clazz, jobject pos, jint posOffset, jobject vel, jint velOffset, jobject fx, jint fxOffset, jobject fy, jint fyOffset, jobject fz, jint fzOffset, jobject tx, jint txOffset, jobject ty, jint tyOffset, jobject tz, jint tzOffset) {
+	float* nPos 	= (pos != NULL) ? posOffset + (float *) env->GetDirectBufferAddress(pos) 	: NULL;
+	float* nVel 	= (vel != NULL) 	? velOffset 	+ (float *) env->GetDirectBufferAddress(vel) 		: NULL;
+	float* nFx 		= (fx != NULL) 	? fxOffset 	+ (float *) env->GetDirectBufferAddress(fx) 		: NULL;
+	float* nFy 		= (fy != NULL) 	? fyOffset 	+ (float *) env->GetDirectBufferAddress(fy) 		: NULL;
+	float* nFz 		= (fz != NULL) 	? fzOffset 	+ (float *) env->GetDirectBufferAddress(fz) 		: NULL;
+	float* nTx 		= (tx != NULL) 	? txOffset 	+ (float *) env->GetDirectBufferAddress(tx) 		: NULL;
+	float* nTy 		= (ty != NULL) 	? tyOffset 	+ (float *) env->GetDirectBufferAddress(ty) 		: NULL;
+	float* nTz 		= (tz != NULL) 	? tzOffset 	+ (float *) env->GetDirectBufferAddress(tz) 		: NULL;
+	fmod_instance->FSOUND_3D_Listener_GetAttributes(nPos, nVel, nFx, nFy, nFz, nTx, nTy, nTz);	
 }
 
 /*
@@ -885,9 +892,10 @@
 * Method:    nFSOUND_3D_Listener_SetAttributes
 * Signature: (Ljava/nio/FloatBuffer;ILjava/nio/FloatBuffer;IFFFFFF)V
 */
-JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_13D_1Listener_1SetAttributes(JNIEnv * env, jclass clazz, jobject, jint, jobject, jint, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat) {
-  //XXX
-  throwFMODException(env, "missing implementation");
+JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_13D_1Listener_1SetAttributes(JNIEnv * env, jclass clazz, jobject pos, jint posOffset, jobject vel, jint velOffset, jfloat fx, jfloat fy, jfloat fz, jfloat tx, jfloat ty, jfloat tz) {
+	float* nPos = posOffset + (float *) env->GetDirectBufferAddress(pos);
+	float* nVel = velOffset + (float *) env->GetDirectBufferAddress(vel);
+  fmod_instance->FSOUND_3D_Listener_SetAttributes(nPos, nVel, fx, fy, fz, tx, ty, tz);
 }
 
 /*

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

Modified Files:
	AL.java 
Log Message:
Added getContext()

Index: AL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/AL.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- AL.java	1 Aug 2004 21:26:25 -0000	1.31
+++ AL.java	10 Aug 2004 10:31:52 -0000	1.32
@@ -255,4 +255,15 @@
 	}
 
 	private static native void resetNativeStubs(Class clazz);
+	
+	/**
+	 * Gets a handle to the current openAL context. The handle is "opaque" right now
+	 * because, realistically, there is nothing you can actually do with it. If it turns
+	 * out that there are useful things you can do with it then it'll return an instance
+	 * of ALCcontext (which will have to become a public class)
+	 * @return an opaque handle to the AL context.
+	 */
+	public static Object getContext() {
+		return context;
+	}
 }