Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-04-04 08:22:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-04-04 08:22:38 +0400
commit2804caff4ce6c9f6d5ebdd101e77c92b7ac65db4 (patch)
treeb3f91af65a3d29c253cae82117bfb4477b834f69 /source/blender/blenlib/intern/math_rotation.c
parent966e86cd2dbe2c627e65766d0361cc79f63d7cc7 (diff)
code cleanup: use bools, (float)sin/(float)cos -> sinf/cosf, more meaningful var names.
Diffstat (limited to 'source/blender/blenlib/intern/math_rotation.c')
-rw-r--r--source/blender/blenlib/intern/math_rotation.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 26576b2dcb2..cf9280d418f 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -539,9 +539,9 @@ void QuatInterpolW(float *result, float quat1[4], float quat2[4], float t)
if ((1.0f - cosom) > 0.0001f) {
omega = (float)acos(cosom);
- sinom = (float)sin(omega);
- sc1 = (float)sin((1.0 - t) * omega) / sinom;
- sc2 = (float)sin(t * omega) / sinom;
+ sinom = sinf(omega);
+ sc1 = sinf((1.0 - t) * omega) / sinom;
+ sc2 = sinf(t * omega) / sinom;
}
else {
sc1 = 1.0f - t;
@@ -558,8 +558,8 @@ void QuatInterpolW(float *result, float quat1[4], float quat2[4], float t)
result[2] = quat2[1];
result[3] = -quat2[0];
- sc1 = (float)sin((1.0 - t) * M_PI_2);
- sc2 = (float)sin(t * M_PI_2);
+ sc1 = sinf((1.0 - t) * M_PI_2);
+ sc2 = sinf(t * M_PI_2);
result[0] = sc1 * quat1[0] + sc2 * result[0];
result[1] = sc1 * quat1[1] + sc2 * result[1];