#8737 Align ortho camera to new engine camera (#8772)

* align ortho camera to new engine camera

* Update snapshots

* use viewHeightFactor

* fmt

* Fix up "drag to edit circle" test

* Fix up "multiple sketches" test

* Fix up "and can be continued" test

* Fix up distance between constraint test

* Fix up "perpendicular distance" test

* Fix "scale other than default in sketch mode" test

* fix test: Shift-click to select and deselect sketch segments

* fmt

* snap-to-grid test fixed

* fix clickYAxis (broke with new camera zoom

* fix some constraint tests

* Test Length constraint fixes

* Update two segment horizontal align test

* Update two segment constraint tests

* Fix Many segments - no modal constraints tests

* fix Snap To X/Y constraint tests: clicking on axis broke

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Frank Noirot <[email protected]>
Co-authored-by: David Reeves <[email protected]>

Author: 4 people

e2e/playwright/fixtures/sceneFixture.ts

@@ -318,7 +318,7 @@ export class SceneFixture {
   clickYAxis = async () => {
     const pointOnYAxis = await this.convertPagePositionToStream(
       0.5,
-      0.25,
+      0.7,
       'ratio'
     )
     await this.page.mouse.click(pointOnYAxis.x, pointOnYAxis.y)

e2e/playwright/point-click.spec.ts

@@ -653,8 +653,8 @@ openSketch = startSketchOn(XY)
     // Colors
     // @pierremtb: had to tone these colors down a bit after the engine zoom fix
     // in https://github.com/KittyCAD/engine/pull/3804, unclear why
-    const edgeColorWhite: [number, number, number] = [150, 150, 150]
-    const edgeColorBlue: [number, number, number] = [10, 10, 150]
+    const edgeColorWhite: [number, number, number] = [230, 230, 230]
+    const edgeColorBlue: [number, number, number] = [23, 10, 247]
     const backgroundColor: [number, number, number] = [30, 30, 30]
     const tolerance = 50
     const timeout = 150

e2e/playwright/regression-tests.spec.ts

@@ -7,6 +7,7 @@ import * as fsp from 'fs/promises'
 import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from '@e2e/playwright/storageStates'
 import type { TestColor } from '@e2e/playwright/test-utils'
 import {
+  NUMBER_REGEXP,
   TEST_COLORS,
   executorInputPath,
   getUtils,
@@ -822,7 +823,9 @@ washer = extrude(washerSketch, length = thicknessMax)`
 
       // Just verify that the radius is the correct order of magnitude
       await editor.expectEditor.toContain(
-        /circle\(sketch001, center = \[0\.04, -0\.06\], radius = 0\.\d+/
+        new RegExp(
+          `circle\\(sketch001, center = \\[${NUMBER_REGEXP}, ${NUMBER_REGEXP}\\], radius = 0\\.\\d+`
+        )
       )
     })
 

e2e/playwright/sketch-tests.spec.ts

@@ -307,23 +307,21 @@ profile001 = startProfile(sketch001, at = [0.0, 0.0])`
     })
 
     await test.step('drag circle radius handle', async () => {
-      const magicYOnCircle = 0.8
+      const magicYOnCircle = 0.68
       const fromPoint = { x: 0.5, y: magicYOnCircle }
       const toPoint = [fromPoint.x / 2, magicYOnCircle] as const
       const [dragRadiusHandle] = scene.makeDragHelpers(...toPoint, {
         debug: true,
         format: 'ratio',
       })
       await dragRadiusHandle({ fromPoint })
-      await editor.expectEditor.not.toContain(prevContent)
-      prevContent = await editor.getCurrentCode()
     })
 
     await test.step('expect the code to have changed', async () => {
+      await editor.expectEditor.not.toContain(prevContent)
       await editor.expectEditor.toContain(
-        `sketch001 = startSketchOn(XZ)
-    |> circle(center = [-0.18, 0.12], radius = 0.54)`,
-        { shouldNormalise: true }
+        new RegExp(`sketch001 = startSketchOn(XZ)
+    |> circle\\(center = \\[${NUMBER_REGEXP}, ${NUMBER_REGEXP}\\], radius = ${NUMBER_REGEXP}\\)`)
       )
     })
   })
@@ -404,10 +402,7 @@ sketch001 = startSketchOn(XZ)
     await editor.expectEditor.toContain(`|> xLine(length =`)
 
     await click00r(0, 50)
-    // @pierremtb: this used to create a yLine before the engine zoom fix
-    // in https://github.com/KittyCAD/engine/pull/3804. I updated it to a line call
-    // since it doesn't change the test objective
-    await editor.expectEditor.toContain(`|> line(`)
+    await editor.expectEditor.toContain(`|> yLine(`)
 
     // exit the sketch, reset relative clicker
     await click00r(undefined, undefined)
@@ -1567,7 +1562,9 @@ profile002 = startProfile(sketch002, at = [0, 52.55])
     await nextPoint()
     await editor.openPane()
     // A regex that just confirms the new segment is a line in a pipe
-    await expect(editor.codeContent).toContainText(/52\.55\]\)\s+\|\>\s+line\(/)
+    await expect(editor.codeContent).toContainText(
+      new RegExp(`${NUMBER_REGEXP}\\]\\)\\s+|>\\s+line\\(`)
+    )
   })
   test('old style sketch all in one pipe (with extrude) will break up to allow users to add a new profile to the same sketch', async ({
     homePage,

e2e/playwright/snap-to-grid.spec.ts

@@ -11,6 +11,18 @@ test.describe('Snap to Grid', () => {
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
 
+    await page.waitForTimeout(1000)
+
+    // Ensure Fixed size grid is ON via Command Bar
+    const commands = page.getByRole('button', { name: 'Commands' })
+    await commands.click()
+    await page
+      .getByRole('option', {
+        name: 'Settings · modeling · fixed size grid',
+      })
+      .click()
+    await page.getByRole('option', { name: 'On', exact: true }).click()
+
     // Enter sketch mode and select a default axis from the Feature Tree
     await toolbar.startSketchBtn.click()
     await toolbar.openFeatureTreePane()
@@ -37,6 +49,6 @@ test.describe('Snap to Grid', () => {
     await clickB()
 
     // Check if snapping is working
-    await editor.expectEditor.toContain('line(end = [0.15, 0.1])')
+    await editor.expectEditor.toContain('line(end = [0.25, 0.25])')
   })
 })

e2e/playwright/snapshot-tests.spec.ts-snapshots/Client-side-scene-scale-should-match-engine-scale-Inch-scale-1-Google-Chrome-linux.png

@@ -148,13 +148,7 @@ test.describe('Testing constraints', () => {
         |> line(end = [74.36, 130.4], tag = $seg01)
         |> line(end = [78.92, -120.11])
         |> angledLine(angle = segAng(seg01), length = 78.33)
-        |> line(end = [51.19, 48.97])
-      part002 = startSketchOn(XZ)
-        |> startProfile(at = [299.05, 231.45])
-        |> xLine(length = -425.34, tag = $seg_what)
-        |> yLine(length = -264.06)
-        |> xLine(length = segLen(seg_what))
-        |> line(endAbsolute = [profileStartX(%), profileStartY(%)])`
+        |> line(end = [51.19, 48.97])`
           )
         })
         const u = await getUtils(page)
@@ -265,13 +259,7 @@ test.describe('Testing constraints', () => {
         |> line(end = [74.36, 130.4])
         |> line(end = [78.92, -120.11])
         |> line(end = [9.16, 77.79])
-        |> line(end = [51.19, 48.97])
-      part002 = startSketchOn(XZ)
-        |> startProfile(at = [299.05, 231.45])
-        |> xLine(length = -425.34, tag = $seg_what)
-        |> yLine(length = -264.06)
-        |> xLine(length = segLen(seg_what))
-        |> line(endAbsolute = [profileStartX(%), profileStartY(%)])`
+        |> line(end = [51.19, 48.97])`
           )
         })
         const u = await getUtils(page)
@@ -574,13 +562,13 @@ profile001 = startProfile(sketch001, at = [-70, -10])
         testName: 'Angle - Add variable',
         addVariable: true,
         constraint: 'angle',
-        value: 'angle001, 78.33',
+        value: 'angle001, 102.05',
       },
       {
         testName: 'Angle - No variable',
         addVariable: false,
         constraint: 'angle',
-        value: '83deg, 78.33',
+        value: '73deg, 102.05',
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
@@ -594,8 +582,8 @@ profile001 = startProfile(sketch001, at = [-70, -10])
         |> startProfile(at = [-7.54, -26.74])
         |> line(end = [74.36, 130.4])
         |> line(end = [78.92, -120.11])
-        |> line(end = [9.16, 77.79])
-        |> line(end = [51.19, 48.97])
+        |> line(end = [29.16, 97.79])
+        |> line(end = [81.19, 68.97])
       part002 = startSketchOn(XZ)
         |> startProfile(at = [299.05, 231.45])
         |> xLine(length = -425.34, tag = $seg_what)
@@ -650,13 +638,13 @@ profile001 = startProfile(sketch001, at = [-70, -10])
         testName: 'Length - Add variable',
         addVariable: true,
         constraint: 'length',
-        value: '83deg, length001',
+        value: '73deg, length001',
       },
       {
         testName: 'Length - No variable',
         addVariable: false,
         constraint: 'length',
-        value: '83deg, 78.33',
+        value: '73deg, 102.05',
       },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
