Changeset 27465 for lang/ruby/starframe

Timestamp:

12/27/08 10:00:10 (4 years ago)

Author:

isaisstillalive

Message:

• 当たり判定の名称を省略して使用できるように、Collisionをモジュールに変更しCollidableモジュールでインクルード
  
• それに伴いCollisionの抽象クラスとしての部分をCollision::Baseに抽出
  

Location:

lang/ruby/starframe

Files:

• lib/starframe/sprite/collision.rb (modified) (1 diff)
• lib/starframe/sprite/collision/base.rb (added)
• lib/starframe/sprite/collision/circle.rb (modified) (2 diffs)
• lib/starframe/sprite/collision/dot.rb (modified) (1 diff)
• lib/starframe/sprite/collision/rect.rb (modified) (4 diffs)
• test/starframe/sprite/collision/test_base.rb (added)
• test/starframe/sprite/collision/test_circle.rb (modified) (2 diffs)
• test/starframe/sprite/collision/test_dot.rb (modified) (2 diffs)
• test/starframe/sprite/collision/test_rect.rb (modified) (2 diffs)
• test/starframe/sprite/test_collidable.rb (modified) (1 diff)
• test/starframe/sprite/test_collision.rb (deleted)

lang/ruby/starframe/lib/starframe/sprite/collision.rb

@@ -1 @@
-# = StarFrame::Sprite::Collision -- スプライト当たり判定定義
+require "starframe/sprite/collision/base"
 
 module StarFrame
   class Sprite
-    # = Sprite::Collisionクラス
-    # スプライト当たり判定クラス。
-    # 
-    # 衝突判定を行い、適切な衝突処理を実行するクラス。
-    class Collision
+    module Collision #:nodoc:
       autoload :Dot,    "starframe/sprite/collision/dot"
       autoload :Circle, "starframe/sprite/collision/circle"
       autoload :Rect,   "starframe/sprite/collision/rect"
-      
-      # 基準座標 - 当たり判定の基準座標のX座標。
-      attr_accessor :x
-      # 基準位置 - 当たり判定の基準座標のY座標。
-      attr_accessor :y
-      # 当たり判定の基準座標を[x, y]の配列で取得。
-      def position
-        [@x, @y]
-      end
-      # 当たり判定の基準座標を[x, y]の配列で設定。
-      def position= position
-        @x, @y = position
-      end
-      
-      class << self #:nodoc:
-        # 指定された点が矩形の中に入っているかどうか判定する
-        def dot_in_rect? dot, rect
-          rect[0][0] <= dot[0] && dot[0] <= rect[1][0] &&
-          rect[0][1] <= dot[1] && dot[1] <= rect[1][1]
-        end
-        
-        # 指定された点が円の中に入っているかどうか判定する
-        def dot_in_circle? dot, circle
-          (circle[0][0]-dot[0])**2 + (circle[0][1]-dot[1])**2 <= circle[1]**2
-        end
-      end
-      
-      def initialize sprite, method_name, *options #:nodoc:
-        @sprite, @method_name = sprite, method_name
-        @x = @y = 0
-      end
-      
-      # 衝突しているかどうかを判定する
-      def collide? other
-        other.collide_dispatch? self unless @dispatched
-      end
-      
-      # 衝突しているかどうかを判定し、衝突していれば衝突処理を実行する
-      def collide other
-        return false unless collide? other
-        call       other.sprite
-        other.call @sprite
-        return true
-      end
-      
-      protected
-      attr_reader :sprite #:nodoc:
-      
-      def call other #:nodoc:
-        @sprite.__send__ @method_name, other if @method_name
-      end
-      
-      def global_position #:nodoc:
-        [@sprite.x+@x, @sprite.y+@y]
-      end
-      
-      def collide_dispatch? other #:nodoc:
-        @dispatched = true
-        self.collide? other
-      ensure
-        @dispatched = nil
-      end
     end
   end

