From a9670e8946d655105212c289322dc4eddf7986ed Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Sun, 18 Jul 2010 01:57:39 -0600
Subject: Use dmnsn_min() and _max() in dmnsn_vector_min() and _max().
---
libdimension/dimension/geometry.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'libdimension')
diff --git a/libdimension/dimension/geometry.h b/libdimension/dimension/geometry.h
index c9f036f..5efba3a 100644
--- a/libdimension/dimension/geometry.h
+++ b/libdimension/dimension/geometry.h
@@ -259,21 +259,21 @@ dmnsn_vector_normalize(dmnsn_vector n)
DMNSN_INLINE dmnsn_vector
dmnsn_vector_min(dmnsn_vector a, dmnsn_vector b)
{
- dmnsn_vector ret = a;
- if (b.x < ret.x) ret.x = b.x;
- if (b.y < ret.y) ret.y = b.y;
- if (b.z < ret.z) ret.z = b.z;
- return ret;
+ return dmnsn_new_vector(
+ dmnsn_min(a.x, b.x),
+ dmnsn_min(a.y, b.y),
+ dmnsn_min(a.z, b.z)
+ );
}
DMNSN_INLINE dmnsn_vector
dmnsn_vector_max(dmnsn_vector a, dmnsn_vector b)
{
- dmnsn_vector ret = a;
- if (b.x > ret.x) ret.x = b.x;
- if (b.y > ret.y) ret.y = b.y;
- if (b.z > ret.z) ret.z = b.z;
- return ret;
+ return dmnsn_new_vector(
+ dmnsn_max(a.x, b.x),
+ dmnsn_max(a.y, b.y),
+ dmnsn_max(a.z, b.z)
+ );
}
double dmnsn_vector_axis_angle(dmnsn_vector v1, dmnsn_vector v2,
--
cgit v1.2.3