Fixed int used instead of glm::length_t

This commit is contained in:
Christophe Riccio 2014-03-15 22:33:25 +01:00
parent db09ecfc41
commit efd4087b1c
10 changed files with 19 additions and 19 deletions

View File

@ -255,7 +255,7 @@ namespace glm
GLM_FUNC_QUALIFIER vecType<T, P> next_float(vecType<T, P> const & x, vecType<uint, P> const & ulps) GLM_FUNC_QUALIFIER vecType<T, P> next_float(vecType<T, P> const & x, vecType<uint, P> const & ulps)
{ {
vecType<T, P> Result; vecType<T, P> Result;
for(uint i = 0; i < Result.length(); ++i) for(length_t i = 0; i < Result.length(); ++i)
Result[i] = next_float(x[i], ulps[i]); Result[i] = next_float(x[i], ulps[i]);
return Result; return Result;
} }

View File

@ -72,10 +72,10 @@ int test_ctr()
{0, 1}, {0, 1},
{2, 3}}; {2, 3}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat2x2> v1{ std::vector<glm::mat2x2> v1{

View File

@ -46,10 +46,10 @@ int test_ctr()
{0, 1, 2}, {0, 1, 2},
{3, 4, 5}}; {3, 4, 5}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat2x3> v1{ std::vector<glm::mat2x3> v1{

View File

@ -46,10 +46,10 @@ int test_ctr()
{0, 1, 2, 3}, {0, 1, 2, 3},
{4, 5, 6, 7}}; {4, 5, 6, 7}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat2x4> v1{ std::vector<glm::mat2x4> v1{

View File

@ -48,10 +48,10 @@ int test_ctr()
{2, 3}, {2, 3},
{4, 5}}; {4, 5}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat3x2> v1{ std::vector<glm::mat3x2> v1{

View File

@ -107,10 +107,10 @@ int test_ctr()
{3, 4, 5}, {3, 4, 5},
{6, 7, 8}}; {6, 7, 8}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat3x3> v1{ std::vector<glm::mat3x3> v1{

View File

@ -48,10 +48,10 @@ int test_ctr()
{4, 5, 6, 7}, {4, 5, 6, 7},
{8, 9, 10, 11}}; {8, 9, 10, 11}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat3x4> v1{ std::vector<glm::mat3x4> v1{

View File

@ -50,10 +50,10 @@ int test_ctr()
{4, 5}, {4, 5},
{6, 7}}; {6, 7}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat4x2> v1{ std::vector<glm::mat4x2> v1{

View File

@ -50,10 +50,10 @@ int test_ctr()
{6, 7, 8}, {6, 7, 8},
{9, 10, 11}}; {9, 10, 11}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat4x3> v1{ std::vector<glm::mat4x3> v1{

View File

@ -208,10 +208,10 @@ int test_ctr()
{8, 9, 10, 11}, {8, 9, 10, 11},
{12, 13, 14, 15}}; {12, 13, 14, 15}};
for(int i = 0; i < m0.length(); ++i) for(glm::length_t i = 0; i < m0.length(); ++i)
Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m0[i], m2[i])) ? 0 : 1;
for(int i = 0; i < m1.length(); ++i) for(glm::length_t i = 0; i < m1.length(); ++i)
Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1; Error += glm::all(glm::equal(m1[i], m2[i])) ? 0 : 1;
std::vector<glm::mat4> m3{ std::vector<glm::mat4> m3{