Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some merge errors

Browse Source
This commit is contained in:
Alexander Eckart committed 2013-05-10 19:36:58 +02:00
1 parent 4161652a1d
commit fd7b3ae3a3
3 files changed
+4 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/IBasic.cs
+2 -5
View File
@@ -114,12 +114,9 @@ namespace VocaluxeLib
public interface IDrawing
{
RectangleF GetTextBounds(CText text);
void DrawTexture(STexture texture, SRectF rect);
void DrawTexture(STexture texture, SRectF rect, SColorF color);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored);
void DrawTexture(STexture texture, SRectF rect, SColorF color, SRectF bounds, bool mirrored = false);
void DrawTextureReflection(STexture texture, SRectF rect, SColorF color, SRectF bounds, float reflectionSpace, float reflectionHeight);
STexture AddTexture(string fileName);
@@ -148,7 +145,7 @@ namespace VocaluxeLib
void SetFont(string fontName);
void SetStyle(EStyle fontStyle);
RectangleF GetTextBounds(CText text, float textHeight);
RectangleF GetTextBounds(CText text);
void DrawText(string text, float textHeight, float x, float y, float z, SColorF color);
void DrawTextReflection(string text, float textHeight, float x, float y, float z, SColorF color, float reflectionSpace, float reflectionHeight);