@@ -684,8 +672,8 @@ part001 = startSketchOn(XZ)
   |> startProfile(at = [-7.54, -26.74])
   |> line(end = [74.36, 130.4])
   |> line(end = [78.92, -120.11])
-  |> line(end = [9.16, 77.79])
-  |> line(end = [51.19, 48.97])
+  |> line(end = [29.16, 97.79])
+  |> line(end = [81.19, 68.97])
 part002 = startSketchOn(XZ)
   |> startProfile(at = [299.05, 231.45])
   |> xLine(length = -425.34, tag = $seg_what)
@@ -720,7 +708,7 @@ part002 = startSketchOn(XZ)
             await cmdBarKclVariableNameInput.press('Backspace')
           })
         }
-        await expect(cmdBarKclInput).toHaveText('78.33')
+        await expect(cmdBarKclInput).toHaveText('102.05')
         await page.waitForTimeout(500)
         const [ang, len] = value.split(', ')
         await cmdBar.continue()
@@ -741,15 +729,15 @@ part002 = startSketchOn(XZ)
         constraintName: 'Vertical',
         codeAfter: [
           `|> yLine(length = 130.4)`,
-          `|> yLine(length = 77.79)`,
-          `|> yLine(length = 48.97)`,
+          `|> yLine(length = 97.79)`,
+          `|> yLine(length = 78.97)`,
         ],
       },
       {
         codeAfter: [
           `|> xLine(length = 74.36)`,
-          `|> xLine(length = 9.16)`,
-          `|> xLine(length = 51.19)`,
+          `|> xLine(length = 29.16)`,
+          `|> xLine(length = 81.19)`,
         ],
         constraintName: 'Horizontal',
       },
