From a25b62d77f070676996bad854ed4c0ccb44b1381 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 2 Nov 2024 02:34:06 +0000 Subject: [PATCH] Add more ascii characters Will also add more characters from code page 437 --- data/charMaps/cMap16x32.CodePage437.png | Bin 0 -> 9425 bytes ghcidOutput | 6 +----- src/Dodge/DisplayInventory.hs | 1 - src/Dodge/Render/HUD.hs | 3 --- src/Picture/Base.hs | 2 +- src/Preload/Render.hs | 3 ++- 6 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 data/charMaps/cMap16x32.CodePage437.png diff --git a/data/charMaps/cMap16x32.CodePage437.png b/data/charMaps/cMap16x32.CodePage437.png new file mode 100644 index 0000000000000000000000000000000000000000..716bf2c64c7cd2314a8e66473166fde947869e99 GIT binary patch literal 9425 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 literal 0 HcmV?d00001 diff --git a/ghcidOutput b/ghcidOutput index 5f11e0a0e..bece4b4e1 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1,5 +1 @@ -/home/justin/Haskell/loop/src/Dodge/DisplayInventory.hs:20:1-33: warning: [-Wunused-imports] - The import of ‘Dodge.Inventory.CheckSlots’ is redundant - | -20 | import Dodge.Inventory.CheckSlots - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +All good (594 modules, at 02:32:29) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 6772bd85f..8a13742d2 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -17,7 +17,6 @@ import Dodge.Data.Config import Dodge.Data.DoubleTree import Dodge.Data.SelectionList import Dodge.Data.Universe -import Dodge.Inventory.CheckSlots import Dodge.Inventory.SelectionList import Dodge.Item.Grammar import Dodge.ListDisplayParams diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index 1c40fe676..73ed5d284 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -64,9 +64,6 @@ drawInventory sss w cfig = drawSelectionSections sss ldp cfig <> drawSSCursor sss (w ^? hud . hudElement . diSelection . _Just) ldp curs cfig <> drawRootCursor w sss (w ^? hud . hudElement . diSelection . _Just) ldp cfig --- <> drawSSMultiCursor sss (w ^? hud . hudElement . diSelection . _Just) --- (w ^? hud . hudElement . diSelectionExtra) --- ldp curs cfig <> iextra <> translateScreenPos cfig diff --git a/src/Picture/Base.hs b/src/Picture/Base.hs index e42b3b30e..7644d47ae 100644 --- a/src/Picture/Base.hs +++ b/src/Picture/Base.hs @@ -323,7 +323,7 @@ charToTuple xoff c f x y = (V3 (xoff + x * 100) (y * 200) 0, white, V3 x (1 - y) charnum) -- textures in opengl have origins at the lower left, my char array has its -- origin at the upper left - charnum = fromIntegral (fromEnum c) - 32 + charnum = fromIntegral (fromEnum c) -- - 32 --charToTuple' :: Float -> Char -> [(Point3, Point4, Point3)] --{-# INLINE charToTuple' #-} diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index c03d15124..3a2c7865d 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -94,7 +94,8 @@ preloadRender = do ] -- 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/charMaps/charMapVert16Tall.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/charMaps/cMap16x32.CodePage437.png" 2 16 32 255 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