From c74b3c57673fc75dc5535cf70ec60055908a7310 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Wed, 22 Aug 2012 10:58:46 +0000 Subject: [PATCH] - added some missing files from last commit - fixed a bug in XNB-Header --- .../Serialization/Compiler/ContentWriter.cs | 56 +++++++----------- .../Resources/ANX.Framework.Logo_220x58.png | Bin 0 -> 7795 bytes Tools/XNBInspector/anx.ico | Bin 0 -> 4286 bytes 3 files changed, 20 insertions(+), 36 deletions(-) create mode 100644 Tools/XNBInspector/Resources/ANX.Framework.Logo_220x58.png create mode 100644 Tools/XNBInspector/anx.ico diff --git a/ANX.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs b/ANX.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs index 8cb543af..59896b0e 100644 --- a/ANX.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs +++ b/ANX.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs @@ -26,6 +26,9 @@ namespace ANX.Framework.Content.Pipeline.Serialization.Compiler private string rootDirectory; private string referenceRelocationPath; + const byte xnbFormatVersion = (byte)5; + char[] xnbMagicWord = new char[] { 'X', 'N', 'B' }; + internal ContentWriter(ContentCompiler compiler, Stream output, TargetPlatform targetPlatform, GraphicsProfile targetProfile, bool compressContent, string rootDirectory, string referenceRelocationPath) { this.compiler = compiler; @@ -178,52 +181,33 @@ namespace ANX.Framework.Content.Pipeline.Serialization.Compiler private void WriteFinalOutput() { this.OutStream = this.finalOutput; - this.Write('X'); - this.Write('N'); - this.Write('B'); + this.Write(xnbMagicWord); this.Write((byte)this.targetPlatform); - //if (this.targetPlatform == TargetPlatform.Windows) - //{ - // this.Write((byte)119); - //} - //else - //{ - // if (this.targetPlatform == TargetPlatform.XBox360) - // { - // this.Write((byte)120); - // } - // else - // { - // if (this.targetPlatform != TargetPlatform.WindowsPhone) - // { - // throw new NotSupportedException(); - // } - // this.Write((byte)109); - // } - //} if (this.compressContent) { throw new NotImplementedException(); //this.WriteCompressedOutput(); - return; } - this.WriteUncompressedOutput(); + else + { + this.WriteUncompressedOutput(); + } } private void WriteUncompressedOutput() { - this.WriteVersionNumber(5); - int num = (int)this.headerData.Length; - int num2 = (int)this.contentData.Length; - this.Write(10 + num + num2); - this.OutStream.Write(this.headerData.GetBuffer(), 0, num); - this.OutStream.Write(this.contentData.GetBuffer(), 0, num2); - } + this.Write(xnbFormatVersion); // Version - private void WriteVersionNumber(ushort version) - { - version |= (ushort)((int)this.targetProfile << 8); - this.Write(version); + byte flags = 0; + if (TargetProfile == GraphicsProfile.HiDef) + { + flags |= 0x01; + } + this.Write(flags); + + this.Write(10 + this.headerData.Length + this.contentData.Length); + this.OutStream.Write(this.headerData.GetBuffer(), 0, (int)this.headerData.Length); + this.OutStream.Write(this.contentData.GetBuffer(), 0, (int)this.contentData.Length); } public TargetPlatform TargetPlatform @@ -238,7 +222,7 @@ namespace ANX.Framework.Content.Pipeline.Serialization.Compiler { get { - return TargetProfile; + return targetProfile; } } } diff --git a/Tools/XNBInspector/Resources/ANX.Framework.Logo_220x58.png b/Tools/XNBInspector/Resources/ANX.Framework.Logo_220x58.png new file mode 100644 index 0000000000000000000000000000000000000000..0907c988da6c324ce7a902b850f430f1cca341d5 GIT binary patch literal 7795 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