mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed mix function link error

Browse Source
This commit is contained in:
Christophe Riccio
2014-01-18 03:14:00 +01:00
parent 6a3e1e9c35
commit 926c8d159c
3 changed files with 88 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glm/detail/func_common.hpp
View File

@@ -258,6 +258,18 @@ namespace glm
/// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second. /// glm::dvec3 t = glm::mix(e, f, a); // Types of the third parameter is not required to match with the first and the second.
/// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter. /// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
/// @endcode /// @endcode
template <typename T, typename U, precision P, template <typename, precision> class vecType>
GLM_FUNC_DECL vecType<T, P> mix(
vecType<T, P> const & x,
vecType<T, P> const & y,
vecType<U, P> const & a);
template <typename T, typename U, precision P, template <typename, precision> class vecType>
GLM_FUNC_DECL vecType<T, P> mix(
vecType<T, P> const & x,
vecType<T, P> const & y,
U const & a);
template <typename genTypeT, typename genTypeU> template <typename genTypeT, typename genTypeU>
GLM_FUNC_DECL genTypeT mix( GLM_FUNC_DECL genTypeT mix(
genTypeT const & x, genTypeT const & x,

306
glm/detail/func_common.inl
View File

@@ -64,6 +64,63 @@ namespace detail
return x; return x;
} }
}; };
template <typename T, typename U, precision P, template <class, precision> class vecType>
struct compute_mix_vector
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<U, P> const & a)
{
return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
}
};
template <typename T, precision P, template <class, precision> class vecType>
struct compute_mix_vector<T, bool, P, vecType>
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, vecType<bool, P> const & a)
{
vecType<T, P> Result;
for(length_t i = 0; i < x.length(); ++i)
Result[i] = a[i] ? y[i] : x[i];
return Result;
}
};
template <typename T, typename U, precision P, template <class, precision> class vecType>
struct compute_mix_scalar
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, U const & a)
{
return vecType<T, P>(vecType<U, P>(x) + a * vecType<U, P>(y - x));
}
};
template <typename T, precision P, template <class, precision> class vecType>
struct compute_mix_scalar<T, bool, P, vecType>
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, vecType<T, P> const & y, bool const & a)
{
return a ? y : x;
}
};
template <typename T, typename U>
struct compute_mix
{
GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, U const & a)
{
return static_cast<T>(static_cast<U>(x) + a * static_cast<U>(y - x));
}
};
template <typename T>
struct compute_mix<T, bool>
{
GLM_FUNC_QUALIFIER static T call(T const & x, T const & y, bool const & a)
{
return a ? y : x;
}
};
}//namespace detail }//namespace detail
// abs // abs
@@ -459,250 +516,37 @@ namespace detail
clamp(x.w, minVal.w, maxVal.w)); clamp(x.w, minVal.w, maxVal.w));
} }
// mix template <typename T, typename U, precision P, template <typename, precision> class vecType>
template <typename genType> GLM_FUNC_QUALIFIER vecType<T, P> mix
GLM_FUNC_QUALIFIER genType mix
( (
genType const & x, vecType<T, P> const & x,
genType const & y, vecType<T, P> const & y,
genType const & a vecType<U, P> const & a
) )
{ {
GLM_STATIC_ASSERT( return detail::compute_mix_vector<T, U, P, vecType>::call(x, y, a);
std::numeric_limits<genType>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
} }
template <typename T, precision P> template <typename T, typename U, precision P, template <typename, precision> class vecType>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix GLM_FUNC_QUALIFIER vecType<T, P> mix
( (
detail::tvec2<T, P> const & x, vecType<T, P> const & x,
detail::tvec2<T, P> const & y, vecType<T, P> const & y,
T const & a U const & a
) )
{ {
GLM_STATIC_ASSERT( return detail::compute_mix_scalar<T, U, P, vecType>::call(x, y, a);
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
} }
template <typename T, precision P> template <typename genTypeT, typename genTypeU>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix GLM_FUNC_QUALIFIER genTypeT mix
( (
detail::tvec3<T, P> const & x, genTypeT const & x,
detail::tvec3<T, P> const & y, genTypeT const & y,
T const & a genTypeU const & a
) )
{ {
GLM_STATIC_ASSERT( return detail::compute_mix<genTypeT, genTypeU>::call(x, y, a);
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
(
detail::tvec4<T, P> const & x,
detail::tvec4<T, P> const & y,
T const & a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
(
detail::tvec2<T, P> const & x,
detail::tvec2<T, P> const & y,
detail::tvec2<T, P> const & a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
(
detail::tvec3<T, P> const & x,
detail::tvec3<T, P> const & y,
detail::tvec3<T, P> const & a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
(
detail::tvec4<T, P> const & x,
detail::tvec4<T, P> const & y,
detail::tvec4<T, P> const & a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return x + a * (y - x);
}
//template <typename genTypeT>
//GLM_FUNC_QUALIFIER genTypeT mix
//(
// genTypeT const & x,
// genTypeT const & y,
// float const & a
//)
//{
// // It could be a vector too
// //GLM_STATIC_ASSERT(
// // detail::type<genTypeT>::is_float &&
// // detail::type<genTypeU>::is_float);
// return x + a * (y - x);
//}
template <>
GLM_FUNC_QUALIFIER float mix
(
float const & x,
float const & y,
bool const & a
)
{
return a ? y : x;
}
template <>
GLM_FUNC_QUALIFIER double mix
(
double const & x,
double const & y,
bool const & a
)
{
return a ? y : x;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
(
detail::tvec2<T, P> const & x,
detail::tvec2<T, P> const & y,
bool a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return a ? y : x;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
(
detail::tvec3<T, P> const & x,
detail::tvec3<T, P> const & y,
bool a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return a ? y : x;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
(
detail::tvec4<T, P> const & x,
detail::tvec4<T, P> const & y,
bool a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
return a ? y : x;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> mix
(
detail::tvec2<T, P> const & x,
detail::tvec2<T, P> const & y,
typename detail::tvec2<T, P>::bool_type a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
detail::tvec2<T, P> result;
for(int i = 0; i < x.length(); ++i)
result[i] = a[i] ? y[i] : x[i];
return result;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> mix
(
detail::tvec3<T, P> const & x,
detail::tvec3<T, P> const & y,
typename detail::tvec3<T, P>::bool_type a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
detail::tvec3<T, P> result;
for(int i = 0; i < x.length(); ++i)
result[i] = a[i] ? y[i] : x[i];
return result;
}
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> mix
(
detail::tvec4<T, P> const & x,
detail::tvec4<T, P> const & y,
typename detail::tvec4<T, P>::bool_type a
)
{
GLM_STATIC_ASSERT(
std::numeric_limits<T>::is_iec559,
"'mix' only accept floating-point inputs");
detail::tvec4<T, P> result;
for(int i = 0; i < x.length(); ++i)
result[i] = a[i] ? y[i] : x[i];
return result;
} }
// step // step

1
readme.txt
View File

@@ -41,6 +41,7 @@ GLM 0.9.5.2: 2014-0X-XX
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- Fixed warnings with the Android NDK 9c - Fixed warnings with the Android NDK 9c
- Fixed non power of two matrix products - Fixed non power of two matrix products
- Fixed mix function link error
================================================================================ ================================================================================
GLM 0.9.5.1: 2014-01-11 GLM 0.9.5.1: 2014-01-11