mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-06 12:26:37 +00:00
Updated version of glm
This commit is contained in:
@@ -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
|
||||
@@ -30,15 +34,14 @@
|
||||
/// @see gtc_quaternion
|
||||
///
|
||||
/// @defgroup gtx_rotate_normalized_axis GLM_GTX_rotate_normalized_axis
|
||||
/// @ingroup gtc
|
||||
/// @ingroup gtx
|
||||
///
|
||||
/// @brief Quaternions and matrices rotations around normalized axis.
|
||||
///
|
||||
/// <glm/gtx/rotate_normalized_axis.hpp> need to be included to use these functionalities.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef GLM_GTX_rotate_normalized_axis
|
||||
#define GLM_GTX_rotate_normalized_axis
|
||||
#pragma once
|
||||
|
||||
// Dependency:
|
||||
#include "../glm.hpp"
|
||||
@@ -63,13 +66,13 @@ namespace glm
|
||||
///
|
||||
/// @see gtx_rotate_normalized_axis
|
||||
/// @see - rotate(T angle, T x, T y, T z)
|
||||
/// @see - rotate(detail::tmat4x4<T, P> const & m, T angle, T x, T y, T z)
|
||||
/// @see - rotate(T angle, detail::tvec3<T, P> const & v)
|
||||
/// @see - rotate(tmat4x4<T, P> const & m, T angle, T x, T y, T z)
|
||||
/// @see - rotate(T angle, tvec3<T, P> const & v)
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_DECL detail::tmat4x4<T, P> rotateNormalizedAxis(
|
||||
detail::tmat4x4<T, P> const & m,
|
||||
GLM_FUNC_DECL tmat4x4<T, P> rotateNormalizedAxis(
|
||||
tmat4x4<T, P> const & m,
|
||||
T const & angle,
|
||||
detail::tvec3<T, P> const & axis);
|
||||
tvec3<T, P> const & axis);
|
||||
|
||||
/// Rotates a quaternion from a vector of 3 components normalized axis and an angle.
|
||||
///
|
||||
@@ -79,14 +82,12 @@ namespace glm
|
||||
///
|
||||
/// @see gtx_rotate_normalized_axis
|
||||
template <typename T, precision P>
|
||||
GLM_FUNC_DECL detail::tquat<T, P> rotateNormalizedAxis(
|
||||
detail::tquat<T, P> const & q,
|
||||
GLM_FUNC_DECL tquat<T, P> rotateNormalizedAxis(
|
||||
tquat<T, P> const & q,
|
||||
T const & angle,
|
||||
detail::tvec3<T, P> const & axis);
|
||||
tvec3<T, P> const & axis);
|
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
#include "rotate_normalized_axis.inl"
|
||||
|
||||
#endif//GLM_GTX_rotate_normalized_axis
|
||||
|
||||
Reference in New Issue
Block a user