archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-13 23:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

and of course the last commit didnt fix everything

Browse Source
This commit is contained in:
aap
2019-07-10 17:34:11 +02:00
parent 4a36d64f15
commit 90e093cd47
19 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/animation/AnimBlendNode.cpp
View File

@ -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

2
src/animation/AnimBlendNode.h
View File

@ -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

6
src/animation/FrameUpdate.cpp
View File

@ -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);
}