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

Merge pull request #3529 from pelya/gyro-camera-angle-fix

Browse Source 
Fix for gyroscope camera using world coordinates instead of camera orientation
This commit is contained in:
Deve 2018-10-23 21:54:43 +02:00 committed by GitHub
commit 91074705fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/camera_normal.cpp
View File

@ -226,7 +226,7 @@ void CameraNormal::getCameraSettings(float *above_kart, float *cam_angle,
MultitouchDevice* device = input_manager->getDeviceManager()->getMultitouchDevice();
if (device)
{
*cam_roll_angle = device->getOrientation();
*cam_roll_angle = -device->getOrientation();
}
}
break;
@ -373,7 +373,12 @@ void CameraNormal::positionCamera(float dt, float above_kart, float cam_angle,
if (cam_roll_angle != 0.0f)
{
irr::core::vector3df up(0, 1, 0);
irr::core::vector3df forward = m_camera->getTarget() - m_camera->getPosition();
float direction = atan2f(forward.Z, forward.X) - 90.0f;
if (direction < -180.0f)
direction += 360.0f;
up.rotateXYBy(cam_roll_angle * (180.0f / M_PI));
up.rotateXZBy(direction * (180.0f / M_PI));
m_camera->setUpVector(up);
}
} // positionCamera