rmath3d 1.1.0 → 1.2.4

data/sample/opengl-bindings/load_matrix.rb

@@ -104,7 +104,7 @@ class App
   def size_callback( window_handle, w, h )
     glViewport( 0, 0, w, h )
     glMatrixMode( GL_PROJECTION )
-    @mtxProj.perspectiveFovRH( 30.0*Math::PI/180.0, w.to_f/h.to_f, 0.1, 1000.0 )
+    @mtxProj.perspectiveFovRH( 30.0*Math::PI/180.0, w.to_f/h.to_f, 0.1, 1000.0, true )
     glLoadMatrixf( @mtxProj.to_a.pack('F16') )
 
     @window_width  = w
@@ -119,7 +119,7 @@ class App
     @at  = RVec3.new(0.0,  0.0,  0.0)
     @up  = RVec3.new(0.0,  1.0,  0.0)
     @mtxLookAt = RMtx4.new.lookAtRH( @eye, @at, @up )
-    @mtxProj = RMtx4.new.perspectiveFovRH( 30.0*Math::PI/180.0, @window_width.to_f/@window_height.to_f, 0.1, 1000.0 )
+    @mtxProj = RMtx4.new.perspectiveFovRH( 30.0*Math::PI/180.0, @window_width.to_f/@window_height.to_f, 0.1, 1000.0, true )
 
     @light_pos = [2.5,0,5,1]
     @light_diffuse  = [1,1,1,1]

data/sample/opengl2/load_matrix.rb

@@ -42,7 +42,7 @@ class App
   def reshape( width, height )
     glViewport( 0, 0, width, height )
     glMatrixMode( GL_PROJECTION )
-    @mtxProj.perspectiveFovRH( 30.0*Math::PI/180.0, width.to_f/height.to_f, 0.1, 1000.0 )
+    @mtxProj.perspectiveFovRH( 30.0*Math::PI/180.0, width.to_f/height.to_f, 0.1, 1000.0, true )
     glLoadMatrix( @mtxProj )
 
     @window_width  = width
@@ -74,7 +74,7 @@ class App
     @at  = RVec3.new(0.0,  0.0,  0.0)
     @up  = RVec3.new(0.0,  1.0,  0.0)
     @mtxLookAt = RMtx4.new.lookAtRH( @eye, @at, @up )
-    @mtxProj = RMtx4.new.perspectiveFovRH( 30.0*Math::PI/180.0, @window_width.to_f/@window_height.to_f, 0.1, 1000.0 )
+    @mtxProj = RMtx4.new.perspectiveFovRH( 30.0*Math::PI/180.0, @window_width.to_f/@window_height.to_f, 0.1, 1000.0, true )
 
     @light_pos = [2.5,0,5,1]
     @light_diffuse  = [1,1,1,1]

data/test/test.rb

@@ -1,4 +1,4 @@
-begin 
+begin
   require 'rmath3d/rmath3d'
 rescue LoadError
   require 'rmath3d/rmath3d_plain'

data/test/test_RMtx4.rb

@@ -485,6 +485,29 @@ class TC_RMtx4 < Minitest::Test
     end
   end
 
+  def test_lookAtLH
+    pEye = RVec3.new( 10, 10, 10 )
+    vDir = ( RVec3.new(0,0,0) - pEye ).normalize! # staring at (0,0,0)
+    vUp = RVec3.new( 0, 1, 0 )
+    vRight = RVec3.cross( vUp, vDir ).normalize!
+    vUp = RVec3.cross( vDir, vRight ).normalize!
+
+    m0 = RMtx4.new( vRight.x, vRight.y, vRight.z, -RVec3.dot(pEye,vRight),
+                    vUp.x,    vUp.y,    vUp.z,    -RVec3.dot(pEye,vUp),
+                    vDir.x,   vDir.y,   vDir.z,   -RVec3.dot(pEye,vDir),
+                    0.0,      0.0,      0.0,       1.0    )
+
+    m1 = RMtx4.new.lookAtLH( RVec3.new(10,10,10), # posistion
+                             RVec3.new(0,0,0),    # at
+                             RVec3.new(0,1,0) )   # up
+
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m0.getElement(r,c), m1.getElement(r,c), @tolerance )
+      end
+    end
+  end
+
   def test_lookAtRH
     pEye = RVec3.new( 10, 10, 10 )
     vDir = ( pEye - RVec3.new(0,0,0) ).normalize! # staring at (0,0,0)
