diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp deleted file mode 100644 index f693ee19..00000000 --- a/glm/gtx/multiple.hpp +++ /dev/null @@ -1,106 +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_multiple -/// @file glm/gtx/multiple.hpp -/// @date 2009-10-26 / 2011-06-07 -/// @author Christophe Riccio -/// -/// @see core (dependence) -/// @see gtx_extented_min_max (dependence) -/// -/// @defgroup gtx_multiple GLM_GTX_multiple -/// @ingroup gtx -/// -/// @brief Find the closest number of a number multiple of other number. -/// -/// need to be included to use these functionalities. -/////////////////////////////////////////////////////////////////////////////////// - -#pragma once - -// Dependency: -#include "../gtc/round.hpp" - -#pragma message("GLM: GLM_GTX_multiple extension is deprecated, use GLM_GTC_round instead.") - -namespace glm -{ - /// @addtogroup gtx_multiple - /// @{ - - /// Higher multiple number of Source. - /// - /// @tparam genType Floating-point or integer scalar or vector types. - /// @param Source - /// @param Multiple Must be a null or positive value - /// - /// @see gtx_multiple - template - GLM_DEPRECATED GLM_FUNC_DECL genType higherMultiple( - genType Source, - genType Multiple); - - /// Higher multiple number of Source. - /// - /// @tparam genType Floating-point or integer scalar or vector types. - /// @param Source - /// @param Multiple Must be a null or positive value - /// - /// @see gtx_multiple - template class vecType> - GLM_DEPRECATED GLM_FUNC_DECL vecType higherMultiple( - vecType const & Source, - vecType const & Multiple); - - /// Lower multiple number of Source. - /// - /// @tparam genType Floating-point or integer scalar or vector types. - /// @param Source - /// @param Multiple Must be a null or positive value - /// - /// @see gtx_multiple - template - GLM_DEPRECATED GLM_FUNC_DECL genType lowerMultiple( - genType Source, - genType Multiple); - - /// Lower multiple number of Source. - /// - /// @tparam genType Floating-point or integer scalar or vector types. - /// @param Source - /// @param Multiple Must be a null or positive value - /// - /// @see gtx_multiple - template class vecType> - GLM_DEPRECATED GLM_FUNC_DECL vecType lowerMultiple( - vecType const & Source, - vecType const & Multiple); - - /// @} -}//namespace glm - -#include "multiple.inl" diff --git a/glm/gtx/multiple.inl b/glm/gtx/multiple.inl deleted file mode 100644 index 878cdfbf..00000000 --- a/glm/gtx/multiple.inl +++ /dev/null @@ -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_multiple -/// @file glm/gtx/multiple.inl -/// @date 2009-10-26 / 2011-06-07 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -namespace glm -{ - ////////////////////// - // higherMultiple - - template - GLM_FUNC_QUALIFIER genType higherMultiple(genType Source, genType Multiple) - { - return detail::compute_ceilMultiple::is_iec559, std::numeric_limits::is_signed>::call(Source, Multiple); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType higherMultiple(vecType const & Source, vecType const & Multiple) - { - return detail::functor2::call(higherMultiple, Source, Multiple); - } - - ////////////////////// - // lowerMultiple - - template - GLM_FUNC_QUALIFIER genType lowerMultiple(genType Source, genType Multiple) - { - return detail::compute_floorMultiple::is_iec559, std::numeric_limits::is_signed>::call(Source, Multiple); - } - - template class vecType> - GLM_FUNC_QUALIFIER vecType lowerMultiple(vecType const & Source, vecType const & Multiple) - { - return detail::functor2::call(lowerMultiple, Source, Multiple); - } -}//namespace glm diff --git a/readme.md b/readme.md index 444e2870..ea5e251e 100644 --- a/readme.md +++ b/readme.md @@ -83,6 +83,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Deprecation: - Removed integer specification for 'mod' in GTC_integer #308 +- Removed GTX_multiple, replaced by GTC_round -------------------------------------------------------------------------------- #### GLM 0.9.6.4 - 2015-0X-XX diff --git a/test/gtx/CMakeLists.txt b/test/gtx/CMakeLists.txt index be39a6c5..3d61f1dd 100644 --- a/test/gtx/CMakeLists.txt +++ b/test/gtx/CMakeLists.txt @@ -24,7 +24,6 @@ glmCreateTestGTC(gtx_matrix_major_storage) glmCreateTestGTC(gtx_matrix_operation) glmCreateTestGTC(gtx_matrix_query) glmCreateTestGTC(gtx_matrix_transform_2d) -glmCreateTestGTC(gtx_multiple) glmCreateTestGTC(gtx_norm) glmCreateTestGTC(gtx_normal) glmCreateTestGTC(gtx_normalize_dot) diff --git a/test/gtx/gtx_multiple.cpp b/test/gtx/gtx_multiple.cpp deleted file mode 100644 index 535d74a4..00000000 --- a/test/gtx/gtx_multiple.cpp +++ /dev/null @@ -1,175 +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_multiple.cpp -/// @date 2012-11-19 / 2014-11-25 -/// @author Christophe Riccio -/////////////////////////////////////////////////////////////////////////////////// - -#include - -int test_higher_uint() -{ - int Error(0); - - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(0), glm::uvec4(4)), glm::uvec4(0))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(1), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(2), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(3), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(4), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(5), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(6), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(7), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(8), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - Error += glm::all(glm::equal(glm::higherMultiple(glm::uvec4(9), glm::uvec4(4)), glm::uvec4(12))) ? 0 : 1; - - return Error; -} - -int test_Lower_uint() -{ - int Error(0); - - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(0), glm::uvec4(4)), glm::uvec4(0))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(1), glm::uvec4(4)), glm::uvec4(0))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(2), glm::uvec4(4)), glm::uvec4(0))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(3), glm::uvec4(4)), glm::uvec4(0))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(4), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(5), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(6), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(7), glm::uvec4(4)), glm::uvec4(4))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(8), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - Error += glm::all(glm::equal(glm::lowerMultiple(glm::uvec4(9), glm::uvec4(4)), glm::uvec4(8))) ? 0 : 1; - - return Error; -} - -int test_higher_int() -{ - int Error(0); - - Error += glm::higherMultiple(-5, 4) == -4 ? 0 : 1; - Error += glm::higherMultiple(-4, 4) == -4 ? 0 : 1; - Error += glm::higherMultiple(-3, 4) == 0 ? 0 : 1; - Error += glm::higherMultiple(-2, 4) == 0 ? 0 : 1; - Error += glm::higherMultiple(-1, 4) == 0 ? 0 : 1; - Error += glm::higherMultiple(0, 4) == 0 ? 0 : 1; - Error += glm::higherMultiple(1, 4) == 4 ? 0 : 1; - Error += glm::higherMultiple(2, 4) == 4 ? 0 : 1; - Error += glm::higherMultiple(3, 4) == 4 ? 0 : 1; - Error += glm::higherMultiple(4, 4) == 4 ? 0 : 1; - Error += glm::higherMultiple(5, 4) == 8 ? 0 : 1; - Error += glm::higherMultiple(6, 4) == 8 ? 0 : 1; - Error += glm::higherMultiple(7, 4) == 8 ? 0 : 1; - Error += glm::higherMultiple(8, 4) == 8 ? 0 : 1; - Error += glm::higherMultiple(9, 4) == 12 ? 0 : 1; - - return Error; -} - -int test_Lower_int() -{ - int Error(0); - - Error += glm::lowerMultiple(-5, 4) == -8 ? 0 : 1; - Error += glm::lowerMultiple(-4, 4) == -4 ? 0 : 1; - Error += glm::lowerMultiple(-3, 4) == -4 ? 0 : 1; - Error += glm::lowerMultiple(-2, 4) == -4 ? 0 : 1; - Error += glm::lowerMultiple(-1, 4) == -4 ? 0 : 1; - Error += glm::lowerMultiple(0, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(1, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(2, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(3, 4) == 0 ? 0 : 1; - Error += glm::lowerMultiple(4, 4) == 4 ? 0 : 1; - Error += glm::lowerMultiple(5, 4) == 4 ? 0 : 1; - Error += glm::lowerMultiple(6, 4) == 4 ? 0 : 1; - Error += glm::lowerMultiple(7, 4) == 4 ? 0 : 1; - Error += glm::lowerMultiple(8, 4) == 8 ? 0 : 1; - Error += glm::lowerMultiple(9, 4) == 8 ? 0 : 1; - - return Error; -} - -int test_higher_double() -{ - int Error(0); - - Error += glm::higherMultiple(-9.0, 4.0) == -8.0 ? 0 : 1; - Error += glm::higherMultiple(-5.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::higherMultiple(-4.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::higherMultiple(-3.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::higherMultiple(-2.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::higherMultiple(-1.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::higherMultiple(0.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::higherMultiple(1.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::higherMultiple(2.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::higherMultiple(3.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::higherMultiple(4.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::higherMultiple(5.0, 4.0) == 8.0 ? 0 : 1; - Error += glm::higherMultiple(6.0, 4.0) == 8.0 ? 0 : 1; - Error += glm::higherMultiple(7.0, 4.0) == 8.0 ? 0 : 1; - Error += glm::higherMultiple(8.0, 4.0) == 8.0 ? 0 : 1; - Error += glm::higherMultiple(9.0, 4.0) == 12.0 ? 0 : 1; - - return Error; -} - -int test_Lower_double() -{ - int Error(0); - - Error += glm::lowerMultiple(-5.0, 4.0) == -8.0 ? 0 : 1; - Error += glm::lowerMultiple(-4.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::lowerMultiple(-3.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::lowerMultiple(-2.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::lowerMultiple(-1.0, 4.0) == -4.0 ? 0 : 1; - Error += glm::lowerMultiple(0.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::lowerMultiple(1.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::lowerMultiple(2.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::lowerMultiple(3.0, 4.0) == 0.0 ? 0 : 1; - Error += glm::lowerMultiple(4.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::lowerMultiple(5.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::lowerMultiple(6.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::lowerMultiple(7.0, 4.0) == 4.0 ? 0 : 1; - Error += glm::lowerMultiple(8.0, 4.0) == 8.0 ? 0 : 1; - Error += glm::lowerMultiple(9.0, 4.0) == 8.0 ? 0 : 1; - - return Error; -} - -int main() -{ - int Error(0); - - Error += test_higher_int(); - Error += test_Lower_int(); - Error += test_higher_uint(); - Error += test_Lower_uint(); - Error += test_higher_double(); - Error += test_Lower_double(); - - return Error; -}