Merge branch 'DragonRuby:master' into masterHEADmaster

2 files changed, 0 insertions, 319 deletions

diff --git a/samples/04_physics_and_collisions/06_jump_physics/app/main.rb b/samples/04_physics_and_collisions/06_jump_physics/app/main.rb
deleted file mode 100644
index da01e91..0000000
--- a/samples/04_physics_and_collisions/06_jump_physics/app/main.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-=begin
-
- Reminders:
-
- - args.state.new_entity: Used when we want to create a new object, like a sprite or button.
-   For example, if we want to create a new button, we would declare it as a new entity and
-   then define its properties. (Remember, you can use state to define ANY property and it will
-   be retained across frames.)
-
- - args.outputs.solids: An array. The values generate a solid.
-   The parameters for a solid are [X, Y, WIDTH, HEIGHT, RED, GREEN, BLUE]
-
- - num1.greater(num2): Returns the greater value.
-
- - Hashes: Collection of unique keys and their corresponding values. The value can be found
-   using their keys.
-
- - ARRAY#inside_rect?: Returns true or false depending on if the point is inside the rect.
-
-=end
-
-# This sample app is a game that requires the user to jump from one platform to the next.
-# As the player successfully clears platforms, they become smaller and move faster.
-
-class VerticalPlatformer
-  attr_gtk
-
-  # declares vertical platformer as new entity
-  def s
-    state.vertical_platformer ||= state.new_entity(:vertical_platformer)
-    state.vertical_platformer
-  end
-
-  # creates a new platform using a hash
-  def new_platform hash
-    s.new_entity_strict(:platform, hash) # platform key
-  end
-
-  # calls methods needed for game to run properly
-  def tick
-    defaults
-    render
-    calc
-    input
-  end
-
-  # Sets default values
-  def defaults
-    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
-    ]
-
-    s.tick_count  = args.state.tick_count
-    s.gravity     = -0.3 # what goes up must come down because of gravity
-    s.player.platforms_cleared ||= 0 # counts how many platforms the player has successfully cleared
-    s.player.x  ||= 0           # sets player values
-    s.player.y  ||= 100
-    s.player.w  ||= 64
-    s.player.h  ||= 64
-    s.player.dy ||= 0           # change in position
-    s.player.dx ||= 0
-    s.player_jump_power           = 15
-    s.player_jump_power_duration  = 10
-    s.player_max_run_speed        = 5
-    s.player_speed_slowdown_rate  = 0.9
-    s.player_acceleration         = 1
-    s.camera ||= { y: -100 } # shows view on screen (as the player moves upward, the camera does too)
-  end
-
-  # Outputs objects onto the screen
-  def render
-    outputs.solids << s.platforms.map do |p| # outputs platforms onto screen
-      [p.x + 300, p.y - s.camera[:y], p.w, p.h] # add 300 to place platform in horizontal center
-      # don't forget, position of platform is denoted by bottom left hand corner
-    end
-
-    # outputs player using hash
-    outputs.solids << {
-      x: s.player.x + 300, # player positioned on top of platform
-      y: s.player.y - s.camera[:y],
-      w: s.player.w,
-      h: s.player.h,
-      r: 100,              # color saturation
-      g: 100,
-      b: 200
-    }
-  end
-
-  # Performs calculations
-  def calc
-    s.platforms.each do |p| # for each platform in the collection
-      p.rect = [p.x, p.y, p.w, p.h] # set the definition
-    end
-
-    # sets player point by adding half the player's width to the player's x
-    s.player.point = [s.player.x + s.player.w.half, s.player.y] # change + to - and see what happens!
-
-    # search the platforms collection to find if the player's point is inside the rect of a platform
-    collision = s.platforms.find { |p| s.player.point.inside_rect? p.rect }
-
-    # if collision occurred and player is moving down (or not moving vertically at all)
-    if collision && s.player.dy <= 0
-      s.player.y = collision.rect.y + collision.rect.h - 2 # player positioned on top of platform
-      s.player.dy = 0 if s.player.dy < 0 # player stops moving vertically
-      if !s.player.platform
-        s.player.dx = 0 # no horizontal movement
-      end
-      # changes horizontal position of player by multiplying collision change in x (dx) by speed and adding it to current x
-      s.player.x += collision.dx * collision.speed
-      s.player.platform = collision # player is on the platform that it collided with (or landed on)
-      if s.player.falling # if player is falling
-        s.player.dx = 0  # no horizontal movement
-      end
-      s.player.falling = false
-      s.player.jumped_at = nil
-    else
-      s.player.platform = nil # player is not on a platform
-      s.player.y  += s.player.dy # velocity is the change in position
-      s.player.dy += s.gravity # acceleration is the change in velocity; what goes up must come down
-    end
-
-    s.platforms.each do |p| # for each platform in the collection
-      p.x += p.dx * p.speed # x is incremented by product of dx and speed (causes platform to move horizontally)
-      # changes platform's x so it moves left and right across the screen (between -300 and 300 pixels)
-      if p.x < -300 # if platform goes too far left
-        p.dx *= -1 # dx is scaled down
-        p.x = -300 # as far left as possible within scope
-      elsif p.x > (1000 - p.w) # if platform's x is greater than 300
-        p.dx *= -1
-        p.x = (1000 - p.w) # set to 300 (as far right as possible within scope)
-      end
-    end
-
-    delta = (s.player.y - s.camera[:y] - 100) # used to position camera view
-
-    if delta > -200
-      s.camera[:y] += delta * 0.01 # allows player to see view as they move upwards
-      s.player.x  += s.player.dx # velocity is change in position; change in x increases by dx
-
-      # searches platform collection to find platforms located more than 300 pixels above the player
-      has_platforms = s.platforms.find { |p| p.y > (s.player.y + 300) }
-      if !has_platforms # if there are no platforms 300 pixels above the player
-        width = 700 - (700 * (0.1 * s.player.platforms_cleared)) # the next platform is smaller than previous
-        s.player.platforms_cleared += 1 # player successfully cleared another platform
-        last_platform = s.platforms[-1] # platform just cleared becomes last platform
-        # another platform is created 300 pixels above the last platform, and this
-        # new platform has a smaller width and moves faster than all previous platforms
-        s.platforms << new_platform(x: (700 - width) * rand, # random x position
-                                    y: last_platform.y + 300,
-                                    w: width,
-                                    h: 32,
-                                    dx: 1.randomize(:sign), # random change in x
-                                    speed: 2 * s.player.platforms_cleared,
-                                    rect: nil)
-      end
-    else
-      s.as_hash.clear # otherwise clear the hash (no new platform is necessary)
-    end
-  end
-
-  # Takes input from the user to move the player
-  def input
-    if inputs.keyboard.space # if the space bar is pressed
-      s.player.jumped_at ||= s.tick_count # set to current frame
-
-      # if the time that has passed since the jump is less than the duration of a jump (10 frames)
-      # and the player is not falling
-      if s.player.jumped_at.elapsed_time < s.player_jump_power_duration && !s.player.falling
-        s.player.dy = s.player_jump_power # player jumps up
-      end
-    end
-
-    if inputs.keyboard.key_up.space # if space bar is in "up" state
-      s.player.falling = true # player is falling
-    end
-
-    if inputs.keyboard.left # if left key is pressed
-      s.player.dx -= s.player_acceleration # player's position changes, decremented by acceleration
-      s.player.dx = s.player.dx.greater(-s.player_max_run_speed) # dx is either current dx or -5, whichever is greater
-    elsif inputs.keyboard.right # if right key is pressed
-      s.player.dx += s.player_acceleration # player's position changes, incremented by acceleration
-      s.player.dx  = s.player.dx.lesser(s.player_max_run_speed) # dx is either current dx or 5, whichever is lesser
-    else
-      s.player.dx *= s.player_speed_slowdown_rate # scales dx down
-    end
-  end
-end
-
-$game = VerticalPlatformer.new
-
-def tick args
-  $game.args = args
-  $game.tick
-end
diff --git a/samples/04_physics_and_collisions/06_jump_physics/replay.txt b/samples/04_physics_and_collisions/06_jump_physics/replay.txt
deleted file mode 100644
index 966dbcd..0000000
--- a/samples/04_physics_and_collisions/06_jump_physics/replay.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-replay_version 2.0
-stopped_at 1260
-seed 100
-recorded_at Sun Sep 29 22:23:22 2019
-[:key_down_raw, 1073741903, 0, 2, 1, 45]
-[:key_down_raw, 1073741903, 0, 2, 2, 70]
-[:key_down_raw, 1073741903, 0, 2, 3, 72]
-[:key_down_raw, 1073741903, 0, 2, 4, 74]
-[:key_down_raw, 1073741903, 0, 2, 5, 76]
-[:key_down_raw, 1073741903, 0, 2, 6, 78]
-[:key_down_raw, 1073741903, 0, 2, 7, 80]
-[:key_down_raw, 1073741903, 0, 2, 8, 82]
-[:key_down_raw, 1073741903, 0, 2, 9, 84]
-[:key_down_raw, 1073741903, 0, 2, 10, 86]
-[:key_down_raw, 1073741903, 0, 2, 11, 88]
-[:key_up_raw, 1073741903, 0, 2, 12, 89]
-[:key_down_raw, 1073741904, 0, 2, 13, 92]
-[:key_down_raw, 1073741903, 0, 2, 14, 112]
-[:key_up_raw, 1073741904, 0, 2, 15, 115]
-[:key_down_raw, 1073741903, 0, 2, 16, 137]
-[:key_down_raw, 1073741903, 0, 2, 17, 139]
-[:key_down_raw, 8, 0, 2, 18, 141]
-[:key_up_raw, 1073741903, 0, 2, 19, 146]
-[:key_down_raw, 1073741903, 0, 2, 20, 147]
-[:key_up_raw, 1073741903, 0, 2, 21, 147]
-[:key_down_raw, 1073741904, 0, 2, 22, 154]
-[:key_up_raw, 8, 0, 2, 23, 172]
-[:key_down_raw, 1073741903, 0, 2, 24, 175]
-[:key_up_raw, 1073741904, 0, 2, 25, 175]
-[:key_down_raw, 32, 0, 2, 26, 194]
-[:key_down_raw, 1073741904, 0, 2, 27, 201]
-[:key_up_raw, 1073741903, 0, 2, 28, 202]
-[:key_down_raw, 1073741903, 0, 2, 29, 222]
-[:key_up_raw, 1073741904, 0, 2, 30, 226]
-[:key_up_raw, 32, 0, 2, 31, 233]
-[:key_down_raw, 1073741903, 0, 2, 32, 247]
-[:key_down_raw, 1073741903, 0, 2, 33, 249]
-[:key_down_raw, 1073741903, 0, 2, 34, 251]
-[:key_down_raw, 1073741903, 0, 2, 35, 253]
-[:key_down_raw, 1073741903, 0, 2, 36, 255]
-[:key_down_raw, 1073741903, 0, 2, 37, 257]
-[:key_down_raw, 1073741903, 0, 2, 38, 259]
-[:key_down_raw, 1073741903, 0, 2, 39, 261]
-[:key_down_raw, 1073741903, 0, 2, 40, 263]
-[:key_down_raw, 1073741903, 0, 2, 41, 265]
-[:key_down_raw, 1073741903, 0, 2, 42, 267]
-[:key_down_raw, 1073741903, 0, 2, 43, 269]
-[:key_down_raw, 1073741903, 0, 2, 44, 271]
-[:key_down_raw, 1073741903, 0, 2, 45, 273]
-[:key_down_raw, 1073741903, 0, 2, 46, 275]
-[:key_up_raw, 1073741903, 0, 2, 47, 276]
-[:key_down_raw, 1073741904, 0, 2, 48, 280]
-[:key_up_raw, 1073741904, 0, 2, 49, 297]
-[:key_down_raw, 1073741903, 0, 2, 50, 300]
-[:key_down_raw, 32, 0, 2, 51, 303]
-[:key_up_raw, 32, 0, 2, 52, 308]
-[:key_up_raw, 1073741903, 0, 2, 53, 334]
-[:key_down_raw, 1073741904, 0, 2, 54, 336]
-[:key_down_raw, 1073741903, 0, 2, 55, 355]
-[:key_up_raw, 1073741904, 0, 2, 56, 355]
-[:key_up_raw, 1073741903, 0, 2, 57, 373]
-[:key_down_raw, 1073741904, 0, 2, 58, 380]
-[:key_down_raw, 32, 0, 2, 59, 398]
-[:key_up_raw, 32, 0, 2, 60, 404]
-[:key_up_raw, 1073741904, 0, 2, 61, 490]
-[:key_down_raw, 32, 0, 2, 62, 510]
-[:key_up_raw, 32, 0, 2, 63, 516]
-[:key_down_raw, 1073741903, 0, 2, 64, 517]
-[:key_up_raw, 1073741903, 0, 2, 65, 537]
-[:key_down_raw, 1073741904, 0, 2, 66, 538]
-[:key_up_raw, 1073741904, 0, 2, 67, 553]
-[:key_down_raw, 32, 0, 2, 68, 653]
-[:key_up_raw, 32, 0, 2, 69, 659]
-[:key_down_raw, 1073741903, 0, 2, 70, 661]
-[:key_down_raw, 1073741903, 0, 2, 71, 686]
-[:key_up_raw, 1073741903, 0, 2, 72, 687]
-[:key_down_raw, 1073741904, 0, 2, 73, 690]
-[:key_down_raw, 1073741904, 0, 2, 74, 715]
-[:key_down_raw, 1073741904, 0, 2, 75, 717]
-[:key_down_raw, 1073741904, 0, 2, 76, 719]
-[:key_down_raw, 1073741904, 0, 2, 77, 721]
-[:key_down_raw, 1073741904, 0, 2, 78, 723]
-[:key_down_raw, 1073741904, 0, 2, 79, 725]
-[:key_down_raw, 1073741904, 0, 2, 80, 727]
-[:key_down_raw, 1073741904, 0, 2, 81, 729]
-[:key_up_raw, 1073741904, 0, 2, 82, 731]
-[:key_down_raw, 1073741903, 0, 2, 83, 740]
-[:key_down_raw, 32, 0, 2, 84, 749]
-[:key_up_raw, 32, 0, 2, 85, 756]
-[:key_up_raw, 1073741903, 0, 2, 86, 789]
-[:key_down_raw, 1073741904, 0, 2, 87, 792]
-[:key_down_raw, 1073741904, 0, 2, 88, 817]
-[:key_up_raw, 1073741904, 0, 2, 89, 817]
-[:key_down_raw, 32, 0, 2, 90, 844]
-[:key_down_raw, 1073741903, 0, 2, 91, 846]
-[:key_up_raw, 32, 0, 2, 92, 852]
-[:key_down_raw, 1073741903, 0, 2, 93, 871]
-[:key_down_raw, 1073741903, 0, 2, 94, 873]
-[:key_down_raw, 1073741903, 0, 2, 95, 875]
-[:key_down_raw, 1073741903, 0, 2, 96, 877]
-[:key_down_raw, 1073741903, 0, 2, 97, 879]
-[:key_down_raw, 1073741903, 0, 2, 98, 881]
-[:key_down_raw, 1073741903, 0, 2, 99, 883]
-[:key_down_raw, 1073741903, 0, 2, 100, 885]
-[:key_down_raw, 1073741903, 0, 2, 101, 887]
-[:key_up_raw, 1073741903, 0, 2, 102, 887]
-[:key_down_raw, 1073741904, 0, 2, 103, 897]
-[:key_up_raw, 1073741904, 0, 2, 104, 901]
-[:key_down_raw, 32, 0, 2, 105, 948]
-[:key_up_raw, 32, 0, 2, 106, 953]
-[:key_down_raw, 1073741904, 0, 2, 107, 977]
-[:key_up_raw, 1073741904, 0, 2, 108, 991]
-[:key_down_raw, 32, 0, 2, 109, 1056]
-[:key_up_raw, 32, 0, 2, 110, 1060]
-[:key_down_raw, 1073741904, 0, 2, 111, 1065]
-[:key_down_raw, 1073741904, 0, 2, 112, 1090]
-[:key_down_raw, 1073741904, 0, 2, 113, 1092]
-[:key_down_raw, 1073741904, 0, 2, 114, 1094]
-[:key_down_raw, 1073741904, 0, 2, 115, 1096]
-[:key_up_raw, 1073741904, 0, 2, 116, 1098]
-[:key_down_raw, 1073741903, 0, 2, 117, 1108]
-[:key_up_raw, 1073741903, 0, 2, 118, 1127]
-[:key_down_raw, 1073742051, 1024, 2, 119, 1258]
-[:key_down_raw, 113, 1024, 2, 120, 1259]