dxruby_sdl 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5e8082520e8fb4624e1e4c52aa7ff387109d01
-  data.tar.gz: 49da563ff5ecb264a44b98929b9f4e93ab8d8a94
+  metadata.gz: b492f2b06c03cae99fd83c1f0a97d6d39013c2d3
+  data.tar.gz: 2d1b0b218869b7f4f7d3f97d34111c3989b89e1a
 SHA512:
-  metadata.gz: a2ccf2367ad0261120a36f7c3e8760a44fe7752775cb3e567ea2e275de25a1592990e97dfd35bf2035ef06a18cd4b6eed7380d8890385f0f14fc45be27b9cd27
-  data.tar.gz: 529148f8c073c3586e63d01f00a0952145e36af648156cef8112f14d8dda229ae7e13a9a69a59a19840af48a0c35916d953bf86e96632a859ca3b05a0fba2131
+  metadata.gz: e9ef344818ea84dae3b66ac4cb8bd378769543bd90b3ae3fef6274737b9fbd49d76932e7bb7ac27f799f6378618e9e591215e6f9561684d717560f8e843a1ede
+  data.tar.gz: 47844fd4b4e7f397d3114f4cb20c488894f50197611e7120141c0977afe2c20d04347444f40dd2c14f63894f43d8c4fb80bc88dc9970509c3bffe20b53990cb2

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.3.5

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.3.3
+  - 2.3.5
 
 env:
   AUDIODEV=null

data/dxruby_sdl.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['kouji.takao@gmail.com']
   spec.description   = %q{`dxruby-sdl` is a ruby library for 2D graphics and game. It has same DXRuby API. It use SDL/Ruby.}
   spec.summary       = %q{2D graphics and game library}
-  spec.homepage      = 'https://github.com/takaokouji/dxruby-sdl'
+  spec.homepage      = 'https://github.com/smalruby/dxruby-sdl'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/lib/dxruby_sdl/color.rb

@@ -6,17 +6,37 @@ module DXRubySDL
 
     def to_sdl_color(color)
       if color.length == 4
-        return color[0..2]
+        return color[1..3]
       else
-        return color
+        color
       end
     end
 
     def to_sdl_alpha(color)
       if color.length == 4
-        return color[3]
+        color[0]
       else
-        return nil
+        0xFF
+      end
+    end
+
+    def to_sdl_rgba(color)
+      [*to_sdl_color(color), to_sdl_alpha(color)]
+    end
+
+    def to_dxruby_argb(color)
+      if color.length == 4
+        [color[3], *color[0..2]]
+      else
+        [0xFF, *color]
+      end
+    end
+
+    def normalize_dxruby(color)
+      if color.length == 4
+        color
+      else
+        [0xFF] + color
       end
     end
   end

data/lib/dxruby_sdl/font.rb

