Update sample and build for GDExtensionLoader based new API

kisg · kisg · commit 4943d52771ff · 2024-06-11T11:45:27.000+02:00
diff --git a/SwiftGodot b/SwiftGodot
@@ -1 +1 @@
-Subproject commit 343458eb28f29505587a568a3af4a4ec0cd9e31e
+Subproject commit 5ef74654bd23949b48ae3498ab5e9787fb0067f4
diff --git a/SwiftGodotKit b/SwiftGodotKit
@@ -1 +1 @@
-Subproject commit 64b543194f1c4f6ab0df266d0e78fcb91e0aae22
+Subproject commit e30e3f7f7a0098dbd25884ab9d5160dccdba0862
diff --git a/build_libgodot.sh b/build_libgodot.sh
@@ -21,7 +21,7 @@ lib_suffix="so"
 host_debug=1
 debug=1
 force_host_rebuild=0
-force_regenerate=0
+update_api=0
 
 case "$host_system" in
     Linux)
@@ -51,18 +51,25 @@ do
         --host-debug)
             host_debug=1
         ;;        
-        --regenerate)
-            force_regenerate=1
+        --host-release)
+            host_debug=0
+        ;;
+        --update-api)
+            update_api=1
+            force_host_rebuild=1
         ;;
         --debug)
             debug=1
         ;;
+        --release)
+            debug=0
+        ;;
         --target)
             shift
             target_platform="${1:-}"
         ;;
         *)
-            echo "Usage: $0 [--host-debug] [--host-rebuild] [--debug] [--regenerate] --target <target platform>"
+            echo "Usage: $0 [--host-debug] [--host-rebuild] [--host-debug] [--host-release] [--debug] [--release] [--update-api] [--target <target platform>]"
             exit 1
         ;;
     esac
@@ -72,7 +79,7 @@ done
 if [ "$target_platform" = "ios" ]
 then
     target_arch="arm64"
-    target="template_debug"
+    target="template_release"
     lib_suffix="a"
 fi
 
@@ -97,6 +104,10 @@ if [ $debug -eq 1 ]
 then
     target_build_options="$target_build_options dev_build=yes"
     target_godot_suffix="$target_godot_suffix.dev"
+    if [ "$target_platform" = "ios" ]
+    then
+        target="template_debug"
+    fi
 fi
 
 target_godot_suffix="$target_godot_suffix.$target_arch"
@@ -113,22 +124,26 @@ fi
 
 mkdir -p $BUILD_DIR
 
-if [ ! -f $BUILD_DIR/extension_api.json ] || [ $force_regenerate -eq 1 ]
+if [ $update_api -eq 1 ]
 then
     cd $BUILD_DIR
     $host_godot --dump-extension-api
+    cp -v $BUILD_DIR/extension_api.json $GODOT_CPP_DIR/gdextension/
+    cp -v $GODOT_DIR/core/extension/gdextension_interface.h $GODOT_CPP_DIR/gdextension/
+    cp -v $GODOT_DIR/core/extension/libgodot.h $GODOT_CPP_DIR/gdextension/
+    cp -v $BUILD_DIR/extension_api.json $SWIFT_GODOT_DIR/Sources/ExtensionApi/
+    cp -v $GODOT_DIR/core/extension/gdextension_interface.h $SWIFT_GODOT_DIR/Sources/GDExtension/include/
+    cp -v $GODOT_DIR/core/extension/libgodot.h $SWIFT_GODOT_DIR/Sources/GDExtension/include/
+
+    echo "Successfully updated the GDExtension API."
+    exit 0
 fi
 
 cd $GODOT_DIR
 scons p=$target_platform target=$target $target_build_options library_type=shared_library
 cp -v $target_godot $BUILD_DIR/libgodot.$lib_suffix
 
-cp -v $BUILD_DIR/extension_api.json $GODOT_CPP_DIR/gdextension/
-cp -v $GODOT_DIR/core/extension/gdextension_interface.h $GODOT_CPP_DIR/gdextension/
-
 if [ "$target_platform" = "ios" ]
 then
