gosu 0.8.7.2-x64-mingw32 → 0.9.0-x64-mingw32

data/lib/gosu/preview.rb

@@ -1,143 +1,10 @@
-require 'gosu'
-
-# Wrapper around Gosu 0.4-0.8 that provides the work-in-progress 0.9 interface
+warn "gosu/preview.rb has been removed in Gosu 0.9.0, and Gosu itself \n" +
+  "provides a similar interface to what preview.rb used to offer.\n" +
+  "Notable differences:\n" +
+  "• no global $window variable\n" +
+  "• no global Gosu.mouse_x and Gosu.mouse_y functions\n" +
+  "• Image#initialize et.al. use an options hash now\n" +
+  "If you cannot update your code base right now, you should require \n" +
+  "Gosu 0.8.x in your Gemfile: gem 'gosu', '~> 0.8.0'";
 
-module Gosu
-  class Font
-    alias :initialize_old :initialize
-    
-    def initialize *args
-      if args.first.is_a? Gosu::Window then
-        initialize_old *args
-      else
-        height  = args[0]
-        options = args[1] || {}
-        name = options[:name] || Gosu::default_font_name
-        initialize_old $window, name, height
-      end
-    end
-  end
-  
-  class Window
-    alias :initialize_old :initialize
-    
-    def initialize width, height, *args
-      if args.empty? or args.first.is_a? Hash then
-       options = args.first || {}
-       fullscreen = !!options[:fullscreen]
-       update_interval = options[:update_interval] || 16.66
-      else
-       fullscreen, update_interval = *args
-      end
-      $window = initialize_old width, height, fullscreen, update_interval
-    end
-  end
-  
-  class Image
-    alias :initialize_old :initialize
-    
-    def initialize *args
-      if args.first.is_a? Gosu::Window then
-        initialize_old *args
-      else
-        source = args[0]
-        tileable = !args[1] || args[1][:tileable]
-        rect = args[1] && args[1][:rect]
-        if rect then
-          initialize_old $window, source, !!tileable, *rect
-        else
-          initialize_old $window, source, !!tileable
-        end
-      end
-    end
-    
-    class <<self
-      alias load_tiles_old load_tiles
-    end
-    
-    def self.load_tiles *args
-      if args.first.is_a? Gosu::Window then
-        load_tiles_old *args
-      else
-        source = args[0]
-        x, y = args[1..2]
-        tileable = !args[3] || args[3][:tileable]
-        load_tiles_old $window, source, x, y, !!tileable
-      end
-    end
-    
-    def self.from_text *args
-      if args.first.is_a? Gosu::Window then
-        args.size == 4 ? from_text4(*args) : from_text7(*args)
-      else
-        text      = args[0]
-        height    = args[1]
-        options   = args[2] || {}
-        font      = options[:font]    || Gosu::default_font_name
-        if width  = options[:width] then
-          spacing = options[:spacing] || 0
-          align   = options[:align]   || :left
-          Gosu::Image.from_text7 $window, text, font, height, spacing, width, align
-        else
-          Gosu::Image.from_text4 $window, text, font, height
-        end
-      end
-    end
-  end
-  
-  def self.button_down? id
-    $window.button_down? id
-  end
-  
-  def self.mouse_x
-    $window.mouse_x
-  end
-  
-  def self.mouse_y
-    $window.mouse_y
-  end
-  
-  def self.draw_line *args
-    $window.draw_line *args
-  end
-  
-  def self.draw_triangle *args
-    $window.draw_triangle *args
-  end
-  
-  def self.draw_quad *args
-    $window.draw_quad *args
-  end
-  
-  def self.draw_rect x, y, width, height, color = 0xffffffff, z = 0, mode = :default
-    $window.draw_quad x, y, color, x + width, y, color, x, y + height, color, x + width, y + height, color, z, mode
-  end
-  
-  def self.clip_to *args, &draw
-    $window.clip_to *args, &draw
-  end
-  
-  def self.translate *args, &draw
-    $window.translate *args, &draw
-  end
-  
-  def self.scale *args, &draw
-    $window.scale *args, &draw
-  end
-  
-  def self.rotate *args, &draw
-    $window.rotate *args, &draw
-  end
-  
-  def self.transform *args, &draw
-    $window.transform *args, &draw
-  end
-  
-  def self.record width, height, &draw
-    $window.record width, height, &draw
-  end
-  
-  def self.gl *args, &draw
-    $window.gl *args, &draw
-  end
-end
+require 'gosu'

