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

Merge branch 'ascivilaspossible' into 'master'

Browse Source 
Increase the base actor angular velocity to 900°/sec (#5192)

Closes #5192

See merge request OpenMW/openmw!1690
This commit is contained in:
psi29a 2022-02-23 10:09:17 +00:00
commit 34be9329eb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -23,6 +23,7 @@
Bug #5088: Sky abruptly changes direction during certain weather transitions Bug #5088: Sky abruptly changes direction during certain weather transitions
Bug #5100: Persuasion doesn't always clamp the resulting disposition Bug #5100: Persuasion doesn't always clamp the resulting disposition
Bug #5120: Scripted object spawning updates physics system Bug #5120: Scripted object spawning updates physics system
Bug #5192: Actor turn rate is too slow
Bug #5207: Loose summons can be present in scene Bug #5207: Loose summons can be present in scene
Bug #5377: console does not appear after using menutest in inventory Bug #5377: console does not appear after using menutest in inventory
Bug #5379: Wandering NPCs falling through cantons Bug #5379: Wandering NPCs falling through cantons

6
apps/openmw/mwmechanics/steering.hpp
View File

@ -16,9 +16,11 @@ namespace MWMechanics
// Max rotating speed, radian/sec // Max rotating speed, radian/sec
inline float getAngularVelocity(const float actorSpeed) inline float getAngularVelocity(const float actorSpeed)
{ {
const float baseAngluarVelocity = 10; constexpr float degreesPerFrame = 15.f;
constexpr int framesPerSecond = 60;
const float baseAngularVelocity = osg::DegreesToRadians(degreesPerFrame * framesPerSecond);
const float baseSpeed = 200; const float baseSpeed = 200;
return baseAngluarVelocity * std::max(actorSpeed / baseSpeed, 1.0f); return baseAngularVelocity * std::max(actorSpeed / baseSpeed, 1.0f);
} }
/// configure rotation settings for an actor to reach this target angle (eventually) /// configure rotation settings for an actor to reach this target angle (eventually)