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

Fix Vector2 and Vector2i coord access via operator[]

This commit is contained in:
Bartłomiej T. Listwon 2022-02-09 09:17:17 +01:00
parent d435c51cda
commit 51cac0709e
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/math/vector2.h
View File

@ -60,10 +60,10 @@ struct _NO_DISCARD_ 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(const real_t p_value) {

22
core/math/vector2i.h
View File

@ -43,19 +43,25 @@ struct _NO_DISCARD_ Vector2i {
};
union {
int32_t x = 0;
int32_t width;
};
union {
int32_t y = 0;
int32_t height;
struct {
union {
int32_t x;
int32_t width;
};
union {
int32_t y;
int32_t height;
};
};
int32_t coord[2] = { 0 };
};
_FORCE_INLINE_ int32_t &operator[](int p_idx) {
return p_idx ? y : x;
return coord[p_idx];
}
_FORCE_INLINE_ const int32_t &operator[](int p_idx) const {
return p_idx ? y : x;
return coord[p_idx];
}
_FORCE_INLINE_ Vector2i::Axis min_axis_index() const {