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

move to imgui 1.65

Browse Source
This commit is contained in:
sonoro1234
2018-09-10 13:23:49 +02:00
parent d45f3594ce
commit a0eab2686f
7 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -10,7 +10,7 @@ Generated files are: cimgui.cpp, cimgui.h for C compilation. Also for helping in
This library is intended as a intermediate layer to be able to use imgui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
Notes:
* currently this wrapper is based on version [1.64 of imgui]
* currently this wrapper is based on version [1.65 of imgui]
* overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/sonoro1234/cimgui/blob/Branch_v1.62.0/generator/generator.lua#L40). Until the comunity finish with defining this table tag will be 1.62beta. Current overloaded function names can be found in (https://github.com/sonoro1234/cimgui/tree/Branch_v1.62.0/generator/generated/overloads.txt)
# compilation

4
cimgui_auto.h
View File

@@ -517,8 +517,9 @@ struct ImGuiIO
ImVec2 DisplayFramebufferScale;
ImVec2 DisplayVisibleMin;
ImVec2 DisplayVisibleMax;
bool MouseDrawCursor;
bool ConfigMacOSXBehaviors;
bool ConfigCursorBlink;
bool ConfigInputTextCursorBlink;
bool ConfigResizeWindowsFromEdges;
const char* (*GetClipboardTextFn)(void* user_data);
void (*SetClipboardTextFn)(void* user_data, const char* text);
@@ -530,7 +531,6 @@ struct ImGuiIO
bool MouseDown[5];
float MouseWheel;
float MouseWheelH;
bool MouseDrawCursor;
bool KeyCtrl;
bool KeyShift;
bool KeyAlt;

22
generator/generated/cimgui.h
View File

