xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Animation WIP merge #321

Merged
XiaoQiDigipen merged 76 commits from SP3-17-animation-system into main 2023-01-30 17:35:57 +08:00
Conversation 0 Commits 76 Files Changed 78 +1 -6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e23f08aa8 - Show all commits

7
SHADE_Engine/src/Animation/SHAnimatorComponent.hpp
View File

@ -59,13 +59,8 @@ namespace SHADE
else else
return nextKeyFrame->Data; return nextKeyFrame->Data;
} }
// At the front, so no prior key frames
else if (nextKeyFrame != keyframes.end())
{
return nextKeyFrame->Data;
}
// At the back, so no keyframes will follow // At the back, so no keyframes will follow
else else if (nextKeyFrame == keyframes.end())
{ {
return firstKeyFrame->Data; return firstKeyFrame->Data;
} }