cglm 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239ddc2c75a6a3939ded1179375071ae43924887a73f8c193e256e2f6e45879f
-  data.tar.gz: 5b3f6be03330019caa0024adb0062e5a20d9e88e5b9141debb3028c39bb4f7b3
+  metadata.gz: 89c806f5a00ef690cfead8c0c384f4a7c0cc5c1734129a43313f952e4c96b04f
+  data.tar.gz: 3609604cbbee1cc090c70ed9e21cde21f77be10a20cdfd1c3964c955a53bb47a
 SHA512:
-  metadata.gz: 76c5578265a2e6130746a46a47aa3f2749e9d7202dea356dc2f2e7708515112986d7dee9602a272f2b0d2cd32b98aceddfb4292cd3e5aaf09a7c3afade0c6c9e
-  data.tar.gz: 730f64f9d352059b73d38d2b1da7020eae9bc3ea8b49f91514a853d7f12eb95fd00e1b5cc89320bc5a722f143930348d6c865f935e50e987cdc4b536d5d3f7fd
+  metadata.gz: 65337d472039a5ad4e8a613b760f6de059d5461f19ad8410a6fe6e87e218a5303de8396dad3ba7311e5c41bc9caedf0274cb633fb08d091ef7b54b092169bb45
+  data.tar.gz: 6fa21d54b27454acda36f4bcb73bd0f99e17707448627d9ed50071076da60b0d3c8544ab8c000379efe5c04c2cabbd5f5f5cdf2a02aeee71e5093739c48ecf79

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    cglm (0.1.1)
+    cglm (0.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    docile (1.3.2)
-    github-markup (3.0.4)
-    json (2.3.0)
-    minitest (5.14.0)
-    rake (13.0.1)
-    rake-compiler (1.1.0)
+    docile (1.4.0)
+    github-markup (4.0.0)
+    minitest (5.15.0)
+    rake (13.0.6)
+    rake-compiler (1.1.9)
       rake
-    redcarpet (3.5.0)
-    simplecov (0.17.1)
+    redcarpet (3.5.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    yard (0.9.24)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -36,4 +38,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.1.2
+   2.2.3

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.h

@@ -97,7 +97,7 @@ static inline size_t vec3_size()  { return sizeof(vec3);  }
 static inline size_t vec4_size()  { return sizeof(vec4);  }
 static inline size_t aabb_size()  { return sizeof(aabb);  }
 static inline size_t mat4_size()  { return sizeof(mat4);  }
-static inline size_t mat3_size()  { return sizeof(mat4);  }
+static inline size_t mat3_size()  { return sizeof(mat3);  }
 static inline size_t quat_size()  { return sizeof(mat4);  }
 static inline size_t plane_size() { return sizeof(plane); }
 
@@ -153,7 +153,7 @@ static inline void *VAL2ADDR(VALUE val, size_t min_size) {
   VALUE addr = rb_funcall(val, rb_intern("addr"), 0);
   VALUE size = rb_funcall(addr, rb_intern("size"), 0);
   if (min_size > NUM2SIZET(size))
-    rb_raise(rb_eArgError, "memory store (size %zu) is not large enough to be converted into the requested type (size %zu)", NUM2SIZET(size), min_size);
+    rb_raise(rb_eArgError, "memory store (size %zu) is not large enough to be converted into the requested type (size %zu)", (size_t) NUM2SIZET(size), min_size);
   return NUM2PTR(rb_funcall(addr, rb_intern("to_i"), 0));
 }
 

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);
@@ -201,13 +203,13 @@ VALUE rb_cglm_quat_to_mat3t(int argc, VALUE *argv, VALUE self) {
 
 /* call-seq: lerp!(from, to, amount) => self */
 VALUE rb_cglm_quat_lerp_self(VALUE self, VALUE from, VALUE to, VALUE amount) {
-  glm_quat_lerp(VAL2QUAT(from), VAL2QUAT(to), NUM2FLT(to), VAL2QUAT(self));
+  glm_quat_lerp(VAL2QUAT(from), VAL2QUAT(to), NUM2FLT(amount), VAL2QUAT(self));
   return self;
 }
 
 /* call-seq: slerp!(from, to, amount) => self */
 VALUE rb_cglm_quat_slerp_self(VALUE self, VALUE from, VALUE to, VALUE amount) {
-  glm_quat_slerp(VAL2QUAT(from), VAL2QUAT(to), NUM2FLT(to), VAL2QUAT(self));
+  glm_quat_slerp(VAL2QUAT(from), VAL2QUAT(to), NUM2FLT(amount), VAL2QUAT(self));
   return self;
 }
 

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.1"
+  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.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Colin MacKenzie IV
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - sinisterchipmunk@gmail.com
 executables: []
@@ -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
@@ -255,7 +256,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/sinisterchipmunk/cglm-ruby
   source_code_uri: https://github.com/sinisterchipmunk/cglm-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby bindings for CGLM (https://github.com/recp/cglm), a high performance
   math library for graphics applications.