mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.2' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.2

Browse Source
This commit is contained in:
Christophe Riccio
2011-05-27 20:21:27 +01:00
parent daa63fd5cc c9b7b712fb
commit 5d2350f7c8
8 changed files with 88 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/gtc/gtc_quaternion.cpp
View File

@@ -23,11 +23,12 @@ int test_quat_slerp()
{
int Error = 0;
glm::quat A(0.0f, glm::vec3(0, 0, 1));
glm::quat B(90.0f, glm::vec3(0, 0, 1));
glm::quat A(glm::vec3(0, 0, 1));
glm::quat B(glm::vec3(0, 1, 0));
glm::quat C = glm::mix(A, B, 0.5f);
Error += C != glm::quat(45.f, glm::vec3(0, 0, 1)) ? 0 : 1;
glm::quat D(glm::normalize(glm::vec3(0, 1, 1)));
Error += C == D ? 0 : 1;
return Error;
}