From 047d3248896d375a8fbc80dbbf573b81a3e5a927 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 20 Mar 2009 04:06:39 +0000 Subject: Revamp color handling. --- libdimension/dimension/geometry.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libdimension/dimension/geometry.h') diff --git a/libdimension/dimension/geometry.h b/libdimension/dimension/geometry.h index 2c0c204..11a6daf 100644 --- a/libdimension/dimension/geometry.h +++ b/libdimension/dimension/geometry.h @@ -31,44 +31,44 @@ typedef struct { dmnsn_scalar x, y, z; } dmnsn_vector; /* Vector arithmetic */ -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_construct(dmnsn_scalar x, dmnsn_scalar y, dmnsn_scalar z) { dmnsn_vector v = { .x = x, .y = y, .z = z }; return v; } -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_add(dmnsn_vector lhs, dmnsn_vector rhs) { return dmnsn_vector_construct(lhs.x + rhs.x, lhs.y + rhs.y, lhs.z + rhs.z); } -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_sub(dmnsn_vector lhs, dmnsn_vector rhs) { return dmnsn_vector_construct(lhs.x - rhs.x, lhs.y - rhs.y, lhs.z - rhs.z); } -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_mul(dmnsn_scalar lhs, dmnsn_vector rhs) { return dmnsn_vector_construct(lhs*rhs.x, lhs*rhs.y, lhs*rhs.z); } -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_div(dmnsn_vector lhs, dmnsn_scalar rhs) { return dmnsn_vector_construct(lhs.x/rhs, lhs.y/rhs, lhs.z/rhs); } -inline dmnsn_scalar +DMNSN_INLINE dmnsn_scalar dmnsn_vector_dot(dmnsn_vector lhs, dmnsn_vector rhs) { return lhs.x*rhs.x + lhs.y*rhs.y + lhs.z*rhs.z; } -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_vector_cross(dmnsn_vector lhs, dmnsn_vector rhs) { return dmnsn_vector_construct(lhs.y*rhs.z - lhs.z*rhs.y, @@ -83,7 +83,7 @@ typedef struct { } dmnsn_line; /* A point on a line, defined by x0 + t*n */ -inline dmnsn_vector +DMNSN_INLINE dmnsn_vector dmnsn_line_point(dmnsn_line l, dmnsn_scalar t) { return dmnsn_vector_add(l.x0, dmnsn_vector_mul(t, l.n)); -- cgit v1.2.3