@@ -765,8 +753,8 @@ part002 = startSketchOn(XZ)
         |> startProfile(at = [-7.54, -26.74])
         |> line(end = [74.36, 130.4])
         |> line(end = [78.92, -120.11])
-        |> line(end = [9.16, 77.79])
-        |> line(end = [51.19, 48.97])
+        |> line(end = [29.16, 97.79])
+        |> line(end = [81.19, 78.97])
       part002 = startSketchOn(XZ)
         |> startProfile(at = [299.05, 231.45])
         |> xLine(length = -425.34, tag = $seg_what)
@@ -834,19 +822,19 @@ part002 = startSketchOn(XZ)
   test.describe('Two segment - no modal constraints', () => {
     const cases = [
       {
-        codeAfter: `|> angledLine(angle = 83deg, length = segLen(seg01))`,
+        codeAfter: `|> angledLine(angle = 73deg, length = segLen(seg01))`,
         constraintName: 'Equal Length',
       },
       {
-        codeAfter: `|> angledLine(angle = segAng(seg01), length = 78.33)`,
+        codeAfter: `|> angledLine(angle = segAng(seg01), length = 102.05)`,
         constraintName: 'Parallel',
       },
       {
-        codeAfter: `|> line(endAbsolute = [segEndX(seg01), 61.34])`,
+        codeAfter: `|> line(endAbsolute = [segEndX(seg01), 81.34])`,
         constraintName: 'Vertically Align',
       },
       {
-        codeAfter: `|> line(endAbsolute = [154.9, segEndY(seg01)])`,
+        codeAfter: `|> line(endAbsolute = [174.9, segEndY(seg01)])`,
         constraintName: 'Horizontally Align',
       },
     ] as const
@@ -861,7 +849,7 @@ part002 = startSketchOn(XZ)
         |> startProfile(at = [-7.54, -26.74])
         |> line(end = [74.36, 130.4])
         |> line(end = [78.92, -120.11])
-        |> line(end = [9.16, 77.79])
+        |> line(end = [29.16, 97.79])
       part002 = startSketchOn(XZ)
         |> startProfile(at = [299.05, 231.45])
         |> xLine(length = -425.34, tag = $seg_what)
@@ -923,7 +911,7 @@ part002 = startSketchOn(XZ)
     const cases = [
       {
         codeAfter: /\|> line\(endAbsolute = \[\d+(\.\d+)?, turns::ZERO/,
-        axisClick: { x: 0.75, y: 0.5 },
+        axisClick: { x: 0.25, y: 0.5 },
         constraintName: 'Snap To X',
       },
       {