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(sdk): resolve spawned entities before tracking scene ownership
yhhbb136f8e8850
diff --git a/sdk/src/render/material.ts b/sdk/src/render/material.tsindex e30502be6..c03104c6b 100644--- a/sdk/src/render/material.ts+++ b/sdk/src/render/material.ts@@ -646,7 +646,8 @@ export const Material = {* readback fails.*/async renderPreview(material: MaterialHandle, w: number, h: number): Promise<ImageData | null> {- const m = previewCore(module);+ const connected = module;+ const m = previewCore(connected);const data = materials.get(material);if (!m || !data) return null;const held: TextureLease[] = [];@@ -654,7 +655,7 @@ export const Material = {return await drawPreview(m, () => {// IDs can be reused after reconnect. Check both identities at// submission time, once the shared readback queue reaches us.- if (module !== m || materials.get(material) !== data) return false;+ if (module !== connected || materials.get(material) !== data) return false;const seen = new Set<number>(); let handle: number | undefined = material;while (handle !== undefined && !seen.has(handle)) {seen.add(handle);diff --git a/sdk/src/scene/scene.ts b/sdk/src/scene/scene.tsindex d952ae1ff..7cc288e15 100644--- a/sdk/src/scene/scene.ts+++ b/sdk/src/scene/scene.ts@@ -659,7 +659,7 @@ async function loadSceneAssetsAndSpawn(}}}- const entities = timed('spawn', () => spawnAndLoadEntities(world, data, options?.externalEntities, options?.onPhase));+ const entities = await timed('spawn', () => spawnAndLoadEntities(world, data, options?.externalEntities, options?.onPhase));options?.assets?.trackSceneAssetReferences(data, entities);return entities;}diff --git a/sdk/tests/scene.test.ts b/sdk/tests/scene.test.tsindex 34373c790..9422fb87c 100644--- a/sdk/tests/scene.test.ts+++ b/sdk/tests/scene.test.ts@@ -8,6 +8,7 @@ import { INVALID_ENTITY } from '../src/types';import {loadSceneData,loadSceneWithAssets,+ loadOwnedSceneWithAssets,resetWorldTo,loadComponent,remapEntityFields,@@ -61,6 +62,19 @@ describe('Scene', () => {initResourceManager(module.getResourceManager());});+ it.each([loadSceneWithAssets, loadOwnedSceneWithAssets])('registers resolved entity ownership through %s', async (load) => {+ const track = vi.fn((_scene, entities: ReadonlyMap<number, Entity>) => {+ expect(entities).toBeInstanceOf(Map);+ expect(world.valid(entities.get(7)!)).toBe(true);+ });+ const assets = { preloadSceneAssets: vi.fn(async () => ({missing: [], textureHandles: new Map()})),+ resolveSceneAssetPaths: vi.fn(), trackSceneAssetReferences: track };+ const data = {version:4,name:'Tracked',entities:[{id:7,name:'Owner',parent:null,children:[],visible:true,components:[]}]};+ const entities = await load(world, data as SceneData, {assets: assets as never});+ expect(track).toHaveBeenCalledTimes(1);+ expect(track.mock.calls[0][1]).toBe(entities);+ });+describe('serialize detaches from live storage', () => {it('clones script-component data so the snapshot does not alias the world', () => {const Stats = defineComponent('SerStats', { hp: 10, tags: [] as string[] });diff --git a/tools/releaseNotes.mjs b/tools/releaseNotes.mjsindex 172a22efa..342f04133 100644--- a/tools/releaseNotes.mjs+++ b/tools/releaseNotes.mjs@@ -28,6 +28,8 @@ export const NOTES_FLOOR = 'v0.65.0';* the reader recognises anyway.*/export const NOTED = {+ 'fix(sdk): resolve spawned entities before tracking scene ownership':+ { note: 'Scene assets have scoped ownership.' },'Fix engine activity, asset ownership and material rendering':{ note: 'Entity activity follows the hierarchy.' },'Strengthen import and native release verification':