Restore older Asteroids vector geometry for ship, asteroids, and UFOs - PR_26133_117-asteroids-older-vector-geometry-restore

DavidQ · DavidQ · commit eb7c9e744183 · 2026-05-18T20:52:44.000-04:00
diff --git a/docs/dev/reports/PR_26133_117-asteroids-older-vector-geometry-restore_report.md b/docs/dev/reports/PR_26133_117-asteroids-older-vector-geometry-restore_report.md
@@ -0,0 +1,52 @@
+# PR_26133_117 Asteroids Older Vector Geometry Restore Report
+
+## Summary
+- Read `docs/dev/PROJECT_INSTRUCTIONS.md` before implementation.
+- Used PR_26133_116 as the prior reference from committed `HEAD` (`830a4b6ef`) and `docs/dev/reports/PR_26133_116-asteroids-vector-map-ssoT-cleanup_report.md`; the local PR116 delta ZIP was not present under `tmp/`.
+- Searched farther back before Object Vector V2 work:
+  - original Asteroids runtime geometry in `055a629ab`, `fe340bde3`, and `31ca1521e`
+  - pre-Object-Vector manifest vector map geometry in `3fc7bbce7`
+  - Object Vector V2 migration boundary in `9d81680fd` and `526dbdf9f`
+- Restored manifest-owned vector map geometry only:
+  - `vector.asteroids.ship` now uses the older right-facing runtime ship points.
+  - `vector.asteroids.asteroid.medium` was restored from the older manifest vector path.
+  - `vector.asteroids.asteroid.small` was restored from the older manifest vector path.
+  - `vector.asteroids.ufo.large` and `vector.asteroids.ufo.small` were verified against the older runtime UFO polylines and left unchanged.
+- Kept Asteroids runtime loading manifest-only; no runtime fallback/default vector maps or hardcoded map constants were added.
+- Preserved the manifest cleanup that was already dirty at the start of PR117: the current ship Object Vector hull point and removal of the duplicate `object.asteroids.medium-asteroid-2`.
+
+## Changed Files
+- `games/Asteroids/game.manifest.json`
+- `tests/games/AsteroidsAssetReferenceAdoption.test.mjs`
+- `tests/games/AsteroidsValidation.test.mjs`
+- `tests/games/AsteroidsVectorTransforms.test.mjs`
+- `docs/dev/reports/PR_26133_117-asteroids-older-vector-geometry-restore_report.md`
+
+## Validation
+- PASS: syntax checks for changed targeted Asteroids test files.
+- PASS: Asteroids manifest JSON parse.
+- PASS: targeted manifest load and restored vector geometry validation for ship, medium asteroid, small asteroid, large UFO, and small UFO.
+- PASS: targeted required vector map resolution and missing required map failure validation.
+- PASS: targeted Asteroids tests:
+  - `AsteroidsValidation`
+  - `AsteroidsVectorTransforms`
+  - `AsteroidsAssetReferenceAdoption`
+  - `AsteroidsPlatformDemo`
+  - `AsteroidsPresentation`
+  - `AsteroidsHardening`
+  - `AsteroidsCollisionTimingStress`
+- PASS: targeted scan found no active Asteroids runtime fallback/default vector maps or collision-suffixed manifest vector IDs; remaining matches are test-only simulated duplicate objects and generic non-vector fallback helpers.
+- PASS: `git diff --check` (line-ending warnings only).
+
+## Skipped
+- Skipped `npm run test:workspace-v2` by request; this PR requested targeted Asteroids validation only.
+- Skipped full regression and full samples smoke test by request.
+
+## Manual Validation
+1. Open the Asteroids workspace/game manifest and confirm `tools.object-vector-studio-v2.vectorMaps.vectors` contains `vector.asteroids.ship`, `vector.asteroids.asteroid.medium`, `vector.asteroids.asteroid.small`, `vector.asteroids.ufo.large`, and `vector.asteroids.ufo.small`.
+2. Confirm the ship map points are `[14,0]`, `[-10,-8]`, `[-6,-3]`, `[-6,3]`, `[-10,8]`, `[14,0]`.
+3. Confirm the medium and small asteroid vector map paths/points match the restored older manifest geometry.
+4. Confirm removing a required manifest vector map, such as `vector.asteroids.ship`, produces an actionable validation failure naming the missing ID.
+
+## ZIP
+- Output path: `tmp/PR_26133_117-asteroids-older-vector-geometry-restore_delta.zip`
diff --git a/games/Asteroids/game.manifest.json b/games/Asteroids/game.manifest.json
@@ -273,25 +273,114 @@
             ],
             "viewBox": "-24 -24 48 48",
             "paths": [
-              "M 0 -18 L 14 16 L 0 8 L -14 16 Z",
-              "M -6 14 L 0 6 L 6 14"
+              "M 14 0 L -10 -8 L -6 -3 L -6 3 L -10 8 L 14 0"
             ],
             "points": [
               {
-                "x": 0,
-                "y": -18
+                "x": 14,
+                "y": 0
+              },
+              {
+                "x": -10,
+                "y": -8
+              },
+              {
+                "x": -6,
+                "y": -3
+              },
+              {
+                "x": -6,
+                "y": 3
+              },
+              {
+                "x": -10,
+                "y": 8
               },
               {
                 "x": 14,
+                "y": 0
+              }
+            ]
+          },
+          {
+            "id": "vector.asteroids.asteroid.medium",
+            "label": "Medium Asteroid",
+            "kind": "polygon",
+            "usage": [
+              "gameplay",
+              "collision"
+            ],
+            "viewBox": "-28 -28 56 56",
+            "paths": [
+              "M -16 -10 L -2 -18 L 16 -14 L 20 2 L 8 18 L -10 16 L -20 4 Z"
+            ],
+            "points": [
+              {
+                "x": -16,
+                "y": -10
+              },
+              {
+                "x": -2,
+                "y": -18
+              },
+              {
+                "x": 16,
+                "y": -14
+              },
+              {
+                "x": 20,
+                "y": 2
+              },
+              {
+                "x": 8,
+                "y": 18
+              },
+              {
+                "x": -10,
                 "y": 16
               },
+              {
+                "x": -20,
+                "y": 4
+              }
+            ]
+          },
+          {
+            "id": "vector.asteroids.asteroid.small",
+            "label": "Small Asteroid",
+            "kind": "polygon",
+            "usage": [
+              "gameplay",
+              "collision"
+            ],
+            "viewBox": "-18 -18 36 36",
+            "paths": [
+              "M -10 -6 L 0 -12 L 10 -6 L 8 8 L -6 10 L -12 0 Z"
+            ],
+            "points": [
+              {
+                "x": -10,
+                "y": -6
+              },
               {
                 "x": 0,
+                "y": -12
+              },
+              {
+                "x": 10,
+                "y": -6
+              },
+              {
+                "x": 8,
                 "y": 8
               },
               {
-                "x": -14,
-                "y": 16
+                "x": -6,
+                "y": 10
+              },
+              {
+                "x": -12,
+                "y": 0
               }
             ]
           },
