Commit f3fde2ae authored by Georg Schaefer's avatar Georg Schaefer
Browse files

Merge branch 'feature/19-level-datastructure' into 'develop'

Resolve "Level: Datastructure"

Closes #19

See merge request !1
parents 6ad48533 00b61bf9
Pipeline #3246 passed with stage
in 7 minutes and 36 seconds
......@@ -33,6 +33,9 @@ namespace phase_shifter {
namespace ui {
class Hud_system;
}
namespace level {
class Level_system;
}
class Meta_system {
public:
......@@ -49,6 +52,7 @@ namespace phase_shifter {
auto entities() noexcept -> auto& { return _entities; }
auto renderer() noexcept -> auto& { return *_renderer; }
auto level_system() noexcept -> auto& { return *_level_system; }
private:
mirrage::ecs::Entity_manager _entities;
......@@ -61,6 +65,7 @@ namespace phase_shifter {
std::unique_ptr<input::Input_system> _input_system;
std::unique_ptr<helper::Attachment_system> _attachment_system;
std::unique_ptr<ui::Hud_system> _hud_system;
std::unique_ptr<level::Level_system> _level_system;
std::unique_ptr<gameplay::Camera_system> _camera_system;
// TODO: add systems here
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment