summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/godot.cpp8
-rw-r--r--src/variant/callable_custom.cpp18
-rw-r--r--src/variant/callable_method_pointer.cpp13
-rw-r--r--src/variant/variant.cpp84
4 files changed, 64 insertions, 59 deletions
diff --git a/src/godot.cpp b/src/godot.cpp
index dd8ace3..8a031be 100644
--- a/src/godot.cpp
+++ b/src/godot.cpp
@@ -173,11 +173,11 @@ GDExtensionInterfaceObjectGetInstanceFromId gdextension_interface_object_get_ins
GDExtensionInterfaceObjectGetInstanceId gdextension_interface_object_get_instance_id = nullptr;
GDExtensionInterfaceObjectHasScriptMethod gdextension_interface_object_has_script_method = nullptr;
GDExtensionInterfaceObjectCallScriptMethod gdextension_interface_object_call_script_method = nullptr;
-GDExtensionInterfaceCallableCustomCreate gdextension_interface_callable_custom_create = nullptr;
+GDExtensionInterfaceCallableCustomCreate2 gdextension_interface_callable_custom_create2 = nullptr;
GDExtensionInterfaceCallableCustomGetUserData gdextension_interface_callable_custom_get_userdata = nullptr;
GDExtensionInterfaceRefGetObject gdextension_interface_ref_get_object = nullptr;
GDExtensionInterfaceRefSetObject gdextension_interface_ref_set_object = nullptr;
-GDExtensionInterfaceScriptInstanceCreate2 gdextension_interface_script_instance_create2 = nullptr;
+GDExtensionInterfaceScriptInstanceCreate3 gdextension_interface_script_instance_create3 = nullptr;
GDExtensionInterfacePlaceHolderScriptInstanceCreate gdextension_interface_placeholder_script_instance_create = nullptr;
GDExtensionInterfacePlaceHolderScriptInstanceUpdate gdextension_interface_placeholder_script_instance_update = nullptr;
GDExtensionInterfaceClassdbConstructObject gdextension_interface_classdb_construct_object = nullptr;
@@ -413,11 +413,11 @@ GDExtensionBool GDExtensionBinding::init(GDExtensionInterfaceGetProcAddress p_ge
LOAD_PROC_ADDRESS(object_get_instance_id, GDExtensionInterfaceObjectGetInstanceId);
LOAD_PROC_ADDRESS(object_has_script_method, GDExtensionInterfaceObjectHasScriptMethod);
LOAD_PROC_ADDRESS(object_call_script_method, GDExtensionInterfaceObjectCallScriptMethod);
- LOAD_PROC_ADDRESS(callable_custom_create, GDExtensionInterfaceCallableCustomCreate);
+ LOAD_PROC_ADDRESS(callable_custom_create2, GDExtensionInterfaceCallableCustomCreate2);
LOAD_PROC_ADDRESS(callable_custom_get_userdata, GDExtensionInterfaceCallableCustomGetUserData);
LOAD_PROC_ADDRESS(ref_get_object, GDExtensionInterfaceRefGetObject);
LOAD_PROC_ADDRESS(ref_set_object, GDExtensionInterfaceRefSetObject);
- LOAD_PROC_ADDRESS(script_instance_create2, GDExtensionInterfaceScriptInstanceCreate2);
+ LOAD_PROC_ADDRESS(script_instance_create3, GDExtensionInterfaceScriptInstanceCreate3);
LOAD_PROC_ADDRESS(placeholder_script_instance_create, GDExtensionInterfacePlaceHolderScriptInstanceCreate);
LOAD_PROC_ADDRESS(placeholder_script_instance_update, GDExtensionInterfacePlaceHolderScriptInstanceUpdate);
LOAD_PROC_ADDRESS(classdb_construct_object, GDExtensionInterfaceClassdbConstructObject);
diff --git a/src/variant/callable_custom.cpp b/src/variant/callable_custom.cpp
index e0540fa..ae8cc48 100644
--- a/src/variant/callable_custom.cpp
+++ b/src/variant/callable_custom.cpp
@@ -35,6 +35,11 @@
namespace godot {
+int CallableCustomBase::get_argument_count(bool &r_is_valid) const {
+ r_is_valid = false;
+ return 0;
+}
+
static void callable_custom_call(void *p_userdata, const GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionVariantPtr r_return, GDExtensionCallError *r_error) {
CallableCustom *callable_custom = (CallableCustom *)p_userdata;
callable_custom->call((const Variant **)p_args, p_argument_count, *(Variant *)r_return, *r_error);
@@ -84,13 +89,21 @@ static GDExtensionBool callable_custom_less_than_func(void *p_a, void *p_b) {
return func_a(a, b);
}
+static GDExtensionInt custom_callable_get_argument_count_func(void *p_userdata, GDExtensionBool *r_is_valid) {
+ CallableCustom *callable_custom = (CallableCustom *)p_userdata;
+ bool valid = false;
+ int ret = callable_custom->get_argument_count(valid);
+ *r_is_valid = valid;
+ return ret;
+}
+
bool CallableCustom::is_valid() const {
// The same default implementation as in Godot.
return ObjectDB::get_instance(get_object());
}
Callable::Callable(CallableCustom *p_callable_custom) {
- GDExtensionCallableCustomInfo info = {};
+ GDExtensionCallableCustomInfo2 info = {};
info.callable_userdata = p_callable_custom;
info.token = internal::token;
info.object_id = p_callable_custom->get_object();
@@ -101,8 +114,9 @@ Callable::Callable(CallableCustom *p_callable_custom) {
info.equal_func = &callable_custom_equal_func;
info.less_than_func = &callable_custom_less_than_func;
info.to_string_func = &callable_custom_to_string;
+ info.get_argument_count_func = &custom_callable_get_argument_count_func;
- ::godot::internal::gdextension_interface_callable_custom_create(_native_ptr(), &info);
+ ::godot::internal::gdextension_interface_callable_custom_create2(_native_ptr(), &info);
}
CallableCustom *Callable::get_custom() const {
diff --git a/src/variant/callable_method_pointer.cpp b/src/variant/callable_method_pointer.cpp
index 520ed05..23b7ef5 100644
--- a/src/variant/callable_method_pointer.cpp
+++ b/src/variant/callable_method_pointer.cpp
@@ -77,6 +77,14 @@ static GDExtensionBool custom_callable_mp_less_than_func(void *p_a, void *p_b) {
return memcmp(a->get_comp_ptr(), b->get_comp_ptr(), a->get_comp_size() * 4) < 0;
}
+static GDExtensionInt custom_callable_mp_get_argument_count_func(void *p_userdata, GDExtensionBool *r_is_valid) {
+ CallableCustomMethodPointerBase *callable_method_pointer = (CallableCustomMethodPointerBase *)p_userdata;
+ bool valid = false;
+ int ret = callable_method_pointer->get_argument_count(valid);
+ *r_is_valid = valid;
+ return ret;
+}
+
void CallableCustomMethodPointerBase::_setup(uint32_t *p_base_ptr, uint32_t p_ptr_size) {
comp_ptr = p_base_ptr;
comp_size = p_ptr_size / 4;
@@ -93,7 +101,7 @@ void CallableCustomMethodPointerBase::_setup(uint32_t *p_base_ptr, uint32_t p_pt
namespace internal {
Callable create_callable_from_ccmp(CallableCustomMethodPointerBase *p_callable_method_pointer) {
- GDExtensionCallableCustomInfo info = {};
+ GDExtensionCallableCustomInfo2 info = {};
info.callable_userdata = p_callable_method_pointer;
info.token = internal::token;
info.object_id = p_callable_method_pointer->get_object();
@@ -103,9 +111,10 @@ Callable create_callable_from_ccmp(CallableCustomMethodPointerBase *p_callable_m
info.hash_func = &custom_callable_mp_hash;
info.equal_func = &custom_callable_mp_equal_func;
info.less_than_func = &custom_callable_mp_less_than_func;
+ info.get_argument_count_func = &custom_callable_mp_get_argument_count_func;
Callable callable;
- ::godot::internal::gdextension_interface_callable_custom_create(callable._native_ptr(), &info);
+ ::godot::internal::gdextension_interface_callable_custom_create2(callable._native_ptr(), &info);
return callable;
}
diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp
index 945d6f4..161362b 100644
--- a/src/variant/variant.cpp
+++ b/src/variant/variant.cpp
@@ -303,123 +303,131 @@ Variant::operator float() const {
}
Variant::operator String() const {
- String result;
- to_type_constructor[STRING](result._native_ptr(), _native_ptr());
- return result;
+ return String(this);
}
Variant::operator Vector2() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector2 result;
to_type_constructor[VECTOR2]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Vector2i() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector2i result;
to_type_constructor[VECTOR2I]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Rect2() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Rect2 result;
to_type_constructor[RECT2]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Rect2i() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Rect2i result;
to_type_constructor[RECT2I]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Vector3() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector3 result;
to_type_constructor[VECTOR3]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Vector3i() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector3i result;
to_type_constructor[VECTOR3I]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Transform2D() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Transform2D result;
to_type_constructor[TRANSFORM2D]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Vector4() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector4 result;
to_type_constructor[VECTOR4]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Vector4i() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Vector4i result;
to_type_constructor[VECTOR4I]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Plane() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Plane result;
to_type_constructor[PLANE]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Quaternion() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Quaternion result;
to_type_constructor[QUATERNION]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator godot::AABB() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
godot::AABB result;
to_type_constructor[AABB]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Basis() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Basis result;
to_type_constructor[BASIS]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Transform3D() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Transform3D result;
to_type_constructor[TRANSFORM3D]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Projection() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Projection result;
to_type_constructor[PROJECTION]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator Color() const {
+ // @todo Avoid initializing result before calling constructor (which will initialize it again)
Color result;
to_type_constructor[COLOR]((GDExtensionTypePtr)&result, _native_ptr());
return result;
}
Variant::operator StringName() const {
- StringName result;
- to_type_constructor[STRING_NAME](result._native_ptr(), _native_ptr());
- return result;
+ return StringName(this);
}
Variant::operator NodePath() const {
- NodePath result;
- to_type_constructor[NODE_PATH](result._native_ptr(), _native_ptr());
- return result;
+ return NodePath(this);
}
Variant::operator godot::RID() const {
- godot::RID result;
- to_type_constructor[RID](result._native_ptr(), _native_ptr());
- return result;
+ return godot::RID(this);
}
Variant::operator Object *() const {
@@ -447,81 +455,55 @@ Variant::operator ObjectID() const {
}
Variant::operator Callable() const {
- Callable result;
- to_type_constructor[CALLABLE](result._native_ptr(), _native_ptr());
- return result;
+ return Callable(this);
}
Variant::operator Signal() const {
- Signal result;
- to_type_constructor[SIGNAL](result._native_ptr(), _native_ptr());
- return result;
+ return Signal(this);
}
Variant::operator Dictionary() const {
- Dictionary result;
- to_type_constructor[DICTIONARY](result._native_ptr(), _native_ptr());
- return result;
+ return Dictionary(this);
}
Variant::operator Array() const {
- Array result;
- to_type_constructor[ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return Array(this);
}
Variant::operator PackedByteArray() const {
- PackedByteArray result;
- to_type_constructor[PACKED_BYTE_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedByteArray(this);
}
Variant::operator PackedInt32Array() const {
- PackedInt32Array result;
- to_type_constructor[PACKED_INT32_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedInt32Array(this);
}
Variant::operator PackedInt64Array() const {
- PackedInt64Array result;
- to_type_constructor[PACKED_INT64_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedInt64Array(this);
}
Variant::operator PackedFloat32Array() const {
- PackedFloat32Array result;
- to_type_constructor[PACKED_FLOAT32_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedFloat32Array(this);
}
Variant::operator PackedFloat64Array() const {
- PackedFloat64Array result;
- to_type_constructor[PACKED_FLOAT64_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedFloat64Array(this);
}
Variant::operator PackedStringArray() const {
- PackedStringArray result;
- to_type_constructor[PACKED_STRING_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedStringArray(this);
}
Variant::operator PackedVector2Array() const {
- PackedVector2Array result;
- to_type_constructor[PACKED_VECTOR2_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedVector2Array(this);
}
Variant::operator PackedVector3Array() const {
- PackedVector3Array result;
- to_type_constructor[PACKED_VECTOR3_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedVector3Array(this);
}
Variant::operator PackedColorArray() const {
- PackedColorArray result;
- to_type_constructor[PACKED_COLOR_ARRAY](result._native_ptr(), _native_ptr());
- return result;
+ return PackedColorArray(this);
}
Variant &Variant::operator=(const Variant &other) {