Skip to content

Commit 31d55a8

Browse files
crazytuzicrazytuzi
committed
Support UE5.0.0
1 parent 9b55bfb commit 31d55a8

File tree

6 files changed

+77
-3
lines changed

6 files changed

+77
-3
lines changed

‎Source/UnrealEnginePython/Private/UObject/UEPySkeletal.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,13 @@ PyObject *py_ue_skeletal_mesh_build_lod(ue_PyUObject *self, PyObject * args, PyO
979979
#endif
980980
TArray<int32> points_to_map;
981981

982-
TArray<FVector> tangentsX;
983-
TArray<FVector> tangentsY;
984982
#if ENGINE_MAJOR_VERSION == 5
983+
TArray<FVector3f> tangentsX;
984+
TArray<FVector3f> tangentsY;
985985
TArray<FVector4f> tangentsZ;
986986
#else
987+
TArray<FVector> tangentsX;
988+
TArray<FVector> tangentsY;
987989
TArray<FVector> tangentsZ;
988990
#endif
989991
TArray<uint16> material_indices;

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFFoliageInstance.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ static int py_ue_ffoliage_instance_set_rotation(ue_PyFFoliageInstance* self, PyO
139139
static PyObject* py_ue_ffoliage_instance_get_draw_scale3d(ue_PyFFoliageInstance* self, void* closure)
140140
{
141141
get_instance(self);
142+
#if ENGINE_MAJOR_VERSION == 5
143+
return py_ue_new_fvector(FVector(instance->DrawScale3D));
144+
#else
142145
return py_ue_new_fvector(instance->DrawScale3D);
146+
#endif
143147
}
144148

145149
static PyObject* py_ue_ffoliage_instance_get_flags(ue_PyFFoliageInstance* self, void* closure)

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFMorphTargetDelta.cpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22

33
static PyObject *py_ue_fmorph_target_delta_get_position_delta(ue_PyFMorphTargetDelta *self, void *closure)
44
{
5+
#if ENGINE_MAJOR_VERSION == 5
6+
return py_ue_new_fvector(FVector(self->morph_target_delta.PositionDelta));
7+
#else
58
return py_ue_new_fvector(self->morph_target_delta.PositionDelta);
9+
#endif
610
}
711

812
static int py_ue_fmorph_target_delta_set_position_delta(ue_PyFMorphTargetDelta *self, PyObject *value, void *closure)
913
{
1014
ue_PyFVector *py_vec = py_ue_is_fvector(value);
1115
if (py_vec)
1216
{
17+
#if ENGINE_MAJOR_VERSION == 5
18+
self->morph_target_delta.PositionDelta = FVector3f(py_vec->vec);
19+
#else
1320
self->morph_target_delta.PositionDelta = py_vec->vec;
21+
#endif
1422
return 0;
1523
}
1624
PyErr_SetString(PyExc_TypeError, "value is not a FVector");
@@ -19,15 +27,23 @@ static int py_ue_fmorph_target_delta_set_position_delta(ue_PyFMorphTargetDelta *
1927

2028
static PyObject *py_ue_fmorph_target_delta_get_tangent_z_delta(ue_PyFMorphTargetDelta *self, void *closure)
2129
{
30+
#if ENGINE_MAJOR_VERSION == 5
31+
return py_ue_new_fvector(FVector(self->morph_target_delta.TangentZDelta));
32+
#else
2233
return py_ue_new_fvector(self->morph_target_delta.TangentZDelta);
34+
#endif
2335
}
2436

2537
static int py_ue_fmorph_target_delta_set_tangent_z_delta(ue_PyFMorphTargetDelta *self, PyObject *value, void *closure)
2638
{
2739
ue_PyFVector *py_vec = py_ue_is_fvector(value);
2840
if (py_vec)
2941
{
42+
#if ENGINE_MAJOR_VERSION == 5
43+
self->morph_target_delta.TangentZDelta = FVector3f(py_vec->vec);
44+
#else
3045
self->morph_target_delta.TangentZDelta = py_vec->vec;
46+
#endif
3147
return 0;
3248
}
3349
PyErr_SetString(PyExc_TypeError, "value is not a FVector");

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFRawAnimSequenceTrack.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
static PyObject *py_ue_fraw_anim_sequence_track_get_pos_keys(ue_PyFRawAnimSequenceTrack *self, void *closure)
44
{
55
PyObject *py_list = PyList_New(0);
6+
#if ENGINE_MAJOR_VERSION == 5
7+
for (FVector vec : TArray<FVector>(self->raw_anim_sequence_track.PosKeys))
8+
#else
69
for (FVector vec : self->raw_anim_sequence_track.PosKeys)
10+
#endif
711
{
812
PyObject *py_vec = py_ue_new_fvector(vec);
913
PyList_Append(py_list, py_vec);
@@ -15,7 +19,11 @@ static PyObject *py_ue_fraw_anim_sequence_track_get_pos_keys(ue_PyFRawAnimSequen
1519
static PyObject *py_ue_fraw_anim_sequence_track_get_scale_keys(ue_PyFRawAnimSequenceTrack *self, void *closure)
1620
{
1721
PyObject *py_list = PyList_New(0);
22+
#if ENGINE_MAJOR_VERSION == 5
23+
for (FVector vec : TArray<FVector>(self->raw_anim_sequence_track.ScaleKeys))
24+
#else
1825
for (FVector vec : self->raw_anim_sequence_track.ScaleKeys)
26+
#endif
1927
{
2028
PyObject *py_vec = py_ue_new_fvector(vec);
2129
PyList_Append(py_list, py_vec);

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFRawMesh.cpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,11 @@ static PyObject *py_ue_fraw_mesh_get_wedge_position(ue_PyFRawMesh *self, PyObjec
245245
if (index > self->raw_mesh.WedgeIndices.Num() - 1 || index < 0)
246246
return PyErr_Format(PyExc_IndexError, "wedge index error");
247247

248+
#if ENGINE_MAJOR_VERSION == 5
249+
FVector vec = FVector(self->raw_mesh.GetWedgePosition(index));
250+
#else
248251
FVector vec = self->raw_mesh.GetWedgePosition(index);
252+
#endif
249253

250254
return py_ue_new_fvector(vec);
251255
}
@@ -524,7 +528,11 @@ static PyObject *py_ue_fraw_mesh_get_vertex_positions(ue_PyFRawMesh *self, PyObj
524528

525529
for (int32 i = 0; i < self->raw_mesh.VertexPositions.Num(); i++)
526530
{
531+
#if ENGINE_MAJOR_VERSION == 5
532+
PyList_Append(py_list, py_ue_new_fvector(FVector(self->raw_mesh.VertexPositions[i])));
533+
#else
527534
PyList_Append(py_list, py_ue_new_fvector(self->raw_mesh.VertexPositions[i]));
535+
#endif
528536
}
529537

530538
return py_list;
@@ -537,7 +545,11 @@ static PyObject *py_ue_fraw_mesh_get_wedge_tangent_x(ue_PyFRawMesh *self, PyObje
537545

538546
for (int32 i = 0; i < self->raw_mesh.WedgeTangentX.Num(); i++)
539547
{
548+
#if ENGINE_MAJOR_VERSION == 5
549+
PyList_Append(py_list, py_ue_new_fvector(FVector(self->raw_mesh.WedgeTangentX[i])));
550+
#else
540551
PyList_Append(py_list, py_ue_new_fvector(self->raw_mesh.WedgeTangentX[i]));
552+
#endif
541553
}
542554

543555
return py_list;
@@ -550,7 +562,11 @@ static PyObject *py_ue_fraw_mesh_get_wedge_tangent_y(ue_PyFRawMesh *self, PyObje
550562

551563
for (int32 i = 0; i < self->raw_mesh.WedgeTangentY.Num(); i++)
552564
{
565+
#if ENGINE_MAJOR_VERSION == 5
566+
PyList_Append(py_list, py_ue_new_fvector(FVector(self->raw_mesh.WedgeTangentY[i])));
567+
#else
553568
PyList_Append(py_list, py_ue_new_fvector(self->raw_mesh.WedgeTangentY[i]));
569+
#endif
554570
}
555571

556572
return py_list;
@@ -563,7 +579,11 @@ static PyObject *py_ue_fraw_mesh_get_wedge_tangent_z(ue_PyFRawMesh *self, PyObje
563579

564580
for (int32 i = 0; i < self->raw_mesh.WedgeTangentZ.Num(); i++)
565581
{
582+
#if ENGINE_MAJOR_VERSION == 5
583+
PyList_Append(py_list, py_ue_new_fvector(FVector(self->raw_mesh.WedgeTangentZ[i])));
584+
#else
566585
PyList_Append(py_list, py_ue_new_fvector(self->raw_mesh.WedgeTangentZ[i]));
586+
#endif
567587
}
568588

569589
return py_list;

‎Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,23 @@ static int py_ue_fsoft_skin_vertex_set_color(ue_PyFSoftSkinVertex *self, PyObjec
2121

2222
static PyObject *py_ue_fsoft_skin_vertex_get_position(ue_PyFSoftSkinVertex *self, void *closure)
2323
{
24+
#if ENGINE_MAJOR_VERSION == 5
25+
return py_ue_new_fvector(FVector(self->ss_vertex.Position));
26+
#else
2427
return py_ue_new_fvector(self->ss_vertex.Position);
28+
#endif
2529
}
2630

2731
static int py_ue_fsoft_skin_vertex_set_position(ue_PyFSoftSkinVertex *self, PyObject *value, void *closure)
2832
{
2933
ue_PyFVector *py_vec = py_ue_is_fvector(value);
3034
if (py_vec)
3135
{
36+
#if ENGINE_MAJOR_VERSION == 5
37+
self->ss_vertex.Position = FVector3f(py_vec->vec);
38+
#else
3239
self->ss_vertex.Position = py_vec->vec;
40+
#endif
3341
return 0;
3442
}
3543
PyErr_SetString(PyExc_TypeError, "value is not a FVector");
@@ -38,15 +46,23 @@ static int py_ue_fsoft_skin_vertex_set_position(ue_PyFSoftSkinVertex *self, PyOb
3846

3947
static PyObject *py_ue_fsoft_skin_vertex_get_tangent_x(ue_PyFSoftSkinVertex *self, void *closure)
4048
{
49+
#if ENGINE_MAJOR_VERSION == 5
50+
return py_ue_new_fvector(FVector(self->ss_vertex.TangentX));
51+
#else
4152
return py_ue_new_fvector(self->ss_vertex.TangentX);
53+
#endif
4254
}
4355

4456
static int py_ue_fsoft_skin_vertex_set_tangent_x(ue_PyFSoftSkinVertex *self, PyObject *value, void *closure)
4557
{
4658
ue_PyFVector *py_vec = py_ue_is_fvector(value);
4759
if (py_vec)
4860
{
61+
#if ENGINE_MAJOR_VERSION == 5
62+
self->ss_vertex.TangentX = FVector3f(py_vec->vec);
63+
#else
4964
self->ss_vertex.TangentX = py_vec->vec;
65+
#endif
5066
return 0;
5167
}
5268
PyErr_SetString(PyExc_TypeError, "value is not a FVector");
@@ -55,15 +71,23 @@ static int py_ue_fsoft_skin_vertex_set_tangent_x(ue_PyFSoftSkinVertex *self, PyO
5571

5672
static PyObject *py_ue_fsoft_skin_vertex_get_tangent_y(ue_PyFSoftSkinVertex *self, void *closure)
5773
{
74+
#if ENGINE_MAJOR_VERSION == 5
75+
return py_ue_new_fvector(FVector(self->ss_vertex.TangentX));
76+
#else
5877
return py_ue_new_fvector(self->ss_vertex.TangentX);
78+
#endif
5979
}
6080

6181
static int py_ue_fsoft_skin_vertex_set_tangent_y(ue_PyFSoftSkinVertex *self, PyObject *value, void *closure)
6282
{
6383
ue_PyFVector *py_vec = py_ue_is_fvector(value);
6484
if (py_vec)
6585
{
86+
#if ENGINE_MAJOR_VERSION == 5
87+
self->ss_vertex.TangentY = FVector3f(py_vec->vec);
88+
#else
6689
self->ss_vertex.TangentY = py_vec->vec;
90+
#endif
6791
return 0;
6892
}
6993
PyErr_SetString(PyExc_TypeError, "value is not a FVector");
@@ -85,7 +109,7 @@ static int py_ue_fsoft_skin_vertex_set_tangent_z(ue_PyFSoftSkinVertex *self, PyO
85109
if (py_vec)
86110
{
87111
#if ENGINE_MAJOR_VERSION == 5
88-
self->ss_vertex.TangentZ = FVector4f(py_vec->vec);
112+
self->ss_vertex.TangentZ = FVector4f(FVector3f(py_vec->vec));
89113
#else
90114
self->ss_vertex.TangentZ = py_vec->vec;
91115
#endif

0 commit comments

Comments
 (0)