Skip to content

Commit

Permalink
fix: declarations
Browse files Browse the repository at this point in the history
  • Loading branch information
@gottfriedleibniz
gottfriedleibniz committed Jan 9, 2023
1 parent fc8f4bb commit 36aa3e7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions glm/gtx/pca.hpp
View file
Expand Up @@ -97,17 +97,17 @@ namespace glm {
/// Sorts a group of Eigenvalues&Eigenvectors, for largest Eigenvalue to smallest Eigenvalue.
/// The data in `outEigenvalues` and `outEigenvectors` are assumed to be matching order, i.e. `outEigenvector[i]` is the Eigenvector of the Eigenvalue `outEigenvalue[i]`.
template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<2, T, Q>& eigenvalues, mat<2, 2, T, Q>& eigenvectors);
GLM_FUNC_DECL void sortEigenvalues(vec<2, T, Q>& eigenvalues, mat<2, 2, T, Q>& eigenvectors);

/// Sorts a group of Eigenvalues&Eigenvectors, for largest Eigenvalue to smallest Eigenvalue.
/// The data in `outEigenvalues` and `outEigenvectors` are assumed to be matching order, i.e. `outEigenvector[i]` is the Eigenvector of the Eigenvalue `outEigenvalue[i]`.
template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<3, T, Q>& eigenvalues, mat<3, 3, T, Q>& eigenvectors);
GLM_FUNC_DECL void sortEigenvalues(vec<3, T, Q>& eigenvalues, mat<3, 3, T, Q>& eigenvectors);

/// Sorts a group of Eigenvalues&Eigenvectors, for largest Eigenvalue to smallest Eigenvalue.
/// The data in `outEigenvalues` and `outEigenvectors` are assumed to be matching order, i.e. `outEigenvector[i]` is the Eigenvector of the Eigenvalue `outEigenvalue[i]`.
template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<4, T, Q>& eigenvalues, mat<4, 4, T, Q>& eigenvectors);
GLM_FUNC_DECL void sortEigenvalues(vec<4, T, Q>& eigenvalues, mat<4, 4, T, Q>& eigenvectors);

