improved delegates

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyEditor.cpp

@@ -1476,18 +1476,12 @@ PyObject *py_unreal_engine_blueprint_add_function(PyObject * self, PyObject * ar
 	char *name;
 	if (!PyArg_ParseTuple(args, "Os:blueprint_add_function", &py_blueprint, &name))
 	{
-		return NULL;
-	}
-
-	if (!ue_is_pyuobject(py_blueprint))
-	{
-		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+		return nullptr;
 	}
-
-	ue_PyUObject *py_obj = (ue_PyUObject *)py_blueprint;
-	if (!py_obj->ue_object->IsA<UBlueprint>())
-		return PyErr_Format(PyExc_Exception, "uobject is not a UBlueprint");
-	UBlueprint *bp = (UBlueprint *)py_obj->ue_object;
+		
+	UBlueprint *bp = ue_py_check_type<UBlueprint>(py_blueprint);
+	if (!bp)
+		return PyErr_Format(PyExc_Exception, "argument is not a UBlueprint");
 
 	UEdGraph *graph = FBlueprintEditorUtils::CreateNewGraph(bp, FName(UTF8_TO_TCHAR(name)), UEdGraph::StaticClass(), UEdGraphSchema_K2::StaticClass());
 	FBlueprintEditorUtils::AddFunctionGraph<UClass>(bp, graph, true, nullptr);

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -540,6 +540,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "set_name", (PyCFunction)py_ue_set_name, METH_VARARGS, "" },
 
 	{ "bind_event", (PyCFunction)py_ue_bind_event, METH_VARARGS, "" },
+	{ "delegate_bind_ufunction", (PyCFunction)py_ue_delegate_bind_ufunction, METH_VARARGS, "" },
 
 	{ "get_py_proxy", (PyCFunction)py_ue_get_py_proxy, METH_VARARGS, "" },
 
@@ -1129,9 +1130,9 @@ static PyObject *ue_PyUObject_getattro(ue_PyUObject *self, PyObject *attr_name)
 #else
 							return PyLong_FromLong(u_enum->FindEnumIndex(item.Key));
 #endif
+						}
 					}
 				}
-			}
 #endif
 				if (self->ue_object->IsA<UEnum>())
 				{
@@ -1143,16 +1144,16 @@ static PyObject *ue_PyUObject_getattro(ue_PyUObject *self, PyObject *attr_name)
 					return PyLong_FromLong(u_enum->FindEnumIndex(FName(UTF8_TO_TCHAR(attr))));
 #endif
 				}
-		}
+			}
 
 			if (function)
 			{
 				// swallow previous exception
 				PyErr_Clear();
 				return py_ue_new_callable(function, self->ue_object);
 			}
+		}
 	}
-}
 	return ret;
 }
 
@@ -1723,7 +1724,7 @@ void unreal_engine_py_log_error()
 	if (zero)
 	{
 		msg = PyBytes_AsString(zero);
-}
+	}
 #else
 	msg = PyString_AsString(PyObject_Str(value));
 #endif
@@ -1778,7 +1779,7 @@ void unreal_engine_py_log_error()
 	}
 
 	PyErr_Clear();
-	}
+}
 
 // retrieve a UWorld from a generic UObject (if possible)
 UWorld *ue_get_uworld(ue_PyUObject *py_obj)
@@ -1974,6 +1975,11 @@ PyObject *ue_py_convert_property(UProperty *prop, uint8 *buffer, int32 index)
 		Py_RETURN_UOBJECT(casted_prop);
 	}
 
+	if (auto casted_prop = Cast<UDelegateProperty>(prop))
+	{
+		Py_RETURN_UOBJECT(casted_prop);
+	}
+
 	if (auto casted_prop = Cast<UArrayProperty>(prop))
 	{
 		FScriptArrayHelper_InContainer array_helper(casted_prop, buffer, index);
@@ -2677,10 +2683,10 @@ PyObject *py_ue_ufunction_call(UFunction *u_function, UObject *u_obj, PyObject *
 #else
 				prop->ImportText(*default_key_value, prop->ContainerPtrToValuePtr<uint8>(buffer), PPF_Localized, NULL);
 #endif
-		}
+			}
 #endif
+		}
 	}
-}
 
 
 	Py_ssize_t tuple_len = PyTuple_Size(args);
@@ -2820,6 +2826,17 @@ PyObject *ue_bind_pyevent(ue_PyUObject *u_obj, FString event_name, PyObject *py_
 		// re-assign multicast delegate
 		casted_prop->SetPropertyValue_InContainer(u_obj->ue_object, multiscript_delegate);
 	}
+	else if (auto casted_prop = Cast<UDelegateProperty>(u_property))
+	{
+
+		FScriptDelegate script_delegate = casted_prop->GetPropertyValue_InContainer(u_obj->ue_object);
+		UPythonDelegate *py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewDelegate(u_obj->ue_object, py_callable, casted_prop->SignatureFunction);
+		// fake UFUNCTION for bypassing checks
+		script_delegate.BindUFunction(py_delegate, FName("PyFakeCallable"));
+
+		// re-assign multicast delegate
+		casted_prop->SetPropertyValue_InContainer(u_obj->ue_object, script_delegate);
+	}
 	else
 	{
 		if (fail_on_wrong_property)

Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp

@@ -1232,6 +1232,38 @@ PyObject *py_ue_bind_event(ue_PyUObject * self, PyObject * args)
 	return ue_bind_pyevent(self, FString(event_name), py_callable, true);
 }
 
+PyObject *py_ue_delegate_bind_ufunction(ue_PyUObject * self, PyObject * args)
+{
+	ue_py_check(self);
+
+	char *delegate_name;
+	PyObject *py_obj;
+	char *fname;
+
+	if (!PyArg_ParseTuple(args, "sOs:delegate_bind_ufunction", &delegate_name, &py_obj, &fname))
+		return nullptr;
+
+	UProperty *u_property = self->ue_object->GetClass()->FindPropertyByName(FName(delegate_name));
+	if (!u_property)
+		return PyErr_Format(PyExc_Exception, "unable to find property %s", delegate_name);
+
+	UDelegateProperty *Prop = Cast<UDelegateProperty>(u_property);
+	if (!Prop)
+		return PyErr_Format(PyExc_Exception, "property is not a UDelegateProperty");
+
+	UObject *Object = ue_py_check_type<UObject>(py_obj);
+	if (!Object)
+		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+
+	FScriptDelegate script_delegate;
+	script_delegate.BindUFunction(Object, FName(fname));
+
+	// re-assign multicast delegate
+	Prop->SetPropertyValue_InContainer(self->ue_object, script_delegate);
+
+	Py_RETURN_NONE;
+}
+
 #if PY_MAJOR_VERSION >= 3
 PyObject *py_ue_add_function(ue_PyUObject * self, PyObject * args)
 {

Source/UnrealEnginePython/Private/UObject/UEPyObject.h

@@ -72,6 +72,7 @@ PyObject *py_ue_class_get_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_class_set_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_get_obj_flags(ue_PyUObject *, PyObject *);
 PyObject *py_ue_set_obj_flags(ue_PyUObject *, PyObject *);
+PyObject *py_ue_delegate_bind_ufunction(ue_PyUObject *, PyObject *);
 
 
 #if WITH_EDITOR