Merge branch 'NDK-Refactor' into NDK
Conflicts: examples/HardwareInfo/main.cpp include/Nazara/Renderer/Enums.hpp include/Nazara/Renderer/GpuQuery.hpp include/Nazara/Renderer/OpenGL.hpp include/Nazara/Renderer/RenderBuffer.hpp include/Nazara/Renderer/RenderTexture.hpp include/Nazara/Renderer/Texture.hpp src/Nazara/Graphics/AbstractRenderTechnique.cpp src/Nazara/Graphics/DeferredRenderTechnique.cpp src/Nazara/Graphics/Material.cpp src/Nazara/Graphics/SkyboxBackground.cpp src/Nazara/Renderer/GpuQuery.cpp src/Nazara/Renderer/OpenGL.cpp src/Nazara/Renderer/RenderBuffer.cpp src/Nazara/Renderer/RenderTexture.cpp src/Nazara/Renderer/Renderer.cpp src/Nazara/Renderer/Shader.cpp src/Nazara/Renderer/ShaderStage.cpp src/Nazara/Renderer/Texture.cpp Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
This commit is contained in:
Lynix
@@ -5,17 +5,17 @@ TEST_CASE("Approach", "[MATH][ALGORITHM]" )
|
||||
{
|
||||
SECTION("Approach 8 with 5 by 2")
|
||||
{
|
||||
REQUIRE(NzApproach(5, 8, 2) == 7);
|
||||
REQUIRE(Nz::Approach(5, 8, 2) == 7);
|
||||
}
|
||||
|
||||
SECTION("Approach 5 with 8 by 2")
|
||||
{
|
||||
REQUIRE(NzApproach(8, 5, 2) == 6);
|
||||
REQUIRE(Nz::Approach(8, 5, 2) == 6);
|
||||
}
|
||||
|
||||
SECTION("Approach 8 with 8 by 2")
|
||||
{
|
||||
REQUIRE(NzApproach(8, 8, 2) == 8);
|
||||
REQUIRE(Nz::Approach(8, 8, 2) == 8);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,17 +23,17 @@ TEST_CASE("Clamp", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("Clamp 8 between 5 and 10")
|
||||
{
|
||||
REQUIRE(NzClamp(8, 5, 10) == 8);
|
||||
REQUIRE(Nz::Clamp(8, 5, 10) == 8);
|
||||
}
|
||||
|
||||
SECTION("Clamp 4 between 5 and 10")
|
||||
{
|
||||
REQUIRE(NzClamp(4, 5, 10) == 5);
|
||||
REQUIRE(Nz::Clamp(4, 5, 10) == 5);
|
||||
}
|
||||
|
||||
SECTION("Clamp 12 between 5 and 10")
|
||||
{
|
||||
REQUIRE(NzClamp(12, 5, 10) == 10);
|
||||
REQUIRE(Nz::Clamp(12, 5, 10) == 10);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ TEST_CASE("DegreeToRadian", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("Convert 45.f degree to radian")
|
||||
{
|
||||
REQUIRE(NzDegreeToRadian(45.f) == Approx(M_PI / 4));
|
||||
REQUIRE(Nz::DegreeToRadian(45.f) == Approx(M_PI / 4));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,12 +49,12 @@ TEST_CASE("GetNearestPowerOfTwo", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("Nearest power of two of 16 = 16")
|
||||
{
|
||||
REQUIRE(NzGetNearestPowerOfTwo(16) == 16);
|
||||
REQUIRE(Nz::GetNearestPowerOfTwo(16) == 16);
|
||||
}
|
||||
|
||||
SECTION("Nearest power of two of 17 = 32")
|
||||
{
|
||||
REQUIRE(NzGetNearestPowerOfTwo(17) == 32);
|
||||
REQUIRE(Nz::GetNearestPowerOfTwo(17) == 32);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,55 +63,55 @@ TEST_CASE("GetNumberLength", "[ALGORITHM]" )
|
||||
SECTION("GetNumberLength of -127 signed char")
|
||||
{
|
||||
signed char minus127 = -127;
|
||||
REQUIRE(NzGetNumberLength(minus127) == 4);
|
||||
REQUIRE(Nz::GetNumberLength(minus127) == 4);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of 255 unsigned char")
|
||||
{
|
||||
unsigned char plus255 = 255;
|
||||
REQUIRE(NzGetNumberLength(plus255) == 3);
|
||||
REQUIRE(Nz::GetNumberLength(plus255) == 3);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of -1270 signed int")
|
||||
{
|
||||
signed int minus1270 = -1270;
|
||||
REQUIRE(NzGetNumberLength(minus1270) == 5);
|
||||
REQUIRE(Nz::GetNumberLength(minus1270) == 5);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of 2550 unsigned int")
|
||||
{
|
||||
unsigned int plus2550 = 2550;
|
||||
REQUIRE(NzGetNumberLength(plus2550) == 4);
|
||||
REQUIRE(Nz::GetNumberLength(plus2550) == 4);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of -1270 signed long long")
|
||||
{
|
||||
signed long long minus12700 = -12700;
|
||||
REQUIRE(NzGetNumberLength(minus12700) == 6);
|
||||
REQUIRE(Nz::GetNumberLength(minus12700) == 6);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of 2550 unsigned long long")
|
||||
{
|
||||
unsigned long long plus25500 = 25500;
|
||||
REQUIRE(NzGetNumberLength(plus25500) == 5);
|
||||
REQUIRE(Nz::GetNumberLength(plus25500) == 5);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of -2.456f float")
|
||||
{
|
||||
float minus2P456 = -2.456f;
|
||||
REQUIRE(NzGetNumberLength(minus2P456, 3) == 6);
|
||||
REQUIRE(Nz::GetNumberLength(minus2P456, 3) == 6);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of -2.456 double")
|
||||
{
|
||||
double minus2P456 = -2.456;
|
||||
REQUIRE(NzGetNumberLength(minus2P456, 3) == 6);
|
||||
REQUIRE(Nz::GetNumberLength(minus2P456, 3) == 6);
|
||||
}
|
||||
|
||||
SECTION("GetNumberLength of -2.456 long double")
|
||||
{
|
||||
long double minus2P456 = -2.456L;
|
||||
REQUIRE(NzGetNumberLength(minus2P456, 3) == 6);
|
||||
REQUIRE(Nz::GetNumberLength(minus2P456, 3) == 6);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +119,7 @@ TEST_CASE("IntegralPow", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("2 to power 4")
|
||||
{
|
||||
REQUIRE(NzIntegralPow(2, 4) == 16);
|
||||
REQUIRE(Nz::IntegralPow(2, 4) == 16);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ TEST_CASE("Lerp", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("Lerp 2 to 6 with 0.5")
|
||||
{
|
||||
REQUIRE(NzLerp(2, 6, 0.5) == 4);
|
||||
REQUIRE(Nz::Lerp(2, 6, 0.5) == 4);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ TEST_CASE("MultiplyAdd", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("2 * 3 + 1")
|
||||
{
|
||||
REQUIRE(NzMultiplyAdd(2, 3, 1) == 7);
|
||||
REQUIRE(Nz::MultiplyAdd(2, 3, 1) == 7);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,12 +143,12 @@ TEST_CASE("NumberEquals", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("2.35 and 2.351 should be the same at 0.01")
|
||||
{
|
||||
CHECK(NzNumberEquals(2.35, 2.35, 0.01));
|
||||
CHECK(Nz::NumberEquals(2.35, 2.35, 0.01));
|
||||
}
|
||||
|
||||
SECTION("3 and 4 unsigned should be the same at 1")
|
||||
{
|
||||
CHECK(NzNumberEquals(3U, 4U, 1U));
|
||||
CHECK(Nz::NumberEquals(3U, 4U, 1U));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,17 +156,17 @@ TEST_CASE("NumberToString", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("235 to string")
|
||||
{
|
||||
REQUIRE(NzNumberToString(235) == "235");
|
||||
REQUIRE(Nz::NumberToString(235) == "235");
|
||||
}
|
||||
|
||||
SECTION("-235 to string")
|
||||
{
|
||||
REQUIRE(NzNumberToString(-235) == "-235");
|
||||
REQUIRE(Nz::NumberToString(-235) == "-235");
|
||||
}
|
||||
|
||||
SECTION("16 in base 16 to string")
|
||||
{
|
||||
REQUIRE(NzNumberToString(16, 16) == "10");
|
||||
REQUIRE(Nz::NumberToString(16, 16) == "10");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ TEST_CASE("RadianToDegree", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("PI / 4 to degree")
|
||||
{
|
||||
REQUIRE(NzRadianToDegree(M_PI / 4) == Approx(45.f));
|
||||
REQUIRE(Nz::RadianToDegree(M_PI / 4) == Approx(45.f));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,16 +182,16 @@ TEST_CASE("StringToNumber", "[ALGORITHM]" )
|
||||
{
|
||||
SECTION("235 in string")
|
||||
{
|
||||
REQUIRE(NzStringToNumber("235") == 235);
|
||||
REQUIRE(Nz::StringToNumber("235") == 235);
|
||||
}
|
||||
|
||||
SECTION("-235 in string")
|
||||
{
|
||||
REQUIRE(NzStringToNumber("-235") == -235);
|
||||
REQUIRE(Nz::StringToNumber("-235") == -235);
|
||||
}
|
||||
|
||||
SECTION("16 in base 16 in string")
|
||||
{
|
||||
REQUIRE(NzStringToNumber("10", 16) == 16);
|
||||
REQUIRE(Nz::StringToNumber("10", 16) == 16);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user