mirror of
https://github.com/cimgui/cimgui.git
synced 2025-08-12 12:48:30 +01:00
pull ImDrawCallback_ResetRenderState to cimgui.h
This commit is contained in:
2
cimgui.h
2
cimgui.h
@@ -3269,6 +3269,8 @@ struct ImFontBuilderIO
|
|||||||
};
|
};
|
||||||
#define IMGUI_HAS_DOCK 1
|
#define IMGUI_HAS_DOCK 1
|
||||||
|
|
||||||
|
#define ImDrawCallback_ResetRenderState (ImDrawCallback)(-8)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
struct GLFWwindow;
|
struct GLFWwindow;
|
||||||
struct SDL_Window;
|
struct SDL_Window;
|
||||||
|
@@ -250,6 +250,9 @@ local function cimgui_generation(parser)
|
|||||||
if gdefines.IMGUI_HAS_DOCK then
|
if gdefines.IMGUI_HAS_DOCK then
|
||||||
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK 1\n"
|
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK 1\n"
|
||||||
end
|
end
|
||||||
|
if gdefines.ImDrawCallback_ResetRenderState then
|
||||||
|
cstructsstr = cstructsstr.."\n#define ImDrawCallback_ResetRenderState "..gdefines.ImDrawCallback_ResetRenderState.."\n"
|
||||||
|
end
|
||||||
if gdefines.IMGUI_HAS_IMSTR then
|
if gdefines.IMGUI_HAS_IMSTR then
|
||||||
if not (NOCHAR or NOIMSTRV) then
|
if not (NOCHAR or NOIMSTRV) then
|
||||||
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR 1\n"
|
cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR 1\n"
|
||||||
@@ -276,8 +279,8 @@ end
|
|||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
--get imgui.h version and IMGUI_HAS_DOCK--------------------------
|
--get imgui.h version and IMGUI_HAS_DOCK--------------------------
|
||||||
--defines for the cl compiler must be present in the print_defines.cpp file
|
--defines for the cl compiler must be present in the print_defines.cpp file
|
||||||
gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
|
gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR","ImDrawCallback_ResetRenderState"}
|
||||||
|
--cpp2ffi.prtable(gdefines)
|
||||||
if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
|
if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
|
||||||
if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end
|
if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end
|
||||||
|
|
||||||
|
@@ -27,3 +27,7 @@
|
|||||||
#ifdef FLT_MAX
|
#ifdef FLT_MAX
|
||||||
#pragma message(CIMGUI_DEFSTRING(FLT_MAX))
|
#pragma message(CIMGUI_DEFSTRING(FLT_MAX))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ImDrawCallback_ResetRenderState
|
||||||
|
#pragma message(CIMGUI_DEFSTRING(ImDrawCallback_ResetRenderState))
|
||||||
|
#endif
|
||||||
|
Reference in New Issue
Block a user