From f1413993458d9a60271e1e3a551376a667210752 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 26 May 2022 18:38:01 +0200 Subject: [PATCH] Removed the _texture_ infix from the methods in TiledWallData which were not supposed to have it. --- modules/props/tiled_wall/tiled_wall_data.cpp | 32 ++++++++++---------- modules/props/tiled_wall/tiled_wall_data.h | 16 +++++----- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/props/tiled_wall/tiled_wall_data.cpp b/modules/props/tiled_wall/tiled_wall_data.cpp index f979a2936..09ec7d9a1 100644 --- a/modules/props/tiled_wall/tiled_wall_data.cpp +++ b/modules/props/tiled_wall/tiled_wall_data.cpp @@ -85,12 +85,12 @@ void TiledWallData::set_tile_texture(const int index, const Ref &textur emit_changed(); } -Vector2 TiledWallData::get_tile_texture_size(const int index) const { +Vector2 TiledWallData::get_tile_size(const int index) const { ERR_FAIL_INDEX_V(index, _textures.size(), Vector2(1, 1)); return _textures.get(index).size; } -void TiledWallData::set_tile_texture_size(const int index, const Vector2 &val) { +void TiledWallData::set_tile_size(const int index, const Vector2 &val) { ERR_FAIL_INDEX(index, _textures.size()); _textures.write[index].size = val; @@ -98,12 +98,12 @@ void TiledWallData::set_tile_texture_size(const int index, const Vector2 &val) { emit_changed(); } -float TiledWallData::get_tile_texture_z_offset(const int index) const { +float TiledWallData::get_tile_z_offset(const int index) const { ERR_FAIL_INDEX_V(index, _textures.size(), 0); return _textures.get(index).z_offset; } -void TiledWallData::set_tile_texture_z_offset(const int index, const float val) { +void TiledWallData::set_tile_z_offset(const int index, const float val) { ERR_FAIL_INDEX(index, _textures.size()); _textures.write[index].z_offset = val; @@ -144,12 +144,12 @@ void TiledWallData::set_flavour_tile_texture(const int index, const Ref emit_changed(); } -Vector2 TiledWallData::get_flavour_tile_texture_size(const int index) const { +Vector2 TiledWallData::get_flavour_tile_size(const int index) const { ERR_FAIL_INDEX_V(index, _flavour_textures.size(), Vector2(1, 1)); return _flavour_textures.get(index).size; } -void TiledWallData::set_flavour_tile_texture_size(const int index, const Vector2 &val) { +void TiledWallData::set_flavour_tile_size(const int index, const Vector2 &val) { ERR_FAIL_INDEX(index, _flavour_textures.size()); _flavour_textures.write[index].size = val; @@ -157,12 +157,12 @@ void TiledWallData::set_flavour_tile_texture_size(const int index, const Vector2 emit_changed(); } -float TiledWallData::get_flavour_tile_texture_z_offset(const int index) const { +float TiledWallData::get_flavour_tile_z_offset(const int index) const { ERR_FAIL_INDEX_V(index, _flavour_textures.size(), 0); return _flavour_textures.get(index).z_offset; } -void TiledWallData::set_flavour_tile_texture_z_offset(const int index, const float val) { +void TiledWallData::set_flavour_tile_z_offset(const int index, const float val) { ERR_FAIL_INDEX(index, _flavour_textures.size()); _flavour_textures.write[index].z_offset = val; @@ -452,11 +452,11 @@ void TiledWallData::_bind_methods() { ClassDB::bind_method(D_METHOD("get_tile_texture", "index"), &TiledWallData::get_tile_texture); ClassDB::bind_method(D_METHOD("set_tile_texture", "index", "texture"), &TiledWallData::set_tile_texture); - ClassDB::bind_method(D_METHOD("get_tile_texture_size", "index"), &TiledWallData::get_tile_texture_size); - ClassDB::bind_method(D_METHOD("set_tile_texture_size", "index", "val"), &TiledWallData::set_tile_texture_size); + ClassDB::bind_method(D_METHOD("get_tile_size", "index"), &TiledWallData::get_tile_size); + ClassDB::bind_method(D_METHOD("set_tile_size", "index", "val"), &TiledWallData::set_tile_size); - ClassDB::bind_method(D_METHOD("get_tile_texture_z_offset", "index"), &TiledWallData::get_tile_texture_z_offset); - ClassDB::bind_method(D_METHOD("set_tile_texture_z_offset", "index", "val"), &TiledWallData::set_tile_texture_z_offset); + ClassDB::bind_method(D_METHOD("get_tile_z_offset", "index"), &TiledWallData::get_tile_z_offset); + ClassDB::bind_method(D_METHOD("set_tile_z_offset", "index", "val"), &TiledWallData::set_tile_z_offset); ClassDB::bind_method(D_METHOD("get_tile_count"), &TiledWallData::get_tile_count); ClassDB::bind_method(D_METHOD("set_tile_count", "count"), &TiledWallData::set_tile_count); @@ -469,11 +469,11 @@ void TiledWallData::_bind_methods() { ClassDB::bind_method(D_METHOD("get_flavour_tile_texture", "index"), &TiledWallData::get_flavour_tile_texture); ClassDB::bind_method(D_METHOD("set_flavour_tile_texture", "index", "texture"), &TiledWallData::set_flavour_tile_texture); - ClassDB::bind_method(D_METHOD("get_flavour_tile_texture_size", "index"), &TiledWallData::get_flavour_tile_texture_size); - ClassDB::bind_method(D_METHOD("set_flavour_tile_texture_size", "index", "val"), &TiledWallData::set_flavour_tile_texture_size); + ClassDB::bind_method(D_METHOD("get_flavour_tile_size", "index"), &TiledWallData::get_flavour_tile_size); + ClassDB::bind_method(D_METHOD("set_flavour_tile_size", "index", "val"), &TiledWallData::set_flavour_tile_size); - ClassDB::bind_method(D_METHOD("get_flavour_tile_texture_z_offset", "index"), &TiledWallData::get_flavour_tile_texture_z_offset); - ClassDB::bind_method(D_METHOD("set_flavour_tile_texture_z_offset", "index", "val"), &TiledWallData::set_flavour_tile_texture_z_offset); + ClassDB::bind_method(D_METHOD("get_flavour_tile_z_offset", "index"), &TiledWallData::get_flavour_tile_z_offset); + ClassDB::bind_method(D_METHOD("set_flavour_tile_z_offset", "index", "val"), &TiledWallData::set_flavour_tile_z_offset); ClassDB::bind_method(D_METHOD("get_flavour_tile_count"), &TiledWallData::get_flavour_tile_count); ClassDB::bind_method(D_METHOD("set_flavour_tile_count", "count"), &TiledWallData::set_flavour_tile_count); diff --git a/modules/props/tiled_wall/tiled_wall_data.h b/modules/props/tiled_wall/tiled_wall_data.h index 205ba6ccf..7d4722305 100644 --- a/modules/props/tiled_wall/tiled_wall_data.h +++ b/modules/props/tiled_wall/tiled_wall_data.h @@ -76,11 +76,11 @@ public: Ref get_tile_texture(const int index) const; void set_tile_texture(const int index, const Ref &texture); - Vector2 get_tile_texture_size(const int index) const; - void set_tile_texture_size(const int index, const Vector2 &val); + Vector2 get_tile_size(const int index) const; + void set_tile_size(const int index, const Vector2 &val); - float get_tile_texture_z_offset(const int index) const; - void set_tile_texture_z_offset(const int index, const float val); + float get_tile_z_offset(const int index) const; + void set_tile_z_offset(const int index, const float val); int get_tile_count() const; void set_tile_count(const int count); @@ -92,11 +92,11 @@ public: Ref get_flavour_tile_texture(const int index) const; void set_flavour_tile_texture(const int index, const Ref &texture); - Vector2 get_flavour_tile_texture_size(const int index) const; - void set_flavour_tile_texture_size(const int index, const Vector2 &val); + Vector2 get_flavour_tile_size(const int index) const; + void set_flavour_tile_size(const int index, const Vector2 &val); - float get_flavour_tile_texture_z_offset(const int index) const; - void set_flavour_tile_texture_z_offset(const int index, const float val); + float get_flavour_tile_z_offset(const int index) const; + void set_flavour_tile_z_offset(const int index, const float val); int get_flavour_tile_count() const; void set_flavour_tile_count(const int count);