Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2024-11-14 10:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement collider transforms.

Browse Source
This commit is contained in:
Relintai 2020-06-28 21:55:00 +02:00
parent 9e2d71169b
commit 2e69796d08
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
world/default/voxel_chunk_default.cpp
View File

@ -715,6 +715,12 @@ void VoxelChunkDefault::update_transforms() {
PhysicsServer::get_singleton()->area_set_shape_transform(rid, 0, t);
}
}
for (int i = 0; i < _collider_bodies.size(); ++i) {
const MDRColliders &c = _collider_bodies[i];
PhysicsServer::get_singleton()->body_set_state(c.body, PhysicsServer::BODY_STATE_TRANSFORM, get_transform() * c.transform);
}
}
//Lights
@ -1106,7 +1112,7 @@ VoxelChunkDefault::~VoxelChunkDefault() {
#if MESH_DATA_RESOURCE_PRESENT
for (int i = 0; i < _collider_bodies.size(); ++i) {
PhysicsServer::get_singleton()->free(_collider_bodies[i]);
PhysicsServer::get_singleton()->free(_collider_bodies[i].body);
}
_collider_bodies.clear();
@ -1587,7 +1593,7 @@ void VoxelChunkDefault::_build_phase(int phase) {
}
#endif
case BUILD_PHASE_FINALIZE: {
update_transforms();
call_deferred("update_transforms");
next_phase();
@ -1630,8 +1636,9 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) {
}
#if MESH_DATA_RESOURCE_PRESENT
//TODO this should only update the differences
for (int i = 0; i < _collider_bodies.size(); ++i) {
PhysicsServer::get_singleton()->free(_collider_bodies[i]);
PhysicsServer::get_singleton()->free(_collider_bodies[i].body);
}
_collider_bodies.clear();
@ -1646,10 +1653,27 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) {
continue;
}
RID body = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
PhysicsServer::get_singleton()->body_add_shape(body, shape->get_rid(), get_mesh_data_resource_transform(i));
MDRColliders c;
_collider_bodies.push_back(body);
RID body = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC);
c.body = body;
c.transform = get_mesh_data_resource_transform(i);
PhysicsServer::get_singleton()->body_add_shape(body, shape->get_rid());
//TODO store the layer mask somewhere
PhysicsServer::get_singleton()->body_set_collision_layer(body, 1);
PhysicsServer::get_singleton()->body_set_collision_mask(body, 1);
if (get_voxel_world()->is_inside_tree() && get_voxel_world()->is_inside_world()) {
Ref<World> world = get_voxel_world()->GET_WORLD();
if (world.is_valid() && world->get_space() != RID())
PhysicsServer::get_singleton()->body_set_space(body, world->get_space());
}
_collider_bodies.push_back(c);
}
}
#endif

10
world/default/voxel_chunk_default.h
View File

@ -227,6 +227,14 @@ public:
VoxelChunkDefault();
~VoxelChunkDefault();
#if MESH_DATA_RESOURCE_PRESENT
protected:
struct MDRColliders {
Transform transform;
RID body;
};
#endif
protected:
virtual void _setup_channels();
virtual void _build_phase(int phase);
@ -291,7 +299,7 @@ protected:
Vector<Ref<VoxelLight> > _lights;
#if MESH_DATA_RESOURCE_PRESENT
Vector<RID> _collider_bodies;
Vector<MDRColliders> _collider_bodies;
#endif
};