From 646153557986ff3fc0f39f6555ff052ff0f8dda6 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 18 Mar 2023 14:41:07 +0000 Subject: [PATCH] Tweak floor normal map shading --- data/normalMaps/checkerboard.png | Bin 703 -> 6091 bytes shader/lighting/texture.frag | 5 +++-- src/Preload/Render.hs | 3 +-- src/Shader/Poke/Floor.hs | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/data/normalMaps/checkerboard.png b/data/normalMaps/checkerboard.png index 9df11ce2f302f4168f3c521962daea4301bdac99..e2712381ec1ca91adce87dfcda8ad6981fe871bc 100644 GIT binary patch literal 6091 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 Yu%5;CZ`{pHMfQN=dd=}Hm>IU}UwD;6lmGw# delta 247 zcmVEX>4Tx04R~ObV*2GcnK@j9M^i!KekJ77PXpSkBFO!|-Myk*bYEe&3ucz@T@L zNcCSY{b4F6#W|e}4A)6fugSo`axO!}mFW7wh+zZ6X$C)r)5O*XUq|bMQ42;b7`0%e x)CWfCZx}>~tq;z<`K_KTz;KD!`hZ*S4* 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