mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 21:11:32 +00:00
Code Issues Releases Wiki Activity

clang format

Browse source
This commit is contained in:
Mads Buvik Sandvei 2023-12-09 20:08:14 +01:00
parent c79446818e
commit 76232c49df
5 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwbase/world.hpp
View file

@ -571,8 +571,7 @@ namespace MWBase
virtual DetourNavigator::Navigator* getNavigator() const = 0; virtual DetourNavigator::Navigator* getNavigator() const = 0;
virtual void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path, virtual void updateActorPath(const MWWorld::ConstPtr& actor, const std::deque<osg::Vec3f>& path,
const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const const DetourNavigator::AgentBounds& agentBounds, const osg::Vec3f& start, const osg::Vec3f& end) const = 0;
= 0;
virtual void removeActorPath(const MWWorld::ConstPtr& actor) const = 0; virtual void removeActorPath(const MWWorld::ConstPtr& actor) const = 0;
@ -581,12 +580,10 @@ namespace MWBase
virtual DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const = 0; virtual DetourNavigator::AgentBounds getPathfindingAgentBounds(const MWWorld::ConstPtr& actor) const = 0;
virtual bool hasCollisionWithDoor( virtual bool hasCollisionWithDoor(
const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const const MWWorld::ConstPtr& door, const osg::Vec3f& position, const osg::Vec3f& destination) const = 0;
= 0;
virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius, virtual bool isAreaOccupiedByOtherActor(const osg::Vec3f& position, const float radius,
std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const std::span<const MWWorld::ConstPtr> ignore, std::vector<MWWorld::Ptr>* occupyingActors = nullptr) const = 0;
= 0;
virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0; virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;

3
apps/openmw/mwphysics/mtphysics.cpp
View file

@ -261,7 +261,8 @@ namespace
// movement solver // movement solver
osg::Vec3f velocity osg::Vec3f velocity
= takeMovement(*ptrHolder, mSimulationTime, mSimulationTime + mDelta * mSteps) / (mSteps * mDelta); = takeMovement(*ptrHolder, mSimulationTime, mSimulationTime + mDelta * mSteps) / (mSteps * mDelta);
// takeInertia() returns a velocity and should be taken over the velocity calculated above to initiate a jump // takeInertia() returns a velocity and should be taken over the velocity calculated above to initiate a
// jump
auto inertia = takeInertia(*ptrHolder, mSimulationTime); auto inertia = takeInertia(*ptrHolder, mSimulationTime);
frameDataRef.get().mMovement += inertia.value_or(velocity); frameDataRef.get().mMovement += inertia.value_or(velocity);

3
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -624,7 +624,8 @@ namespace MWPhysics
return false; return false;
} }
void PhysicsSystem::queueObjectMovement(const MWWorld::Ptr& ptr, const osg::Vec3f& velocity, float duration, bool jump) void PhysicsSystem::queueObjectMovement(
const MWWorld::Ptr& ptr, const osg::Vec3f& velocity, float duration, bool jump)
{ {
float start = MWBase::Environment::get().getWorld()->getTimeManager()->getSimulationTime(); float start = MWBase::Environment::get().getWorld()->getTimeManager()->getSimulationTime();
ActorMap::iterator found = mActors.find(ptr.mRef); ActorMap::iterator found = mActors.find(ptr.mRef);

3
apps/openmw/mwphysics/physicssystem.hpp
View file

@ -245,7 +245,8 @@ namespace MWPhysics
/// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will /// Queues velocity movement for a Ptr. If a Ptr is already queued, its velocity will
/// be overwritten. Valid until the next call to stepSimulation /// be overwritten. Valid until the next call to stepSimulation
void queueObjectMovement(const MWWorld::Ptr& ptr, const osg::Vec3f& velocity, float duration, bool jump = false); void queueObjectMovement(
const MWWorld::Ptr& ptr, const osg::Vec3f& velocity, float duration, bool jump = false);
/// Clear the queued movements list without applying. /// Clear the queued movements list without applying.
void clearQueuedMovement(); void clearQueuedMovement();

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

@ -1249,7 +1249,6 @@ namespace MWRender
osg::Quat(mHeadPitchRadians, osg::Vec3f(1, 0, 0)) * osg::Quat(yaw, osg::Vec3f(0, 0, 1))); osg::Quat(mHeadPitchRadians, osg::Vec3f(1, 0, 0)) * osg::Quat(yaw, osg::Vec3f(0, 0, 1)));
} }
return movement; return movement;
} }