Work in progress

src/engine.cpp

@@ -10,6 +10,7 @@
 #include "resourcemanager.hpp"
 #include "statemanager.hpp"
 #include "window.hpp"
+#include "world.hpp"
 
 using namespace framework;
 
@@ -49,6 +50,14 @@ std::shared_ptr<input::eventmanager> engine::eventmanager() const {
   return _eventmanager;
 }
 
+void engine::set_world(std::shared_ptr<framework::world> world) {
+  _world = std::move(world);
+}
+
+std::shared_ptr<framework::world> engine::world() const {
+  return _world;
+}
+
 void engine::set_entitymanager(std::shared_ptr<framework::entitymanager> entitymanager) {
   _entitymanager = std::move(entitymanager);
 }
@@ -152,6 +161,7 @@ void engine::_loop() {
   _resourcemanager->update(delta);
   _scenemanager->update(delta);
   _eventmanager->update(delta);
+  _world->update(delta);
   _entitymanager->update(delta);
 
   for (auto &loopable : _loopables) {
@@ -161,6 +171,7 @@ void engine::_loop() {
   _renderer->begin();
   _scenemanager->draw();
   _entitymanager->draw();
+  _world->draw();
   _renderer->end();
 }
 

src/engine.hpp

@@ -19,6 +19,9 @@ class engine : public input::eventreceiver {
   void set_audiodevice(std::shared_ptr<audio::audiodevice> audiodevice);
   std::shared_ptr<audio::audiodevice> audiodevice() const;
 
+  void set_world(std::shared_ptr<framework::world> world);
+  std::shared_ptr<framework::world> world() const;
+
   void set_entitymanager(std::shared_ptr<framework::entitymanager> entitymanager);
   std::shared_ptr<framework::entitymanager> entitymanager() const;
 
@@ -67,6 +70,7 @@ class engine : public input::eventreceiver {
   std::shared_ptr<graphics::renderer> _renderer;
   std::shared_ptr<audio::audiodevice> _audiodevice;
   std::shared_ptr<input::eventmanager> _eventmanager;
+  std::shared_ptr<framework::world> _world;
   std::shared_ptr<framework::entitymanager> _entitymanager;
   std::shared_ptr<framework::resourcemanager> _resourcemanager;
   std::shared_ptr<framework::statemanager> _statemanager;

src/enginefactory.cpp

@@ -53,6 +53,7 @@ std::shared_ptr<engine> enginefactory::create() {
   engine->set_renderer(std::move(renderer));
   engine->set_audiodevice(std::move(audiodevice));
   engine->set_eventmanager(std::move(eventmanager));
+  engine->set_world(std::move(world));
   engine->set_entitymanager(std::move(entitymanager));
   engine->set_statemanager(std::move(statemanager));
   engine->set_resourcemanager(std::move(resourcemanager));

src/entitymanager.cpp

@@ -122,8 +122,6 @@ std::shared_ptr<entity> entitymanager::find(uint64_t id) const noexcept {
 void entitymanager::update(float_t delta) {
   UNUSED(delta);
 
-  cpSpaceStep(_world->space().get(), 1.0 / 60.0);
-
   for (const auto &entity : _entities) {
     entity->update();
   }
@@ -133,8 +131,6 @@ void entitymanager::draw() noexcept {
   for (const auto &entity : _entities) {
     entity->draw();
   }
-
-  _world->draw();
 }
 
 void entitymanager::on_mail(const input::mailevent &event) noexcept {

src/world.cpp

@@ -18,14 +18,19 @@ space_ptr world::space() const noexcept {
   return _space;
 }
 
+void world::update(float_t delta) const noexcept {
+  UNUSED(delta);
+
+  cpSpaceStep(_space.get(), 1.0 / 60.0);
+}
+
 void world::draw() noexcept {
   auto drawShape = [&](cpShape *shape) {
     const cpBody *body = cpShapeGetBody(shape);
     const cpVect position = cpBodyGetPosition(body);
 
     int count = cpPolyShapeGetCount(shape);
     std::vector<cpVect> vertices(count);
-
     std::generate(vertices.begin(), vertices.end(), [&, i = 0]() mutable {
       return cpPolyShapeGetVert(shape, i++);
     });

src/world.hpp

@@ -14,6 +14,8 @@ class world {
 
   space_ptr space() const noexcept;
 
+  void update(float_t delta) const noexcept;
+
   void draw() noexcept;
 
 private: