Merge pull request #164 from lukeIam/strech

Added option to stretch
This commit is contained in:
Florian Küpper committed 2015-12-06 12:38:57 +01:00
commit 1870669672
3 files changed
+12 -2

No files matched your search

+3
View File
@@ -89,6 +89,7 @@ namespace Vocaluxe.Base
[DefaultValue(60f)] public float MaxFPS; [DefaultValue(60f)] public float MaxFPS;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VSync; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VSync;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn FullScreen; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn FullScreen;
[DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn Stretch;
[DefaultValue(0.4f), XmlRanged(0, 3)] public float FadeTime; [DefaultValue(0.4f), XmlRanged(0, 3)] public float FadeTime;
} }
@@ -468,6 +469,8 @@ namespace Vocaluxe.Base
return "Server Encryption On/Off: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))); return "Server Encryption On/Off: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)));
case "ServerPort": case "ServerPort":
return "Server Port (default: 3000) [1..65535]"; return "Server Port (default: 3000) [1..65535]";
case "Stretch":
return "Stretch view to full window size: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn)));
default: default:
return null; return null;
} }
+4 -1
View File
@@ -207,7 +207,10 @@ namespace Vocaluxe.Lib.Draw
_H = _Form.ClientSize.Height; _H = _Form.ClientSize.Height;
_W = _Form.ClientSize.Width; _W = _Form.ClientSize.Width;
_AdjustAspect(false); if (CConfig.Config.Graphics.Stretch != EOffOn.TR_CONFIG_ON)
{
_AdjustAspect(false);
}
//Apply the new sizes to the PresentParameters //Apply the new sizes to the PresentParameters
_PresentParameters.BackBufferWidth = _Form.ClientSize.Width; _PresentParameters.BackBufferWidth = _Form.ClientSize.Width;
+5 -1
View File
@@ -219,7 +219,11 @@ namespace Vocaluxe.Lib.Draw
_W = _Control.Width; _W = _Control.Width;
_CurrentAlignment = CConfig.Config.Graphics.ScreenAlignment; _CurrentAlignment = CConfig.Config.Graphics.ScreenAlignment;
_AdjustAspect(true); if (CConfig.Config.Graphics.Stretch != EOffOn.TR_CONFIG_ON)
{
_AdjustAspect(true);
}
_AdjustNewBorders(); _AdjustNewBorders();
GL.Viewport(_X, _Y, _W, _H); GL.Viewport(_X, _Y, _W, _H);
} }