mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
fix(wildlife): the reveal pan eases quadratic out again
The pan used Cesium's QUADRATIC_OUT; through the camera port it took cubicOut, the contract's nearest ease. The contract gains quadraticOut, which Cesium maps to QUADRATIC_OUT and the stub camera computes.
This commit is contained in:
1 parent
4b665147e1
commit
aebb3e79c3
6 files changed
+11
-2
No files matched your search
@@ -41,6 +41,7 @@ export const EASINGS = Object.freeze({
|
|||||||
quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT,
|
quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT,
|
||||||
cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT,
|
cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT,
|
||||||
cubicOut: Cesium.EasingFunction.CUBIC_OUT,
|
cubicOut: Cesium.EasingFunction.CUBIC_OUT,
|
||||||
|
quadraticOut: Cesium.EasingFunction.QUADRATIC_OUT,
|
||||||
quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT,
|
quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT,
|
||||||
sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT,
|
sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ const EASINGS = {
|
|||||||
quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT,
|
quadraticInOut: Cesium.EasingFunction.QUADRATIC_IN_OUT,
|
||||||
cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT,
|
cubicInOut: Cesium.EasingFunction.CUBIC_IN_OUT,
|
||||||
cubicOut: Cesium.EasingFunction.CUBIC_OUT,
|
cubicOut: Cesium.EasingFunction.CUBIC_OUT,
|
||||||
|
quadraticOut: Cesium.EasingFunction.QUADRATIC_OUT,
|
||||||
quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT,
|
quinticInOut: Cesium.EasingFunction.QUINTIC_IN_OUT,
|
||||||
sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT,
|
sineInOut: Cesium.EasingFunction.SINUSOIDAL_IN_OUT,
|
||||||
};
|
};
|
||||||
|
|||||||
Vendored
+1
@@ -90,6 +90,7 @@ export type Easing =
|
|||||||
| 'quadraticInOut'
|
| 'quadraticInOut'
|
||||||
| 'cubicInOut'
|
| 'cubicInOut'
|
||||||
| 'cubicOut'
|
| 'cubicOut'
|
||||||
|
| 'quadraticOut'
|
||||||
| 'quinticInOut'
|
| 'quinticInOut'
|
||||||
| 'sineInOut';
|
| 'sineInOut';
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ const EASINGS = {
|
|||||||
cubicInOut: (t) => (t < 0.5 ? 4 * t * t * t : 1 - (-2 * t + 2) ** 3 / 2),
|
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),
|
quinticInOut: (t) => (t < 0.5 ? 16 * t ** 5 : 1 - (-2 * t + 2) ** 5 / 2),
|
||||||
cubicOut: (t) => (t - 1) ** 3 + 1,
|
cubicOut: (t) => (t - 1) ** 3 + 1,
|
||||||
|
quadraticOut: (t) => t * (2 - t),
|
||||||
sineInOut: (t) => 0.5 * (1 - Math.cos(Math.PI * t)),
|
sineInOut: (t) => 0.5 * (1 - Math.cos(Math.PI * t)),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import '../testSupport/registerDom.mjs';
|
import '../testSupport/registerDom.mjs';
|
||||||
import assert from 'node:assert/strict';
|
import assert from 'node:assert/strict';
|
||||||
|
import * as Cesium from 'cesium';
|
||||||
import test from 'node:test';
|
import test from 'node:test';
|
||||||
import { fromDegrees, toLonLatH } from '../geo/ellipsoid.js';
|
import { fromDegrees, toLonLatH } from '../geo/ellipsoid.js';
|
||||||
import { bindWildlifeViewer } from '../testSupport/wildlifeViewer.mjs';
|
import { bindWildlifeViewer } from '../testSupport/wildlifeViewer.mjs';
|
||||||
@@ -510,6 +511,11 @@ test('the camera correction preserves altitude and orientation and honors reduce
|
|||||||
roll: 0.1,
|
roll: 0.1,
|
||||||
});
|
});
|
||||||
assert.equal(flight.duration, reduced ? 0 : 0.22);
|
assert.equal(flight.duration, reduced ? 0 : 0.22);
|
||||||
|
assert.equal(
|
||||||
|
flight.easingFunction,
|
||||||
|
Cesium.EasingFunction.QUADRATIC_OUT,
|
||||||
|
'eased as before',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -255,8 +255,7 @@ export function panWildlifeSighting(viewer, from, to, reducedMotion = false) {
|
|||||||
roll: pose.roll,
|
roll: pose.roll,
|
||||||
},
|
},
|
||||||
durationS: reducedMotion ? 0 : 0.22,
|
durationS: reducedMotion ? 0 : 0.22,
|
||||||
// The contract's nearest ease-out to a quadratic one.
|
easing: 'quadraticOut',
|
||||||
easing: 'cubicOut',
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in new issue
Block a user