diff --git a/glm/core/_literals.hpp b/glm/core/_literals.hpp new file mode 100644 index 00000000..6b6a2bfe --- /dev/null +++ b/glm/core/_literals.hpp @@ -0,0 +1,51 @@ +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2013 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. +/// +/// 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 core +/// @file glm/core/_literals.hpp +/// @date 2013-05-06 / 2013-05-06 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// + +#ifndef glm_core_literals +#define glm_core_literals + +namespace glm +{ +#define GLM_CXX11_USER_LITERALS +#ifdef GLM_CXX11_USER_LITERALS + + GLM_FUNC_QUALIFIER detail::half operator "" _h(long double const s) + { + return detail::half(s); + } + + GLM_FUNC_QUALIFIER float operator "" _f(long double const s) + { + return static_cast(s); + } + +#endif//GLM_CXX11_USER_LITERALS + +}//namespace glm + +#endif//glm_core_literals diff --git a/glm/core/type_half.hpp b/glm/core/type_half.hpp index 5afc7df3..88f75e05 100644 --- a/glm/core/type_half.hpp +++ b/glm/core/type_half.hpp @@ -111,7 +111,7 @@ namespace detail detail::half const & y); }//namespace detail - + /// Low half-precision floating-point numbers. typedef detail::half lowp_half; diff --git a/glm/glm.hpp b/glm/glm.hpp index d62f8185..e4ad5eca 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -102,6 +102,8 @@ #include "./core/type_float.hpp" #include "./core/type_int.hpp" +#include "./core/_literals.hpp" + #include "./core/type_vec1.hpp" #include "./core/type_vec2.hpp" #include "./core/type_vec3.hpp"