diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache index fa583116edf1dfeb60f3c50d140933201a36585a..7dcce0e548e46b90764d6354561e1e2dd771f572 GIT binary patch literal 137 zc$^FHc6a1rU|`6Y`Lft-vc#^t2G_eM*SatqnQarhm({N558oPxa1XnEtqg<#BM{5z ihZd(673(MFR2J*&<&~zVmgpBGCTAz6rxxqu(+mI~z8cH` diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index ea7981152f806327258b6d961105e05cd386fa83..60faec5b3219920fe6a5b9d24416ee1623503b1e GIT binary patch literal 20937 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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,37 +31,26 @@ "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": {} }, "frameworks": { "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" } } } @@ -601,38 +63,7 @@ }, "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.201/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.201/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/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": "AvKmYKc88bJckphAgHXheUIHeesAncWXbgk6/PQVuxOzmKwDSFnsyg9u++EKNsxOlDt4tDOOVkyfDMjvYvNCKQ==", + "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==", "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/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -323,6 +323,8 @@ batch.Dispose(); sound.Dispose(); Tile.TileSetTexture.Dispose(); + Quad.PixelTexture.Dispose(); + Quad.SolidTexture.Dispose(); } Vector2 calculateMousegrid(Vector2 normalizedMousePos) @@ -697,9 +699,14 @@ Tile.DrawOutlinedSquares(batch, new Vector2[] {new Vector2(19, 1), new Vector2(19, 2), new Vector2(20, 1), new Vector2(21, 1), new Vector2(21, 2), new Vector2(19, 3), new Vector2(20, 3), new Vector2(21, 3)}, Color.Purple); - Quad.FillSquare2(batch, 7, 4, Color.Orange, 1.0f); - Quad.FillSquare2(batch, 7, 3, Color.Yellow, 1.0f); - Quad.FillSquare2(batch, 7, 5, Color.Yellow, .5f); + Quad.FillSquare2(batch, 7, 4, Color.Orange, 1.0f, 0.79f); + Quad.FillSquare2(batch, 7, 3, Color.Yellow, 1.0f, 0.79f); + Quad.FillSquare2(batch, 7, 5, Color.Yellow, .5f, 0.79f); + Quad.FillSquare2(batch, 7, 6, Color.Yellow, .25f, 0.79f); + Quad.FillSquare2(batch, 7, 7, Color.Yellow, .125f, 0.79f); + Quad.FillSquare2(batch, 8, 5, Color.Teal, .5f, 0.79f); + Quad.FillSquare2(batch, 8, 6, Color.Teal, .25f, 0.79f); + Quad.FillSquare2(batch, 8, 7, Color.Teal, .125f, 0.79f); #endif diff --git a/isometric-park-fna/Quad.cs b/isometric-park-fna/Quad.cs --- a/isometric-park-fna/Quad.cs +++ b/isometric-park-fna/Quad.cs @@ -80,49 +80,28 @@ } } - public static void FillSquare2(SpriteBatch batch, int x, int y, Color color, float alpha) + public static void FillSquare2(SpriteBatch batch, int x, int y, Color color, float alpha, float depth) { - var height = 1; - var depth = 0.79f; - - int height_adjust = 0; - if (height > 1) //not sure why this is necessary :/ - { - height_adjust = height; - } - - int adjustedx = x - height_adjust; - int adjustedy = y - height_adjust; - - int screenx = (adjustedx - adjustedy) * Tile.TileSpriteWidth / 2; - int screeny = (adjustedx + adjustedy) * Tile.TileSpriteHeight / 2; + int screenx = (x - y) * Tile.TileSpriteWidth / 2; + int screeny = (x + y) * Tile.TileSpriteHeight / 2; PixelTexture.SetData(new Color[] { color }); - // color.A = (byte)(alpha*255.0f); color *= alpha; - // if (this.cull(x, y)) - // { batch.Draw( Quad.SolidTexture, new Rectangle( screenx, screeny, - Tile.TileWidth, Tile.TileHeight * height), - // Tile.GetExtendedSourceRectangle(tileIndex, height), - // new Rectangle(0, 0, 1, 1), - // null, - Tile.GetExtendedSourceRectangle(0, height), - // Color.White, + Tile.TileWidth, Tile.TileHeight), + Tile.GetExtendedSourceRectangle(0, 1), color, 0.0f, Vector2.Zero, SpriteEffects.None, depth); - // } - } } diff --git a/isometric-park-fna/isometric-park-fna.csproj b/isometric-park-fna/isometric-park-fna.csproj --- a/isometric-park-fna/isometric-park-fna.csproj +++ b/isometric-park-fna/isometric-park-fna.csproj @@ -90,7 +90,7 @@ PreserveNewest - + PreserveNewest