gosu 0.7.15-universal-darwin → 0.7.16-universal-darwin

data/examples/ChipmunkIntegration.rb

@@ -131,7 +131,7 @@ class GameWindow < Gosu::Window
     @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")
+    @beep = Gosu::Sample.new("media/Beep.wav")
     
     # Put the score here, as it is the environment that tracks this now
     @score = 0
@@ -222,20 +222,20 @@ class GameWindow < Gosu::Window
       @player.validate_position
       
       # Check keyboard
-      if button_down? Gosu::Button::KbLeft
+      if button_down? Gosu::KbLeft
         @player.turn_left
       end
-      if button_down? Gosu::Button::KbRight
+      if button_down? Gosu::KbRight
         @player.turn_right
       end
       
-      if button_down? Gosu::Button::KbUp
-        if ( (button_down? Gosu::Button::KbRightShift) || (button_down? Gosu::Button::KbLeftShift) )
+      if button_down? Gosu::KbUp
+        if ( (button_down? Gosu::KbRightShift) || (button_down? Gosu::KbLeftShift) )
           @player.boost
         else
           @player.accelerate
         end
-      elsif button_down? Gosu::Button::KbDown
+      elsif button_down? Gosu::KbDown
         @player.reverse
       end
       
@@ -265,7 +265,7 @@ class GameWindow < Gosu::Window
   end
 
   def button_down(id)
-    if id == Gosu::Button::KbEscape
+    if id == Gosu::KbEscape
       close
     end
   end

data/examples/CptnRuby.rb

@@ -151,7 +151,7 @@ class Map
     gem_img = Image.new(window, "media/CptnRuby Gem.png", false)
     @gems = []
 
-    lines = File.readlines(filename).map { |line| line.chop }
+    lines = File.readlines(filename).map { |line| line.chomp }
     @height = lines.size
     @width = lines[0].size
     @tiles = Array.new(@width) do |x|
@@ -210,8 +210,8 @@ class Game < Window
   end
   def update
     move_x = 0
-    move_x -= 5 if button_down? Button::KbLeft
-    move_x += 5 if button_down? Button::KbRight
+    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
@@ -223,8 +223,8 @@ class Game < Window
     @cptn.draw @screen_x, @screen_y
   end
   def button_down(id)
-    if id == Button::KbUp then @cptn.try_to_jump end
-    if id == Button::KbEscape then close end
+    if id == KbUp then @cptn.try_to_jump end
+    if id == KbEscape then close end
   end
 end
 

data/examples/OpenGLIntegration.rb

@@ -108,7 +108,7 @@ class Player
 
   def initialize(window, x, y)
     @image = Gosu::Image.new(window, "media/Starfighter.bmp", false)
-    @beep = Gosu::Sample.new(window, "media/Beep.wav")
+    @beep = Gosu::Sample.new("media/Beep.wav")
     @x, @y = x, y
     @score = 0
   end
@@ -190,10 +190,10 @@ class GameWindow < Gosu::Window
   end
 
   def update
-    @player.move_left if button_down? Gosu::Button::KbLeft or button_down? Gosu::Button::GpLeft
-    @player.move_right if button_down? Gosu::Button::KbRight or button_down? Gosu::Button::GpRight
-    @player.accelerate if button_down? Gosu::Button::KbUp or button_down? Gosu::Button::GpUp
-    @player.brake if button_down? Gosu::Button::KbDown or button_down? Gosu::Button::GpDown
+    @player.move_left if button_down? Gosu::KbLeft or button_down? Gosu::GpLeft
+    @player.move_right if button_down? Gosu::KbRight or button_down? Gosu::GpRight
+    @player.accelerate if button_down? Gosu::KbUp or button_down? Gosu::GpUp
+    @player.brake if button_down? Gosu::KbDown or button_down? Gosu::GpDown
 
     @player.collect_stars(@stars)
     
@@ -222,7 +222,7 @@ class GameWindow < Gosu::Window
   end
 
   def button_down(id)
-    if id == Gosu::Button::KbEscape
+    if id == Gosu::KbEscape
       close
     end
   end

data/examples/RMagickIntegration.rb

@@ -290,7 +290,7 @@ class Missile
   
   def initialize(window, x, y, angle)
     # All missile instances use the same sound.
