kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-14 05:38:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'docking_inter'

Browse Source
This commit is contained in:
sonoro1234
2025-07-01 11:34:22 +02:00
parent cf8523f31f bcb179376b
commit ce46a36843
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend_test/example_glfw_opengl3/CMakeLists.txt
View File

@@ -45,10 +45,13 @@ add_compile_definitions("IMGUI_IMPL_OPENGL_LOADER_GL3W")
option(IMGUI_FREETYPE "add Freetype2" OFF) option(IMGUI_FREETYPE "add Freetype2" OFF)
if(IMGUI_FREETYPE) if(IMGUI_FREETYPE)
message("building with freetype")
FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH}) FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH})
list(APPEND IMGUI_LIBRARIES freetype) list(APPEND IMGUI_LIBRARIES freetype)
list(APPEND IMGUI_SOURCES ../../imgui/misc/freetype/imgui_freetype.cpp) list(APPEND IMGUI_SOURCES ../../imgui/misc/freetype/imgui_freetype.cpp)
add_definitions("-DCIMGUI_FREETYPE=1") #add_definitions("-DCIMGUI_FREETYPE=1")
add_definitions("-DIMGUI_ENABLE_FREETYPE=1")
add_definitions("-DIMGUI_ENABLE_STB_TRUETYPE=1")
endif(IMGUI_FREETYPE) endif(IMGUI_FREETYPE)
# opengl3 # opengl3

3
cimgui.cpp
View File

@@ -4,9 +4,6 @@
//with imgui_freetype.h api //with imgui_freetype.h api
#include "./imgui/imgui.h" #include "./imgui/imgui.h"
#ifdef IMGUI_ENABLE_FREETYPE
#include "./imgui/misc/freetype/imgui_freetype.h"
#endif
#include "./imgui/imgui_internal.h" #include "./imgui/imgui_internal.h"
#include "cimgui.h" #include "cimgui.h"

6
cimgui.h
View File

@@ -38,6 +38,12 @@ typedef unsigned __int64 ImU64;
//typedef unsigned long long ImU64; //typedef unsigned long long ImU64;
#endif #endif
#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
#ifdef IMGUI_ENABLE_FREETYPE
#include "./imgui/misc/freetype/imgui_freetype.h"
#endif
#endif
#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS

3
generator/cimgui_template.cpp
View File

@@ -1,8 +1,5 @@
#include "./imgui/imgui.h" #include "./imgui/imgui.h"
#ifdef IMGUI_ENABLE_FREETYPE
#include "./imgui/misc/freetype/imgui_freetype.h"
#endif
#include "./imgui/imgui_internal.h" #include "./imgui/imgui_internal.h"
#include "cimgui.h" #include "cimgui.h"

6
generator/cimgui_template.h
View File

@@ -34,6 +34,12 @@ typedef unsigned __int64 ImU64;
//typedef unsigned long long ImU64; //typedef unsigned long long ImU64;
#endif #endif
#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
#ifdef IMGUI_ENABLE_FREETYPE
#include "./imgui/misc/freetype/imgui_freetype.h"
#endif
#endif
#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
#include "imgui_structs.h" #include "imgui_structs.h"

3
generator/cpp2ffi.lua
View File

@@ -1475,6 +1475,8 @@ function M.Parser()
txt = txt:gsub(k,v) txt = txt:gsub(k,v)
end end
end end
--clean = default in constructor (implot3d)
txt = txt:gsub("=%s*default","")
--save_data("./preprocode"..tostring(self):gsub("table: ","")..".c",txt) --save_data("./preprocode"..tostring(self):gsub("table: ","")..".c",txt)
--clean bad positioned comments inside functionD_re --clean bad positioned comments inside functionD_re
if self.COMMENTS_GENERATION then if self.COMMENTS_GENERATION then
@@ -1557,6 +1559,7 @@ function M.Parser()
local inistruct = clean_spaces(stru:match("(.-)%b{}")) local inistruct = clean_spaces(stru:match("(.-)%b{}"))
--clean final: --clean final:
inistruct = inistruct:gsub("%s*final%s*:",":") inistruct = inistruct:gsub("%s*final%s*:",":")
--local stname = stru:match("struct%s*(%S+)%s*%b{}") --local stname = stru:match("struct%s*(%S+)%s*%b{}")
local stname, derived local stname, derived
if inistruct:match":" then if inistruct:match":" then