1 files changed, 12 insertions, 17 deletions

diff --git a/Spear/Math/Triangle.hs b/Spear/Math/Triangle.hs
index 04c2639..c47879b 100644
--- a/Spear/Math/Triangle.hs
+++ b/Spear/Math/Triangle.hs
@@ -4,11 +4,12 @@ module Spear.Math.Triangle
 )

 where

 

+import           Spear.Math.Algebra

+import           Spear.Math.Vector

 

-import Spear.Math.Vector

-

-import Foreign.C.Types

-import Foreign.Storable

+import           Foreign.C.Types

+import           Foreign.Storable

+import           Prelude            hiding ((*))

 

 

 data Triangle = Triangle

@@ -18,23 +19,17 @@ data Triangle = Triangle
     }

 

 

-sizeVector3 = 3 * sizeOf (undefined :: CFloat)

-

-

 instance Storable Triangle where

-    

-    sizeOf _    = 3 * sizeVector3

+    sizeOf _    = (3::Int) * sizeVector3

     alignment _ = alignment (undefined :: CFloat)

-    

+

     peek ptr = do

         p0 <- peekByteOff ptr 0

-        p1 <- peekByteOff ptr $ 1 * sizeVector3

-        p2 <- peekByteOff ptr $ 2 * sizeVector3

-        

+        p1 <- peekByteOff ptr $ (1::Int) * sizeVector3

+        p2 <- peekByteOff ptr $ (2::Int) * sizeVector3

         return $ Triangle p0 p1 p2

-    

-    

+

     poke ptr (Triangle p0 p1 p2) = do

         pokeByteOff ptr 0 p0

-        pokeByteOff ptr (1*sizeVector3) p1

-        pokeByteOff ptr (2*sizeVector3) p2

+        pokeByteOff ptr ((1::Int) * sizeVector3) p1

+        pokeByteOff ptr ((2::Int) * sizeVector3) p2