Tilemap render order fix

src/framework/entities/tilemap_entity.cpp

@@ -6,8 +6,8 @@ Tilemap::Tilemap(Vector2 tilesize, std::string texture_path):
     built_chunks {},
     changed_chunks {},
     tilesize {tilesize},
+    renderer {[this](float delta) {this->render(delta); }},
     chunksize {16, 16} {
-
         type_count = (texture.get()->width / tilesize.x) / 4;
     }
 
@@ -268,7 +268,7 @@ void Tilemap::process(float delta) {
 }
 
 // Draws the tilemap (spatial partitioning and camera culling at play)
-void Tilemap::draw(float delta) {
+void Tilemap::render(float delta) {
     Vector2 camera_pos {0, 0};
     float max_dist = sqrt(tilesize.x*tilesize.x + tilesize.y*tilesize.y) +
         sqrt(res.x*res.x + res.y*res.y);
@@ -294,7 +294,6 @@ void Tilemap::draw(float delta) {
 
             if (built_chunks.find(chunk_pos) != built_chunks.end()) { // If chunk exists
                 TileDataVector &drawables = built_chunks[chunk_pos];
-
                 // For all tiles
                 for (auto& tile: drawables) {
                     Vector2 tile_pos {tile.pos.x * tilesize.x, tile.pos.y * tilesize.y};

src/framework/entities/tilemap_entity.hpp

@@ -5,8 +5,10 @@
 #include <entity.hpp>
 
 #include <camera_component.hpp>
+#include <tilemap_renderer.hpp>
 #include <collider_component.hpp>
 #include <area_component.hpp>
+#include <drawables.hpp>
 #include <fstream>
 #include <json.hpp>
 #include <tuple>
@@ -57,11 +59,12 @@ class Tilemap: public Entity {
 public:
     Vector2 tilesize;
     Vector2 chunksize;
+    TilemapRenderer renderer;
 
     Tilemap(Vector2 tilesize, std::string texture_path);
 
     void process(float delta);
-    void draw(float delta);
+    void render(float delta);
 
     /// @brief Set tile at x, y to type
     /// @param x X coord of tile
@@ -91,4 +94,5 @@ class Tilemap: public Entity {
     void load(std::string path);
 };
 
+
 #endif

src/framework/entities/tilemap_renderer.cpp

@@ -0,0 +1,7 @@
+#include <tilemap_renderer.hpp>
+
+TilemapRenderer::TilemapRenderer(std::function<void(float)> func): Drawable(), func {func} {}
+
+void TilemapRenderer::draw() {
+    func(GetFrameTime());
+}

src/framework/entities/tilemap_renderer.hpp

@@ -0,0 +1,14 @@
+#ifndef TILEMAP_RENDERER_H
+#define TILEMAP_RENDERER_H
+#include <drawables.hpp>
+#include <functional>
+
+class TilemapRenderer: public Drawable {
+public:
+    TilemapRenderer(std::function<void(float)> func);
+
+    std::function<void(float)> func;
+    void draw();
+};
+
+#endif

src/main.cpp

@@ -9,4 +9,5 @@ int main() {
 
     Framework::run();
     return 0;
-}
+}
+