mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-07 01:03:22 +08:00
Updated GLM version w/ now standard radians as angles.
This commit is contained in:
J. de Vries
@@ -1,7 +1,7 @@
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// OpenGL Mathematics (glm.g-truc.net)
|
||||
///
|
||||
/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
|
||||
/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
|
||||
/// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
/// of this software and associated documentation files (the "Software"), to deal
|
||||
/// in the Software without restriction, including without limitation the rights
|
||||
@@ -12,6 +12,10 @@
|
||||
/// The above copyright notice and this permission notice shall be included in
|
||||
/// all copies or substantial portions of the Software.
|
||||
///
|
||||
/// Restrictions:
|
||||
/// By making use of the Software for military purposes, you choose to make
|
||||
/// a Bunny unhappy.
|
||||
///
|
||||
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
@@ -36,14 +40,15 @@
|
||||
/// <glm/gtx/quaternion.hpp> need to be included to use these functionalities.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef GLM_GTX_quaternion
|
||||
#define GLM_GTX_quaternion GLM_VERSION
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include "../glm.hpp"
|
||||
#include "../gtc/constants.hpp"
|
||||
#include "../gtc/quaternion.hpp"
|
||||
#include "../gtx/norm.hpp"
|
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(glm_ext))
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED))
|
||||
# pragma message("GLM: GLM_GTX_quaternion extension included")
|
||||
#endif
|
||||
|
||||
@@ -52,144 +57,158 @@ namespace glm
|
||||
/// @addtogroup gtx_quaternion
|
||||
/// @{
|
||||
|
||||
//! Compute a cross product between a quaternion and a vector.
|
||||
//! Compute a cross product between a quaternion and a vector.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tvec3<valType> cross(
|
||||
detail::tquat<valType> const & q,
|
||||
detail::tvec3<valType> const & v);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tvec3<T, P> cross(
|
||||
tquat<T, P> const & q,
|
||||
tvec3<T, P> const & v);
|
||||
|
||||
//! Compute a cross product between a vector and a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tvec3<valType> cross(
|
||||
detail::tvec3<valType> const & v,
|
||||
detail::tquat<valType> const & q);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tvec3<T, P> cross(
|
||||
tvec3<T, P> const & v,
|
||||
tquat<T, P> const & q);
|
||||
|
||||
//! Compute a point on a path according squad equation.
|
||||
//! q1 and q2 are control points; s1 and s2 are intermediate control points.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> squad(
|
||||
detail::tquat<valType> const & q1,
|
||||
detail::tquat<valType> const & q2,
|
||||
detail::tquat<valType> const & s1,
|
||||
detail::tquat<valType> const & s2,
|
||||
valType const & h);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> squad(
|
||||
tquat<T, P> const & q1,
|
||||
tquat<T, P> const & q2,
|
||||
tquat<T, P> const & s1,
|
||||
tquat<T, P> const & s2,
|
||||
T const & h);
|
||||
|
||||
//! Returns an intermediate control point for squad interpolation.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> intermediate(
|
||||
detail::tquat<valType> const & prev,
|
||||
detail::tquat<valType> const & curr,
|
||||
detail::tquat<valType> const & next);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> intermediate(
|
||||
tquat<T, P> const & prev,
|
||||
tquat<T, P> const & curr,
|
||||
tquat<T, P> const & next);
|
||||
|
||||
//! Returns a exp of a quaternion.
|
||||
//! Returns a exp of a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> exp(
|
||||
detail::tquat<valType> const & q);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> exp(
|
||||
tquat<T, P> const & q);
|
||||
|
||||
//! Returns a log of a quaternion.
|
||||
//! Returns a log of a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> log(
|
||||
detail::tquat<valType> const & q);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> log(
|
||||
tquat<T, P> const & q);
|
||||
|
||||
/// Returns x raised to the y power.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> pow(
|
||||
detail::tquat<valType> const & x,
|
||||
valType const & y);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> pow(
|
||||
tquat<T, P> const & x,
|
||||
T const & y);
|
||||
|
||||
//! Returns quarternion square root.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
//template <typename valType>
|
||||
//detail::tquat<valType> sqrt(
|
||||
// detail::tquat<valType> const & q);
|
||||
//template<typename T, precision P>
|
||||
//tquat<T, P> sqrt(
|
||||
// tquat<T, P> const & q);
|
||||
|
||||
//! Rotates a 3 components vector by a quaternion.
|
||||
//! Rotates a 3 components vector by a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tvec3<valType> rotate(
|
||||
detail::tquat<valType> const & q,
|
||||
detail::tvec3<valType> const & v);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tvec3<T, P> rotate(
|
||||
tquat<T, P> const & q,
|
||||
tvec3<T, P> const & v);
|
||||
|
||||
/// Rotates a 4 components vector by a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tvec4<valType> rotate(
|
||||
detail::tquat<valType> const & q,
|
||||
detail::tvec4<valType> const & v);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tvec4<T, P> rotate(
|
||||
tquat<T, P> const & q,
|
||||
tvec4<T, P> const & v);
|
||||
|
||||
/// Extract the real component of a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
valType extractRealComponent(
|
||||
detail::tquat<valType> const & q);
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL T extractRealComponent(
|
||||
tquat<T, P> const & q);
|
||||
|
||||
/// Converts a quaternion to a 3 * 3 matrix.
|
||||
/// Converts a quaternion to a 3 * 3 matrix.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tmat3x3<valType> toMat3(
|
||||
detail::tquat<valType> const & x){return mat3_cast(x);}
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tmat3x3<T, P> toMat3(
|
||||
tquat<T, P> const & x){return mat3_cast(x);}
|
||||
|
||||
/// Converts a quaternion to a 4 * 4 matrix.
|
||||
/// Converts a quaternion to a 4 * 4 matrix.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tmat4x4<valType> toMat4(
|
||||
detail::tquat<valType> const & x){return mat4_cast(x);}
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tmat4x4<T, P> toMat4(
|
||||
tquat<T, P> const & x){return mat4_cast(x);}
|
||||
|
||||
/// Converts a 3 * 3 matrix to a quaternion.
|
||||
/// Converts a 3 * 3 matrix to a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> toQuat(
|
||||
detail::tmat3x3<valType> const & x){return quat_cast(x);}
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> toQuat(
|
||||
tmat3x3<T, P> const & x){return quat_cast(x);}
|
||||
|
||||
/// Converts a 4 * 4 matrix to a quaternion.
|
||||
/// Converts a 4 * 4 matrix to a quaternion.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename valType>
|
||||
detail::tquat<valType> toQuat(
|
||||
detail::tmat4x4<valType> const & x){return quat_cast(x);}
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> toQuat(
|
||||
tmat4x4<T, P> const & x){return quat_cast(x);}
|
||||
|
||||
/// Quaternion interpolation using the rotation short path.
|
||||
/// Quaternion interpolation using the rotation short path.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename T>
|
||||
detail::tquat<T> shortMix(
|
||||
detail::tquat<T> const & x,
|
||||
detail::tquat<T> const & y,
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> shortMix(
|
||||
tquat<T, P> const & x,
|
||||
tquat<T, P> const & y,
|
||||
T const & a);
|
||||
|
||||
/// Quaternion normalized linear interpolation.
|
||||
/// Quaternion normalized linear interpolation.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template <typename T>
|
||||
detail::tquat<T> fastMix(
|
||||
detail::tquat<T> const & x,
|
||||
detail::tquat<T> const & y,
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> fastMix(
|
||||
tquat<T, P> const & x,
|
||||
tquat<T, P> const & y,
|
||||
T const & a);
|
||||
|
||||
/// Compute the rotation between two vectors.
|
||||
/// param orig vector, needs to be normalized
|
||||
/// param dest vector, needs to be normalized
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL tquat<T, P> rotation(
|
||||
tvec3<T, P> const & orig,
|
||||
tvec3<T, P> const & dest);
|
||||
|
||||
/// Returns the squared length of x.
|
||||
///
|
||||
/// @see gtx_quaternion
|
||||
template<typename T, precision P>
|
||||
GLM_FUNC_DECL T length2(tquat<T, P> const & q);
|
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
#include "quaternion.inl"
|
||||
|
||||
#endif//GLM_GTX_quaternion
|
||||
|
||||
Reference in New Issue
Block a user