From a2055b30bf44cf0fb5b8182ec18ec3bb6b7f1e56 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Sat, 7 Mar 2015 03:19:48 +1100
Subject: [PATCH] line: use aabb for box intersect

---
 line.cpp | 6 +++---
 line.hpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/line.cpp b/line.cpp
index 3de1d9ab..857b8934 100644
--- a/line.cpp
+++ b/line.cpp
@@ -53,10 +53,10 @@ util::line<S,T>::intersect (plane<S,T> q) const
 /// returns -ve if behind
 template <size_t S, typename T>
 T
-util::line<S,T>::intersect (region<S,T> r) const
+util::line<S,T>::intersect (AABB<S,T> r) const
 {
-    auto t1 = (r.base () - p) / d;
-    auto t2 = (r.away () - p) / d;
+    auto t1 = (r.p0 - p) / d;
+    auto t2 = (r.p1 - p) / d;
 
     auto vmin = min (t1, t2);
     auto vmax = max (t1, t2);
diff --git a/line.hpp b/line.hpp
index 477e45b3..99f45bff 100644
--- a/line.hpp
+++ b/line.hpp
@@ -23,16 +23,16 @@
 #include "point.hpp"
 #include "vector.hpp"
 #include "plane.hpp"
-#include "region.hpp"
+#include "aabb.hpp"
 
 namespace util {
     template <size_t S, typename T>
     struct line {
-        line (util::point<S,T> place,
+        line (util::point<S,T> origin,
               util::vector<S,T> direction);
 
         T intersect (plane<S,T>) const;
-        T intersect (region<S,T>) const;
+        T intersect (AABB<S,T>) const;
 
         T closest (point<S,T>) const;