rmath3d 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49898e4a80e600f039ecd7ec04511872b3ae42d2
-  data.tar.gz: fcc1b6d2a979747fc86519d30560e824dbf1b88c
+  metadata.gz: 480f9d7cfa725618252ced196bead41f187d86c2
+  data.tar.gz: cfb9c4dfd3027b08020bb25be79debf32c329efb
 SHA512:
-  metadata.gz: 5ddcc540d1be103a66966c51d839ad3c2af5775b5d0ad2dbe9f1c729964ec60a5cd411fd692fb76e6731a482f778f09e9f77dc9a6913ce7f20e4663c32422067
-  data.tar.gz: ad561643d3081d05ae0821ecafb762be751d07b5675330f7df913a37bac12c827964217dff897b4524be833a68c2545852ba138dd34414d4b4523d8d0f802835
+  metadata.gz: 585ec81811bbb4baa2835fca142a78d92674be01ef232bed8f3d021148c22586deb8fa0858e89d6a5dd19019cfa814c7b365857b488c358cdeb28c65d3539e88
+  data.tar.gz: 28ba4c0c9c30fee57d682ed96da605bf76a59c7d00d62609f4cf795c57808d94ac992af53625deaa8b08a1e091a01f7e38de4694a56b8aa6c3a74e1ea6c1b9ee

data/ChangeLog

@@ -1,3 +1,8 @@
+2015-08-23  vaiorabbit  <http://twitter.com/vaiorabbit>
+
+	* rmath3d.c (def ==): Removed control path returning Qnil.
+	* rmath3d_plain.rb (def ==): Removed control path returning Qnil.
+
 2015-05-02  vaiorabbit  <http://twitter.com/vaiorabbit>
 
 	* Ruby 1.9.3 and prior versions are no longer supported. Ref.: https://www.ruby-lang.org/en/news/2015/02/23/support-for-ruby-1-9-3-has-ended/

data/README.md

@@ -4,7 +4,7 @@
 
 rmath3d is a math module for 3D game programming and computer graphics.
 
-*   Last Update: Mar 02, 2015
+*   Last Update: Aug 23, 2015
 *   Since: Jul 20, 2008
 
 ## Features ##

data/ext/rmath3d/rmath3d.c

