dxruby_sdl 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjEyN2ViYzcxYTFiMGVjNTJhOTU2MDg3M2Q1YjMxNDExOWE1NGQ5Yw==
+    Mzg1MmJhMGFhODU4MmYzZmY5M2QyOTdjYWJiMGJmNWI0ZTA3MmZmMg==
   data.tar.gz: !binary |-
-    YTg5ZGE1YTUxYWUzNzFlOGVkYTk5MTFkN2MwNTVhMDZkZGQ2ZmI1ZQ==
+    ZmUwNmU2ZjgwZWY1NTIyMmRjMzBhNDg2MzY0OGU5NDBiNDhkZjhlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDExY2Q5MzA3YWUyZGY4Y2U0YmJjZTBiNTE1ZGZjNGE2ZGY1NDE2ZTFkNDM3
-    Yjg5ZDRhZGMxMDQ2YTRlYTVjYzM0NDY3NTVkMzJjYWFjYzZjNWI2NmU5OWQ0
-    YzRiYjg1NmM3YjhjNDVjMmQ1M2FhYmViZGZmOGVmMjI2M2E4ZWI=
+    YzFhNGIyM2E0Y2MxMmE3N2RhYTE0NmY4MzhkYzg2NTAzOTY1MTg5Yzc3NmNl
+    MDAyMzJkOGI3ZTFhNjgwNzVmZWUzNDI4NTU5Y2VkNjYwNTgyOWU0NDNmYzE2
+    NTliNWY0NDhmY2MxMDE0MTQzNjI0MTA2OGQ4YWJiNWRlNGJmOWM=
   data.tar.gz: !binary |-
-    OTc1ZGZhZWJmY2QzZTkxMzkzZmFmZWY1MGU4YmRmMGI0MTAxOGI3YmM5ODZk
-    NWNjNTY3MWFjNWMxNDE0ODU1NzQ4ZWEzYTVkZmEyNTI3ZGVhMTVhMzUyZTI5
-    ZTAxNDJkYmQyZjUxNmY2MGUwYWVlMzI1ODVkZjg0NDFiYWIwY2U=
+    OTllMjA5YzFjZGM3M2JiZGZjYjA5Y2JjNGUzMjY3NzY4OGE2ZDVjNTVlMmEz
+    YWMyMDI5ZDU3MDRiYTM5NDFhZWM2N2MxNzg1ZGJiMzY5M2U3NjQ0YzI5YTQ0
+    YWMxNDVjYmIxMDgwODZmMTJhMGY0NTVlNWMzN2UwYjM1ZjZlNzI=

data/.rubocop.yml