/// @}
}//namespace glm
Expand Down
20 changes: 10 additions & 10 deletions glm/gtx/pca.inl
View file
Expand Up @@ -10,21 +10,21 @@ namespace glm {


template<length_t D, typename T, qualifier Q>
GLM_INLINE mat<D, D, T, Q> computeCovarianceMatrix(vec<D, T, Q> const* v, size_t n)
GLM_FUNC_QUALIFIER mat<D, D, T, Q> computeCovarianceMatrix(vec<D, T, Q> const* v, size_t n)
{
return computeCovarianceMatrix<D, T, Q, vec<D, T, Q> const*>(v, v + n);
}


template<length_t D, typename T, qualifier Q>
GLM_INLINE mat<D, D, T, Q> computeCovarianceMatrix(vec<D, T, Q> const* v, size_t n, vec<D, T, Q> const& c)
GLM_FUNC_QUALIFIER mat<D, D, T, Q> computeCovarianceMatrix(vec<D, T, Q> const* v, size_t n, vec<D, T, Q> const& c)
{
return computeCovarianceMatrix<D, T, Q, vec<D, T, Q> const*>(v, v + n, c);
}


template<length_t D, typename T, qualifier Q, typename I>
GLM_FUNC_DECL mat<D, D, T, Q> computeCovarianceMatrix(I const& b, I const& e)
GLM_FUNC_QUALIFIER mat<D, D, T, Q> computeCovarianceMatrix(I const& b, I const& e)
{
glm::mat<D, D, T, Q> m(0);

Expand All @@ -45,7 +45,7 @@ namespace glm {


template<length_t D, typename T, qualifier Q, typename I>
GLM_FUNC_DECL mat<D, D, T, Q> computeCovarianceMatrix(I const& b, I const& e, vec<D, T, Q> const& c)
GLM_FUNC_QUALIFIER mat<D, D, T, Q> computeCovarianceMatrix(I const& b, I const& e, vec<D, T, Q> const& c)
{
glm::mat<D, D, T, Q> m(0);
glm::vec<D, T, Q> v;
Expand All @@ -69,13 +69,13 @@ namespace glm {
{

template<typename T>
GLM_INLINE T transferSign(T const& v, T const& s)
GLM_FUNC_QUALIFIER static T transferSign(T const& v, T const& s)
{
return ((s) >= 0 ? glm::abs(v) : -glm::abs(v));
}

template<typename T>
GLM_INLINE T pythag(T const& a, T const& b) {
GLM_FUNC_QUALIFIER static T pythag(T const& a, T const& b) {
static const T epsilon = static_cast<T>(0.0000001);
T absa = glm::abs(a);
T absb = glm::abs(b);
Expand All @@ -93,7 +93,7 @@ namespace glm {
}

template<length_t D, typename T, qualifier Q>
GLM_FUNC_DECL unsigned int findEigenvaluesSymReal
GLM_FUNC_QUALIFIER unsigned int findEigenvaluesSymReal
(
mat<D, D, T, Q> const& covarMat,
vec<D, T, Q>& outEigenvalues,
Expand Down Expand Up @@ -281,7 +281,7 @@ namespace glm {
}

template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<2, T, Q>& eigenvalues, mat<2, 2, T, Q>& eigenvectors)
GLM_FUNC_QUALIFIER void sortEigenvalues(vec<2, T, Q>& eigenvalues, mat<2, 2, T, Q>& eigenvectors)
{
if (eigenvalues[0] < eigenvalues[1])
{
Expand All @@ -291,7 +291,7 @@ namespace glm {
}

template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<3, T, Q>& eigenvalues, mat<3, 3, T, Q>& eigenvectors)
GLM_FUNC_QUALIFIER void sortEigenvalues(vec<3, T, Q>& eigenvalues, mat<3, 3, T, Q>& eigenvectors)
{
if (eigenvalues[0] < eigenvalues[1])
{
Expand All @@ -311,7 +311,7 @@ namespace glm {
}

template<typename T, qualifier Q>
GLM_INLINE void sortEigenvalues(vec<4, T, Q>& eigenvalues, mat<4, 4, T, Q>& eigenvectors)
GLM_FUNC_QUALIFIER void sortEigenvalues(vec<4, T, Q>& eigenvalues, mat<4, 4, T, Q>& eigenvectors)
{
if (eigenvalues[0] < eigenvalues[2])
{
Expand Down
8 changes: 4 additions & 4 deletions glm/gtx/quaternion.hpp
View file
Expand Up @@ -110,28 +110,28 @@ namespace glm
///
/// @see gtx_quaternion
template<typename T, qualifier Q>
GLM_FUNC_DECL mat<3, 3, T, Q> toMat3(
GLM_FUNC_QUALIFIER mat<3, 3, T, Q> toMat3(
qua<T, Q> const& x){return mat3_cast(x);}

/// Converts a quaternion to a 4 * 4 matrix.
///
/// @see gtx_quaternion
template<typename T, qualifier Q>
GLM_FUNC_DECL mat<4, 4, T, Q> toMat4(
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> toMat4(
qua<T, Q> const& x){return mat4_cast(x);}

/// Converts a 3 * 3 matrix to a quaternion.
///
/// @see gtx_quaternion
template<typename T, qualifier Q>
GLM_FUNC_DECL qua<T, Q> toQuat(
GLM_FUNC_QUALIFIER qua<T, Q> toQuat(
mat<3, 3, T, Q> const& x){return quat_cast(x);}

/// Converts a 4 * 4 matrix to a quaternion.
///
/// @see gtx_quaternion
template<typename T, qualifier Q>
GLM_FUNC_DECL qua<T, Q> toQuat(
GLM_FUNC_QUALIFIER qua<T, Q> toQuat(
mat<4, 4, T, Q> const& x){return quat_cast(x);}

/// Quaternion interpolation using the rotation short path.
Expand Down

0 comments on commit 36aa3e7

Please sign in to comment.