snow-math 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07dcfa849094229689bdbf469119e52479b5034e
-  data.tar.gz: 51702b6e75a2b89f77c257a79ca5e1b9162a763a
+  metadata.gz: 142f6e19b8c998b9745f575ed0c8d2b0ea798d23
+  data.tar.gz: 81c3a701da5050c2a48d41e7e8231d785d3e9808
 SHA512:
-  metadata.gz: 6a625c25c0d0c193dc9cd1d76f921c6ac8e59d94da5da176418656afa924c6f7d2a9dfc8054c091736faa934a37354e5893fa1296c8bfb6905ad0b3f1ffdd562
-  data.tar.gz: a1f15c58795706985615239610c1a673ab009a41a12df9061c3bfac81b4af5f5c00cb03c74e0eba84236b230e9dd0beef48e3bc94ecd6d8d9fe286eea7ca892f
+  metadata.gz: 600813616e652545b881ba308b2bacfd4e508a26b540465463b24dea6560715eb935c3f285dcf0e6bea57e276be3d113af79bb9f8c0030fb18cbbf3245519243
+  data.tar.gz: be637a1bd6f32da28ca8b1c8ba9830c26f838d68c98729116c40ae44fde87d70e316fc3f8d134b7973ad749ec028c465804764f9d489a97fd3fbc7a65c6f9dc9

data/ext/snow-math/mat3.c

@@ -121,50 +121,51 @@ void mat3_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat3_
   const s_float_t xs = s * x;
   const s_float_t ys = s * y;
   const s_float_t zs = s * z;
+  const s_float_t xx = x * x;
+  const s_float_t yy = y * y;
+  const s_float_t zz = z * z;
 
-  out[0] = ((x * x) * ic) + c;
-  out[1] = xy + zs;
-  out[2] = xz - ys;
-  out[3] = xy - zs;
-  out[4] = ((y * y) * ic) + c;
-  out[5] = yz + xs;
-  out[6] = xz + ys;
-  out[7] = yz - xs;
-  out[8] = ((z * z) * ic) + c;
+  out[0] = xx + c * (s_float_lit(1.0) - xx);
+  out[1] = xy * ic - zs;
+  out[2] = z * x * ic + ys;
+
+  out[3] = xy * ic + zs;
+  out[4] = yy + c * (s_float_lit(1.0) - yy);
+  out[5] = yz * ic - xs;
+
+  out[6] = xz * ic - ys;
+  out[7] = yz * ic + xs;
+  out[8] = zz + c * (s_float_lit(1.0) - zz);
 }
 
 
 
 void mat3_from_quat(const quat_t in, mat3_t out)
 {
-  s_float_t tx, ty, tz, xx, xy, xz, yy, yz, zz, wx, wy, wz;
-
-  tx = s_float_lit(2.0) * in[0];
-  ty = s_float_lit(2.0) * in[1];
-  tz = s_float_lit(2.0) * in[2];
-
-  xx = tx * in[0];
-  xy = tx * in[1];
-  xz = tx * in[2];
-
-  yy = ty * in[1];
-  yz = tz * in[1];
-
-  zz = tz * in[3];
-
-  wx = tx * in[3];
-  wy = ty * in[3];
-  wz = tz * in[3];
-
-  out[0] = s_float_lit(1.0) - (yy + zz);
-  out[1] = xy - wz;
-  out[2] = xz + wy;
-  out[3] = xy + wz;
-  out[4] = s_float_lit(1.0) - (xx + zz);
-  out[5] = yz - wx;
-  out[6] = xz - wy;
-  out[7] = yz + wx;
-  out[8] = s_float_lit(1.0) - (xx + yy);
+  s_float_t xx, xy, xz, yy, yz, zz, wx, wy, wz;
+
+  xx = in[0] * in[0];
+  xy = in[0] * in[1];
+  xz = in[0] * in[2];
+
+  yy = in[1] * in[1];
+  yz = in[2] * in[2];
+
+  zz = in[2] * in[2];
+
+  wx = in[0] * in[3];
+  wy = in[1] * in[3];
+  wz = in[2] * in[3];
+
+  out[0] = s_float_lit(1.0) - s_float_lit(2.0) * (yy + zz);
+  out[1] = s_float_lit(2.0) * (xy - wz);
+  out[2] = s_float_lit(2.0) * (xz + wy);
+  out[3] = s_float_lit(2.0) * (xy + wz);
+  out[4] = s_float_lit(1.0) - s_float_lit(2.0) * (xx + zz);
+  out[5] = s_float_lit(2.0) * (yz - wx);
+  out[6] = s_float_lit(2.0) * (xz - wy);
+  out[7] = s_float_lit(2.0) * (yz + wx);
+  out[8] = s_float_lit(1.0) - s_float_lit(2.0) * (xx + yy);
 }
 
 

