geo3d 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3a00916353a730df2887d4c0d4a3b701b252c8
-  data.tar.gz: 0c2dbbc118ea1d42618e19b8233db5cfac1b4868
+  metadata.gz: 45adfa328b2bbe9761b54a83100d9586214ee33f
+  data.tar.gz: dc95fd625d68ff56aad0e62b92a7e68cab274059
 SHA512:
-  metadata.gz: bc4d3e5fd0f130b41fb5762f3235135e9ef459c239aec73247dc8b7242091924133804f54b6043c58e0ad48b65e5587a5e7ae71bc61ec7374e0e4c85c52c2d38
-  data.tar.gz: 7eed2898daa4bf1fbfab8c6500e9241ccd194a1dc4ffcc228823841398feddfca655774d9be735096badec96cff48b42ccc3fb10864351c654d05623b268a469
+  metadata.gz: 77ada830a67ff35e709ef1efb0e3917696363c61f69d73f9fe27d8c70fd16e6c26d081ad68b8fba61835f4045e10278615b00ca7a41735358695b7a635d8b80d
+  data.tar.gz: ef1bedd83c6438fcea8d93cccf0e46ff43fd337f5f15625c00a1bd6ae6f4a3c5c127af401d130a96819167f8e74b7c1f0d0914296a44276bdc665e6a619e0a41

data/geo3d.gemspec

@@ -22,4 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "ruby-opengl"
+  spec.add_development_dependency "glu"
+  spec.add_development_dependency "glut"
+
 end

data/lib/geo3d/plane.rb

@@ -7,10 +7,7 @@ module Geo3d
     alias :w :d
 
     def initialize *args
-      @a = 0.0
-      @b = 0.0
-      @c = 0.0
-      @d = 0.0
+      @a, @b, @c, @d = 0.0, 0.0, 0.0, 0.0
       @a = args[0].to_f if args.size > 0
       @b = args[1].to_f if args.size > 1
       @c = args[2].to_f if args.size > 2

data/lib/geo3d/version.rb

@@ -1,3 +1,3 @@
 module Geo3d
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/opengl/matrix_spec.rb

@@ -1,43 +1,32 @@
 require 'spec_helper'
+require "opengl"
+require "glu"
+require "glut"
+
+# This spec tests the accuracy of Geo3D by comparing its calculations against the same calculations made in OpenGL
 
 describe Geo3d::Matrix do
+  let(:gl){ Class.new{extend GL} }
+  let(:glu){ Class.new{extend GLU} }
+
+  before :all do
+    GLUT.Init
+    GLUT.InitDisplayMode(GLUT::DOUBLE | GLUT::RGB)
+    GLUT.InitWindowSize(500, 500)
+    GLUT.InitWindowPosition(100, 100)
+    GLUT.CreateWindow('test')
+  end
+
   before :each do
-    @gl_initialized = false
-    #require "ruby-sdl-ffi"
-    require "opengl"
-    include Gl,Glu,Glut
-
-    glutInit
-    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB)
-    glutInitWindowSize(500, 500)
-    glutInitWindowPosition(100, 100)
-    glutCreateWindow('test')
-
-=begin
-    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
-=end
- #   raise "opengl not able to initialize" unless @gl_initialized
+    gl.send :glMatrixMode, GL::PROJECTION
+    gl.send :glLoadIdentity
+    gl.send :glMatrixMode, GL::MODELVIEW
+    gl.send :glLoadIdentity
   end
 
+
   it "the identity constructor should be functionally equivalent to glLoadIdentity" do
-    glMatrixMode GL_MODELVIEW
-    glLoadIdentity
-    gl_version = Geo3d::Matrix.new *glGetFloatv(GL_MODELVIEW_MATRIX).flatten
+    gl_version = Geo3d::Matrix.new *gl.send(:glGetFloatv, GL::MODELVIEW_MATRIX).flatten
     Geo3d::Matrix.identity.should == gl_version
   end
 
@@ -47,11 +36,8 @@ describe Geo3d::Matrix do
       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
-
+      glu.send :gluLookAt, eye.x, eye.y, eye.z, focus.x, focus.y, focus.z, up.x, up.y, up.z
+      gl_version = Geo3d::Matrix.new *gl.send(:glGetFloatv, GL::MODELVIEW_MATRIX).flatten
       gl_version.should == Geo3d::Matrix.look_at_rh(eye, focus, up)
     end
   end
@@ -59,11 +45,12 @@ describe Geo3d::Matrix do
   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)
+      gl.send :glMatrixMode, GL::PROJECTION
+      gl.send :glLoadIdentity
+      gl.send :glFrustum, data[:l], data[:r], data[:b], data[:t], data[:zn], data[:zf]
+
+      gl_version = Geo3d::Matrix.new *(gl.send(: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
@@ -73,11 +60,11 @@ describe Geo3d::Matrix do
 
   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.send :glMatrixMode, GL::PROJECTION
+      gl.send :glLoadIdentity
+      glu.send :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
+      gl_version = Geo3d::Matrix.new *gl.send(: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
@@ -87,11 +74,11 @@ describe Geo3d::Matrix do
   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.send :glMatrixMode, GL::PROJECTION
+      gl.send :glLoadIdentity
+      gl.send :glOrtho, data[:l], data[:r], data[:b], data[:t], data[:zn], data[:zf]
 
-      gl_version = Geo3d::Matrix.new *(glGetFloatv(GL_PROJECTION_MATRIX).flatten)
+      gl_version = Geo3d::Matrix.new *(gl.send(: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
@@ -110,11 +97,10 @@ describe Geo3d::Matrix do
 
       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.send :glMatrixMode, GL::MODELVIEW
+      gl.send :glLoadMatrixf, a_values
+      gl.send :glMultMatrixf, b_values
+      gl_version = Geo3d::Matrix.new *gl.send(:glGetFloatv, GL::MODELVIEW).flatten
 
       gl_version.should == geo3d_matrix
     end
@@ -135,9 +121,8 @@ describe Geo3d::Matrix do
 
     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]]
+    glu_vector = glu.send :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
 
@@ -156,7 +141,7 @@ describe Geo3d::Matrix do
 
     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]]
+    glu_vector = glu.send :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
 

data/spec/spec_helper.rb

@@ -1 +1,6 @@
-require 'geo3d'
+require 'geo3d'
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo3d
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: glu
+  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: glut
+  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
 email:
 - MishaAConway@gmail.com
@@ -114,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Library for common 3d graphics vector and matrix operations