mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed mat4 initializer list contructors

Browse Source
This commit is contained in:
Christophe Riccio
2013-09-30 03:50:40 +02:00
parent 812ff4fcc8
commit 81ed43373f
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/core/core_type_mat4x4.cpp
View File

@@ -131,10 +131,10 @@ int test_ctr()
glm::mat4 m1{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
glm::mat4 m2{
glm::vec4{0, 1, 2, 3},
glm::vec4{4, 5, 6, 7},
glm::vec4{8, 9, 10, 11},
glm::vec4{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{
@@ -145,8 +145,12 @@ int test_ctr()
*/
//glm::mat4 m4{m3};
/*
std::vector<glm::mat4> v{
std::vector<glm::mat4> v1{
{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::vector<glm::mat4> v2{
{
{ 0, 1, 2, 3 },
{ 4, 5, 6, 7 },
@@ -160,7 +164,7 @@ int test_ctr()
{ 12, 13, 14, 15 }
}
};
*/
#endif//GLM_HAS_INITIALIZER_LISTS
return Error;