mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-28 09:06:40 +00:00
Code Issues Releases Wiki Activity

clang format

Browse source
This commit is contained in:
Mads Buvik Sandvei 2023-12-03 14:21:14 +01:00
parent 28eeef59bc
commit 18a6422c1c
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwphysics/ptrholder.hpp
View file

@ -1,10 +1,10 @@
#ifndef OPENMW_MWPHYSICS_PTRHOLDER_H
#define OPENMW_MWPHYSICS_PTRHOLDER_H
#include <deque>
#include <memory>
#include <mutex>
#include <utility>
#include <deque>
#include <osg/Vec3d>
@ -40,8 +40,11 @@ namespace MWPhysics
btCollisionObject* getCollisionObject() const { return mCollisionObject.get(); }
void clearMovement() { mMovement = { }; }
void queueMovement(osg::Vec3f velocity, float simulationTimeStart, float simulationTimeStop) { mMovement.push_back(Movement{ velocity, simulationTimeStart, simulationTimeStop }); }
void clearMovement() { mMovement = {}; }
void queueMovement(osg::Vec3f velocity, float simulationTimeStart, float simulationTimeStop)
{
mMovement.push_back(Movement{ velocity, simulationTimeStart, simulationTimeStop });
}
std::deque<Movement>& movement() { return mMovement; }

8
apps/openmw/mwrender/animation.cpp
View file

@ -49,8 +49,8 @@
#include "../mwworld/cellstore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/containerstore.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/datetimemanager.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
@ -1186,9 +1186,9 @@ namespace MWRender
}
else
{
// When animations have velocity, net movement is expected. The above block would negate that movement every time
// the animation resets. Therefore we have to accumulate from oldtime to newtime instead, which works because
// oldtime < newtime is a guarantee even when the animation has looped.
// When animations have velocity, net movement is expected. The above block would negate that movement every
// time the animation resets. Therefore we have to accumulate from oldtime to newtime instead, which works
// because oldtime < newtime is a guarantee even when the animation has looped.
position += offset - osg::componentMultiply(mAccumCtrl->getTranslation(oldtime), mAccumulate);
}
}

2
apps/openmw/mwrender/animation.hpp
View file

@ -10,11 +10,11 @@
#include <components/sceneutil/textkeymap.hpp>
#include <components/sceneutil/util.hpp>
#include <optional>
#include <span>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <optional>
namespace ESM
{

2
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -30,10 +30,10 @@
#include <components/settings/values.hpp>
#include "../mwworld/class.hpp"
#include "../mwworld/datetimemanager.hpp"
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/manualref.hpp"
#include "../mwworld/datetimemanager.hpp"
#include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp"