A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix(tilemap): a tile the atlas does not hold draws nothing
esenginef15976bfcf48
diff --git a/desktop/public/scenes/tilemap-flip.esscene b/desktop/public/scenes/tilemap-flip.essceneindex adede038e..2a5ede70a 100644--- a/desktop/public/scenes/tilemap-flip.esscene+++ b/desktop/public/scenes/tilemap-flip.esscene@@ -55,7 +55,6 @@},"tileset": "@uuid:aaaaaaaa-1111-2222-3333-444444444444","tilesetColumns": 2,- "tilesetRows": 2,"visible": true,"chunks": "RVNUTQEAAAAAAAAAAAAAAAEAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"}diff --git a/desktop/public/scenes/tilemap-oob.esscene b/desktop/public/scenes/tilemap-oob.esscenenew file mode 100644index 000000000..e557f753a--- /dev/null+++ b/desktop/public/scenes/tilemap-oob.esscene@@ -0,0 +1,98 @@+{+ "version": 1,+ "name": "TilemapOutOfRange",+ "entities": [+ {+ "id": 0,+ "name": "Camera",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {+ "position": {+ "x": 16,+ "y": -16,+ "z": 10+ }+ }+ },+ {+ "type": "Camera",+ "data": {+ "projectionType": 1,+ "orthoSize": 40,+ "isActive": true,+ "priority": 0+ }+ }+ ],+ "visible": true+ },+ {+ "id": 1,+ "name": "Tilemap",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {+ "position": {+ "x": 0,+ "y": 0,+ "z": 0+ }+ }+ },+ {+ "type": "TilemapLayer",+ "data": {+ "cellSize": {+ "x": 16,+ "y": 16+ },+ "tileset": "@uuid:aaaaaaaa-1111-2222-3333-444444444444",+ "tilesetColumns": 2,+ "visible": true,+ "chunks": "RVNUTQEAAAAAAAAAAAAAAAEABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"+ }+ }+ ],+ "visible": true+ },+ {+ "id": 2,+ "name": "TilemapWideColumns",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {+ "position": {+ "x": 0,+ "y": -32,+ "z": 0+ }+ }+ },+ {+ "type": "TilemapLayer",+ "data": {+ "cellSize": {+ "x": 16,+ "y": 16+ },+ "tileset": "@uuid:aaaaaaaa-1111-2222-3333-444444444444",+ "tilesetColumns": 4,+ "visible": true,+ "chunks": "RVNUTQEAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/desktop/public/scenes/tilemap-parallax.esscene b/desktop/public/scenes/tilemap-parallax.essceneindex 5b4a68c05..975cdb9b7 100644--- a/desktop/public/scenes/tilemap-parallax.esscene+++ b/desktop/public/scenes/tilemap-parallax.esscene@@ -55,7 +55,6 @@},"tileset": "@uuid:aaaaaaaa-1111-2222-3333-444444444444","tilesetColumns": 2,- "tilesetRows": 2,"visible": true,"chunks": "RVNUTQEAAAAAAAAAAAAAAAEAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","parallaxFactor": {diff --git a/desktop/public/scenes/tilemap-transform.esscene b/desktop/public/scenes/tilemap-transform.essceneindex 61bfff829..8e674dd68 100644--- a/desktop/public/scenes/tilemap-transform.esscene+++ b/desktop/public/scenes/tilemap-transform.esscene@@ -55,7 +55,6 @@},"tileset": "@uuid:aaaaaaaa-1111-2222-3333-444444444444","tilesetColumns": 1,- "tilesetRows": 1,"visible": true,"chunks": "RVNUTQEAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"}diff --git a/docs/astro/src/content/docs/world/tilemaps.mdx b/docs/astro/src/content/docs/world/tilemaps.mdxindex 7c4b6dd5d..e221b9bb5 100644--- a/docs/astro/src/content/docs/world/tilemaps.mdx+++ b/docs/astro/src/content/docs/world/tilemaps.mdx@@ -135,8 +135,7 @@ renderer reads these live, so animating `tintColor` / `opacity` is lag-free.| `cellSize` | Vec2 | `{32, 32}` | Tile size in world units. || `originOffset` | Vec2 | `{0, 0}` | Shifts the layer's grid, in world units. Applied per frame beside the layer's parallax, so dragging it moves the tiles at once and rebuilds no chunk. || `tileset` | asset | none | Tileset texture (single-tileset layers). |-| `tilesetColumns` | number | `1` | Columns in the tileset atlas. |-| `tilesetRows` | number | `1` | Rows in the tileset atlas. |+| `tilesetColumns` | number | `1` | Columns in the tileset atlas. How many rows it holds comes from the texture, and a tile past the last one draws nothing. || `renderLayer` | number | `0` | Sorting layer for draw order. || `tintColor` | Color | `{1,1,1,1}` | Multiplied over every tile. Animatable. || `opacity` | number | `1` | Layer transparency, 0..1. Animatable. |diff --git a/docs/astro/src/content/docs/zh-cn/world/tilemaps.mdx b/docs/astro/src/content/docs/zh-cn/world/tilemaps.mdxindex c8d909ed0..75cf09f9f 100644--- a/docs/astro/src/content/docs/zh-cn/world/tilemaps.mdx+++ b/docs/astro/src/content/docs/zh-cn/world/tilemaps.mdx@@ -121,8 +121,7 @@ const loadLevel = defineSystem([Commands()], (cmds) => {| `cellSize` | Vec2 | `{32, 32}` | 瓦片尺寸(世界单位)。 || `originOffset` | Vec2 | `{0, 0}` | 图层网格的偏移(世界单位)。与图层视差在同一处逐帧应用,所以拖动它当场移动 tile,且不会重建任何 chunk。 || `tileset` | asset | 无 | 图集纹理(单图集图层)。 |-| `tilesetColumns` | number | `1` | 图集图册的列数。 |-| `tilesetRows` | number | `1` | 图集图册的行数。 |+| `tilesetColumns` | number | `1` | 图集图册的列数。行数由纹理自己决定,超出最后一个 tile 的 id 不绘制。 || `renderLayer` | number | `0` | 决定绘制顺序的排序层。 || `tintColor` | Color | `{1,1,1,1}` | 叠乘到每个瓦片上。可动画。 || `opacity` | number | `1` | 图层透明度,0..1。可动画。 |diff --git a/docs/astro/src/data/components.generated.json b/docs/astro/src/data/components.generated.jsonindex c40009590..e2ea19836 100644--- a/docs/astro/src/data/components.generated.json+++ b/docs/astro/src/data/components.generated.json@@ -3219,12 +3219,6 @@"default": "1","range": "≥ 1, step 1"},- {- "key": "tilesetRows",- "type": "number",- "default": "1",- "range": "≥ 1, step 1"- },{"key": "renderLayer","type": "enum (sortingLayers)",diff --git a/examples/tilemap-demo/assets/scenes/hex-map.esscene b/examples/tilemap-demo/assets/scenes/hex-map.essceneindex 92d490c52..db90b4402 100644--- a/examples/tilemap-demo/assets/scenes/hex-map.esscene+++ b/examples/tilemap-demo/assets/scenes/hex-map.esscene@@ -90,7 +90,6 @@},"tileset": 0,"tilesetColumns": 1,- "tilesetRows": 1,"renderLayer": 0,"tintColor": {"r": 1,diff --git a/examples/tilemap-demo/assets/scenes/iso-map.esscene b/examples/tilemap-demo/assets/scenes/iso-map.essceneindex 2087698d1..795040c67 100644--- a/examples/tilemap-demo/assets/scenes/iso-map.esscene+++ b/examples/tilemap-demo/assets/scenes/iso-map.esscene@@ -90,7 +90,6 @@},"tileset": 0,"tilesetColumns": 1,- "tilesetRows": 1,"renderLayer": 0,"tintColor": {"r": 1,diff --git a/examples/tilemap-demo/assets/scenes/staggered-map.esscene b/examples/tilemap-demo/assets/scenes/staggered-map.essceneindex 91c65a017..f275aaac5 100644--- a/examples/tilemap-demo/assets/scenes/staggered-map.esscene+++ b/examples/tilemap-demo/assets/scenes/staggered-map.esscene@@ -90,7 +90,6 @@},"tileset": 0,"tilesetColumns": 1,- "tilesetRows": 1,"renderLayer": 0,"tintColor": {"r": 1,diff --git a/examples/tilemap-demo/assets/scenes/wang-map.esscene b/examples/tilemap-demo/assets/scenes/wang-map.essceneindex 70b9b6140..ed860ca7f 100644--- a/examples/tilemap-demo/assets/scenes/wang-map.esscene+++ b/examples/tilemap-demo/assets/scenes/wang-map.esscene@@ -90,7 +90,6 @@},"tileset": 0,"tilesetColumns": 1,- "tilesetRows": 1,"renderLayer": 0,"tintColor": {"r": 1,diff --git a/sdk/etc/index.api.md b/sdk/etc/index.api.mdindex 34ed03679..a2ce7dd4d 100644--- a/sdk/etc/index.api.md+++ b/sdk/etc/index.api.md@@ -5,7 +5,7 @@ Symbols: 113 public · 58 beta · 1415 experimental · 3 deprecated## ABI_LAYOUT_HASH — const @experimental```-"bcac84b6e9bb2019"+"97f0a1d90b227b76"```## ANCHOR_AXES — const @experimental@@ -7671,7 +7671,6 @@ staggerAxis: numberstaggerIndex: numbertileset: numbertilesetColumns: number-tilesetRows: numbertintColor: Colorvisible: boolean```diff --git a/sdk/etc/index.native.api.md b/sdk/etc/index.native.api.mdindex c165df2aa..609a7959f 100644--- a/sdk/etc/index.native.api.md+++ b/sdk/etc/index.native.api.md@@ -5,7 +5,7 @@ Symbols: 113 public · 63 beta · 1434 experimental · 3 deprecated## ABI_LAYOUT_HASH — const @experimental```-"bcac84b6e9bb2019"+"97f0a1d90b227b76"```## ANCHOR_AXES — const @experimental@@ -7864,7 +7864,6 @@ staggerAxis: numberstaggerIndex: numbertileset: numbertilesetColumns: number-tilesetRows: numbertintColor: Colorvisible: boolean```diff --git a/sdk/etc/index.node.api.md b/sdk/etc/index.node.api.mdindex 173335564..1f26b2727 100644--- a/sdk/etc/index.node.api.md+++ b/sdk/etc/index.node.api.md@@ -7666,7 +7666,6 @@ staggerAxis: numberstaggerIndex: numbertileset: numbertilesetColumns: number-tilesetRows: numbertintColor: Colorvisible: boolean```diff --git a/sdk/etc/minigame.api.md b/sdk/etc/minigame.api.mdindex baa447b21..80865ce35 100644--- a/sdk/etc/minigame.api.md+++ b/sdk/etc/minigame.api.md@@ -7911,7 +7911,6 @@ staggerAxis: numberstaggerIndex: numbertileset: numbertilesetColumns: number-tilesetRows: numbertintColor: Colorvisible: boolean```diff --git a/sdk/etc/wechat.api.md b/sdk/etc/wechat.api.mdindex 31394790d..c79b9a6a2 100644--- a/sdk/etc/wechat.api.md+++ b/sdk/etc/wechat.api.md@@ -7673,7 +7673,6 @@ staggerAxis: numberstaggerIndex: numbertileset: numbertilesetColumns: number-tilesetRows: numbertintColor: Colorvisible: boolean```diff --git a/sdk/src/ecs/bridge/ptrAccessors.generated.ts b/sdk/src/ecs/bridge/ptrAccessors.generated.tsindex a614e94ea..6fb74ee49 100644--- a/sdk/src/ecs/bridge/ptrAccessors.generated.ts+++ b/sdk/src/ecs/bridge/ptrAccessors.generated.ts@@ -1238,7 +1238,6 @@ export interface TilemapLayerPtrData {originOffset: Vec2;tileset: number;tilesetColumns: number;- tilesetRows: number;renderLayer: number;tintColor: Color;opacity: number;@@ -1258,12 +1257,11 @@ export function fillTilemapLayer(const originOffset_ = out.originOffset; originOffset_.x = f32[(ptr + 20) >> 2]; originOffset_.y = f32[((ptr + 20) >> 2) + 1];out.tileset = u32[(ptr + 28) >> 2];out.tilesetColumns = u32[(ptr + 32) >> 2] | 0;- out.tilesetRows = u32[(ptr + 36) >> 2] | 0;- out.renderLayer = u32[(ptr + 40) >> 2] | 0;- const tintColor_ = out.tintColor; tintColor_.r = f32[(ptr + 44) >> 2]; tintColor_.g = f32[((ptr + 44) >> 2) + 1]; tintColor_.b = f32[((ptr + 44) >> 2) + 2]; tintColor_.a = f32[((ptr + 44) >> 2) + 3];- out.opacity = f32[(ptr + 60) >> 2];- const parallaxFactor_ = out.parallaxFactor; parallaxFactor_.x = f32[(ptr + 64) >> 2]; parallaxFactor_.y = f32[((ptr + 64) >> 2) + 1];- out.visible = u8[ptr + 72] !== 0;+ out.renderLayer = u32[(ptr + 36) >> 2] | 0;+ const tintColor_ = out.tintColor; tintColor_.r = f32[(ptr + 40) >> 2]; tintColor_.g = f32[((ptr + 40) >> 2) + 1]; tintColor_.b = f32[((ptr + 40) >> 2) + 2]; tintColor_.a = f32[((ptr + 40) >> 2) + 3];+ out.opacity = f32[(ptr + 56) >> 2];+ const parallaxFactor_ = out.parallaxFactor; parallaxFactor_.x = f32[(ptr + 60) >> 2]; parallaxFactor_.y = f32[((ptr + 60) >> 2) + 1];+ out.visible = u8[ptr + 68] !== 0;}export function writeTilemapLayer(@@ -1278,12 +1276,11 @@ export function writeTilemapLayer(f32[(ptr + 20) >> 2] = data.originOffset.x; f32[((ptr + 20) >> 2) + 1] = data.originOffset.y;u32[(ptr + 28) >> 2] = data.tileset;u32[(ptr + 32) >> 2] = data.tilesetColumns | 0;- u32[(ptr + 36) >> 2] = data.tilesetRows | 0;- u32[(ptr + 40) >> 2] = data.renderLayer | 0;- f32[(ptr + 44) >> 2] = data.tintColor.r; f32[((ptr + 44) >> 2) + 1] = data.tintColor.g; f32[((ptr + 44) >> 2) + 2] = data.tintColor.b; f32[((ptr + 44) >> 2) + 3] = data.tintColor.a;- f32[(ptr + 60) >> 2] = data.opacity;- f32[(ptr + 64) >> 2] = data.parallaxFactor.x; f32[((ptr + 64) >> 2) + 1] = data.parallaxFactor.y;- u8[ptr + 72] = data.visible ? 1 : 0;+ u32[(ptr + 36) >> 2] = data.renderLayer | 0;+ f32[(ptr + 40) >> 2] = data.tintColor.r; f32[((ptr + 40) >> 2) + 1] = data.tintColor.g; f32[((ptr + 40) >> 2) + 2] = data.tintColor.b; f32[((ptr + 40) >> 2) + 3] = data.tintColor.a;+ f32[(ptr + 56) >> 2] = data.opacity;+ f32[(ptr + 60) >> 2] = data.parallaxFactor.x; f32[((ptr + 60) >> 2) + 1] = data.parallaxFactor.y;+ u8[ptr + 68] = data.visible ? 1 : 0;}export function createTilemapLayerData(): TilemapLayerPtrData {@@ -1296,7 +1293,6 @@ export function createTilemapLayerData(): TilemapLayerPtrData {originOffset: { x: 0, y: 0 },tileset: 0,tilesetColumns: 0,- tilesetRows: 0,renderLayer: 0,tintColor: { r: 0, g: 0, b: 0, a: 0 },opacity: 0,diff --git a/sdk/src/ecs/component.generated.ts b/sdk/src/ecs/component.generated.tsindex bc4ac9c63..3e49dc75d 100644--- a/sdk/src/ecs/component.generated.ts+++ b/sdk/src/ecs/component.generated.ts@@ -15,7 +15,7 @@ import type { Dimension, Padding } from '../wasm/wasm.generated';* getAbiLayoutHash(); BuiltinBridge.connect() compares them and refuses to* run on mismatch, because mismatched offsets read the wrong heap bytes.*/-export const ABI_LAYOUT_HASH = 'bcac84b6e9bb2019';+export const ABI_LAYOUT_HASH = '97f0a1d90b227b76';/*** One asset-valued field of a component: which field, and what kind of@@ -663,7 +663,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {originOffset: { x: 0, y: 0 },tileset: 0,tilesetColumns: 1,- tilesetRows: 1,renderLayer: 0,tintColor: { r: 1, g: 1, b: 1, a: 1 },opacity: 1,@@ -681,7 +680,6 @@ export const COMPONENT_META: Record<string, ComponentMetaEntry> = {staggerAxis: { enum: [{ label: 'Y', value: 0 }, { label: 'X', value: 1 }], tooltip: "Stagger axis (staggered/hex): Y shifts rows, X shifts columns." },staggerIndex: { enum: [{ label: 'Odd', value: 0 }, { label: 'Even', value: 1 }], tooltip: "Which lines carry the half-cell shift (staggered/hex)." },tilesetColumns: { min: 1, step: 1 },- tilesetRows: { min: 1, step: 1 },renderLayer: { step: 1, enumSource: "sortingLayers" },opacity: { min: 0, max: 1, slider: true, tooltip: "Layer transparency (0 = invisible, 1 = opaque)." },},@@ -1184,7 +1182,6 @@ export interface TilemapLayerData {originOffset: Vec2;tileset: number;tilesetColumns: number;- tilesetRows: number;renderLayer: number;tintColor: Color;opacity: number;diff --git a/sdk/src/tilemap/tiledLoader.ts b/sdk/src/tilemap/tiledLoader.tsindex 06c6638ee..3068817db 100644--- a/sdk/src/tilemap/tiledLoader.ts+++ b/sdk/src/tilemap/tiledLoader.ts@@ -1221,9 +1221,6 @@ export function loadTiledMap(cellSize: { x: mapData.tileWidth, y: mapData.tileHeight },tileset: textureHandle,tilesetColumns: columns,- tilesetRows: firstTileset- ? Math.max(1, Math.ceil(firstTileset.tileCount / Math.max(1, columns)))- : 1,renderLayer: layerIndex,tintColor: { ...layer.tintColor },opacity: layer.opacity,diff --git a/sdk/src/wasm/ptrLayouts.generated.ts b/sdk/src/wasm/ptrLayouts.generated.tsindex 9bc4f4ad2..dcb46fa6b 100644--- a/sdk/src/wasm/ptrLayouts.generated.ts+++ b/sdk/src/wasm/ptrLayouts.generated.ts@@ -343,12 +343,11 @@ export const PTR_LAYOUTS: Record<string, PtrLayout> = {{ name: 'originOffset', type: 'vec2', offset: 20 },{ name: 'tileset', type: 'u32', offset: 28 },{ name: 'tilesetColumns', type: 'i32', offset: 32 },- { name: 'tilesetRows', type: 'i32', offset: 36 },- { name: 'renderLayer', type: 'i32', offset: 40 },- { name: 'tintColor', type: 'color', offset: 44 },- { name: 'opacity', type: 'f32', offset: 60 },- { name: 'parallaxFactor', type: 'vec2', offset: 64 },- { name: 'visible', type: 'bool', offset: 72 },+ { name: 'renderLayer', type: 'i32', offset: 36 },+ { name: 'tintColor', type: 'color', offset: 40 },+ { name: 'opacity', type: 'f32', offset: 56 },+ { name: 'parallaxFactor', type: 'vec2', offset: 60 },+ { name: 'visible', type: 'bool', offset: 68 },],},TrailRenderer: {diff --git a/sdk/src/wasm/wasm.generated.ts b/sdk/src/wasm/wasm.generated.tsindex 5526fc71c..a48700b3c 100644--- a/sdk/src/wasm/wasm.generated.ts+++ b/sdk/src/wasm/wasm.generated.ts@@ -511,7 +511,6 @@ export interface TilemapLayer {originOffset: Vec2;tileset: number;tilesetColumns: number;- tilesetRows: number;renderLayer: number;tintColor: Vec4;opacity: number;diff --git a/sdk/tests/__snapshots__/component-fieldmeta-golden.test.ts.snap b/sdk/tests/__snapshots__/component-fieldmeta-golden.test.ts.snapindex b9fb4a5eb..bdfe34a35 100644--- a/sdk/tests/__snapshots__/component-fieldmeta-golden.test.ts.snap+++ b/sdk/tests/__snapshots__/component-fieldmeta-golden.test.ts.snap@@ -781,10 +781,6 @@ exports[`builtin FieldMeta (RC9-1 equivalence gate) > matches the golden snapsho"min": 1,"step": 1,},- "tilesetRows": {- "min": 1,- "step": 1,- },},"TrailRenderer": {"blendMode": {diff --git a/sdk/tests/tilemap.test.ts b/sdk/tests/tilemap.test.tsindex ad4b3da52..c4ab12d75 100644--- a/sdk/tests/tilemap.test.ts+++ b/sdk/tests/tilemap.test.ts@@ -64,9 +64,8 @@ describe('Tilemap Components', () => {expect(TilemapLayer._default.tileset).toBe(0);});- it('should have tilesetColumns and tilesetRows defaults', () => {+ it('should have a tilesetColumns default', () => {expect(TilemapLayer._default.tilesetColumns).toBe(1);- expect(TilemapLayer._default.tilesetRows).toBe(1);});it('should have cellSize defaulting to 32x32', () => {@@ -83,7 +82,6 @@ describe('Tilemap Components', () => {originOffset: { x: 0, y: 0 },tileset: 0,tilesetColumns: 1,- tilesetRows: 1,renderLayer: 0,tintColor: { r: 1, g: 1, b: 1, a: 1 },opacity: 1,diff --git a/src/esengine/bindings/EditorAPI.generated.cpp b/src/esengine/bindings/EditorAPI.generated.cppindex 66274f507..8968e9836 100644--- a/src/esengine/bindings/EditorAPI.generated.cpp+++ b/src/esengine/bindings/EditorAPI.generated.cpp@@ -2,10 +2,10 @@* @file EditorAPI.generated.cpp* @brief Auto-generated editor API with string-dispatched component access* @details Generated by EHT - DO NOT EDIT- * @schema_hash faf3163ec9f73265+ * @schema_hash 09fe34b6f64d2a9f*/-#define ES_EDITOR_API_SCHEMA_HASH "faf3163ec9f73265"+#define ES_EDITOR_API_SCHEMA_HASH "09fe34b6f64d2a9f"#include <emscripten/bind.h>#include <string>@@ -449,7 +449,6 @@ std::string editor_getComponentSchema(const std::string& name) {{"key":"originOffset.y","type":"float","group":"TilemapLayer"},{"key":"tileset","type":"asset","group":"TilemapLayer"},{"key":"tilesetColumns","type":"int","group":"TilemapLayer"},- {"key":"tilesetRows","type":"int","group":"TilemapLayer"},{"key":"renderLayer","type":"int","group":"TilemapLayer"},{"key":"tintColor.r","type":"color","group":"TilemapLayer"},{"key":"tintColor.g","type":"color","group":"TilemapLayer"},@@ -1747,7 +1746,6 @@ bool editor_setInt(Registry& reg, u32 e, const std::string& comp, const std::strelse if (field == "staggerIndex") { c.staggerIndex = static_cast<u8>(value); }else if (field == "tileset") { c.tileset = resource::TextureHandle(static_cast<u32>(value)); }else if (field == "tilesetColumns") { c.tilesetColumns = static_cast<i32>(value); }- else if (field == "tilesetRows") { c.tilesetRows = static_cast<i32>(value); }else if (field == "renderLayer") { c.renderLayer = static_cast<i32>(value); }else { return false; }return true;@@ -1920,7 +1918,6 @@ i32 editor_getInt(Registry& reg, u32 e, const std::string& comp, const std::strielse if (field == "staggerIndex") { return static_cast<i32>(c.staggerIndex); }else if (field == "tileset") { return static_cast<i32>(c.tileset.id()); }else if (field == "tilesetColumns") { return static_cast<i32>(c.tilesetColumns); }- else if (field == "tilesetRows") { return static_cast<i32>(c.tilesetRows); }else if (field == "renderLayer") { return static_cast<i32>(c.renderLayer); }} else if (comp == "TrailRenderer") {if (!reg.has<esengine::ecs::TrailRenderer>(entity)) return 0;diff --git a/src/esengine/bindings/WebBindings.generated.cpp b/src/esengine/bindings/WebBindings.generated.cppindex ac1f78151..c5c312ab7 100644--- a/src/esengine/bindings/WebBindings.generated.cpp+++ b/src/esengine/bindings/WebBindings.generated.cpp@@ -798,7 +798,6 @@ struct TilemapLayerJS {glm::vec2 originOffset;u32 tileset;i32 tilesetColumns;- i32 tilesetRows;i32 renderLayer;glm::vec4 tintColor;f32 opacity;@@ -815,7 +814,6 @@ void tilemaplayerApplyJS(esengine::ecs::TilemapLayer& c, const TilemapLayerJS& jc.originOffset = js.originOffset;c.tileset = resource::TextureHandle(js.tileset);c.tilesetColumns = js.tilesetColumns;- c.tilesetRows = js.tilesetRows;c.renderLayer = js.renderLayer;c.tintColor = js.tintColor;c.opacity = js.opacity;@@ -839,7 +837,6 @@ TilemapLayerJS tilemaplayerToJS(const esengine::ecs::TilemapLayer& c) {js.originOffset = c.originOffset;js.tileset = c.tileset.id();js.tilesetColumns = c.tilesetColumns;- js.tilesetRows = c.tilesetRows;js.renderLayer = c.renderLayer;js.tintColor = c.tintColor;js.opacity = c.opacity;@@ -1382,7 +1379,6 @@ EMSCRIPTEN_BINDINGS(esengine_components) {.field("originOffset", &TilemapLayerJS::originOffset).field("tileset", &TilemapLayerJS::tileset).field("tilesetColumns", &TilemapLayerJS::tilesetColumns)- .field("tilesetRows", &TilemapLayerJS::tilesetRows).field("renderLayer", &TilemapLayerJS::renderLayer).field("tintColor", &TilemapLayerJS::tintColor).field("opacity", &TilemapLayerJS::opacity)@@ -2450,12 +2446,11 @@ static_assert(offsetof(esengine::ecs::TilemapLayer, staggerIndex) == 17, "ABI ofstatic_assert(offsetof(esengine::ecs::TilemapLayer, originOffset) == 20, "ABI offset drift: esengine::ecs::TilemapLayer.originOffset (EHT expected 20)");static_assert(offsetof(esengine::ecs::TilemapLayer, tileset) == 28, "ABI offset drift: esengine::ecs::TilemapLayer.tileset (EHT expected 28)");static_assert(offsetof(esengine::ecs::TilemapLayer, tilesetColumns) == 32, "ABI offset drift: esengine::ecs::TilemapLayer.tilesetColumns (EHT expected 32)");-static_assert(offsetof(esengine::ecs::TilemapLayer, tilesetRows) == 36, "ABI offset drift: esengine::ecs::TilemapLayer.tilesetRows (EHT expected 36)");-static_assert(offsetof(esengine::ecs::TilemapLayer, renderLayer) == 40, "ABI offset drift: esengine::ecs::TilemapLayer.renderLayer (EHT expected 40)");-static_assert(offsetof(esengine::ecs::TilemapLayer, tintColor) == 44, "ABI offset drift: esengine::ecs::TilemapLayer.tintColor (EHT expected 44)");-static_assert(offsetof(esengine::ecs::TilemapLayer, opacity) == 60, "ABI offset drift: esengine::ecs::TilemapLayer.opacity (EHT expected 60)");-static_assert(offsetof(esengine::ecs::TilemapLayer, parallaxFactor) == 64, "ABI offset drift: esengine::ecs::TilemapLayer.parallaxFactor (EHT expected 64)");-static_assert(offsetof(esengine::ecs::TilemapLayer, visible) == 72, "ABI offset drift: esengine::ecs::TilemapLayer.visible (EHT expected 72)");+static_assert(offsetof(esengine::ecs::TilemapLayer, renderLayer) == 36, "ABI offset drift: esengine::ecs::TilemapLayer.renderLayer (EHT expected 36)");+static_assert(offsetof(esengine::ecs::TilemapLayer, tintColor) == 40, "ABI offset drift: esengine::ecs::TilemapLayer.tintColor (EHT expected 40)");+static_assert(offsetof(esengine::ecs::TilemapLayer, opacity) == 56, "ABI offset drift: esengine::ecs::TilemapLayer.opacity (EHT expected 56)");+static_assert(offsetof(esengine::ecs::TilemapLayer, parallaxFactor) == 60, "ABI offset drift: esengine::ecs::TilemapLayer.parallaxFactor (EHT expected 60)");+static_assert(offsetof(esengine::ecs::TilemapLayer, visible) == 68, "ABI offset drift: esengine::ecs::TilemapLayer.visible (EHT expected 68)");static_assert(offsetof(esengine::ecs::TrailRenderer, time) == 0, "ABI offset drift: esengine::ecs::TrailRenderer.time (EHT expected 0)");static_assert(offsetof(esengine::ecs::TrailRenderer, minVertexDistance) == 4, "ABI offset drift: esengine::ecs::TrailRenderer.minVertexDistance (EHT expected 4)");static_assert(offsetof(esengine::ecs::TrailRenderer, emitting) == 8, "ABI offset drift: esengine::ecs::TrailRenderer.emitting (EHT expected 8)");@@ -2532,7 +2527,7 @@ static_assert(offsetof(esengine::ecs::Velocity, angular) == 12, "ABI offset drif// ABI Hash -- runtime handshake against the SDK bundle// =============================================================================-static const char* kEsAbiLayoutHash = "bcac84b6e9bb2019";+static const char* kEsAbiLayoutHash = "97f0a1d90b227b76";std::string esengineGetAbiLayoutHash() {return std::string(kEsAbiLayoutHash);diff --git a/src/esengine/ecs/components/TilemapLayer.hpp b/src/esengine/ecs/components/TilemapLayer.hppindex 5421b82c4..4f5f7207c 100644--- a/src/esengine/ecs/components/TilemapLayer.hpp+++ b/src/esengine/ecs/components/TilemapLayer.hpp@@ -71,9 +71,6 @@ struct TilemapLayer {ES_PROPERTY(min=1, step=1)i32 tilesetColumns{1};- ES_PROPERTY(min=1, step=1)- i32 tilesetRows{1};-ES_PROPERTY(step=1, enum_source=sortingLayers)i32 renderLayer{0};diff --git a/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp b/src/esengine/renderer/plugins/TilemapRenderPlugin.cppindex ec9f31b37..34fe85c8b 100644--- a/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp+++ b/src/esengine/renderer/plugins/TilemapRenderPlugin.cpp@@ -58,10 +58,11 @@ void TilemapRenderPlugin::rebuildChunk(// is skipped.int slotIndex = tilemap::resolveTilesetSlot(slots, tileId);if (slotIndex < 0 || !resolved[slotIndex].valid) continue;+ const ResolvedSlot& rs = resolved[slotIndex];u32 tilesetColumns = slots[slotIndex].columns;if (tilesetColumns == 0) continue;- f32 uvTileW = resolved[slotIndex].uvW;- f32 uvTileH = resolved[slotIndex].uvH;+ f32 uvTileW = rs.uvW;+ f32 uvTileH = rs.uvH;bool flipH = (rawTile & tilemap::TILE_FLIP_H) != 0;bool flipV = (rawTile & tilemap::TILE_FLIP_V) != 0;@@ -70,6 +71,10 @@ void TilemapRenderPlugin::rebuildChunk(u32 tileIndex = tileId - slots[slotIndex].first_id;u32 tileCol = tileIndex % tilesetColumns;u32 tileRow = tileIndex / tilesetColumns;+ // A cell the atlas does not hold — an id past the tileset, or a+ // column count wider than the texture. Its UV rect falls outside,+ // where the sampler hands back a tile that does exist.+ if (tileCol >= rs.atlasCols || tileRow >= rs.atlasRows) continue;f32 worldX, worldY;if (layer.grid_type == tilemap::GridType::Isometric) {@@ -108,7 +113,6 @@ void TilemapRenderPlugin::rebuildChunk(// the atlas margin + spacing folded into offset/step so a Tiled tileset// with gaps samples the right cell; inset half a texel per edge so// samples stay inside this tile.- const ResolvedSlot& rs = resolved[slotIndex];f32 uMin = rs.uvOffsetX + static_cast<f32>(tileCol) * rs.uvStepX + rs.insetU;f32 uMax = uMin + uvTileW - 2.0f * rs.insetU;f32 vBottom = 1.0f - rs.uvOffsetY - static_cast<f32>(tileRow) * rs.uvStepY - uvTileH + rs.insetV;@@ -233,6 +237,12 @@ void TilemapRenderPlugin::collect(RenderCollectContext& collect_ctx) {resolved[i].uvStepY = (layer.tile_height + spacing) / th;resolved[i].insetU = 0.5f / tw;resolved[i].insetV = 0.5f / th;+ // n cells span margin + n*tileSize + (n-1)*spacing, so the last one+ // that fits is floor((size - margin + spacing) / step).+ resolved[i].atlasCols = resolved[i].uvStepX > 0.0f+ ? static_cast<u32>((tw - margin + spacing) / (layer.tile_width + spacing)) : 0;+ resolved[i].atlasRows = resolved[i].uvStepY > 0.0f+ ? static_cast<u32>((th - margin + spacing) / (layer.tile_height + spacing)) : 0;anySlotValid = true;}if (!anySlotValid) continue;diff --git a/src/esengine/renderer/plugins/TilemapRenderPlugin.hpp b/src/esengine/renderer/plugins/TilemapRenderPlugin.hppindex 6668330ab..1281b76c4 100644--- a/src/esengine/renderer/plugins/TilemapRenderPlugin.hpp+++ b/src/esengine/renderer/plugins/TilemapRenderPlugin.hpp@@ -67,6 +67,11 @@ private:// (which otherwise rounds across the boundary at fractional zoom).f32 insetU = 0.0f;f32 insetV = 0.0f;+ // How many tiles the texture actually holds, at this layer's cell size.+ // A tile id past them has no texels of its own, and sampling outside the+ // atlas returns some other tile — so it is skipped instead.+ u32 atlasCols = 0;+ u32 atlasRows = 0;bool valid = false;};diff --git a/tools/check-component-fields.mjs b/tools/check-component-fields.mjsindex d4bf73c4e..5e4b3a21f 100644--- a/tools/check-component-fields.mjs+++ b/tools/check-component-fields.mjs@@ -24,12 +24,10 @@ const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');/*** Fields with no reader because the feature behind them is not built. Each one is* a promise the inspector currently makes and the engine does not keep; the entry- * says which, so the list reads as work rather than as permission.+ * says which, so the list reads as work rather than as permission. Empty is the+ * intended state: a field that earns an entry here is work, not permission.*/-const DECLARED_GAPS = {- 'TilemapLayer.tilesetRows': 'written by the Tiled loader; a bounds check against it would read'- + ' its default of 1 as a one-row tileset and cut every layer that never set it',-};+const DECLARED_GAPS = {};const components = JSON.parse(readFileSync(path.join(ROOT, 'docs', 'astro', 'src', 'data', 'components.generated.json'), 'utf8'),diff --git a/tools/renderScenes.mjs b/tools/renderScenes.mjsindex 4dbeb0d7b..51ffe1d17 100644--- a/tools/renderScenes.mjs+++ b/tools/renderScenes.mjs@@ -44,6 +44,10 @@ export const SCENES = [// cell here, so the whole grid steps right by one and the left column empties.// It rides the per-frame origin, not the cached chunk vertices.{ id: "tilemap-origin", tier: "pr", webgpu: true, env: { ESTELLA_VERIFY_SET_FIELD: "{\"entity\":1,\"component\":\"TilemapLayer\",\"key\":\"originOffset\",\"value\":[16,0]}", ESTELLA_VERIFY_SCENE: "/scenes/tilemap-flip.esscene", ESTELLA_VERIFY_MANIFEST: "/scenes/tilemap-flip.textures.json", ESTELLA_VERIFY_W: "256", ESTELLA_VERIFY_H: "256", ESTELLA_VERIFY_STEPS: "2", ESTELLA_VERIFY_EXPECT: "[{\"x\":0.60,\"y\":0.36,\"rgb\":[255,0,0]},{\"x\":0.80,\"y\":0.36,\"rgb\":[0,255,0]},{\"x\":0.60,\"y\":0.58,\"rgb\":[0,0,255]},{\"x\":0.40,\"y\":0.36,\"rgb\":[0,0,0],\"tol\":20}]" } },+ // Cells the atlas does not hold, both ways one can be asked for: an id past a+ // 2x2 tileset, and four declared columns over a two-column atlas. The in-range+ // cells still draw — a layer that stopped drawing satisfies empty probes alone.+ { id: "tilemap-oob", tier: "pr", webgpu: true, env: { ESTELLA_VERIFY_SCENE: "/scenes/tilemap-oob.esscene", ESTELLA_VERIFY_MANIFEST: "/scenes/tilemap-flip.textures.json", ESTELLA_VERIFY_W: "256", ESTELLA_VERIFY_H: "256", ESTELLA_VERIFY_STEPS: "2", ESTELLA_VERIFY_EXPECT: "[{\"x\":0.60,\"y\":0.36,\"rgb\":[0,0,0],\"tol\":20},{\"x\":0.40,\"y\":0.80,\"rgb\":[0,0,0],\"tol\":20},{\"x\":0.40,\"y\":0.36,\"rgb\":[255,0,0]},{\"x\":0.40,\"y\":0.58,\"rgb\":[0,0,255]},{\"x\":0.60,\"y\":0.58,\"rgb\":[255,255,0]}]" } },// Parallax on a cached-chunk tilemap: the camera moves while the layer model is untouched, so only the per-frame origin/parallax merge (not a revision-bump rebuild) can place the tiles — guards against baking camera-dependent offsets into the chunk cache.{ id: "tilemap-parallax", tier: "pr", webgpu: true, env: { ESTELLA_VERIFY_SCENE: "/scenes/tilemap-parallax.esscene", ESTELLA_VERIFY_MANIFEST: "/scenes/tilemap-flip.textures.json", ESTELLA_VERIFY_W: "256", ESTELLA_VERIFY_H: "256", ESTELLA_VERIFY_STEPS: "2", ESTELLA_VERIFY_MOVE: "{\"component\":\"Camera\",\"to\":[48,-16],\"steps\":3}", ESTELLA_VERIFY_EXPECT: "[{\"x\":0.30,\"y\":0.40,\"rgb\":[255,0,0]},{\"x\":0.10,\"y\":0.40,\"rgb\":[0,0,0],\"tol\":20},{\"x\":0.50,\"y\":0.40,\"rgb\":[0,255,0]}]" } },// BitmapText's first pixel coverage: a 2-glyph synthetic .fnt atlas (red A, green B) pins glyph layout, atlas UV orientation and the one-DrawCommand-per-text path.