Code cleanup

This commit is contained in:
Stephan Sundermann committed 2012-03-16 16:30:34 +01:00
1 parent a88c1227eb
commit 73132f3932
1 file changed
-24
-24
View File
@@ -952,13 +952,10 @@ namespace Vocaluxe.Lib.Draw
/// </summary> /// </summary>
/// <param name="Texture">The texture to be drawn</param> /// <param name="Texture">The texture to be drawn</param>
public void DrawTexture(STexture Texture) public void DrawTexture(STexture Texture)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index))
DrawTexture(Texture, Texture.rect, Texture.color); DrawTexture(Texture, Texture.rect, Texture.color);
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -966,13 +963,10 @@ namespace Vocaluxe.Lib.Draw
/// <param name="Texture">The texture to be drawn</param> /// <param name="Texture">The texture to be drawn</param>
/// <param name="rect">A SRectF struct containing the destination coordinates</param> /// <param name="rect">A SRectF struct containing the destination coordinates</param>
public void DrawTexture(STexture Texture, SRectF rect) public void DrawTexture(STexture Texture, SRectF rect)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index))
DrawTexture(Texture, rect, Texture.color, false); DrawTexture(Texture, rect, Texture.color, false);
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -981,13 +975,10 @@ namespace Vocaluxe.Lib.Draw
/// <param name="rect">A SRectF struct containing the destination coordinates</param> /// <param name="rect">A SRectF struct containing the destination coordinates</param>
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param> /// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
public void DrawTexture(STexture Texture, SRectF rect, SColorF color) public void DrawTexture(STexture Texture, SRectF rect, SColorF color)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index))
DrawTexture(Texture, rect, color, false); DrawTexture(Texture, rect, color, false);
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -997,13 +988,10 @@ namespace Vocaluxe.Lib.Draw
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param> /// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param> /// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param>
public void DrawTexture(STexture Texture, SRectF rect, SColorF color, SRectF bounds) public void DrawTexture(STexture Texture, SRectF rect, SColorF color, SRectF bounds)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index))
DrawTexture(Texture, rect, color, bounds, false); DrawTexture(Texture, rect, color, bounds, false);
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -1013,13 +1001,10 @@ namespace Vocaluxe.Lib.Draw
/// <param name="color">A SColorF struct containing a color which the texture will be colored in</param> /// <param name="color">A SColorF struct containing a color which the texture will be colored in</param>
/// <param name="mirrored">True if the texture should be mirrored</param> /// <param name="mirrored">True if the texture should be mirrored</param>
public void DrawTexture(STexture Texture, SRectF rect, SColorF color, bool mirrored) public void DrawTexture(STexture Texture, SRectF rect, SColorF color, bool mirrored)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index))
DrawTexture(Texture, rect, color, new SRectF(0, 0, CSettings.iRenderW, CSettings.iRenderH, rect.Z), mirrored); DrawTexture(Texture, rect, color, new SRectF(0, 0, CSettings.iRenderW, CSettings.iRenderH, rect.Z), mirrored);
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -1030,8 +1015,6 @@ namespace Vocaluxe.Lib.Draw
/// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param> /// <param name="bounds">A SRectF struct containing which part of the texture should be drawn</param>
/// <param name="mirrored">True if the texture should be mirrored</param> /// <param name="mirrored">True if the texture should be mirrored</param>
public void DrawTexture(STexture Texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored) public void DrawTexture(STexture Texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored)
{
//lock (MutexTexture)
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index) && _TextureExists(ref Texture)) if ((Texture.index >= 0) && (_Textures.Count > 0) && (_D3DTextures.Count > Texture.index) && _TextureExists(ref Texture))
{ {
@@ -1143,7 +1126,6 @@ namespace Vocaluxe.Lib.Draw
} }
} }
} }
}
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
@@ -1155,8 +1137,6 @@ namespace Vocaluxe.Lib.Draw
/// <param name="end">A Value ranging from 0 to 1 containing the ending of the texture</param> /// <param name="end">A Value ranging from 0 to 1 containing the ending of the texture</param>
public void DrawTexture(STexture Texture, SRectF rect, SColorF color, float begin, float end) public void DrawTexture(STexture Texture, SRectF rect, SColorF color, float begin, float end)
{
//lock (MutexTexture)
{ {
if (_TextureExists(ref Texture)) if (_TextureExists(ref Texture))
{ {
@@ -1223,7 +1203,6 @@ namespace Vocaluxe.Lib.Draw
} }
} }
} }
}
/// <summary> /// <summary>
/// Draws a reflection of a texture /// Draws a reflection of a texture
@@ -1235,8 +1214,6 @@ namespace Vocaluxe.Lib.Draw
/// <param name="space">The space between the texture and the reflection</param> /// <param name="space">The space between the texture and the reflection</param>
/// <param name="height">The height of the reflection</param> /// <param name="height">The height of the reflection</param>
public void DrawTextureReflection(STexture Texture, SRectF rect, SColorF color, SRectF bounds, float space, float height) public void DrawTextureReflection(STexture Texture, SRectF rect, SColorF color, SRectF bounds, float space, float height)
{
//lock (MutexTexture)
{ {
if (_TextureExists(ref Texture)) if (_TextureExists(ref Texture))
{ {
@@ -1344,7 +1321,6 @@ namespace Vocaluxe.Lib.Draw
} }
} }
} }
}
private void CheckQueque() private void CheckQueque()
{ {