From 94dabe3de52fcd7a8a3ac7016949614cd34a1074 Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Thu, 2 Feb 2012 01:02:51 -0500
Subject: [PATCH] - EFX is now in LWJake2. 	- The underwater effect is
 placeholder, but it does what it does. - Added flibitEFX.jar to the
 libraries. 	- This is a library derived from the flibit2D engine. It
 stores EFX preset effects, which can be accessed with the getIndex() method.

---
 .classpath                                  |   1 +
 doc/license.flibitEFX                       |  15 ++++
 lib/flibitEFX.jar                           | Bin 0 -> 3715 bytes
 src/lwjake2/sound/lwjgl/Channel.java        |   7 +-
 src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java |  92 +++++---------------
 5 files changed, 41 insertions(+), 74 deletions(-)
 create mode 100644 doc/license.flibitEFX
 create mode 100644 lib/flibitEFX.jar

diff --git a/.classpath b/.classpath
index 7a93719..cce230b 100644
--- a/.classpath
+++ b/.classpath
@@ -8,5 +8,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/lwjgl_util.jar"/>
+	<classpathentry kind="lib" path="lib/flibitEFX.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/doc/license.flibitEFX b/doc/license.flibitEFX
new file mode 100644
index 0000000..1242742
--- /dev/null
+++ b/doc/license.flibitEFX
@@ -0,0 +1,15 @@
+/* 
+ * Copyright (C) 2011 Ethan "flibitijibibo" Lee
+ * 
+ * flibitEFX is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * flibitEFX is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with flibitEFX.  If not, see <http://www.gnu.org/licenses/>.
+ */
\ No newline at end of file
diff --git a/lib/flibitEFX.jar b/lib/flibitEFX.jar
new file mode 100644
index 0000000000000000000000000000000000000000..adadd74558fbd43fdd63fd3bf578c7236e897d00
GIT binary patch
literal 3715
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
Vu>p`~Pfthw<dS=B7sKAK{{et}+42AY

literal 0
HcmV?d00001

diff --git a/src/lwjake2/sound/lwjgl/Channel.java b/src/lwjake2/sound/lwjgl/Channel.java
index 54f40ad..2bc2072 100644
--- a/src/lwjake2/sound/lwjgl/Channel.java
+++ b/src/lwjake2/sound/lwjgl/Channel.java
@@ -37,6 +37,8 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.lwjgl.openal.AL10;
+import org.lwjgl.openal.AL11;
+import org.lwjgl.openal.EFX10;
 
 /**
  * Channel
@@ -52,7 +54,7 @@ public class Channel {
 	
 	private static Channel[] channels = new Channel[MAX_CHANNELS];
 	private static IntBuffer sources = Lib.newIntBuffer(MAX_CHANNELS);
-	// a reference of L:WJGLSoundImpl.buffers 
+	// a reference of LWJGLSoundImpl.buffers 
 	private static IntBuffer buffers;
 	private static Map looptable = new Hashtable(MAX_CHANNELS);
 
@@ -289,7 +291,7 @@ public class Channel {
 	//stack variable
 	private static float[] entityOrigin = {0, 0, 0};
  
-	static void playAllSounds(FloatBuffer listenerOrigin) {
+	static void playAllSounds(FloatBuffer listenerOrigin, int currentEffectIndex) {
 		FloatBuffer sourceOrigin = sourceOriginBuffer;
 		Channel ch;
 		int sourceId;
@@ -323,6 +325,7 @@ public class Channel {
 					}
 					AL10.alSourcef (sourceId, AL10.AL_ROLLOFF_FACTOR, ch.rolloff);
 					AL10.alSource3f(sourceId, AL10.AL_POSITION, sourceOrigin.get(), sourceOrigin.get(), sourceOrigin.get());
+					AL11.alSource3i(sourceId, EFX10.AL_AUXILIARY_SEND_FILTER, currentEffectIndex, 0, EFX10.AL_FILTER_NULL);
 					AL10.alSourcePlay(sourceId);
 					sourceOrigin.rewind();
 					ch.modified = false;
diff --git a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java
index e2cefb8..1615d46 100644
--- a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java
+++ b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java
@@ -21,6 +21,7 @@ package lwjake2.sound.lwjgl;
 import lwjake2.Defines;
 import lwjake2.Globals;
 import lwjake2.game.Cmd;
+import lwjake2.game.GameBase;
 import lwjake2.game.cvar_t;
 import lwjake2.game.entity_state_t;
 import lwjake2.qcommon.Com;
@@ -41,17 +42,13 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
+import com.flibitijibibo.flibitEFX.EFXUnderwater;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.openal.AL;
 import org.lwjgl.openal.AL10;
 import org.lwjgl.openal.ALC10;
+import org.lwjgl.openal.EFX10;
 import org.lwjgl.openal.OpenALException;
-/*
-Old EAX Code. If possible, replace with EFX10 - flibit
-import org.lwjgl.openal.eax.EAX;
-import org.lwjgl.openal.eax.EAX20;
-import org.lwjgl.openal.eax.EAXListenerProperties;
-*/
 
 /**
  * LWJGLSoundImpl
@@ -63,15 +60,16 @@ public final class LWJGLSoundImpl implements Sound {
 	static {
 		S.register(new LWJGLSoundImpl());
 	};
-
-	// Replace with an EFX equivalent - flibit
-	// private boolean hasEAX;
 	
 	private cvar_t s_volume;
 	
 	// the last 4 buffers are used for cinematics streaming
     private IntBuffer buffers = Lib.newIntBuffer(MAX_SFX + STREAM_QUEUE);
 
+    /** EFX Variables */
+    private int currentEffectIndex;
+    private EFXUnderwater underwaterEffect;
+    
 	// singleton 
 	private LWJGLSoundImpl() {
 	}
@@ -84,7 +82,7 @@ public final class LWJGLSoundImpl implements Sound {
 		try {
 			initOpenAL();
 			checkError();
-			// initOpenALExtensions(); <- If possible, replace with EFX10 - flibit		
+			initOpenALExtensions();
 		} catch (OpenALException e) {
 			Com.Printf(e.getMessage() + '\n');
 			return false;
@@ -151,44 +149,18 @@ public final class LWJGLSoundImpl implements Sound {
 		}
 	}
 	
-	/*
-	
-	This is old EAX code. If possible, replace with EFX10 - flibit
-	
-	private void initOpenALExtensions() throws OpenALException 
+	/** Initializes OpenAL EFX effects. */
+	private void initOpenALExtensions() 
 	{
-		if (AL10.alIsExtensionPresent("EAX2.0")) 
-		{
-			try {
-				EAX.create();
-				Com.Printf("... using EAX2.0\n");
-				hasEAX=true;
-			} catch (LWJGLException e) {
-				Com.Printf("... can't create EAX2.0\n");
-				hasEAX=false;
-			}
-		} 
-		else 
-		{
-			Com.Printf("... EAX2.0 not found\n");
-			hasEAX=false;
-		}
+		Com.Printf("... using EFX effects:\n");
+		underwaterEffect = new EFXUnderwater();
 	}
 	
-	*/
-	
 	
 	void exitOpenAL() 
 	{
-		/*
-		
-		This is old EAX code. If possible, replace with EFX10 - flibit
-		
-		// Release the EAX context.
-		if (hasEAX){
-			EAX.destroy();
-		}
-		*/
+		// Unload EFX Effects
+		underwaterEffect.killEffect();
 		
 		// Release the context and the device.
 		AL.destroy();
@@ -287,40 +259,16 @@ public final class LWJGLSoundImpl implements Sound {
 		// set the master volume
 		AL10.alListenerf(AL10.AL_GAIN, s_volume.value);
 		
-		/*
-		
-		This is old EAX code. If possible, replace with EFX10 - flibit
-		
-		if (hasEAX){
-			if ((GameBase.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0) {
-				changeEnvironment(EAX20.EAX_ENVIRONMENT_UNDERWATER);
-			} else {
-				changeEnvironment(EAX20.EAX_ENVIRONMENT_GENERIC);
-			}
-		}
-		
-		*/
+		// Detect EFX Conditions
+		if ((GameBase.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0)
+			currentEffectIndex = underwaterEffect.getIndex();
+		else
+			currentEffectIndex = EFX10.AL_EFFECTSLOT_NULL;
 		
 	    Channel.addLoopSounds();
 	    Channel.addPlaySounds();
-		Channel.playAllSounds(listenerOrigin);
+		Channel.playAllSounds(listenerOrigin, currentEffectIndex);
 	}
-	
-	/*
-	
-	This is old EAX code. If possible, replace with EFX10 - flibit
-	
-	private IntBuffer eaxEnv = Lib.newIntBuffer(1);
-	private int currentEnv = EAX20.EAX_ENVIRONMENT_UNDERWATER;
-	
-	private void changeEnvironment(int env) {
-		if (env == currentEnv) return;
-		currentEnv = env;
-		eaxEnv.put(0, currentEnv);
-		EAX20.eaxSet(EAX20.LISTENER_GUID, EAXListenerProperties.EAXLISTENER_ENVIRONMENT | EAXListenerProperties.EAXLISTENER_DEFERRED, 0, eaxEnv, 4);
-	}
-	
-	*/
 
 	/* (non-Javadoc)
 	 * @see jake2.sound.SoundImpl#StopAllSounds()