Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-05-06 17:51:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added position and size helper methods to Rect2 and Rect2i.

Browse Source
This commit is contained in:
Relintai 2022-02-04 12:54:28 +01:00
parent 53b9236c5f
commit e28007085c
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/math/rect2.cpp
View File

@ -110,6 +110,13 @@ void Rect2::expand_to(const Vector2 &p_vector) {
h = end.y - begin.y; h = end.y - begin.y;
} }
Vector2 Rect2::position() const {
return Vector2(x, y);
}
Vector2 Rect2::size() const {
return Vector2(w, h);
}
Rect2 &Rect2::operator+=(const Rect2 &b) { Rect2 &Rect2::operator+=(const Rect2 &b) {
x += b.x; x += b.x;
y += b.y; y += b.y;

3
core/math/rect2.h
View File

@ -18,6 +18,9 @@ public:
void expand_to(const Vector2 &p_vector); void expand_to(const Vector2 &p_vector);
Vector2 position() const;
Vector2 size() const;
Rect2 &operator+=(const Rect2 &b); Rect2 &operator+=(const Rect2 &b);
Rect2 &operator-=(const Rect2 &b); Rect2 &operator-=(const Rect2 &b);

13
core/math/rect2i.cpp
View File

@ -83,9 +83,9 @@ void Rect2i::shrink(const int by) {
w -= by; w -= by;
} }
//Taken from the Godot Engine (MIT License) // Taken from the Godot Engine (MIT License)
//Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. // Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.
//Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). // Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).
void Rect2i::expand_to(const Vector2i &p_vector) { void Rect2i::expand_to(const Vector2i &p_vector) {
Vector2i begin = Vector2i(x, y); Vector2i begin = Vector2i(x, y);
Vector2i end = Vector2i(x, y) + Vector2i(w, h); Vector2i end = Vector2i(x, y) + Vector2i(w, h);
@ -110,6 +110,13 @@ void Rect2i::expand_to(const Vector2i &p_vector) {
h = end.y - begin.y; h = end.y - begin.y;
} }
Vector2i Rect2i::position() const {
return Vector2i(x, y);
}
Vector2i Rect2i::size() const {
return Vector2i(w, h);
}
Rect2i &Rect2i::operator+=(const Rect2i &b) { Rect2i &Rect2i::operator+=(const Rect2i &b) {
x += b.x; x += b.x;
y += b.y; y += b.y;

3
core/math/rect2i.h
View File

@ -18,6 +18,9 @@ public:
void expand_to(const Vector2i &p_vector); void expand_to(const Vector2i &p_vector);
Vector2i position() const;
Vector2i size() const;
Rect2i &operator+=(const Rect2i &b); Rect2i &operator+=(const Rect2i &b);
Rect2i &operator-=(const Rect2i &b); Rect2i &operator-=(const Rect2i &b);