diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/test/InputTest.cpp | 3 | ||||
| -rw-r--r-- | src/test/Profiling.cpp | 3 | ||||
| -rw-r--r-- | src/test/RenderSystemTest.cpp | 9 |
4 files changed, 6 insertions, 11 deletions
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index ea92d96..d1c5a38 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -17,7 +17,7 @@ target_sources(test_main PUBLIC Vector2Test.cpp # LoopManagerTest.cpp LoopTimerTest.cpp - InputTest.cpp + # InputTest.cpp ScriptEventTest.cpp ScriptSceneTest.cpp Profiling.cpp diff --git a/src/test/InputTest.cpp b/src/test/InputTest.cpp index 41142ba..ee362be 100644 --- a/src/test/InputTest.cpp +++ b/src/test/InputTest.cpp @@ -36,8 +36,7 @@ protected: void SetUp() override { GameObject obj = mgr.new_object("camera", "camera", vec2{0, 0}, 0, 1); auto & camera - = obj.add_component<Camera>(ivec2{500, 500}, vec2{500, 500}, - Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); + = obj.add_component<Camera>(vec2{500, 500}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); render.frame_update(); //mediator.event_manager = event_manager; //mediator.component_manager = mgr; diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp index 7dbf110..45f6d4c 100644 --- a/src/test/Profiling.cpp +++ b/src/test/Profiling.cpp @@ -75,8 +75,7 @@ public: void SetUp() override { GameObject do_not_use = mgr.new_object("DO_NOT_USE", "", {0, 0}); - do_not_use.add_component<Camera>(ivec2{1080, 720}, vec2{2000, 2000}, - Camera::Data{ + do_not_use.add_component<Camera>(vec2{2000, 2000}, Camera::Data{ .bg_color = Color::WHITE, .zoom = 1.0f, }); diff --git a/src/test/RenderSystemTest.cpp b/src/test/RenderSystemTest.cpp index 689a6d4..b984efe 100644 --- a/src/test/RenderSystemTest.cpp +++ b/src/test/RenderSystemTest.cpp @@ -128,8 +128,7 @@ TEST_F(RenderSystemTest, sorting_sprites) { } TEST_F(RenderSystemTest, Update) { - entity1.add_component<Camera>(ivec2{100, 100}, vec2{100, 100}, - Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); + entity1.add_component<Camera>(vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); { vector<reference_wrapper<Sprite>> sprites = this->mgr.get_components_by_type<Sprite>(); ASSERT_EQ(sprites.size(), 4); @@ -157,8 +156,7 @@ TEST_F(RenderSystemTest, Camera) { EXPECT_NE(cameras.size(), 1); } { - entity1.add_component<Camera>(ivec2{100, 100}, vec2{100, 100}, - Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); + entity1.add_component<Camera>(vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); auto cameras = this->mgr.get_components_by_type<Camera>(); EXPECT_EQ(cameras.size(), 1); @@ -167,8 +165,7 @@ TEST_F(RenderSystemTest, Camera) { //TODO improve with newer version } TEST_F(RenderSystemTest, Color) { - entity1.add_component<Camera>(ivec2{100, 100}, vec2{100, 100}, - Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); + entity1.add_component<Camera>(vec2{100, 100}, Camera::Data{.bg_color = Color::WHITE, .zoom = 1.0f}); auto & sprite = this->mgr.get_components_by_id<Sprite>(entity1.id).front().get(); //ASSERT_NE(sprite.texture.texture.get(), nullptr); |