diff --git a/modules/terraman/world/terrain_chunk.cpp b/modules/terraman/world/terrain_chunk.cpp index 6cfa2374e..b4aed2ae6 100644 --- a/modules/terraman/world/terrain_chunk.cpp +++ b/modules/terraman/world/terrain_chunk.cpp @@ -910,11 +910,11 @@ void TerrainChunk::clear_baked_lights() { } #ifdef MODULE_PROPS_ENABLED -void TerrainChunk::prop_add(const Transform &tarnsform, const Ref &prop, const bool p_owner) { +void TerrainChunk::prop_add(const Transform &tarnsform, const Ref &prop, const bool p_original) { ERR_FAIL_COND(!prop.is_valid()); PropDataStore s; - s.owner = p_owner; + s.original = p_original; s.transform = tarnsform; 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; } -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); - 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()); - _props.write[index].owner = p_owner; + _props.write[index].original = p_original; } int TerrainChunk::prop_get_count() const { @@ -972,7 +972,7 @@ Array TerrainChunk::props_get() { for (int i = 0; i < _props.size(); i++) { 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].prop.get_ref_ptr()); @@ -989,11 +989,11 @@ void TerrainChunk::props_set(const Array &p_props) { ERR_CONTINUE(prop_data.size() != 3); - bool owner = prop_data[0]; + bool original = prop_data[0]; Transform transform = prop_data[1]; Ref prop = Ref(prop_data[2]); - prop_add(transform, prop, owner); + prop_add(transform, prop, original); } } #endif @@ -1822,7 +1822,7 @@ void TerrainChunk::_bind_methods() { //Meshes #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_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_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_set_is_owner", "index", "owner"), &TerrainChunk::prop_set_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_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_remove", "index"), &TerrainChunk::prop_remove); diff --git a/modules/terraman/world/terrain_chunk.h b/modules/terraman/world/terrain_chunk.h index 52b9b1ca5..defaf8fe8 100644 --- a/modules/terraman/world/terrain_chunk.h +++ b/modules/terraman/world/terrain_chunk.h @@ -260,7 +260,7 @@ public: void clear_baked_lights(); #ifdef MODULE_PROPS_ENABLED - void prop_add(const Transform &tarnsform, const Ref &prop, const bool p_owner = true); + void prop_add(const Transform &tarnsform, const Ref &prop, const bool p_original = true); Ref prop_get(const int index); void prop_set(const int index, const Ref &p_prop); @@ -268,8 +268,8 @@ public: Transform prop_get_tarnsform(const int index); void prop_set_tarnsform(const int index, const Transform &p_transform); - bool prop_get_is_owner(const int index); - void prop_set_is_owner(const int index, const bool p_owner); + bool prop_get_is_original(const int index); + void prop_set_is_original(const int index, const bool p_original); int prop_get_count() const; void prop_remove(const int index); @@ -361,7 +361,7 @@ protected: protected: #ifdef MODULE_PROPS_ENABLED struct PropDataStore { - bool owner; + bool original; Transform transform; Ref prop; }; diff --git a/modules/terraman/world/terrain_world.cpp b/modules/terraman/world/terrain_world.cpp index 1160974a1..37ea08eb4 100644 --- a/modules/terraman/world/terrain_world.cpp +++ b/modules/terraman/world/terrain_world.cpp @@ -614,7 +614,7 @@ int TerrainWorld::generation_get_size() const { } #ifdef MODULE_PROPS_ENABLED -void TerrainWorld::prop_add(Transform transform, const Ref &prop, const bool apply_voxel_scale, const bool p_owner) { +void TerrainWorld::prop_add(Transform transform, const Ref &prop, const bool apply_voxel_scale, const bool p_original) { ERR_FAIL_COND(!prop.is_valid()); if (apply_voxel_scale) { @@ -625,7 +625,7 @@ void TerrainWorld::prop_add(Transform transform, const Ref &prop, cons wp = transform.xform(wp); Ref 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(); 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); #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 //Lights diff --git a/modules/terraman/world/terrain_world.h b/modules/terraman/world/terrain_world.h index 37db50fab..1154327af 100644 --- a/modules/terraman/world/terrain_world.h +++ b/modules/terraman/world/terrain_world.h @@ -176,7 +176,7 @@ public: int generation_get_size() const; #ifdef MODULE_PROPS_ENABLED - void prop_add(Transform transform, const Ref &prop, const bool apply_voxel_scale = true, const bool p_owner = true); + void prop_add(Transform transform, const Ref &prop, const bool apply_voxel_scale = true, const bool p_original = true); #endif //Lights