1 files changed, 18 insertions, 3 deletions

diff --git a/Spear/Math/Sphere.hs b/Spear/Math/Sphere.hs
index 197a9b2..1d20275 100644
--- a/Spear/Math/Sphere.hs
+++ b/Spear/Math/Sphere.hs
@@ -1,9 +1,17 @@
+{-# LANGUAGE MultiParamTypeClasses #-}

+{-# LANGUAGE NoImplicitPrelude     #-}

+

 module Spear.Math.Sphere

 where

 

-import Spear.Math.Vector

+import           Spear.Math.Algebra

+import           Spear.Math.Spatial

+import           Spear.Math.Spatial3

+import           Spear.Math.Vector

+import           Spear.Prelude

+

+import           Data.List           (foldl')

 

-import Data.List (foldl')

 

 -- | A sphere in 3D space.

 data Sphere = Sphere

@@ -11,12 +19,19 @@ data Sphere = Sphere
     , radius :: {-# UNPACK #-} !Float

     }

 

+

+instance Positional Sphere Vector3 where

+    setPosition p sphere = sphere { center = p }

+    position = center

+    translate v sphere = sphere { center = center sphere + v }

+

+

 -- | Create a sphere from the given points.

 sphere :: [Vector3] -> Sphere

 sphere [] = Sphere zero3 0

 sphere (x:xs) = Sphere c r

     where

-        c = pmin + (pmax-pmin)/2

+        c = pmin + (pmax-pmin) / (2::Float)

         r = norm $ pmax - c

         (pmin,pmax) = foldl' update (x,x) xs

         update (pmin,pmax) p = (min p pmin, max p pmax)