rmath3d 1.0.2 → 1.2.3

data/ext/rmath3d/RMtx3.c

@@ -347,7 +347,7 @@ RMtx3Scale( RMtx3* out, const RMtx3* m, rmReal f )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RMtx3.h

@@ -72,7 +72,7 @@ void    RMtx3Scale( RMtx3* out, const RMtx3* m, rmReal f );
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RMtx4.c

@@ -479,37 +479,42 @@ RMtx4LookAtRH( RMtx4* out, const RVec3* eye, const RVec3* at, const RVec3* up )
 }
 
 void
-RMtx4PerspectiveRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar )
+RMtx4PerspectiveRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar, bool ndc_homogeneous )
 {
-    RMtx4PerspectiveOffCenterRH( out, -width/2.0f, width/2.0f, -height/2.0f, height/2.0f, znear, zfar );
+    RMtx4PerspectiveOffCenterRH( out, -width/2.0f, width/2.0f, -height/2.0f, height/2.0f, znear, zfar, ndc_homogeneous );
 }
 
-/* http://pyopengl.sourceforge.net/documentation/manual/gluPerspective.3G.html
+/* https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/gluPerspective.xml
+   Game Programming in C++ (2018) https://www.oreilly.com/library/view/game-programming-in/9780134598185/
  */
 void
-RMtx4PerspectiveFovRH( RMtx4* out, rmReal fovy_radian, rmReal aspect, rmReal znear, rmReal zfar )
+RMtx4PerspectiveFovRH( RMtx4* out, rmReal fovy_radian, rmReal aspect, rmReal znear, rmReal zfar, bool ndc_homogeneous )
 {
     rmReal f = rmTan( fovy_radian / 2.0f );
     f = 1.0f / f;
 
+    rmReal C = ndc_homogeneous ? -(zfar+znear) / (zfar-znear) : zfar / -(zfar-znear);
+    rmReal D = ndc_homogeneous ? -(2*znear*zfar) / (zfar-znear) : -(znear*zfar) / (zfar-znear);
+
     RMtx4Identity( out );
     SET_ELEMENT( out, 0, 0, f / aspect );
     SET_ELEMENT( out, 1, 1, f );
-    SET_ELEMENT( out, 2, 2, (zfar+znear)/(znear-zfar) );
-    SET_ELEMENT( out, 2, 3, 2*zfar*znear/(znear-zfar) );
+    SET_ELEMENT( out, 2, 2, C );
+    SET_ELEMENT( out, 2, 3, D );
     SET_ELEMENT( out, 3, 2, -1.0f );
     SET_ELEMENT( out, 3, 3, 0.0f );
 }
 
-/* http://pyopengl.sourceforge.net/documentation/manual/glFrustum.3G.html
+/* https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glFrustum.xml
+   Game Programming in C++ (2018) https://www.oreilly.com/library/view/game-programming-in/9780134598185/
  */
 void
-RMtx4PerspectiveOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar )
+RMtx4PerspectiveOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar, bool ndc_homogeneous )
 {
     rmReal A = (right+left) / (right-left);
     rmReal B = (top+bottom) / (top-bottom);
-    rmReal C = -(zfar+znear) / (zfar-znear);
-    rmReal D = -(2*znear*zfar) / (zfar-znear);
+    rmReal C = ndc_homogeneous ? -(zfar+znear) / (zfar-znear) : -zfar / (zfar-znear);
+    rmReal D = ndc_homogeneous ? -(2*znear*zfar) / (zfar-znear) : -(znear*zfar) / (zfar-znear);
 
     RMtx4Identity( out );
     SET_ELEMENT( out, 0, 0, 2*znear/(right-left) );
@@ -523,33 +528,34 @@ RMtx4PerspectiveOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal botto
 }
 
 void
-RMtx4OrthoRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar )
+RMtx4OrthoRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar, bool ndc_homogeneous )
 {
-    RMtx4OrthoOffCenterRH( out, -width/2.0f, width/2.0f, -height/2.0f, height/2.0f, znear, zfar );
+    RMtx4OrthoOffCenterRH( out, -width/2.0f, width/2.0f, -height/2.0f, height/2.0f, znear, zfar, ndc_homogeneous );
 }
 
-/* http://pyopengl.sourceforge.net/documentation/manual/glOrtho.3G.html
+/* https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glOrtho.xml
+   Game Programming in C++ (2018) https://www.oreilly.com/library/view/game-programming-in/9780134598185/
  */
 void
-RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar )
+RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar, bool ndc_homogeneous )
 {
-    rmReal tx = (right+left) / (right-left);
-    rmReal ty = (top+bottom) / (top-bottom);
-    rmReal tz = (zfar+znear) / (zfar-znear);
+    rmReal tx = -(right+left) / (right-left);
+    rmReal ty = -(top+bottom) / (top-bottom);
+    rmReal tz = ndc_homogeneous ? -(zfar+znear) / (zfar-znear) : -znear / (zfar-znear);
 
     RMtx4Identity( out );
     SET_ELEMENT( out, 0, 0, 2.0f/(right-left) );
     SET_ELEMENT( out, 0, 3, tx );
     SET_ELEMENT( out, 1, 1, 2.0f/(top-bottom) );
     SET_ELEMENT( out, 1, 3, ty );
-    SET_ELEMENT( out, 2, 2, -2.0f/(zfar-znear) );
+    SET_ELEMENT( out, 2, 2, -(ndc_homogeneous ? 2.0f : 1.0f)/(zfar-znear) );
     SET_ELEMENT( out, 2, 3, tz );
 }
 
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RMtx4.h

@@ -2,6 +2,7 @@
 #ifndef RMATHMTX4_H_INCLUDED
 #define RMATHMTX4_H_INCLUDED
 
+#include <stdbool.h>
 #include "RType.h"
 
 struct RVec3;
@@ -71,11 +72,11 @@ void    RMtx4Mul( RMtx4* out, const RMtx4* m1, const RMtx4* m2 );
 void    RMtx4Scale( RMtx4* out, const RMtx4* m, rmReal f );
 
 void    RMtx4LookAtRH( RMtx4* out, const struct RVec3* eye, const struct RVec3* at, const struct RVec3* up );
-void    RMtx4PerspectiveRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar );
-void    RMtx4PerspectiveFovRH( RMtx4* out, rmReal fovy_radian, rmReal aspect, rmReal znear, rmReal zfar );
-void    RMtx4PerspectiveOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar );
-void    RMtx4OrthoRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar );
-void    RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar );
+void    RMtx4PerspectiveRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar, bool ndc_homogeneous );
+void    RMtx4PerspectiveFovRH( RMtx4* out, rmReal fovy_radian, rmReal aspect, rmReal znear, rmReal zfar, bool ndc_homogeneous );
+void    RMtx4PerspectiveOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar, bool ndc_homogeneous );
+void    RMtx4OrthoRH( RMtx4* out, rmReal width, rmReal height, rmReal znear, rmReal zfar, bool ndc_homogeneous );
+void    RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmReal top, rmReal znear, rmReal zfar, bool ndc_homogeneous );
 
 #ifdef __cplusplus
 }
@@ -87,7 +88,7 @@ void    RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bot
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RQuat.c

@@ -344,7 +344,7 @@ RQuatToAxisAngle( const RQuat* in, struct RVec3* axis, rmReal* radian )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RQuat.h

@@ -69,7 +69,7 @@ void    RQuatToAxisAngle( const RQuat* in, struct RVec3* axis, rmReal* radian );
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RType.h

@@ -53,7 +53,7 @@ typedef double rmReal;
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RVec2.c

