Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/IOViewer/Viewer/dist/viewer.js

Large diffs are not rendered by default.

29 changes: 19 additions & 10 deletions src/IOViewer/Viewer/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,34 +148,43 @@ function start(data, context) {

const picker = new Picker(renderer, scene, camera, { pickFloat: testOptions.pickFloat });
const measureSnap = new MeasureSnap(picker, sections, data);
let measureFrame = 0, hoverX, hoverY;
let measureFrame = 0, measureHover = null;
function clearMeasurePreview() {
cancelAnimationFrame(measureFrame);
measureFrame = 0;
measureHover = null;
measure.setPreview(null);
}
canvas.addEventListener('pointermove', (e) => {
if (!measure.active || e.buttons) return clearMeasurePreview();
hoverX = e.clientX;
hoverY = e.clientY;
if (measureFrame) return;
function updateMeasurePreview() {
measureFrame = 0;
if (measureHover) measure.setPreview(measureSnap.target(...measureHover));
}
function refreshMeasurePreview() {
if (!measureHover) return;
measure.setPreview(null);
cancelAnimationFrame(measureFrame);
// Wait for a frame without another view change before reading the pick tile.
measureFrame = requestAnimationFrame(() => {
measureFrame = 0;
measure.setPreview(measureSnap.target(hoverX, hoverY));
measureFrame = requestAnimationFrame(updateMeasurePreview);
});
}
canvas.addEventListener('pointermove', (e) => {
if (!measure.active || e.buttons) return clearMeasurePreview();
measureHover = [e.clientX, e.clientY];
if (!measureFrame) measureFrame = requestAnimationFrame(updateMeasurePreview);
});
for (const event of ['pointerdown', 'pointerleave', 'pointercancel', 'webglcontextlost'])
canvas.addEventListener(event, clearMeasurePreview);
scene.root.addEventListener('change', (e) => {
if (e.detail.kind !== 'appearance') clearMeasurePreview();
if (e.detail.kind !== 'appearance') refreshMeasurePreview();
});
const controls = new NavigationControls(camera, canvas, {
pick: (x, y) => picker.pick(x, y)?.point ?? null,
visibleBox: () => scene.visibleBox(),
});
controls.addEventListener('change', () => {
picker.camera = controls.camera; // swaps with the projection
clearMeasurePreview();
refreshMeasurePreview();
requestRender();
});
scene.root.addEventListener('change', (e) => {
Expand Down
52 changes: 46 additions & 6 deletions src/IOViewer/Viewer/test/e2e/measure-snap.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,25 @@ for (const instanced of [false, true]) {
});
await page.goto(pathToFileURL(path.join(viewerDir, 'test-results', 'measure-snap.html')).href);
await page.evaluate(() => window.__ioviewer.ready);
await page.evaluate(() => {
const { controls, measure, scene } = window.__ioviewer;
const log = window.measureHoverLog = [];
const note = (event, value) => {
log.push([event, value]);
if (log.length > 30) log.shift();
};
for (const type of ['pointermove', 'pointerleave', 'pointercancel']) {
window.addEventListener(type, (event) => {
if (event.target?.id !== 'ioviewer-canvas') return;
note(type, [event.isTrusted, event.clientX, event.clientY, event.buttons]);
// Only the browser's native clicks own the desktop pointer in this test.
if (event.isTrusted && window.measureTestHover) event.stopImmediatePropagation();
}, true);
}
controls.addEventListener('change', () => note('camera', [controls.camera.zoom, innerWidth, innerHeight]));
scene.root.addEventListener('change', (event) => note('scene', event.detail.kind));
measure.addEventListener('previewchange', () => note('preview', measure.preview?.kind ?? null));
});
const instances = await page.evaluate(() => {
const { scene, controls } = window.__ioviewer;
scene.setVisible([1], false);
Expand Down Expand Up @@ -37,21 +56,42 @@ for (const instanced of [false, true]) {
const [vertex, midpoint, edge, face] = points;
const distance = page.locator('.ioviewer-tool[data-tool="distance"]');
const marker = page.locator('.ioviewer-measure-preview');
const canvas = page.locator('#ioviewer-canvas');
await distance.click();

async function previewAt(x, y) {
await page.evaluate(() => { window.measureTestHover = true; });
await canvas.dispatchEvent('pointermove', { clientX: x, clientY: y, pointerType: 'mouse' });
await page.evaluate(() => new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve))));
}

async function clickAt(x, y) {
await page.evaluate(() => { window.measureTestHover = false; });
await page.mouse.click(x, y);
await distance.hover();
}

async function hover([x, y], dx, dy, kind) {
await page.mouse.move(x + dx, y + dy);
await expect(marker).toBeVisible();
await expect(marker).toHaveAttribute('data-kind', kind);
await previewAt(x + dx, y + dy);
try {
await expect(marker).toBeVisible();
await expect(marker).toHaveAttribute('data-kind', kind);
} catch (error) {
const log = await page.evaluate(() => window.measureHoverLog);
throw new Error(`Expected ${kind} at (${x + dx}, ${y + dy}). Hover events: ${JSON.stringify(log)}`, { cause: error });
}
}

await hover(vertex, 5, -3, 'vertex');
await page.evaluate(() => window.__ioviewer.controls.resize());
await expect(marker).toBeVisible();
await expect(marker).toHaveAttribute('data-kind', 'vertex');
const preview = () => page.evaluate(() => window.__ioviewer.measure.preview?.point.toArray());
const first = await preview();
await page.mouse.click(vertex[0] + 5, vertex[1] - 3);
await clickAt(vertex[0] + 5, vertex[1] - 3);
await hover(midpoint, 0, -3, 'midpoint');
const second = await preview();
await page.mouse.click(midpoint[0], midpoint[1] - 3);
await clickAt(midpoint[0], midpoint[1] - 3);
expect(await page.evaluate(() => window.__ioviewer.measure.points.map((p) => p.toArray()))).toEqual([first, second]);
expect(await page.evaluate(() => window.__ioviewer.measure.distance)).toBeCloseTo(2, 3);
await hover(edge, 0, -3, 'edge');
Expand Down Expand Up @@ -91,7 +131,7 @@ for (const instanced of [false, true]) {
});
for (const dx of [-2.75, -1.5, 0, 1.25, 2.5]) await hover(oblique, dx, -4, 'edge');
await page.evaluate(() => window.__ioviewer.scene.setVisible([0], false));
await page.mouse.move(640, 400);
await previewAt(640, 400);
await expect(marker).toBeHidden();
});
}
Loading