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

Merge pull request #57844 from Pineapple/vector2-brackets-operator

Browse Source
This commit is contained in:
Rémi Verschelde 2022-02-09 13:26:04 +01:00 committed by GitHub
commit 40e579a47f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/math/vector2.h
View File

@ -60,10 +60,10 @@ struct _NO_DISCARD_CLASS_ Vector2 {
};
_FORCE_INLINE_ real_t &operator[](int p_idx) {
return p_idx ? y : x;
return coord[p_idx];
}
_FORCE_INLINE_ const real_t &operator[](int p_idx) const {
return p_idx ? y : x;
return coord[p_idx];
}
_FORCE_INLINE_ void set_all(real_t p_value) {
@ -276,19 +276,25 @@ struct _NO_DISCARD_CLASS_ Vector2i {
};
union {
int x;
int width;
};
union {
int y;
int height;
struct {
union {
int x;
int width;
};
union {
int y;
int height;
};
};
int coord[2];
};
_FORCE_INLINE_ int &operator[](int p_idx) {
return p_idx ? y : x;
return coord[p_idx];
}
_FORCE_INLINE_ const int &operator[](int p_idx) const {
return p_idx ? y : x;
return coord[p_idx];
}
Vector2i operator+(const Vector2i &p_v) const;