mirror of
https://github.com/g-truc/glm.git
synced 2025-04-06 14:05:01 +00:00
Fixed cast and clean up
This commit is contained in:
Christophe Riccio
parent
ad262c3592
commit
1c5fd06c2d
6 changed files with 129 additions and 289 deletions
|
|
@ -231,7 +231,7 @@ namespace detail
|
|||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecIUType>
|
||||
GLM_FUNC_QUALIFIER vecIUType<T, P> mask(vecIUType<T, P> const & v)
|
||||
GLM_FUNC_QUALIFIER vecIUType<T, P> mask(vecIUType<T, P> const& v)
|
||||
{
|
||||
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'mask' accepts only integer values");
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ namespace detail
|
|||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldRotateLeft(vecType<T, P> const & In, int Shift)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldRotateLeft(vecType<T, P> const& In, int Shift)
|
||||
{
|
||||
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldRotateLeft' accepts only integer values");
|
||||
|
||||
|
|
@ -281,7 +281,7 @@ namespace detail
|
|||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillOne(vecType<T, P> const & Value, int FirstBit, int BitCount)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillOne(vecType<T, P> const& Value, int FirstBit, int BitCount)
|
||||
{
|
||||
return Value | static_cast<T>(mask(BitCount) << FirstBit);
|
||||
}
|
||||
|
|
@ -293,7 +293,7 @@ namespace detail
|
|||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillZero(vecType<T, P> const & Value, int FirstBit, int BitCount)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> bitfieldFillZero(vecType<T, P> const& Value, int FirstBit, int BitCount)
|
||||
{
|
||||
return Value & static_cast<T>(~(mask(BitCount) << FirstBit));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace detail
|
|||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
struct compute_rgbToSrgb
|
||||
{
|
||||
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & ColorRGB, T GammaCorrection)
|
||||
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const& ColorRGB, T GammaCorrection)
|
||||
{
|
||||
vecType<T, P> const ClampedColor(clamp(ColorRGB, static_cast<T>(0), static_cast<T>(1)));
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ namespace detail
|
|||
template <typename T, precision P>
|
||||
struct compute_rgbToSrgb<T, P, tvec4>
|
||||
{
|
||||
GLM_FUNC_QUALIFIER static tvec4<T, P> call(tvec4<T, P> const & ColorRGB, T GammaCorrection)
|
||||
GLM_FUNC_QUALIFIER static tvec4<T, P> call(tvec4<T, P> const& ColorRGB, T GammaCorrection)
|
||||
{
|
||||
return tvec4<T, P>(compute_rgbToSrgb<T, P, tvec3>::call(tvec3<T, P>(ColorRGB), GammaCorrection), ColorRGB.a);
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ namespace detail
|
|||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
struct compute_srgbToRgb
|
||||
{
|
||||
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & ColorSRGB, T Gamma)
|
||||
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const& ColorSRGB, T Gamma)
|
||||
{
|
||||
return mix(
|
||||
pow((ColorSRGB + static_cast<T>(0.055)) * static_cast<T>(0.94786729857819905213270142180095), vecType<T, P>(Gamma)),
|
||||
|
|
@ -42,7 +42,7 @@ namespace detail
|
|||
template <typename T, precision P>
|
||||
struct compute_srgbToRgb<T, P, tvec4>
|
||||
{
|
||||
GLM_FUNC_QUALIFIER static tvec4<T, P> call(tvec4<T, P> const & ColorSRGB, T Gamma)
|
||||
GLM_FUNC_QUALIFIER static tvec4<T, P> call(tvec4<T, P> const& ColorSRGB, T Gamma)
|
||||
{
|
||||
return tvec4<T, P>(compute_srgbToRgb<T, P, tvec3>::call(tvec3<T, P>(ColorSRGB), Gamma), ColorSRGB.a);
|
||||
}
|
||||
|
|
@ -50,25 +50,25 @@ namespace detail
|
|||
}//namespace detail
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertLinearToSRGB(vecType<T, P> const & ColorLinear)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertLinearToSRGB(vecType<T, P> const& ColorLinear)
|
||||
{
|
||||
return detail::compute_rgbToSrgb<T, P, vecType>::call(ColorLinear, static_cast<T>(0.41666));
|
||||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertLinearToSRGB(vecType<T, P> const & ColorLinear, T Gamma)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertLinearToSRGB(vecType<T, P> const& ColorLinear, T Gamma)
|
||||
{
|
||||
return detail::compute_rgbToSrgb<T, P, vecType>::call(ColorLinear, static_cast<T>(1) / Gamma);
|
||||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertSRGBToLinear(vecType<T, P> const & ColorSRGB)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertSRGBToLinear(vecType<T, P> const& ColorSRGB)
|
||||
{
|
||||
return detail::compute_srgbToRgb<T, P, vecType>::call(ColorSRGB, static_cast<T>(2.4));
|
||||
}
|
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType>
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertSRGBToLinear(vecType<T, P> const & ColorSRGB, T Gamma)
|
||||
GLM_FUNC_QUALIFIER vecType<T, P> convertSRGBToLinear(vecType<T, P> const& ColorSRGB, T Gamma)
|
||||
{
|
||||
return detail::compute_srgbToRgb<T, P, vecType>::call(ColorSRGB, Gamma);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
namespace glm
|
||||
{
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> translate
|
||||
(
|
||||
tmat4x4<T, P> const & m,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(tmat4x4<T, P> const & m, tvec3<T, P> const & v)
|
||||
{
|
||||
tmat4x4<T, P> Result(m);
|
||||
Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3];
|
||||
|
|
@ -20,12 +16,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate
|
||||
(
|
||||
tmat4x4<T, P> const & m,
|
||||
T angle,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(tmat4x4<T, P> const & m, T angle, tvec3<T, P> const & v)
|
||||
{
|
||||
T const a = angle;
|
||||
T const c = cos(a);
|
||||
|
|
@ -36,15 +27,15 @@ namespace glm
|
|||
|
||||
tmat4x4<T, P> Rotate(uninitialize);
|
||||
Rotate[0][0] = c + temp[0] * axis[0];
|
||||
Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
|
||||
Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
|
||||
Rotate[0][1] = temp[0] * axis[1] + s * axis[2];
|
||||
Rotate[0][2] = temp[0] * axis[2] - s * axis[1];
|
||||
|
||||
Rotate[1][0] = 0 + temp[1] * axis[0] - s * axis[2];
|
||||
Rotate[1][0] = temp[1] * axis[0] - s * axis[2];
|
||||
Rotate[1][1] = c + temp[1] * axis[1];
|
||||
Rotate[1][2] = 0 + temp[1] * axis[2] + s * axis[0];
|
||||
Rotate[1][2] = temp[1] * axis[2] + s * axis[0];
|
||||
|
||||
Rotate[2][0] = 0 + temp[2] * axis[0] + s * axis[1];
|
||||
Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
|
||||
Rotate[2][0] = temp[2] * axis[0] + s * axis[1];
|
||||
Rotate[2][1] = temp[2] * axis[1] - s * axis[0];
|
||||
Rotate[2][2] = c + temp[2] * axis[2];
|
||||
|
||||
tmat4x4<T, P> Result(uninitialize);
|
||||
|
|
@ -56,12 +47,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow
|
||||
(
|
||||
tmat4x4<T, P> const & m,
|
||||
T angle,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate_slow(tmat4x4<T, P> const & m, T angle, tvec3<T, P> const & v)
|
||||
{
|
||||
T const a = angle;
|
||||
T const c = cos(a);
|
||||
|
|
@ -70,31 +56,27 @@ namespace glm
|
|||
|
||||
tvec3<T, P> axis = normalize(v);
|
||||
|
||||
Result[0][0] = c + (1 - c) * axis.x * axis.x;
|
||||
Result[0][1] = (1 - c) * axis.x * axis.y + s * axis.z;
|
||||
Result[0][2] = (1 - c) * axis.x * axis.z - s * axis.y;
|
||||
Result[0][3] = 0;
|
||||
Result[0][0] = c + (static_cast<T>(1) - c) * axis.x * axis.x;
|
||||
Result[0][1] = (static_cast<T>(1) - c) * axis.x * axis.y + s * axis.z;
|
||||
Result[0][2] = (static_cast<T>(1) - c) * axis.x * axis.z - s * axis.y;
|
||||
Result[0][3] = static_cast<T>(0);
|
||||
|
||||
Result[1][0] = (1 - c) * axis.y * axis.x - s * axis.z;
|
||||
Result[1][1] = c + (1 - c) * axis.y * axis.y;
|
||||
Result[1][2] = (1 - c) * axis.y * axis.z + s * axis.x;
|
||||
Result[1][3] = 0;
|
||||
Result[1][0] = (static_cast<T>(1) - c) * axis.y * axis.x - s * axis.z;
|
||||
Result[1][1] = c + (static_cast<T>(1) - c) * axis.y * axis.y;
|
||||
Result[1][2] = (static_cast<T>(1) - c) * axis.y * axis.z + s * axis.x;
|
||||
Result[1][3] = static_cast<T>(0);
|
||||
|
||||
Result[2][0] = (1 - c) * axis.z * axis.x + s * axis.y;
|
||||
Result[2][1] = (1 - c) * axis.z * axis.y - s * axis.x;
|
||||
Result[2][2] = c + (1 - c) * axis.z * axis.z;
|
||||
Result[2][3] = 0;
|
||||
Result[2][0] = (static_cast<T>(1) - c) * axis.z * axis.x + s * axis.y;
|
||||
Result[2][1] = (static_cast<T>(1) - c) * axis.z * axis.y - s * axis.x;
|
||||
Result[2][2] = c + (static_cast<T>(1) - c) * axis.z * axis.z;
|
||||
Result[2][3] = static_cast<T>(0);
|
||||
|
||||
Result[3] = tvec4<T, P>(0, 0, 0, 1);
|
||||
return m * Result;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale
|
||||
(
|
||||
tmat4x4<T, P> const & m,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(tmat4x4<T, P> const & m, tvec3<T, P> const & v)
|
||||
{
|
||||
tmat4x4<T, P> Result(uninitialize);
|
||||
Result[0] = m[0] * v[0];
|
||||
|
|
@ -105,11 +87,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale_slow
|
||||
(
|
||||
tmat4x4<T, P> const & m,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale_slow(tmat4x4<T, P> const & m, tvec3<T, P> const & v)
|
||||
{
|
||||
tmat4x4<T, P> Result(T(1));
|
||||
Result[0][0] = v.x;
|
||||
|
|
@ -267,13 +245,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear,
|
||||
T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspective(T fovy, T aspect, T zNear, T zFar)
|
||||
{
|
||||
# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
|
||||
return perspectiveLH(fovy, aspect, zNear, zFar);
|
||||
|
|
@ -283,12 +255,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveRH
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear, T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveRH(T fovy, T aspect, T zNear, T zFar)
|
||||
{
|
||||
assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
|
||||
|
||||
|
|
@ -311,12 +278,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveLH
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear, T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveLH(T fovy, T aspect, T zNear, T zFar)
|
||||
{
|
||||
assert(abs(aspect - std::numeric_limits<T>::epsilon()) > static_cast<T>(0));
|
||||
|
||||
|
|
@ -339,12 +301,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov
|
||||
(
|
||||
T fov,
|
||||
T width, T height,
|
||||
T zNear, T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFov(T fov, T width, T height, T zNear, T zFar)
|
||||
{
|
||||
# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
|
||||
return perspectiveFovLH(fov, width, height, zNear, zFar);
|
||||
|
|
@ -354,12 +311,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFovRH
|
||||
(
|
||||
T fov,
|
||||
T width, T height,
|
||||
T zNear, T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFovRH(T fov, T width, T height, T zNear, T zFar)
|
||||
{
|
||||
assert(width > static_cast<T>(0));
|
||||
assert(height > static_cast<T>(0));
|
||||
|
|
@ -386,12 +338,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFovLH
|
||||
(
|
||||
T fov,
|
||||
T width, T height,
|
||||
T zNear, T zFar
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> perspectiveFovLH(T fov, T width, T height, T zNear, T zFar)
|
||||
{
|
||||
assert(width > static_cast<T>(0));
|
||||
assert(height > static_cast<T>(0));
|
||||
|
|
@ -418,12 +365,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspective
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspective(T fovy, T aspect, T zNear)
|
||||
{
|
||||
# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
|
||||
return infinitePerspectiveLH(fovy, aspect, zNear);
|
||||
|
|
@ -433,68 +375,52 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspectiveRH
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspectiveRH(T fovy, T aspect, T zNear)
|
||||
{
|
||||
T const range = tan(fovy / T(2)) * zNear;
|
||||
T const range = tan(fovy / static_cast<T>(2)) * zNear;
|
||||
T const left = -range * aspect;
|
||||
T const right = range * aspect;
|
||||
T const bottom = -range;
|
||||
T const top = range;
|
||||
|
||||
tmat4x4<T, defaultp> Result(T(0));
|
||||
Result[0][0] = (T(2) * zNear) / (right - left);
|
||||
Result[1][1] = (T(2) * zNear) / (top - bottom);
|
||||
Result[2][2] = - T(1);
|
||||
Result[2][3] = - T(1);
|
||||
Result[3][2] = - T(2) * zNear;
|
||||
tmat4x4<T, defaultp> Result(static_cast<T>(0));
|
||||
Result[0][0] = (static_cast<T>(2) * zNear) / (right - left);
|
||||
Result[1][1] = (static_cast<T>(2) * zNear) / (top - bottom);
|
||||
Result[2][2] = - static_cast<T>(1);
|
||||
Result[2][3] = - static_cast<T>(1);
|
||||
Result[3][2] = - static_cast<T>(2) * zNear;
|
||||
return Result;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspectiveLH
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> infinitePerspectiveLH(T fovy, T aspect, T zNear)
|
||||
{
|
||||
T const range = tan(fovy / T(2)) * zNear;
|
||||
T const range = tan(fovy / static_cast<T>(2)) * zNear;
|
||||
T const left = -range * aspect;
|
||||
T const right = range * aspect;
|
||||
T const bottom = -range;
|
||||
T const top = range;
|
||||
|
||||
tmat4x4<T, defaultp> Result(T(0));
|
||||
Result[0][0] = (T(2) * zNear) / (right - left);
|
||||
Result[1][1] = (T(2) * zNear) / (top - bottom);
|
||||
Result[2][2] = T(1);
|
||||
Result[2][3] = T(1);
|
||||
Result[3][2] = - T(2) * zNear;
|
||||
Result[0][0] = (static_cast<T>(2) * zNear) / (right - left);
|
||||
Result[1][1] = (static_cast<T>(2) * zNear) / (top - bottom);
|
||||
Result[2][2] = static_cast<T>(1);
|
||||
Result[2][3] = static_cast<T>(1);
|
||||
Result[3][2] = - static_cast<T>(2) * zNear;
|
||||
return Result;
|
||||
}
|
||||
|
||||
// Infinite projection matrix: http://www.terathon.com/gdc07_lengyel.pdf
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> tweakedInfinitePerspective
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear,
|
||||
T ep
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> tweakedInfinitePerspective(T fovy, T aspect, T zNear, T ep)
|
||||
{
|
||||
T const range = tan(fovy / T(2)) * zNear;
|
||||
T const range = tan(fovy / static_cast<T>(2)) * zNear;
|
||||
T const left = -range * aspect;
|
||||
T const right = range * aspect;
|
||||
T const bottom = -range;
|
||||
T const top = range;
|
||||
|
||||
tmat4x4<T, defaultp> Result(T(0));
|
||||
tmat4x4<T, defaultp> Result(static_cast<T>(0));
|
||||
Result[0][0] = (static_cast<T>(2) * zNear) / (right - left);
|
||||
Result[1][1] = (static_cast<T>(2) * zNear) / (top - bottom);
|
||||
Result[2][2] = ep - static_cast<T>(1);
|
||||
|
|
@ -504,12 +430,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> tweakedInfinitePerspective
|
||||
(
|
||||
T fovy,
|
||||
T aspect,
|
||||
T zNear
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> tweakedInfinitePerspective(T fovy, T aspect, T zNear)
|
||||
{
|
||||
return tweakedInfinitePerspective(fovy, aspect, zNear, epsilon<T>());
|
||||
}
|
||||
|
|
@ -523,16 +444,16 @@ namespace glm
|
|||
tvec4<U, P> const & viewport
|
||||
)
|
||||
{
|
||||
tvec4<T, P> tmp = tvec4<T, P>(obj, T(1));
|
||||
tvec4<T, P> tmp = tvec4<T, P>(obj, static_cast<T>(1));
|
||||
tmp = model * tmp;
|
||||
tmp = proj * tmp;
|
||||
|
||||
tmp /= tmp.w;
|
||||
# if GLM_DEPTH_CLIP_SPACE == GLM_DEPTH_ZERO_TO_ONE
|
||||
tmp.x = tmp.x * T(0.5) + T(0.5);
|
||||
tmp.y = tmp.y * T(0.5) + T(0.5);
|
||||
tmp.x = tmp.x * static_cast<T>(0.5) + static_cast<T>(0.5);
|
||||
tmp.y = tmp.y * static_cast<T>(0.5) + static_cast<T>(0.5);
|
||||
# else
|
||||
tmp = tmp * T(0.5) + T(0.5);
|
||||
tmp = tmp * static_cast<T>(0.5) + static_cast<T>(0.5);
|
||||
# endif
|
||||
tmp[0] = tmp[0] * T(viewport[2]) + T(viewport[0]);
|
||||
tmp[1] = tmp[1] * T(viewport[3]) + T(viewport[1]);
|
||||
|
|
@ -555,10 +476,10 @@ namespace glm
|
|||
tmp.x = (tmp.x - T(viewport[0])) / T(viewport[2]);
|
||||
tmp.y = (tmp.y - T(viewport[1])) / T(viewport[3]);
|
||||
# if GLM_DEPTH_CLIP_SPACE == GLM_DEPTH_ZERO_TO_ONE
|
||||
tmp.x = tmp.x * T(2) - T(1);
|
||||
tmp.y = tmp.y * T(2) - T(1);
|
||||
tmp.x = tmp.x * static_cast<T>(2) - static_cast<T>(1);
|
||||
tmp.y = tmp.y * static_cast<T>(2) - static_cast<T>(1);
|
||||
# else
|
||||
tmp = tmp * T(2) - T(1);
|
||||
tmp = tmp * static_cast<T>(2) - static_cast<T>(1);
|
||||
# endif
|
||||
|
||||
tvec4<T, P> obj = Inverse * tmp;
|
||||
|
|
@ -568,36 +489,26 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P, typename U>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> pickMatrix
|
||||
(
|
||||
tvec2<T, P> const & center,
|
||||
tvec2<T, P> const & delta,
|
||||
tvec4<U, P> const & viewport
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> pickMatrix(tvec2<T, P> const & center, tvec2<T, P> const & delta, tvec4<U, P> const & viewport)
|
||||
{
|
||||
assert(delta.x > T(0) && delta.y > T(0));
|
||||
tmat4x4<T, P> Result(1.0f);
|
||||
assert(delta.x > static_cast<T>(0) && delta.y > static_cast<T>(0));
|
||||
tmat4x4<T, P> Result(static_cast<T>(1));
|
||||
|
||||
if(!(delta.x > T(0) && delta.y > T(0)))
|
||||
if(!(delta.x > static_cast<T>(0) && delta.y > static_cast<T>(0)))
|
||||
return Result; // Error
|
||||
|
||||
tvec3<T, P> Temp(
|
||||
(T(viewport[2]) - T(2) * (center.x - T(viewport[0]))) / delta.x,
|
||||
(T(viewport[3]) - T(2) * (center.y - T(viewport[1]))) / delta.y,
|
||||
T(0));
|
||||
(static_cast<T>(viewport[2]) - static_cast<T>(2) * (center.x - static_cast<T>(viewport[0]))) / delta.x,
|
||||
(static_cast<T>(viewport[3]) - static_cast<T>(2) * (center.y - static_cast<T>(viewport[1]))) / delta.y,
|
||||
static_cast<T>(0));
|
||||
|
||||
// Translate and scale the picked region to the entire window
|
||||
Result = translate(Result, Temp);
|
||||
return scale(Result, tvec3<T, P>(T(viewport[2]) / delta.x, T(viewport[3]) / delta.y, T(1)));
|
||||
return scale(Result, tvec3<T, P>(static_cast<T>(viewport[2]) / delta.x, static_cast<T>(viewport[3]) / delta.y, static_cast<T>(1)));
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> lookAt
|
||||
(
|
||||
tvec3<T, P> const & eye,
|
||||
tvec3<T, P> const & center,
|
||||
tvec3<T, P> const & up
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> lookAt(tvec3<T, P> const & eye, tvec3<T, P> const & center, tvec3<T, P> const & up)
|
||||
{
|
||||
# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
|
||||
return lookAtLH(eye, center, up);
|
||||
|
|
|
|||
|
|
@ -7,21 +7,13 @@
|
|||
namespace glm
|
||||
{
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> cross
|
||||
(
|
||||
tvec3<T, P> const & v,
|
||||
tquat<T, P> const & q
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> cross(tvec3<T, P> const& v, tquat<T, P> const& q)
|
||||
{
|
||||
return inverse(q) * v;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> cross
|
||||
(
|
||||
tquat<T, P> const & q,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> cross(tquat<T, P> const& q, tvec3<T, P> const& v)
|
||||
{
|
||||
return q * v;
|
||||
}
|
||||
|
|
@ -51,25 +43,19 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> exp
|
||||
(
|
||||
tquat<T, P> const & q
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> exp(tquat<T, P> const& q)
|
||||
{
|
||||
tvec3<T, P> u(q.x, q.y, q.z);
|
||||
T Angle = glm::length(u);
|
||||
T const Angle = glm::length(u);
|
||||
if (Angle < epsilon<T>())
|
||||
return tquat<T, P>();
|
||||
|
||||
tvec3<T, P> v(u / Angle);
|
||||
tvec3<T, P> const v(u / Angle);
|
||||
return tquat<T, P>(cos(Angle), sin(Angle) * v);
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> log
|
||||
(
|
||||
tquat<T, P> const & q
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> log(tquat<T, P> const& q)
|
||||
{
|
||||
tvec3<T, P> u(q.x, q.y, q.z);
|
||||
T Vec3Len = length(u);
|
||||
|
|
@ -110,36 +96,25 @@ namespace glm
|
|||
T Angle = acos(x.w / magnitude);
|
||||
T NewAngle = Angle * y;
|
||||
T Div = sin(NewAngle) / sin(Angle);
|
||||
T Mag = pow(magnitude, y-1);
|
||||
T Mag = pow(magnitude, y - static_cast<T>(1));
|
||||
|
||||
return tquat<T, P>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> rotate
|
||||
(
|
||||
tquat<T, P> const & q,
|
||||
tvec3<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tvec3<T, P> rotate(tquat<T, P> const& q, tvec3<T, P> const& v)
|
||||
{
|
||||
return q * v;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tvec4<T, P> rotate
|
||||
(
|
||||
tquat<T, P> const & q,
|
||||
tvec4<T, P> const & v
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tvec4<T, P> rotate(tquat<T, P> const& q, tvec4<T, P> const& v)
|
||||
{
|
||||
return q * v;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER T extractRealComponent
|
||||
(
|
||||
tquat<T, P> const & q
|
||||
)
|
||||
GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, P> const& q)
|
||||
{
|
||||
T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
|
||||
if(w < T(0))
|
||||
|
|
@ -149,21 +124,13 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER T length2
|
||||
(
|
||||
tquat<T, P> const & q
|
||||
)
|
||||
GLM_FUNC_QUALIFIER T length2(tquat<T, P> const& q)
|
||||
{
|
||||
return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> shortMix
|
||||
(
|
||||
tquat<T, P> const & x,
|
||||
tquat<T, P> const & y,
|
||||
T const & a
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> shortMix(tquat<T, P> const& x, tquat<T, P> const& y, T const& a)
|
||||
{
|
||||
if(a <= static_cast<T>(0)) return x;
|
||||
if(a >= static_cast<T>(1)) return y;
|
||||
|
|
@ -200,22 +167,13 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> fastMix
|
||||
(
|
||||
tquat<T, P> const & x,
|
||||
tquat<T, P> const & y,
|
||||
T const & a
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> fastMix(tquat<T, P> const& x, tquat<T, P> const& y, T const & a)
|
||||
{
|
||||
return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> rotation
|
||||
(
|
||||
tvec3<T, P> const & orig,
|
||||
tvec3<T, P> const & dest
|
||||
)
|
||||
GLM_FUNC_QUALIFIER tquat<T, P> rotation(tvec3<T, P> const& orig, tvec3<T, P> const& dest)
|
||||
{
|
||||
T cosTheta = dot(orig, dest);
|
||||
tvec3<T, P> rotationAxis;
|
||||
|
|
|
|||
|
|
@ -4,28 +4,21 @@
|
|||
namespace glm
|
||||
{
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(
|
||||
tvec3<T, P> const & v)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(tvec3<T, P> const & v)
|
||||
{
|
||||
return translate(
|
||||
tmat4x4<T, P>(1.0f), v);
|
||||
return translate(tmat4x4<T, P>(static_cast<T>(1)), v);
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(
|
||||
T angle,
|
||||
tvec3<T, P> const & v)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(T angle, tvec3<T, P> const & v)
|
||||
{
|
||||
return rotate(
|
||||
tmat4x4<T, P>(1), angle, v);
|
||||
return rotate(tmat4x4<T, P>(static_cast<T>(1)), angle, v);
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(
|
||||
tvec3<T, P> const & v)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(tvec3<T, P> const & v)
|
||||
{
|
||||
return scale(
|
||||
tmat4x4<T, P>(1.0f), v);
|
||||
return scale(tmat4x4<T, P>(static_cast<T>(1)), v);
|
||||
}
|
||||
|
||||
}//namespace glm
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
namespace glm
|
||||
{
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(
|
||||
const tmat3x3<T, P>& m,
|
||||
T s)
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(tmat3x3<T, P> const& m, T s)
|
||||
{
|
||||
tmat3x3<T, P> r(1);
|
||||
r[0][1] = s;
|
||||
|
|
@ -14,9 +12,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(
|
||||
const tmat3x3<T, P>& m,
|
||||
T s)
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(tmat3x3<T, P> const& m, T s)
|
||||
{
|
||||
tmat3x3<T, P> r(1);
|
||||
r[1][0] = s;
|
||||
|
|
@ -24,10 +20,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(
|
||||
const tmat4x4<T, P>& m,
|
||||
T s,
|
||||
T t)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(tmat4x4<T, P> const& m, T s, T t)
|
||||
{
|
||||
tmat4x4<T, P> r(1);
|
||||
r[1][0] = s;
|
||||
|
|
@ -36,10 +29,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(
|
||||
const tmat4x4<T, P>& m,
|
||||
T s,
|
||||
T t)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(tmat4x4<T, P> const& m, T s, T t)
|
||||
{
|
||||
tmat4x4<T, P> r(1);
|
||||
r[0][1] = s;
|
||||
|
|
@ -48,10 +38,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(
|
||||
const tmat4x4<T, P>& m,
|
||||
T s,
|
||||
T t)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(tmat4x4<T, P> const& m, T s, T t)
|
||||
{
|
||||
tmat4x4<T, P> r(1);
|
||||
r[0][2] = s;
|
||||
|
|
@ -60,35 +47,31 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(
|
||||
const tmat3x3<T, P>& m,
|
||||
const tvec3<T, P>& normal)
|
||||
GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(tmat3x3<T, P> const& m, tvec3<T, P> const& normal)
|
||||
{
|
||||
tmat3x3<T, P> r(1);
|
||||
r[0][0] = 1 - 2 * normal.x * normal.x;
|
||||
r[0][1] = -2 * normal.x * normal.y;
|
||||
r[1][0] = -2 * normal.x * normal.y;
|
||||
r[1][1] = 1 - 2 * normal.y * normal.y;
|
||||
tmat3x3<T, P> r(static_cast<T>(1));
|
||||
r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x;
|
||||
r[0][1] = -static_cast<T>(2) * normal.x * normal.y;
|
||||
r[1][0] = -static_cast<T>(2) * normal.x * normal.y;
|
||||
r[1][1] = static_cast<T>(1) - static_cast<T>(2) * normal.y * normal.y;
|
||||
return m * r;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(
|
||||
const tmat4x4<T, P>& m,
|
||||
const tvec3<T, P>& normal)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(tmat4x4<T, P> const& m, tvec3<T, P> const& normal)
|
||||
{
|
||||
tmat4x4<T, P> r(1);
|
||||
r[0][0] = 1 - 2 * normal.x * normal.x;
|
||||
r[0][1] = -2 * normal.x * normal.y;
|
||||
r[0][2] = -2 * normal.x * normal.z;
|
||||
tmat4x4<T, P> r(static_cast<T>(1));
|
||||
r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x;
|
||||
r[0][1] = -static_cast<T>(2) * normal.x * normal.y;
|
||||
r[0][2] = -static_cast<T>(2) * normal.x * normal.z;
|
||||
|
||||
r[1][0] = -2 * normal.x * normal.y;
|
||||
r[1][1] = 1 - 2 * normal.y * normal.y;
|
||||
r[1][2] = -2 * normal.y * normal.z;
|
||||
r[1][0] = -static_cast<T>(2) * normal.x * normal.y;
|
||||
r[1][1] = static_cast<T>(1) - static_cast<T>(2) * normal.y * normal.y;
|
||||
r[1][2] = -static_cast<T>(2) * normal.y * normal.z;
|
||||
|
||||
r[2][0] = -2 * normal.x * normal.z;
|
||||
r[2][1] = -2 * normal.y * normal.z;
|
||||
r[2][2] = 1 - 2 * normal.z * normal.z;
|
||||
r[2][0] = -static_cast<T>(2) * normal.x * normal.z;
|
||||
r[2][1] = -static_cast<T>(2) * normal.y * normal.z;
|
||||
r[2][2] = static_cast<T>(1) - static_cast<T>(2) * normal.z * normal.z;
|
||||
return m * r;
|
||||
}
|
||||
|
||||
|
|
@ -97,11 +80,11 @@ namespace glm
|
|||
const tmat3x3<T, P>& m,
|
||||
const tvec3<T, P>& normal)
|
||||
{
|
||||
tmat3x3<T, P> r(1);
|
||||
r[0][0] = 1 - normal.x * normal.x;
|
||||
tmat3x3<T, P> r(static_cast<T>(1));
|
||||
r[0][0] = static_cast<T>(1) - normal.x * normal.x;
|
||||
r[0][1] = - normal.x * normal.y;
|
||||
r[1][0] = - normal.x * normal.y;
|
||||
r[1][1] = 1 - normal.y * normal.y;
|
||||
r[1][1] = static_cast<T>(1) - normal.y * normal.y;
|
||||
return m * r;
|
||||
}
|
||||
|
||||
|
|
@ -110,26 +93,24 @@ namespace glm
|
|||
const tmat4x4<T, P>& m,
|
||||
const tvec3<T, P>& normal)
|
||||
{
|
||||
tmat4x4<T, P> r(1);
|
||||
r[0][0] = 1 - normal.x * normal.x;
|
||||
tmat4x4<T, P> r(static_cast<T>(1));
|
||||
r[0][0] = static_cast<T>(1) - normal.x * normal.x;
|
||||
r[0][1] = - normal.x * normal.y;
|
||||
r[0][2] = - normal.x * normal.z;
|
||||
r[1][0] = - normal.x * normal.y;
|
||||
r[1][1] = 1 - normal.y * normal.y;
|
||||
r[1][1] = static_cast<T>(1) - normal.y * normal.y;
|
||||
r[1][2] = - normal.y * normal.z;
|
||||
r[2][0] = - normal.x * normal.z;
|
||||
r[2][1] = - normal.y * normal.z;
|
||||
r[2][2] = 1 - normal.z * normal.z;
|
||||
r[2][2] = static_cast<T>(1) - normal.z * normal.z;
|
||||
return m * r;
|
||||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
|
||||
T scale,
|
||||
T bias)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(T scale, T bias)
|
||||
{
|
||||
tmat4x4<T, P> result;
|
||||
result[3] = tvec4<T, P>(tvec3<T, P>(bias), T(1));
|
||||
result[3] = tvec4<T, P>(tvec3<T, P>(bias), static_cast<T>(1));
|
||||
result[0][0] = scale;
|
||||
result[1][1] = scale;
|
||||
result[2][2] = scale;
|
||||
|
|
@ -137,10 +118,7 @@ namespace glm
|
|||
}
|
||||
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(
|
||||
const tmat4x4<T, P>& m,
|
||||
T scale,
|
||||
T bias)
|
||||
GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(tmat4x4<T, P> const& m, T scale, T bias)
|
||||
{
|
||||
return m * scaleBias(scale, bias);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue