RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'samples/floors' into develop

Browse Source
This commit is contained in:
h4570
2020-12-03 23:54:39 +01:00
parent db23acddd7 513ae84577
commit d22d125afa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/include/models/math/vector3.hpp
+2 -2
View File
@@ -44,8 +44,8 @@ public:
Vector3 operator-(void); Vector3 operator-(void);
static u8 shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0, const Vector3 *v1, const Vector3 *v2); static u8 shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0, const Vector3 *v1, const Vector3 *v2);
u8 collidesSquare(Vector3 &t_min, Vector3 &t_max); u8 collidesSquare(const Vector3 &t_min, const Vector3 &t_max) const;
u8 isOnSquare(Vector3 &t_min, Vector3 &t_max); u8 isOnSquare(const Vector3 &t_min, const Vector3 &t_max) const;
float length(); float length();
void normalize(); void normalize();
void setByLerp(const Vector3 &v1, const Vector3 &v2, const float &t_interp, const float &t_scale); void setByLerp(const Vector3 &v1, const Vector3 &v2, const float &t_interp, const float &t_scale);
src/engine/models/math/vector3.cpp
+2 -2
View File
@@ -170,13 +170,13 @@ u8 Vector3::shouldBeBackfaceCulled(const Vector3 *t_cameraPos, const Vector3 *v0
} }
/** Checks intersection with given square */ /** Checks intersection with given square */
u8 Vector3::collidesSquare(Vector3 &t_min, Vector3 &t_max) u8 Vector3::collidesSquare(const Vector3 &t_min, const Vector3 &t_max) const
{ {
return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y < t_max.y && this->y >= t_min.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y < t_max.y && this->y >= t_min.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0;
} }
/** Checks is this vector is on given square */ /** Checks is this vector is on given square */
u8 Vector3::isOnSquare(Vector3 &t_min, Vector3 &t_max) u8 Vector3::isOnSquare(const Vector3 &t_min, const Vector3 &t_max) const
{ {
return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y >= t_max.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0; return ((this->x <= t_max.x && this->x >= t_min.x) && (this->y >= t_max.y) && (this->z <= t_max.z && this->z >= t_min.z)) ? 1 : 0;
} }