dxruby_sdl 0.0.4 → 0.0.5

data/lib/dxruby_sdl/sprite.rb

@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+
+module DXRubySDL
+  class Sprite
+    attr_accessor :x
+    attr_accessor :y
+    attr_reader :image
+    attr_accessor :z
+    attr_accessor :angle
+    attr_accessor :scale_x
+    attr_accessor :scale_y
+    attr_accessor :center_x
+    attr_accessor :center_y
+    attr_accessor :alpha
+    attr_accessor :blend
+    attr_accessor :shader
+    attr_accessor :target
+    attr_accessor :collision
+    attr_accessor :collision_enable
+    attr_accessor :collision_sync
+    attr_accessor :visible
+
+    class << self
+      def check(o_sprites, d_sprites, shot = :shot, hit = :hit)
+        res = false
+        o_sprites = [o_sprites].flatten.select { |s| s.is_a?(self) }
+        d_sprites = [d_sprites].flatten.select { |s| s.is_a?(self) }
+        discards = []
+        o_sprites.each do |o_sprite|
+          if discards.include?(o_sprite)
+            next
+          end
+          d_sprites.each do |d_sprite|
+            if discards.include?(o_sprite)
+              break
+            end
+            if discards.include?(d_sprite)
+              next
+            end
+            if o_sprite === d_sprite
+              res = true
+              discard = false
+              if o_sprite.respond_to?(shot) && shot
+                if o_sprite.send(shot, d_sprite) == :discard
+                  discard = true
+                end
+              end
+              if d_sprite.respond_to?(hit) && hit
+                if d_sprite.send(hit, o_sprite) == :discard
+                  discard = true
+                end
+              end
+              if discard
+                discards << o_sprite
+                discards << d_sprite
+              end
+            end
+          end
+        end
+        return res
+      end
+
+      def update(sprites)
+        sprites.flatten.each do |s|
+          if s.respond_to?(:update)
+            s.update
+          end
+        end
+      end
+
+      def draw(sprites)
+        sprites.flatten.each do |s|
+          if s.respond_to?(:draw)
+            s.draw
+          end
+        end
+      end
+
+      def clean(sprites)
+        return [sprites].flatten.compact.reject(&:vanished?)
+      end
+    end
+
+    def initialize(x = 0, y = 0, image = nil)
+      @x = x
+      @y = y
+      @image = image
+
+      @collision_enable = true
+      @collision_sync = true
+      @visible = true
+      @vanished = false
+
+      calc_center
+    end
+
+    def image=(val)
+      @image = val
+      calc_center
+    end
+
+    def draw
+      if !@visible || vanished?
+        return
+      end
+      [:target, :blend, :shader].each do |method|
+        if send(method)
+          raise NotImplementedError, "Sprite#draw with #{method}"
+        end
+      end
+      options = {}
+      if angle
+        options[:angle] = angle
+      end
+      if scale_x
+        options[:scale_x] = scale_x
+      end
+      if scale_y
+        options[:scale_y] = scale_y
+      end
+      if center_x
+        options[:center_x] = center_x
+      end
+      if center_y
+        options[:center_y] = center_y
+      end
+      Window.draw_ex(x, y, image, options)
+    end
+
+    def ===(other)
+      if !@collision_enable || vanished? ||
+          !other.collision_enable || other.vanished? ||
+          !other.image && !other.collision
+        return false
+      end
+      if @collision_enable && @collision
+        x, y, width, height =
+          @collision[0] + @x, @collision[1] + @y, @collision[2], @collision[3]
+      else
+        x, y, width, height =
+          @x, @y, @image.width, @image.height
+      end
+      if other.collision_enable && other.collision
+        other_x, other_y, other_width, other_height =
+          other.collision
+      else
+        other_x, other_y, other_width, other_height =
+          other.x, other.y, other.image.width, other.image.height
+      end
+      return other_x + other_width > x && other_x < x + width &&
+        other_y + other_height > y && other_y < y + height
+    end
+
+    def check(sprites)
+      return [sprites].flatten.select { |s| self === s }
+    end
+
+    def vanish
+      @vanished = true
+    end
+
+    def vanished?
+      return @vanished
+    end
+
+    private
+
+    def calc_center
+      if @image
+        @center_x = @image.width / 2
+        @center_y = @image.height / 2
+      else
+        @center_x = 0
+        @center_y = 0
+      end
+    end
+  end
+end

