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

Now VoxelWorldDefault will update lods if a player is set by default. This can be turned off via a new use_default_lod_update property. Also smaller fixes to the default lod update algorithm.

Browse Source
This commit is contained in:
Relintai 2022-02-09 14:25:32 +01:00
parent 0ab76c86bc
commit bdf5c36711
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
world/default/voxel_world_default.cpp
View File

@ -51,6 +51,15 @@ _FORCE_INLINE_ void VoxelWorldDefault::set_build_flags(const int flags) {
} }
} }
bool VoxelWorldDefault::get_use_default_lod_update() const {
return _use_default_lod_update;
}
void VoxelWorldDefault::set_use_default_lod_update(const bool value) {
_use_default_lod_update = value;
set_process_internal(_use_default_lod_update);
}
float VoxelWorldDefault::get_lod_update_interval() const { float VoxelWorldDefault::get_lod_update_interval() const {
return _lod_update_interval; return _lod_update_interval;
} }
@ -171,9 +180,7 @@ void VoxelWorldDefault::_update_lods() {
int mr = MAX(MAX(dx, dy), dz); int mr = MAX(MAX(dx, dy), dz);
mr -= _chunk_lod_falloff; mr -= _chunk_lod_falloff;
mr = CLAMP(mr, 0, _num_lods);
//Todo 3 should be _num_lod, but it's NYI, because chunk can only handle 3 lod levels for now -> FQMS needs to be fixed
mr = CLAMP(mr, 0, _num_lods - 1);
if (c->get_current_lod_level() != mr) if (c->get_current_lod_level() != mr)
c->set_current_lod_level(mr); c->set_current_lod_level(mr);
@ -290,11 +297,12 @@ int VoxelWorldDefault::_get_channel_index_info(const VoxelWorld::ChannelTypeInfo
} }
VoxelWorldDefault::VoxelWorldDefault() { VoxelWorldDefault::VoxelWorldDefault() {
_chunk_lod_falloff = 2; _chunk_lod_falloff = 4;
_lod_update_timer = 0; _lod_update_timer = 0;
_lod_update_interval = 0.5; _lod_update_interval = 0.5;
_build_flags = VoxelChunkDefault::BUILD_FLAG_CREATE_COLLIDER | VoxelChunkDefault::BUILD_FLAG_CREATE_LODS; _build_flags = VoxelChunkDefault::BUILD_FLAG_CREATE_COLLIDER | VoxelChunkDefault::BUILD_FLAG_CREATE_LODS;
_num_lods = 0; _num_lods = 0;
set_use_default_lod_update(true);
set_data_margin_start(1); set_data_margin_start(1);
set_data_margin_end(1); set_data_margin_end(1);
@ -303,13 +311,12 @@ VoxelWorldDefault::VoxelWorldDefault() {
VoxelWorldDefault ::~VoxelWorldDefault() { VoxelWorldDefault ::~VoxelWorldDefault() {
} }
/*
void VoxelWorldDefault::_notification(int p_what) { void VoxelWorldDefault::_notification(int p_what) {
VoxelWorld::_notification(p_what); VoxelWorld::_notification(p_what);
switch (p_what) { switch (p_what) {
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
if ((get_build_flags() & VoxelChunkDefault::BUILD_FLAG_CREATE_LODS) == 0) if (!_use_default_lod_update)
return; return;
if (!get_player()) { if (!get_player()) {
@ -330,7 +337,7 @@ void VoxelWorldDefault::_notification(int p_what) {
} }
} break; } break;
} }
}*/ }
void VoxelWorldDefault::_bind_methods() { void VoxelWorldDefault::_bind_methods() {
ClassDB::bind_method(D_METHOD("_chunk_added", "chunk"), &VoxelWorldDefault::_chunk_added); ClassDB::bind_method(D_METHOD("_chunk_added", "chunk"), &VoxelWorldDefault::_chunk_added);
@ -339,6 +346,10 @@ void VoxelWorldDefault::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_build_flags", "value"), &VoxelWorldDefault::set_build_flags); ClassDB::bind_method(D_METHOD("set_build_flags", "value"), &VoxelWorldDefault::set_build_flags);
ADD_PROPERTY(PropertyInfo(Variant::INT, "build_flags", PROPERTY_HINT_FLAGS, VoxelChunkDefault::BINDING_STRING_BUILD_FLAGS), "set_build_flags", "get_build_flags"); ADD_PROPERTY(PropertyInfo(Variant::INT, "build_flags", PROPERTY_HINT_FLAGS, VoxelChunkDefault::BINDING_STRING_BUILD_FLAGS), "set_build_flags", "get_build_flags");
ClassDB::bind_method(D_METHOD("get_use_default_lod_update"), &VoxelWorldDefault::get_use_default_lod_update);
ClassDB::bind_method(D_METHOD("set_use_default_lod_update", "value"), &VoxelWorldDefault::set_use_default_lod_update);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_default_lod_update"), "set_use_default_lod_update", "get_use_default_lod_update");
ClassDB::bind_method(D_METHOD("get_lod_update_interval"), &VoxelWorldDefault::get_lod_update_interval); ClassDB::bind_method(D_METHOD("get_lod_update_interval"), &VoxelWorldDefault::get_lod_update_interval);
ClassDB::bind_method(D_METHOD("set_lod_update_interval", "value"), &VoxelWorldDefault::set_lod_update_interval); ClassDB::bind_method(D_METHOD("set_lod_update_interval", "value"), &VoxelWorldDefault::set_lod_update_interval);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "lod_update_interval"), "set_lod_update_interval", "get_lod_update_interval"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "lod_update_interval"), "set_lod_update_interval", "get_lod_update_interval");

6
world/default/voxel_world_default.h
View File

@ -32,6 +32,9 @@ public:
int get_build_flags() const; int get_build_flags() const;
void set_build_flags(const int flags); void set_build_flags(const int flags);
bool get_use_default_lod_update() const;
void set_use_default_lod_update(const bool value);
float get_lod_update_interval() const; float get_lod_update_interval() const;
void set_lod_update_interval(const float value); void set_lod_update_interval(const float value);
@ -58,12 +61,13 @@ protected:
virtual void _chunk_added(Ref<VoxelChunk> chunk); virtual void _chunk_added(Ref<VoxelChunk> chunk);
int _get_channel_index_info(const ChannelTypeInfo channel_type); int _get_channel_index_info(const ChannelTypeInfo channel_type);
//virtual void _notification(int p_what); virtual void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();
private: private:
int _build_flags; int _build_flags;
bool _use_default_lod_update;
float _lod_update_timer; float _lod_update_timer;
float _lod_update_interval; float _lod_update_interval;
int _chunk_lod_falloff; int _chunk_lod_falloff;