NET 7.0 and SDL Impl

equilibrium-hub · Jan 18, 2023 · 696c9b7 · 696c9b7
1 parent 57948fe
commit 696c9b7
Show file tree

Hide file tree

Showing 12 changed files with 201 additions and 112 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,10 @@
+# Building
+
+```bash
+dotnet restore src
+dotnet build -c Release --no-restore src
+```
+
 # ImGui.NET
 
 This is a .NET wrapper for the immediate mode GUI library, Dear ImGui (https://github.com/ocornut/imgui). ImGui.NET lets you build graphical interfaces using a simple immediate-mode style. ImGui.NET is a .NET Standard library, and can be used on all major .NET runtimes and operating systems.

diff --git a/deps/cimgui/win-x64/cimgui.dll b/deps/cimgui/win-x64/cimgui.dll
diff --git a/download-native-deps.ps1 b/download-native-deps.ps1
diff --git a/src/CodeGenerator/CodeGenerator.csproj b/src/CodeGenerator/CodeGenerator.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="definitions\cimgui\structs_and_enums.json" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="definitions\cimgui\definitions.json" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="definitions\cimgui\variants.json" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="definitions\cimgui\impl_definitions.json" CopyToOutputDirectory="PreserveNewest" />
 
     <Content Include="definitions\cimplot\structs_and_enums.json" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="definitions\cimplot\definitions.json" CopyToOutputDirectory="PreserveNewest" />

diff --git a/src/CodeGenerator/ImguiDefinitions.cs b/src/CodeGenerator/ImguiDefinitions.cs
@@ -39,6 +39,13 @@ public void LoadFrom(string directory)
                 functionsJson = JObject.Load(jr);
             }
 
+            JObject implFunctionsJson;
+            using (StreamReader fs = File.OpenText(Path.Combine(directory, "impl_definitions.json")))
+            using (JsonTextReader jr = new JsonTextReader(fs))
+            {
+                implFunctionsJson = JObject.Load(jr);
+            }
+
             JObject variantsJson = null;
             if (File.Exists(Path.Combine(directory, "variants.json")))
             {
@@ -98,7 +105,7 @@ public void LoadFrom(string directory)
                 return new TypeDefinition(name, fields);
             }).Where(x => x != null).ToArray();
 
-            Functions = functionsJson.Children().Select(jt =>
+            Functions = functionsJson.Children().Concat(implFunctionsJson.Children()).Select(jt =>
             {
                 JProperty jp = (JProperty)jt;
                 string name = jp.Name;

diff --git a/src/CodeGenerator/definitions/cimgui/definitions.json b/src/CodeGenerator/definitions/cimgui/definitions.json
@@ -23339,7 +23339,7 @@
   ],
   "igImQsort": [
     {
-      "args": "(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*))",
+      "args": "(void* base,size_t count,size_t size_of_element,int(__cdecl*compare_func)(void const*,void const*))",
       "argsT": [
         {
           "name": "base",
@@ -23354,21 +23354,22 @@
           "type": "size_t"
         },
         {
+          "has_cdecl": "__cdecl",
           "name": "compare_func",
           "ret": "int",
           "signature": "(void const*,void const*)",
-          "type": "int(*)(void const*,void const*)"
+          "type": "int(__cdecl*)(void const*,void const*)"
         }
       ],
-      "argsoriginal": "(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*))",
+      "argsoriginal": "(void* base,size_t count,size_t size_of_element,int(__cdecl* compare_func)(void const*,void const*))",
       "call_args": "(base,count,size_of_element,compare_func)",
       "cimguiname": "igImQsort",
       "defaults": {},
       "funcname": "ImQsort",
       "location": "imgui_internal:330",
       "ov_cimguiname": "igImQsort",
       "ret": "void",
-      "signature": "(void*,size_t,size_t,int(*)(void const*,void const*))",
+      "signature": "(void*,size_t,size_t,int(__cdecl*)(void const*,void const*))",
       "stname": ""
     }
   ],
@@ -23420,7 +23421,7 @@
       "cimguiname": "igImRsqrt",
       "defaults": {},
       "funcname": "ImRsqrt",
-      "location": "imgui_internal:452",
+      "location": "imgui_internal:450",
       "ov_cimguiname": "igImRsqrt_Float",
       "ret": "float",
       "signature": "(float)",
@@ -27711,7 +27712,7 @@
           "type": "int"
         }
       ],
-      "argsoriginal": "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))",
+      "argsoriginal": "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282347e+38F,float scale_max=3.40282347e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))",
       "call_args": "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)",
       "cimguiname": "igPlotHistogram",
       "defaults": {
@@ -27772,7 +27773,7 @@
           "type": "ImVec2"
         }
       ],
-      "argsoriginal": "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0))",
+      "argsoriginal": "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282347e+38F,float scale_max=3.40282347e+38F,ImVec2 graph_size=ImVec2(0,0))",
       "call_args": "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)",
       "cimguiname": "igPlotHistogram",
       "defaults": {
@@ -27832,7 +27833,7 @@
           "type": "int"
         }
       ],
-      "argsoriginal": "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))",
+      "argsoriginal": "(const char* label,const float* values,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282347e+38F,float scale_max=3.40282347e+38F,ImVec2 graph_size=ImVec2(0,0),int stride=sizeof(float))",
       "call_args": "(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride)",
       "cimguiname": "igPlotLines",
       "defaults": {
@@ -27893,7 +27894,7 @@
           "type": "ImVec2"
         }
       ],
-      "argsoriginal": "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282346638528859811704183484516925e+38F,float scale_max=3.40282346638528859811704183484516925e+38F,ImVec2 graph_size=ImVec2(0,0))",
+      "argsoriginal": "(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset=0,const char* overlay_text=((void*)0),float scale_min=3.40282347e+38F,float scale_max=3.40282347e+38F,ImVec2 graph_size=ImVec2(0,0))",
       "call_args": "(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size)",
       "cimguiname": "igPlotLines",
       "defaults": {
@@ -28147,7 +28148,7 @@
           "type": "const char*"
         }
       ],
-      "argsoriginal": "(float fraction,const ImVec2& size_arg=ImVec2(-1.17549435082228750796873653722224568e-38F,0),const char* overlay=((void*)0))",
+      "argsoriginal": "(float fraction,const ImVec2& size_arg=ImVec2(-1.17549435e-38F,0),const char* overlay=((void*)0))",
       "call_args": "(fraction,size_arg,overlay)",
       "cimguiname": "igProgressBar",
       "defaults": {