-    $SWIFT_GODOT_DIR/scripts/make-libgodot.framework $GODOT_DIR $BUILD_DIR
-    cp -v $BUILD_DIR/extension_api.json $SWIFT_GODOT_DIR/Sources/ExtensionApi/
-    cp -v $GODOT_DIR/core/extension/gdextension_interface.h $SWIFT_GODOT_DIR/Sources/GDExtension/include/
-fi
+    $SWIFT_GODOT_DIR/scripts/make-libgodot.framework $GODOT_DIR $BUILD_DIR $target
+fi
diff --git a/godot b/godot
@@ -1 +1 @@
-Subproject commit a82f487e7814219d4c4807bb147976dd8eefbf1c
+Subproject commit 2f82b24db0fa54e4d895b44099544804b8716fa6
diff --git a/godot-cpp b/godot-cpp
@@ -1 +1 @@
-Subproject commit b02124595f46ec9bf35d6b0636c9bf16750fbfb6
+Subproject commit 791fbd855c3683168eddcb91e8c0228c614c28ba
diff --git a/samples/cpp_sample/src/main.cpp b/samples/cpp_sample/src/main.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <gdextension_interface.h>
+#include <libgodot.h>
 
 #include <godot_cpp/core/defs.hpp>
 #include <godot_cpp/godot.hpp>
@@ -52,8 +52,15 @@ class LibGodot {
             fprintf(stderr, "Error opening libgodot: %s\n", dlerror());
             return;
         }
