src/app.cpp

@@ -1,10 +1,7 @@
 #include "app.h"
 
 #include "map/map.h"
-#include "interfaces/itemsink.h"
-#include "items/wrench.h"
 #include "tiles/rainbow.h"
-#include "tiles/conveyor.h"
 #include "tiles/dirt.h"
 #include "tiles/grass.h"
 #include "util/vector2.h"
@@ -26,16 +23,14 @@ bool App::OnUserCreate()
 
 bool App::OnUserUpdate(float delta)
 {
-    auto &map = Map::instance();
-
     Vector2<int> screen = {ScreenWidth(), ScreenHeight()};
     Vector2<int> mouse = {GetMouseX(), GetMouseY()};
 
     // Save and load keys
     if(GetKey(olc::Key::S).bReleased)
-        map.save();
+        m_map.save();
     if(GetKey(olc::Key::L).bReleased)
-        map.load();
+        m_map.load();
 
     // Basic block placing
     if(GetMouse(0).bPressed) {
@@ -43,21 +38,14 @@ bool App::OnUserUpdate(float delta)
         auto tile_pos = screen_pos / (TILE_SIZE + 1);
         if(screen_pos.x() < 0) tile_pos -= {1, 0};
         if(screen_pos.y() < 0) tile_pos -= {0, 1};
-        map.set_tile(tile_pos, new Conveyor());
+        m_map.set_tile(tile_pos, new Rainbow());
     }
     if(GetMouse(1).bPressed) {
         auto screen_pos = mouse - m_camera_pos;
         auto tile_pos = screen_pos / (TILE_SIZE + 1);
         if(screen_pos.x() < 0) tile_pos -= {1, 0};
         if(screen_pos.y() < 0) tile_pos -= {0, 1};
-        // map.set_tile(tile_pos, new Dirt());
-        auto sink = dynamic_cast<ItemSink *>(&map.at(tile_pos).entity());
-        std::cout << "Insert " << sink << std::endl;
-        if(sink) {
-            std::cout << sink->can_accept(*(new Wrench())) << std::endl;
-            sink->insert(*(new Wrench()));
-            std::cout << sink->can_accept(*(new Wrench())) << std::endl;
-        }
+        m_map.set_tile(tile_pos, new Dirt());
     }
 
     // Pan camera with middle mouse
@@ -80,7 +68,7 @@ bool App::OnUserUpdate(float delta)
 
     for(int y = min.y() - 1; y < max.y() + 1; y++) {
         for(int x = min.x() - 1; x < max.x() + 1; x++) {
-            auto &node = map.at(Vector2<int>(x, y));
+            auto &node = m_map.at(Vector2<int>(x, y));
             node.update(delta);
             node.render(m_render);
         }

src/app.h

@@ -17,6 +17,7 @@ public:
 
 private:
     Render m_render;
+    Map m_map;
 
     Vector2<int> m_drag_start;
     Vector2<int> m_camera_pos;

src/map/map.h

@@ -10,14 +10,6 @@ class Map {
     public:
         Map() = default;
 
-        Map(Map const &) = delete;
-        void operator=(const Map &) = delete;
-
-        static Map &instance() {
-            static Map s_instance;
-            return s_instance;
-        }
-
         Node &at(Vector2<int> pos);
         void set_tile(Vector2<int> pos, Tile *tile);
 

src/util/render.cpp

@@ -50,10 +50,10 @@ void Render::fill_rectangle_sz(Vector2<int> size, Color color) {
 }
 
 void Render::draw_lines(std::vector<Vector2<float>> points, Color color) {
-    auto prev_cache = m_view_matrix * m_matrix * Vector3<float>(points[0], 1);
+    auto prev_cache = m_matrix * m_view_matrix * Vector3<float>(points[0], 1);
     for(size_t i = 1; i < points.size(); i++) {
         auto start = prev_cache;
-        auto end = m_view_matrix * m_matrix * Vector3<float>(points[i], 1);
+        auto end = m_matrix * m_view_matrix * Vector3<float>(points[i], 1);
 
         m_pge->DrawLine(
             start.x(),
@@ -118,10 +118,10 @@ void Render::pop_matrix() {
 void Render::translate(Vector2<float> trans) {
     switch(m_matrix_mode) {
         case MODEL:
-            m_matrix *= translation_matrix(trans);
+            m_matrix = translation_matrix(trans) * m_matrix;
             break;
         case PROJECTION:
-            m_view_matrix *= translation_matrix(trans);
+            m_view_matrix = translation_matrix(trans) * m_view_matrix;
             break;
     }
 }
@@ -129,10 +129,10 @@ void Render::translate(Vector2<float> trans) {
 void Render::rotate(float theta) {
     switch(m_matrix_mode) {
         case MODEL:
-            m_matrix *= rotation_matrix(theta);
+            m_matrix = rotation_matrix(theta) * m_matrix;
             break;
         case PROJECTION:
-            m_view_matrix *= rotation_matrix(theta);
+            m_view_matrix = rotation_matrix(theta) * m_view_matrix;
             break;
     }
 }
@@ -140,10 +140,10 @@ void Render::rotate(float theta) {
 void Render::scale(Vector2<float> scale) {
     switch(m_matrix_mode) {
         case MODEL:
-            m_matrix *= scale_matrix(scale);
+            m_matrix = scale_matrix(scale) * m_matrix;
             break;
         case PROJECTION:
-            m_view_matrix *= scale_matrix(scale);
+            m_view_matrix = scale_matrix(scale) * m_view_matrix;
     }
 }