Merge pull request OpenXcom#871 from HueponiK/master

Option to enable 1:1.2 pixel aspect ratio

Author: SupSuper

src/Engine/Options.cpp

@@ -119,6 +119,7 @@ void create()
 	_info.push_back(OptionInfo("captureMouse", (bool*)&captureMouse, false));
 	_info.push_back(OptionInfo("battleTooltips", &battleTooltips, true));
 	_info.push_back(OptionInfo("keepAspectRatio", &keepAspectRatio, true));
+	_info.push_back(OptionInfo("nonSquarePixelRatio", &nonSquarePixelRatio, false));	
 	_info.push_back(OptionInfo("cursorInBlackBandsInFullscreen", &cursorInBlackBandsInFullscreen, false));
 	_info.push_back(OptionInfo("cursorInBlackBandsInWindow", &cursorInBlackBandsInWindow, true));
 	_info.push_back(OptionInfo("cursorInBlackBandsInBorderlessWindow", &cursorInBlackBandsInBorderlessWindow, false));

src/Engine/Options.inc.h

@@ -6,7 +6,7 @@ OPT int displayWidth, displayHeight, maxFrameSkip, baseXResolution, baseYResolut
     soundVolume, musicVolume, uiVolume, audioSampleRate, audioBitDepth, pauseMode, windowedModePositionX, windowedModePositionY, FPS,
 	changeValueByMouseWheel, dragScrollTimeTolerance, dragScrollPixelTolerance, mousewheelSpeed, autosaveFrequency;
 OPT bool fullscreen, asyncBlit, playIntro, useScaleFilter, useHQXFilter, useOpenGL, checkOpenGLErrors, vSyncForOpenGL, useOpenGLSmoothing,
-	autosave, allowResize, borderless, debug, debugUi, fpsCounter, newSeedOnLoad, keepAspectRatio,
+	autosave, allowResize, borderless, debug, debugUi, fpsCounter, newSeedOnLoad, keepAspectRatio, nonSquarePixelRatio,
 	cursorInBlackBandsInFullscreen, cursorInBlackBandsInWindow, cursorInBlackBandsInBorderlessWindow, maximizeInfoScreens, musicAlwaysLoop;
 OPT std::string language, useOpenGLShader;
 OPT KeyboardType keyboardMode;

src/Engine/Screen.cpp

@@ -368,6 +368,13 @@ void Screen::resetDisplay(bool resetVideo)
 	_clear.w = getWidth();
 	_clear.h = getHeight();
 
+	double pixelRatioX = 1.0;
+	double pixelRatioY = 1.0;
+	if (Options::nonSquarePixelRatio && !Options::allowResize)
+	{
+		pixelRatioX = 0.75;
+		pixelRatioY = 1.2;
+	}
 	bool cursorInBlackBands;
 	if (!Options::keepAspectRatio)
 	{
@@ -410,13 +417,17 @@ void Screen::resetDisplay(bool resetVideo)
 	}
 	else if (_scaleY > _scaleX && Options::keepAspectRatio)
 	{
-		int targetHeight = (int)floor(_scaleX * (double)_baseHeight);
+		int targetHeight = (int)floor(_scaleX * (double)_baseHeight * pixelRatioY);
 		_topBlackBand = (getHeight() - targetHeight) / 2;
 		if (_topBlackBand < 0)
 		{
 			_topBlackBand = 0;
 		}
         _bottomBlackBand = getHeight() - targetHeight - _topBlackBand;
+		if (_bottomBlackBand < 0)
+		{
+			_bottomBlackBand = 0;
+		}
 		_leftBlackBand = _rightBlackBand = 0;
 		_cursorLeftBlackBand = 0;
 
@@ -587,28 +598,41 @@ int Screen::getDY()
 */
 void Screen::updateScale(int &type, int selection, int &width, int &height, bool change)
 {
+	double pixelRatioY = 1.0;
+	double pixelRatioX = 1.0;
+	if (Options::nonSquarePixelRatio && !Options::allowResize)
+	{
+		pixelRatioX = 0.75;
+		pixelRatioY = 1.2;
+	}
 	type = selection;
 	switch (type)
 	{
 	case SCALE_15X:
-		width = Screen::ORIGINAL_WIDTH * 1.5;
-		height = Screen::ORIGINAL_HEIGHT * 1.5;
+		width = int(floor(Screen::ORIGINAL_WIDTH * 1.5));
+		height = int(floor(Screen::ORIGINAL_HEIGHT * 1.5));
 		break;
 	case SCALE_2X:
-		width = Screen::ORIGINAL_WIDTH * 2;
-		height = Screen::ORIGINAL_HEIGHT * 2;
+		width = int(floor(Screen::ORIGINAL_WIDTH * 2));
+		height = int(floor(Screen::ORIGINAL_HEIGHT * 2));
 		break;
 	case SCALE_SCREEN_DIV_3:
-		width = Options::newDisplayWidth / 3;
-		height = Options::newDisplayHeight / 3;
+		width = int(floor(Options::displayWidth / 3 * pixelRatioY));
+		height = int(floor(Options::displayHeight / 3));
+		width = std::max(width, int(floor(Screen::ORIGINAL_WIDTH / pixelRatioX  * pixelRatioY)));
+		height = std::max(height, int(floor(Screen::ORIGINAL_HEIGHT * pixelRatioY)));
 		break;
 	case SCALE_SCREEN_DIV_2:
-		width = Options::newDisplayWidth / 2;
-		height = Options::newDisplayHeight / 2;
+		width = int(floor(Options::displayWidth / 2 * pixelRatioY));
+		height = int(floor(Options::displayHeight / 2));
+		width = std::max(width, int(floor(Screen::ORIGINAL_WIDTH / pixelRatioX  * pixelRatioY)));
+		height = std::max(height, int(floor(Screen::ORIGINAL_HEIGHT * pixelRatioY)));
 		break;
 	case SCALE_SCREEN:
-		width = Options::newDisplayWidth;
-		height = Options::newDisplayHeight;
+		width = int(floor(Options::displayWidth * pixelRatioY));
+		height = int(floor(Options::displayHeight));
+		width = std::max(width, int(floor(Screen::ORIGINAL_WIDTH / pixelRatioX  * pixelRatioY)));
+		height = std::max(height, int(floor(Screen::ORIGINAL_HEIGHT * pixelRatioY)));
 		break;
 	case SCALE_ORIGINAL:
 	default: