From 2eae3227ba0c4e5f0fb77f08ddb53c27af724512 Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 1 Jul 2022 15:26:22 +0200 Subject: [PATCH] Fix C4305 msvc warning 'argument': truncation from 'double' to 'float' --- .../detournavigator/recastmeshbuilder.cpp | 24 +++++++++---------- .../lua/test_serialization.cpp | 4 ++-- .../lua/test_utilpackage.cpp | 10 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp index b86fe7616b..dcdca1ee72 100644 --- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp +++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp @@ -338,10 +338,10 @@ namespace AreaType_ground, mSource, mObjectTransform ); const auto recastMesh = std::move(builder).create(mGeneration, mRevision); - EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector({ - 0, -4.24264049530029296875, 4.44089209850062616169452667236328125e-16, - 0, -3.535533905029296875, -0.707106769084930419921875, - 0, -3.535533905029296875, 0.707106769084930419921875, + EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector({ + 0, -4.24264049530029296875f, 4.44089209850062616169452667236328125e-16f, + 0, -3.535533905029296875f, -0.707106769084930419921875f, + 0, -3.535533905029296875f, 0.707106769084930419921875f, }))) << recastMesh->getMesh().getVertices(); EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector({1, 2, 0})); EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector({AreaType_ground})); @@ -363,10 +363,10 @@ namespace AreaType_ground, mSource, mObjectTransform ); const auto recastMesh = std::move(builder).create(mGeneration, mRevision); - EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector({ - -4.24264049530029296875, 0, 4.44089209850062616169452667236328125e-16, - -3.535533905029296875, 0, -0.707106769084930419921875, - -3.535533905029296875, 0, 0.707106769084930419921875, + EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector({ + -4.24264049530029296875f, 0, 4.44089209850062616169452667236328125e-16f, + -3.535533905029296875f, 0, -0.707106769084930419921875f, + -3.535533905029296875f, 0, 0.707106769084930419921875f, }))) << recastMesh->getMesh().getVertices(); EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector({1, 2, 0})); EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector({AreaType_ground})); @@ -388,10 +388,10 @@ namespace AreaType_ground, mSource, mObjectTransform ); const auto recastMesh = std::move(builder).create(mGeneration, mRevision); - EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5), std::vector({ - -1.41421353816986083984375, -1.1102230246251565404236316680908203125e-16, 0, - 1.1102230246251565404236316680908203125e-16, -1.41421353816986083984375, 0, - 1.41421353816986083984375, 1.1102230246251565404236316680908203125e-16, 0, + EXPECT_THAT(recastMesh->getMesh().getVertices(), Pointwise(FloatNear(1e-5f), std::vector({ + -1.41421353816986083984375f, -1.1102230246251565404236316680908203125e-16f, 0, + 1.1102230246251565404236316680908203125e-16f, -1.41421353816986083984375f, 0, + 1.41421353816986083984375f, 1.1102230246251565404236316680908203125e-16f, 0, }))) << recastMesh->getMesh().getVertices(); EXPECT_EQ(recastMesh->getMesh().getIndices(), std::vector({2, 0, 1})); EXPECT_EQ(recastMesh->getMesh().getAreaTypes(), std::vector({AreaType_ground})); diff --git a/apps/openmw_test_suite/lua/test_serialization.cpp b/apps/openmw_test_suite/lua/test_serialization.cpp index 610d5b43c1..a74081266f 100644 --- a/apps/openmw_test_suite/lua/test_serialization.cpp +++ b/apps/openmw_test_suite/lua/test_serialization.cpp @@ -33,7 +33,7 @@ namespace EXPECT_EQ(serialized.size(), 10); // version, type, 8 bytes value sol::object value = LuaUtil::deserialize(lua, serialized); ASSERT_TRUE(value.is()); - EXPECT_FLOAT_EQ(value.as(), 3.14); + EXPECT_DOUBLE_EQ(value.as(), 3.14); } TEST(LuaSerializationTest, Boolean) @@ -183,7 +183,7 @@ namespace EXPECT_EQ(t.get("ab"), true); EXPECT_EQ(t.get("nested").get("aa"), 2); EXPECT_EQ(t.get("nested").get("bb"), "something"); - EXPECT_FLOAT_EQ(t.get("nested").get(5), -0.5); + EXPECT_DOUBLE_EQ(t.get("nested").get(5), -0.5); EXPECT_EQ(t.get(1), osg::Vec2f(1, 2)); EXPECT_EQ(t.get(2), osg::Vec2f(2, 1)); } diff --git a/apps/openmw_test_suite/lua/test_utilpackage.cpp b/apps/openmw_test_suite/lua/test_utilpackage.cpp index b7aa534c1d..2e8734a2df 100644 --- a/apps/openmw_test_suite/lua/test_utilpackage.cpp +++ b/apps/openmw_test_suite/lua/test_utilpackage.cpp @@ -172,12 +172,12 @@ namespace lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string); lua["util"] = LuaUtil::initUtilPackage(lua); lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))"); - EXPECT_FLOAT_EQ(get(lua, "v.x"), -0.5); - EXPECT_FLOAT_EQ(get(lua, "v.y"), 0.86602539); - EXPECT_FLOAT_EQ(get(lua, "util.normalizeAngle(math.pi * 10 + 0.1)"), 0.1); - EXPECT_FLOAT_EQ(get(lua, "util.clamp(0.1, 0, 1.5)"), 0.1); + EXPECT_FLOAT_EQ(get(lua, "v.x"), -0.5f); + EXPECT_FLOAT_EQ(get(lua, "v.y"), 0.86602539f); + EXPECT_FLOAT_EQ(get(lua, "util.normalizeAngle(math.pi * 10 + 0.1)"), 0.1f); + EXPECT_FLOAT_EQ(get(lua, "util.clamp(0.1, 0, 1.5)"), 0.1f); EXPECT_FLOAT_EQ(get(lua, "util.clamp(-0.1, 0, 1.5)"), 0); - EXPECT_FLOAT_EQ(get(lua, "util.clamp(2.1, 0, 1.5)"), 1.5); + EXPECT_FLOAT_EQ(get(lua, "util.clamp(2.1, 0, 1.5)"), 1.5f); lua.safe_script("t = util.makeReadOnly({x = 1})"); EXPECT_FLOAT_EQ(get(lua, "t.x"), 1); EXPECT_ERROR(lua.safe_script("t.y = 2"), "userdata value");