diff options
author | Sven Gothel <[email protected]> | 2012-10-07 12:43:16 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-10-07 12:43:16 +0200 |
commit | 747589b5c3267835c36138afded38f607ba6e04e (patch) | |
tree | 04ce175309fdfa993584e8bab132b252239bfb22 /src/jake2/sound | |
parent | 0eba8e26ff1426d4fb2b6b58e9825f72def4c8f3 (diff) |
Simple JOGL2 port
- Remove _very_ old JOGL port (net.java.games.jogl.GL)
- Rename Jsr231* -> Jogl*
- Port Jsr231 to Jogl2:
- package rename of jogl/joal
- use AWT GLCanvas derivation instead of partially reimplementing it in JoglDriver
- drop some EXT suffixes
- name driver 'jogl2'
Diffstat (limited to 'src/jake2/sound')
-rw-r--r-- | src/jake2/sound/S.java | 2 | ||||
-rw-r--r-- | src/jake2/sound/joal/Channel.java | 12 | ||||
-rw-r--r-- | src/jake2/sound/joal/JOALSoundImpl.java | 8 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/jake2/sound/S.java b/src/jake2/sound/S.java index 4b530c3..90b178c 100644 --- a/src/jake2/sound/S.java +++ b/src/jake2/sound/S.java @@ -67,7 +67,7 @@ public class S { // prefered driver try { - Class.forName("net.java.games.joal.AL"); + Class.forName("com.jogamp.openal.AL"); Class.forName("jake2.sound.joal.JOALSoundImpl"); } catch (Throwable e) { // ignore the joal driver if runtime not in classpath diff --git a/src/jake2/sound/joal/Channel.java b/src/jake2/sound/joal/Channel.java index 4b694ea..86a5990 100644 --- a/src/jake2/sound/joal/Channel.java +++ b/src/jake2/sound/joal/Channel.java @@ -29,14 +29,18 @@ import jake2.Globals; import jake2.client.CL_ents; import jake2.game.entity_state_t; import jake2.qcommon.Com; -import jake2.sound.*; +import jake2.sound.Sound; +import jake2.sound.sfx_t; +import jake2.sound.sfxcache_t; import jake2.util.Math3D; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; -import net.java.games.joal.AL; -import net.java.games.joal.ALException; +import com.jogamp.openal.AL; +import com.jogamp.openal.ALException; /** * Channel diff --git a/src/jake2/sound/joal/JOALSoundImpl.java b/src/jake2/sound/joal/JOALSoundImpl.java index d515633..e70b348 100644 --- a/src/jake2/sound/joal/JOALSoundImpl.java +++ b/src/jake2/sound/joal/JOALSoundImpl.java @@ -15,10 +15,10 @@ import jake2.util.Vargs; import java.nio.*; -import net.java.games.joal.*; -import net.java.games.joal.eax.EAX; -import net.java.games.joal.eax.EAXFactory; -import net.java.games.joal.util.ALut; +import com.jogamp.openal.*; +import com.jogamp.openal.eax.EAX; +import com.jogamp.openal.eax.EAXFactory; +import com.jogamp.openal.util.ALut; /** * JOALSoundImpl |