Updated to Dear ImGui 1.92.2b and added ImPlot3D

Author: JunaMeinhold

Examples/AotStaticLinkExample/Program.cs

@@ -4,6 +4,7 @@
 using Hexa.NET.ImGui.Backends.GLFW;
 using Hexa.NET.ImGui.Backends.OpenGL3;
 using Hexa.NET.OpenGL;
+using HexaGen.Runtime;
 using System.Runtime.CompilerServices;
 using GLFWwindowPtr = Hexa.NET.GLFW.GLFWwindowPtr;
 

Generator/Generator.csproj

@@ -88,6 +88,24 @@
 		<None Update="backends\include\cimgui_impl_win32.h">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
+		<None Update="cimplot3d\cimgui.h">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="cimplot3d\cimplot3d.h">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="cimplot3d\definitions.json">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="cimplot3d\generator.json">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="cimplot3d\structs_and_enums.json">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="cimplot3d\typedefs_dict.json">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="config.backends.base.json">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>

Generator/Program.cs

@@ -8,6 +8,7 @@
     .AddImPlot()
     .AddImNodes()
     .AddImGuizmo()
+    .AddImPlot3D()
     .AddImGuiBackends()
     .AddImGuiNodeEditor(false);
 

Generator/Targets/ImGuiAddonTarget.cs

@@ -20,14 +20,17 @@ public static class ImGuiAddonTargetExtensions
         private const string CImGuizmoConfig = "cimguizmo/generator.json";
         private const string CImNodesConfig = "cimnodes/generator.json";
         private const string CImPlotConfig = "cimplot/generator.json";
+        private const string CImPlot3DConfig = "cimplot3d/generator.json";
 
         private const string CImGuizmoHeader = "cimguizmo/cimguizmo.h";
         private const string CImNodesHeader = "cimnodes/cimnodes.h";
         private const string CImPlotHeader = "cimplot/cimplot.h";
+        private const string CImPlot3DHeader = "cimplot3d/cimplot3d.h";
 
         private const string ImGuizmoOutputPath = "../../../../Hexa.NET.ImGuizmo/Generated";
         private const string ImNodesOutputPath = "../../../../Hexa.NET.ImNodes/Generated";
         private const string ImPlotOutputPath = "../../../../Hexa.NET.ImPlot/Generated";
+        private const string ImPlot3DOutputPath = "../../../../Hexa.NET.ImPlot3D/Generated";
 
         public static BuildSystemBuilder AddImGuizmo(this BuildSystemBuilder builder, string configPath = CImGuizmoConfig, string outputPath = ImGuizmoOutputPath)
         {
@@ -64,6 +67,18 @@ public static BuildSystemBuilder AddImPlot(this BuildSystemBuilder builder, stri
             });
             return builder;
         }
+
+        public static BuildSystemBuilder AddImPlot3D(this BuildSystemBuilder builder, string configPath = CImPlot3DConfig, string outputPath = ImPlot3DOutputPath)
+        {
+            builder.AddTarget<ImPlot3DTarget, ImPlot3DTargetOptions>(options =>
+            {
+                options.Name = "implot3d";
+                options.Headers = [CImPlot3DHeader];
+                options.ConfigPath = configPath;
+                options.OutputPath = outputPath;
+            });
+            return builder;
+        }
     }
 
     public class ImPlotTarget(IOptions<ImPlotTargetOptions> options) : ImGuiAddonTarget(options)
@@ -75,6 +90,9 @@ public class ImNodesTarget(IOptions<ImNodesTargetOptions> options) : ImGuiAddonT
     public class ImGuizmoTarget(IOptions<ImGuizmoTargetOptions> options) : ImGuiAddonTarget(options)
     { }
 
+    public class ImPlot3DTarget(IOptions<ImPlot3DTargetOptions> options) : ImGuiAddonTarget(options)
+    { }
+
     public class ImPlotTargetOptions() : ImGuiAddonTargetOptions()
     { }
 
@@ -85,6 +103,9 @@ public class ImGuizmoTargetOptions() : ImGuiAddonTargetOptions()
 
     { }
 
