Start migration to openGLraw, add target parameter to texture params

src/Shader/AuxAddition.hs

@@ -29,9 +29,13 @@ addTexture texturePath shad = do
     glTexStorage2D GL_TEXTURE_2D 3 GL_RGBA8 wtex htex
     VS.unsafeWith (imageData tex) $ \ptr -> do
         glTexSubImage2D GL_TEXTURE_2D 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
-    textureFilter Texture2DArray $= ((Linear',Just Linear') , Linear')
+    --textureFilter Texture2DArray $= ((Linear',Just Linear') , Linear')
+    textureFilter Texture2D $= ((Linear',Just Linear') , Linear')
     generateMipmap' Texture2D
-    return $ shad & shadTex ?~ ShaderTexture {_textureObject = textureOb}
+    return $ shad & shadTex ?~ ShaderTexture 
+        {_textureObject = textureOb
+        ,_textureTarget = GL_TEXTURE_2D
+        }
 
 vaddTextureNoFilter :: String -> FullShader -> IO FullShader
 vaddTextureNoFilter texturePath shad = do
@@ -45,7 +49,10 @@ vaddTextureNoFilter texturePath shad = do
     glTexStorage2D GL_TEXTURE_2D 1 GL_RGBA8 wtex htex
     VS.unsafeWith (imageData tex) $ \ptr -> do
         glTexSubImage2D GL_TEXTURE_2D 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
-    return $ shad & shadTex ?~ ShaderTexture {_textureObject = textureOb}
+    return $ shad & shadTex ?~ ShaderTexture 
+        { _textureObject = textureOb
+        , _textureTarget = GL_TEXTURE_2D
+        }
 
 addTextureNoFilter :: String -> FullShader -> IO FullShader
 addTextureNoFilter texturePath shad = do
@@ -59,7 +66,10 @@ addTextureNoFilter texturePath shad = do
     glTexStorage2D GL_TEXTURE_2D 1 GL_RGBA8 wtex htex
     VS.unsafeWith (imageData tex) $ \ptr -> do
         glTexSubImage2D GL_TEXTURE_2D 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
-    return $ shad & shadTex ?~ ShaderTexture {_textureObject = textureOb}
+    return $ shad & shadTex ?~ ShaderTexture 
+        { _textureObject = textureOb
+        , _textureTarget = GL_TEXTURE_2D
+        }
 
 -- | for transforming a 256x256 image containing 64 tiles of 16x16 pixels into
 -- an image that was directly readable by glTexSubImage3D, used the
@@ -81,7 +91,10 @@ addTextureArray texturePath shad = do
         glTexSubImage3D GL_TEXTURE_2D_ARRAY 0 0 0 0 32 32 64 GL_RGBA GL_UNSIGNED_BYTE ptr
     textureFilter Texture2DArray $= ((Linear',Just Linear') , Linear')
     generateMipmap' Texture2DArray
-    return $ shad & shadTex ?~ ShaderTexture {_textureObject = textureOb}
+    return $ shad & shadTex ?~ ShaderTexture 
+        { _textureObject = textureOb
+        , _textureTarget = GL_TEXTURE_2D_ARRAY
+        }
 
 -- I am completely unclear on why this works with its current parameters
 tilesToLine 

src/Shader/Data.hs

@@ -60,8 +60,10 @@ data EBO = EBO
     , _eboPtr   :: Ptr GLushort
     }
 {- | Datatype containing the reference to a texture object.  -}
-newtype ShaderTexture = ShaderTexture
-    { _textureObject :: TextureObject }
+data ShaderTexture = ShaderTexture
+    { _textureObject :: TextureObject 
+    , _textureTarget :: GLenum
+    }
 data EPrimitiveMode
     = EPoints
     | ELines