AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* More reimplementations

This commit is contained in:
Phillip Stephens 2015-08-28 21:49:19 -07:00
parent eeb7a0235e
commit 716ca479ce
13 changed files with 154 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -44,7 +44,10 @@ add_library(Math
include/CVector4f.hpp
include/CFrustum.hpp
include/CAABox.hpp
include/COBBox.hpp)
include/COBBox.hpp
include/CLine.hpp
include/CSphere.hpp
include/CUnitVector.hpp)
add_subdirectory(test)

86
include/CAABox.hpp
View File

@ -3,6 +3,8 @@
#include "CVector3f.hpp"
#include "CTransform.hpp"
#include "CPlane.hpp"
#include "Math.hpp"
#include <Athena/IStreamReader.hpp>
class ZE_ALIGN(16) CAABox
@ -55,12 +57,53 @@ public:
inline bool intersects(const CAABox& other) const
{
if (m_max[0] < other.m_min[0]) return false;
if (m_min[0] > other.m_max[0]) return false;
if (m_max[1] < other.m_min[1]) return false;
if (m_min[1] > other.m_max[1]) return false;
if (m_max[2] < other.m_min[2]) return false;
if (m_min[2] > other.m_max[2]) return false;
bool x1 = (m_max[0] < other.m_min[0]);
bool x2 = (m_min[0] > other.m_max[0]);
bool y1 = (m_max[1] < other.m_min[1]);
bool y2 = (m_min[1] > other.m_max[1]);
bool z1 = (m_max[2] < other.m_min[2]);
bool z2 = (m_min[2] > other.m_max[2]);
return x1 && x2 && y1 && y2 && z1 && z2;
}
inline bool inside(const CAABox& other) const
{
bool x = m_min[0] >= other.m_min[0] && m_max[0] <= other.m_max[0];
bool y = m_min[1] >= other.m_min[1] && m_max[1] <= other.m_max[1];
bool z = m_min[2] >= other.m_min[2] && m_max[2] <= other.m_max[2];
return x && y && z;
}
inline bool insidePlane(const CPlane& plane) const
{
CVector3f vmin, vmax;
/* X axis */
if (plane.a >= 0) {
vmin[0] = m_min[0];
vmax[0] = m_max[0];
} else {
vmin[0] = m_max[0];
vmax[0] = m_min[0];
}
/* Y axis */
if (plane.b >= 0) {
vmin[1] = m_min[1];
vmax[1] = m_max[1];
} else {
vmin[1] = m_max[1];
vmax[1] = m_min[1];
}
/* Z axis */
if (plane.c >= 0) {
vmin[2] = m_min[2];
vmax[2] = m_max[2];
} else {
vmin[2] = m_max[2];
vmax[2] = m_min[2];
}
float dadot = plane.vec.dot(vmax);
if (dadot + plane.d < 0)
return false;
return true;
}
@ -68,7 +111,7 @@ public:
{
return (m_min + m_max) * 0.5f;
}
CVector3f extents() const
CVector3f volume() const
{
return (m_max - m_min) * 0.5f;
}
@ -113,16 +156,18 @@ public:
inline CVector3f closestPointAlongVector(const CVector3f& other)
{
return {(other.x >= -0.f) ? m_min.x : m_max.x,
(other.y >= -0.f) ? m_min.y : m_max.y,
(other.z >= -0.f) ? m_min.z : m_max.z};
CVector3f center = this->center();
return {(other.x < center.x ? m_min.x : m_max.x),
(other.y < center.y ? m_min.y : m_max.y),
(other.z < center.z ? m_min.z : m_max.z)};
}
inline CVector3f furthestPointAlongVector(const CVector3f& other)
{
return {(other.x >= -0.f) ? m_max.x : m_min.x,
(other.y >= -0.f) ? m_max.y : m_min.y,
(other.z >= -0.f) ? m_max.z : m_min.z};
CVector3f center = this->center();
return {(other.x < center.x ? m_max.x : m_min.x),
(other.y < center.y ? m_max.y : m_min.y),
(other.z < center.z ? m_max.z : m_min.z)};
}
inline CVector3f getPoint(const int point)
@ -139,18 +184,9 @@ public:
inline CVector3f clampToBox(const CVector3f& vec)
{
CVector3f ret = vec;
if (ret.x < m_min.x)
ret.x = m_min.x;
if (ret.y < m_min.y)
ret.y = m_min.y;
if (ret.z < m_min.z)
ret.z = m_min.z;
if (ret.x > m_max.x)
ret.x = m_max.x;
if (ret.y > m_max.y)
ret.y = m_max.y;
if (ret.z > m_max.z)
ret.z = m_max.z;
Math::clamp(ret.x, m_min.x, m_max.x);
Math::clamp(ret.y, m_min.y, m_max.y);
Math::clamp(ret.z, m_min.z, m_max.z);
return ret;
}

0
include/CLine.hpp Normal file
View File

2
include/COBBox.hpp
View File

@ -16,7 +16,7 @@ public:
{}
COBBox(const CAABox& aabb)
: m_extents(aabb.extents())
: m_extents(aabb.volume())
{
m_transform.m_origin = aabb.center();
}

35
include/CSphere.hpp Normal file
View File

@ -0,0 +1,35 @@
#ifndef CSPHERE_HPP
#define CSPHERE_HPP
#include "CVector3f.hpp"
class ZE_ALIGN(16) CSphere
{
public:
ZE_DECLARE_ALIGNED_ALLOCATOR();
CSphere(const CVector3f& position, float radius)
{
#if __SSE__
mVec128 = position.mVec128;
#endif
r = radius;
}
inline CVector3f getSurfaceNormal(const CVector3f& coord)
{
return (vec - coord).normalized();
}
union
{
struct { float x, y, z, r; };
float s[4];
CVector3f vec;
#if __SSE__
__m128 mVec128;
#endif
};
};
#endif

