diff --git a/data/normalMaps/checkerboard.png b/data/normalMaps/checkerboard.png index 9df11ce2f..e2712381e 100644 Binary files a/data/normalMaps/checkerboard.png and b/data/normalMaps/checkerboard.png differ diff --git a/shader/lighting/texture.frag b/shader/lighting/texture.frag index ce61d93b5..a34d80cc1 100644 --- a/shader/lighting/texture.frag +++ b/shader/lighting/texture.frag @@ -13,9 +13,10 @@ void main() { vec3 norm = normbit.xyz - pos; float y1 = dot(normalize(norm), normalize(distVec)); float y2 = float(y1 > 0 ? 1 : 0); + //float y3 = clamp(0.5 * (y1 + 1),0,1) ; + float y3 = clamp(y1 + 1,0,1) ; + float y = float(normbit.w == 0 ? y3 : y2); //float y = y2; - float y3 = clamp(0.5 * (y1 + 1),0,1) ; - float y = float(normbit.w == 0 ? y2 : y2); float dist = dot(distVec, distVec); if (dist > rad) { discard; diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index 43028307f..210e5a38e 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -212,8 +212,7 @@ preloadRender = do , eslist ] initializeGLState - - tonormalmap <- initTexture 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/squaresPattern.png" + tonormalmap <- initTexture 3 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR "data/normalMaps/attachedPanel.png" return $ RenderData { _pictureShaders = shadV diff --git a/src/Shader/Poke/Floor.hs b/src/Shader/Poke/Floor.hs index 95f898a63..1c594147b 100644 --- a/src/Shader/Poke/Floor.hs +++ b/src/Shader/Poke/Floor.hs @@ -1,4 +1,6 @@ -module Shader.Poke.Floor where +module Shader.Poke.Floor + ( pokeTile + ) where import Geometry import Shader.Poke.Triangulate