From dbfd1fc91f7bf1701415f42d472ad8fac6507fb7 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 21 Sep 2023 07:07:26 +0200 Subject: [PATCH] Revert "dun_render: Add `DunTileColorMap` for baked light" This reverts commit 827eb9705d8d0dda670d6eec247b4d5c49139ea6. --- Source/engine/render/dun_render.cpp | 25 ------------------------- Source/engine/render/dun_render.hpp | 12 ------------ 2 files changed, 37 deletions(-) diff --git a/Source/engine/render/dun_render.cpp b/Source/engine/render/dun_render.cpp index 0cd413eee..5e2f12a4a 100644 --- a/Source/engine/render/dun_render.cpp +++ b/Source/engine/render/dun_render.cpp @@ -1197,29 +1197,4 @@ void world_draw_black_tile(const Surface &out, int sx, int sy) } } -void DunTileColorMap(std::span src, TileType tileType, - const uint8_t *tbl, uint8_t *dst) -{ - if (tileType == TileType::TransparentSquare) { - const uint8_t *srcPtr = src.data(); - for (auto i = 0; i < Height; ++i) { - for (uint_fast8_t drawWidth = Width; drawWidth > 0;) { - auto v = static_cast(*srcPtr++); - if (v > 0) { - drawWidth -= v; - while (v-- > 0) { - *dst++ = tbl[*srcPtr++]; - } - } else { - drawWidth += v; - } - } - } - } else { - for (const uint8_t pix : src) { - *dst++ = tbl[pix]; - } - } -} - } // namespace devilution diff --git a/Source/engine/render/dun_render.hpp b/Source/engine/render/dun_render.hpp index 59a4b2d47..d61c35145 100644 --- a/Source/engine/render/dun_render.hpp +++ b/Source/engine/render/dun_render.hpp @@ -6,7 +6,6 @@ #pragma once #include -#include #include @@ -276,15 +275,4 @@ void RenderTile(const Surface &out, Point position, */ void world_draw_black_tile(const Surface &out, int sx, int sy); -/** - * @brief Applies a color map to a dungeon tile. - * - * @param src Dungeon CEL data. - * @param tileType Dungeon CEL type. - * @param tbl Palette mapping. - * @param dst Output dungeon CEL data. - */ -void DunTileColorMap(std::span src, TileType tileType, - const uint8_t *tbl, uint8_t *dst); - } // namespace devilution