rmath3d 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480f9d7cfa725618252ced196bead41f187d86c2
-  data.tar.gz: cfb9c4dfd3027b08020bb25be79debf32c329efb
+  metadata.gz: dc8123d1ad73cb760f30d7c6a3496f13ad54fcb1
+  data.tar.gz: 41ae8b2437dfe3fdc2b0ec6c01fc511a0e5ada20
 SHA512:
-  metadata.gz: 585ec81811bbb4baa2835fca142a78d92674be01ef232bed8f3d021148c22586deb8fa0858e89d6a5dd19019cfa814c7b365857b488c358cdeb28c65d3539e88
-  data.tar.gz: 28ba4c0c9c30fee57d682ed96da605bf76a59c7d00d62609f4cf795c57808d94ac992af53625deaa8b08a1e091a01f7e38de4694a56b8aa6c3a74e1ea6c1b9ee
+  metadata.gz: 39615da4c1208ebfdb06644ce2a6612ed88172afc334c36eb9a08b20211c3fb89359bcdb4e348924fd09fad057745397774be8f3de00e211373a98c6cc6ab11c
+  data.tar.gz: 7e6b01b7f44b95ccb8f2c8a9419d74f730ef1bd6eac59afa7dc128c1e5cfa6ffb171cd151957a8d6d41a4fcbc987ebae63487bb0b30c5299513c936c7179f205

data/ChangeLog

@@ -1,3 +1,7 @@
+2017-07-22  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* Added 'Integer' type for argument type branching (constant ::Fixnum is deprecated since ruby 2.4).
+
 2015-08-23  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* rmath3d.c (def ==): Removed control path returning Qnil.

data/LICENSE.txt

@@ -1,5 +1,5 @@
 rmath3d : Ruby math module for 3D Applications
-Copyright (c) 2008-2015 vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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,7 +4,7 @@
 
 rmath3d is a math module for 3D game programming and computer graphics.
 
-*   Last Update: Aug 23, 2015
+*   Last Update: Jul 22, 2017
 *   Since: Jul 20, 2008
 
 ## Features ##

data/ext/rmath3d/RMath3D.h

@@ -1,5 +1,5 @@
-#ifndef RMATH_H_INCLUDED
-#define RMATH_H_INCLUDED
+#ifndef RMATH3D_H_INCLUDED
+#define RMATH3D_H_INCLUDED
 
 #include "RType.h"
 #include "RVec2.h"
@@ -14,7 +14,7 @@
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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/RMtx2.c

@@ -232,7 +232,7 @@ RMtx2Scale( RMtx2* out, const RMtx2* m, rmReal f )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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/RMtx2.h

@@ -65,7 +65,7 @@ void    RMtx2Scale( RMtx2* out, const RMtx2* m, rmReal f );
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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.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-2017 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-2017 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

@@ -549,7 +549,7 @@ RMtx4OrthoOffCenterRH( RMtx4* out, rmReal left, rmReal right, rmReal bottom, rmR
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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

@@ -87,7 +87,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-2017 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-2017 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-2017 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-2017 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

@@ -144,7 +144,7 @@ RVec2Transform( RVec2* out, const RMtx2* m, const RVec2* in )
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>.
+Copyright (c) 2008-2017 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.h

@@ -57,7 +57,7 @@ void    RVec2Transform( struct RVec2* out, const struct RMtx2* m, const RVec2* i
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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.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-2017 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-2017 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-2017 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.h

@@ -63,7 +63,7 @@ void    RVec4TransformTransposed( RVec4* out, const struct RMtx4* m, const RVec4
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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/rmath3d.c

@@ -200,45 +200,32 @@ RMtx2_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RMtx2SetElements( v,
                               f,f,
                               f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRMtx2(arg) )
-            {
-                /* Copy Constructor */
-                RMtx2* other;
-                TypedData_Get_Struct( arg, RMtx2, &RMtx2_type, other );
-                RMtx2Copy( v, other );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRMtx2(arg) ) {
+                    /* Copy Constructor */
+                    RMtx2* other;
+                    TypedData_Get_Struct( arg, RMtx2, &RMtx2_type, other );
+                    RMtx2Copy( v, other );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RMtx2_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RMtx2_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -251,18 +238,10 @@ RMtx2_initialize( int argc, VALUE* argv, VALUE self )
             for ( col = 0; col < 2; ++col )
             {
                 int i = 2*row + col;
-                switch ( TYPE( argv[i] ) )
-                {
-                case T_FIXNUM:
-                case T_FLOAT:
-                {
+                if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                     rmReal f = NUM2DBL( argv[i] );
                     RMtx2SetElement( v, row, col, f );
-                }
-                break;
-
-                default:
-                {
+                } else {
                     rb_raise( rb_eTypeError,
                               "RMtx2_new : Unknown type %s. at arg %d",
                               rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -270,8 +249,6 @@ RMtx2_initialize( int argc, VALUE* argv, VALUE self )
                         );
                     return Qnil;
                 }
-                break;
-                }
             } /* End : for ( col = 0; col < 2; ++col ) */
         } /* End : for ( row = 0; row < 2; ++row ) */
 
@@ -371,21 +348,12 @@ RMtx2_coerce( VALUE self, VALUE other )
     RMtx2* v = NULL;
     TypedData_Get_Struct( self, RMtx2, &RMtx2_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RMtx2'
          * -> try again as 'RMtx2 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -393,8 +361,6 @@ RMtx2_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -1114,11 +1080,7 @@ RMtx3_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RMtx3SetElements( v,
@@ -1126,34 +1088,25 @@ RMtx3_initialize( int argc, VALUE* argv, VALUE self )
                               f,f,f,
                               f,f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRMtx3(arg) )
-            {
-                /* Copy Constructor */
-                RMtx3* other;
-                TypedData_Get_Struct( arg , RMtx3, &RMtx3_type, other );
-                RMtx3Copy( v, other );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRMtx3(arg) ) {
+                    /* Copy Constructor */
+                    RMtx3* other;
+                    TypedData_Get_Struct( arg , RMtx3, &RMtx3_type, other );
+                    RMtx3Copy( v, other );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RMtx3_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RMtx3_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -1166,18 +1119,10 @@ RMtx3_initialize( int argc, VALUE* argv, VALUE self )
             for ( col = 0; col < 3; ++col )
             {
                 int i = 3*row + col;
-                switch ( TYPE( argv[i] ) )
-                {
-                case T_FIXNUM:
-                case T_FLOAT:
-                {
+                if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                     rmReal f = NUM2DBL( argv[i] );
                     RMtx3SetElement( v, row, col, f );
-                }
-                break;
-
-                default:
-                {
+                } else {
                     rb_raise( rb_eTypeError,
                               "RMtx3_new : Unknown type %s. at arg %d",
                               rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -1185,8 +1130,6 @@ RMtx3_initialize( int argc, VALUE* argv, VALUE self )
                         );
                     return Qnil;
                 }
-                break;
-                }
             } /* End : for ( col = 0; col < 3; ++col ) */
         } /* End : for ( row = 0; row < 3; ++row ) */
 
@@ -1286,21 +1229,12 @@ RMtx3_coerce( VALUE self, VALUE other )
     RMtx3* v = NULL;
     TypedData_Get_Struct( self, RMtx3, &RMtx3_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RMtx3'
          * -> try again as 'RMtx3 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -1308,8 +1242,6 @@ RMtx3_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -2235,11 +2167,7 @@ RMtx4_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RMtx4SetElements( v,
@@ -2248,34 +2176,25 @@ RMtx4_initialize( int argc, VALUE* argv, VALUE self )
                               f,f,f,f,
                               f,f,f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRMtx4(arg) )
-            {
-                /* Copy Constructor */
-                RMtx4* other;
-                TypedData_Get_Struct( arg , RMtx4, &RMtx4_type, other );
-                RMtx4Copy( v, other );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRMtx4(arg) ) {
+                    /* Copy Constructor */
+                    RMtx4* other;
+                    TypedData_Get_Struct( arg , RMtx4, &RMtx4_type, other );
+                    RMtx4Copy( v, other );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RMtx4_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RMtx4_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -2288,18 +2207,10 @@ RMtx4_initialize( int argc, VALUE* argv, VALUE self )
             for ( col = 0; col < 4; ++col )
             {
                 int i = 4*row + col;
-                switch ( TYPE( argv[i] ) )
-                {
-                case T_FIXNUM:
-                case T_FLOAT:
-                {
+                if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                     rmReal f = NUM2DBL( argv[i] );
                     RMtx4SetElement( v, row, col, f );
-                }
-                break;
-
-                default:
-                {
+                } else {
                     rb_raise( rb_eTypeError,
                               "RMtx4_new : Unknown type %s. at arg %d",
                               rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -2307,8 +2218,6 @@ RMtx4_initialize( int argc, VALUE* argv, VALUE self )
                         );
                     return Qnil;
                 }
-                break;
-                }
             } /* End : for ( col = 0; col < 4; ++col ) */
         } /* End : for ( row = 0; row < 4; ++row ) */
 
@@ -2410,21 +2319,12 @@ RMtx4_coerce( VALUE self, VALUE other )
     RMtx4* v = NULL;
     TypedData_Get_Struct( self, RMtx4, &RMtx4_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RMtx4'
          * -> try again as 'RMtx4 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -2432,8 +2332,6 @@ RMtx4_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -3784,43 +3682,30 @@ RQuat_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RQuatSetElements( v, f,f,f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRQuat(arg) )
-            {
-                /* Copy Constructor */
-                RQuat* other;
-                TypedData_Get_Struct( arg , RQuat, &RQuat_type, other );
-                RQuatSetElements( v, other->x, other->y, other->z, other->w );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRQuat(arg) ) {
+                    /* Copy Constructor */
+                    RQuat* other;
+                    TypedData_Get_Struct( arg , RQuat, &RQuat_type, other );
+                    RQuatSetElements( v, other->x, other->y, other->z, other->w );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RQuat_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RQuat_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -3830,18 +3715,10 @@ RQuat_initialize( int argc, VALUE* argv, VALUE self )
         int i;
         for ( i = 0; i < argc; ++i )
         {
-            switch ( TYPE( argv[i] ) )
-            {
-            case T_FIXNUM:
-            case T_FLOAT:
-            {
+            if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                 rmReal f = NUM2DBL( argv[i] );
                 v->e[i] = f;
-            }
-            break;
-
-            default:
-            {
+            } else {
                 rb_raise( rb_eTypeError,
                           "RQuat_new : Unknown type %s. at arg %d",
                           rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -3849,8 +3726,6 @@ RQuat_initialize( int argc, VALUE* argv, VALUE self )
                     );
                 return Qnil;
             }
-            break;
-            }
         } /* End : for ( i = 0; i < argc; ++i ) */
 
         return self;
@@ -3936,21 +3811,12 @@ RQuat_coerce( VALUE self, VALUE other )
     RQuat* v = NULL;
     TypedData_Get_Struct( self, RQuat, &RQuat_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RQuat'
          * -> try again as 'RQuat (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -3958,8 +3824,6 @@ RQuat_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -4506,27 +4370,18 @@ RQuat_op_binary_mult( VALUE self, VALUE other )
     }
     else
     {
-        switch( TYPE(other) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
             f = NUM2DBL( other );
             RQuatScale( &result, v, f );
 
             return RQuat_from_source( &result );
-        }
-        break;
-
-        default:
-        {
+        } else {
             rb_raise( rb_eTypeError,
                       "RQuat#* : Unknown type %s.",
                       rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
                 );
             return Qnil;
         }
-        } /* End : switch( TYPE(other) ) */
     }
 }
 
@@ -4640,7 +4495,7 @@ RQuat_op_assign_mult( VALUE self, VALUE other )
     else
     {
 #ifdef RMATH_ENABLE_ARGUMENT_CHECK
-        if ( TYPE(other) != T_FIXNUM && TYPE(other) != T_FLOAT )
+        if ( !RB_FLOAT_TYPE_P(other) && !RB_INTEGER_TYPE_P(other) )
         {
             rb_raise( rb_eTypeError,
                       "RQuat#mul! : Unknown type %s.",
@@ -4785,43 +4640,30 @@ RVec2_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RVec2SetElements( v, f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRVec2(arg) )
-            {
-                /* Copy Constructor */
-                RVec2* other;
-                TypedData_Get_Struct( arg , RVec2, &RVec2_type, other );
-                RVec2SetElements( v, other->x, other->y );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRVec2(arg) ) {
+                    /* Copy Constructor */
+                    RVec2* other;
+                    TypedData_Get_Struct( arg , RVec2, &RVec2_type, other );
+                    RVec2SetElements( v, other->x, other->y );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RVec2_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RVec2_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -4831,18 +4673,10 @@ RVec2_initialize( int argc, VALUE* argv, VALUE self )
         int i;
         for ( i = 0; i < argc; ++i )
         {
-            switch ( TYPE( argv[i] ) )
-            {
-            case T_FIXNUM:
-            case T_FLOAT:
-            {
+            if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                 rmReal f = NUM2DBL( argv[i] );
                 v->e[i] = f;
-            }
-            break;
-
-            default:
-            {
+            } else {
                 rb_raise( rb_eTypeError,
                           "RVec2_new : Unknown type %s. at arg %d",
                           rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -4850,8 +4684,6 @@ RVec2_initialize( int argc, VALUE* argv, VALUE self )
                     );
                 return Qnil;
             }
-            break;
-            }
         } /* End : for ( i = 0; i < argc; ++i ) */
 
         return self;
@@ -4935,21 +4767,12 @@ RVec2_coerce( VALUE self, VALUE other )
     RVec2* v = NULL;
     TypedData_Get_Struct( self, RVec2, &RVec2_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RVec2'
          * -> try again as 'RVec2 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -4957,8 +4780,6 @@ RVec2_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -5318,28 +5139,19 @@ RVec2_op_binary_mult( VALUE self, VALUE other )
     RVec2 result;
     rmReal f;
 
-    switch( TYPE(other) )
-    {
-    case T_FIXNUM:
-    case T_FLOAT:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         TypedData_Get_Struct( self, RVec2, &RVec2_type, v );
         f = NUM2DBL( other );
         RVec2Scale( &result, v, f );
 
         return RVec2_from_source( &result );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "RVec2#* : Unknown type %s.",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
             );
         return Qnil;
     }
-    } /* End : switch( TYPE(other) ) */
 }
 
 /*
@@ -5441,7 +5253,7 @@ RVec2_op_assign_mult( VALUE self, VALUE other )
     rmReal  f;
 
 #ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( TYPE(other) != T_FIXNUM && TYPE(other) != T_FLOAT )
+    if ( !RB_FLOAT_TYPE_P(other) && !RB_INTEGER_TYPE_P(other) )
     {
         rb_raise( rb_eTypeError,
                   "RVec2#*= : Unknown type %s.",
@@ -5528,43 +5340,30 @@ RVec3_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RVec3SetElements( v, f,f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRVec3(arg) )
-            {
-                /* Copy Constructor */
-                RVec3* other;
-                TypedData_Get_Struct( arg , RVec3, &RVec3_type, other );
-                RVec3SetElements( v, other->x, other->y, other->z );
-                return self;
-            }
-            else
-                return Qnil;
-        }
-        break;
-
-        default:
-        {
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRVec3(arg) ) {
+                    /* Copy Constructor */
+                    RVec3* other;
+                    TypedData_Get_Struct( arg , RVec3, &RVec3_type, other );
+                    RVec3SetElements( v, other->x, other->y, other->z );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
             rb_raise( rb_eTypeError,
                       "RVec3_new : Unknown type %s.",
                       rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
                 );
             return Qnil;
+            }
         }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -5574,18 +5373,10 @@ RVec3_initialize( int argc, VALUE* argv, VALUE self )
         int i;
         for ( i = 0; i < argc; ++i )
         {
-            switch ( TYPE( argv[i] ) )
-            {
-            case T_FIXNUM:
-            case T_FLOAT:
-            {
+            if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                 rmReal f = NUM2DBL( argv[i] );
                 v->e[i] = f;
-            }
-            break;
-
-            default:
-            {
+            } else {
                 rb_raise( rb_eTypeError,
                           "RVec3_new : Unknown type %s. at arg %d",
                           rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -5593,8 +5384,6 @@ RVec3_initialize( int argc, VALUE* argv, VALUE self )
                     );
                 return Qnil;
             }
-            break;
-            }
         } /* End : for ( i = 0; i < argc; ++i ) */
 
         return self;
@@ -5679,21 +5468,12 @@ RVec3_coerce( VALUE self, VALUE other )
     RVec3* v = NULL;
     TypedData_Get_Struct( self, RVec3, &RVec3_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RVec3'
          * -> try again as 'RVec3 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -5701,8 +5481,6 @@ RVec3_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -6316,28 +6094,19 @@ RVec3_op_binary_mult( VALUE self, VALUE other )
     RVec3 result;
     rmReal f;
 
-    switch( TYPE(other) )
-    {
-    case T_FIXNUM:
-    case T_FLOAT:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         TypedData_Get_Struct( self, RVec3, &RVec3_type, v );
         f = NUM2DBL( other );
         RVec3Scale( &result, v, f );
 
         return RVec3_from_source( &result );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "RVec3#* : Unknown type %s.",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
             );
         return Qnil;
     }
-    } /* End : switch( TYPE(other) ) */
 }
 
 /*
@@ -6439,7 +6208,7 @@ RVec3_op_assign_mult( VALUE self, VALUE other )
     rmReal  f;
 
 #ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( TYPE(other) != T_FIXNUM && TYPE(other) != T_FLOAT )
+    if ( !RB_FLOAT_TYPE_P(other) && !RB_INTEGER_TYPE_P(other) )
     {
         rb_raise( rb_eTypeError,
                   "RVec3#*= : Unknown type %s.",
@@ -6526,51 +6295,36 @@ RVec4_initialize( int argc, VALUE* argv, VALUE self )
     case 1:
     {
         VALUE arg = argv[0];
-        switch ( TYPE( arg ) )
-        {
-        case T_FIXNUM:
-        case T_FLOAT:
-        {
+        if ( RB_FLOAT_TYPE_P(arg) || RB_INTEGER_TYPE_P(arg) ) {
             /* convert to float */
             rmReal f = NUM2DBL( arg );
             RVec4SetElements( v, f,f,f,f );
             return self;
