peter
/
gb
1
0
Fork 0
Code Projects Releases Wiki Activity

Fix gb_quat_slerp #38

This commit is contained in:
gingerBill 2018-07-08 22:36:10 +01:00 committed by GitHub
parent 9381302d81
commit 23c3fba697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gb_math.h
View File

@ -476,7 +476,6 @@ GB_MATH_DEF void gb_vec4_lerp(gbVec4 *d, gbVec4 a, gbVec4 b, float t);
GB_MATH_DEF void gb_quat_lerp (gbQuat *d, gbQuat a, gbQuat b, float t);
GB_MATH_DEF void gb_quat_nlerp(gbQuat *d, gbQuat a, gbQuat b, float t);
GB_MATH_DEF void gb_quat_slerp(gbQuat *d, gbQuat a, gbQuat b, float t);
GB_MATH_DEF void gb_quat_nquad(gbQuat *d, gbQuat p, gbQuat a, gbQuat b, gbQuat q, float t);
GB_MATH_DEF void gb_quat_squad(gbQuat *d, gbQuat p, gbQuat a, gbQuat b, gbQuat q, float t);
GB_MATH_DEF void gb_quat_slerp_approx(gbQuat *d, gbQuat a, gbQuat b, float t);
@ -1978,10 +1977,10 @@ void gb_quat_slerp(gbQuat *d, gbQuat a, gbQuat b, float t) {
angle = gb_arccos(cos_theta);
s1 = gb_sin(1.0f - t*angle);
s1 = gb_sin((1.0f - t)*angle);
s0 = gb_sin(t*angle);
is = 1.0f/gb_sin(angle);
gb_quat_mulf(&x, z, s1);
gb_quat_mulf(&x, a, s1);
gb_quat_mulf(&y, z, s0);
gb_quat_add(d, x, y);
gb_quat_muleqf(d, is);