added args to PyActor blueprint methods

Roberto De Ioris · Roberto De Ioris · commit f72b079ded70 · 2016-08-09T15:25:39.000+02:00
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1 @@
+Roberto De Ioris (info@20tab.com)
diff --git a/Source/UnrealEnginePython/Public/PyActor.cpp b/Source/UnrealEnginePython/Public/PyActor.cpp
@@ -157,25 +157,38 @@ void APyActor::PyOnActorClicked(AActor *touched_actor, FKey button_pressed)
 	Py_DECREF(ret);
 }
 
-void APyActor::CallPythonActorMethod(FString method_name)
+void APyActor::CallPythonActorMethod(FString method_name, FString args)
 {
 	if (!py_actor_instance)
 		return;
 
-	PyObject *ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	PyObject *ret = nullptr;
+	if (args.IsEmpty()) {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	}
+	else {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), "s", TCHAR_TO_UTF8(*args));
+	}
+
 	if (!ret) {
 		unreal_engine_py_log_error();
 		return;
 	}
 	Py_DECREF(ret);
 }
 
-bool APyActor::CallPythonActorMethodBool(FString method_name)
+bool APyActor::CallPythonActorMethodBool(FString method_name, FString args)
 {
 	if (!py_actor_instance)
 		return false;
 
-	PyObject *ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	PyObject *ret = nullptr;
+	if (args.IsEmpty()) {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	}
+	else {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), "s", TCHAR_TO_UTF8(*args));
+	}
 	if (!ret) {
 		unreal_engine_py_log_error();
 		return false;
@@ -190,12 +203,18 @@ bool APyActor::CallPythonActorMethodBool(FString method_name)
 	return false;
 }
 
-FString APyActor::CallPythonActorMethodString(FString method_name)
+FString APyActor::CallPythonActorMethodString(FString method_name, FString args)
 {
 	if (!py_actor_instance)
 		return FString();
 
-	PyObject *ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	PyObject *ret = nullptr;
+	if (args.IsEmpty()) {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), NULL);
+	}
+	else {
+		ret = PyObject_CallMethod(py_actor_instance, TCHAR_TO_UTF8(*method_name), "s", TCHAR_TO_UTF8(*args));
+	}
 	if (!ret) {
 		unreal_engine_py_log_error();
 		return FString();
diff --git a/Source/UnrealEnginePython/Public/PyActor.h b/Source/UnrealEnginePython/Public/PyActor.h
@@ -33,13 +33,13 @@ class APyActor : public AActor
 	FString PythonClass;
 
 	UFUNCTION(BlueprintCallable, Category = "Python")
-	void CallPythonActorMethod(FString method_name);
+	void CallPythonActorMethod(FString method_name, FString args);
 
 	UFUNCTION(BlueprintCallable, Category = "Python")
-	bool CallPythonActorMethodBool(FString method_name);
+	bool CallPythonActorMethodBool(FString method_name, FString args);
 
 	UFUNCTION(BlueprintCallable, Category = "Python")
-	FString CallPythonActorMethodString(FString method_name);
+	FString CallPythonActorMethodString(FString method_name, FString args);
 
 private:
 	PyObject *py_actor_instance;
