From 18a6422c1c3b5cc371837f772dde8f8010eaeac5 Mon Sep 17 00:00:00 2001 From: Mads Buvik Sandvei Date: Sun, 3 Dec 2023 14:21:14 +0100 Subject: [PATCH] clang format --- apps/openmw/mwphysics/ptrholder.hpp | 9 ++++++--- apps/openmw/mwrender/animation.cpp | 8 ++++---- apps/openmw/mwrender/animation.hpp | 2 +- apps/openmw/mwworld/projectilemanager.cpp | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwphysics/ptrholder.hpp b/apps/openmw/mwphysics/ptrholder.hpp index 270d2af37b..5884372e42 100644 --- a/apps/openmw/mwphysics/ptrholder.hpp +++ b/apps/openmw/mwphysics/ptrholder.hpp @@ -1,10 +1,10 @@ #ifndef OPENMW_MWPHYSICS_PTRHOLDER_H #define OPENMW_MWPHYSICS_PTRHOLDER_H +#include #include #include #include -#include #include @@ -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() { return mMovement; } diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index cb51bcd00f..e12e8212e6 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -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); } } diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp index 0e748180e8..8e159700ea 100644 --- a/apps/openmw/mwrender/animation.hpp +++ b/apps/openmw/mwrender/animation.hpp @@ -10,11 +10,11 @@ #include #include +#include #include #include #include #include -#include namespace ESM { diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp index 3496b5dab5..b3a01e8c3e 100644 --- a/apps/openmw/mwworld/projectilemanager.cpp +++ b/apps/openmw/mwworld/projectilemanager.cpp @@ -30,10 +30,10 @@ #include #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"