data/ext/snow-math/mat4.c

@@ -206,8 +206,8 @@ void mat4_get_axes4(const mat4_t m, vec4_t x, vec4_t y, vec4_t z, vec4_t w)
 void mat4_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat4_t out)
 {
   const s_float_t angle_rad = angle * S_DEG2RAD;
-  const s_float_t c = s_cos(angle_rad);
-  const s_float_t s = s_sin(angle_rad);
+  const s_float_t c  = s_cos(angle_rad);
+  const s_float_t s  = s_sin(angle_rad);
   const s_float_t ic = s_float_lit(1.0) - c;
   const s_float_t xy = x * y * ic;
   const s_float_t yz = y * z * ic;
@@ -215,16 +215,22 @@ void mat4_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat4_
   const s_float_t xs = s * x;
   const s_float_t ys = s * y;
   const s_float_t zs = s * z;
+  const s_float_t xx = x * x;
+  const s_float_t yy = y * y;
+  const s_float_t zz = z * z;
+
+  out[0] = xx + c * (s_float_lit(1.0) - xx);
+  out[1] = xy * ic - zs;
+  out[2] = z * x * ic + ys;
+
+  out[4] = xy * ic + zs;
+  out[5] = yy + c * (s_float_lit(1.0) - yy);
+  out[6] = yz * ic - xs;
+
+  out[8] = xz * ic - ys;
+  out[9] = yz * ic + xs;
+  out[10] = zz + c * (s_float_lit(1.0) - zz);
 
-  out[0] = ((x * x) * ic) + c;
-  out[1] = xy + zs;
-  out[2] = xz - ys;
-  out[4] = xy - zs;
-  out[5] = ((y * y) * ic) + c;
-  out[6] = yz + xs;
-  out[8] = xz + ys;
-  out[9] = yz - xs;
-  out[10] = ((z * z) * ic) + c;
   out[3] = out[7] = out[11] =
   out[12] = out[13] = out[14] = s_float_lit(0.0);
   out[15] = s_float_lit(1.0);
@@ -309,34 +315,30 @@ void mat4_look_at(const vec3_t eye, const vec3_t center, const vec3_t up, mat4_t
 
 void mat4_from_quat(const quat_t quat, mat4_t out)
 {
-  s_float_t tx, ty, tz, xx, xy, xz, yy, yz, zz, wx, wy, wz;
-
-  tx = s_float_lit(2.0) * quat[0];
-  ty = s_float_lit(2.0) * quat[1];
-  tz = s_float_lit(2.0) * quat[2];
+  s_float_t xx, xy, xz, yy, yz, zz, wx, wy, wz;
 
-  xx = tx * quat[0];
-  xy = tx * quat[1];
-  xz = tx * quat[2];
+  xx = quat[0] * quat[0];
+  xy = quat[0] * quat[1];
+  xz = quat[0] * quat[2];
 
-  yy = ty * quat[1];
-  yz = tz * quat[1];
+  yy = quat[1] * quat[1];
+  yz = quat[2] * quat[2];
 
-  zz = tz * quat[3];
+  zz = quat[2] * quat[2];
 
-  wx = tx * quat[3];
-  wy = ty * quat[3];
-  wz = tz * quat[3];
+  wx = quat[0] * quat[3];
+  wy = quat[1] * quat[3];
+  wz = quat[2] * quat[3];
 
-  out[0 ] = s_float_lit(1.0) - (yy + zz);
-  out[1 ] = xy - wz;
-  out[2 ] = xz + wy;
-  out[4 ] = xy + wz;
-  out[5 ] = s_float_lit(1.0) - (xx + zz);
-  out[6 ] = yz - wx;
-  out[8 ] = xz - wy;
-  out[9 ] = yz + wx;
-  out[10] = s_float_lit(1.0) - (xx + yy);
+  out[0 ] = s_float_lit(1.0) - s_float_lit(2.0) * (yy + zz);
+  out[1 ] = s_float_lit(2.0) * (xy - wz);
+  out[2 ] = s_float_lit(2.0) * (xz + wy);
+  out[4 ] = s_float_lit(2.0) * (xy + wz);
+  out[5 ] = s_float_lit(1.0) - s_float_lit(2.0) * (xx + zz);
+  out[6 ] = s_float_lit(2.0) * (yz - wx);
+  out[8 ] = s_float_lit(2.0) * (xz - wy);
+  out[9 ] = s_float_lit(2.0) * (yz + wx);
+  out[10] = s_float_lit(1.0) - s_float_lit(2.0) * (xx + yy);
 
   out[7 ] = s_float_lit(0.0);
   out[3 ] = s_float_lit(0.0);

data/ext/snow-math/snow-math.c

@@ -4346,7 +4346,7 @@ static VALUE sm_mat4_to_mat3(int argc, VALUE *argv, VALUE sm_self)
 SM_LABEL(skip_output): {
     mat3_t output;
     mat4_to_mat3 (*self, output);
-    sm_out = sm_wrap_mat3(output, s_sm_mat4_klass);
+    sm_out = sm_wrap_mat3(output, s_sm_mat3_klass);
     rb_obj_call_init(sm_out, 0, 0);
   }} else {
     rb_raise(rb_eArgError, "Invalid number of arguments to to_mat3");
@@ -5914,7 +5914,7 @@ static VALUE sm_mat3_to_mat4(int argc, VALUE *argv, VALUE sm_self)
 SM_LABEL(skip_output): {
     mat4_t output;
     mat3_to_mat4 (*self, output);
-    sm_out = sm_wrap_mat4(output, s_sm_mat3_klass);
+    sm_out = sm_wrap_mat4(output, s_sm_mat4_klass);
     rb_obj_call_init(sm_out, 0, 0);
   }} else {
     rb_raise(rb_eArgError, "Invalid number of arguments to to_mat4");

data/lib/snow-math/quat.rb

@@ -222,6 +222,28 @@ class Snow::Quat
     slerp(destination, alpha, self)
   end
 
+  def pitch
+    x, y, z, w = self[0], self[1], self[2], self[3]
+    tx = 2.0 * (x * z - w * y)
+    ty = 2.0 * (y * z + w * x)
+    tz = 1.0 - 2.0 * (x * x + y * y)
+    Math::atan2(ty, Math::sqrt(tx * tx - tz * tz)) * Snow::RADIANS_TO_DEGREES
+  end
+
+  def yaw
+    x, y, z, w = self[0], self[1], self[2], self[3]
+    tx = 2.0 * (x * z - w * y)
+    tz = 1.0 - 2.0 * (x * x + y * y)
+    -Math::atan2(tx, tz) * Snow::RADIANS_TO_DEGREES
+  end
+
+  def roll
+    x, y, z, w = self[0], self[1], self[2], self[3]
+    txy = 2.0 * (x * y - w * z)
+    tyy = 1.0 - 2.0 * (x * x + z * z)
+    Math::atan2(txy, tyy) * Snow::RADIANS_TO_DEGREES
+  end
+
 
   alias_method :-, :subtract
   alias_method :+, :add

data/lib/snow-math/swizzle.rb

@@ -32,7 +32,6 @@ module Snow
   #
   #     # Bad
   #     Vec3[1, 2, 3].www           # => Invalid, no W component for Vec3
-  #     Vec3[1, 2, 3].xx            # => Invalid, no 2-component vector type
   #     Vec3[1, 2, 3].xxxxx         # => Invalid, no 5-component vector type
   #
   module SwizzleSupport

data/lib/snow-math/version.rb

@@ -7,6 +7,6 @@ module Snow
   #
   # snow-math bindings version string.
   #
-  SNOW_MATH_VERSION = '1.7.0'
+  SNOW_MATH_VERSION = '1.7.1'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snow-math
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Noel Raymond Cower