improved fbx importer, added factory_import_object, added get_material_graph

Roberto De Ioris · Roberto De Ioris · commit 1f505f345a7b · 2017-04-01T22:34:00.000+02:00
diff --git a/Source/PythonConsole/Public/PyFbxFactory.cpp b/Source/PythonConsole/Public/PyFbxFactory.cpp
@@ -1,17 +1,52 @@
 #include "PythonConsolePrivatePCH.h"
 
 #include "PyFbxFactory.h"
+#include "FbxMeshUtils.h"
 
 UPyFbxFactory::UPyFbxFactory(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
 	// disable automatic detection of the factory
 	ImportPriority = -1;
+
 }
 
 bool UPyFbxFactory::ConfigureProperties() {
-	bDetectImportTypeOnImport = true;
+	bDetectImportTypeOnImport = false;
 	bShowOption = false;
 
 	return true;
 }
+
+void UPyFbxFactory::PostInitProperties() {
+
+	Super::PostInitProperties();
+	ImportUI->MeshTypeToImport = FBXIT_MAX;
+}
+
+UObject *UPyFbxFactory::FactoryCreateBinary
+(
+	UClass * InClass,
+	UObject * InParent,
+	FName InName,
+	EObjectFlags Flags,
+	UObject * Context,
+	const TCHAR * Type,
+	const uint8 *& Buffer,
+	const uint8 * BufferEnd,
+	FFeedbackContext * Warn,
+	bool & bOutOperationCanceled) {
+
+	if (ImportUI->MeshTypeToImport == FBXIT_MAX) {
+		if (!DetectImportType(UFactory::CurrentFilename)) {
+			return nullptr;
+		}
+	}
+
+	FbxMeshUtils::SetImportOption(ImportUI);
+
+	// ensure auto-detect is skipped
+	bDetectImportTypeOnImport = false;
+
+	return Super::FactoryCreateBinary(InClass, InParent, InName, Flags, Context, Type, Buffer, BufferEnd, Warn, bOutOperationCanceled);
+}
diff --git a/Source/PythonConsole/Public/PyFbxFactory.h b/Source/PythonConsole/Public/PyFbxFactory.h
@@ -14,6 +14,19 @@ class UPyFbxFactory : public UFbxFactory
 	UPyFbxFactory(const FObjectInitializer& ObjectInitializer);
 
 	virtual bool ConfigureProperties() override;
+	virtual void PostInitProperties() override;
+	virtual UObject * FactoryCreateBinary
+		(
+			UClass * InClass,
+			UObject * InParent,
+			FName InName,
+			EObjectFlags Flags,
+			UObject * Context,
+			const TCHAR * Type,
+			const uint8 *& Buffer,
+			const uint8 * BufferEnd,
+			FFeedbackContext * Warn,
+			bool & bOutOperationCanceled) override;
 
 };
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -1261,6 +1261,45 @@ PyObject *py_ue_factory_create_new(ue_PyUObject *self, PyObject * args) {
 	return (PyObject *)ret;
 }
 
