godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace Vector2(i) with Size2(i) for methods returning a size

Browse Source
This commit is contained in:
Johan Aires Rastén 2022-09-01 11:34:15 +02:00
parent 8c7be63588
commit b7e2d45233
12 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/image.cpp
View File

@ -416,8 +416,8 @@ int Image::get_height() const {
return height; return height;
} }
Vector2i Image::get_size() const { Size2i Image::get_size() const {
return Vector2i(width, height); return Size2i(width, height);
} }
bool Image::has_mipmaps() const { bool Image::has_mipmaps() const {

2
core/io/image.h
View File

@ -209,7 +209,7 @@ private:
public: public:
int get_width() const; ///< Get image width int get_width() const; ///< Get image width
int get_height() const; ///< Get image height int get_height() const; ///< Get image height
Vector2i get_size() const; Size2i get_size() const;
bool has_mipmaps() const; bool has_mipmaps() const;
int get_mipmap_count() const; int get_mipmap_count() const;

8
core/math/a_star_grid_2d.cpp
View File

@ -57,7 +57,7 @@ static real_t heuristic_chebyshev(const Vector2i &p_from, const Vector2i &p_to)
static real_t (*heuristics[AStarGrid2D::HEURISTIC_MAX])(const Vector2i &, const Vector2i &) = { heuristic_manhattan, heuristic_euclidian, heuristic_octile, heuristic_chebyshev }; static real_t (*heuristics[AStarGrid2D::HEURISTIC_MAX])(const Vector2i &, const Vector2i &) = { heuristic_manhattan, heuristic_euclidian, heuristic_octile, heuristic_chebyshev };
void AStarGrid2D::set_size(const Vector2i &p_size) { void AStarGrid2D::set_size(const Size2i &p_size) {
ERR_FAIL_COND(p_size.x < 0 || p_size.y < 0); ERR_FAIL_COND(p_size.x < 0 || p_size.y < 0);
if (p_size != size) { if (p_size != size) {
size = p_size; size = p_size;
@ -65,7 +65,7 @@ void AStarGrid2D::set_size(const Vector2i &p_size) {
} }
} }
Vector2i AStarGrid2D::get_size() const { Size2i AStarGrid2D::get_size() const {
return size; return size;
} }
@ -80,14 +80,14 @@ Vector2 AStarGrid2D::get_offset() const {
return offset; return offset;
} }
void AStarGrid2D::set_cell_size(const Vector2 &p_cell_size) { void AStarGrid2D::set_cell_size(const Size2 &p_cell_size) {
if (!cell_size.is_equal_approx(p_cell_size)) { if (!cell_size.is_equal_approx(p_cell_size)) {
cell_size = p_cell_size; cell_size = p_cell_size;
dirty = true; dirty = true;
} }
} }
Vector2 AStarGrid2D::get_cell_size() const { Size2 AStarGrid2D::get_cell_size() const {
return cell_size; return cell_size;
} }

12
core/math/a_star_grid_2d.h
View File

@ -58,9 +58,9 @@ public:
}; };
private: private:
Vector2i size; Size2i size;
Vector2 offset; Vector2 offset;
Vector2 cell_size = Vector2(1, 1); Size2 cell_size = Size2(1, 1);
bool dirty = false; bool dirty = false;
bool jumping_enabled = false; bool jumping_enabled = false;
@ -136,14 +136,14 @@ protected:
GDVIRTUAL2RC(real_t, _compute_cost, Vector2i, Vector2i) GDVIRTUAL2RC(real_t, _compute_cost, Vector2i, Vector2i)
public: public:
void set_size(const Vector2i &p_size); void set_size(const Size2i &p_size);
Vector2i get_size() const; Size2i get_size() const;
void set_offset(const Vector2 &p_offset); void set_offset(const Vector2 &p_offset);
Vector2 get_offset() const; Vector2 get_offset() const;
void set_cell_size(const Vector2 &p_cell_size); void set_cell_size(const Size2 &p_cell_size);
Vector2 get_cell_size() const; Size2 get_cell_size() const;
void update(); void update();

8
scene/3d/occluder_instance_3d.cpp
View File

