geo3d 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e792232f7a90e668e5cae09575b15574c33c0b30
-  data.tar.gz: 18ccd86ed62ef23860e8bd4bc650958b0401836f
+  metadata.gz: 41c051605a8dd60b857e28eb5cd761dee1945f71
+  data.tar.gz: 5637c0862c56ad4f92f3491575b866c0e4719713
 SHA512:
-  metadata.gz: 048b7fb31747320c8024580e1381b630540442a1810089a9a6b49a94060140b0e8cb56e105927de9c6b15cdacda5e4a753934e2e42578979fb6763b7714a85b1
-  data.tar.gz: 119f28b82c0ed685bbf834e215b80501855520e848daf6a9a2f63e289c768116ead912585fec145d277e30213e0d78b0ae55d60b7e77d37f86aee47d1d981429
+  metadata.gz: 140091ea429a7e8385668e197194b1300b83c0eefe2a9306699f85208be9e94c81aa06b936dd8eb81db2f98e69a2af16c0cde94200b0a3acadc5a5e55c83c1f7
+  data.tar.gz: 57abc21c5d11b25311eca919b83d0b201bf695faf5c50465eac9fd29c63fb22d005520f200175f0dc4468ea9e8e58c6d112dbe96cfeca38a3fbaae42df51895a

data/README.md

@@ -87,7 +87,11 @@ Linear Interpolation
 ```
     vec_a.lerp vec_b, 0.4  #returns a new vector which is the 40% linear interpolation between vec_a and vec_b
 ```
-
+Screenspace projections
+```
+    vec.project viewport, projection, view, world  #transform an objectspace vertex to screenspace
+    vec.unproject viewport, projection, view, world  #transform a screenspace vertex to objectspace
+```
 
 ## Matrix
 
