Improve normal maps on ground and walls

src/Preload/Render.hs

@@ -165,15 +165,14 @@ preloadRender = do
     -- textured wallShader
     wallTextureShad <-
         makeShaderUsingVAO "wall/texture" [vert, geom, frag] EPoints wpColVAO
-            >>= addSamplerTexture2D "data/texture/grayscaleDirt.png"
+    let wallverxstrd = 8
+    wallvbo <- setupVBO' wallverxstrd
+    wallshader <- makeShader4 "wall/basic" [vert,geom,frag] [4,4] wallverxstrd EPoints wallvbo
     let floorverxstrd = 8
     floorvbo <- setupVBO' floorverxstrd
     floorshader <- makeShader4 "floor/arrayPos" [vert, frag] [4,4] floorverxstrd ETriangles floorvbo
-    putStrLn "a"
     tonormalmap <- initTexture2DArray 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/normalArray.png"
     todiffusemap <- initTexture2DArray 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/diffuseArray.png"
-    checkGLError
-    putStrLn "b"
     -- bind fixed vertex data
     bufferPokedVBO (snd fsShad) 4
     framebuf2 <- setupTextureFramebuffer 800 600
@@ -260,6 +259,8 @@ preloadRender = do
             , _floorShader = floorshader
             , _toNormalMaps = tonormalmap
             , _toDiffuse = todiffusemap
+            , _wallVBO = wallvbo
+            , _wallShader = wallshader
             }
 
 --------------------end preloadRender