added IAssetEditorInstance wrapper

Roberto De Ioris · Roberto De Ioris · commit 604b969908a1 · 2018-06-26T15:23:14.000+02:00
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -33,6 +33,7 @@
 #include "Wrappers/UEPyFVector.h"
 #include "Wrappers/UEPyFAssetData.h"
 #include "Wrappers/UEPyFEditorViewportClient.h"
+#include "Wrappers/UEPyIAssetEditorInstance.h"
 
 #include "UEPyIPlugin.h"
 
@@ -997,25 +998,66 @@ PyObject *py_unreal_engine_get_selected_assets(PyObject * self, PyObject * args)
 	return assets_list;
 }
 
+PyObject *py_unreal_engine_get_all_edited_assets(PyObject * self, PyObject * args)
+{
+	TArray<UObject *> assets = FAssetEditorManager::Get().GetAllEditedAssets();
+	PyObject *assets_list = PyList_New(0);
+
+	for (UObject *asset : assets)
+	{
+		ue_PyUObject *ret = ue_get_python_uobject(asset);
+		if (ret)
+		{
+			PyList_Append(assets_list, (PyObject *)ret);
+		}
+	}
+
+	return assets_list;
+}
+
 PyObject *py_unreal_engine_open_editor_for_asset(PyObject * self, PyObject * args)
 {
 	PyObject *py_obj;
 
 	if (!PyArg_ParseTuple(args, "O:open_editor_for_asset", &py_obj))
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	UObject *u_obj = ue_py_check_type<UObject>(py_obj);
 	if (!u_obj)
 		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+
 	if (FAssetEditorManager::Get().OpenEditorForAsset(u_obj))
 	{
-		Py_INCREF(Py_True);
-		return Py_True;
+		Py_RETURN_TRUE;
 	}
-	Py_INCREF(Py_False);
-	return Py_False;
+	Py_RETURN_FALSE;
+}
+
+PyObject *py_unreal_engine_find_editor_for_asset(PyObject * self, PyObject * args)
+{
+	PyObject *py_obj;
+	PyObject *py_bool = nullptr;
+
+	if (!PyArg_ParseTuple(args, "O|O:find_editor_for_asset", &py_obj, &py_bool))
+	{
+		return nullptr;
+	}
+
+	UObject *u_obj = ue_py_check_type<UObject>(py_obj);
+	if (!u_obj)
+		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+
+	bool bFocus = false;
+	if (py_bool && PyObject_IsTrue(py_bool))
+		bFocus = true;
+
+	IAssetEditorInstance *instance = FAssetEditorManager::Get().FindEditorForAsset(u_obj, bFocus);
+	if (!instance)
+		return PyErr_Format(PyExc_Exception, "no editor found for asset");
+
+	return py_ue_new_iasset_editor_instance(instance);
 }
 
 PyObject *py_unreal_engine_close_editor_for_asset(PyObject * self, PyObject * args)
