Skip to content

Commit

Permalink
Update to newest version
Browse files Browse the repository at this point in the history
  • Loading branch information
BeastLe9enD committed Jul 16, 2022
1 parent a7abd9a commit cda9332
Show file tree
Hide file tree
Showing 154 changed files with 29 additions and 43,518 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
bin/
obj/
.vs/
.idea/
Binary file removed MonoGame.ImGui/.DS_Store
Binary file not shown.
25 changes: 0 additions & 25 deletions MonoGame.ImGui/.vs/MonoGame.ImGui/xs/UserPrefs.xml

This file was deleted.

This file was deleted.

Empty file.
Binary file not shown.
3 changes: 1 addition & 2 deletions MonoGame.ImGui/Data/InputData.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using ImGuiNET;
using ImGuiNET;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;

namespace MonoGame.ImGui.Exceptions
namespace MonoGame.ImGui.Exceptions
{
public class MissingLoadedTextureKeyException
: InvalidOperationException
Expand Down
3 changes: 1 addition & 2 deletions MonoGame.ImGui/ImGUIRenderer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;
using ImGuiNET;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
Expand Down
108 changes: 16 additions & 92 deletions MonoGame.ImGui/MonoGame.ImGui.csproj
Original file line number Diff line number Diff line change
@@ -1,98 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\NuGet.Build.Packaging.0.2.5-dev.8\build\NuGet.Build.Packaging.props" Condition="Exists('packages\NuGet.Build.Packaging.0.2.5-dev.8\build\NuGet.Build.Packaging.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3A83CBED-E155-46C8-9CD8-F713AFB2B478}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>MonoGame.ImGui</RootNamespace>
<AssemblyName>MonoGame.ImGui</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<PackOnBuild>true</PackOnBuild>
<PackageVersion>1.0</PackageVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<Summary>A Monogame wrapper for ImGui.NET</Summary>
<PackageTags>imgui, monogame, imgui.net</PackageTags>
<Title>Monogame.ImGui</Title>
<Authors>Dovydas Vaičiukynas, Amir Barak</Authors>
<PackageProjectUrl>https://github.com/dovker/Monogame.ImGui</PackageProjectUrl>
<Description>This is a Monogame wrapper for the ImGui.NET Library. Monogame.ImGui lets you build graphical interfaces for your Monogame games / in-game tools using a simple immediate-mode style.</Description>
<PackageId>Monogame.ImGui</PackageId>
<PackageLicenseUrl>https://github.com/dovker/Monogame.ImGui/blob/master/LICENSE</PackageLicenseUrl>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\Target\Debug-AnyCPU\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\Target\Release-AnyCPU\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Buffers">
<HintPath>$(SolutionDir)\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.Numerics.Vectors">
<HintPath>$(SolutionDir)\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe">
<HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="ImGui.NET">
<HintPath>$(SolutionDir)\packages\ImGui.NET.1.72.0\lib\netstandard2.0\ImGui.NET.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Compile Include="Data\IndexData.cs" />
<Compile Include="Data\InputData.cs" />
<Compile Include="Data\TextureData.cs" />
<Compile Include="Data\VertexData.cs" />
<Compile Include="DrawText.cs" />
<Compile Include="DrawVertDecleration.cs" />
<Compile Include="Exceptions\MissingLoadedTextureKeyException.cs" />
<Compile Include="Extensions\DataConvertExtensions.cs" />
<Compile Include="ImGUIRenderer.cs" />
<Compile Include="Utilities\GenerateRasterizerState.cs" />
<PackageReference Include="ImGui.NET" Version="1.87.3" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets'))" />
</Target>
<Import Project="$(SolutionDir)\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('$(SolutionDir)\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" />
<Import Project="$(SolutionDir)\packages\ImGui.NET.1.72.0\build\net40\ImGui.NET.targets" Condition="Exists('$(SolutionDir)\packages\ImGui.NET.1.72.0\build\net40\ImGui.NET.targets')" />
<Import Project="packages\NuGet.Build.Packaging.0.2.5-dev.8\build\NuGet.Build.Packaging.targets" Condition="Exists('packages\NuGet.Build.Packaging.0.2.5-dev.8\build\NuGet.Build.Packaging.targets')" />
</Project>

</Project>
13 changes: 6 additions & 7 deletions MonoGame.ImGui/MonoGame.ImGui.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.ImGui", "MonoGame.ImGui.csproj", "{3A83CBED-E155-46C8-9CD8-F713AFB2B478}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monogame.ImGui", "Monogame.ImGui.csproj", "{C43A43C8-7FF1-4A17-ABA7-E3CED213EFBC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3A83CBED-E155-46C8-9CD8-F713AFB2B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A83CBED-E155-46C8-9CD8-F713AFB2B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A83CBED-E155-46C8-9CD8-F713AFB2B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A83CBED-E155-46C8-9CD8-F713AFB2B478}.Release|Any CPU.Build.0 = Release|Any CPU
{C43A43C8-7FF1-4A17-ABA7-E3CED213EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C43A43C8-7FF1-4A17-ABA7-E3CED213EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C43A43C8-7FF1-4A17-ABA7-E3CED213EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C43A43C8-7FF1-4A17-ABA7-E3CED213EFBC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Binary file not shown.
Empty file.

This file was deleted.

This file was deleted.

Binary file removed MonoGame.ImGui/obj/Debug/MonoGame.ImGui.dll
Binary file not shown.
Binary file removed MonoGame.ImGui/obj/Debug/MonoGame.ImGui.pdb
Binary file not shown.
Empty file.
Empty file.
Empty file.
Empty file.

This file was deleted.

This file was deleted.

Binary file removed MonoGame.ImGui/obj/Release/MonoGame.ImGui.dll
Binary file not shown.
Binary file removed MonoGame.ImGui/obj/Release/MonoGame.ImGui.pdb
Binary file not shown.
9 changes: 0 additions & 9 deletions MonoGame.ImGui/packages.config

This file was deleted.

Binary file removed MonoGame.ImGui/packages/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit cda9332

Please sign in to comment.