diff --git a/tools/e2e/66-video.mjs b/tools/e2e/66-video.mjs index a185d378..779f3c8a 100644 --- a/tools/e2e/66-video.mjs +++ b/tools/e2e/66-video.mjs @@ -1,6 +1,6 @@ import { readFileSync } from 'node:fs'; import { uploadVideo } from '../lib/projects.mjs'; -import { MAKE_OBJECT, pickAssetType } from './lib/scaffold.mjs'; +import { LANES, MAKE_OBJECT, pickAssetType } from './lib/scaffold.mjs'; /** * Videos (#402). A WebM goes up and the worker turns it into an MP4 (in CI beside the PHP server, @@ -16,6 +16,7 @@ import { MAKE_OBJECT, pickAssetType } from './lib/scaffold.mjs'; */ const SPRITE = 'vd66-sprite'; const OBJECT = 'vd66-object'; +const LANE = LANES.video; const COLORS = { red: '#fe0000', green: '#00ff01', blue: '#0000ff', white: '#ffffff' }; export async function video(t) { @@ -201,9 +202,9 @@ export async function video(t) { const scene = __gm.state.activeScene; ${MAKE_OBJECT} p.assets.unshift({ id: '${SPRITE}', type: 'sprite', name: '${SPRITE}', props: { width: 320, height: 180, color: 0xffffff, texture: ${JSON.stringify(clip.id)}, shader: '' } }); - scene.objects.push(make('${OBJECT}', '${SPRITE}', '', 0, 'video')); + scene.objects.push(make('${OBJECT}', '${SPRITE}', '', ${LANE}, 'video')); __gm.state.select(null); - __gm.lookAt(0, 0);`); + __gm.lookAt(0, ${LANE});`); await waitFor( () => json('__gm.videos()'), (players) => players.some((p) => p.ready), @@ -268,5 +269,6 @@ export async function video(t) { const p = __gm.state.project; for (const holder of p.assets) if (holder.objects) holder.objects = holder.objects.filter((o) => o.id !== '${OBJECT}'); p.assets = p.assets.filter((a) => a.id !== '${SPRITE}' && a.id !== ${JSON.stringify(assetId)}); - __gm.state.select(null);`); + __gm.state.select(null); + __gm.lookAt(0, 0);`); } diff --git a/tools/e2e/lib/scaffold.mjs b/tools/e2e/lib/scaffold.mjs index 55bc1b38..1ea1bb54 100644 --- a/tools/e2e/lib/scaffold.mjs +++ b/tools/e2e/lib/scaffold.mjs @@ -30,6 +30,7 @@ export const LANES = { eyedropper: -5800, containerReference: -6200, nestedReference: -6600, + video: -7000, }; /**