michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: updated to 0.7

This commit is contained in:
Brian Matzon 2003-08-13 21:03:57 +00:00
parent 874edcb3ec
commit f19ef56df9
8 changed files with 77 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/lwjgl/test/WindowCreationTest.java
View File

@ -18,12 +18,16 @@ public class WindowCreationTest {
DisplayMode[] modes = Display.getAvailableDisplayModes(); DisplayMode[] modes = Display.getAvailableDisplayModes();
System.out.println("Found " + modes.length + " display modes"); System.out.println("Found " + modes.length + " display modes");
try { try {
Window.create("WindowCreationTest", 50, 50, 320, 240, 16, 0, 0, 0); Window.create("WindowCreationTest", 50, 50, 320, 240, 16, 0, 0, 0);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
System.out.println(Window.getHeight() + ", " + Window.getWidth() + ", " + Window.getTitle());
System.out.println("Display created"); System.out.println("Display created");
while(!Window.isCloseRequested()) { while(!Window.isCloseRequested()) {

11
src/java/org/lwjgl/test/openal/ALCTest.java
View File

@ -77,14 +77,9 @@ public class ALCTest extends BasicTest {
//mo query //mo query
buffer.rewind(); buffer.rewind();
ALC.alcGetIntegerv( buffer.limit(1);
ALC.ALC_MAJOR_VERSION, ALC.alcGetInteger(ALC.ALC_MAJOR_VERSION, buffer);
4, ALC.alcGetInteger(ALC.ALC_MINOR_VERSION, (IntBuffer) buffer.position(1).limit(2));
buffer);
ALC.alcGetIntegerv(
ALC.ALC_MINOR_VERSION,
4,
((IntBuffer)buffer.position(4)).slice());
System.out.println("ALC_MAJOR_VERSION: " + buffer.get(0)); System.out.println("ALC_MAJOR_VERSION: " + buffer.get(0));
System.out.println("ALC_MINOR_VERSION: " + buffer.get(1)); System.out.println("ALC_MINOR_VERSION: " + buffer.get(1));

42
src/java/org/lwjgl/test/openal/MovingSoundTest.java
View File

@ -35,9 +35,9 @@ import org.lwjgl.openal.AL;
import org.lwjgl.openal.eax.*; import org.lwjgl.openal.eax.*;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.Window; import org.lwjgl.opengl.Window;
import org.lwjgl.vector.Vector3f;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.FloatBuffer;
/** /**
* $Id$ * $Id$
@ -76,8 +76,8 @@ public class MovingSoundTest extends BasicTest {
int lastError; int lastError;
FloatBuffer sourcePosition = createFloatBuffer(3); Vector3f sourcePosition = new Vector3f();
FloatBuffer listenerPosition = createFloatBuffer(3); Vector3f listenerPosition = new Vector3f();
boolean eaxApplied = false; boolean eaxApplied = false;
EAXListenerProperties eaxListenerProp = null; EAXListenerProperties eaxListenerProp = null;
@ -94,12 +94,14 @@ public class MovingSoundTest extends BasicTest {
IntBuffer sources = createIntBuffer(1); IntBuffer sources = createIntBuffer(1);
// al generate buffers and sources // al generate buffers and sources
AL.alGenBuffers(1, buffers); buffers.position(0).limit(1);
AL.alGenBuffers(buffers);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alGenSources(1, sources); sources.position(0).limit(1);
AL.alGenSources(sources);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
@ -159,24 +161,24 @@ public class MovingSoundTest extends BasicTest {
Keyboard.poll(); Keyboard.poll();
if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) { if(Keyboard.isKeyDown(Keyboard.KEY_LEFT)) {
if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
listenerPosition.put(0, listenerPosition.get(0) - MOVEMENT); listenerPosition.x -= MOVEMENT;
AL.alListenerfv(AL.AL_POSITION, listenerPosition); AL.alListener3f(AL.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z);
System.out.println("listenerx: " + listenerPosition.get(0)); System.out.println("listenerx: " + listenerPosition.x);
} else { } else {
sourcePosition.put(0, sourcePosition.get(0) - MOVEMENT); sourcePosition.x -= MOVEMENT;
AL.alSourcefv(sources.get(0), AL.AL_POSITION, sourcePosition); AL.alSource3f(sources.get(0), AL.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z);
System.out.println("sourcex: " + sourcePosition.get(0)); System.out.println("sourcex: " + sourcePosition.x);
} }
} }
if(Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) { if(Keyboard.isKeyDown(Keyboard.KEY_RIGHT)) {
if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { if(Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
listenerPosition.put(0, listenerPosition.get(0) + MOVEMENT); listenerPosition.x += MOVEMENT;
AL.alListenerfv(AL.AL_POSITION, listenerPosition); AL.alListener3f(AL.AL_POSITION, listenerPosition.x, listenerPosition.y, listenerPosition.z);
System.out.println("listenerx: " + listenerPosition.get(0)); System.out.println("listenerx: " + listenerPosition.x);
} else { } else {
sourcePosition.put(0, sourcePosition.get(0) + MOVEMENT); sourcePosition.x += MOVEMENT;
AL.alSourcefv(sources.get(0), AL.AL_POSITION, sourcePosition); AL.alSource3f(sources.get(0), AL.AL_POSITION, sourcePosition.x, sourcePosition.y, sourcePosition.z);
System.out.println("sourcex: " + sourcePosition.get(0)); System.out.println("sourcex: " + sourcePosition.x);
} }
} }
@ -208,12 +210,14 @@ public class MovingSoundTest extends BasicTest {
} }
//delete buffers and sources //delete buffers and sources
AL.alDeleteSources(1, sources); sources.position(0).limit(1);
AL.alDeleteSources(sources);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alDeleteBuffers(1, buffers); buffers.position(0).limit(1);
AL.alDeleteBuffers(buffers);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }

12
src/java/org/lwjgl/test/openal/OpenALCreationTest.java
View File

@ -136,12 +136,14 @@ public class OpenALCreationTest {
IntBuffer sources = createIntBuffer(1); IntBuffer sources = createIntBuffer(1);
// al generate buffers and sources // al generate buffers and sources
AL.alGenBuffers(1, buffers); buffers.position(0).limit(1);
AL.alGenBuffers(buffers);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alGenSources(1, sources); sources.position(0).limit(1);
AL.alGenSources(sources);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
@ -196,12 +198,14 @@ public class OpenALCreationTest {
} }
//delete buffers and sources //delete buffers and sources
AL.alDeleteSources(1, sources); sources.position(0).limit(1);
AL.alDeleteSources(sources);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alDeleteBuffers(1, buffers); buffers.position(0).limit(1);
AL.alDeleteBuffers(buffers);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }

12
src/java/org/lwjgl/test/openal/PlayTest.java
View File

@ -69,12 +69,14 @@ public class PlayTest extends BasicTest {
IntBuffer sources = createIntBuffer(1); IntBuffer sources = createIntBuffer(1);
// al generate buffers and sources // al generate buffers and sources
AL.alGenBuffers(1, buffers); buffers.position(0).limit(1);
AL.alGenBuffers(buffers);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alGenSources(1, sources); sources.position(0).limit(1);
AL.alGenSources(sources);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
@ -123,12 +125,14 @@ public class PlayTest extends BasicTest {
} }
//delete buffers and sources //delete buffers and sources
AL.alDeleteSources(1, sources); sources.position(0).limit(1);
AL.alDeleteSources(sources);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alDeleteBuffers(1, buffers); buffers.position(0).limit(1);
AL.alDeleteBuffers(buffers);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }

12
src/java/org/lwjgl/test/openal/PlayTestMemory.java
View File

@ -73,12 +73,14 @@ public class PlayTestMemory extends BasicTest {
IntBuffer sources = createIntBuffer(1); IntBuffer sources = createIntBuffer(1);
// al generate buffers and sources // al generate buffers and sources
AL.alGenBuffers(1, buffers); buffers.position(0).limit(1);
AL.alGenBuffers(buffers);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alGenSources(1, sources); sources.position(0).limit(1);
AL.alGenSources(sources);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
@ -135,12 +137,14 @@ public class PlayTestMemory extends BasicTest {
} }
//delete buffers and sources //delete buffers and sources
AL.alDeleteSources(1, sources); sources.position(0).limit(1);
AL.alDeleteSources(sources);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }
AL.alDeleteBuffers(1, buffers); buffers.position(0).limit(1);
AL.alDeleteBuffers(buffers);
if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
exit(lastError); exit(lastError);
} }

12
src/java/org/lwjgl/test/openal/SourceLimitTest.java
View File

@ -96,14 +96,16 @@ public class SourceLimitTest extends BasicTest {
IntBuffer sources = createIntBuffer(sourcesToCreate); IntBuffer sources = createIntBuffer(sourcesToCreate);
//Create sourcesToCreate sources in one fell swoop //Create sourcesToCreate sources in one fell swoop
AL.alGenSources(sourcesToCreate, sources); sources.position(0).limit(sourcesToCreate);
AL.alGenSources(sources);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
System.out.println("failed to create " + sourcesToCreate + " sources (" + AL.alGetString(lastError) + ")"); System.out.println("failed to create " + sourcesToCreate + " sources (" + AL.alGetString(lastError) + ")");
return; return;
} }
//delete sources //delete sources
AL.alDeleteSources(sourcesToCreate, sources); sources.position(0).limit(sourcesToCreate);
AL.alDeleteSources(sources);
System.out.println("created " + sourcesToCreate + " sources successfully!"); System.out.println("created " + sourcesToCreate + " sources successfully!");
} }
@ -121,7 +123,8 @@ public class SourceLimitTest extends BasicTest {
//create the sources //create the sources
for (int i = 0; i <= sourcesToCreate; i++) { for (int i = 0; i <= sourcesToCreate; i++) {
sources[i] = createIntBuffer(1); sources[i] = createIntBuffer(1);
AL.alGenSources(1, sources[i]); sources[i].position(0).limit(1);
AL.alGenSources(sources[i]);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
System.out.println("failed to create source: " + (i + 1)); System.out.println("failed to create source: " + (i + 1));
break; break;
@ -132,7 +135,8 @@ public class SourceLimitTest extends BasicTest {
//delete allocated sources //delete allocated sources
for (int i = 0; i < sourcesCreated; i++) { for (int i = 0; i < sourcesCreated; i++) {
//delete buffers and sources //delete buffers and sources
AL.alDeleteSources(1, sources[i]); sources[i].position(0).limit(1);
AL.alDeleteSources(sources[i]);
if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) { if ((lastError = AL.alGetError()) != AL.AL_NO_ERROR) {
System.out.println("failed to delete source: " + i + "(" + AL.alGetString(lastError) + ")"); System.out.println("failed to delete source: " + i + "(" + AL.alGetString(lastError) + ")");
break; break;

22
src/java/org/lwjgl/test/openal/StressTest.java
View File

@ -79,7 +79,8 @@ public class StressTest extends BasicTest {
private void createSources() { private void createSources() {
sources = createIntBuffer(4); sources = createIntBuffer(4);
AL.alGenSources(4, sources); sources.position(0).limit(4);
AL.alGenSources(sources);
if (AL.alGetError() != AL.AL_NO_ERROR) { if (AL.alGetError() != AL.AL_NO_ERROR) {
System.out.println("Unable to create 4 sources"); System.out.println("Unable to create 4 sources");
alExit(); alExit();
@ -88,10 +89,12 @@ public class StressTest extends BasicTest {
private void createBuffers() { private void createBuffers() {
buffers = createIntBuffer(10); buffers = createIntBuffer(10);
AL.alGenBuffers(10, buffers); buffers.position(0).limit(10);
AL.alGenBuffers(buffers);
if (AL.alGetError() != AL.AL_NO_ERROR) { if (AL.alGetError() != AL.AL_NO_ERROR) {
System.out.println("Unable to create 10 buffers"); System.out.println("Unable to create 10 buffers");
AL.alDeleteSources(4, sources); sources.position(0).limit(4);
AL.alDeleteSources(sources);
alExit(); alExit();
} }
} }
@ -109,8 +112,11 @@ public class StressTest extends BasicTest {
if (AL.alGetError() != AL.AL_NO_ERROR) { if (AL.alGetError() != AL.AL_NO_ERROR) {
System.out.println("Failed to load " + i + ".wav into buffer"); System.out.println("Failed to load " + i + ".wav into buffer");
AL.alDeleteSources(4, sources); sources.position(0).limit(4);
AL.alDeleteBuffers(10, buffers); AL.alDeleteSources(sources);
buffers.position(0).limit(10);
AL.alDeleteBuffers(buffers);
alExit(); alExit();
} }
} }
@ -191,8 +197,10 @@ public class StressTest extends BasicTest {
} catch (Exception e) { } catch (Exception e) {
} }
AL.alDeleteSources(4, sources); sources.position(0).limit(4);
AL.alDeleteBuffers(10, buffers); AL.alDeleteSources(sources);
buffers.position(0).limit(10);
AL.alDeleteBuffers(buffers);
} }
private int getRandomBuffer() { private int getRandomBuffer() {