diff options
| author | chai <chaifix@163.com> | 2018-12-06 00:14:52 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-12-06 00:14:52 +0800 |
| commit | 17d86218e25a6c889c24822da8d7b59967babd89 (patch) | |
| tree | 478996e0554639829a44f6d6eb84d79b8f466c1a /src | |
| parent | bffa68875803598210a974d11446ccf87dbf40a3 (diff) | |
*animator
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib | bin | 33996 -> 33996 bytes | |||
| -rw-r--r-- | src/3rdparty/LuaJIT-2.0.5/src/minilua.lib | bin | 33996 -> 33996 bytes | |||
| -rw-r--r-- | src/libjin/graphics/animations/je_animator.cpp | 6 | ||||
| -rw-r--r-- | src/libjin/math/je_math.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib Binary files differindex c7be727..be22bd4 100644 --- a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib +++ b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib Binary files differindex e2b3ac3..1a4ed3f 100644 --- a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib +++ b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib diff --git a/src/libjin/graphics/animations/je_animator.cpp b/src/libjin/graphics/animations/je_animator.cpp index 449799d..1e25639 100644 --- a/src/libjin/graphics/animations/je_animator.cpp +++ b/src/libjin/graphics/animations/je_animator.cpp @@ -51,10 +51,10 @@ namespace JinEngine float interval = 1 / mSpeed; mTick += dt; uint fc = mAnimation->getFrameCount(); - while (mTick >= interval) + if (mTick >= interval) { - mTick -= interval; - ++mIndex; + mIndex += int(mTick / interval); + mTick = fmod(mTick, interval); if (mLoop) mIndex %= fc; mIndex = clamp<uint>(mIndex, 0, fc - 1); diff --git a/src/libjin/math/je_math.h b/src/libjin/math/je_math.h index ae4017f..ed46e58 100644 --- a/src/libjin/math/je_math.h +++ b/src/libjin/math/je_math.h @@ -86,4 +86,4 @@ namespace JinEngine } // namespace Math } // namespace JinEngine -#endif // __JE_UTILS_MATH_H__ +#endif // __JE_UTILS_MATH_H__
\ No newline at end of file |