geo3d 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d922bc02f451ded2c7a44b2b3b8aa96f0606b023
-  data.tar.gz: 9d02cbf3e7580833d546447d011e7f360a879727
+  metadata.gz: bb43721b8bbf57fe410e61ea947c754644f50ff2
+  data.tar.gz: 6e913f011af0bc1ecac10e0ba19891b70dc9039d
 SHA512:
-  metadata.gz: 09bc0f46c7f284253784270a80937bc41c7e610a0b869fee9d1333f86d5a1231b4d428f834ad4eb42645c26be71e15fb567cd397c102dabe33cde6ac5b0a57aa
-  data.tar.gz: 2c0a45d96a0824b1ed1e1b5be2e9e8fe6a0c7751c0f8081f69afbc09e34b8245c3299bfdce9106237377e2940933921fcc5d53b345d53dd8ab37657b8e02819b
+  metadata.gz: 88c2a7d26f6aca9cbe58106fcf10a0c5e5ce9721f9344fa0d9a4bf44c5d12715a9f203a007c66aa321033ca4cb8678596e0d409c15caf9feebe138bea4dfd68a
+  data.tar.gz: 59916b7493f0c27a3ba3f2fecbaecdb9cbcd3e0fdc1612aabe57fb1a7f158f7aa4337c2cec8c0c037d4c08ea59558b0b5ec5d1b3192e2f2437e85f737451ebb6

data/README.md

@@ -165,6 +165,7 @@ View matrix constructors
 Misc constructors
 ```
     Geo3d::Matrix.reflection reflection_plane  #returns a reflection matrix where reflection_plane is a Geo3d::Vector that corresponds to the normal of the plane
+    Geo3d::Matrix.shadow light_position, plane  #returns a shadow matrix
 ```
 
 

data/lib/geo3d/version.rb

@@ -1,3 +1,3 @@
 module Geo3d
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/matrix.rb

@@ -1,3 +1,5 @@
+require 'utils'
+
 module Geo3d
   class Matrix
     attr_accessor :_11, :_12, :_13, :_14
@@ -6,7 +8,22 @@ module Geo3d
     attr_accessor :_41, :_42, :_43, :_44
 
     def initialize *args
-      @_11 = 0, @_12 = 0, @_13 = 0, @_14 = 0, @_21 = 0, @_22 = 0, @_23 = 0, @_24 = 0, @_31 = 0, @_32 = 0, @_33 = 0, @_34 = 0, @_41 = 0, @_42 = 0, @_43 = 0, @_44 = 0
+      @_11 = 0
+      @_12 = 0
+      @_13 = 0
+      @_14 = 0
+      @_21 = 0
+      @_22 = 0
+      @_23 = 0
+      @_24 = 0
+      @_31 = 0
+      @_32 = 0
+      @_33 = 0
+      @_34 = 0
+      @_41 = 0
+      @_42 = 0
+      @_43 = 0
+      @_44 = 0
       @_11 = args[0] if args.size > 0
       @_12 = args[1] if args.size > 1
       @_13 = args[2] if args.size > 2
@@ -30,11 +47,24 @@ module Geo3d
     end
 
     def [] x, y
-      to_a[4*y + x]
+      to_a[4*x + y]
     end
 
     def []= x, y, v
-      send (%w{_11 _12 _13 _14 _21 _22 _23 _24 _31 _32 _33 _34 _41 _42 _43 _44}[4*y + x] + '=').to_sym, v
+      send (%w{_11 _12 _13 _14 _21 _22 _23 _24 _31 _32 _33 _34 _41 _42 _43 _44}[4*x + y] + '=').to_sym, v
+    end
+
+    def == m
+      a = to_a
+      b = m.to_a
+      for i in 0..15
+        return false unless Geo3d::Utils.float_cmp a[i], b[i]
+      end
+      true
+    end
+
+    def != m
+      !(self == m)
     end
 
     def +@
@@ -46,7 +76,7 @@ module Geo3d
     end
 
     def + mat
-      sum = Matrix.new
+      sum = self.class.new
 
       sum._11 = _11 + mat._11
       sum._12 = _12 + mat._12
@@ -72,7 +102,7 @@ module Geo3d
     end
 
     def - mat
-      sum = Matrix.new
+      sum = self.class.new
 
       sum._11 = _11 - mat._11
       sum._12 = _12 - mat._12
@@ -98,9 +128,9 @@ module Geo3d
     end
 
     def * v
-      result = Matrix.new
+      result = self.class.new
 
-      if Matrix == v.class
+      if self.class == v.class
         matrix = v
 
         result._11 = _11 * matrix._11 + _12 * matrix._21 + _13 * matrix._31 + _14 * matrix._41
@@ -154,12 +184,12 @@ module Geo3d
     end
 
     def / v
-      if Matrix == v.class
+      if self.class == v.class
         self * v.inverse
       elsif Vector == v.class
         raise 'dividing matrices by vectors not currently supported'
       else
-        result = Matrix.new
+        result = self.class.new
         scalar = v
         result._11 = _11 / scalar
         result._12 = _12 / scalar
