geo3d 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c051605a8dd60b857e28eb5cd761dee1945f71
-  data.tar.gz: 5637c0862c56ad4f92f3491575b866c0e4719713
+  metadata.gz: f3462d13ff5931e068cd063b2bfeafe32a2f4b17
+  data.tar.gz: 1e9791d44fb25bd1f490a60240ca6136fa464cdd
 SHA512:
-  metadata.gz: 140091ea429a7e8385668e197194b1300b83c0eefe2a9306699f85208be9e94c81aa06b936dd8eb81db2f98e69a2af16c0cde94200b0a3acadc5a5e55c83c1f7
-  data.tar.gz: 57abc21c5d11b25311eca919b83d0b201bf695faf5c50465eac9fd29c63fb22d005520f200175f0dc4468ea9e8e58c6d112dbe96cfeca38a3fbaae42df51895a
+  metadata.gz: 945c70f63e01ef6be80054858899c924e383d116148b6e2b4a6b9ac7b3f24d684d6d283bd80a929fb66dec62a161942ed2f0b6334394317465a86c2bdb1965b4
+  data.tar.gz: a69c83d5ad537b48d77eff2441bd89889bf4066557bdfda975af972cbcfc57b1c6ab8cac449261ff79a1e5f10bbfff6f9892a542ec83ce79d5fcbf56b3062817

data/README.md

@@ -164,16 +164,18 @@ Rotation
     angle = 0.9
     Geo3d::Matrix.rotation axis, angle #rotate about an arbitrary axis
 ```
-Projection matrix constructors ala Direct3D   (clip space has a range of 0 to 1)
+Projection matrix constructors ala Direct3D   (clip space of z coordinate 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)
+Projection matrix constructors ala OpenGL  (clip space of z coordinate has a range of -1 to 1)
 ```
-    Geo3d::Matrix.glu_perspective_degrees fovy, aspect, zn, zf #returns an opengl style right handed projection matrix
+    Geo3d::Matrix.glu_perspective_degrees fovy, aspect, zn, zf #returns an opengl style right handed perspective projection matrix
+    Geo3d::Matrix.gl_frustum l, r, b, t, zn, zf #returns an opengl style right handed perspective projection matrix
+    Geo3d::Matrix.gl_ortho l, r, b, t, zn, zf  #returns an opengl style righthanded orthographic projection matrix
 ```
 View matrix constructors
 ```
@@ -300,7 +302,18 @@ Constructors
 
 ```
 
-Documentation coming soon!
+
+## Triangle
+
+Represents a triangle in three dimensional space
+
+Constructors
+```
+    Geo3d::Triangle.from_axis rotation_axis, radians  #returns a quaternion from an axis and angle
+    Geo3d::Quaternion.from_matrix m  #returns a quaternion from a rotation matrix
+    Geo3d::Quaternion.identity  #returns the identity quaternion
+
+```
 
 
 

data/lib/geo3d/version.rb

@@ -1,3 +1,3 @@
 module Geo3d
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 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 = 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
@@ -479,6 +479,8 @@ module Geo3d
       matrix
     end
 
+
+
     def self.perspective_fov_rh fovy, aspect, zn, zf
       fovy = fovy.to_f
       aspect = aspect.to_f
@@ -511,6 +513,24 @@ module Geo3d
       matrix
     end
 
+    def self.gl_ortho 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
+      matrix = self.new
+      matrix._11 = 2.0 / (r-l)
+      matrix._22 = 2.0 / (t-b)
+      matrix._33 = -2.0 / (zf - zn)
+      matrix._41 = -(r+l) / (r-l)
+      matrix._42 = -(t+b) / (t-b)
+      matrix._43 = -(zf+zn) / (zf-zn)
+      matrix._44 = 1.0
+      matrix
+    end
+
     def self.ortho_off_center_rh l, r, b, t, zn, zf
       l = l.to_f
       r = r.to_f

data/lib/triangle.rb

@@ -6,10 +6,10 @@ module Geo3d
       [a, b, c]
     end
 
-    def initialize
-      @a = Vector.new
-      @b = Vector.new
-      @c = Vector.new
+    def initialize *args
+      @a = args.size > 0 ? args[0] : Vector.new
+      @b = args.size > 1 ? args[1] : Vector.new
+      @c = args.size > 2 ? args[2] : Vector.new
     end
 
     def flip!
@@ -35,12 +35,12 @@ module Geo3d
       reference_normal.dot(sum) / 2.0
     end
 
-    def clockwise?
-      signed_area > 0
+    def clockwise? reference_normal = Vector.new(0,0,-1)
+      signed_area( reference_normal ) > 0
     end
 
-    def counter_clockwise?
-      signed_area < 0
+    def counter_clockwise? reference_normal = Vector.new(0,0,-1)
+      signed_area( reference_normal ) < 0
     end
   end
 end

data/spec/opengl/matrix_spec.rb

@@ -69,6 +69,20 @@ describe Geo3d::Matrix do
     end
   end
 
+  it "gl_ortho should be equivalent to opengl glOrtho" do
+    [{:l => -2, :r => 2, :b => -2, :t => 2, :zn => 1, :zf => 1000},
+     {:l => -231, :r => 453, :b => -232, :t => 2786, :zn => 9.221, :zf => 10000}].each do |data|
+      glMatrixMode GL_PROJECTION
+      glLoadIdentity
+      glOrtho data[:l], data[:r], data[:b], data[:t], data[:zn], data[:zf]
+
+      gl_version = Geo3d::Matrix.new *(glGetFloatv(GL_PROJECTION_MATRIX).flatten)
+      geo3d_matrix = Geo3d::Matrix.gl_ortho data[:l], data[:r], data[:b], data[:t], data[:zn], data[:zf]
+
+      gl_version.should == geo3d_matrix
+    end
+  end
+
   it "should multiply matrices the same way opengl does" do
     10000.times do
       a_values = (0..15).to_a.map do |i|

metadata

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