Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carsten W. <ca...@us...> - 2006-10-25 20:13:23
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5641/webstart Modified Files: jake2_jogl11.jnlp jake2_online.jnlp Log Message: joal via webstart from sun Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jake2_online.jnlp 8 Jan 2006 22:52:51 -0000 1.1 --- jake2_online.jnlp 25 Oct 2006 20:13:16 -0000 1.2 *************** *** 21,45 **** <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <property name="ATI_WORKAROUND" value="false"/> ! <extension href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp" name="jogl"/> ! </resources> ! ! <resources os="Linux"> ! <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> ! </resources> ! ! <resources os="Windows"> ! <jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/> ! </resources> ! ! <resources os="Mac OS X"> ! <jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/> </resources> ! <application-desc main-class="jake2.Jake2"> <argument>+set</argument> --- 21,28 ---- <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> ! <application-desc main-class="jake2.Jake2"> <argument>+set</argument> *************** *** 51,57 **** <argument>+set</argument> <argument>adr0</argument> ! <argument>213.187.87.100</argument> <argument>+connect</argument> ! <argument>213.187.87.100</argument> </application-desc> --- 34,40 ---- <argument>+set</argument> <argument>adr0</argument> ! <argument>jake2.in-chemnitz.de</argument> <argument>+connect</argument> ! <argument>jake2.in-chemnitz.de</argument> </application-desc> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** jake2_jogl11.jnlp 8 Jan 2006 22:54:29 -0000 1.13 --- jake2_jogl11.jnlp 25 Oct 2006 20:13:16 -0000 1.14 *************** *** 21,45 **** <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <property name="ATI_WORKAROUND" value="false"/> ! <extension href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp" name="jogl"/> ! </resources> ! ! <resources os="Linux"> ! <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> ! </resources> ! ! <resources os="Windows"> ! <jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/> ! </resources> ! ! <resources os="Mac OS X"> ! <jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/> </resources> ! <application-desc main-class="jake2.Jake2"> <argument>+set</argument> --- 21,28 ---- <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> ! <application-desc main-class="jake2.Jake2"> <argument>+set</argument> *************** *** 51,55 **** <argument>+set</argument> <argument>adr0</argument> ! <argument>213.187.87.100</argument> </application-desc> --- 34,38 ---- <argument>+set</argument> <argument>adr0</argument> ! <argument>jake2.in-chemnitz.de</argument> </application-desc> |
|
From: Carsten W. <ca...@us...> - 2006-10-24 23:00:47
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5295 Modified Files: Jake2.bat Jake2.sh Log Message: switch to joal 1.0b01 (now we have a system independent joal.jar) TODO * build.xml, install.xml * jnlp files Index: Jake2.bat =================================================================== RCS file: /cvsroot/jake2/jake2/Jake2.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jake2.bat 28 Nov 2005 07:19:43 -0000 1.1 --- Jake2.bat 24 Oct 2006 23:00:43 -0000 1.2 *************** *** 1,4 **** @echo off SET PATH=lib\joal\windows;%PATH% ! SET CP=build;resources;lib/jogl/jogl.jar;lib/joal/windows/joal.jar;lib/lwjgl/lwjgl.jar;lib/lwjgl/lwjgl_util.jar java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl/windows;lib/joal/windows;lib/lwjgl/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- 1,4 ---- @echo off SET PATH=lib\joal\windows;%PATH% ! SET CP=build;resources;lib/jogl/jogl.jar;lib/joal/joal.jar;lib/lwjgl/lwjgl.jar;lib/lwjgl/lwjgl_util.jar java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl/windows;lib/joal/windows;lib/lwjgl/windows -cp %CP% jake2.Jake2 \ No newline at end of file Index: Jake2.sh =================================================================== RCS file: /cvsroot/jake2/jake2/Jake2.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jake2.sh 12 Dec 2005 21:48:55 -0000 1.4 --- Jake2.sh 24 Oct 2006 23:00:43 -0000 1.5 *************** *** 6,10 **** export LD_LIBRARY_PATH=lib/joal/linux:lib/lwjgl/linux ! CP=build:resources:lib/jogl/jogl.jar:lib/joal/linux/joal.jar:lib/lwjgl/lwjgl.jar:lib/lwjgl/lwjgl_util.jar exec java -Xmx100M -Djava.library.path=lib/jogl/linux:lib/joal/linux:lib/lwjgl/linux -cp $CP jake2.Jake2 $* --- 6,10 ---- export LD_LIBRARY_PATH=lib/joal/linux:lib/lwjgl/linux ! CP=build:resources:lib/jogl/jogl.jar:lib/joal/joal.jar:lib/lwjgl/lwjgl.jar:lib/lwjgl/lwjgl_util.jar exec java -Xmx100M -Djava.library.path=lib/jogl/linux:lib/joal/linux:lib/lwjgl/linux -cp $CP jake2.Jake2 $* |
|
From: Carsten W. <ca...@us...> - 2006-10-24 23:00:47
|
Update of /cvsroot/jake2/jake2/scripts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5295/scripts Modified Files: Jake2.sh Jake2_mac.sh Jake2.bat Log Message: switch to joal 1.0b01 (now we have a system independent joal.jar) TODO * build.xml, install.xml * jnlp files Index: Jake2.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Jake2.sh 28 Jun 2005 07:01:10 -0000 1.6 --- Jake2.sh 24 Oct 2006 23:00:44 -0000 1.7 *************** *** 4,8 **** export LD_LIBRARY_PATH=lib/linux ! CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 --- 4,8 ---- export LD_LIBRARY_PATH=lib/linux ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 Index: Jake2_mac.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_mac.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jake2_mac.sh 24 Oct 2006 22:51:21 -0000 1.3 --- Jake2_mac.sh 24 Oct 2006 23:00:44 -0000 1.4 *************** *** 3,7 **** export LD_LIBRARY_PATH=lib/osx export DYLD_LIBRARY_PATH=lib/osx ! CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 --- 3,7 ---- export LD_LIBRARY_PATH=lib/osx export DYLD_LIBRARY_PATH=lib/osx ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 Index: Jake2.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Jake2.bat 24 Oct 2006 22:15:52 -0000 1.6 --- Jake2.bat 24 Oct 2006 23:00:44 -0000 1.7 *************** *** 1,4 **** @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- 1,4 ---- @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/jogl.jar;lib/joal.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:25
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227 Modified Files: .classpath Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .classpath 14 Dec 2004 00:58:12 -0000 1.6 --- .classpath 24 Oct 2006 22:51:21 -0000 1.7 *************** *** 3,10 **** <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> - <classpathentry kind="src" path="patch"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/linux/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/windows/joal.jar"/> <classpathentry kind="lib" path="lib/jogl/jogl.jar"/> <classpathentry kind="lib" path="resources"/> --- 3,9 ---- <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/gluegen-rt.jar"/> <classpathentry kind="lib" path="lib/jogl/jogl.jar"/> <classpathentry kind="lib" path="resources"/> |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/lib/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/lib/joal Added Files: gluegen-rt.jar joal.jar Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun --- NEW FILE: gluegen-rt.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: joal.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/scripts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/scripts Modified Files: Jake2_mac.sh Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun Index: Jake2_mac.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_mac.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jake2_mac.sh 26 May 2005 16:56:31 -0000 1.2 --- Jake2_mac.sh 24 Oct 2006 22:51:21 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- export LD_LIBRARY_PATH=lib/osx + export DYLD_LIBRARY_PATH=lib/osx CP=lib/jake2.jar:lib/jogl.jar:lib/linux/joal.jar |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/lib/joal/linux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/lib/joal/linux Modified Files: libopenal.so Added Files: libgluegen-rt.so libjoal_native.so Removed Files: joal.jar libjoal.so Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun Index: libopenal.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/joal/linux/libopenal.so,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvskg1CoS and /tmp/cvseGaSdz differ --- libjoal.so DELETED --- --- NEW FILE: libjoal_native.so --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libgluegen-rt.so --- (This appears to be a binary file; contents omitted.) --- joal.jar DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/patch/net/java/games/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/patch/net/java/games/joal Removed Files: ALFactory.java Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun --- ALFactory.java DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/src/jake2/sound/joal Modified Files: Channel.java JOALSoundImpl.java Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun Index: Channel.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/Channel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Channel.java 4 Dec 2005 20:56:26 -0000 1.6 --- Channel.java 24 Oct 2006 22:51:20 -0000 1.7 *************** *** 109,113 **** for (int i = 0; i < MAX_CHANNELS; i++) { ! al.alGenSources(1, tmp); sourceId = tmp[0]; --- 109,113 ---- for (int i = 0; i < MAX_CHANNELS; i++) { ! al.alGenSources(1, tmp, 0); sourceId = tmp[0]; *************** *** 122,127 **** al.alSourcef (sourceId, AL.AL_GAIN, 1.0f); al.alSourcef (sourceId, AL.AL_PITCH, 1.0f); ! al.alSourcei (sourceId, AL.AL_SOURCE_ABSOLUTE, AL.AL_TRUE); ! al.alSourcefv(sourceId, AL.AL_VELOCITY, NULLVECTOR); al.alSourcei (sourceId, AL.AL_LOOPING, AL.AL_FALSE); al.alSourcef (sourceId, AL.AL_REFERENCE_DISTANCE, 200.0f); --- 122,127 ---- al.alSourcef (sourceId, AL.AL_GAIN, 1.0f); al.alSourcef (sourceId, AL.AL_PITCH, 1.0f); ! al.alSourcei (sourceId, AL.AL_SOURCE_RELATIVE, AL.AL_FALSE); ! al.alSourcefv(sourceId, AL.AL_VELOCITY, NULLVECTOR, 0); al.alSourcei (sourceId, AL.AL_LOOPING, AL.AL_FALSE); al.alSourcef (sourceId, AL.AL_REFERENCE_DISTANCE, 200.0f); *************** *** 142,146 **** static void shutdown() { ! al.alDeleteSources(numChannels, sources); numChannels = 0; isInitialized = false; --- 142,146 ---- static void shutdown() { ! al.alDeleteSources(numChannels, sources, 0); numChannels = 0; isInitialized = false; *************** *** 167,171 **** unqueueStreams(); int source = channels[numChannels].sourceId; ! al.alSourcei (source, AL.AL_SOURCE_ABSOLUTE, AL.AL_TRUE); // free the last source --- 167,171 ---- unqueueStreams(); int source = channels[numChannels].sourceId; ! al.alSourcei (source, AL.AL_SOURCE_RELATIVE, AL.AL_FALSE); // free the last source *************** *** 181,188 **** // stop streaming al.alSourceStop(source); ! int count = al.alGetSourcei(source, AL.AL_BUFFERS_QUEUED); Com.DPrintf("unqueue " + count + " buffers\n"); while (count-- > 0) { ! al.alSourceUnqueueBuffers(source, 1, tmp); } streamQueue = 0; --- 181,190 ---- // stop streaming al.alSourceStop(source); ! int[] tmpCount = new int[]{0}; ! al.alGetSourcei(source, AL.AL_BUFFERS_QUEUED, tmpCount, 0); ! int count = tmpCount[0]; Com.DPrintf("unqueue " + count + " buffers\n"); while (count-- > 0) { ! al.alSourceUnqueueBuffers(source, 1, tmp, 0); } streamQueue = 0; *************** *** 193,199 **** int[] buffer = tmp; int source = channels[numChannels].sourceId; - int processed = al.alGetSourcei(source, AL.AL_BUFFERS_PROCESSED); ! boolean playing = (al.alGetSourcei(source, AL.AL_SOURCE_STATE) == AL.AL_PLAYING); boolean interupted = !playing && streamQueue > 2; --- 195,205 ---- int[] buffer = tmp; int source = channels[numChannels].sourceId; ! int[] tmp = new int[]{0}; ! al.alGetSourcei(source, AL.AL_BUFFERS_PROCESSED, tmp, 0); ! int processed = tmp[0]; ! al.alGetSourcei(source, AL.AL_SOURCE_STATE, tmp, 0); ! int state = tmp[0]; ! boolean playing = ( state == AL.AL_PLAYING); boolean interupted = !playing && streamQueue > 2; *************** *** 209,213 **** } else { // reuse the buffer ! al.alSourceUnqueueBuffers(source, 1, buffer); } --- 215,219 ---- } else { // reuse the buffer ! al.alSourceUnqueueBuffers(source, 1, buffer, 0); } *************** *** 215,219 **** samples.limit(count); al.alBufferData(buffer[0], format, samples, count, rate); ! al.alSourceQueueBuffers(source, 1, buffer); if (streamQueue > 1 && !playing) { --- 221,225 ---- samples.limit(count); al.alBufferData(buffer[0], format, samples, count, rate); ! al.alSourceQueueBuffers(source, 1, buffer, 0); if (streamQueue > 1 && !playing) { *************** *** 299,302 **** --- 305,309 ---- int sourceId; int state; + int[] tmp = new int[]{0}; for (int i = 0; i < numChannels; i++) { *************** *** 325,335 **** } al.alSourcef (sourceId, AL.AL_ROLLOFF_FACTOR, ch.rolloff); ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin); al.alSourcePlay(sourceId); ch.modified = false; } else { ! state = al.alGetSourcei(sourceId, AL.AL_SOURCE_STATE); ! if (state == AL.AL_PLAYING) { ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin); } else { ch.clear(); --- 332,343 ---- } al.alSourcef (sourceId, AL.AL_ROLLOFF_FACTOR, ch.rolloff); ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin, 0); al.alSourcePlay(sourceId); ch.modified = false; } else { ! al.alGetSourcei(sourceId, AL.AL_SOURCE_STATE, tmp , 0); ! state = tmp[0]; ! if (state == AL.AL_PLAYING) { ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin, 0); } else { ch.clear(); Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JOALSoundImpl.java 4 Dec 2005 19:21:04 -0000 1.15 --- JOALSoundImpl.java 24 Oct 2006 22:51:20 -0000 1.16 *************** *** 21,24 **** --- 21,25 ---- import net.java.games.joal.eax.EAX; import net.java.games.joal.eax.EAXFactory; + import net.java.games.joal.util.ALut; /** *************** *** 69,93 **** */ public boolean Init() { ! ! // preload OpenAL native library ! String os = System.getProperty("os.name"); ! if (os.startsWith("Linux")) { ! unpack(); ! } else if (os.startsWith("Windows")) { ! try { ! System.loadLibrary("OpenAL32"); ! } catch (Throwable e) {} ! } ! try { ! initOpenAL(); al = ALFactory.getAL(); checkError(); initOpenALExtensions(); ! } catch (OpenALException e) { Com.Printf(e.getMessage() + '\n'); return false; } catch (Throwable e) { ! Com.DPrintf(e.getMessage() + '\n'); return false; } --- 70,85 ---- */ public boolean Init() { ! try { ! ALut.alutInit(); al = ALFactory.getAL(); + alc = ALFactory.getALC(); checkError(); initOpenALExtensions(); ! } catch (ALException e) { Com.Printf(e.getMessage() + '\n'); return false; } catch (Throwable e) { ! Com.Printf(e.toString() + '\n'); return false; } *************** *** 95,99 **** s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE); ! al.alGenBuffers(buffers.length, buffers); int count = Channel.init(al, buffers); Com.Printf("... using " + count + " channels\n"); --- 87,91 ---- s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE); ! al.alGenBuffers(buffers.length, buffers, 0); int count = Channel.init(al, buffers); Com.Printf("... using " + count + " channels\n"); *************** *** 128,156 **** return true; } ! ! ! private void initOpenAL() throws OpenALException { ! ALFactory.initialize(); ! alc = ALFactory.getALC(); ! String deviceName = null; ! ! String os = System.getProperty("os.name"); ! if (os.startsWith("Windows")) { ! deviceName = "DirectSound3D"; ! } ! ALC.Device device = alc.alcOpenDevice(deviceName); ! String deviceSpecifier = alc.alcGetString(device, ALC.ALC_DEVICE_SPECIFIER); ! String defaultSpecifier = alc.alcGetString(device, ALC.ALC_DEFAULT_DEVICE_SPECIFIER); ! ! Com.Printf(os + " using " + ((deviceName == null) ? defaultSpecifier : deviceName) + '\n'); ! ! ALC.Context context = alc.alcCreateContext(device, new int[] {0}); ! alc.alcMakeContextCurrent(context); ! // Check for an error. ! if (alc.alcGetError(device) != ALC.ALC_NO_ERROR) { ! Com.DPrintf("Error with SoundDevice"); ! } ! } ! private void initOpenALExtensions() { if (al.alIsExtensionPresent("EAX2.0")) { --- 120,124 ---- return true; } ! private void initOpenALExtensions() { if (al.alIsExtensionPresent("EAX2.0")) { *************** *** 165,171 **** void exitOpenAL() { // Get the current context. ! ALC.Context curContext = alc.alcGetCurrentContext(); // Get the device used by that context. ! ALC.Device curDevice = alc.alcGetContextsDevice(curContext); // Reset the current context to NULL. alc.alcMakeContextCurrent(null); --- 133,139 ---- void exitOpenAL() { // Get the current context. ! ALCcontext curContext = alc.alcGetCurrentContext(); // Get the device used by that context. ! ALCdevice curDevice = alc.alcGetContextsDevice(curContext); // Reset the current context to NULL. alc.alcMakeContextCurrent(null); *************** *** 214,218 **** StopAllSounds(); Channel.shutdown(); ! al.alDeleteBuffers(buffers.length, buffers); exitOpenAL(); --- 182,186 ---- StopAllSounds(); Channel.shutdown(); ! al.alDeleteBuffers(buffers.length, buffers, 0); exitOpenAL(); *************** *** 268,275 **** public void Update(float[] origin, float[] forward, float[] right, float[] up) { Channel.convertVector(origin, listenerOrigin); ! al.alListenerfv(AL.AL_POSITION, listenerOrigin); Channel.convertOrientation(forward, up, listenerOrientation); ! al.alListenerfv(AL.AL_ORIENTATION, listenerOrientation); // set the listener (master) volume --- 236,243 ---- public void Update(float[] origin, float[] forward, float[] right, float[] up) { Channel.convertVector(origin, listenerOrigin); ! al.alListenerfv(AL.AL_POSITION, listenerOrigin, 0); Channel.convertOrientation(forward, up, listenerOrientation); ! al.alListenerfv(AL.AL_ORIENTATION, listenerOrientation, 0); // set the listener (master) volume |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/lib/joal/windows In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/lib/joal/windows Modified Files: OpenAL32.dll Added Files: gluegen-rt.dll wrap_oal.dll joal_native.dll Removed Files: joal.jar joal.dll Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun Index: OpenAL32.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/joal/windows/OpenAL32.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsRXlEKM and /tmp/cvsnx3Pev differ --- joal.dll DELETED --- --- joal.jar DELETED --- --- NEW FILE: gluegen-rt.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: joal_native.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wrap_oal.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:51:24
|
Update of /cvsroot/jake2/jake2/lib/joal/osx In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32227/lib/joal/osx Added Files: libgluegen-rt.jnilib libjoal_native.jnilib Removed Files: joal.jar libjoal.jnilib Log Message: switch to joal 1.0b01 (new libraries, API changes) TODO * joal via webstart from sun --- NEW FILE: libjoal_native.jnilib --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libgluegen-rt.jnilib --- (This appears to be a binary file; contents omitted.) --- joal.jar DELETED --- --- libjoal.jnilib DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:39:47
|
Update of /cvsroot/jake2/jake2/scripts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15307/scripts Modified Files: Jake2_lwjgl.bat Jake2.bat Added Files: Jake2_dedicated.sh Jake2_dedicated.bat Log Message: merge r_0_9_5 into HEAD Index: Jake2_lwjgl.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_lwjgl.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jake2_lwjgl.bat 26 May 2005 16:56:31 -0000 1.2 --- Jake2_lwjgl.bat 24 Oct 2006 22:15:52 -0000 1.3 *************** *** 2,4 **** SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar ! java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- 2,4 ---- SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar ! start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- NEW FILE: Jake2_dedicated.bat --- @echo off SET CP=lib/jake2.jar java -Xmx64M -cp %CP% jake2.Jake2 +set dedicated 1 --- NEW FILE: Jake2_dedicated.sh --- #!/bin/bash cd `dirname $0` CP=lib/jake2.jar exec java -Xmx64M -cp $CP jake2.Jake2 Index: Jake2.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Jake2.bat 26 May 2005 16:56:32 -0000 1.5 --- Jake2.bat 24 Oct 2006 22:15:52 -0000 1.6 *************** *** 2,4 **** SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar ! java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- 2,4 ---- SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar ! start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:38:38
|
Update of /cvsroot/jake2/jake2/.settings In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15307/.settings Added Files: org.eclipse.core.resources.prefs Log Message: merge r_0_9_5 into HEAD --- NEW FILE: org.eclipse.core.resources.prefs --- #Wed Oct 25 00:11:03 CEST 2006 eclipse.preferences.version=1 encoding/<project>=ISO-8859-1 |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:38:38
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15307 Modified Files: README_DE build.xml README Log Message: merge r_0_9_5 into HEAD Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** README 1 Jul 2005 14:24:45 -0000 1.9 --- README 24 Oct 2006 22:15:52 -0000 1.10 *************** *** 7,11 **** The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering ! and Java OpenAL (joal) for sound. The 0.9.4 release comes with an lwjgl driver as an alternative for the jogl/joal combination. --- 7,11 ---- The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering ! and Java OpenAL (joal) for sound. Since 0.9.4 release, Jake2 comes with an lwjgl driver as an alternative for the jogl/joal combination. *************** *** 13,17 **** ja...@by.... ! Currently Jake2 supports Linux, Windows2000/XP and Mac OS X. requirements: --- 13,18 ---- ja...@by.... ! Currently Jake2 supports Linux, Windows2000/XP and Mac OS X. The Jake2 dedicated ! server runs on every Java supported plattform. requirements: *************** *** 25,29 **** from binary distribution: ! - run the installer with "java -jar Jake2-0.9.4-install.jar" - follow the instructions - change to the installation directory --- 26,30 ---- from binary distribution: ! - run the installer with "java -jar Jake2-0.9.5-install.jar" - follow the instructions - change to the installation directory *************** *** 62,66 **** ant build tool http://ant.apache.org xerces XML library http://xml.apache.org - proguard obfuscator http://proguard.sourceforge.net Use <ja...@by...> for bug reports and feedback. --- 63,66 ---- Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** build.xml 18 Nov 2005 07:28:45 -0000 1.28 --- build.xml 24 Oct 2006 22:15:52 -0000 1.29 *************** *** 205,208 **** --- 205,209 ---- <include name="install.xml"/> <include name="readme.id"/> + <include name="Jake2_Eclipse_Setup.txt"/> </tarfileset> </tar> *************** *** 221,225 **** <include name="README*"/> <include name="install.xml"/> ! <include name="readme.id"/> </zipfileset> </zip> --- 222,227 ---- <include name="README*"/> <include name="install.xml"/> ! <include name="readme.id"/> ! <include name="Jake2_Eclipse_Setup.txt"/> </zipfileset> </zip> Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README_DE 1 Jul 2005 14:24:45 -0000 1.8 --- README_DE 24 Oct 2006 22:15:52 -0000 1.9 *************** *** 16,22 **** Bugreports und Rückmeldungen ist ja...@by.... ! Jake2 wird von uns unter Linux und Windows2000/XP getestet. Wir haben Feedback, ! dass Jake2 mit den richtigen plattformspezifischen jogl Bibliotheken auch auf ! Mac OS X läuft. Mindestanforderungen: --- 16,21 ---- Bugreports und Rückmeldungen ist ja...@by.... ! Jake2 läuft unter Linux, Windows2000/XP sowie Mac OS X. Als reiner Server ohne ! grafische Oberfläche läuft Jake2 auf jeder Plattform mit JRE1.4. Mindestanforderungen: *************** *** 30,34 **** ausgehend von der Binärdistribution: ! - Installationsprogramm mit "java -jar Jake2-0.9.4-install.jar" starten - den Anweisungen folgen - ins Installationsverzeichnis wechseln --- 29,33 ---- ausgehend von der Binärdistribution: ! - Installationsprogramm mit "java -jar Jake2-0.9.5-install.jar" starten - den Anweisungen folgen - ins Installationsverzeichnis wechseln *************** *** 68,72 **** ant build tool http://ant.apache.org xerces XML library http://xml.apache.org - proguard obfuscator http://proguard.sourceforge.net <ja...@by...> für Bugreports und Rückmeldungen. --- 67,70 ---- |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:38:38
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15307/webstart Removed Files: jake2_jogl11ATI.jnlp Log Message: merge r_0_9_5 into HEAD --- jake2_jogl11ATI.jnlp DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-24 22:38:35
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15307/src/jake2/client Modified Files: Menu.java Log Message: merge r_0_9_5 into HEAD Index: Menu.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Menu.java 3 Dec 2005 19:47:36 -0000 1.20 --- Menu.java 24 Oct 2006 22:15:53 -0000 1.21 *************** *** 1714,1718 **** static String idcredits[] = { "+QUAKE II BY ID SOFTWARE", "", "+PROGRAMMING", "John Carmack", "John Cash", "Brian Hook", "", ! "+JAVA PORT BY BYTONIC", "CWEI", "HOZ", "RST", "", "+ART", "Adrian Carmack", "Kevin Cloud", "Paul Steed", "", "+LEVEL DESIGN", "Tim Willits", "American McGee", "Christian Antkow", --- 1714,1718 ---- static String idcredits[] = { "+QUAKE II BY ID SOFTWARE", "", "+PROGRAMMING", "John Carmack", "John Cash", "Brian Hook", "", ! "+JAVA PORT BY BYTONIC", "Carsten Weisse", "Holger Zickner", "Rene Stoeckel", "", "+ART", "Adrian Carmack", "Kevin Cloud", "Paul Steed", "", "+LEVEL DESIGN", "Tim Willits", "American McGee", "Christian Antkow", |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:27:46
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17662 Modified Files: Tag: render-refactoring .classpath Log Message: patch removed Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.6.8.2 retrieving revision 1.6.8.3 diff -C2 -d -r1.6.8.2 -r1.6.8.3 *** .classpath 18 Oct 2006 21:15:14 -0000 1.6.8.2 --- .classpath 18 Oct 2006 21:27:42 -0000 1.6.8.3 *************** *** 3,7 **** <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> - <classpathentry kind="src" path="patch"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/joal/joal.jar"/> --- 3,6 ---- |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:23
|
Update of /cvsroot/jake2/jake2/lib/joal/osx In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/lib/joal/osx Added Files: Tag: render-refactoring libjoal_native.jnilib libgluegen-rt.jnilib Removed Files: Tag: render-refactoring libjoal.jnilib joal.jar Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun --- NEW FILE: libjoal_native.jnilib --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libgluegen-rt.jnilib --- (This appears to be a binary file; contents omitted.) --- joal.jar DELETED --- --- libjoal.jnilib DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:21
|
Update of /cvsroot/jake2/jake2/lib/joal/linux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/lib/joal/linux Modified Files: Tag: render-refactoring libopenal.so Added Files: Tag: render-refactoring libgluegen-rt.so libjoal_native.so Removed Files: Tag: render-refactoring joal.jar libjoal.so Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun Index: libopenal.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/joal/linux/libopenal.so,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -C2 -d -r1.1 -r1.1.16.1 Binary files /tmp/cvsmg5EGH and /tmp/cvs7FHDkM differ --- libjoal.so DELETED --- --- NEW FILE: libjoal_native.so --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libgluegen-rt.so --- (This appears to be a binary file; contents omitted.) --- joal.jar DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:21
|
Update of /cvsroot/jake2/jake2/lib/joal/windows In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/lib/joal/windows Modified Files: Tag: render-refactoring OpenAL32.dll Added Files: Tag: render-refactoring joal_native.dll gluegen-rt.dll wrap_oal.dll Removed Files: Tag: render-refactoring joal.dll joal.jar Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun Index: OpenAL32.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/joal/windows/OpenAL32.dll,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -C2 -d -r1.1 -r1.1.16.1 Binary files /tmp/cvsSTuJjX and /tmp/cvsgs9ch2 differ --- joal.dll DELETED --- --- joal.jar DELETED --- --- NEW FILE: gluegen-rt.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: joal_native.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wrap_oal.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:21
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824 Modified Files: Tag: render-refactoring .classpath Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.6.8.1 retrieving revision 1.6.8.2 diff -C2 -d -r1.6.8.1 -r1.6.8.2 *** .classpath 7 Oct 2006 19:57:34 -0000 1.6.8.1 --- .classpath 18 Oct 2006 21:15:14 -0000 1.6.8.2 *************** *** 5,10 **** <classpathentry kind="src" path="patch"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/linux/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/windows/joal.jar"/> <classpathentry kind="lib" path="resources"/> <classpathentry kind="lib" path="lib/lwjgl/lwjgl_util.jar"/> --- 5,10 ---- <classpathentry kind="src" path="patch"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="lib/joal/joal.jar"/> ! <classpathentry kind="lib" path="lib/joal/gluegen-rt.jar"/> <classpathentry kind="lib" path="resources"/> <classpathentry kind="lib" path="lib/lwjgl/lwjgl_util.jar"/> |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:20
|
Update of /cvsroot/jake2/jake2/patch/net/java/games/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/patch/net/java/games/joal Removed Files: Tag: render-refactoring ALFactory.java Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun --- ALFactory.java DELETED --- |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:20
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/src/jake2/sound/joal Modified Files: Tag: render-refactoring JOALSoundImpl.java Channel.java Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun Index: Channel.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/Channel.java,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -C2 -d -r1.4.6.1 -r1.4.6.2 *** Channel.java 25 Dec 2005 18:16:06 -0000 1.4.6.1 --- Channel.java 18 Oct 2006 21:15:14 -0000 1.4.6.2 *************** *** 109,113 **** for (int i = 0; i < MAX_CHANNELS; i++) { ! al.alGenSources(1, tmp); sourceId = tmp[0]; --- 109,113 ---- for (int i = 0; i < MAX_CHANNELS; i++) { ! al.alGenSources(1, tmp, 0); sourceId = tmp[0]; *************** *** 122,127 **** al.alSourcef (sourceId, AL.AL_GAIN, 1.0f); al.alSourcef (sourceId, AL.AL_PITCH, 1.0f); ! al.alSourcei (sourceId, AL.AL_SOURCE_ABSOLUTE, AL.AL_TRUE); ! al.alSourcefv(sourceId, AL.AL_VELOCITY, NULLVECTOR); al.alSourcei (sourceId, AL.AL_LOOPING, AL.AL_FALSE); al.alSourcef (sourceId, AL.AL_REFERENCE_DISTANCE, 200.0f); --- 122,127 ---- al.alSourcef (sourceId, AL.AL_GAIN, 1.0f); al.alSourcef (sourceId, AL.AL_PITCH, 1.0f); ! al.alSourcei (sourceId, AL.AL_SOURCE_RELATIVE, AL.AL_FALSE); ! al.alSourcefv(sourceId, AL.AL_VELOCITY, NULLVECTOR, 0); al.alSourcei (sourceId, AL.AL_LOOPING, AL.AL_FALSE); al.alSourcef (sourceId, AL.AL_REFERENCE_DISTANCE, 200.0f); *************** *** 142,146 **** static void shutdown() { ! al.alDeleteSources(numChannels, sources); numChannels = 0; isInitialized = false; --- 142,146 ---- static void shutdown() { ! al.alDeleteSources(numChannels, sources, 0); numChannels = 0; isInitialized = false; *************** *** 167,171 **** unqueueStreams(); int source = channels[numChannels].sourceId; ! al.alSourcei (source, AL.AL_SOURCE_ABSOLUTE, AL.AL_TRUE); // free the last source --- 167,171 ---- unqueueStreams(); int source = channels[numChannels].sourceId; ! al.alSourcei (source, AL.AL_SOURCE_RELATIVE, AL.AL_FALSE); // free the last source *************** *** 181,188 **** // stop streaming al.alSourceStop(source); ! int count = al.alGetSourcei(source, AL.AL_BUFFERS_QUEUED); Com.DPrintf("unqueue " + count + " buffers\n"); while (count-- > 0) { ! al.alSourceUnqueueBuffers(source, 1, tmp); } streamQueue = 0; --- 181,190 ---- // stop streaming al.alSourceStop(source); ! int[] tmpCount = new int[]{0}; ! al.alGetSourcei(source, AL.AL_BUFFERS_QUEUED, tmpCount, 0); ! int count = tmpCount[0]; Com.DPrintf("unqueue " + count + " buffers\n"); while (count-- > 0) { ! al.alSourceUnqueueBuffers(source, 1, tmp, 0); } streamQueue = 0; *************** *** 193,199 **** int[] buffer = tmp; int source = channels[numChannels].sourceId; - int processed = al.alGetSourcei(source, AL.AL_BUFFERS_PROCESSED); ! boolean playing = (al.alGetSourcei(source, AL.AL_SOURCE_STATE) == AL.AL_PLAYING); boolean interupted = !playing && streamQueue > 2; --- 195,205 ---- int[] buffer = tmp; int source = channels[numChannels].sourceId; ! int[] tmp = new int[]{0}; ! al.alGetSourcei(source, AL.AL_BUFFERS_PROCESSED, tmp, 0); ! int processed = tmp[0]; ! al.alGetSourcei(source, AL.AL_SOURCE_STATE, tmp, 0); ! int state = tmp[0]; ! boolean playing = ( state == AL.AL_PLAYING); boolean interupted = !playing && streamQueue > 2; *************** *** 209,213 **** } else { // reuse the buffer ! al.alSourceUnqueueBuffers(source, 1, buffer); } --- 215,219 ---- } else { // reuse the buffer ! al.alSourceUnqueueBuffers(source, 1, buffer, 0); } *************** *** 215,219 **** samples.limit(count); al.alBufferData(buffer[0], format, samples, count, rate); ! al.alSourceQueueBuffers(source, 1, buffer); if (streamQueue > 1 && !playing) { --- 221,225 ---- samples.limit(count); al.alBufferData(buffer[0], format, samples, count, rate); ! al.alSourceQueueBuffers(source, 1, buffer, 0); if (streamQueue > 1 && !playing) { *************** *** 299,302 **** --- 305,309 ---- int sourceId; int state; + int[] tmp = new int[]{0}; for (int i = 0; i < numChannels; i++) { *************** *** 325,335 **** } al.alSourcef (sourceId, AL.AL_ROLLOFF_FACTOR, ch.rolloff); ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin); al.alSourcePlay(sourceId); ch.modified = false; } else { ! state = al.alGetSourcei(sourceId, AL.AL_SOURCE_STATE); ! if (state == AL.AL_PLAYING) { ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin); } else { ch.clear(); --- 332,343 ---- } al.alSourcef (sourceId, AL.AL_ROLLOFF_FACTOR, ch.rolloff); ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin, 0); al.alSourcePlay(sourceId); ch.modified = false; } else { ! al.alGetSourcei(sourceId, AL.AL_SOURCE_STATE, tmp , 0); ! state = tmp[0]; ! if (state == AL.AL_PLAYING) { ! al.alSourcefv(sourceId, AL.AL_POSITION, sourceOrigin, 0); } else { ch.clear(); Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.13.6.1 retrieving revision 1.13.6.2 diff -C2 -d -r1.13.6.1 -r1.13.6.2 *** JOALSoundImpl.java 25 Dec 2005 18:16:06 -0000 1.13.6.1 --- JOALSoundImpl.java 18 Oct 2006 21:15:14 -0000 1.13.6.2 *************** *** 21,24 **** --- 21,25 ---- import net.java.games.joal.eax.EAX; import net.java.games.joal.eax.EAXFactory; + import net.java.games.joal.util.ALut; /** *************** *** 69,93 **** */ public boolean Init() { ! ! // preload OpenAL native library ! String os = System.getProperty("os.name"); ! if (os.startsWith("Linux")) { ! unpack(); ! } else if (os.startsWith("Windows")) { ! try { ! System.loadLibrary("OpenAL32"); ! } catch (Throwable e) {} ! } ! try { ! initOpenAL(); al = ALFactory.getAL(); checkError(); initOpenALExtensions(); ! } catch (OpenALException e) { Com.Printf(e.getMessage() + '\n'); return false; } catch (Throwable e) { ! Com.DPrintf(e.getMessage() + '\n'); return false; } --- 70,85 ---- */ public boolean Init() { ! try { ! ALut.alutInit(); al = ALFactory.getAL(); + alc = ALFactory.getALC(); checkError(); initOpenALExtensions(); ! } catch (ALException e) { Com.Printf(e.getMessage() + '\n'); return false; } catch (Throwable e) { ! Com.Printf(e.toString() + '\n'); return false; } *************** *** 95,99 **** s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE); ! al.alGenBuffers(buffers.length, buffers); int count = Channel.init(al, buffers); Com.Printf("... using " + count + " channels\n"); --- 87,91 ---- s_volume = Cvar.Get("s_volume", "0.7", Defines.CVAR_ARCHIVE); ! al.alGenBuffers(buffers.length, buffers, 0); int count = Channel.init(al, buffers); Com.Printf("... using " + count + " channels\n"); *************** *** 128,156 **** return true; } ! ! ! private void initOpenAL() throws OpenALException { ! ALFactory.initialize(); ! alc = ALFactory.getALC(); ! String deviceName = null; ! ! String os = System.getProperty("os.name"); ! if (os.startsWith("Windows")) { ! deviceName = "DirectSound3D"; ! } ! ALC.Device device = alc.alcOpenDevice(deviceName); ! String deviceSpecifier = alc.alcGetString(device, ALC.ALC_DEVICE_SPECIFIER); ! String defaultSpecifier = alc.alcGetString(device, ALC.ALC_DEFAULT_DEVICE_SPECIFIER); ! ! Com.Printf(os + " using " + ((deviceName == null) ? defaultSpecifier : deviceName) + '\n'); ! ! ALC.Context context = alc.alcCreateContext(device, new int[] {0}); ! alc.alcMakeContextCurrent(context); ! // Check for an error. ! if (alc.alcGetError(device) != ALC.ALC_NO_ERROR) { ! Com.DPrintf("Error with SoundDevice"); ! } ! } ! private void initOpenALExtensions() { if (al.alIsExtensionPresent("EAX2.0")) { --- 120,124 ---- return true; } ! private void initOpenALExtensions() { if (al.alIsExtensionPresent("EAX2.0")) { *************** *** 165,171 **** void exitOpenAL() { // Get the current context. ! ALC.Context curContext = alc.alcGetCurrentContext(); // Get the device used by that context. ! ALC.Device curDevice = alc.alcGetContextsDevice(curContext); // Reset the current context to NULL. alc.alcMakeContextCurrent(null); --- 133,139 ---- void exitOpenAL() { // Get the current context. ! ALCcontext curContext = alc.alcGetCurrentContext(); // Get the device used by that context. ! ALCdevice curDevice = alc.alcGetContextsDevice(curContext); // Reset the current context to NULL. alc.alcMakeContextCurrent(null); *************** *** 214,218 **** StopAllSounds(); Channel.shutdown(); ! al.alDeleteBuffers(buffers.length, buffers); exitOpenAL(); --- 182,186 ---- StopAllSounds(); Channel.shutdown(); ! al.alDeleteBuffers(buffers.length, buffers, 0); exitOpenAL(); *************** *** 268,275 **** public void Update(float[] origin, float[] forward, float[] right, float[] up) { Channel.convertVector(origin, listenerOrigin); ! al.alListenerfv(AL.AL_POSITION, listenerOrigin); Channel.convertOrientation(forward, up, listenerOrientation); ! al.alListenerfv(AL.AL_ORIENTATION, listenerOrientation); // set the listener (master) volume --- 236,243 ---- public void Update(float[] origin, float[] forward, float[] right, float[] up) { Channel.convertVector(origin, listenerOrigin); ! al.alListenerfv(AL.AL_POSITION, listenerOrigin, 0); Channel.convertOrientation(forward, up, listenerOrientation); ! al.alListenerfv(AL.AL_ORIENTATION, listenerOrientation, 0); // set the listener (master) volume |
|
From: Carsten W. <ca...@us...> - 2006-10-18 21:15:20
|
Update of /cvsroot/jake2/jake2/lib/joal In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11824/lib/joal Added Files: Tag: render-refactoring joal.jar gluegen-rt.jar Log Message: switch to joal 1.0b01 (new libraries, API changes, tested on MacBook Pro (univeral binaries)) TODO * joal via webstart from sun --- NEW FILE: gluegen-rt.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: joal.jar --- (This appears to be a binary file; contents omitted.) |
2 messages has been excluded from this view by a project administrator.
