From 1ea40a708155384a6087dc355ebf3d1ed951eb00 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Mon, 7 Nov 2011 15:14:20 +0000 Subject: [PATCH] fixed the signature of the predefined vertex formats --- ANX.Framework/Graphics/VertexPositionColor.cs | 30 +++++++++++++++++++ .../Graphics/VertexPositionColorTexture.cs | 30 +++++++++++++++++++ .../Graphics/VertexPositionNormalTexture.cs | 30 +++++++++++++++++++ .../Graphics/VertexPositionTexture.cs | 30 +++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/ANX.Framework/Graphics/VertexPositionColor.cs b/ANX.Framework/Graphics/VertexPositionColor.cs index 297dc9f0..2b8c7a5c 100644 --- a/ANX.Framework/Graphics/VertexPositionColor.cs +++ b/ANX.Framework/Graphics/VertexPositionColor.cs @@ -79,5 +79,35 @@ namespace ANX.Framework.Graphics d.Name = "VertexPositionColor.VertexDeclaration"; VertexDeclaration = d; } + + public override int GetHashCode() + { + throw new NotImplementedException(); + } + + public override string ToString() + { + return string.Format("{{Position:{0} Color:{1}}}", this.Position, this.Color); + } + + public override bool Equals(object obj) + { + if (obj != null && obj.GetType() == this.GetType()) + { + return this == (VertexPositionColor)obj; + } + + return false; + } + + public static bool operator ==(VertexPositionColor lhs, VertexPositionColor rhs) + { + return lhs.Color.Equals(rhs.Color) && lhs.Position.Equals(rhs.Position); + } + + public static bool operator !=(VertexPositionColor lhs, VertexPositionColor rhs) + { + return !lhs.Color.Equals(rhs.Color) || !lhs.Position.Equals(rhs.Position); + } } } diff --git a/ANX.Framework/Graphics/VertexPositionColorTexture.cs b/ANX.Framework/Graphics/VertexPositionColorTexture.cs index 8c2c0d0c..50cee702 100644 --- a/ANX.Framework/Graphics/VertexPositionColorTexture.cs +++ b/ANX.Framework/Graphics/VertexPositionColorTexture.cs @@ -82,5 +82,35 @@ namespace ANX.Framework.Graphics d.Name = "VertexPositionColorTexture.VertexDeclaration"; VertexDeclaration = d; } + + public override int GetHashCode() + { + throw new NotImplementedException(); + } + + public override string ToString() + { + return string.Format("{{Position:{0} Color:{1} TextureCoordinate:{2}}}", this.Position, this.Color, this.TextureCoordinate); + } + + public override bool Equals(object obj) + { + if (obj != null && obj.GetType() == this.GetType()) + { + return this == (VertexPositionColorTexture)obj; + } + + return false; + } + + public static bool operator ==(VertexPositionColorTexture lhs, VertexPositionColorTexture rhs) + { + return lhs.Color.Equals(rhs.Color) && lhs.Position.Equals(rhs.Position) && lhs.TextureCoordinate.Equals(rhs.TextureCoordinate); + } + + public static bool operator !=(VertexPositionColorTexture lhs, VertexPositionColorTexture rhs) + { + return !lhs.Color.Equals(rhs.Color) || !lhs.Position.Equals(rhs.Position) || !lhs.TextureCoordinate.Equals(rhs.TextureCoordinate); + } } } diff --git a/ANX.Framework/Graphics/VertexPositionNormalTexture.cs b/ANX.Framework/Graphics/VertexPositionNormalTexture.cs index be969d45..2deb9fe6 100644 --- a/ANX.Framework/Graphics/VertexPositionNormalTexture.cs +++ b/ANX.Framework/Graphics/VertexPositionNormalTexture.cs @@ -82,5 +82,35 @@ namespace ANX.Framework.Graphics d.Name = "VertexPositionNormalTexture.VertexDeclaration"; VertexDeclaration = d; } + + public override int GetHashCode() + { + throw new NotImplementedException(); + } + + public override string ToString() + { + return string.Format("{{Position:{0} Normal:{1} TextureCoordinate:{2}}}", this.Position, this.Normal, this.TextureCoordinate); + } + + public override bool Equals(object obj) + { + if (obj != null && obj.GetType() == this.GetType()) + { + return this == (VertexPositionNormalTexture)obj; + } + + return false; + } + + public static bool operator ==(VertexPositionNormalTexture lhs, VertexPositionNormalTexture rhs) + { + return lhs.Normal.Equals(rhs.Normal) && lhs.Position.Equals(rhs.Position) && lhs.TextureCoordinate.Equals(rhs.TextureCoordinate); + } + + public static bool operator !=(VertexPositionNormalTexture lhs, VertexPositionNormalTexture rhs) + { + return !lhs.Normal.Equals(rhs.Normal) || !lhs.Position.Equals(rhs.Position) || !lhs.TextureCoordinate.Equals(rhs.TextureCoordinate); + } } } diff --git a/ANX.Framework/Graphics/VertexPositionTexture.cs b/ANX.Framework/Graphics/VertexPositionTexture.cs index 34ae4548..807fb85b 100644 --- a/ANX.Framework/Graphics/VertexPositionTexture.cs +++ b/ANX.Framework/Graphics/VertexPositionTexture.cs @@ -79,5 +79,35 @@ namespace ANX.Framework.Graphics d.Name = "VertexPositionTexture.VertexDeclaration"; VertexDeclaration = d; } + + public override int GetHashCode() + { + throw new NotImplementedException(); + } + + public override string ToString() + { + return string.Format("{{Position:{0} TextureCoordinate:{1}}}", this.Position, this.TextureCoordinate); + } + + public override bool Equals(object obj) + { + if (obj != null && obj.GetType() == this.GetType()) + { + return this == (VertexPositionTexture)obj; + } + + return false; + } + + public static bool operator ==(VertexPositionTexture lhs, VertexPositionTexture rhs) + { + return lhs.TextureCoordinate.Equals(rhs.TextureCoordinate) && lhs.Position.Equals(rhs.Position); + } + + public static bool operator !=(VertexPositionTexture lhs, VertexPositionTexture rhs) + { + return !lhs.TextureCoordinate.Equals(rhs.TextureCoordinate) || !lhs.Position.Equals(rhs.Position); + } } }