snow-math 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8540161113581ca75f88df1235ccb6293daa57ec
-  data.tar.gz: d93b16b109cb01a2ce9aa287307696f9ff6e8fb3
+  metadata.gz: 2abd452bb35eb8e3103d3f7be86ff10caafa41cf
+  data.tar.gz: 7bdde81b230eed327872fd2207b720880657b8ed
 SHA512:
-  metadata.gz: 318d5a4f427a73d0ae42066e8f8e0796b9e4913931a9ec0235c201de922018a2e473fa1d4cb904516f0107ad7a466c448c3c51bf6e80fc4f35a21e9bf594fc09
-  data.tar.gz: 91ce1b664a2aa88065f47a8c358202a590df84b391d97f2e232b972ec0ad3517fa9f606cbc24f67f57aaa47fb5f5fa7252655e25247059b93e78a31a38768838
+  metadata.gz: 2d03e5ff63f45425ebcdf9078505b760ab847d663c580aecd031769c3cfbb79737957df79f52befbf173f80edb9dbefb134067ac4a4910a3c7dd0b26d0d8b7a7
+  data.tar.gz: 4b564b77f26858fb0db2bdd25db32eee51ff20c1237dfefdba7ca8be48805ee2bf2ce62b8c57a3746ce8e9ab6ec0adb9dd11fb9fb347efbc4b518ff3561181cc

data/ext/snow-math/mat3.c

@@ -17,9 +17,9 @@ extern "C"
 
 
 const mat3_t g_mat3_identity = {
-  1.0, 0.0, 0.0,
-  0.0, 1.0, 0.0,
-  0.0, 0.0, 1.0
+  s_float_lit(1.0), s_float_lit(0.0), s_float_lit(0.0),
+  s_float_lit(0.0), s_float_lit(1.0), s_float_lit(0.0),
+  s_float_lit(0.0), s_float_lit(0.0), s_float_lit(1.0)
 };
 
 
@@ -57,14 +57,14 @@ void mat3_identity(mat3_t out)
 {
   out[0] =
   out[4] =
-  out[8] = 1;
+  out[8] = s_float_lit(1.0);
 
   out[1] =
   out[2] =
   out[3] =
   out[5] =
   out[6] =
-  out[7] = 0;
+  out[7] = s_float_lit(0.0);
 }
 
 
@@ -74,19 +74,19 @@ void mat3_to_mat4(const mat3_t in, mat4_t out)
   out[0] = in[0];
   out[1] = in[1];
   out[2] = in[2];
-  out[3] = 0;
+  out[3] = s_float_lit(0.0);
   out[4] = in[3];
   out[5] = in[4];
   out[6] = in[5];
-  out[7] = 0;
+  out[7] = s_float_lit(0.0);
   out[8] = in[6];
   out[9] = in[7];
   out[10] = in[8];
   out[14] =
   out[13] =
   out[12] =
-  out[11] = 0;
-  out[15] = 1;
+  out[11] = s_float_lit(0.0);
+  out[15] = s_float_lit(1.0);
 }
 
 
@@ -114,7 +114,7 @@ void mat3_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat3_
   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 ic = 1.0 - c;
+  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;
   const s_float_t xz = x * z * ic;
@@ -139,9 +139,9 @@ 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 = 2.0 * in[0];
-  ty = 2.0 * in[1];
-  tz = 2.0 * in[2];
+  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];
@@ -156,15 +156,15 @@ void mat3_from_quat(const quat_t in, mat3_t out)
   wy = ty * in[3];
   wz = tz * in[3];
 
-  out[0] = 1.0 - (yy + zz);
+  out[0] = s_float_lit(1.0) - (yy + zz);
   out[1] = xy - wz;
   out[2] = xz + wy;
   out[3] = xy + wz;
-  out[4] = 1.0 - (xx + zz);
+  out[4] = s_float_lit(1.0) - (xx + zz);
   out[5] = yz - wx;
   out[6] = xz - wy;
   out[7] = yz + wx;
-  out[8] = 1.0 - (xx + yy);
+  out[8] = s_float_lit(1.0) - (xx + yy);
 }
 
 
