summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-06-10 23:24:39 -0400
committerJoe Crayne <joe@jerkface.net>2019-06-10 23:24:39 -0400
commite4102da4f6e0eeaba3c8f7d658c5b4872d9d0ddb (patch)
tree0f6df75db65fcdc9a94624a93c9d5516a389c810
parentd157db5b68c59833b9f2c77a0f142468b2015e6f (diff)
Drop dependency on OpenGL.
-rw-r--r--src/Graphics/Formats/Collada/ColladaTypes.hs7
-rw-r--r--wavefront-obj.cabal1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Graphics/Formats/Collada/ColladaTypes.hs b/src/Graphics/Formats/Collada/ColladaTypes.hs
index ad78aa8..89ebde8 100644
--- a/src/Graphics/Formats/Collada/ColladaTypes.hs
+++ b/src/Graphics/Formats/Collada/ColladaTypes.hs
@@ -25,6 +25,7 @@ module Graphics.Formats.Collada.ColladaTypes
25 Profile(..), NewParam(..), TechniqueCommon(..), Material, Effect, 25 Profile(..), NewParam(..), TechniqueCommon(..), Material, Effect,
26 C(..), Color(..), 26 C(..), Color(..),
27 Animation(..), 27 Animation(..),
28 TextureObject(..),
28 Fx_common_color_type(..), Fx_common_texture_type(..), Texture(..), 29 Fx_common_color_type(..), Fx_common_texture_type(..), Texture(..),
29 Interpolation(..), 30 Interpolation(..),
30) 31)
@@ -32,9 +33,13 @@ where
32 33
33import Data.Tree 34import Data.Tree
34import Data.Vector 35import Data.Vector
35import Graphics.Rendering.OpenGL (TextureObject) 36import Data.Word
36import Graphics.Formats.Collada.Vector2D3D (V3(..), V4(..)) 37import Graphics.Formats.Collada.Vector2D3D (V3(..), V4(..))
37 38
39-- Coercible to Graphics.Rendering.OpenGL.TextureObject
40newtype TextureObject = TextureObject { textureID :: Word32 }
41 deriving ( Eq, Ord, Show )
42
38type Mat44 = ((Float,Float,Float,Float), 43type Mat44 = ((Float,Float,Float,Float),
39 (Float,Float,Float,Float), 44 (Float,Float,Float,Float),
40 (Float,Float,Float,Float), 45 (Float,Float,Float,Float),
diff --git a/wavefront-obj.cabal b/wavefront-obj.cabal
index 083981e..2a0532c 100644
--- a/wavefront-obj.cabal
+++ b/wavefront-obj.cabal
@@ -75,7 +75,6 @@ library
75 , vector >=0.12 && <0.13 75 , vector >=0.12 && <0.13
76 , linear >=1.20 && <1.21 76 , linear >=1.20 && <1.21
77 , attoparsec >=0.13 && <0.14 77 , attoparsec >=0.13 && <0.14
78 , OpenGL >=3.0 && <3.1
79 , tuple >=0.3 && <0.4 78 , tuple >=0.3 && <0.4
80 , tuple-gen >=2.0 && <2.1 79 , tuple-gen >=2.0 && <2.1
81 , dlist >=0.8 && <0.9 80 , dlist >=0.8 && <0.9