mewin/glm
1
0
Fork 0
Code Releases Activity

Merge 0.9.8

Browse Source
This commit is contained in:
Christophe Riccio
2016-09-02 01:46:56 +02:00
parent bf88ae130d e77c300e4c
commit d029db8ac0
100 changed files with 336 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/core/core_func_integer.cpp
View File

@@ -529,8 +529,8 @@ namespace bitfieldReverse
{
int Error = 0;
Error += perf32(Samples);
Error += perf64(Samples);
Error += perf32(static_cast<glm::uint32>(Samples));
Error += perf64(static_cast<glm::uint64>(Samples));
return Error;
}
@@ -1459,7 +1459,7 @@ namespace bitCount
// bitCount - TimeIf
{
for(std::size_t i = 0, n = v.size(); i < n; ++i)
v[i] = bitCount_if(i);
v[i] = bitCount_if(static_cast<int>(i));
}
std::clock_t TimestampsB = std::clock();

4
test/core/core_func_swizzle.cpp
View File

@@ -1,5 +1,5 @@
#define GLM_MESSAGES
#define GLM_SWIZZLE
#define GLM_FORCE_MESSAGES
#define GLM_FORCE_SWIZZLE
#include <glm/glm.hpp>
int test_ivec2_swizzle()

2
test/core/core_setup_message.cpp
View File

@@ -1,4 +1,4 @@
#define GLM_MESSAGES
#define GLM_FORCE_MESSAGES
#include <glm/vec3.hpp>
#include <cstdio>

6
test/core/core_type_vec1.cpp
View File

@@ -1,4 +1,4 @@
#define GLM_SWIZZLE
#define GLM_FORCE_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/gtc/vec1.hpp>
#include <vector>
@@ -65,7 +65,7 @@ int test_vec1_ctor()
}
#endif
*/
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec2 A = glm::vec2(1.0f, 2.0f);
glm::vec2 B = A.xy;
@@ -76,7 +76,7 @@ int test_vec1_ctor()
Error += glm::all(glm::equal(A, C)) ? 0 : 1;
Error += glm::all(glm::equal(A, D)) ? 0 : 1;
}
#endif//GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#endif//GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec2 A = glm::vec2(2.0f);

6
test/core/core_type_vec2.cpp
View File

@@ -1,4 +1,4 @@
#define GLM_SWIZZLE
#define GLM_FORCE_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/vec2.hpp>
#include <vector>
@@ -230,7 +230,7 @@ int test_vec2_ctor()
}
#endif
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec2 A = glm::vec2(1.0f, 2.0f);
glm::vec2 B = A.xy;
@@ -241,7 +241,7 @@ int test_vec2_ctor()
Error += glm::all(glm::equal(A, C)) ? 0 : 1;
Error += glm::all(glm::equal(A, D)) ? 0 : 1;
}
#endif//GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#endif//GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec2 A = glm::vec2(2.0f);

6
test/core/core_type_vec3.cpp
View File

@@ -1,4 +1,4 @@
#define GLM_SWIZZLE
#define GLM_FORCE_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/geometric.hpp>
#include <glm/vec2.hpp>
@@ -40,7 +40,7 @@ int test_vec3_ctor()
}
#endif
#if(GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE))
#if(GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE))
{
glm::vec3 A = glm::vec3(1.0f, 2.0f, 3.0f);
glm::vec3 B = A.xyz;
@@ -59,7 +59,7 @@ int test_vec3_ctor()
Error += glm::all(glm::equal(A, G)) ? 0 : 1;
Error += glm::all(glm::equal(A, H)) ? 0 : 1;
}
#endif//(GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE))
#endif//(GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE))
{
glm::vec3 A(1);

6
test/core/core_type_vec4.cpp
View File

@@ -1,5 +1,5 @@
#define GLM_FORCE_ALIGNED
#define GLM_SWIZZLE
#define GLM_FORCE_SWIZZLE
#include <glm/vector_relational.hpp>
#include <glm/vec2.hpp>
#include <glm/vec3.hpp>
@@ -68,7 +68,7 @@ int test_vec4_ctor()
}
#endif
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#if GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec4 A = glm::vec4(1.0f, 2.0f, 3.0f, 4.0f);
glm::vec4 B = A.xyzw;
@@ -97,7 +97,7 @@ int test_vec4_ctor()
Error += glm::all(glm::equal(A, L)) ? 0 : 1;
Error += glm::all(glm::equal(A, M)) ? 0 : 1;
}
#endif// GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_SWIZZLE)
#endif// GLM_HAS_UNRESTRICTED_UNIONS && defined(GLM_FORCE_SWIZZLE)
{
glm::vec4 A(1);

2
test/gtc/gtc_type_aligned.cpp
View File

@@ -1,4 +1,4 @@
#define GLM_MESSAGES
#define GLM_FORCE_MESSAGES
#include <glm/glm.hpp>
#if GLM_HAS_ALIGNED_TYPE