diff options
Diffstat (limited to 'backends/platform/iphone/iphone_video.mm')
| -rw-r--r-- | backends/platform/iphone/iphone_video.mm | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/backends/platform/iphone/iphone_video.mm b/backends/platform/iphone/iphone_video.mm index ecb514d633..0ddb90bece 100644 --- a/backends/platform/iphone/iphone_video.mm +++ b/backends/platform/iphone/iphone_video.mm @@ -41,8 +41,6 @@ static long lastTick = 0; static int frames = 0; #endif -static bool _aspectRatioCorrect = false; - #define printOpenGLError() printOglError(__FILE__, __LINE__) int printOglError(const char *file, int line) { @@ -58,14 +56,6 @@ int printOglError(const char *file, int line) { return retCode; } -void iPhone_setAspectRatioState(bool enable) { - _aspectRatioCorrect = enable; -} - -bool iPhone_getAspectRatioState() { - return _aspectRatioCorrect; -} - bool iPhone_isHighResDevice() { return _fullHeight > 480; } @@ -488,22 +478,19 @@ const char *iPhone_getDocumentsDir() { [[_keyboardView inputView] removeFromSuperview]; } - float adjustedWidth = _videoContext.screenWidth; - float adjustedHeight = _videoContext.screenHeight; - if (_aspectRatioCorrect && ((_videoContext.screenWidth == 320 && _videoContext.screenHeight == 200) - || (_videoContext.screenWidth == 640 && _videoContext.screenHeight == 400)) ) { - if (_videoContext.screenHeight == 200) { + GLfloat adjustedWidth = _videoContext.screenWidth; + GLfloat adjustedHeight = _videoContext.screenHeight; + if (_videoContext.asprectRatioCorrection) { + if (_videoContext.screenWidth == 320 && _videoContext.screenHeight == 200) adjustedHeight = 240; - } - if (_videoContext.screenHeight == 400) { + else if (_videoContext.screenWidth == 640 && _videoContext.screenHeight == 400) adjustedHeight = 480; - } } float overlayPortraitRatio; if (_orientation == UIDeviceOrientationLandscapeLeft || _orientation == UIDeviceOrientationLandscapeRight) { - GLfloat gameScreenRatio = (GLfloat)adjustedWidth / (GLfloat)adjustedHeight; + GLfloat gameScreenRatio = adjustedWidth / adjustedHeight; GLfloat screenRatio = (GLfloat)screenWidth / (GLfloat)screenHeight; // These are the width/height according to the portrait layout! @@ -532,7 +519,7 @@ const char *iPhone_getDocumentsDir() { _gameScreenRect = CGRectMake(xOffset, yOffset, rectWidth, rectHeight); overlayPortraitRatio = 1.0f; } else { - float ratio = (float)adjustedHeight / (float)adjustedWidth; + GLfloat ratio = adjustedHeight / adjustedWidth; int height = (int)(screenWidth * ratio); //printf("Making rect (%u, %u)\n", screenWidth, height); _gameScreenRect = CGRectMake(0, 0, screenWidth, height); |