1 files changed, 24 insertions, 17 deletions

@@ -7,30 +7,37 @@ texture_ptr Level::render(SDL_Renderer* ren, Layer layer) const
       ren,
       SDL_PIXELFORMAT_RGBA8888,
       SDL_TEXTUREACCESS_TARGET,
-      WINDOW_SIZE.w(),
-      WINDOW_SIZE.h()));
+      LEVEL_SIZE.w(),
+      LEVEL_SIZE.h()));
 
   SDL_SetRenderTarget(ren, canvas.get());
+  SDL_SetTextureBlendMode(canvas.get(), SDL_BLENDMODE_BLEND);
+  SDL_SetRenderDrawColor(ren, 0, 0, 0, 0);
+  SDL_RenderFillRect(ren, nullptr);
 
   for (size_t y = 0; y < size_.h(); y++)
   {
     for (size_t x = 0; x < size_.w(); x++)
     {
-      if (layer == Layer::map)
-      {
-        int val = 255 - at(x, y) * 10;
-
-        SDL_SetRenderDrawColor(ren, val, val, val, 255);
-
-        SDL_Rect rect {
-          static_cast<int>(x * TILE_SIZE.w()),
-          static_cast<int>(y * TILE_SIZE.h()),
-          TILE_SIZE.w(),
-          TILE_SIZE.h()
-        };
-
-        SDL_RenderFillRect(ren, &rect);
-      }
+      SDL_Rect src {
+        0,
+        static_cast<int>(at(x, y, layer) * TILE_SIZE.h()),
+        TILE_SIZE.w(),
+        TILE_SIZE.h()
+      };
+
+      SDL_Rect dest {
+        static_cast<int>(x * TILE_SIZE.w()),
+        static_cast<int>(y * TILE_SIZE.h()),
+        TILE_SIZE.w(),
+        TILE_SIZE.h()
+      };
+
+      SDL_RenderCopy(
+        ren,
+        getTileset(layer).getImage().get(),
+        &src,
+        &dest);
     }
   }