Wang Tiles #1582
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,12 +39,12 @@ WangSet::WangSet(Tileset *tileset, | |
| int imageTileId): | ||
| Object(Object::TerrainType), //for now, will add unique type soon | ||
| mTileSet(tileset), | ||
| mName(std::move(name)), | ||
| mImageTileId(imageTileId), | ||
| mEdgeColors(edgeColors), | ||
| mCornerColors(cornerColors)/*, | ||
| mWangIdToTile(QMultiHash<WangId, Tile*>()), | ||
| mTileIdToWangId(QHash<int, WangId>())*/ | ||
| { | ||
| } | ||
|
|
||
|
|
@@ -53,58 +53,69 @@ void WangSet::addTile(Tile *tile, WangId wangId) | |
| Q_ASSERT(tile->tileset() == mTileSet); | ||
|
|
||
| for (int i = 0; i < 4; ++i) { | ||
| Q_ASSERT(wangId.edgeColor(i) <= mEdgeColors); | ||
| } | ||
|
|
||
| for (int i = 0; i < 4; ++i) { | ||
| Q_ASSERT(wangId.cornerColor(i) <= mCornerColors); | ||
| } | ||
|
|
||
| mWangIdToTile.insert(wangId, tile); | ||
| mTileIdToWangId.insert(tile->id(), wangId); | ||
| } | ||
|
|
||
| Tile *WangSet::findMatchingTile(WangId wangId) const | ||
| { | ||
| auto potentials = findMatchingTiles(wangId); | ||
|
|
||
| if (potentials.length() > 0) | ||
| return potentials[qrand() % potentials.length()]; | ||
| else | ||
| return NULL; | ||
| } | ||
|
|
||
| typedef struct WangWildCard | ||
| { | ||
| int index, colorCount; | ||
| } WangWildCard; | ||
|
There was a problem hiding this comment. This way of defining a struct was necessary in C times, to avoid needing to repeat the struct WangWildCard
{
int index;
int colorCount;
};There was a problem hiding this comment. What a wonderful time we live in! Thanks for informing me |
||
|
|
||
| QList<Tile*> WangSet::findMatchingTiles(WangId wangId) const | ||
| { | ||
| QList<Tile*> list; | ||
|
|
||
| //Stores the space of a wild card, followed by how many colors that space can have. | ||
| QVector<WangWildCard> wildCards; | ||
|
|
||
| if (mEdgeColors > 0) { | ||
| for (int i = 0; i < 4; ++i) { | ||
| if (!wangId.edgeColor(i)) { | ||
| WangWildCard w; | ||
| w.index = i * 8; | ||
| w.colorCount = mEdgeColors; | ||
|
|
||
| wildCards.append(w); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (mCornerColors > 0) { | ||
| for (int i = 0; i < 4; ++i) { | ||
| if (!wangId.cornerColor(i)) { | ||
| WangWildCard w; | ||
| w.index = i * 8 + 4; | ||
| w.colorCount = mCornerColors; | ||
|
|
||
| wildCards.append(w); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (wildCards.isEmpty()) { | ||
| list.append(mWangIdToTile.values(wangId)); | ||
| } else { | ||
| QStack<WangWildCard> stack; | ||
|
|
||
| stack.append(wildCards); | ||
|
There was a problem hiding this comment. I checked the documentation, check the following link. http://doc.qt.io/qt-5/qvector.html#append-2 The method to append another qvector was introduced in Qt 5.5 so there is a difference in the Qt version that you are using and the one that the Travis CI uses, I would suggest you to get Qt 5.4.2 which is the officially minimal supported to build Tiled. There was a problem hiding this comment. You might be able to use += or << operators instead. There was a problem hiding this comment. I guess we could also just raise the minimum Qt version to 5.5. I wanted to quickly look up if those operators would work as an alternative, but http://doc.qt.io/archives/index.html does not even host Qt 5.4 documentation anymore. In general, it does not matter which version is used for development but I'd recommend simply using the latest version, since that is likely the version the next Tiled release is going to be made against. We can check the minimum supported version using Travis CI. There was a problem hiding this comment. So for the time being, should I change that part of the code to comply with the older version? Or just leave it as is? There was a problem hiding this comment. Bjorn has more a word on this than I, he is the product owner, but I would say that if += work in older versions and in newers aswell, then just use the operator. There was a problem hiding this comment. Right, looking at the Qt 5.4 docs in Qt Creator, the operator+= does work with another QVector, so please just use that instead of append, so we can have it in a single line without raising the Qt dependency. |
||
|
|
||
| int max = wildCards.size(); | ||
|
|
||
|
|
@@ -113,19 +124,19 @@ QList<Tile*> WangSet::getAllTiles(WangId wangId) const | |
| int idVariation = 0; | ||
|
|
||
| for (int i = 0; i < max; ++i) { | ||
| idVariation |= stack[i].colorCount << stack[i].index; | ||
| } | ||
|
There was a problem hiding this comment. Coding style: please leave out the braces for one-line bodies (also below). |
||
|
|
||
| list.append(mWangIdToTile.values(idVariation | wangId)); | ||
|
|
||
| WangWildCard top = stack.pop(); | ||
| top.colorCount -= 1; | ||
| if (top.colorCount > 0) | ||
| stack.push(top); | ||
| } else { | ||
| WangWildCard top = stack.pop(); | ||
| top.colorCount -= 1; | ||
| if (top.colorCount > 0) { | ||
| stack.push(top); | ||
|
|
||
| for (int i = stack.size(); i < max; ++i) { | ||
|
|
@@ -139,10 +150,17 @@ QList<Tile*> WangSet::getAllTiles(WangId wangId) const | |
| return list; | ||
| } | ||
|
|
||
| WangId WangSet::wangIdOfTile(Tile *tile) const | ||
| { | ||
| return mTileIdToWangId.value(tile->id()); | ||
| } | ||
|
|
||
| WangSet *WangSet::clone(Tileset *tileset) const | ||
| { | ||
| WangSet *c = new WangSet(tileset, mEdgeColors, mCornerColors, mName, mImageTileId); | ||
|
|
||
| c->mWangIdToTile = mWangIdToTile; | ||
| c->mTileIdToWangId = mTileIdToWangId; | ||
|
|
||
| return c; | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just remove these lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Knew I forgot something...