@@ -160,18 +164,26 @@ Rotation
     angle = 0.9
     Geo3d::Matrix.rotation axis, angle #rotate about an arbitrary axis
 ```
-Projection matrix constructors
+Projection matrix constructors ala Direct3D   (clip space has a range of 0 to 1)
 ```
     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
 ```
+Projection matrix constructors ala OpenGL  (clip space has a range of -1 to 1)
+```
+    Geo3d::Matrix.glu_perspective_degrees fovy, aspect, zn, zf #returns an opengl style right handed projection matrix
+```
 View matrix constructors
 ```
     Geo3d::Matrix.look_at_rh eye_position, look_at_position, up_direction #returns a right handed view matrix
     Geo3d::Matrix.look_at_lh eye_position, look_at_position, up_direction #returns a left handed view matrix
 ```
+Viewport matrix constructors
+```
+    Geo3d::Matrix.viewport x, y, width, height
+```
 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

data/lib/geo3d/version.rb

@@ -1,3 +1,3 @@
 module Geo3d
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/matrix.rb

@@ -471,7 +471,7 @@ module Geo3d
       matrix = self.new
       matrix._11 = 2.0 * zn / (r-l)
       matrix._31 = a
-      matrix._22 = 2.0 * zn / (t-b)  #todo: the man page says multiply this by two, but I don't actually match what glFrustum does if I do
+      matrix._22 = zn / (t-b)  #todo: the man page says multiply this by two, but I don't actually match what glFrustum does if I do
       matrix._32 = b
       matrix._33 = c
       matrix._43 = d
@@ -609,6 +609,11 @@ module Geo3d
       matrix
     end
 
+
+    def self.viewport x, y, width, height
+      self.scaling(width.to_f / 2.0, height.to_f / 2.0, 0.5) * self.translation(x.to_f + width.to_f / 2.0, y.to_f + height.to_f / 2.0, 0.5)
+    end
+
     def self.reflection reflection_plane
       reflection_plane = Geo3d::Vector.new *reflection_plane.to_a
       reflection_matrix = self.new
@@ -673,20 +678,20 @@ module Geo3d
 
     def self.translation x, y, z
       translation_matrix = self.new
-      translation_matrix._11 = translation_matrix._22 = translation_matrix._33 = translation_matrix._44 = 1
+      translation_matrix._11 = translation_matrix._22 = translation_matrix._33 = translation_matrix._44 = 1.0
       #todo: consider simplifying with identity
-      translation_matrix._41 = x
-      translation_matrix._42 = y
-      translation_matrix._43 = z
+      translation_matrix._41 = x.to_f
+      translation_matrix._42 = y.to_f
+      translation_matrix._43 = z.to_f
       translation_matrix
     end
 
     def self.scaling x, y, z
       scaling_matrix = self.new
-      scaling_matrix._11 = x
-      scaling_matrix._22 = y
-      scaling_matrix._33 = z
-      scaling_matrix._44 = 1
+      scaling_matrix._11 = x.to_f
+      scaling_matrix._22 = y.to_f
+      scaling_matrix._33 = z.to_f
+      scaling_matrix._44 = 1.0
       scaling_matrix
     end
 

data/lib/vector.rb

@@ -114,6 +114,18 @@ module Geo3d
       l.w = w + (vec.w - w)*s
       l
     end
+
+    def project viewport, projection, view, world
+      clipspace_vector = projection * view * world * one_w
+      normalized_clipspace_vector = (clipspace_vector / clipspace_vector.w.to_f).one_w
+      viewport * normalized_clipspace_vector
+    end
+
+    def unproject viewport, projection, view, world
+      normalized_clipspace_vector = viewport.inverse * one_w
+      almost_objectspace_vector = (projection * view * world).inverse * normalized_clipspace_vector.one_w
+      (almost_objectspace_vector / almost_objectspace_vector.w).one_w
+    end
   end
 end
 

data/spec/opengl/matrix_spec.rb

@@ -91,5 +91,45 @@ describe Geo3d::Matrix do
     end
   end
 
+  it "should project a vector the same way gluProject does" do
+    viewport_data = {:x => 0, :y => 0, :width => 640, :height => 480}
+    projection_data = {:fovy_in_degrees => 60.0, :width => 640.0, :height => 480.0, :near => 0.1, :far => 1000.0}
+    view_data = {:eye => [1.0, 0.0, 0.0], :focus => [200.0, -40.0, -100.0], :up => [0.0, 1.0, 0.0]}
+    eye = Geo3d::Vector.new *view_data[:eye]
+    focus = Geo3d::Vector.new *view_data[:focus]
+    up = Geo3d::Vector.new *view_data[:up]
+
+
+    viewport_matrix = Geo3d::Matrix.viewport viewport_data[:x], viewport_data[:y], viewport_data[:width], viewport_data[:height]
+    projection_matrix = Geo3d::Matrix.glu_perspective_degrees(projection_data[:fovy_in_degrees], projection_data[:width].to_f/projection_data[:height].to_f, projection_data[:near], projection_data[:far])
+    view_matrix = Geo3d::Matrix.look_at_rh(eye, focus, up)
+
+    vector = Geo3d::Vector.new 300, 100, -500
+
+    glu_vector = gluProject vector.x, vector.y, vector.z, projection_matrix.to_a, view_matrix.to_a, [viewport_data[:x], viewport_data[:y], viewport_data[:width], viewport_data[:height]]
+
+    puts "glu vect is #{glu_vector.inspect}"
+    Geo3d::Vector.new(*glu_vector).should == vector.project(viewport_matrix, projection_matrix, view_matrix, Geo3d::Matrix.identity).zero_w
+  end
+
+  it "should unproject a vector the same way gluUnproject does" do
+    viewport_data = {:x => 0, :y => 0, :width => 640, :height => 480}
+    projection_data = {:fovy_in_degrees => 60.0, :width => 640.0, :height => 480.0, :near => 0.1, :far => 1000.0}
+    view_data = {:eye => [1.0, 0.0, 0.0], :focus => [200.0, -40.0, -100.0], :up => [0.0, 1.0, 0.0]}
+    eye = Geo3d::Vector.new *view_data[:eye]
+    focus = Geo3d::Vector.new *view_data[:focus]
+    up = Geo3d::Vector.new *view_data[:up]
+
+
+    viewport_matrix = Geo3d::Matrix.viewport viewport_data[:x], viewport_data[:y], viewport_data[:width], viewport_data[:height]
+    projection_matrix = Geo3d::Matrix.glu_perspective_degrees(projection_data[:fovy_in_degrees], projection_data[:width].to_f/projection_data[:height].to_f, projection_data[:near], projection_data[:far])
+    view_matrix = Geo3d::Matrix.look_at_rh(eye, focus, up)
+
+    vector = Geo3d::Vector.new 574.1784279190967, 294.42147391181595, 0.8485367205965038
+
+    glu_vector = gluUnProject vector.x, vector.y, vector.z, projection_matrix.to_a, view_matrix.to_a, [viewport_data[:x], viewport_data[:y], viewport_data[:width], viewport_data[:height]]
+    Geo3d::Vector.new(*glu_vector).should == vector.unproject(viewport_matrix, projection_matrix, view_matrix, Geo3d::Matrix.identity).zero_w
+  end
+
 
 end

metadata

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