@@ -0,0 +1,167 @@
+#include <math.h>
+#include <string.h>
+
+#include "RVec2.h"
+#include "RMtx2.h"
+
+#define SET_ELEMENT( out, at, f )
+
+void
+RVec2SetElement( RVec2* out, int at, rmReal f )
+{
+    out->e[at] = f;
+}
+
+void
+RVec2SetX( RVec2* out, rmReal x )
+{
+    out->x = x;
+}
+
+void
+RVec2SetY( RVec2* out, rmReal y )
+{
+    out->y = y;
+}
+
+void
+RVec2SetElements( RVec2* out, rmReal x, rmReal y )
+{
+    RVec2SetX( out, x );
+    RVec2SetY( out, y );
+}
+
+rmReal
+RVec2GetElement( const RVec2* in, int at )
+{
+    return in->e[at];
+}
+
+rmReal
+RVec2GetX( const RVec2* in )
+{
+    return in->x;
+}
+
+rmReal
+RVec2GetY( const RVec2* in )
+{
+    return in->y;
+}
+
+int
+RVec2Equal( const RVec2* v1, const RVec2* v2 )
+{
+    if ( 0 == memcmp( v1, v2, sizeof(RVec2) ) )
+        return !0;
+    else
+        return 0;
+}
+
+void
+RVec2Add( RVec2* out, const RVec2* v1, const RVec2* v2 )
+{
+    out->x = v1->x + v2->x;
+    out->y = v1->y + v2->y;
+}
+
+void
+RVec2Sub( RVec2* out, const RVec2* v1, const RVec2* v2 )
+{
+    out->x = v1->x - v2->x;
+    out->y = v1->y - v2->y;
+}
+
+void
+RVec2Scale( RVec2* out, const RVec2* in, rmReal f )
+{
+    out->x = in->x * f;
+    out->y = in->y * f;
+}
+
+rmReal
+RVec2Cross( const RVec2* v1, const RVec2* v2 )
+{
+    rmReal v1x, v1y, v2x, v2y;
+
+    v1x = v1->x;
+    v1y = v1->y;
+    v2x = v2->x;
+    v2y = v2->y;
+
+    return v1x*v2y - v1y*v2x;
+}
+
+rmReal
+RVec2LengthSq( const RVec2* in )
+{
+    return in->x*in->x + in->y*in->y;
+}
+
+rmReal
+RVec2Length( const RVec2* in )
+{
+    return rmSqrt( in->x*in->x + in->y*in->y );
+}
+
+rmReal
+RVec2Dot( const RVec2* v1, const RVec2* v2 )
+{
+    return v1->x*v2->x + v1->y*v2->y;
+}
+
+void
+RVec2Copy( RVec2* out, const RVec2* in )
+{
+    out->x = in->x;
+    out->y = in->y;
+}
+
+void
+RVec2Normalize( RVec2* out, const RVec2* in )
+{
+    rmReal length = RVec2Length( in );
+    RVec2Scale( out, in, 1.0f/length );
+}
+
+void
+RVec2Transform( RVec2* out, const RMtx2* m, const RVec2* in )
+{
+    RVec2 result, in_vec2;
+    int row;
+
+    RVec2Copy( &in_vec2, in );
+    for ( row = 0; row < 2; ++row )
+    {
+        RVec2 row_vector;
+        RMtx2GetRow( &row_vector, m, row );
+        RVec2SetElement( &result, row, RVec2Dot( &row_vector, &in_vec2 ) );
+    }
+
+    out->x = RVec2GetX( &result );
+    out->y = RVec2GetY( &result );
+}
+
+/*
+RMath : Ruby math module for 3D Applications
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>.
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+ */

data/ext/rmath3d/RVec2.h

@@ -0,0 +1,80 @@
+/* -*- C -*- */
+#ifndef RMATHVEC2_H_INCLUDED
+#define RMATHVEC2_H_INCLUDED
+
+#include "RType.h"
+
+struct RMtx2;
+
+typedef struct RVec2
+{
+    union
+    {
+        struct
+        {
+            rmReal x, y;
+        };
+        rmReal e[2];
+    };
+} RVec2;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void    RVec2SetElements( RVec2* out, rmReal x, rmReal y );
+void    RVec2SetElement( RVec2* out, int at, rmReal f );
+void    RVec2SetX( RVec2* out, rmReal x );
+void    RVec2SetY( RVec2* out, rmReal y );
+
+rmReal  RVec2GetElement( const RVec2* in, int at );
+rmReal  RVec2GetX( const RVec2* in );
+rmReal  RVec2GetY( const RVec2* in );
+
+int     RVec2Equal( const RVec2* v1, const RVec2* v2 );
+
+void    RVec2Add( RVec2* out, const RVec2* v1, const RVec2* v2 );
+void    RVec2Sub( RVec2* out, const RVec2* v1, const RVec2* v2 );
+void    RVec2Scale( RVec2* out, const RVec2* in, rmReal f );
+rmReal  RVec2Cross( const RVec2* v1, const RVec2* v2 );
+
+rmReal  RVec2Length( const RVec2* in );
+rmReal  RVec2LengthSq( const RVec2* in );
+
+rmReal  RVec2Dot( const RVec2* v1, const RVec2* v2 );
+
+void    RVec2Copy( RVec2* out, const RVec2* in );
+void    RVec2Normalize( RVec2* out, const RVec2* in );
+
+void    RVec2Transform( struct RVec2* out, const struct RMtx2* m, const RVec2* in );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*
+RMath : Ruby math module for 3D Applications
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+ */

data/ext/rmath3d/RVec3.c

@@ -262,7 +262,7 @@ RVec3TransformByQuaternion( RVec3* out, const struct RQuat* q, const RVec3* in )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>.
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>.
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RVec3.h

@@ -66,7 +66,7 @@ void    RVec3TransformByQuaternion( RVec3* out, const struct RQuat* q, const RVe
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

data/ext/rmath3d/RVec4.c

@@ -192,7 +192,7 @@ RVec4TransformTransposed( RVec4* out, const struct RMtx4* m, const RVec4* in )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2020 vaiorabbit  <http://twitter.com/vaiorabbit>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages