From de356f60b91fab37b1456992dc66ada8bd8e4dd7 Mon Sep 17 00:00:00 2001 From: jaroWMR Date: Wed, 23 Oct 2024 20:06:28 +0200 Subject: fixed merge issue --- src/crepe/PhysicsSystem.cpp | 12 ++++++------ src/crepe/api/CMakeLists.txt | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/crepe') diff --git a/src/crepe/PhysicsSystem.cpp b/src/crepe/PhysicsSystem.cpp index d9930a8..93b20f1 100644 --- a/src/crepe/PhysicsSystem.cpp +++ b/src/crepe/PhysicsSystem.cpp @@ -36,12 +36,12 @@ void PhysicsSystem::update() { rigidbody.velocity_y += force.force_y; } - std::cout << "before transform.postion.x " << transform.postion.x << std::endl; - std::cout << "before transform.postion.y " << transform.postion.y << std::endl; - transform.postion.x += rigidbody.velocity_x; - transform.postion.y += rigidbody.velocity_y; - std::cout << "after transform.postion.x " << transform.postion.x << std::endl; - std::cout << "after transform.postion.y " << transform.postion.y << std::endl; + std::cout << "before transform.postion.x " << transform.position.x << std::endl; + std::cout << "before transform.postion.y " << transform.position.y << std::endl; + transform.position.x += rigidbody.velocity_x; + transform.position.y += rigidbody.velocity_y; + std::cout << "after transform.postion.x " << transform.position.x << std::endl; + std::cout << "after transform.postion.y " << transform.position.y << std::endl; } } break; diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index f2d45eb..cca4994 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -10,7 +10,6 @@ target_sources(crepe PUBLIC Color.cpp Texture.cpp AssetManager.cpp - Collider.cpp Sprite.cpp ) -- cgit v1.2.3