From 87d0c69701b070a50b0527ef667f2317c7b8d0ce Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 6 Jan 2025 10:56:11 +0100 Subject: [PATCH] feat: added collision world to canvas engine class --- src/core/canvas_engine.cpp | 1 + src/core/canvas_engine.hpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/core/canvas_engine.cpp b/src/core/canvas_engine.cpp index 32ba31d..21e74ec 100644 --- a/src/core/canvas_engine.cpp +++ b/src/core/canvas_engine.cpp @@ -132,6 +132,7 @@ void CanvasEngine::process_event(SDL_Event const &evt) { void CanvasEngine::tick(double delta_time) { this->level->propagate_tick(delta_time); + this->physics_world.check_collisions(); } void CanvasEngine::draw(SDL_Renderer *render) { diff --git a/src/core/canvas_engine.hpp b/src/core/canvas_engine.hpp index 14225a2..bad6013 100644 --- a/src/core/canvas_engine.hpp +++ b/src/core/canvas_engine.hpp @@ -1,6 +1,7 @@ #ifndef CANVAS_ENGINE_HPP #define CANVAS_ENGINE_HPP +#include "core/collision.hpp" #include "core/level.hpp" #include "node.hpp" #include "assets/asset_db.hpp" @@ -21,6 +22,7 @@ private: SDL_Renderer *render{nullptr}; //!< primary application window's renderer SDL_Texture *render_target{nullptr}; AssetDB assets{}; + CollisionWorld physics_world{}; InputMap input_map{}; //!< map of inputs to input callback objects std::unique_ptr level; Uint64 last_frame_start_time{}; //!< time at start of last frame