From 4e808cfa852b873b484d0b9c90ab89ac196c3e52 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 16 Jan 2018 17:22:17 +0200 Subject: MAINT-3859 Fixed Texture animation flicker at certain frame rates --- indra/newview/llviewertextureanim.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/llviewertextureanim.cpp') diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp index 9af92d7377..b94f6f4569 100644 --- a/indra/newview/llviewertextureanim.cpp +++ b/indra/newview/llviewertextureanim.cpp @@ -138,10 +138,8 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t, { frame_counter = fmod(frame_counter, full_length); } - else - { - frame_counter = llmin(full_length - 1.f, frame_counter); - } + + frame_counter = llmin(full_length - 1.f, frame_counter); if (!(mMode & SMOOTH)) { -- cgit v1.2.3 From 2c0cfd9185dda2fa33d2a7603d2959c827357aba Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 18 Jan 2018 18:34:08 +0200 Subject: MAINT-3859 Remade to account from smoothed looping --- indra/newview/llviewertextureanim.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewertextureanim.cpp') diff --git a/indra/newview/llviewertextureanim.cpp b/indra/newview/llviewertextureanim.cpp index b94f6f4569..9603811066 100644 --- a/indra/newview/llviewertextureanim.cpp +++ b/indra/newview/llviewertextureanim.cpp @@ -138,12 +138,16 @@ S32 LLViewerTextureAnim::animateTextures(F32 &off_s, F32 &off_t, { frame_counter = fmod(frame_counter, full_length); } - - frame_counter = llmin(full_length - 1.f, frame_counter); + else + { + frame_counter = llmin(full_length - 1.f, frame_counter); + } if (!(mMode & SMOOTH)) { frame_counter = (F32)llfloor(frame_counter + 0.01f); + // account for 0.01, we shouldn't step over full length + frame_counter = llmin(full_length - 1.f, frame_counter); } if (mMode & PING_PONG) -- cgit v1.2.3