Drezil/dear-imgui.hs
1
0
Fork 0
mirror of https://github.com/Drezil/dear-imgui.hs.git synced 2024-11-22 16:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to dear-imgui v1.82 (#57)

Browse Source
This commit is contained in:
Ollie Charles 2021-05-08 12:58:25 +01:00 committed by GitHub
parent 5cdce50c3a
commit 73eee5fc9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
generator/DearImGui/Generator/Parser.hs
View File

@ -75,7 +75,7 @@ import Data.HashMap.Strict
import qualified Data.HashMap.Strict as HashMap import qualified Data.HashMap.Strict as HashMap
( fromList, insert, lookup ) ( fromList, insert, lookup )
-- dear-imgui-generator -- dear-imgui-generator
import DearImGui.Generator.Tokeniser import DearImGui.Generator.Tokeniser
( Tok(..) ) ( Tok(..) )
import DearImGui.Generator.Types import DearImGui.Generator.Types
@ -134,18 +134,20 @@ headers = do
_ <- skipManyTill anySingle ( namedSection "Misc data structures" ) _ <- skipManyTill anySingle ( namedSection "Misc data structures" )
_ <- skipManyTill anySingle ( namedSection "Obsolete functions" ) _ <- skipManyTill anySingle ( namedSection "Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, ImColor)" )
_ <- skipManyTill anySingle ( namedSection "Helpers" ) _ <- skipManyTill anySingle ( namedSection "Drawing API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData)" )
_ <- skipManyTill anySingle ( namedSection "Drawing API" )
skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" ) skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" )
drawingEnums <- many ( enumeration enumNamesAndTypes ) drawingEnums <- many ( enumeration enumNamesAndTypes )
_ <- skipManyTill anySingle ( namedSection "Font API" ) _ <- skipManyTill anySingle ( namedSection "Font API (ImFontConfig, ImFontGlyph, ImFontAtlasFlags, ImFontAtlas, ImFontGlyphRangesBuilder, ImFont)" )
skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" ) skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" )
fontEnums <- many ( enumeration enumNamesAndTypes ) fontEnums <- many ( enumeration enumNamesAndTypes )
_ <- skipManyTill anySingle ( namedSection "Viewports" )
_ <- skipManyTill anySingle ( namedSection "Obsolete functions and types" )
let let
enums :: [ Enumeration () ] enums :: [ Enumeration () ]
enums = basicEnums <> drawingEnums <> fontEnums enums = basicEnums <> drawingEnums <> fontEnums
@ -208,7 +210,7 @@ enumeration enumNamesAndTypes = do
docs :: [Comment] docs :: [Comment]
docs = forwardDoc : CommentText "" : inlineDocs docs = forwardDoc : CommentText "" : inlineDocs
reservedSymbol '{' reservedSymbol '{'
( patterns, EnumState { enumSize, hasExplicitCount } ) <- ( patterns, EnumState { enumSize, hasExplicitCount } ) <-
( `runStateT` EnumState { enumValues = mempty, currEnumTag = 0, enumSize = 0, hasExplicitCount = False } ) $ ( `runStateT` EnumState { enumValues = mempty, currEnumTag = 0, enumSize = 0, hasExplicitCount = False } ) $
catMaybes catMaybes
<$> many <$> many

2
imgui

@ -1 +1 @@
Subproject commit 58075c4414b985b352d10718b02a8c43f25efd7c Subproject commit 35b1148efb839381b84de9290d9caf0b66ad7d03