@@ -526,7 +549,7 @@ class TC_RMtx4 < Minitest::Test
                     0.0,         2*z_n/height, 0.0,                  0.0,
                     0.0,         0.0,         -(z_f+z_n)/(z_f-z_n), -2.0*z_f*z_n / (z_f-z_n),
                     0.0,         0.0,         -1.0,                  0.0 )
-    m1 = RMtx4.new.perspectiveRH( width, height, z_n, z_f )
+    m1 = RMtx4.new.perspectiveRH( width, height, z_n, z_f, true )
 
     for r in 0...4 do
       for c in 0...4 do
@@ -540,15 +563,15 @@ class TC_RMtx4 < Minitest::Test
     fovy = 2.0 * Math::atan( (height/2.0) / z_n )
     f = 1.0/Math::tan( fovy/2.0 )
 
-    m2 = RMtx4.new( f/aspect, 0.0,  0.0,                 0.0,
-                    0.0,      f,    0.0,                 0.0,
-                    0.0,      0.0,  (z_f+z_n)/(z_n-z_f), 2*z_f*z_n/(z_n-z_f),
-                    0.0,      0.0, -1.0,                 0.0 )
-    m3 = RMtx4.new.perspectiveFovRH( fovy, aspect, z_n, z_f );
+    m2 = RMtx4.new( f/aspect, 0.0,  0.0,                   0.0,
+                    0.0,      f,    0.0,                   0.0,
+                    0.0,      0.0,  -(z_f+z_n)/(z_f-z_n), -2*z_f*z_n/(z_f-z_n),
+                    0.0,      0.0,  -1.0,                  0.0 )
+    m3 = RMtx4.new.perspectiveFovRH( fovy, aspect, z_n, z_f, true );
 
     for r in 0...4 do
       for c in 0...4 do
-        assert_in_delta( m2.getElement(r,c), m2.getElement(r,c), @tolerance )
+        assert_in_delta( m2.getElement(r,c), m3.getElement(r,c), @tolerance )
       end
     end
 
@@ -563,7 +586,68 @@ class TC_RMtx4 < Minitest::Test
                     0.0,                0.0,                c,   d,
                     0.0,                0.0,               -1.0, 0.0 )
 
-    m5 = RMtx4.new.perspectiveOffCenterRH( left, right, bottom, top, z_n, z_f )
+    m5 = RMtx4.new.perspectiveOffCenterRH( left, right, bottom, top, z_n, z_f, true )
+
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m4.getElement(r,c), m5.getElement(r,c), @tolerance )
+      end
+    end
+  end
+
+  def test_perspectiveLH
+    left  = -640.0
+    right =  640.0
+    bottom = -360.0
+    top    =  360.0
+    z_n = 1.0
+    z_f = 1000.0
+    width = right - left
+    height = top - bottom
+    aspect = width/height
+
+    # RMtx4#perspectiveLH
+    m0 = RMtx4.new( 2*z_n/width, 0.0,          0.0,                  0.0,
+                    0.0,         2*z_n/height, 0.0,                  0.0,
+                    0.0,         0.0,          (z_f+z_n)/(z_f-z_n), -2.0*z_f*z_n / (z_f-z_n),
+                    0.0,         0.0,          1.0,                  0.0 )
+    m1 = RMtx4.new.perspectiveLH( width, height, z_n, z_f, true )
+
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m0.getElement(r,c), m1.getElement(r,c), @tolerance )
+      end
+    end
+
+    # RMtx4#perspectiveFovLH
+
+    # [NOTE] tan(fovy/2) == (height/2)/z_n
+    fovy = 2.0 * Math::atan( (height/2.0) / z_n )
+    f = 1.0/Math::tan( fovy/2.0 )
+
+    m2 = RMtx4.new( f/aspect, 0.0,  0.0,                 0.0,
+                    0.0,      f,    0.0,                 0.0,
+                    0.0,      0.0,  (z_f+z_n)/(z_f-z_n), -2.0*z_f*z_n/(z_f-z_n),
+                    0.0,      0.0,  1.0,                 0.0 )
+    m3 = RMtx4.new.perspectiveFovLH( fovy, aspect, z_n, z_f, true );
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m2.getElement(r,c), m3.getElement(r,c), @tolerance )
+      end
+    end
+
+    # RMtx4#perspectiveOffCenterLH
+
+    a = (right+left)/(right-left)
+    b = (top+bottom)/(top-bottom)
+    c = -(z_f+z_n)/(z_f-z_n)
+    d = -2.0*z_f*z_n/(z_f-z_n)
+    m4 = RMtx4.new( 2*z_n/(right-left), 0.0,                -a,   0.0,
+                    0.0,                2*z_n/(top-bottom), -b,   0.0,
+                    0.0,                0.0,                -c,   d,
+                    0.0,                0.0,                 1.0, 0.0 )
+
+    m5 = RMtx4.new.perspectiveOffCenterLH( left, right, bottom, top, z_n, z_f, true )
 
     for r in 0...4 do
       for c in 0...4 do
