Remove dependency on OpenGL
This commit is contained in:
+1
-1
@@ -20,7 +20,6 @@ import Dodge.Render
|
|||||||
import Dodge.SoundLogic.LoadSound
|
import Dodge.SoundLogic.LoadSound
|
||||||
import Dodge.TestString
|
import Dodge.TestString
|
||||||
import Dodge.Update
|
import Dodge.Update
|
||||||
import Graphics.Rendering.OpenGL hiding (color, rotate, scale, translate)
|
|
||||||
import qualified IntMapHelp as IM
|
import qualified IntMapHelp as IM
|
||||||
import Loop
|
import Loop
|
||||||
import Music
|
import Music
|
||||||
@@ -30,6 +29,7 @@ import Preload.Render
|
|||||||
--import Render
|
--import Render
|
||||||
import qualified SDL
|
import qualified SDL
|
||||||
import qualified SDL.Mixer as Mix
|
import qualified SDL.Mixer as Mix
|
||||||
|
import SDL (($=))
|
||||||
import Sound
|
import Sound
|
||||||
import System.Directory
|
import System.Directory
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ dependencies:
|
|||||||
#- heap
|
#- heap
|
||||||
- sdl2
|
- sdl2
|
||||||
- sdl2-mixer
|
- sdl2-mixer
|
||||||
- OpenGL
|
#- OpenGL
|
||||||
- OpenGLRaw
|
- OpenGLRaw
|
||||||
- text
|
- text
|
||||||
#- raw-strings-qq
|
#- raw-strings-qq
|
||||||
|
|||||||
+1
-2
@@ -30,8 +30,7 @@ module Shader.Data
|
|||||||
, frag'
|
, frag'
|
||||||
) where
|
) where
|
||||||
import Data.Vector (Vector)
|
import Data.Vector (Vector)
|
||||||
import Graphics.Rendering.OpenGL
|
import Graphics.GL.Core45
|
||||||
import Graphics.GL.Core43
|
|
||||||
import Foreign
|
import Foreign
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
{- | Datatype containing the necessary information for a single shader. -}
|
{- | Datatype containing the necessary information for a single shader. -}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ module Shader.Parameters
|
|||||||
, numSubElements
|
, numSubElements
|
||||||
, glushortSize
|
, glushortSize
|
||||||
) where
|
) where
|
||||||
import Graphics.Rendering.OpenGL hiding (Point,translate,scale,imageHeight)
|
import Graphics.GL.Core45
|
||||||
import Foreign
|
import Foreign
|
||||||
|
|
||||||
floatSize :: Int
|
floatSize :: Int
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import Shape.Data
|
|||||||
import Geometry.Data
|
import Geometry.Data
|
||||||
--import ShapePicture
|
--import ShapePicture
|
||||||
|
|
||||||
import Graphics.Rendering.OpenGL hiding (color,scale,translate,rotate)
|
import Graphics.GL.Core45
|
||||||
import Foreign
|
import Foreign
|
||||||
import qualified Data.Vector as V
|
import qualified Data.Vector as V
|
||||||
import qualified Data.Vector.Unboxed as UV
|
import qualified Data.Vector.Unboxed as UV
|
||||||
|
|||||||
Reference in New Issue
Block a user