summaryrefslogtreecommitdiffstats
path: root/libdimension/dimension
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2010-04-17 14:26:19 -0400
committerTavian Barnes <tavianator@gmail.com>2010-04-17 14:26:19 -0400
commitcd7cba285144211c5ea1f4573ad729555923dab1 (patch)
tree10f500a3c3fbbeba04778943fad36f97f6b2242f /libdimension/dimension
parentbafe01580d1470f703a95a434b38998843440cd0 (diff)
downloaddimension-cd7cba285144211c5ea1f4573ad729555923dab1.tar.xz
Rename dmnsn_matrix_*_mul() to dmnsn_transform_*().
Diffstat (limited to 'libdimension/dimension')
-rw-r--r--libdimension/dimension/geometry.h12
-rw-r--r--libdimension/dimension/object.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/libdimension/dimension/geometry.h b/libdimension/dimension/geometry.h
index 754e46d..a7ff32c 100644
--- a/libdimension/dimension/geometry.h
+++ b/libdimension/dimension/geometry.h
@@ -192,19 +192,19 @@ double dmnsn_vector_axis_angle(dmnsn_vector v1, dmnsn_vector v2,
dmnsn_matrix dmnsn_matrix_inverse(dmnsn_matrix A);
dmnsn_matrix dmnsn_matrix_mul(dmnsn_matrix lhs, dmnsn_matrix rhs);
-dmnsn_vector dmnsn_matrix_vector_mul(dmnsn_matrix lhs, dmnsn_vector rhs);
-dmnsn_bounding_box dmnsn_matrix_bounding_box_mul(dmnsn_matrix lhs,
- dmnsn_bounding_box rhs);
+dmnsn_vector dmnsn_transform_vector(dmnsn_matrix lhs, dmnsn_vector rhs);
+dmnsn_bounding_box dmnsn_transform_bounding_box(dmnsn_matrix lhs,
+ dmnsn_bounding_box rhs);
/* Affine line transformation; n = lhs*(x0 + n) - lhs*x0, x0 *= lhs */
DMNSN_INLINE dmnsn_line
-dmnsn_matrix_line_mul(dmnsn_matrix lhs, dmnsn_line rhs)
+dmnsn_transform_line(dmnsn_matrix lhs, dmnsn_line rhs)
{
/* 24 multiplications, 6 divisions, 30 additions */
dmnsn_line l;
- l.x0 = dmnsn_matrix_vector_mul(lhs, rhs.x0);
+ l.x0 = dmnsn_transform_vector(lhs, rhs.x0);
l.n = dmnsn_vector_sub(
- dmnsn_matrix_vector_mul(lhs, dmnsn_vector_add(rhs.x0, rhs.n)),
+ dmnsn_transform_vector(lhs, dmnsn_vector_add(rhs.x0, rhs.n)),
l.x0
);
return l;
diff --git a/libdimension/dimension/object.h b/libdimension/dimension/object.h
index 1d5f580..d0afa8a 100644
--- a/libdimension/dimension/object.h
+++ b/libdimension/dimension/object.h
@@ -41,7 +41,7 @@ typedef struct dmnsn_intersection {
const dmnsn_interior *interior;
} dmnsn_intersection;
-dmnsn_vector dmnsn_matrix_normal_mul(dmnsn_matrix trans, dmnsn_vector normal);
+dmnsn_vector dmnsn_transform_normal(dmnsn_matrix trans, dmnsn_vector normal);
/* Forward-declare dmnsn_object */
typedef struct dmnsn_object dmnsn_object;