gosling 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6f0f8aedff9ad18db82e215fb3228fd59b79be
-  data.tar.gz: 13b4208f4759774469e045e5cdfaa6d4697343b0
+  metadata.gz: 6522b7771bdf2e2b85a0bf3cbf7f440497d21a91
+  data.tar.gz: e0d6aa8c63c4361aeb7dffb1f25c6310bb050730
 SHA512:
-  metadata.gz: 143ae71d33d54592e6a45624c96f7083f419970110dd09a4763fd7f20f3d55abb1cc0c28b0226a36c55ad2775a1ac846118f57f05580d693a96b0e7a4bf83c85
-  data.tar.gz: e542b0689382e52d4a2e430ba9a389cd99f12a37f261fec7468fbad3afc927b2743301cd820da451ac93635bfd3e0ec74e06384aa2f04477f0709adda717ca89
+  metadata.gz: a1646556b4e6765ceda7ede9e7c7447cd71eda9af4eb510bd7413e9ba8e9116c4c4177e9b8096c3f2fc81584c0bcb310ab6caf00691d951f1b549b5ffb98eeb8
+  data.tar.gz: 719da8786b573ae344338586f2c53ebc0bc41987d392fc0383b218fc4408e94f5f411ffc3a506bf78a9958eae033ae34db14385db3c4702f380e6e312250d753

data/lib/gosling/collision.rb

@@ -15,6 +15,8 @@ module Gosling
   class Collision
     include Singleton
 
+    COLLISION_TOLERANCE = 0.000001
+
     ##
     # Tests two Actors or child classes to see whether they overlap. Actors, having no shape, never overlap. Child
     # classes use appropriate algorithms based on their shape.
@@ -42,6 +44,50 @@ module Gosling
       return true
     end
 
+    ##
+    # Tests two Actors or child classes to see whether they overlap. This is similar to #test, but returns additional
+    # information.
+    #
+    # Arguments:
+    # - shapeA: an Actor
+    # - shapeB: another Actor
+    #
+    # Returns a hash with the following key/value pairs:
+    # - colliding: true if the Actors overlap; false otherwise
+    # - overlap: if colliding, the smallest overlapping distance; nil otherwise
+    # - penetration: if colliding, a vector representing how far shape B must move to be separated from (or merely
+    #     touching) shape A; nil otherwise
+    #
+    def self.get_collision_info(shapeA, shapeB)
+      info = { colliding: false, overlap: nil, penetration: nil }
+
+      return info if shapeA.instance_of?(Actor) || shapeB.instance_of?(Actor)
+
+      return info if shapeA === shapeB
+
+      separation_axes = get_separation_axes(shapeA, shapeB)
+
+      smallest_overlap = nil
+      smallest_axis = nil
+      separation_axes.each do |axis|
+        projectionA = project_onto_axis(shapeA, axis)
+        projectionB = project_onto_axis(shapeB, axis)
+        overlap = get_overlap(projectionA, projectionB)
+        return info unless overlap && overlap > COLLISION_TOLERANCE
+        if smallest_overlap.nil? || smallest_overlap > overlap
+          smallest_overlap = overlap
+          flip = (projectionA[0] + projectionA[1]) * 0.5 > (projectionB[0] + projectionB[1]) * 0.5
+          smallest_axis = flip ? -axis : axis
+        end
+      end
+
+      info[:colliding] = true
+      info[:overlap] = smallest_overlap
+      info[:penetration] = smallest_axis.normalize * smallest_overlap
+
+      return info
+    end
+
     ##
     # Tests a point in space to see whether it is inside the actor's shape or not.
     #
@@ -147,6 +193,11 @@ module Gosling
     end
 
     def self.projections_overlap?(a, b)
+      overlap = get_overlap(a, b)
+      overlap != nil && overlap > COLLISION_TOLERANCE
+    end
+
+    def self.get_overlap(a, b)
       type_check(a, Array)
       type_check(b, Array)
       a.each { |x| type_check(x, Numeric) }
@@ -155,7 +206,11 @@ module Gosling
 
       a.sort! if a[0] > a[1]
       b.sort! if b[0] > b[1]
-      (a[0] <= b[1] && (b[1] <= a[1] || b[0] <= a[0])) || (b[0] <= a[1] && (a[0] <= b[0] || a[1] <= b[1]))
+      return b[1] - b[0] if a[0] <= b[0] && b[1] <= a[1]
+      return a[1] - a[0] if b[0] <= a[0] && a[1] <= b[1]
+      return a[1] - b[0] if a[0] <= b[0] && b[0] <= a[1]
+      return b[1] - a[0] if b[0] <= a[0] && a[0] <= b[1]
+      nil
     end
   end
 end

data/lib/gosling/polygon.rb

@@ -31,16 +31,34 @@ module Gosling
     end
 
     ##
-    # Sets this polygon's vertices. Requires three or more Snow::Vec3.
+    # Sets this polygon's vertices. Requires three or more Snow::Vec2, Vec3, Vec4, or Arrays containing 2 or more
+    # numbers.
     #
     # Usage:
     # - polygon.set_vertices([Snow::Vec3[-1, 0, 0], Snow::Vec3[0, -1, 0], Snow::Vec3[1, 1, 0]])
     #
     def set_vertices(vertices)
       type_check(vertices, Array)
