diff --git a/src/render/cesium/camera.js b/src/render/cesium/camera.js index b717ef771..ffe67ef7e 100644 --- a/src/render/cesium/camera.js +++ b/src/render/cesium/camera.js @@ -41,6 +41,7 @@ export const EASINGS = Object.freeze({ quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT, cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT, cubicOut: Cesium.EasingFunction.CUBIC_OUT, + quadraticOut: Cesium.EasingFunction.QUADRATIC_OUT, quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT, sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT, }); diff --git a/src/render/cesium/cameraGoldens.js b/src/render/cesium/cameraGoldens.js index 4b74e4ff0..58d86f6bc 100644 --- a/src/render/cesium/cameraGoldens.js +++ b/src/render/cesium/cameraGoldens.js @@ -38,6 +38,7 @@ const EASINGS = { quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT, cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT, cubicOut: Cesium.EasingFunction.CUBIC_OUT, + quadraticOut: Cesium.EasingFunction.QUADRATIC_OUT, quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT, sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT, }; diff --git a/src/render/contract/camera.d.ts b/src/render/contract/camera.d.ts index ae87e7f8e..7e30a495a 100644 --- a/src/render/contract/camera.d.ts +++ b/src/render/contract/camera.d.ts @@ -90,6 +90,7 @@ export type Easing = | 'quadraticInOut' | 'cubicInOut' | 'cubicOut' + | 'quadraticOut' | 'quinticInOut' | 'sineInOut'; diff --git a/src/render/stub/camera.js b/src/render/stub/camera.js index 853cf90cf..bb5b2d5d6 100644 --- a/src/render/stub/camera.js +++ b/src/render/stub/camera.js @@ -64,6 +64,7 @@ const EASINGS = { cubicInOut: (t) => (t < 0.5 ? 4 * t * t * t : 1 - (-2 * t + 2) ** 3 / 2), quinticInOut: (t) => (t < 0.5 ? 16 * t ** 5 : 1 - (-2 * t + 2) ** 5 / 2), cubicOut: (t) => (t - 1) ** 3 + 1, + quadraticOut: (t) => t * (2 - t), sineInOut: (t) => 0.5 * (1 - Math.cos(Math.PI * t)), }; diff --git a/src/ui/wildlifeSightingCard.test.mjs b/src/ui/wildlifeSightingCard.test.mjs index 5a78297fc..30c6cb3e0 100644 --- a/src/ui/wildlifeSightingCard.test.mjs +++ b/src/ui/wildlifeSightingCard.test.mjs @@ -1,5 +1,6 @@ import '../testSupport/registerDom.mjs'; import assert from 'node:assert/strict'; +import * as Cesium from 'cesium'; import test from 'node:test'; import { fromDegrees, toLonLatH } from '../geo/ellipsoid.js'; import { bindWildlifeViewer } from '../testSupport/wildlifeViewer.mjs'; @@ -510,6 +511,11 @@ test('the camera correction preserves altitude and orientation and honors reduce roll: 0.1, }); assert.equal(flight.duration, reduced ? 0 : 0.22); + assert.equal( + flight.easingFunction, + Cesium.EasingFunction.QUADRATIC_OUT, + 'eased as before', + ); } }); diff --git a/src/ui/wildlifeSightingPlacement.js b/src/ui/wildlifeSightingPlacement.js index 295e4ea63..9c5516abb 100644 --- a/src/ui/wildlifeSightingPlacement.js +++ b/src/ui/wildlifeSightingPlacement.js @@ -255,8 +255,7 @@ export function panWildlifeSighting(viewer, from, to, reducedMotion = false) { roll: pose.roll, }, durationS: reducedMotion ? 0 : 0.22, - // The contract's nearest ease-out to a quadratic one. - easing: 'cubicOut', + easing: 'quadraticOut', }, ); return true;