@@ -353,8 +353,8 @@ void mat3_adjoint(const mat3_t in, mat3_t out)
 int mat3_inverse(const mat3_t in, mat3_t out)
 {
   s_float_t determinant = mat3_determinant(in);
-  if (determinant != 0.0 && determinant != -0.0) {
-    determinant = 1.0 / determinant;
+  if (determinant != s_float_lit(0.0) && determinant != s_float_lit(-0.0)) {
+    determinant = s_float_lit(1.0) / determinant;
   } else {
     return 0;
   }
@@ -378,16 +378,25 @@ int mat3_inverse(const mat3_t in, mat3_t out)
 
 void mat3_get_row3(const mat3_t in, int row, vec3_t out)
 {
-  const s_float_t *p = &in[0];
   switch (row) {
-  case 2: { p += 3; }
-  case 1: { p += 3; }
   case 0: {
     out[0] = in[0];
     out[1] = in[1];
     out[2] = in[2];
     break;
   }
+  case 1: {
+    out[0] = in[3];
+    out[1] = in[4];
+    out[2] = in[5];
+    break;
+  }
+  case 2: {
+    out[0] = in[6];
+    out[1] = in[7];
+    out[2] = in[8];
+    break;
+  }
   default: { break; }
   }
 }
@@ -396,16 +405,25 @@ void mat3_get_row3(const mat3_t in, int row, vec3_t out)
 
 void mat3_get_column3(const mat3_t in, int column, vec3_t out)
 {
-  const s_float_t *p = &in[0];
   switch (column) {
-  case 2: { ++p; }
-  case 1: { ++p; }
   case 0: {
     out[0] = in[0];
     out[1] = in[3];
     out[2] = in[6];
     break;
   }
+  case 1: {
+    out[0] = in[1];
+    out[1] = in[4];
+    out[2] = in[7];
+    break;
+  }
+  case 2: {
+    out[0] = in[2];
+    out[1] = in[5];
+    out[2] = in[8];
+    break;
+  }
   default: { break; }
   }
 }
@@ -414,16 +432,25 @@ void mat3_get_column3(const mat3_t in, int column, vec3_t out)
 
 void mat3_set_row3(int row, const vec3_t in, mat3_t out)
 {
-  const s_float_t *p = &out[0];
   switch (row) {
-  case 2: { p += 3; }
-  case 1: { p += 3; }
   case 0: {
     out[0] = in[0];
     out[1] = in[1];
     out[2] = in[2];
     break;
   }
+  case 1: {
+    out[3] = in[0];
+    out[4] = in[1];
+    out[5] = in[2];
+    break;
+  }
+  case 2: {
+    out[6] = in[0];
+    out[7] = in[1];
+    out[8] = in[2];
+    break;
+  }
   default: { break; }
   }
 }
@@ -432,16 +459,25 @@ void mat3_set_row3(int row, const vec3_t in, mat3_t out)
 
 void mat3_set_column3(int column, const vec3_t in, mat3_t out)
 {
-  const s_float_t *p = &out[0];
   switch (column) {
-  case 2: { ++p; }
-  case 1: { ++p; }
   case 0: {
     out[0] = in[0];
     out[3] = in[1];
     out[6] = in[2];
     break;
   }
+  case 1: {
+    out[3] = in[0];
+    out[4] = in[1];
+    out[5] = in[2];
+    break;
+  }
+  case 2: {
+    out[6] = in[0];
+    out[7] = in[1];
+    out[8] = in[2];
+    break;
+  }
   default: { break; }
   }
 }

data/ext/snow-math/mat4.c

@@ -23,21 +23,21 @@ extern "C"
 */
 
 const mat4_t g_mat4_identity = {
-  1.0, 0.0, 0.0, 0.0,
-  0.0, 1.0, 0.0, 0.0,
-  0.0, 0.0, 1.0, 0.0,
-  0.0, 0.0, 0.0, 1.0
+  s_float_lit(1.0), s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0),
+  s_float_lit(0.0), s_float_lit(1.0), s_float_lit(0.0), s_float_lit(0.0),
+  s_float_lit(0.0), s_float_lit(0.0), s_float_lit(1.0), s_float_lit(0.0),
+  s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0), s_float_lit(1.0)
 };
 
 static s_float_t mat4_cofactor(const mat4_t m, int r0, int r1, int r2, int c0, int c1, int c2);
 
 void mat4_identity(mat4_t out)
 {
-  out[0] = out[5] = out[10] = out[15] = 1.0;
+  out[0] = out[5] = out[10] = out[15] = s_float_lit(1.0);
   out[1] = out[2] = out[3] =
   out[4] = out[6] = out[7] =
   out[8] = out[9] = out[11] =
-  out[12] = out[13] = out[14] = 0.0;
+  out[12] = out[13] = out[14] = s_float_lit(0.0);
 }
 
 void mat4_copy(const mat4_t in, mat4_t out)
@@ -116,8 +116,8 @@ void mat4_set_axes3(const vec3_t x, const vec3_t y, const vec3_t z, const vec3_t
   out[7] = w[1];
   out[11] = w[2];
 
-  out[12] = out[13] = out[14] = 0.0;
-  out[15] = 1.0;
+  out[12] = out[13] = out[14] = s_float_lit(0.0);
+  out[15] = s_float_lit(1.0);
 }
 
 void mat4_get_axes3(const mat4_t m, vec3_t x, vec3_t y, vec3_t z, vec3_t w)
@@ -208,7 +208,7 @@ void mat4_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat4_
   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 ic = 1.0 - c;
+  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;
   const s_float_t xz = x * z * ic;
@@ -226,8 +226,8 @@ void mat4_rotation(s_float_t angle, s_float_t x, s_float_t y, s_float_t z, mat4_
   out[9] = yz - xs;
   out[10] = ((z * z) * ic) + c;
   out[3] = out[7] = out[11] =
-  out[12] = out[13] = out[14] = 0.0;
-  out[15] = 1.0;
+  out[12] = out[13] = out[14] = s_float_lit(0.0);
+  out[15] = s_float_lit(1.0);
 }
 
 void mat4_frustum(s_float_t left, s_float_t right, s_float_t bottom, s_float_t top, s_float_t near, s_float_t far, mat4_t out)
@@ -235,18 +235,18 @@ void mat4_frustum(s_float_t left, s_float_t right, s_float_t bottom, s_float_t t
   const s_float_t xdelta = right - left;
   const s_float_t ydelta = top - bottom;
   const s_float_t zdelta = far - near;
-  const s_float_t neardouble = 2.0 * near;
+  const s_float_t neardouble = s_float_lit(2.0) * near;
 
   out[0] = neardouble / xdelta;
   out[2] = (right + left) / xdelta;
   out[5] = neardouble / ydelta;
   out[6] = (top + bottom) / ydelta;
   out[10] = -((far + near) / zdelta);
-  out[11] = -1.0;
+  out[11] = s_float_lit(-1.0);
   out[14] = -((neardouble * far) / zdelta);
   out[1] = out[3] = out[4] =
   out[7] = out[8] = out[9] =
-  out[12] = out[13] = out[15] = 0.0;
+  out[12] = out[13] = out[15] = s_float_lit(0.0);
 }
 
 void mat4_orthographic(s_float_t left, s_float_t right, s_float_t bottom, s_float_t top, s_float_t near, s_float_t far, mat4_t out)
@@ -255,37 +255,37 @@ void mat4_orthographic(s_float_t left, s_float_t right, s_float_t bottom, s_floa
   const s_float_t ydelta = top - bottom;
   const s_float_t zdelta = far - near;
 
-  out[0] = 2.0 / xdelta;
-  out[5] = 2.0 / ydelta;
-  out[10] = -2.0 / zdelta;
+  out[0] = s_float_lit(2.0) / xdelta;
+  out[5] = s_float_lit(2.0) / ydelta;
+  out[10] = s_float_lit(-2.0) / zdelta;
   out[12] = -((right + left) / xdelta);
   out[13] = -((top + bottom) / ydelta);
   out[14] = -((far + near) / zdelta);
-  out[15] = 1.0;
+  out[15] = s_float_lit(1.0);
   out[1] = out[2] = out[3] =
   out[4] = out[6] = out[7] =
-  out[8] = out[9] = out[11] = 0.0;
+  out[8] = out[9] = out[11] = s_float_lit(0.0);
 }
 
 void mat4_perspective(s_float_t fov_y, s_float_t aspect, s_float_t near, s_float_t far, mat4_t out)
 {
-  const s_float_t r = s_tan(fov_y * 0.5 * S_DEG2RAD);
+  const s_float_t r = s_tan(fov_y * s_float_lit(0.5) * S_DEG2RAD);
   const s_float_t left = -r * aspect;
   const s_float_t right = r * aspect;
   const s_float_t bottom = -r;
   const s_float_t top = r;
-  const s_float_t two_near = 2 * near;
-  const s_float_t zdelta = 1.0 / (near - far);
+  const s_float_t two_near = s_float_lit(2.0) * near;
+  const s_float_t zdelta = s_float_lit(1.0) / (near - far);
 
   out[0] = two_near * (right - left);
   out[5] = two_near / (top - bottom);
   out[10] = (far + near) * zdelta;
-  out[11] = -1.0;
+  out[11] = s_float_lit(-1.0);
   out[14] = (two_near * far) * zdelta;
   out[1] = out[2] = out[3] =
   out[4] = out[6] = out[7] =
   out[8] = out[9] = out[12] =
-  out[13] = out[15] = 0.0;
+  out[13] = out[15] = s_float_lit(0.0);
 }
 
 void mat4_look_at(const vec3_t eye, const vec3_t center, const vec3_t up, mat4_t out)
