diff --git a/cimgui/gen_imgui_structs.bat b/cimgui/gen_imgui_structs.bat index 595bb6b..a04fe9b 100644 --- a/cimgui/gen_imgui_structs.bat +++ b/cimgui/gen_imgui_structs.bat @@ -3,6 +3,6 @@ rem set your PATH if necessary for gcc and lua with: set PATH=%PATH%;C:\mingw32\bin;C:\luaGL; gcc -E ../imgui/imgui.h | luajit.exe ./gen_imgui_structs.lua > imgui_structs.h - +rem gcc -E ../imgui/imgui.h > imgui_structs.raw cmd /k diff --git a/cimgui/gen_imgui_structs.lua b/cimgui/gen_imgui_structs.lua index 03c4463..217e5a9 100644 --- a/cimgui/gen_imgui_structs.lua +++ b/cimgui/gen_imgui_structs.lua @@ -23,7 +23,7 @@ for line in io.lines() do repeat -- simulate continue with break --print(line) - line = strip(line) + --line = strip(line) if #line == 0 then break end -- Is this a preprocessor statement? if line:sub(1,1) == "#" then @@ -71,8 +71,8 @@ end local namespace_re = "namespace" local in_namespace = false -local struct_re = "^struct%s+([^%s;]+)$" -local struct_closed_re = "^struct%s+([^%s]+);$" +local struct_re = "^%s*struct%s+([^%s;]+)$" +local struct_closed_re = "^%s*struct%s+([^%s]+);$" local struct_closing_re = "};" local struct_op_close_re = "%b{}" local structnames = {} @@ -113,7 +113,6 @@ typedef struct ImVector ImVector;]] if in_namespace then if line:match(function_closing_re) then - --io.write( line,"\n") in_namespace = false end break -- dont write anything inside @@ -124,7 +123,7 @@ typedef struct ImVector ImVector;]] if line:match("typedef") then --dont allow inner typedefs break elseif not line:match("^{$") and not line:match(struct_closing_re) then --avoid tab { and }; - line = " "..line + --line = " "..line end end io.write( line,"\n") @@ -139,7 +138,7 @@ typedef struct ImVector ImVector;]] innerstructs[structnames[#structnames]] = innerstructs[structnames[#structnames]] or {} local st = innerstructs[structnames[#structnames]] if not line:match("struct") and not line:match("^{$") and not line:match(struct_closing_re) then --avoid tab in struct { and }; - line = " "..line + --line = " "..line end st[#st + 1] = line if line:match(struct_closing_re) and not line:match(struct_op_close_re) then diff --git a/cimgui/imgui_structs.h b/cimgui/imgui_structs.h index 566c138..ab0689a 100644 --- a/cimgui/imgui_structs.h +++ b/cimgui/imgui_structs.h @@ -1,6 +1,7 @@ /////////////// BEGIN AUTOGENERATED SEGMENT #ifndef IMGUI_STRUCTS_INCLUDED #define IMGUI_STRUCTS_INCLUDED + struct ImDrawChannel; typedef struct ImDrawChannel ImDrawChannel; struct ImDrawCmd; @@ -84,315 +85,315 @@ struct ImVec4 typedef struct ImVec4 ImVec4; enum ImGuiWindowFlags_ { -ImGuiWindowFlags_NoTitleBar = 1 << 0, -ImGuiWindowFlags_NoResize = 1 << 1, -ImGuiWindowFlags_NoMove = 1 << 2, -ImGuiWindowFlags_NoScrollbar = 1 << 3, -ImGuiWindowFlags_NoScrollWithMouse = 1 << 4, -ImGuiWindowFlags_NoCollapse = 1 << 5, -ImGuiWindowFlags_AlwaysAutoResize = 1 << 6, -ImGuiWindowFlags_NoSavedSettings = 1 << 8, -ImGuiWindowFlags_NoInputs = 1 << 9, -ImGuiWindowFlags_MenuBar = 1 << 10, -ImGuiWindowFlags_HorizontalScrollbar = 1 << 11, -ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12, -ImGuiWindowFlags_NoBringToFrontOnFocus = 1 << 13, -ImGuiWindowFlags_AlwaysVerticalScrollbar= 1 << 14, -ImGuiWindowFlags_AlwaysHorizontalScrollbar=1<< 15, -ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16, -ImGuiWindowFlags_ResizeFromAnySide = 1 << 17, -ImGuiWindowFlags_NoNavInputs = 1 << 18, -ImGuiWindowFlags_NoNavFocus = 1 << 19, -ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus, -ImGuiWindowFlags_NavFlattened = 1 << 23, -ImGuiWindowFlags_ChildWindow = 1 << 24, -ImGuiWindowFlags_Tooltip = 1 << 25, -ImGuiWindowFlags_Popup = 1 << 26, -ImGuiWindowFlags_Modal = 1 << 27, -ImGuiWindowFlags_ChildMenu = 1 << 28 + ImGuiWindowFlags_NoTitleBar = 1 << 0, + ImGuiWindowFlags_NoResize = 1 << 1, + ImGuiWindowFlags_NoMove = 1 << 2, + ImGuiWindowFlags_NoScrollbar = 1 << 3, + ImGuiWindowFlags_NoScrollWithMouse = 1 << 4, + ImGuiWindowFlags_NoCollapse = 1 << 5, + ImGuiWindowFlags_AlwaysAutoResize = 1 << 6, + ImGuiWindowFlags_NoSavedSettings = 1 << 8, + ImGuiWindowFlags_NoInputs = 1 << 9, + ImGuiWindowFlags_MenuBar = 1 << 10, + ImGuiWindowFlags_HorizontalScrollbar = 1 << 11, + ImGuiWindowFlags_NoFocusOnAppearing = 1 << 12, + ImGuiWindowFlags_NoBringToFrontOnFocus = 1 << 13, + ImGuiWindowFlags_AlwaysVerticalScrollbar= 1 << 14, + ImGuiWindowFlags_AlwaysHorizontalScrollbar=1<< 15, + ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16, + ImGuiWindowFlags_ResizeFromAnySide = 1 << 17, + ImGuiWindowFlags_NoNavInputs = 1 << 18, + ImGuiWindowFlags_NoNavFocus = 1 << 19, + ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus, + ImGuiWindowFlags_NavFlattened = 1 << 23, + ImGuiWindowFlags_ChildWindow = 1 << 24, + ImGuiWindowFlags_Tooltip = 1 << 25, + ImGuiWindowFlags_Popup = 1 << 26, + ImGuiWindowFlags_Modal = 1 << 27, + ImGuiWindowFlags_ChildMenu = 1 << 28 }; enum ImGuiInputTextFlags_ { -ImGuiInputTextFlags_CharsDecimal = 1 << 0, -ImGuiInputTextFlags_CharsHexadecimal = 1 << 1, -ImGuiInputTextFlags_CharsUppercase = 1 << 2, -ImGuiInputTextFlags_CharsNoBlank = 1 << 3, -ImGuiInputTextFlags_AutoSelectAll = 1 << 4, -ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5, -ImGuiInputTextFlags_CallbackCompletion = 1 << 6, -ImGuiInputTextFlags_CallbackHistory = 1 << 7, -ImGuiInputTextFlags_CallbackAlways = 1 << 8, -ImGuiInputTextFlags_CallbackCharFilter = 1 << 9, -ImGuiInputTextFlags_AllowTabInput = 1 << 10, -ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11, -ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12, -ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13, -ImGuiInputTextFlags_ReadOnly = 1 << 14, -ImGuiInputTextFlags_Password = 1 << 15, -ImGuiInputTextFlags_NoUndoRedo = 1 << 16, -ImGuiInputTextFlags_CharsScientific = 1 << 17, -ImGuiInputTextFlags_Multiline = 1 << 20 + ImGuiInputTextFlags_CharsDecimal = 1 << 0, + ImGuiInputTextFlags_CharsHexadecimal = 1 << 1, + ImGuiInputTextFlags_CharsUppercase = 1 << 2, + ImGuiInputTextFlags_CharsNoBlank = 1 << 3, + ImGuiInputTextFlags_AutoSelectAll = 1 << 4, + ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5, + ImGuiInputTextFlags_CallbackCompletion = 1 << 6, + ImGuiInputTextFlags_CallbackHistory = 1 << 7, + ImGuiInputTextFlags_CallbackAlways = 1 << 8, + ImGuiInputTextFlags_CallbackCharFilter = 1 << 9, + ImGuiInputTextFlags_AllowTabInput = 1 << 10, + ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11, + ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12, + ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13, + ImGuiInputTextFlags_ReadOnly = 1 << 14, + ImGuiInputTextFlags_Password = 1 << 15, + ImGuiInputTextFlags_NoUndoRedo = 1 << 16, + ImGuiInputTextFlags_CharsScientific = 1 << 17, + ImGuiInputTextFlags_Multiline = 1 << 20 }; enum ImGuiTreeNodeFlags_ { -ImGuiTreeNodeFlags_Selected = 1 << 0, -ImGuiTreeNodeFlags_Framed = 1 << 1, -ImGuiTreeNodeFlags_AllowItemOverlap = 1 << 2, -ImGuiTreeNodeFlags_NoTreePushOnOpen = 1 << 3, -ImGuiTreeNodeFlags_NoAutoOpenOnLog = 1 << 4, -ImGuiTreeNodeFlags_DefaultOpen = 1 << 5, -ImGuiTreeNodeFlags_OpenOnDoubleClick = 1 << 6, -ImGuiTreeNodeFlags_OpenOnArrow = 1 << 7, -ImGuiTreeNodeFlags_Leaf = 1 << 8, -ImGuiTreeNodeFlags_Bullet = 1 << 9, -ImGuiTreeNodeFlags_FramePadding = 1 << 10, -ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13, -ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoAutoOpenOnLog -, ImGuiTreeNodeFlags_AllowOverlapMode = ImGuiTreeNodeFlags_AllowItemOverlap + ImGuiTreeNodeFlags_Selected = 1 << 0, + ImGuiTreeNodeFlags_Framed = 1 << 1, + ImGuiTreeNodeFlags_AllowItemOverlap = 1 << 2, + ImGuiTreeNodeFlags_NoTreePushOnOpen = 1 << 3, + ImGuiTreeNodeFlags_NoAutoOpenOnLog = 1 << 4, + ImGuiTreeNodeFlags_DefaultOpen = 1 << 5, + ImGuiTreeNodeFlags_OpenOnDoubleClick = 1 << 6, + ImGuiTreeNodeFlags_OpenOnArrow = 1 << 7, + ImGuiTreeNodeFlags_Leaf = 1 << 8, + ImGuiTreeNodeFlags_Bullet = 1 << 9, + ImGuiTreeNodeFlags_FramePadding = 1 << 10, + ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13, + ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoAutoOpenOnLog + , ImGuiTreeNodeFlags_AllowOverlapMode = ImGuiTreeNodeFlags_AllowItemOverlap }; enum ImGuiSelectableFlags_ { -ImGuiSelectableFlags_DontClosePopups = 1 << 0, -ImGuiSelectableFlags_SpanAllColumns = 1 << 1, -ImGuiSelectableFlags_AllowDoubleClick = 1 << 2 + ImGuiSelectableFlags_DontClosePopups = 1 << 0, + ImGuiSelectableFlags_SpanAllColumns = 1 << 1, + ImGuiSelectableFlags_AllowDoubleClick = 1 << 2 }; enum ImGuiComboFlags_ { -ImGuiComboFlags_PopupAlignLeft = 1 << 0, -ImGuiComboFlags_HeightSmall = 1 << 1, -ImGuiComboFlags_HeightRegular = 1 << 2, -ImGuiComboFlags_HeightLarge = 1 << 3, -ImGuiComboFlags_HeightLargest = 1 << 4, -ImGuiComboFlags_NoArrowButton = 1 << 5, -ImGuiComboFlags_NoPreview = 1 << 6, -ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest + ImGuiComboFlags_PopupAlignLeft = 1 << 0, + ImGuiComboFlags_HeightSmall = 1 << 1, + ImGuiComboFlags_HeightRegular = 1 << 2, + ImGuiComboFlags_HeightLarge = 1 << 3, + ImGuiComboFlags_HeightLargest = 1 << 4, + ImGuiComboFlags_NoArrowButton = 1 << 5, + ImGuiComboFlags_NoPreview = 1 << 6, + ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest }; enum ImGuiFocusedFlags_ { -ImGuiFocusedFlags_ChildWindows = 1 << 0, -ImGuiFocusedFlags_RootWindow = 1 << 1, -ImGuiFocusedFlags_AnyWindow = 1 << 2, -ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows + ImGuiFocusedFlags_ChildWindows = 1 << 0, + ImGuiFocusedFlags_RootWindow = 1 << 1, + ImGuiFocusedFlags_AnyWindow = 1 << 2, + ImGuiFocusedFlags_RootAndChildWindows = ImGuiFocusedFlags_RootWindow | ImGuiFocusedFlags_ChildWindows }; enum ImGuiHoveredFlags_ { -ImGuiHoveredFlags_Default = 0, -ImGuiHoveredFlags_ChildWindows = 1 << 0, -ImGuiHoveredFlags_RootWindow = 1 << 1, -ImGuiHoveredFlags_AnyWindow = 1 << 2, -ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 3, -ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 5, -ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 6, -ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped, -ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows + ImGuiHoveredFlags_Default = 0, + ImGuiHoveredFlags_ChildWindows = 1 << 0, + ImGuiHoveredFlags_RootWindow = 1 << 1, + ImGuiHoveredFlags_AnyWindow = 1 << 2, + ImGuiHoveredFlags_AllowWhenBlockedByPopup = 1 << 3, + ImGuiHoveredFlags_AllowWhenBlockedByActiveItem = 1 << 5, + ImGuiHoveredFlags_AllowWhenOverlapped = 1 << 6, + ImGuiHoveredFlags_RectOnly = ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem | ImGuiHoveredFlags_AllowWhenOverlapped, + ImGuiHoveredFlags_RootAndChildWindows = ImGuiHoveredFlags_RootWindow | ImGuiHoveredFlags_ChildWindows }; enum ImGuiDragDropFlags_ { -ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0, -ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1, -ImGuiDragDropFlags_SourceNoHoldToOpenOthers = 1 << 2, -ImGuiDragDropFlags_SourceAllowNullID = 1 << 3, -ImGuiDragDropFlags_SourceExtern = 1 << 4, -ImGuiDragDropFlags_AcceptBeforeDelivery = 1 << 10, -ImGuiDragDropFlags_AcceptNoDrawDefaultRect = 1 << 11, -ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect + ImGuiDragDropFlags_SourceNoPreviewTooltip = 1 << 0, + ImGuiDragDropFlags_SourceNoDisableHover = 1 << 1, + ImGuiDragDropFlags_SourceNoHoldToOpenOthers = 1 << 2, + ImGuiDragDropFlags_SourceAllowNullID = 1 << 3, + ImGuiDragDropFlags_SourceExtern = 1 << 4, + ImGuiDragDropFlags_AcceptBeforeDelivery = 1 << 10, + ImGuiDragDropFlags_AcceptNoDrawDefaultRect = 1 << 11, + ImGuiDragDropFlags_AcceptPeekOnly = ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect }; enum ImGuiDir_ { -ImGuiDir_None = -1, -ImGuiDir_Left = 0, -ImGuiDir_Right = 1, -ImGuiDir_Up = 2, -ImGuiDir_Down = 3, -ImGuiDir_COUNT + ImGuiDir_None = -1, + ImGuiDir_Left = 0, + ImGuiDir_Right = 1, + ImGuiDir_Up = 2, + ImGuiDir_Down = 3, + ImGuiDir_COUNT }; enum ImGuiKey_ { -ImGuiKey_Tab, -ImGuiKey_LeftArrow, -ImGuiKey_RightArrow, -ImGuiKey_UpArrow, -ImGuiKey_DownArrow, -ImGuiKey_PageUp, -ImGuiKey_PageDown, -ImGuiKey_Home, -ImGuiKey_End, -ImGuiKey_Insert, -ImGuiKey_Delete, -ImGuiKey_Backspace, -ImGuiKey_Space, -ImGuiKey_Enter, -ImGuiKey_Escape, -ImGuiKey_A, -ImGuiKey_C, -ImGuiKey_V, -ImGuiKey_X, -ImGuiKey_Y, -ImGuiKey_Z, -ImGuiKey_COUNT + ImGuiKey_Tab, + ImGuiKey_LeftArrow, + ImGuiKey_RightArrow, + ImGuiKey_UpArrow, + ImGuiKey_DownArrow, + ImGuiKey_PageUp, + ImGuiKey_PageDown, + ImGuiKey_Home, + ImGuiKey_End, + ImGuiKey_Insert, + ImGuiKey_Delete, + ImGuiKey_Backspace, + ImGuiKey_Space, + ImGuiKey_Enter, + ImGuiKey_Escape, + ImGuiKey_A, + ImGuiKey_C, + ImGuiKey_V, + ImGuiKey_X, + ImGuiKey_Y, + ImGuiKey_Z, + ImGuiKey_COUNT }; enum ImGuiNavInput_ { -ImGuiNavInput_Activate, -ImGuiNavInput_Cancel, -ImGuiNavInput_Input, -ImGuiNavInput_Menu, -ImGuiNavInput_DpadLeft, -ImGuiNavInput_DpadRight, -ImGuiNavInput_DpadUp, -ImGuiNavInput_DpadDown, -ImGuiNavInput_LStickLeft, -ImGuiNavInput_LStickRight, -ImGuiNavInput_LStickUp, -ImGuiNavInput_LStickDown, -ImGuiNavInput_FocusPrev, -ImGuiNavInput_FocusNext, -ImGuiNavInput_TweakSlow, -ImGuiNavInput_TweakFast, -ImGuiNavInput_KeyMenu_, -ImGuiNavInput_KeyLeft_, -ImGuiNavInput_KeyRight_, -ImGuiNavInput_KeyUp_, -ImGuiNavInput_KeyDown_, -ImGuiNavInput_COUNT, -ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_ + ImGuiNavInput_Activate, + ImGuiNavInput_Cancel, + ImGuiNavInput_Input, + ImGuiNavInput_Menu, + ImGuiNavInput_DpadLeft, + ImGuiNavInput_DpadRight, + ImGuiNavInput_DpadUp, + ImGuiNavInput_DpadDown, + ImGuiNavInput_LStickLeft, + ImGuiNavInput_LStickRight, + ImGuiNavInput_LStickUp, + ImGuiNavInput_LStickDown, + ImGuiNavInput_FocusPrev, + ImGuiNavInput_FocusNext, + ImGuiNavInput_TweakSlow, + ImGuiNavInput_TweakFast, + ImGuiNavInput_KeyMenu_, + ImGuiNavInput_KeyLeft_, + ImGuiNavInput_KeyRight_, + ImGuiNavInput_KeyUp_, + ImGuiNavInput_KeyDown_, + ImGuiNavInput_COUNT, + ImGuiNavInput_InternalStart_ = ImGuiNavInput_KeyMenu_ }; enum ImGuiConfigFlags_ { -ImGuiConfigFlags_NavEnableKeyboard = 1 << 0, -ImGuiConfigFlags_NavEnableGamepad = 1 << 1, -ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2, -ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3, -ImGuiConfigFlags_NoMouse = 1 << 4, -ImGuiConfigFlags_NoMouseCursorChange = 1 << 5, -ImGuiConfigFlags_IsSRGB = 1 << 20, -ImGuiConfigFlags_IsTouchScreen = 1 << 21 + ImGuiConfigFlags_NavEnableKeyboard = 1 << 0, + ImGuiConfigFlags_NavEnableGamepad = 1 << 1, + ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2, + ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3, + ImGuiConfigFlags_NoMouse = 1 << 4, + ImGuiConfigFlags_NoMouseCursorChange = 1 << 5, + ImGuiConfigFlags_IsSRGB = 1 << 20, + ImGuiConfigFlags_IsTouchScreen = 1 << 21 }; enum ImGuiBackendFlags_ { -ImGuiBackendFlags_HasGamepad = 1 << 0, -ImGuiBackendFlags_HasMouseCursors = 1 << 1, -ImGuiBackendFlags_HasSetMousePos = 1 << 2 + ImGuiBackendFlags_HasGamepad = 1 << 0, + ImGuiBackendFlags_HasMouseCursors = 1 << 1, + ImGuiBackendFlags_HasSetMousePos = 1 << 2 }; enum ImGuiCol_ { -ImGuiCol_Text, -ImGuiCol_TextDisabled, -ImGuiCol_WindowBg, -ImGuiCol_ChildBg, -ImGuiCol_PopupBg, -ImGuiCol_Border, -ImGuiCol_BorderShadow, -ImGuiCol_FrameBg, -ImGuiCol_FrameBgHovered, -ImGuiCol_FrameBgActive, -ImGuiCol_TitleBg, -ImGuiCol_TitleBgActive, -ImGuiCol_TitleBgCollapsed, -ImGuiCol_MenuBarBg, -ImGuiCol_ScrollbarBg, -ImGuiCol_ScrollbarGrab, -ImGuiCol_ScrollbarGrabHovered, -ImGuiCol_ScrollbarGrabActive, -ImGuiCol_CheckMark, -ImGuiCol_SliderGrab, -ImGuiCol_SliderGrabActive, -ImGuiCol_Button, -ImGuiCol_ButtonHovered, -ImGuiCol_ButtonActive, -ImGuiCol_Header, -ImGuiCol_HeaderHovered, -ImGuiCol_HeaderActive, -ImGuiCol_Separator, -ImGuiCol_SeparatorHovered, -ImGuiCol_SeparatorActive, -ImGuiCol_ResizeGrip, -ImGuiCol_ResizeGripHovered, -ImGuiCol_ResizeGripActive, -ImGuiCol_PlotLines, -ImGuiCol_PlotLinesHovered, -ImGuiCol_PlotHistogram, -ImGuiCol_PlotHistogramHovered, -ImGuiCol_TextSelectedBg, -ImGuiCol_ModalWindowDarkening, -ImGuiCol_DragDropTarget, -ImGuiCol_NavHighlight, -ImGuiCol_NavWindowingHighlight, -ImGuiCol_COUNT -, ImGuiCol_ChildWindowBg = ImGuiCol_ChildBg, ImGuiCol_Column = ImGuiCol_Separator, ImGuiCol_ColumnHovered = ImGuiCol_SeparatorHovered, ImGuiCol_ColumnActive = ImGuiCol_SeparatorActive + ImGuiCol_Text, + ImGuiCol_TextDisabled, + ImGuiCol_WindowBg, + ImGuiCol_ChildBg, + ImGuiCol_PopupBg, + ImGuiCol_Border, + ImGuiCol_BorderShadow, + ImGuiCol_FrameBg, + ImGuiCol_FrameBgHovered, + ImGuiCol_FrameBgActive, + ImGuiCol_TitleBg, + ImGuiCol_TitleBgActive, + ImGuiCol_TitleBgCollapsed, + ImGuiCol_MenuBarBg, + ImGuiCol_ScrollbarBg, + ImGuiCol_ScrollbarGrab, + ImGuiCol_ScrollbarGrabHovered, + ImGuiCol_ScrollbarGrabActive, + ImGuiCol_CheckMark, + ImGuiCol_SliderGrab, + ImGuiCol_SliderGrabActive, + ImGuiCol_Button, + ImGuiCol_ButtonHovered, + ImGuiCol_ButtonActive, + ImGuiCol_Header, + ImGuiCol_HeaderHovered, + ImGuiCol_HeaderActive, + ImGuiCol_Separator, + ImGuiCol_SeparatorHovered, + ImGuiCol_SeparatorActive, + ImGuiCol_ResizeGrip, + ImGuiCol_ResizeGripHovered, + ImGuiCol_ResizeGripActive, + ImGuiCol_PlotLines, + ImGuiCol_PlotLinesHovered, + ImGuiCol_PlotHistogram, + ImGuiCol_PlotHistogramHovered, + ImGuiCol_TextSelectedBg, + ImGuiCol_ModalWindowDarkening, + ImGuiCol_DragDropTarget, + ImGuiCol_NavHighlight, + ImGuiCol_NavWindowingHighlight, + ImGuiCol_COUNT + , ImGuiCol_ChildWindowBg = ImGuiCol_ChildBg, ImGuiCol_Column = ImGuiCol_Separator, ImGuiCol_ColumnHovered = ImGuiCol_SeparatorHovered, ImGuiCol_ColumnActive = ImGuiCol_SeparatorActive }; enum ImGuiStyleVar_ { -ImGuiStyleVar_Alpha, -ImGuiStyleVar_WindowPadding, -ImGuiStyleVar_WindowRounding, -ImGuiStyleVar_WindowBorderSize, -ImGuiStyleVar_WindowMinSize, -ImGuiStyleVar_WindowTitleAlign, -ImGuiStyleVar_ChildRounding, -ImGuiStyleVar_ChildBorderSize, -ImGuiStyleVar_PopupRounding, -ImGuiStyleVar_PopupBorderSize, -ImGuiStyleVar_FramePadding, -ImGuiStyleVar_FrameRounding, -ImGuiStyleVar_FrameBorderSize, -ImGuiStyleVar_ItemSpacing, -ImGuiStyleVar_ItemInnerSpacing, -ImGuiStyleVar_IndentSpacing, -ImGuiStyleVar_ScrollbarSize, -ImGuiStyleVar_ScrollbarRounding, -ImGuiStyleVar_GrabMinSize, -ImGuiStyleVar_GrabRounding, -ImGuiStyleVar_ButtonTextAlign, -ImGuiStyleVar_COUNT -, ImGuiStyleVar_Count_ = ImGuiStyleVar_COUNT, ImGuiStyleVar_ChildWindowRounding = ImGuiStyleVar_ChildRounding + ImGuiStyleVar_Alpha, + ImGuiStyleVar_WindowPadding, + ImGuiStyleVar_WindowRounding, + ImGuiStyleVar_WindowBorderSize, + ImGuiStyleVar_WindowMinSize, + ImGuiStyleVar_WindowTitleAlign, + ImGuiStyleVar_ChildRounding, + ImGuiStyleVar_ChildBorderSize, + ImGuiStyleVar_PopupRounding, + ImGuiStyleVar_PopupBorderSize, + ImGuiStyleVar_FramePadding, + ImGuiStyleVar_FrameRounding, + ImGuiStyleVar_FrameBorderSize, + ImGuiStyleVar_ItemSpacing, + ImGuiStyleVar_ItemInnerSpacing, + ImGuiStyleVar_IndentSpacing, + ImGuiStyleVar_ScrollbarSize, + ImGuiStyleVar_ScrollbarRounding, + ImGuiStyleVar_GrabMinSize, + ImGuiStyleVar_GrabRounding, + ImGuiStyleVar_ButtonTextAlign, + ImGuiStyleVar_COUNT + , ImGuiStyleVar_Count_ = ImGuiStyleVar_COUNT, ImGuiStyleVar_ChildWindowRounding = ImGuiStyleVar_ChildRounding }; enum ImGuiColorEditFlags_ { -ImGuiColorEditFlags_NoAlpha = 1 << 1, -ImGuiColorEditFlags_NoPicker = 1 << 2, -ImGuiColorEditFlags_NoOptions = 1 << 3, -ImGuiColorEditFlags_NoSmallPreview = 1 << 4, -ImGuiColorEditFlags_NoInputs = 1 << 5, -ImGuiColorEditFlags_NoTooltip = 1 << 6, -ImGuiColorEditFlags_NoLabel = 1 << 7, -ImGuiColorEditFlags_NoSidePreview = 1 << 8, -ImGuiColorEditFlags_AlphaBar = 1 << 9, -ImGuiColorEditFlags_AlphaPreview = 1 << 10, -ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 11, -ImGuiColorEditFlags_HDR = 1 << 12, -ImGuiColorEditFlags_RGB = 1 << 13, -ImGuiColorEditFlags_HSV = 1 << 14, -ImGuiColorEditFlags_HEX = 1 << 15, -ImGuiColorEditFlags_Uint8 = 1 << 16, -ImGuiColorEditFlags_Float = 1 << 17, -ImGuiColorEditFlags_PickerHueBar = 1 << 18, -ImGuiColorEditFlags_PickerHueWheel = 1 << 19, -ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX, -ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float, -ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar, -ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar + ImGuiColorEditFlags_NoAlpha = 1 << 1, + ImGuiColorEditFlags_NoPicker = 1 << 2, + ImGuiColorEditFlags_NoOptions = 1 << 3, + ImGuiColorEditFlags_NoSmallPreview = 1 << 4, + ImGuiColorEditFlags_NoInputs = 1 << 5, + ImGuiColorEditFlags_NoTooltip = 1 << 6, + ImGuiColorEditFlags_NoLabel = 1 << 7, + ImGuiColorEditFlags_NoSidePreview = 1 << 8, + ImGuiColorEditFlags_AlphaBar = 1 << 9, + ImGuiColorEditFlags_AlphaPreview = 1 << 10, + ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 11, + ImGuiColorEditFlags_HDR = 1 << 12, + ImGuiColorEditFlags_RGB = 1 << 13, + ImGuiColorEditFlags_HSV = 1 << 14, + ImGuiColorEditFlags_HEX = 1 << 15, + ImGuiColorEditFlags_Uint8 = 1 << 16, + ImGuiColorEditFlags_Float = 1 << 17, + ImGuiColorEditFlags_PickerHueBar = 1 << 18, + ImGuiColorEditFlags_PickerHueWheel = 1 << 19, + ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX, + ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float, + ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar, + ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar }; enum ImGuiMouseCursor_ { -ImGuiMouseCursor_None = -1, -ImGuiMouseCursor_Arrow = 0, -ImGuiMouseCursor_TextInput, -ImGuiMouseCursor_ResizeAll, -ImGuiMouseCursor_ResizeNS, -ImGuiMouseCursor_ResizeEW, -ImGuiMouseCursor_ResizeNESW, -ImGuiMouseCursor_ResizeNWSE, -ImGuiMouseCursor_COUNT -, ImGuiMouseCursor_Count_ = ImGuiMouseCursor_COUNT + ImGuiMouseCursor_None = -1, + ImGuiMouseCursor_Arrow = 0, + ImGuiMouseCursor_TextInput, + ImGuiMouseCursor_ResizeAll, + ImGuiMouseCursor_ResizeNS, + ImGuiMouseCursor_ResizeEW, + ImGuiMouseCursor_ResizeNESW, + ImGuiMouseCursor_ResizeNWSE, + ImGuiMouseCursor_COUNT + , ImGuiMouseCursor_Count_ = ImGuiMouseCursor_COUNT }; enum ImGuiCond_ { -ImGuiCond_Always = 1 << 0, -ImGuiCond_Once = 1 << 1, -ImGuiCond_FirstUseEver = 1 << 2, -ImGuiCond_Appearing = 1 << 3 -, ImGuiSetCond_Always = ImGuiCond_Always, ImGuiSetCond_Once = ImGuiCond_Once, ImGuiSetCond_FirstUseEver = ImGuiCond_FirstUseEver, ImGuiSetCond_Appearing = ImGuiCond_Appearing + ImGuiCond_Always = 1 << 0, + ImGuiCond_Once = 1 << 1, + ImGuiCond_FirstUseEver = 1 << 2, + ImGuiCond_Appearing = 1 << 3 + , ImGuiSetCond_Always = ImGuiCond_Always, ImGuiSetCond_Once = ImGuiCond_Once, ImGuiSetCond_FirstUseEver = ImGuiCond_FirstUseEver, ImGuiSetCond_Appearing = ImGuiCond_Appearing }; struct ImGuiStyle { @@ -599,20 +600,20 @@ struct ImDrawChannel typedef struct ImDrawChannel ImDrawChannel; enum ImDrawCornerFlags_ { -ImDrawCornerFlags_TopLeft = 1 << 0, -ImDrawCornerFlags_TopRight = 1 << 1, -ImDrawCornerFlags_BotLeft = 1 << 2, -ImDrawCornerFlags_BotRight = 1 << 3, -ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight, -ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight, -ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft, -ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight, -ImDrawCornerFlags_All = 0xF + ImDrawCornerFlags_TopLeft = 1 << 0, + ImDrawCornerFlags_TopRight = 1 << 1, + ImDrawCornerFlags_BotLeft = 1 << 2, + ImDrawCornerFlags_BotRight = 1 << 3, + ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight, + ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight, + ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft, + ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight, + ImDrawCornerFlags_All = 0xF }; enum ImDrawListFlags_ { -ImDrawListFlags_AntiAliasedLines = 1 << 0, -ImDrawListFlags_AntiAliasedFill = 1 << 1 + ImDrawListFlags_AntiAliasedLines = 1 << 0, + ImDrawListFlags_AntiAliasedFill = 1 << 1 }; struct ImDrawList { @@ -672,8 +673,8 @@ struct ImFontGlyph typedef struct ImFontGlyph ImFontGlyph; enum ImFontAtlasFlags_ { -ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0, -ImFontAtlasFlags_NoMouseCursors = 1 << 1 + ImFontAtlasFlags_NoPowerOfTwoHeight = 1 << 0, + ImFontAtlasFlags_NoMouseCursors = 1 << 1 }; struct ImFontAtlas { @@ -712,35 +713,35 @@ struct ImFont int MetricsTotalSurface; }; typedef struct ImFont ImFont; -struct GlyphRangesBuilder -{ - ImVector/**/ UsedChars; -}; + struct GlyphRangesBuilder + { + ImVector/**/ UsedChars; + }; typedef struct GlyphRangesBuilder GlyphRangesBuilder; -struct CustomRect -{ - unsigned int ID; - unsigned short Width, Height; - unsigned short X, Y; - float GlyphAdvanceX; - ImVec2 GlyphOffset; - ImFont* Font; -}; + struct CustomRect + { + unsigned int ID; + unsigned short Width, Height; + unsigned short X, Y; + float GlyphAdvanceX; + ImVec2 GlyphOffset; + ImFont* Font; + }; typedef struct CustomRect CustomRect; -struct TextRange -{ - const char* b; - const char* e; -}; + struct TextRange + { + const char* b; + const char* e; + }; typedef struct TextRange TextRange; -struct Pair -{ - ImGuiID key; -union { int val_i; float val_f; void* val_p; }; -}; + struct Pair + { + ImGuiID key; + union { int val_i; float val_f; void* val_p; }; + }; typedef struct Pair Pair; #endif //IMGUI_STRUCTS_INCLUDED