dxruby_sdl 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Zjg0ZTM4M2RhNDdlMjkxMzBkYjE5N2IwMDZkNTM3ODNkYmVkODAwYg==
-  data.tar.gz: !binary |-
-    MWQ1MDA3ZjMwZWE4NzFjMmJjZTdlMDFhMTcxNjk1ZDI4MWVlZTM2Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjNmNzNjM2FhY2RiZjI1NmMxYjMyYWE2ODc3MTM3YmEwNThjYTZhMGQ0ZWMw
-    ODc0ZGEwOWI3M2QyNGFhMGU5ZmZlYmM3YWRjNGU1M2E3NDg4YjQyMjY2ZmI5
-    YWYyMDVhMjVkOWRiOTNhYjUyMzY1YjVhYzUwMTA3Y2JmNTE2ZDQ=
-  data.tar.gz: !binary |-
-    MzI1NGZkMzAyM2JkYzViZjI3YzJkNjNjNTA1NTlhNjc2NWE5YjQ4NTk2M2Rm
-    N2M4ODUxMWM4NDViN2E3NWMxZTMzZGNhZjI3YzE2MDFjZmFlY2JmYTQ3OWIw
-    YTkzNDc5NzJlN2U2YTY1NTdiMzgwN2FhZGM4YzQ1NTAwZTIwYjQ=
+SHA1:
+  metadata.gz: 139c626106c76fc47012a4f1770e9f9c4ee89ad9
+  data.tar.gz: 1daf8ade7133805c367c931a5ce68fb2ad77bbc5
+SHA512:
+  metadata.gz: d6c6a7ead348da242f06fbab68ba60ca68a5057ac2e59ae281b933d3b59f8887a415286bdb73f4b00ada9c27b711207aa2835f619e9a3f05dd511216d5c23e8e
+  data.tar.gz: 75936a49d94f56dcb39b17fc0eee68244009a62c6c01671ea3cae5c4f8b57cf7833c3fa7c74748c67174cb36e9808ae134849eb896fbda41b1f9160c6d8960fd

data/lib/dxruby_sdl/sprite.rb

@@ -61,23 +61,38 @@ module DXRubySDL
       end
 
       def update(sprites)
-        sprites.flatten.each do |s|
-          if s.respond_to?(:update)
-            s.update
+        [sprites].flatten.each do |s|
+          if !s.respond_to?(:vanished?) or !s.vanished?
+            if s.respond_to?(:update)
+              s.update
+            end
           end
         end
       end
 
       def draw(sprites)
-        sprites.flatten.each do |s|
-          if s.respond_to?(:draw)
-            s.draw
+        [sprites].flatten.each do |s|
+          if !s.respond_to?(:vanished?) or !s.vanished?
+            if s.respond_to?(:draw)
+              s.draw
+            end
           end
         end
       end
 
       def clean(sprites)
-        return [sprites].flatten.compact.reject(&:vanished?)
+        sprites.size.times do |i|
+          s = sprites[i]
+          if s.kind_of?(Array)
+            clean(s)
+          else
+            if s.respond_to?(:vanished?)
+              sprites[i] = nil if s.vanished?
+            end
+          end
+        end
+        sprites.compact!
+        nil
       end
     end
 
@@ -134,21 +149,22 @@ module DXRubySDL
         return false
       end
       if @collision_enable && @collision
-        x, y, width, height =
-          @collision[0] + @x, @collision[1] + @y, @collision[2], @collision[3]
+        x1, y1, x2, y2 =
+          @collision[0] + @x, @collision[1] + @y, @collision[2] + @x, @collision[3] + @y
       else
-        x, y, width, height =
-          @x, @y, @image.width, @image.height
+        x1, y1, x2, y2 =
+          @x, @y, @image.width + @x - 1, @image.height + @y - 1
       end
       if other.collision_enable && other.collision
