Finish Asteroids manifest-driven render path cleanup - PR_26133_127-asteroids-manifest-render-path-cleanup

Author: DavidQ

docs/dev/reports/PR_26133_127-asteroids-manifest-render-path-cleanup_report.md

@@ -0,0 +1,41 @@
+# PR_26133_127 Asteroids Manifest Render Path Cleanup
+
+## Summary
+- Replaced Asteroids attract/demo-only manifest ID names with shared Object Vector Studio V2 object IDs: bullet, ship, large/medium/small asteroid, large UFO, and small UFO.
+- Required manifest geometry now explicitly includes `object.asteroids.small-ufo` with the other six runtime objects.
+- Gameplay ship, ship lives, UFO, bullets, and asteroids now render with explicit `objectId` plus `requireManifestBinding: true`.
+- Demo and attract ship/UFO/asteroid rendering now uses the same shared render keys and manifest object IDs as gameplay.
+
+## Runtime Render Path Audit
+- Removed active `attractShip`, `attractUfo`, and `attractAsteroid` render paths from Asteroids runtime code.
+- No separate demo/attract object geometry definitions remain in Asteroids runtime code.
+- Remaining direct renderer draws are non-object UI/effect paths: starfield background pixels, HUD/menu text, attract text panels, demo trail pixels, pause/initials overlays, particle effects, and ship debris fragments.
+- Ship debris was left unchanged because it is an explosion effect, not a demo/attract object geometry source.
+
+## Preserved Intentional Behavior
+- Ship flame flicker state/shape data was not changed.
+- Asteroid manifest geometry and scale tuning were not changed.
+- Manifest-authored style colors remain sourced from Object Vector Studio V2 objects.
+- No fallback/default vector maps or hardcoded object vector maps were added.
+
+## Validation
+- PASS: targeted Asteroids manifest/gameplay/demo/bullet node validation:
+  - `AsteroidsValidation`
+  - `AsteroidsPresentation`
+  - `AsteroidsVectorTransforms`
+  - `AsteroidsPlatformDemo`
+  - `AsteroidsAssetReferenceAdoption`
+- PASS: targeted Workspace Manager V2/Asteroids Playwright validation:
+  - `npx playwright test tests/playwright/tools/WorkspaceManagerV2.spec.mjs --project=playwright --workers=1 --reporter=list -g "loads Object Vector Studio V2 runtime assets into Asteroids gameplay rendering"`
+- PASS: `git diff --check`
+- Playwright impacted: Yes. Validates Asteroids Object Vector runtime asset loading, attract/demo shared manifest IDs, gameplay manifest rendering, UFO/ship/asteroid render counts, and bullet runtime rendering.
+- Full samples smoke test skipped as requested; this PR is limited to Asteroids render-path cleanup.
+
+## Coverage
+- Updated `docs/dev/reports/playwright_v8_coverage_report.txt` and `docs/dev/reports/coverage_changed_js_guardrail.txt` to list the changed Asteroids runtime JS files from the targeted Playwright V8 coverage output.
+
+## Manual Validation
+- Open `/games/Asteroids/index.html`.
+- Let attract mode enter title/demo phases; expected: ship, UFO, and all asteroids render from manifest-authored Object Vector Studio V2 objects.
+- Start gameplay and fire bullets at multiple ship angles; expected: bullets use `object.asteroids.bullet` styling/geometry and rotate with fire direction.
+- Confirm large, medium, and small asteroids preserve manifest-authored colors/scale tuning.

games/Asteroids/game/AsteroidsAttractAdapter.js

@@ -7,7 +7,7 @@ AsteroidsAttractAdapter.js
 import { clamp } from '../../../src/shared/utils/mathUtils.js';
 import { ASTEROIDS_OBJECT_GEOMETRY_IDS } from './asteroidsObjectGeometryManifest.js';
 
