Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into Better_Graphics_Handling

Conflicts:
	Vocaluxe/COSFunctions.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CStatic.cs
	VocaluxeLib/Structs.cs
This commit is contained in:
Flamefire committed 2014-09-25 18:49:18 +02:00
commit c156fa69ab
550 files changed
+22434 -23687

No files matched your search

+29
View File
@@ -111,6 +111,30 @@ namespace VocaluxeLib
scaledWidth = bounds.H * aspectRatio;
}
break;
case EAspect.Zoom1:
if (boundsAspectRatio >= aspectRatio)
{
scaledWidth = bounds.W * 1.33f;
scaledHeight = bounds.W * 1.33f / aspectRatio;
}
else
{
scaledHeight = bounds.H / 1.33f;
scaledWidth = bounds.H / 1.33f * aspectRatio;
}
break;
case EAspect.Zoom2:
if (boundsAspectRatio >= aspectRatio)
{
scaledWidth = bounds.W * 1.17f;
scaledHeight = bounds.W * 1.17f / aspectRatio;
}
else
{
scaledHeight = bounds.H / 1.17f;
scaledWidth = bounds.H / 1.17f * aspectRatio;
}
break;
case EAspect.LetterBox:
if (boundsAspectRatio <= aspectRatio)
{
@@ -259,6 +283,11 @@ namespace VocaluxeLib
return filename + ext;
}
public static int Sum(int n)
{
return (n * n + n) / 2;
}
/// <summary>
/// Loads a bitmap from a file logging errors
/// </summary>