rmath3d 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa4b132536ee9bcbe0c7da9e51fe53bd566010e
-  data.tar.gz: 17eee04a0ac050c85fbc1953d7302ff7f41e1d06
+  metadata.gz: cb1e762ea46c80e060d6efdcaf6db861e6ad2ffc
+  data.tar.gz: c4cbac65664fd3c54d08ca66dd9e207a9f3384b0
 SHA512:
-  metadata.gz: 9bfefb8f3a0a41f88c8e25fa3074d1b45a05a2be87085c6759029b7566362188c65d41261254b7afacaab22c1fdc221b2e50bccac6097ca36e2e42089cc167d6
-  data.tar.gz: ac604ce99ae372569cdf291ae09166dc4c67f8d9e86f970bfe6da7b2967ebe6e57ac652dcd0f1a07f222d9801a348df8d5372c6dc5d6d395ea291dfc9d08ec5c
+  metadata.gz: bf14364015645a9631a9e57c6c54279a93090f2bb8ed7470bfd75795e04cfdb2ca519aceaaeaf9f10d19caf5909b1e7a71645cd4237bd563236dc788c93b8081
+  data.tar.gz: 158e3a7d837715897afadf073c644aa10fa7dbd3b9fc735bdf6c1d5bbd029f6637fb82e0731d9806109bc9c7122f39d7ac8113fe84a01a681956e5854f52f8bd

data/ChangeLog

@@ -1,3 +1,7 @@
+2015-04-12  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* RVec2.c|h, RMtx2.c|h: Added.
+
 2014-05-17  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* ext/rmath3d/rmath3d.c: Fixed memory management

data/LICENSE.txt

@@ -1,5 +1,5 @@
 rmath3d : Ruby math module for 3D Applications
-Copyright (c) 2008-2014 vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2015 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/README.md

@@ -4,18 +4,20 @@
 
 rmath3d is a math module for 3D game programming and computer graphics.
 
-*   Last Update: May 17, 2014
+*   Last Update: Apr 12, 2015
 *   Since: Jul 20, 2008
 
 ## Features ##
 
 ### Supports frequently-used vector and matrix classes ###
 
+*   RMtx2 (2x2 matrix)
 *   RMtx3 (3x3 matrix)
 *   RMtx4 (4x4 matrix)
 *   RQuat (Quaternion)
-*   RVec3 (3 element vector)
-*   RVec4 (4 element vector)
+*   RVec2 (2-element vector)
+*   RVec3 (3-element vector)
+*   RVec4 (4-element vector)
 
 ### Two implementations that are interchangeable with each other ###
 

data/ext/rmath3d/RMath3D.h

@@ -2,9 +2,11 @@
 #define RMATH_H_INCLUDED
 
 #include "RType.h"
+#include "RVec2.h"
 #include "RVec3.h"
 #include "RVec4.h"
 #include "RQuat.h"
+#include "RMtx2.h"
 #include "RMtx3.h"
 #include "RMtx4.h"
 

data/ext/rmath3d/RMtx2.c

