gosu-examples 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb4367ee4c008b79167bda5845113c7513eedd4
-  data.tar.gz: 9b6fe668a5ed7f24da588abdb4f6f9dcbe600f81
+  metadata.gz: 888d1aceda91b77fb517e8b8bcf29c0465b0db10
+  data.tar.gz: b078a35fb710a436a9c1a0f1df81a01e3483a28e
 SHA512:
-  metadata.gz: cacab6fb2e19440bb1b1b84043f4a3936c5b84c48734809a3e8452252ac5509cd9b743d117afc81fa2d7a300c5593a35e32dfb13a0d030ffeb8bef0efe5367eb
-  data.tar.gz: aed9c85c7dc6c65a7bf585867f77344a6617273310bcba784f1a15ca0c932ab8eb9984fe3900c3bbf1d693371e10b8fb58e13a7b7325f23d52c14a5ca363869f
+  metadata.gz: 90eddc66bbd574cf91b55c8c61c7796ad4146612d14c5f72c092643ae03bcacfe0dbda96e6296c9c75051ba99c1880d088d8dd049f7d06bfde4ea5da71c7f658
+  data.tar.gz: 9ca2489faf897835cd19a248c23f500d250ecf95a385873b8ee728ccdef028a47fba38b172870837a0bb94cab5ea924d0bc0e51a9fb77ca6134d907bdc7d24f7

data/README.md

@@ -1,14 +1,30 @@
 Gosu Examples
 =============
 
