Merge pull request #28 from eevee/patch-1

Fix seekFrameIndex
kikito · Sep 15, 2017 · d4d8926 · d4d8926
2 parents cae46ae + 535c397
commit d4d8926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/anim8.lua b/anim8.lua
@@ -213,8 +213,8 @@ local function seekFrameIndex(intervals, timer)
 
  while(low <= high) do
  i = math.floor((low + high) / 2)
- if timer >  intervals[i+1] then low = i + 1
- elseif timer <= intervals[i] then high = i - 1
+ if timer >= intervals[i+1] then low = i + 1
+ elseif timer <  intervals[i] then high = i - 1
  else
  return i
  end

diff --git a/spec/anim8/animation_spec.lua b/spec/anim8/animation_spec.lua
@@ -60,9 +60,9 @@ describe("anim8", function()
  describe(":update", function()
  it("moves to the next frame #focus", function()
  local a = newAnimation({1,2,3,4}, 1)
- a:update(1)
+ a:update(0.5)
  assert.equal(1, a.position)
- a:update(0.1)
+ a:update(0.5)
  assert.equal(2, a.position)
  end)
  it("moves several frames if needed", function()