diff --git a/data/charMaps/cMap16x32.CodePage437.png b/data/charMaps/cMap16x32.CodePage437.png new file mode 100644 index 000000000..716bf2c64 Binary files /dev/null and b/data/charMaps/cMap16x32.CodePage437.png differ 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