@@ -315,9 +315,9 @@ 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 = 2.0 * quat[0];
-  ty = 2.0 * quat[1];
-  tz = 2.0 * quat[2];
+  tx = s_float_lit(2.0) * quat[0];
+  ty = s_float_lit(2.0) * quat[1];
+  tz = s_float_lit(2.0) * quat[2];
 
   xx = tx * quat[0];
   xy = tx * quat[1];
@@ -332,24 +332,24 @@ void mat4_from_quat(const quat_t quat, mat4_t out)
   wy = ty * quat[3];
   wz = tz * quat[3];
 
-  out[0 ] = 1.0 - (yy + zz);
+  out[0 ] = s_float_lit(1.0) - (yy + zz);
   out[1 ] = xy - wz;
   out[2 ] = xz + wy;
   out[4 ] = xy + wz;
-  out[5 ] = 1.0 - (xx + zz);
+  out[5 ] = s_float_lit(1.0) - (xx + zz);
   out[6 ] = yz - wx;
   out[8 ] = xz - wy;
   out[9 ] = yz + wx;
-  out[10] = 1.0 - (xx + yy);
+  out[10] = s_float_lit(1.0) - (xx + yy);
 
-  out[7 ] = 0.0;
-  out[3 ] = 0.0;
-  out[11] = 0.0;
-  out[12] = 0.0;
-  out[13] = 0.0;
-  out[14] = 0.0;
+  out[7 ] = s_float_lit(0.0);
+  out[3 ] = s_float_lit(0.0);
+  out[11] = s_float_lit(0.0);
+  out[12] = s_float_lit(0.0);
+  out[13] = s_float_lit(0.0);
+  out[14] = s_float_lit(0.0);
 
-  out[15] = 1.0;
+  out[15] = s_float_lit(1.0);
 }
 
 void mat4_get_row4(const mat4_t in, int row, vec4_t out)
@@ -491,21 +491,21 @@ void mat4_inverse_orthogonal(const mat4_t in, mat4_t out)
     in[0],
     in[4],
     in[8],
-    0.0,
+    s_float_lit(0.0),
     in[1],
     in[5],
     in[9],
-    0.0,
+    s_float_lit(0.0),
     in[2],
     in[6],
     in[10],
-    0.0
+    s_float_lit(0.0)
   };
 
   temp[12] = -((m12 * temp[0]) + (m13 * temp[4]) + (m14 * temp[8]));
   temp[13] = -((m12 * temp[1]) + (m13 * temp[5]) + (m14 * temp[9]));
   temp[14] = -((m12 * temp[2]) + (m13 * temp[6]) + (m14 * temp[10]));
-  temp[15] = 1.0;
+  temp[15] = s_float_lit(1.0);
 
   mat4_copy(temp, out);
 }
@@ -539,7 +539,7 @@ int mat4_inverse_affine(const mat4_t in, mat4_t out)
     return 0;
   }
 
-  det = 1.0 / det;
+  det = s_float_lit(1.0) / det;
 
   out[0] = temp[0] * det;
   out[1] = temp[1] * det;
