Clean up Object Vector Studio V2 manifest shape ownership and remove mixed vector geometry styles - PR_26133_120-object-vector-shapes-ssoT-cleanup

Author: DavidQ

docs/dev/reports/PR_26133_120-object-vector-shapes-ssoT-cleanup_report.md

@@ -0,0 +1,47 @@
+# PR_26133_120-object-vector-shapes-ssoT-cleanup
+
+## Summary
+- Renamed the Object Vector Studio V2 manifest map collection from `vectorMaps.vectors` to `vectorMaps.shapes`.
+- Removed the active vector-map entry contract that allowed separate `points` and `paths` geometry under `vectorMaps`.
+- Kept `objects[].shapes[]` as the single active Asteroids object geometry source for runtime rendering and collision geometry.
+
+## Manifest Cleanup Decisions
+- `vectorMaps.vectors` was removed from `games/Asteroids/game.manifest.json`; the document now contains `vectorMaps.shapes`.
+- `vectorMaps.shapes` is intentionally empty for Asteroids because the active object geometry lives in `objects[].shapes[]`.
+- `vector.asteroids.bullet` was converted into `object.asteroids.bullet` with polygon geometry in `objects[]`.
+- The bullet role was added to `vectorMaps.objectVectorRoles` so gameplay render and collision lookup use the same manifest object geometry.
+- `vector.asteroids.ui.title` was removed from Object Vector Studio V2 ownership because the Asteroids title is rendered by UI text drawing, not object geometry.
+- The `paths[]` vector-map style was removed from the Object Vector Studio V2 schema contract.
+- The legacy `vectors.points` vector-map style was removed from the active contract; point geometry now appears only inside Object Vector shape geometry.
+- Asteroids manifest map metadata was renamed from `html-js-gaming.asteroids-vector-map` to `html-js-gaming.asteroids-object-vector-shapes`.
+
+## Runtime Cleanup
+- Bullet rendering now uses `drawObjectVectorAsset` with the manifest role `bullet`.
+- Bullet collision geometry now loads through `requireAsteroidsObjectVectorPoints`.
+- Attract screen IDs now resolve through `ASTEROIDS_OBJECT_VECTOR_IDS`.
+- Removed runtime hardcoded vector-map lookup helpers and render diagnostics for `vector.asteroids.*`.
+- Required Asteroids manifest geometry must resolve through `object-vector-studio-v2.objects`; missing required geometry returns actionable loader errors.
+
+## Validation
+- Playwright impacted: Yes, because manifest loading and Object Vector runtime paths changed.
+- PASS `node --check` for changed Asteroids runtime files and targeted test files.
+- PASS Asteroids manifest JSON parse.
+- PASS Object Vector Studio V2 schema JSON parse.
+- PASS targeted Asteroids manifest-load and missing-geometry validation.
+- PASS targeted Object Vector Studio V2 schema/runtime manifest-load validation.
+- PASS `node -e "import('./tests/tools/ObjectVectorStudioV2DeleteCleanup.test.mjs').then(async (m) => { await m.run(); console.log('PASS ObjectVectorStudioV2DeleteCleanup'); })"`
+- PASS `node -e "import('./tests/games/AsteroidsValidation.test.mjs').then(async (m) => { await m.run(); console.log('PASS AsteroidsValidation'); })"`
+- PASS `node -e "import('./tests/games/AsteroidsVectorTransforms.test.mjs').then(async (m) => { await m.run(); console.log('PASS AsteroidsVectorTransforms'); })"`
+- PASS `node -e "import('./tests/games/AsteroidsAssetReferenceAdoption.test.mjs').then(async (m) => { await m.run(); console.log('PASS AsteroidsAssetReferenceAdoption'); })"`
+- PASS `node -e "import('./tests/games/AsteroidsPlatformDemo.test.mjs').then(async (m) => { await m.run(); console.log('PASS AsteroidsPlatformDemo'); })"`
+- PASS `node -e "import('./tests/games/AsteroidsPresentation.test.mjs').then(async (m) => { await m.run(); console.log('PASS AsteroidsPresentation'); })"`
+- PASS `git diff --check`
+
+## Skipped
+- Full regression/full samples smoke test skipped per PR instructions.
+- `npm run test:workspace-v2` was not run because this PR requested targeted Asteroids/Object Vector validation only.
+
+## Artifacts
+- Review diff: `docs/dev/reports/codex_review.diff`
+- Changed files report: `docs/dev/reports/codex_changed_files.txt`
+- Delta ZIP: `tmp/PR_26133_120-object-vector-shapes-ssoT-cleanup_delta.zip`

