mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 01:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kraj/glm

Browse Source
This commit is contained in:
Christophe Riccio 2020-01-05 15:08:16 +01:00
commit 016263179c
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtx/scalar_multiplication.hpp
View File

@ -54,7 +54,7 @@ namespace glm
template<typename T> \ template<typename T> \
return_type_scalar_multiplication<T, Vec> \ return_type_scalar_multiplication<T, Vec> \
operator/(Vec lh, T const& s){ \ operator/(Vec lh, T const& s){ \
return lh *= 1.0f / s; \ return lh *= 1.0f / static_cast<float>(s); \
} }
GLM_IMPLEMENT_SCAL_MULT(vec2) GLM_IMPLEMENT_SCAL_MULT(vec2)

32
test/gtx/gtx_fast_trigonometry.cpp
View File

@ -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) / Samples; float Steps = (End - Begin) / 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 * i)); Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i)); Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i)); Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i)); Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i)); Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i); Results[i] = taylorCosA(AngleShift.x + Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i); Results[i] = taylorCosB(AngleShift.x + Begin + Steps * 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) / Samples; float Steps = (End - Begin) / 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 * i); Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i));
std::clock_t const TimeStampEnd = std::clock(); std::clock_t const TimeStampEnd = std::clock();