Godot 4.0 adaption (Windows + MacOS)

src/callback/event_callbacks.h

@@ -3,7 +3,7 @@
 
 #include <fmod_common.h>
 #include <fmod_studio_common.h>
-#include <core/Dictionary.hpp>
+#include <variant/dictionary.hpp>
 #include <mutex>
 
 namespace Callbacks {

src/godot_fmod.h

@@ -1,22 +1,22 @@
 #ifndef GODOTFMOD_GODOT_FMOD_H
 #define GODOTFMOD_GODOT_FMOD_H
 
-#include <Godot.hpp>
-#include <GodotGlobal.hpp>
+#include <godot.hpp>
+#include <classes/global_constants.hpp>
 #include <fmod_common.h>
 #include <fmod_errors.h>
 #include <fmod_studio.hpp>
 #include <fmod.hpp>
-#include <Spatial.hpp>
-#include <Object.hpp>
-#include <CanvasItem.hpp>
-#include <Node.hpp>
-#include <gen/Mutex.hpp>
+#include <core/object.hpp>
+#include <classes/canvas_item.hpp>
+#include <classes/node.hpp>
+#include <classes/mutex.hpp>
 #include "callback/event_callbacks.h"
 #include "callback/file_callbacks.h"
 #include "helpers/containers.h"
 #include "helpers/constants.h"
 #include "helpers/current_function.h"
+#include <variant/utility_functions.hpp>
 
 #define CUSTOM_FILESYSTEM
 
@@ -44,13 +44,13 @@ namespace godot {
 #define GODOT_LOG(level, message)\
     switch (level) {\
         case 0:\
-            Godot::print(message);\
+            UtilityFunctions::print(message);\
             break;\
         case 1:\
-            Godot::print_warning(message, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__);\
+            UtilityFunctions::print(message, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__);\
             break;\
         case 2:\
-            Godot::print_error(message, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__);\
+            UtilityFunctions::printerr(message, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__);\
             break;\
     }\
 
@@ -95,9 +95,12 @@ namespace godot {
     };
 
     class Fmod : public Node {
-    GODOT_CLASS(Fmod, Node)
+    GDCLASS(Fmod, Node)
         DECLARE_ALL_CONSTANTS
 
+    protected:
+        static void _bind_methods();
+
     private:
         FMOD::Studio::System *system;
         FMOD::System *coreSystem;
@@ -161,8 +164,6 @@ namespace godot {
 
         ~Fmod();
 
-        static void _register_methods();
-
         void _init();
         void _process(float delta);
         void shutdown();

src/helpers/containers.h

@@ -5,8 +5,8 @@
 #ifndef GODOTFMOD_POINTERARRAY_H
 #define GODOTFMOD_POINTERARRAY_H
 
-#include <core/Godot.hpp>
-#include <core/Array.hpp>
+#include <godot.hpp>
+#include <variant/array.hpp>
 #include "current_function.h"
 
 namespace godot {

src/register_types.cpp

@@ -0,0 +1,42 @@
+#include "register_types.h"
+
+#include <godot/gdnative_interface.h>
+
+#include <core/class_db.hpp>
+#include <core/defs.hpp>
+#include <godot.hpp>
+
+#include "godot_fmod.h"
+
+using namespace godot;
+
+void initialize_fmod_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
+		return;
+	}
+
+    Callbacks::GodotFileRunner::get_singleton();
+
+    ClassDB::register_class<Fmod>();
+}
+
+void uninitialize_fmod_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
+		return;
+	}
+}
+
+extern "C" {
+
+// Initialization.
+
+GDNativeBool GDN_EXPORT fmod_library_init(const GDNativeInterface *p_interface, const GDNativeExtensionClassLibraryPtr p_library, GDNativeInitialization *r_initialization) {
+	godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
+
+	init_obj.register_initializer(initialize_fmod_module);
+	init_obj.register_terminator(uninitialize_fmod_module);
+	init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE);
+
+	return init_obj.init();
+}
+}

src/register_types.h

@@ -0,0 +1,11 @@
+#ifndef FMOD_REGISTER_TYPES_H
+#define FMOD_REGISTER_TYPES_H
+
+#include <core/class_db.hpp>
+
+using namespace godot;
+
+void initialize_fmod_module(ModuleInitializationLevel p_level);
+void uninitialize_fmod_module(ModuleInitializationLevel p_level);
+
+#endif // ! FMOD_REGISTER_TYPES_H