Menu
▾
▴
[Java-game-lib-cvs] CVS: LWJGL/src/java/org/lwjgl/openal/test ALCTest.java,1.2,1.3 ALTest.java,1.6,1.7 BasicTest.java,1.1,1.2 PlayTest.java,1.7,1.8 PlayTestMemory.java,1.1,1.2
|
From: Brian M. <ma...@us...> - 2002-08-29 12:44:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test In directory usw-pr-cvs1:/tmp/cvs-serv18864/org/lwjgl/openal/test Modified Files: ALCTest.java ALTest.java BasicTest.java PlayTest.java PlayTestMemory.java Log Message: fix: now using Int- & Float- Buffers fix: to small iteration when unqueing buffers fix: nulling of buffer 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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ALCTest.java 27 Aug 2002 23:21:03 -0000 1.2 +++ ALCTest.java 29 Aug 2002 12:44:32 -0000 1.3 @@ -37,8 +37,8 @@ import org.lwjgl.openal.ALCdevice; import org.lwjgl.Sys; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; +import java.nio.IntBuffer; + /** * $Id$ * @@ -71,15 +71,14 @@ } //create attribute list for context creation - ByteBuffer buffer = ByteBuffer.allocateDirect(28); - buffer.order(ByteOrder.nativeOrder()); - buffer.putInt(ALC.FREQUENCY); - buffer.putInt(44100); - buffer.putInt(ALC.REFRESH); - buffer.putInt(15); - buffer.putInt(ALC.SYNC); - buffer.putInt(ALC.FALSE); - buffer.putInt(0); //terminating int + IntBuffer buffer = createIntBuffer(7); + buffer.put(ALC.FREQUENCY); + buffer.put(44100); + buffer.put(ALC.REFRESH); + buffer.put(15); + buffer.put(ALC.SYNC); + buffer.put(ALC.FALSE); + buffer.put(0); //terminating int //create a context, using above attributes context = alc.createContext(device, Sys.getDirectBufferAddress(buffer)); @@ -112,8 +111,8 @@ 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()); - System.out.println("ALC_MINOR_VERSION: " + buffer.getInt()); + System.out.println("ALC_MAJOR_VERSION: " + buffer.get(0)); + System.out.println("ALC_MINOR_VERSION: " + buffer.get(1)); //no check for ALC_ALL_ATTRIBUTES / ALC_ATTRIBUTES_SIZE since it //is buggy on win32 - my dev platform Index: ALTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/ALTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ALTest.java 29 Aug 2002 02:00:49 -0000 1.6 +++ ALTest.java 29 Aug 2002 12:44:32 -0000 1.7 @@ -41,6 +41,8 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.IntBuffer; +import java.nio.FloatBuffer; import java.io.IOException; /** @@ -57,7 +59,7 @@ public static final int NUM_BUFFERS = 7; [...1868 lines suppressed...] - pos.getFloat() + "\n"); + pos.get(0) + ", " + + pos.get(1) + ", " + + pos.get(2) + "\n"); // Enable looping - al.sourcei(Sources.getInt(4*i), AL.LOOPING, AL.TRUE); + al.sourcei(Sources.get(i), AL.LOOPING, AL.TRUE); pos.clear(); } @@ -2319,7 +2196,7 @@ switch (ch) { case '1': for (i = 0; i < numSources; i++) { - al.sourcePlay(Sources.getInt(4*i)); + al.sourcePlay(Sources.get(i)); if ((error = al.getError()) != AL.NO_ERROR) displayALError("alSourcePlay : ", error); Index: BasicTest.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/BasicTest.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/BasicTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- BasicTest.java 26 Aug 2002 21:10:08 -0000 1.1 +++ BasicTest.java 29 Aug 2002 12:44:32 -0000 1.2 @@ -37,6 +37,10 @@ import org.lwjgl.openal.ALCdevice; import org.lwjgl.openal.ALUT; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.IntBuffer; + /** * $Id$ * @@ -94,6 +98,20 @@ throw new RuntimeException("An error occurred while making context current"); } } + + /** + * Creates an integer buffer to hold specified ints + * - strictly a utility method + * + * @param size how many int to contain + * @return created IntBuffer + */ + protected IntBuffer createIntBuffer(int size) { + ByteBuffer temp = ByteBuffer.allocateDirect(4*size); + temp.order(ByteOrder.nativeOrder()); + + return temp.asIntBuffer(); + } /** * Exits the test NOW, printing errorcode to stdout 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.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- PlayTest.java 29 Aug 2002 01:11:46 -0000 1.7 +++ PlayTest.java 29 Aug 2002 12:44:32 -0000 1.8 @@ -35,8 +35,7 @@ import org.lwjgl.openal.AL; import org.lwjgl.openal.ALUTLoadWAVData; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; +import java.nio.IntBuffer; /** * $Id$ @@ -71,11 +70,8 @@ alInitialize(); //create 1 buffer and 1 source - ByteBuffer buffers = ByteBuffer.allocateDirect(4); - buffers.order(ByteOrder.nativeOrder()); - - ByteBuffer sources = ByteBuffer.allocateDirect(4); - sources.order(ByteOrder.nativeOrder()); + IntBuffer buffers = createIntBuffer(1); + IntBuffer sources = createIntBuffer(1); // al generate buffers and sources al.genBuffers(1, Sys.getDirectBufferAddress(buffers)); @@ -96,7 +92,7 @@ //copy to buffers - al.bufferData(buffers.getInt(0), file.format, file.data, file.size, file.freq); + al.bufferData(buffers.get(0), file.format, file.data, file.size, file.freq); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } @@ -108,19 +104,19 @@ } //set up source input - al.sourcei(sources.getInt(0), AL.BUFFER, buffers.getInt(0)); + al.sourcei(sources.get(0), AL.BUFFER, buffers.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } //lets loop the sound - al.sourcei(sources.getInt(0), AL.LOOPING, AL.TRUE); + al.sourcei(sources.get(0), AL.LOOPING, AL.TRUE); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } //play source 0 - al.sourcePlay(sources.getInt(0)); + al.sourcePlay(sources.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } @@ -133,7 +129,7 @@ } //stop source 0 - al.sourceStop(sources.getInt(0)); + al.sourceStop(sources.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } @@ -158,7 +154,7 @@ /** * main entry point - *+ + * * @param args String array containing arguments */ public static void main(String[] args) { Index: PlayTestMemory.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTestMemory.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/test/PlayTestMemory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PlayTestMemory.java 29 Aug 2002 01:11:25 -0000 1.1 +++ PlayTestMemory.java 29 Aug 2002 12:44:32 -0000 1.2 @@ -41,6 +41,7 @@ import java.net.URL; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.IntBuffer; /** * $Id$ @@ -75,11 +76,8 @@ alInitialize(); //create 1 buffer and 1 source - ByteBuffer buffers = ByteBuffer.allocateDirect(4); - buffers.order(ByteOrder.nativeOrder()); - - ByteBuffer sources = ByteBuffer.allocateDirect(4); - sources.order(ByteOrder.nativeOrder()); + IntBuffer buffers = createIntBuffer(1); + IntBuffer sources = createIntBuffer(1); // al generate buffers and sources al.genBuffers(1, Sys.getDirectBufferAddress(buffers)); @@ -106,7 +104,7 @@ //copy to buffers - al.bufferData(buffers.getInt(0), file.format, file.data, file.size, file.freq); + al.bufferData(buffers.get(0), file.format, file.data, file.size, file.freq); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } @@ -118,19 +116,19 @@ } //set up source input - al.sourcei(sources.getInt(0), AL.BUFFER, buffers.getInt(0)); + al.sourcei(sources.get(0), AL.BUFFER, buffers.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } //lets loop the sound - al.sourcei(sources.getInt(0), AL.LOOPING, AL.TRUE); + al.sourcei(sources.get(0), AL.LOOPING, AL.TRUE); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } //play source 0 - al.sourcePlay(sources.getInt(0)); + al.sourcePlay(sources.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } @@ -143,7 +141,7 @@ } //stop source 0 - al.sourceStop(sources.getInt(0)); + al.sourceStop(sources.get(0)); if((lastError = al.getError()) != AL.NO_ERROR) { exit(lastError); } |