diff --git a/readme.md b/readme.md index 81f8d120..3486af0c 100644 --- a/readme.md +++ b/readme.md @@ -53,7 +53,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) ## Release notes -### [GLM 0.9.9.7](https://github.com/g-truc/glm/releases/latest) - 2020-01-XX +### [GLM 0.9.9.7](https://github.com/g-truc/glm/releases/tag/0.9.9.7) - 2020-01-05 #### Improvements: - Improved Neon support with more functions optimized #950 - Added CMake GLM interface #963 @@ -65,6 +65,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) - Fixed for intersection ray/plane and added related tests #953 - Fixed ARM 64bit detection #949 - Fixed GLM_EXT_matrix_clip_space warnings #980 +- Fixed Wimplicit-int-float-conversion warnings with clang 10+ #986 ### [GLM 0.9.9.6](https://github.com/g-truc/glm/releases/tag/0.9.9.6) - 2019-09-08 #### Features: diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp index f3c4e957..8bf86ba0 100644 --- a/test/gtx/gtx_fast_trigonometry.cpp +++ b/test/gtx/gtx_fast_trigonometry.cpp @@ -239,12 +239,12 @@ namespace taylorCos std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i))); + Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * static_cast(i))); std::clock_t const TimeStampEnd = std::clock(); @@ -280,12 +280,12 @@ namespace taylorCos std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i))); + Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * static_cast(i))); std::clock_t const TimeStampEnd = std::clock(); @@ -327,12 +327,12 @@ namespace taylorCos std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * static_cast(i))); std::clock_t const TimeStampEnd = std::clock(); @@ -349,12 +349,12 @@ namespace taylorCos std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * static_cast(i))); std::clock_t const TimeStampEnd = std::clock(); @@ -371,12 +371,12 @@ namespace taylorCos std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i))); + Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * static_cast(i))); std::clock_t const TimeStampEnd = std::clock(); @@ -466,12 +466,12 @@ namespace taylor2 std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i)); + Results[i] = taylorCosA(AngleShift.x + Begin + Steps * static_cast(i)); std::clock_t const TimeStampEnd = std::clock(); @@ -488,12 +488,12 @@ namespace taylor2 std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i)); + Results[i] = taylorCosB(AngleShift.x + Begin + Steps * static_cast(i)); std::clock_t const TimeStampEnd = std::clock(); @@ -510,12 +510,12 @@ namespace taylor2 std::vector Results; Results.resize(Samples); - float Steps = (End - Begin) / float(Samples); + float const Steps = (End - Begin) / static_cast(Samples); std::clock_t const TimeStampBegin = std::clock(); for(std::size_t i = 0; i < Samples; ++i) - Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i)); + Results[i] = taylorCosC(AngleShift.x + Begin + Steps * static_cast(i)); std::clock_t const TimeStampEnd = std::clock();