-    @@explosion_sound ||= Gosu::Sample.new(window, "media/Explosion.wav")
+    @@explosion_sound ||= Gosu::Sample.new("media/Explosion.wav")
     
     # Horizontal/vertical velocity.
     @vx, @vy = Gosu::offset_x(angle, 20).to_i, Gosu::offset_y(angle, 20).to_i

data/examples/TextInput.rb

@@ -47,6 +47,12 @@ class TextField < Gosu::TextInput
     self.text = "Click to change text"
   end
   
+  # Example filter method. You can truncate the text to employ a length limit (watch out
+  # with Ruby 1.8 and UTF-8!), limit the text to certain characters etc.
+  def filter text
+    text.upcase
+  end
+  
   def draw
     # Depending on whether this is the currently selected input or not, change the
     # background's color.
@@ -82,7 +88,7 @@ class TextField < Gosu::TextInput
   end
 
   # This text field grows with the text that's being entered.
-  # (Without clipping, one has to be a bit creative about this ;) )
+  # (Usually one would use clip_to and scroll around on the text field.)
   def width
     @font.text_width(self.text)
   end

data/examples/Tutorial.rb

@@ -16,7 +16,7 @@ class Player
 
   def initialize(window)
     @image = Gosu::Image.new(window, "media/Starfighter.bmp", false)
-    @beep = Gosu::Sample.new(window, "media/Beep.wav")
+    @beep = Gosu::Sample.new("media/Beep.wav")
     @x = @y = @vel_x = @vel_y = @angle = 0.0
     @score = 0
   end
@@ -102,13 +102,13 @@ class GameWindow < Gosu::Window
   end
 
   def update
-    if button_down? Gosu::Button::KbLeft or button_down? Gosu::Button::GpLeft then
+    if button_down? Gosu::KbLeft or button_down? Gosu::GpLeft then
       @player.turn_left
     end
-    if button_down? Gosu::Button::KbRight or button_down? Gosu::Button::GpRight then
+    if button_down? Gosu::KbRight or button_down? Gosu::GpRight then
       @player.turn_right
     end
-    if button_down? Gosu::Button::KbUp or button_down? Gosu::Button::GpButton0 then
+    if button_down? Gosu::KbUp or button_down? Gosu::GpButton0 then
       @player.accelerate
     end
     @player.move
@@ -127,7 +127,7 @@ class GameWindow < Gosu::Window
   end
 
   def button_down(id)
-    if id == Gosu::Button::KbEscape then
+    if id == Gosu::KbEscape then
       close
     end
   end

data/lib/gosu.rb

@@ -1,7 +1,10 @@
 require 'rbconfig'
 
 begin
-  if RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
+  if defined? NSObject then
+    require "#{File.dirname(__FILE__)}/gosu.for_macruby.bundle"
+    require "#{File.dirname(__FILE__)}/hotgosu.rb"
+  elsif defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
     require "#{File.dirname(__FILE__)}/gosu.for_1_9.#{Config::CONFIG['DLEXT']}"
   else
     require "#{File.dirname(__FILE__)}/gosu.for_1_8.#{Config::CONFIG['DLEXT']}"
@@ -9,3 +12,5 @@ begin
 rescue LoadError => e
   require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
 end
+
+require "#{File.dirname(__FILE__)}/gosu/patches.rb"

data/lib/gosu/patches.rb

@@ -0,0 +1,53 @@
+# Extend Numeric with simple angle conversion methods.
+class ::Numeric
+  def gosu_to_radian_scale
+    self * Math::PI / 180.0
+  end
+  def radian_scale_to_gosu
+    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 the 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 new_initialize initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    new_initialize args
+  end
+end
+class Gosu::Song
+  alias new_initialize initialize
+  
+  def initialize(*args)
+    args.shift if args.first.is_a? Gosu::Window
+    new_initialize args
+  end
+end
+
+# Color constants (SWIG messes up constants somehow)
+class Gosu::Color
+  NONE    = Gosu::Color.new(0x00000000)
+  BLACK   = Gosu::Color.new(0xff000000)
+  GRAY    = Gosu::Color.new(0xff808080)
+  WHITE   = Gosu::Color.new(0xffffffff)            
+  AQUA    = Gosu::Color.new(0xff00ffff)
+  RED     = Gosu::Color.new(0xffff0000)
+  GREEN   = Gosu::Color.new(0xff00ff00)
+  BLUE    = Gosu::Color.new(0xff0000ff)
+  YELLOW  = Gosu::Color.new(0xffffff00)
+  FUCHSIA = Gosu::Color.new(0xffff00ff)
+  CYAN    = Gosu::Color.new(0xff00ffff)
+end