-        }
-        break;
-
-        case T_DATA:
-        {
-            if ( IsRVec3(arg) )
-            {
-                /* Create from RVec3 */
-                RVec3* other;
-                TypedData_Get_Struct( arg , RVec3, &RVec3_type, other );
-                RVec4SetElements( v, other->x, other->y, other->z, 0.0f );
-                return self;
-            }
-            else if ( IsRVec4(arg) )
-            {
-                /* Copy Constructor */
-                RVec4* other;
-                TypedData_Get_Struct( arg , RVec4, &RVec4_type, other );
-                RVec4SetElements( v, other->x, other->y, other->z, other->w );
-                return self;
-            }
-            else
+        } else {
+            if ( TYPE( arg ) == T_DATA ) {
+                if ( IsRVec3(arg) ) {
+                    /* Create from RVec3 */
+                    RVec3* other;
+                    TypedData_Get_Struct( arg , RVec3, &RVec3_type, other );
+                    RVec4SetElements( v, other->x, other->y, other->z, 0.0f );
+                    return self;
+                } else if ( IsRVec4(arg) ) {
+                    /* Copy Constructor */
+                    RVec4* other;
+                    TypedData_Get_Struct( arg , RVec4, &RVec4_type, other );
+                    RVec4SetElements( v, other->x, other->y, other->z, other->w );
+                    return self;
+                } else {
+                    return Qnil;
+                }
+            } else {
+                rb_raise( rb_eTypeError,
+                          "RVec4_new : Unknown type %s.",
+                          rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
+                    );
                 return Qnil;
+            }
         }
