cglm 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b055efd84ea5f04fd2db0580fbc15df485b59c45afe73c41aa8e0eff9701d1
-  data.tar.gz: 5a65edbb6ee9a569fa87459f630e40c6b98d94c705658b9c365accdcc0c304b2
+  metadata.gz: 89c806f5a00ef690cfead8c0c384f4a7c0cc5c1734129a43313f952e4c96b04f
+  data.tar.gz: 3609604cbbee1cc090c70ed9e21cde21f77be10a20cdfd1c3964c955a53bb47a
 SHA512:
-  metadata.gz: 66ad4516dc605c3fe302ce923ad2a54f027b7ee7d2601b4b65d2e1bf6f4ca681fd344a137baed3c12ea5c01f4124cf3bd6d6d0d5c89c3b4b46fd15690a9d1ed5
-  data.tar.gz: 975f418d0f8c3a9e74f726bd8423bd078a43f268d6263edb5198c06c45471d1215f4c78057c7d5fd0930158916606d1538de7838741d4794f89ce56be008b54f
+  metadata.gz: 65337d472039a5ad4e8a613b760f6de059d5461f19ad8410a6fe6e87e218a5303de8396dad3ba7311e5c41bc9caedf0274cb633fb08d091ef7b54b092169bb45
+  data.tar.gz: 6fa21d54b27454acda36f4bcb73bd0f99e17707448627d9ed50071076da60b0d3c8544ab8c000379efe5c04c2cabbd5f5f5cdf2a02aeee71e5093739c48ecf79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cglm (0.1.3)
+    cglm (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/ext/cglm/rb_cglm.c

@@ -5,6 +5,7 @@ VALUE rb_cFiddle     = Qnil,
       rb_mCGLM       = Qnil,
       rb_cCGLMBase   = Qnil,
       rb_cVectorType = Qnil,
+      rb_cMatrixType = Qnil,
       rb_cMat3       = Qnil,
       rb_cMat4       = Qnil,
       rb_cVec3       = Qnil,
@@ -33,9 +34,9 @@ void Init_cglm(void) {
   rb_mCGLM       = rb_define_module("CGLM");
   rb_mEuler      = rb_define_module_under(rb_mCGLM, "Euler");
   rb_cCGLMBase   = rb_define_class_under(rb_mCGLM, "Base",       rb_cObject);
-  rb_cMat3       = rb_define_class_under(rb_mCGLM, "Mat3",       rb_cCGLMBase);
-  rb_cMat4       = rb_define_class_under(rb_mCGLM, "Mat4",       rb_cCGLMBase);
-  rb_cCGLMBase   = rb_define_class_under(rb_mCGLM, "Base",       rb_cObject);
+  rb_cMatrixType = rb_define_class_under(rb_mCGLM, "MatrixType", rb_cCGLMBase);
+  rb_cMat3       = rb_define_class_under(rb_mCGLM, "Mat3",       rb_cMatrixType);
+  rb_cMat4       = rb_define_class_under(rb_mCGLM, "Mat4",       rb_cMatrixType);
   rb_cVectorType = rb_define_class_under(rb_mCGLM, "VectorType", rb_cCGLMBase);
   rb_cAABB       = rb_define_class_under(rb_mCGLM, "AABB",       rb_cCGLMBase);
   rb_cVec3       = rb_define_class_under(rb_mCGLM, "Vec3",       rb_cVectorType);

data/ext/cglm/rb_cglm_affine.c

@@ -130,22 +130,30 @@ VALUE rb_cglm_translate_z_self(VALUE self, VALUE flt) {
 }
 
 /* call-seq: translate(vec3) => new Mat4 */
-VALUE rb_cglm_translate_new(VALUE klass, VALUE vec_v) {
-  VALUE dest = MAT4_NEW(ALLOC_MAT4);
+VALUE rb_cglm_translate_new(int argc, VALUE *argv, VALUE klass) {
+  VALUE vec_v, dest;
+  rb_scan_args(argc, argv, "11", &vec_v, &dest);
+  if (NIL_P(dest)) dest = MAT4_NEW(ALLOC_MAT4);
   glm_translate_make(VAL2MAT4(dest), VAL2VEC3(vec_v));
   return dest;
 }
 
 /* call-seq: scale(vec3) => new Mat4 */
-VALUE rb_cglm_scale_new(VALUE klass, VALUE vec_v) {
-  VALUE dest = MAT4_NEW(ALLOC_MAT4);
+VALUE rb_cglm_scale_new(int argc, VALUE *argv, VALUE klass) {
+  VALUE vec_v, dest;
+  rb_scan_args(argc, argv, "11", &vec_v, &dest);
+  if (NIL_P(dest)) dest = MAT4_NEW(ALLOC_MAT4);
   glm_scale_make(VAL2MAT4(dest), VAL2VEC3(vec_v));
   return dest;
 }
 
-/* call-seq: rotate(axis, angle) => new Mat4 */
-VALUE rb_cglm_rotate_new(VALUE klass, VALUE axis, VALUE angle) {
-  VALUE dest = MAT4_NEW(ALLOC_MAT4);
+/*
+ * call-seq: rotate(axis, angle[, dest]) => dest | new Mat4
+ */
+VALUE rb_cglm_rotate_new(int argc, VALUE *argv, VALUE klass) {
+  VALUE axis, angle, dest;
+  rb_scan_args(argc, argv, "21", &axis, &angle, &dest);
+  if (NIL_P(dest)) dest = MAT4_NEW(ALLOC_MAT4);
   glm_rotate_make(VAL2MAT4(dest), (float) NUM2DBL(angle), VAL2VEC3(axis));
   return dest;
 }
@@ -318,8 +326,8 @@ void Init_cglm_affine() {
   rb_define_method(rb_cMat4, "decompose_rs",   rb_cglm_decompose_rs,     2);
   rb_define_method(rb_cMat4, "decompose",      rb_cglm_decompose,        3);
 
-  rb_define_singleton_method(rb_cMat4, "translate",            rb_cglm_translate_new, 1);
-  rb_define_singleton_method(rb_cMat4, "scale",                rb_cglm_scale_new,     1);
-  rb_define_singleton_method(rb_cMat4, "rotate",               rb_cglm_rotate_new,    2);
+  rb_define_singleton_method(rb_cMat4, "translate",            rb_cglm_translate_new,-1);
+  rb_define_singleton_method(rb_cMat4, "scale",                rb_cglm_scale_new,    -1);
+  rb_define_singleton_method(rb_cMat4, "rotate",               rb_cglm_rotate_new,   -1);
   rb_define_singleton_method(rb_cMat4, "axis_angle_rotate_at", rb_cglm_rotate_at_new, 3);
 }

data/ext/cglm/rb_cglm_quat.c

@@ -9,7 +9,9 @@ VALUE rb_cglm_quat_new_identity(int argc, VALUE *argv, VALUE self) {
   return dest;
 }
 
-/* call-seq: axis_angle(axis, angle[, dest]) => dest | new Quat */
+/*
+ * call-seq: axis_angle(axis, angle[, dest]) => dest | new Quat
+ */
 VALUE rb_cglm_quat_new_axis_angle(int argc, VALUE *argv, VALUE self) {
   VALUE axis, angle, dest;
   rb_scan_args(argc, argv, "21", &axis, &angle, &dest);

data/lib/cglm/base.rb

@@ -18,7 +18,8 @@ module CGLM
 
     def copy_to(other)
       size = addr.size > other.addr.size ? other.addr.size : addr.size
-      other.addr[0, size] = addr[0, size]
+      other.addr[0, size] = addr
+      other
     end
 
     def dup(other = nil)

data/lib/cglm/mat3.rb

@@ -1,5 +1,5 @@
 module CGLM
-  class Mat3 < Base
+  class Mat3 < MatrixType
     # Performs multiplication with `other` and returns the result.
     #
     # * `other` is a Mat3 or Vec3.
@@ -23,5 +23,12 @@ module CGLM
       left = "#<#{self.class}@#{addr.to_i.to_s(16)} ["
       left + vals.join(",\n" + (" " * left.size)) + "]>"
     end
+
+    # Returns a flat array of floats, rather than the 2D array returned by
+    # #to_a. Equivalent to `to_a.flatten`, but more efficient.
+    def to_flat_a
+      addr = self.addr
+      addr[0, addr.size].unpack("F*")
+    end
   end
 end

data/lib/cglm/mat4.rb

@@ -1,5 +1,5 @@
 module CGLM
-  class Mat4 < Base
+  class Mat4 < MatrixType
     def initialize(initial_values = nil, **args)
       super(**args)
       case initial_values

data/lib/cglm/matrix_type.rb

@@ -0,0 +1,10 @@
+module CGLM
+  class MatrixType < Base
+    # Returns a flat array of floats, rather than the 2D array returned by
+    # #to_a. Equivalent to `to_a.flatten`, but more efficient.
+    def to_flat_a
+      addr = self.addr
+      addr[0, addr.size].unpack("F*")
+    end
+  end
+end

data/lib/cglm/version.rb

@@ -1,3 +1,3 @@
 module CGLM
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/cglm.rb

@@ -13,6 +13,7 @@ end
 module CGLM
   require 'cglm/base'
   require 'cglm/vector_type'
+  require 'cglm/matrix_type'
   require 'cglm/aabb'
   require 'cglm/vec3'
   require 'cglm/vec4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cglm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Colin MacKenzie IV
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -241,6 +241,7 @@ files:
 - lib/cglm/frustum.rb
 - lib/cglm/mat3.rb
 - lib/cglm/mat4.rb
+- lib/cglm/matrix_type.rb
 - lib/cglm/plane.rb
 - lib/cglm/quat.rb
 - lib/cglm/sphere.rb