summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-10 17:34:11 +0200
committeraap <aap@papnet.eu>2019-07-10 17:34:11 +0200
commit90e093cd47fb2af10617b1d404fc65ca813782ec (patch)
treef77fde407d8458529f688d3cb14c2ff003573fb0 /src/animation
parentadded wrappers around math functions (diff)
downloadre3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar.gz
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar.bz2
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar.lz
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar.xz
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.tar.zst
re3-90e093cd47fb2af10617b1d404fc65ca813782ec.zip
Diffstat (limited to 'src/animation')
-rw-r--r--src/animation/AnimBlendNode.cpp4
-rw-r--r--src/animation/AnimBlendNode.h2
-rw-r--r--src/animation/FrameUpdate.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/animation/AnimBlendNode.cpp b/src/animation/AnimBlendNode.cpp
index 3d3d80ec..be5fcc9c 100644
--- a/src/animation/AnimBlendNode.cpp
+++ b/src/animation/AnimBlendNode.cpp
@@ -125,8 +125,8 @@ CAnimBlendNode::CalcDeltas(void)
float cos = DotProduct(kfA->rotation, kfB->rotation);
if(cos > 1.0f)
cos = 1.0f;
- theta = acos(cos);
- invSin = theta == 0.0f ? 0.0f : 1.0f/sin(theta);
+ theta = Acos(cos);
+ invSin = theta == 0.0f ? 0.0f : 1.0f/Sin(theta);
}
void
diff --git a/src/animation/AnimBlendNode.h b/src/animation/AnimBlendNode.h
index ea75fbfa..361a4134 100644
--- a/src/animation/AnimBlendNode.h
+++ b/src/animation/AnimBlendNode.h
@@ -10,7 +10,7 @@ class CAnimBlendNode
public:
// for slerp
float theta; // angle between quaternions
- float invSin; // 1/sin(theta)
+ float invSin; // 1/Sin(theta)
// indices into array in sequence
int32 frameA; // next key frame
int32 frameB; // previous key frame
diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp
index 62300527..dcb71944 100644
--- a/src/animation/FrameUpdate.cpp
+++ b/src/animation/FrameUpdate.cpp
@@ -53,7 +53,7 @@ FrameUpdateCallBack(AnimBlendFrameData *frame, void *arg)
if(norm == 0.0f)
rot.w = 1.0f;
else
- rot *= 1.0f/sqrt(norm);
+ rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}
@@ -127,7 +127,7 @@ FrameUpdateCallBackWithVelocityExtraction(AnimBlendFrameData *frame, void *arg)
if(norm == 0.0f)
rot.w = 1.0f;
else
- rot *= 1.0f/sqrt(norm);
+ rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}
@@ -206,7 +206,7 @@ FrameUpdateCallBackWith3dVelocityExtraction(AnimBlendFrameData *frame, void *arg
if(norm == 0.0f)
rot.w = 1.0f;
else
- rot *= 1.0f/sqrt(norm);
+ rot *= 1.0f/Sqrt(norm);
rot.Get(mat);
}