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

Added the new scene_add() method to TerrainWorld. Also store scenes from props inside chunks.

Browse Source
This commit is contained in:
Relintai 2025-02-14 17:49:07 +01:00
parent 9d6ec2bb65
commit 10c5076819
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/terraman/world/terrain_world.cpp
View File

@ -613,6 +613,16 @@ int TerrainWorld::generation_get_size() const {
return _generating.size(); return _generating.size();
} }
void TerrainWorld::scene_add(const Ref<PackedScene> &p_scene, const Transform &p_transform, const Node *p_node, const bool p_original) {
ERR_FAIL_COND(!p_scene.is_valid());
Vector3 wp;
wp = p_transform.xform(wp);
Ref<TerrainChunk> chunk = get_or_create_chunk_at_world_position(wp);
chunk->scene_add(p_scene, p_transform, p_node, p_original);
}
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
void TerrainWorld::prop_add(Transform transform, const Ref<PropData> &prop, const bool apply_voxel_scale, const bool p_original) { void TerrainWorld::prop_add(Transform transform, const Ref<PropData> &prop, const bool apply_voxel_scale, const bool p_original) {
ERR_FAIL_COND(!prop.is_valid()); ERR_FAIL_COND(!prop.is_valid());
@ -673,7 +683,7 @@ void TerrainWorld::prop_add(Transform transform, const Ref<PropData> &prop, cons
sp->set_transform(t); sp->set_transform(t);
} }
// TODO store this in a chunk, and manage loading/unloading it with it chunk->scene_add(sc, t, n, false);
continue; continue;
} }
@ -1606,6 +1616,8 @@ void TerrainWorld::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_position_walkable", "position"), &TerrainWorld::is_position_walkable); ClassDB::bind_method(D_METHOD("is_position_walkable", "position"), &TerrainWorld::is_position_walkable);
ClassDB::bind_method(D_METHOD("on_chunk_mesh_generation_finished", "chunk"), &TerrainWorld::on_chunk_mesh_generation_finished); ClassDB::bind_method(D_METHOD("on_chunk_mesh_generation_finished", "chunk"), &TerrainWorld::on_chunk_mesh_generation_finished);
ClassDB::bind_method(D_METHOD("scene_add", "scene", "transform", "node", "original"), &TerrainWorld::scene_add, DEFVAL(Transform()), DEFVAL(NULL), DEFVAL(true));
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
ClassDB::bind_method(D_METHOD("prop_add", "transform", "prop", "apply_voxel_scale", "original"), &TerrainWorld::prop_add, DEFVAL(true), DEFVAL(true)); ClassDB::bind_method(D_METHOD("prop_add", "transform", "prop", "apply_voxel_scale", "original"), &TerrainWorld::prop_add, DEFVAL(true), DEFVAL(true));
#endif #endif

2
modules/terraman/world/terrain_world.h
View File

@ -175,6 +175,8 @@ public:
void generation_remove_index(const int index); void generation_remove_index(const int index);
int generation_get_size() const; int generation_get_size() const;
void scene_add(const Ref<PackedScene> &p_scene, const Transform &p_transform = Transform(), const Node *p_node = NULL, const bool p_original = true);
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
void prop_add(Transform transform, const Ref<PropData> &prop, const bool apply_voxel_scale = true, const bool p_original = true); void prop_add(Transform transform, const Ref<PropData> &prop, const bool apply_voxel_scale = true, const bool p_original = true);
#endif #endif