mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-27 11:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
6b0183ec89
godot/core/math/vector2.h

378 lines
11 KiB
C++
Raw Normal View History

[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
/*************************************************************************/
/* vector2.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
Update copyright statements to 2021 Happy new year to the wonderful Godot community! 2020 has been a tough year for most of us personally, but a good year for Godot development nonetheless with a huge amount of work done towards Godot 4.0 and great improvements backported to the long-lived 3.2 branch. We've had close to 400 contributors to engine code this year, authoring near 7,000 commit! (And that's only for the `master` branch and for the engine code, there's a lot more when counting docs, demos and other first-party repos.) Here's to a great year 2021 for all Godot users 🎆
2021-01-02 03:13:46 +08:00
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef VECTOR2_H
#define VECTOR2_H
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-12 00:13:45 +08:00
#include "core/math/math_funcs.h"
Reorganized core/ directory, it was too fatty already -Removed FuncRef, since Callable makes it obsolete -Removed int_types.h as its obsolete in c++11+ -Changed color names code
2020-11-08 06:33:38 +08:00
#include "core/string/ustring.h"
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
struct Vector2i;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
struct Vector2 {
Dynamic BVH broadphase in 2D & 3D Godot Physics Port lawnjelly's dynamic BVH implementation from 3.x to be used in both 2D and 3D broadphases. Removed alternative broadphase implementations which are not meant to be used anymore since they are much slower. Includes changes in Rect2, Vector2, Vector3 that help with the template implementation of the dynamic BVH by uniformizing the interface between 2D and 3D math. Co-authored-by: lawnjelly <lawnjelly@gmail.com>
2021-05-11 05:43:13 +08:00
static const int AXIS_COUNT = 2;
Add Vector2/3 sign and posmod functions, misc additions Also make the docs more consistent, add Axis enum to Vector2, add > and >=. and C# also gets % and an override for vector-vector mod.
2019-08-05 09:50:28 +08:00
enum Axis {
AXIS_X,
AXIS_Y,
};
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
union {
Dynamic BVH broadphase in 2D & 3D Godot Physics Port lawnjelly's dynamic BVH implementation from 3.x to be used in both 2D and 3D broadphases. Removed alternative broadphase implementations which are not meant to be used anymore since they are much slower. Includes changes in Rect2, Vector2, Vector3 that help with the template implementation of the dynamic BVH by uniformizing the interface between 2D and 3D math. Co-authored-by: lawnjelly <lawnjelly@gmail.com>
2021-05-11 05:43:13 +08:00
struct {
union {
real_t x;
real_t width;
};
union {
real_t y;
real_t height;
};
};
real_t coord[2] = { 0 };
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
};
_FORCE_INLINE_ real_t &operator[](int p_idx) {
return p_idx ? y : x;
}
_FORCE_INLINE_ const real_t &operator[](int p_idx) const {
return p_idx ? y : x;
}
Dynamic BVH broadphase in 2D & 3D Godot Physics Port lawnjelly's dynamic BVH implementation from 3.x to be used in both 2D and 3D broadphases. Removed alternative broadphase implementations which are not meant to be used anymore since they are much slower. Includes changes in Rect2, Vector2, Vector3 that help with the template implementation of the dynamic BVH by uniformizing the interface between 2D and 3D math. Co-authored-by: lawnjelly <lawnjelly@gmail.com>
2021-05-11 05:43:13 +08:00
_FORCE_INLINE_ void set_all(real_t p_value) {
x = y = p_value;
}
_FORCE_INLINE_ int min_axis() const {
return x < y ? 0 : 1;
}
_FORCE_INLINE_ int max_axis() const {
return x < y ? 1 : 0;
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
void normalize();
Vector2 normalized() const;
bool is_normalized() const;
real_t length() const;
real_t length_squared() const;
Rename Vector2 clamped to limit_length and add limit_length to Vector3
2021-02-01 13:42:00 +08:00
Vector2 limit_length(const real_t p_len = 1.0) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Implement GPU Particle Collisions -Sphere Attractor -Box Attractor -Vector Field -Sphere Collider -Box Collider -Baked SDF Collider -Heightmap Collider
2020-10-08 08:29:49 +08:00
Vector2 min(const Vector2 &p_vector2) const {
return Vector2(MIN(x, p_vector2.x), MIN(y, p_vector2.y));
}
Vector2 max(const Vector2 &p_vector2) const {
return Vector2(MAX(x, p_vector2.x), MAX(y, p_vector2.y));
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
real_t distance_to(const Vector2 &p_vector2) const;
real_t distance_squared_to(const Vector2 &p_vector2) const;
real_t angle_to(const Vector2 &p_vector2) const;
real_t angle_to_point(const Vector2 &p_vector2) const;
Improve argument names for core types
2020-12-07 16:16:31 +08:00
_FORCE_INLINE_ Vector2 direction_to(const Vector2 &p_to) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
real_t dot(const Vector2 &p_other) const;
real_t cross(const Vector2 &p_other) const;
Add Vector2/3 sign and posmod functions, misc additions Also make the docs more consistent, add Axis enum to Vector2, add > and >=. and C# also gets % and an override for vector-vector mod.
2019-08-05 09:50:28 +08:00
Vector2 posmod(const real_t p_mod) const;
Vector2 posmodv(const Vector2 &p_modv) const;
Improve argument names for core types
2020-12-07 16:16:31 +08:00
Vector2 project(const Vector2 &p_to) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 plane_project(real_t p_d, const Vector2 &p_vec) const;
Improve argument names for core types
2020-12-07 16:16:31 +08:00
_FORCE_INLINE_ Vector2 lerp(const Vector2 &p_to, real_t p_weight) const;
_FORCE_INLINE_ Vector2 slerp(const Vector2 &p_to, real_t p_weight) const;
Vector2 cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_weight) const;
Added move_toward functions for float, Vector2 and Vector3
2019-04-08 05:40:56 +08:00
Vector2 move_toward(const Vector2 &p_to, const real_t p_delta) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 slide(const Vector2 &p_normal) const;
Vector2 bounce(const Vector2 &p_normal) const;
Vector2 reflect(const Vector2 &p_normal) const;
Make is_equal_approx separate for structures This commit adds exposed behavior for C#
2019-10-15 04:33:45 +08:00
bool is_equal_approx(const Vector2 &p_v) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 operator+(const Vector2 &p_v) const;
void operator+=(const Vector2 &p_v);
Vector2 operator-(const Vector2 &p_v) const;
void operator-=(const Vector2 &p_v);
Vector2 operator*(const Vector2 &p_v1) const;
Vector2 operator*(const real_t &rvalue) const;
void operator*=(const real_t &rvalue);
void operator*=(const Vector2 &rvalue) { *this = *this * rvalue; }
Vector2 operator/(const Vector2 &p_v1) const;
Vector2 operator/(const real_t &rvalue) const;
void operator/=(const real_t &rvalue);
Added ability for multiple images to be imported as an atlas This adds support for groups in the import system, which point to a single file. Add property hint for saving files in file field
2019-04-20 02:54:33 +08:00
void operator/=(const Vector2 &rvalue) { *this = *this / rvalue; }
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 operator-() const;
bool operator==(const Vector2 &p_vec2) const;
bool operator!=(const Vector2 &p_vec2) const;
Change inequality comparison operators to use exact equality
2020-09-09 06:10:58 +08:00
bool operator<(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y < p_vec2.y) : (x < p_vec2.x); }
bool operator>(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y > p_vec2.y) : (x > p_vec2.x); }
bool operator<=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
bool operator>=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
real_t angle() const;
_FORCE_INLINE_ Vector2 abs() const {
return Vector2(Math::abs(x), Math::abs(y));
}
Vector2 rotated(real_t p_by) const;
Rename Vector2.tangent() to Vector2.orthogonal()
2020-12-07 02:16:06 +08:00
Vector2 orthogonal() const {
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
return Vector2(y, -x);
}
Add Vector2/3 sign and posmod functions, misc additions Also make the docs more consistent, add Axis enum to Vector2, add > and >=. and C# also gets % and an override for vector-vector mod.
2019-08-05 09:50:28 +08:00
Vector2 sign() const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 floor() const;
Vector2 ceil() const;
Vector2 round() const;
Vector2 snapped(const Vector2 &p_by) const;
Allow clamping vectors and colors
2021-02-01 13:10:52 +08:00
Vector2 clamp(const Vector2 &p_min, const Vector2 &p_max) const;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
real_t aspect() const { return width / height; }
operator String() const { return String::num(x) + ", " + String::num(y); }
Port member initialization from constructor to declaration (C++11) Using `clang-tidy`'s `modernize-use-default-member-init` check and manual review of the changes, and some extra manual changes that `clang-tidy` failed to do. Also went manually through all of `core` to find occurrences that `clang-tidy` couldn't handle, especially all initializations done in a constructor without using initializer lists.
2020-05-12 23:01:17 +08:00
_FORCE_INLINE_ Vector2() {}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2(real_t p_x, real_t p_y) {
x = p_x;
y = p_y;
}
};
_FORCE_INLINE_ Vector2 Vector2::plane_project(real_t p_d, const Vector2 &p_vec) const {
return p_vec - *this * (dot(p_vec) - p_d);
}
Allow commutative multiplication in Variant Also allow quaternions to be multiplied by integers.
2020-09-17 19:56:36 +08:00
_FORCE_INLINE_ Vector2 operator*(float p_scalar, const Vector2 &p_vec) {
return p_vec * p_scalar;
}
_FORCE_INLINE_ Vector2 operator*(double p_scalar, const Vector2 &p_vec) {
return p_vec * p_scalar;
}
_FORCE_INLINE_ Vector2 operator*(int32_t p_scalar, const Vector2 &p_vec) {
return p_vec * p_scalar;
}
_FORCE_INLINE_ Vector2 operator*(int64_t p_scalar, const Vector2 &p_vec) {
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
return p_vec * p_scalar;
}
_FORCE_INLINE_ Vector2 Vector2::operator+(const Vector2 &p_v) const {
return Vector2(x + p_v.x, y + p_v.y);
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 20:29:06 +08:00
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ void Vector2::operator+=(const Vector2 &p_v) {
x += p_v.x;
y += p_v.y;
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 20:29:06 +08:00
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2 Vector2::operator-(const Vector2 &p_v) const {
return Vector2(x - p_v.x, y - p_v.y);
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 20:29:06 +08:00
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ void Vector2::operator-=(const Vector2 &p_v) {
x -= p_v.x;
y -= p_v.y;
}
_FORCE_INLINE_ Vector2 Vector2::operator*(const Vector2 &p_v1) const {
return Vector2(x * p_v1.x, y * p_v1.y);
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2 Vector2::operator*(const real_t &rvalue) const {
return Vector2(x * rvalue, y * rvalue);
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ void Vector2::operator*=(const real_t &rvalue) {
x *= rvalue;
y *= rvalue;
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2 Vector2::operator/(const Vector2 &p_v1) const {
return Vector2(x / p_v1.x, y / p_v1.y);
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2 Vector2::operator/(const real_t &rvalue) const {
return Vector2(x / rvalue, y / rvalue);
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ void Vector2::operator/=(const real_t &rvalue) {
x /= rvalue;
y /= rvalue;
Style: Remove unnecessary semicolons from `core` Semicolons are not necessary after function definitions or control flow blocks, and having some code use them makes things inconsistent (and occasionally can mess up `clang-format`'s formatting). Removing them is tedious work though, I had to do this manually (regex + manual review) as I couldn't find a tool for that. All other code folders would need to get the same treatment.
2020-05-19 21:46:49 +08:00
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ Vector2 Vector2::operator-() const {
return Vector2(-x, -y);
}
_FORCE_INLINE_ bool Vector2::operator==(const Vector2 &p_vec2) const {
Expose is_equal_approx and restore == to be exact again This commit changes behavior for GDScript and C#. Also did some organizing of the order to logically group related methods, mostly for Rect2 and AABB.
2019-10-03 04:35:49 +08:00
return x == p_vec2.x && y == p_vec2.y;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
}
Style: Enforce separation line between function definitions I couldn't find a tool that enforces it, so I went the manual route: ``` find -name "thirdparty" -prune \ -o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \ -o -name "*.glsl" > files perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files) misc/scripts/fix_style.sh -c ``` This adds a newline after all `}` on the first column, unless they are followed by `#` (typically `#endif`). This leads to having lots of places with two lines between function/class definitions, but clang-format then fixes it as we enforce max one line of separation. This doesn't fix potential occurrences of function definitions which are indented (e.g. for a helper class defined in a .cpp), but it's better than nothing. Also can't be made to run easily on CI/hooks so we'll have to be careful with new code. Part of #33027.
2020-05-14 20:29:06 +08:00
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
_FORCE_INLINE_ bool Vector2::operator!=(const Vector2 &p_vec2) const {
Expose is_equal_approx and restore == to be exact again This commit changes behavior for GDScript and C#. Also did some organizing of the order to logically group related methods, mostly for Rect2 and AABB.
2019-10-03 04:35:49 +08:00
return x != p_vec2.x || y != p_vec2.y;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
}
Improve argument names for core types
2020-12-07 16:16:31 +08:00
Vector2 Vector2::lerp(const Vector2 &p_to, real_t p_weight) const {
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
Vector2 res = *this;
Improve argument names for core types
2020-12-07 16:16:31 +08:00
res.x += (p_weight * (p_to.x - x));
res.y += (p_weight * (p_to.y - y));
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
return res;
}
Improve argument names for core types
2020-12-07 16:16:31 +08:00
Vector2 Vector2::slerp(const Vector2 &p_to, real_t p_weight) const {
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
#ifdef MATH_CHECKS
Add explanations for errors related to Vector/Quat normalization
2020-01-24 20:51:25 +08:00
ERR_FAIL_COND_V_MSG(!is_normalized(), Vector2(), "The start Vector2 must be normalized.");
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
#endif
Improve argument names for core types
2020-12-07 16:16:31 +08:00
real_t theta = angle_to(p_to);
return rotated(theta * p_weight);
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
}
Improve argument names for core types
2020-12-07 16:16:31 +08:00
Vector2 Vector2::direction_to(const Vector2 &p_to) const {
Vector2 ret(p_to.x - x, p_to.y - y);
Added direction_to method to vectors
2019-03-27 18:51:05 +08:00
ret.normalize();
return ret;
}
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
typedef Vector2 Size2;
typedef Vector2 Point2;
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
/* INTEGER STUFF */
struct Vector2i {
Add Vector2/3 sign and posmod functions, misc additions Also make the docs more consistent, add Axis enum to Vector2, add > and >=. and C# also gets % and an override for vector-vector mod.
2019-08-05 09:50:28 +08:00
enum Axis {
AXIS_X,
AXIS_Y,
};
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
union {
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
int32_t x = 0;
int32_t width;
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
};
union {
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
int32_t y = 0;
int32_t height;
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
};
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
_FORCE_INLINE_ int32_t &operator[](int p_idx) {
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
return p_idx ? y : x;
}
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
_FORCE_INLINE_ const int32_t &operator[](int p_idx) const {
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
return p_idx ? y : x;
}
Rework the TileSet resource and TileMap nodes: - Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
2021-05-07 21:41:39 +08:00
Vector2i min(const Vector2i &p_vector2i) const {
return Vector2(MIN(x, p_vector2i.x), MIN(y, p_vector2i.y));
}
Vector2i max(const Vector2i &p_vector2i) const {
return Vector2(MAX(x, p_vector2i.x), MAX(y, p_vector2i.y));
}
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
Vector2i operator+(const Vector2i &p_v) const;
void operator+=(const Vector2i &p_v);
Vector2i operator-(const Vector2i &p_v) const;
void operator-=(const Vector2i &p_v);
Vector2i operator*(const Vector2i &p_v1) const;
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
Vector2i operator*(const int32_t &rvalue) const;
void operator*=(const int32_t &rvalue);
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
Vector2i operator/(const Vector2i &p_v1) const;
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
Vector2i operator/(const int32_t &rvalue) const;
void operator/=(const int32_t &rvalue);
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
Refactored Variant Operators. -Using classes to call and a table -For typed code (GDS or GDNative), can obtain functions to call prevalidated or ptr.
2020-11-05 10:01:55 +08:00
Vector2i operator%(const Vector2i &p_v1) const;
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
Vector2i operator%(const int32_t &rvalue) const;
void operator%=(const int32_t &rvalue);
Refactored Variant Operators. -Using classes to call and a table -For typed code (GDS or GDNative), can obtain functions to call prevalidated or ptr.
2020-11-05 10:01:55 +08:00
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
Vector2i operator-() const;
bool operator<(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y < p_vec2.y) : (x < p_vec2.x); }
bool operator>(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y > p_vec2.y) : (x > p_vec2.x); }
Add support for Vector2i, Rect2i and Vector3i to Variant WARNING: Requires C++17 'guaranteed copy elision' to fix ambiguous operator problems in Variant. This was added for this commit (and future C++17 uses) in #36457.
2020-02-22 11:26:41 +08:00
bool operator<=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
bool operator>=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
bool operator==(const Vector2i &p_vec2) const;
bool operator!=(const Vector2i &p_vec2) const;
Add support for Vector2i, Rect2i and Vector3i to Variant WARNING: Requires C++17 'guaranteed copy elision' to fix ambiguous operator problems in Variant. This was added for this commit (and future C++17 uses) in #36457.
2020-02-22 11:26:41 +08:00
real_t aspect() const { return width / (real_t)height; }
Vector2i sign() const { return Vector2i(SGN(x), SGN(y)); }
Vector2i abs() const { return Vector2i(ABS(x), ABS(y)); }
Allow clamping vectors and colors
2021-02-01 13:10:52 +08:00
Vector2i clamp(const Vector2i &p_min, const Vector2i &p_max) const;
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
operator String() const { return String::num(x) + ", " + String::num(y); }
operator Vector2() const { return Vector2(x, y); }
Port member initialization from constructor to declaration (C++11) Using `clang-tidy`'s `modernize-use-default-member-init` check and manual review of the changes, and some extra manual changes that `clang-tidy` failed to do. Also went manually through all of `core` to find occurrences that `clang-tidy` couldn't handle, especially all initializations done in a constructor without using initializer lists.
2020-05-12 23:01:17 +08:00
inline Vector2i() {}
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
inline Vector2i(const Vector2 &p_vec2) {
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
x = (int32_t)p_vec2.x;
y = (int32_t)p_vec2.y;
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
}
Define GDNative sizes using sizeof(godot_real_t) and sizeof(int32_t)
2021-01-22 18:36:48 +08:00
inline Vector2i(int32_t p_x, int32_t p_y) {
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
x = p_x;
y = p_y;
}
};
Allow commutative multiplication in Variant Also allow quaternions to be multiplied by integers.
2020-09-17 19:56:36 +08:00
_FORCE_INLINE_ Vector2i operator*(const int32_t &p_scalar, const Vector2i &p_vector) {
return p_vector * p_scalar;
}
_FORCE_INLINE_ Vector2i operator*(const int64_t &p_scalar, const Vector2i &p_vector) {
return p_vector * p_scalar;
}
_FORCE_INLINE_ Vector2i operator*(const float &p_scalar, const Vector2i &p_vector) {
return p_vector * p_scalar;
}
_FORCE_INLINE_ Vector2i operator*(const double &p_scalar, const Vector2i &p_vector) {
return p_vector * p_scalar;
}
[Core] Move Vector2i and Rect2i out of math_2d.h
2018-08-11 13:32:45 +08:00
typedef Vector2i Size2i;
typedef Vector2i Point2i;
[Core] Move Vector2 to its own file Makes 2D math code easier to read and makes Vector2 consistent with Vector3. In the future, we may move other things out of math_2d as well.
2018-05-08 05:33:25 +08:00
#endif // VECTOR2_H
Reference in New Issue Copy Permalink