Improve intersection test--fails sometimes

src/Shader/AuxAddition.hs

@@ -25,11 +25,10 @@ addTexture texturePath shad = do
     let tex = convertRGBA8 cmap
     textureOb <- genObjectName
     textureBinding Texture2D $= Just textureOb
-    let texData = V.toList $ imageData tex
-        wtex = fromIntegral $ imageWidth  tex
+    let wtex = fromIntegral $ imageWidth  tex
         htex = fromIntegral $ imageHeight tex
     glTexStorage2D GL_TEXTURE_2D 3 GL_RGBA8 wtex htex
-    withArray texData $ \ptr -> do
+    V.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')
     generateMipmap' Texture2D
@@ -46,7 +45,8 @@ vaddTextureNoFilter texturePath shad = do
         wtex = fromIntegral $ imageWidth  tex
         htex = fromIntegral $ imageHeight tex
     glTexStorage2D GL_TEXTURE_2D 1 GL_RGBA8 wtex htex
-    withArray texData $ \ptr -> do
+    --withArray texData $ \ptr -> do
+    V.unsafeWith (imageData tex) $ \ptr -> do
         glTexSubImage2D GL_TEXTURE_2D 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
     return $ shad & shaderTexture ?~ ShaderTexture {_textureObject = textureOb}
 
@@ -61,20 +61,22 @@ addTextureNoFilter texturePath shad = do
         wtex = fromIntegral $ imageWidth  tex
         htex = fromIntegral $ imageHeight tex
     glTexStorage2D GL_TEXTURE_2D 1 GL_RGBA8 wtex htex
-    withArray texData $ \ptr -> do
+    --withArray texData $ \ptr -> do
+    V.unsafeWith (imageData tex) $ \ptr -> do
         glTexSubImage2D GL_TEXTURE_2D 0 0 0 wtex htex GL_RGBA GL_UNSIGNED_BYTE ptr
     return $ shad & shaderTexture ?~ ShaderTexture {_textureObject = textureOb}
 
 addTextureArray :: String -> FullShader -> IO FullShader
 addTextureArray texturePath shad = do
-    Right cmap <- readImage texturePath
-    let tex = convertRGBA8 cmap
     textureOb <- genObjectName
     textureBinding Texture2DArray $= Just textureOb
+    Right cmap <- readImage texturePath
+    let tex = convertRGBA8 cmap
     let texData = tilesToLine 128 8 . 
             V.toList $ imageData tex
     glTexStorage3D GL_TEXTURE_2D_ARRAY 3 GL_RGBA8 32 32 64
     withArray texData $ \ptr -> do
+        --glTexSubImage3D GL_TEXTURE_2D_ARRAY 0 0 0 0 32 32 64 GL_RGBA GL_UNSIGNED_BYTE ptr
         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
@@ -87,6 +89,13 @@ tilesToLine
     -> [a]
     -> [a]
 tilesToLine w n = concat . concat . transpose . chunksOf n . chunksOf w
+tilesToLineV
+    :: Int -- ^ Parameter a
+    -> Int -- ^ Parameter b
+    -> V.Vector a
+    -> V.Vector a
+tilesToLineV w n = undefined
+
 
 addUniforms :: [String] -> FullShader -> IO FullShader
 addUniforms uniStrings shad = do