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

Now VoxelChunkDefault will move it's meshes if it's transform changes, free them on EXIT_TREE, and sets their visibility. Also added a few missing break statements.

Browse Source
This commit is contained in:
Relintai 2020-03-15 19:33:10 +01:00
parent 080e8f2437
commit 666695a220
3 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
world/voxel_chunk_default.cpp
View File

@ -475,6 +475,20 @@ void VoxelChunkDefault::free_clutter_mesh() {
} }
} }
void VoxelChunkDefault::update_transforms() {
if (get_mesh_instance_rid() != RID())
VS::get_singleton()->instance_set_transform(get_mesh_instance_rid(), get_transform());
if (get_prop_mesh_instance_rid() != RID())
VS::get_singleton()->instance_set_transform(get_prop_mesh_instance_rid(), get_transform());
if (get_body_rid() != RID())
PhysicsServer::get_singleton()->body_set_state(get_body_rid(), PhysicsServer::BODY_STATE_TRANSFORM, get_transform());
if (get_prop_body_rid() != RID())
PhysicsServer::get_singleton()->body_set_state(get_prop_body_rid(), PhysicsServer::BODY_STATE_TRANSFORM, get_transform());
}
void VoxelChunkDefault::create_debug_immediate_geometry() { void VoxelChunkDefault::create_debug_immediate_geometry() {
ERR_FAIL_COND(_voxel_world == NULL); ERR_FAIL_COND(_voxel_world == NULL);
ERR_FAIL_COND(_debug_drawer != NULL); ERR_FAIL_COND(_debug_drawer != NULL);
@ -592,6 +606,14 @@ void VoxelChunkDefault::draw_debug_voxel_lights() {
_debug_drawer->end(); _debug_drawer->end();
} }
void VoxelChunkDefault::set_visibility(bool visible) {
if (get_mesh_instance_rid() != RID())
VS::get_singleton()->instance_set_visible(get_mesh_instance_rid(), is_visible_in_tree());
if (get_prop_mesh_instance_rid() != RID())
VS::get_singleton()->instance_set_visible(get_prop_mesh_instance_rid(), is_visible_in_tree());
}
void VoxelChunkDefault::free_chunk() { void VoxelChunkDefault::free_chunk() {
free_main_mesh(); free_main_mesh();
remove_colliders(); remove_colliders();
@ -652,13 +674,6 @@ VoxelChunkDefault::~VoxelChunkDefault() {
wait_and_finish_thread(); wait_and_finish_thread();
} }
free_main_mesh();
remove_colliders();
free_prop_mesh();
free_prop_colliders();
free_liquid_mesh();
free_clutter_mesh();
memdelete(_build_phase_done_mutex); memdelete(_build_phase_done_mutex);
} }
@ -908,6 +923,8 @@ void VoxelChunkDefault::_build_phase(int phase) {
if (_clutter_mesh_instance_rid != RID()) if (_clutter_mesh_instance_rid != RID())
VS::get_singleton()->instance_set_visible(_clutter_mesh_instance_rid, is_visible()); VS::get_singleton()->instance_set_visible(_clutter_mesh_instance_rid, is_visible());
update_transforms();
next_phase(); next_phase();
return; return;
@ -1028,13 +1045,29 @@ void VoxelChunkDefault::_build(bool immediate) {
void VoxelChunkDefault::_notification(int p_what) { void VoxelChunkDefault::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_VISIBILITY_CHANGED: {
if (is_inside_tree()) {
set_visibility(is_visible_in_tree());
}
}
case NOTIFICATION_ENTER_TREE: {
set_notify_transform(true);
} break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
if (_build_thread) { if (_build_thread) {
_abort_build = true; _abort_build = true;
wait_and_finish_thread(); wait_and_finish_thread();
} }
}
free_main_mesh();
remove_colliders();
free_prop_mesh();
free_prop_colliders();
free_liquid_mesh();
free_clutter_mesh();
} break;
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
if (!get_is_generating() || !has_next_phase() || _build_step_in_progress) { if (!get_is_generating() || !has_next_phase() || _build_step_in_progress) {
return; return;
@ -1070,6 +1103,7 @@ void VoxelChunkDefault::_notification(int p_what) {
case BUILD_PHASE_TYPE_PHYSICS_PROCESS: case BUILD_PHASE_TYPE_PHYSICS_PROCESS:
return; return;
} }
break;
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: { case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
if (!get_is_generating() || !has_next_phase() || _build_step_in_progress) { if (!get_is_generating() || !has_next_phase() || _build_step_in_progress) {
return; return;
@ -1093,7 +1127,10 @@ void VoxelChunkDefault::_notification(int p_what) {
return; return;
} }
} } break;
case NOTIFICATION_TRANSFORM_CHANGED: {
update_transforms();
} break;
} }
} }
} }
@ -1216,6 +1253,8 @@ void VoxelChunkDefault::_bind_methods() {
ClassDB::bind_method(D_METHOD("_create_meshers"), &VoxelChunkDefault::_create_meshers); ClassDB::bind_method(D_METHOD("_create_meshers"), &VoxelChunkDefault::_create_meshers);
ClassDB::bind_method(D_METHOD("_build", "immediate"), &VoxelChunkDefault::_build); ClassDB::bind_method(D_METHOD("_build", "immediate"), &VoxelChunkDefault::_build);
//ClassDB::bind_method(D_METHOD("set_visibility", "visible"), &VoxelChunkDefault::set_visibility);
BIND_CONSTANT(BUILD_PHASE_DONE); BIND_CONSTANT(BUILD_PHASE_DONE);
BIND_CONSTANT(BUILD_PHASE_SETUP); BIND_CONSTANT(BUILD_PHASE_SETUP);
BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH_SETUP); BIND_CONSTANT(BUILD_PHASE_TERRARIN_MESH_SETUP);

4
world/voxel_chunk_default.h
View File

@ -193,6 +193,8 @@ public:
void allocate_clutter_mesh(); void allocate_clutter_mesh();
void free_clutter_mesh(); void free_clutter_mesh();
void update_transforms();
//Debug //Debug
void create_debug_immediate_geometry(); void create_debug_immediate_geometry();
void free_debug_immediate_geometry(); void free_debug_immediate_geometry();
@ -202,6 +204,8 @@ public:
void draw_debug_voxels(int max, Color color = Color(1, 1, 1)); void draw_debug_voxels(int max, Color color = Color(1, 1, 1));
void draw_debug_voxel_lights(); void draw_debug_voxel_lights();
void set_visibility(bool visible);
//free //free
void free_chunk(); void free_chunk();

6
world/voxel_world.cpp
View File

@ -424,7 +424,7 @@ void VoxelWorld::_notification(int p_what) {
if (!Engine::get_singleton()->is_editor_hint() && _library.is_valid()) if (!Engine::get_singleton()->is_editor_hint() && _library.is_valid())
_library->refresh_rects(); _library->refresh_rects();
} } break;
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
_num_frame_chunk_build_steps = 0; _num_frame_chunk_build_steps = 0;
@ -463,9 +463,9 @@ void VoxelWorld::_notification(int p_what) {
generate_chunk(chunk); generate_chunk(chunk);
} }
} } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
} } break;
} }
} }