aboutsummaryrefslogtreecommitdiffstats
path: root/src/jake2/sound/lwjgl/LWJGLSoundImpl.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jake2/sound/lwjgl/LWJGLSoundImpl.java')
-rw-r--r--src/jake2/sound/lwjgl/LWJGLSoundImpl.java351
1 files changed, 46 insertions, 305 deletions
diff --git a/src/jake2/sound/lwjgl/LWJGLSoundImpl.java b/src/jake2/sound/lwjgl/LWJGLSoundImpl.java
index ea1cdc3..eb8ed8c 100644
--- a/src/jake2/sound/lwjgl/LWJGLSoundImpl.java
+++ b/src/jake2/sound/lwjgl/LWJGLSoundImpl.java
@@ -2,33 +2,28 @@
* LWJGLSoundImpl.java
* Copyright (C) 2004
*
- * $Id: LWJGLSoundImpl.java,v 1.3 2004-12-21 00:42:31 cawe Exp $
+ * $Id: LWJGLSoundImpl.java,v 1.4 2004-12-23 00:52:12 cawe Exp $
*/
package jake2.sound.lwjgl;
import jake2.Defines;
import jake2.Globals;
-import jake2.client.CL;
-import jake2.client.CL_ents;
import jake2.game.*;
import jake2.qcommon.*;
import jake2.sound.*;
-import jake2.util.*;
+import jake2.util.Lib;
+import jake2.util.Vargs;
-import java.io.IOException;
-import java.io.RandomAccessFile;
import java.nio.*;
-import java.util.*;
-import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.openal.*;
import org.lwjgl.openal.eax.*;
-import org.lwjgl.openal.eax.EAX20;
-import org.lwjgl.openal.eax.EAXListenerProperties;
/**
* LWJGLSoundImpl
+ *
+ * @author dsanders/cwei
*/
public final class LWJGLSoundImpl implements Sound {
@@ -41,12 +36,8 @@ public final class LWJGLSoundImpl implements Sound {
private cvar_t s_volume;
private static final int MAX_SFX = Defines.MAX_SOUNDS * 2;
- private static final int MAX_CHANNELS = 32;
- private IntBuffer buffers = BufferUtils.createIntBuffer(MAX_SFX);
- private IntBuffer sources = BufferUtils.createIntBuffer(MAX_CHANNELS);
- private Channel[] channels = null;
- private int num_channels = 0;
+ private IntBuffer buffers = Lib.newIntBuffer(MAX_SFX);
// singleton
private LWJGLSoundImpl() {
@@ -71,7 +62,8 @@ public final class LWJGLSoundImpl implements Sound {
AL10.alGenBuffers(buffers);
s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE);
- initChannels();
+ int count = Channel.init(buffers, s_volume.value);
+ Com.Printf("... using " + count + " channels\n");
AL10.alDistanceModel(AL10.AL_INVERSE_DISTANCE_CLAMPED);
Cmd.AddCommand("play", new xcommand_t() {
public void execute() {
@@ -96,7 +88,6 @@ public final class LWJGLSoundImpl implements Sound {
num_sfx = 0;
-
Com.Printf("sound sampling rate: 44100Hz\n");
StopAllSounds();
@@ -158,40 +149,9 @@ public final class LWJGLSoundImpl implements Sound {
AL.destroy();
}
- private void initChannels() {
-
- // create channels
- channels = new Channel[MAX_CHANNELS];
-
- int sourceId;
- IntBuffer tmp = BufferUtils.createIntBuffer(1);
- int error;
- for (int i = 0; i < MAX_CHANNELS; i++) {
-
- AL10.alGenSources(tmp);
- sourceId = tmp.get(0);
-
- //if ((error = al.alGetError()) != AL.AL_NO_ERROR) break;
- if (sourceId <= 0) break;
-
- sources.put(i, sourceId);
-
- channels[i] = new Channel(sourceId);
- num_channels++;
-
- // set default values for AL sources
- AL10.alSourcef (sourceId, AL10.AL_GAIN, s_volume.value);
- AL10.alSourcef (sourceId, AL10.AL_PITCH, 1.0f);
- AL10.alSourcei (sourceId, AL10.AL_SOURCE_ABSOLUTE, AL10.AL_TRUE);
- AL10.nalSourcefv(sourceId, AL10.AL_VELOCITY, NULLVECTOR_BUFFER,0);
- AL10.alSourcei (sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
- AL10.alSourcef (sourceId, AL10.AL_REFERENCE_DISTANCE, 300.0f);
- AL10.alSourcef (sourceId, AL10.AL_MIN_GAIN, 0.0005f);
- AL10.alSourcef (sourceId, AL10.AL_MAX_GAIN, 1.0f);
- }
- Com.Printf("... using " + num_channels + " channels\n");
- }
-
+ // TODO check the sfx direct buffer size
+ // 2MB sfx buffer
+ ByteBuffer sfxDataBuffer = Lib.newByteBuffer(2 * 1024 * 1024);
/* (non-Javadoc)
* @see jake2.sound.SoundImpl#RegisterSound(jake2.sound.sfx_t)
@@ -203,9 +163,10 @@ public final class LWJGLSoundImpl implements Sound {
}
int format = AL10.AL_FORMAT_MONO16;
- ByteBuffer data = BufferUtils.createByteBuffer(sfx.cache.data.length);
- data.put(sfx.cache.data);
+ ByteBuffer data = sfxDataBuffer.slice();
+ data.put(sfx.cache.data, 0, sfx.cache.data.length);
data.rewind();
+ data.limit(sfx.cache.data.length);
int freq = sfx.cache.speed;
AL10.alBufferData( buffers.get(sfx.bufferId), format, data, freq);
@@ -235,8 +196,7 @@ public final class LWJGLSoundImpl implements Sound {
*/
public void Shutdown() {
StopAllSounds();
-
- AL10.alDeleteSources(sources);
+ Channel.shutdown();
AL10.alDeleteBuffers(buffers);
exitOpenAL();
@@ -252,14 +212,8 @@ public final class LWJGLSoundImpl implements Sound {
known_sfx[i].clear();
}
num_sfx = 0;
- num_channels = 0;
}
- //private final static float[] NULLVECTOR = {0, 0, 0};
- private final static FloatBuffer NULLVECTOR_BUFFER=Lib.newFloatBuffer(3);
- private float[] entityOrigin = {0, 0, 0};
- private float[] sourceOrigin = {0, 0, 0};
-
/* (non-Javadoc)
* @see jake2.sound.SoundImpl#StartSound(float[], int, int, jake2.sound.sfx_t, float, float, float)
*/
@@ -277,75 +231,22 @@ public final class LWJGLSoundImpl implements Sound {
if (attenuation != Defines.ATTN_STATIC)
attenuation *= 0.5f;
- Channel ch = pickChannel(entnum, entchannel, buffers.get(sfx.bufferId), attenuation);
-
- if (ch == null) return;
-
- if (entnum == Globals.cl.playernum + 1) {
- ch.addListener();
- } else if (origin != null) {
- ch.addFixed(origin);
- } else {
- ch.addDynamic(entnum);
- }
- }
-
- Channel pickChannel(int entnum, int entchannel, int bufferId, float rolloff) {
-
- Channel ch = null;
- int state;
- int i;
-
- for (i = 0; i < num_channels; i++) {
- ch = channels[i];
-
- if (entchannel != 0 && ch.entnum == entnum && ch.entchannel == entchannel) {
- // always override sound from same entity
- break;
- }
-
- // don't let monster sounds override player sounds
- if ((ch.entnum == Globals.cl.playernum+1) && (entnum != Globals.cl.playernum+1) && ch.bufferId != -1)
- continue;
-
- // looking for a free AL source
- if (!ch.active) {
- break;
- }
- }
-
- if (i == num_channels)
- return null;
-
- ch.entnum = entnum;
- ch.entchannel = entchannel;
- if (ch.bufferId != bufferId) {
- ch.bufferId = bufferId;
- ch.bufferChanged = true;
- }
- ch.rolloff = rolloff * 2;
- ch.active = true;
- ch.modified = true;
-
- return ch;
+ PlaySound.allocate(origin, entnum, entchannel, buffers.get(sfx.bufferId), fvol, attenuation, timeofs);
}
- private float[] listenerOrigin = {0, 0, 0};
- private FloatBuffer listenerOriginBuffer=FloatBuffer.wrap(listenerOrigin);
-
- private float[] listenerOrientation = {0, 0, 0, 0, 0, 0};
- private FloatBuffer listenerOrientationBuffer=FloatBuffer.wrap(listenerOrientation);
+ private FloatBuffer listenerOrigin = Lib.newFloatBuffer(3);
+ private FloatBuffer listenerOrientation = Lib.newFloatBuffer(6);
/* (non-Javadoc)
* @see jake2.sound.SoundImpl#Update(float[], float[], float[], float[])
*/
public void Update(float[] origin, float[] forward, float[] right, float[] up) {
- convertVector(origin, listenerOrigin);
- AL10.nalListenerfv(AL10.AL_POSITION, listenerOriginBuffer,0);
+ Channel.convertVector(origin, listenerOrigin);
+ AL10.nalListenerfv(AL10.AL_POSITION, listenerOrigin, 0);
- convertOrientation(forward, up, listenerOrientation);
- AL10.nalListenerfv(AL10.AL_ORIENTATION, listenerOrientationBuffer,0);
+ Channel.convertOrientation(forward, up, listenerOrientation);
+ AL10.nalListenerfv(AL10.AL_ORIENTATION, listenerOrientation, 0);
if (hasEAX){
if ((GameBase.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0) {
@@ -355,8 +256,9 @@ public final class LWJGLSoundImpl implements Sound {
}
}
- AddLoopSounds(origin);
- playChannels(listenerOrigin);
+ Channel.addLoopSounds();
+ Channel.addPlaySounds();
+ Channel.playAllSounds(listenerOrigin, s_volume.value);
}
private IntBuffer eaxEnv = Lib.newIntBuffer(1);
@@ -368,172 +270,13 @@ public final class LWJGLSoundImpl implements Sound {
eaxEnv.put(0, currentEnv);
EAX20.eaxSet(EAX20.LISTENER_GUID, EAXListenerProperties.EAXLISTENER_ENVIRONMENT | EAXListenerProperties.EAXLISTENER_DEFERRED, 0, eaxEnv, 4);
}
-
- Map looptable = new Hashtable(MAX_CHANNELS);
-
- /*
- ==================
- S_AddLoopSounds
-
- Entities with a ->sound field will generated looped sounds
- that are automatically started, stopped, and merged together
- as the entities are sent to the client
- ==================
- */
- void AddLoopSounds(float[] listener) {
-
- if (Globals.cl_paused.value != 0.0f) {
- removeUnusedLoopSounds();
- return;
- }
-
- if (Globals.cls.state != Globals.ca_active) {
- removeUnusedLoopSounds();
- return;
- }
-
- if (!Globals.cl.sound_prepped) {
- removeUnusedLoopSounds();
- return;
- }
-
- Channel ch;
- sfx_t sfx;
- sfxcache_t sc;
- int num;
- entity_state_t ent;
- Object key;
- int sound = 0;
-
- for (int i=0 ; i<Globals.cl.frame.num_entities ; i++) {
- num = (Globals.cl.frame.parse_entities + i)&(Defines.MAX_PARSE_ENTITIES-1);
- ent = Globals.cl_parse_entities[num];
- sound = ent.sound;
-
- if (sound == 0) continue;
-
- key = new Integer(ent.number);
- ch = (Channel)looptable.get(key);
-
- if (ch != null) {
- // keep on looping
- ch.autosound = true;
- ch.origin = ent.origin;
- continue;
- }
-
- sfx = Globals.cl.sound_precache[sound];
- if (sfx == null)
- continue; // bad sound effect
-
- sc = sfx.cache;
- if (sc == null)
- continue;
-
- // allocate a channel
- ch = pickChannel(0, 0, buffers.get(sfx.bufferId), 6);
- if (ch == null)
- break;
-
- ch.addFixed(ent.origin);
- ch.autosound = true;
-
- looptable.put(key, ch);
- AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_TRUE);
- }
-
- removeUnusedLoopSounds();
-
- }
-
- void removeUnusedLoopSounds() {
- Channel ch;
- // stop unused loopsounds
- for (Iterator iter = looptable.values().iterator(); iter.hasNext();) {
- ch = (Channel)iter.next();
- if (!ch.autosound) {
- AL10.alSourceStop(ch.sourceId);
- AL10.alSourcei(ch.sourceId, AL10.AL_LOOPING, AL10.AL_FALSE);
- iter.remove();
- ch.clear();
- }
- }
- }
-
- void playChannels(float[] listenerOrigin)
- {
- float[] sourceOrigin = {0, 0, 0};
- FloatBuffer sourceOriginBuffer=FloatBuffer.wrap(sourceOrigin);
-
- float[] entityOrigin = {0, 0, 0};
- Channel ch;
- int sourceId;
- int state;
-
- for (int i = 0; i < num_channels; i++) {
- ch = channels[i];
- if (ch.active) {
- sourceId = ch.sourceId;
-
- switch (ch.type) {
- case Channel.LISTENER:
- Math3D.VectorCopy(listenerOrigin, sourceOrigin);
- break;
- case Channel.DYNAMIC:
- CL_ents.GetEntitySoundOrigin(ch.entity, entityOrigin);
- convertVector(entityOrigin, sourceOrigin);
- break;
- case Channel.FIXED:
- convertVector(ch.origin, sourceOrigin);
- break;
- }
-
- if (ch.modified) {
- if (ch.bufferChanged)
- AL10.alSourcei (sourceId, AL10.AL_BUFFER, ch.bufferId);
-
- AL10.alSourcef (sourceId, AL10.AL_GAIN, s_volume.value);
- AL10.alSourcef (sourceId, AL10.AL_ROLLOFF_FACTOR, ch.rolloff);
- AL10.nalSourcefv(sourceId, AL10.AL_POSITION, sourceOriginBuffer,0);
- AL10.alSourcePlay(sourceId);
- ch.modified = false;
- } else {
- state = AL10.alGetSourcei(ch.sourceId, AL10.AL_SOURCE_STATE);
- if (state == AL10.AL_PLAYING) {
- AL10.nalSourcefv(sourceId, AL10.AL_POSITION, sourceOriginBuffer,0);
- } else {
- ch.clear();
- }
- }
- ch.autosound = false;
- }
- }
- }
/* (non-Javadoc)
* @see jake2.sound.SoundImpl#StopAllSounds()
*/
public void StopAllSounds() {
- for (int i = 0; i < num_channels; i++) {
- AL10.alSourceStop(sources.get(i));
- AL10.alSourcei(sources.get(i), AL10.AL_BUFFER, 0);
- channels[i].clear();
- }
- }
-
- static void convertVector(float[] from, float[] to) {
- to[0] = from[0];
- to[1] = from[2];
- to[2] = -from[1];
- }
-
- static void convertOrientation(float[] forward, float[] up, float[] orientation) {
- orientation[0] = forward[0];
- orientation[1] = forward[2];
- orientation[2] = -forward[1];
- orientation[3] = up[0];
- orientation[4] = up[2];
- orientation[5] = -up[1];
+ PlaySound.reset();
+ Channel.reset();
}
/* (non-Javadoc)
@@ -543,7 +286,6 @@ public final class LWJGLSoundImpl implements Sound {
return "lwjgl";
}
-
int s_registration_sequence;
boolean s_registering;
@@ -603,8 +345,7 @@ public final class LWJGLSoundImpl implements Sound {
sfx_t sfx = null;
// determine what model the client is using
- // TODO configstrings for player male and female are wrong
- String model = "male";
+ String model = null;
int n = Globals.CS_PLAYERSKINS + ent.number - 1;
if (Globals.cl.configstrings[n] != null) {
int p = Globals.cl.configstrings[n].indexOf('\\');
@@ -626,25 +367,25 @@ public final class LWJGLSoundImpl implements Sound {
//Com_sprintf (sexedFilename, sizeof(sexedFilename), "#players/%s/%s", model, base+1);
sfx = FindName(sexedFilename, false);
- if (sfx == null) {
- // no, so see if it exists
- RandomAccessFile f = null;
- try {
- f = FS.FOpenFile(sexedFilename.substring(1));
- } catch (IOException e) {}
- if (f != null) {
- // yes, close the file and register it
- try {
- FS.FCloseFile(f);
- } catch (IOException e1) {}
- sfx = RegisterSound(sexedFilename);
- } else {
- // no, revert to the male sound in the pak0.pak
- String maleFilename = "player/male/" + base.substring(1);
- sfx = AliasName(sexedFilename, maleFilename);
- }
+ if (sfx != null) return sfx;
+
+ //
+ // fall back strategies
+ //
+ // not found , so see if it exists
+ if (FS.FileLength(sexedFilename.substring(1)) > 0) {
+ // yes, register it
+ return RegisterSound(sexedFilename);
}
- return sfx;
+ // try it with the female sound in the pak0.pak
+ if (model.equalsIgnoreCase("female")) {
+ String femaleFilename = "player/female/" + base.substring(1);
+ if (FS.FileLength("sound/" + femaleFilename) > 0)
+ return AliasName(sexedFilename, femaleFilename);
+ }
+ // no chance, revert to the male sound in the pak0.pak
+ String maleFilename = "player/male/" + base.substring(1);
+ return AliasName(sexedFilename, maleFilename);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 19:19:53 +0000