From b3a24a05654d0d45b1a1cd730404ddb8b33e455b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 7 May 2018 18:12:18 +0200 Subject: [PATCH] Fixed linearRand #762 --- glm/gtc/random.inl | 78 +++++++---------------------------------- test/gtc/gtc_random.cpp | 1 + 2 files changed, 13 insertions(+), 66 deletions(-) diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index b1475009..5301c59c 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -176,84 +176,30 @@ namespace detail } }; - template - struct compute_linearRand + template + struct compute_linearRand { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) + GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; + return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; } }; - template - struct compute_linearRand + template + struct compute_linearRand { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) + GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; + return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; } }; - template - struct compute_linearRand + template + struct compute_linearRand { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) + GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; - } - }; - - template - struct compute_linearRand - { - GLM_FUNC_QUALIFIER static vec call(vec const& Min, vec const& Max) - { - return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; + return vec(compute_rand::call()) / static_cast(std::numeric_limits::max()) * (Max - Min) + Min; } }; }//namespace detail diff --git a/test/gtc/gtc_random.cpp b/test/gtc/gtc_random.cpp index 30211439..9849862a 100644 --- a/test/gtc/gtc_random.cpp +++ b/test/gtc/gtc_random.cpp @@ -1,3 +1,4 @@ +#define GLM_FORCE_ALIGNED #include #include #if GLM_LANG & GLM_LANG_CXX0X_FLAG