From d72033c562f80e0cb1bd1e33225d385c787cb46f Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 9 Mar 2023 22:20:24 +0000 Subject: [PATCH] Remove dependency on OpenGL --- appDodge/Main.hs | 2 +- package.yaml | 2 +- src/Shader/Data.hs | 3 +-- src/Shader/Parameters.hs | 2 +- src/Shader/Poke.hs | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/appDodge/Main.hs b/appDodge/Main.hs index d61492530..d63743d65 100644 --- a/appDodge/Main.hs +++ b/appDodge/Main.hs @@ -20,7 +20,6 @@ import Dodge.Render import Dodge.SoundLogic.LoadSound import Dodge.TestString import Dodge.Update -import Graphics.Rendering.OpenGL hiding (color, rotate, scale, translate) import qualified IntMapHelp as IM import Loop import Music @@ -30,6 +29,7 @@ import Preload.Render --import Render import qualified SDL import qualified SDL.Mixer as Mix +import SDL (($=)) import Sound import System.Directory diff --git a/package.yaml b/package.yaml index dfb82f7f6..56b5cf395 100644 --- a/package.yaml +++ b/package.yaml @@ -31,7 +31,7 @@ dependencies: #- heap - sdl2 - sdl2-mixer -- OpenGL + #- OpenGL - OpenGLRaw - text #- raw-strings-qq diff --git a/src/Shader/Data.hs b/src/Shader/Data.hs index 8687e3745..203bcdb21 100644 --- a/src/Shader/Data.hs +++ b/src/Shader/Data.hs @@ -30,8 +30,7 @@ module Shader.Data , frag' ) where import Data.Vector (Vector) -import Graphics.Rendering.OpenGL -import Graphics.GL.Core43 +import Graphics.GL.Core45 import Foreign import Control.Lens {- | Datatype containing the necessary information for a single shader. -} diff --git a/src/Shader/Parameters.hs b/src/Shader/Parameters.hs index c8247b73d..4c9e3ba1c 100644 --- a/src/Shader/Parameters.hs +++ b/src/Shader/Parameters.hs @@ -4,7 +4,7 @@ module Shader.Parameters , numSubElements , glushortSize ) where -import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight) +import Graphics.GL.Core45 import Foreign floatSize :: Int diff --git a/src/Shader/Poke.hs b/src/Shader/Poke.hs index e7bd2a324..61a9aec7c 100644 --- a/src/Shader/Poke.hs +++ b/src/Shader/Poke.hs @@ -13,7 +13,7 @@ import Shape.Data import Geometry.Data --import ShapePicture -import Graphics.Rendering.OpenGL hiding (color,scale,translate,rotate) +import Graphics.GL.Core45 import Foreign import qualified Data.Vector as V import qualified Data.Vector.Unboxed as UV