-const ATTRACT_ASTEROID_RENDER_BINDINGS = Object.freeze({
+const ASTEROID_RENDER_BINDINGS = Object.freeze({
   large: Object.freeze({
     objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidLarge,
     objectKey: 'asteroidLarge',
@@ -105,12 +105,12 @@ export default class AsteroidsAttractAdapter {
   }
 
   drawManifestAsteroid(renderer, sizeKey, options = {}) {
-    const binding = ATTRACT_ASTEROID_RENDER_BINDINGS[sizeKey];
+    const binding = ASTEROID_RENDER_BINDINGS[sizeKey];
     if (!binding) {
       return;
     }
 
-    this.scene?.drawObjectVectorAsset?.(renderer, 'attractAsteroid', {
+    this.scene?.drawObjectVectorAsset?.(renderer, 'asteroids', {
       ...this.scene.objectVectorTagOptions(binding.objectKey),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
@@ -152,11 +152,12 @@ export default class AsteroidsAttractAdapter {
       });
     }
 
-    this.scene?.drawObjectVectorAsset?.(renderer, 'attractShip', {
+    this.scene?.drawObjectVectorAsset?.(renderer, 'ship', {
       ...this.scene.objectVectorTagOptions('ship'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip,
+      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.ship,
+      requireManifestBinding: true,
       rotation: -0.28,
       scale: 1.1,
       stateId: 'idle',
@@ -245,11 +246,12 @@ export default class AsteroidsAttractAdapter {
 
     const x = 480 + Math.cos(this.demoTime * 0.7) * 220;
     const y = 340 + Math.sin(this.demoTime * 1.1) * 130;
-    this.scene?.drawObjectVectorAsset?.(renderer, 'attractShip', {
+    this.scene?.drawObjectVectorAsset?.(renderer, 'ship', {
       ...this.scene.objectVectorTagOptions('ship'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip,
+      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.ship,
+      requireManifestBinding: true,
       rotation: Math.sin(this.demoTime * 0.9) * 1.2,
       stateId: 'idle',
       x,
@@ -271,11 +273,12 @@ export default class AsteroidsAttractAdapter {
       x: 430 + Math.sin((this.demoTime * 0.92) + 2.2) * 154,
       y: 318 + Math.cos((this.demoTime * 0.72) + 2.7) * 78,
     });
-    this.scene?.drawObjectVectorAsset?.(renderer, 'attractUfo', {
+    this.scene?.drawObjectVectorAsset?.(renderer, 'ufo', {
       ...this.scene.objectVectorTagOptions('ufoLarge'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.attractUfo,
+      objectId: ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoLarge,
+      requireManifestBinding: true,
       stateId: 'active',
       x: 480 + Math.cos(this.demoTime * 0.43) * 280,
       y: 284,

games/Asteroids/game/AsteroidsGameScene.js

@@ -754,6 +754,8 @@ export default class AsteroidsGameScene extends Scene {
         ...this.objectVectorTagOptions(objectKey),
         elapsedMs: this.objectVectorPlaybackMs,
         fps: 12,
+        objectId: this.objectVectorRuntimeObjectValidation.objectsByKey[objectKey]?.id || "",
+        requireManifestBinding: true,
         stateId: "active",
         x: this.world.ufo.x,
         y: this.world.ufo.y,
@@ -791,6 +793,8 @@ export default class AsteroidsGameScene extends Scene {
         ...this.objectVectorTagOptions("ship"),
         elapsedMs: this.objectVectorPlaybackMs,
         fps: 12,
+        objectId: this.objectVectorRuntimeObjectValidation.objectsByKey.ship?.id || "",
+        requireManifestBinding: true,
         rotation: this.world.ship.angle,
         stateId: this.world.ship.thrusting && this.session.mode === 'playing' ? "move" : "idle",
         x: this.world.ship.x,
@@ -880,6 +884,8 @@ export default class AsteroidsGameScene extends Scene {
         ...this.objectVectorTagOptions("ship"),
         elapsedMs: this.objectVectorPlaybackMs,
         fps: 12,
+        objectId: this.objectVectorRuntimeObjectValidation.objectsByKey.ship?.id || "",
+        requireManifestBinding: true,
         rotation: -Math.PI / 2,
         scale: 1.05,
         stateId: "idle",

games/Asteroids/game/asteroidsObjectGeometryManifest.js

@@ -10,17 +10,19 @@ export const ASTEROIDS_OBJECT_GEOMETRY_IDS = Object.freeze({
   asteroidMedium: 'object.asteroids.medium-asteroid',
   asteroidSmall: 'object.asteroids.small-asteroid',
   bullet: 'object.asteroids.bullet',
-  attractShip: 'object.asteroids.ship',
-  attractUfo: 'object.asteroids.large-ufo',
+  ship: 'object.asteroids.ship',
+  ufoLarge: 'object.asteroids.large-ufo',
+  ufoSmall: 'object.asteroids.small-ufo',
 });
 
 export const ASTEROIDS_REQUIRED_MANIFEST_GEOMETRY_IDS = Object.freeze([
   ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidLarge,
   ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidMedium,
   ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidSmall,
-  ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip,
-  ASTEROIDS_OBJECT_GEOMETRY_IDS.attractUfo,
   ASTEROIDS_OBJECT_GEOMETRY_IDS.bullet,
+  ASTEROIDS_OBJECT_GEOMETRY_IDS.ship,
+  ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoLarge,
+  ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoSmall,
 ]);
 
 function isRecord(value) {

tests/games/AsteroidsAssetReferenceAdoption.test.mjs

@@ -63,12 +63,12 @@ export async function run() {
   assert.deepEqual(
     payload.objects.find((object) => object.id === "object.asteroids.ship").shapes.find((shape) => shape.tool === "polygon").geometry.points,
     [
-      { x: 14, y: 0 },
-      { x: -10, y: -8 },
-      { x: -6, y: -3 },
-      { x: -6, y: 3 },
-      { x: -10, y: 8 },
-      { x: 14, y: 0 },
+      { x: 15.4, y: 0 },
+      { x: -11, y: -8.8 },
+      { x: -6.6, y: -3.3 },
+      { x: -6.6, y: 3.3 },
+      { x: -11, y: 8.8 },
+      { x: 15.4, y: 0 },
     ],
   );
   assert.equal(payload.objects.find((object) => object.id === "object.asteroids.large-ufo").shapes[0].tool, "polyline");

tests/games/AsteroidsPresentation.test.mjs

@@ -245,15 +245,74 @@ function testAsteroidsAttractAsteroidsUseManifestObjectsAndStyles() {
   assert.equal(objectIds.includes('object.asteroids.small-asteroid'), true);
   assert.equal(objectIds.includes('object.asteroids.large-ufo'), true);
   [
+    'object.asteroids.ship',
     'object.asteroids.large-asteroid',
     'object.asteroids.medium-asteroid',
     'object.asteroids.small-asteroid',
+    'object.asteroids.large-ufo',
   ].forEach((objectId) => {
     const calls = renderCalls.filter((call) => call.objectId === objectId);
     assert.equal(calls.length > 0, true);
     assert.equal(calls.every((call) => call.requireManifestBinding), true);
     assert.equal(calls.every((call) => call.stroke === styleByObjectId.get(objectId)), true);
   });
+  assert.equal(scene.objectVectorRenderCounts.attractAsteroid, undefined);
+  assert.equal(scene.objectVectorRenderCounts.attractShip, undefined);
+  assert.equal(scene.objectVectorRenderCounts.attractUfo, undefined);
+  assert.equal(scene.objectVectorRenderCounts.asteroids > 0, true);
+  assert.equal(scene.objectVectorRenderCounts.ship > 0, true);
+  assert.equal(scene.objectVectorRenderCounts.ufo > 0, true);
+}
+
+function testAsteroidsGameplayObjectsUseSharedManifestBindings() {
+  const renderCalls = [];
+  const scene = new AsteroidsGameScene(createAsteroidsTestSceneOptions({
+    objectVectorAssets: createObjectVectorAssetSet(),
+    objectVectorRuntime: createObjectVectorRuntime(renderCalls),
+  }));
+  scene.session.start(1);
+  scene.attractController.active = false;
+  scene.world.asteroids = [
+    scene.world.createAsteroidFromState({ angle: 0.12, size: 3, x: 120, y: 160 }),
+    scene.world.createAsteroidFromState({ angle: -0.28, size: 2, x: 240, y: 260 }),
+    scene.world.createAsteroidFromState({ angle: 0.47, size: 1, x: 360, y: 320 }),
+  ];
+  scene.world.bullets = [];
+  scene.world.ufoBullets = [];
+  scene.world.ufo = scene.world.createUfoEntity('large', scene.world.wave);
+  scene.world.ufo.x = 520;
+  scene.world.ufo.y = 180;
+
+  const renderer = {
+    drawRect() {},
+    strokeRect() {},
+    drawPolygon() {},
+    drawLine() {},
+    drawCircle() {},
+    drawText() {},
+  };
+
+  scene.render(renderer);
+  [
+    'object.asteroids.ship',
+    'object.asteroids.large-asteroid',
+    'object.asteroids.medium-asteroid',
+    'object.asteroids.small-asteroid',
+    'object.asteroids.large-ufo',
+  ].forEach((objectId) => {
+    const calls = renderCalls.filter((call) => call.objectId === objectId);
+    assert.equal(calls.length > 0, true, `${objectId} should render from the manifest`);
+    assert.equal(calls.every((call) => call.requireManifestBinding), true, `${objectId} should require manifest binding`);
+  });
+  assert.equal(renderCalls.some((call) => call.objectId === 'object.asteroids.ship' && call.stateId === 'idle'), true);
+
+  scene.world.ufo = scene.world.createUfoEntity('small', scene.world.wave);
+  scene.world.ufo.x = 580;
+  scene.world.ufo.y = 220;
+  scene.render(renderer);
+  const smallUfoCalls = renderCalls.filter((call) => call.objectId === 'object.asteroids.small-ufo');
+  assert.equal(smallUfoCalls.length > 0, true);
+  assert.equal(smallUfoCalls.every((call) => call.requireManifestBinding), true);
 }
 
 function testAsteroidsGameplayBulletsUseManifestObjectGeometry() {
@@ -360,6 +419,7 @@ export function run() {
   testAsteroidsGameOverQualifyingScoreInitialsFlow();
   testAsteroidsMenuHighScoreUsesLeaderboardTop();
   testAsteroidsAttractAsteroidsUseManifestObjectsAndStyles();
+  testAsteroidsGameplayObjectsUseSharedManifestBindings();
   testAsteroidsGameplayBulletsUseManifestObjectGeometry();
   testAsteroidsGameplayRenderDoesNotCoverBackgroundLayer();
 }

tests/games/AsteroidsValidation.test.mjs

@@ -163,14 +163,16 @@ export async function run() {
   assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidLarge, 'object.asteroids.large-asteroid');
   assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidMedium, 'object.asteroids.medium-asteroid');
   assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidSmall, 'object.asteroids.small-asteroid');
-  assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip, 'object.asteroids.ship');
-  assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.attractUfo, 'object.asteroids.large-ufo');
+  assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.ship, 'object.asteroids.ship');
+  assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoLarge, 'object.asteroids.large-ufo');
+  assert.equal(ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoSmall, 'object.asteroids.small-ufo');
   assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.bullet).id, 'object.asteroids.bullet');
   assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidLarge).id, 'object.asteroids.large-asteroid');
   assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidMedium).id, 'object.asteroids.medium-asteroid');
   assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.asteroidSmall).id, 'object.asteroids.small-asteroid');
-  assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip).id, 'object.asteroids.ship');
-  assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.attractUfo).id, 'object.asteroids.large-ufo');
+  assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.ship).id, 'object.asteroids.ship');
+  assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoLarge).id, 'object.asteroids.large-ufo');
+  assert.equal(objectGeometry.objectsById.get(ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoSmall).id, 'object.asteroids.small-ufo');
   ASTEROIDS_REQUIRED_MANIFEST_GEOMETRY_IDS.forEach((id) => {
     assert.equal(objectGeometry.objectsById.has(id), true, `required Asteroids manifest geometry id ${id} should resolve`);
   });
@@ -189,12 +191,12 @@ export async function run() {
   assert.deepEqual(
     getAsteroidsObjectGeometryPoints(objectGeometry, 'ship'),
     [
-      { x: 14, y: 0 },
-      { x: -10, y: -8 },
-      { x: -6, y: -3 },
-      { x: -6, y: 3 },
-      { x: -10, y: 8 },
-      { x: 14, y: 0 },
+      { x: 15.4, y: 0 },
+      { x: -11, y: -8.8 },
+      { x: -6.6, y: -3.3 },
+      { x: -6.6, y: 3.3 },
+      { x: -11, y: 8.8 },
+      { x: 15.4, y: 0 },
     ],
   );
   assert.deepEqual(
@@ -244,12 +246,12 @@ export async function run() {
   const shipObject = loadAsteroidsObjectVectorPayload().objects.find((object) => object.id === 'object.asteroids.ship');
   const shipHull = shipObject.shapes.find((shape) => shape.tool === 'polygon');
   assert.deepEqual(shipHull.geometry.points, [
-    { x: 14, y: 0 },
-    { x: -10, y: -8 },
-    { x: -6, y: -3 },
-    { x: -6, y: 3 },
-    { x: -10, y: 8 },
-    { x: 14, y: 0 },
+    { x: 15.4, y: 0 },
+    { x: -11, y: -8.8 },
+    { x: -6.6, y: -3.3 },
+    { x: -6.6, y: 3.3 },
+    { x: -11, y: 8.8 },
+    { x: 15.4, y: 0 },
   ]);
   const largeUfoObject = loadAsteroidsObjectVectorPayload().objects.find((object) => object.id === 'object.asteroids.large-ufo');
   assert.equal(largeUfoObject.shapes[0].tool, 'polyline');
@@ -288,13 +290,13 @@ export async function run() {
   assert.equal(legacySharedGeometryValidation.errors.some((message) => message.includes('vectorMaps')), true);
   const missingShipObjectManifest = structuredClone(manifestPayload);
   missingShipObjectManifest.tools['object-vector-studio-v2'].objects = missingShipObjectManifest.tools['object-vector-studio-v2'].objects
-    .filter((object) => object.id !== ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip);
+    .filter((object) => object.id !== ASTEROIDS_OBJECT_GEOMETRY_IDS.ship);
   const missingShipObjectValidation = loadAsteroidsObjectGeometryFromManifest(missingShipObjectManifest);
   assert.equal(missingShipObjectValidation.ok, false);
-  assert.equal(missingShipObjectValidation.errors.some((message) => message.includes(ASTEROIDS_OBJECT_GEOMETRY_IDS.attractShip)), true);
+  assert.equal(missingShipObjectValidation.errors.some((message) => message.includes(ASTEROIDS_OBJECT_GEOMETRY_IDS.ship)), true);
   const missingSmallUfoObjectManifest = structuredClone(manifestPayload);
   missingSmallUfoObjectManifest.tools['object-vector-studio-v2'].objects = missingSmallUfoObjectManifest.tools['object-vector-studio-v2'].objects
-    .filter((object) => object.id !== 'object.asteroids.small-ufo');
+    .filter((object) => object.id !== ASTEROIDS_OBJECT_GEOMETRY_IDS.ufoSmall);
   const missingSmallUfoObjectValidation = loadAsteroidsObjectGeometryFromManifest(missingSmallUfoObjectManifest);
   assert.equal(missingSmallUfoObjectValidation.ok, false);
   assert.equal(

tests/games/AsteroidsVectorTransforms.test.mjs

@@ -31,9 +31,9 @@ export function run() {
   ship.angle = Math.PI / 2;
   const shipPoints = ship.getPoints();
   assert.equal(shipPoints.length, 6);
-  assertPointClose(shipPoints[0], { x: 100, y: 214 });
-  assertPointClose(shipPoints[1], { x: 108, y: 190 });
-  assertPointClose(shipPoints[4], { x: 92, y: 190 });
+  assertPointClose(shipPoints[0], { x: 100, y: 215.4 });
+  assertPointClose(shipPoints[1], { x: 108.8, y: 189 });
+  assertPointClose(shipPoints[4], { x: 91.2, y: 189 });
 
   const asteroid = new Asteroid(320, 240, 3, () => 0.5, asteroidGeometryProfiles);
   asteroid.angle = 0;