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

Small improvements. Also added commented out code for debugging the terrarin meshes (They will need to be converted be lines).

Browse Source
This commit is contained in:
Relintai 2020-06-29 23:44:54 +02:00
parent b54a1021d4
commit bb2f13b075
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
world/default/voxel_chunk_default.cpp
View File

@ -775,6 +775,10 @@ void VoxelChunkDefault::debug_mesh_array_clear() {
} }
void VoxelChunkDefault::debug_mesh_add_vertices_to(const PoolVector3Array &arr) { void VoxelChunkDefault::debug_mesh_add_vertices_to(const PoolVector3Array &arr) {
_debug_mesh_array.append_array(arr); _debug_mesh_array.append_array(arr);
if (_debug_mesh_array.size() % 2 == 1) {
_debug_mesh_array.append(_debug_mesh_array[_debug_mesh_array.size() - 1]);
}
} }
void VoxelChunkDefault::debug_mesh_send() { void VoxelChunkDefault::debug_mesh_send() {
debug_mesh_allocate(); debug_mesh_allocate();
@ -794,6 +798,8 @@ void VoxelChunkDefault::debug_mesh_send() {
if (st) { if (st) {
VisualServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid()); VisualServer::get_singleton()->mesh_surface_set_material(_debug_mesh_rid, 0, SceneTree::get_singleton()->get_debug_collision_material()->get_rid());
} }
debug_mesh_array_clear();
} }
void VoxelChunkDefault::draw_cross_voxels(Vector3 pos) { void VoxelChunkDefault::draw_cross_voxels(Vector3 pos) {
@ -1174,6 +1180,8 @@ VoxelChunkDefault::~VoxelChunkDefault() {
_lights.clear(); _lights.clear();
debug_mesh_free();
#if MESH_DATA_RESOURCE_PRESENT #if MESH_DATA_RESOURCE_PRESENT
for (int i = 0; i < _collider_bodies.size(); ++i) { for (int i = 0; i < _collider_bodies.size(); ++i) {
PhysicsServer::get_singleton()->free(_collider_bodies[i].body); PhysicsServer::get_singleton()->free(_collider_bodies[i].body);
@ -1259,6 +1267,17 @@ void VoxelChunkDefault::_build_phase(int phase) {
temp_arr_collider.append_array(mesher->build_collider()); temp_arr_collider.append_array(mesher->build_collider());
} }
/*
#if TOOLS_ENABLED
if (SceneTree::get_singleton()->is_debugging_collisions_hint()) {
SceneTree *st = SceneTree::get_singleton();
if (st && temp_arr_collider.size() > 0) {
debug_mesh_add_vertices_to(temp_arr_collider);
}
}
#endif
*/
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
for (int i = 0; i < _liquid_meshers.size(); ++i) { for (int i = 0; i < _liquid_meshers.size(); ++i) {
Ref<VoxelMesher> mesher = _liquid_meshers.get(i); Ref<VoxelMesher> mesher = _liquid_meshers.get(i);
@ -1267,6 +1286,17 @@ void VoxelChunkDefault::_build_phase(int phase) {
temp_arr_collider_liquid.append_array(mesher->build_collider()); temp_arr_collider_liquid.append_array(mesher->build_collider());
} }
/*
#if TOOLS_ENABLED
if (SceneTree::get_singleton()->is_debugging_collisions_hint()) {
SceneTree *st = SceneTree::get_singleton();
if (st && temp_arr_collider_liquid.size() > 0) {
debug_mesh_add_vertices_to(temp_arr_collider_liquid);
}
}
#endif
*/
} }
if (temp_arr_collider.size() == 0 && temp_arr_collider_liquid.size() == 0 if (temp_arr_collider.size() == 0 && temp_arr_collider_liquid.size() == 0
@ -1657,6 +1687,12 @@ void VoxelChunkDefault::_build_phase(int phase) {
} }
#endif #endif
case BUILD_PHASE_FINALIZE: { case BUILD_PHASE_FINALIZE: {
#if TOOLS_ENABLED
if (_debug_mesh_array.size() > 0) {
debug_mesh_send();
}
#endif
call_deferred("update_transforms"); call_deferred("update_transforms");
next_phase(); next_phase();
@ -1744,7 +1780,6 @@ void VoxelChunkDefault::_build_phase_physics_process(int phase) {
#if TOOLS_ENABLED #if TOOLS_ENABLED
if (SceneTree::get_singleton()->is_debugging_collisions_hint() && _collider_bodies.size() > 0) { if (SceneTree::get_singleton()->is_debugging_collisions_hint() && _collider_bodies.size() > 0) {
draw_debug_mdr_colliders(); draw_debug_mdr_colliders();
debug_mesh_send();
} }
#endif #endif