Improve fringe map layers drawing.

Pre cache next tile position with image.

1 files changed, 451 insertions, 0 deletions

diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
new file mode 100644
index 000000000..90f34ce0e
--- /dev/null
+++ b/src/resources/map/maplayer_unittest.cc
@@ -0,0 +1,451 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch.hpp"
+
+#include "logger.h"
+
+#include "resources/image/image.h"
+
+#include "resources/map/maplayer.h"
+
+#include "debug.h"
+
+TEST_CASE("MapLayer getTileDrawWidth")
+{
+    Image *const img1 = new Image(32, 32);
+    Image *const img2 = new Image(32, 32);
+    Image *const img3 = new Image(32, 32);
+    MapLayer *layer = nullptr;
+    int width;
+    int nextTile;
+
+    SECTION("simple 1")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            1, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 2")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            2, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            2,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 1);
+    }
+
+    SECTION("simple 3")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            2, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(1, 0, img2);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 1,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 4")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            2, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(1, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            2,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 1,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 4")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            3, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(2, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            3,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 2,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 5")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            3, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(1, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            3,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 2);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 1,
+            2,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 1);
+    }
+
+    SECTION("simple 6")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            3, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(1, 0, img1);
+        layer->setTile(2, 0, img2);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getTileDrawWidth(tiles,
+            3,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 1,
+            2,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 2,
+            1,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("normal 1")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            100, 100,
+            false,
+            0,
+            0);
+        layer->setTile(1, 10, img1);
+        layer->setTile(2, 10, img1);
+        layer->setTile(3, 10, img1);
+        layer->setTile(4, 10, img2);
+        layer->setTile(5, 10, nullptr);
+        layer->setTile(6, 10, img2);
+        layer->setTile(7, 10, nullptr);
+        layer->setTile(8, 10, nullptr);
+        layer->setTile(9, 10, img2);
+        layer->setTile(10, 10, img2);
+        layer->setTile(11, 10, img3);
+        layer->setTile(12, 10, nullptr);
+        layer->setTile(13, 10, nullptr);
+        layer->setTile(14, 10, nullptr);
+        layer->setTile(15, 10, img1);
+        layer->setTile(16, 10, img1);
+        layer->setTile(17, 10, img1);
+        TileInfo *const tiles = layer->getTiles();
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 1,
+            100 - 1,
+            width,
+            nextTile) == 2);
+        REQUIRE(width == 96);
+        REQUIRE(nextTile == 2);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 2,
+            100 - 2,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 3,
+            100 - 3,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 4,
+            100 - 4,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 6,
+            100 - 6,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 2);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 9,
+            100 - 9,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 10,
+            100 - 10,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 11,
+            100 - 11,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 3);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 15,
+            100 - 15,
+            width,
+            nextTile) == 2);
+        REQUIRE(width == 96);
+        REQUIRE(nextTile == 84);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 16,
+            100 - 16,
+            width,
+            nextTile) == 1);
+        REQUIRE(width == 64);
+        REQUIRE(nextTile == 83);
+
+        REQUIRE(layer->getTileDrawWidth(tiles + 10 * 100 + 17,
+            100 - 17,
+            width,
+            nextTile) == 0);
+        REQUIRE(width == 32);
+        REQUIRE(nextTile == 82);
+    }
+
+    delete layer;
+    delete img1;
+    delete img2;
+    delete img3;
+}
+
+
+TEST_CASE("MapLayer getEmptyTileDrawWidth")
+{
+    Image *const img1 = new Image(32, 32);
+    Image *const img2 = new Image(32, 32);
+    Image *const img3 = new Image(32, 32);
+    MapLayer *layer = nullptr;
+    int nextTile;
+
+    SECTION("simple 2")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            2, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 1,
+            1,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 4")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            3, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(2, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 1,
+            2,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("simple 5")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            3, 1,
+            false,
+            0,
+            0);
+        layer->setTile(0, 0, img1);
+        layer->setTile(1, 0, img1);
+        TileInfo *const tiles = layer->getTiles();
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 2,
+            1,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+    }
+
+    SECTION("normal 1")
+    {
+        MapLayer *layer = new MapLayer("test",
+            0, 0,
+            100, 100,
+            false,
+            0,
+            0);
+        layer->setTile(1, 10, img1);
+        layer->setTile(2, 10, img1);
+        layer->setTile(3, 10, img1);
+        layer->setTile(4, 10, img2);
+        layer->setTile(5, 10, nullptr);
+        layer->setTile(6, 10, img2);
+        layer->setTile(7, 10, nullptr);
+        layer->setTile(8, 10, nullptr);
+        layer->setTile(9, 10, img2);
+        layer->setTile(10, 10, img2);
+        layer->setTile(11, 10, img3);
+        layer->setTile(12, 10, nullptr);
+        layer->setTile(13, 10, nullptr);
+        layer->setTile(14, 10, nullptr);
+        layer->setTile(15, 10, img1);
+        layer->setTile(16, 10, img1);
+        layer->setTile(17, 10, img1);
+        TileInfo *const tiles = layer->getTiles();
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 0,
+            100 - 0,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 5,
+            100 - 5,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 7,
+            100 - 7,
+            nextTile) == 1);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 8,
+            100 - 8,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 12,
+            100 - 12,
+            nextTile) == 2);
+        REQUIRE(nextTile == 2);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 13,
+            100 - 13,
+            nextTile) == 1);
+        REQUIRE(nextTile == 1);
+
+        REQUIRE(layer->getEmptyTileDrawWidth(tiles + 10 * 100 + 14,
+            100 - 14,
+            nextTile) == 0);
+        REQUIRE(nextTile == 0);
+    }
+
+    delete layer;
+    delete img1;
+    delete img2;
+    delete img3;
+}