Compare commits

...

15 Commits

Author SHA1 Message Date
Victor Bombi
41b397020a readme update 2021-02-11 14:50:09 +01:00
Victor Bombi
c1890d4c00 pull imgui docking 1.81 2021-02-11 10:32:01 +01:00
Victor Bombi
7756c4f53f pull imgui docking 1.81 and generate 2021-02-11 10:31:31 +01:00
Victor Bombi
2638737f2c cpp2ffi: parse_enum_value drop outer () (ImGuizmo needed it) 2021-02-05 18:04:22 +01:00
Victor Bombi
6aa3f1decd cpp2ffi: const char* versions of ImStr take now a postfix _Strv 2021-02-05 16:06:10 +01:00
Victor Bombi
bc708a092d cpp2ffi: char* -> Str, ImStr -> STR for backward compability 2021-02-05 16:06:10 +01:00
Victor Bombi
9ac7cd93e1 test, backend_test adapt to new naming 2021-02-05 16:06:10 +01:00
Victor Bombi
2838c0317a cpp2ffi: changes for name prefixing the const char* versions of ImStr 2021-02-05 16:06:09 +01:00
Victor Bombi
c57efd953f cpp2ffi: dont expect const ImStr 2021-02-05 16:06:09 +01:00
Victor Bombi
a48009b062 test and backend_test modifications for IMGUI_HAS_IMSTR 2021-02-05 16:06:09 +01:00
Victor Bombi
383ebf3a7a cpp2ffi: ADDiMSTR_S before overload naming and copy defaults, overload_Algo improvement 2021-02-05 16:06:09 +01:00
Victor Bombi
afdbb6b799 test and backend_test prepared for IMGUI_HAS_IMSTR 2021-02-05 16:06:09 +01:00
Victor Bombi
a64de2e303 cpp2ffi: add ADDIMSTR_S function for making const char* versions of ImStr arguments 2021-02-05 16:06:09 +01:00
Victor Bombi
a9928295db generator: keep IMGUI_HAS_IMSTR definition 2021-02-05 16:06:09 +01:00
Victor Bombi
ce239ed53f cpp2ffi: overload naming char* -> Chpt (was Str) avoids clash with ImStr - > Str 2021-02-05 16:06:09 +01:00
18 changed files with 4033 additions and 3460 deletions

View File

@@ -11,7 +11,7 @@ History:
Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
Notes:
* currently this wrapper is based on version [1.80 of Dear ImGui with internal api]
* currently this wrapper is based on version [1.81 of Dear ImGui with internal api]
* only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
* if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
* All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.

View File

@@ -11,7 +11,13 @@
#include <GL/gl.h>
#include <GL/glu.h>
#ifdef IMGUI_HAS_IMSTR
#define igBegin SigBegin
#define igSliderFloat SigSliderFloat
#define igCheckbox SigCheckbox
#define igColorEdit3 SigColorEdit3
#define igButton SigButton
#endif
SDL_Window *window = NULL;

