hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)

Browse source
This commit is contained in:
Aaron Franke 2021-01-22 05:36:48 -05:00
parent 38db12b45a
commit 6c197cf259
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
14 changed files with 116 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

30
core/math/vector2.h
View file

@ -265,18 +265,18 @@ struct Vector2i {
};
union {
int x = 0;
int width;
int32_t x = 0;
int32_t width;
};
union {
int y = 0;
int height;
int32_t y = 0;
int32_t height;
};
_FORCE_INLINE_ int &operator[](int p_idx) {
_FORCE_INLINE_ int32_t &operator[](int p_idx) {
return p_idx ? y : x;
}
_FORCE_INLINE_ const int &operator[](int p_idx) const {
_FORCE_INLINE_ const int32_t &operator[](int p_idx) const {
return p_idx ? y : x;
}
@ -286,16 +286,16 @@ struct Vector2i {
void operator-=(const Vector2i &p_v);
Vector2i operator*(const Vector2i &p_v1) const;
Vector2i operator*(const int &rvalue) const;
void operator*=(const int &rvalue);
Vector2i operator*(const int32_t &rvalue) const;
void operator*=(const int32_t &rvalue);
Vector2i operator/(const Vector2i &p_v1) const;
Vector2i operator/(const int &rvalue) const;
void operator/=(const int &rvalue);
Vector2i operator/(const int32_t &rvalue) const;
void operator/=(const int32_t &rvalue);
Vector2i operator%(const Vector2i &p_v1) const;
Vector2i operator%(const int &rvalue) const;
void operator%=(const int &rvalue);
Vector2i operator%(const int32_t &rvalue) const;
void operator%=(const int32_t &rvalue);
Vector2i operator-() const;
bool operator<(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y < p_vec2.y) : (x < p_vec2.x); }
@ -317,10 +317,10 @@ struct Vector2i {
inline Vector2i() {}
inline Vector2i(const Vector2 &p_vec2) {
x = (int)p_vec2.x;
y = (int)p_vec2.y;
x = (int32_t)p_vec2.x;
y = (int32_t)p_vec2.y;
}
inline Vector2i(int p_x, int p_y) {
inline Vector2i(int32_t p_x, int32_t p_y) {
x = p_x;
y = p_y;
}