-        break;
-
-        default:
-        {
-            rb_raise( rb_eTypeError,
-                      "RVec4_new : Unknown type %s.",
-                      rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self )
-                );
-            return Qnil;
-        }
-        break;
-        } /* End : switch ( TYPE( arg ) ) */
     } /* End : case 1 */
     break;
 
@@ -6580,18 +6334,10 @@ RVec4_initialize( int argc, VALUE* argv, VALUE self )
         int i;
         for ( i = 0; i < argc; ++i )
         {
-            switch ( TYPE( argv[i] ) )
-            {
-            case T_FIXNUM:
-            case T_FLOAT:
-            {
+            if ( RB_FLOAT_TYPE_P(argv[i]) || RB_INTEGER_TYPE_P(argv[i]) ) {
                 rmReal f = NUM2DBL( argv[i] );
                 v->e[i] = f;
-            }
-            break;
-
-            default:
-            {
+            } else {
                 rb_raise( rb_eTypeError,
                           "RVec4_new : Unknown type %s. at arg %d",
                           rb_special_const_p( self ) ? RSTRING_PTR( rb_inspect( self ) ) : rb_obj_classname( self ),
@@ -6599,8 +6345,6 @@ RVec4_initialize( int argc, VALUE* argv, VALUE self )
                     );
                 return Qnil;
             }
-            break;
-            }
         } /* End : for ( i = 0; i < argc; ++i ) */
 
         return self;
@@ -6686,21 +6430,12 @@ RVec4_coerce( VALUE self, VALUE other )
     RVec4* v = NULL;
     TypedData_Get_Struct( self, RVec4, &RVec4_type, v );
 
-    switch( TYPE(other) )
-    {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         /* 'other (op) RVec4'
          * -> try again as 'RVec4 (op) other'
          */
         return rb_ary_new3( 2,  self, other );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "%s can't be coerced into %s",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other ),
@@ -6708,8 +6443,6 @@ RVec4_coerce( VALUE self, VALUE other )
             );
         return Qnil;
     }