View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.80" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.81" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
//docking branch
@@ -164,10 +164,6 @@ CIMGUI_API float igGetWindowDpiScale()
{
return ImGui::GetWindowDpiScale();
}
CIMGUI_API ImGuiViewport* igGetWindowViewport()
{
return ImGui::GetWindowViewport();
}
CIMGUI_API void igGetWindowPos(ImVec2 *pOut)
{
*pOut = ImGui::GetWindowPos();
@@ -184,6 +180,10 @@ CIMGUI_API float igGetWindowHeight()
{
return ImGui::GetWindowHeight();
}
CIMGUI_API ImGuiViewport* igGetWindowViewport()
{
return ImGui::GetWindowViewport();
}
CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
{
return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -954,6 +954,14 @@ CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSele
{
return ImGui::Selectable(label,p_selected,flags,size);
}
CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size)
{
return ImGui::BeginListBox(label,size);
}
CIMGUI_API void igEndListBox()
{
return ImGui::EndListBox();
}
CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items)
{
return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
@@ -962,18 +970,6 @@ CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*ite
{
return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
}
CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size)
{
return ImGui::ListBoxHeader(label,size);
}
CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items)
{
return ImGui::ListBoxHeader(label,items_count,height_in_items);
}
CIMGUI_API void igListBoxFooter()
{
return ImGui::ListBoxFooter();
}
CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride)
{
return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
@@ -1221,7 +1217,7 @@ CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flag
{
return ImGui::DockSpace(id,size,flags,window_class);
}
CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
{
return ImGui::DockSpaceOverViewport(viewport,flags,window_class);
}
@@ -1373,6 +1369,10 @@ CIMGUI_API void igSetItemAllowOverlap()
{
return ImGui::SetItemAllowOverlap();
}
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
}
CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size)
{
return ImGui::IsRectVisible(size);
@@ -1581,10 +1581,6 @@ CIMGUI_API ImGuiPlatformIO* igGetPlatformIO()
{
return &ImGui::GetPlatformIO();
}
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
}
CIMGUI_API void igUpdatePlatformWindows()
{
return ImGui::UpdatePlatformWindows();
@@ -2493,6 +2489,22 @@ CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsi
{
return self->IsGlyphRangeUnused(c_begin,c_last);
}
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
{
return IM_NEW(ImGuiViewport)();
}
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetCenter();
}
CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkCenter();
}
CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void)
{
return IM_NEW(ImGuiPlatformIO)();
@@ -2509,26 +2521,6 @@ CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
{
return IM_NEW(ImGuiViewport)();
}
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self)
{
IM_DELETE(self);
}
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetCenter();
}
CIMGUI_API void ImGuiViewport_GetWorkPos(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkPos();
}
CIMGUI_API void ImGuiViewport_GetWorkSize(ImVec2 *pOut,ImGuiViewport* self)
{
*pOut = self->GetWorkSize();
}
CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
{
return ImHashData(data,data_size,seed);
@@ -3021,6 +3013,10 @@ CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
{
return self->GetDrawListCount();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{
return self->FlattenIntoSingleLayer();
@@ -3257,6 +3253,10 @@ CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self)
{
*pOut = self->GetWorkRect();
}
CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self)
{
return self->UpdateWorkRect();
}
CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
{
return self->ClearRequestFlags();
@@ -3573,10 +3573,14 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
{
return ImGui::UpdateMouseMovingWindowEndFrame();
}
CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
{
return ImGui::AddContextHook(context,hook);
}
CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove)
{
return ImGui::RemoveContextHook(context,hook_to_remove);
}
CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type)
{
return ImGui::CallContextHooks(context,type);
@@ -3773,6 +3777,14 @@ CIMGUI_API void igLogToBuffer(int auto_open_depth)
{
return ImGui::LogToBuffer(auto_open_depth);
}
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
{
return ImGui::LogRenderedText(ref_pos,text,text_end);
}
CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix)
{
return ImGui::LogSetNextTextDecoration(prefix,suffix);
}
CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags)
{
return ImGui::BeginChildEx(name,id,size_arg,border,flags);
@@ -4105,6 +4117,10 @@ CIMGUI_API void igTableOpenContextMenu(int column_n)
{
return ImGui::TableOpenContextMenu(column_n);
}
CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled)
{
return ImGui::TableSetColumnEnabled(column_n,enabled);
}
CIMGUI_API void igTableSetColumnWidth(int column_n,float width)
{
return ImGui::TableSetColumnWidth(column_n,width);
@@ -4361,10 +4377,6 @@ CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_e
{
return ImGui::FindRenderedTextEnd(text,text_end);
}
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
{
return ImGui::LogRenderedText(ref_pos,text,text_end);
}
CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale)
{
return ImGui::RenderArrow(draw_list,pos,col,dir,scale);
@@ -4621,9 +4633,13 @@ CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
{
return ImGui::DebugNodeViewport(viewport);
}
CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
{
return ImFontAtlasBuildWithStbTruetype(atlas);
return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
}
CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype()
{
return ImFontAtlasGetBuilderForStbTruetype();
}
CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas)
{
@@ -4641,9 +4657,13 @@ CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas)
{
return ImFontAtlasBuildFinish(atlas);
}
CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
{
return ImFontAtlasBuildRender1bppRectFromString(atlas,atlas_x,atlas_y,w,h,in_str,in_marker_char,in_marker_pixel_value);
return ImFontAtlasBuildRender8bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
}
CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value)
{
return ImFontAtlasBuildRender32bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
}
CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor)
{

131
cimgui.h
View File

@@ -1,5 +1,5 @@
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
//based on imgui.h file version "1.80" from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.81" from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
//docking branch
#ifndef CIMGUI_INCLUDED
@@ -116,6 +116,7 @@ typedef struct ImColor ImColor;
typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder;
typedef struct ImFontGlyph ImFontGlyph;
typedef struct ImFontConfig ImFontConfig;
typedef struct ImFontBuilderIO ImFontBuilderIO;
typedef struct ImFontAtlas ImFontAtlas;
typedef struct ImFont ImFont;
typedef struct ImDrawVert ImDrawVert;
@@ -135,6 +136,7 @@ struct ImDrawListSplitter;
struct ImDrawVert;
struct ImFont;
struct ImFontAtlas;
struct ImFontBuilderIO;
struct ImFontConfig;
struct ImFontGlyph;
struct ImFontGlyphRangesBuilder;
@@ -1146,10 +1148,10 @@ struct ImDrawList
struct ImDrawData
{
bool Valid;
ImDrawList** CmdLists;
int CmdListsCount;
int TotalIdxCount;
int TotalVtxCount;
ImDrawList** CmdLists;
ImVec2 DisplayPos;
ImVec2 DisplaySize;
ImVec2 FramebufferScale;
@@ -1171,7 +1173,7 @@ struct ImFontConfig
float GlyphMinAdvanceX;
float GlyphMaxAdvanceX;
bool MergeMode;
unsigned int RasterizerFlags;
unsigned int FontBuilderFlags;
float RasterizerMultiply;
ImWchar EllipsisChar;
char Name[40];
@@ -1179,8 +1181,9 @@ struct ImFontConfig
};
struct ImFontGlyph
{
unsigned int Codepoint : 31;
unsigned int Colored : 1;
unsigned int Visible : 1;
unsigned int Codepoint : 30;
float AdvanceX;
float X0, Y0, X1, Y1;
float U0, V0, U1, V1;
@@ -1221,6 +1224,8 @@ struct ImFontAtlas
ImVector_ImFontAtlasCustomRect CustomRects;
ImVector_ImFontConfig ConfigData;
ImVec4 TexUvLines[(63) + 1];
const ImFontBuilderIO* FontBuilderIO;
unsigned int FontBuilderFlags;
int PackIdMouseCursors;
int PackIdLines;
};
@@ -1243,6 +1248,41 @@ struct ImFont
int MetricsTotalSurface;
ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
};
typedef enum {
ImGuiViewportFlags_None = 0,
ImGuiViewportFlags_IsPlatformWindow = 1 << 0,
ImGuiViewportFlags_IsPlatformMonitor = 1 << 1,
ImGuiViewportFlags_OwnedByApp = 1 << 2,
ImGuiViewportFlags_NoDecoration = 1 << 3,
ImGuiViewportFlags_NoTaskBarIcon = 1 << 4,
ImGuiViewportFlags_NoFocusOnAppearing = 1 << 5,
ImGuiViewportFlags_NoFocusOnClick = 1 << 6,
ImGuiViewportFlags_NoInputs = 1 << 7,
ImGuiViewportFlags_NoRendererClear = 1 << 8,
ImGuiViewportFlags_TopMost = 1 << 9,
ImGuiViewportFlags_Minimized = 1 << 10,
ImGuiViewportFlags_NoAutoMerge = 1 << 11,
ImGuiViewportFlags_CanHostOtherWindows = 1 << 12
}ImGuiViewportFlags_;
struct ImGuiViewport
{
ImGuiID ID;
ImGuiViewportFlags Flags;
ImVec2 Pos;
ImVec2 Size;
ImVec2 WorkPos;
ImVec2 WorkSize;
float DpiScale;
ImGuiID ParentViewportId;
ImDrawData* DrawData;
void* RendererUserData;
void* PlatformUserData;
void* PlatformHandle;
void* PlatformHandleRaw;
bool PlatformRequestMove;
bool PlatformRequestResize;
bool PlatformRequestClose;
};
struct ImGuiPlatformIO
{
void (*Platform_CreateWindow)(ImGuiViewport* vp);
@@ -1270,7 +1310,6 @@ struct ImGuiPlatformIO
void (*Renderer_RenderWindow)(ImGuiViewport* vp, void* render_arg);
void (*Renderer_SwapBuffers)(ImGuiViewport* vp, void* render_arg);
ImVector_ImGuiPlatformMonitor Monitors;
ImGuiViewport* MainViewport;
ImVector_ImGuiViewportPtr Viewports;
};
struct ImGuiPlatformMonitor
@@ -1279,38 +1318,6 @@ struct ImGuiPlatformMonitor
ImVec2 WorkPos, WorkSize;
float DpiScale;
};
typedef enum {
ImGuiViewportFlags_None = 0,
ImGuiViewportFlags_NoDecoration = 1 << 0,
ImGuiViewportFlags_NoTaskBarIcon = 1 << 1,
ImGuiViewportFlags_NoFocusOnAppearing = 1 << 2,
ImGuiViewportFlags_NoFocusOnClick = 1 << 3,
ImGuiViewportFlags_NoInputs = 1 << 4,
ImGuiViewportFlags_NoRendererClear = 1 << 5,
ImGuiViewportFlags_TopMost = 1 << 6,
ImGuiViewportFlags_Minimized = 1 << 7,
ImGuiViewportFlags_NoAutoMerge = 1 << 8,
ImGuiViewportFlags_CanHostOtherWindows = 1 << 9
}ImGuiViewportFlags_;
struct ImGuiViewport
{
ImGuiID ID;
ImGuiViewportFlags Flags;
ImVec2 Pos;
ImVec2 Size;
ImVec2 WorkOffsetMin;
ImVec2 WorkOffsetMax;
float DpiScale;
ImDrawData* DrawData;
ImGuiID ParentViewportId;
void* RendererUserData;
void* PlatformUserData;
void* PlatformHandle;
void* PlatformHandleRaw;
bool PlatformRequestMove;
bool PlatformRequestResize;
bool PlatformRequestClose;
};
struct StbUndoRecord
{
int where;
@@ -1800,7 +1807,6 @@ struct ImGuiViewportP
ImGuiViewport _ImGuiViewport;
int Idx;
int LastFrameActive;
int LastFrameDrawLists[2];
int LastFrontMostStampCount;
ImGuiID LastNameHash;
ImVec2 LastPos;
@@ -1809,12 +1815,15 @@ struct ImGuiViewportP
short PlatformMonitor;
bool PlatformWindowCreated;
ImGuiWindow* Window;
int DrawListsLastFrame[2];
ImDrawList* DrawLists[2];
ImDrawData DrawDataP;
ImDrawDataBuilder DrawDataBuilder;
ImVec2 LastPlatformPos;
ImVec2 LastPlatformSize;
ImVec2 LastRendererSize;
ImVec2 WorkOffsetMin;
ImVec2 WorkOffsetMax;
ImVec2 CurrWorkOffsetMin;
ImVec2 CurrWorkOffsetMax;
};
@@ -1864,9 +1873,10 @@ struct ImGuiStackSizes
short SizeOfGroupStack;
short SizeOfBeginPopupStack;
};
typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown }ImGuiContextHookType;
typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ }ImGuiContextHookType;
struct ImGuiContextHook
{
ImGuiID HookId;
ImGuiContextHookType Type;
ImGuiID Owner;
ImGuiContextHookCallback Callback;
@@ -1958,6 +1968,7 @@ struct ImGuiContext
ImGuiViewportP* CurrentViewport;
ImGuiViewportP* MouseViewport;
ImGuiViewportP* MouseLastHoveredViewport;
ImGuiID PlatformLastFocusedViewportId;
int ViewportFrontMostStampCount;
ImGuiWindow* NavWindow;
ImGuiID NavId;
@@ -2068,10 +2079,13 @@ struct ImGuiContext
ImChunkStream_ImGuiWindowSettings SettingsWindows;
ImChunkStream_ImGuiTableSettings SettingsTables;
ImVector_ImGuiContextHook Hooks;
ImGuiID HookIdNext;
bool LogEnabled;
ImGuiLogType LogType;
ImFileHandle LogFile;
ImGuiTextBuffer LogBuffer;
const char* LogNextPrefix;
const char* LogNextSuffix;
float LogLinePosY;
bool LogLineFirstItem;
int LogDepthRef;
@@ -2482,6 +2496,10 @@ struct ImGuiTableSettings
ImGuiTableColumnIdx ColumnsCountMax;
bool WantApply;
};
struct ImFontBuilderIO
{
bool (*FontBuilder_Build)(ImFontAtlas* atlas);
};
#define IMGUI_HAS_DOCK 1
#else
@@ -2583,11 +2601,11 @@ CIMGUI_API bool igIsWindowFocused(ImGuiFocusedFlags flags);
CIMGUI_API bool igIsWindowHovered(ImGuiHoveredFlags flags);
CIMGUI_API ImDrawList* igGetWindowDrawList(void);
CIMGUI_API float igGetWindowDpiScale(void);
CIMGUI_API ImGuiViewport* igGetWindowViewport(void);
CIMGUI_API void igGetWindowPos(ImVec2 *pOut);
CIMGUI_API void igGetWindowSize(ImVec2 *pOut);
CIMGUI_API float igGetWindowWidth(void);
CIMGUI_API float igGetWindowHeight(void);
CIMGUI_API ImGuiViewport* igGetWindowViewport(void);
CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond);
CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data);
@@ -2772,11 +2790,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_visible,ImGu
CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond);
CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size);
CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size);
CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size);
CIMGUI_API void igEndListBox(void);
CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items);
CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items);
CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size);
CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items);
CIMGUI_API void igListBoxFooter(void);
CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size);
CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
@@ -2838,7 +2855,7 @@ CIMGUI_API void igEndTabItem(void);
CIMGUI_API bool igTabItemButton(const char* label,ImGuiTabItemFlags flags);
CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
CIMGUI_API void igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond);
CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class);
CIMGUI_API ImGuiID igGetWindowDockID(void);
@@ -2876,6 +2893,7 @@ CIMGUI_API void igGetItemRectMin(ImVec2 *pOut);
CIMGUI_API void igGetItemRectMax(ImVec2 *pOut);
CIMGUI_API void igGetItemRectSize(ImVec2 *pOut);
CIMGUI_API void igSetItemAllowOverlap(void);
CIMGUI_API ImGuiViewport* igGetMainViewport(void);
CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size);
CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max);
CIMGUI_API double igGetTime(void);
@@ -2928,7 +2946,6 @@ CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_
CIMGUI_API void* igMemAlloc(size_t size);
CIMGUI_API void igMemFree(void* ptr);
CIMGUI_API ImGuiPlatformIO* igGetPlatformIO(void);
CIMGUI_API ImGuiViewport* igGetMainViewport(void);
CIMGUI_API void igUpdatePlatformWindows(void);
CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg);
CIMGUI_API void igDestroyPlatformWindows(void);
@@ -3156,15 +3173,14 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
CIMGUI_API void ImFont_SetGlyphVisible(ImFont* self,ImWchar c,bool visible);
CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsigned int c_last);
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void);
CIMGUI_API void ImGuiPlatformIO_destroy(ImGuiPlatformIO* self);
CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void);
CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self);
CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkPos(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API void ImGuiViewport_GetWorkSize(ImVec2 *pOut,ImGuiViewport* self);
CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed);
CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed);
CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b);
@@ -3287,6 +3303,7 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error);
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self);
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v);
CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self);
@@ -3346,6 +3363,7 @@ CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void);
CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self);
CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self);
CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
@@ -3425,7 +3443,8 @@ CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock_floating_node);
CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove);
CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type);
CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2 old_pos,const ImVec2 new_pos);
CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale);
@@ -3475,6 +3494,8 @@ CIMGUI_API void igGetContentRegionMaxAbs(ImVec2 *pOut);
CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess);
CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
CIMGUI_API void igLogToBuffer(int auto_open_depth);
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix);
CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags);
CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup);
@@ -3558,6 +3579,7 @@ CIMGUI_API ImGuiOldColumns* igFindOrCreateColumns(ImGuiWindow* window,ImGuiID id
CIMGUI_API float igGetColumnOffsetFromNorm(const ImGuiOldColumns* columns,float offset_norm);
CIMGUI_API float igGetColumnNormFromOffset(const ImGuiOldColumns* columns,float offset);
CIMGUI_API void igTableOpenContextMenu(int column_n);
CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled);
CIMGUI_API void igTableSetColumnWidth(int column_n,float width);
CIMGUI_API void igTableSetColumnSortDirection(int column_n,ImGuiSortDirection sort_direction,bool append_to_sort_specs);
CIMGUI_API int igTableGetHoveredColumn(void);
@@ -3622,7 +3644,6 @@ CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding);
CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags);
CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);
CIMGUI_API void igRenderBullet(ImDrawList* draw_list,ImVec2 pos,ImU32 col);
CIMGUI_API void igRenderCheckMark(ImDrawList* draw_list,ImVec2 pos,ImU32 col,float sz);
@@ -3687,12 +3708,14 @@ CIMGUI_API void igDebugNodeWindow(ImGuiWindow* window,const char* label);
CIMGUI_API void igDebugNodeWindowSettings(ImGuiWindowSettings* settings);
CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const char* label);
CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport);
CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas);
CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb);
CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype(void);
CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas);
CIMGUI_API void igImFontAtlasBuildSetupFont(ImFontAtlas* atlas,ImFont* font,ImFontConfig* font_config,float ascent,float descent);
CIMGUI_API void igImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas,void* stbrp_context_opaque);
CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas);
CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value);
CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value);
CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value);
CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor);
CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256],unsigned char* pixels,int x,int y,int w,int h,int stride);

