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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test
In directory usw-pr-cvs1:/tmp/cvs-serv2247/org/lwjgl/openal/test

Added Files:
	ALUTTest.java 
Log Message:
initial import of ALUTTest - basically PlayTest, using ALUT for initialization and deinitialization


--- NEW FILE: ALUTTest.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALUTTest.java
/*
 * Copyright (c) 2002 Light Weight Java Game Library Project
 * 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 'Light Weight Java Game Library' 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.openal.test;

import org.lwjgl.openal.AL;
import org.lwjgl.openal.ALC;
import org.lwjgl.openal.ALCcontext;
import org.lwjgl.openal.ALCdevice;
import org.lwjgl.openal.ALUT;
import org.lwjgl.openal.ALUTLoadWAVData;

import java.io.*;
import java.net.*;
/**
 * $Id: ALUTTest.java,v 1.1 2002/08/27 23:30:21 matzon Exp $
 *
 * This is a basic play test using ALUT
 * Yes, over zealous use of getError ;)
 *
 * @author Brian Matzon <br...@ma...>
 * @version $Revision: 1.1 $
 */
public class ALUTTest extends BasicTest {
    
    /**
     * Creates an instance of ALUTTest
     */
    public ALUTTest() {
        super();
    }
    
    /**
     * Runs the actual test, using supplied arguments
     */
    protected void execute(String[] args) {
        if(args.length < 1) {
            System.out.println("please specify filename to play");
            return;
        }        
        
        int lastError;
        
        //initialize AL, using ALUT
        alut.init(args);
        
        //create 1 buffer and 1 source
        int[] buffers   = new int[1];
        int[] sources   = new int[1];
        
        // al generate buffers and sources
        al.genBuffers(1, buffers);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }

        al.genSources(1, sources);        
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }
        
        //load wave data
        ALUTLoadWAVData file = alut.loadWAVFile(args[0]);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }
        
        
        //copy to buffers
        al.bufferData(buffers[0], file.format, file.data, file.size, file.freq);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //unload file again
        alut.unloadWAV(file.format, file.data, file.size, file.freq);        
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //set up source input
        al.sourcei(sources[0], AL.BUFFER, buffers[0]);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //lets loop the sound
        al.sourcei(sources[0], AL.LOOPING, AL.TRUE);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //play source 0
        al.sourcePlay(sources[0]);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //wait 5 secs
        try {
            System.out.println("Waiting 5 seconds for sound to complete");
            Thread.sleep(5000);
        } catch (InterruptedException inte) {
        }
        
        //stop source 0
        al.sourceStop(sources[0]);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        
        
        //delete buffers and sources
        al.deleteSources(1, sources);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }
        
        al.deleteBuffers(1, buffers);
        if((lastError = al.getError()) != AL.NO_ERROR) {
            exit(lastError);
        }        

        //shutdown using ALUT
        alut.exit();
    }
    
    /**
     * main entry point
     *
     * @param args String array containing arguments
     */
    public static void main(String[] args) {
        ALUTTest alutTest = new ALUTTest();
        alutTest.execute(args);
    }
}

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test
In directory usw-pr-cvs1:/tmp/cvs-serv1564/org/lwjgl/openal/test

Modified Files:
	PlayTest.java 
Log Message:
add: mo javadoc


Index: PlayTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PlayTest.java	27 Aug 2002 17:48:30 -0000	1.4
+++ PlayTest.java	27 Aug 2002 23:28:52 -0000	1.5
@@ -57,7 +57,10 @@
     public PlayTest() {
         super();
     }