+    public class ImPlot3DTargetOptions() : ImGuiAddonTargetOptions()
+    { }
+
     public class ImGuiAddonTarget : ImGuiBaseTarget
     {
         private readonly List<string> headers;

Generator/Targets/ImGuiTarget.cs

@@ -26,6 +26,9 @@ public override void Execute(BuildContext context)
         {
             // don't worry about "NoInternals" internals will be generated in a substep (post-patch) when generating. see ImGuiPostPatch.cs
             Generate([CImGuiHeader], CImGuiConfig, ImGuiOutputPath, null, out var metadata, InternalsGenerationType.NoInternals);
+            metadata.CppDefinedFunctions.Remove("igSetAllocatorFunctions");
+            metadata.CppDefinedFunctions.Remove("igGetAllocatorFunctions");
+            metadata.DefinedFunctions.RemoveAll(x => x.Name == "SetAllocatorFunctions" || x.Name == "GetAllocatorFunctions");
             context.SetVar(ImGuiMetadataKey, metadata);
         }
     }

Generator/cimgui/cimgui.h

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.92.1" 19210 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.92.2b" 19222 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
 //docking branch
@@ -434,10 +434,15 @@ typedef enum {
     ImGuiTabBarFlags_NoTabListScrollingButtons = 1 << 4,
     ImGuiTabBarFlags_NoTooltip = 1 << 5,
     ImGuiTabBarFlags_DrawSelectedOverline = 1 << 6,
-    ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 7,
-    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 8,
-    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
-    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown,
+    ImGuiTabBarFlags_FittingPolicyMixed = 1 << 7,
+    ImGuiTabBarFlags_FittingPolicyShrink = 1 << 8,
+    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 9,
+    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyMixed | ImGuiTabBarFlags_FittingPolicyShrink | ImGuiTabBarFlags_FittingPolicyScroll,
+    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyMixed,
+
+
+
+
 }ImGuiTabBarFlags_;
 typedef enum {
     ImGuiTabItemFlags_None = 0,
@@ -851,6 +856,8 @@ typedef enum {
     ImGuiStyleVar_ImageBorderSize,
     ImGuiStyleVar_TabRounding,
     ImGuiStyleVar_TabBorderSize,
+    ImGuiStyleVar_TabMinWidthBase,
+    ImGuiStyleVar_TabMinWidthShrink,
     ImGuiStyleVar_TabBarBorderSize,
     ImGuiStyleVar_TabBarOverlineSize,
     ImGuiStyleVar_TableAngledHeadersAngle,
@@ -1078,6 +1085,8 @@ struct ImGuiStyle
     float ImageBorderSize;
     float TabRounding;
     float TabBorderSize;
+    float TabMinWidthBase;
+    float TabMinWidthShrink;
     float TabCloseButtonMinWidthSelected;
     float TabCloseButtonMinWidthUnselected;
     float TabBarBorderSize;
@@ -1148,6 +1157,7 @@ struct ImGuiIO
     bool ConfigViewportsNoTaskBarIcon;
     bool ConfigViewportsNoDecoration;
     bool ConfigViewportsNoDefaultParent;
+    bool ConfigViewportPlatformFocusSetsImGuiFocus;
     bool ConfigDpiScaleFonts;
     bool ConfigDpiScaleViewports;
     bool MouseDrawCursor;
@@ -1647,7 +1657,8 @@ struct ImFontBaked
     float Ascent, Descent;
     unsigned int MetricsTotalSurface:26;
     unsigned int WantDestroy:1;
-    unsigned int LockLoadingFallback:1;
+    unsigned int LoadNoFallback:1;
+    unsigned int LoadNoRenderOnLayout:1;
     int LastUsedFrame;
     ImGuiID BakedId;
     ImFont* ContainerFont;
@@ -2307,11 +2318,11 @@ typedef enum {
     ImGuiInputEventType_COUNT
 }ImGuiInputEventType;
 typedef enum {
-    ImGuiInputSource_None = 0,
-    ImGuiInputSource_Mouse,
-    ImGuiInputSource_Keyboard,
-    ImGuiInputSource_Gamepad,
-    ImGuiInputSource_COUNT
+ImGuiInputSource_None=0,
+ImGuiInputSource_Mouse=1,
+ImGuiInputSource_Keyboard=2,
+ImGuiInputSource_Gamepad=3,
+ImGuiInputSource_COUNT=4,
 }ImGuiInputSource;
 typedef struct ImGuiInputEventMousePos ImGuiInputEventMousePos;
 struct ImGuiInputEventMousePos
@@ -3008,6 +3019,7 @@ struct ImGuiContext
     bool ActiveIdHasBeenEditedBefore;
     bool ActiveIdHasBeenEditedThisFrame;
     bool ActiveIdFromShortcut;
+    ImGuiID ActiveIdDisabledId;
     int ActiveIdMouseButton : 8;
     ImVec2 ActiveIdClickOffset;
     ImGuiWindow* ActiveIdWindow;
@@ -3461,6 +3473,7 @@ struct ImGuiTabBar
     int CurrFrameVisible;
     int PrevFrameVisible;
     ImRect BarRect;
+    float BarRectPrevWidth;
     float CurrTabsContentsHeight;
     float PrevTabsContentsHeight;
     float WidthAllTabs;
@@ -3479,6 +3492,7 @@ struct ImGuiTabBar
     bool WantLayout;
     bool VisibleTabWasSubmitted;
     bool TabsAddedNew;
+    bool ScrollButtonEnabled;
     ImS16 TabsActiveCount;
     ImS16 LastTabItemIdx;
     float ItemSpacingY;
@@ -4668,7 +4682,7 @@ CIMGUI_API const char* igImParseFormatTrimDecorations(const char* format,char* b
 CIMGUI_API void igImParseFormatSanitizeForPrinting(const char* fmt_in,char* fmt_out,size_t fmt_out_size);
 CIMGUI_API const char* igImParseFormatSanitizeForScanning(const char* fmt_in,char* fmt_out,size_t fmt_out_size);
 CIMGUI_API int igImParseFormatPrecision(const char* format,int default_value);
-CIMGUI_API const char* igImTextCharToUtf8(char out_buf[5],unsigned int c);
+CIMGUI_API int igImTextCharToUtf8(char out_buf[5],unsigned int c);
 CIMGUI_API int igImTextStrToUtf8(char* out_buf,int out_buf_size,const ImWchar* in_text,const ImWchar* in_text_end);
 CIMGUI_API int igImTextCharFromUtf8(unsigned int* out_char,const char* in_text,const char* in_text_end);
 CIMGUI_API int igImTextStrFromUtf8(ImWchar* out_buf,int out_buf_size,const char* in_text,const char* in_text_end,const char** in_remaining);
@@ -4989,6 +5003,7 @@ CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags(const ImVec2 mouse_pos);
 CIMGUI_API void igFindHoveredWindowEx(const ImVec2 pos,bool find_first_and_in_any_viewport,ImGuiWindow** out_hovered_window,ImGuiWindow** out_hovered_window_under_moving_window);
 CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
 CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock);
+CIMGUI_API void igStopMouseMovingWindow(void);
 CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
 CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
 CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
@@ -5045,7 +5060,7 @@ CIMGUI_API void igSetLastItemData(ImGuiID item_id,ImGuiItemFlags item_flags,ImGu
 CIMGUI_API void igCalcItemSize(ImVec2 *pOut,ImVec2 size,float default_w,float default_h);
 CIMGUI_API float igCalcWrapWidthForPos(const ImVec2 pos,float wrap_pos_x);
 CIMGUI_API void igPushMultiItemsWidths(int components,float width_full);
-CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess);
+CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess,float width_min);
 CIMGUI_API const ImGuiStyleVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx);
 CIMGUI_API void igBeginDisabledOverrideReenable(void);
 CIMGUI_API void igEndDisabledOverrideReenable(void);