Merge branch 'DragonRuby:master' into masterHEADmaster

1 files changed, 10 insertions, 10 deletions

diff --git a/samples/04_physics_and_collisions/06_box_collision_3/app/main.rb b/samples/04_physics_and_collisions/06_box_collision_3/app/main.rb
index 2e32eee..e2210c2 100644
--- a/samples/04_physics_and_collisions/06_box_collision_3/app/main.rb
+++ b/samples/04_physics_and_collisions/06_box_collision_3/app/main.rb
@@ -46,9 +46,9 @@ class Game
     mouse_overlay = mouse_overlay.merge r: 255 if state.delete_mode
 
     if state.mouse_held
-      outputs.primitives << mouse_overlay.border
+      outputs.primitives << mouse_overlay.border!
     else
-      outputs.primitives << mouse_overlay.solid
+      outputs.primitives << mouse_overlay.solid!
     end
   end
 
@@ -112,7 +112,7 @@ class Game
 
   def calc_below
     return unless player.dy <= 0
-    tiles_below = find_tiles { |t| t.rect.top <= player.y }
+    tiles_below = find_tiles { |t| t.rect.top <= player.prev_rect.y }
     collision = find_colliding_tile tiles_below, (player.rect.merge y: player.next_rect.y)
     return unless collision
     if collision.neighbors.b == :none && player.jumped_down_at.elapsed_time < 10
@@ -143,7 +143,7 @@ class Game
 
   def calc_above
     return unless player.dy > 0
-    tiles_above = find_tiles { |t| t.rect.y >= player.y }
+    tiles_above = find_tiles { |t| t.rect.y >= player.prev_rect.y }
     collision = find_colliding_tile tiles_above, (player.rect.merge y: player.next_rect.y)
     return unless collision
     return if collision.neighbors.t == :none
@@ -152,17 +152,17 @@ class Game
   end
 
   def calc_player_dx
-    player.y  += player.dy
-    player.dy += state.gravity
-    player.dy += player.dy * state.drag ** 2 * -1
-  end
-
-  def calc_player_dy
     player.dx  = player.dx.clamp(-5,  5)
     player.dx *= 0.9
     player.x  += player.dx
   end
 
+  def calc_player_dy
+    player.y  += player.dy
+    player.dy += state.gravity
+    player.dy += player.dy * state.drag ** 2 * -1
+  end
+
   def reset_player
     player.x  = 100
     player.y  = 720