# HG changeset patch # User alys # Date 2020-12-28 20:49:16 # Node ID cc98ce039e4f6f466a8c728ed5fcc1515ffcb899 # Parent 29da918dd164d60dcd657446fdd0e1f3c201e3b6 Add start of dialog. diff --git a/SpriteFontPlus/src/obj/Debug/net45/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SpriteFontPlus/src/obj/Debug/net45/.NETFramework,Version=v4.5.AssemblyAttributes.cs --- a/SpriteFontPlus/src/obj/Debug/net45/.NETFramework,Version=v4.5.AssemblyAttributes.cs +++ b/SpriteFontPlus/src/obj/Debug/net45/.NETFramework,Version=v4.5.AssemblyAttributes.cs @@ -1,4 +1,4 @@ -// -using System; -using System.Reflection; +// +using System; +using System.Reflection; [assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache index 3fdcb09ac3000ba7c7371532a23773ecc71a5344..6d3ee815e64a68d41d0d938dd329345f596bfd94 GIT binary patch literal 137 zc$^FHc6a1rU|`6M-%uc2ut@jC!`EItCxt9U7aE<^e!L)6=i;$_0!kCPTNwxgMj)2a i4=qkDD%MZTsVvsl%PUP!EzvJXOwLYBPc7ERrx^e;2pa(a diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index 39f34da091f6d50da67fa27d01048798faa2b64b..8b46905df1a9cdd53dcba0fb33cbcd01b87e25df GIT binary patch literal 52649 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 diff --git a/SpriteFontPlus/src/obj/project.assets.json b/SpriteFontPlus/src/obj/project.assets.json --- a/SpriteFontPlus/src/obj/project.assets.json +++ b/SpriteFontPlus/src/obj/project.assets.json @@ -2,57 +2,8 @@ "version": 3, "targets": { ".NETFramework,Version=v4.5": { - "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { - "type": "package", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.0" - } - }, - "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { - "type": "package", - "build": { - "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets": {} - } - }, "FNA/1.0.0": { "type": "project", - "framework": ".NETFramework,Version=v4.0", - "compile": { - "bin/placeholder/FNA.dll": {} - }, - "runtime": { - "bin/placeholder/FNA.dll": {} - } - } - }, - ".NETStandard,Version=v2.0": { - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - } - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - }, - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - }, - "build": { - "build/netstandard2.0/NETStandard.Library.targets": {} - } - }, - "FNA/1.0.0": { - "type": "project", - "framework": ".NETStandard,Version=v2.0", "compile": { "bin/placeholder/FNA.dll": {} }, @@ -63,493 +14,15 @@ } }, "libraries": { - "Microsoft.NETCore.Platforms/1.1.0": { - "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "type": "package", - "path": "microsoft.netcore.platforms/1.1.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/netstandard1.0/_._", - "microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "microsoft.netcore.platforms.nuspec", - "runtime.json" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { - "sha512": "7D2TMufjGiowmt0E941kVoTIS+GTNzaPopuzM1/1LSaJAdJdBrVP0SkZW7AgDd0a2U1DjsIeaKG1wxGVBNLDMw==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies/1.0.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", - "microsoft.netframework.referenceassemblies.nuspec" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { - "sha512": "f7XMQsZFaoc3w8Vg3VQ3FHuU2C9vf0Ng5EAV4gzdNWDerPM/OmrzccLj15eI1wCLLXj4jk8+lKsbonzJeyXgQQ==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies.net45/1.0.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "build/.NETFramework/v4.5/Accessibility.dll", - "build/.NETFramework/v4.5/Accessibility.xml", - "build/.NETFramework/v4.5/CustomMarshalers.dll", - "build/.NETFramework/v4.5/CustomMarshalers.xml", - "build/.NETFramework/v4.5/Facades/System.Collections.Concurrent.dll", - "build/.NETFramework/v4.5/Facades/System.Collections.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.Annotations.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.EventBasedAsync.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Contracts.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Debug.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tools.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tracing.dll", - "build/.NETFramework/v4.5/Facades/System.Dynamic.Runtime.dll", - "build/.NETFramework/v4.5/Facades/System.Globalization.dll", - "build/.NETFramework/v4.5/Facades/System.IO.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Expressions.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Parallel.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Queryable.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.dll", - "build/.NETFramework/v4.5/Facades/System.Net.NetworkInformation.dll", - "build/.NETFramework/v4.5/Facades/System.Net.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Net.Requests.dll", - "build/.NETFramework/v4.5/Facades/System.ObjectModel.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.ILGeneration.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.Lightweight.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.dll", - "build/.NETFramework/v4.5/Facades/System.Resources.ResourceManager.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.WindowsRuntime.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Numerics.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Json.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Xml.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.dll", - "build/.NETFramework/v4.5/Facades/System.Security.Principal.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Duplex.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Http.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.NetTcp.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Security.dll", - "build/.NETFramework/v4.5/Facades/System.Text.Encoding.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Text.Encoding.dll", - "build/.NETFramework/v4.5/Facades/System.Text.RegularExpressions.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.Parallel.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.ReaderWriter.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.XDocument.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.XmlSerializer.dll", - "build/.NETFramework/v4.5/ISymWrapper.dll", - "build/.NETFramework/v4.5/ISymWrapper.xml", - "build/.NETFramework/v4.5/Microsoft.Activities.Build.dll", - "build/.NETFramework/v4.5/Microsoft.Activities.Build.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Engine.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Engine.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Framework.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Framework.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.dll", - "build/.NETFramework/v4.5/Microsoft.Build.xml", - "build/.NETFramework/v4.5/Microsoft.CSharp.dll", - "build/.NETFramework/v4.5/Microsoft.CSharp.xml", - "build/.NETFramework/v4.5/Microsoft.JScript.dll", - "build/.NETFramework/v4.5/Microsoft.JScript.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.xml", - "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.dll", - "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.xml", - "build/.NETFramework/v4.5/Microsoft.VisualC.dll", - "build/.NETFramework/v4.5/Microsoft.VisualC.xml", - "build/.NETFramework/v4.5/PermissionSets/FullTrust.xml", - "build/.NETFramework/v4.5/PermissionSets/Internet.xml", - "build/.NETFramework/v4.5/PermissionSets/LocalIntranet.xml", - "build/.NETFramework/v4.5/PresentationBuildTasks.dll", - "build/.NETFramework/v4.5/PresentationBuildTasks.xml", - "build/.NETFramework/v4.5/PresentationCore.dll", - "build/.NETFramework/v4.5/PresentationCore.xml", - "build/.NETFramework/v4.5/PresentationFramework.Aero.dll", - "build/.NETFramework/v4.5/PresentationFramework.Aero.xml", - "build/.NETFramework/v4.5/PresentationFramework.Aero2.dll", - "build/.NETFramework/v4.5/PresentationFramework.AeroLite.dll", - "build/.NETFramework/v4.5/PresentationFramework.Classic.dll", - "build/.NETFramework/v4.5/PresentationFramework.Classic.xml", - "build/.NETFramework/v4.5/PresentationFramework.Luna.dll", - "build/.NETFramework/v4.5/PresentationFramework.Luna.xml", - "build/.NETFramework/v4.5/PresentationFramework.Royale.dll", - "build/.NETFramework/v4.5/PresentationFramework.Royale.xml", - "build/.NETFramework/v4.5/PresentationFramework.dll", - "build/.NETFramework/v4.5/PresentationFramework.xml", - "build/.NETFramework/v4.5/ReachFramework.dll", - "build/.NETFramework/v4.5/ReachFramework.xml", - "build/.NETFramework/v4.5/RedistList/FrameworkList.xml", - "build/.NETFramework/v4.5/System.Activities.Core.Presentation.dll", - "build/.NETFramework/v4.5/System.Activities.Core.Presentation.xml", - "build/.NETFramework/v4.5/System.Activities.DurableInstancing.dll", - "build/.NETFramework/v4.5/System.Activities.DurableInstancing.xml", - "build/.NETFramework/v4.5/System.Activities.Presentation.dll", - "build/.NETFramework/v4.5/System.Activities.Presentation.xml", - "build/.NETFramework/v4.5/System.Activities.dll", - "build/.NETFramework/v4.5/System.Activities.xml", - "build/.NETFramework/v4.5/System.AddIn.Contract.dll", - "build/.NETFramework/v4.5/System.AddIn.Contract.xml", - "build/.NETFramework/v4.5/System.AddIn.dll", - "build/.NETFramework/v4.5/System.AddIn.xml", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.Registration.dll", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.dll", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.xml", - "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.dll", - "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.xml", - "build/.NETFramework/v4.5/System.Configuration.Install.dll", - "build/.NETFramework/v4.5/System.Configuration.Install.xml", - "build/.NETFramework/v4.5/System.Configuration.dll", - "build/.NETFramework/v4.5/System.Configuration.xml", - "build/.NETFramework/v4.5/System.Core.dll", - "build/.NETFramework/v4.5/System.Core.xml", - "build/.NETFramework/v4.5/System.Data.DataSetExtensions.dll", - "build/.NETFramework/v4.5/System.Data.DataSetExtensions.xml", - "build/.NETFramework/v4.5/System.Data.Entity.Design.dll", - "build/.NETFramework/v4.5/System.Data.Entity.Design.xml", - "build/.NETFramework/v4.5/System.Data.Entity.dll", - "build/.NETFramework/v4.5/System.Data.Entity.xml", - "build/.NETFramework/v4.5/System.Data.Linq.dll", - "build/.NETFramework/v4.5/System.Data.Linq.xml", - "build/.NETFramework/v4.5/System.Data.OracleClient.dll", - "build/.NETFramework/v4.5/System.Data.OracleClient.xml", - "build/.NETFramework/v4.5/System.Data.Services.Client.dll", - "build/.NETFramework/v4.5/System.Data.Services.Client.xml", - "build/.NETFramework/v4.5/System.Data.Services.Design.dll", - "build/.NETFramework/v4.5/System.Data.Services.Design.xml", - "build/.NETFramework/v4.5/System.Data.Services.dll", - "build/.NETFramework/v4.5/System.Data.Services.xml", - "build/.NETFramework/v4.5/System.Data.SqlXml.dll", - "build/.NETFramework/v4.5/System.Data.SqlXml.xml", - "build/.NETFramework/v4.5/System.Data.dll", - "build/.NETFramework/v4.5/System.Data.xml", - "build/.NETFramework/v4.5/System.Deployment.dll", - "build/.NETFramework/v4.5/System.Deployment.xml", - "build/.NETFramework/v4.5/System.Design.dll", - "build/.NETFramework/v4.5/System.Design.xml", - "build/.NETFramework/v4.5/System.Device.dll", - "build/.NETFramework/v4.5/System.Device.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.xml", - "build/.NETFramework/v4.5/System.Drawing.Design.dll", - "build/.NETFramework/v4.5/System.Drawing.Design.xml", - "build/.NETFramework/v4.5/System.Drawing.dll", - "build/.NETFramework/v4.5/System.Drawing.xml", - "build/.NETFramework/v4.5/System.EnterpriseServices.Thunk.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.Wrapper.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.xml", - "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.dll", - "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.xml", - "build/.NETFramework/v4.5/System.IO.Compression.dll", - "build/.NETFramework/v4.5/System.IO.Compression.xml", - "build/.NETFramework/v4.5/System.IO.Log.dll", - "build/.NETFramework/v4.5/System.IO.Log.xml", - "build/.NETFramework/v4.5/System.IdentityModel.Selectors.dll", - "build/.NETFramework/v4.5/System.IdentityModel.Selectors.xml", - "build/.NETFramework/v4.5/System.IdentityModel.Services.dll", - "build/.NETFramework/v4.5/System.IdentityModel.Services.xml", - "build/.NETFramework/v4.5/System.IdentityModel.dll", - "build/.NETFramework/v4.5/System.IdentityModel.xml", - "build/.NETFramework/v4.5/System.Management.Instrumentation.dll", - "build/.NETFramework/v4.5/System.Management.Instrumentation.xml", - "build/.NETFramework/v4.5/System.Management.dll", - "build/.NETFramework/v4.5/System.Management.xml", - "build/.NETFramework/v4.5/System.Messaging.dll", - "build/.NETFramework/v4.5/System.Messaging.xml", - "build/.NETFramework/v4.5/System.Net.Http.WebRequest.dll", - "build/.NETFramework/v4.5/System.Net.Http.WebRequest.xml", - "build/.NETFramework/v4.5/System.Net.Http.dll", - "build/.NETFramework/v4.5/System.Net.Http.xml", - "build/.NETFramework/v4.5/System.Net.dll", - "build/.NETFramework/v4.5/System.Net.xml", - "build/.NETFramework/v4.5/System.Numerics.dll", - "build/.NETFramework/v4.5/System.Numerics.xml", - "build/.NETFramework/v4.5/System.Printing.dll", - "build/.NETFramework/v4.5/System.Printing.xml", - "build/.NETFramework/v4.5/System.Reflection.Context.dll", - "build/.NETFramework/v4.5/System.Reflection.Context.xml", - "build/.NETFramework/v4.5/System.Runtime.Caching.dll", - "build/.NETFramework/v4.5/System.Runtime.Caching.xml", - "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.dll", - "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.xml", - "build/.NETFramework/v4.5/System.Runtime.Remoting.dll", - "build/.NETFramework/v4.5/System.Runtime.Remoting.xml", - "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.dll", - "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.xml", - "build/.NETFramework/v4.5/System.Runtime.Serialization.dll", - "build/.NETFramework/v4.5/System.Runtime.Serialization.xml", - "build/.NETFramework/v4.5/System.Security.dll", - "build/.NETFramework/v4.5/System.Security.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Activation.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Activation.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Activities.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Activities.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Channels.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Channels.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Discovery.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Discovery.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Routing.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Routing.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Web.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Web.xml", - "build/.NETFramework/v4.5/System.ServiceModel.dll", - "build/.NETFramework/v4.5/System.ServiceModel.xml", - "build/.NETFramework/v4.5/System.ServiceProcess.dll", - "build/.NETFramework/v4.5/System.ServiceProcess.xml", - "build/.NETFramework/v4.5/System.Speech.dll", - "build/.NETFramework/v4.5/System.Speech.xml", - "build/.NETFramework/v4.5/System.Threading.Tasks.Dataflow.xml", - "build/.NETFramework/v4.5/System.Transactions.dll", - "build/.NETFramework/v4.5/System.Transactions.xml", - "build/.NETFramework/v4.5/System.Web.Abstractions.dll", - "build/.NETFramework/v4.5/System.Web.ApplicationServices.dll", - "build/.NETFramework/v4.5/System.Web.ApplicationServices.xml", - "build/.NETFramework/v4.5/System.Web.DataVisualization.Design.dll", - "build/.NETFramework/v4.5/System.Web.DataVisualization.dll", - "build/.NETFramework/v4.5/System.Web.DataVisualization.xml", - "build/.NETFramework/v4.5/System.Web.DynamicData.Design.dll", - "build/.NETFramework/v4.5/System.Web.DynamicData.Design.xml", - "build/.NETFramework/v4.5/System.Web.DynamicData.dll", - "build/.NETFramework/v4.5/System.Web.DynamicData.xml", - "build/.NETFramework/v4.5/System.Web.Entity.Design.dll", - "build/.NETFramework/v4.5/System.Web.Entity.Design.xml", - "build/.NETFramework/v4.5/System.Web.Entity.dll", - "build/.NETFramework/v4.5/System.Web.Entity.xml", - "build/.NETFramework/v4.5/System.Web.Extensions.Design.dll", - "build/.NETFramework/v4.5/System.Web.Extensions.Design.xml", - "build/.NETFramework/v4.5/System.Web.Extensions.dll", - "build/.NETFramework/v4.5/System.Web.Extensions.xml", - "build/.NETFramework/v4.5/System.Web.Mobile.dll", - "build/.NETFramework/v4.5/System.Web.Mobile.xml", - "build/.NETFramework/v4.5/System.Web.RegularExpressions.dll", - "build/.NETFramework/v4.5/System.Web.RegularExpressions.xml", - "build/.NETFramework/v4.5/System.Web.Routing.dll", - "build/.NETFramework/v4.5/System.Web.Services.dll", - "build/.NETFramework/v4.5/System.Web.Services.xml", - "build/.NETFramework/v4.5/System.Web.dll", - "build/.NETFramework/v4.5/System.Web.xml", - "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.dll", - "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.xml", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.Design.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.xml", - "build/.NETFramework/v4.5/System.Windows.Forms.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.xml", - "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.dll", - "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.xml", - "build/.NETFramework/v4.5/System.Windows.Presentation.dll", - "build/.NETFramework/v4.5/System.Windows.Presentation.xml", - "build/.NETFramework/v4.5/System.Windows.dll", - "build/.NETFramework/v4.5/System.Workflow.Activities.dll", - "build/.NETFramework/v4.5/System.Workflow.Activities.xml", - "build/.NETFramework/v4.5/System.Workflow.ComponentModel.dll", - "build/.NETFramework/v4.5/System.Workflow.ComponentModel.xml", - "build/.NETFramework/v4.5/System.Workflow.Runtime.dll", - "build/.NETFramework/v4.5/System.Workflow.Runtime.xml", - "build/.NETFramework/v4.5/System.WorkflowServices.dll", - "build/.NETFramework/v4.5/System.WorkflowServices.xml", - "build/.NETFramework/v4.5/System.Xaml.dll", - "build/.NETFramework/v4.5/System.Xaml.xml", - "build/.NETFramework/v4.5/System.Xml.Linq.dll", - "build/.NETFramework/v4.5/System.Xml.Linq.xml", - "build/.NETFramework/v4.5/System.Xml.Serialization.dll", - "build/.NETFramework/v4.5/System.Xml.dll", - "build/.NETFramework/v4.5/System.Xml.xml", - "build/.NETFramework/v4.5/System.dll", - "build/.NETFramework/v4.5/System.xml", - "build/.NETFramework/v4.5/UIAutomationClient.dll", - "build/.NETFramework/v4.5/UIAutomationClient.xml", - "build/.NETFramework/v4.5/UIAutomationClientsideProviders.dll", - "build/.NETFramework/v4.5/UIAutomationClientsideProviders.xml", - "build/.NETFramework/v4.5/UIAutomationProvider.dll", - "build/.NETFramework/v4.5/UIAutomationProvider.xml", - "build/.NETFramework/v4.5/UIAutomationTypes.dll", - "build/.NETFramework/v4.5/UIAutomationTypes.xml", - "build/.NETFramework/v4.5/WindowsBase.dll", - "build/.NETFramework/v4.5/WindowsBase.xml", - "build/.NETFramework/v4.5/WindowsFormsIntegration.dll", - "build/.NETFramework/v4.5/WindowsFormsIntegration.xml", - "build/.NETFramework/v4.5/XamlBuildTask.dll", - "build/.NETFramework/v4.5/XamlBuildTask.xml", - "build/.NETFramework/v4.5/mscorlib.dll", - "build/.NETFramework/v4.5/mscorlib.xml", - "build/.NETFramework/v4.5/sysglobl.dll", - "build/.NETFramework/v4.5/sysglobl.xml", - "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets", - "microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", - "microsoft.netframework.referenceassemblies.net45.nuspec" - ] - }, - "NETStandard.Library/2.0.3": { - "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "type": "package", - "path": "netstandard.library/2.0.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "build/netstandard2.0/NETStandard.Library.targets", - "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", - "build/netstandard2.0/ref/System.AppContext.dll", - "build/netstandard2.0/ref/System.Collections.Concurrent.dll", - "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", - "build/netstandard2.0/ref/System.Collections.Specialized.dll", - "build/netstandard2.0/ref/System.Collections.dll", - "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", - "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", - "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", - "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", - "build/netstandard2.0/ref/System.ComponentModel.dll", - "build/netstandard2.0/ref/System.Console.dll", - "build/netstandard2.0/ref/System.Core.dll", - "build/netstandard2.0/ref/System.Data.Common.dll", - "build/netstandard2.0/ref/System.Data.dll", - "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", - "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", - "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", - "build/netstandard2.0/ref/System.Diagnostics.Process.dll", - "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", - "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", - "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", - "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", - "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", - "build/netstandard2.0/ref/System.Drawing.Primitives.dll", - "build/netstandard2.0/ref/System.Drawing.dll", - "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", - "build/netstandard2.0/ref/System.Globalization.Calendars.dll", - "build/netstandard2.0/ref/System.Globalization.Extensions.dll", - "build/netstandard2.0/ref/System.Globalization.dll", - "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", - "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", - "build/netstandard2.0/ref/System.IO.Compression.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.dll", - "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", - "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", - "build/netstandard2.0/ref/System.IO.Pipes.dll", - "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", - "build/netstandard2.0/ref/System.IO.dll", - "build/netstandard2.0/ref/System.Linq.Expressions.dll", - "build/netstandard2.0/ref/System.Linq.Parallel.dll", - "build/netstandard2.0/ref/System.Linq.Queryable.dll", - "build/netstandard2.0/ref/System.Linq.dll", - "build/netstandard2.0/ref/System.Net.Http.dll", - "build/netstandard2.0/ref/System.Net.NameResolution.dll", - "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", - "build/netstandard2.0/ref/System.Net.Ping.dll", - "build/netstandard2.0/ref/System.Net.Primitives.dll", - "build/netstandard2.0/ref/System.Net.Requests.dll", - "build/netstandard2.0/ref/System.Net.Security.dll", - "build/netstandard2.0/ref/System.Net.Sockets.dll", - "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", - "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", - "build/netstandard2.0/ref/System.Net.WebSockets.dll", - "build/netstandard2.0/ref/System.Net.dll", - "build/netstandard2.0/ref/System.Numerics.dll", - "build/netstandard2.0/ref/System.ObjectModel.dll", - "build/netstandard2.0/ref/System.Reflection.Extensions.dll", - "build/netstandard2.0/ref/System.Reflection.Primitives.dll", - "build/netstandard2.0/ref/System.Reflection.dll", - "build/netstandard2.0/ref/System.Resources.Reader.dll", - "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", - "build/netstandard2.0/ref/System.Resources.Writer.dll", - "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", - "build/netstandard2.0/ref/System.Runtime.Extensions.dll", - "build/netstandard2.0/ref/System.Runtime.Handles.dll", - "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", - "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", - "build/netstandard2.0/ref/System.Runtime.Numerics.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.dll", - "build/netstandard2.0/ref/System.Runtime.dll", - "build/netstandard2.0/ref/System.Security.Claims.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", - "build/netstandard2.0/ref/System.Security.Principal.dll", - "build/netstandard2.0/ref/System.Security.SecureString.dll", - "build/netstandard2.0/ref/System.ServiceModel.Web.dll", - "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", - "build/netstandard2.0/ref/System.Text.Encoding.dll", - "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", - "build/netstandard2.0/ref/System.Threading.Overlapped.dll", - "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", - "build/netstandard2.0/ref/System.Threading.Tasks.dll", - "build/netstandard2.0/ref/System.Threading.Thread.dll", - "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", - "build/netstandard2.0/ref/System.Threading.Timer.dll", - "build/netstandard2.0/ref/System.Threading.dll", - "build/netstandard2.0/ref/System.Transactions.dll", - "build/netstandard2.0/ref/System.ValueTuple.dll", - "build/netstandard2.0/ref/System.Web.dll", - "build/netstandard2.0/ref/System.Windows.dll", - "build/netstandard2.0/ref/System.Xml.Linq.dll", - "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", - "build/netstandard2.0/ref/System.Xml.Serialization.dll", - "build/netstandard2.0/ref/System.Xml.XDocument.dll", - "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", - "build/netstandard2.0/ref/System.Xml.XPath.dll", - "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", - "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", - "build/netstandard2.0/ref/System.Xml.dll", - "build/netstandard2.0/ref/System.dll", - "build/netstandard2.0/ref/mscorlib.dll", - "build/netstandard2.0/ref/netstandard.dll", - "build/netstandard2.0/ref/netstandard.xml", - "lib/netstandard1.0/_._", - "netstandard.library.2.0.3.nupkg.sha512", - "netstandard.library.nuspec" - ] - }, "FNA/1.0.0": { "type": "project", - "path": "../../FNA/FNA.Core.csproj", - "msbuildProject": "../../FNA/FNA.Core.csproj" + "path": "../../FNA/FNA.csproj", + "msbuildProject": "../../FNA/FNA.csproj" } }, "projectFileDependencyGroups": { ".NETFramework,Version=v4.5": [ - "FNA >= 1.0.0", - "Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0" - ], - ".NETStandard,Version=v2.0": [ - "FNA >= 1.0.0", - "NETStandard.Library >= 2.0.3" + "FNA >= 1.0.0" ] }, "packageFolders": { @@ -558,19 +31,17 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "projectName": "SpriteFontPlus", - "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "packagesPath": "/Users/alys/.nuget/packages/", "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", "projectStyle": "PackageReference", - "crossTargeting": true, "configFilePaths": [ - "/Users/alys/.nuget/NuGet/NuGet.Config" + "/Users/alys/.config/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net45", - "netstandard2.0" + "net45" ], "sources": { "https://api.nuget.org/v3/index.json": {} @@ -579,16 +50,8 @@ "net45": { "targetAlias": "net45", "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" - } - } - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" + "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { + "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" } } } @@ -602,36 +65,6 @@ "frameworks": { "net45": { "targetAlias": "net45", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.0, )", - "autoReferenced": true - } - }, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.101/RuntimeIdentifierGraph.json" - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "dependencies": { - "NETStandard.Library": { - "suppressParent": "All", - "target": "Package", - "version": "[2.0.3, )", - "autoReferenced": true - } - }, - "imports": [ - "net461", - "net462", - "net47", - "net471", - "net472", - "net48" - ], - "assetTargetFallback": true, - "warn": true, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.101/RuntimeIdentifierGraph.json" } } diff --git a/SpriteFontPlus/src/obj/project.nuget.cache b/SpriteFontPlus/src/obj/project.nuget.cache --- a/SpriteFontPlus/src/obj/project.nuget.cache +++ b/SpriteFontPlus/src/obj/project.nuget.cache @@ -1,13 +1,8 @@ { "version": 2, - "dgSpecHash": "dhPKFNw3z61lLgG5PTvU/tAz8W8Gveld8QdJGcXz/4LRQNmoXX1loh3ovHxBwpw4TffVugyuIKzijuNDfBZoxg==", + "dgSpecHash": "K2eZWc96szHBhsBHLdQISlDUCUoBqbOO/kuQg7JxPZ+7eqqDfW+UGRDZiMDlRv4HxmSNa76l7Elv0ZO48kh6uw==", "success": true, - "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", - "expectedPackageFiles": [ - "/Users/alys/.nuget/packages/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512" - ], + "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", + "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/isometric-park-fna/DebugWindow.cs b/isometric-park-fna/DebugWindow.cs --- a/isometric-park-fna/DebugWindow.cs +++ b/isometric-park-fna/DebugWindow.cs @@ -27,10 +27,17 @@ private Texture2D _xnaTexture; private IntPtr _imGuiTexture; + private bool show_test_window; + + public ImFontPtr monoFont; public DebugWindow(ImGuiRenderer _imGuiRenderer, GraphicsDevice graphicsDevice) { + ImGuiIOPtr io = ImGui.GetIO(); + this.monoFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-medium.ttf", 15); + _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering + _xnaTexture = CreateTexture(graphicsDevice, 300, 150, pixel => { @@ -91,12 +98,12 @@ } - public virtual void Layout(DebugInfo debugInfo, Dictionary additionalInfo, ref bool show_another_window) + public virtual void Layout(DebugInfo debugInfo, Dictionary additionalInfo, ref bool show) { - if (show_another_window) + if (show) { - ImGui.Begin("Debug", ref show_another_window); + ImGui.Begin("Debug", ref show); ImGui.Text(string.Format("fps: {0:F3}", debugInfo.fps)); ImGui.Text(string.Format("Draw Time: {0:F3}", debugInfo.drawTime.TotalMilliseconds.ToString())); @@ -105,7 +112,10 @@ ImGui.Text(string.Format("Application average {0:F3} ms/frame ({1:F1} FPS", 1000f / ImGui.GetIO().Framerate, ImGui.GetIO().Framerate)); - + if (ImGui.Button("Test Window")) + { + this.show_test_window = !this.show_test_window; + } if (debugInfo.pastFps.Length >= 1) { ImGui.PlotLines("Frame Rate", ref debugInfo.pastFps[0], debugInfo.pastFps.Length); @@ -113,7 +123,13 @@ ImGui.End(); } - + + if (this.show_test_window) + { + ImGui.SetNextWindowPos(new Num.Vector2(650, 20), ImGuiCond.FirstUseEver); + ImGui.ShowDemoWindow(ref show_test_window); + } + } } } diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -11,7 +11,7 @@ using isometricparkfna; using System.Diagnostics; using ImGuiNET.SampleProgram.XNA; - +using ImGuiNET; class FNAGame : Game { @@ -64,8 +64,8 @@ private ImGuiRenderer _imGuiRenderer; private DebugWindow debugWindow; bool show_another_window; - - + private bool showInitial; + int messageIndex; private static void Main(string[] args) { @@ -107,6 +107,9 @@ } } + showInitial = true; + messageIndex = 0; + Content.RootDirectory = "Content"; @@ -119,7 +122,7 @@ */ this.IsMouseVisible = true; - _imGuiRenderer = new ImGuiRenderer(this); + _imGuiRenderer = new ImGuiRenderer(this); _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering base.Initialize(); @@ -296,9 +299,9 @@ this.camera.ZoomIn(); } - if (keyboardCur.IsKeyDown(Keys.OemBackslash)) + if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash)) { - this.show_another_window = true; + this.show_another_window = !this.show_another_window; } @@ -701,9 +704,25 @@ //Finally, draw the debug window _imGuiRenderer.BeforeLayout(gameTime); debugWindow.Layout(debugInfo, new Dictionary(),ref show_another_window); - _imGuiRenderer.AfterLayout(); + String[] messages = { "Message1", "Message2" }; + + if (showInitial && (messageIndex < messages.Length)) + { + ImGui.Begin("Welcome", ref showInitial); + ImGui.PushFont(debugWindow.monoFont); + ImGui.Text(messages[messageIndex]); + if(ImGui.Button("Okay")) + { + messageIndex++; + } + + ImGui.PopFont(); + + } + + _imGuiRenderer.AfterLayout(); stopWatch.Stop(); this.drawTime = stopWatch.Elapsed;