From 20eef80568d6b50feec455b6123d4c11ee0e393e Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 23 Apr 2023 12:30:51 +0100 Subject: [PATCH] Add file --- data/charMaps/charMapVert16Tall.png | Bin 0 -> 4793 bytes src/Preload/Render.hs | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 data/charMaps/charMapVert16Tall.png diff --git a/data/charMaps/charMapVert16Tall.png b/data/charMaps/charMapVert16Tall.png new file mode 100644 index 0000000000000000000000000000000000000000..af00339f859370b2e637043ca23293e35eb25668 GIT binary patch literal 4793 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 IE^itBf7W*7@&Et; literal 0 HcmV?d00001 diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index b8b0f0ab5..bad103fda 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -118,7 +118,8 @@ preloadRender = do cslist <- makeShaderVBO "picture/charArray" [vert, frag] (toFloatVAs [3, 4, 4]) pmTriangles -- initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_NEAREST_MIPMAP_LINEAR GL_LINEAR - initTexture2DArray 50 "data/texture/charMapVert16Block.png" 2 16 32 95 GL_NEAREST GL_NEAREST + --initTexture2DArray 50 "data/texture/charMapVert16Block.png" 2 16 32 95 GL_NEAREST GL_NEAREST + initTexture2DArray 50 "data/charMaps/charMapVert16Tall.png" 2 16 32 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVert8Block.png" 2 8 16 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_NEAREST GL_LINEAR