dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
This commit is contained in:
Jonathan G Rennison
2023-09-12 18:25:49 +01:00
parent 627eb1effc f814c86389
commit 1b61dfabe3
15 changed files with 164 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/tests/math_func.cpp
View File

@@ -75,3 +75,58 @@ TEST_CASE("IntSqrtTest - FindSqRt")
CHECK(9 == IntSqrt(88));
CHECK(1696 == IntSqrt(2876278));
}
TEST_CASE("ClampTo")
{
CHECK(0 == ClampTo<uint8_t>(std::numeric_limits<int64_t>::lowest()));
CHECK(0 == ClampTo<uint8_t>(-1));
CHECK(0 == ClampTo<uint8_t>(0));
CHECK(1 == ClampTo<uint8_t>(1));
CHECK(255 == ClampTo<uint8_t>(std::numeric_limits<uint64_t>::max()));
CHECK(255 == ClampTo<uint8_t>(256));
CHECK(255 == ClampTo<uint8_t>(255));
CHECK(254 == ClampTo<uint8_t>(254));
CHECK(-128 == ClampTo<int8_t>(std::numeric_limits<int64_t>::lowest()));
CHECK(-128 == ClampTo<int8_t>(-129));
CHECK(-128 == ClampTo<int8_t>(-128));
CHECK(-127 == ClampTo<int8_t>(-127));
CHECK(127 == ClampTo<int8_t>(std::numeric_limits<uint64_t>::max()));
CHECK(127 == ClampTo<int8_t>(128));
CHECK(127 == ClampTo<int8_t>(127));
CHECK(126 == ClampTo<int8_t>(126));
CHECK(126 == ClampTo<int64_t>(static_cast<uint8>(126)));
CHECK(126 == ClampTo<uint64_t>(static_cast<int8>(126)));
CHECK(0 == ClampTo<uint64_t>(static_cast<int8>(-126)));
CHECK(0 == ClampTo<uint8_t>(static_cast<int8>(-126)));
/* The realm around 64 bits types is tricky as there is not one type/method that works for all. */
/* lowest/max uint64_t does not get clamped when clamping to uint64_t. */
CHECK(std::numeric_limits<uint64_t>::lowest() == ClampTo<uint64_t>(std::numeric_limits<uint64_t>::lowest()));
CHECK(std::numeric_limits<uint64_t>::max() == ClampTo<uint64_t>(std::numeric_limits<uint64_t>::max()));
/* negative int64_t get clamped to 0. */
CHECK(0 == ClampTo<uint64_t>(std::numeric_limits<int64_t>::lowest()));
CHECK(0 == ClampTo<uint64_t>(int64_t(-1)));
/* positive int64_t remain the same. */
CHECK(1 == ClampTo<uint64_t>(int64_t(1)));
CHECK(static_cast<uint64_t>(std::numeric_limits<int64_t>::max()) == ClampTo<uint64_t>(std::numeric_limits<int64_t>::max()));
/* max uint64_t gets clamped to max int64_t. */
CHECK(std::numeric_limits<int64_t>::max() == ClampTo<int64_t>(std::numeric_limits<uint64_t>::max()));
}
TEST_CASE("SoftClamp")
{
/* Special behaviour of soft clamp returning the average of min/max when min is higher than max. */
CHECK(1250 == SoftClamp(0, 1500, 1000));
int million = 1000 * 1000;
CHECK(1250 * million == SoftClamp(0, 1500 * million, 1000 * million));
CHECK(0 == SoftClamp(0, 1500 * million, -1500 * million));
}