-    break;
-    }
 }
 
 /*
@@ -7215,28 +6948,19 @@ RVec4_op_binary_mult( VALUE self, VALUE other )
     RVec4 result;
     rmReal f;
 
-    switch( TYPE(other) )
-    {
-    case T_FIXNUM:
-    case T_FLOAT:
-    {
+    if ( RB_FLOAT_TYPE_P(other) || RB_INTEGER_TYPE_P(other) ) {
         TypedData_Get_Struct( self, RVec4, &RVec4_type, v );
         f = NUM2DBL( other );
         RVec4Scale( &result, v, f );
 
         return RVec4_from_source( &result );
-    }
-    break;
-
-    default:
-    {
+    } else {
         rb_raise( rb_eTypeError,
                   "RVec4#* : Unknown type %s.",
                   rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
             );
         return Qnil;
     }
-    } /* End : switch( TYPE(other) ) */
 }
 
 /*
@@ -7338,7 +7062,7 @@ RVec4_op_assign_mult( VALUE self, VALUE other )
     rmReal  f;
 
 #ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( TYPE(other) != T_FIXNUM && TYPE(other) != T_FLOAT )
+    if ( !RB_FLOAT_TYPE_P(other) && !RB_INTEGER_TYPE_P(other) )
     {
         rb_raise( rb_eTypeError,
                   "RVec4#*= : Unknown type %s.",
@@ -7820,7 +7544,7 @@ Init_rmath3d()
 
 /*
 RMath : Ruby math module for 3D Applications
-Copyright (c) 2008- vaiorabbit  <http://twitter.com/vaiorabbit>
+Copyright (c) 2008-2017 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