-        other_x, other_y, other_width, other_height =
-          other.collision
+        other_x1, other_y1, other_x2, other_y2 =
+          other.collision[0] + other.x, other.collision[1] + other.y,
+          other.collision[2] + other.x, other.collision[3] + other.y
       else
-        other_x, other_y, other_width, other_height =
-          other.x, other.y, other.image.width, other.image.height
+        other_x1, other_y1, other_x2, other_y2 =
+          other.x, other.y, other.image.width + other.x - 1, other.image.height + other.y - 1
       end
-      return other_x + other_width > x && other_x < x + width &&
-        other_y + other_height > y && other_y < y + height
+      return other_x2 >= x1 && other_x1 <= x2 &&
+        other_y2 >= y1 && other_y1 <= y2
     end
 
     def check(sprites)

data/lib/dxruby_sdl/version.rb

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

data/spec/lib/dxruby_sdl/sprite_spec.rb

@@ -311,7 +311,10 @@ describe DXRubySDL::Sprite, 'ゲームのキャラを扱う場合の基本とな
   describe '.clean',
            '配列内のすべてのオブジェクトのvanished?メソッドを呼び出し、' \
            'trueが返ってきた要素と、もともとnilだった要素を削除する' do
-    subject { described_class.clean(ary) }
+    subject {
+      described_class.clean(ary)
+      ary
+    }
 
     shared_examples 'vanished?メソッドを呼び出す' do
       it '配列内のすべてのオブジェクトのvanished?メソッドを呼び出す' do
@@ -322,79 +325,59 @@ describe DXRubySDL::Sprite, 'ゲームのキャラを扱う場合の基本とな
       end
     end
 
-    shared_context '.clean' do
-      context 'すべてのvanished?がtrueを返す場合' do
-        def make_sprite(i)
-          s = double('Sprite')
+    shared_context 'vanished_true', vanished_true: true do
+      def make_sprite(i)
+        s = double('Sprite', index: i)
+        allow(s).to receive(:vanished?).and_return(true)
+        return s
+      end
+    end
+
+    shared_context 'some_item_vanished', some_item_vanished: true do
+      def make_sprite(i)
+        s = double('Sprite', index: i)
+        if i.even?
           allow(s).to receive(:vanished?).and_return(true)
-          return s
+        else
+          allow(s).to receive(:vanished?).and_return(false)
         end
-
-        include_examples 'vanished?メソッドを呼び出す'
-        it { should be_empty }
+        return s
       end
+    end
 
-      context '一部のvanished?がtrueを返す場合' do
-        def make_sprite(i)
-          s = double('Sprite')
-          if i.even?
-            allow(s).to receive(:vanished?).and_return(true)
-          else
-            allow(s).to receive(:vanished?).and_return(false)
-          end
+    shared_context 'vanished_false_or_nil', vanished_false_or_nil: true do
+      def make_sprite(i)
+        if i.even?
+          s = double('Sprite', index: i)
+          allow(s).to receive(:vanished?).and_return(false)
           return s
-        end
-
-        include_examples 'vanished?メソッドを呼び出す'
-
-        it 'vanished?がtrueのものが取り除かれた配列を返す' do
-          should eq(ary.flatten.reject(&:vanished?))
+        else
+          return nil
         end
       end
 
-      context '一部がnil、それ以外のvanished?がfalseを返す場合' do
-        def make_sprite(i)
-          if i.even?
-            s = double('Sprite')
-            allow(s).to receive(:vanished?).and_return(false)
-            return s
-          else
-            return nil
-          end
-        end
-
-        it '配列内のnilではないオブジェクトのvanished?メソッドを呼び出す' do
-          expect {
-            subject
-          }.not_to raise_error
+      it '配列内のnilではないオブジェクトのvanished?メソッドを呼び出す' do
+        expect {
+          subject
+        }.not_to raise_error
 
-          ary.flatten.each do |s|
-            if !s.nil?
-              expect(s).to have_received(:vanished?).once
-            end
+        ary.flatten.each do |s|
+          if !s.nil?
+            expect(s).to have_received(:vanished?).once
           end
         end
