From 17d86218e25a6c889c24822da8d7b59967babd89 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 6 Dec 2018 00:14:52 +0800 Subject: *animator --- bin/SDL2.dll | Bin 1242112 -> 1279488 bytes bin/jin.exe | Bin 1596416 -> 1811456 bytes bin/lua51.dll | Bin 364544 -> 364544 bytes src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib | Bin 33996 -> 33996 bytes src/3rdparty/LuaJIT-2.0.5/src/minilua.lib | Bin 33996 -> 33996 bytes src/libjin/graphics/animations/je_animator.cpp | 6 +++--- src/libjin/math/je_math.h | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/SDL2.dll b/bin/SDL2.dll index 0e2e59e..65f23c8 100644 Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ diff --git a/bin/jin.exe b/bin/jin.exe index 4561246..d8d1779 100644 Binary files a/bin/jin.exe and b/bin/jin.exe differ diff --git a/bin/lua51.dll b/bin/lua51.dll index 0e56506..a47ab15 100644 Binary files a/bin/lua51.dll and b/bin/lua51.dll differ diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib index c7be727..be22bd4 100644 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib and b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib differ diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib index e2b3ac3..1a4ed3f 100644 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib and b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib differ 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(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 -- cgit v1.1-26-g67d0