GLSL -> GL

8 files changed, 19 insertions, 44 deletions

diff --git a/Spear.cabal b/Spear.cabal
index 2f21fad..316c1eb 100644
--- a/Spear.cabal
+++ b/Spear.cabal
@@ -20,7 +20,7 @@ library
                      Spear.Physics.Types Spear.App Spear.App.Application Spear.App.Input
                      Spear.Assets.Image Spear.Assets.Model Spear.Collision
                      Spear.Math.AABB Spear.Math.Circle Spear.Math.Triangle Spear.Game
-                     Spear.GLSL Spear.Math.Camera Spear.Math.Entity Spear.Math.Matrix3
+                     Spear.GL Spear.Math.Camera Spear.Math.Entity Spear.Math.Matrix3
                      Spear.Math.Matrix4 Spear.Math.MatrixUtils Spear.Math.Plane
                      Spear.Math.Quaternion Spear.Math.Vector Spear.Math.Vector.Class
                      Spear.Math.Vector.Vector3 Spear.Math.Vector.Vector4
diff --git a/Spear/GLSL.hs b/Spear/GL.hs
index 8541e1f..05e439a 100644
--- a/Spear/GLSL.hs
+++ b/Spear/GL.hs
@@ -1,4 +1,4 @@
-module Spear.GLSL
+module Spear.GL
 (
     -- * General Management
     GLSLShader
diff --git a/Spear/Render/AnimatedModel.hs b/Spear/Render/AnimatedModel.hs
index e554272..be3e2e3 100644
--- a/Spear/Render/AnimatedModel.hs
+++ b/Spear/Render/AnimatedModel.hs
@@ -30,7 +30,7 @@ where
 import Spear.Assets.Model
 import Spear.Collision
 import Spear.Game
-import Spear.GLSL
+import Spear.GL
 import Spear.Math.AABB
 import Spear.Math.Matrix4 (Matrix4)
 import Spear.Math.Vector
diff --git a/Spear/Render/Program.hs b/Spear/Render/Program.hs
index ab2a548..6e94ca5 100644
--- a/Spear/Render/Program.hs
+++ b/Spear/Render/Program.hs
@@ -11,34 +11,28 @@ module Spear.Render.Program
 )
 where
 
-
-import Spear.GLSL (GLSLProgram)
-
+import Spear.GL (GLSLProgram)
 
 import Graphics.Rendering.OpenGL.Raw.Core31
 
-
 data StaticProgram = StaticProgram
     { staticProgram         :: GLSLProgram
     , staticProgramChannels :: StaticProgramChannels
     , staticProgramUniforms :: StaticProgramUniforms
     }
 
-
 data AnimatedProgram = AnimatedProgram
     { animatedProgram         :: GLSLProgram
     , animatedProgramChannels :: AnimatedProgramChannels
     , animatedProgramUniforms :: AnimatedProgramUniforms
     }
 
-
 data StaticProgramChannels = StaticProgramChannels
     { vertexChannel  :: GLuint -- ^ Vertex channel.
     , normalChannel  :: GLuint -- ^ Normal channel.
     , stexChannel    :: GLuint -- ^ Texture channel.
     }
 
-
 data AnimatedProgramChannels = AnimatedProgramChannels
     { vertexChannel1 :: GLuint -- ^ Vertex channel 1.
     , vertexChannel2 :: GLuint -- ^ Vertex channel 2.
@@ -47,7 +41,6 @@ data AnimatedProgramChannels = AnimatedProgramChannels
     , atexChannel    :: GLuint -- ^ Texture channel.
     }
 
-
 data StaticProgramUniforms = StaticProgramUniforms
     { skaLoc         :: GLint -- ^ Material ambient uniform location.
     , skdLoc         :: GLint -- ^ Material diffuse uniform location.
@@ -59,7 +52,6 @@ data StaticProgramUniforms = StaticProgramUniforms
     , sprojLoc       :: GLint -- ^ Projection matrix location.
     }
 
-
 data AnimatedProgramUniforms = AnimatedProgramUniforms
     { akaLoc         :: GLint -- ^ Material ambient uniform location.
     , akdLoc         :: GLint -- ^ Material diffuse uniform location.
@@ -72,19 +64,15 @@ data AnimatedProgramUniforms = AnimatedProgramUniforms
     , aprojLoc       :: GLint -- ^ Projection matrix location.
     }
 