data/lib/hotgosu.rb

@@ -0,0 +1,59 @@
+require "#{File.dirname(__FILE__)}/hotgosu/constants.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/color.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/functions.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/font.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/image.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/sample.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/song.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/window.rb"
+require "#{File.dirname(__FILE__)}/hotgosu/window_primitives.rb"
+
+module Gosu   
+#   # An instance of a Sample playing. Can be used to stop sounds dynamically,
+#   # or to check if they are finished.
+#   # It is recommended that you throw away sample instances if possible,
+#   # as they could accidentally refer to other sounds being played after
+#   # a very long time has passed.
+#   class SampleInstance
+#     attr_accessor :volume
+#     attr_accessor :speed
+#     attr_accessor :pan
+#     
+#     # Stops this instance of a sound being played. Calling this twice, or too late, does not do any harm. You can nil out the reference to the instance afterwards as it will be useless.
+#     def stop; end
+#     # Pauses this instance to be resumed afterwards. It will still keep a channel filled while paused.
+#     def pause; end
+#     def paused?; end
+#     def resume; end
+#     def playing?; end
+#   end
+#   
+#   # TextInput instances are invisible objects that build a text string from input,
+#   # using the current operating system's keyboard layout.
+#   #
+#   # At its most basic form, you only need to create a new TextInput instance and
+#   # pass it to your window via text_input=. Until you call this function again,
+#   # passing nil, the TextInput object will build a text that can be accessed via
+#   # TextInput#text.
+#   #
+#   # A TextInput object is purely abstract, though; drawing the input field is left
+#   # to the user. As with most of Gosu, how this is handled is completely left open.
+#   #
+#   # TextInput only aims to provide enough code for your own GUIs to build upon.
+#   class TextInput
+#     attr_accessor :text
+#     attr_reader :caret_pos
+#     attr_reader :selection_start
+#   end
+
+
+  # Small additions to Numeric to make it easier to integrate Gosu with
+  # libraries that use radians, like Chipmunk.
+  class ::Numeric
+    # Returns <tt>self * 180.0 / Math::PI + 90</tt>
+    def radians_to_gosu(); end
+
+    # Returns <tt>(self - 90) * Math::PI / 180.0</tt>
+    def gosu_to_radians(); end
+  end
+end

data/lib/hotgosu/color.rb

@@ -0,0 +1,43 @@
+module Gosu
+  Color = ::ObjGosuColor
+  
+  class Color
+    def self.new(*args)
+      case args.length
+      when 1 then
+        alloc.initWithARGB args[0]
+      when 4 then
+        alloc.initWithAlpha args[0], red: args[1], green: args[2], blue: args[3]
+      else
+        raise ArgumentError.new("wrong number of arguments (#{args.length} for 1 or 4)")
+      end
+    end
+  end
+  
+#   # Represents an ARGB color value with 8 bits for each channel. Can be
+#   # replaced by literals of the form 0xaarrggbb in all of Gosu.
+#   class Color
+#     attr_accessor :hue, :saturation, :value
+# 
+#     # argb: 0xAARRGGBB integer.
+#     def initialize(argb); end
+#     # a:: Integer from 0..255
+#     # r:: Integer from 0..255
+#     # g:: Integer from 0..255
+#     # b:: Integer from 0..255
+#     def initialize(a, r, g, b); end
+#     
+#     # Converts a HSV triple into a color. Same as from_ahsv with alpha set to 255.
+#     # h:: Integer from 0..360
+#     # s:: Float from 0..1
+#     # v:: Float from 0..1.
+#     def self.from_hsv(h, s, v); end
+# 
+#     # Converts a HSV triple into a color, with a given alpha.
+#     # a:: Integer from 0..255
+#     # h:: Integer from 0..360
+#     # s:: Float from 0..1
+#     # v:: Float from 0..1.
+#     def self.from_ahsv(a, h, s, v); end
+#  end
+end