@@ -41,7 +41,7 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;
#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
typedef unsigned short ImDrawIdx;
typedef void* ImTextureID;
// dear imgui, v1.64
// dear imgui, v1.65
typedef struct CustomRect CustomRect;
typedef struct GlyphRangesBuilder GlyphRangesBuilder;
typedef struct ImFontGlyph ImFontGlyph;
@@ -341,10 +341,10 @@ enum ImGuiKey_
ImGuiKey_Z, // for text edit CTRL+Z: undo
ImGuiKey_COUNT
};
// [BETA] Gamepad/Keyboard directional navigation
// Gamepad/Keyboard directional navigation
// Keyboard: Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard to enable. NewFrame() will automatically fill io.NavInputs[] based on your io.KeysDown[] + io.KeyMap[] arrays.
// Gamepad: Set io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad to enable. Back-end: set ImGuiBackendFlags_HasGamepad and fill the io.NavInputs[] fields before calling NewFrame(). Note that io.NavInputs[] is cleared by EndFrame().
// Read instructions in imgui.cpp for more details. Download PNG/PSD at goo.gl/9LgVZW.
// Read instructions in imgui.cpp for more details. Download PNG/PSD at http://goo.gl/9LgVZW.
enum ImGuiNavInput_
{
// Gamepad Mapping
@@ -557,7 +557,7 @@ struct ImGuiStyle
float GrabMinSize; // Minimum width/height of a grab box for slider/scrollbar.
float GrabRounding; // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
ImVec2 ButtonTextAlign; // Alignment of button text when button is larger than text. Defaults to (0.5f,0.5f) for horizontally+vertically centered.
ImVec2 DisplayWindowPadding; // Window positions are clamped to be visible within the display area by at least this amount. Only covers regular windows.
ImVec2 DisplayWindowPadding; // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows.
ImVec2 DisplaySafeAreaPadding; // If you cannot see the edges of your screen (e.g. on a TV) increase the safe area padding. Apply to popups/tooltips as well regular windows. NB: Prefer configuring your TV sets correctly!
float MouseCursorScale; // Scale software rendered mouse cursor (when io.MouseDrawCursor is enabled). May be removed later.
bool AntiAliasedLines; // Enable anti-aliasing on lines/borders. Disable if you are really tight on CPU/GPU.
@@ -570,11 +570,11 @@ struct ImGuiStyle
struct ImGuiIO
{
//------------------------------------------------------------------
// Settings (fill once) // Default value:
// Configuration (fill once) // Default value:
//------------------------------------------------------------------
ImGuiConfigFlags ConfigFlags; // = 0 // See ImGuiConfigFlags_ enum. Set by user/application. Gamepad/keyboard navigation options, etc.
ImGuiBackendFlags BackendFlags; // = 0 // Set ImGuiBackendFlags_ enum. Set by imgui_impl_xxx files or custom back-end to communicate features supported by the back-end.
ImVec2 DisplaySize; // <unset> // Display size, in pixels. For clamping windows positions.
ImVec2 DisplaySize; // <unset> // Main display size, in pixels. For clamping windows positions.
float DeltaTime; // = 1.0f/60.0f // Time elapsed since last frame, in seconds.
float IniSavingRate; // = 5.0f // Minimum time between saving positions/sizes to .ini file, in seconds.
const char* IniFilename; // = "imgui.ini" // Path to .ini file. Set NULL to disable automatic .ini loading/saving, if e.g. you want to manually load/save from memory.
@@ -591,11 +591,12 @@ struct ImGuiIO
bool FontAllowUserScaling; // = false // Allow user scaling text of individual window with CTRL+Wheel.
ImFont* FontDefault; // = NULL // Font to use on NewFrame(). Use NULL to uses Fonts->Fonts[0].
ImVec2 DisplayFramebufferScale; // = (1.0f,1.0f) // For retina display or other situations where window coordinates are different from framebuffer coordinates. User storage only, presently not used by ImGui.
ImVec2 DisplayVisibleMin; // <unset> (0.0f,0.0f) // If you use DisplaySize as a virtual space larger than your screen, set DisplayVisibleMin/Max to the visible area.
ImVec2 DisplayVisibleMax; // <unset> (0.0f,0.0f) // If the values are the same, we defaults to Min=(0.0f) and Max=DisplaySize
ImVec2 DisplayVisibleMin; // <unset> (0.0f,0.0f) // [obsolete] If you use DisplaySize as a virtual space larger than your screen, set DisplayVisibleMin/Max to the visible area.
ImVec2 DisplayVisibleMax; // <unset> (0.0f,0.0f) // [obsolete: just use io.DisplaySize] If the values are the same, we defaults to Min=(0.0f) and Max=DisplaySize
// Miscellaneous configuration options
bool MouseDrawCursor; // = false // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor). Cannot be easily renamed to 'io.ConfigXXX' because this is frequently used by back-end implementations.
bool ConfigMacOSXBehaviors; // = defined(__APPLE__) // OS X style: Text editing cursor movement using Alt instead of Ctrl, Shortcuts using Cmd/Super instead of Ctrl, Line/Text Start and End using Cmd+Arrows instead of Home/End, Double click selects by word instead of selecting whole text, Multi-selection in lists uses Cmd/Super instead of Ctrl (was called io.OptMacOSXBehaviors prior to 1.63)
bool ConfigCursorBlink; // = true // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63)
bool ConfigInputTextCursorBlink; // = true // Set to false to disable blinking cursor, for users who consider it distracting. (was called: io.OptCursorBlink prior to 1.63)
bool ConfigResizeWindowsFromEdges; // = false // [BETA] Enable resizing of windows from their edges and from the lower-left corner. This requires (io.BackendFlags & ImGuiBackendFlags_HasMouseCursors) because it needs mouse cursor feedback. (This used to be the ImGuiWindowFlags_ResizeFromAnySide flag)
//------------------------------------------------------------------
// Settings (User Functions)
@@ -616,7 +617,6 @@ struct ImGuiIO
bool MouseDown[5]; // Mouse buttons: 0=left, 1=right, 2=middle + extras. ImGui itself mostly only uses left button (BeginPopupContext** are using right button). Others buttons allows us to track if the mouse is being used by your application + available to user as a convenience via IsMouse** API.
float MouseWheel; // Mouse wheel Vertical: 1 unit scrolls about 5 lines text.
float MouseWheelH; // Mouse wheel Horizontal. Most users don't have a mouse with an horizontal wheel, may not be filled by all back-ends.
bool MouseDrawCursor; // Request ImGui to draw a mouse cursor for you (if you are on a platform without a mouse cursor).
bool KeyCtrl; // Keyboard modifier pressed: Control
bool KeyShift; // Keyboard modifier pressed: Shift
bool KeyAlt; // Keyboard modifier pressed: Alt
@@ -1479,7 +1479,7 @@ CIMGUI_API void* igMemAlloc(size_t size);
CIMGUI_API void igMemFree(void* ptr);
CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
//------------------------------------------------------------------
// Settings (fill once) // Default value:
// Configuration (fill once) // Default value:
//------------------------------------------------------------------
// Miscellaneous configuration options
//------------------------------------------------------------------

4
generator/generated/cimgui_auto.h
View File

@@ -517,8 +517,9 @@ struct ImGuiIO
ImVec2 DisplayFramebufferScale;
ImVec2 DisplayVisibleMin;
ImVec2 DisplayVisibleMax;
bool MouseDrawCursor;
bool ConfigMacOSXBehaviors;
bool ConfigCursorBlink;
bool ConfigInputTextCursorBlink;
bool ConfigResizeWindowsFromEdges;
const char* (*GetClipboardTextFn)(void* user_data);
void (*SetClipboardTextFn)(void* user_data, const char* text);
@@ -530,7 +531,6 @@ struct ImGuiIO
bool MouseDown[5];
float MouseWheel;
float MouseWheelH;
bool MouseDrawCursor;
bool KeyCtrl;
bool KeyShift;
bool KeyAlt;

2
generator/generated/structs_and_enums.json
View File

File diff suppressed because one or more lines are too long

48
generator/generated/structs_and_enums.lua
View File

@@ -1710,47 +1710,47 @@ defs["structs"]["ImGuiIO"][21]["type"] = "ImVec2"
defs["structs"]["ImGuiIO"][21]["name"] = "DisplayVisibleMax"
defs["structs"]["ImGuiIO"][22] = {}
defs["structs"]["ImGuiIO"][22]["type"] = "bool"
defs["structs"]["ImGuiIO"][22]["name"] = "ConfigMacOSXBehaviors"
defs["structs"]["ImGuiIO"][22]["name"] = "MouseDrawCursor"
defs["structs"]["ImGuiIO"][23] = {}
defs["structs"]["ImGuiIO"][23]["type"] = "bool"
defs["structs"]["ImGuiIO"][23]["name"] = "ConfigCursorBlink"
defs["structs"]["ImGuiIO"][23]["name"] = "ConfigMacOSXBehaviors"
defs["structs"]["ImGuiIO"][24] = {}
defs["structs"]["ImGuiIO"][24]["type"] = "bool"
defs["structs"]["ImGuiIO"][24]["name"] = "ConfigResizeWindowsFromEdges"
defs["structs"]["ImGuiIO"][24]["name"] = "ConfigInputTextCursorBlink"
defs["structs"]["ImGuiIO"][25] = {}
defs["structs"]["ImGuiIO"][25]["type"] = "const char*(*)(void* user_data)"
defs["structs"]["ImGuiIO"][25]["name"] = "GetClipboardTextFn"
defs["structs"]["ImGuiIO"][25]["type"] = "bool"
defs["structs"]["ImGuiIO"][25]["name"] = "ConfigResizeWindowsFromEdges"
defs["structs"]["ImGuiIO"][26] = {}
defs["structs"]["ImGuiIO"][26]["type"] = "void(*)(void* user_data,const char* text)"
defs["structs"]["ImGuiIO"][26]["name"] = "SetClipboardTextFn"
defs["structs"]["ImGuiIO"][26]["type"] = "const char*(*)(void* user_data)"
defs["structs"]["ImGuiIO"][26]["name"] = "GetClipboardTextFn"
defs["structs"]["ImGuiIO"][27] = {}
defs["structs"]["ImGuiIO"][27]["type"] = "void*"
defs["structs"]["ImGuiIO"][27]["name"] = "ClipboardUserData"
defs["structs"]["ImGuiIO"][27]["type"] = "void(*)(void* user_data,const char* text)"
defs["structs"]["ImGuiIO"][27]["name"] = "SetClipboardTextFn"
defs["structs"]["ImGuiIO"][28] = {}
defs["structs"]["ImGuiIO"][28]["type"] = "void(*)(int x,int y)"
defs["structs"]["ImGuiIO"][28]["name"] = "ImeSetInputScreenPosFn"
defs["structs"]["ImGuiIO"][28]["type"] = "void*"
defs["structs"]["ImGuiIO"][28]["name"] = "ClipboardUserData"
defs["structs"]["ImGuiIO"][29] = {}
defs["structs"]["ImGuiIO"][29]["type"] = "void*"
defs["structs"]["ImGuiIO"][29]["name"] = "ImeWindowHandle"
defs["structs"]["ImGuiIO"][29]["type"] = "void(*)(int x,int y)"
defs["structs"]["ImGuiIO"][29]["name"] = "ImeSetInputScreenPosFn"
defs["structs"]["ImGuiIO"][30] = {}
defs["structs"]["ImGuiIO"][30]["type"] = "void*"
defs["structs"]["ImGuiIO"][30]["name"] = "RenderDrawListsFnUnused"
defs["structs"]["ImGuiIO"][30]["name"] = "ImeWindowHandle"
defs["structs"]["ImGuiIO"][31] = {}
defs["structs"]["ImGuiIO"][31]["type"] = "ImVec2"
defs["structs"]["ImGuiIO"][31]["name"] = "MousePos"
defs["structs"]["ImGuiIO"][31]["type"] = "void*"
defs["structs"]["ImGuiIO"][31]["name"] = "RenderDrawListsFnUnused"
defs["structs"]["ImGuiIO"][32] = {}
defs["structs"]["ImGuiIO"][32]["type"] = "bool"
defs["structs"]["ImGuiIO"][32]["name"] = "MouseDown[5]"
defs["structs"]["ImGuiIO"][32]["size"] = 5
defs["structs"]["ImGuiIO"][32]["type"] = "ImVec2"
defs["structs"]["ImGuiIO"][32]["name"] = "MousePos"
defs["structs"]["ImGuiIO"][33] = {}
defs["structs"]["ImGuiIO"][33]["type"] = "float"
defs["structs"]["ImGuiIO"][33]["name"] = "MouseWheel"
defs["structs"]["ImGuiIO"][33]["type"] = "bool"
defs["structs"]["ImGuiIO"][33]["name"] = "MouseDown[5]"
defs["structs"]["ImGuiIO"][33]["size"] = 5
defs["structs"]["ImGuiIO"][34] = {}
defs["structs"]["ImGuiIO"][34]["type"] = "float"
defs["structs"]["ImGuiIO"][34]["name"] = "MouseWheelH"
defs["structs"]["ImGuiIO"][34]["name"] = "MouseWheel"
defs["structs"]["ImGuiIO"][35] = {}
defs["structs"]["ImGuiIO"][35]["type"] = "bool"
defs["structs"]["ImGuiIO"][35]["name"] = "MouseDrawCursor"
defs["structs"]["ImGuiIO"][35]["type"] = "float"
defs["structs"]["ImGuiIO"][35]["name"] = "MouseWheelH"
defs["structs"]["ImGuiIO"][36] = {}
defs["structs"]["ImGuiIO"][36]["type"] = "bool"
defs["structs"]["ImGuiIO"][36]["name"] = "KeyCtrl"

2
imgui

Submodule imgui updated: 767649afb1...e0cab5664a