From 7b4507d00dbbddcd0e49269067de056dee2c98f7 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Sat, 11 Feb 2012 16:11:16 -0500 Subject: [PATCH] - Updated flibitEFX from latest flibit2D build. - The underwater effect is now just a low-pass filter. Reverb == bleh. --- lib/flibitEFX.jar | Bin 6925 -> 6544 bytes src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/flibitEFX.jar b/lib/flibitEFX.jar index 75d8ad2ac5c16c9869fff6bb50f6a8a6842cdd8e..d878745626dcddcf5deb361898c2c09d0b24ab11 100644 GIT binary patch delta 3877 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 G)&Bv0vCokJ delta 4280 zcmaJ^1yoeq8XjVXp=)T6jzOdwX^|L2Kwt<_h8#*jT4E^a9zu~WDd`df#8E^*q+v)2 z=|)1zhu(MBefQnB-Z|^6Z|$}I{qKF&U*DG~7AHxn3&X=F0sz1OfMcXe5-A^^!xczZ z;F(>)3hOUG6XM+XjWRe=q*rUDj96NFBU}K01Ra1QfpVczhFli+773Us8Ppd&sII^7 zWKuq6#)K}WRaF@&3_p>58x(r4Q84%WXV#^dsJQn8s3652A6wcI@&Mr%7t5JqcI^kB zWe(21e0d1CW-;DHwJ$kVLm3(x(ilC-Z}OI|c&0YIl~Gc{$-d;){B5@cc1hjY>M@rX z5xjDd_iCt@oThae)_0G-?aHW@7+;q_%Ir>tu$!a@>^XQ$LoUr`4IrB1ZM1OGZP?b` z(7bs+84JDMP>6W2GQq=1ptpwBp znIM8Y+L_=u$vshNC{GZbIy9!bDeY4@FET`yjr57OBiZ=rsTQ76InO`4(^B<9p1Q{; zaNID*&-~jE%jx~Kb7#iSqHrNK6iPfz>+w(VTa8O>?{b6+Zdsa}kYyxvz4fm4};_rItv8ket;Mk03Ja4pT)s5@% zQhF5M_D~CCcII~zg zQU@zLH|Bvo$KP}3nd-(W$3BR(ea&Ls{|(!WShC;Xd88*+uKgNP?IHLPAFTsFcDQ9{yYi@@F0I*%9odf^?uyS!0vURezwD&;A<1nENA6eTx z_C|QvJQlQaLb$u9>b7d(DMRGZS=MMz3EB3CPotmRa!mqr>;+dL*^E!XY1`MO*=-T# z4Tp+O=RhW!7`6$`&2s<~O7%^vgI%6jpZqcNwtKeXwG6;M{b+8%T~(&jA6f^2=|T;r zLg#B+RBv_z>${{Ld@{>4lQuw6g!Zsj;n3jmgBYk{YS}|=K-}n8!n>Yd+!%&zu&&86CXwvuj75+NT2&Xb-8d4605Mz6FchgPl`4JjL%W}&3-)|nXJ%k zC`}zr>|pvjn7m*ro~+j160X~grzI0ekQTGi6!|S#g)mQy-6yOpQvDeuih^1tu7oF< zJvwE8qq2!|TDOK?_EWzu%!1iXJ5dT4Y){h3#+|^tEE0oDTODFpVZ~&&nvcA2q>tW; zzr7Vzb{L5JN0bNv;NM}YGXtvQQvQn9R?CC{@G4$KSDyqr7>5H*!2tSam=Zg+FiI5R zKkcRB?i4iWb-o}XvL^$r>FsfVh&y8#-#kjDX(}Xix)&fQM04{5ppYV6dbq6Yjm2Jc zU{Ptd8xC_Q)81cvxTs%u_z6xM#Yj-eLju z!H_5B7URq+4dk#On^I??A|ssqsgCC>UglwkBEf>QM0jD0>GM`m__E3VTFTdH19vpE z-!*II;WqQ#CA0^k)4k@Yv&zXAb+9_>u`APM^IF^WgL49tOKC

918(NYGyWz&x_9 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 diff --git a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java index 664c7bc..c4e2a32 100644 --- a/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java +++ b/src/lwjake2/sound/lwjgl/LWJGLSoundImpl.java @@ -42,8 +42,7 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import com.flibitijibibo.flibitEFX.EFXEffectUnderwater; -import com.flibitijibibo.flibitEFX.EFXFilterUnderwater; +import com.flibitijibibo.flibitEFX.EFXFilterLowPass; import org.lwjgl.LWJGLException; import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; @@ -70,8 +69,7 @@ public final class LWJGLSoundImpl implements Sound { /** EFX Variables */ private int currentEffectIndex; private int currentFilterIndex; - private EFXEffectUnderwater underwaterEffect; - private EFXFilterUnderwater underwaterFilter; + private EFXFilterLowPass underwaterFilter; // singleton private LWJGLSoundImpl() { @@ -156,15 +154,13 @@ public final class LWJGLSoundImpl implements Sound { private void initOpenALExtensions() { Com.Printf("... using EFX effects:\n"); - underwaterEffect = new EFXEffectUnderwater(); - underwaterFilter = new EFXFilterUnderwater(); + underwaterFilter = new EFXFilterLowPass(); } void exitOpenAL() { // Unload EFX Effects - underwaterEffect.killEffect(); underwaterFilter.killFilter(); // Release the context and the device. @@ -266,7 +262,6 @@ public final class LWJGLSoundImpl implements Sound { // Detect EFX Conditions if ((GameBase.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0) { - currentEffectIndex = underwaterEffect.getIndex(); currentFilterIndex = underwaterFilter.getIndex(); } else {