mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5

Browse Source
This commit is contained in:
Christophe Riccio 2013-09-30 03:51:40 +02:00
commit 2badec664f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/core/core_type_mat4x4.cpp
View File

@ -129,13 +129,19 @@ int test_ctr()
#if(GLM_HAS_INITIALIZER_LISTS) #if(GLM_HAS_INITIALIZER_LISTS)
glm::mat4 m1{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; glm::mat4 m1{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
glm::mat4 m2{ glm::mat4 m2{
{0, 1, 2, 3}, {0, 1, 2, 3},
{4, 5, 6, 7}, {4, 5, 6, 7},
{8, 9, 10, 11}, {8, 9, 10, 11},
{12, 13, 14, 15}}; {12, 13, 14, 15}};
std::vector<glm::mat4> m3{
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}};
/* /*
std::initializer_list<glm::mat4> m3{ std::initializer_list<glm::mat4> m3{
{0, 1, 2, 3}, {0, 1, 2, 3},