@ -186,21 +186,21 @@ ArrayOccluder3D::~ArrayOccluder3D() {
///////////////////////////////////////////////// /////////////////////////////////////////////////
void QuadOccluder3D::set_size(const Vector2 &p_size) { void QuadOccluder3D::set_size(const Size2 &p_size) {
if (size == p_size) { if (size == p_size) {
return; return;
} }
size = p_size.max(Vector2()); size = p_size.max(Size2());
_update(); _update();
} }
Vector2 QuadOccluder3D::get_size() const { Size2 QuadOccluder3D::get_size() const {
return size; return size;
} }
void QuadOccluder3D::_update_arrays(PackedVector3Array &r_vertices, PackedInt32Array &r_indices) { void QuadOccluder3D::_update_arrays(PackedVector3Array &r_vertices, PackedInt32Array &r_indices) {
Vector2 _size = Vector2(size.x / 2.0f, size.y / 2.0f); Size2 _size = Size2(size.x / 2.0f, size.y / 2.0f);
r_vertices = { r_vertices = {
Vector3(-_size.x, -_size.y, 0), Vector3(-_size.x, -_size.y, 0),

6
scene/3d/occluder_instance_3d.h
View File

@ -88,15 +88,15 @@ class QuadOccluder3D : public Occluder3D {
GDCLASS(QuadOccluder3D, Occluder3D); GDCLASS(QuadOccluder3D, Occluder3D);
private: private:
Vector2 size = Vector2(1.0f, 1.0f); Size2 size = Vector2(1.0f, 1.0f);
protected: protected:
virtual void _update_arrays(PackedVector3Array &r_vertices, PackedInt32Array &r_indices) override; virtual void _update_arrays(PackedVector3Array &r_vertices, PackedInt32Array &r_indices) override;
static void _bind_methods(); static void _bind_methods();
public: public:
Vector2 get_size() const; Size2 get_size() const;
void set_size(const Vector2 &p_size); void set_size(const Size2 &p_size);
QuadOccluder3D(); QuadOccluder3D();
~QuadOccluder3D(); ~QuadOccluder3D();

8
scene/resources/rectangle_shape_2d.cpp
View File

@ -41,7 +41,7 @@ void RectangleShape2D::_update_shape() {
bool RectangleShape2D::_set(const StringName &p_name, const Variant &p_value) { bool RectangleShape2D::_set(const StringName &p_name, const Variant &p_value) {
if (p_name == "extents") { // Compatibility with Godot 3.x. if (p_name == "extents") { // Compatibility with Godot 3.x.
// Convert to `size`, twice as big. // Convert to `size`, twice as big.
set_size((Vector2)p_value * 2); set_size((Size2)p_value * 2);
return true; return true;
} }
return false; return false;
@ -57,13 +57,13 @@ bool RectangleShape2D::_get(const StringName &p_name, Variant &r_property) const
} }
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
void RectangleShape2D::set_size(const Vector2 &p_size) { void RectangleShape2D::set_size(const Size2 &p_size) {
ERR_FAIL_COND_MSG(p_size.x < 0 || p_size.y < 0, "RectangleShape2D size cannot be negative."); ERR_FAIL_COND_MSG(p_size.x < 0 || p_size.y < 0, "RectangleShape2D size cannot be negative.");
size = p_size; size = p_size;
_update_shape(); _update_shape();
} }
Vector2 RectangleShape2D::get_size() const { Size2 RectangleShape2D::get_size() const {
return size; return size;
} }
@ -106,6 +106,6 @@ void RectangleShape2D::_bind_methods() {
RectangleShape2D::RectangleShape2D() : RectangleShape2D::RectangleShape2D() :
Shape2D(PhysicsServer2D::get_singleton()->rectangle_shape_create()) { Shape2D(PhysicsServer2D::get_singleton()->rectangle_shape_create()) {
size = Vector2(20, 20); size = Size2(20, 20);
_update_shape(); _update_shape();
} }

6
scene/resources/rectangle_shape_2d.h
View File

@ -36,7 +36,7 @@
class RectangleShape2D : public Shape2D { class RectangleShape2D : public Shape2D {
GDCLASS(RectangleShape2D, Shape2D); GDCLASS(RectangleShape2D, Shape2D);
Vector2 size; Size2 size;
void _update_shape(); void _update_shape();
protected: protected:
@ -47,8 +47,8 @@ protected:
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
public: public:
void set_size(const Vector2 &p_size); void set_size(const Size2 &p_size);
Vector2 get_size() const; Size2 get_size() const;
virtual void draw(const RID &p_to_rid, const Color &p_color) override; virtual void draw(const RID &p_to_rid, const Color &p_color) override;
virtual Rect2 get_rect() const override; virtual Rect2 get_rect() const override;

8
scene/resources/tile_set.cpp
View File

@ -118,7 +118,7 @@ void TileMapPattern::remove_cell(const Vector2i &p_coords, bool p_update_size) {
pattern.erase(p_coords); pattern.erase(p_coords);
if (p_update_size) { if (p_update_size) {
size = Vector2i(); size = Size2i();
for (const KeyValue<Vector2i, TileMapCell> &E : pattern) { for (const KeyValue<Vector2i, TileMapCell> &E : pattern) {
size = size.max(E.key + Vector2i(1, 1)); size = size.max(E.key + Vector2i(1, 1));
} }
@ -157,11 +157,11 @@ TypedArray<Vector2i> TileMapPattern::get_used_cells() const {
return a; return a;
} }
Vector2i TileMapPattern::get_size() const { Size2i TileMapPattern::get_size() const {
return size; return size;
} }
void TileMapPattern::set_size(const Vector2i &p_size) { void TileMapPattern::set_size(const Size2i &p_size) {
for (const KeyValue<Vector2i, TileMapCell> &E : pattern) { for (const KeyValue<Vector2i, TileMapCell> &E : pattern) {
Vector2i coords = E.key; Vector2i coords = E.key;
if (p_size.x <= coords.x || p_size.y <= coords.y) { if (p_size.x <= coords.x || p_size.y <= coords.y) {
@ -178,7 +178,7 @@ bool TileMapPattern::is_empty() const {
}; };
void TileMapPattern::clear() { void TileMapPattern::clear() {
size = Vector2i(); size = Size2i();
pattern.clear(); pattern.clear();
emit_changed(); emit_changed();
}; };

6
scene/resources/tile_set.h
View File

@ -117,7 +117,7 @@ union TileMapCell {
class TileMapPattern : public Resource { class TileMapPattern : public Resource {
GDCLASS(TileMapPattern, Resource); GDCLASS(TileMapPattern, Resource);
Vector2i size; Size2i size;
HashMap<Vector2i, TileMapCell> pattern; HashMap<Vector2i, TileMapCell> pattern;
void _set_tile_data(const Vector<int> &p_data); void _set_tile_data(const Vector<int> &p_data);
@ -140,8 +140,8 @@ public:
TypedArray<Vector2i> get_used_cells() const; TypedArray<Vector2i> get_used_cells() const;
Vector2i get_size() const; Size2i get_size() const;
void set_size(const Vector2i &p_size); void set_size(const Size2i &p_size);
bool is_empty() const; bool is_empty() const;
void clear(); void clear();

4
scene/resources/visual_shader.cpp
View File

@ -3855,11 +3855,11 @@ VisualShaderNodeUniform::VisualShaderNodeUniform() {
////////////// ResizeableBase ////////////// ResizeableBase
void VisualShaderNodeResizableBase::set_size(const Vector2 &p_size) { void VisualShaderNodeResizableBase::set_size(const Size2 &p_size) {
size = p_size; size = p_size;
} }
Vector2 VisualShaderNodeResizableBase::get_size() const { Size2 VisualShaderNodeResizableBase::get_size() const {
return size; return size;
} }

6
scene/resources/visual_shader.h
View File

@ -612,15 +612,15 @@ class VisualShaderNodeResizableBase : public VisualShaderNode {
GDCLASS(VisualShaderNodeResizableBase, VisualShaderNode); GDCLASS(VisualShaderNodeResizableBase, VisualShaderNode);
protected: protected:
Vector2 size = Size2(0, 0); Size2 size = Size2(0, 0);
bool allow_v_resize = true; bool allow_v_resize = true;
protected: protected:
static void _bind_methods(); static void _bind_methods();
public: public:
void set_size(const Vector2 &p_size); void set_size(const Size2 &p_size);
Vector2 get_size() const; Size2 get_size() const;
bool is_allow_v_resize() const; bool is_allow_v_resize() const;
void set_allow_v_resize(bool p_enabled); void set_allow_v_resize(bool p_enabled);