improved ue_site management, added texture_set_source_data()

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -640,6 +640,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "set_blend_parameter", (PyCFunction)py_ue_set_blend_parameter, METH_VARARGS, "" },
 
 	{ "get_bone_transform", (PyCFunction)py_ue_anim_get_bone_transform, METH_VARARGS, "" },
+	{ "extract_bone_transform", (PyCFunction)py_ue_anim_extract_bone_transform, METH_VARARGS, "" },
 	{ "extract_root_motion", (PyCFunction)py_ue_anim_extract_root_motion, METH_VARARGS, "" },
 
 #if WITH_EDITOR
@@ -973,6 +974,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 
 #if WITH_EDITOR
 	{ "texture_get_source_data", (PyCFunction)py_ue_texture_get_source_data, METH_VARARGS, "" },
+	{ "texture_set_source_data", (PyCFunction)py_ue_texture_set_source_data, METH_VARARGS, "" },
 #endif
 
 	// Sequencer

Source/UnrealEnginePython/Private/UObject/UEPyAnimSequence.cpp

@@ -23,7 +23,7 @@ PyObject *py_ue_anim_get_bone_transform(ue_PyUObject * self, PyObject * args)
 	ue_py_check(self);
 
 	int track_index;
-        float frame_time;
+	float frame_time;
 	PyObject *py_b_use_raw_data = nullptr;
 
 	if (!PyArg_ParseTuple(args, "if|O:get_bone_transform", &track_index, &frame_time, &py_b_use_raw_data))
@@ -45,6 +45,35 @@ PyObject *py_ue_anim_get_bone_transform(ue_PyUObject * self, PyObject * args)
 	return py_ue_new_ftransform(OutAtom);
 }
 