@@ -557,7 +646,7 @@
                 "points": [
                   {
                     "x": 0,
-                    "y": -18
+                    "y": -16
                   },
                   {
                     "x": 14,
@@ -1310,86 +1399,6 @@
             "x": 0,
             "y": 0
           }
-        },
-        {
-          "id": "object.asteroids.medium-asteroid-2",
-          "name": "Medium Asteroid 2",
-          "shapes": [
-            {
-              "tool": "polygon",
-              "order": 0,
-              "visible": true,
-              "locked": false,
-              "geometry": {
-                "points": [
-                  {
-                    "x": -16,
-                    "y": -10
-                  },
-                  {
-                    "x": -2,
-                    "y": -18
-                  },
-                  {
-                    "x": 16,
-                    "y": -14
-                  },
-                  {
-                    "x": 20,
-                    "y": 2
-                  },
-                  {
-                    "x": 8,
-                    "y": 18
-                  },
-                  {
-                    "x": -10,
-                    "y": 16
-                  },
-                  {
-                    "x": -20,
-                    "y": 4
-                  }
-                ]
-              },
-              "style": {
-                "fill": "transparent",
-                "stroke": "#CBD5E1",
-                "strokeWidth": 2,
-                "fillOpacity": 1,
-                "strokeOpacity": 1
-              },
-              "transform": {
-                "x": 0,
-                "y": 0,
-                "rotation": 0,
-                "scaleX": 1,
-                "scaleY": 1
-              }
-            }
-          ],
-          "states": [
-            {
-              "id": "active",
-              "name": "Active",
-              "frames": [
-                {
-                  "id": "frame-1",
-                  "order": 0,
-                  "durationFrames": 1,
-                  "shapeOverrides": []
-                }
-              ]
-            }
-          ],
-          "tags": [
-            "asteroid",
-            "medium"
-          ],
-          "objectOrigin": {
-            "x": 0,
-            "y": 0
-          }
         }
       ]
     },
diff --git a/tests/games/AsteroidsAssetReferenceAdoption.test.mjs b/tests/games/AsteroidsAssetReferenceAdoption.test.mjs
@@ -82,10 +82,6 @@ export async function run() {
     roleBindings: vectorMaps.objectVectorRoles
   });
   assert.equal(missingMediumValidation.ok, false);
-  assert.equal(missingMediumValidation.errors.some((entry) => (
-    entry.message.includes("requires object object.asteroids.medium-asteroid")
-    && entry.details.candidates.some((candidate) => candidate.includes("object.asteroids.medium-asteroid-2"))
-  )), true);
   assert.equal(missingMediumValidation.errors.some((entry) => (
     entry.message.includes("manifest binding requires object object.asteroids.medium-asteroid")
   )), true);
