mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:23:51 +00:00
Code Issues Releases Wiki Activity

Improved camera logic to restore proper character orientation when loading a saved game.

Browse source
This commit is contained in:
madsbuvi 2021-04-26 20:56:28 +02:00
parent 2172aa17f1
commit 6e5d9d39dd
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/openmw/mwvr/vrcamera.cpp
View file

@ -10,6 +10,7 @@
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwbase/windowmanager.hpp"
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
@ -66,21 +67,6 @@ namespace MWVR
} }
mShouldResetZ = false; mShouldResetZ = false;
} }
// When the cell changes, the game rotates the character appropriately.
// To respect this, reset yaw offset to make our yaw match the character.
MWBase::World* world = MWBase::Environment::get().getWorld();
if (world)
{
auto& player = world->getPlayer();
auto playerPtr = player.getPlayer();
const auto& data = playerPtr.getRefData();
float yaw = 0.f;
float pitch = 0.f;
float roll = 0.f;
getEulerAngles(mHeadPose.orientation, yaw, pitch, roll);
mYawOffset = data.getPosition().rot[2] - yaw;
}
mShouldRecenter = false; mShouldRecenter = false;
Log(Debug::Verbose) << "Recentered"; Log(Debug::Verbose) << "Recentered";
} }
@ -92,17 +78,17 @@ namespace MWVR
auto& player = world->getPlayer(); auto& player = world->getPlayer();
auto playerPtr = player.getPlayer(); auto playerPtr = player.getPlayer();
osg::Quat orientation;
getOrientation(orientation);
float yaw = 0.f; float yaw = 0.f;
float pitch = 0.f; float pitch = 0.f;
float roll = 0.f; float roll = 0.f;
getEulerAngles(mHeadPose.orientation, yaw, pitch, roll); getEulerAngles(orientation, yaw, pitch, roll);
yaw += mYawOffset;
if (!player.isDisabled() && mTrackingNode) if (!player.isDisabled() && mTrackingNode)
{ {
world->rotateObject(playerPtr, pitch, 0.f, yaw, MWBase::RotationFlag_none); world->rotateObject(playerPtr, pitch, 0.f, yaw, MWBase::RotationFlag_none);
world->rotateWorldObject(playerPtr, mHeadPose.orientation);
} }
} }
@ -136,8 +122,9 @@ namespace MWVR
} }
else else
{ {
if (mShouldTrackPlayerCharacter) if (mShouldTrackPlayerCharacter && !MWBase::Environment::get().getWindowManager()->isGuiMode())
applyTracking(); applyTracking();
Camera::updateCamera(cam); Camera::updateCamera(cam);
} }
} }
@ -214,6 +201,15 @@ namespace MWVR
{ {
Camera::rotateCameraToTrackingPtr(); Camera::rotateCameraToTrackingPtr();
setRoll(-mTrackingPtr.getRefData().getPosition().rot[1] - mDeferredRotation.y()); setRoll(-mTrackingPtr.getRefData().getPosition().rot[1] - mDeferredRotation.y());
// When the cell changes, openmw rotates the character.
// To make sure the player faces the same direction regardless of current orientation,
// compute the offset from character orientation to player orientation and reset yaw offset to this.
float yaw = 0.f;
float pitch = 0.f;
float roll = 0.f;
getEulerAngles(mHeadPose.orientation, yaw, pitch, roll);
mYawOffset = -mYaw - yaw;
} }
osg::Quat VRCamera::stageRotation() osg::Quat VRCamera::stageRotation()
@ -225,7 +221,7 @@ namespace MWVR
{ {
mShouldRecenter = true; mShouldRecenter = true;
// Use OR so we don't a pending reset of Z. // Use OR so we don't negate a pending requests.
mShouldResetZ |= resetZ; mShouldResetZ |= resetZ;
} }
} }