Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codestyle fixes.

Browse Source
This commit is contained in:
Relintai 2022-07-31 13:43:36 +02:00
parent 6af9f9045d
commit 0227b18d06
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/props/prop_instance_merger.cpp
View File

@ -181,8 +181,9 @@ void PropInstanceMerger::meshes_create(const int num) {
for (int i = 0; i < num; ++i) { for (int i = 0; i < num; ++i) {
RID mesh_instance_rid = VS::get_singleton()->instance_create(); RID mesh_instance_rid = VS::get_singleton()->instance_create();
if (get_world().is_valid()) if (get_world().is_valid()) {
VS::get_singleton()->instance_set_scenario(mesh_instance_rid, get_world()->get_scenario()); VS::get_singleton()->instance_set_scenario(mesh_instance_rid, get_world()->get_scenario());
}
RID mesh_rid = VS::get_singleton()->mesh_create(); RID mesh_rid = VS::get_singleton()->mesh_create();
@ -411,8 +412,9 @@ void PropInstanceMerger::debug_mesh_send() {
debug_mesh_allocate(); debug_mesh_allocate();
debug_mesh_clear(); debug_mesh_clear();
if (_debug_mesh_array.size() == 0) if (_debug_mesh_array.size() == 0) {
return; return;
}
SceneTree *st = SceneTree::get_singleton(); SceneTree *st = SceneTree::get_singleton();
@ -582,8 +584,9 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
Ref<PropDataEntry> e = prop->get_prop(i); Ref<PropDataEntry> e = prop->get_prop(i);
if (!e.is_valid()) if (!e.is_valid()) {
continue; continue;
}
Transform t = transform * e->get_transform(); Transform t = transform * e->get_transform();
@ -592,8 +595,9 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
if (prop_entry_data.is_valid()) { if (prop_entry_data.is_valid()) {
Ref<PropData> p = prop_entry_data->get_prop(); Ref<PropData> p = prop_entry_data->get_prop();
if (!p.is_valid()) if (!p.is_valid()) {
continue; continue;
}
prop_preprocess(t, p); prop_preprocess(t, p);
@ -629,8 +633,9 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
if (scene_data.is_valid()) { if (scene_data.is_valid()) {
Ref<PackedScene> sc = scene_data->get_scene(); Ref<PackedScene> sc = scene_data->get_scene();
if (!sc.is_valid()) if (!sc.is_valid()) {
continue; continue;
}
Node *n = sc->instance(); Node *n = sc->instance();
add_child(n); add_child(n);
@ -670,8 +675,9 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
if (mesh_data.is_valid()) { if (mesh_data.is_valid()) {
Ref<MeshDataResource> mdr = mesh_data->get_mesh(); Ref<MeshDataResource> mdr = mesh_data->get_mesh();
if (!mdr.is_valid()) if (!mdr.is_valid()) {
continue; continue;
}
_job->add_mesh(mesh_data, t); _job->add_mesh(mesh_data, t);