Merge branch 'main' into kurt-2833

e2e/playwright/flow-tests.spec.ts

@@ -4317,7 +4317,7 @@ test.describe('Sketch tests', () => {
     await expect(page.locator('.cm-content'))
       .toHaveText(`const sketch001 = startSketchOn('XZ')
     |> startProfileAt([6.44, -12.07], %)
-    |> line([14.72, 2.01], %)
+    |> line([14.72, 1.97], %)
     |> tangentialArcTo([24.95, -5.38], %)
     |> line([1.97, 2.06], %)
     |> close(%)

src/clientSideScene/CameraControls.ts

@@ -538,7 +538,7 @@ export class CameraControls {
     return this.camera
   }
 
-  dollyZoom = async (newFov: number, splitEngineCalls = false) => {
+  dollyZoom = async (newFov: number) => {
     if (!(this.camera instanceof PerspectiveCamera)) {
       console.warn('Dolly zoom is only applicable to perspective cameras.')
       return
@@ -589,48 +589,21 @@ export class CameraControls {
     this.camera.near = z_near
     this.camera.far = z_far
 
-    if (splitEngineCalls) {
+    await this.engineCommandManager.sendSceneCommand({
-      await this.engineCommandManager.sendSceneCommand({
+      type: 'modeling_cmd_req',
-        type: 'modeling_cmd_req',
+      cmd_id: uuidv4(),
-        cmd_id: uuidv4(),
+      cmd: {
-        cmd: {
+        type: 'default_camera_perspective_settings',
-          type: 'default_camera_look_at',
+        ...convertThreeCamValuesToEngineCam({
-          ...convertThreeCamValuesToEngineCam({
+          isPerspective: true,
-            isPerspective: true,
+          position: newPosition,
-            position: newPosition,
+          quaternion: this.camera.quaternion,
-            quaternion: this.camera.quaternion,
+          zoom: this.camera.zoom,
-            zoom: this.camera.zoom,
+          target: this.target,
-            target: this.target,
+        }),
-          }),
+        fov_y: newFov,
-        },
+      },
-      })
+    })
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_set_perspective',
-          parameters: {
-            fov_y: newFov,
-          },
-        },
-      })
-    } else {
-      await this.engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: {
-          type: 'default_camera_perspective_settings',
-          ...convertThreeCamValuesToEngineCam({
-            isPerspective: true,
-            position: newPosition,
-            quaternion: this.camera.quaternion,
-            zoom: this.camera.zoom,
-            target: this.target,
-          }),
-          fov_y: newFov,
-        },
-      })
-    }
   }
 
   update = (forceUpdate = false) => {
@@ -1035,29 +1008,6 @@ export class CameraControls {
         .onComplete(onComplete)
         .start()
     })
-  snapToPerspectiveBeforeHandingBackControlToEngine = async (
-    targetCamUp = new Vector3(0, 0, 1)
-  ) => {
-    if (this.syncDirection === 'engineToClient') {
-      console.warn(
-        'animate To Perspective not design to work with engineToClient syncDirection.'
-      )
-    }
-    this.isFovAnimationInProgress = true
-    const targetFov = this.fovBeforeOrtho // Target FOV for perspective
-    this.lastPerspectiveFov = 4
-    let currentFov = 4
-    const initialCameraUp = this.camera.up.clone()
-    this.usePerspectiveCamera()
-    const tempVec = new Vector3()
-
-    currentFov = this.lastPerspectiveFov + (targetFov - this.lastPerspectiveFov)
-    const currentUp = tempVec.lerpVectors(initialCameraUp, targetCamUp, 1)
-    this.camera.up.copy(currentUp)
-    await this.dollyZoom(currentFov, true)
-
-    this.isFovAnimationInProgress = false
-  }
 
   get reactCameraProperties(): ReactCameraProperties {
     return {

src/components/ModelingMachineProvider.tsx

@@ -129,7 +129,16 @@ export const ModelingMachineProvider = ({
         },
         'sketch exit execute': ({ store }) => {
           ;(async () => {
-            await sceneInfra.camControls.snapToPerspectiveBeforeHandingBackControlToEngine()
+            await engineCommandManager.sendSceneCommand({
+              type: 'modeling_cmd_req',
+              cmd_id: uuidv4(),
+              cmd: {
+                type: 'default_camera_set_perspective',
+                parameters: {
+                  fov_y: 45,
+                },
+              },
+            })
 
             sceneInfra.camControls.syncDirection = 'engineToClient'