lang/ruby/starframe/lib/starframe/sprite/collision/circle.rb

@@ +1 @@
+require "starframe/sprite/collision/base"
+
 module StarFrame
   class Sprite
-    class Collision
-      class Circle < Collision
+    module Collision
+      class Circle < Base
         attr_reader :x, :y, :radius
         
@@ -19 +21 @@
             return super
           end
-          Collision.dot_in_circle?(other.global_position, [global_position, radius])
+          dot_in_circle?(other.global_position, [global_position, radius])
         end
       end

lang/ruby/starframe/lib/starframe/sprite/collision/dot.rb

@@ +1 @@
+require "starframe/sprite/collision/base"
+
 module StarFrame
   class Sprite
-    class Collision
-      class Dot < Collision
+    module Collision
+      class Dot < Base
         attr_reader :x, :y
         

lang/ruby/starframe/lib/starframe/sprite/collision/rect.rb

@@ +1 @@
+require "starframe/sprite/collision/base"
+
 module StarFrame
   class Sprite
-    class Collision
-      class Rect < Collision
+    module Collision
+      class Rect < Base
         attr_reader :x, :y, :width, :height
         
@@ -24 +26 @@
             return super
           end
-          Collision.dot_in_rect?(other.global_position, [[left, top], [right, bottom]])
+          dot_in_rect?(other.global_position, [[left, top], [right, bottom]])
         end
         
@@ -41 +43 @@
           
           other_position = other.global_position
-          return false unless Collision.dot_in_rect?(other_position, [[vleft, vtop], [vright, vbottom]])
+          return false unless dot_in_rect?(other_position, [[vleft, vtop], [vright, vbottom]])
           
           case
@@ -61 +63 @@
           end
           
-          return Collision.dot_in_circle?([x, y], [other_position, other.radius])
+          return dot_in_circle?([x, y], [other_position, other.radius])
         end
       end

lang/ruby/starframe/test/starframe/sprite/collision/test_circle.rb

@@ -1 +1 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
 require "starframe/sprite"
-require "starframe/sprite/collision"
 require "starframe/sprite/collision/dot"
 require "starframe/sprite/collision/circle"
@@ -9 +8 @@
     @texture = StarRuby::Texture.load "test"
   end
-  class NoneCollision < StarFrame::Sprite::Collision
+  class NoneCollision < StarFrame::Sprite::Collision::Base
   end
   

lang/ruby/starframe/test/starframe/sprite/collision/test_dot.rb

@@ -1 +1 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
 require "starframe/sprite"
-require "starframe/sprite/collision"
 require "starframe/sprite/collision/dot"
 
@@ -8 +7 @@
     @texture = StarRuby::Texture.load "test"
   end
-  class NoneCollision < StarFrame::Sprite::Collision
+  class NoneCollision < StarFrame::Sprite::Collision::Base
   end
   

lang/ruby/starframe/test/starframe/sprite/collision/test_rect.rb

@@ -1 +1 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
 require "starframe/sprite"
-require "starframe/sprite/collision"
 require "starframe/sprite/collision/dot"
 require "starframe/sprite/collision/circle"
@@ -10 +9 @@
     @texture = StarRuby::Texture.load "test"
   end
-  class NoneCollision < StarFrame::Sprite::Collision
+  class NoneCollision < StarFrame::Sprite::Collision::Base
   end
   

lang/ruby/starframe/test/starframe/sprite/test_collidable.rb

@@ -1 +1 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "helper"))
 require "starframe/sprite"
-require "starframe/sprite/collision"
+require "starframe/sprite/collidable"
 
-class StarFrame::Sprite::Collision
+class StarFrame::Sprite::Collision::Base
   attr_accessor :target, :method_name, :options
 end
 
 class TestStarFrameSpriteCollidable < Test::Unit::TestCase
-  class TestCollision < StarFrame::Sprite::Collision
+  class TestCollision < StarFrame::Sprite::Collision::Base
     attr_accessor :options