Skip to content

Complain explicitly if margin+width+spacing does not match file size #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Complain explicitly if margin+width+spacing does not match file size #298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions ...Tiled2Unity/Packages/com.seanba.super-tiled2unity/Editor/Loaders/Tileset/TilesetLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,21 @@ private void BuildTilesetFromImage(XElement xTileset)
int expectedWidth = xImage.GetAttributeAs<int>("width");
int expectedHeight = xImage.GetAttributeAs<int>("height");

int columns = m_SuperTileset.m_TileColumns;
int rows = (m_SuperTileset.m_TileCount + columns - 1) / columns;
int tileWidth = m_SuperTileset.m_TileWidth;
int tileHeight = m_SuperTileset.m_TileHeight;
int spacing = m_SuperTileset.m_Spacing;
int margin = m_SuperTileset.m_Margin;

int calculatedWidth = (tileWidth * columns) + (spacing * (columns - 1)) + (margin * 2);
int calculatedHeight = (tileHeight * rows) + (spacing * (rows - 1)) + (margin * 2);

// Report mismatch if expected and calculated sizes differ
if (expectedWidth != calculatedWidth || expectedHeight != calculatedHeight)
{
m_Importer.ReportGenericError($"Tileset image size mismatch: XML width/height = {expectedWidth}x{expectedHeight}, calculated = {calculatedWidth}x{calculatedHeight}. Check spacing, margin, columns, and tile size.");
}

using (var tilesetAssetResolver = TilesetAssetResolverFactory.CreateFromRelativeAssetPath(m_Importer, m_SuperTileset, sourceRelativePath))
{
Expand All @@ -108,21 +123,18 @@ private void BuildTilesetFromImage(XElement xTileset)
for (int i = 0; i < m_SuperTileset.m_TileCount; i++)
{
// Get grid x,y coords
int x = i % m_SuperTileset.m_TileColumns;
int y = i / m_SuperTileset.m_TileColumns;

int tileWidth = m_SuperTileset.m_TileWidth;
int tileHeight = m_SuperTileset.m_TileHeight;
int x = i % columns;
int y = i / columns;

// Get x source on texture
int srcx = x * tileWidth;
srcx += x * m_SuperTileset.m_Spacing;
srcx += m_SuperTileset.m_Margin;
srcx += x * spacing;
srcx += margin;

// Get y source on texture
int srcy = y * tileHeight;
srcy += y * m_SuperTileset.m_Spacing;
srcy += m_SuperTileset.m_Margin;
srcy += y * spacing;
srcy += margin;

if (!tilesetAssetResolver.AddSpritesAndTile(i, srcx, srcy, tileWidth, tileHeight))
{
Expand Down