+PyObject *py_ue_factory_import_object(ue_PyUObject *self, PyObject * args) {
+
+	ue_py_check(self);
+
+	char *filename = nullptr;
+	char *name = nullptr;
+	if (!PyArg_ParseTuple(args, "ss:factory_import_object", &filename, &name)) {
+		return NULL;
+	}
+
+	if (!self->ue_object->IsA<UFactory>())
+		return PyErr_Format(PyExc_Exception, "uobject is not a Factory");
+
+	UFactory *factory = (UFactory *)self->ue_object;
+
+	FString object_name = ObjectTools::SanitizeObjectName(FPaths::GetBaseFilename(UTF8_TO_TCHAR(filename)));
+	FString pkg_name = FString(UTF8_TO_TCHAR(name)) + TEXT("/") + object_name;
+
+	UPackage *outer = CreatePackage(nullptr, *pkg_name);
+	if (!outer)
+		return PyErr_Format(PyExc_Exception, "unable to create package");
+
+	bool canceled = false;
+	UObject *u_object = factory->ImportObject(factory->ResolveSupportedClass(), outer, FName(*object_name), RF_Public | RF_Standalone, UTF8_TO_TCHAR(filename), nullptr, canceled);
+
+	if (!u_object)
+		return PyErr_Format(PyExc_Exception, "unable to create new object from factory");
+
+	FAssetRegistryModule::AssetCreated(u_object);
+	outer->MarkPackageDirty();
+
+	ue_PyUObject *ret = ue_get_python_wrapper(u_object);
+	if (!ret)
+		return PyErr_Format(PyExc_Exception, "uobject is in invalid state");
+
+	Py_INCREF(ret);
+	return (PyObject *)ret;
+}
+
 PyObject *py_unreal_engine_add_level_to_world(PyObject *self, PyObject * args) {
 
 	PyObject *py_world;
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.h b/Source/UnrealEnginePython/Private/UEPyEditor.h
@@ -56,6 +56,7 @@ PyObject *py_unreal_engine_move_selected_actors_to_level(PyObject *, PyObject *)
 
 
 PyObject *py_ue_factory_create_new(ue_PyUObject *, PyObject *);
+PyObject *py_ue_factory_import_object(ue_PyUObject *, PyObject *);
 
 PyObject *py_unreal_engine_editor_take_high_res_screen_shots(PyObject *, PyObject *);
 
diff --git a/Source/UnrealEnginePython/Private/UEPyMaterial.cpp b/Source/UnrealEnginePython/Private/UEPyMaterial.cpp
@@ -418,4 +418,21 @@ PyObject *py_ue_static_mesh_set_shadow_for_lod(ue_PyUObject *self, PyObject * ar
 	return Py_None;
 }
 
+PyObject *py_ue_get_material_graph(ue_PyUObject *self, PyObject * args) {
+
+	ue_py_check(self);
+
+	if (!self->ue_object->IsA<UMaterialInterface>()) {
+		return PyErr_Format(PyExc_Exception, "uobject is not a UMaterialInterface");
+	}
+
+	UMaterialInterface *material_interface = (UMaterialInterface *)self->ue_object;
+
+	ue_PyUObject *ret = ue_get_python_wrapper((UObject *)material_interface->GetMaterial()->MaterialGraph);
+	if (!ret)
+		return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
+	Py_INCREF(ret);
+	return (PyObject *)ret;
+}
+
 #endif
diff --git a/Source/UnrealEnginePython/Private/UEPyMaterial.h b/Source/UnrealEnginePython/Private/UEPyMaterial.h
@@ -24,4 +24,6 @@ PyObject *py_ue_set_material_parent(ue_PyUObject *, PyObject *);
 PyObject *py_ue_static_mesh_set_collision_for_lod(ue_PyUObject *, PyObject *);
 PyObject *py_ue_static_mesh_set_shadow_for_lod(ue_PyUObject *, PyObject *);
 
+PyObject *py_ue_get_material_graph(ue_PyUObject *, PyObject *);
+
 #endif
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -353,6 +353,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "asset_reimport", (PyCFunction)py_ue_asset_reimport, METH_VARARGS, "" },
 
 	{ "factory_create_new", (PyCFunction)py_ue_factory_create_new, METH_VARARGS, "" },
+	{ "factory_import_object", (PyCFunction)py_ue_factory_import_object, METH_VARARGS, "" },
 
 	{ "graph_add_node_call_function", (PyCFunction)py_ue_graph_add_node_call_function, METH_VARARGS, "" },
 	{ "graph_add_node_custom_event", (PyCFunction)py_ue_graph_add_node_custom_event, METH_VARARGS, "" },
@@ -365,6 +366,8 @@ static PyMethodDef ue_PyUObject_methods[] = {
 
 	{ "node_pins", (PyCFunction)py_ue_node_pins, METH_VARARGS, "" },
 	{ "node_find_pin", (PyCFunction)py_ue_node_find_pin, METH_VARARGS, "" },
+
+	{ "get_material_graph", (PyCFunction)py_ue_get_material_graph, METH_VARARGS, "" },
 #endif
 
 	{ "is_rooted", (PyCFunction)py_ue_is_rooted, METH_VARARGS, "" },

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ PyObject py_unreal_engine_move_selected_actors_to_level(PyObject , PyObject *)`
`56`	`56`
`57`	`57`
`58`	`58`	`PyObject py_ue_factory_create_new(ue_PyUObject , PyObject *);`
	`59`	`+PyObject py_ue_factory_import_object(ue_PyUObject , PyObject *);`
`59`	`60`
`60`	`61`	`PyObject py_unreal_engine_editor_take_high_res_screen_shots(PyObject , PyObject *);`
`61`	`62`