ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1954, part 2

Browse Source
This commit is contained in:
Marianne Gagnon 2015-03-01 21:50:54 -05:00
parent d5736f3a5e
commit 48d5567b3f
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/graphics/camera.cpp
View File

@ -164,21 +164,21 @@ void Camera::readEndCamera(const XMLNode &root)
*/ */
void Camera::setupCamera() void Camera::setupCamera()
{ {
m_aspect = (float)(UserConfigParams::m_width)/UserConfigParams::m_height; m_aspect = (float)(irr_driver->getActualScreenSize().Width)/irr_driver->getActualScreenSize().Height;
switch(race_manager->getNumLocalPlayers()) switch(race_manager->getNumLocalPlayers())
{ {
case 1: m_viewport = core::recti(0, 0, case 1: m_viewport = core::recti(0, 0,
UserConfigParams::m_width, irr_driver->getActualScreenSize().Width,
UserConfigParams::m_height); irr_driver->getActualScreenSize().Height);
m_scaling = core::vector2df(1.0f, 1.0f); m_scaling = core::vector2df(1.0f, 1.0f);
m_fov = DEGREE_TO_RAD*75.0f; m_fov = DEGREE_TO_RAD*75.0f;
break; break;
case 2: m_viewport = core::recti(0, case 2: m_viewport = core::recti(0,
m_index==0 ? 0 m_index==0 ? 0
: UserConfigParams::m_height>>1, : irr_driver->getActualScreenSize().Height>>1,
UserConfigParams::m_width, irr_driver->getActualScreenSize().Width,
m_index==0 ? UserConfigParams::m_height>>1 m_index==0 ? irr_driver->getActualScreenSize().Height>>1
: UserConfigParams::m_height); : irr_driver->getActualScreenSize().Height);
m_scaling = core::vector2df(1.0f, 0.5f); m_scaling = core::vector2df(1.0f, 0.5f);
m_aspect *= 2.0f; m_aspect *= 2.0f;
m_fov = DEGREE_TO_RAD*65.0f; m_fov = DEGREE_TO_RAD*65.0f;
@ -188,19 +188,19 @@ void Camera::setupCamera()
if(m_index<2) if(m_index<2)
{ {
m_viewport = core::recti(m_index==0 ? 0 m_viewport = core::recti(m_index==0 ? 0
: UserConfigParams::m_width>>1, : irr_driver->getActualScreenSize().Width>>1,
0, 0,
m_index==0 ? UserConfigParams::m_width>>1 m_index==0 ? irr_driver->getActualScreenSize().Width>>1
: UserConfigParams::m_width, : irr_driver->getActualScreenSize().Width,
UserConfigParams::m_height>>1); irr_driver->getActualScreenSize().Height>>1);
m_scaling = core::vector2df(0.5f, 0.5f); m_scaling = core::vector2df(0.5f, 0.5f);
m_fov = DEGREE_TO_RAD*50.0f; m_fov = DEGREE_TO_RAD*50.0f;
} }
else else
{ {
m_viewport = core::recti(0, UserConfigParams::m_height>>1, m_viewport = core::recti(0, irr_driver->getActualScreenSize().Height>>1,
UserConfigParams::m_width, irr_driver->getActualScreenSize().Width,
UserConfigParams::m_height); irr_driver->getActualScreenSize().Height);
m_scaling = core::vector2df(1.0f, 0.5f); m_scaling = core::vector2df(1.0f, 0.5f);
m_fov = DEGREE_TO_RAD*65.0f; m_fov = DEGREE_TO_RAD*65.0f;
m_aspect *= 2.0f; m_aspect *= 2.0f;
@ -208,10 +208,10 @@ void Camera::setupCamera()
break;*/ break;*/
case 4: case 4:
{ // g++ 4.3 whines about the variables in switch/case if not {}-wrapped (???) { // g++ 4.3 whines about the variables in switch/case if not {}-wrapped (???)
const int x1 = (m_index%2==0 ? 0 : UserConfigParams::m_width>>1); const int x1 = (m_index%2==0 ? 0 : irr_driver->getActualScreenSize().Width>>1);
const int y1 = (m_index<2 ? 0 : UserConfigParams::m_height>>1); const int y1 = (m_index<2 ? 0 : irr_driver->getActualScreenSize().Height>>1);
const int x2 = (m_index%2==0 ? UserConfigParams::m_width>>1 : UserConfigParams::m_width); const int x2 = (m_index%2==0 ? irr_driver->getActualScreenSize().Width>>1 : irr_driver->getActualScreenSize().Width);
const int y2 = (m_index<2 ? UserConfigParams::m_height>>1 : UserConfigParams::m_height); const int y2 = (m_index<2 ? irr_driver->getActualScreenSize().Height>>1 : irr_driver->getActualScreenSize().Height);
m_viewport = core::recti(x1, y1, x2, y2); m_viewport = core::recti(x1, y1, x2, y2);
m_scaling = core::vector2df(0.5f, 0.5f); m_scaling = core::vector2df(0.5f, 0.5f);
m_fov = DEGREE_TO_RAD*50.0f; m_fov = DEGREE_TO_RAD*50.0f;
@ -222,8 +222,8 @@ void Camera::setupCamera()
Log::warn("Camera", "Incorrect number of players: '%d' - assuming 1.", Log::warn("Camera", "Incorrect number of players: '%d' - assuming 1.",
race_manager->getNumLocalPlayers()); race_manager->getNumLocalPlayers());
m_viewport = core::recti(0, 0, m_viewport = core::recti(0, 0,
UserConfigParams::m_width, irr_driver->getActualScreenSize().Width,
UserConfigParams::m_height); irr_driver->getActualScreenSize().Height);
m_scaling = core::vector2df(1.0f, 1.0f); m_scaling = core::vector2df(1.0f, 1.0f);
m_fov = DEGREE_TO_RAD*75.0f; m_fov = DEGREE_TO_RAD*75.0f;
break; break;