Merge drawlist branch and clean up repository.

* The drawlist branch includes a bunch of additional wrapper methods for
  ImDrawList stuff. As part of that, the DrawList type had some minor
  refactoring to it, in a way that closely mirrors other native types.
  There is now a "managed" DrawList type, and a "raw" NativeDrawList type.
  The DrawList type is a safe convenience wrapper over the native type,
  which is still there if needed. Not all ImDrawList functions have
  convenience wrappers yet, but there are enough to build quite a few
  things with.
* This is also a fairly large reorganization and updating of the build files in
  the repository. Given that a stable version of the .NET Core tools have
  been release, I've updated all of the project files to use the new
  project syntax exclusively. There is now only one project for ImGui,
  which targets .NET Standard 1.1 using the new SDK syntax. There is a
  single sample project as well, targeting .NET Core 1.0. .NET Framework
  is still supported, because the library still targets .NET Standard 1.1.
internals
Eric Mellino 8 years ago
parent 499fb6902b
commit fb07155d34
  1. 3
      .gitmodules
  2. 11
      Directory.Build.props
  3. 20
      build.proj
  4. 1
      corebuild
  5. BIN
      deps/OpenTK/OpenTK.dll
  6. 443128
      deps/OpenTK/OpenTK.xml
  7. 6
      dir.props
  8. 3
      dir.targets
  9. 6
      src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
  10. 2
      src/ImGui.NET.SampleProgram/SampleWindow.cs
  11. 15
      src/ImGui.NET.SampleProgram/imgui.ini
  12. 42
      src/ImGui.NET.sln
  13. 2
      src/ImGui.NET/ImGui.NET.csproj

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "corebuild"]
path = corebuild
url = https://github.com/mellinoe/corebuild

@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir">
<PropertyGroup>
<RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
<BinDir>$(RepositoryRootDirectory)bin</BinDir>
<OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\$(MSBuildProjectName)</OutputPath>
<OutDir>$(OutputPath)</OutDir>
<RootOutDir>$(OutDir)</RootOutDir>
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\obj\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
<ExtDir>$(MSBuildThisFileDirectory)\ext</ExtDir>
</PropertyGroup>
</Project>

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dir.props" />
<ItemGroup>
<Project Include="src\**\*.csproj" />
</ItemGroup>
<Target Name="Build">
<MSBuild Projects="@(Project)"
ContinueOnError="ErrorAndContinue" />
</Target>
<Target Name="Clean">
<RemoveDir Directories="$(BinDir)" />
</Target>
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
</Project>

@ -1 +0,0 @@
Subproject commit c50a9fe00c2318a431c9940bcbd63feb97d29a25

Binary file not shown.

443128
deps/OpenTK/OpenTK.xml vendored

File diff suppressed because it is too large Load Diff

@ -1,6 +0,0 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\corebuild\corebuild.props" />
<PropertyGroup>
<DepsDir>$(ProjectDir)deps\</DepsDir>
</PropertyGroup>
</Project>

@ -1,3 +0,0 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)\corebuild\corebuild.targets" />
</Project>

@ -2,20 +2,14 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework> <TargetFramework>netcoreapp1.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>portable</DebugType>
<AssemblyName>ImGui.NET.SampleProgram</AssemblyName> <AssemblyName>ImGui.NET.SampleProgram</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Link="cimgui.dll"> <None Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Link="cimgui.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImGui.NET\ImGui.NET.csproj" /> <ProjectReference Include="..\ImGui.NET\ImGui.NET.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenTK.NETCore" Version="1.1.2364.6424" /> <PackageReference Include="OpenTK.NETCore" Version="1.1.2364.6424" />
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -391,7 +391,7 @@ namespace ImGuiNET
for (int n = 0; n < draw_data->CmdListsCount; n++) for (int n = 0; n < draw_data->CmdListsCount; n++)
{ {
DrawList* cmd_list = draw_data->CmdLists[n]; NativeDrawList* cmd_list = draw_data->CmdLists[n];
byte* vtx_buffer = (byte*)cmd_list->VtxBuffer.Data; byte* vtx_buffer = (byte*)cmd_list->VtxBuffer.Data;
ushort* idx_buffer = (ushort*)cmd_list->IdxBuffer.Data; ushort* idx_buffer = (ushort*)cmd_list->IdxBuffer.Data;

@ -0,0 +1,15 @@
[Debug]
Pos=60,60
Size=400,400
Collapsed=0
[ImGUI.NET Sample Program]
Pos=5,10
Size=950,520
Collapsed=0
[Memory editor]
Pos=210,80
Size=594,403
Collapsed=0

@ -1,46 +1,26 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26120.4 VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET", "ImGui.NET\ImGui.NET.csproj", "{BD7ACEC1-4B57-491F-833A-8542FB824F84}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET", "ImGui.NET\ImGui.NET.csproj", "{AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET.SampleProgram", "ImGui.NET.SampleProgram\ImGui.NET.SampleProgram.csproj", "{79FCECB1-6190-41CF-BAF5-2D0906A59F02}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET.SampleProgram", "ImGui.NET.SampleProgram\ImGui.NET.SampleProgram.csproj", "{0FBA4057-7708-4FCC-B0D2-D049E647DC5A}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|Any CPU.Build.0 = Debug|Any CPU {AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x64.ActiveCfg = Debug|x64 {AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x64.Build.0 = Debug|x64 {AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}.Release|Any CPU.Build.0 = Release|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x86.ActiveCfg = Debug|x86 {0FBA4057-7708-4FCC-B0D2-D049E647DC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x86.Build.0 = Debug|x86 {0FBA4057-7708-4FCC-B0D2-D049E647DC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|Any CPU.ActiveCfg = Release|Any CPU {0FBA4057-7708-4FCC-B0D2-D049E647DC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|Any CPU.Build.0 = Release|Any CPU {0FBA4057-7708-4FCC-B0D2-D049E647DC5A}.Release|Any CPU.Build.0 = Release|Any CPU
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x64.ActiveCfg = Release|x64
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x64.Build.0 = Release|x64
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x86.ActiveCfg = Release|x86
{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x86.Build.0 = Release|x86
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x64.ActiveCfg = Debug|x64
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x64.Build.0 = Debug|x64
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x86.ActiveCfg = Debug|x86
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x86.Build.0 = Debug|x86
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|Any CPU.Build.0 = Release|Any CPU
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x64.ActiveCfg = Release|x64
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x64.Build.0 = Release|x64
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x86.ActiveCfg = Release|x86
{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl> <PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\Release\ImGui.NET.xml</DocumentationFile> <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" /> <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />

Loading…
Cancel
Save