data/lib/gosu/swig_patches.rb

@@ -6,6 +6,19 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
+  alias initialize_without_hash initialize
+  
+  def initialize width, height, *args
+    if args.empty? or args.first.is_a? Hash then
+      options = args.first || {}
+      fullscreen = options[:fullscreen]
+      update_interval = options[:update_interval]
+    else
+      fullscreen, update_interval = *args
+    end
+    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666
+  end
+  
   %w(update draw needs_redraw? needs_cursor?
      lose_focus button_down button_up).each do |callback|
     define_method "protected_#{callback}" do |*args|
@@ -27,12 +40,6 @@ class Gosu::Window
     $gosu_gl_blocks = nil
   end
   
-  def gl(*args, &block)
-    $gosu_gl_blocks ||= []
-    $gosu_gl_blocks << block
-    unsafe_gl(*args, &block)
-  end
-  
   alias show_internal show
   def show
     show_internal
@@ -47,10 +54,13 @@ class Gosu::Window
   end
 end
 
-# SWIG doesn't understand the C++ overloading, so we need this simple check in Ruby.
-class Gosu::Image
-  def self.from_text(*args)
-    args.size == 4 ? from_text4(*args) : from_text7(*args)
+module Gosu
+  # Keep a reference to these blocks that is only cleared after Window#draw.
+  # Otherwise, the GC might free these blocks while Gosu is still rendering.
+  def self.gl(*args, &block)
+    $gosu_gl_blocks ||= []
+    $gosu_gl_blocks << block
+    unsafe_gl(*args, &block)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.8.7.2
+  version: 0.9.0
 platform: x64-mingw32
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -50,29 +50,6 @@ files:
 - Gosu/Version.hpp
 - Gosu/WinUtility.hpp
 - Gosu/Window.hpp
-- examples/ChipmunkIntegration.rb
-- examples/CptnRuby.rb
-- examples/GosuZen.rb
-- examples/MoreChipmunkAndRMagick.rb
-- examples/OpenGLIntegration.rb
-- examples/RMagickIntegration.rb
-- examples/TextInput.rb
-- examples/Tutorial.rb
-- examples/media/Beep.wav
-- examples/media/CptnRuby Gem.png
-- examples/media/CptnRuby Map.txt
-- examples/media/CptnRuby Tileset.png
-- examples/media/CptnRuby.png
-- examples/media/Cursor.png
-- examples/media/Earth.png
-- examples/media/Explosion.wav
-- examples/media/Landscape.svg
-- examples/media/LargeStar.png
-- examples/media/Smoke.png
-- examples/media/Soldier.png
-- examples/media/Space.png
-- examples/media/Star.png
-- examples/media/Starfighter.bmp
 - lib/gosu.rb
 - lib/gosu/patches.rb
 - lib/gosu/preview.rb
@@ -103,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 2D game development library.

data/examples/ChipmunkIntegration.rb

