Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust screen size correction factor for showShipModelWithKey: to be able to handle also game windows with height bigger than their width.

Browse Source
This commit is contained in:
AnotherCommander 2014-01-29 10:26:30 +01:00
parent f553455a98
commit 282b2f2770
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Entities/PlayerEntity.m
View File

@ -3022,7 +3022,13 @@ static GLfloat sBaseMass = 0.0;
// Correct the position of the displayed model in the status screen when viewed in non-4/3 resolutions. Other screens displaying // Correct the position of the displayed model in the status screen when viewed in non-4/3 resolutions. Other screens displaying
// demoship models remain unaltered - Nikos 20140129 // demoship models remain unaltered - Nikos 20140129
NSSize screenSize = [[UNIVERSE gameView] viewSize]; NSSize screenSize = [[UNIVERSE gameView] viewSize];
GLfloat screenSizeCorrectionFactor = [context isEqualToString:@"GUI_SCREEN_STATUS"] ? screenSize.height / screenSize.width * (4.0f/3.0f) : 1.0f; GLfloat screenSizeCorrectionFactor = 1.0f;
if ([context isEqualToString:@"GUI_SCREEN_STATUS"])
{
screenSizeCorrectionFactor = screenSize.height <= screenSize.width ?
screenSize.height / screenSize.width * (4.0f/3.0f) :
screenSize.height / screenSize.width * (3.0f/4.0f);
}
Quaternion q2 = { (GLfloat)M_SQRT1_2, (GLfloat)M_SQRT1_2, (GLfloat)0.0f, (GLfloat)0.0f }; Quaternion q2 = { (GLfloat)M_SQRT1_2, (GLfloat)M_SQRT1_2, (GLfloat)0.0f, (GLfloat)0.0f };
// MKW - retrieve last demo ships' orientation and release it // MKW - retrieve last demo ships' orientation and release it