Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #52878 from AnilBK/add-get-center

Browse source
This commit is contained in:
Rémi Verschelde 2021-09-21 21:30:30 +02:00 • committed by GitHub
commit ba57252bd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 133 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/math/aabb.h
View file

@ -118,6 +118,10 @@ public:
return position + size;
}
_FORCE_INLINE_ Vector3 get_center() const {
return position + (size * 0.5);
}
operator String() const;
_FORCE_INLINE_ AABB() {}

2
core/math/delaunay_2d.h
View file

@ -101,7 +101,7 @@ public:
}
float delta_max = MAX(rect.size.width, rect.size.height);
Vector2 center = rect.position + rect.size * 0.5;
Vector2 center = rect.get_center();
points.push_back(Vector2(center.x - 20 * delta_max, center.y - delta_max));
points.push_back(Vector2(center.x, center.y + 20 * delta_max));

6
core/math/rect2.h
View file

@ -46,6 +46,8 @@ struct Rect2 {
real_t get_area() const { return size.width * size.height; }
_FORCE_INLINE_ Vector2 get_center() const { return position + (size * 0.5); }
inline bool intersects(const Rect2 &p_rect, const bool p_include_borders = false) const {
if (p_include_borders) {
if (position.x > (p_rect.position.x + p_rect.size.width)) {
@ -259,7 +261,7 @@ struct Rect2 {
}
_FORCE_INLINE_ bool intersects_filled_polygon(const Vector2 *p_points, int p_point_count) const {
Vector2 center = position + size * 0.5;
Vector2 center = get_center();
int side_plus = 0;
int side_minus = 0;
Vector2 end = position + size;
@ -344,6 +346,8 @@ struct Rect2i {
int get_area() const { return size.width * size.height; }
_FORCE_INLINE_ Vector2i get_center() const { return position + (size / 2); }
inline bool intersects(const Rect2i &p_rect) const {
if (position.x > (p_rect.position.x + p_rect.size.width)) {
return false;

4
core/math/triangle_mesh.cpp
View file

@ -76,7 +76,7 @@ int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, in
int index = r_max_alloc++;
BVH *_new = &p_bvh[index];
_new->aabb = aabb;
_new->center = aabb.position + aabb.size * 0.5;
_new->center = aabb.get_center();
_new->face_index = -1;
_new->left = left;
_new->right = right;
@ -152,7 +152,7 @@ void TriangleMesh::create(const Vector<Vector3> &p_faces) {
bw[i].left = -1;
bw[i].right = -1;
bw[i].face_index = i;
bw[i].center = bw[i].aabb.position + bw[i].aabb.size * 0.5;
bw[i].center = bw[i].aabb.get_center();
}
vertices.resize(db.size());