Fix method callable

Author: CedNaru

kt/godot-library/godot-core-library/src/main/kotlin/godot/core/Variant.kt

@@ -285,14 +285,14 @@ enum class VariantParser(override val id: Int) : VariantConverter {
         }
     },
     AABB(16) {
-        override fun toUnsafeKotlin(buffer: ByteBuffer): godot.core.AABB {
+        override fun toUnsafeKotlin(buffer: ByteBuffer): AABB {
             val position = buffer.vector3
             val size = buffer.vector3
             return AABB(position, size)
         }
 
         override fun toUnsafeGodot(buffer: ByteBuffer, any: Any?) {
-            require(any is godot.core.AABB)
+            require(any is AABB)
             buffer.vector3 = any._position
             buffer.vector3 = any._size
         }
@@ -377,6 +377,7 @@ enum class VariantParser(override val id: Int) : VariantConverter {
                 buffer.putLong(any.ptr)
             } else {
                 require(any is LambdaCallable<*> || any is MethodCallable)
+                // Be careful that ::toNativeCallable doesn't itself use the shared buffer.
                 val ptr = any.toNativeCallable().ptr
                 buffer.putLong(ptr)
             }

kt/godot-library/godot-core-library/src/main/kotlin/godot/core/callback/Callable.kt

@@ -129,13 +129,16 @@ interface Callable : CoreType {
 
         @JvmStatic
         @JvmName("create")
-        operator fun invoke(target: Object, methodName: StringName) = VariantCallable(target, methodName)
+        operator fun invoke(target: Object, methodName: StringName) = MethodCallable(target, methodName)
     }
 
     @Suppress("FunctionName")
     object Bridge {
         external fun engine_call_constructor(): VoidPtr
-        external fun engine_call_constructor_object_string_name(): VoidPtr
+        external fun engine_call_constructor_object_string_name(
+            objectPtr: VoidPtr,
+            methodNamePtr: VoidPtr
+        ): VoidPtr
         external fun engine_call_constructor_lambda_callable(
             callable: LambdaContainer<*>,
             variantTypeOrdinal: Int,

kt/godot-library/godot-core-library/src/main/kotlin/godot/core/callback/MethodCallable.kt

@@ -3,6 +3,7 @@
 package godot.core
 
 import godot.api.Object
+import godot.core.Callable.Bridge
 import godot.internal.memory.MemoryManager
 
 class MethodCallable internal constructor(
@@ -30,7 +31,9 @@ class MethodCallable internal constructor(
     }
 
     override fun toNativeCallable(): VariantCallable {
-        val unbound = VariantCallable(target, methodName)
+        // We pass all params using jni as we're often in a context of sending parameters to cpp, so we should not rewind buffer.
+        val ptr = Bridge.engine_call_constructor_object_string_name(target.ptr, methodName.ptr)
+        val unbound = VariantCallable(ptr)
         if (boundArgs.isNotEmpty()) {
             return unbound.bindUnsafe(*boundArgs)
         }

kt/godot-library/godot-core-library/src/main/kotlin/godot/core/callback/VariantCallable.kt

@@ -17,12 +17,6 @@ class VariantCallable : NativeCoreType, Callable {
         MemoryManager.registerNativeCoreType(this, VariantParser.CALLABLE)
     }
 
-    internal constructor(target: Object, methodName: StringName) {
-        TransferContext.writeArguments(VariantParser.OBJECT to target, VariantParser.STRING_NAME to methodName)
-        ptr = Bridge.engine_call_constructor_object_string_name()
-        MemoryManager.registerNativeCoreType(this, VariantParser.CALLABLE)
-    }
-
     internal constructor(callable: VariantCallable) {
         TransferContext.writeArguments(VariantParser.CALLABLE to callable)
         ptr = Bridge.engine_call_copy_constructor()

kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json

@@ -164,7 +164,7 @@
     "methods" : [
       { "name" : "engine_call_constructor", "parameterTypes" : [] },
 
-      { "name" : "engine_call_constructor_object_string_name", "parameterTypes" : [] },
+      { "name" : "engine_call_constructor_object_string_name", "parameterTypes" : ["long", "long"] },
       { "name" : "engine_call_constructor_lambda_callable", "parameterTypes" : ["godot.core.LambdaContainer", "int", "int"] },
       { "name" : "engine_call_constructor_cancellable", "parameterTypes" : ["godot.core.LambdaContainer", "int", "int"] },
       { "name" : "engine_call_copy_constructor", "parameterTypes" : [] },

src/jvm_wrapper/bridge/callable_bridge.cpp

@@ -13,11 +13,10 @@ uintptr_t CallableBridge::engine_call_constructor(JNIEnv* p_raw_env, jobject p_i
     return reinterpret_cast<uintptr_t>(VariantAllocator::alloc(Callable()));
 }
 
-uintptr_t CallableBridge::engine_call_constructor_object_string_name(JNIEnv* p_raw_env, jobject p_instance) {
-    jni::Env env {p_raw_env};
-    Variant args[2] = {};
-    TransferContext::get_instance().read_args(env, args);
-    return reinterpret_cast<uintptr_t>(VariantAllocator::alloc(Callable(args[0].operator Object*(), args[1].operator StringName())));
+uintptr_t CallableBridge::engine_call_constructor_object_string_name(JNIEnv * p_raw_env, jobject p_instance, jlong object_ptr, jlong method_name_ptr) {
+    Object* obj = reinterpret_cast<Object*>(object_ptr);
+    StringName* name = reinterpret_cast<StringName*>(method_name_ptr);
+    return reinterpret_cast<uintptr_t>(VariantAllocator::alloc(Callable(obj, *name)));
 }
 
 uintptr_t CallableBridge::engine_call_constructor_lambda_callable(JNIEnv* p_raw_env, jobject, jobject p_lambda_container, jint p_variant_type_ordinal, jint p_hash_code) {

src/jvm_wrapper/bridge/callable_bridge.h

@@ -10,7 +10,7 @@ namespace bridges {
         // clang-format off
         INIT_JNI_BINDINGS(
             INIT_NATIVE_METHOD("engine_call_constructor", "()J", CallableBridge::engine_call_constructor)
-            INIT_NATIVE_METHOD("engine_call_constructor_object_string_name", "()J", CallableBridge::engine_call_constructor_object_string_name)
+            INIT_NATIVE_METHOD("engine_call_constructor_object_string_name", "(JJ)J", CallableBridge::engine_call_constructor_object_string_name)
             INIT_NATIVE_METHOD("engine_call_constructor_lambda_callable", "(Lgodot/core/LambdaContainer;II)J", CallableBridge::engine_call_constructor_lambda_callable)
             INIT_NATIVE_METHOD("engine_call_constructor_cancellable", "(Lgodot/core/LambdaContainer;II)V", CallableBridge::engine_call_constructor_cancellable)
             INIT_NATIVE_METHOD("engine_call_copy_constructor", "()J", CallableBridge::engine_call_copy_constructor)
@@ -35,7 +35,7 @@ namespace bridges {
 
     public:
         static uintptr_t engine_call_constructor(JNIEnv * p_raw_env, jobject p_instance);
-        static uintptr_t engine_call_constructor_object_string_name(JNIEnv * p_raw_env, jobject p_instance);
+        static uintptr_t engine_call_constructor_object_string_name(JNIEnv * p_raw_env, jobject p_instance, jlong object_ptr, jlong method_name_ptr);
         static uintptr_t engine_call_constructor_lambda_callable(
           JNIEnv * p_raw_env,
           jobject p_instance,