+PyObject *py_ue_anim_extract_bone_transform(ue_PyUObject * self, PyObject * args)
+{
+	ue_py_check(self);
+
+	PyObject *py_sources;
+	float frame_time;
+
+	if (!PyArg_ParseTuple(args, "Of:extract_bone_transform", &py_sources, &frame_time))
+	{
+		return nullptr;
+	}
+
+	UAnimSequence *anim = ue_py_check_type<UAnimSequence>(self);
+	if (!anim)
+		return PyErr_Format(PyExc_Exception, "UObject is not a UAnimSequence.");
+
+	ue_PyFRawAnimSequenceTrack *rast = py_ue_is_fraw_anim_sequence_track(py_sources);
+	if (rast)
+	{
+		FTransform OutAtom;
+		anim->ExtractBoneTransform(rast->raw_anim_sequence_track, OutAtom, frame_time);
+
+		return py_ue_new_ftransform(OutAtom);
+	}
+
+	return PyErr_Format(PyExc_Exception, "argument is not an FRawAnimSequenceTrack");
+
+}
+
 PyObject *py_ue_anim_extract_root_motion(ue_PyUObject * self, PyObject * args)
 {
 	ue_py_check(self);
@@ -138,16 +167,16 @@ PyObject *py_ue_anim_sequence_apply_raw_anim_changes(ue_PyUObject * self, PyObje
 
 
 	if (anim_seq->DoesNeedRebake())
-        {
-        	anim_seq->Modify(true);
-                anim_seq->BakeTrackCurvesToRawAnimation();
-        }
+	{
+		anim_seq->Modify(true);
+		anim_seq->BakeTrackCurvesToRawAnimation();
+	}
 
-        if (anim_seq->DoesNeedRecompress())
-        {
-        	anim_seq->Modify(true);
-                anim_seq->RequestSyncAnimRecompression(false);
-        }
+	if (anim_seq->DoesNeedRecompress())
+	{
+		anim_seq->Modify(true);
+		anim_seq->RequestSyncAnimRecompression(false);
+	}
 
 	Py_RETURN_NONE;
 }
@@ -214,7 +243,7 @@ PyObject *py_ue_anim_sequence_update_raw_track(ue_PyUObject * self, PyObject * a
 	anim_seq->Modify();
 
 	FRawAnimSequenceTrack& RawRef = anim_seq->GetRawAnimationTrack(track_index);
-	
+
 	RawRef.PosKeys = py_f_rast->raw_anim_sequence_track.PosKeys;
 	RawRef.RotKeys = py_f_rast->raw_anim_sequence_track.RotKeys;
 	RawRef.ScaleKeys = py_f_rast->raw_anim_sequence_track.ScaleKeys;

Source/UnrealEnginePython/Private/UObject/UEPyAnimSequence.h

@@ -20,6 +20,7 @@ PyObject *py_ue_anim_sequence_apply_raw_anim_changes(ue_PyUObject *, PyObject *)
 #endif
 PyObject *py_ue_anim_set_skeleton(ue_PyUObject *, PyObject *);
 PyObject *py_ue_anim_get_bone_transform(ue_PyUObject *, PyObject *);
+PyObject *py_ue_anim_extract_bone_transform(ue_PyUObject *, PyObject *);
 PyObject *py_ue_anim_extract_root_motion(ue_PyUObject *, PyObject *);
 
 PyObject *py_ue_get_blend_parameter(ue_PyUObject *, PyObject *);

Source/UnrealEnginePython/Private/UObject/UEPyTexture.cpp

@@ -79,7 +79,7 @@ PyObject *py_ue_texture_get_source_data(ue_PyUObject *self, PyObject * args)
 
 	if (!PyArg_ParseTuple(args, "|i:texture_get_data", &mipmap))
 	{
-		return NULL;
+		return nullptr;
 	}
 
 	UTexture2D *tex = ue_py_check_type<UTexture2D>(self);
@@ -96,6 +96,55 @@ PyObject *py_ue_texture_get_source_data(ue_PyUObject *self, PyObject * args)
 	tex->Source.UnlockMip(mipmap);
 	return bytes;
 }
+
+PyObject *py_ue_texture_set_source_data(ue_PyUObject *self, PyObject * args)
+{
+
+	ue_py_check(self);
+
+	Py_buffer py_buf;
+	int mipmap = 0;
+
+	if (!PyArg_ParseTuple(args, "z*|i:texture_set_source_data", &py_buf, &mipmap))
+	{
+		return NULL;
+	}
+
+	UTexture2D *tex = ue_py_check_type<UTexture2D>(self);
+	if (!tex)
+		return PyErr_Format(PyExc_Exception, "object is not a Texture2D");
+
+
+	if (!py_buf.buf)
+		return PyErr_Format(PyExc_Exception, "invalid data");
+
+	if (mipmap >= tex->GetNumMips())
+		return PyErr_Format(PyExc_Exception, "invalid mipmap id");
+
+	int32 wanted_len = py_buf.len;
+	int32 len = tex->Source.GetSizeX() * tex->Source.GetSizeY() * 4;
+	// avoid making mess
+	if (wanted_len > len)
+	{
+		UE_LOG(LogPython, Warning, TEXT("truncating buffer to %d bytes"), len);
+		wanted_len = len;
+	}
+
+	const uint8 *blob = tex->Source.LockMip(mipmap);
+
+	FMemory::Memcpy((void *)blob, py_buf.buf, wanted_len);
+
+	tex->Source.UnlockMip(mipmap);
+	Py_BEGIN_ALLOW_THREADS;
+	tex->MarkPackageDirty();
+#if WITH_EDITOR
+	tex->PostEditChange();
+#endif
+
+	tex->UpdateResource();
+	Py_END_ALLOW_THREADS;
+	Py_RETURN_NONE;
+}
 #endif
 
 PyObject *py_ue_render_target_get_data(ue_PyUObject *self, PyObject * args)
@@ -274,7 +323,7 @@ PyObject *py_unreal_engine_create_checkerboard_texture(PyObject * self, PyObject
 		return PyErr_Format(PyExc_Exception, "argument is not a FColor");
 
 	UTexture2D *texture = nullptr;
-	
+
 	Py_BEGIN_ALLOW_THREADS;
 	texture = FImageUtils::CreateCheckerboardTexture(color_one->color, color_two->color, checker_size);
 	Py_END_ALLOW_THREADS;

Source/UnrealEnginePython/Private/UObject/UEPyTexture.h

@@ -23,4 +23,5 @@ PyObject *py_ue_texture_update_resource(ue_PyUObject *, PyObject *);
 #if WITH_EDITOR
 PyObject *py_unreal_engine_create_texture(PyObject * self, PyObject *);
 PyObject *py_ue_texture_get_source_data(ue_PyUObject *, PyObject *);
+PyObject *py_ue_texture_set_source_data(ue_PyUObject *, PyObject *);
 #endif

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -370,8 +370,15 @@ void FUnrealEnginePythonModule::StartupModule()
 	}
 	else
 	{
-		// TODO gracefully manage the error
-		unreal_engine_py_log_error();
+		if (PyErr_ExceptionMatches(PyExc_ModuleNotFoundError))
+		{
+			UE_LOG(LogPython, Log, TEXT("ue_site Python module not found"));
+			PyErr_Clear();
+		}
+		else
+		{
+			unreal_engine_py_log_error();
+		}
 	}
 
 	// release the GIL
@@ -511,7 +518,7 @@ void FUnrealEnginePythonModule::RunFile(char *filename)
 	{
 		unreal_engine_py_log_error();
 		return;
-	}
+}
 #endif
 
 }