Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed camera view options

Browse source 
- fixed camera lens angle
- xamera distance
This commit is contained in:
stojce 2013-10-22 22:02:17 +02:00
parent 2fcb246923
commit 1cea3b403b
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Application.cpp
View file

@ -433,15 +433,8 @@ void Application::paintGL() {
_glowEffect.render(); _glowEffect.render();
if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
glm::vec3 targetPosition = _myAvatar.getEyeLevelPosition(); glm::vec3 targetPosition = _myAvatar.getHeadJointPosition();
if (_myAvatar.getHead().getBlendFace().isActive()) { _mirrorCamera.setDistance(0.3f);
// make sure we're aligned to the blend face eyes
glm::vec3 leftEyePosition, rightEyePosition;
if (_myAvatar.getHead().getBlendFace().getEyePositions(leftEyePosition, rightEyePosition, true)) {
targetPosition = (leftEyePosition + rightEyePosition) * 0.5f;
}
}
_mirrorCamera.setTargetPosition(targetPosition); _mirrorCamera.setTargetPosition(targetPosition);
_mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f))); _mirrorCamera.setTargetRotation(_myAvatar.getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PIf, 0.0f)));
_mirrorCamera.update(1.0f/_fps); _mirrorCamera.update(1.0f/_fps);
@ -460,9 +453,6 @@ void Application::paintGL() {
// render rear view tools if mouse is in the bounds // render rear view tools if mouse is in the bounds
QPoint mousePosition = _glWidget->mapFromGlobal(QCursor::pos()); QPoint mousePosition = _glWidget->mapFromGlobal(QCursor::pos());
qDebug("mouse pos: x = %d, y = %d\n", mousePosition.x(), mousePosition.y());
if (_mirrorViewRect.contains(mousePosition.x(), mousePosition.y())) { if (_mirrorViewRect.contains(mousePosition.x(), mousePosition.y())) {
displayRearMirrorTools(); displayRearMirrorTools();
} }
@ -1665,6 +1655,8 @@ void Application::init() {
_mirrorCamera.setMode(CAMERA_MODE_MIRROR); _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
_mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT); _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
_mirrorCamera.setFieldOfView(45);
_mirrorCamera.setDistance(3.3f);
_mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT); _mirrorViewRect = QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT);
switchToResourcesParentIfRequired(); switchToResourcesParentIfRequired();