diff options
| author | aap <aap@papnet.eu> | 2019-07-10 17:18:26 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-07-10 17:18:26 +0200 |
| commit | 4a36d64f15f898854bb8a76be86ac9a8c536b291 (patch) | |
| tree | 2ff1344fb2f1e9859ba15cd56c461d40683359f9 /src/math/math.cpp | |
| parent | Merge pull request #128 from erorcun/erorcun (diff) | |
| download | re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.gz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.bz2 re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.lz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.xz re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.tar.zst re3-4a36d64f15f898854bb8a76be86ac9a8c536b291.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/math/math.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/math/math.cpp b/src/math/math.cpp index b76db4ae..b4ba9c98 100644 --- a/src/math/math.cpp +++ b/src/math/math.cpp @@ -13,11 +13,11 @@ CQuaternion::Slerp(const CQuaternion &q1, const CQuaternion &q2, float theta, fl float w1, w2; if(theta > PI/2){ theta = PI - theta; - w1 = sin((1.0f - t) * theta) * invSin; + w1 = Sin((1.0f - t) * theta) * invSin; w2 = -sin(t * theta) * invSin; }else{ - w1 = sin((1.0f - t) * theta) * invSin; - w2 = sin(t * theta) * invSin; + w1 = Sin((1.0f - t) * theta) * invSin; + w2 = Sin(t * theta) * invSin; } *this = w1*q1 + w2*q2; } |