Zylann/godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-assign a mesher in editor for convenience

Browse Source
This commit is contained in:
Marc Gilleron 2022-07-17 20:24:49 +01:00
parent bf32742890
commit 7004ce5816
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
terrain/fixed_lod/voxel_terrain.cpp
View File

@ -18,6 +18,9 @@
#include "../../util/string_funcs.h"
#include "../instancing/voxel_instancer.h"
#include "../voxel_data_block_enter_info.h"
#ifdef TOOLS_ENABLED
#include "../../meshers/transvoxel/voxel_mesher_transvoxel.h"
#endif
#include <core/config/engine.h>
#include <core/core_string_names.h>
@ -862,6 +865,17 @@ void VoxelTerrain::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE:
set_process(true);
#ifdef TOOLS_ENABLED
// In the editor, auto-configure a default mesher, for convenience.
// Because Godot has a property hint to automatically instantiate a resource, but if that resource is
// abstract, it doesn't work... and it cannot be a default value because such practice was deprecated with a
// warning in Godot 4.
if (Engine::get_singleton()->is_editor_hint() && !get_mesher().is_valid()) {
Ref<VoxelMesherTransvoxel> mesher;
mesher.instantiate();
set_mesher(mesher);
}
#endif
break;
case NOTIFICATION_PROCESS:

17
terrain/variable_lod/voxel_lod_terrain.cpp
View File

@ -20,6 +20,9 @@
#include "../../util/thread/rw_lock.h"
#include "../instancing/voxel_instancer.h"
#include "voxel_lod_terrain_update_task.h"
#ifdef TOOLS_ENABLED
#include "../../meshers/transvoxel/voxel_mesher_transvoxel.h"
#endif
#include <core/config/engine.h>
#include <core/core_string_names.h>
@ -1116,6 +1119,20 @@ void VoxelLodTerrain::_notification(int p_what) {
break;
}
#ifdef TOOLS_ENABLED
case NOTIFICATION_ENTER_TREE:
// In the editor, auto-configure a default mesher, for convenience.
// Because Godot has a property hint to automatically instantiate a resource, but if that resource is
// abstract, it doesn't work... and it cannot be a default value because such practice was deprecated with a
// warning in Godot 4.
if (Engine::get_singleton()->is_editor_hint() && !get_mesher().is_valid()) {
Ref<VoxelMesherTransvoxel> mesher;
mesher.instantiate();
set_mesher(mesher);
}
break;
#endif
case NOTIFICATION_EXIT_TREE:
break;