@@ -584,14 +668,14 @@ class TC_RMtx4 < Minitest::Test
     height = top - bottom
 
     # RMtx4#orthoRH
-    tx = (right+left)/width
-    ty = (top+bottom)/height
-    tz = (z_f+z_n)/(z_f-z_n)
+    tx = -(right+left)/width
+    ty = -(top+bottom)/height
+    tz = -(z_f+z_n)/(z_f-z_n)
     m0 = RMtx4.new( 2.0/width, 0.0,         0.0,           tx,
                     0.0,       2.0/height,  0.0,           ty,
                     0.0,       0.0,        -2.0/(z_f-z_n), tz,
                     0.0,       0.0,         0.0,           1.0 )
-    m1 = RMtx4.new.orthoRH( width, height, z_n, z_f )
+    m1 = RMtx4.new.orthoRH( width, height, z_n, z_f, true )
 
     for r in 0...4 do
       for c in 0...4 do
@@ -600,14 +684,57 @@ class TC_RMtx4 < Minitest::Test
     end
 
     # RMtx4#orthoOffCenterRH
-    tx = (right+left)/(right-left)
-    ty = (top+bottom)/(top-bottom)
-    tz = (z_f+z_n)/(z_f-z_n)
+    tx = -(right+left)/(right-left)
+    ty = -(top+bottom)/(top-bottom)
+    tz = -(z_f+z_n)/(z_f-z_n)
     m2 = RMtx4.new( 2.0/(right-left), 0.0,               0.0,           tx,
                     0.0,              2.0/(top-bottom),  0.0,           ty,
                     0.0,              0.0,              -2.0/(z_f-z_n), tz,
                     0.0,              0.0,               0.0,           1.0 )
-    m3 = RMtx4.new.orthoOffCenterRH( left, right, bottom, top, z_n, z_f )
+    m3 = RMtx4.new.orthoOffCenterRH( left, right, bottom, top, z_n, z_f, true )
+
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m2.getElement(r,c), m3.getElement(r,c), @tolerance )
+      end
+    end
+  end
+
+  def test_orthoLH
+    left  = -640.0
+    right =  640.0
+    bottom = -360.0
+    top    =  360.0
+    z_n = 1.0
+    z_f = 1000.0
+    width = right - left
+    height = top - bottom
+
+    # RMtx4#orthoLH
+    tx = -(right+left)/width
+    ty = -(top+bottom)/height
+    tz = -(z_f+z_n)/(z_f-z_n)
+    m0 = RMtx4.new( 2.0/width, 0.0,         0.0,           tx,
+                    0.0,       2.0/height,  0.0,           ty,
+                    0.0,       0.0,         2.0/(z_f-z_n), tz,
+                    0.0,       0.0,         0.0,           1.0 )
+    m1 = RMtx4.new.orthoLH( width, height, z_n, z_f, true )
+
+    for r in 0...4 do
+      for c in 0...4 do
+        assert_in_delta( m0.getElement(r,c), m1.getElement(r,c), @tolerance )
+      end
+    end
+
+    # RMtx4#orthoOffCenterLH
+    tx = -(right+left)/(right-left)
+    ty = -(top+bottom)/(top-bottom)
+    tz = -(z_f+z_n)/(z_f-z_n)
+    m2 = RMtx4.new( 2.0/(right-left), 0.0,               0.0,           tx,
+                    0.0,              2.0/(top-bottom),  0.0,           ty,
+                    0.0,              0.0,               2.0/(z_f-z_n), tz,
+                    0.0,              0.0,               0.0,           1.0 )
+    m3 = RMtx4.new.orthoOffCenterLH( left, right, bottom, top, z_n, z_f, true )
 
     for r in 0...4 do
       for c in 0...4 do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmath3d
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.4
 platform: ruby
 authors:
 - vaiorabbit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   Provides vector2/3/4, matrix2x2/3x3/4x4 and quaternion in C extension library form (and plain Ruby form with the same interface for debugging use).
@@ -56,9 +56,9 @@ files:
 - test/test_RVec4.rb
 homepage: https://github.com/vaiorabbit/rmath3d
 licenses:
-- zlib/libpng
+- Zlib
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,16 +66,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ruby Math Module for 3D Applications
 test_files: []