From e16fb5be90c889c371cbb0ca2444735c2e12073c Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sun, 18 Feb 2018 12:35:45 -0500 Subject: Implemented map adjacency This brings along with it the ability to move to different maps, for which the PlayingSystem and PlayableComponent were introduced. The PlayingSystem is a general overseer system that handles big picture stuff like initializing the player and changing maps. The PlayableComponent represents the player. While the ControllableComponent is also likely to always only be on the player entity, the two are distinct by separation of concerns. This also required a refactoring of how collisions are processed, because of a bug where the player can move to a new map when horizontal collisions are checked, and vertical collisions are skipped, causing the player to clip through the ground because the normal force was never handled. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7bcb8..155063e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ add_executable(Aromatherapy src/animation.cpp src/world.cpp src/util.cpp + src/collision.cpp src/renderer/renderer.cpp src/renderer/mesh.cpp src/renderer/shader.cpp @@ -64,6 +65,7 @@ add_executable(Aromatherapy src/systems/animating.cpp src/systems/mapping.cpp src/systems/orienting.cpp + src/systems/playing.cpp ) set_property(TARGET Aromatherapy PROPERTY CXX_STANDARD 11) -- cgit 1.4.1