X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FPoint.hs;h=4b9eaece2c88173c7a634899207d877730a99c41;hb=985ab5303039bc69d57139092b4adf9603cc2d0c;hp=2b8d59736e28e91a5ce1cc9104e5c131305db3c6;hpb=603d9155a29bfbc353b42a6c880edce224626a16;p=spline3.git

diff --git a/src/Point.hs b/src/Point.hs
index 2b8d597..4b9eaec 100644
--- a/src/Point.hs
+++ b/src/Point.hs
@@ -1,9 +1,15 @@
-{-# LANGUAGE TypeSynonymInstances #-}
-
-module Point
+{-# LANGUAGE FlexibleInstances #-}
+
+module Point (
+  Point,
+  distance,
+  dot,
+  is_close,
+  scale
+  )
 where
 
-import Comparisons
+import Comparisons ((~=))
 
 
 type Point = (Double, Double, Double)
@@ -24,8 +30,14 @@ scale (x, y, z) d = (x*d, y*d, z*d)
 
 -- | Returns the distance between p1 and p2.
 distance :: Point -> Point -> Double
-distance (x1, y1, z1) (x2, y2, z2) =
-    sqrt $ (x2 - x1)^(2::Int) + (y2 - y1)^(2::Int) + (z2 - z1)^(2::Int)
+distance p1 p2 =
+    sqrt $ p1 `dot` p2
+
+
+-- | Returns the dot product of two points (taken as three-vectors).
+dot :: Point -> Point -> Double
+dot (x1, y1, z1) (x2, y2, z2) =
+    (x2 - x1)^(2::Int) + (y2 - y1)^(2::Int) + (z2 - z1)^(2::Int)
 
 
 -- | Returns 'True' if p1 is close to (within 'epsilon' of) p2,