@@ -48,29 +48,26 @@ class Viewport y = @y_offset_range.max if @y_offset_range.max < y end x_diff = @width/2 + @follow_offset_x - x - @x_offset - STDERR.puts x_diff if x_diff.abs > @buffer_x # move screen if x_diff > 0 @x_offset += x_diff - @buffer_x - scrolled = true else @x_offset += x_diff + @buffer_x - scrolled = true end + scrolled = true end - STDERR.puts x_diff + y_diff = @height/2 + @follow_offset_y - y - @y_offset if y_diff.abs > @buffer_y # move screen if y_diff > 0 @y_offset += y_diff - @buffer_y - scrolled = true else @y_offset += y_diff + @buffer_y - scrolled = true end + scrolled = true end fire :scrolled if scrolled lib/gamebox/viewport.rb @@ -86,25 +86,20 @@ describe 'A new viewport' do end it 'should follow a target if target has gone left;up of its buffer' do - STDERR.puts "HERE" actor = Vec.new 900, 200 - @viewport.should_receive(:fire).with(:scrolled).exactly(3).times - STDERR.puts "FOLLOW" + @viewport.should_receive(:fire).with(:scrolled).twice @viewport.follow actor, [0,0], [100,200] - STDERR.puts "UPDATE 1" @viewport.update 100 actor.x = 810 actor.y = 10 - - STDERR.puts "UPDATE 2" + @viewport.update 100 @viewport.x_offset.should equal(-500) @viewport.y_offset.should equal(100) actor.x = 799 actor.y = -1 - STDERR.puts "UPDATE 2" @viewport.update 100 @viewport.x_offset.should equal(-499) @@ -117,6 +112,4 @@ describe 'A new viewport' do @viewport.follow actor, [0,0], [100,200] end - it 'should fire :scrolled event from update when the actor moves' - end spec/viewport_spec.rb 530bdb257df5a89b7d593b51a4b2664bd1b47979 Shawn Anderson shawn42@gmail.com http://github.com/shawn42/gamebox/commit/e06ee878a919952d61d2ea53c3bd38a1705a1ecd e06ee878a919952d61d2ea53c3bd38a1705a1ecd 2009-10-05T05:14:33-07:00 2009-10-05T05:14:33-07:00 fixed scroll event spec e12dc641b8164c0d1f6a8684aa3b81a65c79315f Shawn Anderson shawn42@gmail.com