fix: Avoid to get and set fmod_parameters root (#296)

* fix: Avoid to get and set fmod_parameters root * fix: set rpath to loader_path/.. when linking macos library
utopia-rise · Jan 7, 2025 · ea0c048 · ea0c048
1 parent dc44b6f
commit ea0c048
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 35 deletions.
diff --git a/SConstruct b/SConstruct
@@ -61,6 +61,7 @@ if env["platform"] == "macos":
             "-framework",
             "Cocoa",
             "-Wl,-undefined,dynamic_lookup",
+            "-rpath", "@loader_path/.."
         ]
     )
 
@@ -150,24 +151,6 @@ def sys_exec(args):
     return out.rstrip("\r\n").lstrip()
 
 
-#Necessary so the extension library can find the Fmod libraries
-if env["platform"] == "macos":
-    lib_name = "{}.{}.{}".format(
-        target,
-        target_name,
-        env["platform"],
-        env["target"]
-    )
-
-    def change_id(self, arg, env, executor = None):
-        sys_exec(["install_name_tool", "-id", "@rpath/%s" % lib_name , target])
-        sys_exec(["install_name_tool", "-change", "@rpath/%s" % libfmodstudio, "@loader_path/../%s" % libfmodstudio, target])
-        sys_exec(["install_name_tool", "-change", "@rpath/%s" % libfmod, "@loader_path/../%s" % libfmod, target])
-    change_id_action = Action('', change_id)
-
-    AddPostAction(library, change_id_action)
-
-
 if env["platform"] == "ios":
     xcframework_path = "{}{}/{}.{}.{}.xcframework".format(
         target_path,

diff --git a/src/fmod_string_names.cpp b/src/fmod_string_names.cpp
@@ -17,6 +17,7 @@ FmodStringNames* FmodStringNames::get_instance() {
     return instance;
 }
 
-FmodStringNames::FmodStringNames() : bank_path_property_name("bank_paths") {
+FmodStringNames::FmodStringNames() : bank_path_property_name("bank_paths"),
+  event_parameter_prefix_for_properties(EVENT_PARAMETER_PREFIX_FOR_PROPERTIES) {
 
 }
diff --git a/src/fmod_string_names.h b/src/fmod_string_names.h
@@ -21,7 +21,10 @@ class FmodStringNames {
 public:
     static FmodStringNames* get_instance();
 
+    static constexpr const char* EVENT_PARAMETER_PREFIX_FOR_PROPERTIES = "fmod_parameters";
+
     StringName bank_path_property_name;
+    StringName event_parameter_prefix_for_properties;
 };
 
 #endif //GODOTFMOD_FMOD_STRING_NAMES_H
diff --git a/src/nodes/fmod_event_emitter.h b/src/nodes/fmod_event_emitter.h
@@ -5,6 +5,7 @@
 
 #include <constants.h>
 #include <fmod_server.h>
+#include <fmod_string_names.h>
 
 #include <classes/engine.hpp>
 #include <classes/project_settings.hpp>
@@ -16,8 +17,6 @@ static constexpr const char* STARTED_SIGNAL_STRING = "started";
 static constexpr const char* RESTARTED_SIGNAL_STRING = "restarted";
 static constexpr const char* STOPPED_SIGNAL_STRING = "stopped";
 
-static constexpr const char* EVENT_PARAMETER_PREFIX_FOR_PROPERTIES = "fmod_parameters";
-
 namespace godot {
 
     template<class Derived, class NodeType>
@@ -605,9 +604,10 @@ namespace godot {
 
     template<class Derived, class NodeType>
     bool FmodEventEmitter<Derived, NodeType>::_set(const StringName& p_name, const Variant& p_property) {
-        if (!p_name.begins_with(EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (!p_name.begins_with(FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (p_name == FmodStringNames::get_instance()->event_parameter_prefix_for_properties) { return false; }
 
-        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
+        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
 
         const String& parameter_name {parts[0]};
 
@@ -658,9 +658,10 @@ namespace godot {
 
     template<class Derived, class NodeType>
     bool FmodEventEmitter<Derived, NodeType>::_get(const StringName& p_name, Variant& r_property) const {
-        if (!p_name.begins_with(EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (!p_name.begins_with(FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (p_name == FmodStringNames::get_instance()->event_parameter_prefix_for_properties) { return false; }
 
-        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
+        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
 
         Parameter* parameter {_find_parameter(parts[0])};
 
@@ -692,9 +693,10 @@ namespace godot {
 
     template<class Derived, class NodeType>
     bool FmodEventEmitter<Derived, NodeType>::_property_can_revert(const StringName& p_name) const {
-        if (!p_name.begins_with(EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (!p_name.begins_with(FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (p_name == FmodStringNames::get_instance()->event_parameter_prefix_for_properties) { return false; }
 
-        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
+        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
 
         if (parts.size() == 1) { return true; }
 
@@ -703,9 +705,10 @@ namespace godot {
 
     template<class Derived, class NodeType>
     bool FmodEventEmitter<Derived, NodeType>::_property_get_revert(const StringName& p_name, Variant& r_property) const {
-        if (!p_name.begins_with(EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (!p_name.begins_with(FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)) { return false; }
+        if (p_name == FmodStringNames::get_instance()->event_parameter_prefix_for_properties) { return false; }
 
-        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
+        PackedStringArray parts {p_name.trim_prefix(vformat("%s/", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES)).split("/")};
 
         Parameter* parameter {_find_parameter(parts[0])};
 
@@ -724,7 +727,7 @@ namespace godot {
         p_list->push_back(
             PropertyInfo(
                 Variant::Type::DICTIONARY,
-                EVENT_PARAMETER_PREFIX_FOR_PROPERTIES,
+                FmodStringNames::get_instance()->event_parameter_prefix_for_properties,
                 PROPERTY_HINT_NONE,
                 "",
                 PROPERTY_USAGE_NO_EDITOR
@@ -741,22 +744,22 @@ namespace godot {
             const Variant::Type parameter_variant_type {parameter.variant_type};
 
             p_list->push_back(
-              PropertyInfo(Variant::Type::INT, vformat("%s/%s/id", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR)
+              PropertyInfo(Variant::Type::INT, vformat("%s/%s/id", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR)
             );
 
             if (!parameter.labels.is_empty()) {
                 p_list->push_back(
                   PropertyInfo(
                     parameter_variant_type,
-                    vformat("%s/%s", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
+                    vformat("%s/%s", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
                     PROPERTY_HINT_ENUM,
                     vformat(String(",").join(parameter.labels))
                   )
                 );
                 p_list->push_back(
                   PropertyInfo(
                     Variant::Type::PACKED_STRING_ARRAY,
-                    vformat("%s/%s/labels", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
+                    vformat("%s/%s/labels", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
                     PROPERTY_HINT_NONE,
                     "",
                     PROPERTY_USAGE_NO_EDITOR
@@ -766,7 +769,7 @@ namespace godot {
                 p_list->push_back(
                   PropertyInfo(
                     parameter_variant_type,
-                    vformat("%s/%s", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
+                    vformat("%s/%s", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
                     PROPERTY_HINT_RANGE,
                     vformat("%s,%s,0.1", parameter_min_value, parameter_max_value)
                   )
@@ -776,7 +779,7 @@ namespace godot {
             p_list->push_back(
               PropertyInfo(
                 Variant::Type::INT,
-                vformat("%s/%s/variant_type", EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
+                vformat("%s/%s/variant_type", FmodStringNames::EVENT_PARAMETER_PREFIX_FOR_PROPERTIES, parameter_name),
                 PROPERTY_HINT_ENUM,
                 "",
                 PROPERTY_USAGE_NO_EDITOR