geo3d 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec800a7b43a09953bbbcb5ed8c56c556366e2f67
-  data.tar.gz: 456e73c6c0a3897743b0f309d319e81593109bee
+  metadata.gz: d922bc02f451ded2c7a44b2b3b8aa96f0606b023
+  data.tar.gz: 9d02cbf3e7580833d546447d011e7f360a879727
 SHA512:
-  metadata.gz: 5d5890e94efad1febb36e354dbb5dab3ce8383c11a335014d15b58677f572cbd12d4940150e0c0d2593e466a5703e4b734776a307e8bf3042a2a2977cbac3faf
-  data.tar.gz: a8ece5e4e6942f37ea0ed6cb633a64228a4c6fff72c3ea5de2adab025221902fc0572975543bb1f54e4ceb9df3f6e2541223b83e2ff8b19e6da99968410e0470
+  metadata.gz: 09bc0f46c7f284253784270a80937bc41c7e610a0b869fee9d1333f86d5a1231b4d428f834ad4eb42645c26be71e15fb567cd397c102dabe33cde6ac5b0a57aa
+  data.tar.gz: 2c0a45d96a0824b1ed1e1b5be2e9e8fe6a0c7751c0f8081f69afbc09e34b8245c3299bfdce9106237377e2940933921fcc5d53b345d53dd8ab37657b8e02819b

data/README.md

@@ -140,10 +140,22 @@ Scaling
     Geo3d::Matrix.scaling x,y,z #returns a scaling matrix
     Geo3d::Matrix.uniform_scaling scale #returns a uniform scaling matrix
 ```
+Rotation
+```
+    Geo3d::Matrix.rotation_x 0.44 #rotate .44 radians about x axis
+    Geo3d::Matrix.rotation_y 0.44 #rotate .44 radians about y axis
+    Geo3d::Matrix.rotation_z 0.44 #rotate .44 radians about z axis
+
+    axis = Geo3d::Vector.new 1,1,0
+    angle = 0.9
+    Geo3d::Matrix.rotation axis, angle #rotate about an arbitrary axis
+```
 Projection matrix constructors
 ```
-    Geo3d::Matrix.matrix_perspective_fov_rh fovy, aspect, z_near, z_far  #returns a right handed perspective projection matrix
-    Geo3d::Matrix.matrix_perspective_fov_lh fovy, aspect, z_near, z_far  #returns a left handed perspective projection matrix
+    Geo3d::Matrix.perspective_fov_rh fovy, aspect, z_near, z_far  #returns a right handed perspective projection matrix
+    Geo3d::Matrix.perspective_fov_lh fovy, aspect, z_near, z_far  #returns a left handed perspective projection matrix
+    Geo3d::Matrix.ortho_off_center_rh left, right, bottom, top, z_near, z_far #returns a right handed orthographic projection matrix
+    Geo3d::Matrix.ortho_off_center_lh left, right, bottom, top, z_near, z_far #returns a left handed orthographic projection matrix
 ```
 View matrix constructors
 ```
