Skip to content

Fix compare mode: side-by-side split view centers each frame in its own half #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chfr19820610-cell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compare mode: side-by-side split view centers each frame in its own half #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions packages/android/beear-webview/src/main/assets/beear/assets/beear-tryon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,28 +351,39 @@ function drawGlassesOverlay(ctx, face, selectedA, selectedB, compareMode, pdMm)
const m = faceMetricsFromLandmarks(face, w, h);

if (compareMode && selectedA && selectedB) {
// Side-by-side: shift each frame to center in its own half
const halfW = w / 2;
const leftOffset = m.midX - halfW / 2;
const rightOffset = halfW / 2 - m.midX;
ctx.save();
ctx.beginPath();
ctx.rect(0, 0, w / 2, h);
ctx.rect(0, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, -leftOffset);
ctx.restore();
ctx.save();
ctx.beginPath();
ctx.rect(w / 2, 0, w / 2, h);
ctx.rect(halfW, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, rightOffset);
ctx.restore();
ctx.strokeStyle = "#f5c518aa";
ctx.lineWidth = 2;
ctx.setLineDash([6, 4]);
ctx.beginPath();
ctx.moveTo(w / 2, 0);
ctx.lineTo(w / 2, h);
ctx.moveTo(halfW, 12);
ctx.lineTo(halfW, h - 12);
ctx.stroke();
ctx.setLineDash([]);
ctx.fillStyle = "#f5c518";
ctx.font = "12px system-ui";
ctx.font = "bold 13px system-ui";
ctx.fillText("A", 12, 20);
ctx.fillText("B", w / 2 + 12, 20);
ctx.fillText("B", halfW + 12, 20);
// Frame names below labels
ctx.fillStyle = "#e8eefccc";
ctx.font = "11px system-ui";
ctx.fillText(selectedA.name || "", 12, 34);
ctx.fillText(selectedB.name || "", halfW + 12, 34);
} else if (selectedA) {
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
}
Expand Down
27 changes: 19 additions & 8 deletions packages/tryon-js/src/overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,39 @@ export function drawGlassesOverlay(ctx, face, selectedA, selectedB, compareMode,
const m = faceMetricsFromLandmarks(face, w, h);

if (compareMode && selectedA && selectedB) {
// Side-by-side: shift each frame to center in its own half
const halfW = w / 2;
const leftOffset = m.midX - halfW / 2; // center frame A in left half → shift left
const rightOffset = halfW / 2 - m.midX; // center frame B in right half → shift right
ctx.save();
ctx.beginPath();
ctx.rect(0, 0, w / 2, h);
ctx.rect(0, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, -leftOffset);
ctx.restore();
ctx.save();
ctx.beginPath();
ctx.rect(w / 2, 0, w / 2, h);
ctx.rect(halfW, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, rightOffset);
ctx.restore();
ctx.strokeStyle = "#f5c518aa";
ctx.lineWidth = 2;
ctx.setLineDash([6, 4]);
ctx.beginPath();
ctx.moveTo(w / 2, 0);
ctx.lineTo(w / 2, h);
ctx.moveTo(halfW, 12);
ctx.lineTo(halfW, h - 12);
ctx.stroke();
ctx.setLineDash([]);
ctx.fillStyle = "#f5c518";
ctx.font = "12px system-ui";
ctx.font = "bold 13px system-ui";
ctx.fillText("A", 12, 20);
ctx.fillText("B", w / 2 + 12, 20);
ctx.fillText("B", halfW + 12, 20);
// Frame names below labels
ctx.fillStyle = "#e8eefccc";
ctx.font = "11px system-ui";
ctx.fillText(selectedA.name || "", 12, 34);
ctx.fillText(selectedB.name || "", halfW + 12, 34);
} else if (selectedA) {
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
}
Expand Down
27 changes: 19 additions & 8 deletions packages/web/assets/beear-tryon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,28 +351,39 @@ function drawGlassesOverlay(ctx, face, selectedA, selectedB, compareMode, pdMm)
const m = faceMetricsFromLandmarks(face, w, h);

if (compareMode && selectedA && selectedB) {
// Side-by-side: shift each frame to center in its own half
const halfW = w / 2;
const leftOffset = m.midX - halfW / 2;
const rightOffset = halfW / 2 - m.midX;
ctx.save();
ctx.beginPath();
ctx.rect(0, 0, w / 2, h);
ctx.rect(0, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, -leftOffset);
ctx.restore();
ctx.save();
ctx.beginPath();
ctx.rect(w / 2, 0, w / 2, h);
ctx.rect(halfW, 0, halfW, h);
ctx.clip();
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
drawFrameAt(ctx, selectedB, m.midX, m.midY, m.angle, m.pdPx, pdMm, rightOffset);
ctx.restore();
ctx.strokeStyle = "#f5c518aa";
ctx.lineWidth = 2;
ctx.setLineDash([6, 4]);
ctx.beginPath();
ctx.moveTo(w / 2, 0);
ctx.lineTo(w / 2, h);
ctx.moveTo(halfW, 12);
ctx.lineTo(halfW, h - 12);
ctx.stroke();
ctx.setLineDash([]);
ctx.fillStyle = "#f5c518";
ctx.font = "12px system-ui";
ctx.font = "bold 13px system-ui";
ctx.fillText("A", 12, 20);
ctx.fillText("B", w / 2 + 12, 20);
ctx.fillText("B", halfW + 12, 20);
// Frame names below labels
ctx.fillStyle = "#e8eefccc";
ctx.font = "11px system-ui";
ctx.fillText(selectedA.name || "", 12, 34);
ctx.fillText(selectedB.name || "", halfW + 12, 34);
} else if (selectedA) {
drawFrameAt(ctx, selectedA, m.midX, m.midY, m.angle, m.pdPx, pdMm, 0);
}
Expand Down
Loading