Skip to content

Extend hexagonal/staggered map support #417

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
pkulev wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Extend hexagonal/staggered map support #417

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b3d16d
tiled: simplify unknown identifier detection for the user
pkulev Oct 31, 2025
c70716d
tiled: add support for staggeraxis
pkulev Nov 1, 2025
cd26618
tiled: add hexsidelength support
pkulev Nov 1, 2025
fcff390
tiled: add staggerindex support
pkulev Nov 1, 2025
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
39 changes: 30 additions & 9 deletions cute_tiled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,16 +413,16 @@ struct cute_tiled_map_t
uint32_t backgroundcolor; // Hex-formatted color (#RRGGBB or #AARRGGBB) (optional).
cute_tiled_string_t class_; // The class of the map (since 1.9, optional).
int height; // Number of tile rows.
/* hexsidelength */ // Not currently supported.
int hexsidelength; // Width or height (by staggered axis) of the tile’s edge, in pixels (hexagonal).
int infinite; // Whether the map has infinite dimensions.
cute_tiled_layer_t* layers; // Linked list of layers. Can be NULL.
int nextobjectid; // Auto-increments for each placed object.
cute_tiled_string_t orientation; // `orthogonal`, `isometric`, `staggered` or `hexagonal`.
int property_count; // Number of elements in the `properties` array.
cute_tiled_property_t* properties; // Array of properties.
cute_tiled_string_t renderorder; // Rendering direction (orthogonal maps only).
/* staggeraxis */ // Not currently supported.
/* staggerindex */ // Not currently supported.
cute_tiled_string_t staggeraxis; // Which axis is staggered (staggered and hexagonal maps).
cute_tiled_string_t staggerindex; // Whether the “even” or “odd” indexes along the staggered axis are shifted (staggered/hexagonal).
cute_tiled_string_t tiledversion; // The Tiled version used to save the file.
int tileheight; // Map grid height.
cute_tiled_tileset_t* tilesets; // Linked list of tilesets.
Expand Down Expand Up @@ -1476,6 +1476,13 @@ static int cute_tiled_try(cute_tiled_map_internal_t* m, char expect)
CUTE_TILED_CHECK(cute_tiled_next(m) == (expect), error); \
} while (0)

#define cute_tiled_unknown_identifier(m, h) \
do { \
static char error[256]; \
CUTE_TILED_SNPRINTF(error, sizeof(error), "Unknown identifier found: %s, hash: %llu.", m->scratch, h); \
CUTE_TILED_CHECK(0, error); \
} while (0)

char cute_tiled_parse_char(char c)
{
switch (c)
Expand Down Expand Up @@ -2096,7 +2103,7 @@ cute_tiled_object_t* cute_tiled_read_object(cute_tiled_map_internal_t* m)
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

cute_tiled_try(m, ',');
Expand Down Expand Up @@ -2276,7 +2283,7 @@ cute_tiled_layer_t* cute_tiled_layers(cute_tiled_map_internal_t* m)
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

cute_tiled_try(m, ',');
Expand Down Expand Up @@ -2401,7 +2408,7 @@ cute_tiled_tile_descriptor_t* cute_tiled_read_tile_descriptor(cute_tiled_map_int
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

cute_tiled_try(m, ',');
Expand Down Expand Up @@ -2438,7 +2445,7 @@ int cute_tiled_read_point_internal(cute_tiled_map_internal_t* m, int* point_x, i
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

cute_tiled_try(m, ',');
Expand Down Expand Up @@ -2625,7 +2632,7 @@ cute_tiled_tileset_t* cute_tiled_tileset(cute_tiled_map_internal_t* m)
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

cute_tiled_try(m, ',');
Expand Down Expand Up @@ -2672,6 +2679,10 @@ static int cute_tiled_dispatch_map_internal(cute_tiled_map_internal_t* m)
cute_tiled_read_int(m, &m->map.height);
break;

case 5684465468058326115U: // hexsidelength
cute_tiled_read_int(m, &m->map.hexsidelength);
break;

case 16529928297377797591U: // infinite
cute_tiled_read_bool(m, &m->map.infinite);
break;
Expand Down Expand Up @@ -2707,6 +2718,14 @@ static int cute_tiled_dispatch_map_internal(cute_tiled_map_internal_t* m)
cute_tiled_intern_string(m, &m->map.renderorder);
break;

case 18082816309487282231U: // staggeraxis
cute_tiled_intern_string(m, &m->map.staggeraxis);
break;

case 16693286153064272296U: // staggerindex
cute_tiled_intern_string(m, &m->map.staggerindex);
break;

case 1007832939408977147U: // tiledversion
cute_tiled_intern_string(m, &m->map.tiledversion);
break;
Expand Down Expand Up @@ -2756,7 +2775,7 @@ static int cute_tiled_dispatch_map_internal(cute_tiled_map_internal_t* m)
break;

default:
CUTE_TILED_CHECK(0, "Unknown identifier found.");
cute_tiled_unknown_identifier(m, h);
}

return 1;
Expand Down Expand Up @@ -2841,6 +2860,8 @@ static void cute_tiled_patch_interned_strings(cute_tiled_map_internal_t* m)
cute_tiled_deintern_string(m, &m->map.class_);
cute_tiled_deintern_string(m, &m->map.orientation);
cute_tiled_deintern_string(m, &m->map.renderorder);
cute_tiled_deintern_string(m, &m->map.staggeraxis);
cute_tiled_deintern_string(m, &m->map.staggerindex);
cute_tiled_deintern_string(m, &m->map.tiledversion);
cute_tiled_deintern_string(m, &m->map.type);
cute_tiled_deintern_properties(m, m->map.properties, m->map.property_count);
Expand Down