upgrade fmod to 2.03.11

Author: bitbrain

.github/workflows/check_pr.yml

@@ -11,7 +11,7 @@ env:
   NDK_VERSION: 27.3.13750724
   TARGET_PATH: demo/addons/fmod/libs/
   TARGET_NAME: libGodotFmod
-  FMOD_VERSION: 20306
+  FMOD_VERSION: 20311
 jobs:
   gate:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -10,7 +10,7 @@ env:
   NDK_VERSION: 27.3.13750724
   TARGET_PATH: demo/addons/fmod/libs/
   TARGET_NAME: libGodotFmod
-  FMOD_VERSION: 20306
+  FMOD_VERSION: 20311
 jobs:
   build:
     name: ${{ matrix.name }}

SConstruct

@@ -129,10 +129,10 @@ elif env["platform"] == "android":
     env.Append(LIBS=[libfmod, libfmodstudio])
 
 elif env["platform"] == "web":
-    html_lib = os.path.join(fmod_lib_dir, 'api/studio/lib/upstream/w32/')
+    html_lib = os.path.join(fmod_lib_dir, 'api/studio/lib/w32/')
     html_inc = os.path.join(fmod_lib_dir, 'api/studio/inc/')
 
-    html_core_lib = os.path.join(fmod_lib_dir, 'api/core/lib/upstream/w32/')
+    html_core_lib = os.path.join(fmod_lib_dir, 'api/core/lib/w32/')
     html_core_inc = os.path.join(fmod_lib_dir, 'api/core/inc/')
 
     libfmodstudio_path = os.path.join(html_lib, 'fmodstudio%s_wasm.a' % lfix)

demo/test/unit/test_listener.gd

@@ -45,13 +45,13 @@ class TestListener:
 	func test_assert_should_have_proper_weight():
 		var desiredValue: float = 1.0
 		assert_listener_weight(0, desiredValue)
-		desiredValue = 2.0
+		desiredValue = 0.5
 		FmodServer.set_listener_weight(0, desiredValue)
 		assert_listener_weight(0, desiredValue)
 		desiredValue = 1.0
 		FmodServer.set_listener_weight(0, desiredValue)
 		FmodServer.set_listener_number(2)
-		desiredValue = 2.0
+		desiredValue = 0.5
 		FmodServer.add_listener(1, sprite)
 		FmodServer.set_listener_weight(1, desiredValue)
 		assert_listener_weight(1, desiredValue)

src/fmod_server.cpp

@@ -353,6 +353,8 @@ void FmodServer::set_system_listener_number(int p_listenerNumber) {
 void FmodServer::add_listener(int index, Node* game_obj) {
     if (index >= 0 && index < systemListenerNumber) {
         Listener* listener = &listeners[index];
+        if (listener->weight < 0.0f) { listener->weight = 0.0f; }
+        if (listener->weight > 1.0f) { listener->weight = 1.0f; }
         listener->wrapper.set_node(game_obj);
         ERROR_CHECK_WITH_REASON(
           system->setListenerWeight(index, listener->weight),
@@ -394,6 +396,8 @@ float FmodServer::get_system_listener_weight(const int index) {
 
 void FmodServer::set_system_listener_weight(const int index, float weight) {
     if (index >= 0 && index < systemListenerNumber) {
+        if (weight < 0.0f) { weight = 0.0f; }
+        if (weight > 1.0f) { weight = 1.0f; }
         listeners[index].weight = weight;
         ERROR_CHECK_WITH_REASON(system->setListenerWeight(index, weight), vformat("Cannot set listener %d weight to %f", index, weight));
     } else {