-
 class Program a where
     program :: a -> GLSLProgram
 
-
 instance Program StaticProgram where
     program = staticProgram
 
-
 instance Program AnimatedProgram where
     program = animatedProgram
 
-
 class ProgramUniforms a where
     kaLoc        :: a -> GLint
     kdLoc        :: a -> GLint
@@ -95,7 +83,6 @@ class ProgramUniforms a where
     normalmatLoc :: a -> GLint
     projLoc      :: a -> GLint
 
-
 instance ProgramUniforms StaticProgramUniforms where
     kaLoc        = skaLoc
     kdLoc        = skdLoc
@@ -106,8 +93,6 @@ instance ProgramUniforms StaticProgramUniforms where
     normalmatLoc = snormalmatLoc
     projLoc      = sprojLoc
     
-
-
 instance ProgramUniforms AnimatedProgramUniforms where
     kaLoc        = akaLoc
     kdLoc        = akdLoc
diff --git a/Spear/Render/StaticModel.hs b/Spear/Render/StaticModel.hs
index fc7006e..42cf9d0 100644
--- a/Spear/Render/StaticModel.hs
+++ b/Spear/Render/StaticModel.hs
@@ -20,7 +20,7 @@ where
 import Spear.Assets.Model
 import Spear.Collision
 import Spear.Game
-import Spear.GLSL
+import Spear.GL
 import Spear.Math.AABB
 import Spear.Math.Matrix4 (Matrix4)
 import Spear.Math.Vector
diff --git a/Spear/Scene/GameObject.hs b/Spear/Scene/GameObject.hs
index 37f9260..b981c00 100644
--- a/Spear/Scene/GameObject.hs
+++ b/Spear/Scene/GameObject.hs
@@ -32,7 +32,7 @@ where
 
 
 import Spear.Collision as Col
-import Spear.GLSL
+import Spear.GL
 import Spear.Math.AABB
 import qualified Spear.Math.Camera as Cam
 import qualified Spear.Math.Matrix3 as M3
diff --git a/Spear/Scene/Loader.hs b/Spear/Scene/Loader.hs
index 09d69eb..22657bd 100644
--- a/Spear/Scene/Loader.hs
+++ b/Spear/Scene/Loader.hs
@@ -20,7 +20,7 @@ where
 import Spear.Assets.Model as Model
 import Spear.Collision
 import Spear.Game
-import qualified Spear.GLSL as GLSL
+import qualified Spear.GL as GL
 import Spear.Math.Matrix3 as M3
 import Spear.Math.Matrix4 as M4
 import Spear.Math.MatrixUtils (fastNormalMatrix)
@@ -201,20 +201,20 @@ rotateModel (Rotation ax ay az order) model =
     in
         flip Model.transformVerts vTransform . flip Model.transformNormals nTransform $ model
 
-loadTexture :: FilePath -> Loader GLSL.Texture
+loadTexture :: FilePath -> Loader GL.Texture
 loadTexture file =
     loadResource file textures addTexture $
-        GLSL.loadTextureImage file gl_LINEAR gl_LINEAR
+        GL.loadTextureImage file gl_LINEAR gl_LINEAR
 
 newShaderProgram :: SceneGraph -> Loader ()
 newShaderProgram (SceneLeaf _ props) = do
-    (vsName, vertShader) <- Spear.Scene.Loader.loadShader GLSL.VertexShader props
-    (fsName, fragShader) <- Spear.Scene.Loader.loadShader GLSL.FragmentShader props
+    (vsName, vertShader) <- Spear.Scene.Loader.loadShader GL.VertexShader props
+    (fsName, fragShader) <- Spear.Scene.Loader.loadShader GL.FragmentShader props
     name       <- asString $ mandatory' "name" props
     stype      <- asString $ mandatory' "type" props
-    prog       <- GLSL.newProgram [vertShader, fragShader]
+    prog       <- GL.newProgram [vertShader, fragShader]
     
