Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-18 13:03:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-02-02 17:47:59 -08:00
parent 6cba3f788a
commit 457f0700f6
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/bx/inline/math.inl
View File

@@ -598,8 +598,8 @@ namespace bx
const float phi = atan2(_dir.x, _dir.z);
const float theta = acos(_dir.y);
*_outU = (bx::kPi + phi)/bx::kPi2;
*_outV = theta*bx::kInvPi;
*_outU = (kPi + phi)/kPi2;
*_outV = theta*kInvPi;
}
inline BX_CONSTEXPR_FUNC Quaternion invert(const Quaternion _a)
@@ -975,27 +975,32 @@ namespace bx
_result[15] = _a[15];
}
inline bx::Vec3 calcNormal(const bx::Vec3& _va, const bx::Vec3& _vb, const bx::Vec3& _vc)
inline Vec3 calcNormal(const Vec3& _va, const Vec3& _vb, const Vec3& _vc)
{
const bx::Vec3 ba = sub(_vb, _va);
const bx::Vec3 ca = sub(_vc, _va);
const bx::Vec3 baxca = cross(ba, ca);
const Vec3 ba = sub(_vb, _va);
const Vec3 ca = sub(_vc, _va);
const Vec3 baxca = cross(ba, ca);
return bx::normalize(baxca);
return normalize(baxca);
}
inline void calcPlane(Plane& _outPlane, const bx::Vec3& _va, const bx::Vec3& _vb, const bx::Vec3& _vc)
inline void calcPlane(Plane& _outPlane, const Vec3& _va, const Vec3& _vb, const Vec3& _vc)
{
bx::Vec3 normal = calcNormal(_va, _vb, _vc);
Vec3 normal = calcNormal(_va, _vb, _vc);
calcPlane(_outPlane, normal, _va);
}
inline void calcPlane(Plane& _outPlane, const bx::Vec3& _normal, const bx::Vec3& _pos)
inline void calcPlane(Plane& _outPlane, const Vec3& _normal, const Vec3& _pos)
{
_outPlane.normal = _normal;
_outPlane.dist = -dot(_normal, _pos);
}
inline float distance(const Plane& _plane, const Vec3& _pos)
{
return dot(_plane.normal, _pos) + _plane.dist;
}
inline BX_CONST_FUNC float toLinear(float _a)
{
const float lo = _a / 12.92f;

11
include/bx/math.h
View File

@@ -59,7 +59,7 @@ namespace bx
///
struct Plane
{
bx::Vec3 normal;
Vec3 normal;
float dist;
};
@@ -573,13 +573,16 @@ namespace bx
void mtxInverse(float* _result, const float* _a);
///
bx::Vec3 calcNormal(const bx::Vec3& _va, const bx::Vec3& _vb, const bx::Vec3& _vc);
Vec3 calcNormal(const Vec3& _va, const Vec3& _vb, const Vec3& _vc);
///
void calcPlane(Plane& _outPlane, const bx::Vec3& _va, const bx::Vec3& _vb, const bx::Vec3& _vc);
void calcPlane(Plane& _outPlane, const Vec3& _va, const Vec3& _vb, const Vec3& _vc);
///
void calcPlane(Plane& _outPlane, const bx::Vec3& _normal, const bx::Vec3& _pos);
void calcPlane(Plane& _outPlane, const Vec3& _normal, const Vec3& _pos);
///
float distance(const Plane& _plane, const Vec3& _pos);
///
void calcLinearFit2D(float _result[2], const void* _points, uint32_t _stride, uint32_t _numPoints);