gosu 0.8.6-x86-mingw32 → 0.8.7-x86-mingw32

data/examples/CptnRuby.rb

@@ -1,223 +1,223 @@
-# Basically, the tutorial game taken to a jump'n'run perspective.
-
-# Shows how to
-#  * implement jumping/gravity
-#  * implement scrolling using Window#translate
-#  * implement a simple tile-based map
-#  * load levels from primitive text files
-
-# Some exercises, starting at the real basics:
-#  0) understand the existing code!
-# As shown in the tutorial:
-#  1) change it use Gosu's Z-ordering
-#  2) add gamepad support
-#  3) add a score as in the tutorial game
-#  4) similarly, add sound effects for various events
-# Exploring this game's code and Gosu:
-#  5) make the player wider, so he doesn't fall off edges as easily
-#  6) add background music (check if playing in Window#update to implement 
-#     looping)
-#  7) implement parallax scrolling for the star background!
-# Getting tricky:
-#  8) optimize Map#draw so only tiles on screen are drawn (needs modulo, a pen
-#     and paper to figure out)
-#  9) add loading of next level when all gems are collected
-# ...Enemies, a more sophisticated object system, weapons, title and credits
-# screens...
-
-require 'rubygems'
-require 'gosu'
-include Gosu
-
-module Tiles
-  Grass = 0
-  Earth = 1
-end
-
-class CollectibleGem
-  attr_reader :x, :y
-
-  def initialize(image, x, y)
-    @image = image
-    @x, @y = x, y
-  end
-  
-  def draw
-    # Draw, slowly rotating
-    @image.draw_rot(@x, @y, 0, 25 * Math.sin(milliseconds / 133.7))
-  end
-end
-
-# Player class.
-class CptnRuby
-  attr_reader :x, :y
-
-  def initialize(window, x, y)
-    @x, @y = x, y
-    @dir = :left
-    @vy = 0 # Vertical velocity
-    @map = window.map
-    # Load all animation frames
-    @standing, @walk1, @walk2, @jump =
-      *Image.load_tiles(window, "media/CptnRuby.png", 50, 50, false)
-    # This always points to the frame that is currently drawn.
-    # This is set in update, and used in draw.
-    @cur_image = @standing    
-  end
-  
-  def draw
-    # Flip vertically when facing to the left.
-    if @dir == :left then
-      offs_x = -25
-      factor = 1.0
-    else
-      offs_x = 25
-      factor = -1.0
-    end
-    @cur_image.draw(@x + offs_x, @y - 49, 0, factor, 1.0)
-  end
-  
-  # Could the object be placed at x + offs_x/y + offs_y without being stuck?
-  def would_fit(offs_x, offs_y)
-    # Check at the center/top and center/bottom for map collisions
-    not @map.solid?(@x + offs_x, @y + offs_y) and
-      not @map.solid?(@x + offs_x, @y + offs_y - 45)
-  end
-  
-  def update(move_x)
-    # Select image depending on action
-    if (move_x == 0)
-      @cur_image = @standing
-    else
-      @cur_image = (milliseconds / 175 % 2 == 0) ? @walk1 : @walk2
-    end
-    if (@vy < 0)
-      @cur_image = @jump
-    end
-    
-    # Directional walking, horizontal movement
-    if move_x > 0 then
-      @dir = :right
-      move_x.times { if would_fit(1, 0) then @x += 1 end }
-    end
-    if move_x < 0 then
-      @dir = :left
-      (-move_x).times { if would_fit(-1, 0) then @x -= 1 end }
-    end
-
-    # Acceleration/gravity
-    # By adding 1 each frame, and (ideally) adding vy to y, the player's
-    # jumping curve will be the parabole we want it to be.
-    @vy += 1
-    # Vertical movement
-    if @vy > 0 then
-      @vy.times { if would_fit(0, 1) then @y += 1 else @vy = 0 end }
-    end
-    if @vy < 0 then
-      (-@vy).times { if would_fit(0, -1) then @y -= 1 else @vy = 0 end }
-    end
-  end
-  
-  def try_to_jump
-    if @map.solid?(@x, @y + 1) then
-      @vy = -20
-    end
-  end
-  
-  def collect_gems(gems)
-    # Same as in the tutorial game.
-    gems.reject! do |c|
-      (c.x - @x).abs < 50 and (c.y - @y).abs < 50
-    end
-  end
-end
-
-# Map class holds and draws tiles and gems.
-class Map
-  attr_reader :width, :height, :gems
-  
-  def initialize(window, filename)
-    # Load 60x60 tiles, 5px overlap in all four directions.
-    @tileset = Image.load_tiles(window, "media/CptnRuby Tileset.png", 60, 60, true)
-
-    gem_img = Image.new(window, "media/CptnRuby Gem.png", false)
-    @gems = []
-
-    lines = File.readlines(filename).map { |line| line.chomp }
-    @height = lines.size
-    @width = lines[0].size
-    @tiles = Array.new(@width) do |x|
-      Array.new(@height) do |y|
-        case lines[y][x, 1]
-        when '"'
-          Tiles::Grass
-        when '#'
-          Tiles::Earth
-        when 'x'
-          @gems.push(CollectibleGem.new(gem_img, x * 50 + 25, y * 50 + 25))
-          nil
-        else
-          nil
-        end
-      end
-    end
-  end
-  
-  def draw
-    # Very primitive drawing function:
-    # Draws all the tiles, some off-screen, some on-screen.
-    @height.times do |y|
-      @width.times do |x|
-        tile = @tiles[x][y]
-        if tile
-          # Draw the tile with an offset (tile images have some overlap)
-          # Scrolling is implemented here just as in the game objects.
-          @tileset[tile].draw(x * 50 - 5, y * 50 - 5, 0)
-        end
-      end
-    end
-    @gems.each { |c| c.draw }
-  end
-  
-  # Solid at a given pixel position?
-  def solid?(x, y)
-    y < 0 || @tiles[x / 50][y / 50]
-  end
-end
-
-class Game < Window
-  attr_reader :map
-
-  def initialize
-    super(640, 480, false)
-    self.caption = "Cptn. Ruby"
-    @sky = Image.new(self, "media/Space.png", true)
-    @map = Map.new(self, "media/CptnRuby Map.txt")
-    @cptn = CptnRuby.new(self, 400, 100)
-    # The scrolling position is stored as top left corner of the screen.
-    @camera_x = @camera_y = 0
-  end
-  def update
-    move_x = 0
-    move_x -= 5 if button_down? KbLeft
-    move_x += 5 if button_down? KbRight
-    @cptn.update(move_x)
-    @cptn.collect_gems(@map.gems)
-    # Scrolling follows player
-    @camera_x = [[@cptn.x - 320, 0].max, @map.width * 50 - 640].min
-    @camera_y = [[@cptn.y - 240, 0].max, @map.height * 50 - 480].min
-  end
-  def draw
-    @sky.draw 0, 0, 0
-    translate(-@camera_x, -@camera_y) do
-      @map.draw
-      @cptn.draw
-    end
-  end
-  def button_down(id)
-    if id == KbUp then @cptn.try_to_jump end
-    if id == KbEscape then close end
-  end
-end
-
-Game.new.show
+# Basically, the tutorial game taken to a jump'n'run perspective.
+
+# Shows how to
+#  * implement jumping/gravity
+#  * implement scrolling using Window#translate
+#  * implement a simple tile-based map
+#  * load levels from primitive text files
+
+# Some exercises, starting at the real basics:
+#  0) understand the existing code!
+# As shown in the tutorial:
+#  1) change it use Gosu's Z-ordering
+#  2) add gamepad support
+#  3) add a score as in the tutorial game
+#  4) similarly, add sound effects for various events
+# Exploring this game's code and Gosu:
+#  5) make the player wider, so he doesn't fall off edges as easily
+#  6) add background music (check if playing in Window#update to implement 
+#     looping)
+#  7) implement parallax scrolling for the star background!
+# Getting tricky:
+#  8) optimize Map#draw so only tiles on screen are drawn (needs modulo, a pen
+#     and paper to figure out)
+#  9) add loading of next level when all gems are collected
+# ...Enemies, a more sophisticated object system, weapons, title and credits
+# screens...
+
+require 'rubygems'
+require 'gosu'
+include Gosu
+
+module Tiles
+  Grass = 0
+  Earth = 1
+end
+
+class CollectibleGem
+  attr_reader :x, :y
+
+  def initialize(image, x, y)
+    @image = image
+    @x, @y = x, y
+  end
+  
+  def draw
+    # Draw, slowly rotating
+    @image.draw_rot(@x, @y, 0, 25 * Math.sin(milliseconds / 133.7))
+  end
+end
+
+# Player class.
+class CptnRuby
+  attr_reader :x, :y
+
+  def initialize(window, x, y)
+    @x, @y = x, y
+    @dir = :left
+    @vy = 0 # Vertical velocity
+    @map = window.map
+    # Load all animation frames
+    @standing, @walk1, @walk2, @jump =
+      *Image.load_tiles(window, "media/CptnRuby.png", 50, 50, false)
+    # This always points to the frame that is currently drawn.
+    # This is set in update, and used in draw.
+    @cur_image = @standing    
+  end
+  
+  def draw
+    # Flip vertically when facing to the left.
+    if @dir == :left then
+      offs_x = -25
+      factor = 1.0
+    else
+      offs_x = 25
+      factor = -1.0
+    end
+    @cur_image.draw(@x + offs_x, @y - 49, 0, factor, 1.0)
+  end
+  
+  # Could the object be placed at x + offs_x/y + offs_y without being stuck?
+  def would_fit(offs_x, offs_y)
+    # Check at the center/top and center/bottom for map collisions
+    not @map.solid?(@x + offs_x, @y + offs_y) and
+      not @map.solid?(@x + offs_x, @y + offs_y - 45)
+  end
+  
+  def update(move_x)
+    # Select image depending on action
+    if (move_x == 0)
+      @cur_image = @standing
+    else
+      @cur_image = (milliseconds / 175 % 2 == 0) ? @walk1 : @walk2
+    end
+    if (@vy < 0)
+      @cur_image = @jump
+    end
+    
+    # Directional walking, horizontal movement
+    if move_x > 0 then
+      @dir = :right
+      move_x.times { if would_fit(1, 0) then @x += 1 end }
+    end
+    if move_x < 0 then
+      @dir = :left
+      (-move_x).times { if would_fit(-1, 0) then @x -= 1 end }
+    end
+
+    # Acceleration/gravity
+    # By adding 1 each frame, and (ideally) adding vy to y, the player's
+    # jumping curve will be the parabole we want it to be.
+    @vy += 1
+    # Vertical movement
+    if @vy > 0 then
+      @vy.times { if would_fit(0, 1) then @y += 1 else @vy = 0 end }
+    end
+    if @vy < 0 then
+      (-@vy).times { if would_fit(0, -1) then @y -= 1 else @vy = 0 end }
+    end
+  end
+  
+  def try_to_jump
+    if @map.solid?(@x, @y + 1) then
+      @vy = -20
+    end
+  end
+  
+  def collect_gems(gems)
+    # Same as in the tutorial game.
+    gems.reject! do |c|
+      (c.x - @x).abs < 50 and (c.y - @y).abs < 50
+    end
+  end
+end
+
+# Map class holds and draws tiles and gems.
+class Map
+  attr_reader :width, :height, :gems
+  
+  def initialize(window, filename)
+    # Load 60x60 tiles, 5px overlap in all four directions.
+    @tileset = Image.load_tiles(window, "media/CptnRuby Tileset.png", 60, 60, true)
+
+    gem_img = Image.new(window, "media/CptnRuby Gem.png", false)
+    @gems = []
+
+    lines = File.readlines(filename).map { |line| line.chomp }
+    @height = lines.size
+    @width = lines[0].size
+    @tiles = Array.new(@width) do |x|
+      Array.new(@height) do |y|
+        case lines[y][x, 1]
+        when '"'
+          Tiles::Grass
+        when '#'
+          Tiles::Earth
+        when 'x'
+          @gems.push(CollectibleGem.new(gem_img, x * 50 + 25, y * 50 + 25))
+          nil
+        else
+          nil
+        end
+      end
+    end
+  end
+  
+  def draw
+    # Very primitive drawing function:
+    # Draws all the tiles, some off-screen, some on-screen.
+    @height.times do |y|
+      @width.times do |x|
+        tile = @tiles[x][y]
+        if tile
+          # Draw the tile with an offset (tile images have some overlap)
+          # Scrolling is implemented here just as in the game objects.
+          @tileset[tile].draw(x * 50 - 5, y * 50 - 5, 0)
+        end
+      end
+    end
+    @gems.each { |c| c.draw }
+  end
+  
+  # Solid at a given pixel position?
+  def solid?(x, y)
+    y < 0 || @tiles[x / 50][y / 50]
+  end
+end
+
+class Game < Window
+  attr_reader :map
+
+  def initialize
+    super(640, 480, false)
+    self.caption = "Cptn. Ruby"
+    @sky = Image.new(self, "media/Space.png", true)
+    @map = Map.new(self, "media/CptnRuby Map.txt")
+    @cptn = CptnRuby.new(self, 400, 100)
+    # The scrolling position is stored as top left corner of the screen.
+    @camera_x = @camera_y = 0
+  end
+  def update
+    move_x = 0
+    move_x -= 5 if button_down? KbLeft
+    move_x += 5 if button_down? KbRight
+    @cptn.update(move_x)
+    @cptn.collect_gems(@map.gems)
+    # Scrolling follows player
+    @camera_x = [[@cptn.x - 320, 0].max, @map.width * 50 - 640].min
+    @camera_y = [[@cptn.y - 240, 0].max, @map.height * 50 - 480].min
+  end
+  def draw
+    @sky.draw 0, 0, 0
+    translate(-@camera_x, -@camera_y) do
+      @map.draw
+      @cptn.draw
+    end
+  end
+  def button_down(id)
+    if id == KbUp then @cptn.try_to_jump end
+    if id == KbEscape then close end
+  end
+end
+
+Game.new.show

