From: Brian M. <ma...@us...> - 2002-09-03 11:17:47
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax In directory usw-pr-cvs1:/tmp/cvs-serv548/org/lwjgl/openal/eax Modified Files: BaseEAXConstants.java EAXBufferProperties.java EAXListenerProperties.java Log Message: mod: refactored some EAX constants to Buffer or Listerner Properties class Index: BaseEAXConstants.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/BaseEAXConstants.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/BaseEAXConstants.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- BaseEAXConstants.java 2 Sep 2002 22:06:12 -0000 1.2 +++ BaseEAXConstants.java 3 Sep 2002 11:17:42 -0000 1.3 @@ -40,33 +40,6 @@ * @version $Revision$ */ public interface BaseEAXConstants { - public static final int DSPROPERTY_EAXLISTENER_NONE = 0; - public static final int DSPROPERTY_EAXLISTENER_ALLPARAMETERS = 1; - public static final int DSPROPERTY_EAXLISTENER_ROOM = 2; - public static final int DSPROPERTY_EAXLISTENER_ROOMHF = 3; - public static final int DSPROPERTY_EAXLISTENER_ROOMROLLOFFFACTOR = 4; - public static final int DSPROPERTY_EAXLISTENER_DECAYTIME = 5; - public static final int DSPROPERTY_EAXLISTENER_DECAYHFRATIO = 6; - public static final int DSPROPERTY_EAXLISTENER_REFLECTIONS = 7; - public static final int DSPROPERTY_EAXLISTENER_REFLECTIONSDELAY = 8; - public static final int DSPROPERTY_EAXLISTENER_REVERB = 9; - public static final int DSPROPERTY_EAXLISTENER_REVERBDELAY = 10; - public static final int DSPROPERTY_EAXLISTENER_ENVIRONMENT = 11; - public static final int DSPROPERTY_EAXLISTENER_ENVIRONMENTSIZE = 12; - public static final int DSPROPERTY_EAXLISTENER_ENVIRONMENTDIFFUSION = 13; - public static final int DSPROPERTY_EAXLISTENER_AIRABSORPTIONHF = 14; - public static final int DSPROPERTY_EAXLISTENER_FLAGS = 15; - - /** changes take effect immediately */ - public static final int DSPROPERTY_EAXLISTENER_IMMEDIATE = 0x00000000; - - /** changes take effect later */ - public static final int DSPROPERTY_EAXLISTENER_DEFERRED = 0x80000000; - - public static final int DSPROPERTY_EAXLISTENER_COMMITDEFERREDSETTINGS = - (DSPROPERTY_EAXLISTENER_NONE | - DSPROPERTY_EAXLISTENER_IMMEDIATE); - public static final int ENVIRONMENT_GENERIC = 0; public static final int ENVIRONMENT_PADDEDCELL = 1; public static final int ENVIRONMENT_ROOM = 2; @@ -94,181 +67,6 @@ public static final int ENVIRONMENT_DIZZY = 24; public static final int ENVIRONMENT_PSYCHOTIC = 25; public static final int ENVIRONMENT_COUNT = 26; - - /** reverberation decay time */ - public static final int EAXLISTENERFLAGS_DECAYTIMESCALE = 0x00000001; - - /** reflection level */ - public static final int EAXLISTENERFLAGS_REFLECTIONSSCALE = 0x00000002; - - /** initial reflection delay time */ - public static final int EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE = 0x00000004; - - /** reflections level */ - public static final int EAXLISTENERFLAGS_REVERBSCALE = 0x00000008; - - /** late reverberation delay time */ - public static final int EAXLISTENERFLAGS_REVERBDELAYSCALE = 0x00000010; - - /** This flag limits high-frequency decay time according to air absorption. */ - public static final int EAXLISTENERFLAGS_DECAYHFLIMIT = 0x00000020; - - /** reserved future use */ - public static final int EAXLISTENERFLAGS_RESERVED = 0xFFFFFFC0; - - // property ranges and defaults: - public static final int EAXLISTENER_MINROOM = -10000; - public static final int EAXLISTENER_MAXROOM = 0; - public static final int EAXLISTENER_DEFAULTROOM = -1000; - - public static final int EAXLISTENER_MINROOMHF = -10000; - public static final int EAXLISTENER_MAXROOMHF = 0; - public static final int EAXLISTENER_DEFAULTROOMHF = -100; - - public static final float EAXLISTENER_MINROOMROLLOFFFACTOR = 0.0f; - public static final float EAXLISTENER_MAXROOMROLLOFFFACTOR = 10.0f; - public static final float EAXLISTENER_DEFAULTROOMROLLOFFFACTOR = 0.0f; - - public static final float EAXLISTENER_MINDECAYTIME = 0.1f; - public static final float EAXLISTENER_MAXDECAYTIME = 20.0f; - public static final float EAXLISTENER_DEFAULTDECAYTIME = 1.49f; - - public static final float EAXLISTENER_MINDECAYHFRATIO = 0.1f; - public static final float EAXLISTENER_MAXDECAYHFRATIO = 2.0f; - public static final float EAXLISTENER_DEFAULTDECAYHFRATIO = 0.83f; - - public static final int EAXLISTENER_MINREFLECTIONS = -10000; - public static final int EAXLISTENER_MAXREFLECTIONS = 1000; - public static final int EAXLISTENER_DEFAULTREFLECTIONS = -2602; - - public static final float EAXLISTENER_MINREFLECTIONSDELAY = 0.0f; - public static final float EAXLISTENER_MAXREFLECTIONSDELAY = 0.3f; - public static final float EAXLISTENER_DEFAULTREFLECTIONSDELAY = 0.007f; - - public static final int EAXLISTENER_MINREVERB = -10000; - public static final int EAXLISTENER_MAXREVERB = 2000; - public static final int EAXLISTENER_DEFAULTREVERB = 200; - - public static final float EAXLISTENER_MINREVERBDELAY = 0.0f; - public static final float EAXLISTENER_MAXREVERBDELAY = 0.1f; - public static final float EAXLISTENER_DEFAULTREVERBDELAY = 0.011f; - - public static final int EAXLISTENER_MINENVIRONMENT = 0; - public static final int EAXLISTENER_MAXENVIRONMENT = (ENVIRONMENT_COUNT-1); - public static final int EAXLISTENER_DEFAULTENVIRONMENT = ENVIRONMENT_GENERIC; - - public static final float EAXLISTENER_MINENVIRONMENTSIZE = 1.0f; - public static final float EAXLISTENER_MAXENVIRONMENTSIZE = 100.0f; - public static final float EAXLISTENER_DEFAULTENVIRONMENTSIZE = 7.5f; - - public static final float EAXLISTENER_MINENVIRONMENTDIFFUSION = 0.0f; - public static final float EAXLISTENER_MAXENVIRONMENTDIFFUSION = 1.0f; - public static final float EAXLISTENER_DEFAULTENVIRONMENTDIFFUSION = 1.0f; - - public static final float EAXLISTENER_MINAIRABSORPTIONHF = -100.0f; - public static final float EAXLISTENER_MAXAIRABSORPTIONHF = 0.0f; - public static final float EAXLISTENER_DEFAULTAIRABSORPTIONHF = -5.0f; - - public static final int EAXLISTENER_DEFAULTFLAGS = - (EAXLISTENERFLAGS_DECAYTIMESCALE | - EAXLISTENERFLAGS_REFLECTIONSSCALE | - EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE | - EAXLISTENERFLAGS_REVERBSCALE | - EAXLISTENERFLAGS_REVERBDELAYSCALE | - EAXLISTENERFLAGS_DECAYHFLIMIT); - - //------------------------------------ - public static final int DSPROPERTY_EAXBUFFER_NONE = 0; - public static final int DSPROPERTY_EAXBUFFER_ALLPARAMETERS = 1; - public static final int DSPROPERTY_EAXBUFFER_DIRECT = 2; - public static final int DSPROPERTY_EAXBUFFER_DIRECTHF = 3; - public static final int DSPROPERTY_EAXBUFFER_ROOM = 4; - public static final int DSPROPERTY_EAXBUFFER_ROOMHF = 5; - public static final int DSPROPERTY_EAXBUFFER_ROOMROLLOFFFACTOR = 6; - public static final int DSPROPERTY_EAXBUFFER_OBSTRUCTION = 7; - public static final int DSPROPERTY_EAXBUFFER_OBSTRUCTIONLFRATIO = 8; - public static final int DSPROPERTY_EAXBUFFER_OCCLUSION = 9; - public static final int DSPROPERTY_EAXBUFFER_OCCLUSIONLFRATIO = 10; - public static final int DSPROPERTY_EAXBUFFER_OCCLUSIONROOMRATIO = 11; - public static final int DSPROPERTY_EAXBUFFER_OUTSIDEVOLUMEHF = 12; - public static final int DSPROPERTY_EAXBUFFER_AIRABSORPTIONFACTOR = 13; - public static final int DSPROPERTY_EAXBUFFER_FLAGS = 14; - - /** changes take effect immediately */ - public static final int DSPROPERTY_EAXBUFFER_IMMEDIATE = 0x00000000; - - /** changes take effect later */ - public static final int DSPROPERTY_EAXBUFFER_DEFERRED = 0x80000000; - public static final int DSPROPERTY_EAXBUFFER_COMMITDEFERREDSETTINGS = - (DSPROPERTY_EAXBUFFER_NONE | - DSPROPERTY_EAXBUFFER_IMMEDIATE); - - /** affects DSPROPERTY_EAXBUFFER_DIRECTHF */ - public static final int EAXBUFFERFLAGS_DIRECTHFAUTO = 0x00000001; - - /** affects DSPROPERTY_EAXBUFFER_ROOM */ - public static final int EAXBUFFERFLAGS_ROOMAUTO = 0x00000002; - - /** affects DSPROPERTY_EAXBUFFER_ROOMHF */ - public static final int EAXBUFFERFLAGS_ROOMHFAUTO = 0x00000004; - - /** reserved future use */ - public static final int EAXBUFFERFLAGS_RESERVED = 0xFFFFFFF8; - - // property ranges and defaults: - - public static final int EAXBUFFER_MINDIRECT = -10000; - public static final int EAXBUFFER_MAXDIRECT = 1000; - public static final int EAXBUFFER_DEFAULTDIRECT = 0; - - public static final int EAXBUFFER_MINDIRECTHF = -10000; - public static final int EAXBUFFER_MAXDIRECTHF = 0; - public static final int EAXBUFFER_DEFAULTDIRECTHF = 0; - - public static final int EAXBUFFER_MINROOM = -10000; - public static final int EAXBUFFER_MAXROOM = 1000; - public static final int EAXBUFFER_DEFAULTROOM = 0; - - public static final int EAXBUFFER_MINROOMHF = -10000; - public static final int EAXBUFFER_MAXROOMHF = 0; - public static final int EAXBUFFER_DEFAULTROOMHF = 0; - - public static final float EAXBUFFER_MINROOMROLLOFFFACTOR = 0.0f; - public static final float EAXBUFFER_MAXROOMROLLOFFFACTOR = 10.f; - public static final float EAXBUFFER_DEFAULTROOMROLLOFFFACTOR = 0.0f; - - public static final int EAXBUFFER_MINOBSTRUCTION = -10000; - public static final int EAXBUFFER_MAXOBSTRUCTION = 0; - public static final int EAXBUFFER_DEFAULTOBSTRUCTION = 0; - - public static final float EAXBUFFER_MINOBSTRUCTIONLFRATIO = 0.0f; - public static final float EAXBUFFER_MAXOBSTRUCTIONLFRATIO = 1.0f; - public static final float EAXBUFFER_DEFAULTOBSTRUCTIONLFRATIO = 0.0f; - - public static final int EAXBUFFER_MINOCCLUSION = -10000; - public static final int EAXBUFFER_MAXOCCLUSION = 0; - public static final int EAXBUFFER_DEFAULTOCCLUSION = 0; - - public static final float EAXBUFFER_MINOCCLUSIONLFRATIO = 0.0f; - public static final float EAXBUFFER_MAXOCCLUSIONLFRATIO = 1.0f; - public static final float EAXBUFFER_DEFAULTOCCLUSIONLFRATIO = 0.25f; - - public static final float EAXBUFFER_MINOCCLUSIONROOMRATIO = 0.0f; - public static final float EAXBUFFER_MAXOCCLUSIONROOMRATIO = 10.0f; - public static final float EAXBUFFER_DEFAULTOCCLUSIONROOMRATIO = 0.5f; - - public static final int EAXBUFFER_MINOUTSIDEVOLUMEHF = -10000; - public static final int EAXBUFFER_MAXOUTSIDEVOLUMEHF = 0; - public static final int EAXBUFFER_DEFAULTOUTSIDEVOLUMEHF = 0; - - public static final float EAXBUFFER_MINAIRABSORPTIONFACTOR = 0.0f; - public static final float EAXBUFFER_MAXAIRABSORPTIONFACTOR = 10.0f; - public static final float EAXBUFFER_DEFAULTAIRABSORPTIONFACTOR = 1.0f; - - public static final int EAXBUFFER_DEFAULTFLAGS = - (EAXBUFFERFLAGS_DIRECTHFAUTO | - EAXBUFFERFLAGS_ROOMAUTO | - EAXBUFFERFLAGS_ROOMHFAUTO); // Single window material preset public static final int MATERIAL_SINGLEWINDOW = -2800; Index: EAXBufferProperties.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/EAXBufferProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EAXBufferProperties.java 2 Sep 2002 22:06:13 -0000 1.1 +++ EAXBufferProperties.java 3 Sep 2002 11:17:42 -0000 1.2 @@ -92,6 +92,95 @@ /** modifies the behavior of properties offset */ protected static int flags_offset; + public static final int NONE = 0; + public static final int ALLPARAMETERS = 1; + public static final int DIRECT = 2; + public static final int DIRECTHF = 3; + public static final int ROOM = 4; + public static final int ROOMHF = 5; + public static final int ROOMROLLOFFFACTOR = 6; + public static final int OBSTRUCTION = 7; + public static final int OBSTRUCTIONLFRATIO = 8; + public static final int OCCLUSION = 9; + public static final int OCCLUSIONLFRATIO = 10; + public static final int OCCLUSIONROOMRATIO = 11; + public static final int OUTSIDEVOLUMEHF = 12; + public static final int AIRABSORPTIONFACTOR = 13; + public static final int FLAGS = 14; + + /** changes take effect immediately */ + public static final int IMMEDIATE = 0x00000000; + + /** changes take effect later */ + public static final int DEFERRED = 0x80000000; + public static final int COMMITDEFERREDSETTINGS = (NONE | IMMEDIATE); + + /** affects DSPROPERTY_EAXBUFFER_DIRECTHF */ + public static final int FLAGS_DIRECTHFAUTO = 0x00000001; + + /** affects DSPROPERTY_EAXBUFFER_ROOM */ + public static final int FLAGS_ROOMAUTO = 0x00000002; + + /** affects DSPROPERTY_EAXBUFFER_ROOMHF */ + public static final int FLAGS_ROOMHFAUTO = 0x00000004; + + /** reserved future use */ + public static final int FLAGS_RESERVED = 0xFFFFFFF8; + + // property ranges and defaults: + + public static final int MINDIRECT = -10000; + public static final int MAXDIRECT = 1000; + public static final int DEFAULTDIRECT = 0; + + public static final int MINDIRECTHF = -10000; + public static final int MAXDIRECTHF = 0; + public static final int DEFAULTDIRECTHF = 0; + + public static final int MINROOM = -10000; + public static final int MAXROOM = 1000; + public static final int DEFAULTROOM = 0; + + public static final int MINROOMHF = -10000; + public static final int MAXROOMHF = 0; + public static final int DEFAULTROOMHF = 0; + + public static final float MINROOMROLLOFFFACTOR = 0.0f; + public static final float MAXROOMROLLOFFFACTOR = 10.f; + public static final float DEFAULTROOMROLLOFFFACTOR = 0.0f; + + public static final int MINOBSTRUCTION = -10000; + public static final int MAXOBSTRUCTION = 0; + public static final int DEFAULTOBSTRUCTION = 0; + + public static final float MINOBSTRUCTIONLFRATIO = 0.0f; + public static final float MAXOBSTRUCTIONLFRATIO = 1.0f; + public static final float DEFAULTOBSTRUCTIONLFRATIO = 0.0f; + + public static final int MINOCCLUSION = -10000; + public static final int MAXOCCLUSION = 0; + public static final int DEFAULTOCCLUSION = 0; + + public static final float MINOCCLUSIONLFRATIO = 0.0f; + public static final float MAXOCCLUSIONLFRATIO = 1.0f; + public static final float DEFAULTOCCLUSIONLFRATIO = 0.25f; + + public static final float MINOCCLUSIONROOMRATIO = 0.0f; + public static final float MAXOCCLUSIONROOMRATIO = 10.0f; + public static final float DEFAULTOCCLUSIONROOMRATIO = 0.5f; + + public static final int MINOUTSIDEVOLUMEHF = -10000; + public static final int MAXOUTSIDEVOLUMEHF = 0; + public static final int DEFAULTOUTSIDEVOLUMEHF = 0; + + public static final float MINAIRABSORPTIONFACTOR = 0.0f; + public static final float MAXAIRABSORPTIONFACTOR = 10.0f; + public static final float DEFAULTAIRABSORPTIONFACTOR = 1.0f; + + public static final int DEFAULTFLAGS = (FLAGS_DIRECTHFAUTO | + FLAGS_ROOMAUTO | + FLAGS_ROOMHFAUTO); + static { System.loadLibrary(org.lwjgl.Sys.getLibraryName()); EAXBUFFERPROPERTIES_SIZE = sizeOfEaxBufferProperties(); Index: EAXListenerProperties.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/openal/eax/EAXListenerProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EAXListenerProperties.java 2 Sep 2002 22:06:13 -0000 1.1 +++ EAXListenerProperties.java 3 Sep 2002 11:17:42 -0000 1.2 @@ -94,6 +94,112 @@ /** modifies the behavior of properties offset */ protected static int flags_offset; + public static final int NONE = 0; + public static final int ALLPARAMETERS = 1; + public static final int ROOM = 2; + public static final int ROOMHF = 3; + public static final int ROOMROLLOFFFACTOR = 4; + public static final int DECAYTIME = 5; + public static final int DECAYHFRATIO = 6; + public static final int REFLECTIONS = 7; + public static final int REFLECTIONSDELAY = 8; + public static final int REVERB = 9; + public static final int REVERBDELAY = 10; + public static final int ENVIRONMENT = 11; + public static final int ENVIRONMENTSIZE = 12; + public static final int ENVIRONMENTDIFFUSION = 13; + public static final int AIRABSORPTIONHF = 14; + public static final int FLAGS = 15; + + /** changes take effect immediately */ + public static final int IMMEDIATE = 0x00000000; + + /** changes take effect later */ + public static final int DEFERRED = 0x80000000; + + public static final int COMMITDEFERREDSETTINGS = (NONE | IMMEDIATE); + + /** reverberation decay time */ + public static final int FLAGS_DECAYTIMESCALE = 0x00000001; + + /** reflection level */ + public static final int FLAGS_REFLECTIONSSCALE = 0x00000002; + + /** initial reflection delay time */ + public static final int FLAGS_REFLECTIONSDELAYSCALE = 0x00000004; + + /** reflections level */ + public static final int FLAGS_REVERBSCALE = 0x00000008; + + /** late reverberation delay time */ + public static final int FLAGS_REVERBDELAYSCALE = 0x00000010; + + /** This flag limits high-frequency decay time according to air absorption. */ + public static final int FLAGS_DECAYHFLIMIT = 0x00000020; + + /** reserved future use */ + public static final int FLAGS_RESERVED = 0xFFFFFFC0; + + // property ranges and defaults: + public static final int MINROOM = -10000; + public static final int MAXROOM = 0; + public static final int DEFAULTROOM = -1000; + + public static final int MINROOMHF = -10000; + public static final int MAXROOMHF = 0; + public static final int DEFAULTROOMHF = -100; + + public static final float MINROOMROLLOFFFACTOR = 0.0f; + public static final float MAXROOMROLLOFFFACTOR = 10.0f; + public static final float DEFAULTROOMROLLOFFFACTOR = 0.0f; + + public static final float MINDECAYTIME = 0.1f; + public static final float MAXDECAYTIME = 20.0f; + public static final float DEFAULTDECAYTIME = 1.49f; + + public static final float MINDECAYHFRATIO = 0.1f; + public static final float MAXDECAYHFRATIO = 2.0f; + public static final float DEFAULTDECAYHFRATIO = 0.83f; + + public static final int MINREFLECTIONS = -10000; + public static final int MAXREFLECTIONS = 1000; + public static final int DEFAULTREFLECTIONS = -2602; + + public static final float MINREFLECTIONSDELAY = 0.0f; + public static final float MAXREFLECTIONSDELAY = 0.3f; + public static final float DEFAULTREFLECTIONSDELAY = 0.007f; + + public static final int MINREVERB = -10000; + public static final int MAXREVERB = 2000; + public static final int DEFAULTREVERB = 200; + + public static final float MINREVERBDELAY = 0.0f; + public static final float MAXREVERBDELAY = 0.1f; + public static final float DEFAULTREVERBDELAY = 0.011f; + + public static final int MINENVIRONMENT = 0; + public static final int MAXENVIRONMENT = (EAX.ENVIRONMENT_COUNT-1); + public static final int DEFAULTENVIRONMENT = EAX.ENVIRONMENT_GENERIC; + + public static final float MINENVIRONMENTSIZE = 1.0f; + public static final float MAXENVIRONMENTSIZE = 100.0f; + public static final float DEFAULTENVIRONMENTSIZE = 7.5f; + + public static final float MINENVIRONMENTDIFFUSION = 0.0f; + public static final float MAXENVIRONMENTDIFFUSION = 1.0f; + public static final float DEFAULTENVIRONMENTDIFFUSION = 1.0f; + + public static final float MINAIRABSORPTIONHF = -100.0f; + public static final float MAXAIRABSORPTIONHF = 0.0f; + public static final float DEFAULTAIRABSORPTIONHF = -5.0f; + + public static final int DEFAULTFLAGS = (FLAGS_DECAYTIMESCALE | + FLAGS_REFLECTIONSSCALE | + FLAGS_REFLECTIONSDELAYSCALE | + FLAGS_REVERBSCALE | + FLAGS_REVERBDELAYSCALE | + FLAGS_DECAYHFLIMIT); + static { System.loadLibrary(org.lwjgl.Sys.getLibraryName()); EAXLISTENERPROPERTIES_SIZE = sizeOfEaxListenerProperties(); |