From 6a64d45eed427fefaad213d178f3f35d1345f62f Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Tue, 17 Sep 2002 21:58:25 +0000 Subject: [PATCH] bugfixes git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1704 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/media/util/FrameSequencer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/media/util/FrameSequencer.java b/src/java/com/threerings/media/util/FrameSequencer.java index 22fa7145a..3b911166a 100644 --- a/src/java/com/threerings/media/util/FrameSequencer.java +++ b/src/java/com/threerings/media/util/FrameSequencer.java @@ -1,5 +1,5 @@ // -// $Id: FrameSequencer.java,v 1.1 2002/09/17 20:07:28 mdb Exp $ +// $Id: FrameSequencer.java,v 1.2 2002/09/17 21:58:25 ray Exp $ package com.threerings.media.util; @@ -55,7 +55,7 @@ public interface FrameSequencer */ public ConstantRate (double framesPerSecond, boolean loop) { - _millisPerFrame = (long)(1000d / _millisPerFrame); + _millisPerFrame = (long)(1000d / framesPerSecond); _loop = loop; } @@ -79,7 +79,8 @@ public interface FrameSequencer // if we're not looping and we've exhausted our frames, we // return -1 to indicate that the animation should stop - return (!_loop && frameIdx >= _frameCount) ? -1 : frameIdx; + return (_loop || frameIdx < _frameCount) ? (frameIdx % _frameCount) + : -1; } // documentation inherited from interface