@@ -194,8 +224,36 @@ module Geo3d
       self * vec
     end
 
+    def identity?
+      self == self.class.identity
+    end
+
+    def translation_component
+      Vector.new _41, _42, _43
+    end
+
+    def scaling_component
+      Vector.new Vector.new(_11, _12, _13).length, Vector.new(_21, _22, _23).length, Vector.new(_31, _32, _33).length
+    end
+
+    def rotation_component
+      scaling = scaling_component
+      return nil if scaling.x.zero? || scaling.y.zero? || scaling.z.zero?
+      m = Matrix.new
+      m._11=_11 / scaling.x
+      m._12=_12/scaling.x
+      m._13=_13/scaling.x
+      m._21=_21/scaling.y
+      m._22=_22/scaling.y
+      m._23=_23/scaling.y
+      m._31=_31/scaling.z
+      m._32=_32/scaling.z
+      m._33=_33/scaling.z
+      Quaternion.from_matrix m
+    end
+
     def self.identity
-      identity_matrix = Matrix.new
+      identity_matrix = self.new
       identity_matrix._12 = identity_matrix._13 = identity_matrix._14 = 0
       identity_matrix._21 = identity_matrix._23 = identity_matrix._24 = 0
       identity_matrix._31 = identity_matrix._32 = identity_matrix._34 = 0
@@ -204,6 +262,10 @@ module Geo3d
       identity_matrix
     end
 
+    def determinant
+      inverse(true).last
+    end
+
     def inverse with_determinant = false
       mat = to_a
       dst = Array.new 16
@@ -291,7 +353,7 @@ module Geo3d
         dst[j] *= det
       end
 
-      inverted_matrix = Matrix.new *dst
+      inverted_matrix = self.class.new *dst
 
       if with_determinant
         [inverted_matrix, det]
@@ -301,7 +363,7 @@ module Geo3d
     end
 
     def transpose
-      transposed_matrix = Matrix.new
+      transposed_matrix = self.class.new
       transposed_matrix._11 = _11
       transposed_matrix._12 = _21
       transposed_matrix._13 = _31
@@ -347,7 +409,7 @@ module Geo3d
       zf = zf.to_f
       y_scale = 1.0 / Math.tan(0.5*fovy)
       x_scale = y_scale / aspect
-      matrix = Matrix.new
+      matrix = self.new
       matrix._11 = x_scale
       matrix._22 = y_scale
       matrix._33 = zf/(zn - zf)
@@ -363,7 +425,7 @@ module Geo3d
       zf = zf.to_f
       y_scale = 1.0 / Math.tan(0.5*fovy)
       x_scale = y_scale / aspect
-      matrix = Matrix.new
+      matrix = self.new
       matrix._11 = x_scale
       matrix._22 = y_scale
       matrix._33 = zf/(zf - zn)
@@ -411,7 +473,7 @@ module Geo3d
       xaxis = up_direction.cross(zaxis).normalize
       yaxis = zaxis.cross xaxis
 
-      matrix = Matrix.new
+      matrix = self.new
 
       # set column one
       matrix._11 = xaxis.x
@@ -443,7 +505,7 @@ module Geo3d
       xaxis = up_direction.cross(zaxis).normalize
       yaxis = zaxis.cross xaxis
 
-      matrix = Matrix.new
+      matrix = self.new
 
       # set column one
       matrix._11 = xaxis.x
@@ -471,7 +533,7 @@ module Geo3d
     end
 
     def self.reflection reflection_plane
-      reflection_matrix = Matrix.new
+      reflection_matrix = self.new
 
       plane_magnitude = Vector.new(reflection_plane.x, reflection_plane.y, reflection_plane.z, 0).length
       normalized_plane = reflection_plane / plane_magnitude
@@ -508,7 +570,7 @@ module Geo3d
       normalized_plane = plane / norm
       dot = normalized_plane.dot(light_position)
 
-      m = Matrix.new
+      m = self.new
       m._11 = dot - normalized_plane.a * light_position.x
       m._12 = -normalized_plane.a * light_position.y
       m._13 = -normalized_plane.a * light_position.z
@@ -531,7 +593,7 @@ module Geo3d
 
 
     def self.translation x, y, z
-      translation_matrix = Matrix.new
+      translation_matrix = self.new
       translation_matrix._11 = translation_matrix._22 = translation_matrix._33 = translation_matrix._44 = 1
       #todo: consider simplifying with identity
       translation_matrix._41 = x
@@ -541,7 +603,7 @@ module Geo3d
     end
 
     def self.scaling x, y, z
-      scaling_matrix = Matrix.new
+      scaling_matrix = self.new
       scaling_matrix._11 = x
       scaling_matrix._22 = y
       scaling_matrix._33 = z

data/lib/quaternion.rb

@@ -2,18 +2,82 @@ module Geo3d
   class Quaternion
     attr_reader :x, :y, :z, :w
 
