Christophe Riccio
ago%!(EXTRA string=10 years)
parent
998feff87e
commit
a9ab80d5fd
9 changed files with 136 additions and 273 deletions
@ -1,64 +0,0 @@ |
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
/// 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_float_normalize
|
||||
/// @file glm/gtx/float_normalize.hpp
|
||||
/// @date 2015-09-25 / 2015-09-25
|
||||
/// @author Christophe Riccio
|
||||
///
|
||||
/// @see core (dependence)
|
||||
///
|
||||
/// @defgroup gtx_float_normalize GLM_GTX_float_normalize
|
||||
/// @ingroup gtx
|
||||
///
|
||||
/// @brief Convert integer vectors into normalized float vectors.
|
||||
///
|
||||
/// <glm/gtx/color_space.hpp> need to be included to use these functionalities.
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#pragma once |
||||
|
||||
// Dependency:
|
||||
#include "../glm.hpp" |
||||
|
||||
#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) |
||||
# pragma message("GLM: GLM_GTX_float_normalize extension included") |
||||
#endif |
||||
|
||||
namespace glm |
||||
{ |
||||
/// @addtogroup gtx_float_normalize
|
||||
/// @{
|
||||
|
||||
/// Converts a color from HSV color space to its color in RGB color space.
|
||||
/// @see gtx_float_normalize
|
||||
template <typename T, precision P, template <typename, precision> class vecType> |
||||
GLM_FUNC_DECL vecType<float, P> floatNormalize(vecType<T, P> const & v); |
||||
|
||||
/// @}
|
||||
}//namespace glm
|
||||
|
||||
#include "float_normalize.inl" |
||||
@ -1,77 +0,0 @@ |
||||
/////////////////////////////////////////////////////////////////////////////////// |
||||
/// 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_float_normalize |
||||
/// @file glm/gtx/float_normalize.inl |
||||
/// @date 2015-09-25 / 2015-09-25 |
||||
/// @author Christophe Riccio |
||||
/////////////////////////////////////////////////////////////////////////////////// |
||||
|
||||
#include <limits> |
||||
|
||||
namespace glm{ |
||||
namespace detail |
||||
{ |
||||
template <typename T, typename floatType, precision P, template <typename, precision> class vecType, bool isInteger, bool signedType> |
||||
struct compute_floatNormalize |
||||
{}; |
||||
|
||||
template <typename T, typename floatType, precision P, template <typename, precision> class vecType> |
||||
struct compute_floatNormalize<T, floatType, P, vecType, true, true> |
||||
{ |
||||
GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) |
||||
{ |
||||
floatType const Min = static_cast<floatType>(std::numeric_limits<T>::min()); |
||||
floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()); |
||||
return (vecType<floatType, P>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1); |
||||
} |
||||
}; |
||||
|
||||
template <typename T, typename floatType, precision P, template <typename, precision> class vecType> |
||||
struct compute_floatNormalize<T, floatType, P, vecType, true, false> |
||||
{ |
||||
GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) |
||||
{ |
||||
return vecType<floatType, P>(v) / static_cast<floatType>(std::numeric_limits<T>::max()); |
||||
} |
||||
}; |
||||
|
||||
template <typename T, typename floatType, precision P, template <typename, precision> class vecType> |
||||
struct compute_floatNormalize<T, floatType, P, vecType, false, true> |
||||
{ |
||||
GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v) |
||||
{ |
||||
return v; |
||||
} |
||||
}; |
||||
}//namespace detail |
||||
|
||||
template <typename T, precision P, template <typename, precision> class vecType> |
||||
GLM_FUNC_QUALIFIER vecType<float, P> floatNormalize(vecType<T, P> const & v) |
||||
{ |
||||
return detail::compute_floatNormalize<T, float, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v); |
||||
} |
||||
}//namespace glm |
||||
@ -1,110 +0,0 @@ |
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
/// 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.
|
||||
///
|
||||
/// @file test/gtx/gtx_float_normalize.cpp
|
||||
/// @date 2015-09-25 / 2015-09-25
|
||||
/// @author Christophe Riccio
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <glm/gtx/float_normalize.hpp> |
||||
#include <glm/gtc/type_precision.hpp> |
||||
#include <glm/gtc/epsilon.hpp> |
||||
#include <glm/gtc/constants.hpp> |
||||
#include <limits> |
||||
|
||||
namespace integer_8bit_test |
||||
{ |
||||
int run() |
||||
{ |
||||
int Error(0); |
||||
|
||||
{ |
||||
glm::vec4 const A = glm::floatNormalize(glm::u8vec4(0, 127, 128, 255)); |
||||
|
||||
Error += glm::epsilonEqual(A.x, 0.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
Error += A.y < 0.5f ? 0 : 1; |
||||
Error += A.z > 0.5f ? 0 : 1; |
||||
Error += glm::epsilonEqual(A.w, 1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
} |
||||
|
||||
{ |
||||
glm::vec4 const A = glm::floatNormalize(glm::i8vec4(-128, -1, 0, 127)); |
||||
|
||||
Error += glm::epsilonEqual(A.x,-1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
Error += A.y < 0.0f ? 0 : 1; |
||||
Error += A.z > 0.0f ? 0 : 1; |
||||
Error += glm::epsilonEqual(A.w, 1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
} |
||||
|
||||
return Error; |
||||
} |
||||
}//namespace integer_8bit_test
|
||||
|
||||
namespace integer_16bit_test |
||||
{ |
||||
int run() |
||||
{ |
||||
int Error(0); |
||||
|
||||
{ |
||||
glm::vec4 const A = glm::floatNormalize(glm::u16vec4( |
||||
std::numeric_limits<glm::u16>::min(), |
||||
(std::numeric_limits<glm::u16>::max() >> 1) + 0, |
||||
(std::numeric_limits<glm::u16>::max() >> 1) + 1, |
||||
std::numeric_limits<glm::u16>::max())); |
||||
|
||||
Error += glm::epsilonEqual(A.x, 0.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
Error += A.y < 0.5f ? 0 : 1; |
||||
Error += A.z > 0.5f ? 0 : 1; |
||||
Error += glm::epsilonEqual(A.w, 1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
} |
||||
|
||||
{ |
||||
glm::vec4 const A = glm::floatNormalize(glm::i16vec4( |
||||
std::numeric_limits<glm::i16>::min(), |
||||
static_cast<glm::i16>(-1), |
||||
static_cast<glm::i16>(0), |
||||
std::numeric_limits<glm::i16>::max())); |
||||
|
||||
Error += glm::epsilonEqual(A.x,-1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
Error += A.y < 0.0f ? 0 : 1; |
||||
Error += A.z > 0.0f ? 0 : 1; |
||||
Error += glm::epsilonEqual(A.w, 1.0f, glm::epsilon<float>()) ? 0 : 1; |
||||
} |
||||
|
||||
return Error; |
||||
} |
||||
}//namespace integer_16bit_test
|
||||
|
||||
int main() |
||||
{ |
||||
int Error(0); |
||||
|
||||
Error += integer_8bit_test::run(); |
||||
Error += integer_16bit_test::run(); |
||||
|
||||
return Error; |
||||
} |
||||
Loading…
Reference in New Issue