geo3d 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870525f0b9b488f8fe0bd03f72e679d173b40222
-  data.tar.gz: c9803964afa4f1cf843b9a4472b2a16aa749abf5
+  metadata.gz: e792232f7a90e668e5cae09575b15574c33c0b30
+  data.tar.gz: 18ccd86ed62ef23860e8bd4bc650958b0401836f
 SHA512:
-  metadata.gz: b377f16be7634b34158dbf5b21d0960c3025a4188c1ffb1e90b905f0621063d94a0d3f5f2185e5db3dc019984065dc06f4eb05a7bc2358dad37e1fb3bf257143
-  data.tar.gz: 11fbe068470ca6034a2174344f5f6a33cbae544821ae5eb7136a91e3d02688ded7e672fedab991ff734d398f4f71c0dcb5be727be082b72cd6baba752af43ba4
+  metadata.gz: 048b7fb31747320c8024580e1381b630540442a1810089a9a6b49a94060140b0e8cb56e105927de9c6b15cdacda5e4a753934e2e42578979fb6763b7714a85b1
+  data.tar.gz: 119f28b82c0ed685bbf834e215b80501855520e848daf6a9a2f63e289c768116ead912585fec145d277e30213e0d78b0ae55d60b7e77d37f86aee47d1d981429

data/geo3d.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "misha-ruby-sdl-ffi"
+  spec.add_development_dependency "ruby-opengl"
 end

data/lib/geo3d.rb

@@ -3,5 +3,6 @@ require 'vector'
 require 'matrix'
 require 'quaternion'
 require 'plane'
+require 'triangle'
 
 

data/lib/geo3d/version.rb

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

data/lib/matrix.rb

@@ -186,6 +186,15 @@ module Geo3d
         transformed_vector.z = _13 * vec.x + _23 * vec.y + _33 * vec.z + _43 * vec.w
         transformed_vector.w = _14 * vec.x + _24 * vec.y + _34 * vec.z + _44 * vec.w
         return transformed_vector
+      elsif Triangle == v.class
+        tri = v
+        transformed_tri = Triangle.new
+        transformed_tri.a = self * tri.a
+        transformed_tri.b = self * tri.b
+        transformed_tri.c = self * tri.c
+        return transformed_tri
+      elsif Array == v.class
+        return v.map { |i| self * i }
       else
         scalar = v
         result._11 = _11 * scalar
@@ -238,7 +247,7 @@ module Geo3d
     end
 
     def transform_coord vec
-      self * Vector.new( vec.x, vec.y, vec.z, 1.0 )
+      self * Vector.new(vec.x, vec.y, vec.z, 1.0)
     end
 
     def transform vec
@@ -436,7 +445,38 @@ module Geo3d
     end
 
     def to_s
-      (0..3).to_a.map{ |i| row(i).to_s}.join "\n"
+      (0..3).to_a.map { |i| row(i).to_s }.join "\n"
+    end
+
+    def self.glu_perspective_degrees fovy, aspect, zn, zf
+      fovy = fovy.to_f
+      aspect = aspect.to_f
+      zn = zn.to_f
+      zf = zf.to_f
+      range = zn*Math.tan(Geo3d::Utils.to_radians(fovy/2.0))
+      self.gl_frustum -range*aspect, range*aspect, -range, range, zn, zf
+    end
+
+    def self.gl_frustum 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
+      a = (r+l) / (r-l)
+      b = (t+b) / (t-b)
+      c = -(zf + zn) / (zf - zn)
+      d = -(2 * zf * zn) / (zf - zn)
+      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._32 = b
+      matrix._33 = c
+      matrix._43 = d
+      matrix._34 = -1.0
+      matrix
     end
 
     def self.perspective_fov_rh fovy, aspect, zn, zf

data/lib/triangle.rb

@@ -0,0 +1,46 @@
+module Geo3d
+  class Triangle
+    attr_accessor :a, :b, :c
+
+    def points
+      [a, b, c]
+    end
+
+    def initialize
+      @a = Vector.new
+      @b = Vector.new
+      @c = Vector.new
+    end
+
+    def flip!
+      @b, @c = @c, @b
+    end
+
+    def flip
+      f = clone
+      f.flip!
+      f
+    end
+
+    def normal
+      (b - a).cross(c - a).normalize
+    end
+
+    def signed_area reference_normal = Vector.new(0,0,-1)
+      sum = Vector.new 0, 0, 0, 0
+      points.each_with_index do |current_point, i|
+        next_point = points[(i == points.size - 1) ? 0 : i+1]
+        sum += current_point.cross next_point
+      end
+      reference_normal.dot(sum) / 2.0
+    end
+
+    def clockwise?
+      signed_area > 0
+    end
+
+    def counter_clockwise?
+      signed_area < 0
+    end
+  end
+end