@@ -0,0 +1,255 @@
+#include <math.h>
+#include <string.h>
+
+#include "RVec2.h"
+#include "RMtx2.h"
+
+/* NOTE : column-major */
+#define SET_ELEMENT(out, row, col, val) (out)->e[(col)*2+(row)] = (val)
+#define GET_ELEMENT(in, row, col) ((in)->e[(col)*2+(row)])
+
+void
+RMtx2SetElement( RMtx2* out, int row, int col, rmReal e )
+{
+    SET_ELEMENT( out, row, col, e );
+}
+
+rmReal
+RMtx2GetElement( const RMtx2* in, int row, int col )
+{
+    return GET_ELEMENT( in, row, col );
+}
+
+void
+RMtx2GetRow( RVec2* out, const RMtx2* in, int row )
+{
+    RVec2SetX( out, GET_ELEMENT( in, row, 0 ) );
+    RVec2SetY( out, GET_ELEMENT( in, row, 1 ) );
+}
+
+void
+RMtx2GetColumn( RVec2* out, const RMtx2* in, int col )
+{
+    RVec2SetX( out, GET_ELEMENT( in, 0, col ) );
+    RVec2SetY( out, GET_ELEMENT( in, 1, col ) );
+}
+
+void
+RMtx2SetRow( RMtx2* out, const RVec2* in, int row )
+{
+    SET_ELEMENT( out, row, 0, RVec2GetElement( in, 0 ) );
+    SET_ELEMENT( out, row, 1, RVec2GetElement( in, 1 ) );
+}
+
+void
+RMtx2SetColumn( RMtx2* out, const RVec2* in, int col )
+{
+    SET_ELEMENT( out, 0, col, RVec2GetElement( in, 0 ) );
+    SET_ELEMENT( out, 1, col, RVec2GetElement( in, 1 ) );
+}
+
+void
+RMtx2Copy( RMtx2* out, const RMtx2* in )
+{
+    memmove( out, in, sizeof(RMtx2) );
+}
+
+void
+RMtx2SetElements( RMtx2* out,
+                  rmReal e00, rmReal e01,
+                  rmReal e10, rmReal e11
+    )
+{
+    SET_ELEMENT( out, 0, 0, e00 );
+    SET_ELEMENT( out, 0, 1, e01 );
+
+    SET_ELEMENT( out, 1, 0, e10 );
+    SET_ELEMENT( out, 1, 1, e11 );
+}
+
+void
+RMtx2Zero( RMtx2* out )
+{
+    int row, col;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( out, row, col, 0.0f );
+}
+
+void
+RMtx2Identity( RMtx2* out )
+{
+    int row, col;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( out, row, col, (row==col) ? 1.0f : 0.0f );
+}
+
+rmReal
+RMtx2Determinant( const RMtx2* in )
+{
+#define I( r, c ) GET_ELEMENT( in, (r), (c) )
+#define D( e00, e01, e10, e11 ) ((e00)*(e11)-(e01)*(e10))
+
+    return D( I(0,0), I(0,1), I(1,0), I(1,1) );
+
+#undef I
+#undef D
+}
+
+void
+RMtx2Transpose( RMtx2* out, const RMtx2* in )
+{
+    int row, col;
+    RMtx2 tmp;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( &tmp, row, col, GET_ELEMENT( in, col, row ) );
+
+    RMtx2Copy( out, &tmp );
+}
+
+rmReal
+RMtx2Inverse( RMtx2* out, const RMtx2* in )
+{
+#define I( r, c ) GET_ELEMENT( in, (r), (c) )
+#define R( r, c ) GET_ELEMENT( &result, (r), (c) )
+#define D( e00, e01, e10, e11 ) ((e00)*(e11)-(e01)*(e10))
+
+    RMtx2 result;
+    rmReal det;
+
+    det = D( I(0,0), I(0,1), I(1,0), I(1,1) );
+
+    if ( rmFabs(det) < RMATH_TOLERANCE )
+        return det;
+
+    SET_ELEMENT( &result, 0, 0,  I(1,1) );
+    SET_ELEMENT( &result, 0, 1, -I(0,1) );
+
+    SET_ELEMENT( &result, 1, 0, -I(1,0) );
+    SET_ELEMENT( &result, 1, 1,  I(0,0) );
+
+    RMtx2Scale( out, &result, 1.0f / det );
+
+    return det;
+
+#undef I
+#undef R
+#undef D
+}
+
+
+/* http://en.wikipedia.org/wiki/Rotation_representation_%28mathematics%29
+   http://en.wikipedia.org/wiki/Rotation_matrix
+*/
+void
+RMtx2Rotation( RMtx2* out, rmReal radian )
+{
+    rmReal s = rmSin( radian );
+    rmReal c = rmCos( radian );
+
+    RMtx2Identity( out );
+    SET_ELEMENT( out, 0, 0,  c );
+    SET_ELEMENT( out, 0, 1, -s );
+    SET_ELEMENT( out, 1, 0,  s );
+    SET_ELEMENT( out, 1, 1,  c );
+}
+
+void
+RMtx2Scaling( RMtx2* out, rmReal sx, rmReal sy )
+{
+    RMtx2Identity( out );
+    SET_ELEMENT( out, 0, 0, sx );
+    SET_ELEMENT( out, 1, 1, sy );
+}
+
+
+int
+RMtx2Equal( const RMtx2* m1, const RMtx2* m2 )
+{
+    if ( 0 == memcmp( m1, m2, sizeof(RMtx2) ) )
+        return !0;
+    else
+        return 0;
+}
+
+
+void
+RMtx2Add( RMtx2* out, const RMtx2* m1, const RMtx2* m2 )
+{
+    int row, col;
+    RMtx2 tmp;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( &tmp, row, col,
+                         GET_ELEMENT( m1, row, col ) + GET_ELEMENT( m2, row, col ) );
+
+    RMtx2Copy( out, &tmp );
+}
+
+void
+RMtx2Sub( RMtx2* out, const RMtx2* m1, const RMtx2* m2 )
+{
+    int row, col;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( out, row, col,
+                         GET_ELEMENT( m1, row, col ) - GET_ELEMENT( m2, row, col ) );
+}
+
+void
+RMtx2Mul( RMtx2* out, const RMtx2* m1, const RMtx2* m2 )
+{
+    int row, col;
+    RMtx2 tmp;
+    for ( row = 0; row < 2; ++row )
+    {
+        for ( col = 0; col < 2; ++col )
+        {
+            int i;
+            rmReal sum = 0.0f;
+            for ( i = 0; i < 2; ++i )
+            {
+                sum += GET_ELEMENT( m1, row, i ) * GET_ELEMENT( m2, i, col );
+            }
+            SET_ELEMENT( &tmp, row, col, sum );
+        }
+    }
+
+    RMtx2Copy( out, &tmp );
+}
+
+void
+RMtx2Scale( RMtx2* out, const RMtx2* m, rmReal f )
+{
+    int row, col;
+    for ( row = 0; row < 2; ++row )
+        for ( col = 0; col < 2; ++col )
+            SET_ELEMENT( out, row, col,
+                         GET_ELEMENT( m, row, col ) * f );
+}
+
+/*
+RMath : Ruby math module for 3D Applications
+Copyright (c) 2008- 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/RMtx2.h

@@ -0,0 +1,88 @@
+/* -*- C -*- */
+#ifndef RMATHMTX2_H_INCLUDED
+#define RMATHMTX2_H_INCLUDED
+
+#include "RType.h"
+
+struct RVec2;
+
+typedef struct RMtx2
+{
+    union
+    {
+        /* NOTE : column-major */
+        struct
+        {
+            rmReal e00, e10;
+            rmReal e01, e11;
+        };
+        rmReal e[4];
+    };
+} RMtx2;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void RMtx2SetElements( RMtx2* out,
+                       rmReal e00, rmReal e01,
+                       rmReal e10, rmReal e11
+    );
+
+void    RMtx2SetElement( RMtx2* out, int row, int col, rmReal e );
+rmReal  RMtx2GetElement( const RMtx2* in, int row, int col );
+
+void    RMtx2GetRow( struct RVec2* out, const RMtx2* in, int row );
+void    RMtx2GetColumn( struct RVec2* out, const RMtx2* in, int col );
+
+void    RMtx2SetRow( struct RMtx2* out, const RVec2* in, int row );
+void    RMtx2SetColumn( struct RMtx2* out, const RVec2* in, int col );
+
+void    RMtx2Copy( RMtx2* out, const RMtx2* in );
+
+void    RMtx2Zero( RMtx2* out );
+void    RMtx2Identity( RMtx2* out );
+rmReal  RMtx2Determinant( const RMtx2* in );
+void    RMtx2Transpose( RMtx2* out, const RMtx2* in );
+rmReal  RMtx2Inverse( RMtx2* out, const RMtx2* in );
+
+void    RMtx2Rotation( RMtx2* out, rmReal radian );
+void    RMtx2Scaling( RMtx2* out, rmReal sx, rmReal sy );
+
+int     RMtx2Equal( const RMtx2* m1, const RMtx2* m2 );
+
+void    RMtx2Add( RMtx2* out, const RMtx2* m1, const RMtx2* m2 );
+void    RMtx2Sub( RMtx2* out, const RMtx2* m1, const RMtx2* m2 );
+void    RMtx2Mul( RMtx2* out, const RMtx2* m1, const RMtx2* m2 );
+void    RMtx2Scale( RMtx2* out, const RMtx2* m, rmReal f );
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
+
+/*
+RMath : Ruby math module for 3D Applications
+Copyright (c) 2008- 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.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- 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.
+ */