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

some cosmetics and PushStyleColor overload name

Browse Source
This commit is contained in:
sonoro1234
2018-06-20 11:42:19 +02:00
parent a4b061f8c7
commit 77cf5fc1e3
7 changed files with 1665 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cimgui/cimgui.cpp
View File

@@ -276,7 +276,7 @@ CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col)
{
return ImGui::PushStyleColor(idx,col);
}
CIMGUI_API void igPushStyleColorVec4(ImGuiCol idx,const ImVec4 col)
CIMGUI_API void igPushStyleColor(ImGuiCol idx,const ImVec4 col)
{
return ImGui::PushStyleColor(idx,col);
}
@@ -2015,5 +2015,5 @@ CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config)
}
CIMGUI_API float igGET_FLT_MAX()
{
return FLT_MAX;
return FLT_MAX;
}

2135
cimgui/cimgui.h
View File

File diff suppressed because it is too large Load Diff

2
cimgui/generator/cimgui_template.cpp
View File

@@ -30,5 +30,5 @@ CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config)
}
CIMGUI_API float igGET_FLT_MAX()
{
return FLT_MAX;
return FLT_MAX;
}

1
cimgui/generator/cimgui_template.h
View File

@@ -46,6 +46,7 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
//no appendfV
CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
//for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX();

27
cimgui/generator/generator.bat
View File

@@ -1,21 +1,24 @@
rem this is used to rebuild imgui_structs.h
rem set your PATH if necessary for gcc and lua with:
:: this is used to rebuild cimgui.h and cimgui.cpp and must be executed in this directory
:: set your PATH if necessary for gcc and lua 5.1 or luajit with:
set PATH=%PATH%;C:\mingw32\bin;C:\luaGL;
rem gcc -E -C -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h | luajit.exe ./generator.lua > out.txt
rem gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h | luajit.exe ./generator.lua > out.txt
rem gcc -E -CC -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h > imgui_structs2.raw
:: gcc -E preprocesor striped comments
:: gcc -E -C //comments but not /* and multiple spaces to one
:: gcc -E -CC // and /* comments
:: gcc -E -C -traditional-cpp // coments and respects multiple spaces
:: gcc -E -P no #pragma location information
gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_APIX="" ../../imgui/imgui.h ../../imgui/examples/imgui_impl_glfw.h ../../imgui/examples/imgui_impl_opengl3.h > 1.txt
::generate preprocessed file
gcc -E -C -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_APIX="" ../../imgui/imgui.h ../../imgui/examples/imgui_impl_glfw.h ../../imgui/examples/imgui_impl_opengl3.h > 1.txt
::process preprocessed file
type 1.txt | luajit.exe ./generator.lua true imgui imgui_impl_glfw imgui_impl_opengl3 > out.txt
rem gcc -E -C -traditional-cpp -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h > 1Ctra.txt
rem type 1CTra.txt | luajit.exe ./generator.lua true > out.txt
rem gcc -E -P -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS ../../imgui/imgui.h > 1P.txt
rem type 1C.txt | luajit.exe ./generator.lua > out.txt
::copy cimgui.h and cimgui.cpp
copy .\cimgui.h ..\cimgui.h
copy .\cimgui.cpp ..\cimgui.cpp
::leave console open
cmd /k

1069
cimgui/generator/generator.lua
View File

File diff suppressed because it is too large Load Diff

4
cimgui/generator/generatorNOGCC.bat
View File

@@ -5,5 +5,9 @@ set PATH=%PATH%;C:\luaGL;
rem type ..\..\imgui\imgui.h | luajit.exe ./generator.lua false > out.txt
type ..\..\imgui\imgui.h ..\..\imgui\examples\imgui_impl_glfw.h ..\..\imgui\examples\imgui_impl_opengl3.h | luajit.exe ./generator.lua false > out.txt
::copy cimgui.h and cimgui.cpp
copy .\cimgui.h ..\cimgui.h
copy .\cimgui.cpp ..\cimgui.cpp
cmd /k