diff --git a/tests/games/AsteroidsValidation.test.mjs b/tests/games/AsteroidsValidation.test.mjs
@@ -23,6 +23,9 @@ import {
   loadAsteroidsVectorMapsFromManifest
 } from '../../games/Asteroids/game/asteroidsVectorMaps.js';
 
+const ASTEROIDS_MEDIUM_ASTEROID_VECTOR_MAP_ID = 'vector.asteroids.asteroid.medium';
+const ASTEROIDS_SMALL_ASTEROID_VECTOR_MAP_ID = 'vector.asteroids.asteroid.small';
+
 function createCanvas() {
   const listeners = new Map();
   const canvas = {
@@ -159,6 +162,8 @@ export async function run() {
   const manifestVectorIds = objectVectorPayload.vectorMaps.vectors.map((vector) => vector.id);
   assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.bullet), true);
   assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ship), true);
+  assert.equal(manifestVectorIds.includes(ASTEROIDS_MEDIUM_ASTEROID_VECTOR_MAP_ID), true);
+  assert.equal(manifestVectorIds.includes(ASTEROIDS_SMALL_ASTEROID_VECTOR_MAP_ID), true);
   assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ufoLarge), true);
   assert.equal(manifestVectorIds.includes(ASTEROIDS_VECTOR_MAP_IDS.ufoSmall), true);
   assert.equal(manifestVectorIds.includes('vector.asteroids.ship.collision'), false);
@@ -195,17 +200,53 @@ export async function run() {
   assert.deepEqual(
     vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.ship).points,
     [
-      { x: 0, y: -18 },
-      { x: 14, y: 16 },
-      { x: 0, y: 8 },
-      { x: -14, y: 16 },
+      { x: 14, y: 0 },
+      { x: -10, y: -8 },
+      { x: -6, y: -3 },
+      { x: -6, y: 3 },
+      { x: -10, y: 8 },
+      { x: 14, y: 0 },
     ],
   );
   assert.deepEqual(
     vectorMaps.vectorsById.get(ASTEROIDS_VECTOR_MAP_IDS.ship).paths,
     [
-      'M 0 -18 L 14 16 L 0 8 L -14 16 Z',
-      'M -6 14 L 0 6 L 6 14',
+      'M 14 0 L -10 -8 L -6 -3 L -6 3 L -10 8 L 14 0',
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_MEDIUM_ASTEROID_VECTOR_MAP_ID).points,
+    [
+      { x: -16, y: -10 },
+      { x: -2, y: -18 },
+      { x: 16, y: -14 },
+      { x: 20, y: 2 },
+      { x: 8, y: 18 },
+      { x: -10, y: 16 },
+      { x: -20, y: 4 },
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_MEDIUM_ASTEROID_VECTOR_MAP_ID).paths,
+    [
+      'M -16 -10 L -2 -18 L 16 -14 L 20 2 L 8 18 L -10 16 L -20 4 Z',
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_SMALL_ASTEROID_VECTOR_MAP_ID).points,
+    [
+      { x: -10, y: -6 },
+      { x: 0, y: -12 },
+      { x: 10, y: -6 },
+      { x: 8, y: 8 },
+      { x: -6, y: 10 },
+      { x: -12, y: 0 },
+    ],
+  );
+  assert.deepEqual(
+    vectorMaps.vectorsById.get(ASTEROIDS_SMALL_ASTEROID_VECTOR_MAP_ID).paths,
+    [
+      'M -10 -6 L 0 -12 L 10 -6 L 8 8 L -6 10 L -12 0 Z',
     ],
   );
   assert.deepEqual(
@@ -221,12 +262,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: 0, y: -18 },
+    { x: 0, y: -16 },
     { x: 14, y: 16 },
     { x: 0, y: 8 },
     { x: -14, y: 16 },
   ]);
-  const mediumAsteroidVariant = loadAsteroidsObjectVectorPayload().objects.find((object) => object.id === 'object.asteroids.medium-asteroid-2');
+  const mediumAsteroidVariant = loadAsteroidsObjectVectorPayload().objects.find((object) => object.id === 'object.asteroids.medium-asteroid');
   assert.deepEqual(mediumAsteroidVariant.shapes[0].geometry.points, [
     { x: -16, y: -10 },
     { x: -2, y: -18 },
diff --git a/tests/games/AsteroidsVectorTransforms.test.mjs b/tests/games/AsteroidsVectorTransforms.test.mjs
@@ -31,10 +31,10 @@ export function run() {
   });
   ship.angle = Math.PI / 2;
   const shipPoints = ship.getPoints();
-  assert.equal(shipPoints.length, 4);
-  assertPointClose(shipPoints[0], { x: 118, y: 200 });
-  assertPointClose(shipPoints[1], { x: 84, y: 214 });
-  assertPointClose(shipPoints[3], { x: 84, y: 186 });
+  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 });
 
   const asteroid = new Asteroid(320, 240, 3, () => 0.5, asteroidGeometryProfiles);
   asteroid.angle = 0;
