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

data/examples/media/Landscape.svg

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" clip-rule="evenodd" stroke-miterlimit="10" viewBox="0 0 850.39 637.80">
-    <desc>SVG generated by Lineform</desc>
-    <defs/>
-    <g>
-        <rect width="940.00" height="734.00" x="-25.50" y="-55.50" fill="#5FB7FF" stroke="#000000" stroke-width="2.20"/>
-        <path d="M 223.50 49.00 C 171.16 49.00 118.84 59.51 78.91 80.50 C -0.96 122.48 -0.96 190.52 78.91 232.50 C 134.24 261.59 213.37 270.50 283.34 259.28 C 350.32 290.78 452.18 289.47 516.06 255.19 C 582.65 219.45 582.65 161.55 516.06 125.81 C 482.95 108.04 439.59 99.12 396.19 99.03 C 388.26 92.46 378.99 86.23 368.09 80.50 C 328.16 59.51 275.84 49.00 223.50 49.00 Z M 223.50 49.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
-        <path d="M 735.48 183.00 C 699.52 183.00 663.55 187.05 636.11 195.16 C 607.54 203.59 593.99 214.76 595.17 225.81 C 561.74 227.76 529.60 233.37 503.83 242.72 C 438.71 266.35 438.71 304.65 503.83 328.28 C 568.96 351.91 674.56 351.91 739.69 328.28 C 787.65 310.88 800.17 285.50 777.48 263.91 C 798.41 261.97 818.28 258.74 834.86 253.84 C 889.73 237.64 889.73 211.36 834.86 195.16 C 807.42 187.05 771.44 183.00 735.48 183.00 Z M 735.48 183.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" clip-rule="evenodd" stroke-miterlimit="10" viewBox="0 0 850.39 637.80">
+    <desc>SVG generated by Lineform</desc>
+    <defs/>
+    <g>
+        <rect width="940.00" height="734.00" x="-25.50" y="-55.50" fill="#5FB7FF" stroke="#000000" stroke-width="2.20"/>
+        <path d="M 223.50 49.00 C 171.16 49.00 118.84 59.51 78.91 80.50 C -0.96 122.48 -0.96 190.52 78.91 232.50 C 134.24 261.59 213.37 270.50 283.34 259.28 C 350.32 290.78 452.18 289.47 516.06 255.19 C 582.65 219.45 582.65 161.55 516.06 125.81 C 482.95 108.04 439.59 99.12 396.19 99.03 C 388.26 92.46 378.99 86.23 368.09 80.50 C 328.16 59.51 275.84 49.00 223.50 49.00 Z M 223.50 49.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
+        <path d="M 735.48 183.00 C 699.52 183.00 663.55 187.05 636.11 195.16 C 607.54 203.59 593.99 214.76 595.17 225.81 C 561.74 227.76 529.60 233.37 503.83 242.72 C 438.71 266.35 438.71 304.65 503.83 328.28 C 568.96 351.91 674.56 351.91 739.69 328.28 C 787.65 310.88 800.17 285.50 777.48 263.91 C 798.41 261.97 818.28 258.74 834.86 253.84 C 889.73 237.64 889.73 211.36 834.86 195.16 C 807.42 187.05 771.44 183.00 735.48 183.00 Z M 735.48 183.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
+    </g>
 </svg>

data/lib/gosu.rb

@@ -1,16 +1,19 @@
-require 'rbconfig'
-
-if RUBY_PLATFORM =~ /mswin|mingw32|mingw64|win32\-|\-win32/ then
-  # Add this gem to the PATH on Windows so that DLLs can be found
-  ENV['PATH'] = "#{File.dirname(__FILE__)};#{ENV['PATH']}"
-end
-
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/gosu.#{RbConfig::CONFIG['DLEXT']}"
-rescue LoadError
-  require "gosu.#{RbConfig::CONFIG['DLEXT']}"
-end
-
-require "gosu/swig_patches"
-require "gosu/patches"
+require 'rbconfig'
+
+if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/ then
+  binary_path = File.dirname(__FILE__)
+  # 64-bit builds of Windows use "x64-mingw32" as RUBY_PLATFORM
+  binary_path += '64' if RUBY_PLATFORM =~ /^x64-/
+  
+  # Add this gem to the PATH on Windows so that bundled DLLs can be found.
+  ENV['PATH'] = "#{binary_path};#{ENV['PATH']}"
+  
+  # Add the correct directory 
+  RUBY_VERSION =~ /(\d+.\d+)/
+  $LOAD_PATH.unshift "#{binary_path}/#{$1}"
+end
+
+require "gosu.#{RbConfig::CONFIG['DLEXT']}"
+
+require "gosu/swig_patches"
+require "gosu/patches"

data/lib/gosu/patches.rb

