diff --git a/.gitignore b/.gitignore index 89cc35d7..893d7e93 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ obj *.cachefile /packages/** /package -/UpgradeLog.htm \ No newline at end of file +/UpgradeLog.htm +log.txt diff --git a/ANX.Framework.Content.Pipeline.Assimp/ANX.Framework.Content.Pipeline.Assimp.csproj b/ANX.Framework.Content.Pipeline.Assimp/ANX.Framework.Content.Pipeline.Assimp.csproj index 5dcc476d..c15ae8a9 100644 --- a/ANX.Framework.Content.Pipeline.Assimp/ANX.Framework.Content.Pipeline.Assimp.csproj +++ b/ANX.Framework.Content.Pipeline.Assimp/ANX.Framework.Content.Pipeline.Assimp.csproj @@ -38,6 +38,7 @@ + @@ -58,6 +59,14 @@ ANX.Framework + + + Assimp32.dll + + + Assimp64.dll + + diff --git a/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporter.cs b/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporter.cs index debaeeb2..256e5279 100644 --- a/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporter.cs +++ b/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporter.cs @@ -46,7 +46,7 @@ namespace ANX.Framework.Content.Pipeline this.identity = new ContentIdentity(filename, this.GetType().Name); - //AssimpDeploy.DeployLibraries(); + AssimpDeploy.DeployLibraries(); Assimp.AssimpContext assimpContext = new AssimpContext(); diff --git a/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporterAttribute.cs b/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporterAttribute.cs index be7400b6..e26a523d 100644 --- a/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporterAttribute.cs +++ b/ANX.Framework.Content.Pipeline.Assimp/Importer/AssimpImporterAttribute.cs @@ -12,7 +12,7 @@ namespace ANX.Framework.Content.Pipeline { try { - //AssimpDeploy.DeployLibraries(); + AssimpDeploy.DeployLibraries(); Assimp.AssimpContext context = new Assimp.AssimpContext(); diff --git a/ANX.Framework.Content.Pipeline/Graphics/DxtBitmapContent.cs b/ANX.Framework.Content.Pipeline/Graphics/DxtBitmapContent.cs index b3a996be..3e5d6b8f 100644 --- a/ANX.Framework.Content.Pipeline/Graphics/DxtBitmapContent.cs +++ b/ANX.Framework.Content.Pipeline/Graphics/DxtBitmapContent.cs @@ -32,8 +32,8 @@ namespace ANX.Framework.Content.Pipeline.Graphics //Data in a DXT texture is compressed in blocks of 4x4 pixels, the block size is the resolution for this blocks. //The block size is also the reason why width and height must be a multiple of four. width = (width + 3) / 4; - height = (height + 3) / 4; - _pixelData = new byte[width * height * blockSize]; + height = (height + 3) / 4; + _pixelData = new byte[width * height * blockSize]; } public override byte[] GetPixelData() diff --git a/ANX.Framework.Content.Pipeline/Importer/EffectImporter.cs b/ANX.Framework.Content.Pipeline/Importer/EffectImporter.cs index 407f24cf..ea9ca749 100644 --- a/ANX.Framework.Content.Pipeline/Importer/EffectImporter.cs +++ b/ANX.Framework.Content.Pipeline/Importer/EffectImporter.cs @@ -11,7 +11,7 @@ using ANX.Framework.NonXNA; namespace ANX.Framework.Content.Pipeline { - [ContentImporter(new string[] { ".fx", ".fxg", ".hlsl", ".glsl" })] + [ContentImporter(new string[] { ".fx", ".fxg", ".hlsl", ".glsl" }, Category = "Effect Files")] public class EffectImporter : ContentImporter { public override EffectContent Import(string filename, ContentImporterContext context) diff --git a/ANX.Framework.Content.Pipeline/Importer/FontDescriptionImporter.cs b/ANX.Framework.Content.Pipeline/Importer/FontDescriptionImporter.cs index 090ad9c5..65fab2d5 100644 --- a/ANX.Framework.Content.Pipeline/Importer/FontDescriptionImporter.cs +++ b/ANX.Framework.Content.Pipeline/Importer/FontDescriptionImporter.cs @@ -23,7 +23,7 @@ namespace ANX.Framework.Content.Pipeline.Importer [PercentageComplete(90)] [Developer("SilentWarrior/Eagle Eye Studios, KorsarNek")] [TestState(TestStateAttribute.TestState.InProgress)] //Works but there should be a check whether the characters are supported - [ContentImporter("Spritefont", ".spritefont", DefaultProcessor = "FontDescriptionProcessor", DisplayName = "FontDescription Importer - ANX Framework")] + [ContentImporter("Spritefont", ".spritefont", DefaultProcessor = "FontDescriptionProcessor", DisplayName = "FontDescription Importer - ANX Framework", Category = "Font Files")] public class FontDescriptionImporter : ContentImporter { /// diff --git a/ANX.Framework.Content.Pipeline/Importer/TextureImporter.cs b/ANX.Framework.Content.Pipeline/Importer/TextureImporter.cs index 38e63b2e..bc3a6305 100644 --- a/ANX.Framework.Content.Pipeline/Importer/TextureImporter.cs +++ b/ANX.Framework.Content.Pipeline/Importer/TextureImporter.cs @@ -7,6 +7,8 @@ using ANX.Framework.Content.Pipeline.Graphics; using ANX.Framework.Content; using System.IO; using System.Drawing; +using ANX.Framework.Content.Pipeline.Helpers; +using System.Runtime.InteropServices; #endregion @@ -16,16 +18,30 @@ using System.Drawing; namespace ANX.Framework.Content.Pipeline.Importer { - [ContentImporter(new string[] { ".bmp", ".jpg", ".jpeg", ".png", ".wdp", ".gif", ".tif" }, DefaultProcessor = "SpriteTextureProcessor")] + [ContentImporter(new string[] { ".bmp", ".jpg", ".jpeg", ".png", ".wdp", ".gif", ".tif", ".tga", ".dds" }, DefaultProcessor = "TextureProcessor", Category = "Texture Files", DisplayName = "TextureImporter - ANX Framework")] public class TextureImporter : ContentImporter { public override TextureContent Import(string filename, ContentImporterContext context) { string fileExtension = Path.GetExtension(filename).ToLowerInvariant(); - Image image = Bitmap.FromFile(filename); + BitmapContent bitmapContent; + if (fileExtension == ".tga" || fileExtension == ".dds") + bitmapContent = LoadByRendersystem(filename); + else + bitmapContent = LoadByGdi(filename); + + TextureContent textureContent = new Texture2DContent(); + textureContent.Faces[0] = new MipmapChain(bitmapContent); + + return textureContent; + } + + private BitmapContent LoadByGdi(string fileName) + { + Image image = Bitmap.FromFile(fileName); Bitmap bitmap = new Bitmap(image); - PixelBitmapContent bitmapContent = new PixelBitmapContent(image.Width, image.Height); + var bitmapContent = new PixelBitmapContent(image.Width, image.Height); System.Drawing.Color sourceColor; ANX.Framework.Color destColor = new Color(); @@ -44,10 +60,31 @@ namespace ANX.Framework.Content.Pipeline.Importer } } - TextureContent textureContent = new Texture2DContent(); - textureContent.Faces[0] = new MipmapChain(bitmapContent); + return bitmapContent; + } - return textureContent; + private BitmapContent LoadByRendersystem(string fileName) + { + using (FileStream stream = new FileStream(fileName, FileMode.Open, FileAccess.Read)) + { + var texture = ANX.Framework.Graphics.Texture2D.FromStream(GraphicsHelper.ReferenceDevice, stream); + + Type vectorType; + if (VectorConverter.TryGetVectorType(texture.Format, out vectorType)) + { + var content = (BitmapContent)Activator.CreateInstance(typeof(PixelBitmapContent<>).MakeGenericType(vectorType), texture.Width, texture.Height); + + byte[] data = new byte[texture.Width * texture.Height * Marshal.SizeOf(vectorType)]; + texture.GetData(data); + content.SetPixelData(data); + + return content; + } + else + { + throw new InvalidContentException("Unable to convert file format."); + } + } } } } diff --git a/ANX.Framework.Content.Pipeline/Importer/WavImporter.cs b/ANX.Framework.Content.Pipeline/Importer/WavImporter.cs index 61ba905d..85886e28 100644 --- a/ANX.Framework.Content.Pipeline/Importer/WavImporter.cs +++ b/ANX.Framework.Content.Pipeline/Importer/WavImporter.cs @@ -9,7 +9,7 @@ using WaveUtils; namespace ANX.Framework.Content.Pipeline.Importer { - [ContentImporter(new string[] { ".wav" }, DefaultProcessor = "SoundEffectProcessor")] + [ContentImporter(new string[] { ".wav" }, DefaultProcessor = "SoundEffectProcessor", Category="Sound Files")] public class WavImporter : ContentImporter { public override AudioContent Import(string filename, ContentImporterContext context) diff --git a/ANX.Framework.Content.Pipeline/Importer/XmlImporter.cs b/ANX.Framework.Content.Pipeline/Importer/XmlImporter.cs index 166493eb..76117486 100644 --- a/ANX.Framework.Content.Pipeline/Importer/XmlImporter.cs +++ b/ANX.Framework.Content.Pipeline/Importer/XmlImporter.cs @@ -10,6 +10,7 @@ using System.Xml.Linq; using ANX.Framework.NonXNA.Development; using ANX.Framework.NonXNA.Reflection; using ANX.Framework.Content.Pipeline.Serialization.Intermediate; +using System.ComponentModel; #endregion // This file is part of the ANX.Framework created by the @@ -18,13 +19,12 @@ using ANX.Framework.Content.Pipeline.Serialization.Intermediate; namespace ANX.Framework.Content.Pipeline.Importer { - [ContentImporter(new[] { ".xml" })] + [ContentImporter(new[] { ".xml" }, Category="XML Files")] [Developer("KorsarNek")] [PercentageComplete(100)] [TestState(TestStateAttribute.TestState.InProgress)] public class XmlImporter : ContentImporter { - private XDocument _doc; public override object Import(string filename, ContentImporterContext context) { using (XmlReader xmlReader = XmlReader.Create(filename)) diff --git a/ANX.Framework.Content.Pipeline/Serialization/Compiler/GraphicTypeWriters/EffectWriter.cs b/ANX.Framework.Content.Pipeline/Serialization/Compiler/GraphicTypeWriters/EffectWriter.cs index 9cee016e..6913fed5 100644 --- a/ANX.Framework.Content.Pipeline/Serialization/Compiler/GraphicTypeWriters/EffectWriter.cs +++ b/ANX.Framework.Content.Pipeline/Serialization/Compiler/GraphicTypeWriters/EffectWriter.cs @@ -27,7 +27,7 @@ namespace ANX.Framework.Content.Pipeline.Serialization.Compiler { if (output.TargetPlatform != TargetPlatform.Windows) { - throw new InvalidOperationException("currently only HLSL windows effects are supported by EffectWriter"); + throw new InvalidOperationException("Currently only HLSL effects for windows are supported by EffectWriter."); } byte[] effectCode = value.GetEffectCode(); diff --git a/ANX.Framework.Content.Pipeline/TargetPlatform.cs b/ANX.Framework.Content.Pipeline/TargetPlatform.cs index 034f562c..d6f26556 100644 --- a/ANX.Framework.Content.Pipeline/TargetPlatform.cs +++ b/ANX.Framework.Content.Pipeline/TargetPlatform.cs @@ -24,4 +24,28 @@ namespace ANX.Framework.Content.Pipeline WindowsMetro = (byte)'8', } + + public static class TargetPlatformExtension + { + public static string ToDisplayName(this TargetPlatform targetPlatform) + { + switch (targetPlatform) + { + case TargetPlatform.IOS: + return "iOS"; + case TargetPlatform.MacOs: + return "Mac OS"; + case TargetPlatform.PsVita: + return "PS Vita"; + case TargetPlatform.WindowsMetro: + return "Windows Metro"; + case TargetPlatform.WindowsPhone: + return "Windows Phone"; + case TargetPlatform.XBox360: + return "XBox 360"; + default: + return targetPlatform.ToString(); + } + } + } } diff --git a/ANX.Framework.Content.Pipeline/Tasks/BuildContentTask.cs b/ANX.Framework.Content.Pipeline/Tasks/BuildContentTask.cs index 59257bdb..183f4f36 100644 --- a/ANX.Framework.Content.Pipeline/Tasks/BuildContentTask.cs +++ b/ANX.Framework.Content.Pipeline/Tasks/BuildContentTask.cs @@ -246,9 +246,16 @@ namespace ANX.Framework.Content.Pipeline.Tasks if (compiledItem != null) { - SerializeAsset(buildItem, compiledItem, outputFilename.LocalPath); + try + { + SerializeAsset(buildItem, compiledItem, outputFilename.LocalPath); - compiled = new CompiledBuildItem(compiledItem, buildItem, outputFilename.LocalPath, true); + compiled = new CompiledBuildItem(compiledItem, buildItem, outputFilename.LocalPath, true); + } + catch (Exception exc) + { + LogException(exc, absoluteFilename); + } } } @@ -323,7 +330,7 @@ namespace ANX.Framework.Content.Pipeline.Tasks } IContentImporter importer = this.ImporterManager.GetInstance(importerName); - buildLogger.LogMessage("importing {0} with importer {1}", Uri.EscapeUriString(item.SourceFilename.ToString()), importer.GetType()); + buildLogger.LogMessage("importing {0} with importer {1}", item.SourceFilename.ToString(), importer.GetType()); object result = importer.Import(absoluteFilename, context); diff --git a/ANX.Framework.Content.Pipeline/Tasks/ImporterManager.cs b/ANX.Framework.Content.Pipeline/Tasks/ImporterManager.cs index f9de1d2d..18f8c8b8 100644 --- a/ANX.Framework.Content.Pipeline/Tasks/ImporterManager.cs +++ b/ANX.Framework.Content.Pipeline/Tasks/ImporterManager.cs @@ -32,7 +32,7 @@ namespace ANX.Framework.Content.Pipeline.Tasks #if LINUX Console.WriteLine("ImporterManager: Checking " + assembly.FullName); #endif - foreach (Type type in ANX.Framework.NonXNA.Reflection.TypeHelper.SafelyExtractTypesFrom(assembly)) + foreach (Type type in ANX.Framework.NonXNA.Reflection.TypeHelper.SafelyExtractTypesFrom(assembly)) { if (type == null) continue; @@ -110,23 +110,20 @@ namespace ANX.Framework.Content.Pipeline.Tasks } - public static String GuessImporterByFileExtension(string filename) + public String GuessImporterByFileExtension(string filename) { String extension = System.IO.Path.GetExtension(filename); - foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) + foreach (var type in this.importerTypes.Values) { - foreach (Type type in assembly.GetTypes()) + ContentImporterAttribute[] value = (ContentImporterAttribute[])type.GetCustomAttributes(typeof(ContentImporterAttribute), true); + foreach (ContentImporterAttribute cia in value) { - ContentImporterAttribute[] value = (ContentImporterAttribute[])type.GetCustomAttributes(typeof(ContentImporterAttribute), true); - foreach (ContentImporterAttribute cia in value) + foreach (string fe in cia.FileExtensions) { - foreach (string fe in cia.FileExtensions) + if (string.Equals(fe, extension, StringComparison.InvariantCultureIgnoreCase)) { - if (string.Equals(fe, extension, StringComparison.InvariantCultureIgnoreCase)) - { - return type.Name; - } + return type.Name; } } } diff --git a/ANX.Framework.Content.Pipeline/Tasks/ProcessorManager.cs b/ANX.Framework.Content.Pipeline/Tasks/ProcessorManager.cs index 3df86946..b02f28c2 100644 --- a/ANX.Framework.Content.Pipeline/Tasks/ProcessorManager.cs +++ b/ANX.Framework.Content.Pipeline/Tasks/ProcessorManager.cs @@ -78,11 +78,13 @@ namespace ANX.Framework.Content.Pipeline.Tasks public string GetProcessorDisplayName(string proccessorName) { - var attribute = this.GetInstance(proccessorName).GetType().GetCustomAttributes(typeof(ContentProcessorAttribute), true).Cast().FirstOrDefault(); - if (attribute != null && !string.IsNullOrEmpty(attribute.DisplayName)) - return attribute.DisplayName; - else - return proccessorName; + if (this.processors.ContainsKey(proccessorName)) + { + var attribute = this.GetInstance(proccessorName).GetType().GetCustomAttributes(typeof(ContentProcessorAttribute), true).Cast().FirstOrDefault(); + if (attribute != null && !string.IsNullOrEmpty(attribute.DisplayName)) + return attribute.DisplayName; + } + return proccessorName; } public String GetProcessorForType(Type inputType) diff --git a/ANX.Framework/Audio/Cue.cs b/ANX.Framework/Audio/Cue.cs index 9887c8bf..ed9ed2e7 100644 --- a/ANX.Framework/Audio/Cue.cs +++ b/ANX.Framework/Audio/Cue.cs @@ -10,153 +10,153 @@ namespace ANX.Framework.Audio [PercentageComplete(5)] [Developer("AstrorEnales")] [TestState(TestStateAttribute.TestState.Untested)] - public sealed class Cue : IDisposable - { - #region Events - public event EventHandler Disposing; - #endregion + public sealed class Cue : IDisposable + { + #region Events + public event EventHandler Disposing; + #endregion - #region Public - public bool IsCreated - { - get - { - throw new NotImplementedException(); - } - } + #region Public + public bool IsCreated + { + get + { + throw new NotImplementedException(); + } + } - public bool IsDisposed - { - get; - private set; - } + public bool IsDisposed + { + get; + private set; + } - public bool IsPaused - { - get - { - throw new NotImplementedException(); - } - } + public bool IsPaused + { + get + { + throw new NotImplementedException(); + } + } - public bool IsPlaying - { - get - { - throw new NotImplementedException(); - } - } + public bool IsPlaying + { + get + { + throw new NotImplementedException(); + } + } - public bool IsPrepared - { - get - { - throw new NotImplementedException(); - } - } + public bool IsPrepared + { + get + { + throw new NotImplementedException(); + } + } - public bool IsPreparing - { - get - { - throw new NotImplementedException(); - } - } + public bool IsPreparing + { + get + { + throw new NotImplementedException(); + } + } - public bool IsStopped - { - get - { - throw new NotImplementedException(); - } - } + public bool IsStopped + { + get + { + throw new NotImplementedException(); + } + } - public bool IsStopping - { - get - { - throw new NotImplementedException(); - } - } + public bool IsStopping + { + get + { + throw new NotImplementedException(); + } + } - public string Name - { - get - { - throw new NotImplementedException(); - } - } - #endregion + public string Name + { + get + { + throw new NotImplementedException(); + } + } + #endregion - #region Constructor - internal Cue() - { - } + #region Constructor + internal Cue() + { + } - ~Cue() - { - Dispose(); - } - #endregion + ~Cue() + { + Dispose(); + } + #endregion - #region Apply3D - public void Apply3D(AudioListener listener, AudioEmitter emitter) - { - throw new NotImplementedException(); - } - #endregion + #region Apply3D + public void Apply3D(AudioListener listener, AudioEmitter emitter) + { + throw new NotImplementedException(); + } + #endregion - #region SetVariable - public void SetVariable(string name, float value) - { - throw new NotImplementedException(); - } - #endregion + #region SetVariable + public void SetVariable(string name, float value) + { + throw new NotImplementedException(); + } + #endregion - #region GetVariable - public float GetVariable(string name) - { - throw new NotImplementedException(); - } - #endregion + #region GetVariable + public float GetVariable(string name) + { + throw new NotImplementedException(); + } + #endregion - #region Pause - public void Pause() - { - throw new NotImplementedException(); - } - #endregion + #region Pause + public void Pause() + { + throw new NotImplementedException(); + } + #endregion - #region Play - public void Play() - { - throw new NotImplementedException(); - } - #endregion + #region Play + public void Play() + { + throw new NotImplementedException(); + } + #endregion - #region Resume - public void Resume() - { - throw new NotImplementedException(); - } - #endregion + #region Resume + public void Resume() + { + throw new NotImplementedException(); + } + #endregion - #region Stop - public void Stop(AudioStopOptions options) - { - throw new NotImplementedException(); - } - #endregion + #region Stop + public void Stop(AudioStopOptions options) + { + throw new NotImplementedException(); + } + #endregion - #region Dispose - public void Dispose() - { - if (IsDisposed == false) - { - IsDisposed = true; - throw new NotImplementedException(); - } - } - #endregion - } + #region Dispose + public void Dispose() + { + if (IsDisposed == false) + { + IsDisposed = true; + throw new NotImplementedException(); + } + } + #endregion + } } diff --git a/ANX.Framework/Graphics/PackedVector/IPackedVector.cs b/ANX.Framework/Graphics/PackedVector/IPackedVector.cs index 96f7473e..2bdd58e5 100644 --- a/ANX.Framework/Graphics/PackedVector/IPackedVector.cs +++ b/ANX.Framework/Graphics/PackedVector/IPackedVector.cs @@ -8,22 +8,22 @@ namespace ANX.Framework.Graphics.PackedVector [PercentageComplete(100)] [Developer("Glatzemann")] [TestState(TestStateAttribute.TestState.Tested)] - public interface IPackedVector - { - void PackFromVector4(Vector4 vector); + public interface IPackedVector + { + void PackFromVector4(Vector4 vector); - Vector4 ToVector4(); - } + Vector4 ToVector4(); + } [PercentageComplete(100)] [Developer("Glatzemann")] [TestState(TestStateAttribute.TestState.Tested)] - public interface IPackedVector : IPackedVector - { - TPacked PackedValue - { - get; - set; - } - } + public interface IPackedVector : IPackedVector + { + TPacked PackedValue + { + get; + set; + } + } } diff --git a/ANX.Framework/Graphics/Texture2D.cs b/ANX.Framework/Graphics/Texture2D.cs index ad47a6ef..0ae52927 100644 --- a/ANX.Framework/Graphics/Texture2D.cs +++ b/ANX.Framework/Graphics/Texture2D.cs @@ -17,192 +17,192 @@ namespace ANX.Framework.Graphics [PercentageComplete(70)] [Developer("Glatzemann")] [TestState(TestStateAttribute.TestState.Untested)] - public class Texture2D : Texture, IGraphicsResource - { - #region Private - protected internal int width; - protected internal int height; + public class Texture2D : Texture, IGraphicsResource + { + #region Private + protected internal int width; + protected internal int height; - internal float OneOverWidth; - internal float OneOverHeight; + internal float OneOverWidth; + internal float OneOverHeight; - private INativeTexture2D nativeTexture2D; - private INativeTexture2D NativeTexture2D - { - get - { - if (nativeTexture2D == null) - CreateNativeTextureSurface(); + private INativeTexture2D nativeTexture2D; + private INativeTexture2D NativeTexture2D + { + get + { + if (nativeTexture2D == null) + CreateNativeTextureSurface(); - return nativeTexture2D; - } - } - #endregion + return nativeTexture2D; + } + } + #endregion - #region Public - public Rectangle Bounds - { - get - { - return new Rectangle(0, 0, this.width, this.height); - } - } + #region Public + public Rectangle Bounds + { + get + { + return new Rectangle(0, 0, this.width, this.height); + } + } - public int Width - { - get - { - return this.width; - } - } + public int Width + { + get + { + return this.width; + } + } - public int Height - { - get - { - return this.height; - } - } - #endregion + public int Height + { + get + { + return this.height; + } + } + #endregion - #region Constructor (TODO) - internal Texture2D(GraphicsDevice graphicsDevice) - : base(graphicsDevice) - { - } + #region Constructor (TODO) + internal Texture2D(GraphicsDevice graphicsDevice) + : base(graphicsDevice) + { + } - public Texture2D(GraphicsDevice graphicsDevice, int width, int height) - : base(graphicsDevice) - { - this.width = width; - this.height = height; - OneOverWidth = 1f / width; - OneOverHeight = 1f / height; + public Texture2D(GraphicsDevice graphicsDevice, int width, int height) + : base(graphicsDevice) + { + this.width = width; + this.height = height; + OneOverWidth = 1f / width; + OneOverHeight = 1f / height; - base.LevelCount = 1; - base.Format = SurfaceFormat.Color; + base.LevelCount = 1; + base.Format = SurfaceFormat.Color; - CreateNativeTextureSurface(); - } + CreateNativeTextureSurface(); + } - public Texture2D(GraphicsDevice graphicsDevice, int width, int height, [MarshalAsAttribute(UnmanagedType.U1)] bool mipMap, - SurfaceFormat format) - : base(graphicsDevice) - { - this.width = width; - this.height = height; - OneOverWidth = 1f / width; - OneOverHeight = 1f / height; + public Texture2D(GraphicsDevice graphicsDevice, int width, int height, [MarshalAsAttribute(UnmanagedType.U1)] bool mipMap, + SurfaceFormat format) + : base(graphicsDevice) + { + this.width = width; + this.height = height; + OneOverWidth = 1f / width; + OneOverHeight = 1f / height; - // TODO: pass the mipmap parameter to the creation of the texture to let the graphics card generate mipmaps! - base.LevelCount = 1; - base.Format = format; + // TODO: pass the mipmap parameter to the creation of the texture to let the graphics card generate mipmaps! + base.LevelCount = 1; + base.Format = format; - CreateNativeTextureSurface(); - } + CreateNativeTextureSurface(); + } - internal Texture2D(GraphicsDevice graphicsDevice, int width, int height, int mipCount, SurfaceFormat format) - : base(graphicsDevice) - { - this.width = width; - this.height = height; - OneOverWidth = 1f / width; - OneOverHeight = 1f / height; + internal Texture2D(GraphicsDevice graphicsDevice, int width, int height, int mipCount, SurfaceFormat format) + : base(graphicsDevice) + { + this.width = width; + this.height = height; + OneOverWidth = 1f / width; + OneOverHeight = 1f / height; - base.LevelCount = mipCount; - base.Format = format; + base.LevelCount = mipCount; + base.Format = format; - CreateNativeTextureSurface(); - } - #endregion + CreateNativeTextureSurface(); + } + #endregion - #region FromStream (TODO) - public static Texture2D FromStream(GraphicsDevice graphicsDevice, Stream stream) - { - throw new NotImplementedException(); - } + #region FromStream (TODO) + public static Texture2D FromStream(GraphicsDevice graphicsDevice, Stream stream) + { + throw new NotImplementedException(); + } - public static Texture2D FromStream(GraphicsDevice graphicsDevice, Stream stream, int width, int height, - [MarshalAsAttribute(UnmanagedType.U1)] bool zoom) - { - throw new NotImplementedException(); - } - #endregion + public static Texture2D FromStream(GraphicsDevice graphicsDevice, Stream stream, int width, int height, + [MarshalAsAttribute(UnmanagedType.U1)] bool zoom) + { + throw new NotImplementedException(); + } + #endregion - #region GetData - public void GetData(int level, Nullable rect, T[] data, int startIndex, int elementCount) where T : struct - { - NativeTexture2D.GetData(level, rect, data, startIndex, elementCount); - } + #region GetData + public void GetData(int level, Nullable rect, T[] data, int startIndex, int elementCount) where T : struct + { + NativeTexture2D.GetData(level, rect, data, startIndex, elementCount); + } - public void GetData(T[] data) where T : struct - { - NativeTexture.GetData(data); - } + public void GetData(T[] data) where T : struct + { + NativeTexture.GetData(data); + } - public void GetData(T[] data, int startIndex, int elementCount) where T : struct - { - NativeTexture.GetData(data, startIndex, elementCount); - } - #endregion + public void GetData(T[] data, int startIndex, int elementCount) where T : struct + { + NativeTexture.GetData(data, startIndex, elementCount); + } + #endregion - #region SetData - public void SetData(int level, Nullable rect, T[] data, int startIndex, int elementCount) where T : struct - { - NativeTexture2D.SetData(level, rect, data, startIndex, elementCount); - } + #region SetData + public void SetData(int level, Nullable rect, T[] data, int startIndex, int elementCount) where T : struct + { + NativeTexture2D.SetData(level, rect, data, startIndex, elementCount); + } - public void SetData(T[] data) where T : struct - { - NativeTexture.SetData(GraphicsDevice, data); - } + public void SetData(T[] data) where T : struct + { + NativeTexture.SetData(GraphicsDevice, data); + } - public void SetData(T[] data, int startIndex, int elementCount) where T : struct - { - NativeTexture.SetData(GraphicsDevice, data, startIndex, elementCount); - } - #endregion + public void SetData(T[] data, int startIndex, int elementCount) where T : struct + { + NativeTexture.SetData(GraphicsDevice, data, startIndex, elementCount); + } + #endregion - #region SaveAsJpeg - public void SaveAsJpeg(Stream stream, int width, int height) - { - NativeTexture2D.SaveAsJpeg(stream, width, height); - } - #endregion + #region SaveAsJpeg + public void SaveAsJpeg(Stream stream, int width, int height) + { + NativeTexture2D.SaveAsJpeg(stream, width, height); + } + #endregion - #region SaveAsPng - public void SaveAsPng(Stream stream, int width, int height) - { - NativeTexture2D.SaveAsPng(stream, width, height); - } - #endregion + #region SaveAsPng + public void SaveAsPng(Stream stream, int width, int height) + { + NativeTexture2D.SaveAsPng(stream, width, height); + } + #endregion - #region Dispose - public override void Dispose() - { - base.Dispose(true); - } + #region Dispose + public override void Dispose() + { + base.Dispose(true); + } - protected override void Dispose([MarshalAs(UnmanagedType.U1)] bool disposeManaged) - { - base.Dispose(disposeManaged); - } - #endregion + protected override void Dispose([MarshalAs(UnmanagedType.U1)] bool disposeManaged) + { + base.Dispose(disposeManaged); + } + #endregion - #region ReCreateNativeTextureSurface - internal override void ReCreateNativeTextureSurface() - { - CreateNativeTextureSurface(); - } - #endregion + #region ReCreateNativeTextureSurface + internal override void ReCreateNativeTextureSurface() + { + CreateNativeTextureSurface(); + } + #endregion - #region CreateNativeTextureSurface - private void CreateNativeTextureSurface() - { - var creator = AddInSystemFactory.Instance.GetDefaultCreator(); - nativeTexture2D = creator.CreateTexture(GraphicsDevice, Format, width, height, LevelCount); - base.nativeTexture = nativeTexture2D; - } - #endregion - } + #region CreateNativeTextureSurface + private void CreateNativeTextureSurface() + { + var creator = AddInSystemFactory.Instance.GetDefaultCreator(); + nativeTexture2D = creator.CreateTexture(GraphicsDevice, Format, width, height, LevelCount); + base.nativeTexture = nativeTexture2D; + } + #endregion + } } diff --git a/ANX.Framework/Properties/AssemblyInfo.cs b/ANX.Framework/Properties/AssemblyInfo.cs index 1917cfa2..cf4a8b6b 100644 --- a/ANX.Framework/Properties/AssemblyInfo.cs +++ b/ANX.Framework/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ -using System.Reflection; +using System; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -21,6 +22,7 @@ using System.Runtime.InteropServices; // Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird [assembly: Guid("67548701-e7e2-4c56-be3f-18c5fdf5c0fb")] +[assembly: CLSCompliant(true)] // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: // diff --git a/ANX.Framework_VS2013.sln b/ANX.Framework_VS2013.sln index 58f7d310..04f50944 100644 --- a/ANX.Framework_VS2013.sln +++ b/ANX.Framework_VS2013.sln @@ -2367,22 +2367,17 @@ Global {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|iOS.Build.0 = Debug|iOS {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.ActiveCfg = Debug|Linux {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Linux.Build.0 = Debug|Linux - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.ActiveCfg = Debug|Mac OS - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.Build.0 = Debug|Mac OS + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mac OS.ActiveCfg = Debug|MacOs {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.Build.0 = Debug|Windows - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.ActiveCfg = Debug|PS Vita - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.Build.0 = Debug|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|PS Vita.ActiveCfg = Debug|PsVita {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.ActiveCfg = Debug|Windows {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows.Build.0 = Debug|Windows - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.ActiveCfg = Debug|Windows Metro - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.Build.0 = Debug|Windows Metro - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.Build.0 = Debug|Windows Phone - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x64.ActiveCfg = Debug|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x86.ActiveCfg = Debug|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Metro.ActiveCfg = Debug|WindowsPhone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Windows Phone.ActiveCfg = Debug|WindowsPhone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x64.ActiveCfg = Debug|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x86.ActiveCfg = Debug|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Xbox 360.ActiveCfg = Debug|XBox360 {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.ActiveCfg = Release|Android {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Android.Build.0 = Release|Android {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Any CPU.ActiveCfg = Release|Android @@ -2391,22 +2386,17 @@ Global {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|iOS.Build.0 = Release|iOS {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.ActiveCfg = Release|Linux {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Linux.Build.0 = Release|Linux - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.ActiveCfg = Release|Mac OS - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.Build.0 = Release|Mac OS - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.ActiveCfg = Release|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.Build.0 = Release|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.ActiveCfg = Release|PS Vita - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.Build.0 = Release|PS Vita + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mac OS.ActiveCfg = Release|MacOs + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.ActiveCfg = Release|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.Build.0 = Release|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|PS Vita.ActiveCfg = Release|PsVita {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.ActiveCfg = Release|Windows {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows.Build.0 = Release|Windows - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.ActiveCfg = Release|Windows Metro - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.Build.0 = Release|Windows Metro - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.ActiveCfg = Release|Windows Phone - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.Build.0 = Release|Windows Phone - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x64.ActiveCfg = Release|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x86.ActiveCfg = Release|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Metro.ActiveCfg = Release|WindowsPhone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Windows Phone.ActiveCfg = Release|WindowsPhone + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x64.ActiveCfg = Release|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x86.ActiveCfg = Release|XBox360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Xbox 360.ActiveCfg = Release|XBox360 {8B0D9390-6F41-4CDB-810B-46A9EE3C3F1B}.Debug|Android.ActiveCfg = Debug|Any CPU {8B0D9390-6F41-4CDB-810B-46A9EE3C3F1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8B0D9390-6F41-4CDB-810B-46A9EE3C3F1B}.Debug|Any CPU.Build.0 = Debug|Any CPU diff --git a/Samples/AlphaTestEffectSample.sln b/Samples/AlphaTestEffectSample.sln index 769f809b..69c90314 100644 --- a/Samples/AlphaTestEffectSample.sln +++ b/Samples/AlphaTestEffectSample.sln @@ -1,58 +1,36 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleContent", "SampleContent\SampleContent.contentproj", "{FA6E229D-4504-47B1-8A23-2D3FCC13F778}" -EndProject +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlphaTestEffectSample", "AlphaTestEffectSample\AlphaTestEffectSample.csproj", "{0005BDAA-F232-45C3-8D37-7E4FF7A1F605}" EndProject +Project("{75EFAE60-726E-430F-8661-4CF9ABD1306C}") = "SampleContent", "SampleContent\SampleContent.cproj", "{75EFAE60-726E-430F-8661-4CF9ABD1306C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x86 = Debug|x86 - DebugWin8|Any CPU = DebugWin8|Any CPU - DebugWin8|Mixed Platforms = DebugWin8|Mixed Platforms - DebugWin8|x86 = DebugWin8|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|x86 = Release|x86 - ReleaseWin8|Any CPU = ReleaseWin8|Any CPU - ReleaseWin8|Mixed Platforms = ReleaseWin8|Mixed Platforms - ReleaseWin8|x86 = ReleaseWin8|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.DebugWin8|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x86.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Any CPU.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FA6E229D-4504-47B1-8A23-2D3FCC13F778}.ReleaseWin8|x86.ActiveCfg = Debug|Any CPU {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Debug|Any CPU.ActiveCfg = Debug|x86 {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Debug|Mixed Platforms.Build.0 = Debug|x86 {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Debug|x86.ActiveCfg = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Debug|x86.Build.0 = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.DebugWin8|Any CPU.ActiveCfg = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.DebugWin8|Mixed Platforms.ActiveCfg = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.DebugWin8|Mixed Platforms.Build.0 = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.DebugWin8|x86.ActiveCfg = Debug|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.DebugWin8|x86.Build.0 = Debug|x86 {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Release|Any CPU.ActiveCfg = Release|x86 {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Release|Mixed Platforms.Build.0 = Release|x86 {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Release|x86.ActiveCfg = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.Release|x86.Build.0 = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.ReleaseWin8|Any CPU.ActiveCfg = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.ReleaseWin8|Mixed Platforms.ActiveCfg = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.ReleaseWin8|Mixed Platforms.Build.0 = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.ReleaseWin8|x86.ActiveCfg = Release|x86 - {0005BDAA-F232-45C3-8D37-7E4FF7A1F605}.ReleaseWin8|x86.Build.0 = Release|x86 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Any CPU.ActiveCfg = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|Mixed Platforms.Build.0 = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Debug|x86.ActiveCfg = Debug|Windows + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Any CPU.ActiveCfg = Release|Android + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.ActiveCfg = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|Mixed Platforms.Build.0 = Release|XBox 360 + {75EFAE60-726E-430F-8661-4CF9ABD1306C}.Release|x86.ActiveCfg = Release|XBox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/AlphaTestEffectSample/AlphaTestEffectSample.csproj b/Samples/AlphaTestEffectSample/AlphaTestEffectSample.csproj index a32b918c..ca7b6bd9 100644 --- a/Samples/AlphaTestEffectSample/AlphaTestEffectSample.csproj +++ b/Samples/AlphaTestEffectSample/AlphaTestEffectSample.csproj @@ -49,40 +49,38 @@ - - {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} - ANX.Framework - - - {60D08399-244F-46A3-91F1-4CFD26D961A3} - ANX.InputDevices.Windows.XInput - - - {49066074-3B7B-4A55-B122-6BD33AB73558} - ANX.InputSystem.Standard - - - {068EB2E9-963C-4E1B-8831-E25011F11FFE} - ANX.PlatformSystem.Windows - - - {EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} - ANX.RenderSystem.GL3 - - - {5BE49183-2F6F-4527-AC90-D816911FCF90} - ANX.RenderSystem.Windows.DX10 - - - {B30DE9C2-0926-46B6-8351-9AF276C472D5} - ANX.RenderSystem.Windows.DX11 - - - {6A582788-C4D2-410C-96CD-177F75712D65} - ANX.SoundSystem.Windows.XAudio - - - + + False + ..\..\bin\Debug\ANX.Framework.dll + + + False + ..\..\bin\Debug\ANX.InputDevices.Windows.XInput.dll + + + False + ..\..\bin\Debug\ANX.InputSystem.Standard.dll + + + False + ..\..\bin\Debug\ANX.PlatformSystem.Windows.dll + + + False + ..\..\bin\Debug\ANX.RenderSystem.GL3.dll + + + False + ..\..\bin\Debug\ANX.RenderSystem.Windows.DX10.dll + + + False + ..\..\bin\Debug\ANX.RenderSystem.Windows.DX11.dll + + + False + ..\..\bin\Debug\ANX.SoundSystem.Windows.XAudio.dll + diff --git a/Samples/SampleContent/Fonts/Debug.spritefont b/Samples/SampleContent/Fonts/Debug.spritefont index cd1a12c1..a98d8910 100644 --- a/Samples/SampleContent/Fonts/Debug.spritefont +++ b/Samples/SampleContent/Fonts/Debug.spritefont @@ -5,7 +5,7 @@ Framework Inhalts-Pipeline gelesen. Befolgen Sie die Kommentare zur Anpassung de der Schriftart in Ihrem Spiel und zum Ändern der Zeichen, die für das Zeichnen verfügbar sind. --> - +