@@ -1,3 +1,7 @@
+AllCops:
+  Excludes:
+    - tmp/**
+
 MethodLength:
   Enabled: false
 
@@ -22,3 +26,8 @@ RedundantReturn:
 AsciiComments:
   Enabled: false
 
+CaseEquality:
+  Enabled: false
+
+SymbolName:
+  Enabled: false

data/.travis.yml

@@ -8,4 +8,5 @@ env:
 
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq libsdl1.2-dev libsdl-mixer1.2-dev timidity libsdl-ttf2.0-dev libsdl-sge-dev otf-ipafont-gothic
+ - sudo apt-get install -qq libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev timidity libsdl-ttf2.0-dev libsdl-sge-dev fonts-horai-umefont fonts-ipafont
+

data/Guardfile

@@ -10,7 +10,7 @@ if /darwin/ =~ RUBY_PLATFORM
 end
 guard :rspec, rspec_option do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { "spec" }
   watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
 end

data/README.md

@@ -1,5 +1,6 @@
 # dxruby_sdl
 
+[![Gem Version](https://badge.fury.io/rb/dxruby_sdl.png)](http://badge.fury.io/rb/dxruby_sdl)
 [![Build Status](https://travis-ci.org/takaokouji/dxruby_sdl.png?branch=master)](https://travis-ci.org/takaokouji/dxruby_sdl)
 [![Coverage Status](https://coveralls.io/repos/takaokouji/dxruby_sdl/badge.png?branch=master)](https://coveralls.io/r/takaokouji/dxruby_sdl?branch=master)
 [![Dependency Status](https://gemnasium.com/takaokouji/dxruby_sdl.png)](https://gemnasium.com/takaokouji/dxruby_sdl)
@@ -8,41 +9,64 @@
 `dxruby_sdl` is a ruby library for 2D graphics and game. It has same
 DXRuby API. It use SDL/Ruby.
 
+Current API compatibility status: http://dxruby-apis.herokuapp.com/en/
+
 ## Installation
 
-### SDL & SGE
+### SDL, SGE, etc...
+
+#### Mac OS X
+
+(1) SDL
+
+```
+(if you use MacPorts.)
+$ sudo port install libsdl libsdl_image libsdl_mixer libsdl_sound libsdl_ttf
+```
+
+(2) SGE
 
-#### Mac OS X with MacPorts
+```
+$ curl -O http://www.digitalfanatics.org/cal/sge/files/sge030809.tar.gz
+$ tar xvzf sge030809.tar.gz
+$ cd sge030809
+$ curl https://gist.github.com/steved555/963525/raw/7b638e4100f9dd1a9d00560b98ea2ddd4375b2b0/sge_030809_freetype.patch | patch
+$ curl https://gist.github.com/steved555/963524/raw/c03396e1fb8bb87e9f4ba92597d087f730c6c48b/sge_030809_cmap.patch | patch
+$ curl https://gist.github.com/steved555/963522/raw/5b277a0a6b08a1c077fbe2c96eead4ef1d761856/sge-030809-build.patch | patch
+$ sed -i -e 's/-soname/-install_name/g' Makefile
+$ make
+$ sudo make install
+```
 
-SDL
+(3) MS PGohic (DXRuby's default font)
 
-    sudo port install libsdl libsdl_image libsdl_mixer libsdl_sound libsdl_ttf
+Install Microsoft Office:mac from http://www.microsoft.com/japan/mac.
 
-SGE
+#### Linux
 
-    curl -O http://www.digitalfanatics.org/cal/sge/files/sge030809.tar.gz
-    tar xvzf sge030809.tar.gz
-    cd sge030809
-    curl https://gist.github.com/steved555/963525/raw/7b638e4100f9dd1a9d00560b98ea2ddd4375b2b0/sge_030809_freetype.patch | patch
-    curl https://gist.github.com/steved555/963524/raw/c03396e1fb8bb87e9f4ba92597d087f730c6c48b/sge_030809_cmap.patch | patch
-    curl https://gist.github.com/steved555/963522/raw/5b277a0a6b08a1c077fbe2c96eead4ef1d761856/sge-030809-build.patch | patch
-    sed -i -e 's/-soname/-install_name/g' Makefile
-    make
-    sudo make install
+```
+$ sudo apt-get install libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev timidity libsdl-ttf2.0-dev libsdl-sge-dev fonts-horai-umefont fonts-ipafont
+```
 
 ### dxruby_sdl
 
 Add this line to your application's Gemfile:
 
-    gem 'dxruby_sdl'
+```
+gem 'dxruby_sdl'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install dxruby_sdl
+```
+$ gem install dxruby_sdl
+```
 
 ## Usage
 

data/lib/dxruby_sdl/color.rb

@@ -8,7 +8,7 @@ module DXRubySDL
       if color.length == 4
         return color[0..2]
       else
-        color
+        return color
       end
     end
 
@@ -16,7 +16,7 @@ module DXRubySDL
       if color.length == 4
         return color[3]
       else
-        return 255
+        return nil
       end
     end
   end

data/lib/dxruby_sdl/font.rb

@@ -5,33 +5,154 @@ module DXRubySDL
     attr_reader :size
     attr_reader :_ttf
 
+    @font_cache = {}
+
     def initialize(size, fontname = '', hash = {})
       @size = size
 
       if !SDL::TTF.init?
         SDL::TTF.init
       end
-      if !(path = FONTS[fontname.downcase])
+      if !(path = (FONTS[fontname] || FONT_ALIASES[fontname]))
         path = FONTS.first.last
       end
-      @_ttf = SDL::TTF.open(path, size)
+      font_cache = Font.instance_variable_get('@font_cache')
+      args = [path, size]
+      if font_cache.key?(args)
+        @_ttf = font_cache[args]
+      else
+        @_ttf = font_cache[args] = SDL::TTF.open(*args)
+      end
     end
 
+    def get_width(string)
+      return @_ttf.text_size(string).first
+    end
+
+    alias_method :getWidth, :get_width
+
     private
 
+    FONTS = {}
+    private_constant :FONTS
+
+    FONT_ALIASES = {}
+    private_constant :FONT_ALIASES
+
     # :nocov:
     if /darwin/ =~ RUBY_PLATFORM
-      FONTS = {
-        'osaka' => '/Library/Fonts/osaka.ttf',
-        'IPA ゴシック' => '/Library/Fonts/ipag.ttf',
-        'IPA Pゴシック' => '/Library/Fonts/ipagp.ttf',
-      }
+      font_info =
+        [
+         %w[
+           ＭＳ\ Ｐゴシック
+           /Library/Fonts/Microsoft/MS\ PGothic.ttf
+           MS\ Pゴシック
+           MS\ PGothic
+         ],
+         %w[
+           ＭＳ\ ゴシック
+           /Library/Fonts/Microsoft/MS\ Gothic.ttf
+           MS\ ゴシック
+           MS\ Gothic
+         ],
+         %w[
+           ＭＳ\ P明朝
+           /Library/Fonts/Microsoft/MS\ PMincho.ttf
+           MS\ P明朝
+           MS\ PMincho
+         ],
+         %w[
+           ＭＳ\ 明朝
+           /Library/Fonts/Microsoft/MS\ Mincho.ttf
+           MS\ 明朝
+           MS\ Mincho
+         ],
+         %w[
+           osaka
+           /Library/Fonts/osaka.ttf
+         ],
+         %w[
+           IPA\ Pゴシック
+           /Library/Fonts/ipagp.ttf
+           IPA\ PGothic
+           ipagp
+         ],
+         %w[
+           IPA\ ゴシック
+           /Library/Fonts/ipag.ttf
+           IPA\ Gothic
+           ipag
+         ],
+        ]
     elsif /linux/ =~ RUBY_PLATFORM
-      FONTS = {
-        'IPA ゴシック' => '/usr/share/fonts/opentype/ipafont-gothic/ipag.ttf',
-        'IPA Pゴシック' => '/usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf',
-      }
+      font_info =
+        [
+         %w[
+           梅Pゴシック
+           /usr/share/fonts/truetype/horai-umefont/ume-pgo4.ttf
+           ume-pgo4
+           ＭＳ\ Ｐゴシック
+           MS\ Pゴシック
+           MS\ PGothic
+         ],
+         %w[
+           梅ゴシック
+           /usr/share/fonts/truetype/horai-umefont/ume-tgo4.ttf
+           ume-tgo4
+           ＭＳ\ ゴシック
+           MS\ ゴシック
+           MS\ Gothic
+         ],
+         %w[
+           梅P明朝
+           /usr/share/fonts/truetype/horai-umefont/ume-pmo3.ttf
+           ume-pmo3
+           ＭＳ\ P明朝
+           MS\ P明朝
+           MS\ PMincho
+         ],
+         %w[
+           梅明朝
+           /usr/share/fonts/truetype/horai-umefont/ume-tmo3.ttf
+           ume-tmo3
+           ＭＳ\ 明朝
+           MS\ 明朝
+           MS\ Mincho
+         ],
+         %w[
+           IPA\ Pゴシック
+           /usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf
+           IPA\ PGothic
+           ipagp
+         ],
+         %w[
+           IPA\ ゴシック
+           /usr/share/fonts/opentype/ipafont-gothic/ipag.ttf
+           IPA\ Gothic
+           ipag
+         ],
+         %w[
+           IPA\ P明朝
+           /usr/share/fonts/opentype/ipafont-mincho/ipamp.ttf
+           IPA\ PMincho
+           ipamp
+         ],
+         %w[
+           IPA\ 明朝
+           /usr/share/fonts/opentype/ipafont-mincho/ipam.ttf
+           IPA\ Mincho
+           ipam
+         ],
+        ]
     end
     # :nocov:
+    font_info.each do |name, path, *aliases|
+      if File.exist?(path)
+        FONTS[name] = path
+        aliases.each do |a|
+          FONT_ALIASES[a] = path
+        end
+      end
+    end
   end
 end

data/lib/dxruby_sdl/image.rb

@@ -31,6 +31,7 @@ module DXRubySDL
 
     def initialize(width, height, color = [0, 0, 0, 0])
       @color = color
+      @_surface_is_dirty = false
 
       if width == 0 && height == 0
         return
@@ -39,6 +40,14 @@ module DXRubySDL
       @_surface =
         SDL::Surface.new(SDL::SWSURFACE, width, height, Window.send(:screen))
       @_surface.fill_rect(0, 0, width, height, @color)
+      @_surface_is_dirty = true
+    end
+
+    def _surface_display_format_alpha
+      if @_surface_is_dirty
+        @_surface = @_surface.display_format_alpha
+        @_surface_is_dirty = false
+      end
     end
 
     def width
@@ -49,6 +58,16 @@ module DXRubySDL
       return @_surface.h
     end
 
+    def set_color_key(color)
+      @_surface.set_color_key(SDL::SRCCOLORKEY | SDL::RLEACCEL, color)
+      @_surface_is_dirty = true
+    end
+
+    def compare(x, y, color)
+      pixel = lock { @_surface.get_pixel(x, y) }
+      return @_surface.format.get_rgb(pixel) == color
+    end
+
     def slice(x, y, width, height)
       s = @_surface.copy_rect(x, y, width, height)
       image = Image.new(0, 0)
@@ -61,6 +80,7 @@ module DXRubySDL
         @_surface.draw_line(x1, y1, x2, y2,
                             to_sdl_color(color), true, to_sdl_alpha(color))
       end
+      @_surface_is_dirty = true
       return self
     end
 
@@ -69,6 +89,7 @@ module DXRubySDL
         @_surface.draw_circle(x, y, r, to_sdl_color(color), false, true,
                               to_sdl_alpha(color))
       end
+      @_surface_is_dirty = true
       return self
     end
 
@@ -77,6 +98,7 @@ module DXRubySDL
         @_surface.draw_circle(x, y, r, to_sdl_color(color), true, false,
                               to_sdl_alpha(color))
       end
+      @_surface_is_dirty = true
       return self
     end
 
@@ -89,6 +111,7 @@ module DXRubySDL
         @_surface.draw_rect(x, y, w, h, to_sdl_color(color), false,
                             to_sdl_alpha(color))
       end
+      @_surface_is_dirty = true
       return self
     end
 
@@ -101,18 +124,41 @@ module DXRubySDL
         @_surface.draw_rect(x, y, w, h, to_sdl_color(color), true,
                             to_sdl_alpha(color))
       end
+      @_surface_is_dirty = true
+      return self
+    end
+
+    def clear
+      @_surface.fill_rect(0, 0, width, height, @color)
+      @_surface_is_dirty = true
+    end
+
+    def draw_font(x, y, string, font, color = [255, 255, 255])
+      if string.empty?
+        return
+      end
+      r, g, b = *color
+      h = font._ttf.height + 1
+      string.lines.each.with_index do |line, i|
+        line.chomp!
+        if line.empty?
+          next
+        end
+        font._ttf.draw_blended_utf8(@_surface, line, x, y + i * h, r, g, b)
+      end
+      @_surface_is_dirty = true
       return self
     end
 
-    # rubocop:disable SymbolName
     class << self
       alias_method :loadTiles, :load_tiles
       alias_method :load_to_array, :load_tiles
       alias_method :loadToArray, :load_to_array
     end
+    alias_method :setColorKey, :set_color_key
     alias_method :circleFill, :circle_fill
     alias_method :boxFill, :box_fill
-    # rubocop:enable SymbolName
+    alias_method :drawFont, :draw_font
 
     private
 
@@ -122,7 +168,7 @@ module DXRubySDL
       else
         begin
           @_surface.lock
-          yield
+          return yield
         ensure
           @_surface.unlock
         end

data/lib/dxruby_sdl/input.rb

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+require 'set'
+
 module DXRubySDL
   module Input
     module_function
@@ -98,7 +100,10 @@ module DXRubySDL
       return SDL::Mouse.state[index] && !@last_mouse_state[index]
     end
 
-    # rubocop:disable SymbolName
+    def keys
+      return @keys
+    end
+
     class << self
       alias_method :setRepeat, :set_repeat
       alias_method :padDown?, :pad_down?
@@ -110,12 +115,12 @@ module DXRubySDL
       alias_method :mouseDown?, :mouse_down?
       alias_method :mousePush?, :mouse_push?
     end
-    # rubocop:enable SymbolName
 
     private
 
-    @current_key_state = Set.new
-    @last_key_state = Set.new
+    @keys = Set.new
+    @checked_keys = Set.new
+    @down_keys = Set.new
     @last_mouse_state = [false, false, false]
     @joysticks = []
 
@@ -123,7 +128,7 @@ module DXRubySDL
 
       private
 
-      KEY_TABLE = {}
+      SDL_KEY_TABLE = {}
       replace_table = {
         'BACK' => 'BACKSPACE',
         'ADD' => 'PLUS',
@@ -156,40 +161,35 @@ module DXRubySDL
           end
         end
         begin
-          KEY_TABLE[DXRubySDL.const_get(k)] = SDL::Key.const_get(name.to_sym)
+          SDL_KEY_TABLE[DXRubySDL.const_get(k)] =
+            SDL::Key.const_get(name.to_sym)
         rescue NameError
         end
       end
-      private_constant :KEY_TABLE
+      private_constant :SDL_KEY_TABLE
+
+      DXRUBY_KEY_TABLE = SDL_KEY_TABLE.invert
+      private_constant :DXRUBY_KEY_TABLE
 
       def store_last_state
-        keys = (@last_key_state - @current_key_state)
-        if keys.length > 0
-          SDL::Key.scan
-          keys.each do |key|
-            if SDL::Key.press?(key)
-              @current_key_state.add(key)
-            end
-          end
-        end
-        @last_key_state = @current_key_state
-        @current_key_state = Set.new
+        @down_keys.merge(@checked_keys)
+        @checked_keys.clear
         @last_mouse_state = SDL::Mouse.state
       end
 
       def sdl_key_press?(key)
-        SDL::Key.scan
-        if SDL::Key.press?(key)
-          @current_key_state.add(key)
+        dkey = to_dxruby_key(key)
+        if @keys.include?(dkey)
+          @checked_keys.add(dkey)
           return true
         else
-          @current_key_state.delete(key)
           return false
         end
       end
 
       def sdl_key_push?(key)
-        return sdl_key_press?(key) && !@last_key_state.include?(key)
+        dkey = to_dxruby_key(key)
+        return sdl_key_press?(key) && !@down_keys.include?(dkey)
       end
 
       def joystick(pad_number)
@@ -203,7 +203,23 @@ module DXRubySDL
       end
 
       def to_sdl_key(key_code)
-        return KEY_TABLE[key_code]
+        return SDL_KEY_TABLE[key_code]
+      end
+
+      def to_dxruby_key(key_code)
+        return DXRUBY_KEY_TABLE[key_code]
+      end
+
+      def handle_key_event(event)
+        dkey = to_dxruby_key(event.sym)
+        case event
+        when SDL::Event::KeyDown
+          @keys.add(dkey)
+        when SDL::Event::KeyUp
+          @keys.delete(dkey)
+          @checked_keys.delete(dkey)
+          @down_keys.delete(dkey)
+        end
       end
     end
   end

data/lib/dxruby_sdl/sound.rb

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 
+require 'forwardable'
+
 module DXRubySDL
   class Sound
+    extend Forwardable
+
     @sdl_mixer_openend = false
 
     def initialize(filename)
@@ -17,9 +21,9 @@ module DXRubySDL
       end
     end
 
-    def play
-      @sound.play
-    end
+    def_delegators :@sound, :play, :set_volume
+
+    alias_method :setVolume, :set_volume
 
     private
 
@@ -31,10 +35,16 @@ module DXRubySDL
       def play
         SDL::Mixer.play_music(@music, -1)
       end
+
+      def set_volume(volume, time = 0)
+        raise NotImplementedError, 'Sound#set_volume(volume, time) with MIDI'
+      end
     end
     private_constant :Music
 
     class Wave
+      extend Forwardable
+
       def initialize(filename)
         @wave = SDL::Mixer::Wave.load(filename)
         @last_played_channel = nil
@@ -48,6 +58,13 @@ module DXRubySDL
           retry
         end
       end
+
+      def set_volume(volume, time = 0)
+        if time > 0
+          raise NotImplementedError, 'Sound#set_volume(volume, time != 0)'
+        end
+        @wave.set_volume(volume)
+      end
     end
     private_constant :Wave
   end

data/lib/dxruby_sdl/sound_effect.rb

@@ -3,9 +3,13 @@
 module DXRubySDL
   class SoundEffect
     def initialize(time, wavetype = WAVE_RECT, resolution = 1000)
+      @time = time
+
+      @time.times { yield }
     end
 
     def add(wavetype = WAVE_RECT, resolution = 1000)
+      @time.times { yield }
     end
 
     def play