Skip to content

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.

feat(editor): first-class New Tilemap command + tileset chooser

yhh0dad89a7c0f1
diff --git a/desktop/src/App.tsx b/desktop/src/App.tsx
index 6ef736c50..df8957782 100644
--- a/desktop/src/App.tsx
+++ b/desktop/src/App.tsx
@@ -14,6 +14,7 @@ import { Perf } from '@/components/Perf';
import { PerfRealmBridge } from '@/components/PerfRealmBridge';
import { BuildDialog } from '@/components/BuildDialog';
import { SettingsDialog } from '@/components/SettingsDialog';
+import { TilemapPickerDialog } from '@/components/TilemapPickerDialog';
import { useEditorStore } from '@/store/editorStore';
import { commands } from '@/commands';
import { PlayRealms } from '@/engine/PlayRealm';
@@ -140,6 +141,7 @@ export function App() {
}, [showLauncher]);
const buildOpen = useEditorStore((s) => s.buildOpen);
const settingsOpen = useEditorStore((s) => s.settingsOpen);
+ const tilemapPickerOpen = useEditorStore((s) => s.tilemapPickerOpen);
if (showLauncher) return <Launcher />;
return (
@@ -155,6 +157,7 @@ export function App() {
<PerfRealmBridge />
{buildOpen && <BuildDialog />}
{settingsOpen && <SettingsDialog />}
+ {tilemapPickerOpen && <TilemapPickerDialog />}
<Toaster />
</div>
);
diff --git a/desktop/src/commands/editorCommands.ts b/desktop/src/commands/editorCommands.ts
index 7b9207e00..e8b7accaf 100644
--- a/desktop/src/commands/editorCommands.ts
+++ b/desktop/src/commands/editorCommands.ts
@@ -16,6 +16,7 @@ import { SceneCommands } from '@/engine/SceneCommands';
import { SceneModel } from '@/engine/SceneModel';
import { hasEntityClipboard } from '@/engine/entityClipboard';
import { ViewportController } from '@/engine/ViewportController';
+import { createTilemapFromTileset } from '@/tilemap/createTilemap';
import { useEditorStore } from '@/store/editorStore';
import { useSelection } from '@/store/selectionStore';
import { Toasts } from '@/store/Toasts';
@@ -111,6 +112,28 @@ commands.register({
if (e != null) sel().select(e);
},
});
+commands.register({
+ id: 'tilemap.new',
+ label: 'New Tilemap',
+ category: 'Entity',
+ isEnabled: () => !!ProjectStore.getSnapshot(),
+ // A tilemap needs a tileset palette. Zero → guide the user to make one; exactly
+ // one → create straight away; many → let them pick (TilemapPickerDialog). The
+ // downstream createTilemapFromTileset does all the entity wiring either way.
+ run: () => {
+ const list = ProjectStore.listAssets('tileset');
+ if (list.length === 0) {
+ Toasts.push('项目里还没有瓦片集 — 在内容浏览器右键一张贴图 → Create Tileset', 'warn');
+ return;
+ }
+ if (list.length === 1) {
+ const path = ProjectStore.assetInfo(list[0].ref)?.path;
+ if (path) void createTilemapFromTileset(path);
+ return;
+ }
+ editor().setTilemapPickerOpen(true);
+ },
+});
commands.register({
id: 'entity.duplicate',
label: 'Duplicate',
diff --git a/desktop/src/components/TilemapPickerDialog.tsx b/desktop/src/components/TilemapPickerDialog.tsx
new file mode 100644
index 000000000..3d2f99d63
--- /dev/null
+++ b/desktop/src/components/TilemapPickerDialog.tsx
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright (c) 2024-present ESEngine Team
+/**
+ * @file TilemapPickerDialog.tsx — the "New Tilemap" tileset chooser.
+ * Opened by the `tilemap.new` command when the project has more than one
+ * `.estileset` (one → created directly, none → guided by a toast). Pick a
+ * tileset and `createTilemapFromTileset` does the full wiring (spawn the
+ * TilemapLayer entity, seed cellSize, live-sync the tileset, open the
+ * painter). A store-flag dialog like BuildDialog / SettingsDialog.
+ */
+import { useState } from 'react';
+import { LayoutGrid } from 'lucide-react';
+import { Modal } from '@/components/Modal';
+import { ProjectStore } from '@/project/ProjectStore';
+import { useEditorStore } from '@/store/editorStore';
+import { createTilemapFromTileset } from '@/tilemap/createTilemap';
+
+export function TilemapPickerDialog() {
+ const close = () => useEditorStore.getState().setTilemapPickerOpen(false);
+ const [q, setQ] = useState('');
+ const tilesets = ProjectStore.listAssets('tileset');
+ const needle = q.trim().toLowerCase();
+ const shown = needle ? tilesets.filter((t) => t.name.toLowerCase().includes(needle)) : tilesets;
+
+ const choose = (ref: string) => {
+ const path = ProjectStore.assetInfo(ref)?.path;
+ close();
+ if (path) void createTilemapFromTileset(path);
+ };
+
+ return (
+ <Modal title="新建瓦片地图" onClose={close} width={440}>
+ <div className="tmpick">
+ <p className="tmpick__hint">选择一个瓦片集作为地图的调色板</p>
+ <input
+ className="tmpick__search"
+ placeholder="搜索瓦片集…"
+ value={q}
+ autoFocus
+ spellCheck={false}
+ onChange={(e) => setQ(e.target.value)}
+ />
+ {shown.length === 0 ? (
+ <div className="tmpick__empty">没有匹配的瓦片集</div>
+ ) : (
+ <div className="tmpick__list">
+ {shown.map((t) => (
+ <button key={t.ref} type="button" className="tmpick__item" onClick={() => choose(t.ref)}>
+ <LayoutGrid size={15} className="tmpick__icon" />
+ <span className="tmpick__name">{t.name.replace(/\.estileset$/, '')}</span>
+ <span className="tmpick__path">{t.path}</span>
+ </button>
+ ))}
+ </div>
+ )}
+ </div>
+ </Modal>
+ );
+}
diff --git a/desktop/src/layout/MenuBar.tsx b/desktop/src/layout/MenuBar.tsx
index 760833c07..9b21d467f 100644
--- a/desktop/src/layout/MenuBar.tsx
+++ b/desktop/src/layout/MenuBar.tsx
@@ -110,6 +110,7 @@ export function MenuBar() {
title: 'Entity',
items: [
cmdItem('entity.add'),
+ cmdItem('tilemap.new'),
{ sep: true },
cmdItem('entity.duplicate'),
cmdItem('entity.delete'),
diff --git a/desktop/src/store/editorStore.ts b/desktop/src/store/editorStore.ts
index ffd545845..2bfafcd14 100644
--- a/desktop/src/store/editorStore.ts
+++ b/desktop/src/store/editorStore.ts
@@ -83,6 +83,11 @@ interface EditorState {
// Settings window (the registry-driven preferences dialog).
settingsOpen: boolean;
setSettingsOpen: (open: boolean) => void;
+
+ // "New Tilemap" tileset chooser (Entity → New Tilemap): picks the .estileset
+ // palette for a fresh map, then createTilemapFromTileset does the rest.
+ tilemapPickerOpen: boolean;
+ setTilemapPickerOpen: (open: boolean) => void;
}
export const useEditorStore = create<EditorState>((set) => ({
@@ -147,4 +152,7 @@ export const useEditorStore = create<EditorState>((set) => ({
settingsOpen: false,
setSettingsOpen: (settingsOpen) => set({ settingsOpen }),
+
+ tilemapPickerOpen: false,
+ setTilemapPickerOpen: (tilemapPickerOpen) => set({ tilemapPickerOpen }),
}));
diff --git a/desktop/src/theme/menus.css b/desktop/src/theme/menus.css
index d70b9d827..40201f11b 100644
--- a/desktop/src/theme/menus.css
+++ b/desktop/src/theme/menus.css
@@ -132,6 +132,19 @@
.modal__body { padding: 14px; overflow-y: auto; }
.modal__foot { display: flex; justify-content: flex-end; gap: 8px; padding: 10px 14px; border-top: 1px solid var(--border); background: var(--srf-2); flex-shrink: 0; }
+/* ── New Tilemap tileset chooser ── */
+.tmpick { display: flex; flex-direction: column; gap: 10px; }
+.tmpick__hint { font-size: var(--fs-sm); color: var(--text-mute); }
+.tmpick__search { width: 100%; padding: 7px 10px; background: var(--srf-3); border: 1px solid var(--border-line); border-radius: var(--r-md); color: var(--text); font: inherit; }
+.tmpick__search:focus { outline: none; border-color: var(--acc); }
+.tmpick__list { display: flex; flex-direction: column; gap: 3px; max-height: 320px; overflow-y: auto; }
+.tmpick__item { display: flex; align-items: center; gap: 9px; padding: 8px 10px; background: var(--srf-3); border: 1px solid transparent; border-radius: var(--r-md); color: var(--text-dim); cursor: pointer; text-align: left; font: inherit; }
+.tmpick__item:hover { color: var(--text); border-color: var(--acc); background: var(--srf-2); }
+.tmpick__icon { flex: 0 0 auto; color: var(--text-mute); }
+.tmpick__name { flex: 0 0 auto; font-weight: 600; }
+.tmpick__path { flex: 1 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: var(--fs-2xs); color: var(--text-mute); text-align: right; }
+.tmpick__empty { padding: 18px; text-align: center; color: var(--text-mute); font-size: var(--fs-sm); }
+
/* ── Package / Build dialog ── */
.build { display: flex; flex-direction: column; gap: 12px; }
.build__label { font-size: var(--fs-2xs); font-weight: 700; letter-spacing: 0.4px; text-transform: uppercase; color: var(--text-mute); }
diff --git a/desktop/tests/commands.test.ts b/desktop/tests/commands.test.ts
index d4e269cc7..86af2d035 100644
--- a/desktop/tests/commands.test.ts
+++ b/desktop/tests/commands.test.ts
@@ -76,4 +76,10 @@ describe('command registry', () => {
expect(cmd?.label).toBe('New Scene');
expect(cmd?.keybinding).toBe('mod+n');
});
+
+ it('registers New Tilemap under the Entity category (the menu-bar item resolves)', () => {
+ const cmd = commands.get('tilemap.new');
+ expect(cmd?.label).toBe('New Tilemap');
+ expect(cmd?.category).toBe('Entity');
+ });
});