Add more ascii characters
Will also add more characters from code page 437
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 9.2 KiB |
+1
-5
@@ -1,5 +1 @@
|
|||||||
/home/justin/Haskell/loop/src/Dodge/DisplayInventory.hs:20:1-33: warning: [-Wunused-imports]
|
All good (594 modules, at 02:32:29)
|
||||||
The import of ‘Dodge.Inventory.CheckSlots’ is redundant
|
|
||||||
|
|
|
||||||
20 | import Dodge.Inventory.CheckSlots
|
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import Dodge.Data.Config
|
|||||||
import Dodge.Data.DoubleTree
|
import Dodge.Data.DoubleTree
|
||||||
import Dodge.Data.SelectionList
|
import Dodge.Data.SelectionList
|
||||||
import Dodge.Data.Universe
|
import Dodge.Data.Universe
|
||||||
import Dodge.Inventory.CheckSlots
|
|
||||||
import Dodge.Inventory.SelectionList
|
import Dodge.Inventory.SelectionList
|
||||||
import Dodge.Item.Grammar
|
import Dodge.Item.Grammar
|
||||||
import Dodge.ListDisplayParams
|
import Dodge.ListDisplayParams
|
||||||
|
|||||||
@@ -64,9 +64,6 @@ drawInventory sss w cfig =
|
|||||||
drawSelectionSections sss ldp cfig
|
drawSelectionSections sss ldp cfig
|
||||||
<> drawSSCursor sss (w ^? hud . hudElement . diSelection . _Just) ldp curs cfig
|
<> drawSSCursor sss (w ^? hud . hudElement . diSelection . _Just) ldp curs cfig
|
||||||
<> drawRootCursor w sss (w ^? hud . hudElement . diSelection . _Just) ldp 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
|
<> iextra
|
||||||
<> translateScreenPos
|
<> translateScreenPos
|
||||||
cfig
|
cfig
|
||||||
|
|||||||
+1
-1
@@ -323,7 +323,7 @@ charToTuple xoff c
|
|||||||
f x y = (V3 (xoff + x * 100) (y * 200) 0, white, V3 x (1 - y) charnum)
|
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
|
-- textures in opengl have origins at the lower left, my char array has its
|
||||||
-- origin at the upper left
|
-- origin at the upper left
|
||||||
charnum = fromIntegral (fromEnum c) - 32
|
charnum = fromIntegral (fromEnum c) -- - 32
|
||||||
|
|
||||||
--charToTuple' :: Float -> Char -> [(Point3, Point4, Point3)]
|
--charToTuple' :: Float -> Char -> [(Point3, Point4, Point3)]
|
||||||
--{-# INLINE charToTuple' #-}
|
--{-# INLINE charToTuple' #-}
|
||||||
|
|||||||
@@ -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/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/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/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_LINEAR GL_LINEAR
|
||||||
--initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_NEAREST GL_LINEAR
|
--initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_NEAREST GL_LINEAR
|
||||||
|
|||||||
Reference in New Issue
Block a user