Author: msierad
Date: 2006-12-24 15:10:08 -0500 (Sun, 24 Dec 2006)
New Revision: 70030
Modified:
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReader.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReaderManager.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ResourceContentManager.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture2D.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/TextureCube.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/VertexBuffer.cs
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Vector4.cs
Log:
Remove members inherited from parent classes (like not overriden ToString ())
and add 'new' before some functions.
Modified:
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReader.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReader.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReader.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -81,15 +81,6 @@
protected internal abstract T Read(ContentReader input, T
existingInstance);
- public bool Equals(Object obj) { throw new NotImplementedException(); }
- public override int GetHashCode() { throw new
NotImplementedException(); }
- public Type GetType() { throw new NotImplementedException(); }
- public static bool ReferenceEquals(Object objA, Object objB) { throw
new NotImplementedException(); }
- public override string ToString() { throw new
NotImplementedException(); }
-
- ~ContentTypeReader() { throw new NotImplementedException(); }
- protected Object MemberwiseClone() { throw new
NotImplementedException(); }
}
}
-
Modified:
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReaderManager.cs
===================================================================
---
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReaderManager.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ContentTypeReaderManager.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -37,14 +37,5 @@
{
throw new NotImplementedException();
}
-
- public override bool Equals(Object obj) { throw new
NotImplementedException(); }
- public override int GetHashCode() { throw new
NotImplementedException(); }
- public Type GetType() { throw new NotImplementedException(); }
- public static bool ReferenceEquals(Object objA, Object objB) { throw
new NotImplementedException(); }
- public override string ToString() { throw new
NotImplementedException(); }
-
- ~ContentTypeReaderManager() { throw new NotImplementedException(); }
- protected Object MemberwiseClone() { throw new
NotImplementedException(); }
}
}
Modified:
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ResourceContentManager.cs
===================================================================
---
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ResourceContentManager.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++
trunk/Mono.Xna/src/Microsoft.Xna.Framework/Content/ResourceContentManager.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -39,29 +39,9 @@
throw new NotImplementedException();
}
- public IServiceProvider ServiceProvider {
- get { throw new NotImplementedException(); }
- // No 'set' method for this property defined in MSDN
- }
-
- public void Dispose() { throw new NotImplementedException(); }
- public override bool Equals(Object obj) { throw new
NotImplementedException(); }
-
- // We must implement Load<T> for Model, Texture, etc
- /*public override T Load<T>(string assetName) { throw new
NotImplementedException(); } */
-
- public override int GetHashCode() { throw new
NotImplementedException(); }
- public Type GetType() { throw new NotImplementedException(); }
- public static bool ReferenceEquals(Object objA, Object objB) { throw
new NotImplementedException(); }
- public override string ToString() { throw new
NotImplementedException(); }
- public override void Unload() { throw new NotImplementedException(); }
-
protected override Stream OpenStream(string assetName)
{
throw new NotImplementedException();
}
-
- ~ResourceContentManager() { throw new NotImplementedException(); }
- protected Object MemberwiseClone() { throw new
NotImplementedException(); }
}
}
Modified: trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -76,13 +76,7 @@
public static TextureInformation GetTextureInformation(Stream
textureStream, int numberBytes) { throw new NotImplementedException(); }
- public Type GetType() { throw new NotImplementedException(); }
-
- public static bool ReferenceEquals(Object a, Object b) { throw new
NotImplementedException(); }
-
public void Save(string filename, ImageFileFormat format) { throw new
NotImplementedException(); }
- public override string ToString() { throw new
NotImplementedException(); }
-
}
}
Modified: trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture2D.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture2D.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/Texture2D.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -65,7 +65,7 @@
/// <param name="graphicsDevice">The graphics device to use to create
the texture resource.</param>
/// <param name="textureStream">Stream containing the texture
data.</param>
/// <returns>The texture resource that has been created on the
specified graphics device. </returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, Stream
textureStream)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
Stream textureStream)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -74,7 +74,7 @@
/// <param name="graphicsDevice">The graphics device to use to create
the texture resource.</param>
/// <param name="filename">The name of the file containing the
texture.</param>
/// <returns>The texture resource that has been created on the
specified graphics device.</returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, string
filename)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
string filename)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -84,7 +84,7 @@
/// <param name="textureStream">Stream containing the texture
data.</param>
/// <param name="creationParameters">The parameters to use when
creating this texture.</param>
/// <returns>The texture resource that has been created on the
specified graphics device. </returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, Stream
textureStream, TextureCreationParameters creationParameters)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, TextureCreationParameters creationParameters)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -94,7 +94,7 @@
/// <param name="textureStream">Stream containing the texture
data.</param>
/// <param name="numberBytes">The number of bytes in
textureStream.</param>
/// <returns>The texture resource that has been created on the
specified graphics device. </returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, Stream
textureStream, int numberBytes)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -104,7 +104,7 @@
/// <param name="filename">The name of the file containing the
texture.</param>
/// <param name="creationParameters">The parameters to use when
creating this texture.</param>
/// <returns>The texture resource that has been created on the
specified graphics device. </returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, string
filename, TextureCreationParameters creationParameters)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
string filename, TextureCreationParameters creationParameters)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -115,7 +115,7 @@
/// <param name="numberBytes">The number of bytes in
textureStream.</param>
/// <param name="creationParameters">The parameters to use when
creating this texture.</param>
/// <returns>The texture resource that has been created on the
specified graphics device.</returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, Stream
textureStream, int numberBytes, TextureCreationParameters creationParameters)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes, TextureCreationParameters
creationParameters)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -128,7 +128,7 @@
/// <param name="width">The width of the texture, in pixels.</param>
/// <param name="height">The height of the texture, in pixels.</param>
/// <returns>The texture resource that has been created on the
specified graphics device.</returns>
- public static Texture2D FromFile(GraphicsDevice graphicsDevice, string
filename, int width, int height)
+ public new static Texture2D FromFile(GraphicsDevice graphicsDevice,
string filename, int width, int height)
{
throw new NotImplementedException("The method or operation is not
implemented.");
}
@@ -214,17 +214,5 @@
public override int GetHashCode() { throw new
NotImplementedException(); }
public override string ToString() { throw new
NotImplementedException(); }
-
- public void GenerateMipMaps(TextureFilter filterType) { throw new
NotImplementedException(); }
-
- public static TextureCreationParameters
GetCreationParameters(GraphicsDevice graphicsDevice, Stream textureStream) {
throw new NotImplementedException(); }
-
- public static TextureInformation GetTextureInformation(Stream
textureStream) { throw new NotImplementedException(); }
-
- public Type GetType() { throw new NotImplementedException(); }
-
- public static bool ReferenceEquals(Object objA, Object objB) { throw
new NotImplementedException(); }
-
- public void Save(string filename, ImageFileFormat format) { throw new
NotImplementedException(); }
}
}
Modified: trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/TextureCube.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/TextureCube.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/TextureCube.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -58,19 +58,19 @@
public override bool Equals(object obj) { throw new
NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream) { throw new NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream) { throw new NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename) { throw new NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename) { throw new NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes) { throw new NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes) { throw new NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, TextureCreationParameters creationParameters) { throw new
NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, TextureCreationParameters creationParameters) { throw new
NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename, int size) { throw new NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename, int size) { throw new NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename, TextureCreationParameters creationParameters) { throw new
NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
string filename, TextureCreationParameters creationParameters) { throw new
NotImplementedException(); }
- public static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes, TextureCreationParameters
creationParameters) { throw new NotImplementedException(); }
+ public new static TextureCube FromFile(GraphicsDevice graphicsDevice,
Stream textureStream, int numberBytes, TextureCreationParameters
creationParameters) { throw new NotImplementedException(); }
public void GetData<T>(CubeMapFace faceType, T[] data) { throw new
NotImplementedException(); }
Modified: trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/VertexBuffer.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/VertexBuffer.cs
2006-12-24 20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Graphics/VertexBuffer.cs
2006-12-24 20:10:08 UTC (rev 70030)
@@ -141,10 +141,10 @@
public VertexElementUsage VertexElementUsage { get { throw new
NotImplementedException(); } set { throw new NotImplementedException(); } }
- public bool Equals(object obj) { throw new NotImplementedException(); }
+ public override bool Equals(object obj) { throw new
NotImplementedException(); }
- public int GetHashCode() { throw new NotImplementedException(); }
+ public override int GetHashCode() { throw new
NotImplementedException(); }
- public string ToString() { throw new NotImplementedException(); }
+ public override string ToString() { throw new
NotImplementedException(); }
}
}
Modified: trunk/Mono.Xna/src/Microsoft.Xna.Framework/Vector4.cs
===================================================================
--- trunk/Mono.Xna/src/Microsoft.Xna.Framework/Vector4.cs 2006-12-24
20:08:21 UTC (rev 70029)
+++ trunk/Mono.Xna/src/Microsoft.Xna.Framework/Vector4.cs 2006-12-24
20:10:08 UTC (rev 70030)
@@ -194,7 +194,7 @@
/// <summary>Calculates the distance between two vectors.</summary>
/// <param name="value1">Source vector.</param>
/// <param name="value2">Source vector.</param>
- /// <returns>Distance between the source vectors.</return s>
+ /// <returns>Distance between the source vectors.</returns>
public static float Distance(Vector4 value1, Vector4 value2)
{
Vector4 vector1 = value1 - value2;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