games/Asteroids/game.manifest.json

@@ -213,11 +213,18 @@
       "toolId": "object-vector-studio-v2",
       "name": "Asteroids Object Vector Assets",
       "vectorMaps": {
-        "schema": "html-js-gaming.asteroids-vector-map",
+        "schema": "html-js-gaming.asteroids-object-vector-shapes",
         "version": 1,
-        "name": "Asteroids Object Vector Manifest Maps",
+        "name": "Asteroids Object Vector Shape Roles",
         "source": "object-vector-studio-v2",
         "objectVectorRoles": {
+          "bullet": {
+            "objectId": "object.asteroids.bullet",
+            "tags": [
+              "projectile",
+              "bullet"
+            ]
+          },
           "ship": {
             "objectId": "object.asteroids.ship",
             "tags": [
@@ -261,54 +268,77 @@
             ]
           }
         },
-        "vectors": [
-          {
-            "id": "vector.asteroids.bullet",
-            "label": "Bullet",
-            "kind": "polygon",
-            "usage": [
-              "gameplay",
-              "collision",
-              "projectile"
-            ],
-            "points": [
-              {
-                "x": -2,
-                "y": -2
-              },
-              {
-                "x": 2,
-                "y": -2
+        "shapes": []
+      },
+      "objects": [
+        {
+          "id": "object.asteroids.bullet",
+          "name": "Bullet",
+          "shapes": [
+            {
+              "tool": "polygon",
+              "order": 0,
+              "visible": true,
+              "locked": false,
+              "geometry": {
+                "points": [
+                  {
+                    "x": -2,
+                    "y": -2
+                  },
+                  {
+                    "x": 2,
+                    "y": -2
+                  },
+                  {
+                    "x": 2,
+                    "y": 2
+                  },
+                  {
+                    "x": -2,
+                    "y": 2
+                  }
+                ]
               },
-              {
-                "x": 2,
-                "y": 2
+              "style": {
+                "fill": "transparent",
+                "stroke": "#F8FAFC",
+                "strokeWidth": 1,
+                "fillOpacity": 1,
+                "strokeOpacity": 1
               },
-              {
-                "x": -2,
-                "y": 2
+              "transform": {
+                "x": 0,
+                "y": 0,
+                "rotation": 0,
+                "scaleX": 1,
+                "scaleY": 1
               }
-            ]
-          },
-          {
-            "id": "vector.asteroids.ui.title",
-            "label": "Asteroids Title",
-            "kind": "path",
-            "usage": [
-              "splash",
-              "attract",
-              "ui"
-            ],
-            "viewBox": "0 0 220 48",
-            "paths": [
-              "M 6 40 L 24 6 L 42 40 Z",
-              "M 58 40 L 58 8 L 88 8 L 88 18 L 70 18 L 70 22 L 86 22 L 86 32 L 70 32 L 70 40 Z"
-            ],
-            "points": []
+            }
+          ],
+          "states": [
+            {
+              "id": "active",
+              "name": "Active",
+              "frames": [
+                {
+                  "id": "frame-1",
+                  "order": 0,
+                  "durationFrames": 1,
+                  "shapeOverrides": []
+                }
+              ]
+            }
+          ],
+          "tags": [
+            "projectile",
+            "bullet"
+          ],
+          "objectOrigin": {
+            "x": 0,
+            "y": 0
           }
-        ]
-      },
-      "objects": [
+        },
         {
           "id": "object.asteroids.ship",
           "name": "Asteroids Ship",

games/Asteroids/game/AsteroidsAttractAdapter.js

@@ -5,7 +5,7 @@ David Quesenberry
 AsteroidsAttractAdapter.js
 */
 import { clamp } from '../../../src/shared/utils/mathUtils.js';
-import { ASTEROIDS_VECTOR_MAP_IDS } from './asteroidsVectorMaps.js';
+import { ASTEROIDS_OBJECT_VECTOR_IDS } from './asteroidsVectorMaps.js';
 
 function estimateTextWidth(text, fontPx) {
   return String(text ?? '').length * (fontPx * 0.62);
@@ -124,7 +124,7 @@ export default class AsteroidsAttractAdapter {
       ...this.scene.objectVectorRoleOptions('ship'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_VECTOR_MAP_IDS.attractShip,
+      objectId: ASTEROIDS_OBJECT_VECTOR_IDS.attractShip,
       rotation: -0.28,
       scale: 1.1,
       stateId: 'idle',
@@ -135,7 +135,7 @@ export default class AsteroidsAttractAdapter {
       ...this.scene.objectVectorRoleOptions('asteroidLarge'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_VECTOR_MAP_IDS.attractAsteroid,
+      objectId: ASTEROIDS_OBJECT_VECTOR_IDS.attractAsteroid,
       scale: 0.72,
       stateId: 'active',
       x: 632,
@@ -213,7 +213,7 @@ export default class AsteroidsAttractAdapter {
       ...this.scene.objectVectorRoleOptions('ship'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_VECTOR_MAP_IDS.attractShip,
+      objectId: ASTEROIDS_OBJECT_VECTOR_IDS.attractShip,
       rotation: Math.sin(this.demoTime * 0.9) * 1.2,
       stateId: 'idle',
       x,
@@ -226,7 +226,7 @@ export default class AsteroidsAttractAdapter {
       ...this.scene.objectVectorRoleOptions('asteroidLarge'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_VECTOR_MAP_IDS.attractAsteroid,
+      objectId: ASTEROIDS_OBJECT_VECTOR_IDS.attractAsteroid,
       scale: 0.72,
       stateId: 'active',
       x: rockX,
@@ -236,7 +236,7 @@ export default class AsteroidsAttractAdapter {
       ...this.scene.objectVectorRoleOptions('ufoLarge'),
       elapsedMs: this.scene.objectVectorPlaybackMs,
       fps: 12,
-      objectId: ASTEROIDS_VECTOR_MAP_IDS.attractUfo,
+      objectId: ASTEROIDS_OBJECT_VECTOR_IDS.attractUfo,
       stateId: 'active',
       x: 480 + Math.cos(this.demoTime * 0.43) * 280,
       y: 284,

games/Asteroids/game/AsteroidsGameScene.js

@@ -6,7 +6,6 @@ AsteroidsGameScene.js
 */
 import { AttractModeController, Scene } from '../../../src/engine/scene/index.js';
 import { ParticleSystem } from '../../../src/engine/fx/index.js';
-import { transformPoints } from '../../../src/engine/rendering/index.js';
 import AsteroidsSession from './AsteroidsSession.js';
 import AsteroidsWorld from './AsteroidsWorld.js';
 import AsteroidsAudio from '../systems/AsteroidsAudio.js';
@@ -20,10 +19,6 @@ import {
   runtimeObjectRoleOptions,
   validateAsteroidsRuntimeObjectRoles
 } from './asteroidsObjectVectorRoles.js';
-import {
-  ASTEROIDS_VECTOR_MAP_IDS,
-  getAsteroidsVectorMap
-} from './asteroidsVectorMaps.js';
 import {
   ASTEROIDS_GAME_OVER_AUTO_EXIT_SECONDS, ASTEROIDS_GAME_OVER_RETURN_MODE
 } from "../rules/flowRules.js";
@@ -94,10 +89,8 @@ export default class AsteroidsGameScene extends Scene {
     this.objectVectorAssets = options.objectVectorAssets || null;
     this.objectVectorRuntime = options.objectVectorRuntime || null;
     this.vectorMaps = options.vectorMaps || null;
-    this.vectorMapRenderCounts = {};
-    this.vectorMapRenderFailures = new Set();
-    if (!this.vectorMaps?.vectorsById || !this.vectorMaps?.objectVectorRoles) {
-      const message = 'Asteroids vector map manifest validation failed: vector maps were not loaded from game.manifest.json.';
+    if (!this.vectorMaps?.objectVectorMapsById || !this.vectorMaps?.objectVectorRoles) {
+      const message = 'Asteroids Object Vector manifest validation failed: object geometry was not loaded from game.manifest.json.';
       console.error(message);
       throw new Error(message);
     }
@@ -123,6 +116,7 @@ export default class AsteroidsGameScene extends Scene {
     this.objectVectorPlaybackMs = 0;
     this.objectVectorRenderCounts = {
       asteroids: 0,
+      bullet: 0,
       ship: 0,
       ufo: 0,
     };
@@ -767,18 +761,18 @@ export default class AsteroidsGameScene extends Scene {
     }
 
     this.world.bullets.forEach((bullet) => {
-      this.drawManifestVectorMap(renderer, ASTEROIDS_VECTOR_MAP_IDS.bullet, {
-        color: '#f8fafc',
-        lineWidth: 1,
+      this.drawObjectVectorAsset(renderer, "bullet", {
+        ...this.objectVectorRoleOptions("bullet"),
+        stateId: "active",
         x: bullet.x,
         y: bullet.y,
       });
     });
 
     this.world.ufoBullets.forEach((bullet) => {
-      this.drawManifestVectorMap(renderer, ASTEROIDS_VECTOR_MAP_IDS.bullet, {
-        color: '#ffffff',
-        lineWidth: 1,
+      this.drawObjectVectorAsset(renderer, "bullet", {
+        ...this.objectVectorRoleOptions("bullet"),
+        stateId: "active",
         x: bullet.x,
         y: bullet.y,
       });
@@ -889,53 +883,6 @@ export default class AsteroidsGameScene extends Scene {
     });
   }
 
-  drawManifestVectorMap(renderer, vectorMapId, {
-    color = '#ffffff',
-    lineWidth = 2,
-    rotation = 0,
-    scale = 1,
-    x = 0,
-    y = 0,
-  } = {}) {
-    const vectorMap = getAsteroidsVectorMap(this.vectorMaps, vectorMapId);
-    if (!vectorMap || !Array.isArray(vectorMap.points) || vectorMap.points.length < 2) {
-      this.recordVectorMapRenderFailure(vectorMapId, 'manifest vector map points are unavailable');
-      return false;
-    }
-    const points = transformPoints(vectorMap.points, {
-      rotation,
-      scale,
-      x,
-      y,
-    });
-    if (vectorMap.kind === 'polygon' && typeof renderer.drawPolygon === 'function') {
-      renderer.drawPolygon(points, {
-        fillColor: null,
-        lineWidth,
-        strokeColor: color,
-      });
-    } else {
-      for (let index = 0; index < points.length - 1; index += 1) {
-        renderer.drawLine(points[index].x, points[index].y, points[index + 1].x, points[index + 1].y, color, lineWidth);
-      }
-    }
-    this.vectorMapRenderCounts[vectorMapId] = (this.vectorMapRenderCounts[vectorMapId] || 0) + 1;
-    return true;
-  }
-
-  recordVectorMapRenderFailure(vectorMapId, reason) {
-    const failureKey = `${vectorMapId || 'unknown'}:${reason}`;
-    if (this.vectorMapRenderFailures.has(failureKey)) {
-      return;
-    }
-    this.vectorMapRenderFailures.add(failureKey);
-    this.pushDebugEvent('ASTEROIDS_VECTOR_MAP_RENDER_FAIL', {
-      reason,
-      vectorMapId: vectorMapId || 'unknown',
-    });
-    console.error(`FAIL Asteroids manifest vector map render blocked for ${vectorMapId || 'unknown'}: ${reason}.`);
-  }
-
   drawObjectVectorAsset(renderer, renderKey, options) {
     if (!this.objectVectorRuntime || !this.objectVectorAssets) {
       this.recordObjectVectorRenderFailure(renderKey, options.assetId || options.objectId || options.runtimeRole, "validated Object Vector runtime assets are not loaded");
@@ -971,19 +918,10 @@ export default class AsteroidsGameScene extends Scene {
         assetCount: this.objectVectorAssets?.objectsById?.size || 0,
         loaded: Boolean(this.objectVectorAssets),
         objectCount: this.objectVectorAssets?.objectsById?.size || 0,
-        objectVectorMapIds: this.vectorMaps?.objectVectorMaps?.map((object) => object.id) || [],
+        objectVectorObjectIds: this.vectorMaps?.objectVectorMaps?.map((object) => object.id) || [],
         runtimeObjectsValid: Boolean(this.objectVectorRuntimeObjectValidation?.ok),
         renderCounts: { ...this.objectVectorRenderCounts },
-        vectorMapIds: this.vectorMaps?.vectors?.map((vector) => vector.id) || [],
-        vectorMapRenderCounts: { ...this.vectorMapRenderCounts },
-        vectorMapUsageCounts: { ...(this.vectorMaps?.usageCounts || {}) },
-        vectorMapsLoaded: Boolean(this.vectorMaps?.vectorsById),
-      };
-      globalThis.__asteroidsVectorMaps = {
-        ids: this.vectorMaps?.vectors?.map((vector) => vector.id) || [],
-        loaded: Boolean(this.vectorMaps?.vectorsById),
-        renderCounts: { ...this.vectorMapRenderCounts },
-        usageCounts: { ...(this.vectorMaps?.usageCounts || {}) },
+        sharedShapeCount: this.vectorMaps?.shapes?.length || 0,
       };
     } catch {
       // Ignore diagnostics assignment in restricted runtimes.