-    let getUniformLoc name = (gameIO . SV.get $ GLSL.uniformLocation prog name) `GLSL.assertGL` name
+    let getUniformLoc name = (gameIO . SV.get $ GL.uniformLocation prog name) `GL.assertGL` name
     
     case stype of
         "static" -> do
@@ -285,17 +285,17 @@ newShaderProgram (SceneLeaf _ props) = do
             loadResource name customPrograms addCustomProgram $ return prog
             return ()
 
-loadShader :: GLSL.ShaderType -> [Property] -> Loader (String, GLSL.GLSLShader)
+loadShader :: GL.ShaderType -> [Property] -> Loader (String, GL.GLSLShader)
 loadShader _ [] = gameError $ "Loader::vertexShader: empty list"
 loadShader shaderType ((stype, file):xs) =
-    if shaderType == GLSL.VertexShader   && stype == "vertex-shader" ||
-       shaderType == GLSL.FragmentShader && stype == "fragment-shader"
+    if shaderType == GL.VertexShader   && stype == "vertex-shader" ||
+       shaderType == GL.FragmentShader && stype == "fragment-shader"
     then let f = concat file
          in loadShader' f shaderType >>= \shader -> return (f, shader)
     else Spear.Scene.Loader.loadShader shaderType xs
 
-loadShader' :: String -> GLSL.ShaderType -> Loader GLSL.GLSLShader
-loadShader' file shaderType = loadResource file shaders addShader $ GLSL.loadShader file shaderType
+loadShader' :: String -> GL.ShaderType -> Loader GL.GLSLShader
+loadShader' file shaderType = loadResource file shaders addShader $ GL.loadShader file shaderType
 
 newLight :: SceneGraph -> Loader ()
 newLight _ = return ()
diff --git a/Spear/Scene/SceneResources.hs b/Spear/Scene/SceneResources.hs
index c2dabcf..d75db56 100644
--- a/Spear/Scene/SceneResources.hs
+++ b/Spear/Scene/SceneResources.hs
@@ -17,9 +17,8 @@ module Spear.Scene.SceneResources
 )
 where
 
-
 import Spear.Assets.Model as Model
-import Spear.GLSL as GLSL
+import Spear.GL as GL
 import Spear.Math.Vector
 import Spear.Render.AnimatedModel
 import Spear.Render.Material
@@ -29,7 +28,6 @@ import Spear.Scene.Light
 
 import Data.Map as M
 
-
 data SceneResources = SceneResources
     { shaders          :: Map String GLSLShader
     , customPrograms   :: Map String GLSLProgram
@@ -41,42 +39,34 @@ data SceneResources = SceneResources
     , lights           :: [Light]
     }
 
-
 -- | Build an empty instance of 'SceneResources'.
 emptySceneResources =
     SceneResources M.empty M.empty M.empty M.empty M.empty M.empty M.empty []
 
-
 -- | Get the shader specified by the given string.
 getShader :: SceneResources -> String -> Maybe GLSLShader
 getShader res key = M.lookup key $ shaders res
 
-
 -- | Get the custom program specified by the given string.
 getCustomProgram :: SceneResources -> String -> Maybe GLSLProgram
 getCustomProgram res key = M.lookup key $ customPrograms res
 
-
 -- | Get the static program specified by the given string.
 getStaticProgram :: SceneResources -> String -> Maybe StaticProgram
 getStaticProgram res key = M.lookup key $ staticPrograms res
 
-
 -- | Get the animated program specified by the given string.
 getAnimatedProgram :: SceneResources -> String -> Maybe AnimatedProgram
 getAnimatedProgram res key = M.lookup key $ animatedPrograms res
 
-
 -- | Get the texture specified by the given string.
 getTexture :: SceneResources -> String -> Maybe Texture
 getTexture res key = M.lookup key $ textures res
 
-
 -- | Get the static model resource specified by the given string.
 getStaticModel :: SceneResources -> String -> Maybe StaticModelResource
 getStaticModel res key = M.lookup key $ staticModels res
 
-
 -- | Get the animated model resource specified by the given string.
 getAnimatedModel :: SceneResources -> String -> Maybe AnimatedModelResource
 getAnimatedModel res key = M.lookup key $ animatedModels res