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
feat: unify prefab files to store UUIDs on disk
esengine39702a30b69c
diff --git a/desktop/src-tauri/src/preview_server.rs b/desktop/src-tauri/src/preview_server.rsindex 17003e6db..c1be292a8 100644--- a/desktop/src-tauri/src/preview_server.rs+++ b/desktop/src-tauri/src/preview_server.rs@@ -241,6 +241,17 @@ fn serve_embedded(data: &[u8], content_type_str: &str) -> Response<std::io::Cursfn serve_project_file(project_dir: &PathBuf, path: &str) -> Response<std::io::Cursor<Vec<u8>>> {let decoded_path = urlencoding::decode(path).unwrap_or_else(|_| path.into());++ let preview_path = project_dir.join(".esengine/preview").join(decoded_path.as_ref());+ if preview_path.starts_with(project_dir) {+ if let Ok(data) = std::fs::read(&preview_path) {+ return Response::from_data(data)+ .with_header(content_type(get_mime_type(path)))+ .with_header(no_cache())+ .with_header(cors());+ }+ }+let file_path = project_dir.join(decoded_path.as_ref());if !file_path.starts_with(project_dir) {diff --git a/editor/src/prefab/PrefabSerializer.ts b/editor/src/prefab/PrefabSerializer.tsindex 238929e53..4bf9f117b 100644--- a/editor/src/prefab/PrefabSerializer.ts+++ b/editor/src/prefab/PrefabSerializer.ts@@ -241,14 +241,7 @@ export async function savePrefabToPath(prefab: PrefabData, filePath: string): Prconst resolved = resolvePathOrUuid(filePath);const absolutePath = getGlobalPathResolver().toAbsolutePath(resolved);- const db = getAssetDatabase();- const converted = convertPrefabAssetRefs(prefab, (value) => {- if (isUUID(value)) {- return db.getPath(value) ?? value;- }- return value;- });- const json = serializePrefab(converted);+ const json = serializePrefab(prefab);return fs.writeFile(absolutePath, json);}@@ -263,15 +256,42 @@ export async function loadPrefabFromPath(filePath: string): Promise<PrefabData |const content = await fs.readFile(absolutePath);if (!content) return null;const prefab = deserializePrefab(content);- const db = getAssetDatabase();- return convertPrefabAssetRefs(prefab, (value) => {- if (!isUUID(value)) {- return db.getUuid(value) ?? value;- }- return value;- });+ const migrated = await migratePrefab(prefab);+ if (migrated) {+ const json = serializePrefab(prefab);+ await fs.writeFile(absolutePath, json);+ }+ return prefab;} catch (err) {console.error('Failed to load prefab:', absolutePath, err);return null;}}++async function migratePrefab(prefab: PrefabData): Promise<boolean> {+ const db = getAssetDatabase();+ let changed = false;++ for (const entity of prefab.entities) {+ for (const comp of entity.components) {+ const fields = getComponentRefFields(comp.type);+ if (!fields || !comp.data) continue;+ for (const field of fields) {+ const value = comp.data[field];+ if (typeof value === 'string' && value && !isUUID(value)) {+ const uuid = db.getUuid(value) ?? await db.ensureMeta(value);+ comp.data[field] = uuid;+ changed = true;+ }+ }+ }+ if (entity.nestedPrefab?.prefabPath && !isUUID(entity.nestedPrefab.prefabPath)) {+ const uuid = db.getUuid(entity.nestedPrefab.prefabPath)+ ?? await db.ensureMeta(entity.nestedPrefab.prefabPath);+ entity.nestedPrefab.prefabPath = uuid;+ changed = true;+ }+ }++ return changed;+}diff --git a/editor/src/preview/PreviewService.ts b/editor/src/preview/PreviewService.tsindex ed98e36db..f8a0cb492 100644--- a/editor/src/preview/PreviewService.ts+++ b/editor/src/preview/PreviewService.ts@@ -11,6 +11,8 @@ import { getComponentAssetFields } from 'esengine';import { getEditorContext } from '../context/EditorContext';import { getAssetLibrary } from '../asset/AssetLibrary';import { getProjectDir } from '../utils/path';+import { deserializePrefab, convertPrefabAssetRefs } from '../prefab/PrefabSerializer';+import { isUUID, getComponentRefFields } from '../asset';// =============================================================================// Types@@ -151,6 +153,8 @@ export class PreviewService {const scriptPath = `${this.previewDir_}/user-scripts.js`;await fs.writeFile(scriptPath, compiledScript ?? '');++ await this.resolvePrefabsForPreview(fs, resolvedScene);}private async collectTextureMetadata(@@ -190,6 +194,57 @@ export class PreviewService {return result;}+ private async resolvePrefabsForPreview(fs: NativeFS, scene: SceneData): Promise<void> {+ const db = getAssetLibrary();+ const visited = new Set<string>();++ const collectPrefabPaths = (entities: SceneData['entities']): string[] => {+ const paths: string[] = [];+ for (const entity of entities) {+ if (entity.prefab?.prefabPath) {+ paths.push(entity.prefab.prefabPath);+ }+ }+ return paths;+ };++ const resolvePrefabFile = async (relativePath: string): Promise<void> => {+ if (visited.has(relativePath)) return;+ visited.add(relativePath);++ const fullPath = `${this.projectDir_}/${relativePath}`;+ const content = await fs.readFile(fullPath);+ if (!content) return;++ try {+ const prefab = deserializePrefab(content);+ const resolved = convertPrefabAssetRefs(prefab, (value) => {+ if (isUUID(value)) {+ return db.getPath(value) ?? value;+ }+ return value;+ });++ for (const entity of resolved.entities) {+ if (entity.nestedPrefab?.prefabPath) {+ await resolvePrefabFile(entity.nestedPrefab.prefabPath);+ }+ }++ const outPath = `${this.previewDir_}/${relativePath}`;+ const outDir = outPath.substring(0, outPath.lastIndexOf('/'));+ await this.ensureDirectory(fs, outDir);+ await fs.writeFile(outPath, JSON.stringify(resolved));+ } catch {+ // Skip invalid prefab files+ }+ };++ for (const path of collectPrefabPaths(scene.entities)) {+ await resolvePrefabFile(path);+ }+ }+private async ensureDirectory(fs: NativeFS, path: string): Promise<void> {if (!(await fs.exists(path))) {await fs.createDirectory(path);diff --git a/examples/space-shooter/assets/prefabs/EnemyA.esprefab b/examples/space-shooter/assets/prefabs/EnemyA.esprefabnew file mode 100644index 000000000..95afb51a9--- /dev/null+++ b/examples/space-shooter/assets/prefabs/EnemyA.esprefab@@ -0,0 +1,35 @@+{+ "version": "1.0",+ "name": "EnemyA",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "EnemyA",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {}+ },+ {+ "type": "Sprite",+ "data": {+ "texture": "25e60610-c126-48bf-9b14-85c4699dc912",+ "size": { "x": 48, "y": 48 }+ }+ },+ {+ "type": "Enemy",+ "data": {+ "speed": 150,+ "type": "A",+ "shootTimer": 2+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/examples/space-shooter/assets/prefabs/EnemyB.esprefab b/examples/space-shooter/assets/prefabs/EnemyB.esprefabnew file mode 100644index 000000000..47f02be6a--- /dev/null+++ b/examples/space-shooter/assets/prefabs/EnemyB.esprefab@@ -0,0 +1,35 @@+{+ "version": "1.0",+ "name": "EnemyB",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "EnemyB",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {}+ },+ {+ "type": "Sprite",+ "data": {+ "texture": "d429cf7d-d52c-42eb-823e-9b775b6249b6",+ "size": { "x": 56, "y": 56 }+ }+ },+ {+ "type": "Enemy",+ "data": {+ "speed": 120,+ "type": "B",+ "shootTimer": 3+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/examples/space-shooter/assets/prefabs/EnemyBullet.esprefab b/examples/space-shooter/assets/prefabs/EnemyBullet.esprefabnew file mode 100644index 000000000..d7b49bea8--- /dev/null+++ b/examples/space-shooter/assets/prefabs/EnemyBullet.esprefab@@ -0,0 +1,34 @@+{+ "version": "1.0",+ "name": "EnemyBullet",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "EnemyBullet",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {}+ },+ {+ "type": "Sprite",+ "data": {+ "texture": "97a221a6-85bd-49e7-9af5-2880960fecda",+ "size": { "x": 8, "y": 20 }+ }+ },+ {+ "type": "Bullet",+ "data": {+ "speed": 400,+ "fromPlayer": false+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/examples/space-shooter/assets/prefabs/Explosion.esprefab b/examples/space-shooter/assets/prefabs/Explosion.esprefabnew file mode 100644index 000000000..ee858a279--- /dev/null+++ b/examples/space-shooter/assets/prefabs/Explosion.esprefab@@ -0,0 +1,33 @@+{+ "version": "1.0",+ "name": "Explosion",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "Explosion",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {}+ },+ {+ "type": "Sprite",+ "data": {+ "texture": "4e16b7e8-3ba1-455b-ab3c-1cfbf5a97e0c",+ "size": { "x": 64, "y": 64 }+ }+ },+ {+ "type": "Explosion",+ "data": {+ "timer": 0.3+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/examples/space-shooter/assets/prefabs/PlayerBullet.esprefab b/examples/space-shooter/assets/prefabs/PlayerBullet.esprefabnew file mode 100644index 000000000..b818c2921--- /dev/null+++ b/examples/space-shooter/assets/prefabs/PlayerBullet.esprefab@@ -0,0 +1,34 @@+{+ "version": "1.0",+ "name": "PlayerBullet",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "PlayerBullet",+ "parent": null,+ "children": [],+ "components": [+ {+ "type": "Transform",+ "data": {}+ },+ {+ "type": "Sprite",+ "data": {+ "texture": "c643c566-1859-460a-8029-4568951787f8",+ "size": { "x": 8, "y": 24 }+ }+ },+ {+ "type": "Bullet",+ "data": {+ "speed": 600,+ "fromPlayer": true+ }+ }+ ],+ "visible": true+ }+ ]+}diff --git a/examples/space-shooter/assets/prefabs/Star.esprefab b/examples/space-shooter/assets/prefabs/Star.esprefabnew file mode 100644index 000000000..01ab6cf46--- /dev/null+++ b/examples/space-shooter/assets/prefabs/Star.esprefab@@ -0,0 +1,19 @@+{+ "version": "1.0",+ "name": "Star",+ "rootEntityId": 0,+ "entities": [+ {+ "prefabEntityId": 0,+ "name": "Star",+ "parent": null,+ "children": [],+ "components": [+ { "type": "Transform", "data": { "position": { "x": 0, "y": 0, "z": -0.5 } } },+ { "type": "Sprite", "data": { "texture": "8f56c884-0439-47f1-86d9-05839abfa6e0", "size": { "x": 4, "y": 4 }, "color": { "r": 1, "g": 1, "b": 1, "a": 0.5 }, "layer": -1 } },+ { "type": "Star", "data": { "speed": 30, "layer": 0 } }+ ],+ "visible": true+ }+ ]+}