-      raise ArgumentError.new("set_vertices() expects an array of at least three 3D Vectors") unless vertices.length >= 3
-      vertices.each { |v| type_check(v, Snow::Vec3) }
-      @vertices.replace(vertices)
+      raise ArgumentError.new("set_vertices() expects an array of at least three 2D vectors") unless vertices.length >= 3
+      vertices.each do |v|
+        types_check(v, Snow::Vec2, Snow::Vec3, Snow::Vec4, Array)
+        if v.is_a?(Array)
+          raise ArgumentError.new("set_vertices() expects an array of at least three 2D vectors") unless v.length >= 2
+          v.each { |n| type_check(n, Numeric) }
+        end
+      end
+
+      if @vertices.length < vertices.length
+        @vertices.concat(Array.new(vertices.length - @vertices.length) { Snow::Vec3.new })
+      elsif @vertices.length > vertices.length
+        @vertices.pop(@vertices.length - vertices.length)
+      end
+
+      vertices.each_index do |i|
+        @vertices[i].x = vertices[i][0]
+        @vertices[i].y = vertices[i][1]
+        @vertices[i].z = 0
+      end
     end
 
     ##

data/lib/gosling/transformable.rb

@@ -9,57 +9,15 @@ module Gosling
   # SnowMath gem to remain performant.
   #
   module Transformable
-    ##
-    # Wraps Math.sin to produce rationals instead of floats. Common values are returned quickly from a lookup table.
-    #
-    def self.rational_sin(r)
-      type_check(r, Numeric)
-
-      r = r % (2 * Math::PI)
-      case r
-      when 0.0
-        0.to_r
-      when Math::PI / 2
-        1.to_r
-      when Math::PI
-        0.to_r
-      when Math::PI * 3 / 2
-        -1.to_r
-      else
-        Math.sin(r).to_r
-      end
-    end
-
-    ##
-    # Wraps Math.cos to produce rationals instead of floats. Common values are returned quickly from a lookup table.
-    #
-    def self.rational_cos(r)
-      type_check(r, Numeric)
-
-      r = r % (2 * Math::PI)
-      case r
-      when 0.0
-        1.to_r
-      when Math::PI / 2
-        0.to_r
-      when Math::PI
-        -1.to_r
-      when Math::PI * 3 / 2
-        0.to_r
-      else
-        Math.cos(r).to_r
-      end
-    end
-
     attr_reader :rotation
 
     ##
     # Initializes this Transformable to have no transformations (identity matrix).
     #
     def initialize
-      @center = Snow::Vec3[0.to_r, 0.to_r, 1.to_r]
-      @scale = Snow::Vec2[1.to_r, 1.to_r]
-      @translation = Snow::Vec3[0.to_r, 0.to_r, 1.to_r]
+      @center = Snow::Vec3[0, 0, 1]
+      @scale = Snow::Vec2[1, 1]
+      @translation = Snow::Vec3[0, 0, 1]
       reset
     end
 
@@ -68,10 +26,10 @@ module Gosling
     # matrix.
     #
     def reset
-      self.center = 0.to_r, 0.to_r
-      self.scale = 1.to_r, 1.to_r
-      self.rotation = 0.to_r
-      self.translation = 0.to_r, 0.to_r
+      self.center = 0, 0
+      self.scale = 1, 1
+      self.rotation = 0
+      self.translation = 0, 0
     end
 
     ##
@@ -258,6 +216,9 @@ module Gosling
     #
     def rotation=(radians)
       type_check(radians, Numeric)
+      if radians.is_a?(Float)
+        raise ArgumentError.new("Expected a finite number, but received #{radians.inspect}!") unless radians.finite?
+      end
       @rotation = radians
       @rotate_is_dirty = @is_dirty = true
     end
@@ -347,8 +308,8 @@ module Gosling
     def self.transform_point(mat, v)
       type_check(mat, Snow::Mat3)
       type_check(v, Snow::Vec3)
-      result = mat * Snow::Vec3[v[0], v[1], 1.to_r]
-      result[2] = 0.to_r
+      result = mat * Snow::Vec3[v[0], v[1], 1]
+      result[2] = 0
       result
     end
 
@@ -371,8 +332,8 @@ module Gosling
       unless inverse_mat
         raise "Unable to invert matrix: #{mat}!"
       end
-      result = mat.inverse * Snow::Vec3[v[0], v[1], 1.to_r]
-      result[2] = 0.to_r
+      result = mat.inverse * Snow::Vec3[v[0], v[1], 1]
+      result[2] = 0
       result
     end
 
@@ -397,18 +358,17 @@ module Gosling
     def update_scale_matrix
       return unless @scale_is_dirty || @scale_mat.nil?
       @scale_mat ||= Snow::Mat3.new
-      @scale_mat[0] = @scale[0].to_r
-      @scale_mat[4] = @scale[1].to_r
+      @scale_mat[0] = @scale[0]
+      @scale_mat[4] = @scale[1]
       @scale_is_dirty = false
     end
 
     def update_rotate_matrix
       return unless @rotate_is_dirty || @rotate_mat.nil?
       @rotate_mat ||= Snow::Mat3.new
-      @rotate_mat[0] = Transformable.rational_cos(@rotation)
-      @rotate_mat[1] = Transformable.rational_sin(@rotation)
-      @rotate_mat[3] = -Transformable.rational_sin(@rotation)
-      @rotate_mat[4] = Transformable.rational_cos(@rotation)
+      @rotate_mat[4] = @rotate_mat[0] = Math.cos(@rotation)
+      @rotate_mat[1] = Math.sin(@rotation)
+      @rotate_mat[3] = -@rotate_mat[1]
       @rotate_is_dirty = false
     end
 

data/lib/gosling/version.rb

@@ -3,5 +3,5 @@
 # MINOR version when you add functionality in a backwards-compatible manner, and
 # PATCH version when you make backwards-compatible bug fixes.
 module Gosling
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end