data/examples/GosuZen.rb

@@ -1,68 +1,68 @@
-# Gosu Zen example based on erisdiscord's comment here:
-# https://github.com/jlnr/gosu/pull/120
-
-# Gosu Zen is the (inline) Sinatra of Ruby multimedia programming.
-# The interface is still in flux. If you want to tune the interface
-# a little further or provide more examples, please fork Gosu and
-# send a pull request. Thanks!
-
-require 'rubygems'
-require 'gosu/zen'
-include Gosu::Zen
-
-window 480, 240, :fullscreen => false
-
-button_down Gosu::KbEscape do
-  close
-end
-
-update do
-  t = Gosu.milliseconds / 1000.0
-
-  @radius = [width, height].min * 0.37
-  @angle = t * Math::PI
-
-  a, b =\
-    (Math.cos(t) + 0.5) * 0xff,
-    (Math.sin(t) + 0.5) * 0xff
-
-  c = (a + b) / 2
-
-  @colors = [
-    Gosu::Color.rgb(a, b, 0xff),
-    Gosu::Color.rgb(a, 0x00, b),
-    Gosu::Color.rgb(0xff, b, a),
-    Gosu::Color.rgb(b, a, 0x00),
-    Gosu::Color.rgb(b, 0xff, a),
-    Gosu::Color.rgb(0x00, a, b) ]
-
-  @background = Gosu::Color.rgb(c, c, c)
-end
-
-draw do
-  draw_quad\
-    0,     0,      @background,
-    0,     height, @background,
-    width, height, @background,
-    width, 0,      @background, 0
-
-  translate width / 2, height / 2 do
-    @colors.each.with_index do |color, i|
-
-      angle = @angle + i.to_f / @colors.length * 2.0 * Math::PI
-      x = @radius * Math.sin(angle)
-      y = @radius * Math.cos(angle)
-      w, h = x, y
-
-      translate x, y do
-        rotate Gosu.radians_to_degrees(angle) do
-          draw_quad\
-            -w, +h, color,
-            -w, -h, color,
-            +w, -h, color,
-            +w, +h, color, 0
-        end
-      end
-    end
-  end
-end
+# Gosu Zen example based on erisdiscord's comment here:
+# https://github.com/jlnr/gosu/pull/120
+
+# Gosu Zen is the (inline) Sinatra of Ruby multimedia programming.
+# The interface is still in flux. If you want to tune the interface
+# a little further or provide more examples, please fork Gosu and
+# send a pull request. Thanks!
+
+require 'rubygems'
+require 'gosu/zen'
+include Gosu::Zen
+
+window 480, 240, :fullscreen => false
+
+button_down Gosu::KbEscape do
+  close
+end
+
+update do
+  t = Gosu.milliseconds / 1000.0
+
+  @radius = [width, height].min * 0.37
+  @angle = t * Math::PI
+
+  a, b =\
+    (Math.cos(t) + 0.5) * 0xff,
+    (Math.sin(t) + 0.5) * 0xff
+
+  c = (a + b) / 2
+
+  @colors = [
+    Gosu::Color.rgb(a, b, 0xff),
+    Gosu::Color.rgb(a, 0x00, b),
+    Gosu::Color.rgb(0xff, b, a),
+    Gosu::Color.rgb(b, a, 0x00),
+    Gosu::Color.rgb(b, 0xff, a),
+    Gosu::Color.rgb(0x00, a, b) ]
+
+  @background = Gosu::Color.rgb(c, c, c)
+end
+
+draw do
+  draw_quad\
+    0,     0,      @background,
+    0,     height, @background,
+    width, height, @background,
+    width, 0,      @background, 0
+
+  translate width / 2, height / 2 do
+    @colors.each.with_index do |color, i|
+
+      angle = @angle + i.to_f / @colors.length * 2.0 * Math::PI
+      x = @radius * Math.sin(angle)
+      y = @radius * Math.cos(angle)
+      w, h = x, y
+
+      translate x, y do
+        rotate Gosu.radians_to_degrees(angle) do
+          draw_quad\
+            -w, +h, color,
+            -w, -h, color,
+            +w, -h, color,
+            +w, +h, color, 0
+        end
+      end
+    end
+  end
+end