data/lib/dxruby_sdl/version.rb

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

data/lib/dxruby_sdl/window.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 require 'dxruby_sdl/window/fpstimer'
-require 'set'
 
 module DXRubySDL
   module Window
@@ -18,7 +17,7 @@ module DXRubySDL
     end
 
     def scale
-      @scale ||= 1
+      @scale ||= DEFAULTS[:scale]
       return @scale
     end
 
@@ -44,6 +43,8 @@ module DXRubySDL
             case event
             when SDL::Event::Quit
               exit
+            when SDL::Event::KeyDown, SDL::Event::KeyUp
+              Input.send(:handle_key_event, event)
             end
           end
 
@@ -51,7 +52,7 @@ module DXRubySDL
 
           yield
 
-          screen.update_rect(0, 0, 0, 0)
+          screen.flip
 
           Input.send(:store_last_state)
         end
@@ -59,19 +60,54 @@ module DXRubySDL
     end
 
     def draw(x, y, image, z = 0)
+      if z != 0
+        raise NotImplementedError, 'Window.draw(x, y, image, z != 0)'
+      end
+      image._surface_display_format_alpha
       screen.put(image._surface, x, y)
     end
 
+    def draw_ex(x, y, image, hash = {})
+      if hash[:z] && hash[:z] != 0
+        raise NotImplementedError, 'Window.draw_ex(x, y, image, z: != 0)'
+      end
+      image._surface_display_format_alpha
+      option = {
+        angle: 0,
+        scale_x: 1,
+        scale_y: 1,
+        center_x: 0,
+        center_y: 0,
+      }.merge(hash)
+      SDL::Surface.transform_blit(image._surface, screen,
+                                  option[:angle],
+                                  option[:scale_x], option[:scale_y],
+                                  option[:center_x], option[:center_y],
+                                  x + option[:center_x], y + option[:center_y],
+                                  SDL::Surface::TRANSFORM_SAFE)
+    end
+
     def draw_font(x, y, string, font, hash = {})
+      if string.empty?
+        return
+      end
       if hash[:color]
         r, g, b = *hash[:color]
       else
         r, g, b = 255, 255, 255
       end
-      font._ttf.draw_blended_utf8(screen, string, x, y, r, g, b)
+      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(screen, line, x, y + i * h, r, g, b)
+      end
     end
 
     def open_filename(filter, title)
+      # :nocov:
       if /darwin/ =~ RUBY_PLATFORM
         apple_script = <<-EOS
 on run
@@ -87,24 +123,25 @@ end run
       else
         raise NotImplementedError, 'Window.open_filename'
       end
+      # :nocov:
     end
 
-    # rubocop:disable SymbolName
     class << self
       attr_writer :width
       attr_writer :height
       attr_writer :scale
 
+      alias_method :drawEx, :draw_ex
       alias_method :drawFont, :draw_font
       alias_method :openFilename, :open_filename
     end
-    # rubocop:enable SymbolName
 
     private
 
     DEFAULTS = {
       width: 640,
       height: 480,
+      scale: 1,
       background_color: [0, 0, 0],
     }
     private_constant :DEFAULTS
@@ -116,7 +153,9 @@ end run
       def screen
         return SDL::Screen.get
       rescue SDL::Error
-        return SDL::Screen.open(width, height, 16, SDL::SWSURFACE)
+        flags =
+          SDL::HWSURFACE | SDL::ASYNCBLIT | SDL::HWPALETTE | SDL::DOUBLEBUF
+        return SDL::Screen.open(width, height, 0, flags)
       end
     end
   end

data/lib/dxruby_sdl.rb

