Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-24 10:07:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented handling the new collider_z_offset property for merged TiledWalls.

Browse Source
This commit is contained in:
Relintai 2022-07-31 14:04:26 +02:00
parent 0227b18d06
commit 40d9d6b49b
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/props/prop_instance_merger.cpp
View File

@ -607,6 +607,9 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
Ref<PropDataTiledWall> tiled_wall_data = e;
if (tiled_wall_data.is_valid()) {
Ref<TiledWallData> twd = tiled_wall_data->get_data();
if (twd.is_valid()) {
_job->add_tiled_wall(tiled_wall_data, t);
if (tiled_wall_data->get_collision()) {
@ -618,12 +621,14 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
tws->set_extents(Vector3(hew, heh, 0.01));
Transform tt = t;
Transform et = e->get_transform() * Transform(Basis(), Vector3(0, 0, twd->get_colldier_z_offset()));
Transform tt = transform * et;
//tt.origin += Vector3(hew, heh, 0);
tt.translate(hew, heh, 0);
_job->add_collision_shape(tws, tt, true);
}
}
continue;
}