mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix door rotation order in collision case (Bug #3707)

Browse Source
This commit is contained in:
scrawl 2017-01-19 02:19:44 +01:00
parent 45fb4f04b1
commit cc19b4bd8a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwworld/worldimp.cpp
View File

@ -1477,8 +1477,6 @@ namespace MWWorld
float diff = duration * osg::DegreesToRadians(90.f); float diff = duration * osg::DegreesToRadians(90.f);
float targetRot = std::min(std::max(minRot, oldRot + diff * (it->second == 1 ? 1 : -1)), maxRot); float targetRot = std::min(std::max(minRot, oldRot + diff * (it->second == 1 ? 1 : -1)), maxRot);
rotateObject(it->first, objPos.rot[0], objPos.rot[1], targetRot); rotateObject(it->first, objPos.rot[0], objPos.rot[1], targetRot);
// the rotation order we want to use
mWorldScene->updateObjectRotation(it->first, false);
bool reached = (targetRot == maxRot && it->second) || targetRot == minRot; bool reached = (targetRot == maxRot && it->second) || targetRot == minRot;
@ -1502,6 +1500,9 @@ namespace MWWorld
} }
} }
// the rotation order we want to use
mWorldScene->updateObjectRotation(it->first, false);
if (reached) if (reached)
{ {
// Mark as non-moving // Mark as non-moving