@@ -44,8 +44,13 @@ class Sprite < Widget parent.contents.select { |c| c != self } end + def relations + siblings.unshift parent + end + def gravity( gx, gy ) @gravity_x, @gravity_y = gx, gy + @stuck = false end def push( px, py ) @@ -56,6 +61,8 @@ class Sprite < Widget @velocity_y = @max_velocity_y if @velocity_y > @max_velocity_y @velocity_x = -@max_velocity_x if @velocity_x < -@max_velocity_x @velocity_y = -@max_velocity_y if @velocity_y < -@max_velocity_y + + @stuck = false end def update_bounce( dx, dy ) @@ -63,7 +70,7 @@ class Sprite < Widget pw, ph = parent.width, parent.height if @left < 0 - @left = 0 + @left = 1 if @gravity_x < 0 && (@gravity_x * @friction_x - @velocity_x) < @min_velocity_x @velocity_x = 0 @@ -71,7 +78,7 @@ class Sprite < Widget @velocity_x = -@velocity_x end elsif @left + @width > pw - @left = pw - @width + @left = pw - @width - 1 if @gravity_x > 0 && (@velocity_x - @gravity_x * @friction_x) < @min_velocity_x @velocity_x = 0 @@ -81,7 +88,7 @@ class Sprite < Widget end if @top < 0 - @top = 0 + @top = 1 if @gravity_y < 0 && (@gravity_y * @friction_y - @velocity_y) < @min_velocity_y @velocity_y = 0 @@ -89,7 +96,7 @@ class Sprite < Widget @velocity_y = -@velocity_y end elsif @top + @height > ph - @top = ph - @height + @top = ph - @height - 1 if @gravity_y > 0 && (@velocity_y - @gravity_y * @friction_y) < @min_velocity_y @velocity_y = 0 @@ -105,47 +112,146 @@ class Sprite < Widget sx, sy, sw, sh = sib.left, sib.top, sib.width, sib.height rebound = sib.style[:push] + unless @left + @width <= sx || @left >= sx + sw || + @top + @height <= sy || @top >= sy + sh + + # collision! + + if @velocity_y < 0 && @top - dy > sy + sh + @top = sy + sh - 1 + @velocity_y = -@velocity_y + rebound + end + + if @velocity_y > 0 && @top - dy + @height < sy + @top = sy - @height + 1 + @velocity_y = -@velocity_y - rebound + end + + if @velocity_x < 0 && @left - dx > sx + sw + @left = sx + sw - 1 + @velocity_x = -@velocity_x + rebound + end + + if @velocity_x > 0 && @left - dx + @width < sx + @left = sx - @width + 1 + @velocity_x = -@velocity_x - rebound + end + end + end + end + + def update_stick( dx, dy ) + if parent.style[:sticky] + pw, ph = parent.width, parent.height + + if @velocity_y < 0 && @top < 0 + @top = 1 + @velocity_x = 0 + @velocity_y = 0 + @stuck = true + end + + if @velocity_y > 0 && @top + @height > ph + @top = ph - @height - 1 + @velocity_x = 0 + @velocity_y = 0 + @stuck = true + end + + if @velocity_x < 0 && @left < 0 + @left = 1 + @velocity_x = 0 + @velocity_y = 0 + @stuck = true + end + + if @velocity_x > 0 && @left + @width > pw + @left = pw - @width - 1 + @velocity_x = 0 + @velocity_y = 0 + @stuck = true + end + end + + siblings.each do |sib| + next unless sib.style[:sticky] + + sx, sy, sw, sh = sib.left, sib.top, sib.width, sib.height + rebound = sib.style[:push] + unless @left + @width < sx || @left > sx + sw || @top + @height < sy || @top > sy + sh # collision! - - a = [] + @stuck = true if @velocity_y < 0 && @top - dy > sy + sh @top = sy + sh + 1 - @velocity_y = -@velocity_y + rebound + @velocity_x = 0 + @velocity_y = 0 end if @velocity_y > 0 && @top - dy + @height < sy @top = sy - @height - 1 - @velocity_y = -@velocity_y - rebound + @velocity_x = 0 + @velocity_y = 0 end if @velocity_x < 0 && @left - dx > sx + sw @left = sx + sw + 1 - @velocity_x = -@velocity_x + rebound + @velocity_x = 0 + @velocity_y = 0 end if @velocity_x > 0 && @left - dx + @width < sx @left = sx - @width - 1 - @velocity_x = -@velocity_x - rebound + @velocity_x = 0 + @velocity_y = 0 end end end end + def touching?( sibling, edge ) + sx, sy, sw, sh = sibling.left, sibling.top, sibling.width, sibling.height + + case edge + when :top + @top == sy - @height - 1 && + ! (@left > sx + sw || @left + @width < sx) + when :bottom + @top == sy + sh + 1 && + ! (@left > sx + sw || @left + @width < sx) + when :left + @left == sx - @width - 1 && + ! (@top > sy + sh || @top + @height < sy) + when :right + @left == sx + sw + 1 && + ! (@top > sy + sh || @top + @height < sy) + end + end + def update_movement( delta ) - change = false + return if @stuck if (@gravity_x > 0 && @left + @width < parent.width) || (@gravity_x < 0 && @left > 0) - @velocity_x += @gravity_x * delta + + if (@gravity_x > 0 && ! siblings.any? { |s| touching?( s, :left ) }) || + (@gravity_x < 0 && ! siblings.any? { |s| touching?( s, :right ) }) + + @velocity_x += @gravity_x * delta + end end if (@gravity_y > 0 && @top + @height < parent.height) || - (@gravity_y < 0 && @top > 0) - @velocity_y += @gravity_y * delta + (@gravity_y < 0 && @top > 0) + + if (@gravity_y > 0 && ! siblings.any? { |s| touching?( s, :top ) }) || + (@gravity_y < 0 && ! siblings.any? { |s| touching?( s, :bottom ) }) + + @velocity_y += @gravity_y * delta + end end return if @velocity_x == 0.0 && @velocity_y == 0.0 @@ -154,6 +260,7 @@ class Sprite < Widget @top += (dy = @velocity_y * delta) update_bounce( dx, dy ) + update_stick( dx, dy ) @velocity_x *= 1.0 - (1.0 - @friction_x) * delta @velocity_y *= 1.0 - (1.0 - @friction_y) * delta @@ -177,7 +284,7 @@ Shoes.app :width => 400, :height => 400, :title => "Sprite Demo" do stack :top => 0, :left => 0, :width => 400, :height => 400, :bouncy => true do stack :top => 186, :left => 100, :width => 200, :height => 28, - :bouncy => true, :push => 100 do + :bouncy => true, :push => 100 do background "ddd" @p = para "down", :align => 'center' end @@ -195,10 +302,24 @@ Shoes.app :width => 400, :height => 400, :title => "Sprite Demo" do when :up then @s.push( 0, -90 ) when :down then @s.push( 0, 90 ) - when :alt_j then @s.gravity( -80, 0 ); @p.text = "left" - when :alt_l then @s.gravity( 80, 0 ); @p.text = "right" - when :alt_i then @s.gravity( 0, -80 ); @p.text = "up" - when :alt_k then @s.gravity( 0, 80 ); @p.text = "down" + when :shift_left then @s.gravity( -80, 0 ); @p.text = "left" + when :shift_right then @s.gravity( 80, 0 ); @p.text = "right" + when :shift_up then @s.gravity( 0, -80 ); @p.text = "up" + when :shift_down then @s.gravity( 0, 80 ); @p.text = "down" + + when :alt_s + @s.relations.each do |r| + r.style[:bouncy] = false + r.style[:sticky] = true + end + @p.text = "sticky" + + when :alt_b + @s.relations.each do |r| + r.style[:bouncy] = true + r.style[:sticky] = false + end + @p.text = "bouncy" end end sprite/sprite.rb 345d016a03252e93d99944dd5ced8865a0e5fbcd Eric K Idema eki@vying.org http://github.com/eki/shoesfest/commit/9ab43d9cb02da0f5ffbf8b9133e360d4352dc867 9ab43d9cb02da0f5ffbf8b9133e360d4352dc867 2008-07-25T21:06:36-07:00 2008-07-25T21:06:36-07:00 Get sticky. 4e5d76e801e9f2dd700126a7cab93650995cdd5f Eric K Idema eki@vying.org