-    
+
+    /**
+     * Runs the actual test, using supplied arguments
+     */
     protected void execute(String[] args) {
         if(args.length < 1) {
             System.out.println("please specify filename to play");

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test
In directory usw-pr-cvs1:/tmp/cvs-serv31220/org/lwjgl/openal/test

Modified Files:
	ALCTest.java 
Log Message:
add: last test added. ALCTest complete sans some stuff that doesn't work on win32 - awaiting fix from OpenAL people


Index: ALCTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALCTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALCTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ALCTest.java	27 Aug 2002 17:49:53 -0000	1.1
+++ ALCTest.java	27 Aug 2002 23:21:03 -0000	1.2
@@ -35,8 +35,10 @@
 import org.lwjgl.openal.ALC;
 import org.lwjgl.openal.ALCcontext;
 import org.lwjgl.openal.ALCdevice;
+import org.lwjgl.Sys;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 /**
  * $Id$
  *
@@ -69,17 +71,18 @@
         }
         
         //create attribute list for context creation
-        ByteBuffer buffer = ByteBuffer.allocate(28);
+        ByteBuffer buffer = ByteBuffer.allocateDirect(28);
+        buffer.order(ByteOrder.nativeOrder());
         buffer.putInt(ALC.FREQUENCY);
         buffer.putInt(44100);
-        buffer.putInt(ALC.SYNC);
-        buffer.putInt(ALC.FALSE);
         buffer.putInt(ALC.REFRESH);
         buffer.putInt(15);
+        buffer.putInt(ALC.SYNC);
+        buffer.putInt(ALC.FALSE);
         buffer.putInt(0); //terminating int
         
-        //create a context
-        context = alc.createContext(device, org.lwjgl.Sys.getDirectBufferAddress(buffer));
+        //create a context, using above attributes
+        context = alc.createContext(device, Sys.getDirectBufferAddress(buffer));
         if(context == null) {
             System.out.println("Unable to create context");
             System.exit(-1);
@@ -94,31 +97,27 @@
         alc.makeContextCurrent(context);
         
         //process
-        //NOTE - weird bug exposed!
-        //calling alcProcessContext on a non suspended context hangs
-        //this is a OpenAL specific bug - not our code
-        //alc.processContext(context);
+        alc.processContext(context);
 
         //suspend
         alc.suspendContext(context);
         
-        //process again
-        alc.processContext(context);
-        
         //query        
         System.out.println("DEFAULT_DEVICE_SPECIFIER: " + alc.getString(device, ALC.DEFAULT_DEVICE_SPECIFIER));
         System.out.println("DEVICE_SPECIFIER: " + alc.getString(device, ALC.DEVICE_SPECIFIER));
         System.out.println("EXTENSIONS: " + alc.getString(device, ALC.EXTENSIONS));
         
-        //mo query - hmmmmm don't get alcGetIntegerv
-        /*buffer.rewind();
-        alc.getIntegerv(device, ALC.MAJOR_VERSION, 32, org.lwjgl.Sys.getDirectBufferAddress(buffer));
+        //mo query
+        buffer.rewind();
+        alc.getIntegerv(device, ALC.MAJOR_VERSION, 4, Sys.getDirectBufferAddress(buffer));
+        alc.getIntegerv(device, ALC.MINOR_VERSION, 4, Sys.getDirectBufferAddress(buffer)+4);
+
         System.out.println("ALC_MAJOR_VERSION: " + buffer.getInt());
-        
-        alc.getIntegerv(device, ALC.MINOR_VERSION, 4, org.lwjgl.Sys.getDirectBufferAddress(buffer));
         System.out.println("ALC_MINOR_VERSION: " + buffer.getInt());
-        */
         
+        //no check for ALC_ALL_ATTRIBUTES / ALC_ATTRIBUTES_SIZE since it 
+        //is buggy on win32 - my dev platform
+
         //check current context
         ALCcontext currentContext = alc.getCurrentContext();
         if(context.context != currentContext.context) {
@@ -131,7 +130,10 @@
         if(device.device != currentDevice.device) {
             System.out.println("Serious error! - device copy != current contexts device");
             System.exit(-1);
-        }         
+        }
+        
+        //get an enumerstion value
+        System.out.println("Value of ALC_MAJOR_VERSION: " + alc.getEnumValue(device, "ALC_MAJOR_VERSION"));
         
         //close context again
         alc.destroyContext(context);

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

Modified Files:
	checkALerror.h 
Log Message:
fix: empty defines for !debug builds

Index: checkALerror.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/checkALerror.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/checkALerror.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- checkALerror.h	26 Aug 2002 18:22:50 -0000	1.1
+++ checkALerror.h	27 Aug 2002 20:44:19 -0000	1.2
@@ -37,7 +37,8 @@
 
 #else
 
-#define CHECK_GL_ERROR
+#define CHECK_AL_ERROR
+#define CHECK_ALC_ERROR
 
 #endif /* _DEBUG */
 

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
fix: made compile

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_input_Keyboard.cpp	17 Aug 2002 14:13:11 -0000	1.3
+++ org_lwjgl_input_Keyboard.cpp	27 Aug 2002 20:42:47 -0000	1.4
@@ -41,6 +41,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef  DIRECTINPUT_VERSION
+#define DIRECTINPUT_VERSION 0x0300
 #include <dinput.h>
 #include "org_lwjgl_input_Keyboard.h"
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test
In directory usw-pr-cvs1:/tmp/cvs-serv20498/org/lwjgl/openal/test

Added Files:
	ALCTest.java 
Log Message:
first stab at ALC testing - Work In Progress

--- NEW FILE: ALCTest.java ---
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALCTest.java
/*
 * Copyright (c) 2002 Light Weight Java Game Library Project
 * 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 'Light Weight Java Game Library' 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.openal.test;

import org.lwjgl.openal.AL;
import org.lwjgl.openal.ALC;
import org.lwjgl.openal.ALCcontext;
import org.lwjgl.openal.ALCdevice;

import java.nio.ByteBuffer;
/**
 * $Id: ALCTest.java,v 1.1 2002/08/27 17:49:53 matzon Exp $
 *
 * This is a test for the ALC part of OpenAL
 *
 * @author Brian Matzon <br...@ma...>
 * @version $Revision: 1.1 $
 */
public class ALCTest extends BasicTest {
    
    /**
     * Creates an instance of ALCTest
     */
    public ALCTest() {
        super();
    }
    
    /**
     * Runs the actual test, using supplied arguments
     */
    protected void execute(String[] args) {
        //error stuff
        int lastError = ALC.NO_ERROR;
        
        //create a device
        device = alc.openDevice(null);
        if(device == null) {
            System.out.println("Unable to create device");
            System.exit(-1);
        }
        
        //create attribute list for context creation
        ByteBuffer buffer = ByteBuffer.allocate(28);
        buffer.putInt(ALC.FREQUENCY);
        buffer.putInt(44100);
        buffer.putInt(ALC.SYNC);
        buffer.putInt(ALC.FALSE);
        buffer.putInt(ALC.REFRESH);
        buffer.putInt(15);
        buffer.putInt(0); //terminating int
        
        //create a context
        context = alc.createContext(device, org.lwjgl.Sys.getDirectBufferAddress(buffer));
        if(context == null) {
            System.out.println("Unable to create context");
            System.exit(-1);
        }
        
        if((lastError = alc.getError(device)) != ALC.NO_ERROR) {
            System.out.println("ALC Error: " + alc.getString(device, lastError));
            System.exit(-1);
        }
        
        //make current
        alc.makeContextCurrent(context);
        
        //process
        //NOTE - weird bug exposed!
        //calling alcProcessContext on a non suspended context hangs
        //this is a OpenAL specific bug - not our code
        //alc.processContext(context);

        //suspend
        alc.suspendContext(context);
        
        //process again
        alc.processContext(context);
        
        //query        
        System.out.println("DEFAULT_DEVICE_SPECIFIER: " + alc.getString(device, ALC.DEFAULT_DEVICE_SPECIFIER));
        System.out.println("DEVICE_SPECIFIER: " + alc.getString(device, ALC.DEVICE_SPECIFIER));
        System.out.println("EXTENSIONS: " + alc.getString(device, ALC.EXTENSIONS));
        
        //mo query - hmmmmm don't get alcGetIntegerv
        /*buffer.rewind();
        alc.getIntegerv(device, ALC.MAJOR_VERSION, 32, org.lwjgl.Sys.getDirectBufferAddress(buffer));
        System.out.println("ALC_MAJOR_VERSION: " + buffer.getInt());
        
        alc.getIntegerv(device, ALC.MINOR_VERSION, 4, org.lwjgl.Sys.getDirectBufferAddress(buffer));
        System.out.println("ALC_MINOR_VERSION: " + buffer.getInt());
        */
        
        //check current context
        ALCcontext currentContext = alc.getCurrentContext();
        if(context.context != currentContext.context) {
            System.out.println("Serious error! - context copy != current context");
            System.exit(-1);
        } 

        //check contexts device
        ALCdevice currentDevice = alc.getContextsDevice(context);
        if(device.device != currentDevice.device) {
            System.out.println("Serious error! - device copy != current contexts device");
            System.exit(-1);
        }         
        
        //close context again
        alc.destroyContext(context);
        
        //close it
        alc.closeDevice(device);
    }
    
    /**
     * main entry point
     *
     * @param args String array containing arguments
     */
    public static void main(String[] args) {
        ALCTest alcTest = new ALCTest();
        alcTest.execute(args);
    }
}

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test
In directory usw-pr-cvs1:/tmp/cvs-serv19735/org/lwjgl/openal/test

Modified Files:
	PlayTest.java 
Log Message:
fix: update to spec recommendation (alcMakeContextCurrent before destroy)


Index: PlayTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PlayTest.java	26 Aug 2002 21:10:08 -0000	1.3
+++ PlayTest.java	27 Aug 2002 17:48:30 -0000	1.4
@@ -147,6 +147,7 @@
         
         //no errorchecking from now on, since our context is gone.
         //shutdown
+        alc.makeContextCurrent(null);
         alc.destroyContext(context);
         alc.closeDevice(device);
     }

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

Modified Files:
	org_lwjgl_openal_ALC.cpp 
Log Message:
fix: support alcMakeContextCurrent - as recommended in specs!

Index: org_lwjgl_openal_ALC.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_openal_ALC.cpp	26 Aug 2002 22:16:25 -0000	1.6
+++ org_lwjgl_openal_ALC.cpp	27 Aug 2002 17:45:40 -0000	1.7
@@ -182,6 +182,10 @@
  * ALCboolean alcMakeContextCurrent(ALCcontext *context);
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_makeContextCurrent (JNIEnv *env, jobject obj, jobject context) {
+	if(context == NULL) {
+		return alcMakeContextCurrent(NULL);
+	}
+	
 	/* get context address */
 	jclass context_class	= env->GetObjectClass(context);
 	jfieldID context_field	= env->GetFieldID(context_class, "context", "I");