@@ -1,275 +0,0 @@
-## File: ChipmunkIntegration.rb
-## Author: Dirk Johnson
-## Version: 1.0.0
-## Date: 2007-10-05
-## License: Same as for Gosu (MIT)
-## Comments: Based on the Gosu Ruby Tutorial, but incorporating the Chipmunk Physics Engine
-## See https://github.com/jlnr/gosu/wiki/Ruby-Chipmunk-Integration for the accompanying text.
-
-require 'rubygems'
-require 'gosu'
-require 'chipmunk'
-
-SCREEN_WIDTH = 640
-SCREEN_HEIGHT = 480
-
-# The number of steps to process every Gosu update
-# The Player ship can get going so fast as to "move through" a
-# star without triggering a collision; an increased number of
-# Chipmunk step calls per update will effectively avoid this issue
-SUBSTEPS = 6
-
-# Convenience method for converting from radians to a Vec2 vector.
-class Numeric
-  def radians_to_vec2
-    CP::Vec2.new(Math::cos(self), Math::sin(self))
-  end
-end
-
-# Layering of sprites
-module ZOrder
-  Background, Stars, Player, UI = *0..3
-end
-
-# This game will have one Player in the form of a ship
-class Player
-  attr_reader :shape
-
-  def initialize(window, shape)
-    @image = Gosu::Image.new(window, "media/Starfighter.bmp", false)
-    @shape = shape
-    @shape.body.p = CP::Vec2.new(0.0, 0.0) # position
-    @shape.body.v = CP::Vec2.new(0.0, 0.0) # velocity
-    
-    # Keep in mind that down the screen is positive y, which means that PI/2 radians,
-    # which you might consider the top in the traditional Trig unit circle sense is actually
-    # the bottom; thus 3PI/2 is the top
-    @shape.body.a = (3*Math::PI/2.0) # angle in radians; faces towards top of screen
-  end
-  
-  # Directly set the position of our Player
-  def warp(vect)
-    @shape.body.p = vect
-  end
-  
-  # Apply negative Torque; Chipmunk will do the rest
-  # SUBSTEPS is used as a divisor to keep turning rate constant
-  # even if the number of steps per update are adjusted
-  def turn_left
-    @shape.body.t -= 400.0/SUBSTEPS
-  end
-  
-  # Apply positive Torque; Chipmunk will do the rest
-  # SUBSTEPS is used as a divisor to keep turning rate constant
-  # even if the number of steps per update are adjusted
-  def turn_right
-    @shape.body.t += 400.0/SUBSTEPS
-  end
-  
-  # Apply forward force; Chipmunk will do the rest
-  # SUBSTEPS is used as a divisor to keep acceleration rate constant
-  # even if the number of steps per update are adjusted
-  # Here we must convert the angle (facing) of the body into
-  # 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((@shape.body.a.radians_to_vec2 * (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((@shape.body.a.radians_to_vec2 * (3000.0)), CP::Vec2.new(0.0, 0.0))
-  end
-  
-  # Apply reverse force
-  # See accelerate for more details
-  def reverse
-    @shape.body.apply_force(-(@shape.body.a.radians_to_vec2 * (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
-  def validate_position
-    l_position = CP::Vec2.new(@shape.body.p.x % SCREEN_WIDTH, @shape.body.p.y % SCREEN_HEIGHT)
-    @shape.body.p = l_position
-  end
-  
-  def draw
-    @image.draw_rot(@shape.body.p.x, @shape.body.p.y, ZOrder::Player, @shape.body.a.radians_to_gosu)
-  end
-end
-
-# See how simple our Star is?
-# Of course... it just sits around and looks good...
-class Star
-  attr_reader :shape
-  
-  def initialize(animation, shape)
-    @animation = animation
-    @color = Gosu::Color.new(0xff000000)
-    @color.red = rand(255 - 40) + 40
-    @color.green = rand(255 - 40) + 40
-    @color.blue = rand(255 - 40) + 40
-    @shape = shape
-    @shape.body.p = CP::Vec2.new(rand * SCREEN_WIDTH, rand * SCREEN_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
-  end
-
-  def draw  
-    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
-
-# The Gosu::Window is always the "environment" of our game
-# It also provides the pulse of our game
-class GameWindow < Gosu::Window
-  def initialize
-    super(SCREEN_WIDTH, SCREEN_HEIGHT, false, 16)
-    self.caption = "Gosu & Chipmunk Integration Demo"
-    @background_image = Gosu::Image.new(self, "media/Space.png", true)
-
-    # Put the beep here, as it is the environment now that determines collision
-    @beep = Gosu::Sample.new(self, "media/Beep.wav")
-    
-    # Put the score here, as it is the environment that tracks this now
-    @score = 0
-    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
-    
-    # Time increment over which to apply a physics "step" ("delta t")
-    @dt = (1.0/60.0)
-    
-    # Create our Space and set its damping
-    # A damping of 0.8 causes the ship bleed off its force and torque over time
-    # This is not realistic behavior in a vacuum of space, but it gives the game
-    # the feel I'd like in this situation
-    @space = CP::Space.new
-    @space.damping = 0.8    
-    
-    # Create the Body for the Player
-    body = CP::Body.new(10.0, 150.0)
-    
-    # In order to create a shape, we must first define it
-    # Chipmunk defines 3 types of Shapes: Segments, Circles and Polys
-    # We'll use s simple, 4 sided Poly for our Player (ship)
-    # You need to define the vectors so that the "top" of the Shape is towards 0 radians (the right)
-    shape_array = [CP::Vec2.new(-25.0, -25.0), CP::Vec2.new(-25.0, 25.0), CP::Vec2.new(25.0, 1.0), CP::Vec2.new(25.0, -1.0)]
-    shape = CP::Shape::Poly.new(body, shape_array, CP::Vec2.new(0,0))
-    
-    # The collision_type of a shape allows us to set up special collision behavior
-    # based on these types.  The actual value for the collision_type is arbitrary
-    # and, as long as it is consistent, will work for us; of course, it helps to have it make sense
-    shape.collision_type = :ship
-    
-    @space.add_body(body)
-    @space.add_shape(shape)
-
-    @player = Player.new(self, shape)
-    @player.warp(CP::Vec2.new(320, 240)) # move to the center of the window
-    
-    @star_anim = Gosu::Image::load_tiles(self, "media/Star.png", 25, 25, false)
-    @stars = Array.new
-        
-    # Here we define what is supposed to happen when a Player (ship) collides with a Star
-    # I create a @remove_shapes array because we cannot remove either Shapes or Bodies
-    # from Space within a collision closure, rather, we have to wait till the closure
-    # is through executing, then we can remove the Shapes and Bodies
-    # In this case, the Shapes and the Bodies they own are removed in the Gosu::Window.update phase
-    # by iterating over the @remove_shapes array
-    # Also note that both Shapes involved in the collision are passed into the closure
-    # in the same order that their collision_types are defined in the add_collision_func call
-    @remove_shapes = []
-    @space.add_collision_func(:ship, :star) do |ship_shape, star_shape|
-      @score += 10
-      @beep.play
-      @remove_shapes << star_shape
-    end
-    
-    # Here we tell Space that we don't want one star bumping into another
-    # The reason we need to do this is because when the Player hits a Star,
-    # the Star will travel until it is removed in the update cycle below
-    # which means it may collide and therefore push other Stars
-    # To see the effect, remove this line and play the game, every once in a while
-    # you'll see a Star moving
-    @space.add_collision_func(:star, :star, &nil)
-  end
-
-  def update
-    # Step the physics environment SUBSTEPS times each update
-    SUBSTEPS.times do
-      # This iterator makes an assumption of one Shape per Star making it safe to remove
-      # each Shape's Body as it comes up
-      # If our Stars had multiple Shapes, as would be required if we were to meticulously
-      # define their true boundaries, we couldn't do this as we would remove the Body
-      # multiple times
-      # We would probably solve this by creating a separate @remove_bodies array to remove the Bodies
-      # of the Stars that were gathered by the Player
-      @remove_shapes.each do |shape|
-        @stars.delete_if { |star| star.shape == shape }
-        @space.remove_body(shape.body)
-        @space.remove_shape(shape)
-      end
-      @remove_shapes.clear # clear out the shapes for next pass
-      
-      # When a force or torque is set on a Body, it is cumulative
-      # This means that the force you applied last SUBSTEP will compound with the
-      # force applied this SUBSTEP; which is probably not the behavior you want
-      # We reset the forces on the Player each SUBSTEP for this reason
-      @player.shape.body.reset_forces
-      
-      # Wrap around the screen to the other side
-      @player.validate_position
-      
-      # Check keyboard
-      if button_down? Gosu::KbLeft
-        @player.turn_left
-      end
-      if button_down? Gosu::KbRight
-        @player.turn_right
-      end
-      
-      if button_down? Gosu::KbUp
-        if ( (button_down? Gosu::KbRightShift) || (button_down? Gosu::KbLeftShift) )
-          @player.boost
-        else
-          @player.accelerate
-        end
-      elsif button_down? Gosu::KbDown
-        @player.reverse
-      end
-      
-      # Perform the step over @dt period of time
-      # For best performance @dt should remain consistent for the game
-      @space.step(@dt)
-    end
-    
-    # Each update (not SUBSTEP) we see if we need to add more Stars
-    if rand(100) < 4 and @stars.size < 25 then
-      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
-      
-      @space.add_body(body)
-      @space.add_shape(shape)
-      
-      @stars.push(Star.new(@star_anim, shape))
-    end
-  end
-
-  def draw
-    @background_image.draw(0, 0, ZOrder::Background)
-    @player.draw
-    @stars.each { |star| star.draw }
-    @font.draw("Score: #{@score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffffff00)
-  end
-
-  def button_down(id)
-    if id == Gosu::KbEscape
-      close
-    end
-  end
-end
-
-window = GameWindow.new
-window.show