Merge branch 'master' into add-VtxOffset-handling

Author: mellinoe

.github/workflows/build.yml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  create: # when tags are created
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  Build_Windows:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore src
+    - name: Build Project
+      run: dotnet build -c Release --no-restore src
+
+    - name: Build Packages
+      run: dotnet pack src/ImGui.NET -c Release --no-restore --no-build
+    - name: List Packages
+      run: ls -l bin\Release\ImGui.NET\
+
+    - name: Publish to nuget.org
+      if: startsWith(github.ref, 'refs/tags/')
+      run: dotnet nuget push bin\Release\ImGui.NET\*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_KEY}}

README.md

@@ -16,7 +16,16 @@ ImGui.NET can be built in Visual Studio or on the command line. The .NET Core SD
 
 # Usage
 
-ImGui.NET currently provides a raw wrapper around the ImGui native API, and also provides a very thin safe, managed API for convenience. It is currently very much like using the native library, which is very simple, flexible, and robust. The easiest way to figure out how to use the library is to read the documentation of imgui itself, mostly in the imgui.cpp, and imgui.h files, as well as the exported functions in cimgui.h. Looking at the sample program code will also give some indication about basic usage.
+ImGui.NET currently provides a raw wrapper around the ImGui native API, and also provides a very thin safe, managed API for convenience. It is currently very much like using the native library, which is very simple, flexible, and robust. The easiest way to figure out how to use the library is to read the documentation of imgui itself, mostly in the imgui.cpp, and imgui.h files, as well as the exported functions in cimgui.h. Looking at the [sample program code](https://github.com/mellinoe/ImGui.NET/tree/master/src) will also give some indication about basic usage.
+
+# Debugging native code
+
+ImGui.NET is a wrapper over native code. By default, this native code is packaged and released in an optimized form, making debugging difficult. To obtain a debuggable version of the native code, follow these steps:
+
+1. Clone the [ImGui.NET-nativebuild](https://github.com/mellinoe/ImGui.NET-nativebuild) repo, at the tag matching the version of ImGui.NET you are using.
+2. In the ImGui.NET-nativebuild repo, run `build.cmd debug` or `build.sh debug` (depending on your platform).
+3. Copy the produced binaries (cimgui.dll, libcimgui.so, or libcimgui.dylib) into your application.
+4. Run the program under a native debugger, or enable mixed-mode debugging in Visual Studio.
 
 # See Also
 

deps/cimgui/linux-x64/cimgui.so

@@ -1,23 +1,29 @@
 param (
+    [Parameter(Mandatory=$false)][string]$repository,
     [Parameter(Mandatory=$true)][string]$tag
 )
 
+if( -not $repository )
+{
+    $repository="https://github.com/mellinoe/imgui.net-nativebuild"
+}
+
 Write-Host Downloading native binaries from GitHub Releases...
 
 if (Test-Path $PSScriptRoot\deps\cimgui\)
 {
     Remove-Item $PSScriptRoot\deps\cimgui\ -Force -Recurse | Out-Null
 }
 New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\linux-x64 | Out-Null
-New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-x64 | Out-Null
+New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\osx-universal | Out-Null
 New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x86 | Out-Null
 New-Item -ItemType Directory -Force -Path $PSScriptRoot\deps\cimgui\win-x64 | Out-Null
 
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
 $client = New-Object System.Net.WebClient
 $client.DownloadFile(
-    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x86.dll",
+    "$repository/releases/download/$tag/cimgui.win-x86.dll",
     "$PSScriptRoot/deps/cimgui/win-x86/cimgui.dll")
 if( -not $? )
 {
@@ -29,7 +35,7 @@ if( -not $? )
 Write-Host "- cimgui.dll (x86)"
 
 $client.DownloadFile(
-    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.win-x64.dll",
+    "$repository/releases/download/$tag/cimgui.win-x64.dll",
     "$PSScriptRoot/deps/cimgui/win-x64/$configuration/cimgui.dll")
 if( -not $? )
 {
@@ -41,7 +47,7 @@ if( -not $? )
 Write-Host "- cimgui.dll (x64)"
 
 $client.DownloadFile(
-    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.so",
+    "$repository/releases/download/$tag/cimgui.so",
     "$PSScriptRoot/deps/cimgui/linux-x64/cimgui.so")
 if( -not $? )
 {
@@ -53,13 +59,37 @@ if( -not $? )
 Write-Host - cimgui.so
 
 $client.DownloadFile(
-    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/cimgui.dylib",
-    "$PSScriptRoot/deps/cimgui/osx-x64/cimgui.dylib")
+    "$repository/releases/download/$tag/cimgui.dylib",
+    "$PSScriptRoot/deps/cimgui/osx-universal/cimgui.dylib")
 if( -not $? )
 {
     $msg = $Error[0].Exception.Message
     Write-Error "Couldn't download cimgui.dylib. This most likely indicates the macOS native build failed."
     exit
 }
 
-Write-Host - cimgui.dylib
+Write-Host "- cimgui.dylib"
+
+$client.DownloadFile(
+    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/definitions.json",
+    "$PSScriptRoot/src/CodeGenerator/definitions/cimgui/definitions.json")
+if( -not $? )
+{
+    $msg = $Error[0].Exception.Message
+    Write-Error "Couldn't download definitions.json."
+    exit
+}
+
+Write-Host - definitions.json
+
+$client.DownloadFile(
+    "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$tag/structs_and_enums.json",
+    "$PSScriptRoot/src/CodeGenerator/definitions/cimgui/structs_and_enums.json")
+if( -not $? )
+{
+    $msg = $Error[0].Exception.Message
+    Write-Error "Couldn't download structs_and_enums.json."
+    exit
+}
+
+Write-Host - structs_and_enums.json

deps/cimgui/osx-universal/cimgui.dylib

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+if [ $# -eq 0 ]; then
+    echo "Missing first argument. Please provide the tag to download."
+    exit 1
+fi
+
+TAG=$1
+
+SCRIPT_ROOT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+echo "Script is located in: $SCRIPT_ROOT"
+echo "Using Tag: $TAG"
+
+echo -n "Downloading windows x86 cimgui: "
+curl -sfLo "$SCRIPT_ROOT/deps/cimgui/win-x86/cimgui.dll" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/cimgui.win-x86.dll"
+echo ""
+
+echo -n "Downloading windows x64 cimgui: "
+curl -sfLo "$SCRIPT_ROOT/deps/cimgui/win-x64/cimgui.dll" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/cimgui.win-x64.dll"
+echo ""
+
+echo -n "Downloading linux x64 cimgui: "
+curl -sfLo "$SCRIPT_ROOT/deps/cimgui/linux-x64/cimgui.so" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/cimgui.so"
+echo ""
+
+echo -n "Downloading osx x64 cimgui: "
+curl -sfLo "$SCRIPT_ROOT/deps/cimgui/osx-x64/cimgui.dylib" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/cimgui.dylib"
+echo ""
+
+echo -n "Downloading definitions json file: "
+curl -sfLo "$SCRIPT_ROOT/src/CodeGenerator/definitions/cimgui/definitions.json" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/definitions.json"
+echo ""
+
+echo -n "Downloading structs and enums json file: "
+curl -sfLo "$SCRIPT_ROOT/src/CodeGenerator/definitions/cimgui/structs_and_enums.json" "https://github.com/mellinoe/imgui.net-nativebuild/releases/download/$TAG/structs_and_enums.json"
+echo ""

deps/cimgui/osx-x64/cimgui.dylib

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>