From e4102da4f6e0eeaba3c8f7d658c5b4872d9d0ddb Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Mon, 10 Jun 2019 23:24:39 -0400 Subject: Drop dependency on OpenGL. --- src/Graphics/Formats/Collada/ColladaTypes.hs | 7 ++++++- wavefront-obj.cabal | 1 - 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 Profile(..), NewParam(..), TechniqueCommon(..), Material, Effect, C(..), Color(..), Animation(..), + TextureObject(..), Fx_common_color_type(..), Fx_common_texture_type(..), Texture(..), Interpolation(..), ) @@ -32,9 +33,13 @@ where import Data.Tree import Data.Vector -import Graphics.Rendering.OpenGL (TextureObject) +import Data.Word import Graphics.Formats.Collada.Vector2D3D (V3(..), V4(..)) +-- Coercible to Graphics.Rendering.OpenGL.TextureObject +newtype TextureObject = TextureObject { textureID :: Word32 } + deriving ( Eq, Ord, Show ) + type Mat44 = ((Float,Float,Float,Float), (Float,Float,Float,Float), (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 , vector >=0.12 && <0.13 , linear >=1.20 && <1.21 , attoparsec >=0.13 && <0.14 - , OpenGL >=3.0 && <3.1 , tuple >=0.3 && <0.4 , tuple-gen >=2.0 && <2.1 , dlist >=0.8 && <0.9 -- cgit v1.2.3