diff --git a/getFNA.sh b/getFNA.sh
index c899546..2e1d67a 100755
--- a/getFNA.sh
+++ b/getFNA.sh
@@ -63,36 +63,6 @@ function updateFNA()
}
-# Clones FNA from the git master branch
-function downloadImGui()
-{
- checkGit
- echo "Downloading ImGui..."
- echo "Temporarily using ImGui.NET branch until ImGui.NET master is updated"
- #git -C $MY_DIR clone https://github.com/mellinoe/ImGui.NET.git --recursive
- git -C $MY_DIR clone -b fix-MonoGame-FNA https://github.com/prime31/ImGui.NET.git --recursive
- if [ $? -eq 0 ]; then
- echo "Finished downloading!"
- else
- echo >&2 "ERROR: Unable to download successfully. Maybe try again later?"
- fi
-}
-
-# Pulls FNA from the git master branch
-function updateImGui()
-{
- checkGit
- echo "Updating to the latest git version of ImGui.NET..."
- git -C "$MY_DIR/ImGui.NET" pull --recurse-submodules
- if [ $? -eq 0 ]; then
- echo "Finished updating!\n"
- else
- echo >&2 "ERROR: Unable to update."
- exit 1
- fi
-}
-
-
# Downloads and extracts prepackaged archive of native libraries ("fnalibs")
function getLibs()
{
@@ -139,14 +109,6 @@ else
fi
-# Dear ImGui
-if [ ! -d "$MY_DIR/ImGui.NET" ]; then
- read -p "Download ImGui.NET (y/n)? " shouldDownload
-else
- read -p "Update ImGui.NET (y/n)? " shouldUpdate
-fi
-
-
# act on the input
# FNA
@@ -161,13 +123,6 @@ if [[ $shouldDownloadLibs =~ ^[Yy]$ ]]; then
getLibs
fi
-# Dear ImGui
-if [[ $shouldDownload =~ ^[Yy]$ ]]; then
- downloadImGui
-elif [[ $shouldUpdate =~ ^[Yy]$ ]]; then
- updateImGui
-fi
-
# install t4 engine
installT4
diff --git a/project_name.sln b/project_name.sln
index bf0682f..76a9c87 100644
--- a/project_name.sln
+++ b/project_name.sln
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "FNA\FNA.csproj", "{3
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nez.FNA", "Nez.FNA\Nez.FNA\Nez.FNA.csproj", "{11A5855C-B12C-4F8D-B935-56F3D0B671C3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET", "ImGui.NET\src\ImGui.NET\ImGui.NET.csproj", "{AD548A1D-01B2-410E-B3ED-ADAC05C3C4A3}"
-EndProject
Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8C576ECC-147D-4B4A-8EC1-56533D26A178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/project_name/ImGui/ImGuiFinalRenderDelegate.cs b/project_name/ImGui/ImGuiFinalRenderDelegate.cs
index 678be53..349dbf1 100644
--- a/project_name/ImGui/ImGuiFinalRenderDelegate.cs
+++ b/project_name/ImGui/ImGuiFinalRenderDelegate.cs
@@ -17,9 +17,9 @@ namespace Nez
public ImGuiFinalRenderDelegate()
{
- var core = typeof(Core).GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null) as Core;
- _imGuiRenderer = new ImGuiRenderer(core);
+ _imGuiRenderer = new ImGuiRenderer(Core.instance);
_imGuiRenderer.RebuildFontAtlas();
+ ImGui.GetIO().ConfigWindowsMoveFromTitleBarOnly = true;
}
public void handleFinalRender( Color letterboxColor, RenderTarget2D source, Rectangle finalRenderDestinationRect, SamplerState samplerState )
diff --git a/project_name/project_name.csproj b/project_name/project_name.csproj
index 934c629..e257a0f 100644
--- a/project_name/project_name.csproj
+++ b/project_name/project_name.csproj
@@ -14,7 +14,6 @@
-
@@ -74,22 +73,30 @@
+
+ $(NuGetPackageRoot)\imgui.net\**\runtimes\
+
+
-
- %(RecursiveDir)%(Filename)%(Extension)
+
+ %(Filename)%(Extension)
PreserveNewest
-
- %(RecursiveDir)%(Filename)%(Extension)
+
+ %(Filename)%(Extension)
PreserveNewest
-
- %(RecursiveDir)%(Filename)%(Extension)
+
+ libcimgui.dylib
PreserveNewest
-
- %(RecursiveDir)%(Filename)%(Extension)
+
+ %(Filename)%(Extension)
PreserveNewest
+
+
+
+