Synced with DragonRuby Game Toolkit v3.2.

2 files changed, 14 insertions, 8 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 ae447fd..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
@@ -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
diff --git a/samples/04_physics_and_collisions/07_jump_physics/app/main.rb b/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
index 3fcb9e9..8db98be 100644
--- a/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
+++ b/samples/04_physics_and_collisions/07_jump_physics/app/main.rb
@@ -45,8 +45,7 @@ class VerticalPlatformer
     input
   end
 
-  # Sets default values
-  def defaults
+  def init_game
     s.platforms ||= [ # initializes platforms collection with two platforms using hashes
       new_platform(x: 0, y: 0, w: 700, h: 32, dx: 1, speed: 0, rect: nil),
       new_platform(x: 0, y: 300, w: 700, h: 32, dx: 1, speed: 0, rect: nil), # 300 pixels higher
@@ -69,6 +68,11 @@ class VerticalPlatformer
     s.camera ||= { y: -100 } # shows view on screen (as the player moves upward, the camera does too)
   end
 
+  # Sets default values
+  def defaults
+    init_game
+  end
+
   # Outputs objects onto the screen
   def render
     outputs.solids << s.platforms.map do |p| # outputs platforms onto screen
@@ -156,7 +160,9 @@ class VerticalPlatformer
                                     rect: nil)
       end
     else
+      # game over
       s.as_hash.clear # otherwise clear the hash (no new platform is necessary)
+      init_game
     end
   end