Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-03-20 19:42:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented an immediate build mode for TerrainChunk.

Browse Source
This commit is contained in:
Relintai 2025-02-06 17:22:10 +01:00
parent 952553e9ad
commit 6be11c2bff
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
modules/terraman/world/terrain_chunk.cpp
View File

@ -71,13 +71,20 @@ void TerrainChunk::set_visible(const bool value) {
visibility_changed(value); visibility_changed(value);
} }
_FORCE_INLINE_ bool TerrainChunk::get_is_generating() const { bool TerrainChunk::get_is_generating() const {
return _is_generating; return _is_generating;
} }
_FORCE_INLINE_ void TerrainChunk::set_is_generating(const bool value) { void TerrainChunk::set_is_generating(const bool value) {
_is_generating = value; _is_generating = value;
} }
bool TerrainChunk::get_is_immediate_build() const {
return _is_immediate_build;
}
void TerrainChunk::set_is_immediate_build(const bool value) {
_is_immediate_build = value;
}
bool TerrainChunk::is_build_aborted() const { bool TerrainChunk::is_build_aborted() const {
return _abort_build; return _abort_build;
} }
@ -313,7 +320,11 @@ void TerrainChunk::job_next() {
j->set_complete(false); j->set_complete(false);
if (j->get_build_phase_type() == TerrainJob::BUILD_PHASE_TYPE_NORMAL) { if (j->get_build_phase_type() == TerrainJob::BUILD_PHASE_TYPE_NORMAL) {
ThreadPool::get_singleton()->add_job(j); if (!_is_immediate_build) {
ThreadPool::get_singleton()->add_job(j);
} else {
j->execute();
}
} }
} }
Ref<TerrainJob> TerrainChunk::job_get_current() { Ref<TerrainJob> TerrainChunk::job_get_current() {
@ -679,6 +690,14 @@ void TerrainChunk::build() {
call("_build"); call("_build");
} }
void TerrainChunk::build_immediate() {
ERR_FAIL_COND(!ObjectDB::instance_validate(get_voxel_world()));
ERR_FAIL_COND(!get_voxel_world()->is_inside_tree());
ERR_FAIL_COND(!is_in_tree());
call("_build_immediate");
}
void TerrainChunk::_build() { void TerrainChunk::_build() {
if (get_is_generating()) { if (get_is_generating()) {
_queued_generation = true; _queued_generation = true;
@ -686,6 +705,19 @@ void TerrainChunk::_build() {
} }
_is_generating = true; _is_generating = true;
_is_immediate_build = false;
job_next();
}
void TerrainChunk::_build_immediate() {
if (get_is_generating()) {
_queued_generation = true;
return;
}
_is_generating = true;
_is_immediate_build = true;
job_next(); job_next();
} }
@ -1096,6 +1128,7 @@ TerrainChunk::TerrainChunk() {
_is_visible = true; _is_visible = true;
_is_generating = false; _is_generating = false;
_is_immediate_build = false;
_dirty = false; _dirty = false;
_state = TERRAIN_CHUNK_STATE_OK; _state = TERRAIN_CHUNK_STATE_OK;
@ -1366,6 +1399,10 @@ void TerrainChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_is_generating", "value"), &TerrainChunk::set_is_generating); ClassDB::bind_method(D_METHOD("set_is_generating", "value"), &TerrainChunk::set_is_generating);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_generating", PROPERTY_HINT_NONE, "", 0), "set_is_generating", "get_is_generating"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_generating", PROPERTY_HINT_NONE, "", 0), "set_is_generating", "get_is_generating");
ClassDB::bind_method(D_METHOD("get_is_immediate_build"), &TerrainChunk::get_is_immediate_build);
ClassDB::bind_method(D_METHOD("set_is_immediate_build", "value"), &TerrainChunk::set_is_immediate_build);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_immediate_build", PROPERTY_HINT_NONE, "", 0), "set_is_immediate_build", "get_is_immediate_build");
ClassDB::bind_method(D_METHOD("is_build_aborted"), &TerrainChunk::is_build_aborted); ClassDB::bind_method(D_METHOD("is_build_aborted"), &TerrainChunk::is_build_aborted);
ClassDB::bind_method(D_METHOD("get_dirty"), &TerrainChunk::get_dirty); ClassDB::bind_method(D_METHOD("get_dirty"), &TerrainChunk::get_dirty);
@ -1566,6 +1603,10 @@ void TerrainChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("build"), &TerrainChunk::build); ClassDB::bind_method(D_METHOD("build"), &TerrainChunk::build);
ClassDB::bind_method(D_METHOD("_build"), &TerrainChunk::_build); ClassDB::bind_method(D_METHOD("_build"), &TerrainChunk::_build);
BIND_VMETHOD(MethodInfo("_build_immediate"));
ClassDB::bind_method(D_METHOD("build_immediate"), &TerrainChunk::build_immediate);
ClassDB::bind_method(D_METHOD("_build_immediate"), &TerrainChunk::_build_immediate);
ClassDB::bind_method(D_METHOD("get_global_transform"), &TerrainChunk::get_global_transform); ClassDB::bind_method(D_METHOD("get_global_transform"), &TerrainChunk::get_global_transform);
ClassDB::bind_method(D_METHOD("to_local", "global"), &TerrainChunk::to_local); ClassDB::bind_method(D_METHOD("to_local", "global"), &TerrainChunk::to_local);
ClassDB::bind_method(D_METHOD("to_global", "local"), &TerrainChunk::to_global); ClassDB::bind_method(D_METHOD("to_global", "local"), &TerrainChunk::to_global);

8
modules/terraman/world/terrain_chunk.h
View File

@ -89,6 +89,9 @@ public:
bool get_is_generating() const; bool get_is_generating() const;
void set_is_generating(const bool value); void set_is_generating(const bool value);
bool get_is_immediate_build() const;
void set_is_immediate_build(const bool value);
bool is_build_aborted() const; bool is_build_aborted() const;
bool is_in_tree() const; bool is_in_tree() const;
@ -216,11 +219,13 @@ public:
//Meshing //Meshing
void build(); void build();
void build_immediate();
void clear(); void clear();
void finalize_build(); void finalize_build();
void cancel_build(); void cancel_build();
void _build(); virtual void _build();
virtual void _build_immediate();
//light Baking //light Baking
void bake_lights(); void bake_lights();
@ -354,6 +359,7 @@ protected:
bool _is_visible; bool _is_visible;
bool _is_generating; bool _is_generating;
bool _is_immediate_build;
bool _dirty; bool _dirty;
int _state; int _state;