@@ -156,6 +168,10 @@ Misc constructors
 ```
 
 
+## Quaternion
+
+Documentation coming soon!
+
 
 
 

data/lib/geo3d/version.rb

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

data/lib/matrix.rb

@@ -321,7 +321,30 @@ module Geo3d
       transposed_matrix
     end
 
-    def self.matrix_perspective_fov_rh fovy, aspect, zn, zf
+    def print
+      puts "_11: #{_11}\n"
+      puts "_12: #{_12}\n"
+      puts "_13: #{_13}\n"
+      puts "_14: #{_14}\n"
+      puts "_21: #{_21}\n"
+      puts "_22: #{_22}\n"
+      puts "_23: #{_23}\n"
+      puts "_24: #{_24}\n"
+      puts "_31: #{_31}\n"
+      puts "_32: #{_32}\n"
+      puts "_33: #{_33}\n"
+      puts "_34: #{_34}\n"
+      puts "_41: #{_41}\n"
+      puts "_42: #{_42}\n"
+      puts "_43: #{_43}\n"
+      puts "_44: #{_44}\n"
+    end
+
+    def self.perspective_fov_rh fovy, aspect, zn, zf
+      fovy = fovy.to_f
+      aspect = aspect.to_f
+      zn = zn.to_f
+      zf = zf.to_f
       y_scale = 1.0 / Math.tan(0.5*fovy)
       x_scale = y_scale / aspect
       matrix = Matrix.new
@@ -333,18 +356,56 @@ module Geo3d
       matrix
     end
 
-    def self.matrix_perspective_fov_lh fovy, aspect, zn, zf
+    def self.perspective_fov_lh fovy, aspect, zn, zf
+      fovy = fovy.to_f
+      aspect = aspect.to_f
+      zn = zn.to_f
+      zf = zf.to_f
       y_scale = 1.0 / Math.tan(0.5*fovy)
       x_scale = y_scale / aspect
       matrix = Matrix.new
       matrix._11 = x_scale
       matrix._22 = y_scale
-      matrix._33 = zf/(zn - zf)
+      matrix._33 = zf/(zf - zn)
       matrix._34 = 1
-      matrix._43 = -zn*zf/(zn - zf)
+      matrix._43 = zn*zf/(zn - zf)
       matrix
     end
 
+    def self.ortho_off_center_rh l, r, b, t, zn, zf
+      l = l.to_f
+      r = r.to_f
+      b = b.to_f
+      t = t.to_f
+      zn = zn.to_f
+      zf = zf.to_f
+      m = identity
+      m._11 = 2.0 / (r - l)
+      m._22 = 2.0 / (t - b)
+      m._33 = 1.0 / (zn -zf)
+      m._41 = -1.0 -2.0 *l / (r - l)
+      m._42 = 1.0 + 2.0 * t / (b - t)
+      m._43 = zn / (zn -zf)
+      m
+    end
+
+    def self.ortho_off_center_lh l, r, b, t, zn, zf
+      l = l.to_f
+      r = r.to_f
+      b = b.to_f
+      t = t.to_f
+      zn = zn.to_f
+      zf = zf.to_f
+      m = identity
+      m._11 = 2.0 / (r - l)
+      m._22 = 2.0 / (t - b)
+      m._33 = 1.0 / (zf -zn)
+      m._41 = -1.0 -2.0 *l / (r - l)
+      m._42 = 1.0 + 2.0 * t / (b - t)
+      m._43 = zn / (zn -zf)
+      m
+    end
+
     def self.look_at_rh eye_position, look_at_position, up_direction
       zaxis = (eye_position - look_at_position).normalize
       xaxis = up_direction.cross(zaxis).normalize
@@ -442,6 +503,33 @@ module Geo3d
       reflection_matrix
     end
 
+    def self.shadow light_position, plane
+      norm = plane.x * plane.x + plane.y * plane.y + plane.z * plane.z
+      normalized_plane = plane / norm
+      dot = normalized_plane.dot(light_position)
+
+      m = Matrix.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
+      m._14 = -normalized_plane.a * light_position.w
+      m._21 = -normalized_plane.b * light_position.x
+      m._22 = dot - normalized_plane.b * light_position.y
+      m._23 = -normalized_plane.b * light_position.z
+      m._24 = -normalized_plane.b * light_position.w
+      m._31 = -normalized_plane.c * light_position.x
+      m._32 = -normalized_plane.c * light_position.y
+      m._33 = dot - normalized_plane.c * light_position.z
+      m._34 = -normalized_plane.c * light_position.w
+      m._41 = -normalized_plane.d * light_position.x
+      m._42 = -normalized_plane.d * light_position.y
+      m._43 = -normalized_plane.d * light_position.z
+      m._44 = dot - normalized_plane.d * light_position.w
+
+      m
+    end
+
+
     def self.translation x, y, z
       translation_matrix = Matrix.new
       translation_matrix._11 = translation_matrix._22 = translation_matrix._33 = translation_matrix._44 = 1
@@ -465,23 +553,52 @@ module Geo3d
       scaling scale, scale, scale
     end
 
-    def self.rotation_y_rh angle
+    def self.rotation_x angle
+      m = identity
       sine = Math.sin angle
       cosine = Math.cos angle
-      rotation_matrix = Matrix.new
-      rotation_matrix._11 = cosine
-      rotation_matrix._12 = 0
-      rotation_matrix._13 = sine
-      rotation_matrix._14 = 0
-      rotation_matrix._21 = rotation_matrix._23 = rotation_matrix._24 = 0
-      rotation_matrix._22 = 1
-      rotation_matrix._31 = -sine
-      rotation_matrix._32 = 0
-      rotation_matrix._33 = cosine
-      rotation_matrix._34 = 0
-      rotation_matrix._41 = rotation_matrix._42 = rotation_matrix._43 = 0
-      rotation_matrix._44 = 1
-      rotation_matrix
+      m._22 = cosine
+      m._33 = cosine
+      m._23 = sine
+      m._32 = -sine
+      m
+    end
+
+    def self.rotation_y angle
+      m = identity
+      sine = Math.sin angle
+      cosine = Math.cos angle
+      m._11 = cosine
+      m._33 = cosine
+      m._13 = -sine
+      m._31 = sine
+      m
+    end
+
+    def self.rotation_z angle
+      m = identity
+      sine = Math.sin angle
+      cosine = Math.cos angle
+      m._11 = cosine
+      m._22 = cosine
+      m._12 = sine
+      m._21 = -sine
+      m
+    end
+
+    def self.rotation axis, angle
+      v = axis.normalize
+      m = identity
+      m._11 = (1.0 - Math.cos(angle)) * v.x * v.x + Math.cos(angle)
+      m._21 = (1.0 - Math.cos(angle)) * v.x * v.y - Math.sin(angle) * v.z
+      m._31 = (1.0 - Math.cos(angle)) * v.x * v.z + Math.sin(angle) * v.y
+      m._12 = (1.0 - Math.cos(angle)) * v.y * v.x + Math.sin(angle) * v.z
+      m._22 = (1.0 - Math.cos(angle)) * v.y * v.y + Math.cos(angle)
+      m._32 = (1.0 - Math.cos(angle)) * v.y * v.z - Math.sin(angle) * v.x
+      m._13 = (1.0 - Math.cos(angle)) * v.z * v.x - Math.sin(angle) * v.y
+      m._23 = (1.0 - Math.cos(angle)) * v.z * v.y + Math.sin(angle) * v.x
+      m._33 = (1.0 - Math.cos(angle)) * v.z * v.z + Math.cos(angle)
+      m
     end
   end
 end

data/lib/vector.rb

@@ -1,13 +1,17 @@
 module Geo3d
   class Vector
     attr_accessor :x, :y, :z, :w
+    alias :a :x
+    alias :b :y
+    alias :c :z
+    alias :d :w
 
     def initialize *args
       @x, @y, @z, @w = 0, 0, 0, 0
-      @x = args[0] if args.size > 0
-      @y = args[1] if args.size > 1
-      @z = args[2] if args.size > 2
-      @w = args[3] if args.size > 3
+      @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
+      @w = args[3].to_f if args.size > 3
     end
 
     def to_s
@@ -55,7 +59,7 @@ module Geo3d
     end
 
     def dot vec
-      x * vec.x + y * vec.y + z * vec.z
+      x * vec.x + y * vec.y + z * vec.z + w * vec.w
     end
 
     def normalize!
@@ -64,11 +68,12 @@ module Geo3d
         @x /= len
         @y /= len
         @z /= len
+        @w /= len
       end
     end
 
     def normalize
-      v = self.class.new x, y, z
+      v = self.class.new x, y, z, w
       v.normalize!
       v
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo3d
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler