Browse Source

Fixed Wimplicit-int-float-conversion warnings with clang 10+ #986

Christophe Riccio 6 years ago
parent
commit
436579b37e
2 changed files with 18 additions and 17 deletions
  1. 2 1
      readme.md
  2. 16 16
      test/gtx/gtx_fast_trigonometry.cpp

+ 2 - 1
readme.md

@@ -53,7 +53,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
 
 
 ## Release notes
 ## 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:
 #### Improvements:
 - Improved Neon support with more functions optimized #950
 - Improved Neon support with more functions optimized #950
 - Added CMake GLM interface #963
 - 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 for intersection ray/plane and added related tests #953
 - Fixed ARM 64bit detection #949
 - Fixed ARM 64bit detection #949
 - Fixed GLM_EXT_matrix_clip_space warnings #980
 - 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
 ### [GLM 0.9.9.6](https://github.com/g-truc/glm/releases/tag/0.9.9.6) - 2019-09-08
 #### Features:
 #### Features:

+ 16 - 16
test/gtx/gtx_fast_trigonometry.cpp

@@ -239,12 +239,12 @@ namespace taylorCos
 		std::vector<glm::vec4> Results;
 		std::vector<glm::vec4> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i)));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -280,12 +280,12 @@ namespace taylorCos
 		std::vector<glm::vec4> Results;
 		std::vector<glm::vec4> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i)));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -327,12 +327,12 @@ namespace taylorCos
 		std::vector<glm::vec4> Results;
 		std::vector<glm::vec4> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i)));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -349,12 +349,12 @@ namespace taylorCos
 		std::vector<glm::vec4> Results;
 		std::vector<glm::vec4> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i)));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -371,12 +371,12 @@ namespace taylorCos
 		std::vector<glm::vec4> Results;
 		std::vector<glm::vec4> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i)));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -466,12 +466,12 @@ namespace taylor2
 		std::vector<float> Results;
 		std::vector<float> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -488,12 +488,12 @@ namespace taylor2
 		std::vector<float> Results;
 		std::vector<float> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();
 
 
@@ -510,12 +510,12 @@ namespace taylor2
 		std::vector<float> Results;
 		std::vector<float> Results;
 		Results.resize(Samples);
 		Results.resize(Samples);
 
 
-		float Steps = (End - Begin) / float(Samples);
+		float const Steps = (End - Begin) / static_cast<float>(Samples);
 
 
 		std::clock_t const TimeStampBegin = std::clock();
 		std::clock_t const TimeStampBegin = std::clock();
 
 
 		for(std::size_t i = 0; i < Samples; ++i)
 		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<float>(i));
 
 
 		std::clock_t const TimeStampEnd = std::clock();
 		std::clock_t const TimeStampEnd = std::clock();