From 023c51ad0e2081c22c856f6ac0ede3a063d35ab0 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Mon, 6 Apr 2020 16:18:42 +0400 Subject: [PATCH] Fix int/float conversions in the CSVRender::BrushDraw --- apps/opencs/view/render/brushdraw.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/opencs/view/render/brushdraw.cpp b/apps/opencs/view/render/brushdraw.cpp index 9a648336e..51084948e 100644 --- a/apps/opencs/view/render/brushdraw.cpp +++ b/apps/opencs/view/render/brushdraw.cpp @@ -21,8 +21,9 @@ CSVRender::BrushDraw::BrushDraw(osg::ref_ptr parentNode, bool textur mBrushDrawNode->addChild(mGeometry); mParentNode->addChild(mBrushDrawNode); if (mTextureMode) - mLandSizeFactor = ESM::Land::REAL_SIZE / ESM::Land::LAND_TEXTURE_SIZE; - else mLandSizeFactor = ESM::Land::REAL_SIZE / ESM::Land::LAND_SIZE; + mLandSizeFactor = static_cast(ESM::Land::REAL_SIZE) / static_cast(ESM::Land::LAND_TEXTURE_SIZE); + else + mLandSizeFactor = static_cast(ESM::Land::REAL_SIZE) / static_cast(ESM::Land::LAND_SIZE); } CSVRender::BrushDraw::~BrushDraw() @@ -121,7 +122,7 @@ void CSVRender::BrushDraw::buildSquareGeometry(const float& radius, const osg::V const float brushOutlineHeight (1.0f); float diameter = radius * 2; - int resolution = (diameter / mLandSizeFactor) * 2; //half a vertex resolution + int resolution = static_cast(2.f * diameter / mLandSizeFactor); //half a vertex resolution float resAdjustedLandSizeFactor = mLandSizeFactor / 2; osg::Vec4f lineColor(1.0f, 1.0f, 1.0f, 0.6f);