diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-07-11 02:48:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 02:48:36 +0200 |
| commit | aa449b6fe162d8960351c5fe164a9120b8572652 (patch) | |
| tree | fa82496d356ac2b77ffa1ab00684b0150907f009 /src/math/math.cpp | |
| parent | fixfixfix (diff) | |
| parent | Merge pull request #129 from erorcun/erorcun (diff) | |
| download | re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar.gz re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar.bz2 re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar.lz re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar.xz re3-aa449b6fe162d8960351c5fe164a9120b8572652.tar.zst re3-aa449b6fe162d8960351c5fe164a9120b8572652.zip | |
Diffstat (limited to 'src/math/math.cpp')
| -rw-r--r-- | src/math/math.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/math/math.cpp b/src/math/math.cpp index b76db4ae..c1199fcc 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; - w2 = -sin(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; } |