@@ -1024,24 +1066,22 @@ PyObject *py_unreal_engine_close_editor_for_asset(PyObject * self, PyObject * ar
 
 	if (!PyArg_ParseTuple(args, "O:close_editor_for_asset", &py_obj))
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	UObject *u_obj = ue_py_check_type<UObject>(py_obj);
 	if (!u_obj)
 		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
 	FAssetEditorManager::Get().CloseAllEditorsForAsset(u_obj);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_close_all_asset_editors(PyObject * self, PyObject * args)
 {
 	FAssetEditorManager::Get().CloseAllAssetEditors();
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_set_fbx_import_option(PyObject * self, PyObject * args)
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.h b/Source/UnrealEnginePython/Private/UEPyEditor.h
@@ -91,6 +91,8 @@ PyObject *py_unreal_engine_get_asset_referencers(PyObject *, PyObject *);
 PyObject *py_unreal_engine_get_asset_dependencies(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_open_editor_for_asset(PyObject *, PyObject *);
+PyObject *py_unreal_engine_find_editor_for_asset(PyObject *, PyObject *);
+PyObject *py_unreal_engine_get_all_edited_assets(PyObject *, PyObject *);
 PyObject *py_unreal_engine_close_editor_for_asset(PyObject *, PyObject *);
 PyObject *py_unreal_engine_close_all_asset_editors(PyObject *, PyObject *);
 
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -73,6 +73,7 @@
 #include "Wrappers/UEPyFViewportClient.h"
 #if WITH_EDITOR
 #include "Wrappers/UEPyFEditorViewportClient.h"
+#include "Wrappers/UEPyIAssetEditorInstance.h"
 #endif
 
 #include "Wrappers/UEPyFFoliageInstance.h"
@@ -262,6 +263,8 @@ static PyMethodDef unreal_engine_methods[] = {
 	{ "create_property_view",  (PyCFunction)py_unreal_engine_create_property_view, METH_VARARGS | METH_KEYWORDS, "" },
 
 	{ "open_editor_for_asset", py_unreal_engine_open_editor_for_asset, METH_VARARGS, "" },
+	{ "find_editor_for_asset", py_unreal_engine_find_editor_for_asset, METH_VARARGS, "" },
+	{ "get_all_edited_assets", py_unreal_engine_get_all_edited_assets, METH_VARARGS, "" },
 	{ "close_editor_for_asset", py_unreal_engine_close_editor_for_asset, METH_VARARGS, "" },
 	{ "close_all_asset_editors", py_unreal_engine_close_all_asset_editors, METH_VARARGS, "" },
 	{ "allow_actor_script_execution_in_editor", py_unreal_engine_allow_actor_script_execution_in_editor , METH_VARARGS, "" },
@@ -1505,6 +1508,7 @@ void unreal_engine_init_py_module()
 	ue_python_init_fviewport_client(new_unreal_engine_module);
 #if WITH_EDITOR
 	ue_python_init_feditor_viewport_client(new_unreal_engine_module);
+	ue_python_init_iasset_editor_instance(new_unreal_engine_module);
 #endif
 
 	ue_python_init_fpython_output_device(new_unreal_engine_module);
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyIAssetEditorInstance.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyIAssetEditorInstance.cpp
@@ -0,0 +1,103 @@
+#include "UEPyIAssetEditorInstance.h"
+
+#if WITH_EDITOR
+
+
+
+static PyObject *py_ue_iasset_editor_instance_close_window(ue_PyIAssetEditorInstance *self, PyObject * args)
+{
+	self->editor_instance->CloseWindow();
+	Py_RETURN_NONE;
+}
+
+static PyObject *py_ue_iasset_editor_instance_focus_window(ue_PyIAssetEditorInstance *self, PyObject * args)
+{
+	self->editor_instance->FocusWindow();
+	Py_RETURN_NONE;
+}
+
+static PyObject *py_ue_iasset_editor_instance_get_editor_name(ue_PyIAssetEditorInstance *self, PyObject * args)
+{
+	return PyUnicode_FromString(TCHAR_TO_UTF8(*self->editor_instance->GetEditorName().ToString()));
+}
+
+static PyObject *py_ue_iasset_editor_instance_get_last_activation_time(ue_PyIAssetEditorInstance *self, PyObject * args)
+{
+	return PyFloat_FromDouble(self->editor_instance->GetLastActivationTime());
+}
+
+static PyMethodDef ue_PyIAssetEditorInstance_methods[] = {
+	{ "close_window", (PyCFunction)py_ue_iasset_editor_instance_close_window, METH_VARARGS, "" },
+	{ "focus_window", (PyCFunction)py_ue_iasset_editor_instance_focus_window, METH_VARARGS, "" },
+	{ "get_editor_name", (PyCFunction)py_ue_iasset_editor_instance_get_editor_name, METH_VARARGS, "" },
+	{ "get_last_activation_time", (PyCFunction)py_ue_iasset_editor_instance_get_last_activation_time, METH_VARARGS, "" },
+	{ nullptr }  /* Sentinel */
+};
+
+static PyObject *ue_PyIAssetEditorInstance_str(ue_PyIAssetEditorInstance *self)
+{
+	return PyUnicode_FromFormat("<unreal_engine.IAssetEditorInstance %p>",
+		&self->editor_instance);
+}
+
+static PyTypeObject ue_PyIAssetEditorInstanceType = {
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"unreal_engine.IAssetEditorInstance", /* tp_name */
+	sizeof(ue_PyIAssetEditorInstance), /* tp_basicsize */
+	0,                         /* tp_itemsize */
+	0,       /* tp_dealloc */
+	0,                         /* tp_print */
+	0,                         /* tp_getattr */
+	0,                         /* tp_setattr */
+	0,                         /* tp_reserved */
+	0,                         /* tp_repr */
+	0,                         /* tp_as_number */
+	0,                         /* tp_as_sequence */
+	0,                         /* tp_as_mapping */
+	0,                         /* tp_hash  */
+	0,                         /* tp_call */
+	(reprfunc)ue_PyIAssetEditorInstance_str,                         /* tp_str */
+	0,                         /* tp_getattro */
+	0,                         /* tp_setattro */
+	0,                         /* tp_as_buffer */
+#if PY_MAJOR_VERSION < 3
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_CHECKTYPES,        /* tp_flags */
+#else
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /* tp_flags */
+#endif
+	"Unreal Engine IAssetEditorInstance",           /* tp_doc */
+	0,                         /* tp_traverse */
+	0,                         /* tp_clear */
+	0,                         /* tp_richcompare */
+	0,                         /* tp_weaklistoffset */
+	0,                         /* tp_iter */
+	0,                         /* tp_iternext */
+	ue_PyIAssetEditorInstance_methods,             /* tp_methods */
+	0,
+};
+
+void ue_python_init_iasset_editor_instance(PyObject *ue_module)
+{
+	ue_PyIAssetEditorInstanceType.tp_new = PyType_GenericNew;
+
+	if (PyType_Ready(&ue_PyIAssetEditorInstanceType) < 0)
+		return;
+
+	Py_INCREF(&ue_PyIAssetEditorInstanceType);
+	PyModule_AddObject(ue_module, "IAssetEditorInstance", (PyObject *)&ue_PyIAssetEditorInstanceType);
+}
+
+ue_PyIAssetEditorInstance *py_ue_is_iasset_editor_instance(PyObject *obj)
+{
+	if (!PyObject_IsInstance(obj, (PyObject *)&ue_PyIAssetEditorInstanceType))
+		return nullptr;
+	return (ue_PyIAssetEditorInstance *)obj;
+}
+
+PyObject *py_ue_new_iasset_editor_instance(IAssetEditorInstance *editor_instance)
+{
+	ue_PyIAssetEditorInstance *ret = (ue_PyIAssetEditorInstance *)PyObject_New(ue_PyIAssetEditorInstance, &ue_PyIAssetEditorInstanceType);
+	ret->editor_instance = editor_instance;
+	return (PyObject *)ret;
+}
+#endif
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyIAssetEditorInstance.h b/Source/UnrealEnginePython/Private/Wrappers/UEPyIAssetEditorInstance.h
@@ -0,0 +1,21 @@
+#pragma once
+#include "UnrealEnginePython.h"
+
+#if WITH_EDITOR
+
+#include "Editor/UnrealEd/Public/Toolkits/AssetEditorManager.h"
+
+struct ue_PyIAssetEditorInstance
+{
+	PyObject_HEAD
+	/* Type-specific fields go here. */
+	IAssetEditorInstance *editor_instance;
+};
+
+void ue_python_init_iasset_editor_instance(PyObject *);
+
+PyObject *py_ue_new_iasset_editor_instance(IAssetEditorInstance *);
+
+ue_PyIAssetEditorInstance *py_ue_is_iasset_editor_instance(PyObject *);
+
+#endif
