kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-10 03:48:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'docking_inter'

Browse Source
This commit is contained in:
Victor Bombi
2021-01-27 10:54:09 +01:00
parent 1bdfc0964e 86112e0b45
commit 6791a95f79
7 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cimgui.cpp
View File

@@ -4307,6 +4307,11 @@ CIMGUI_API float igGET_FLT_MAX()
return FLT_MAX;
}
CIMGUI_API float igGET_FLT_MIN()
{
return FLT_MIN;
}
CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
{

2
cimgui.h
View File

@@ -3307,6 +3307,8 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
//for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX();
//for getting FLT_MIN in bindings
CIMGUI_API float igGET_FLT_MIN();
CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();

5
generator/cimgui_template.cpp
View File

@@ -35,6 +35,11 @@ CIMGUI_API float igGET_FLT_MAX()
return FLT_MAX;
}
CIMGUI_API float igGET_FLT_MIN()
{
return FLT_MIN;
}
CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
{

2
generator/cimgui_template.h
View File

@@ -55,6 +55,8 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
//for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX();
//for getting FLT_MIN in bindings
CIMGUI_API float igGET_FLT_MIN();
CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();

7
generator/generator.lua
View File

@@ -168,13 +168,16 @@ local function get_defines(t)
end
return ret
end
--subtitution of FLT_MAX value for FLT_MAX
--subtitution of FLT_MAX value for FLT_MAX or FLT_MIN
local function set_defines(fdefs)
local FLT_MINpat = gdefines.FLT_MIN:gsub("([%.%-])","%%%1")
for k,defT in pairs(fdefs) do
for i,def in ipairs(defT) do
for name,default in pairs(def.defaults) do
if default == gdefines.FLT_MAX then
def.defaults[name] = "FLT_MAX"
elseif default:match(FLT_MINpat) then
def.defaults[name] = default:gsub(FLT_MINpat,"FLT_MIN")
end
end
end
@@ -330,7 +333,7 @@ end
--------------------------------------------------------
--get imgui.h version and IMGUI_HAS_DOCK--------------------------
--get some defines wont work for cl ----------------
gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","IMGUI_HAS_DOCK"}
gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK"}
--this will work for cl
local pipe,err = io.open("../imgui/imgui.h","r")
if not pipe then

2
generator/output/definitions.json
View File

@@ -23163,7 +23163,7 @@
"cimguiname": "igProgressBar",
"defaults": {
"overlay": "NULL",
"size_arg": "ImVec2(-1.17549435082228750796873653722224568e-38F,0)"
"size_arg": "ImVec2(-FLT_MIN,0)"
},
"funcname": "ProgressBar",
"location": "imgui:469",

2
generator/output/definitions.lua
View File

@@ -19615,7 +19615,7 @@ defs["igProgressBar"][1]["call_args"] = "(fraction,size_arg,overlay)"
defs["igProgressBar"][1]["cimguiname"] = "igProgressBar"
defs["igProgressBar"][1]["defaults"] = {}
defs["igProgressBar"][1]["defaults"]["overlay"] = "NULL"
defs["igProgressBar"][1]["defaults"]["size_arg"] = "ImVec2(-1.17549435082228750796873653722224568e-38F,0)"
defs["igProgressBar"][1]["defaults"]["size_arg"] = "ImVec2(-FLT_MIN,0)"
defs["igProgressBar"][1]["funcname"] = "ProgressBar"
defs["igProgressBar"][1]["location"] = "imgui:469"
defs["igProgressBar"][1]["namespace"] = "ImGui"