Changes from my assembly-browser project

internals
Eric Mellino 9 years ago
parent 4dd6a3db15
commit af11e21acc
  1. 2
      src/ImGui.NET/Align.cs
  2. 2
      src/ImGui.NET/ColorEditMode.cs
  3. 2
      src/ImGui.NET/ColorTarget.cs
  4. 2
      src/ImGui.NET/DrawCmd.cs
  5. 2
      src/ImGui.NET/DrawData.cs
  6. 2
      src/ImGui.NET/DrawList.cs
  7. 2
      src/ImGui.NET/DrawVert.cs
  8. 2
      src/ImGui.NET/Font.cs
  9. 2
      src/ImGui.NET/FontAtlas.cs
  10. 2
      src/ImGui.NET/FontConfig.cs
  11. 2
      src/ImGui.NET/GuiKey.cs
  12. 2
      src/ImGui.NET/IO.cs
  13. 3
      src/ImGui.NET/ImGui.NET.csproj
  14. 2
      src/ImGui.NET/ImGui.cs
  15. 38
      src/ImGui.NET/ImGuiNative.cs
  16. 2
      src/ImGui.NET/ImVector.cs
  17. 2
      src/ImGui.NET/InputTextFlags.cs
  18. 2
      src/ImGui.NET/MouseCursorKind.cs
  19. 2
      src/ImGui.NET/SelectableFlags.cs
  20. 2
      src/ImGui.NET/SetCondition.cs
  21. 2
      src/ImGui.NET/Storage.cs
  22. 2
      src/ImGui.NET/Style.cs
  23. 2
      src/ImGui.NET/StyleVar.cs
  24. 2
      src/ImGui.NET/TextEditCallback.cs
  25. 2
      src/ImGui.NET/TextEditCallbackData.cs
  26. 2
      src/ImGui.NET/WindowFlags.cs

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
public enum Align public enum Align
{ {

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Enumeration for ColorEditMode() /// Enumeration for ColorEditMode()

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Enumeration for PushStyleColor() / PopStyleColor() /// Enumeration for PushStyleColor() / PopStyleColor()

@ -2,7 +2,7 @@
using System.Numerics; using System.Numerics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Typically, 1 command = 1 gpu draw call (unless command is a callback) /// Typically, 1 command = 1 gpu draw call (unless command is a callback)

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
// All draw data to render an ImGui frame // All draw data to render an ImGui frame
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Draw command list /// Draw command list

@ -1,7 +1,7 @@
using System.Numerics; using System.Numerics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct DrawVert public unsafe struct DrawVert

@ -2,7 +2,7 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Numerics; using System.Numerics;
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Font runtime data and rendering. /// Font runtime data and rendering.

@ -2,7 +2,7 @@
using System; using System;
using System.Numerics; using System.Numerics;
namespace ImGui namespace ImGuiNET
{ {
// Load and rasterize multiple TTF fonts into a same texture. // Load and rasterize multiple TTF fonts into a same texture.
// Sharing a texture for multiple fonts allows us to reduce the number of draw calls during rendering. // Sharing a texture for multiple fonts allows us to reduce the number of draw calls during rendering.

@ -2,7 +2,7 @@
using System.Numerics; using System.Numerics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct FontConfig public unsafe struct FontConfig

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array /// User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array

@ -2,7 +2,7 @@
using System.Numerics; using System.Numerics;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct IO public unsafe struct IO

@ -80,6 +80,9 @@
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<None Include="project.json" /> <None Include="project.json" />
</ItemGroup> </ItemGroup>

@ -1,6 +1,6 @@
using System.Numerics; using System.Numerics;
namespace ImGui namespace ImGuiNET
{ {
public static class ImGui public static class ImGui
{ {

@ -2,7 +2,7 @@
using System.Numerics; using System.Numerics;
using System; using System;
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Contains all of the exported functions from the native (c)imGui module. /// Contains all of the exported functions from the native (c)imGui module.
@ -30,6 +30,17 @@ namespace ImGui
public static extern void igShowUserGuide(); public static extern void igShowUserGuide();
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern void igShowStyleEditor(ref Style @ref); public static extern void igShowStyleEditor(ref Style @ref);
public static void igBegin(string v, ref object _mainWindowOpened, WindowFlags windowFlags)
{
throw new NotImplementedException();
}
public static void igBeginChildFrame(uint _leftFrameId, Vector2 vector2)
{
throw new NotImplementedException();
}
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern void igShowTestWindow(ref bool opened); public static extern void igShowTestWindow(ref bool opened);
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
@ -52,6 +63,12 @@ namespace ImGui
public static extern void igGetContentRegionMax(out Vector2 @out); public static extern void igGetContentRegionMax(out Vector2 @out);
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern void igGetContentRegionAvail(out Vector2 @out); public static extern void igGetContentRegionAvail(out Vector2 @out);
public static void igSliderFloat(string v1, ref object _sliderVal, float v2, float v3, string v4, int v5)
{
throw new NotImplementedException();
}
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern float igGetContentRegionAvailWidth(); public static extern float igGetContentRegionAvailWidth();
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
@ -494,8 +511,23 @@ namespace ImGui
public static extern void igOpenPopup(string str_id); public static extern void igOpenPopup(string str_id);
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern bool igBeginPopup(string str_id); public static extern bool igBeginPopup(string str_id);
[DllImport(cimguiLib)] [DllImport(cimguiLib, CharSet=CharSet.Ansi)]
public static extern bool igBeginPopupModal(string name, ref bool p_opened, WindowFlags extra_flags); public static extern bool igBeginPopupModal(string name, byte* p_opened, WindowFlags extra_flags);
public static bool igBeginPopupModal(string name, WindowFlags extra_flags)
{
return igBeginPopupModal(name, null, extra_flags);
}
public static bool igBeginPopupModal(string name, ref bool p_opened, WindowFlags extra_flags)
{
byte value = p_opened ? (byte)1 : (byte)0;
bool result = igBeginPopupModal(name, &value, extra_flags);
p_opened = value == 1 ? true : false;
return result;
}
[DllImport(cimguiLib)] [DllImport(cimguiLib)]
public static extern bool igBeginPopupContextItem(string str_id, int mouse_button); public static extern bool igBeginPopupContextItem(string str_id, int mouse_button);
[DllImport(cimguiLib)] [DllImport(cimguiLib)]

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct ImVector public unsafe struct ImVector

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Flags for ImGui.InputText() /// Flags for ImGui.InputText()

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Enumeration for GetMouseCursor() /// Enumeration for GetMouseCursor()

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Flags for ImGui::Selectable() /// Flags for ImGui::Selectable()

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Condition flags for ImGui::SetWindow***(), SetNextWindow***(), SetNextTreeNode***() functions. /// Condition flags for ImGui::SetWindow***(), SetNextWindow***(), SetNextTreeNode***() functions.

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct Storage public unsafe struct Storage

@ -1,7 +1,7 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Numerics; using System.Numerics;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct Style public unsafe struct Style

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Enumeration for PushStyleVar() / PopStyleVar() /// Enumeration for PushStyleVar() / PopStyleVar()

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
public unsafe delegate int TextEditCallback(TextEditCallbackData* data); public unsafe delegate int TextEditCallback(TextEditCallbackData* data);
} }

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace ImGui namespace ImGuiNET
{ {
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public unsafe struct TextEditCallbackData public unsafe struct TextEditCallbackData

@ -1,4 +1,4 @@
namespace ImGui namespace ImGuiNET
{ {
/// <summary> /// <summary>
/// Flags for ImGui::Begin() /// Flags for ImGui::Begin()

Loading…
Cancel
Save