games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fix test

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-19 12:17:06 +00:00
parent b256919dab
commit 2d3734656d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapping/CMapEditManager.h
View File

@ -72,16 +72,16 @@ public:
CMap * getMap(); CMap * getMap();
/// Clears the terrain. The free level is filled with water and the underground level with rock. /// Clears the terrain. The free level is filled with water and the underground level with rock.
void clearTerrain(vstd::RNG * gen = nullptr); void clearTerrain(vstd::RNG * gen);
/// Draws terrain at the current terrain selection. The selection will be cleared automatically. /// Draws terrain at the current terrain selection. The selection will be cleared automatically.
void drawTerrain(TerrainId terType, int decorationsPercentage, vstd::RNG * gen = nullptr); void drawTerrain(TerrainId terType, int decorationsPercentage, vstd::RNG * gen);
/// Draws roads at the current terrain selection. The selection will be cleared automatically. /// Draws roads at the current terrain selection. The selection will be cleared automatically.
void drawRoad(RoadId roadType, vstd::RNG * gen = nullptr); void drawRoad(RoadId roadType, vstd::RNG * gen);
/// Draws rivers at the current terrain selection. The selection will be cleared automatically. /// Draws rivers at the current terrain selection. The selection will be cleared automatically.
void drawRiver(RiverId riverType, vstd::RNG * gen = nullptr); void drawRiver(RiverId riverType, vstd::RNG * gen);
void insertObject(CGObjectInstance * obj); void insertObject(CGObjectInstance * obj);
void insertObjects(std::set<CGObjectInstance *> & objects); void insertObjects(std::set<CGObjectInstance *> & objects);

21
test/map/CMapEditManagerTest.cpp
View File

@ -25,15 +25,16 @@ TEST(MapManager, DrawTerrain_Type)
try try
{ {
auto map = std::make_unique<CMap>(nullptr); auto map = std::make_unique<CMap>(nullptr);
CRandomGenerator rand;
map->width = 52; map->width = 52;
map->height = 52; map->height = 52;
map->initTerrain(); map->initTerrain();
auto editManager = map->getEditManager(); auto editManager = map->getEditManager();
editManager->clearTerrain(); editManager->clearTerrain(&rand);
// 1x1 Blow up // 1x1 Blow up
editManager->getTerrainSelection().select(int3(5, 5, 0)); editManager->getTerrainSelection().select(int3(5, 5, 0));
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
static const int3 squareCheck[] = { int3(5,5,0), int3(5,4,0), int3(4,4,0), int3(4,5,0) }; static const int3 squareCheck[] = { int3(5,5,0), int3(5,4,0), int3(4,4,0), int3(4,5,0) };
for(const auto & tile : squareCheck) for(const auto & tile : squareCheck)
{ {
@ -42,20 +43,20 @@ TEST(MapManager, DrawTerrain_Type)
// Concat to square // Concat to square
editManager->getTerrainSelection().select(int3(6, 5, 0)); editManager->getTerrainSelection().select(int3(6, 5, 0));
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
EXPECT_EQ(map->getTile(int3(6, 4, 0)).terType->getId(), ETerrainId::GRASS); EXPECT_EQ(map->getTile(int3(6, 4, 0)).terType->getId(), ETerrainId::GRASS);
editManager->getTerrainSelection().select(int3(6, 5, 0)); editManager->getTerrainSelection().select(int3(6, 5, 0));
editManager->drawTerrain(ETerrainId::LAVA, 10); editManager->drawTerrain(ETerrainId::LAVA, 10, &rand);
EXPECT_EQ(map->getTile(int3(4, 4, 0)).terType->getId(), ETerrainId::GRASS); EXPECT_EQ(map->getTile(int3(4, 4, 0)).terType->getId(), ETerrainId::GRASS);
EXPECT_EQ(map->getTile(int3(7, 4, 0)).terType->getId(), ETerrainId::LAVA); EXPECT_EQ(map->getTile(int3(7, 4, 0)).terType->getId(), ETerrainId::LAVA);
// Special case water,rock // Special case water,rock
editManager->getTerrainSelection().selectRange(MapRect(int3(10, 10, 0), 10, 5)); editManager->getTerrainSelection().selectRange(MapRect(int3(10, 10, 0), 10, 5));
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
editManager->getTerrainSelection().selectRange(MapRect(int3(15, 17, 0), 10, 5)); editManager->getTerrainSelection().selectRange(MapRect(int3(15, 17, 0), 10, 5));
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
editManager->getTerrainSelection().select(int3(21, 16, 0)); editManager->getTerrainSelection().select(int3(21, 16, 0));
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
EXPECT_EQ(map->getTile(int3(20, 15, 0)).terType->getId(), ETerrainId::GRASS); EXPECT_EQ(map->getTile(int3(20, 15, 0)).terType->getId(), ETerrainId::GRASS);
// Special case non water,rock // Special case non water,rock
@ -66,16 +67,16 @@ TEST(MapManager, DrawTerrain_Type)
{ {
editManager->getTerrainSelection().select(tile); editManager->getTerrainSelection().select(tile);
} }
editManager->drawTerrain(ETerrainId::GRASS, 10); editManager->drawTerrain(ETerrainId::GRASS, 10, &rand);
EXPECT_EQ(map->getTile(int3(35, 44, 0)).terType->getId(), ETerrainId::WATER); EXPECT_EQ(map->getTile(int3(35, 44, 0)).terType->getId(), ETerrainId::WATER);
// Rock case // Rock case
editManager->getTerrainSelection().selectRange(MapRect(int3(1, 1, 1), 15, 15)); editManager->getTerrainSelection().selectRange(MapRect(int3(1, 1, 1), 15, 15));
editManager->drawTerrain(ETerrainId::SUBTERRANEAN, 10); editManager->drawTerrain(ETerrainId::SUBTERRANEAN, 10, &rand);
std::vector<int3> vec({ int3(6, 6, 1), int3(7, 6, 1), int3(8, 6, 1), int3(5, 7, 1), int3(6, 7, 1), int3(7, 7, 1), std::vector<int3> vec({ int3(6, 6, 1), int3(7, 6, 1), int3(8, 6, 1), int3(5, 7, 1), int3(6, 7, 1), int3(7, 7, 1),
int3(8, 7, 1), int3(4, 8, 1), int3(5, 8, 1), int3(6, 8, 1)}); int3(8, 7, 1), int3(4, 8, 1), int3(5, 8, 1), int3(6, 8, 1)});
editManager->getTerrainSelection().setSelection(vec); editManager->getTerrainSelection().setSelection(vec);
editManager->drawTerrain(ETerrainId::ROCK, 10); editManager->drawTerrain(ETerrainId::ROCK, 10, &rand);
EXPECT_TRUE(!map->getTile(int3(5, 6, 1)).terType->isPassable() || !map->getTile(int3(7, 8, 1)).terType->isPassable()); EXPECT_TRUE(!map->getTile(int3(5, 6, 1)).terType->isPassable() || !map->getTile(int3(7, 8, 1)).terType->isPassable());
//todo: add checks here and enable, also use smaller size //todo: add checks here and enable, also use smaller size