aboutsummaryrefslogtreecommitdiffstats
path: root/al/eax/api.cpp
diff options
context:
space:
mode:
authorBoris I. Bendovsky <[email protected]>2022-05-24 12:19:14 +0300
committerGitHub <[email protected]>2022-05-24 02:19:14 -0700
commit074dbef2e3129e9f7ee4895c44721c2a0a4b045b (patch)
tree72087ad2df3a5293d6aec82e762797b69de64111 /al/eax/api.cpp
parent54d72d17ad64809aeaf7a840447e398b2d38cbc9 (diff)
[EAX] Add separate effect state for each version (#705)
* [EAX] Add separate effect state for each version * [EAX] Don't use EAX call as data member
Diffstat (limited to 'al/eax/api.cpp')
-rw-r--r--al/eax/api.cpp621
1 files changed, 563 insertions, 58 deletions
diff --git a/al/eax/api.cpp b/al/eax/api.cpp
index f859a1c4..34ba554f 100644
--- a/al/eax/api.cpp
+++ b/al/eax/api.cpp
@@ -393,6 +393,569 @@ bool operator!=(
}
+// EAX1 =====================================================================
+
+namespace {
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_GENERIC = {EAX_ENVIRONMENT_GENERIC, 0.5F, 1.493F, 0.5F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PADDEDCELL = {EAX_ENVIRONMENT_PADDEDCELL, 0.25F, 0.1F, 0.0F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ROOM = {EAX_ENVIRONMENT_ROOM, 0.417F, 0.4F, 0.666F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_BATHROOM = {EAX_ENVIRONMENT_BATHROOM, 0.653F, 1.499F, 0.166F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_LIVINGROOM = {EAX_ENVIRONMENT_LIVINGROOM, 0.208F, 0.478F, 0.0F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_STONEROOM = {EAX_ENVIRONMENT_STONEROOM, 0.5F, 2.309F, 0.888F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_AUDITORIUM = {EAX_ENVIRONMENT_AUDITORIUM, 0.403F, 4.279F, 0.5F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CONCERTHALL = {EAX_ENVIRONMENT_CONCERTHALL, 0.5F, 3.961F, 0.5F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CAVE = {EAX_ENVIRONMENT_CAVE, 0.5F, 2.886F, 1.304F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ARENA = {EAX_ENVIRONMENT_ARENA, 0.361F, 7.284F, 0.332F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_HANGAR = {EAX_ENVIRONMENT_HANGAR, 0.5F, 10.0F, 0.3F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CARPETTEDHALLWAY = {EAX_ENVIRONMENT_CARPETEDHALLWAY, 0.153F, 0.259F, 2.0F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_HALLWAY = {EAX_ENVIRONMENT_HALLWAY, 0.361F, 1.493F, 0.0F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_STONECORRIDOR = {EAX_ENVIRONMENT_STONECORRIDOR, 0.444F, 2.697F, 0.638F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ALLEY = {EAX_ENVIRONMENT_ALLEY, 0.25F, 1.752F, 0.776F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_FOREST = {EAX_ENVIRONMENT_FOREST, 0.111F, 3.145F, 0.472F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CITY = {EAX_ENVIRONMENT_CITY, 0.111F, 2.767F, 0.224F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_MOUNTAINS = {EAX_ENVIRONMENT_MOUNTAINS, 0.194F, 7.841F, 0.472F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_QUARRY = {EAX_ENVIRONMENT_QUARRY, 1.0F, 1.499F, 0.5F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PLAIN = {EAX_ENVIRONMENT_PLAIN, 0.097F, 2.767F, 0.224F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PARKINGLOT = {EAX_ENVIRONMENT_PARKINGLOT, 0.208F, 1.652F, 1.5F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_SEWERPIPE = {EAX_ENVIRONMENT_SEWERPIPE, 0.652F, 2.886F, 0.25F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_UNDERWATER = {EAX_ENVIRONMENT_UNDERWATER, 1.0F, 1.499F, 0.0F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_DRUGGED = {EAX_ENVIRONMENT_DRUGGED, 0.875F, 8.392F, 1.388F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_DIZZY = {EAX_ENVIRONMENT_DIZZY, 0.139F, 17.234F, 0.666F};
+constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PSYCHOTIC = {EAX_ENVIRONMENT_PSYCHOTIC, 0.486F, 7.563F, 0.806F};
+} // namespace
+
+const Eax1ReverbPresets EAX1REVERB_PRESETS{{
+ EAX1REVERB_PRESET_GENERIC,
+ EAX1REVERB_PRESET_PADDEDCELL,
+ EAX1REVERB_PRESET_ROOM,
+ EAX1REVERB_PRESET_BATHROOM,
+ EAX1REVERB_PRESET_LIVINGROOM,
+ EAX1REVERB_PRESET_STONEROOM,
+ EAX1REVERB_PRESET_AUDITORIUM,
+ EAX1REVERB_PRESET_CONCERTHALL,
+ EAX1REVERB_PRESET_CAVE,
+ EAX1REVERB_PRESET_ARENA,
+ EAX1REVERB_PRESET_HANGAR,
+ EAX1REVERB_PRESET_CARPETTEDHALLWAY,
+ EAX1REVERB_PRESET_HALLWAY,
+ EAX1REVERB_PRESET_STONECORRIDOR,
+ EAX1REVERB_PRESET_ALLEY,
+ EAX1REVERB_PRESET_FOREST,
+ EAX1REVERB_PRESET_CITY,
+ EAX1REVERB_PRESET_MOUNTAINS,
+ EAX1REVERB_PRESET_QUARRY,
+ EAX1REVERB_PRESET_PLAIN,
+ EAX1REVERB_PRESET_PARKINGLOT,
+ EAX1REVERB_PRESET_SEWERPIPE,
+ EAX1REVERB_PRESET_UNDERWATER,
+ EAX1REVERB_PRESET_DRUGGED,
+ EAX1REVERB_PRESET_DIZZY,
+ EAX1REVERB_PRESET_PSYCHOTIC,
+}};
+
+// EAX2 =====================================================================
+
+namespace {
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_GENERIC{
+ EAX2LISTENER_DEFAULTROOM,
+ EAX2LISTENER_DEFAULTROOMHF,
+ EAX2LISTENER_DEFAULTROOMROLLOFFFACTOR,
+ EAX2LISTENER_DEFAULTDECAYTIME,
+ EAX2LISTENER_DEFAULTDECAYHFRATIO,
+ EAX2LISTENER_DEFAULTREFLECTIONS,
+ EAX2LISTENER_DEFAULTREFLECTIONSDELAY,
+ EAX2LISTENER_DEFAULTREVERB,
+ EAX2LISTENER_DEFAULTREVERBDELAY,
+ EAX2LISTENER_DEFAULTENVIRONMENT,
+ EAX2LISTENER_DEFAULTENVIRONMENTSIZE,
+ EAX2LISTENER_DEFAULTENVIRONMENTDIFFUSION,
+ EAX2LISTENER_DEFAULTAIRABSORPTIONHF,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_PADDEDCELL{
+ -1'000L,
+ -6'000L,
+ 0.0F,
+ 0.17F,
+ 0.1F,
+ -1'204L,
+ 0.001F,
+ 207L,
+ 0.002F,
+ EAX2_ENVIRONMENT_PADDEDCELL,
+ 1.4F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_ROOM{
+ -1'000L,
+ -454L,
+ 0.0F,
+ 0.4F,
+ 0.83F,
+ -1'646L,
+ 0.002F,
+ 53L,
+ 0.003F,
+ EAX2_ENVIRONMENT_ROOM,
+ 1.9F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_BATHROOM{
+ -1'000L,
+ -1'200L,
+ 0.0F,
+ 1.49F,
+ 0.54F,
+ -370L,
+ 0.007F,
+ 1'030L,
+ 0.011F,
+ EAX2_ENVIRONMENT_BATHROOM,
+ 1.4F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_LIVINGROOM{
+ -1'000L,
+ -6'000L,
+ 0.0F,
+ 0.5F,
+ 0.1F,
+ -1'376L,
+ 0.003F,
+ -1'104L,
+ 0.004F,
+ EAX2_ENVIRONMENT_LIVINGROOM,
+ 2.5F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_STONEROOM{
+ -1'000L,
+ -300L,
+ 0.0F,
+ 2.31F,
+ 0.64F,
+ -711L,
+ 0.012F,
+ 83L,
+ 0.017F,
+ EAX2_ENVIRONMENT_STONEROOM,
+ 11.6F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_AUDITORIUM{
+ -1'000L,
+ -476L,
+ 0.0F,
+ 4.32F,
+ 0.59F,
+ -789L,
+ 0.02F,
+ -289L,
+ 0.03F,
+ EAX2_ENVIRONMENT_AUDITORIUM,
+ 21.6F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_CONCERTHALL{
+ -1'000L,
+ -500L,
+ 0.0F,
+ 3.92F,
+ 0.7F,
+ -1'230L,
+ 0.02F,
+ -2L,
+ 0.029F,
+ EAX2_ENVIRONMENT_CONCERTHALL,
+ 19.6F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_CAVE{
+ -1'000L,
+ 0L,
+ 0.0F,
+ 2.91F,
+ 1.3F,
+ -602L,
+ 0.015F,
+ -302L,
+ 0.022F,
+ EAX2_ENVIRONMENT_CAVE,
+ 14.6F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_ARENA{
+ -1'000L,
+ -698L,
+ 0.0F,
+ 7.24F,
+ 0.33F,
+ -1'166L,
+ 0.02F,
+ 16L,
+ 0.03F,
+ EAX2_ENVIRONMENT_ARENA,
+ 36.2F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_HANGAR{
+ -1'000L,
+ -1'000L,
+ 0.0F,
+ 10.05F,
+ 0.23F,
+ -602L,
+ 0.02F,
+ 198L,
+ 0.03F,
+ EAX2_ENVIRONMENT_HANGAR,
+ 50.3F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_CARPETTEDHALLWAY{
+ -1'000L,
+ -4'000L,
+ 0.0F,
+ 0.3F,
+ 0.1F,
+ -1'831L,
+ 0.002F,
+ -1'630L,
+ 0.03F,
+ EAX2_ENVIRONMENT_CARPETEDHALLWAY,
+ 1.9F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_HALLWAY{
+ -1'000L,
+ -300L,
+ 0.0F,
+ 1.49F,
+ 0.59F,
+ -1'219L,
+ 0.007F,
+ 441L,
+ 0.011F,
+ EAX2_ENVIRONMENT_HALLWAY,
+ 1.8F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_STONECORRIDOR{
+ -1'000L,
+ -237L,
+ 0.0F,
+ 2.7F,
+ 0.79F,
+ -1'214L,
+ 0.013F,
+ 395L,
+ 0.02F,
+ EAX2_ENVIRONMENT_STONECORRIDOR,
+ 13.5F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_ALLEY{
+ -1'000L,
+ -270L,
+ 0.0F,
+ 1.49F,
+ 0.86F,
+ -1'204L,
+ 0.007F,
+ -4L,
+ 0.011F,
+ EAX2_ENVIRONMENT_ALLEY,
+ 7.5F,
+ 0.3F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_FOREST{
+ -1'000L,
+ -3'300L,
+ 0.0F,
+ 1.49F,
+ 0.54F,
+ -2'560L,
+ 0.162F,
+ -229L,
+ 0.088F,
+ EAX2_ENVIRONMENT_FOREST,
+ 38.0F,
+ 0.3F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_CITY{
+ -1'000L,
+ -800L,
+ 0.0F,
+ 1.49F,
+ 0.67F,
+ -2'273L,
+ 0.007F,
+ -1'691L,
+ 0.011F,
+ EAX2_ENVIRONMENT_CITY,
+ 7.5F,
+ 0.5F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_MOUNTAINS{
+ -1'000L,
+ -2'500L,
+ 0.0F,
+ 1.49F,
+ 0.21F,
+ -2'780L,
+ 0.3F,
+ -1'434L,
+ 0.1F,
+ EAX2_ENVIRONMENT_MOUNTAINS,
+ 100.0F,
+ 0.27F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_QUARRY{
+ -1'000L,
+ -1'000L,
+ 0.0F,
+ 1.49F,
+ 0.83F,
+ -10'000L,
+ 0.061F,
+ 500L,
+ 0.025F,
+ EAX2_ENVIRONMENT_QUARRY,
+ 17.5F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_PLAIN{
+ -1'000L,
+ -2'000L,
+ 0.0F,
+ 1.49F,
+ 0.5F,
+ -2'466L,
+ 0.179F,
+ -1'926L,
+ 0.1F,
+ EAX2_ENVIRONMENT_PLAIN,
+ 42.5F,
+ 0.21F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_PARKINGLOT{
+ -1'000L,
+ 0L,
+ 0.0F,
+ 1.65F,
+ 1.5F,
+ -1'363L,
+ 0.008F,
+ -1'153L,
+ 0.012F,
+ EAX2_ENVIRONMENT_PARKINGLOT,
+ 8.3F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_SEWERPIPE{
+ -1'000L,
+ -1'000L,
+ 0.0F,
+ 2.81F,
+ 0.14F,
+ 429L,
+ 0.014F,
+ 1'023L,
+ 0.021F,
+ EAX2_ENVIRONMENT_SEWERPIPE,
+ 1.7F,
+ 0.8F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_UNDERWATER{
+ -1'000L,
+ -4'000L,
+ 0.0F,
+ 1.49F,
+ 0.1F,
+ -449L,
+ 0.007F,
+ 1'700L,
+ 0.011F,
+ EAX2_ENVIRONMENT_UNDERWATER,
+ 1.8F,
+ 1.0F,
+ -5.0F,
+ EAX2LISTENER_DEFAULTFLAGS,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_DRUGGED{
+ -1'000L,
+ 0L,
+ 0.0F,
+ 8.39F,
+ 1.39F,
+ -115L,
+ 0.002F,
+ 985L,
+ 0.03F,
+ EAX2_ENVIRONMENT_DRUGGED,
+ 1.9F,
+ 0.5F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_DIZZY{
+ -1'000L,
+ -400L,
+ 0.0F,
+ 17.23F,
+ 0.56F,
+ -1'713L,
+ 0.02F,
+ -613L,
+ 0.03F,
+ EAX2_ENVIRONMENT_DIZZY,
+ 1.8F,
+ 0.6F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+constexpr EAX20LISTENERPROPERTIES EAX2REVERB_PRESET_PSYCHOTIC{
+ -1'000L,
+ -151L,
+ 0.0F,
+ 7.56F,
+ 0.91F,
+ -626L,
+ 0.02F,
+ 774L,
+ 0.03F,
+ EAX2_ENVIRONMENT_PSYCHOTIC,
+ 1.0F,
+ 0.5F,
+ -5.0F,
+ EAX2LISTENERFLAGS_DECAYTIMESCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSSCALE |
+ EAX2LISTENERFLAGS_REFLECTIONSDELAYSCALE |
+ EAX2LISTENERFLAGS_REVERBSCALE |
+ EAX2LISTENERFLAGS_REVERBDELAYSCALE,
+};
+
+} // namespace
+
+const Eax2ReverbPresets EAX2REVERB_PRESETS{
+ EAX2REVERB_PRESET_GENERIC,
+ EAX2REVERB_PRESET_PADDEDCELL,
+ EAX2REVERB_PRESET_ROOM,
+ EAX2REVERB_PRESET_BATHROOM,
+ EAX2REVERB_PRESET_LIVINGROOM,
+ EAX2REVERB_PRESET_STONEROOM,
+ EAX2REVERB_PRESET_AUDITORIUM,
+ EAX2REVERB_PRESET_CONCERTHALL,
+ EAX2REVERB_PRESET_CAVE,
+ EAX2REVERB_PRESET_ARENA,
+ EAX2REVERB_PRESET_HANGAR,
+ EAX2REVERB_PRESET_CARPETTEDHALLWAY,
+ EAX2REVERB_PRESET_HALLWAY,
+ EAX2REVERB_PRESET_STONECORRIDOR,
+ EAX2REVERB_PRESET_ALLEY,
+ EAX2REVERB_PRESET_FOREST,
+ EAX2REVERB_PRESET_CITY,
+ EAX2REVERB_PRESET_MOUNTAINS,
+ EAX2REVERB_PRESET_QUARRY,
+ EAX2REVERB_PRESET_PLAIN,
+ EAX2REVERB_PRESET_PARKINGLOT,
+ EAX2REVERB_PRESET_SEWERPIPE,
+ EAX2REVERB_PRESET_UNDERWATER,
+ EAX2REVERB_PRESET_DRUGGED,
+ EAX2REVERB_PRESET_DIZZY,
+ EAX2REVERB_PRESET_PSYCHOTIC,
+};
+
+// EAX3+ ====================================================================
+
namespace {
constexpr EAXREVERBPROPERTIES EAXREVERB_PRESET_GENERIC =
@@ -1153,61 +1716,3 @@ const EaxReverbPresets EAXREVERB_PRESETS{{
EAXREVERB_PRESET_DIZZY,
EAXREVERB_PRESET_PSYCHOTIC,
}};
-
-namespace {
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_GENERIC = {EAX_ENVIRONMENT_GENERIC, 0.5F, 1.493F, 0.5F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PADDEDCELL = {EAX_ENVIRONMENT_PADDEDCELL, 0.25F, 0.1F, 0.0F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ROOM = {EAX_ENVIRONMENT_ROOM, 0.417F, 0.4F, 0.666F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_BATHROOM = {EAX_ENVIRONMENT_BATHROOM, 0.653F, 1.499F, 0.166F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_LIVINGROOM = {EAX_ENVIRONMENT_LIVINGROOM, 0.208F, 0.478F, 0.0F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_STONEROOM = {EAX_ENVIRONMENT_STONEROOM, 0.5F, 2.309F, 0.888F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_AUDITORIUM = {EAX_ENVIRONMENT_AUDITORIUM, 0.403F, 4.279F, 0.5F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CONCERTHALL = {EAX_ENVIRONMENT_CONCERTHALL, 0.5F, 3.961F, 0.5F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CAVE = {EAX_ENVIRONMENT_CAVE, 0.5F, 2.886F, 1.304F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ARENA = {EAX_ENVIRONMENT_ARENA, 0.361F, 7.284F, 0.332F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_HANGAR = {EAX_ENVIRONMENT_HANGAR, 0.5F, 10.0F, 0.3F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CARPETTEDHALLWAY = {EAX_ENVIRONMENT_CARPETEDHALLWAY, 0.153F, 0.259F, 2.0F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_HALLWAY = {EAX_ENVIRONMENT_HALLWAY, 0.361F, 1.493F, 0.0F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_STONECORRIDOR = {EAX_ENVIRONMENT_STONECORRIDOR, 0.444F, 2.697F, 0.638F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_ALLEY = {EAX_ENVIRONMENT_ALLEY, 0.25F, 1.752F, 0.776F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_FOREST = {EAX_ENVIRONMENT_FOREST, 0.111F, 3.145F, 0.472F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_CITY = {EAX_ENVIRONMENT_CITY, 0.111F, 2.767F, 0.224F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_MOUNTAINS = {EAX_ENVIRONMENT_MOUNTAINS, 0.194F, 7.841F, 0.472F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_QUARRY = {EAX_ENVIRONMENT_QUARRY, 1.0F, 1.499F, 0.5F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PLAIN = {EAX_ENVIRONMENT_PLAIN, 0.097F, 2.767F, 0.224F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PARKINGLOT = {EAX_ENVIRONMENT_PARKINGLOT, 0.208F, 1.652F, 1.5F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_SEWERPIPE = {EAX_ENVIRONMENT_SEWERPIPE, 0.652F, 2.886F, 0.25F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_UNDERWATER = {EAX_ENVIRONMENT_UNDERWATER, 1.0F, 1.499F, 0.0F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_DRUGGED = {EAX_ENVIRONMENT_DRUGGED, 0.875F, 8.392F, 1.388F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_DIZZY = {EAX_ENVIRONMENT_DIZZY, 0.139F, 17.234F, 0.666F};
-constexpr EAX_REVERBPROPERTIES EAX1REVERB_PRESET_PSYCHOTIC = {EAX_ENVIRONMENT_PSYCHOTIC, 0.486F, 7.563F, 0.806F};
-} // namespace
-
-const Eax1ReverbPresets EAX1REVERB_PRESETS{{
- EAX1REVERB_PRESET_GENERIC,
- EAX1REVERB_PRESET_PADDEDCELL,
- EAX1REVERB_PRESET_ROOM,
- EAX1REVERB_PRESET_BATHROOM,
- EAX1REVERB_PRESET_LIVINGROOM,
- EAX1REVERB_PRESET_STONEROOM,
- EAX1REVERB_PRESET_AUDITORIUM,
- EAX1REVERB_PRESET_CONCERTHALL,
- EAX1REVERB_PRESET_CAVE,
- EAX1REVERB_PRESET_ARENA,
- EAX1REVERB_PRESET_HANGAR,
- EAX1REVERB_PRESET_CARPETTEDHALLWAY,
- EAX1REVERB_PRESET_HALLWAY,
- EAX1REVERB_PRESET_STONECORRIDOR,
- EAX1REVERB_PRESET_ALLEY,
- EAX1REVERB_PRESET_FOREST,
- EAX1REVERB_PRESET_CITY,
- EAX1REVERB_PRESET_MOUNTAINS,
- EAX1REVERB_PRESET_QUARRY,
- EAX1REVERB_PRESET_PLAIN,
- EAX1REVERB_PRESET_PARKINGLOT,
- EAX1REVERB_PRESET_SEWERPIPE,
- EAX1REVERB_PRESET_UNDERWATER,
- EAX1REVERB_PRESET_DRUGGED,
- EAX1REVERB_PRESET_DIZZY,
- EAX1REVERB_PRESET_PSYCHOTIC,
-}};