-
-        it 'nilのものが取り除かれた配列を返す' do
-          should eq(ary.flatten.reject(&:nil?))
-        end
       end
+    end
 
-      context 'すべてのvanished?がfalseを返す場合' do
-        def make_sprite(i)
-          s = double('Sprite')
-          allow(s).to receive(:vanished?).and_return(false)
-          return s
-        end
-
-        include_examples 'vanished?メソッドを呼び出す'
-
-        it 'なにも取り除かずにフラットにした配列を返す' do
-          should eq(ary.flatten)
-        end
+    shared_context 'vanished_false', vanished_false: true do
+      def make_sprite(i)
+        s = double('Sprite', index: i)
+        allow(s).to receive(:vanished?).and_return(false)
+        return s
       end
     end
 
+
     context '引数がネストしていない配列の場合' do
       let(:ary) {
         5.times.map { |i|
@@ -402,7 +385,34 @@ describe DXRubySDL::Sprite, 'ゲームのキャラを扱う場合の基本とな
         }
       }
 
-      include_context '.clean'
+      context 'すべてのvanished?がtrueを返す場合', vanished_true: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it { should be_empty }
+      end
+
+      context '一部のvanished?がtrueを返す場合', some_item_vanished: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it 'vanished?がtrueのものが取り除かれた配列を返す' do
+          expect(subject.map(&:index)).to eq([1, 3])
+        end
+      end
+
+      context '一部がnil、それ以外のvanished?がfalseを返す場合',
+              vanished_false_or_nil: true do
+        it 'nilのものが取り除かれた配列を返す' do
+          expect(subject.map(&:index)).to eq([0, 2, 4])
+        end
+      end
+
+      context 'すべてのvanished?がfalseを返す場合', vanished_false: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it 'なにも取り除かない' do
+          expect(subject.map(&:index)).to eq([0, 1, 2, 3, 4])
+        end
+      end
     end
 
     context '引数がネストした配列の場合' do
@@ -414,7 +424,37 @@ describe DXRubySDL::Sprite, 'ゲームのキャラを扱う場合の基本とな
         }
       }
 
-      include_context '.clean'
+      context 'すべてのvanished?がtrueを返す場合', vanished_true: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it { expect(subject).to eq(Array.new(5) { [] }) }
+      end
+
+      context '一部のvanished?がtrueを返す場合', some_item_vanished: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it 'vanished?がtrueのものが取り除かれた配列を返す' do
+          expect(subject.map { |i| i.map(&:index) })
+            .to eq(Array.new(5) { [1, 3] })
+        end
+      end
+
+      context '一部がnil、それ以外のvanished?がfalseを返す場合',
+              vanished_false_or_nil: true do
+        it 'nilのものが取り除かれた配列を返す' do
+          expect(subject.map { |i| i.map(&:index) })
+            .to eq(Array.new(5) { [0, 2, 4] })
+        end
+      end
+
+      context 'すべてのvanished?がfalseを返す場合', vanished_false: true do
+        include_examples 'vanished?メソッドを呼び出す'
+
+        it 'なにも取り除かない' do
+          expect(subject.map { |i| i.map(&:index) })
+            .to eq(Array.new(5) { [0, 1, 2, 3, 4] })
+        end
+      end
     end
   end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: dxruby_sdl
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -98,71 +98,71 @@ dependencies:
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubysdl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: rsdl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '`dxruby-sdl` is a ruby library for 2D graphics and game. It has same
-  DXRuby API. It use SDL/Ruby.'
+description: "`dxruby-sdl` is a ruby library for 2D graphics and game. It has same
+  DXRuby API. It use SDL/Ruby."
 email:
 - kouji.takao@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LEGAL
@@ -225,17 +225,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 2D graphics and game library
@@ -257,3 +257,4 @@ test_files:
 - spec/lib/dxruby_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixture_helper.rb
+has_rdoc: