diff --git a/diagrams-povray.cabal b/diagrams-povray.cabal index 19847c5..809b681 100644 --- a/diagrams-povray.cabal +++ b/diagrams-povray.cabal @@ -18,7 +18,8 @@ Source-repository head Library Exposed-modules: Diagrams.Backend.POVRay Hs-source-dirs: src - Build-depends: base >= 4.2 && < 4.4, - diagrams-core >= 0.3 && < 0.4, - diagrams-lib >= 0.3 && < 0.4, - pretty >= 1.0.1.2 && < 1.1 \ No newline at end of file + Build-depends: base >= 4.2 && < 4.7, + diagrams-core >= 0.5 && < 0.6, + diagrams-lib >= 0.5 && < 0.6, + pretty >= 1.0.1.2 && < 1.2, + vector-space >= 0.8 && < 0.9 \ No newline at end of file diff --git a/src/Diagrams/Backend/POVRay.hs b/src/Diagrams/Backend/POVRay.hs index 7f34a1e..b463fbb 100644 --- a/src/Diagrams/Backend/POVRay.hs +++ b/src/Diagrams/Backend/POVRay.hs @@ -3,6 +3,7 @@ , MultiParamTypeClasses , TypeFamilies , DeriveDataTypeable + , ViewPatterns #-} ----------------------------------------------------------------------------- @@ -58,7 +59,7 @@ povrayTransf t = OMTransf $ , v10, v11, v12 , v20, v21, v22 , v30, v31, v32 ] - where (v00, v01, v02) = apply t (1,0,0) - (v10, v11, v12) = apply t (0,1,0) - (v20, v21, v22) = apply t (0,0,1) - (v30, v31, v32) = transl t \ No newline at end of file + where (unr3 -> (v00, v01, v02)) = apply t (r3 (1,0,0)) + (unr3 -> (v10, v11, v12)) = apply t (r3 (0,1,0)) + (unr3 -> (v20, v21, v22)) = apply t (r3 (0,0,1)) + (unr3 -> (v30, v31, v32)) = transl t \ No newline at end of file diff --git a/src/Diagrams/Backend/POVRay/Syntax.hs b/src/Diagrams/Backend/POVRay/Syntax.hs index b4effa3..4f7663a 100644 --- a/src/Diagrams/Backend/POVRay/Syntax.hs +++ b/src/Diagrams/Backend/POVRay/Syntax.hs @@ -1,6 +1,6 @@ -{-# LANGUAGE TypeSynonymInstances - , TypeFamilies - #-} +{-# LANGUAGE TypeSynonymInstances #-} +{-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE FlexibleInstances #-} ----------------------------------------------------------------------------- -- | -- Module : Diagrams.Backend.POVRay.Syntax