Added C++17 detection, added VC language version detection, clean up alignment type, clean up swizzle operator detection
This commit is contained in:
@@ -4,16 +4,18 @@
|
||||
|
||||
#if !GLM_HAS_ONLY_XYZW
|
||||
|
||||
int test_ivec2_swizzle()
|
||||
static int test_ivec2_swizzle()
|
||||
{
|
||||
int Error = 0;
|
||||
|
||||
#if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
glm::ivec2 A(1, 2);
|
||||
glm::ivec2 B = A.yx();
|
||||
glm::ivec2 C = B.yx();
|
||||
|
||||
Error += A != B ? 0 : 1;
|
||||
Error += A == C ? 0 : 1;
|
||||
#endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
|
||||
return Error;
|
||||
}
|
||||
@@ -22,12 +24,14 @@ int test_ivec3_swizzle()
|
||||
{
|
||||
int Error = 0;
|
||||
|
||||
#if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
glm::ivec3 A(1, 2, 3);
|
||||
glm::ivec3 B = A.zyx();
|
||||
glm::ivec3 C = B.zyx();
|
||||
|
||||
Error += A != B ? 0 : 1;
|
||||
Error += A == C ? 0 : 1;
|
||||
#endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
|
||||
return Error;
|
||||
}
|
||||
@@ -36,12 +40,14 @@ int test_ivec4_swizzle()
|
||||
{
|
||||
int Error = 0;
|
||||
|
||||
#if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
glm::ivec4 A(1, 2, 3, 4);
|
||||
glm::ivec4 B = A.wzyx();
|
||||
glm::ivec4 C = B.wzyx();
|
||||
|
||||
Error += A != B ? 0 : 1;
|
||||
Error += A == C ? 0 : 1;
|
||||
#endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
|
||||
return Error;
|
||||
}
|
||||
@@ -50,6 +56,7 @@ int test_vec4_swizzle()
|
||||
{
|
||||
int Error = 0;
|
||||
|
||||
#if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
glm::vec4 A(1, 2, 3, 4);
|
||||
glm::vec4 B = A.wzyx();
|
||||
glm::vec4 C = B.wzyx();
|
||||
@@ -59,6 +66,7 @@ int test_vec4_swizzle()
|
||||
|
||||
float f = glm::dot(C.wzyx(), C.xyzw());
|
||||
Error += glm::abs(f - 20.f) < 0.01f ? 0 : 1;
|
||||
#endif//GLM_SWIZZLE == GLM_SWIZZLE_ENABLED
|
||||
|
||||
return Error;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user