prepare for better structures api

Roberto De Ioris · Roberto De Ioris · commit 9d65722aa535 · 2017-01-29T17:27:17.000+01:00
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.cpp b/Source/UnrealEnginePython/Private/UEPyEngine.cpp
@@ -436,7 +436,7 @@ PyObject *py_unreal_engine_new_class(PyObject * self, PyObject * args) {
 	return (PyObject *)ret;
 }
 
-PyObject *py_unreal_engine_classes(PyObject * self, PyObject * args) {
+PyObject *py_unreal_engine_all_classes(PyObject * self, PyObject * args) {
 
 	PyObject *ret = PyList_New(0);
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.h b/Source/UnrealEnginePython/Private/UEPyEngine.h
@@ -27,7 +27,7 @@ PyObject *py_unreal_engine_load_enum(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_find_object(PyObject *, PyObject *);
 
-PyObject *py_unreal_engine_classes(PyObject *, PyObject *);
+PyObject *py_unreal_engine_all_classes(PyObject *, PyObject *);
 
 
 PyObject *py_unreal_engine_new_object(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp b/Source/UnrealEnginePython/Private/UEPyEnumsImporter.cpp
@@ -55,7 +55,7 @@ static PyTypeObject ue_PyEnumsImporterType = {
 	0,
 };
 
-void ue_python_init_Enumsimporter(PyObject *ue_module) {
+void ue_python_init_enumsimporter(PyObject *ue_module) {
 	ue_PyEnumsImporterType.tp_new = PyType_GenericNew;
 
 	if (PyType_Ready(&ue_PyEnumsImporterType) < 0)
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -214,7 +214,7 @@ static PyMethodDef unreal_engine_methods[] = {
 
 	{ "get_mutable_default", py_unreal_engine_get_mutable_default, METH_VARARGS, "" },
 
-	{ "classes", (PyCFunction)py_unreal_engine_classes, METH_VARARGS, "" },
+	{ "all_classes", (PyCFunction)py_unreal_engine_all_classes, METH_VARARGS, "" },
 
 
 	{ "new_class", py_unreal_engine_new_class, METH_VARARGS, "" },
@@ -1066,6 +1066,9 @@ void unreal_engine_init_py_module() {
 	ue_python_init_callable(new_unreal_engine_module);
 
 	ue_python_init_uclassesimporter(new_unreal_engine_module);
+	ue_python_init_enumsimporter(new_unreal_engine_module);
+	ue_python_init_ustructsimporter(new_unreal_engine_module);
+
 
 #if WITH_EDITOR
 	ue_python_init_swidget(new_unreal_engine_module);
@@ -1087,6 +1090,10 @@ void unreal_engine_init_py_module() {
 	Py_INCREF(u_enums_importer);
 	PyDict_SetItemString(py_sys_modules, "unreal_engine.enums", u_enums_importer);
 
+	PyObject *u_structs_importer = py_ue_new_ustructsimporter();
+	Py_INCREF(u_structs_importer);
+	PyDict_SetItemString(py_sys_modules, "unreal_engine.structs", u_structs_importer);
+
 	PyDict_SetItemString(unreal_engine_dict, "ENGINE_MAJOR_VERSION", PyLong_FromLong(ENGINE_MAJOR_VERSION));
 	PyDict_SetItemString(unreal_engine_dict, "ENGINE_MINOR_VERSION", PyLong_FromLong(ENGINE_MINOR_VERSION));
 	PyDict_SetItemString(unreal_engine_dict, "ENGINE_PATCH_VERSION", PyLong_FromLong(ENGINE_PATCH_VERSION));
@@ -1336,7 +1343,9 @@ PyObject *ue_py_convert_property(UProperty *prop, uint8 *buffer) {
 		return PyErr_Format(PyExc_Exception, "invalid UClass type for %s", TCHAR_TO_UTF8(*casted_prop->GetName()));
 	}
 
-	// map a UStruct to a dictionary (if possible)
+	
+
+	// try to manage known struct first
 	if (auto casted_prop = Cast<UStructProperty>(prop)) {
 		if (auto casted_struct = Cast<UScriptStruct>(casted_prop->Struct)) {
 			// check for FVector
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h b/Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h
@@ -38,6 +38,7 @@
 #include "UEPyCallable.h"
 #include "UEPyUClassesImporter.h"
 #include "UEPyEnumsImporter.h"
+#include "UEPyUStructsImporter.h"
 
 #if WITH_EDITOR
 #include "UEPyFAssetData.h"

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ PyObject py_unreal_engine_new_class(PyObject self, PyObject * args) {`
`436`	`436`	`return (PyObject *)ret;`
`437`	`437`	`}`
`438`	`438`
`439`		`-PyObject py_unreal_engine_classes(PyObject self, PyObject * args) {`
	`439`	`+PyObject py_unreal_engine_all_classes(PyObject self, PyObject * args) {`
`440`	`440`
`441`	`441`	`PyObject *ret = PyList_New(0);`
`442`	`442`