@@ -559,8 +559,8 @@ int mat4_inverse_affine(const mat4_t in, mat4_t out)
   out[13] = -((m12 * temp[1]) + (m13 * temp[5]) + (m14 * temp[9 ]));
   out[14] = -((m12 * temp[2]) + (m13 * temp[6]) + (m14 * temp[10]));
 
-  out[3] = out[7] = out[11] = 0.0;
-  out[15] = 1.0;
+  out[3] = out[7] = out[11] = s_float_lit(0.0);
+  out[15] = s_float_lit(1.0);
 
   return 1;
 }
@@ -644,7 +644,7 @@ int mat4_inverse_general(const mat4_t in, mat4_t out)
   }
 
   mat4_adjoint(in, out);
-  det = 1.0 / det;
+  det = s_float_lit(1.0) / det;
   for (index = 0; index < 16; ++index) {
     out[index] *= det;
   }
@@ -673,7 +673,7 @@ void mat4_translation(s_float_t x, s_float_t y, s_float_t z, mat4_t out) {
   s_float_t m12 = x;
   s_float_t m13 = y;
   s_float_t m14 = z;
-  s_float_t m15 = 1;
+  s_float_t m15 = s_float_lit(1.0);
 
   mat4_copy(g_mat4_identity, out);
 

data/ext/snow-math/maths_local.h

@@ -40,6 +40,7 @@ typedef float s_float_t;
 #define s_atan(X) (atanf((X)))
 #define s_fabs(X) (fabsf((X)))
 #define s_sqrt(X) (sqrtf((X)))
+#define s_float_lit(X) (X##f)
 #else
 typedef double s_float_t;
 #define s_cos(X)  (cos((X)))
@@ -50,6 +51,7 @@ typedef double s_float_t;
 #define s_atan(X) (atan((X)))
 #define s_fabs(X) (fabs((X)))
 #define s_sqrt(X) (sqrt((X)))
+#define s_float_lit(X) (X)
 #endif
 
 typedef s_float_t mat4_t[16];
@@ -67,10 +69,10 @@ typedef s_float_t quat_t[4];
  *
  * It should be stressed that this is absolutely not an accurate epsilon.
  */
-#define S_FLOAT_EPSILON (1.0e-9)
+#define S_FLOAT_EPSILON s_float_lit(1.0e-9)
 
-#define S_DEG2RAD (0.01745329)
-#define S_RAD2DEG (57.2957795)
+#define S_DEG2RAD s_float_lit(0.01745329)
+#define S_RAD2DEG s_float_lit(57.2957795)
 
 
 

data/ext/snow-math/quat.c

@@ -14,7 +14,7 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-const quat_t g_quat_identity = {0.0, 0.0, 0.0, 1.0};
+const quat_t g_quat_identity = { s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0), s_float_lit(1.0) };
 
 void quat_set(s_float_t x, s_float_t y, s_float_t z, s_float_t w, quat_t out)
 {
@@ -36,8 +36,8 @@ void quat_copy(const quat_t in, quat_t out)
 
 void quat_identity(quat_t q)
 {
-  q[0] = q[1] = q[2] = 0.0;
-  q[3] = 1.0;
+  q[0] = q[1] = q[2] = s_float_lit(0.0);
+  q[3] = s_float_lit(1.0);
 }
 
 void quat_inverse(const quat_t in, quat_t out)
@@ -81,8 +81,8 @@ void quat_multiply_vec3(const quat_t left, const vec3_t right, vec3_t out)
   vec3_t lxr_cross, lxlr_cross;
   vec3_cross_product(left, right, lxr_cross);
   vec3_cross_product(left, lxr_cross, lxlr_cross);
-  vec3_scale(lxr_cross, 2.0 * left[3], lxr_cross);
-  vec3_scale(lxlr_cross, 2.0, lxlr_cross);
+  vec3_scale(lxr_cross, s_float_lit(2.0) * left[3], lxr_cross);
+  vec3_scale(lxlr_cross, s_float_lit(2.0), lxlr_cross);
   vec3_add(lxr_cross, lxlr_cross, lxr_cross);
   vec3_add(right, lxr_cross, out);
 }