@@ -152,6 +152,8 @@ module DXRubySDL
   ].each.with_index do |dik_name, i|
     const_set(dik_name.sub(/\ADI/, '').to_sym, i)
   end
+  K_BACKSPACE = K_BACK
+  K_NUMPADSTAR = K_MULTIPLY
 
   %w[
     P_LEFT
@@ -220,5 +222,6 @@ require 'dxruby_sdl/font'
 require 'dxruby_sdl/input'
 require 'dxruby_sdl/sound'
 require 'dxruby_sdl/sound_effect'
+require 'dxruby_sdl/sprite'
 
 SDL.init(SDL::INIT_EVERYTHING)

data/spec/{dxruby_sdl → lib/dxruby_sdl}/color_spec.rb

@@ -25,8 +25,8 @@ describe DXRubySDL::Color, 'カラーを変換するモジュール' do
     context '引数が3つの要素の配列の場合' do
       let(:color) { [0, 125, 255] }
 
-      it '常に255を返す' do
-        should eq(255)
+      it '常にnilを返す' do
+        should eq(nil)
       end
     end
 

data/spec/lib/dxruby_sdl/font_spec.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe DXRubySDL::Font, 'フォントを表すクラス' do
+  describe '.new' do
+    given = 32
+    context "大きさ(#{given.inspect})を指定した場合" do
+      subject { described_class.new(given) }
+
+      its(:size) { should eq(given) }
+    end
+  end
+
+  shared_context '#get_width' do
+    let(:font) { described_class.new(32) }
+    let(:method) { :get_width }
+
+    subject { font.send(method, 'やあ') }
+
+    it { should be_kind_of(Integer) }
+
+    it 'SDL::TTF#text_size(\'やあ\')を呼び出す' do
+      expect_any_instance_of(SDL::TTF)
+        .to receive(:text_size).with('やあ').once.and_return([62, 32])
+      subject
+    end
+  end
+
+  describe '#get_width', '文字列の描画幅を返す' do
+    include_context '#get_width'
+
+    describe 'alias' do
+      describe '#getWidth' do
+        it_behaves_like '#get_width' do
+          let(:method) { :getWidth }
+        end
+      end
+    end
+  end
+end

data/spec/{dxruby_sdl → lib/dxruby_sdl}/image_spec.rb

@@ -14,10 +14,7 @@ describe DXRubySDL::Image, '画像を表すクラス' do
   end
 
   describe '.load' do
-    subject {
-      path = File.expand_path("../../fixtures/#{filename}", __FILE__)
-      DXRubySDL::Image.load(path)
-    }
+    subject { DXRubySDL::Image.load(fixture_path(filename)) }
 
     context 'PNG形式のファイルの場合' do
       let(:filename) { 'logo.png' }
@@ -198,4 +195,50 @@ describe DXRubySDL::Image, '画像を表すクラス' do
       end
     end
   end
+
+  shared_context '#draw_font' do
+    let!(:font) { DXRubySDL::Font.new(32) }
+    let(:args) { [0, 0, 'やあ', font] }
+
+    include_context 'draw methods'
+
+    context '引数が空文字列の場合' do
+      let(:args) { [0, 0, '', font] }
+
+      it 'なにもしない' do
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    context '引数が複数行の場合' do
+      let(:args) { [0, 0, "やあ\n\nこんにちは\n\nHello\n", font] }
+
+      it 'なにもしない' do
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    color = [255, 0, 0]
+    context "第5引数の色(#{color.inspect})を指定した場合" do
+      let(:args) { [0, 0, 'やあ', font, color] }
+
+      it '文字列を描画する' do
+        subject
+      end
+    end
+  end
+
+  describe '#draw_font' do
+    subject { image.draw_font(*args) }
+
+    include_context '#draw_font'
+
+    describe 'alias' do
+      describe '#drawFont' do
+        it_behaves_like '#draw_font' do
+          subject { image.drawFont(*args) }
+        end
+      end
+    end
+  end
 end