@@ -1,81 +1,81 @@
-# Extend Numeric with simple angle conversion methods.
-class ::Numeric
-  def degrees_to_radians
-    self * Math::PI / 180.0
-  end
-  def radians_to_degrees
-    self * 180.0 / Math::PI
-  end
-  def gosu_to_radians
-    (self - 90) * Math::PI / 180.0
-  end
-  def radians_to_gosu
-    self * 180.0 / Math::PI + 90
-  end
-end
-    
-# Backwards compatibility: import constants into Gosu::Button.
-module Gosu::Button
-  Gosu.constants.each { |c| const_set(c, Gosu.const_get(c)) }
-end
-
-# Backwards compatibility: Window arguments to Sample and Song
-class Gosu::Sample
-  alias initialize_ initialize
-  
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_(*args)
-  end
-end
-class Gosu::Song
-  alias initialize_ initialize
-  
-  def initialize(*args)
-    args.shift if args.first.is_a? Gosu::Window
-    initialize_(*args)
-  end
-end
-
-# Color constants (SWIG messes up constants somehow)
-class Gosu::Color
-  class Constant < Gosu::Color
-  private
-    def alpha=; end
-    def red=; end
-    def green=; end
-    def blue=; end
-    def hue=; end
-    def saturation=; end
-    def value=; end
-  end
-  
-  NONE    = Gosu::Color::Constant.argb(0x00000000)
-  BLACK   = Gosu::Color::Constant.argb(0xff000000)
-  GRAY    = Gosu::Color::Constant.argb(0xff808080)
-  WHITE   = Gosu::Color::Constant.argb(0xffffffff)            
-  AQUA    = Gosu::Color::Constant.argb(0xff00ffff)
-  RED     = Gosu::Color::Constant.argb(0xffff0000)
-  GREEN   = Gosu::Color::Constant.argb(0xff00ff00)
-  BLUE    = Gosu::Color::Constant.argb(0xff0000ff)
-  YELLOW  = Gosu::Color::Constant.argb(0xffffff00)
-  FUCHSIA = Gosu::Color::Constant.argb(0xffff00ff)
-  CYAN    = Gosu::Color::Constant.argb(0xff00ffff)
-end
-
-# Instance methods for button_id_to_char and char_to_button_id
-class Gosu::Window
-  def button_id_to_char(id)
-    self.class.button_id_to_char(id)
-  end
-  
-  def char_to_button_id(ch)
-    self.class.char_to_button_id(ch)
-  end
-end
-
-# Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit do
-  Gosu::Song.current_song.stop if Gosu::Song.current_song
-  Gosu::_release_all_openal_resources
-end
+# Extend Numeric with simple angle conversion methods.
+class ::Numeric
+  def degrees_to_radians
+    self * Math::PI / 180.0
+  end
+  def radians_to_degrees
+    self * 180.0 / Math::PI
+  end
+  def gosu_to_radians
+    (self - 90) * Math::PI / 180.0
+  end
+  def radians_to_gosu
+    self * 180.0 / Math::PI + 90
+  end
+end
+    
+# Backwards compatibility: import constants into Gosu::Button.
+module Gosu::Button
+  Gosu.constants.each { |c| const_set(c, Gosu.const_get(c)) }
+end
+
+# Backwards compatibility: Window arguments to Sample and Song
+class Gosu::Sample
+  alias initialize_ initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    initialize_(*args)
+  end
+end
+class Gosu::Song
+  alias initialize_ initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    initialize_(*args)
+  end
+end
+
+# Color constants (SWIG messes up constants somehow)
+class Gosu::Color
+  class Constant < Gosu::Color
+  private
+    def alpha=; end
+    def red=; end
+    def green=; end
+    def blue=; end
+    def hue=; end
+    def saturation=; end
+    def value=; end
+  end
+  
+  NONE    = Gosu::Color::Constant.argb(0x00000000)
+  BLACK   = Gosu::Color::Constant.argb(0xff000000)
+  GRAY    = Gosu::Color::Constant.argb(0xff808080)
+  WHITE   = Gosu::Color::Constant.argb(0xffffffff)            
+  AQUA    = Gosu::Color::Constant.argb(0xff00ffff)
+  RED     = Gosu::Color::Constant.argb(0xffff0000)
+  GREEN   = Gosu::Color::Constant.argb(0xff00ff00)
+  BLUE    = Gosu::Color::Constant.argb(0xff0000ff)
+  YELLOW  = Gosu::Color::Constant.argb(0xffffff00)
+  FUCHSIA = Gosu::Color::Constant.argb(0xffff00ff)
+  CYAN    = Gosu::Color::Constant.argb(0xff00ffff)
+end
+
+# Instance methods for button_id_to_char and char_to_button_id
+class Gosu::Window
+  def button_id_to_char(id)
+    self.class.button_id_to_char(id)
+  end
+  
+  def char_to_button_id(ch)
+    self.class.char_to_button_id(ch)
+  end
+end
+
+# Release OpenAL resources during Ruby's shutdown, not Gosu's.
+at_exit do
+  Gosu::Song.current_song.stop if Gosu::Song.current_song
+  Gosu::_release_all_openal_resources
+end

data/lib/gosu/preview.rb

@@ -1,139 +1,143 @@
-require 'gosu'
-
-# Wrapper around Gosu 0.7 that provides the work-in-progress 0.8 interface
-
-module Gosu
-  class Font
-    alias :initialize07 :initialize
-    
-    def initialize *args
-      if args.first.is_a? Gosu::Window then
-        initialize07 *args
-      else
-        height  = args[0]
-        options = args[1] || {}
-        name = options[:name] || Gosu::default_font_name
-        initialize07 $window, name, height
-      end
-    end
-  end
-  
-  class Window
-    alias :initialize07 :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 = initialize07 width, height, fullscreen, update_interval
-    end
-  end
-  
-  class Image
-    alias :initialize07 :initialize
-    
-    def initialize *args
-      if args.first.is_a? Gosu::Window then
-        initialize07 *args
-      else
-        source = args[0]
-        tileable = !args[1] || args[1][:tileable]
-        rect = args[1] && args[1][:rect]
-        if rect then
-          initialize07 $window, source, !!tileable, *rect
-        else
-          initialize07 $window, source, !!tileable
-        end
-      end
-    end
-    
-    class <<self
-      alias load_tiles07 load_tiles
-    end
-    
-    def self.load_tiles *args
-      if args.first.is_a? Gosu::Window then
-        load_tiles07 *args
-      else
-        source = args[0]
-        x, y = args[1..2]
-        tileable = !args[3] || args[3][:tileable]
-        load_tiles07 $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.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'
+
+# Wrapper around Gosu 0.4-0.8 that provides the work-in-progress 0.9 interface
+
+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, 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