improved texture creation and added get_or_create_package()

Roberto De Ioris · Roberto De Ioris · commit 9d15b6ba9db7 · 2017-08-16T11:54:31.000+02:00
diff --git a/Source/PythonEditor/Private/PythonProject.cpp b/Source/PythonEditor/Private/PythonProject.cpp
@@ -6,10 +6,4 @@
 UPythonProject::UPythonProject(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
-	Path = PythonModule.ScriptsPath;
-	if (!FPaths::DirectoryExists(Path)) {
-		IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
-		PlatformFile.CreateDirectory(*Path);
-	}
 }
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.cpp b/Source/UnrealEnginePython/Private/UEPyEngine.cpp
@@ -811,6 +811,33 @@ PyObject *py_unreal_engine_create_package(PyObject *self, PyObject * args) {
 	return (PyObject *)ret;
 }
 
+PyObject *py_unreal_engine_get_or_create_package(PyObject *self, PyObject * args) {
+
+	char *name;
+
+	if (!PyArg_ParseTuple(args, "s:get_or_create_package", &name)) {
+		return nullptr;
+	}
+
+	UPackage *u_package = (UPackage *)StaticFindObject(nullptr, ANY_PACKAGE, UTF8_TO_TCHAR(name), true);
+	// create a new package if it does not exist
+	if (!u_package) {
+		u_package = CreatePackage(nullptr, UTF8_TO_TCHAR(name));
+		if (!u_package)
+			return PyErr_Format(PyExc_Exception, "unable to create package");
+		u_package->FileName = *FPackageName::LongPackageNameToFilename(UTF8_TO_TCHAR(name), FPackageName::GetAssetPackageExtension());
+
+		u_package->FullyLoad();
+		u_package->MarkPackageDirty();
+	}
+
+	ue_PyUObject *ret = ue_get_python_wrapper(u_package);
+	if (!ret)
+		return PyErr_Format(PyExc_Exception, "uobject is in invalid state");
+	Py_INCREF(ret);
+	return (PyObject *)ret;
+}
+
 PyObject *py_unreal_engine_get_transient_package(PyObject *self, PyObject * args) {
 
 	ue_PyUObject *ret = ue_get_python_wrapper(GetTransientPackage());
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.h b/Source/UnrealEnginePython/Private/UEPyEngine.h
@@ -51,6 +51,7 @@ PyObject *py_unreal_engine_get_viewport_size(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_create_world(PyObject *, PyObject *);
 PyObject *py_unreal_engine_create_package(PyObject *, PyObject *);
+PyObject *py_unreal_engine_get_or_create_package(PyObject *, PyObject *);
 PyObject *py_unreal_engine_get_transient_package(PyObject *, PyObject *);
 
 PyObject *py_unreal_engine_object_path_to_package_name(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -173,6 +173,7 @@ static PyMethodDef unreal_engine_methods[] = {
 
 	// package
 	{ "create_package", (PyCFunction)py_unreal_engine_create_package, METH_VARARGS, "" },
+	{ "get_or_create_package", (PyCFunction)py_unreal_engine_create_package, METH_VARARGS, "" },
 	{ "get_transient_package", (PyCFunction)py_unreal_engine_get_transient_package, METH_VARARGS, "" },
 
 	// slate
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyTexture.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyTexture.cpp
@@ -232,9 +232,9 @@ PyObject *py_unreal_engine_create_texture(PyObject * self, PyObject * args) {
 	char *name;
 	int width;
 	int height;
-	int format = PF_B8G8R8A8;
+	Py_buffer py_buf;
 
-	if (!PyArg_ParseTuple(args, "Osii|i:create_texture", &py_package, &name, &width, &height, &format)) {
+	if (!PyArg_ParseTuple(args, "Osiiz*:create_texture", &py_package, &name, &width, &height, &py_buf)) {
 		return nullptr;
 	}
 
@@ -249,24 +249,21 @@ PyObject *py_unreal_engine_create_texture(PyObject * self, PyObject * args) {
 		}
 	}
 
-	UTexture2D *texture = NewObject<UTexture2D>(u_package, UTF8_TO_TCHAR(name), RF_Public | RF_Standalone);
+	SIZE_T wanted_len = width * height * 4;
+
+	TArray<FColor> colors;
+	colors.AddZeroed(wanted_len);
+	FCreateTexture2DParameters params;
+
+	if ((SIZE_T)py_buf.len < wanted_len)
+		wanted_len = py_buf.len;
+
+	FMemory::Memcpy(colors.GetData(), py_buf.buf, wanted_len);
+	
+	UTexture2D *texture = FImageUtils::CreateTexture2D(width, height, colors, u_package, UTF8_TO_TCHAR(name), RF_Public | RF_Standalone, params);
 	if (!texture)
 		return PyErr_Format(PyExc_Exception, "unable to create texture");
 
-	texture->PlatformData = new FTexturePlatformData();
-	texture->PlatformData->SizeX = width;
-	texture->PlatformData->SizeY = height;
-	texture->PlatformData->PixelFormat = (EPixelFormat)format;
-
-	int32 blocksX = width / GPixelFormats[(EPixelFormat)format].BlockSizeX;
-	int32 blocksY = width / GPixelFormats[(EPixelFormat)format].BlockSizeY;
-	FTexture2DMipMap *mip = new(texture->PlatformData->Mips) FTexture2DMipMap();
-	mip->SizeX = width;
-	mip->SizeY = height;
-	mip->BulkData.Lock(LOCK_READ_WRITE);
-	mip->BulkData.Realloc(blocksX * blocksY * GPixelFormats[(EPixelFormat)format].BlockBytes);
-	mip->BulkData.Unlock();
-
 	ue_PyUObject *ret = ue_get_python_wrapper(texture);
 	if (!ret)
 		return PyErr_Format(PyExc_Exception, "uobject is in invalid state");
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -224,6 +224,11 @@ void FUnrealEnginePythonModule::StartupModule()
 		ZipPath = FPaths::Combine(*FPaths::GameContentDir(), UTF8_TO_TCHAR("ue_python.zip"));
 	}
 
+	if (!FPaths::DirectoryExists(ScriptsPath)) {
+		IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();
+		PlatformFile.CreateDirectory(*ScriptsPath);
+	}
+
 	Py_Initialize();
 
 	PyEval_InitThreads();

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,4 @@`
`6`	`6`	`UPythonProject::UPythonProject(const FObjectInitializer& ObjectInitializer)`
`7`	`7`	`: Super(ObjectInitializer)`
`8`	`8`	`{`
`9`		`- FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");`
`10`		`- Path = PythonModule.ScriptsPath;`
`11`		`- if (!FPaths::DirectoryExists(Path)) {`
`12`		`- IPlatformFile& PlatformFile = FPlatformFileManager::Get().GetPlatformFile();`
`13`		`- PlatformFile.CreateDirectory(*Path);`
`14`		`- }`
`15`	`9`	`}`