mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 02:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
Christophe Riccio 2017-08-09 22:15:01 +02:00
parent 3c7d778dba
commit b936761960
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/core/core_func_common.cpp
View File

@ -16,12 +16,12 @@ namespace floor_
int Error(0); int Error(0);
{ {
float A(1.1f); float A = 1.1f;
float B = glm::floor(A); float B = glm::floor(A);
} }
{ {
double A(1.1f); double A = 1.1;
double B = glm::floor(A); double B = glm::floor(A);
} }
@ -33,7 +33,7 @@ namespace floor_
} }
{ {
glm::dvec1 A(1.1f); glm::dvec1 A(1.1);
glm::dvec1 B = glm::floor(A); glm::dvec1 B = glm::floor(A);
Error += glm::all(glm::epsilonEqual(B, glm::dvec1(1.0), 0.0001)) ? 0 : 1; Error += glm::all(glm::epsilonEqual(B, glm::dvec1(1.0), 0.0001)) ? 0 : 1;
@ -47,7 +47,7 @@ namespace floor_
} }
{ {
glm::dvec2 A(1.1f); glm::dvec2 A(1.1);
glm::dvec2 B = glm::floor(A); glm::dvec2 B = glm::floor(A);
Error += glm::all(glm::epsilonEqual(B, glm::dvec2(1.0), 0.0001)) ? 0 : 1; Error += glm::all(glm::epsilonEqual(B, glm::dvec2(1.0), 0.0001)) ? 0 : 1;
@ -61,7 +61,7 @@ namespace floor_
} }
{ {
glm::dvec3 A(1.1f); glm::dvec3 A(1.1);
glm::dvec3 B = glm::floor(A); glm::dvec3 B = glm::floor(A);
Error += glm::all(glm::epsilonEqual(B, glm::dvec3(1.0), 0.0001)) ? 0 : 1; Error += glm::all(glm::epsilonEqual(B, glm::dvec3(1.0), 0.0001)) ? 0 : 1;
@ -75,7 +75,7 @@ namespace floor_
} }
{ {
glm::dvec4 A(1.1f); glm::dvec4 A(1.1);
glm::dvec4 B = glm::floor(A); glm::dvec4 B = glm::floor(A);
Error += glm::all(glm::epsilonEqual(B, glm::dvec4(1.0), 0.0001)) ? 0 : 1; Error += glm::all(glm::epsilonEqual(B, glm::dvec4(1.0), 0.0001)) ? 0 : 1;

2
test/core/core_func_matrix.cpp
View File

@ -248,7 +248,7 @@ int test_inverse_perf(std::size_t Count, std::size_t Instance, char const * Mess
//glm::uint Ulp = 0; //glm::uint Ulp = 0;
//Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp); //Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp);
printf("inverse<%s>(%f): %lu\n", Message, Diff, EndTime - StartTime); printf("inverse<%s>(%f): %lu\n", Message, static_cast<double>(Diff), EndTime - StartTime);
return 0; return 0;
} }

8
test/core/core_type_mat4x4.cpp
View File

@ -17,10 +17,10 @@ template<typename genType>
void print(genType const & Mat0) void print(genType const & Mat0)
{ {
printf("mat4(\n"); printf("mat4(\n");
printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[0][0], Mat0[0][1], Mat0[0][2], Mat0[0][3]); printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", static_cast<double>(Mat0[0][0]), static_cast<double>(Mat0[0][1]), static_cast<double>(Mat0[0][2]), static_cast<double>(Mat0[0][3]));
printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[1][0], Mat0[1][1], Mat0[1][2], Mat0[1][3]); printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", static_cast<double>(Mat0[1][0]), static_cast<double>(Mat0[1][1]), static_cast<double>(Mat0[1][2]), static_cast<double>(Mat0[1][3]));
printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", Mat0[2][0], Mat0[2][1], Mat0[2][2], Mat0[2][3]); printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f)\n", static_cast<double>(Mat0[2][0]), static_cast<double>(Mat0[2][1]), static_cast<double>(Mat0[2][2]), static_cast<double>(Mat0[2][3]));
printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f))\n\n", Mat0[3][0], Mat0[3][1], Mat0[3][2], Mat0[3][3]); printf("\tvec4(%2.9f, %2.9f, %2.9f, %2.9f))\n\n", static_cast<double>(Mat0[3][0]), static_cast<double>(Mat0[3][1]), static_cast<double>(Mat0[3][2]), static_cast<double>(Mat0[3][3]));
} }
int test_inverse_mat4x4() int test_inverse_mat4x4()

2
test/gtc/gtc_packing.cpp
View File

@ -46,7 +46,7 @@ void print_11bits(glm::uint const & s)
void print_value(float const & s) void print_value(float const & s)
{ {
printf("%2.5f, ", s); printf("%2.5f, ", static_cast<double>(s);
print_bits(s); print_bits(s);
printf(", "); printf(", ");
// print_11bits(detail::floatTo11bit(s)); // print_11bits(detail::floatTo11bit(s));