View File

@@ -165,8 +165,11 @@ local function parse_enum_value(value, allenums,dontpost)
--already in allenums
if allenums[clean(value)] then return allenums[clean(value)] end
--must be several and operators
--precedence order (hope not ())
assert(not value:match("[%(%)]"))
------------precedence order (hope not ())
--first drop outer ()
value = value:gsub("^(%()",""):gsub("(%))$","")
assert(not value:match("[%(%)]"),value)
local several,seps = strsplit(value,"([<>&|~%+]+)")
--M.prtable(value,several,seps)
assert(#seps+1==#several)
@@ -182,6 +185,9 @@ local function parse_enum_value(value, allenums,dontpost)
local val2 = clean(several[i+1])
if allenums[val1] then val1 = allenums[val1] end
if allenums[val2] then val2 = allenums[val2] end
--clean 1u
if type(val1)=="string" then val1 = val1:gsub("(%d)(u)$","%1") end
if type(val2)=="string" then val2 = val2:gsub("(%d)(u)$","%1") end
--for getting numbers from "1ULL"
if type(val1)=="string" then val1 = loadstring("return "..val1)() end
if type(val2)=="string" then val2 = loadstring("return "..val2)() end
@@ -414,14 +420,13 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
end
M.parseItems = parseItems
local function name_overloadsAlgo(v)
local aa = {}
local bb = {}
local done = {}
local maxnum = 0
for i,t in ipairs(v) do
bb[i] = ""
--local signature = t.signature:sub(2,-2) -- without parenthesis
--inside parenthesis
local signature = t.signature:match("%b()")
signature = signature:sub(2,-2)
--add const function
@@ -430,47 +435,52 @@ local function name_overloadsAlgo(v)
end
aa[i] = {}
local num = 1
--for typec in t.signature:gmatch(".-([^,%(%s]+)[,%)]") do
--for typec in t.signature:gmatch(".-([^,%(]+)[,%)]") do
--for typec in signature:gmatch(".-([^,]+),?") do
for typec in signature:gsub("(%(.-%))", function(x) return x:gsub(",","\0") end):gmatch(".-([^,]+),?") do
--typec = typec:gsub
aa[i][num] = typec:gsub("%z+", ",")
num = num + 1
end
num = num - 1
maxnum = (num > maxnum) and num or maxnum
end
for l=1,maxnum do
local keys = {}
local diferent = true
local equal = true
for i=1,#v do
aa[i][l] = aa[i][l] or "nil"
keys[aa[i][l]] = 1 + (aa[i][l] and keys[aa[i][l]] or 0)
keys[aa[i][l]] = 1 + (keys[aa[i][l]] or 0)
if not done[i] then
for j=i+1,#v do
if not done[j] then
if aa[i][l] == aa[j][l] then
diferent = false
else
equal = false
for j=i+1,#v do
if not done[j] then
if aa[i][l] == aa[j][l] then
diferent = false
else
equal = false
end
end
end
end
end
end
end
if not equal then -- not all the same
for i=1,#v do
if not done[i] then
bb[i] = bb[i]..(aa[i][l]=="nil" and "" or aa[i][l])
if keys[aa[i][l]] == 1 then
done[i] = true
end
-- if keys[aa[i][l]] == 1 then
-- done[i] = true
-- end
end
end
end
--test done
for i=1,#v do
done[i] = true
for j=1,#v do
if i~=j and bb[i]==bb[j] then
done[i] = false
end
end
end
end
--avoid empty postfix which will be reserved to generic
for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end
@@ -493,6 +503,7 @@ local function typetoStr(typ)
typ = typ:gsub("float","Float")
typ = typ:gsub("uInt","Uint")
typ = typ:gsub("ImGui","")
typ = typ:gsub("ImStr","STR")
typ = typ:gsub("Im","")
typ = typ:gsub("[<>]","")
return typ
@@ -769,6 +780,84 @@ local function AdjustArguments(FP)
end
end
end
local function ADDIMSTR_S(FP)
local defsT = FP.defsT
local newcdefs = {}
for numcdef,t in ipairs(FP.funcdefs) do
newcdefs[#newcdefs+1] = t
if t.cimguiname then
local cimf = defsT[t.cimguiname]
local defT = cimf[t.signature]
--if isIMSTR return generate _S version
local isIMSTR = false
for i,arg in ipairs(defT.argsT) do
if arg.type == "ImStr" then isIMSTR=true;break end
end
--if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
--if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end
if isIMSTR then
--passing as a pointer arg
local defT2 = {}
--first strings
for k,v in pairs(defT) do
defT2[k] = v
end
--then argsT table
defT2.argsT = {}
for k,v in ipairs(defT.argsT) do
local typ = v.type == "ImStr" and "const char*" or v.type
table.insert(defT2.argsT,{type=typ,name=v.name})
end
--defaults table
defT2.defaults = {}
for k,v in pairs(defT.defaults) do
defT2.defaults[k] = v
end
defT2.args = defT2.args:gsub("ImStr","const char*")
--recreate call_args for wrapping into ImStr
local caar
if #defT.argsT > 0 then
caar = "("
for i,v in ipairs(defT.argsT) do
local name = v.name --v.type == "ImStr" and "ImStr("..v.name..")" or v.name --wrap
if v.ret then --function pointer
caar = caar .. name .. ","
else
local callname = v.reftoptr and "*"..name or name
caar = caar .. callname .. ","
end
end
caar = caar:sub(1,-2)..")"
else
caar = "()"
end
defT2.call_args = caar --:gsub("ImStr%(([^%(%)]+)%)","%1") --unwrap
------------------
defT2.signature = defT.signature:gsub("ImStr","const char*") --.."_S"
defT2.ov_cimguiname = defT2.ov_cimguiname .. "_Strv"
defT2.isIMSTR_S = 1
-- check there is not an equal version in imgui_stname
local doadd = true
for i,dd in ipairs(cimf) do
if dd.signature == defT2.signature then
doadd = false;
print("skip _S addition",defT2.cimguiname)
break
end
end
--add _S version
if doadd then
cimf[#cimf+1] = defT2
cimf[defT2.signature] = defT2
newcdefs[#newcdefs+1] = {stname=t.stname,funcname=t.funcname,args=defT2.args,signature=defT2.signature,cimguiname=defT2.cimguiname,ret =defT2.ret}
end
end
else print("not cimguiname in");M.prtable(t)
end
end
FP.funcdefs = newcdefs
end
local function ADDnonUDT(FP)
local defsT = FP.defsT
--local newcdefs = {}
@@ -1491,6 +1580,7 @@ function M.Parser()
for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end
end
function par:compute_overloads()
--ADDIMSTR_S(self)
local strt = {}
local numoverloaded = 0
self.alltypes = {}
@@ -1506,8 +1596,15 @@ function M.Parser()
for i,t in ipairs(v) do
--take overloaded name from manual table or algorythm
t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i])
--check ...
if( t.ov_cimguiname:match"%.%.%.") then
print("... in ov",t.ov_cimguiname)
for i,dd in ipairs(v) do
print(dd.signature,post[i])
end
error"Bad check ..."
end
table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature))
--M.prtable(typesc[i],post)
end
--check not two names are equal (produced by bad cimguiname_overload)
for i=1,#v-1 do
@@ -1525,8 +1622,10 @@ function M.Parser()
end)
--print(numoverloaded, "overloaded")
table.insert(strt,string.format("%d overloaded",numoverloaded))
ADDIMSTR_S(self)
AdjustArguments(self)
ADDnonUDT(self)
--ADDdestructors(self)
self.overloadstxt = table.concat(strt,"\n")
end