-This is a collection of Ruby example games for the [Gosu media library](https://libgosu.org/).
+<img src="screenshot.png" width="526">
 
-To run the examples, simply install the `gosu-examples` Ruby gem and then run `gosu-examples` in the terminal.
+This is a collection of Ruby example games for the [Gosu library](https://www.libgosu.org/).
 
-Some examples require the following libraries to be installed:
+(You can find C++ examples in the [main gosu repository](https://github.com/gosu/gosu/tree/master/examples).)
 
-`gem install chipmunk`
-`gem install rmagick`
-`gem install opengl`
+To install and run the `gosu-examples` gem:
 
-(This is a very rough first version of this gem. Feel free to contribute to all parts of this repository via Pull Requests - media files, more examples, cleaning up code... - as long as we can use your contributions under the MIT license.)
+```bash
+gem install gosu-examples
+gosu-examples
+```
+
+You can also [download and unpack this repository](https://github.com/gosu/gosu-examples/archive/master.zip) and then run individual examples from the terminal:
+
+```bash
+cd gosu-examples-master/examples
+ruby tutorial.rb
+```
+
+Some examples require the following additional libraries:
+
+```bash
+gem install chipmunk
+gem install rmagick
+gem install opengl
+```

data/bin/gosu-examples

@@ -10,25 +10,20 @@ $LOAD_PATH << "#{File.dirname __FILE__}/../lib/gosu-examples"
 require 'example'
 require 'sidebar'
 
-Example.load_examples "{.,../features}/*.rb" # TODO - should be *.rb
+Example.load_examples "*.rb"
 
 class ExampleBox < Gosu::Window
-  # TODO - the ExampleWindow should resize to fit once Gosu::Window#resize has been added.
-  # See https://github.com/jlnr/gosu/issues/255
-  EXAMPLE_WIDTH  = 600
-  EXAMPLE_HEIGHT = 600
-  
   def initialize
-    super Sidebar::WIDTH + EXAMPLE_WIDTH, EXAMPLE_HEIGHT, :fullscreen => ARGV.include?('--fullscreen')
+    super Sidebar::WIDTH, Sidebar::HEIGHT, :fullscreen => ARGV.include?('--fullscreen')
     
     @sidebar = Sidebar.new { |example| change_example(example) }
     
     welcome_class = Example.examples.find { |example| example.name =~ /::Welcome$/ }
-    @current_example = welcome_class.new
+    change_example(welcome_class)
   end
   
   def update
-    self.caption = "Gosu Example Box - #{@current_example.caption} (#{Gosu::fps} FPS)"
+    self.caption = "Gosu Example Box - #{@current_example.caption} (#{Gosu.fps} FPS)"
     
     @current_example.update
   end
@@ -36,9 +31,9 @@ class ExampleBox < Gosu::Window
   def draw
     @current_example.draw
     
-    flush
+    Gosu.flush
     
-    translate(EXAMPLE_WIDTH, 0) do
+    Gosu.translate(@current_example.width, 0) do
       current_filename = @current_example.class.source_file
       @sidebar.draw(current_filename)
     end
@@ -46,23 +41,26 @@ class ExampleBox < Gosu::Window
   
   def button_down(id)
     case id
-    when Gosu::KbEscape
+    when Gosu::KB_ESCAPE
       close
-    when char_to_button_id('S')
-      if filename = @current_example.class.source_file then
+    when Gosu.char_to_button_id('E')
+      if filename = @current_example.class.source_file
         open_file_or_folder filename
       end
-    when char_to_button_id('O')
-      if filename = @current_example.class.source_file then
+    when Gosu.char_to_button_id('O')
+      if filename = @current_example.class.source_file
         open_file_or_folder File.dirname(filename)
       end
     else
-      if id == Gosu::MsLeft and mouse_x >= EXAMPLE_WIDTH then
-        @sidebar.click(mouse_x - EXAMPLE_WIDTH, mouse_y)
+      if id == Gosu::MS_LEFT and mouse_x >= @current_example.width
+        @sidebar.click(mouse_x - @current_example.width, mouse_y)
       else
         @current_example.button_down(id)
       end
     end
+    
+    # Call super to enable alt+enter/cmd+F for toggling fullscreen mode.
+    super
   end
   
   def button_up(id)
@@ -76,18 +74,20 @@ class ExampleBox < Gosu::Window
   private
   
   def change_example(example)
-    if @current_example.class != example then
+    if @current_example.class != example
       @current_example = nil
       GC.start
       @current_example = example.new
+      self.width = @current_example.width + Sidebar::WIDTH
+      self.height = @current_example.height
     end
   end
   
   def open_file_or_folder(filename)
-    if RUBY_PLATFORM =~ /darwin[0-9]*$/ then
+    if RUBY_PLATFORM =~ /darwin[0-9]*$/
       `open '#{filename}'`
-    elsif RUBY_PLATFORM =~ /mingw[0-9]*$/ then
-      `explorer '#{filename}'`
+    elsif RUBY_PLATFORM =~ /mingw[0-9]*$/
+      `explorer "#{filename.gsub('/', '\\')}"`
     else
       `xdg-open '#{filename}'`
     end

data/examples/chipmunk_and_rmagick.rb

@@ -13,11 +13,11 @@ require 'rmagick'
 
 # Layering of sprites
 module ZOrder
-  Background, Box = *0..1
+  BACKGROUND, BOX = *0..1
 end
 
-WIDTH = 600
-HEIGHT = 600
+WIDTH = 640
+HEIGHT = 480
 TICK = 1.0/60.0
 NUM_POLYGONS = 80
 NUM_SIDES = 4
@@ -63,7 +63,7 @@ class ChipmunkAndRMagick < (Example rescue Gosu::Window)
       8.times do |j|
         stagger = (j % 2) * 40
         x = i * 80 + stagger
-        y =  j * 70 + 80
+        y = j * 70 + 80
         shape = CP::Shape::Poly.new(body, shape_vertices, CP::Vec2.new(x, y))
         shape.e = 1
         shape.u = 1
@@ -123,7 +123,7 @@ class ChipmunkAndRMagick < (Example rescue Gosu::Window)
   
   # All the updating of the screen is done here.
   def draw
-    @background_image.draw(0, 0, ZOrder::Background)
+    @background_image.draw(0, 0, ZOrder::BACKGROUND)
     @boxes.each { |box| box.draw }
   end
 end
@@ -145,7 +145,7 @@ class Box
   end
   
   def draw
-    @image.draw_rot(@body.p.x, @body.p.y, ZOrder::Box, @body.a.radians_to_gosu)
+    @image.draw_rot(@body.p.x, @body.p.y, ZOrder::BOX, @body.a.radians_to_gosu)
   end
 end
 

data/examples/chipmunk_integration.rb

@@ -12,8 +12,8 @@ require 'rubygems'
 require 'gosu'
 require 'chipmunk'
 
-WIDTH = 600
-HEIGHT = 600
+WIDTH = 640
+HEIGHT = 480
 
 # The number of steps to process every Gosu update
 # The Player ship can get going so fast as to "move through" a
@@ -68,19 +68,19 @@ class Player
   # forward momentum by creating a vector in the direction of the facing
   # and with a magnitude representing the force we want to apply
   def accelerate
-    @shape.body.apply_force((radians_to_vec2(@shape.body.a) * (3000.0/SUBSTEPS)), CP::Vec2.new(0.0, 0.0))
+    @shape.body.apply_force(@shape.body.rot * (3000.0/SUBSTEPS), CP::Vec2.new(0.0, 0.0))
   end
   
   # Apply even more forward force
   # See accelerate for more details
   def boost
-    @shape.body.apply_force((radians_to_vec2(@shape.body.a) * (3000.0)), CP::Vec2.new(0.0, 0.0))
+    @shape.body.apply_force(@shape.body.rot * (3000.0), CP::Vec2.new(0.0, 0.0))
   end
   
   # Apply reverse force
   # See accelerate for more details
   def reverse
-    @shape.body.apply_force(-(radians_to_vec2(@shape.body.a) * (1000.0/SUBSTEPS)), CP::Vec2.new(0.0, 0.0))
+    @shape.body.apply_force(-@shape.body.rot * (1000.0/SUBSTEPS), CP::Vec2.new(0.0, 0.0))
   end
   
   # Wrap to the other side of the screen when we fly off the edge
@@ -92,13 +92,6 @@ class Player
   def draw
     @image.draw_rot(@shape.body.p.x, @shape.body.p.y, ZOrder::Player, @shape.body.a.radians_to_gosu)
   end
-  
-  private
-  
-  # Convenience method for converting from radians to a Vec2 vector.
-  def radians_to_vec2(radians)
-    CP::Vec2.new(Math::cos(radians), Math::sin(radians))
-  end
 end
 
 # See how simple our Star is?
@@ -115,11 +108,11 @@ class Star
     @shape = shape
     @shape.body.p = CP::Vec2.new(rand * WIDTH, rand * HEIGHT) # position
     @shape.body.v = CP::Vec2.new(0.0, 0.0) # velocity
-    @shape.body.a = (3*Math::PI/2.0) # angle in radians; faces towards top of screen
+    @shape.body.a = 0.gosu_to_radians # faces towards top of screen
   end
 
   def draw  
-    img = @animation[Gosu::milliseconds / 100 % @animation.size];
+    img = @animation[Gosu.milliseconds / 100 % @animation.size];
     img.draw(@shape.body.p.x - img.width / 2.0, @shape.body.p.y - img.height / 2.0, ZOrder::Stars, 1, 1, @color, :add)
   end
 end
@@ -226,20 +219,20 @@ class ChipmunkIntegration < (Example rescue Gosu::Window)
       @player.validate_position
       
       # Check keyboard
-      if Gosu::button_down? Gosu::KbLeft
+      if Gosu.button_down? Gosu::KB_LEFT
         @player.turn_left
       end
-      if Gosu::button_down? Gosu::KbRight
+      if Gosu.button_down? Gosu::KB_RIGHT
         @player.turn_right
       end
       
-      if Gosu::button_down? Gosu::KbUp
-        if Gosu::button_down?(Gosu::KbRightShift) or Gosu::button_down?(Gosu::KbLeftShift)
+      if Gosu.button_down? Gosu::KB_UP
+        if Gosu.button_down?(Gosu::KB_RIGHT_SHIFT) or Gosu.button_down?(Gosu::KB_LEFT_SHIFT)
           @player.boost
         else
           @player.accelerate
         end
-      elsif Gosu::button_down? Gosu::KbDown
+      elsif Gosu.button_down? Gosu::KB_DOWN
         @player.reverse
       end
       
@@ -249,7 +242,7 @@ class ChipmunkIntegration < (Example rescue Gosu::Window)
     end
     
     # Each update (not SUBSTEP) we see if we need to add more Stars
-    if rand(100) < 4 and @stars.size < 25 then
+    if rand(100) < 4 and @stars.size < 25
       body = CP::Body.new(0.0001, 0.0001)
       shape = CP::Shape::Circle.new(body, 25/2, CP::Vec2.new(0.0, 0.0))
       shape.collision_type = :star
@@ -269,8 +262,10 @@ class ChipmunkIntegration < (Example rescue Gosu::Window)
   end
 
   def button_down(id)
-    if id == Gosu::KbEscape
+    if id == Gosu::KB_ESCAPE
       close
+    else
+      super
     end
   end
 end

data/examples/cptn_ruby.rb

@@ -30,7 +30,7 @@
 require 'rubygems'
 require 'gosu'
 
-WIDTH, HEIGHT = 600, 600
+WIDTH, HEIGHT = 640, 480
 
 module Tiles
   Grass = 0
@@ -47,7 +47,7 @@ class CollectibleGem
   
   def draw
     # Draw, slowly rotating
-    @image.draw_rot(@x, @y, 0, 25 * Math.sin(Gosu::milliseconds / 133.7))
+    @image.draw_rot(@x, @y, 0, 25 * Math.sin(Gosu.milliseconds / 133.7))
   end
 end
 
@@ -69,7 +69,7 @@ class Player
   
   def draw
     # Flip vertically when facing to the left.
-    if @dir == :left then
+    if @dir == :left
       offs_x = -25
       factor = 1.0
     else
@@ -91,18 +91,18 @@ class Player
     if (move_x == 0)
       @cur_image = @standing
     else
-      @cur_image = (Gosu::milliseconds / 175 % 2 == 0) ? @walk1 : @walk2
+      @cur_image = (Gosu.milliseconds / 175 % 2 == 0) ? @walk1 : @walk2
     end
     if (@vy < 0)
       @cur_image = @jump
     end
     
     # Directional walking, horizontal movement
-    if move_x > 0 then
+    if move_x > 0
       @dir = :right
       move_x.times { if would_fit(1, 0) then @x += 1 end }
     end
-    if move_x < 0 then
+    if move_x < 0
       @dir = :left
       (-move_x).times { if would_fit(-1, 0) then @x -= 1 end }
     end
@@ -112,16 +112,16 @@ class Player
     # jumping curve will be the parabole we want it to be.
     @vy += 1
     # Vertical movement
-    if @vy > 0 then
+    if @vy > 0
       @vy.times { if would_fit(0, 1) then @y += 1 else @vy = 0 end }
     end
-    if @vy < 0 then
+    if @vy < 0
       (-@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
+    if @map.solid?(@x, @y + 1)
       @vy = -20
     end
   end
@@ -202,8 +202,8 @@ class CptnRuby < (Example rescue Gosu::Window)
   
   def update
     move_x = 0
-    move_x -= 5 if Gosu::button_down? Gosu::KbLeft
-    move_x += 5 if Gosu::button_down? Gosu::KbRight
+    move_x -= 5 if Gosu.button_down? Gosu::KB_LEFT
+    move_x += 5 if Gosu.button_down? Gosu::KB_RIGHT
     @cptn.update(move_x)
     @cptn.collect_gems(@map.gems)
     # Scrolling follows player
@@ -213,15 +213,20 @@ class CptnRuby < (Example rescue Gosu::Window)
   
   def draw
     @sky.draw 0, 0, 0
-    Gosu::translate(-@camera_x, -@camera_y) do
+    Gosu.translate(-@camera_x, -@camera_y) do
       @map.draw
       @cptn.draw
     end
   end
   
   def button_down(id)
-    if id == Gosu::KbUp then
+    case id
+    when Gosu::KB_UP
       @cptn.try_to_jump
+    when Gosu::KB_ESCAPE
+      close
+    else
+      super
     end
   end
 end

data/examples/opengl_integration.rb

@@ -9,7 +9,7 @@ require 'rubygems'
 require 'gosu'
 require 'gl'
 
-WIDTH, HEIGHT = 600, 600
+WIDTH, HEIGHT = 640, 480
 
 module ZOrder
   Background, Stars, Player, UI = *0..3
@@ -32,7 +32,7 @@ class GLBackground
   
   def scroll
     @scrolls += 1
-    if @scrolls == SCROLLS_PER_STEP then
+    if @scrolls == SCROLLS_PER_STEP
       @scrolls = 0
       @height_map.shift
       @height_map.push Array.new(POINTS_X) { rand }
@@ -42,7 +42,7 @@ class GLBackground
   def draw(z)
     # gl will execute the given block in a clean OpenGL environment, then reset
     # everything so Gosu's rendering can take place again.
-    Gosu::gl(z) { exec_gl }
+    Gosu.gl(z) { exec_gl }
   end
   
   private
@@ -143,7 +143,7 @@ class Player
   
   def collect_stars(stars)
     stars.reject! do |star|
-      if Gosu::distance(@x, @y, star.x, star.y) < 35 then
+      if Gosu.distance(@x, @y, star.x, star.y) < 35
         @score += 10
         @beep.play
         true
@@ -170,7 +170,7 @@ class Star
   end
 
   def draw  
-    img = @animation[Gosu::milliseconds / 100 % @animation.size];
+    img = @animation[Gosu.milliseconds / 100 % @animation.size];
     img.draw_rot(@x, @y, ZOrder::Stars, @y, 0.5, 0.5, 1, 1, @color, :add)
   end
   
@@ -199,10 +199,10 @@ class OpenGLIntegration < (Example rescue Gosu::Window)
   end
   
   def update
-    @player.move_left if Gosu::button_down? Gosu::KbLeft or Gosu::button_down? Gosu::GpLeft
-    @player.move_right if Gosu::button_down? Gosu::KbRight or Gosu::button_down? Gosu::GpRight
-    @player.accelerate if Gosu::button_down? Gosu::KbUp or Gosu::button_down? Gosu::GpUp
-    @player.brake if Gosu::button_down? Gosu::KbDown or Gosu::button_down? Gosu::GpDown
+    @player.move_left  if Gosu.button_down? Gosu::KB_LEFT  or Gosu.button_down? Gosu::GP_LEFT
+    @player.move_right if Gosu.button_down? Gosu::KB_RIGHT or Gosu.button_down? Gosu::GP_RIGHT
+    @player.accelerate if Gosu.button_down? Gosu::KB_UP    or Gosu.button_down? Gosu::GP_UP
+    @player.brake      if Gosu.button_down? Gosu::KB_DOWN  or Gosu.button_down? Gosu::GP_DOWN
     
     @player.collect_stars(@stars)
     

data/examples/rmagick_integration.rb

@@ -17,7 +17,7 @@ require 'rubygems'
 require 'gosu'
 require 'rmagick'
 
-WIDTH, HEIGHT = 600, 600
+WIDTH, HEIGHT = 640, 480
 
 NULL_PIXEL = Magick::Pixel.from_color('none')
 
@@ -156,7 +156,7 @@ class Player
   end
   
   def draw
-    if dead then
+    if dead
       # Poor, broken soldier.
       @@images[0].draw_rot(x, y, 0, 290 * @dir, 0.5, 0.65, @dir * 0.5, 0.5, @color)
       @@images[2].draw_rot(x, y, 0, 160 * @dir, 0.95, 0.5, 0.5, @dir * 0.5, @color)
@@ -164,7 +164,7 @@ class Player
       # Was moved last frame?
       if @show_walk_anim
         # Yes: Display walking animation.
-        frame = Gosu::milliseconds / 200 % 2
+        frame = Gosu.milliseconds / 200 % 2
       else
         # No: Stand around (boring).
         frame = 0
@@ -185,7 +185,7 @@ class Player
     # Gravity.
     @vy += 1
     
-    if @vy > 1 then
+    if @vy > 1
       # Move upwards until hitting something.
       @vy.times do
         if @window.map.solid?(x, y + 1)
@@ -240,7 +240,7 @@ class Player
   end
   
   def hit_by? missile
-    if Gosu::distance(missile.x, missile.y, x, y) < 30 then
+    if Gosu.distance(missile.x, missile.y, x, y) < 30
       # Was hit :(
       @dead = true
       return true
@@ -260,7 +260,7 @@ class Missile
   
   def initialize(window, x, y, angle)
     # Horizontal/vertical velocity.
-    @vx, @vy = Gosu::offset_x(angle, 20).to_i, Gosu::offset_y(angle, 20).to_i
+    @vx, @vy = Gosu.offset_x(angle, 20).to_i, Gosu.offset_y(angle, 20).to_i
     
     @window, @x, @y = window, x + @vx, y + @vy
   end
@@ -271,7 +271,7 @@ class Missile
     @y += @vy
     @vy += 1
     # Hit anything?
-    if @window.map.solid?(x, y) or @window.objects.any? { |o| o.hit_by?(self) } then
+    if @window.map.solid?(x, y) or @window.objects.any? { |o| o.hit_by?(self) }
       # Create great particles.
       5.times { @window.objects << Particle.new(@window, x - 25 + rand(51), y - 25 + rand(51)) }
       @window.map.blast(x, y)
@@ -285,7 +285,7 @@ class Missile
   
   def draw
     # Just draw a small rectangle.
-    Gosu::draw_rect x-2, y-2, 4, 4, 0xff_800000
+    Gosu.draw_rect x-2, y-2, 4, 4, 0xff_800000
   end
   
   def hit_by?(missile)
@@ -370,7 +370,7 @@ class RMagickIntegration < (Example rescue Gosu::Window)
     cur_text = @player_instructions[@current_player] if not @waiting
     cur_text = @player_won_messages[1 - @current_player] if @players[@current_player].dead
     
-    if cur_text then
+    if cur_text
       x, y = 0, 30
       cur_text.draw(x - 1, y, 0, 1, 1, 0xff_000000)
       cur_text.draw(x + 1, y, 0, 1, 1, 0xff_000000)
@@ -389,22 +389,24 @@ class RMagickIntegration < (Example rescue Gosu::Window)
     @objects.reject! { |o| o.update == false }
 
     # If it's a player's turn, forward controls.
-    if not @waiting and not @players[@current_player].dead then
+    if not @waiting and not @players[@current_player].dead
       player = @players[@current_player]
-      player.aim_up       if Gosu::button_down? Gosu::KbUp
-      player.aim_down     if Gosu::button_down? Gosu::KbDown
-      player.try_walk(-1) if Gosu::button_down? Gosu::KbLeft
-      player.try_walk(+1) if Gosu::button_down? Gosu::KbRight
-      player.try_jump     if Gosu::button_down? Gosu::KbReturn
+      player.aim_up       if Gosu.button_down? Gosu::KB_UP
+      player.aim_down     if Gosu.button_down? Gosu::KB_DOWN
+      player.try_walk(-1) if Gosu.button_down? Gosu::KB_LEFT
+      player.try_walk(+1) if Gosu.button_down? Gosu::KB_RIGHT
+      player.try_jump     if Gosu.button_down? Gosu::KB_RETURN
     end
   end
   
   def button_down(id)
-    if id == Gosu::KbSpace and not @waiting and not @players[@current_player].dead then
+    if id == Gosu::KB_SPACE and not @waiting and not @players[@current_player].dead
       # Shoot! This is handled in button_down because holding space shouldn't auto-fire.
       @players[@current_player].shoot
       @current_player = 1 - @current_player
       @waiting = true
+    else
+      super
     end
   end
 end

data/examples/tutorial.rb

@@ -3,10 +3,8 @@
 require 'rubygems'
 require 'gosu'
 
-WIDTH, HEIGHT = 600, 600
-
 module ZOrder
-  Background, Stars, Player, UI = *0..3
+  BACKGROUND, STARS, PLAYER, UI = *0..3
 end
 
 class Player
@@ -32,27 +30,27 @@ class Player
   end
   
   def accelerate
-    @vel_x += Gosu::offset_x(@angle, 0.5)
-    @vel_y += Gosu::offset_y(@angle, 0.5)
+    @vel_x += Gosu.offset_x(@angle, 0.5)
+    @vel_y += Gosu.offset_y(@angle, 0.5)
   end
   
   def move
     @x += @vel_x
     @y += @vel_y
-    @x %= WIDTH
-    @y %= HEIGHT
+    @x %= 640
+    @y %= 480
     
     @vel_x *= 0.95
     @vel_y *= 0.95
   end
   
   def draw
-    @image.draw_rot(@x, @y, ZOrder::Player, @angle)
+    @image.draw_rot(@x, @y, ZOrder::PLAYER, @angle)
   end
   
   def collect_stars(stars)
     stars.reject! do |star|
-      if Gosu::distance(@x, @y, star.x, star.y) < 35 then
+      if Gosu.distance(@x, @y, star.x, star.y) < 35
         @score += 10
         @beep.play
         true
@@ -68,25 +66,24 @@ class Star
   
   def initialize(animation)
     @animation = animation
-    @color = Gosu::Color.new(0xff_000000)
+    @color = Gosu::Color::BLACK.dup
     @color.red = rand(256 - 40) + 40
     @color.green = rand(256 - 40) + 40
     @color.blue = rand(256 - 40) + 40
-    @x = rand * WIDTH
-    @y = rand * HEIGHT
+    @x = rand * 640
+    @y = rand * 480
   end
   
   def draw
-    img = @animation[Gosu::milliseconds / 100 % @animation.size]
+    img = @animation[Gosu.milliseconds / 100 % @animation.size]
     img.draw(@x - img.width / 2.0, @y - img.height / 2.0,
-        ZOrder::Stars, 1, 1, @color, :add)
+        ZOrder::STARS, 1, 1, @color, :add)
   end
 end
 
 class Tutorial < (Example rescue Gosu::Window)
   def initialize
-    super WIDTH, HEIGHT
-    
+    super 640, 480
     self.caption = "Tutorial Game"
     
     @background_image = Gosu::Image.new("media/space.png", :tileable => true)
@@ -101,28 +98,36 @@ class Tutorial < (Example rescue Gosu::Window)
   end
   
   def update
-    if Gosu::button_down? Gosu::KbLeft or Gosu::button_down? Gosu::GpLeft then
+    if Gosu.button_down? Gosu::KB_LEFT or Gosu.button_down? Gosu::GP_LEFT
       @player.turn_left
     end
-    if Gosu::button_down? Gosu::KbRight or Gosu::button_down? Gosu::GpRight then
+    if Gosu.button_down? Gosu::KB_RIGHT or Gosu.button_down? Gosu::GP_RIGHT
       @player.turn_right
     end
-    if Gosu::button_down? Gosu::KbUp or Gosu::button_down? Gosu::GpButton0 then
+    if Gosu.button_down? Gosu::KB_UP or Gosu.button_down? Gosu::GP_BUTTON_0
       @player.accelerate
     end
     @player.move
     @player.collect_stars(@stars)
     
-    if rand(100) < 4 and @stars.size < 25 then
+    if rand(100) < 4 and @stars.size < 25
       @stars.push(Star.new(@star_anim))
     end
   end
   
   def draw
-    @background_image.draw(0, 0, ZOrder::Background)
+    @background_image.draw(0, 0, ZOrder::BACKGROUND)
     @player.draw
     @stars.each { |star| star.draw }
-    @font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xff_ffff00)
+    @font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, Gosu::Color::YELLOW)
+  end
+  
+  def button_down(id)
+    if id == Gosu::KB_ESCAPE
+      close
+    else
+      super
+    end
   end
 end
 

data/examples/welcome.rb

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'gosu'
 
-WIDTH, HEIGHT = 600, 600
+WIDTH, HEIGHT = 640, 480
 
 class Welcome < (Example rescue Gosu::Window)
   PADDING = 20
@@ -20,11 +20,12 @@ class Welcome < (Example rescue Gosu::Window)
       
       Every example can be run both from this tool <i>and</i> from the terminal/command line as a stand-alone Ruby script.
       
-      Shortcuts:
+      Keyboard shortcuts:
       
-      • To see the source code of an example or feature demo, press <b>S</b>.
+      • To see the source code of an example or feature demo, press <b>E</b>.
       • To open the ‘examples’ folder, press <b>O</b>.
-      • To quit this tool, press <b>Esc</b>. This is useful if you are running in fullscreen mode. ($ gosu-examples --fullscreen)
+      • To quit this tool, press <b>Esc</b>.
+      • To toggle fullscreen mode, press <b>Alt+Enter</b> (Windows, Linux) or <b>cmd+F</b> (macOS).
       
       Why not take a look at the code for this example right now? Simply press <b>S</b>."
     
@@ -46,8 +47,8 @@ class Welcome < (Example rescue Gosu::Window)
     # Disregard the math in this method, it doesn't look as good as I thought it
     # would. =(
     
-    angle = Gosu::milliseconds / 50.0
-    scale = (Gosu::milliseconds % 1000) / 1000.0
+    angle = Gosu.milliseconds / 50.0
+    scale = (Gosu.milliseconds % 1000) / 1000.0
     
     [1, 0].each do |extra_scale|
       @background.draw_rot WIDTH * 0.5, HEIGHT * 0.75, 0, angle, 0.5, 0.5,

data/lib/gosu-examples/example.rb

@@ -17,24 +17,11 @@ class Example
   
   def button_up(id)
   end
-end
-
-class Feature < Example
-  def self.inherited(subclass)
-    @@features ||= {}
-    @@features[subclass] = self.current_source_file
-  end
   
-  def self.features
-    @@features.keys
+  def close
+    # no-op, examples cannot close the containing window.
   end
-  
-  def self.source_file
-    @@examples[self]
-  end
-end
 
-class Example
   def self.current_source_file
     @current_source_file
   end
@@ -49,7 +36,7 @@ class Example
   end
   
   def self.examples
-    @@examples.keys - [Feature]
+    @@examples.keys
   end
   
   def self.source_file
@@ -59,18 +46,14 @@ class Example
   def self.load_examples(pattern)
     Dir.glob(pattern) do |file| 
       begin
-        # Remember that all examples and features being loaded now must come from the
-        # next file.
-        #
+        # Remember which file we are loading.
         Example.current_source_file = File.expand_path(file)
 
-        # Load the example/feature in a sandbox module (second parameter). This way,
-        # several examples can define a Player class without colliding.
-        # 
-        # load() does not let us refer to the anonymous module it creates, but we
-        # can enumerate all loaded examples and features using Example.examples and
-        # Feature.features afterwards.
+        # Load the example in a sandbox module (second parameter to load()). This way, examples can
+        # define classes and constants with the same names, and they will not collide.
         # 
+        # load() does not let us refer to the anonymous module it creates, but we can enumerate all
+        # loaded examples using Example.examples thanks to the "inherited" callback above.
         load file, true
       rescue Exception => e
         puts "*** Cannot load #{file}:"

data/lib/gosu-examples/sidebar.rb

@@ -1,13 +1,13 @@
 class Sidebar
-  WIDTH = 213
+  WIDTH = 300
   HEIGHT = 600
   FONT = Gosu::Font.new(20)
-  HEADER = Gosu::Image.new("media/header.psd", :tileable => true)
+  HEADER = Gosu::Image.new("media/header@2x.psd", :tileable => true)
   
   class Button
     HEIGHT = 25
     SPACING = 5
-    TOP_Y = HEADER.height + 15
+    TOP_Y = HEADER.height / 2 + 15
     
     attr_reader :filename
     
@@ -19,7 +19,7 @@ class Sidebar
       text_color = Gosu::Color::BLACK
       
       if is_current
-        Gosu::draw_rect 0, @top, Sidebar::WIDTH, HEIGHT, 0xff_1565e5 if is_current
+        Gosu.draw_rect 0, @top, Sidebar::WIDTH, HEIGHT, 0xff_1565e5 if is_current
         text_color = Gosu::Color::WHITE
       end
       
@@ -44,8 +44,8 @@ class Sidebar
   end
   
   def draw(current_filename)
-    Gosu::draw_rect 0, 0, WIDTH, HEIGHT, Gosu::Color::WHITE
-    HEADER.draw 0, 0, 0
+    Gosu.draw_rect 0, 0, WIDTH, HEIGHT, Gosu::Color::WHITE
+    HEADER.draw 0, 0, 0, 0.5, 0.5
     
     @buttons.each do |button|
       is_current = (button.filename == current_filename)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gosu-examples
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 description: The `gosu-examples` tool provides an easy way to run and inspect example
   games written for the Gosu game development library.
 email: julian@raschke.de
@@ -32,18 +32,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/gosu-examples
 - LICENSE
 - README.md
-- lib/gosu-examples/example.rb
-- lib/gosu-examples/sidebar.rb
+- bin/gosu-examples
 - examples/chipmunk_and_rmagick.rb
 - examples/chipmunk_integration.rb
 - examples/cptn_ruby.rb
-- examples/opengl_integration.rb
-- examples/rmagick_integration.rb
-- examples/tutorial.rb
-- examples/welcome.rb
+- examples/media/BrokenPNG.png
+- examples/media/Cursor.png
+- examples/media/JingleBells.mp3
+- examples/media/JingleBells.ogg
+- examples/media/Loop.wav
+- examples/media/Sample.wav
+- examples/media/SquareTexture.png
+- examples/media/Wallpaper.png
+- examples/media/WallpaperXXL.png
+- examples/media/WhiteAlpha.png
 - examples/media/audio_formats/aiff_32bit_float.aiff
 - examples/media/audio_formats/au_16bit_pcm.au
 - examples/media/audio_formats/caf_be_16bit_44khz.caf
@@ -58,33 +62,29 @@ files:
 - examples/media/audio_formats/wav_32bit_pcm.wav
 - examples/media/audio_formats/wav_4bit_ms_adpcm.wav
 - examples/media/beep.wav
-- examples/media/BrokenPNG.png
 - examples/media/cptn_ruby.png
 - examples/media/cptn_ruby_map.txt
-- examples/media/Cursor.png
 - examples/media/earth.png
 - examples/media/explosion.wav
 - examples/media/gem.png
-- examples/media/header.psd
+- examples/media/header@2x.psd
 - examples/media/image_formats/test.jpg
 - examples/media/image_formats/test.psd
-- examples/media/JingleBells.mp3
-- examples/media/JingleBells.ogg
 - examples/media/landscape.svg
 - examples/media/large_star.png
-- examples/media/Loop.wav
-- examples/media/Sample.wav
 - examples/media/smoke.png
 - examples/media/soldier.png
 - examples/media/space.png
-- examples/media/SquareTexture.png
 - examples/media/star.png
 - examples/media/starfighter.bmp
 - examples/media/tileset.png
 - examples/media/vera.ttf
-- examples/media/Wallpaper.png
-- examples/media/WallpaperXXL.png
-- examples/media/WhiteAlpha.png
+- examples/opengl_integration.rb
+- examples/rmagick_integration.rb
+- examples/tutorial.rb
+- examples/welcome.rb
+- lib/gosu-examples/example.rb
+- lib/gosu-examples/sidebar.rb
 homepage: http://www.libgosu.org/
 licenses: []
 metadata: {}
@@ -94,19 +94,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby examples for the Gosu library
 test_files: []
-has_rdoc: