Skip to content

Commit 19ce63e

Browse files
author
Roberto De Ioris
committed
reindenting
1 parent 4f371af commit 19ce63e

2 files changed

Lines changed: 35 additions & 33 deletions

File tree

‎Source/UnrealEnginePython/Private/UEPyModule.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static PyObject *py_unreal_engine_add_on_screen_debug_message(PyObject * self, P
7070
}
7171

7272
static PyObject *py_unreal_engine_print_string(PyObject * self, PyObject * args) {
73-
73+
7474
char *message;
7575
if (!PyArg_ParseTuple(args, "s:print_string", &message)) {
7676
return NULL;
@@ -129,7 +129,7 @@ static PyObject *py_unreal_engine_find_object(PyObject * self, PyObject * args)
129129

130130
#if WITH_EDITOR
131131
static PyObject *py_unreal_engine_get_editor_world(PyObject * self, PyObject * args) {
132-
132+
133133
if (!GEditor)
134134
return PyErr_Format(PyExc_Exception, "no GEditor found");
135135

@@ -144,8 +144,8 @@ static PyObject *py_unreal_engine_get_editor_world(PyObject * self, PyObject * a
144144

145145

146146
static PyObject *py_unreal_engine_vector_add_vector(PyObject * self, PyObject *args) {
147-
148-
float x=0, y=0, z=0;
147+
148+
float x = 0, y = 0, z = 0;
149149

150150
Py_ssize_t items = PyTuple_Size(args);
151151

@@ -157,12 +157,12 @@ static PyObject *py_unreal_engine_vector_add_vector(PyObject * self, PyObject *a
157157
PyObject *x_py = PyTuple_GetItem(args, i);
158158
if (!PyFloat_Check(x_py))
159159
return PyErr_Format(PyExc_TypeError, "this function supports only float values (x)");
160-
x += (float) PyFloat_AsDouble(x_py);
161-
PyObject *y_py = PyTuple_GetItem(args, i+1);
160+
x += (float)PyFloat_AsDouble(x_py);
161+
PyObject *y_py = PyTuple_GetItem(args, i + 1);
162162
if (!PyFloat_Check(y_py))
163163
return PyErr_Format(PyExc_TypeError, "this function supports only float values (y)");
164164
y += (float)PyFloat_AsDouble(y_py);
165-
PyObject *z_py = PyTuple_GetItem(args, i+2);
165+
PyObject *z_py = PyTuple_GetItem(args, i + 2);
166166
if (!PyFloat_Check(z_py))
167167
return PyErr_Format(PyExc_TypeError, "this function supports only float values (z)");
168168
z += (float)PyFloat_AsDouble(z_py);
@@ -197,7 +197,7 @@ static PyObject *py_unreal_engine_vector_add_float(PyObject * self, PyObject *ar
197197
return PyErr_Format(PyExc_TypeError, "this function supports only float values (x)");
198198
z = (float)PyFloat_AsDouble(z_py);
199199

200-
for (int i = 3; i < (int)items; i ++) {
200+
for (int i = 3; i < (int)items; i++) {
201201
PyObject *delta_py = PyTuple_GetItem(args, i);
202202
if (!PyFloat_Check(delta_py))
203203
return PyErr_Format(PyExc_TypeError, "this function supports only float values");
@@ -313,7 +313,7 @@ static PyObject *py_ue_call(ue_PyUObject *self, PyObject * args) {
313313

314314
FOutputDeviceNull od_null;
315315
if (!self->ue_object->CallFunctionByNameWithArguments(UTF8_TO_TCHAR(call_args), od_null, NULL, true)) {
316-
return PyErr_Format(PyExc_Exception, "error while calling \"%s\"", call_args);
316+
return PyErr_Format(PyExc_Exception, "error while calling \"%s\"", call_args);
317317
}
318318

319319
Py_INCREF(Py_None);
@@ -421,7 +421,7 @@ static PyObject *py_ue_get_owner(ue_PyUObject *self, PyObject * args) {
421421
return PyErr_Format(PyExc_Exception, "uobject is not a component");
422422
}
423423

424-
UActorComponent *component = (UActorComponent *) self->ue_object;
424+
UActorComponent *component = (UActorComponent *)self->ue_object;
425425

426426
ue_PyUObject *ret = ue_get_python_wrapper(component->GetOwner());
427427
if (!ret)
@@ -434,7 +434,7 @@ static PyObject *py_ue_get_name(ue_PyUObject *self, PyObject * args) {
434434

435435
ue_py_check(self);
436436

437-
437+
438438
return PyUnicode_FromString(TCHAR_TO_UTF8(*(self->ue_object->GetName())));
439439
}
440440

@@ -738,7 +738,7 @@ static PyObject *py_ue_get_world(ue_PyUObject *self, PyObject * args) {
738738
return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
739739
Py_INCREF(ret);
740740
return (PyObject *)ret;
741-
741+
742742
}
743743

744744

@@ -1072,13 +1072,13 @@ static PyObject *py_ue_set_simulate_physics(ue_PyUObject * self, PyObject * args
10721072
enabled = false;
10731073

10741074
UPrimitiveComponent *primitive = nullptr;
1075-
1075+
10761076
if (self->ue_object->IsA<UPrimitiveComponent>()) {
10771077
primitive = (UPrimitiveComponent *)self->ue_object;
10781078
}
10791079
else if (self->ue_object->IsA<AActor>()) {
10801080
AActor *actor = (AActor *)self->ue_object;
1081-
primitive = (UPrimitiveComponent *) actor->GetComponentByClass(UPrimitiveComponent::StaticClass());
1081+
primitive = (UPrimitiveComponent *)actor->GetComponentByClass(UPrimitiveComponent::StaticClass());
10821082
}
10831083
else {
10841084
return PyErr_Format(PyExc_Exception, "unable to set physics for the object");
@@ -1128,7 +1128,7 @@ static PyObject *py_ue_actor_destroy(ue_PyUObject * self, PyObject * args) {
11281128
Py_INCREF(Py_None);
11291129
return Py_None;
11301130

1131-
1131+
11321132
}
11331133

11341134
static PyObject *py_ue_actor_has_tag(ue_PyUObject * self, PyObject * args) {
@@ -1189,14 +1189,14 @@ static PyObject *py_ue_line_trace_single_by_channel(ue_PyUObject * self, PyObjec
11891189
if (!world)
11901190
return PyErr_Format(PyExc_Exception, "unable to retrieve UWorld from uobject");
11911191

1192-
1192+
11931193
if (!PyArg_ParseTuple(args, "ffffffi:line_trace_single_by_channel", &x1, &y1, &z1, &x2, &y2, &z2, &channel)) {
11941194
return NULL;
11951195
}
11961196

11971197
FHitResult hit;
11981198

1199-
bool got_hit = world->LineTraceSingleByChannel(hit, FVector(x1, y1, z1), FVector(x2, y2, z2), (ECollisionChannel) channel);
1199+
bool got_hit = world->LineTraceSingleByChannel(hit, FVector(x1, y1, z1), FVector(x2, y2, z2), (ECollisionChannel)channel);
12001200

12011201
if (got_hit) {
12021202
PyObject *ret = (PyObject *)ue_get_python_wrapper(hit.GetActor());
@@ -1205,7 +1205,7 @@ static PyObject *py_ue_line_trace_single_by_channel(ue_PyUObject * self, PyObjec
12051205
return Py_BuildValue("Offffff", ret, hit.ImpactPoint.X, hit.ImpactPoint.Y, hit.ImpactPoint.Z, hit.ImpactNormal.X, hit.ImpactNormal.Y, hit.ImpactNormal.Z);
12061206
}
12071207

1208-
return Py_BuildValue("Offffff", Py_None, 0,0,0,0,0,0);
1208+
return Py_BuildValue("Offffff", Py_None, 0, 0, 0, 0, 0, 0);
12091209

12101210
}
12111211

@@ -1228,7 +1228,7 @@ static PyObject *py_ue_line_trace_multi_by_channel(ue_PyUObject * self, PyObject
12281228

12291229
TArray<struct FHitResult> hits;
12301230
hits.Reset();
1231-
1231+
12321232
PyObject *hits_list = PyList_New(0);
12331233

12341234

@@ -1362,7 +1362,7 @@ static PyObject *py_ue_add_actor_component(ue_PyUObject * self, PyObject * args)
13621362
}
13631363

13641364
ue_PyUObject *py_obj = (ue_PyUObject *)obj;
1365-
1365+
13661366
if (!py_obj->ue_object->IsA<UClass>()) {
13671367
return PyErr_Format(PyExc_Exception, "argument is not a class");
13681368
}
@@ -1554,7 +1554,7 @@ static PyObject *py_ue_set_view_target(ue_PyUObject * self, PyObject * args) {
15541554
AActor *actor = (AActor *)py_obj->ue_object;
15551555

15561556
world->GetFirstPlayerController()->SetViewTarget(actor);
1557-
1557+
15581558
Py_INCREF(Py_None);
15591559
return Py_None;
15601560

@@ -1605,7 +1605,7 @@ static PyObject *py_ue_destructible_apply_damage(ue_PyUObject * self, PyObject *
16051605
}
16061606
else if (self->ue_object->IsA<AActor>()) {
16071607
actor = (AActor *)self->ue_object;
1608-
destructible = (UDestructibleComponent *) actor->GetComponentByClass(UDestructibleComponent::StaticClass());
1608+
destructible = (UDestructibleComponent *)actor->GetComponentByClass(UDestructibleComponent::StaticClass());
16091609
}
16101610
else if (self->ue_object->IsA<UActorComponent>()) {
16111611
actor = (AActor *)self->ue_object->GetOuter();

‎Source/UnrealEnginePython/UnrealEnginePython.Build.cs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public UnrealEnginePython(TargetInfo Target)
5454
"InputCore",
5555
"Slate",
5656
"SlateCore",
57-
// ... add private dependencies that you statically link with here ...
57+
// ... add private dependencies that you statically link with here ...
5858
}
5959
);
6060

@@ -75,16 +75,18 @@ public UnrealEnginePython(TargetInfo Target)
7575
});
7676
}
7777

78-
if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32)) {
79-
PublicIncludePaths.Add(PythonHome);
80-
PublicAdditionalLibraries.Add(Path.Combine(PythonHome, "libs", "python35.lib"));
81-
}
82-
else if (Target.Platform == UnrealTargetPlatform.Mac) {
83-
string mac_python = "/Library/Frameworks/Python.framework/Versions/3.5/";
84-
PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
85-
PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython3.5m.dylib"));
86-
Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC=1"));
87-
}
78+
if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
79+
{
80+
PublicIncludePaths.Add(PythonHome);
81+
PublicAdditionalLibraries.Add(Path.Combine(PythonHome, "libs", "python35.lib"));
82+
}
83+
else if (Target.Platform == UnrealTargetPlatform.Mac)
84+
{
85+
string mac_python = "/Library/Frameworks/Python.framework/Versions/3.5/";
86+
PublicIncludePaths.Add(Path.Combine(mac_python, "include"));
87+
PublicAdditionalLibraries.Add(Path.Combine(mac_python, "lib", "libpython3.5m.dylib"));
88+
Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC=1"));
89+
}
8890

8991
}
9092
}

0 commit comments

Comments
 (0)