mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 07:21:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix double -> float conversions

Browse Source
This commit is contained in:
Andrei Kortunov 2021-04-19 15:36:58 +04:00
parent 1b1c786d0c
commit 0cadc97fb3
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/view/render/cellarrow.cpp
View File

@ -151,7 +151,7 @@ void CSVRender::CellArrow::buildShape()
osg::Vec4Array *colours = new osg::Vec4Array; osg::Vec4Array *colours = new osg::Vec4Array;
for (int i=0; i<6; ++i) for (int i=0; i<6; ++i)
colours->push_back (osg::Vec4f (0.11, 0.6f, 0.95f, 1.0f)); colours->push_back (osg::Vec4f (0.11f, 0.6f, 0.95f, 1.0f));
for (int i=0; i<6; ++i) for (int i=0; i<6; ++i)
colours->push_back (osg::Vec4f (0.08f, 0.44f, 0.7f, 1.0f)); colours->push_back (osg::Vec4f (0.08f, 0.44f, 0.7f, 1.0f));

2
apps/openmw/mwgui/statswindow.cpp
View File

@ -93,7 +93,7 @@ namespace MWGui
int windowHeight = window->getSize().height; int windowHeight = window->getSize().height;
//initial values defined in openmw_stats_window.layout, if custom options are not present in .layout, a default is loaded //initial values defined in openmw_stats_window.layout, if custom options are not present in .layout, a default is loaded
float leftPaneRatio = 0.44; float leftPaneRatio = 0.44f;
if (mLeftPane->isUserString("LeftPaneRatio")) if (mLeftPane->isUserString("LeftPaneRatio"))
leftPaneRatio = MyGUI::utility::parseFloat(mLeftPane->getUserString("LeftPaneRatio")); leftPaneRatio = MyGUI::utility::parseFloat(mLeftPane->getUserString("LeftPaneRatio"));

2
apps/openmw/mwmechanics/aicombat.cpp
View File

@ -531,7 +531,7 @@ namespace MWMechanics
// Otherwise apply a random side step (kind of dodging) with some probability // Otherwise apply a random side step (kind of dodging) with some probability
// if actor is within range of target's weapon. // if actor is within range of target's weapon.
if (std::abs(angleToTarget) > osg::PI / 4) if (std::abs(angleToTarget) > osg::PI / 4)
moveDuration = 0.2; moveDuration = 0.2f;
else if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability() < 0.25) else if (distToTarget <= rangeAttackOfTarget && Misc::Rng::rollClosedProbability() < 0.25)
moveDuration = 0.1f + 0.1f * Misc::Rng::rollClosedProbability(); moveDuration = 0.1f + 0.1f * Misc::Rng::rollClosedProbability();
if (moveDuration > 0) if (moveDuration > 0)

4
apps/openmw/mwphysics/constants.hpp
View File

@ -17,10 +17,10 @@ namespace MWPhysics
// Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared. // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
static constexpr int sMaxIterations = 8; static constexpr int sMaxIterations = 8;
// Allows for more precise movement solving without getting stuck or snagging too easily. // Allows for more precise movement solving without getting stuck or snagging too easily.
static constexpr float sCollisionMargin = 0.1; static constexpr float sCollisionMargin = 0.1f;
// Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily // Allow for a small amount of penetration to prevent numerical precision issues from causing the "unstuck"ing code to run unnecessarily
// Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues // Currently set to 0 because having the "unstuck"ing code run whenever possible prevents some glitchy snagging issues
static constexpr float sAllowedPenetration = 0.0; static constexpr float sAllowedPenetration = 0.0f;
} }
#endif #endif