|
@@ -32,29 +32,29 @@ namespace
|
|
|
|
|
|
TEST_F(Vector2Test, operator_addition)
|
|
TEST_F(Vector2Test, operator_addition)
|
|
{
|
|
{
|
|
- Vector2 c = Vector2(3, 4) + Vector2(5, 3);
|
|
|
|
|
|
+ Vector2 c = Vector2(3.0f, 4.0f) + Vector2(5.0f, 3.0f);
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(8, c.getX());
|
|
|
|
- ASSERT_FLOAT_EQ(7, c.getY());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(8.0f, c.getX());
|
|
|
|
+ ASSERT_FLOAT_EQ(7.0f, c.getY());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_substraction)
|
|
TEST_F(Vector2Test, operator_substraction)
|
|
{
|
|
{
|
|
- Vector2 c = Vector2(3, 4) - Vector2(5, 3);
|
|
|
|
|
|
+ Vector2 c = Vector2(3.0f, 4.0f) - Vector2(5.0f, 3.0f);
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(-2, c.getX());
|
|
|
|
- ASSERT_FLOAT_EQ(1, c.getY());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(-2.0f, c.getX());
|
|
|
|
+ ASSERT_FLOAT_EQ(1.0f, c.getY());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_scalar)
|
|
TEST_F(Vector2Test, operator_scalar)
|
|
{
|
|
{
|
|
- vector_scalar scalar = Vector2(3, 4) * Vector2(5, 3);
|
|
|
|
- ASSERT_FLOAT_EQ(27, scalar);
|
|
|
|
|
|
+ vector_scalar scalar = Vector2(3.0f, 4.0f) * Vector2(5.0f, 3.0f);
|
|
|
|
+ ASSERT_FLOAT_EQ(27.0f, scalar);
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_multiplicator)
|
|
TEST_F(Vector2Test, operator_multiplicator)
|
|
{
|
|
{
|
|
- Vector2 c = Vector2(3, 4) * 1.5f;
|
|
|
|
|
|
+ Vector2 c = Vector2(3.0f, 4.0f) * 1.5f;
|
|
|
|
|
|
ASSERT_FLOAT_EQ(4.5f, c.getX());
|
|
ASSERT_FLOAT_EQ(4.5f, c.getX());
|
|
ASSERT_FLOAT_EQ(6.0f, c.getY());
|
|
ASSERT_FLOAT_EQ(6.0f, c.getY());
|
|
@@ -79,36 +79,36 @@ namespace
|
|
|
|
|
|
TEST_F(Vector2Test, operator_equals)
|
|
TEST_F(Vector2Test, operator_equals)
|
|
{
|
|
{
|
|
- ASSERT_TRUE(Vector2(3, 4) == Vector2(3, 4));
|
|
|
|
|
|
+ ASSERT_TRUE(Vector2(3.0f, 4.0f) == Vector2(3.0f, 4.0f));
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_equals_not_equals)
|
|
TEST_F(Vector2Test, operator_equals_not_equals)
|
|
{
|
|
{
|
|
- ASSERT_FALSE(Vector2(3, 8) == Vector2(3, 4));
|
|
|
|
|
|
+ ASSERT_FALSE(Vector2(3.0f, 8.0f) == Vector2(3.0f, 4.0f));
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_not_equals)
|
|
TEST_F(Vector2Test, operator_not_equals)
|
|
{
|
|
{
|
|
- ASSERT_TRUE(Vector2(3, 5) != Vector2(3, 4));
|
|
|
|
|
|
+ ASSERT_TRUE(Vector2(3.0f, 5.0f) != Vector2(3.0f, 4.0f));
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, operator_not_equals_equals)
|
|
TEST_F(Vector2Test, operator_not_equals_equals)
|
|
{
|
|
{
|
|
- ASSERT_FALSE(Vector2(3, 4) != Vector2(3, 4));
|
|
|
|
|
|
+ ASSERT_FALSE(Vector2(3.0f, 4.0f) != Vector2(3.0f, 4.0f));
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, add)
|
|
TEST_F(Vector2Test, add)
|
|
{
|
|
{
|
|
- Vector2 c = Vector2::add(Vector2(3, 4), Vector2(5, 3));
|
|
|
|
|
|
+ Vector2 c = Vector2::add(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(8, c.getX());
|
|
|
|
- ASSERT_FLOAT_EQ(7, c.getY());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(8.0f, c.getX());
|
|
|
|
+ ASSERT_FLOAT_EQ(7.0f, c.getY());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, dot)
|
|
TEST_F(Vector2Test, dot)
|
|
{
|
|
{
|
|
- vector_scalar scalar = ls::math::vector::Vector2::dot(Vector2(3, 4), Vector2(5, 3));
|
|
|
|
- ASSERT_FLOAT_EQ(27, scalar);
|
|
|
|
|
|
+ vector_scalar scalar = ls::math::vector::Vector2::dot(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
|
|
|
|
+ ASSERT_FLOAT_EQ(27.0f, scalar);
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, getComponents)
|
|
TEST_F(Vector2Test, getComponents)
|
|
@@ -122,20 +122,20 @@ namespace
|
|
|
|
|
|
TEST_F(Vector2Test, getLength)
|
|
TEST_F(Vector2Test, getLength)
|
|
{
|
|
{
|
|
- Vector2 a{6, 8};
|
|
|
|
- ASSERT_FLOAT_EQ(10, a.getLength());
|
|
|
|
|
|
+ Vector2 a{6.0f, 8.0f};
|
|
|
|
+ ASSERT_FLOAT_EQ(10.0f, a.getLength());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, getX)
|
|
TEST_F(Vector2Test, getX)
|
|
{
|
|
{
|
|
- Vector2 a{3, 4};
|
|
|
|
- ASSERT_FLOAT_EQ(3, a.getX());
|
|
|
|
|
|
+ Vector2 a{3.0f, 4.0f};
|
|
|
|
+ ASSERT_FLOAT_EQ(3.0f, a.getX());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, getY)
|
|
TEST_F(Vector2Test, getY)
|
|
{
|
|
{
|
|
- Vector2 a{3, 4};
|
|
|
|
- ASSERT_FLOAT_EQ(4, a.getY());
|
|
|
|
|
|
+ Vector2 a{3.0f, 4.0f};
|
|
|
|
+ ASSERT_FLOAT_EQ(4.0f, a.getY());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, normalize)
|
|
TEST_F(Vector2Test, normalize)
|
|
@@ -157,25 +157,25 @@ namespace
|
|
|
|
|
|
TEST_F(Vector2Test, setX)
|
|
TEST_F(Vector2Test, setX)
|
|
{
|
|
{
|
|
- Vector2 a{3, 4};
|
|
|
|
- a.setX(14);
|
|
|
|
|
|
+ Vector2 a{3.0f, 4.0f};
|
|
|
|
+ a.setX(14.0f);
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(14, a.getX());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(14.0f, a.getX());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, setY)
|
|
TEST_F(Vector2Test, setY)
|
|
{
|
|
{
|
|
- Vector2 a{3, 4};
|
|
|
|
- a.setY(8);
|
|
|
|
|
|
+ Vector2 a{3.0f, 4.0f};
|
|
|
|
+ a.setY(8.0f);
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(8, a.getY());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(8.0f, a.getY());
|
|
}
|
|
}
|
|
|
|
|
|
TEST_F(Vector2Test, subtract)
|
|
TEST_F(Vector2Test, subtract)
|
|
{
|
|
{
|
|
- Vector2 c = ls::math::vector::Vector2::subtract(Vector2(3, 4), Vector2(5, 3));
|
|
|
|
|
|
+ Vector2 c = ls::math::vector::Vector2::subtract(Vector2(3.0f, 4.0f), Vector2(5.0f, 3.0f));
|
|
|
|
|
|
- ASSERT_FLOAT_EQ(-2, c.getX());
|
|
|
|
- ASSERT_FLOAT_EQ(1, c.getY());
|
|
|
|
|
|
+ ASSERT_FLOAT_EQ(-2.0f, c.getX());
|
|
|
|
+ ASSERT_FLOAT_EQ(1.0f, c.getY());
|
|
}
|
|
}
|
|
}
|
|
}
|