@@ -92,7 +92,7 @@ void quat_from_angle_axis(s_float_t angle, s_float_t x, s_float_t y, s_float_t z
   vec3_t v = {x, y, z};
   vec3_normalize(v, v);
 
-  angle *= (S_DEG2RAD * 0.5);
+  angle *= (S_DEG2RAD * s_float_lit(0.5));
   const s_float_t s = s_sin(angle);
 
   out[0] = v[0] * s;
@@ -108,9 +108,9 @@ void quat_from_mat4(const mat4_t mat, quat_t out)
 
   trace = mat[0] + mat[5] + mat[10];
   if (trace > 0) {
-    r = s_sqrt(trace + 1.0);
-    out[3] = r * 0.5;
-    r = 0.5 / r;
+    r = s_sqrt(trace + s_float_lit(1.0));
+    out[3] = r * s_float_lit(0.5);
+    r = s_float_lit(0.5) / r;
     out[0] = (mat[9] - mat[6]) * r;
     out[1] = (mat[2] - mat[8]) * r;
     out[2] = (mat[4] - mat[1]) * r;
@@ -122,10 +122,10 @@ void quat_from_mat4(const mat4_t mat, quat_t out)
       index = 1;
     }
 
-    r = s_sqrt(mat[index * 5] - (mat[((index + 1)) % 3 * 5] + mat[((index + 2) % 3) * 5]) + 1.0);
-    out[index] = r * 0.5;
+    r = s_sqrt(mat[index * 5] - (mat[((index + 1)) % 3 * 5] + mat[((index + 2) % 3) * 5]) + s_float_lit(1.0));
+    out[index] = r * s_float_lit(0.5);
 
-    if (r) r = 0.5 / r;
+    if (r) r = s_float_lit(0.5) / r;
 
     switch (index)
     {
@@ -159,10 +159,10 @@ void quat_from_mat3(const mat3_t mat, quat_t out)
 
   trace = mat[0] + mat[4] + mat[8];
 
-  if (trace > 0.0) {
-    r = s_sqrt(trace + 1);
-    out[3] = r * 0.5;
-    r = 0.5 / r;
+  if (trace > s_float_lit(0.0)) {
+    r = s_sqrt(trace + s_float_lit(1.0));
+    out[3] = r * s_float_lit(0.5);
+    r = s_float_lit(0.5) / r;
     out[0] = (m12 - m21) * r;
     out[1] = (m20 - m02) * r;
     out[2] = (m01 - m10) * r;
@@ -177,9 +177,9 @@ void quat_from_mat3(const mat3_t mat, quat_t out)
     switch (index) {
     default:
     case 0:
-      r = out[0] = s_sqrt(mat[0] - (mat[4] + mat[8]) + 1) * 0.5;
-      if (r != 0.0 && r != -0.0) {
-        r = 0.5 / r;
+      r = out[0] = s_sqrt(mat[0] - (mat[4] + mat[8]) + s_float_lit(1.0)) * s_float_lit(0.5);
+      if (r != s_float_lit(0.0) && r != s_float_lit(-0.0)) {
+        r = s_float_lit(0.5) / r;
       }
       out[1] = (m10 + m01) * r;
       out[2] = (m20 + m02) * r;
@@ -187,9 +187,9 @@ void quat_from_mat3(const mat3_t mat, quat_t out)
       break;
 
     case 1:
-      r = out[1] = s_sqrt(mat[4] - (mat[8] + mat[0]) + 1) * 0.5;
-      if (r != 0.0 && r != -0.0) {
-        r = 0.5 / r;
+      r = out[1] = s_sqrt(mat[4] - (mat[8] + mat[0]) + s_float_lit(1.0)) * s_float_lit(0.5);
+      if (r != s_float_lit(0.0) && r != s_float_lit(-0.0)) {
+        r = s_float_lit(0.5) / r;
       }
       out[0] = (m10 + m01) * r;
       out[2] = (m12 + m21) * r;
@@ -197,9 +197,9 @@ void quat_from_mat3(const mat3_t mat, quat_t out)
       break;
 
     case 2:
-      r = out[2] = s_sqrt(mat[4] - (mat[0] + mat[4]) + 1) * 0.5;
-      if (r != 0.0 && r != -0.0) {
-        r = 0.5 / r;
+      r = out[2] = s_sqrt(mat[4] - (mat[0] + mat[4]) + s_float_lit(1.0)) * s_float_lit(0.5);
+      if (r != s_float_lit(0.0) && r != s_float_lit(-0.0)) {
+        r = s_float_lit(0.5) / r;
       }
       out[0] = (m20 + m02) * r;
       out[1] = (m21 + m12) * r;
@@ -216,7 +216,7 @@ void quat_slerp(const quat_t from, const quat_t to, s_float_t delta, quat_t out)
 
   dot = vec4_dot_product((const s_float_t *)from, (const s_float_t *)to);
 
-  if (dot < 0.0) {
+  if (dot < s_float_lit(0.0)) {
     dot = -dot;
     dx = -to[0];
     dy = -to[1];
@@ -229,12 +229,12 @@ void quat_slerp(const quat_t from, const quat_t to, s_float_t delta, quat_t out)
     dw = to[3];
   }
 
-  delta = fminf(fmaxf(delta, 0.0), 1.0);
+  delta = fminf(fmaxf(delta, s_float_lit(0.0)), s_float_lit(1.0));
 
   angle = s_acos(dot);
-  inverse_sin = 1.0 / s_sin(dot);
+  inverse_sin = s_float_lit(1.0) / s_sin(dot);
 
-  scale0 = s_sin((1.0 - delta) * angle) * inverse_sin;
+  scale0 = s_sin((s_float_lit(1.0) - delta) * angle) * inverse_sin;
   scale1 = s_sin(delta * angle) * inverse_sin;
 
   out[0] = (from[0] * scale0) + (dx * scale1);

data/ext/snow-math/vec3.c

@@ -14,8 +14,8 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-const vec3_t g_vec3_zero = {0.0, 0.0, 0.0};
-const vec3_t g_vec3_one = {1.0, 1.0, 1.0};
+const vec3_t g_vec3_zero = {s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0)};
+const vec3_t g_vec3_one = {s_float_lit(1.0), s_float_lit(1.0), s_float_lit(1.0)};
 
 void vec3_copy(const vec3_t in, vec3_t out)
 {
@@ -51,7 +51,7 @@ s_float_t vec3_length(const vec3_t v)
 void vec3_normalize(const vec3_t in, vec3_t out)
 {
   s_float_t mag = vec3_length(in);
-  if (mag) mag = 1.0 / mag;
+  if (mag) mag = s_float_lit(1.0) / mag;
   out[0] = in[0] * mag;
   out[1] = in[1] * mag;
   out[2] = in[2] * mag;
@@ -87,9 +87,9 @@ void vec3_negate(const vec3_t v, vec3_t out)
 
 void vec3_inverse(const vec3_t v, vec3_t out)
 {
-  out[2] = (v[2] != 0.0 && v[2] != -0.0) ? (1.0 / v[2]) : v[2];
-  out[1] = (v[1] != 0.0 && v[1] != -0.0) ? (1.0 / v[1]) : v[1];
-  out[0] = (v[0] != 0.0 && v[0] != -0.0) ? (1.0 / v[0]) : v[0];
+  out[2] = (v[2] != s_float_lit(0.0) && v[2] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[2]) : v[2];
+  out[1] = (v[1] != s_float_lit(0.0) && v[1] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[1]) : v[1];
+  out[0] = (v[0] != s_float_lit(0.0) && v[0] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[0]) : v[0];
 }
 
 void vec3_project(const vec3_t in, const vec3_t normal, vec3_t out)
@@ -100,7 +100,7 @@ void vec3_project(const vec3_t in, const vec3_t normal, vec3_t out)
 void vec3_reflect(const vec3_t in, const vec3_t normal, vec3_t out)
 {
   vec3_t temp;
-  vec3_scale(normal, 2 * vec3_dot_product(in, normal), temp);
+  vec3_scale(normal, s_float_lit(2.0) * vec3_dot_product(in, normal), temp);
   vec3_subtract(in, temp, out);
 }
 
@@ -134,7 +134,7 @@ void vec3_scale(const vec3_t v, s_float_t scalar, vec3_t out)
 int vec3_divide(const vec3_t v, s_float_t divisor, vec3_t out)
 {
   if (divisor) {
-    divisor = ((s_float_t)1.0) / divisor;
+    divisor = s_float_lit(1.0) / divisor;
     out[2] = v[2] * divisor;
     out[1] = v[1] * divisor;
     out[0] = v[0] * divisor;

data/ext/snow-math/vec4.c

@@ -14,9 +14,9 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-const vec4_t g_vec4_zero = {0.0, 0.0, 0.0, 0.0};
-const vec4_t g_vec4_one = {1.0, 1.0, 1.0, 1.0};
-const vec4_t g_vec4_identity = {0.0, 0.0, 0.0, 1.0};
+const vec4_t g_vec4_zero = {s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0)};
+const vec4_t g_vec4_one = {s_float_lit(1.0), s_float_lit(1.0), s_float_lit(1.0), s_float_lit(1.0)};
+const vec4_t g_vec4_identity = {s_float_lit(0.0), s_float_lit(0.0), s_float_lit(0.0), s_float_lit(1.0)};
 
 void vec4_copy(const vec4_t in, vec4_t out)
 {
@@ -54,7 +54,7 @@ s_float_t vec4_length(const vec4_t v)
 void vec4_normalize(const vec4_t in, vec4_t out)
 {
   s_float_t mag = vec4_length(in);
-  if (mag) mag = 1.0 / mag;
+  if (mag) mag = s_float_lit(1.0) / mag;
   out[0] = in[0] * mag;
   out[1] = in[1] * mag;
   out[2] = in[2] * mag;
@@ -95,10 +95,10 @@ void vec4_negate(const vec4_t v, vec4_t out)
 
 void vec4_inverse(const vec4_t v, vec4_t out)
 {
-  out[3] = (v[3] != 0.0 && v[3] != -0.0) ? (1.0 / v[3]) : v[3];
-  out[2] = (v[2] != 0.0 && v[2] != -0.0) ? (1.0 / v[2]) : v[2];
-  out[1] = (v[1] != 0.0 && v[1] != -0.0) ? (1.0 / v[1]) : v[1];
-  out[0] = (v[0] != 0.0 && v[0] != -0.0) ? (1.0 / v[0]) : v[0];
+  out[3] = (v[3] != s_float_lit(0.0) && v[3] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[3]) : v[3];
+  out[2] = (v[2] != s_float_lit(0.0) && v[2] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[2]) : v[2];
+  out[1] = (v[1] != s_float_lit(0.0) && v[1] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[1]) : v[1];
+  out[0] = (v[0] != s_float_lit(0.0) && v[0] != s_float_lit(-0.0)) ? (s_float_lit(1.0) / v[0]) : v[0];
 }
 
 void vec4_project(const vec4_t in, const vec4_t normal, vec4_t out)
@@ -109,7 +109,7 @@ void vec4_project(const vec4_t in, const vec4_t normal, vec4_t out)
 void vec4_reflect(const vec4_t in, const vec4_t normal, vec4_t out)
 {
   vec4_t temp;
-  vec4_scale(normal, 2 * vec4_dot_product(in, normal), temp);
+  vec4_scale(normal, s_float_lit(2.0) * vec4_dot_product(in, normal), temp);
   vec4_subtract(in, temp, out);
 }
 
@@ -133,7 +133,7 @@ void vec4_scale(const vec4_t v, s_float_t scalar, vec4_t out)
 int vec4_divide(const vec4_t v, s_float_t divisor, vec4_t out)
 {
   if (divisor) {
-    divisor = ((s_float_t)1.0) / divisor;
+    divisor = s_float_lit(1.0) / divisor;
     out[3] = v[3] * divisor;
     out[2] = v[2] * divisor;
     out[1] = v[1] * divisor;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snow-math
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Noel Raymond Cower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Math types built on the SnowPalm math code
 email: ncower@gmail.com
@@ -21,15 +21,12 @@ extra_rdoc_files:
 files:
 - lib/snow-math/array_cache.rb
 - lib/snow-math/inspect.rb
-- lib/snow-math/line.rb
 - lib/snow-math/mat3.rb
 - lib/snow-math/mat4.rb
-- lib/snow-math/plane.rb
 - lib/snow-math/ptr.rb
 - lib/snow-math/quat.rb
 - lib/snow-math/swizzle.rb
 - lib/snow-math/to_a.rb
-- lib/snow-math/vec2.rb
 - lib/snow-math/vec3.rb
 - lib/snow-math/vec4.rb
 - lib/snow-math.rb