data/lib/hotgosu/constants.rb

@@ -0,0 +1,143 @@
+# Mac-specific constants extracted from SWIG port via:
+
+# Gosu.constants.sort.each do |name|
+#   value = eval "Gosu::#{name}"
+#   puts "  #{name} = #{value.inspect}" unless value.is_a? Module
+# end
+
+module Gosu
+  GpButton0 = 65546
+  GpButton1 = 65547
+  GpButton10 = 65556
+  GpButton11 = 65557
+  GpButton12 = 65558
+  GpButton13 = 65559
+  GpButton14 = 65560
+  GpButton15 = 65561
+  GpButton2 = 65548
+  GpButton3 = 65549
+  GpButton4 = 65550
+  GpButton5 = 65551
+  GpButton6 = 65552
+  GpButton7 = 65553
+  GpButton8 = 65554
+  GpButton9 = 65555
+  GpDown = 65545
+  GpLeft = 65542
+  GpNum = 20
+  GpRangeBegin = 65542
+  GpRangeEnd = 65561
+  GpRight = 65543
+  GpUp = 65544
+  Kb0 = 29
+  Kb1 = 18
+  Kb2 = 19
+  Kb3 = 20
+  Kb4 = 21
+  Kb5 = 23
+  Kb6 = 22
+  Kb7 = 26
+  Kb8 = 28
+  Kb9 = 25
+  KbA = 0
+  KbB = 11
+  KbBackspace = 51
+  KbC = 8
+  KbD = 2
+  KbDelete = 117
+  KbDown = 125
+  KbE = 14
+  KbEnd = 119
+  KbEnter = 76
+  KbEscape = 53
+  KbF = 3
+  KbF1 = 122
+  KbF10 = 109
+  KbF11 = 103
+  KbF12 = 111
+  KbF2 = 120
+  KbF3 = 99
+  KbF4 = 118
+  KbF5 = 96
+  KbF6 = 97
+  KbF7 = 98
+  KbF8 = 100
+  KbF9 = 101
+  KbG = 5
+  KbH = 4
+  KbHome = 115
+  KbI = 34
+  KbInsert = 114
+  KbJ = 38
+  KbK = 40
+  KbL = 37
+  KbLeft = 123
+  KbLeftAlt = 58
+  KbLeftControl = 59
+  KbLeftMeta = 55
+  KbLeftShift = 56
+  KbM = 46
+  KbN = 45
+  KbNum = 65535
+  KbNumpad0 = 82
+  KbNumpad1 = 83
+  KbNumpad2 = 84
+  KbNumpad3 = 85
+  KbNumpad4 = 86
+  KbNumpad5 = 87
+  KbNumpad6 = 88
+  KbNumpad7 = 89
+  KbNumpad8 = 91
+  KbNumpad9 = 92
+  KbNumpadAdd = 69
+  KbNumpadDivide = 75
+  KbNumpadMultiply = 67
+  KbNumpadSubtract = 78
+  KbO = 31
+  KbP = 35
+  KbPageDown = 121
+  KbPageUp = 116
+  KbQ = 12
+  KbR = 15
+  KbRangeBegin = 1
+  KbRangeEnd = 65535
+  KbReturn = 36
+  KbRight = 124
+  KbRightAlt = 61
+  KbRightControl = 62
+  KbRightMeta = 54
+  KbRightShift = 60
+  KbS = 1
+  KbSpace = 49
+  KbT = 17
+  KbTab = 48
+  KbU = 32
+  KbUp = 126
+  KbV = 9
+  KbW = 13
+  KbX = 7
+  KbY = 16
+  KbZ = 6
+  MAJOR_VERSION = 0
+  MINOR_VERSION = 7
+  MsLeft = 65536
+  MsMiddle = 65538
+  MsNum = 6
+  MsRangeBegin = 65536
+  MsRangeEnd = 65541
+  MsRight = 65537
+  MsWheelDown = 65540
+  MsWheelUp = 65539
+  NoButton = -1
+  NumButtons = 65562
+  POINT_VERSION = 16
+  VERSION = "0.7.16"
+end
+
+module Gosu
+  module Button
+    Gosu.constants.grep(/^(Gp|Ms|Kb)/).each do |constant|
+      self.const_set constant, Gosu.const_get(constant)
+    end
+  end
+end