1
include/CTransform.hpp
View File

@ -123,6 +123,7 @@ static inline CTransform CTransformFromScaleVector(const CVector3f& scale)
return CTransform(CMatrix3f(scale));
}
CTransform CTransformFromEditorEuler(const CVector3f& eulerVec);
CTransform CTransformFromEditorEulers(const CVector3f& eulerVec, const CVector3f& origin);
CTransform CTransformFromAxisAngle(const CVector3f& axis, float angle);
#endif // CTRANSFORM_HPP

21
include/CVector2f.hpp
View File

@ -198,17 +198,26 @@ class ZE_ALIGN(16) CVector2f
inline void normalize()
{
float mag = length();
assert(mag != 0.0);
mag = 1.0 / mag;
*this *= mag;
if (mag > 1e-6f)
{
mag = 1.0 / mag;
*this *= mag;
}
else
zeroOut();
}
inline CVector2f normalized() const
{
float mag = length();
assert(mag != 0.0);
mag = 1.0 / mag;
return *this * mag;
if (mag > 1e-6f)
{
mag = 1.0 / mag;
return *this * mag;
}
return {1, 0};
}
inline float cross(const CVector2f& rhs) const
{
return (x * rhs.y) - (y * rhs.x);

15
include/CVector3f.hpp
View File

@ -169,7 +169,7 @@ public:
*this *= mag;
}
else
x = 1.0, y = 0.0, z = 0.0;
zeroOut();
}
inline CVector3f normalized() const
{
@ -179,7 +179,7 @@ public:
mag = 1.0 / mag;
return *this * mag;
}
return {1, 0, 0};
return {0, 0, 0};
}
inline CVector3f cross(const CVector3f& rhs) const
{
@ -260,6 +260,11 @@ public:
return !isNormalized();
}
inline bool isZero() const
{
return lengthSquared() <= 1e-7;
}
inline void scaleToLength(float newLength)
{
float length = lengthSquared();
@ -281,6 +286,12 @@ public:
return v;
}
inline bool isEqu(const CVector3f& other, float epsilon=1e-7f)
{
CVector3f diffVec = other - *this;
return (diffVec.x <= epsilon && diffVec.y <= epsilon && diffVec.z <= epsilon);
}
inline float& operator[](size_t idx) {return (&x)[idx];}
inline const float& operator[](size_t idx) const {return (&x)[idx];}

19
include/CVector4f.hpp
View File

@ -222,16 +222,23 @@ class ZE_ALIGN(16) CVector4f
inline void normalize()
{
float mag = length();
assert(mag != 0.0);
mag = 1.0 / mag;
*this *= mag;
if (mag > 1e-6f)
{
mag = 1.0 / mag;
*this *= mag;
}
else
zeroOut();
}
inline CVector4f normalized() const
{
float mag = length();
assert(mag != 0.0);
mag = 1.0 / mag;
return *this * mag;
if (mag > 1e-6f)
{
mag = 1.0 / mag;
return *this * mag;
}
return {0, 0, 0, 0};
}
inline float dot(const CVector4f& rhs) const

2
include/Global.hpp
View File

@ -11,7 +11,7 @@
# define ZE_ALIGN(x) __declspec(align(x))
# else
# include <mm_malloc.h>
# define ZE_ALIGN(x) __attribute__((aligned(x)))
# define ZE_ALIGN(x) alignas(16)
# endif
# define ZE_SHUFFLE(x,y,z,w) ((w)<<6 | (z)<<4 | (y)<<2 | (x))
# define zeAlloc(sz, align) _mm_malloc(sz, align)

5
include/Math.hpp
View File

@ -18,15 +18,14 @@ namespace Math
{
template<typename T>
inline T clamp(T min, T val, T max) {return MAX(min, MIN(max, val));}
inline float radToDeg(float rad) {return rad * 180.f / M_PI;}
inline float degToRad(float deg) {return deg * M_PI / 180;}
extern const CVector3f kRadToDegVec;
extern const CVector3f kDegToRadVec;
inline CVector3f radToDeg(CVector3f rad) {return rad * kRadToDegVec;}
inline CVector3f degToRad(CVector3f deg) {return deg * kDegToRadVec;}
extern const CVector3f kUpVec;
CTransform lookAt(const CVector3f& pos, const CVector3f& lookPos, const CVector3f& up=kUpVec);
inline CVector3f baryToWorld(const CVector3f& p0, const CVector3f& p1, const CVector3f& p2, const CVector3f& bary)

2
include/MathLib.hpp
View File

@ -11,10 +11,12 @@
#include "CVector2f.hpp"
#include "CVector3f.hpp"
#include "CVector4f.hpp"
#include "CUnitVector.hpp"
#include "CRectangle.hpp"
#include "CPlane.hpp"
#include "CAABox.hpp"
#include "COBBox.hpp"
#include "CSphere.hpp"
#include "CFrustum.hpp"
#include "CColor.hpp"
#include "Global.hpp"

6
src/CTransform.cpp
View File

@ -58,3 +58,9 @@ CTransform CTransformFromAxisAngle(const CVector3f& axis, float angle)
return result;
}
CTransform CTransformFromEditorEulers(const CVector3f& eulerVec, const CVector3f& origin)
{
CTransform ret = CTransformFromEditorEuler(eulerVec);
ret.m_origin = origin;
return ret;
}