From bff87410e92de3c953fd88c3b537959c4359b0d4 Mon Sep 17 00:00:00 2001 From: "SND\\AstrorEnales_cp" Date: Thu, 11 Oct 2012 07:27:50 +0000 Subject: [PATCH] Added some TestState and Percentage Attributes and implemented the Texture3DReader and the TextureCubeReader correctly --- .../AlphaTestEffectReader.cs | 20 ++++++----- .../GraphicTypeReaders/BasicEffectReader.cs | 33 +++++++++++-------- .../DualTextureEffectReader.cs | 16 +++++---- .../EnvironmentMapEffectReader.cs | 2 ++ .../GraphicTypeReaders/SkinnedEffectReader.cs | 19 ++++++----- .../GraphicTypeReaders/Texture2DReader.cs | 7 ++-- .../GraphicTypeReaders/Texture3DReader.cs | 29 +++++++--------- .../GraphicTypeReaders/TextureCubeReader.cs | 27 +++++---------- .../MathTypeReaders/BoundingBoxReader.cs | 6 ++-- .../MathTypeReaders/BoundingFrustumReader.cs | 8 ++--- .../MathTypeReaders/BoundingSphereReader.cs | 6 ++-- .../Content/MathTypeReaders/ColorReader.cs | 6 ++-- .../Content/MathTypeReaders/MatrixReader.cs | 6 ++-- .../Content/MathTypeReaders/PlaneReader.cs | 6 ++-- .../Content/MathTypeReaders/PointReader.cs | 13 +++----- .../MathTypeReaders/QuaternionReader.cs | 15 +++------ .../Content/MathTypeReaders/RayReader.cs | 6 ++-- .../MathTypeReaders/RectangleReader.cs | 8 ++--- .../Content/MathTypeReaders/Vector2Reader.cs | 8 ++--- .../Content/MathTypeReaders/Vector3Reader.cs | 8 ++--- .../Content/MathTypeReaders/Vector4Reader.cs | 6 ++-- 21 files changed, 125 insertions(+), 130 deletions(-) diff --git a/ANX.Framework/Content/GraphicTypeReaders/AlphaTestEffectReader.cs b/ANX.Framework/Content/GraphicTypeReaders/AlphaTestEffectReader.cs index bd9d785e..4334cee3 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/AlphaTestEffectReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/AlphaTestEffectReader.cs @@ -7,21 +7,25 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] public class AlphaTestEffectReader : ContentTypeReader { protected internal override AlphaTestEffect Read(ContentReader input, AlphaTestEffect existingInstance) { var graphics = input.ResolveGraphicsDevice(); - var effect = new AlphaTestEffect(graphics); + var effect = new AlphaTestEffect(graphics) + { + Texture = input.ReadExternalReference(), + AlphaFunction = (CompareFunction)input.ReadInt32(), + ReferenceAlpha = input.ReadInt32(), + DiffuseColor = input.ReadVector3(), + Alpha = input.ReadSingle(), + VertexColorEnabled = input.ReadBoolean() + }; - effect.Texture = input.ReadExternalReference(); - effect.AlphaFunction = (CompareFunction)input.ReadInt32(); - effect.ReferenceAlpha = input.ReadInt32(); - effect.DiffuseColor = input.ReadVector3(); - effect.Alpha = input.ReadSingle(); - effect.VertexColorEnabled = input.ReadBoolean(); - return effect; + return effect; } } } \ No newline at end of file diff --git a/ANX.Framework/Content/GraphicTypeReaders/BasicEffectReader.cs b/ANX.Framework/Content/GraphicTypeReaders/BasicEffectReader.cs index 90461f05..16ac7e2b 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/BasicEffectReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/BasicEffectReader.cs @@ -10,26 +10,31 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] public class BasicEffectReader : ContentTypeReader { protected internal override BasicEffect Read(ContentReader input, BasicEffect existingInstance) { var graphics = input.ResolveGraphicsDevice(); - var effect = new BasicEffect(graphics); - Texture2D texture = input.ReadExternalReference(); - // TODO: enable parameter setup when basic effect is implemented - //if (texture != null) - //{ - // effect.Texture = texture; - // effect.TextureEnabled = true; - //} - /*effect.DiffuseColor = */input.ReadVector3(); - /*effect.EmissiveColor = */input.ReadVector3(); - /*effect.SpecularColor = */input.ReadVector3(); - /*effect.SpecularPower = */input.ReadSingle(); - /*effect.Alpha = */input.ReadSingle(); - /*effect.VertexColorEnabled = */input.ReadBoolean(); + var texture = input.ReadExternalReference(); + var effect = new BasicEffect(graphics) + { + DiffuseColor = input.ReadVector3(), + EmissiveColor = input.ReadVector3(), + SpecularColor = input.ReadVector3(), + SpecularPower = input.ReadSingle(), + Alpha = input.ReadSingle(), + VertexColorEnabled = input.ReadBoolean() + }; + + if (texture != null) + { + effect.Texture = texture; + effect.TextureEnabled = true; + } + return effect; } } diff --git a/ANX.Framework/Content/GraphicTypeReaders/DualTextureEffectReader.cs b/ANX.Framework/Content/GraphicTypeReaders/DualTextureEffectReader.cs index c2c9c68b..0ce82065 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/DualTextureEffectReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/DualTextureEffectReader.cs @@ -10,19 +10,23 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] public class DualTextureEffectReader : ContentTypeReader { protected internal override DualTextureEffect Read(ContentReader input, DualTextureEffect existingInstance) { var graphics = input.ResolveGraphicsDevice(); - var effect = new DualTextureEffect(graphics); + var effect = new DualTextureEffect(graphics) + { + Texture = input.ReadExternalReference(), + Texture2 = input.ReadExternalReference(), + DiffuseColor = input.ReadVector3(), + Alpha = input.ReadSingle(), + VertexColorEnabled = input.ReadBoolean() + }; - effect.Texture =input.ReadExternalReference(); - effect.Texture2 = input.ReadExternalReference(); - effect.DiffuseColor = input.ReadVector3(); - effect.Alpha = input.ReadSingle(); - effect.VertexColorEnabled = input.ReadBoolean(); return effect; } } diff --git a/ANX.Framework/Content/GraphicTypeReaders/EnvironmentMapEffectReader.cs b/ANX.Framework/Content/GraphicTypeReaders/EnvironmentMapEffectReader.cs index d8a1d398..2311361f 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/EnvironmentMapEffectReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/EnvironmentMapEffectReader.cs @@ -10,7 +10,9 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] public class EnvironmentMapEffectReader : ContentTypeReader { protected internal override EnvironmentMapEffect Read(ContentReader input, EnvironmentMapEffect existingInstance) diff --git a/ANX.Framework/Content/GraphicTypeReaders/SkinnedEffectReader.cs b/ANX.Framework/Content/GraphicTypeReaders/SkinnedEffectReader.cs index 7207544c..2c045359 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/SkinnedEffectReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/SkinnedEffectReader.cs @@ -16,15 +16,16 @@ namespace ANX.Framework.Content protected internal override SkinnedEffect Read(ContentReader input, SkinnedEffect existingInstance) { var graphics = input.ResolveGraphicsDevice(); - var effect = new SkinnedEffect(graphics); - - effect.Texture = input.ReadExternalReference(); - effect.WeightsPerVertex = input.ReadInt32(); - effect.DiffuseColor = input.ReadVector3(); - effect.EmissiveColor = input.ReadVector3(); - effect.SpecularColor = input.ReadVector3(); - effect.SpecularPower = input.ReadSingle(); - effect.Alpha = input.ReadSingle(); + var effect = new SkinnedEffect(graphics) + { + Texture = input.ReadExternalReference(), + WeightsPerVertex = input.ReadInt32(), + DiffuseColor = input.ReadVector3(), + EmissiveColor = input.ReadVector3(), + SpecularColor = input.ReadVector3(), + SpecularPower = input.ReadSingle(), + Alpha = input.ReadSingle() + }; return effect; } diff --git a/ANX.Framework/Content/GraphicTypeReaders/Texture2DReader.cs b/ANX.Framework/Content/GraphicTypeReaders/Texture2DReader.cs index f8c3744b..d758ca51 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/Texture2DReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/Texture2DReader.cs @@ -1,6 +1,5 @@ using System; using ANX.Framework.Graphics; -using ANX.Framework.NonXNA; using ANX.Framework.NonXNA.Development; // This file is part of the ANX.Framework created by the @@ -9,7 +8,9 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { - [Developer("GinieDP")] + [PercentageComplete(100)] + [Developer("GinieDP, AstrorEnales")] + [TestState(TestStateAttribute.TestState.Untested)] internal class Texture2DReader : ContentTypeReader { protected internal override Texture2D Read(ContentReader input, Texture2D existingInstance) @@ -24,7 +25,7 @@ namespace ANX.Framework.Content { int size = input.ReadInt32(); byte[] data = input.ReadBytes(size); - texture2D.SetData(level, null, data, 0, size); + texture2D.SetData(level, null, data, 0, size); } return texture2D; } diff --git a/ANX.Framework/Content/GraphicTypeReaders/Texture3DReader.cs b/ANX.Framework/Content/GraphicTypeReaders/Texture3DReader.cs index 7cb66ef8..49bce324 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/Texture3DReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/Texture3DReader.cs @@ -1,8 +1,7 @@ #region Using Statements using System; -using System.Collections.Generic; using ANX.Framework.Graphics; -using ANX.Framework.NonXNA; +using ANX.Framework.NonXNA.Development; using ANX.Framework.NonXNA.Development; #endregion // Using Statements @@ -13,19 +12,13 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { - [Developer("GinieDP")] + [PercentageComplete(100)] + [Developer("AstrorEnales")] + [TestState(TestStateAttribute.TestState.Untested)] internal class Texture3DReader : ContentTypeReader { protected internal override Texture3D Read(ContentReader input, Texture3D existingInstance) { - IServiceProvider service = input.ContentManager.ServiceProvider; - - var rfc = service.GetService(typeof(IRenderSystemCreator)) as IRenderSystemCreator; - if (rfc == null) - { - throw new ContentLoadException("Service not found IRenderFrameworkCreator"); - } - GraphicsDevice graphics = input.ResolveGraphicsDevice(); SurfaceFormat surfaceFormat = (SurfaceFormat)input.ReadInt32(); int width = input.ReadInt32(); @@ -33,16 +26,18 @@ namespace ANX.Framework.Content int depth = input.ReadInt32(); int mipCount = input.ReadInt32(); - List colorData = new List(); - - for (int i = 0; i < mipCount; i++) + var texture3D = new Texture3D(graphics, width, height, depth, mipCount > 1, surfaceFormat); + for (int index = 0; index < mipCount; index++) { int size = input.ReadInt32(); - colorData.AddRange(input.ReadBytes(size)); + byte[] data = input.ReadBytes(size); + texture3D.SetData(index, 0, 0, width, height, 0, depth, data, 0, size); + width = Math.Max(width >> 1, 1); + height = Math.Max(height >> 1, 1); + depth = Math.Max(depth >> 1, 1); } - throw new NotImplementedException(); - //return rfc.CreateTexture(graphics, surfaceFormat, width, height, mipCount, depth, colorData.ToArray(); + return texture3D; } } } diff --git a/ANX.Framework/Content/GraphicTypeReaders/TextureCubeReader.cs b/ANX.Framework/Content/GraphicTypeReaders/TextureCubeReader.cs index 13a0bbe6..9c1d67aa 100644 --- a/ANX.Framework/Content/GraphicTypeReaders/TextureCubeReader.cs +++ b/ANX.Framework/Content/GraphicTypeReaders/TextureCubeReader.cs @@ -1,8 +1,7 @@ #region Using Statements using System; -using System.Collections.Generic; using ANX.Framework.Graphics; -using ANX.Framework.NonXNA; +using ANX.Framework.NonXNA.Development; using ANX.Framework.NonXNA.Development; #endregion // Using Statements @@ -13,38 +12,30 @@ using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { - [Developer("GinieDP")] + [PercentageComplete(100)] + [Developer("AstrorEnales")] + [TestState(TestStateAttribute.TestState.Untested)] internal class TextureCubeReader : ContentTypeReader { protected internal override TextureCube Read(ContentReader input, TextureCube existingInstance) { - IServiceProvider service = input.ContentManager.ServiceProvider; - - var rfc = service.GetService(typeof(IRenderSystemCreator)) as IRenderSystemCreator; - if (rfc == null) - { - throw new ContentLoadException("Service not found IRenderFrameworkCreator"); - } - GraphicsDevice graphics = input.ResolveGraphicsDevice(); SurfaceFormat surfaceFormat = (SurfaceFormat)input.ReadInt32(); int size = input.ReadInt32(); int mipCount = input.ReadInt32(); - List colorData = new List(); - - // for each cube face: +x, -x, +y, -y, +z, -z + var textureCube = new TextureCube(graphics, size, mipCount > 1, surfaceFormat); for (int face = 0; face < 6; face++) { - for (int i = 0; i < mipCount; i++) + for (int index = 0; index < mipCount; index++) { int dataSize = input.ReadInt32(); - colorData.AddRange(input.ReadBytes(dataSize)); + byte[] data = input.ReadBytes(dataSize); + textureCube.SetData((CubeMapFace)face, index, null, data, 0, dataSize); } } - throw new NotImplementedException(); - //return rfc.CreateTexture(graphics, surfaceFormat, size, mipCount, colorData.ToArray()); + return textureCube; } } } diff --git a/ANX.Framework/Content/MathTypeReaders/BoundingBoxReader.cs b/ANX.Framework/Content/MathTypeReaders/BoundingBoxReader.cs index 8e8a0147..bdb5f0ed 100644 --- a/ANX.Framework/Content/MathTypeReaders/BoundingBoxReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/BoundingBoxReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class BoundingBoxReader : ContentTypeReader { protected internal override BoundingBox Read(ContentReader input, BoundingBox existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/BoundingFrustumReader.cs b/ANX.Framework/Content/MathTypeReaders/BoundingFrustumReader.cs index 62b12d0a..5be852ce 100644 --- a/ANX.Framework/Content/MathTypeReaders/BoundingFrustumReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/BoundingFrustumReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class BoundingFrustumReader : ContentTypeReader { protected internal override BoundingFrustum Read(ContentReader input, BoundingFrustum existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/BoundingSphereReader.cs b/ANX.Framework/Content/MathTypeReaders/BoundingSphereReader.cs index ddf377a7..46f6d9a6 100644 --- a/ANX.Framework/Content/MathTypeReaders/BoundingSphereReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/BoundingSphereReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class BoundingSphereReader : ContentTypeReader { protected internal override BoundingSphere Read(ContentReader input, BoundingSphere existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/ColorReader.cs b/ANX.Framework/Content/MathTypeReaders/ColorReader.cs index 9d8813f8..48e64eb1 100644 --- a/ANX.Framework/Content/MathTypeReaders/ColorReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/ColorReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class ColorReader : ContentTypeReader { protected internal override Color Read(ContentReader input, Color existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/MatrixReader.cs b/ANX.Framework/Content/MathTypeReaders/MatrixReader.cs index cc74785d..c3710b91 100644 --- a/ANX.Framework/Content/MathTypeReaders/MatrixReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/MatrixReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class MatrixReader : ContentTypeReader { protected internal override Matrix Read(ContentReader input, Matrix existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/PlaneReader.cs b/ANX.Framework/Content/MathTypeReaders/PlaneReader.cs index 9fc10ad0..c3a6be85 100644 --- a/ANX.Framework/Content/MathTypeReaders/PlaneReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/PlaneReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class PlaneReader : ContentTypeReader { protected internal override Plane Read(ContentReader input, Plane existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/PointReader.cs b/ANX.Framework/Content/MathTypeReaders/PointReader.cs index ce1ae8b6..935261cf 100644 --- a/ANX.Framework/Content/MathTypeReaders/PointReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/PointReader.cs @@ -1,24 +1,21 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class PointReader : ContentTypeReader { protected internal override Point Read(ContentReader input, Point existingInstance) { - var result = new Point(); - result.X = input.ReadInt32(); - result.Y = input.ReadInt32(); - return result; + return new Point(input.ReadInt32(), input.ReadInt32()); } } } diff --git a/ANX.Framework/Content/MathTypeReaders/QuaternionReader.cs b/ANX.Framework/Content/MathTypeReaders/QuaternionReader.cs index b05b9353..7f1546bb 100644 --- a/ANX.Framework/Content/MathTypeReaders/QuaternionReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/QuaternionReader.cs @@ -1,26 +1,21 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class QuaternionReader : ContentTypeReader { protected internal override Quaternion Read(ContentReader input, Quaternion existingInstance) { - var result = new Quaternion(); - result.X = input.ReadSingle(); - result.Y = input.ReadSingle(); - result.Z = input.ReadSingle(); - result.W = input.ReadSingle(); - return result; + return new Quaternion(input.ReadSingle(), input.ReadSingle(), input.ReadSingle(), input.ReadSingle()); } } } diff --git a/ANX.Framework/Content/MathTypeReaders/RayReader.cs b/ANX.Framework/Content/MathTypeReaders/RayReader.cs index 8c3155ea..9140b4d0 100644 --- a/ANX.Framework/Content/MathTypeReaders/RayReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/RayReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] public class RayReader : ContentTypeReader { protected internal override Ray Read(ContentReader input, Ray existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/RectangleReader.cs b/ANX.Framework/Content/MathTypeReaders/RectangleReader.cs index 9e18bea0..5221170a 100644 --- a/ANX.Framework/Content/MathTypeReaders/RectangleReader.cs +++ b/ANX.Framework/Content/MathTypeReaders/RectangleReader.cs @@ -1,16 +1,16 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class RectangleReader : ContentTypeReader { protected internal override Rectangle Read(ContentReader input, Rectangle existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/Vector2Reader.cs b/ANX.Framework/Content/MathTypeReaders/Vector2Reader.cs index d7b700fa..f78dbbe3 100644 --- a/ANX.Framework/Content/MathTypeReaders/Vector2Reader.cs +++ b/ANX.Framework/Content/MathTypeReaders/Vector2Reader.cs @@ -1,16 +1,16 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class Vector2Reader : ContentTypeReader { protected internal override Vector2 Read(ContentReader input, Vector2 existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/Vector3Reader.cs b/ANX.Framework/Content/MathTypeReaders/Vector3Reader.cs index d9252d2b..c052b329 100644 --- a/ANX.Framework/Content/MathTypeReaders/Vector3Reader.cs +++ b/ANX.Framework/Content/MathTypeReaders/Vector3Reader.cs @@ -1,16 +1,16 @@ #region Using Statements - - -#endregion +using ANX.Framework.NonXNA.Development; +#endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class Vector3Reader : ContentTypeReader { protected internal override Vector3 Read(ContentReader input, Vector3 existingInstance) diff --git a/ANX.Framework/Content/MathTypeReaders/Vector4Reader.cs b/ANX.Framework/Content/MathTypeReaders/Vector4Reader.cs index e142ccbe..701a25ed 100644 --- a/ANX.Framework/Content/MathTypeReaders/Vector4Reader.cs +++ b/ANX.Framework/Content/MathTypeReaders/Vector4Reader.cs @@ -1,16 +1,16 @@ #region Using Statements - - +using ANX.Framework.NonXNA.Development; #endregion // Using Statements // This file is part of the ANX.Framework created by the // "ANX.Framework developer group" and released under the Ms-PL license. // For details see: http://anxframework.codeplex.com/license -using ANX.Framework.NonXNA.Development; namespace ANX.Framework.Content { + [PercentageComplete(100)] [Developer("GinieDP")] + [TestState(TestStateAttribute.TestState.Untested)] internal class Vector4Reader : ContentTypeReader { protected internal override Vector4 Read(ContentReader input, Vector4 existingInstance)