@@ -43,6 +43,38 @@ module DXRubySDL
     if /darwin/ =~ RUBY_PLATFORM
       font_info =
         [
+        %w[
+          梅Pゴシック
+          /Library/Fonts/ume-pgo4.ttf
+          ume-pgo4
+          ＭＳ\ Ｐゴシック
+          MS\ Pゴシック
+          MS\ PGothic
+        ],
+        %w[
+          梅ゴシック
+          /Library/Fonts/ume-tgo4.ttf
+          ume-tgo4
+          ＭＳ\ ゴシック
+          MS\ ゴシック
+          MS\ Gothic
+        ],
+        %w[
+          梅P明朝
+          /Library/Fonts/ume-pmo3.ttf
+          ume-pmo3
+          ＭＳ\ P明朝
+          MS\ P明朝
+          MS\ PMincho
+        ],
+        %w[
+          梅明朝
+          /Library/Fonts/ume-tmo3.ttf
+          ume-tmo3
+          ＭＳ\ 明朝
+          MS\ 明朝
+          MS\ Mincho
+        ],
          %w[
            ＭＳ\ Ｐゴシック
            /Library/Fonts/Microsoft/MS\ PGothic.ttf

data/lib/dxruby_sdl/image.rb

@@ -30,7 +30,7 @@ module DXRubySDL
     end
 
     def initialize(width, height, color = [0, 0, 0, 0])
-      @color = color
+      @color = to_sdl_rgba(color)
 
       if width == 0 && height == 0
         return
@@ -39,12 +39,18 @@ module DXRubySDL
       @_surface =
         SDL::Surface.new(SDL::SWSURFACE, width, height, Window.send(:screen))
       @_surface.fill_rect(0, 0, width, height, @color)
+    end
 
-      # TODO: a値が0の時にしか対応していない。
-      # 1から254の値に対応すること
-      if color[3] == 0
-        set_color_key(@color[0..2])
-      end
+    def [](x, y)
+      pixel = lock { @_surface.get_pixel(x, y) }
+      Color.to_dxruby_argb(@_surface.format.get_rgba(pixel))
+    end
+
+    def []=(x, y, color)
+      sdl_rgba = Color.to_sdl_rgba(color)
+      lock {
+        @_surface[x, y] = sdl_rgba
+      }
     end
 
     def width
@@ -56,12 +62,11 @@ module DXRubySDL
     end
 
     def set_color_key(color)
-      @_surface.set_color_key(SDL::SRCCOLORKEY | SDL::RLEACCEL, color)
+      @_surface.set_color_key(SDL::SRCCOLORKEY | SDL::RLEACCEL, to_sdl_color(color))
     end
 
     def compare(x, y, color)
-      pixel = lock { @_surface.get_pixel(x, y) }
-      return @_surface.format.get_rgb(pixel) == color
+      self[x, y] == Color.normalize_dxruby(color)
     end
 
     def slice(x, y, width, height)
@@ -127,7 +132,7 @@ module DXRubySDL
       if string.empty?
         return
       end
-      r, g, b = *color
+      r, g, b = *to_sdl_color(color)
       h = font._ttf.height + 1
       string.lines.each.with_index do |line, i|
         line.chomp!

data/lib/dxruby_sdl/render_target.rb

@@ -6,20 +6,62 @@ module DXRubySDL
   class RenderTarget
     extend Forwardable
 
-    attr_reader :_surface
-
     def initialize(width, height, color)
-      @image = Image.new(width, height, color)
-      @_surface = @image._surface
+      @_image = Image.new(width, height, color)
+      @disposed = false
+    end
+
+    def dispose
+      @disposed = true
+      @_image = nil
+    end
+
+    def disposed?
+      @disposed
+    end
+
+    def draw(*args)
+      check_disposed
+      @_image.draw(*args)
+    end
+
+    def draw_ex(x, y, image, hash = {})
+      check_disposed
+      if hash[:z] && hash[:z] != 0
+        raise NotImplementedError, 'Window.draw_ex(x, y, image, z: != 0)'
+      end
+      option = {
+        angle: 0,
+        scale_x: 1,
+        scale_y: 1,
+        center_x: 0,
+        center_y: 0,
+      }.merge(hash)
+      SDL::Surface.transform_blit(image._surface, @_image._surface,
+        option[:angle],
+        option[:scale_x], option[:scale_y],
+        option[:center_x], option[:center_y],
+        x + option[:center_x], y + option[:center_y],
+        0)
     end
 
-    def_delegators :@image, :draw
-    
     def draw_font(x, y, string, font, option = {})
+      check_disposed
       color = option[:color] || [255, 255, 255]
-      @image.draw_font(x, y, string, font, color) 
+      @_image.draw_font(x, y, string, font, color)
+    end
+
+    def to_image
+      check_disposed
+      @_image
     end
 
-    alias_method :drawFont, :draw_font
+    private
+
+    def check_disposed
+      if disposed?
+        raise
+      end
+    end
   end
 end

data/lib/dxruby_sdl/sound.rb

@@ -32,8 +32,9 @@ module DXRubySDL
       end
     end
 
-    def_delegators :@sound, :play, :set_volume, :stop
+    def_delegators :@sound, :play, :loop_count=, :set_volume, :stop
 
+    alias_method :loopCount=, :loop_count=
     alias_method :setVolume, :set_volume
 
     private
@@ -43,17 +44,22 @@ module DXRubySDL
 
       def initialize(filename)
         @music = SDL::Mixer::Music.load(filename)
+        @_loop_count = -1
       end
 
       def play
-        SDL::Mixer.play_music(@music, -1)
+        SDL::Mixer.play_music(@music, @_loop_count)
+      end
+
+      def loop_count=(n)
+        @_loop_count = n
       end
 
       def set_volume(volume, time = 0)
         if time > 0
           raise NotImplementedError, 'Sound#set_volume(volume, time != 0)'
         end
-        @music.set_volume_music(dxruby_volume_to_sdl_volume(volume))
+        SDL::Mixer.set_volume_music(dxruby_volume_to_sdl_volume(volume))
       end
 
       def stop
@@ -69,10 +75,11 @@ module DXRubySDL
       def initialize(filename)
         @wave = SDL::Mixer::Wave.load(filename)
         @last_played_channel = nil
+        @_loop_count = 0
       end
 
       def play
-        @last_played_channel = SDL::Mixer.play_channel(-1, @wave, 0)
+        @last_played_channel = SDL::Mixer.play_channel(-1, @wave, @_loop_count)
       rescue SDL::Error => e
         if /No free channels available/ =~ e.message
           SDL::Mixer.halt(@last_played_channel == 0 ? 1 : 0)
@@ -80,6 +87,10 @@ module DXRubySDL
         end
       end
 
+      def loop_count=(n)
+        @_loop_count = n
+      end
+
       def set_volume(volume, time = 0)
         if time > 0
           raise NotImplementedError, 'Sound#set_volume(volume, time != 0)'
@@ -88,7 +99,7 @@ module DXRubySDL
       end
 
       def stop
-        SDL::Mixer.halt(@last_played_channel)
+        SDL::Mixer.halt(@last_played_channel) if @last_played_channel
       end
     end
     private_constant :Wave

data/lib/dxruby_sdl/sprite.rb

@@ -118,7 +118,7 @@ module DXRubySDL
       if !@visible || vanished?
         return
       end
-      [:target, :blend, :shader].each do |method|
+      [:blend, :shader].each do |method|
         if send(method)
           raise NotImplementedError, "Sprite#draw with #{method}"
         end
@@ -139,7 +139,11 @@ module DXRubySDL
       if center_y
         options[:center_y] = center_y
       end
-      Window.draw_ex(x, y, image, options)
+      if target
+        target.draw_ex(x, y, image, options)
+      else
+        Window.draw_ex(x, y, image, options)
+      end
     end
 
     def ===(other)

data/lib/dxruby_sdl/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module DXRubySDL
-  VERSION =  '0.0.15'
+  VERSION =  '0.0.16'
 end

data/spec/lib/dxruby_sdl/color_spec.rb

@@ -7,15 +7,15 @@ describe DXRubySDL::Color, 'カラーを変換するモジュール' do
 
     expected = [0, 125, 255]
     context "引数が3つの要素の配列(#{expected.inspect})の場合" do
-      let(:color) { [0, 125, 255] }
+      let(:color) { expected }
 
-      it { should be(color) }
+      it { is_expected.to eq(expected) }
     end
 
-    context "引数が4つの要素の配列で最初の3つが(#{expected.inspect})の場合" do
-      let(:color) { expected + [0] }
+    context "引数が4つの要素の配列で後ろから3つが(#{expected.inspect})の場合" do
+      let(:color) { [0] + expected }
 
-      it { should eq(expected) }
+      it { is_expected.to eq(expected) }
     end
   end
 
@@ -25,17 +25,63 @@ describe DXRubySDL::Color, 'カラーを変換するモジュール' do
     context '引数が3つの要素の配列の場合' do
       let(:color) { [0, 125, 255] }
 
-      it '常にnilを返す' do
-        should eq(nil)
-      end
+      it { is_expected.to eq(0xFF) }
     end
 
     [0, 125, 255].each do |expected|
-      context "引数が4つの要素の配列で最後の値が#{expected}の場合" do
-        let(:color) { [0, 125, 255, expected] }
+      context "引数が4つの要素の配列で最初の値が#{expected}の場合" do
+        let(:color) { [expected, 0, 125, 255] }
 
-        it { should eq(expected) }
+        it { is_expected.to eq(expected) }
       end
     end
   end
+
+  describe '#to_sdl_rgba', 'DXRubyのカラー + アルファ値の情報をSDLのカラー + アルファ値の情報に変換する' do
+    subject { described_class.to_sdl_rgba(color) }
+
+    context "引数が3つの要素の配列([0, 125, 255])の場合" do
+      let(:color) { [0, 125, 255] }
+
+      it { is_expected.to eq(color + [255]) }
+    end
+
+    context "引数が4つの要素の配列で後ろから3つが([0, 125, 255])の場合" do
+      let(:color) { [60, 0, 125, 255] }
+
+      it { is_expected.to eq([0, 125 ,255, 60]) }
+    end
+  end
+
+  describe '#to_dxruby_argb', 'SDL\'s RGBA to DXRuby\'s ARGB' do
+    subject { described_class.to_dxruby_argb(color) }
+
+    context "RGB" do
+      let(:color) { [0, 125, 255] }
+
+      it { is_expected.to eq([0xFF] + color) }
+    end
+
+    context "RGBA" do
+      let(:color) { [60, 0, 125, 255] }
+
+      it { is_expected.to eq([255, 60, 0, 125]) }
+    end
+  end
+
+  describe '#normalize_dxruby' do
+    subject { described_class.normalize_dxruby(color) }
+
+    context "RGB" do
+      let(:color) { [0, 125, 255] }
+
+      it { is_expected.to eq([0xFF] + color) }
+    end
+
+    context "ARGB" do
+      let(:color) { [255, 60, 0, 125] }
+
+      it { is_expected.to eq(color) }
+    end
+  end
 end

data/spec/lib/dxruby_sdl/image_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 
 describe DXRubySDL::Image, '画像を表すクラス' do
   let(:image) { DXRubySDL::Image.new(640, 480) }
+  let(:logo_image) { DXRubySDL::Image.load(fixture_path("logo.png")) }
 
   describe '.new' do
     context '幅と高さを指定した場合' do
@@ -92,6 +93,40 @@ describe DXRubySDL::Image, '画像を表すクラス' do
     end
   end
 
+  describe '#[]' do
+    it "pixel is ARGB format" do
+      expect(logo_image[0, 0]).to eq([254, 255, 255, 255])
+      expect(logo_image[75, 144]).to eq([0, 255, 255, 255])
+      expect(logo_image[206, 191]).to eq([254, 229, 98, 108])
+    end
+  end
+
+  describe '#[]=' do
+    it "RGB" do
+      logo_image[0, 0] = [229, 98, 108]
+      expect(logo_image[0, 0]).to eq([255, 229, 98, 108])
+    end
+
+    it "ARGB" do
+      logo_image[0, 0] = [150, 229, 98, 108]
+      expect(logo_image[0, 0]).to eq([150, 229, 98, 108])
+    end
+  end
+
+  describe '#compare' do
+    it "RGB" do
+      expect(logo_image.compare(0, 0, [255, 255, 255])).to eq(false)
+      expect(logo_image.compare(75, 144, [255, 255, 255])).to eq(false)
+      expect(logo_image.compare(206, 191, [229, 98, 108])).to eq(false)
+    end
+
+    it "ARGB" do
+      expect(logo_image.compare(0, 0, [254, 255, 255, 255])).to eq(true)
+      expect(logo_image.compare(75, 144, [0, 255, 255, 255])).to eq(true)
+      expect(logo_image.compare(206, 191, [254, 229, 98, 108])).to eq(true)
+    end
+  end
+
   describe '#slice' do
     let(:image) { DXRubySDL::Image.load(fixture_path('logo.png')) }
 

data/spec/lib/dxruby_sdl/sound_spec.rb

@@ -81,7 +81,34 @@ describe DXRubySDL::Sound, '音を表すクラス' do
     end
   end
 
+  describe '#loop_count=' do
+    context 'WAVE file', wave: true do
+      it 'SDL::Waveのループ回数を変更する' do
+        wave =
+          sound.instance_variable_get('@sound').instance_variable_get('@wave')
+        expect(SDL::Mixer).to receive(:play_channel).with(-1, wave, 1)
+        sound.loop_count = 1
+        sound.play
+      end
+    end
+
+    context 'MIDI file', midi: true do
+      it 'SDL::Musicのループ回数を変更する' do
+        music =
+          sound.instance_variable_get('@sound').instance_variable_get('@music')
+        expect(SDL::Mixer).to receive(:play_music).with(music, 1)
+        sound.loop_count = 1
+        sound.play
+      end
+    end
+  end
+
   describe '#stop' do
+    it '再生していないサウンドを停止でエラーが発生しない' do
+      sound = DXRubySDL::Sound.new(fixture_path('sound.wav'))
+      expect { sound.stop }.to_not raise_error
+    end
+
     context 'WAVE file', wave: true do
       let(:path) { fixture_path('sound.wav') }
       let(:sound) { DXRubySDL::Sound.new(path) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dxruby_sdl
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,7 +244,7 @@ files:
 - spec/lib/dxruby_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helper.rb
-homepage: https://github.com/takaokouji/dxruby-sdl
+homepage: https://github.com/smalruby/dxruby-sdl
 licenses:
 - MIT
 metadata: {}
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: 2D graphics and game library