mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'refactoring2' into 'master'

Browse Source 
Minor refactoring: use Misc::normalizeAngle in worldimp.cpp

See merge request OpenMW/openmw!1242
This commit is contained in:
Evil Eye 2021-09-27 16:01:31 +00:00
commit 233bb287e1
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
#include <components/esm/cellref.hpp>
#include <components/misc/constants.hpp>
#include <components/misc/mathutil.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/misc/rng.hpp>
#include <components/misc/convert.hpp>
@ -76,21 +77,6 @@
#include "contentloader.hpp"
#include "esmloader.hpp"
namespace
{
// Wraps a value to (-PI, PI]
void wrap(float& rad)
{
const float pi = static_cast<float>(osg::PI);
if (rad>0)
rad = std::fmod(rad+pi, 2.0f*pi)-pi;
else
rad = std::fmod(rad-pi, 2.0f*pi)+pi;
}
}
namespace MWWorld
{
struct GameContentLoader : public ContentLoader
@ -1290,8 +1276,6 @@ namespace MWWorld
void World::rotateObject(const Ptr& ptr, const osg::Vec3f& rot, MWBase::RotationFlags flags)
{
const float pi = static_cast<float>(osg::PI);
ESM::Position pos = ptr.getRefData().getPosition();
float *objRot = pos.rot;
if (flags & MWBase::RotationFlag_adjust)
@ -1313,13 +1297,9 @@ namespace MWWorld
* currently it's done so for rotating the camera, which needs
* clamping.
*/
const float half_pi = pi/2.f;
if(objRot[0] < -half_pi) objRot[0] = -half_pi;
else if(objRot[0] > half_pi) objRot[0] = half_pi;
wrap(objRot[1]);
wrap(objRot[2]);
objRot[0] = osg::clampBetween(objRot[0], -osg::PIf / 2, osg::PIf / 2);
objRot[1] = Misc::normalizeAngle(objRot[1]);
objRot[2] = Misc::normalizeAngle(objRot[2]);
}
ptr.getRefData().setPosition(pos);