mirror of
https://github.com/Relintai/props.git
synced 2025-02-04 16:05:54 +01:00
Collider support for TiledWalls in PropInstanceMerger.
This commit is contained in:
parent
5baba6436f
commit
681cdb21c6
@ -65,6 +65,8 @@ typedef class RenderingServer VS;
|
|||||||
|
|
||||||
#include "tiled_wall/tiled_wall_data.h"
|
#include "tiled_wall/tiled_wall_data.h"
|
||||||
|
|
||||||
|
#include "scene/resources/box_shape.h"
|
||||||
|
|
||||||
const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2;
|
const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2;
|
||||||
|
|
||||||
bool PropInstanceMerger::get_building() {
|
bool PropInstanceMerger::get_building() {
|
||||||
@ -584,6 +586,22 @@ void PropInstanceMerger::_prop_preprocess(Transform transform, const Ref<PropDat
|
|||||||
|
|
||||||
_job->add_tiled_wall(tiled_wall_data, t);
|
_job->add_tiled_wall(tiled_wall_data, t);
|
||||||
|
|
||||||
|
if (tiled_wall_data->get_collision()) {
|
||||||
|
Ref<BoxShape> tws;
|
||||||
|
tws.instance();
|
||||||
|
|
||||||
|
float hew = tiled_wall_data->get_width() / 2.0;
|
||||||
|
float heh = tiled_wall_data->get_heigth() / 2.0;
|
||||||
|
|
||||||
|
tws->set_extents(Vector3(hew, heh, 0.01));
|
||||||
|
|
||||||
|
Transform tt = t;
|
||||||
|
//tt.origin += Vector3(hew, heh, 0);
|
||||||
|
tt.translate(hew, heh, 0);
|
||||||
|
|
||||||
|
_job->add_collision_shape(tws, tt);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user