Merge pull request #9 from JiepengTan/libgodot_c_ext

Add more libgodot C interfaces to simplify the use of libgodot.

Author: xushiwei

core/extension/godot_instance.cpp

@@ -46,6 +46,9 @@ GodotInstance::~GodotInstance() {
 }
 
 bool GodotInstance::initialize(GDExtensionInitializationFunction p_init_func) {
+	if (p_init_func == nullptr) {
+		return true;
+	}
 	GDExtensionManager *gdextension_manager = GDExtensionManager::get_singleton();
 	GDExtensionConstPtr<const GDExtensionInitializationFunction> ptr((const GDExtensionInitializationFunction *)&p_init_func);
 	GDExtensionManager::LoadStatus status = gdextension_manager->load_function_extension("libgodot://main", ptr);

core/extension/libgodot.h

@@ -30,6 +30,13 @@
 
 #ifndef LIBGODOT_H
 #define LIBGODOT_H
+#ifdef _WIN32
+#define EXPORT_SYMBOL __declspec(dllexport)
+#elif defined(__GNUC__)
+#define EXPORT_SYMBOL __attribute__((visibility("default")))
+#else
+#define EXPORT_SYMBOL
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,7 +56,7 @@ extern "C" {
  *
  * @return A pointer to created \ref GodotInstance GDExtension object or nullptr if there was an error.
  */
-__declspec(dllexport) GDExtensionObjectPtr libgodot_create_godot_instance(int p_argc, char *p_argv[], GDExtensionInitializationFunction p_init_func, void *p_platform_data);
+EXPORT_SYMBOL GDExtensionObjectPtr libgodot_create_godot_instance(int p_argc, char *p_argv[], GDExtensionInitializationFunction p_init_func, void *p_platform_data);
 
 /**
  * @name libgodot_destroy_godot_instance
@@ -60,7 +67,28 @@ __declspec(dllexport) GDExtensionObjectPtr libgodot_create_godot_instance(int p_
  * @param p_godot_instance The reference to the GodotInstance object to destroy.
  *
  */
-__declspec(dllexport) void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance);
+EXPORT_SYMBOL void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance);
+
+/**
+ * @name libgodot_start_godot_instance
+ * @since 4.4
+ *
+ * Godot instance start.
+ *
+ * @param p_godot_instance The reference to the GodotInstance object to destroy.
+ *
+ */
+EXPORT_SYMBOL bool libgodot_start_godot_instance(GDExtensionObjectPtr p_godot_instance);
+/**
+ * @name libgodot_iteration_godot_instance
+ * @since 4.4
+ *
+ * Godot instance iteration.
+ *
+ * @param p_godot_instance The reference to the GodotInstance object to destroy.
+ *
+ */
+EXPORT_SYMBOL bool libgodot_iteration_godot_instance(GDExtensionObjectPtr p_godot_instance);
 
 #ifdef __cplusplus
 }

platform/ios/display_server_ios.mm

@@ -81,7 +81,7 @@
 		if (!layer) {
 			ERR_FAIL_MSG("Failed to create iOS Vulkan rendering layer.");
 		}
-		apple_surface = RenderingNativeSurfaceApple::create((CAMetalLayer *const *)&layer);
+		apple_surface = RenderingNativeSurfaceApple::create((__bridge void *)layer);
 		rendering_context = apple_surface->create_rendering_context();
 	}
 #endif

platform/ios/libgodot_ios.mm

@@ -67,3 +67,21 @@ void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance) {
 		Main::cleanup();
 	}
 }
+
+bool libgodot_start_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->start();
+	}
+	return ret;
+}
+
+bool libgodot_iteration_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->iteration();
+	}
+	return ret;
+}

platform/linuxbsd/libgodot_linuxbsd.cpp

@@ -68,3 +68,20 @@ void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance) {
 		Main::cleanup();
 	}
 }
+bool libgodot_start_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->start();
+	}
+	return ret;
+}
+
+bool libgodot_iteration_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->iteration();
+	}
+	return ret;
+}

platform/macos/libgodot_macos.mm

@@ -70,3 +70,21 @@ void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance) {
 		Main::cleanup();
 	}
 }
+
+bool libgodot_start_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->start();
+	}
+	return ret;
+}
+
+bool libgodot_iteration_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->iteration();
+	}
+	return ret;
+}

platform/windows/libgodot_windows.cpp

@@ -68,3 +68,21 @@ void libgodot_destroy_godot_instance(GDExtensionObjectPtr p_godot_instance) {
 		Main::cleanup();
 	}
 }
+
+bool libgodot_start_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->start();
+	}
+	return ret;
+}
+
+bool libgodot_iteration_godot_instance(GDExtensionObjectPtr p_godot_instance) {
+	bool ret = false;
+	GodotInstance *godot_instance = (GodotInstance *)p_godot_instance;
+	if (instance == godot_instance) {
+		ret = godot_instance->iteration();
+	}
+	return ret;
+}