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

Merge pull request #874 from kraj/master

Browse Source 
glm: Remove redundant double semi-colons #874
This commit is contained in:
Christophe 2019-03-04 10:24:48 +01:00 committed by GitHub
commit 4adf2fb1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/associated_min_max.inl
View File

@ -86,7 +86,7 @@ GLM_FUNC_QUALIFIER U associatedMin
)
{
T Test1 = min(x, y);
T Test2 = min(z, w);;
T Test2 = min(z, w);
U Result1 = x < y ? a : b;
U Result2 = z < w ? c : d;
U Result = Test1 < Test2 ? Result1 : Result2;
@ -152,7 +152,7 @@ GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
for(length_t i = 0, n = Result.length(); i < n; ++i)
{
T Test1 = min(x[i], y[i]);
T Test2 = min(z[i], w[i]);;
T Test2 = min(z[i], w[i]);
U Result1 = x[i] < y[i] ? a : b;
U Result2 = z[i] < w[i] ? c : d;
Result[i] = Test1 < Test2 ? Result1 : Result2;
@ -278,7 +278,7 @@ GLM_FUNC_QUALIFIER U associatedMax
)
{
T Test1 = max(x, y);
T Test2 = max(z, w);;
T Test2 = max(z, w);
U Result1 = x > y ? a : b;
U Result2 = z > w ? c : d;
U Result = Test1 > Test2 ? Result1 : Result2;
@ -344,7 +344,7 @@ GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
for(length_t i = 0, n = Result.length(); i < n; ++i)
{
T Test1 = max(x[i], y[i]);
T Test2 = max(z[i], w[i]);;
T Test2 = max(z[i], w[i]);
U Result1 = x[i] > y[i] ? a : b;
U Result2 = z[i] > w[i] ? c : d;
Result[i] = Test1 > Test2 ? Result1 : Result2;

2
glm/simd/common.h
View File

@ -103,7 +103,7 @@ GLM_FUNC_QUALIFIER glm_vec4 glm_vec4_sign(glm_vec4 x)
glm_vec4 const cmp1 = _mm_cmpgt_ps(x, zro0);
glm_vec4 const and0 = _mm_and_ps(cmp0, _mm_set1_ps(-1.0f));
glm_vec4 const and1 = _mm_and_ps(cmp1, _mm_set1_ps(1.0f));
glm_vec4 const or0 = _mm_or_ps(and0, and1);;
glm_vec4 const or0 = _mm_or_ps(and0, and1);
return or0;
}

6
test/core/core_func_exponential.cpp
View File

@ -153,13 +153,13 @@ static int test_inversesqrt()
float A = glm::inversesqrt(16.f) * glm::sqrt(16.f);
Error += glm::equal(A, 1.f, 0.01f) ? 0 : 1;
glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);;
glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);
Error += glm::all(glm::equal(B, glm::vec1(1.f), 0.01f)) ? 0 : 1;
glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);;
glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);
Error += glm::all(glm::equal(C, glm::vec2(1.f), 0.01f)) ? 0 : 1;
glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);;
glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);
Error += glm::all(glm::equal(D, glm::vec3(1.f), 0.01f)) ? 0 : 1;
glm::vec4 E = glm::inversesqrt(glm::vec4(16.f)) * glm::sqrt(16.f);

4
test/gtx/gtx_easing.cpp
View File

@ -34,7 +34,7 @@ namespace
r = glm::circularEaseOut(a);
r = glm::circularEaseInOut(a);
r = glm::exponentialEaseIn(a);;
r = glm::exponentialEaseIn(a);
r = glm::exponentialEaseOut(a);
r = glm::exponentialEaseInOut(a);
@ -46,7 +46,7 @@ namespace
r = glm::backEaseOut(a);
r = glm::backEaseInOut(a);
r = glm::bounceEaseIn(a);;
r = glm::bounceEaseIn(a);
r = glm::bounceEaseOut(a);
r = glm::bounceEaseInOut(a);
}