Add another batch of missing struct keywords, Add definition for ImDrawVert (#28)

* Add missing struct keywords for ImVec2 and ImGuiListClipper arguments
* Add another batch of missing struct keywords
* Add missing definition for ImDrawVert under CIMGUI_DEFINE_ENUMS_AND_STRUCTS
This commit is contained in:
Merwan Achibet
2017-06-06 15:40:29 +02:00
committed by Stephan Dilly
parent 76001ce58c
commit 389c1f1ad1

View File

@@ -242,7 +242,7 @@ struct ImGuiStyle {
struct ImVec2 WindowPadding; struct ImVec2 WindowPadding;
struct ImVec2 WindowMinSize; struct ImVec2 WindowMinSize;
float WindowRounding; float WindowRounding;
ImVec2 WindowTitleAlign; struct ImVec2 WindowTitleAlign;
float ChildWindowRounding; float ChildWindowRounding;
struct ImVec2 FramePadding; struct ImVec2 FramePadding;
float FrameRounding; float FrameRounding;
@@ -255,7 +255,7 @@ struct ImGuiStyle {
float ScrollbarRounding; float ScrollbarRounding;
float GrabMinSize; float GrabMinSize;
float GrabRounding; float GrabRounding;
ImVec2 ButtonTextAlign; struct ImVec2 ButtonTextAlign;
struct ImVec2 DisplayWindowPadding; struct ImVec2 DisplayWindowPadding;
struct ImVec2 DisplaySafeAreaPadding; struct ImVec2 DisplaySafeAreaPadding;
bool AntiAliasedLines; bool AntiAliasedLines;
@@ -280,7 +280,7 @@ struct ImGuiIO {
struct ImFontAtlas* Fonts; struct ImFontAtlas* Fonts;
float FontGlobalScale; float FontGlobalScale;
bool FontAllowUserScaling; bool FontAllowUserScaling;
ImFont* FontDefault; struct ImFont* FontDefault;
struct ImVec2 DisplayFramebufferScale; struct ImVec2 DisplayFramebufferScale;
struct ImVec2 DisplayVisibleMin; struct ImVec2 DisplayVisibleMin;
struct ImVec2 DisplayVisibleMax; struct ImVec2 DisplayVisibleMax;
@@ -311,7 +311,7 @@ struct ImGuiIO {
int MetricsRenderVertices; int MetricsRenderVertices;
int MetricsRenderIndices; int MetricsRenderIndices;
int MetricsActiveWindows; int MetricsActiveWindows;
ImVec2 MouseDelta; struct ImVec2 MouseDelta;
struct ImVec2 MousePosPrev; struct ImVec2 MousePosPrev;
bool MouseClicked[5]; bool MouseClicked[5];
struct ImVec2 MouseClickedPos[5]; struct ImVec2 MouseClickedPos[5];
@@ -365,6 +365,13 @@ struct ImDrawData {
int TotalIdxCount; int TotalIdxCount;
}; };
struct ImDrawVert
{
struct ImVec2 pos;
struct ImVec2 uv;
ImU32 col;
};
struct ImFontConfig { struct ImFontConfig {
void* FontData; void* FontData;
int FontDataSize; int FontDataSize;
@@ -374,7 +381,7 @@ struct ImFontConfig {
int OversampleH, OversampleV; int OversampleH, OversampleV;
bool PixelSnapH; bool PixelSnapH;
struct ImVec2 GlyphExtraSpacing; struct ImVec2 GlyphExtraSpacing;
ImVec2 GlyphOffset; struct ImVec2 GlyphOffset;
const ImWchar* GlyphRanges; const ImWchar* GlyphRanges;
bool MergeMode; bool MergeMode;
char Name[32]; char Name[32];