GPipe-Collada 0.1.3 → 0.1.4

raw patch · 4 files changed

+8/−10 lines, 4 filesdep −Vec-Transformdep ~GPipedep ~VecPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies removed: Vec-Transform

Dependency ranges changed: GPipe, Vec

API changes (from Hackage documentation)

Files

• GPipe-Collada.cabal +3/−4
• src/Data/Vec/AABB.hs +0/−1
• src/Graphics/GPipe/Collada.hs +4/−3
• src/Graphics/GPipe/Collada/Utils.hs +1/−2

@@ -1,5 +1,5 @@ name: GPipe-Collada-version: 0.1.3
+version: 0.1.4
 cabal-version: >= 1.8
 build-type: Simple license: BSD3@@ -20,12 +20,11 @@  Library     build-depends: 
-                   GPipe >= 1.3.2,
+                   GPipe >= 1.4,
                    base >= 4 && <5,
                    HaXml >= 1.23 && < 1.24,
                    containers >= 0.4 && < 0.5,
-                   Vec == 0.9.9,
-                   Vec-Transform == 1.0.6,
+                   Vec == 1.0.1,
                    array >= 0.3,
                    mtl
     hs-source-dirs: src

@@ -25,7 +25,6 @@ import Data.Vec.Base ((:.)(..), Mat44, Mat33, Vec3) import Data.Vec.Nat import Data.Vec.LinAlg-import Data.Vec.LinAlg.Transform3D  -- | An axis aligned bounding box. data AABB = AABB {

@@ -48,13 +48,13 @@ import Data.Map (Map) import Data.Maybe import Data.Monoid-import Graphics.GPipe.Stream.Primitive+import Graphics.GPipe.Stream
+import Graphics.GPipe.Stream.Primitive
 import Graphics.GPipe.Format import qualified Data.Vec as Vec import Data.Vec (Vec2, Vec3, Mat44, Mat33, (:.)(..), ) import Data.Vec.LinAlg import Data.Vec.AABB-import Data.Vec.LinAlg.Transform3D  import Data.Typeable import Data.Dynamic@@ -159,7 +159,8 @@ type SID = Maybe String type Semantic = String -deriving instance Typeable1 Vertex+deriving instance Typeable2 Shader
+deriving instance Typeable V
 deriving instance Typeable2 (:.)  ---------------------------------------------------

@@ -45,7 +45,6 @@ import qualified Data.Vec.Base as Vec import Data.Vec.Base ((:.)(..), Mat44, Mat33, Vec3) import Data.Vec.LinAlg as Vec-import Data.Vec.LinAlg.Transform3D import Data.Vec.Nat import Control.Arrow (first) import Data.Monoid@@ -142,6 +141,6 @@         let normMat = Vec.transpose $ fromJust $ invert $ Vec.map (Vec.take n3) $ Vec.take n3 modelView         return $ fmap (\v -> let p = homPoint $ fromJust $ dynVertex v "POSITION"                                  nx:.ny:.nz:.() = (toGPU normMat :: Mat33 (Vertex Float)) `multmv` fromJust (dynVertex v "NORMAL")-                             in ((toGPU modelViewProj :: Mat44 (Vertex Float)) `multmv` p, max nz 0)+                             in ((toGPU modelViewProj :: Mat44 (Vertex Float)) `multmv` p, maxB nz 0)                       ) pstream