data/spec/lib/triangle_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Geo3d::Triangle do
+  it "should detect winding" do
+    [{:a => [0,0,0], :b => [1,0,0], :c => [1,1,0], :expected => "counter-clockwise"},
+     {:a => [0,0,0], :b => [1,0,0], :c => [1,-1,0], :expected => "clockwise"}].each do |data|
+      t = Geo3d::Triangle.new
+      t.a = Geo3d::Vector.new *data[:a]
+      t.b = Geo3d::Vector.new *data[:b]
+      t.c = Geo3d::Vector.new *data[:c]
+      winding = t.counter_clockwise?? 'counter-clockwise' : 'clockwise'
+      winding.should == data[:expected]
+    end
+  end
+
+  it "should calculate normal" do
+
+  end
+end

data/spec/opengl/matrix_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe Geo3d::Matrix do
+  before :each do
+    @gl_initialized = false
+    require "ruby-sdl-ffi"
+    require "opengl"
+
+    if SDL.Init(SDL::INIT_VIDEO) < 0
+      puts "not able to init"
+    else
+
+      SDL.GL_SetAttribute SDL::GL_RED_SIZE, 5
+      SDL.GL_SetAttribute SDL::GL_GREEN_SIZE, 5
+      SDL.GL_SetAttribute SDL::GL_BLUE_SIZE, 5
+      SDL.GL_SetAttribute SDL::GL_DEPTH_SIZE, 16
+      SDL.GL_SetAttribute SDL::GL_DOUBLEBUFFER, 1
+
+      if 0 == SDL.SetVideoMode(640, 480, SDL.GetVideoInfo.vfmt.BitsPerPixel, SDL::OPENGL)
+        puts "not able to set video mode"
+      else
+        @gl_initialized = true
+      end
+    end
+    raise "opengl not able to initialize" unless @gl_initialized
+  end
+
+
+  it "the right handed view constructor should be functionally equivalent to gluLookAt" do
+    [{:eye => [1, 0, 0], :focus => [100, 0, -100], :up => [0, 1, 0]}].each do |data|
+      eye = Geo3d::Vector.new *data[:eye]
+      focus = Geo3d::Vector.new *data[:eye]
+      up = Geo3d::Vector.new *data[:eye]
+
+      glMatrixMode GL_MODELVIEW
+      glLoadIdentity
+      gluLookAt eye.x, eye.y, eye.z, focus.x, focus.y, focus.z, up.x, up.y, up.z
+      gl_version = Geo3d::Matrix.new *glGetFloatv(GL_MODELVIEW_MATRIX).flatten
+
+      gl_version.should == Geo3d::Matrix.look_at_rh(eye, focus, up)
+    end
+  end
+
+  it "gl_frustum should be equivalent to opengl glFrustum" 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
+      glFrustum 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_frustum data[:l], data[:r], data[:b], data[:t], data[:zn], data[:zf]
+
+      gl_version.should == geo3d_matrix
+    end
+
+  end
+
+  it "glu_perspective_degrees should be equivalent to opengl gluPerspective" do
+    [{:fovy_in_degrees => 60, :width => 640, :height => 480, :near => 0.1, :far => 1000}].each do |data|
+      glMatrixMode GL_PROJECTION
+      glLoadIdentity
+      gluPerspective data[:fovy_in_degrees], data[:width].to_f/data[:height].to_f, data[:near], data[:far]
+
+      gl_version = Geo3d::Matrix.new *glGetFloatv(GL_PROJECTION_MATRIX).flatten
+      geo3d_matrix = Geo3d::Matrix.glu_perspective_degrees(data[:fovy_in_degrees], data[:width].to_f/data[:height].to_f, data[:near], data[:far])
+
+      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|
+        rand * rand(100)
+      end
+
+      b_values = (0..15).to_a.map do |i|
+        rand * rand(100)
+      end
+
+      geo3d_matrix = Geo3d::Matrix.new(*b_values) * Geo3d::Matrix.new(*a_values)
+
+      glMatrixMode GL_MODELVIEW
+      glLoadIdentity
+      glLoadMatrixf a_values
+      glMultMatrixf b_values
+      gl_version = Geo3d::Matrix.new *glGetFloatv(GL_MODELVIEW).flatten
+
+      gl_version.should == geo3d_matrix
+    end
+  end
+
+
+end

metadata

@@ -1,55 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: geo3d
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: misha-ruby-sdl-ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-opengl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Library for common 3d graphics vector and matrix operations
@@ -59,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,12 +98,15 @@ files:
 - lib/matrix.rb
 - lib/plane.rb
 - lib/quaternion.rb
+- lib/triangle.rb
 - lib/utils.rb
 - lib/vector.rb
 - spec/lib/matrix_spec.rb
 - spec/lib/plane_spec.rb
 - spec/lib/quaternion_spec.rb
+- spec/lib/triangle_spec.rb
 - spec/lib/vector_spec.rb
+- spec/opengl/matrix_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/MishaConway/geo3d
 licenses:
@@ -87,17 +118,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Library for common 3d graphics vector and matrix operations
@@ -105,5 +136,7 @@ test_files:
 - spec/lib/matrix_spec.rb
 - spec/lib/plane_spec.rb
 - spec/lib/quaternion_spec.rb
+- spec/lib/triangle_spec.rb
 - spec/lib/vector_spec.rb
+- spec/opengl/matrix_spec.rb
 - spec/spec_helper.rb