@@ -935,27 +935,24 @@ RMtx2_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RMtx2_op_binary_eq( VALUE self, VALUE other )
 {
-    RMtx2* m1 = NULL;
-    RMtx2* m2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRMtx2(other) )
+    if ( IsRMtx2(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RMtx2#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RMtx2* m1 = NULL;
+        RMtx2* m2 = NULL;
 
-    TypedData_Get_Struct( self,  RMtx2, &RMtx2_type, m1 );
-    TypedData_Get_Struct( other, RMtx2, &RMtx2_type, m2 );
+        TypedData_Get_Struct( self,  RMtx2, &RMtx2_type, m1 );
+        TypedData_Get_Struct( other, RMtx2, &RMtx2_type, m2 );
 
-    if ( !RMtx2Equal(m1,m2) )
-        return Qfalse;
+        if ( !RMtx2Equal(m1,m2) )
+            return Qfalse;
+        else
+            return Qtrue;
+
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -2060,27 +2057,23 @@ RMtx3_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RMtx3_op_binary_eq( VALUE self, VALUE other )
 {
-    RMtx3* m1 = NULL;
-    RMtx3* m2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRMtx3(other) )
+    if ( IsRMtx3(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RMtx3#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RMtx3* m1 = NULL;
+        RMtx3* m2 = NULL;
 
-    TypedData_Get_Struct( self,  RMtx3, &RMtx3_type, m1 );
-    TypedData_Get_Struct( other, RMtx3, &RMtx3_type, m2 );
+        TypedData_Get_Struct( self,  RMtx3, &RMtx3_type, m1 );
+        TypedData_Get_Struct( other, RMtx3, &RMtx3_type, m2 );
 
-    if ( !RMtx3Equal(m1,m2) )
-        return Qfalse;
+        if ( !RMtx3Equal(m1,m2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -3616,27 +3609,23 @@ RMtx4_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RMtx4_op_binary_eq( VALUE self, VALUE other )
 {
-    RMtx4* m1 = NULL;
-    RMtx4* m2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRMtx4(other) )
+    if ( IsRMtx4(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RMtx4#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RMtx4* m1 = NULL;
+        RMtx4* m2 = NULL;
 
-    TypedData_Get_Struct( self,  RMtx4, &RMtx4_type, m1 );
-    TypedData_Get_Struct( other, RMtx4, &RMtx4_type, m2 );
+        TypedData_Get_Struct( self,  RMtx4, &RMtx4_type, m1 );
+        TypedData_Get_Struct( other, RMtx4, &RMtx4_type, m2 );
 
-    if ( !RMtx4Equal(m1,m2) )
-        return Qfalse;
+        if ( !RMtx4Equal(m1,m2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -4549,27 +4538,23 @@ RQuat_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RQuat_op_binary_eq( VALUE self, VALUE other )
 {
-    RQuat* v1 = NULL;
-    RQuat* v2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRQuat(other) )
+    if ( IsRQuat(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RQuat#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RQuat* v1 = NULL;
+        RQuat* v2 = NULL;
 
-    TypedData_Get_Struct( self,  RQuat, &RQuat_type, v1 );
-    TypedData_Get_Struct( other, RQuat, &RQuat_type, v2 );
+        TypedData_Get_Struct( self,  RQuat, &RQuat_type, v1 );
+        TypedData_Get_Struct( other, RQuat, &RQuat_type, v2 );
 
-    if ( !RQuatEqual(v1,v2) )
-        return Qfalse;
+        if ( !RQuatEqual(v1,v2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -5365,27 +5350,23 @@ RVec2_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RVec2_op_binary_eq( VALUE self, VALUE other )
 {
-    RVec2* v1 = NULL;
-    RVec2* v2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRVec2(other) )
+    if ( IsRVec2(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RVec2#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RVec2* v1 = NULL;
+        RVec2* v2 = NULL;
 
-    TypedData_Get_Struct( self,  RVec2, &RVec2_type, v1 );
-    TypedData_Get_Struct( other, RVec2, &RVec2_type, v2 );
+        TypedData_Get_Struct( self,  RVec2, &RVec2_type, v1 );
+        TypedData_Get_Struct( other, RVec2, &RVec2_type, v2 );
 
-    if ( !RVec2Equal(v1,v2) )
-        return Qfalse;
+        if ( !RVec2Equal(v1,v2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -6367,27 +6348,23 @@ RVec3_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RVec3_op_binary_eq( VALUE self, VALUE other )
 {
-    RVec3* v1 = NULL;
-    RVec3* v2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRVec3(other) )
+    if ( IsRVec3(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RVec3#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RVec3* v1 = NULL;
+        RVec3* v2 = NULL;
 
-    TypedData_Get_Struct( self,  RVec3, &RVec3_type, v1 );
-    TypedData_Get_Struct( other, RVec3, &RVec3_type, v2 );
+        TypedData_Get_Struct( self,  RVec3, &RVec3_type, v1 );
+        TypedData_Get_Struct( other, RVec3, &RVec3_type, v2 );
 
-    if ( !RVec3Equal(v1,v2) )
-        return Qfalse;
+        if ( !RVec3Equal(v1,v2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*
@@ -7270,27 +7247,23 @@ RVec4_op_binary_mult( VALUE self, VALUE other )
 static VALUE
 RVec4_op_binary_eq( VALUE self, VALUE other )
 {
-    RVec4* v1 = NULL;
-    RVec4* v2 = NULL;
-
-#ifdef RMATH_ENABLE_ARGUMENT_CHECK
-    if ( !IsRVec4(other) )
+    if ( IsRVec4(other) )
     {
-        rb_raise( rb_eTypeError,
-                  "RVec4#== : Unknown type %s.",
-                  rb_special_const_p( other ) ? RSTRING_PTR( rb_inspect( other ) ) : rb_obj_classname( other )
-            );
-        return Qnil;
-    }
-#endif
+        RVec4* v1 = NULL;
+        RVec4* v2 = NULL;
 
-    TypedData_Get_Struct( self,  RVec4, &RVec4_type, v1 );
-    TypedData_Get_Struct( other, RVec4, &RVec4_type, v2 );
+        TypedData_Get_Struct( self,  RVec4, &RVec4_type, v1 );
+        TypedData_Get_Struct( other, RVec4, &RVec4_type, v2 );
 
-    if ( !RVec4Equal(v1,v2) )
-        return Qfalse;
+        if ( !RVec4Equal(v1,v2) )
+            return Qfalse;
+        else
+            return Qtrue;
+    }
     else
-        return Qtrue;
+    {
+        return Qfalse;
+    }
 }
 
 /*

data/lib/rmath3d/rmath3d_plain.rb

@@ -440,19 +440,18 @@ module RMath3D
     # mtx1 == mtx2 : evaluates equality.
     #
     def ==( other )
-      if ( other.class != RMtx2 )
-        raise TypeError, "RMtx2#==(other) : Unknown type #{other.class} given as RMtx2."
-        return nil
-      end
-
-      for row in 0...2 do
-        for col in 0...2 do
-          if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
-            return false
+      if other.class == RMtx2
+        for row in 0...2 do
+          for col in 0...2 do
+            if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
+              return false
+            end
           end
         end
+        return true
+      else
+        return false
       end
-      return true
     end
 
     #
@@ -1129,19 +1128,18 @@ module RMath3D
     # mtx1 == mtx2 : evaluates equality.
     #
     def ==( other )
-      if ( other.class != RMtx3 )
-        raise TypeError, "RMtx3#==(other) : Unknown type #{other.class} given as RMtx3."
-        return nil
-      end
-
-      for row in 0...3 do
-        for col in 0...3 do
-          if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
-            return false
+      if other.class == RMtx3
+        for row in 0...3 do
+          for col in 0...3 do
+            if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
+              return false
+            end
           end
         end
+        return true
+      else
+        return false
       end
-      return true
     end
 
     #
@@ -2081,19 +2079,18 @@ module RMath3D
     # mtx1 == mtx2 : evaluates equality.
     #
     def ==( other )
-      if ( other.class != RMtx4 )
-        raise TypeError, "RMtx4#==(other) : Unknown type #{other.class} given as RMtx4."
-        return nil
-      end
-
-      for row in 0...4 do
-        for col in 0...4 do
-          if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
-            return false
+      if other.class == RMtx4
+        for row in 0...4 do
+          for col in 0...4 do
+            if ( (getElement(row,col) - other.getElement(row,col)).abs > TOLERANCE )
+              return false
+            end
           end
         end
+        return true
+      else
+        return false
       end
-      return true
     end
 
     #
@@ -2258,7 +2255,7 @@ module RMath3D
     # Returns human-readable string.
     #
     def to_s
-      return "( #{@e[0]}, #{@e[1]}, #{@e[2]}, #{@e[3]} )\n"
+      return "( #{@e[0]}, #{@e[1]}, #{@e[2]}, #{@e[3]} )"
     end
 
     #
@@ -2630,16 +2627,15 @@ module RMath3D
     # quat1 == quat2 : evaluates equality.
     #
     def ==( other )
-      if other.class != RQuat
-        raise TypeError, "RQuat#== : Unknown type #{other.class}."
-        return nil
-      end
-
-      if  (x-other.x).abs<=Float::EPSILON &&
-          (y-other.y).abs<=Float::EPSILON &&
-          (z-other.z).abs<=Float::EPSILON &&
-          (w-other.w).abs<=Float::EPSILON
-        return true
+      if other.class == RQuat
+        if  (x-other.x).abs<=Float::EPSILON &&
+            (y-other.y).abs<=Float::EPSILON &&
+            (z-other.z).abs<=Float::EPSILON &&
+            (w-other.w).abs<=Float::EPSILON
+          return true
+        else
+          return false
+        end
       else
         return false
       end
@@ -2859,7 +2855,7 @@ module RMath3D
     # Returns human-readable string.
     #
     def to_s
-      return "( #{@e[0]}, #{@e[1]} )\n"
+      return "( #{@e[0]}, #{@e[1]} )"
     end
 
     #
@@ -3081,14 +3077,13 @@ module RMath3D
     # vec1 == vec2 : evaluates equality.
     #
     def ==( other )
-      if other.class != RVec2
-        raise TypeError, "RVec2#== : Unknown type #{other.class}."
-        return nil
-      end
-
-      if  (x-other.x).abs<=Float::EPSILON &&
-          (y-other.y).abs<=Float::EPSILON
-        return true
+      if other.class == RVec2
+        if  (x-other.x).abs<=Float::EPSILON &&
+            (y-other.y).abs<=Float::EPSILON
+          return true
+        else
+          return false
+        end
       else
         return false
       end
@@ -3199,7 +3194,7 @@ module RMath3D
     # Returns human-readable string.
     #
     def to_s
-      return "( #{@e[0]}, #{@e[1]}, #{@e[2]} )\n"
+      return "( #{@e[0]}, #{@e[1]}, #{@e[2]} )"
     end
 
     #
@@ -3635,15 +3630,14 @@ module RMath3D
     # vec1 == vec2 : evaluates equality.
     #
     def ==( other )
-      if other.class != RVec3
-        raise TypeError, "RVec3#== : Unknown type #{other.class}."
-        return nil
-      end
-
-      if  (x-other.x).abs<=Float::EPSILON &&
-          (y-other.y).abs<=Float::EPSILON &&
-          (z-other.z).abs<=Float::EPSILON
-        return true
+      if other.class == RVec3
+        if  (x-other.x).abs<=Float::EPSILON &&
+            (y-other.y).abs<=Float::EPSILON &&
+            (z-other.z).abs<=Float::EPSILON
+          return true
+        else
+          return false
+        end
       else
         return false
       end
@@ -3759,7 +3753,7 @@ module RMath3D
     # Returns human-readable string.
     #
     def to_s
-      return "( #{@e[0]}, #{@e[1]}, #{@e[2]}, #{@e[3]} )\n"
+      return "( #{@e[0]}, #{@e[1]}, #{@e[2]}, #{@e[3]} )"
     end
 
     #
@@ -4082,16 +4076,15 @@ module RMath3D
     # vec1 == vec2 : evaluates equality.
     #
     def ==( other )
-      if other.class != RVec4
-        raise TypeError, "RVec4#== : Unknown type #{other.class}."
-        return nil
-      end
-
-      if  (x-other.x).abs<=Float::EPSILON &&
-          (y-other.y).abs<=Float::EPSILON &&
-          (z-other.z).abs<=Float::EPSILON &&
-          (w-other.w).abs<=Float::EPSILON
-        return true
+      if other.class == RVec4
+        if  (x-other.x).abs<=Float::EPSILON &&
+            (y-other.y).abs<=Float::EPSILON &&
+            (z-other.z).abs<=Float::EPSILON &&
+            (w-other.w).abs<=Float::EPSILON
+          return true
+        else
+          return false
+        end
       else
         return false
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmath3d
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - vaiorabbit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-08-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).
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Math Module for 3D Applications