mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-09-03 10:03:01 +02:00
Code Issues Releases Wiki Activity

fix camera lookAt for first person view

Browse Source
This commit is contained in:
XProger
2018-10-18 07:29:06 +03:00
parent 621c0495e7
commit 7e0a467016
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/camera.h
View File

@@ -364,8 +364,6 @@ struct Camera : ICamera {
} else } else
updateFirstPerson(); updateFirstPerson();
} else { } else {
Controller *lookAt = NULL;
if (Core::settings.detail.stereo == Core::Settings::STEREO_VR) { if (Core::settings.detail.stereo == Core::Settings::STEREO_VR) {
lookAngle = vec3(0.0f); lookAngle = vec3(0.0f);
} else { } else {
@@ -392,6 +390,15 @@ struct Camera : ICamera {
} }
} }
targetAngle = owner->angle + lookAngle;
targetAngle.x = clampAngle(targetAngle.x);
targetAngle.y = clampAngle(targetAngle.y);
targetAngle.x = clamp(targetAngle.x, -85 * DEG2RAD, +85 * DEG2RAD);
Controller *lookAt = NULL;
if (mode != MODE_STATIC) { if (mode != MODE_STATIC) {
if (!owner->viewTarget) { if (!owner->viewTarget) {
if (viewTarget && !viewTarget->flags.invisible) { if (viewTarget && !viewTarget->flags.invisible) {
@@ -408,15 +415,9 @@ struct Camera : ICamera {
owner->lookAt(NULL); owner->lookAt(NULL);
} }
targetAngle = owner->angle + lookAngle;
if (!firstPerson && (mode == MODE_FOLLOW || mode == MODE_COMBAT)) if (!firstPerson && (mode == MODE_FOLLOW || mode == MODE_COMBAT))
targetAngle += angle; targetAngle += angle;
targetAngle.x = clampAngle(targetAngle.x);
targetAngle.y = clampAngle(targetAngle.y);
targetAngle.x = clamp(targetAngle.x, -85 * DEG2RAD, +85 * DEG2RAD);
if (!firstPerson || viewIndex != -1) { if (!firstPerson || viewIndex != -1) {
if (timer > 0.0f) { if (timer > 0.0f) {