Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-04-25 21:25:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

A bit more work on areas. They don't work properly yet, they might need to have a closed mesh.

Browse Source
This commit is contained in:
Relintai 2020-04-20 17:30:22 +02:00
parent ed990caa32
commit 9635ef064c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
world/default/voxel_chunk_default.cpp
View File

@ -576,7 +576,8 @@ void VoxelChunkDefault::free_meshes(const int mesh_index) {
} }
void VoxelChunkDefault::create_colliders(const int mesh_index, const int layer_mask) { void VoxelChunkDefault::create_colliders(const int mesh_index, const int layer_mask) {
ERR_FAIL_COND(_voxel_world == Variant()); ERR_FAIL_COND(_voxel_world == NULL);
ERR_FAIL_COND(PhysicsServer::get_singleton()->is_flushing_queries());
if (!_rids.has(mesh_index)) if (!_rids.has(mesh_index))
_rids[mesh_index] = Dictionary(); _rids[mesh_index] = Dictionary();
@ -609,7 +610,8 @@ void VoxelChunkDefault::create_colliders(const int mesh_index, const int layer_m
_rids[mesh_index] = m; _rids[mesh_index] = m;
} }
void VoxelChunkDefault::create_colliders_area(const int mesh_index, const int layer_mask) { void VoxelChunkDefault::create_colliders_area(const int mesh_index, const int layer_mask) {
ERR_FAIL_COND(_voxel_world == Variant()); ERR_FAIL_COND(_voxel_world == NULL);
ERR_FAIL_COND(PhysicsServer::get_singleton()->is_flushing_queries());
if (!_rids.has(mesh_index)) if (!_rids.has(mesh_index))
_rids[mesh_index] = Dictionary(); _rids[mesh_index] = Dictionary();
@ -622,11 +624,17 @@ void VoxelChunkDefault::create_colliders_area(const int mesh_index, const int la
RID shape_rid = PhysicsServer::get_singleton()->shape_create(PhysicsServer::SHAPE_CONCAVE_POLYGON); RID shape_rid = PhysicsServer::get_singleton()->shape_create(PhysicsServer::SHAPE_CONCAVE_POLYGON);
RID area_rid = PhysicsServer::get_singleton()->area_create(); RID area_rid = PhysicsServer::get_singleton()->area_create();
PhysicsServer::get_singleton()->area_attach_object_instance_id(area_rid, _voxel_world->get_instance_id());
PhysicsServer::get_singleton()->area_set_param(area_rid, PhysicsServer::AREA_PARAM_GRAVITY, 9.8);
PhysicsServer::get_singleton()->area_set_param(area_rid, PhysicsServer::AREA_PARAM_GRAVITY_VECTOR, Vector3(0, -1, 0));
//PhysicsServer::get_singleton()->area_set_monitor_callback(area_rid, this, "_body_area_inout");
//PhysicsServer::get_singleton()->area_set_area_monitor_callback(area_rid, this, "_body_area_area_inout");
//PhysicsServer::get_singleton()->area_set_monitorable(area_rid, true);
PhysicsServer::get_singleton()->area_set_collision_layer(area_rid, layer_mask); PhysicsServer::get_singleton()->area_set_collision_layer(area_rid, layer_mask);
PhysicsServer::get_singleton()->area_set_collision_mask(area_rid, layer_mask); PhysicsServer::get_singleton()->area_set_collision_mask(area_rid, layer_mask);
PhysicsServer::get_singleton()->area_add_shape(area_rid, shape_rid, get_transform());
if (get_voxel_world()->is_inside_world()) { if (get_voxel_world()->is_inside_world()) {
Ref<World> world = get_voxel_world()->get_world(); Ref<World> world = get_voxel_world()->get_world();
@ -634,11 +642,14 @@ void VoxelChunkDefault::create_colliders_area(const int mesh_index, const int la
PhysicsServer::get_singleton()->area_set_space(area_rid, world->get_space()); PhysicsServer::get_singleton()->area_set_space(area_rid, world->get_space());
} }
PhysicsServer::get_singleton()->area_add_shape(area_rid, shape_rid, get_transform());
m[MESH_TYPE_INDEX_AREA] = area_rid; m[MESH_TYPE_INDEX_AREA] = area_rid;
m[MESH_TYPE_INDEX_SHAPE] = shape_rid; m[MESH_TYPE_INDEX_SHAPE] = shape_rid;
_rids[mesh_index] = m; _rids[mesh_index] = m;
} }
void VoxelChunkDefault::free_colliders(const int mesh_index) { void VoxelChunkDefault::free_colliders(const int mesh_index) {
if (!_rids.has(mesh_index)) if (!_rids.has(mesh_index))
return; return;