Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-25 20:02:40 +01:00
Code Issues Projects Releases Activity

Remove string comparision from getFrameMatrix

Browse Source
This commit is contained in:
Daniel Evans 2014-06-01 20:18:52 +01:00
parent 602218579c
commit 3be84c02c1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rwengine/src/engine/Animator.cpp
View File

@ -99,7 +99,8 @@ glm::mat4 Animator::getFrameMatrix(ModelFrame* frame, float alpha) const
if(it != getAnimation()->bones.end()) {
auto kf = it->second->getInterpolatedKeyframe(getAnimationTime(alpha));
glm::mat4 m;
if(it->second->type == AnimationBone::R00 || frame->getName() == "swaist") {
bool isRoot = frame->getParent() ? !! frame->getParent() : true;
if(it->second->type == AnimationBone::R00 || isRoot ) {
m = glm::translate(m, frame->getDefaultTranslation());
m = m * glm::mat4_cast(kf.rotation);
}