View File

@@ -313,6 +313,9 @@ local function cimgui_generation(parser)
if gdefines.IMGUI_HAS_DOCK then
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK 1\n"
end
if gdefines.IMGUI_HAS_IMSTR then
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR 1\n"
end
hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
local cfuncsstr = func_header_generate(parser)
@@ -333,13 +336,13 @@ end
--------------------------------------------------------
--get imgui.h version and IMGUI_HAS_DOCK--------------------------
--get some defines wont work for cl ----------------
gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK"}
gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
--this will work for cl
local pipe,err = io.open("../imgui/imgui.h","r")
if not pipe then
error("could not open file:"..err)
end
local imgui_version,has_dock
local imgui_version,has_dock,has_imstr
while true do
local line = pipe:read"*l"
if not line then break end
@@ -349,11 +352,15 @@ while true do
if not has_dock then
has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]])
end
if imgui_version and has_dock then break end
if not has_imstr then
has_imstr = line:match([[#define%s+IMGUI_HAS_IMSTR]])--%s*(".+")]])
end
if imgui_version and has_dock and has_imstr then break end
end
pipe:close()
if has_dock then gdefines.IMGUI_HAS_DOCK = true end
if has_imstr then gdefines.IMGUI_HAS_IMSTR = true end
cimgui_header = cimgui_header:gsub("XXX",imgui_version)
if INTERNAL_GENERATION then
@@ -369,6 +376,7 @@ if gdefines.IMGUI_HAS_DOCK then
]]
end
print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
print("IMGUI_VERSION",imgui_version)

View File

@@ -8,6 +8,7 @@ struct GLFWmonitor;
struct SDL_Window;
typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
CIMGUI_API void ImGui_ImplGlfw_Shutdown();
CIMGUI_API void ImGui_ImplGlfw_NewFrame();
CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -17,7 +17,7 @@
"cimguiname": "ImGui_ImplGlfw_CharCallback",
"defaults": {},
"funcname": "ImGui_ImplGlfw_CharCallback",
"location": "imgui_impl_glfw:40",
"location": "imgui_impl_glfw:41",
"ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
"ret": "void",
"signature": "(GLFWwindow*,unsigned int)",
@@ -49,6 +49,31 @@
"stname": ""
}
],
"ImGui_ImplGlfw_InitForOther": [
{
"args": "(GLFWwindow* window,bool install_callbacks)",
"argsT": [
{
"name": "window",
"type": "GLFWwindow*"
},
{
"name": "install_callbacks",
"type": "bool"
}
],
"argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
"call_args": "(window,install_callbacks)",
"cimguiname": "ImGui_ImplGlfw_InitForOther",
"defaults": {},
"funcname": "ImGui_ImplGlfw_InitForOther",
"location": "imgui_impl_glfw:31",
"ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
"ret": "bool",
"signature": "(GLFWwindow*,bool)",
"stname": ""
}
],
"ImGui_ImplGlfw_InitForVulkan": [
{
"args": "(GLFWwindow* window,bool install_callbacks)",
@@ -104,7 +129,7 @@
"cimguiname": "ImGui_ImplGlfw_KeyCallback",
"defaults": {},
"funcname": "ImGui_ImplGlfw_KeyCallback",
"location": "imgui_impl_glfw:39",
"location": "imgui_impl_glfw:40",
"ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
"ret": "void",
"signature": "(GLFWwindow*,int,int,int,int)",
@@ -129,7 +154,7 @@
"cimguiname": "ImGui_ImplGlfw_MonitorCallback",
"defaults": {},
"funcname": "ImGui_ImplGlfw_MonitorCallback",
"location": "imgui_impl_glfw:41",
"location": "imgui_impl_glfw:42",
"ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
"ret": "void",
"signature": "(GLFWmonitor*,int)",
@@ -162,7 +187,7 @@
"cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
"defaults": {},
"funcname": "ImGui_ImplGlfw_MouseButtonCallback",
"location": "imgui_impl_glfw:37",
"location": "imgui_impl_glfw:38",
"ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
"ret": "void",
"signature": "(GLFWwindow*,int,int,int)",
@@ -178,7 +203,7 @@
"cimguiname": "ImGui_ImplGlfw_NewFrame",
"defaults": {},
"funcname": "ImGui_ImplGlfw_NewFrame",
"location": "imgui_impl_glfw:32",
"location": "imgui_impl_glfw:33",
"ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
"ret": "void",
"signature": "()",
@@ -207,7 +232,7 @@
"cimguiname": "ImGui_ImplGlfw_ScrollCallback",
"defaults": {},
"funcname": "ImGui_ImplGlfw_ScrollCallback",
"location": "imgui_impl_glfw:38",
"location": "imgui_impl_glfw:39",
"ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
"ret": "void",
"signature": "(GLFWwindow*,double,double)",
@@ -223,7 +248,7 @@
"cimguiname": "ImGui_ImplGlfw_Shutdown",
"defaults": {},
"funcname": "ImGui_ImplGlfw_Shutdown",
"location": "imgui_impl_glfw:31",
"location": "imgui_impl_glfw:32",
"ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
"ret": "void",
"signature": "()",

View File

@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:40"
defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:41"
defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -41,6 +41,27 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
defs["ImGui_ImplGlfw_InitForOpenGL"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOpenGL"][1]
defs["ImGui_ImplGlfw_InitForOther"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["name"] = "window"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["type"] = "GLFWwindow*"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["name"] = "install_callbacks"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["type"] = "bool"
defs["ImGui_ImplGlfw_InitForOther"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks)"
defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:31"
defs["ImGui_ImplGlfw_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOther"
defs["ImGui_ImplGlfw_InitForOther"][1]["ret"] = "bool"
defs["ImGui_ImplGlfw_InitForOther"][1]["signature"] = "(GLFWwindow*,bool)"
defs["ImGui_ImplGlfw_InitForOther"][1]["stname"] = ""
defs["ImGui_ImplGlfw_InitForOther"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOther"][1]
defs["ImGui_ImplGlfw_InitForVulkan"] = {}
defs["ImGui_ImplGlfw_InitForVulkan"][1] = {}
defs["ImGui_ImplGlfw_InitForVulkan"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
@@ -86,7 +107,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:39"
defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:40"
defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -107,7 +128,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:41"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:42"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)"
@@ -134,7 +155,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:37"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:38"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -149,7 +170,7 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:32"
defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:33"
defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -173,7 +194,7 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:38"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:39"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -188,7 +209,7 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:31"
defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:32"
defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"

View File

@@ -164,9 +164,6 @@ igItemSize 2
igListBox 2
1 bool igListBoxStr_arr (const char*,int*,const char* const[],int,int)
2 bool igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
igListBoxHeader 2
1 bool igListBoxHeaderVec2 (const char*,const ImVec2)
2 bool igListBoxHeaderInt (const char*,int,int)
igMarkIniSettingsDirty 2
1 void igMarkIniSettingsDirtyNil ()
2 void igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*)
@@ -248,4 +245,4 @@ igValue 4
2 void igValueInt (const char*,int)
3 void igValueUint (const char*,unsigned int)
4 void igValueFloat (const char*,float,const char*)
175 overloaded
173 overloaded

View File

@@ -889,6 +889,11 @@
"calc_value": 6,
"name": "ImGuiContextHookType_Shutdown",
"value": "6"
},
{
"calc_value": 7,
"name": "ImGuiContextHookType_PendingRemoval_",
"value": "7"
}
],
"ImGuiDataAuthority_": [
@@ -3163,53 +3168,68 @@
},
{
"calc_value": 1,
"name": "ImGuiViewportFlags_NoDecoration",
"name": "ImGuiViewportFlags_IsPlatformWindow",
"value": "1 << 0"
},
{
"calc_value": 2,
"name": "ImGuiViewportFlags_NoTaskBarIcon",
"name": "ImGuiViewportFlags_IsPlatformMonitor",
"value": "1 << 1"
},
{
"calc_value": 4,
"name": "ImGuiViewportFlags_NoFocusOnAppearing",
"name": "ImGuiViewportFlags_OwnedByApp",
"value": "1 << 2"
},
{
"calc_value": 8,
"name": "ImGuiViewportFlags_NoFocusOnClick",
"name": "ImGuiViewportFlags_NoDecoration",
"value": "1 << 3"
},
{
"calc_value": 16,
"name": "ImGuiViewportFlags_NoInputs",
"name": "ImGuiViewportFlags_NoTaskBarIcon",
"value": "1 << 4"
},
{
"calc_value": 32,
"name": "ImGuiViewportFlags_NoRendererClear",
"name": "ImGuiViewportFlags_NoFocusOnAppearing",
"value": "1 << 5"
},
{
"calc_value": 64,
"name": "ImGuiViewportFlags_TopMost",
"name": "ImGuiViewportFlags_NoFocusOnClick",
"value": "1 << 6"
},
{
"calc_value": 128,
"name": "ImGuiViewportFlags_Minimized",
"name": "ImGuiViewportFlags_NoInputs",
"value": "1 << 7"
},
{
"calc_value": 256,
"name": "ImGuiViewportFlags_NoAutoMerge",
"name": "ImGuiViewportFlags_NoRendererClear",
"value": "1 << 8"
},
{
"calc_value": 512,
"name": "ImGuiViewportFlags_CanHostOtherWindows",
"name": "ImGuiViewportFlags_TopMost",
"value": "1 << 9"
},
{
"calc_value": 1024,
"name": "ImGuiViewportFlags_Minimized",
"value": "1 << 10"
},
{
"calc_value": 2048,
"name": "ImGuiViewportFlags_NoAutoMerge",
"value": "1 << 11"
},
{
"calc_value": 4096,
"name": "ImGuiViewportFlags_CanHostOtherWindows",
"value": "1 << 12"
}
],
"ImGuiWindowDockStyleCol": [
@@ -3414,149 +3434,150 @@
},
"enumtypes": [],
"locations": {
"ImBitVector": "imgui_internal:511",
"ImColor": "imgui:2284",
"ImDrawChannel": "imgui:2378",
"ImDrawCmd": "imgui:2333",
"ImDrawCmdHeader": "imgui:2370",
"ImDrawCornerFlags_": "imgui:2402",
"ImDrawData": "imgui:2557",
"ImDrawDataBuilder": "imgui_internal:655",
"ImDrawList": "imgui:2435",
"ImDrawListFlags_": "imgui:2418",
"ImDrawListSharedData": "imgui_internal:636",
"ImDrawListSplitter": "imgui:2387",
"ImDrawVert": "imgui:2355",
"ImFont": "imgui:2769",
"ImFontAtlas": "imgui:2674",
"ImFontAtlasCustomRect": "imgui:2636",
"ImFontAtlasFlags_": "imgui:2649",
"ImFontConfig": "imgui:2581",
"ImFontGlyph": "imgui:2610",
"ImFontGlyphRangesBuilder": "imgui:2621",
"ImGuiAxis": "imgui_internal:792",
"ImGuiBackendFlags_": "imgui:1423",
"ImGuiButtonFlagsPrivate_": "imgui_internal:706",
"ImGuiButtonFlags_": "imgui:1536",
"ImGuiCol_": "imgui:1438",
"ImGuiColorEditFlags_": "imgui:1549",
"ImGuiColorMod": "imgui_internal:899",
"ImGuiComboFlags_": "imgui:1038",
"ImGuiCond_": "imgui:1641",
"ImGuiConfigFlags_": "imgui:1398",
"ImGuiContext": "imgui_internal:1425",
"ImGuiContextHook": "imgui_internal:1411",
"ImGuiContextHookType": "imgui_internal:1409",
"ImGuiDataAuthority_": "imgui_internal:1180",
"ImGuiDataTypeInfo": "imgui_internal:882",
"ImGuiDataTypePrivate_": "imgui_internal:891",
"ImGuiDataTypeTempStorage": "imgui_internal:876",
"ImGuiDataType_": "imgui:1290",
"ImGuiDir_": "imgui:1306",
"ImGuiDockContext": "imgui_internal:1272",
"ImGuiDockNode": "imgui_internal:1196",
"ImGuiDockNodeFlagsPrivate_": "imgui_internal:1156",
"ImGuiDockNodeFlags_": "imgui:1255",
"ImGuiDockNodeState": "imgui_internal:1187",
"ImGuiDragDropFlags_": "imgui:1268",
"ImGuiFocusedFlags_": "imgui:1225",
"ImGuiGroupData": "imgui_internal:916",
"ImGuiHoveredFlags_": "imgui:1237",
"ImGuiIO": "imgui:1801",
"ImGuiInputReadMode": "imgui_internal:816",
"ImGuiInputSource": "imgui_internal:805",
"ImGuiInputTextCallbackData": "imgui:1951",
"ImGuiInputTextFlags_": "imgui:953",
"ImGuiInputTextState": "imgui_internal:945",
"ImGuiItemFlags_": "imgui_internal:670",
"ImGuiItemStatusFlags_": "imgui_internal:685",
"ImGuiKeyModFlags_": "imgui:1353",
"ImGuiKey_": "imgui:1325",
"ImGuiLastItemDataBackup": "imgui_internal:2030",
"ImGuiLayoutType_": "imgui_internal:776",
"ImGuiListClipper": "imgui:2235",
"ImGuiLogType": "imgui_internal:782",
"ImGuiMenuColumns": "imgui_internal:931",
"ImGuiMetricsConfig": "imgui_internal:1365",
"ImGuiMouseButton_": "imgui:1613",
"ImGuiMouseCursor_": "imgui:1623",
"ImGuiNavDirSourceFlags_": "imgui_internal:835",
"ImGuiNavForward": "imgui_internal:855",
"ImGuiNavHighlightFlags_": "imgui_internal:826",
"ImGuiNavInput_": "imgui:1366",
"ImGuiNavLayer": "imgui_internal:862",
"ImGuiNavMoveFlags_": "imgui_internal:843",
"ImGuiNavMoveResult": "imgui_internal:993",
"ImGuiNextItemData": "imgui_internal:1058",
"ImGuiNextItemDataFlags_": "imgui_internal:1051",
"ImGuiNextWindowData": "imgui_internal:1024",
"ImGuiNextWindowDataFlags_": "imgui_internal:1007",
"ImGuiOldColumnData": "imgui_internal:1110",
"ImGuiOldColumnFlags_": "imgui_internal:1090",
"ImGuiOldColumns": "imgui_internal:1120",
"ImGuiOnceUponAFrame": "imgui:2113",
"ImGuiPayload": "imgui:2013",
"ImGuiPlatformIO": "imgui:2870",
"ImGuiPlatformMonitor": "imgui:2935",
"ImGuiPlotType": "imgui_internal:799",
"ImGuiPopupData": "imgui_internal:980",
"ImGuiPopupFlags_": "imgui:1011",
"ImGuiPopupPositionPolicy": "imgui_internal:869",
"ImGuiPtrOrIndex": "imgui_internal:1076",
"ImGuiSelectableFlagsPrivate_": "imgui_internal:736",
"ImGuiSelectableFlags_": "imgui:1027",
"ImGuiSeparatorFlags_": "imgui_internal:754",
"ImGuiSettingsHandler": "imgui_internal:1346",
"ImGuiShrinkWidthItem": "imgui_internal:1070",
"ImGuiSizeCallbackData": "imgui:1982",
"ImGuiSliderFlagsPrivate_": "imgui_internal:729",
"ImGuiSliderFlags_": "imgui:1596",
"ImGuiSortDirection_": "imgui:1317",
"ImGuiStackSizes": "imgui_internal:1389",
"ImGuiStorage": "imgui:2175",
"ImGuiStoragePair": "imgui:2178",
"ImGuiStyle": "imgui:1747",
"ImGuiStyleMod": "imgui_internal:906",
"ImGuiStyleVar_": "imgui:1505",
"ImGuiTabBar": "imgui_internal:2083",
"ImGuiTabBarFlagsPrivate_": "imgui_internal:2047",
"ImGuiTabBarFlags_": "imgui:1052",
"ImGuiTabItem": "imgui_internal:2064",
"ImGuiTabItemFlagsPrivate_": "imgui_internal:2055",
"ImGuiTabItemFlags_": "imgui:1068",
"ImGuiTable": "imgui_internal:2211",
"ImGuiTableBgTarget_": "imgui:1216",
"ImGuiTableCellData": "imgui_internal:2204",
"ImGuiTableColumn": "imgui_internal:2146",
"ImGuiTableColumnFlags_": "imgui:1161",
"ImGuiTableColumnSettings": "imgui_internal:2329",
"ImGuiTableColumnSortSpecs": "imgui:2035",
"ImGuiTableFlags_": "imgui:1104",
"ImGuiTableRowFlags_": "imgui:1201",
"ImGuiTableSettings": "imgui_internal:2353",
"ImGuiTableSortSpecs": "imgui:2049",
"ImGuiTextBuffer": "imgui:2148",
"ImGuiTextFilter": "imgui:2121",
"ImGuiTextFlags_": "imgui_internal:762",
"ImGuiTextRange": "imgui:2131",
"ImGuiTooltipFlags_": "imgui_internal:768",
"ImGuiTreeNodeFlagsPrivate_": "imgui_internal:749",
"ImGuiTreeNodeFlags_": "imgui:982",
"ImGuiViewport": "imgui:2962",
"ImGuiViewportFlags_": "imgui:2944",
"ImGuiViewportP": "imgui_internal:1291",
"ImGuiWindow": "imgui_internal:1896",
"ImGuiWindowClass": "imgui:1997",
"ImGuiWindowDockStyle": "imgui_internal:1267",
"ImGuiWindowDockStyleCol": "imgui_internal:1256",
"ImGuiWindowFlags_": "imgui:910",
"ImGuiWindowSettings": "imgui_internal:1329",
"ImGuiWindowTempData": "imgui_internal:1840",
"ImRect": "imgui_internal:442",
"ImVec1": "imgui_internal:424",
"ImVec2": "imgui:232",
"ImVec2ih": "imgui_internal:432",
"ImVec4": "imgui:245",
"ImBitVector": "imgui_internal:518",
"ImColor": "imgui:2299",
"ImDrawChannel": "imgui:2393",
"ImDrawCmd": "imgui:2348",
"ImDrawCmdHeader": "imgui:2385",
"ImDrawCornerFlags_": "imgui:2417",
"ImDrawData": "imgui:2573",
"ImDrawDataBuilder": "imgui_internal:663",
"ImDrawList": "imgui:2451",
"ImDrawListFlags_": "imgui:2433",
"ImDrawListSharedData": "imgui_internal:644",
"ImDrawListSplitter": "imgui:2402",
"ImDrawVert": "imgui:2370",
"ImFont": "imgui:2789",
"ImFontAtlas": "imgui:2690",
"ImFontAtlasCustomRect": "imgui:2652",
"ImFontAtlasFlags_": "imgui:2665",
"ImFontBuilderIO": "imgui_internal:2799",
"ImFontConfig": "imgui:2596",
"ImFontGlyph": "imgui:2625",
"ImFontGlyphRangesBuilder": "imgui:2637",
"ImGuiAxis": "imgui_internal:801",
"ImGuiBackendFlags_": "imgui:1434",
"ImGuiButtonFlagsPrivate_": "imgui_internal:715",
"ImGuiButtonFlags_": "imgui:1547",
"ImGuiCol_": "imgui:1449",
"ImGuiColorEditFlags_": "imgui:1560",
"ImGuiColorMod": "imgui_internal:908",
"ImGuiComboFlags_": "imgui:1049",
"ImGuiCond_": "imgui:1652",
"ImGuiConfigFlags_": "imgui:1409",
"ImGuiContext": "imgui_internal:1434",
"ImGuiContextHook": "imgui_internal:1419",
"ImGuiContextHookType": "imgui_internal:1417",
"ImGuiDataAuthority_": "imgui_internal:1189",
"ImGuiDataTypeInfo": "imgui_internal:891",
"ImGuiDataTypePrivate_": "imgui_internal:900",
"ImGuiDataTypeTempStorage": "imgui_internal:885",
"ImGuiDataType_": "imgui:1301",
"ImGuiDir_": "imgui:1317",
"ImGuiDockContext": "imgui_internal:1281",
"ImGuiDockNode": "imgui_internal:1205",
"ImGuiDockNodeFlagsPrivate_": "imgui_internal:1165",
"ImGuiDockNodeFlags_": "imgui:1266",
"ImGuiDockNodeState": "imgui_internal:1196",
"ImGuiDragDropFlags_": "imgui:1279",
"ImGuiFocusedFlags_": "imgui:1236",
"ImGuiGroupData": "imgui_internal:925",
"ImGuiHoveredFlags_": "imgui:1248",
"ImGuiIO": "imgui:1812",
"ImGuiInputReadMode": "imgui_internal:825",
"ImGuiInputSource": "imgui_internal:814",
"ImGuiInputTextCallbackData": "imgui:1962",
"ImGuiInputTextFlags_": "imgui:964",
"ImGuiInputTextState": "imgui_internal:954",
"ImGuiItemFlags_": "imgui_internal:679",
"ImGuiItemStatusFlags_": "imgui_internal:694",
"ImGuiKeyModFlags_": "imgui:1364",
"ImGuiKey_": "imgui:1336",
"ImGuiLastItemDataBackup": "imgui_internal:2046",
"ImGuiLayoutType_": "imgui_internal:785",
"ImGuiListClipper": "imgui:2250",
"ImGuiLogType": "imgui_internal:791",
"ImGuiMenuColumns": "imgui_internal:940",
"ImGuiMetricsConfig": "imgui_internal:1373",
"ImGuiMouseButton_": "imgui:1624",
"ImGuiMouseCursor_": "imgui:1634",
"ImGuiNavDirSourceFlags_": "imgui_internal:844",
"ImGuiNavForward": "imgui_internal:864",
"ImGuiNavHighlightFlags_": "imgui_internal:835",
"ImGuiNavInput_": "imgui:1377",
"ImGuiNavLayer": "imgui_internal:871",
"ImGuiNavMoveFlags_": "imgui_internal:852",
"ImGuiNavMoveResult": "imgui_internal:1002",
"ImGuiNextItemData": "imgui_internal:1067",
"ImGuiNextItemDataFlags_": "imgui_internal:1060",
"ImGuiNextWindowData": "imgui_internal:1033",
"ImGuiNextWindowDataFlags_": "imgui_internal:1016",
"ImGuiOldColumnData": "imgui_internal:1119",
"ImGuiOldColumnFlags_": "imgui_internal:1099",
"ImGuiOldColumns": "imgui_internal:1129",
"ImGuiOnceUponAFrame": "imgui:2128",
"ImGuiPayload": "imgui:2024",
"ImGuiPlatformIO": "imgui:2952",
"ImGuiPlatformMonitor": "imgui:3016",
"ImGuiPlotType": "imgui_internal:808",
"ImGuiPopupData": "imgui_internal:989",
"ImGuiPopupFlags_": "imgui:1022",
"ImGuiPopupPositionPolicy": "imgui_internal:878",
"ImGuiPtrOrIndex": "imgui_internal:1085",
"ImGuiSelectableFlagsPrivate_": "imgui_internal:745",
"ImGuiSelectableFlags_": "imgui:1038",
"ImGuiSeparatorFlags_": "imgui_internal:763",
"ImGuiSettingsHandler": "imgui_internal:1354",
"ImGuiShrinkWidthItem": "imgui_internal:1079",
"ImGuiSizeCallbackData": "imgui:1993",
"ImGuiSliderFlagsPrivate_": "imgui_internal:738",
"ImGuiSliderFlags_": "imgui:1607",
"ImGuiSortDirection_": "imgui:1328",
"ImGuiStackSizes": "imgui_internal:1397",
"ImGuiStorage": "imgui:2190",
"ImGuiStoragePair": "imgui:2193",
"ImGuiStyle": "imgui:1758",
"ImGuiStyleMod": "imgui_internal:915",
"ImGuiStyleVar_": "imgui:1516",
"ImGuiTabBar": "imgui_internal:2099",
"ImGuiTabBarFlagsPrivate_": "imgui_internal:2063",
"ImGuiTabBarFlags_": "imgui:1063",
"ImGuiTabItem": "imgui_internal:2080",
"ImGuiTabItemFlagsPrivate_": "imgui_internal:2071",
"ImGuiTabItemFlags_": "imgui:1079",
"ImGuiTable": "imgui_internal:2227",
"ImGuiTableBgTarget_": "imgui:1227",
"ImGuiTableCellData": "imgui_internal:2220",
"ImGuiTableColumn": "imgui_internal:2162",
"ImGuiTableColumnFlags_": "imgui:1172",
"ImGuiTableColumnSettings": "imgui_internal:2345",
"ImGuiTableColumnSortSpecs": "imgui:2046",
"ImGuiTableFlags_": "imgui:1115",
"ImGuiTableRowFlags_": "imgui:1212",
"ImGuiTableSettings": "imgui_internal:2369",
"ImGuiTableSortSpecs": "imgui:2060",
"ImGuiTextBuffer": "imgui:2163",
"ImGuiTextFilter": "imgui:2136",
"ImGuiTextFlags_": "imgui_internal:771",
"ImGuiTextRange": "imgui:2146",
"ImGuiTooltipFlags_": "imgui_internal:777",
"ImGuiTreeNodeFlagsPrivate_": "imgui_internal:758",
"ImGuiTreeNodeFlags_": "imgui:993",
"ImGuiViewport": "imgui:2870",
"ImGuiViewportFlags_": "imgui:2845",
"ImGuiViewportP": "imgui_internal:1298",
"ImGuiWindow": "imgui_internal:1912",
"ImGuiWindowClass": "imgui:2008",
"ImGuiWindowDockStyle": "imgui_internal:1276",
"ImGuiWindowDockStyleCol": "imgui_internal:1265",
"ImGuiWindowFlags_": "imgui:921",
"ImGuiWindowSettings": "imgui_internal:1337",
"ImGuiWindowTempData": "imgui_internal:1856",
"ImRect": "imgui_internal:449",
"ImVec1": "imgui_internal:431",
"ImVec2": "imgui:234",
"ImVec2ih": "imgui_internal:439",
"ImVec4": "imgui:247",
"STB_TexteditState": "imstb_textedit:317",
"StbTexteditRow": "imstb_textedit:364",
"StbUndoRecord": "imstb_textedit:299",
@@ -3637,10 +3658,6 @@
"name": "Valid",
"type": "bool"
},
{
"name": "CmdLists",
"type": "ImDrawList**"
},
{
"name": "CmdListsCount",
"type": "int"
@@ -3653,6 +3670,10 @@
"name": "TotalVtxCount",
"type": "int"
},
{
"name": "CmdLists",
"type": "ImDrawList**"
},
{
"name": "DisplayPos",
"type": "ImVec2"
@@ -3958,6 +3979,14 @@
"size": 64,
"type": "ImVec4"
},
{
"name": "FontBuilderIO",
"type": "const ImFontBuilderIO*"
},
{
"name": "FontBuilderFlags",
"type": "unsigned int"
},
{
"name": "PackIdMouseCursors",
"type": "int"
@@ -4001,6 +4030,12 @@
"type": "ImFont*"
}
],
"ImFontBuilderIO": [
{
"name": "FontBuilder_Build",
"type": "bool(*)(ImFontAtlas* atlas)"
}
],
"ImFontConfig": [
{
"name": "FontData",
@@ -4059,7 +4094,7 @@
"type": "bool"
},
{
"name": "RasterizerFlags",
"name": "FontBuilderFlags",
"type": "unsigned int"
},
{
@@ -4082,8 +4117,8 @@
],
"ImFontGlyph": [
{
"bitfield": "31",
"name": "Codepoint",
"bitfield": "1",
"name": "Colored",
"type": "unsigned int"
},
{
@@ -4091,6 +4126,11 @@
"name": "Visible",
"type": "unsigned int"
},
{
"bitfield": "30",
"name": "Codepoint",
"type": "unsigned int"
},
{
"name": "AdvanceX",
"type": "float"
@@ -4495,6 +4535,10 @@
"name": "MouseLastHoveredViewport",
"type": "ImGuiViewportP*"
},
{
"name": "PlatformLastFocusedViewportId",
"type": "ImGuiID"
},
{
"name": "ViewportFrontMostStampCount",
"type": "int"
@@ -4955,6 +4999,10 @@
"template_type": "ImGuiContextHook",
"type": "ImVector_ImGuiContextHook"
},
{
"name": "HookIdNext",
"type": "ImGuiID"
},
{
"name": "LogEnabled",
"type": "bool"
@@ -4971,6 +5019,14 @@
"name": "LogBuffer",
"type": "ImGuiTextBuffer"
},
{
"name": "LogNextPrefix",
"type": "const char*"
},
{
"name": "LogNextSuffix",
"type": "const char*"
},
{
"name": "LogLinePosY",
"type": "float"
@@ -5035,6 +5091,10 @@
}
],
"ImGuiContextHook": [
{
"name": "HookId",
"type": "ImGuiID"
},
{
"name": "Type",
"type": "ImGuiContextHookType"
@@ -6270,10 +6330,6 @@
"template_type": "ImGuiPlatformMonitor",
"type": "ImVector_ImGuiPlatformMonitor"
},
{
"name": "MainViewport",
"type": "ImGuiViewport*"
},
{
"name": "Viewports",
"template_type": "ImGuiViewport*",
@@ -7576,25 +7632,25 @@
"type": "ImVec2"
},
{
"name": "WorkOffsetMin",
"name": "WorkPos",
"type": "ImVec2"
},
{
"name": "WorkOffsetMax",
"name": "WorkSize",
"type": "ImVec2"
},
{
"name": "DpiScale",
"type": "float"
},
{
"name": "DrawData",
"type": "ImDrawData*"
},
{
"name": "ParentViewportId",
"type": "ImGuiID"
},
{
"name": "DrawData",
"type": "ImDrawData*"
},
{
"name": "RendererUserData",
"type": "void*"
@@ -7637,11 +7693,6 @@
"name": "LastFrameActive",
"type": "int"
},
{
"name": "LastFrameDrawLists[2]",
"size": 2,
"type": "int"
},
{
"name": "LastFrontMostStampCount",
"type": "int"
@@ -7674,6 +7725,11 @@
"name": "Window",
"type": "ImGuiWindow*"
},
{
"name": "DrawListsLastFrame[2]",
"size": 2,
"type": "int"
},
{
"name": "DrawLists[2]",
"size": 2,
@@ -7699,6 +7755,14 @@
"name": "LastRendererSize",
"type": "ImVec2"
},
{
"name": "WorkOffsetMin",
"type": "ImVec2"
},
{
"name": "WorkOffsetMax",
"type": "ImVec2"
},
{
"name": "CurrWorkOffsetMin",
"type": "ImVec2"

File diff suppressed because it is too large Load Diff

View File

@@ -19,6 +19,7 @@
"ImFontAtlas": "struct ImFontAtlas",
"ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
"ImFontAtlasFlags": "int",
"ImFontBuilderIO": "struct ImFontBuilderIO",
"ImFontConfig": "struct ImFontConfig",
"ImFontGlyph": "struct ImFontGlyph",
"ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",

View File

@@ -19,6 +19,7 @@ defs["ImFont"] = "struct ImFont"
defs["ImFontAtlas"] = "struct ImFontAtlas"
defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
defs["ImFontAtlasFlags"] = "int"
defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
defs["ImFontConfig"] = "struct ImFontConfig"
defs["ImFontGlyph"] = "struct ImFontGlyph"
defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"

2
imgui

Submodule imgui updated: bb26751b94...7180e9ac66

View File

@@ -2,6 +2,14 @@
#include <assert.h>
#include "../cimgui.h"
#ifdef IMGUI_HAS_IMSTR
#define igBegin SigBegin
#define igSliderFloat SigSliderFloat
#define igCheckbox SigCheckbox
#define igColorEdit3 SigColorEdit3
#define igButton SigButton
#endif
int main(void)
{
assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),