-        *(void**)(&func_gdextension_create_godot_instance) = dlsym(handle, "gdextension_create_godot_instance");
-        if (func_gdextension_create_godot_instance == nullptr) {
+        *(void**)(&func_libgodot_create_godot_instance) = dlsym(handle, "libgodot_create_godot_instance");
+        if (func_libgodot_create_godot_instance == nullptr) {
+            fprintf(stderr, "Error acquiring function: %s\n", dlerror());
+            dlclose(handle);
+            handle == nullptr;
+            return;
+        }
+        *(void**)(&func_libgodot_destroy_godot_instance) = dlsym(handle, "libgodot_destroy_godot_instance");
+        if (func_libgodot_destroy_godot_instance == nullptr) {
             fprintf(stderr, "Error acquiring function: %s\n", dlerror());
             dlclose(handle);
             handle == nullptr;
@@ -68,23 +75,29 @@ class LibGodot {
     }
 
     bool is_open() {
-        return handle != nullptr && func_gdextension_create_godot_instance != nullptr;
+        return handle != nullptr && func_libgodot_create_godot_instance != nullptr;
     }
 
     godot::GodotInstance *create_godot_instance(int p_argc, char *p_argv[], GDExtensionInitializationFunction p_init_func = gdextension_default_init) {
         if (!is_open()) {
             return nullptr;
         }
-        GDExtensionObjectPtr instance = func_gdextension_create_godot_instance(p_argc, p_argv, p_init_func);
+        GDExtensionObjectPtr instance = func_libgodot_create_godot_instance(p_argc, p_argv, p_init_func);
         if (instance == nullptr) {
             return nullptr;
         }
         return reinterpret_cast<godot::GodotInstance *>(godot::internal::get_object_instance_binding(instance));
     }
 
+    void destroy_godot_instance(godot::GodotInstance* instance) {
+        GDExtensionObjectPtr obj = godot::internal::gdextension_interface_object_get_instance_from_id(instance->get_instance_id());
+        func_libgodot_destroy_godot_instance(obj);
+    }
+
 private:
     void *handle = nullptr;
-    GDExtensionObjectPtr (*func_gdextension_create_godot_instance)(int, char *[], GDExtensionInitializationFunction) = nullptr;
+    GDExtensionObjectPtr (*func_libgodot_create_godot_instance)(int, char *[], GDExtensionInitializationFunction) = nullptr;
+    void (*func_libgodot_destroy_godot_instance)(GDExtensionObjectPtr) = nullptr;
 };
 
 int main(int argc, char **argv) {
@@ -95,7 +108,7 @@ int main(int argc, char **argv) {
     if (argc > 0) {
         program = std::string(argv[0]);
     }
-    std::vector<std::string> args = { program, "--path", "../../project/" };
+    std::vector<std::string> args = { program, "--path", "../../project/", "--rendering-method", "gl_compatibility", "--rendering-driver", "opengl3" };
 
     std::vector<char*> argvs;
     for (const auto& arg : args) {
@@ -111,7 +124,7 @@ int main(int argc, char **argv) {
 
     instance->start();
     while (!instance->iteration()) {}
-    instance->shutdown();
+    libgodot.destroy_godot_instance(instance);
 
     return EXIT_SUCCESS;
 }
diff --git a/samples/ios_sample/iosTest.xcodeproj/project.pbxproj b/samples/ios_sample/iosTest.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		4009A2932BC608480066C885 /* SwiftGodotKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4009A2922BC608480066C885 /* SwiftGodotKit */; };
+		4041CDDD2C16837600400A0A /* game.pck in Resources */ = {isa = PBXBuildFile; fileRef = 4041CDDC2C16837600400A0A /* game.pck */; };
 		63091EA02BA0B27300576D34 /* main.pck in Resources */ = {isa = PBXBuildFile; fileRef = 63091E9F2BA0B27300576D34 /* main.pck */; };
 		633CF6A02B9EFEE1000461C9 /* iosTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633CF69F2B9EFEE1000461C9 /* iosTestApp.swift */; };
 		633CF6A22B9EFEE1000461C9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 633CF6A12B9EFEE1000461C9 /* ContentView.swift */; };
@@ -38,6 +39,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		4041CDDC2C16837600400A0A /* game.pck */ = {isa = PBXFileReference; lastKnownFileType = file; path = game.pck; sourceTree = "<group>"; };
 		63091E9F2BA0B27300576D34 /* main.pck */ = {isa = PBXFileReference; lastKnownFileType = file; path = main.pck; sourceTree = "<group>"; };
 		633CF69C2B9EFEE1000461C9 /* iosTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		633CF69F2B9EFEE1000461C9 /* iosTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosTestApp.swift; sourceTree = "<group>"; };
@@ -106,6 +108,7 @@
 		633CF69E2B9EFEE1000461C9 /* iosTest */ = {
 			isa = PBXGroup;
 			children = (
+				4041CDDC2C16837600400A0A /* game.pck */,
 				63091E9F2BA0B27300576D34 /* main.pck */,
 				633CF69F2B9EFEE1000461C9 /* iosTestApp.swift */,
 				633CF6A12B9EFEE1000461C9 /* ContentView.swift */,
@@ -263,6 +266,7 @@
 			files = (
 				63091EA02BA0B27300576D34 /* main.pck in Resources */,
 				633CF6A72B9EFEE3000461C9 /* Preview Assets.xcassets in Resources */,
+				4041CDDD2C16837600400A0A /* game.pck in Resources */,
 				633CF6A42B9EFEE3000461C9 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -454,7 +458,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"iosTest/Preview Content\"";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = CVQ7CHHHZY;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
@@ -489,7 +493,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"iosTest/Preview Content\"";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = CVQ7CHHHZY;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = "";
diff --git a/samples/ios_sample/iosTest.xcodeproj/xcshareddata/xcschemes/iosTest.xcscheme b/samples/ios_sample/iosTest.xcodeproj/xcshareddata/xcschemes/iosTest.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "633CF69B2B9EFEE1000461C9"
+               BuildableName = "iosTest.app"
+               BlueprintName = "iosTest"
+               ReferencedContainer = "container:iosTest.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "633CF6AB2B9EFEE4000461C9"
+               BuildableName = "iosTestTests.xctest"
+               BlueprintName = "iosTestTests"
+               ReferencedContainer = "container:iosTest.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "633CF6B52B9EFEE4000461C9"
+               BuildableName = "iosTestUITests.xctest"
+               BlueprintName = "iosTestUITests"
+               ReferencedContainer = "container:iosTest.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "633CF69B2B9EFEE1000461C9"
+            BuildableName = "iosTest.app"
+            BlueprintName = "iosTest"
+            ReferencedContainer = "container:iosTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "633CF69B2B9EFEE1000461C9"
+            BuildableName = "iosTest.app"
+            BlueprintName = "iosTest"
+            ReferencedContainer = "container:iosTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/ios_sample/iosTest.xcodeproj/xcuserdata/kisg.xcuserdatad/xcschemes/xcschememanagement.plist b/samples/ios_sample/iosTest.xcodeproj/xcuserdata/kisg.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/samples/ios_sample/iosTest/ContentView.swift b/samples/ios_sample/iosTest/ContentView.swift
diff --git a/samples/ios_sample/iosTest/game.pck b/samples/ios_sample/iosTest/game.pck
