diff options
Diffstat (limited to '3rdparty/glm/glm/gtx/transform.inl')
-rw-r--r-- | 3rdparty/glm/glm/gtx/transform.inl | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/3rdparty/glm/glm/gtx/transform.inl b/3rdparty/glm/glm/gtx/transform.inl index 832a4ca5caa..516d8661a3a 100644 --- a/3rdparty/glm/glm/gtx/transform.inl +++ b/3rdparty/glm/glm/gtx/transform.inl @@ -1,60 +1,24 @@ -/////////////////////////////////////////////////////////////////////////////////// -/// OpenGL Mathematics (glm.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 -/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -/// copies of the Software, and to permit persons to whom the Software is -/// furnished to do so, subject to the following conditions: -/// -/// 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 -/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -/// THE SOFTWARE. -/// /// @ref gtx_transform /// @file glm/gtx/transform.inl -/// @date 2005-12-21 / 2011-06-07 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// 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 |