-    def initialize rotation_axis = nil, radians = 0
-      @x = @y = @z = @w = 0
+    def initialize
+      @x = @y = @z = @w = 0.0
+    end
+
+    def x= v
+      @x = v.to_f
+    end
+
+    def y= v
+      @y = v.to_f
+    end
+
+    def z= v
+      @z = v.to_f
+    end
+
+    def w= v
+      @w = v.to_f
+    end
+
+    def self.from_axis rotation_axis, radians = 0
+      normalized_rotation_axis = rotation_axis.normalize
+      #const float radians = GeoConvertToRadians( degrees );
+
+      q = self.new
+      q.x = Math.sin(radians / 2.0) * normalized_rotation_axis.x
+      q.y = Math.sin(radians / 2.0) * normalized_rotation_axis.y
+      q.z = Math.sin(radians / 2.0) * normalized_rotation_axis.z
+      q.w = Math.cos(radians / 2.0)
+      q
+    end
+
+    def self.from_matrix pm
+      pout = self.new
+
+      trace = pm._11 + pm._22 + pm._33 + 1.0
+      if trace > 0
+        pout.x = (pm._23 - pm._32) / (2.0 * Math.sqrt(trace))
+        pout.y = (pm._31 - pm._13) / (2.0 * Math.sqrt(trace))
+        pout.z = (pm._12- pm._21) / (2.0 * Math.sqrt(trace))
+        pout.w = Math.sqrt(trace) / 2.0
+        return pout
+      end
+      maxi = 0
+      maxdiag = pm._11
+
+
+      for i in 1..2
+        if pm[i, i] > maxdiag #todo: indexing might need to be fixed > maxdiag
+          maxi = i
+          maxdiag = pm[i, i] #todo: indexing might need to be fixed
+        end
+      end
+      case maxi
+        when 0
+          s = 2.0 * Math.sqrt(1.0 + pm._11 - pm._22 - pm._33)
+          pout.x = 0.25 * s
+          pout.y = (pm._12 + pm._21) / s
+          pout.z = (pm._13 + pm._31) / s
+          pout.w = (pm._23 - pm._32) / s
 
-      if rotation_axis
+        when 1
+          s = 2.0 * Math.sqrt(1.0 + pm._22 - pm._11 - pm._33)
+          pout.x = (pm._12 + pm._21) / s
+          pout.y = 0.25 * s
+          pout.z = (pm._23 + pm._32) / s
+          pout.w = (pm._31 - pm._13) / s
 
-        normalized_rotation_axis = rotation_axis.normalize
-        #const float radians = GeoConvertToRadians( degrees );
-        @x = Math.sin(radians / 2.0) * normalized_rotation_axis.x
-        @y = Math.sin(radians / 2.0) * normalized_rotation_axis.y
-        @z = Math.sin(radians / 2.0) * normalized_rotation_axis.z
-        @w = Math.cos(radians / 2.0);
+        when 2
+          s = 2.0 * Math.sqrt(1.0 + pm._33 - pm._11 - pm._22)
+          pout.x = (pm._13 + pm._31) / s
+          pout.y = (pm._23 + pm._32) / s
+          pout.z = 0.25 * s
+          pout.w = (pm._12 - pm._21) / s
       end
+      pout
     end
 
     def * quat
@@ -41,7 +105,11 @@ module Geo3d
     end
 
     def axis
-      Vector.new(x, y, z).normalize
+      v = Vector.new
+      v.x = x / Math.sqrt(1-w*w)
+      v.y = y / Math.sqrt(1-w*w)
+      v.z = z / Math.sqrt(1-w*w)
+      v
     end
 
     def angle

data/lib/utils.rb

@@ -0,0 +1,7 @@
+module Geo3d
+  module Utils
+    def self.float_cmp a, b, tolerance = 0.01
+      (a-b).abs < tolerance
+    end
+  end
+end

data/lib/vector.rb

@@ -7,7 +7,10 @@ module Geo3d
     alias :d :w
 
     def initialize *args
-      @x, @y, @z, @w = 0, 0, 0, 0
+      @x = 0.0
+      @y = 0.0
+      @z = 0.0
+      @w = 0.0
       @x = args[0].to_f if args.size > 0
       @y = args[1].to_f if args.size > 1
       @z = args[2].to_f if args.size > 2
@@ -47,11 +50,11 @@ module Geo3d
     end
 
     def == vec
-      x == vec.x && y == vec.y && z == vec.z && w == vec.w
+      Geo3d::Utils.float_cmp(x, vec.x) && Geo3d::Utils.float_cmp(y, vec.y) && Geo3d::Utils.float_cmp(z, vec.z) && Geo3d::Utils.float_cmp(w, vec.w)
     end
 
     def != vec
-      x != vec.x || y != vec.y || z != vec.z || w != vec.w
+      !(self == vec)
     end
 
     def cross vec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo3d
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - lib/geo3d/version.rb
 - lib/matrix.rb
 - lib/quaternion.rb
+- lib/utils.rb
 - lib/vector.rb
 homepage: https://github.com/MishaConway/geo3d
 licenses: