Improve extension system

- Fix library loading and initialization.
- Add extra methods/parameters in the interface needed by extenstions.
- Add Variant destructors and functions for extracting values and
  creating Variants from values.

1 files changed, 170 insertions, 6 deletions

diff --git a/core/extension/gdnative_interface.cpp b/core/extension/gdnative_interface.cpp
index 88fff342ee..a444b2e18e 100644
--- a/core/extension/gdnative_interface.cpp
+++ b/core/extension/gdnative_interface.cpp
@@ -299,6 +299,161 @@ static GDNativeBool gdnative_variant_can_convert_strict(GDNativeVariantType p_fr
 	return Variant::can_convert_strict((Variant::Type)p_from, (Variant::Type)p_to);
 }
 
+// Variant interaction.
+static GDNativeVariantFromTypeConstructorFunc gdnative_get_variant_from_type_constructor(GDNativeVariantType p_type) {
+	switch (p_type) {
+		case GDNATIVE_VARIANT_TYPE_BOOL:
+			return VariantTypeConstructor<bool>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_INT:
+			return VariantTypeConstructor<int64_t>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_FLOAT:
+			return VariantTypeConstructor<double>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_STRING:
+			return VariantTypeConstructor<String>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_VECTOR2:
+			return VariantTypeConstructor<Vector2>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_VECTOR2I:
+			return VariantTypeConstructor<Vector2i>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_RECT2:
+			return VariantTypeConstructor<Rect2>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_RECT2I:
+			return VariantTypeConstructor<Rect2i>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_VECTOR3:
+			return VariantTypeConstructor<Vector3>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_VECTOR3I:
+			return VariantTypeConstructor<Vector3i>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_TRANSFORM2D:
+			return VariantTypeConstructor<Transform2D>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PLANE:
+			return VariantTypeConstructor<Plane>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_QUATERNION:
+			return VariantTypeConstructor<Quaternion>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_AABB:
+			return VariantTypeConstructor<AABB>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_BASIS:
+			return VariantTypeConstructor<Basis>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_TRANSFORM3D:
+			return VariantTypeConstructor<Transform3D>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_COLOR:
+			return VariantTypeConstructor<Color>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_STRING_NAME:
+			return VariantTypeConstructor<StringName>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_NODE_PATH:
+			return VariantTypeConstructor<NodePath>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_RID:
+			return VariantTypeConstructor<RID>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_OBJECT:
+			return VariantTypeConstructor<Object *>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_CALLABLE:
+			return VariantTypeConstructor<Callable>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_SIGNAL:
+			return VariantTypeConstructor<Signal>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_DICTIONARY:
+			return VariantTypeConstructor<Dictionary>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_ARRAY:
+			return VariantTypeConstructor<Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_BYTE_ARRAY:
+			return VariantTypeConstructor<PackedByteArray>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_INT32_ARRAY:
+			return VariantTypeConstructor<PackedInt32Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_INT64_ARRAY:
+			return VariantTypeConstructor<PackedInt64Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_FLOAT32_ARRAY:
+			return VariantTypeConstructor<PackedFloat32Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_FLOAT64_ARRAY:
+			return VariantTypeConstructor<PackedFloat64Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_STRING_ARRAY:
+			return VariantTypeConstructor<PackedStringArray>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_VECTOR2_ARRAY:
+			return VariantTypeConstructor<PackedVector2Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_VECTOR3_ARRAY:
+			return VariantTypeConstructor<PackedVector3Array>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_PACKED_COLOR_ARRAY:
+			return VariantTypeConstructor<PackedColorArray>::variant_from_type;
+		case GDNATIVE_VARIANT_TYPE_NIL:
+		case GDNATIVE_VARIANT_TYPE_VARIANT_MAX:
+			ERR_FAIL_V_MSG(nullptr, "Getting Variant conversion function with invalid type");
+	}
+	ERR_FAIL_V_MSG(nullptr, "Getting Variant conversion function with invalid type");
+}
+
+static GDNativeTypeFromVariantConstructorFunc gdnative_get_type_from_variant_constructor(GDNativeVariantType p_type) {
+	switch (p_type) {
+		case GDNATIVE_VARIANT_TYPE_BOOL:
+			return VariantTypeConstructor<bool>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_INT:
+			return VariantTypeConstructor<int64_t>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_FLOAT:
+			return VariantTypeConstructor<double>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_STRING:
+			return VariantTypeConstructor<String>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_VECTOR2:
+			return VariantTypeConstructor<Vector2>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_VECTOR2I:
+			return VariantTypeConstructor<Vector2i>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_RECT2:
+			return VariantTypeConstructor<Rect2>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_RECT2I:
+			return VariantTypeConstructor<Rect2i>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_VECTOR3:
+			return VariantTypeConstructor<Vector3>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_VECTOR3I:
+			return VariantTypeConstructor<Vector3i>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_TRANSFORM2D:
+			return VariantTypeConstructor<Transform2D>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PLANE:
+			return VariantTypeConstructor<Plane>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_QUATERNION:
+			return VariantTypeConstructor<Quaternion>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_AABB:
+			return VariantTypeConstructor<AABB>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_BASIS:
+			return VariantTypeConstructor<Basis>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_TRANSFORM3D:
+			return VariantTypeConstructor<Transform3D>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_COLOR:
+			return VariantTypeConstructor<Color>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_STRING_NAME:
+			return VariantTypeConstructor<StringName>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_NODE_PATH:
+			return VariantTypeConstructor<NodePath>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_RID:
+			return VariantTypeConstructor<RID>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_OBJECT:
+			return VariantTypeConstructor<Object *>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_CALLABLE:
+			return VariantTypeConstructor<Callable>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_SIGNAL:
+			return VariantTypeConstructor<Signal>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_DICTIONARY:
+			return VariantTypeConstructor<Dictionary>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_ARRAY:
+			return VariantTypeConstructor<Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_BYTE_ARRAY:
+			return VariantTypeConstructor<PackedByteArray>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_INT32_ARRAY:
+			return VariantTypeConstructor<PackedInt32Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_INT64_ARRAY:
+			return VariantTypeConstructor<PackedInt64Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_FLOAT32_ARRAY:
+			return VariantTypeConstructor<PackedFloat32Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_FLOAT64_ARRAY:
+			return VariantTypeConstructor<PackedFloat64Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_STRING_ARRAY:
+			return VariantTypeConstructor<PackedStringArray>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_VECTOR2_ARRAY:
+			return VariantTypeConstructor<PackedVector2Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_VECTOR3_ARRAY:
+			return VariantTypeConstructor<PackedVector3Array>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_PACKED_COLOR_ARRAY:
+			return VariantTypeConstructor<PackedColorArray>::type_from_variant;
+		case GDNATIVE_VARIANT_TYPE_NIL:
+		case GDNATIVE_VARIANT_TYPE_VARIANT_MAX:
+			ERR_FAIL_V_MSG(nullptr, "Getting Variant conversion function with invalid type");
+	}
+	ERR_FAIL_V_MSG(nullptr, "Getting Variant conversion function with invalid type");
+}
+
 // ptrcalls
 static GDNativePtrOperatorEvaluator gdnative_variant_get_ptr_operator_evaluator(GDNativeVariantOperator p_operator, GDNativeVariantType p_type_a, GDNativeVariantType p_type_b) {
 	return (GDNativePtrOperatorEvaluator)Variant::get_ptr_operator_evaluator(Variant::Operator(p_operator), Variant::Type(p_type_a), Variant::Type(p_type_b));
@@ -316,6 +471,9 @@ static GDNativePtrBuiltInMethod gdnative_variant_get_ptr_builtin_method(GDNative
 static GDNativePtrConstructor gdnative_variant_get_ptr_constructor(GDNativeVariantType p_type, int32_t p_constructor) {
 	return (GDNativePtrConstructor)Variant::get_ptr_constructor(Variant::Type(p_type), p_constructor);
 }
+static GDNativePtrDestructor gdnative_variant_get_ptr_destructor(GDNativeVariantType p_type) {
+	return (GDNativePtrDestructor)Variant::get_ptr_destructor(Variant::Type(p_type));
+}
 static void gdnative_variant_construct(GDNativeVariantType p_type, GDNativeVariantPtr p_base, const GDNativeVariantPtr *p_args, int32_t p_argument_count, GDNativeCallError *r_error) {
 	memnew_placement(p_base, Variant);
 
@@ -521,11 +679,16 @@ static GDNativeObjectPtr gdnative_global_get_singleton(const char *p_name) {
 	return (GDNativeObjectPtr)Engine::get_singleton()->get_singleton_object(String(p_name));
 }
 
-static void *gdnative_object_get_instance_binding(GDNativeObjectPtr p_instance, void *p_token, GDNativeInstanceBindingCallbacks *p_callbacks) {
+static void *gdnative_object_get_instance_binding(GDNativeObjectPtr p_instance, void *p_token, const GDNativeInstanceBindingCallbacks *p_callbacks) {
 	Object *o = (Object *)p_instance;
 	return o->get_instance_binding(p_token, p_callbacks);
 }
 
+static void gdnative_object_set_instance_binding(GDNativeObjectPtr p_instance, void *p_token, void *p_binding, const GDNativeInstanceBindingCallbacks *p_callbacks) {
+	Object *o = (Object *)p_instance;
+	o->set_instance_binding(p_token, p_binding, p_callbacks);
+}
+
 static GDNativeObjectPtr gdnative_object_get_instance_from_id(GDObjectInstanceID p_instance_id) {
 	return (GDNativeObjectPtr)ObjectDB::get_instance(ObjectID(p_instance_id));
 }
@@ -626,15 +789,15 @@ void gdnative_setup_interface(GDNativeInterface *p_interface) {
 	gdni.variant_can_convert = gdnative_variant_can_convert;
 	gdni.variant_can_convert_strict = gdnative_variant_can_convert_strict;
 
-	//ptrcalls
-#if 0
-	GDNativeVariantFromTypeConstructorFunc (*get_variant_from_type_constructor)(GDNativeVariantType p_type);
-	GDNativeTypeFromVariantConstructorFunc (*get_variant_to_type_constructor)(GDNativeVariantType p_type);
-#endif
+	gdni.get_variant_from_type_constructor = gdnative_get_variant_from_type_constructor;
+	gdni.get_variant_to_type_constructor = gdnative_get_type_from_variant_constructor;
+
+	// ptrcalls.
 
 	gdni.variant_get_ptr_operator_evaluator = gdnative_variant_get_ptr_operator_evaluator;
 	gdni.variant_get_ptr_builtin_method = gdnative_variant_get_ptr_builtin_method;
 	gdni.variant_get_ptr_constructor = gdnative_variant_get_ptr_constructor;
+	gdni.variant_get_ptr_destructor = gdnative_variant_get_ptr_destructor;
 	gdni.variant_construct = gdnative_variant_construct;
 	gdni.variant_get_ptr_setter = gdnative_variant_get_ptr_setter;
 	gdni.variant_get_ptr_getter = gdnative_variant_get_ptr_getter;
@@ -672,6 +835,7 @@ void gdnative_setup_interface(GDNativeInterface *p_interface) {
 	gdni.object_destroy = gdnative_object_destroy;
 	gdni.global_get_singleton = gdnative_global_get_singleton;
 	gdni.object_get_instance_binding = gdnative_object_get_instance_binding;
+	gdni.object_set_instance_binding = gdnative_object_set_instance_binding;
 
 	gdni.object_cast_to = gdnative_object_cast_to;
 	gdni.object_get_instance_from_id = gdnative_object_get_instance_from_id;