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

Renamed the new original parameter in TerrainChunk and TerrainWorld's prop api from owner to original.

Browse Source
This commit is contained in:
Relintai 2025-02-14 15:32:54 +01:00
parent 0a87629b01
commit 2054f60c6d
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -910,11 +910,11 @@ void TerrainChunk::clear_baked_lights() {
} }
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
void TerrainChunk::prop_add(const Transform &tarnsform, const Ref<PropData> &prop, const bool p_owner) { void TerrainChunk::prop_add(const Transform &tarnsform, const Ref<PropData> &prop, const bool p_original) {
ERR_FAIL_COND(!prop.is_valid()); ERR_FAIL_COND(!prop.is_valid());
PropDataStore s; PropDataStore s;
s.owner = p_owner; s.original = p_original;
s.transform = tarnsform; s.transform = tarnsform;
s.prop = prop; s.prop = prop;
@ -943,15 +943,15 @@ void TerrainChunk::prop_set_tarnsform(const int index, const Transform &p_transf
_props.write[index].transform = p_transform; _props.write[index].transform = p_transform;
} }
bool TerrainChunk::prop_get_is_owner(const int index) { bool TerrainChunk::prop_get_is_original(const int index) {
ERR_FAIL_INDEX_V(index, _props.size(), false); ERR_FAIL_INDEX_V(index, _props.size(), false);
return _props.get(index).owner; return _props.get(index).original;
} }
void TerrainChunk::prop_set_is_owner(const int index, const bool p_owner) { void TerrainChunk::prop_set_is_original(const int index, const bool p_original) {
ERR_FAIL_INDEX(index, _props.size()); ERR_FAIL_INDEX(index, _props.size());
_props.write[index].owner = p_owner; _props.write[index].original = p_original;
} }
int TerrainChunk::prop_get_count() const { int TerrainChunk::prop_get_count() const {
@ -972,7 +972,7 @@ Array TerrainChunk::props_get() {
for (int i = 0; i < _props.size(); i++) { for (int i = 0; i < _props.size(); i++) {
Array prop_data; Array prop_data;
prop_data.push_back(_props[i].owner); prop_data.push_back(_props[i].original);
prop_data.push_back(_props[i].transform); prop_data.push_back(_props[i].transform);
prop_data.push_back(_props[i].prop.get_ref_ptr()); prop_data.push_back(_props[i].prop.get_ref_ptr());
@ -989,11 +989,11 @@ void TerrainChunk::props_set(const Array &p_props) {
ERR_CONTINUE(prop_data.size() != 3); ERR_CONTINUE(prop_data.size() != 3);
bool owner = prop_data[0]; bool original = prop_data[0];
Transform transform = prop_data[1]; Transform transform = prop_data[1];
Ref<PropData> prop = Ref<PropData>(prop_data[2]); Ref<PropData> prop = Ref<PropData>(prop_data[2]);
prop_add(transform, prop, owner); prop_add(transform, prop, original);
} }
} }
#endif #endif
@ -1822,7 +1822,7 @@ void TerrainChunk::_bind_methods() {
//Meshes //Meshes
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
ClassDB::bind_method(D_METHOD("prop_add", "prop", "owner"), &TerrainChunk::prop_add, DEFVAL(true)); ClassDB::bind_method(D_METHOD("prop_add", "prop", "original"), &TerrainChunk::prop_add, DEFVAL(true));
ClassDB::bind_method(D_METHOD("prop_get", "index"), &TerrainChunk::prop_get); ClassDB::bind_method(D_METHOD("prop_get", "index"), &TerrainChunk::prop_get);
ClassDB::bind_method(D_METHOD("prop_set", "index", "prop"), &TerrainChunk::prop_set); ClassDB::bind_method(D_METHOD("prop_set", "index", "prop"), &TerrainChunk::prop_set);
@ -1830,8 +1830,8 @@ void TerrainChunk::_bind_methods() {
ClassDB::bind_method(D_METHOD("prop_get_tarnsform", "index"), &TerrainChunk::prop_get_tarnsform); ClassDB::bind_method(D_METHOD("prop_get_tarnsform", "index"), &TerrainChunk::prop_get_tarnsform);
ClassDB::bind_method(D_METHOD("prop_set_tarnsform", "index", "transform"), &TerrainChunk::prop_set_tarnsform); ClassDB::bind_method(D_METHOD("prop_set_tarnsform", "index", "transform"), &TerrainChunk::prop_set_tarnsform);
ClassDB::bind_method(D_METHOD("prop_get_is_owner", "index"), &TerrainChunk::prop_get_is_owner); ClassDB::bind_method(D_METHOD("prop_get_is_original", "index"), &TerrainChunk::prop_get_is_original);
ClassDB::bind_method(D_METHOD("prop_set_is_owner", "index", "owner"), &TerrainChunk::prop_set_is_owner); ClassDB::bind_method(D_METHOD("prop_set_is_original", "index", "original"), &TerrainChunk::prop_set_is_original);
ClassDB::bind_method(D_METHOD("prop_get_count"), &TerrainChunk::prop_get_count); ClassDB::bind_method(D_METHOD("prop_get_count"), &TerrainChunk::prop_get_count);
ClassDB::bind_method(D_METHOD("prop_remove", "index"), &TerrainChunk::prop_remove); ClassDB::bind_method(D_METHOD("prop_remove", "index"), &TerrainChunk::prop_remove);

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

@ -260,7 +260,7 @@ public:
void clear_baked_lights(); void clear_baked_lights();
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
void prop_add(const Transform &tarnsform, const Ref<PropData> &prop, const bool p_owner = true); void prop_add(const Transform &tarnsform, const Ref<PropData> &prop, const bool p_original = true);
Ref<PropData> prop_get(const int index); Ref<PropData> prop_get(const int index);
void prop_set(const int index, const Ref<PropData> &p_prop); void prop_set(const int index, const Ref<PropData> &p_prop);
@ -268,8 +268,8 @@ public:
Transform prop_get_tarnsform(const int index); Transform prop_get_tarnsform(const int index);
void prop_set_tarnsform(const int index, const Transform &p_transform); void prop_set_tarnsform(const int index, const Transform &p_transform);
bool prop_get_is_owner(const int index); bool prop_get_is_original(const int index);
void prop_set_is_owner(const int index, const bool p_owner); void prop_set_is_original(const int index, const bool p_original);
int prop_get_count() const; int prop_get_count() const;
void prop_remove(const int index); void prop_remove(const int index);
@ -361,7 +361,7 @@ protected:
protected: protected:
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
struct PropDataStore { struct PropDataStore {
bool owner; bool original;
Transform transform; Transform transform;
Ref<PropData> prop; Ref<PropData> prop;
}; };

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

@ -614,7 +614,7 @@ int TerrainWorld::generation_get_size() const {
} }
#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_owner) { 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());
if (apply_voxel_scale) { if (apply_voxel_scale) {
@ -625,7 +625,7 @@ void TerrainWorld::prop_add(Transform transform, const Ref<PropData> &prop, cons
wp = transform.xform(wp); wp = transform.xform(wp);
Ref<TerrainChunk> chunk = get_or_create_chunk_at_world_position(wp); Ref<TerrainChunk> chunk = get_or_create_chunk_at_world_position(wp);
chunk->prop_add(transform, prop, p_owner); chunk->prop_add(transform, prop, p_original);
int count = prop->get_prop_count(); int count = prop->get_prop_count();
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
@ -1608,7 +1608,7 @@ void TerrainWorld::_bind_methods() {
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);
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
ClassDB::bind_method(D_METHOD("prop_add", "transform", "prop", "apply_voxel_scale", "owner"), &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
//Lights //Lights

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

@ -176,7 +176,7 @@ public:
int generation_get_size() const; int generation_get_size() const;
#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_owner = true); void prop_add(Transform transform, const Ref<PropData> &prop, const bool apply_voxel_scale = true, const bool p_original = true);
#endif #endif
//Lights //Lights