RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout: breakout

old-stable24
Varun Patil 2022-10-17 16:35:24 -07:00
parent 96c2150bf6
commit 0c30422c2a
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Timeline.vue
View File

@ -764,7 +764,7 @@ export default class Timeline extends Mixins(GlobalMixin, UserConfig) {
// Set row height
const row = this.list[rowIdx];
const jH = this.squareMode ? this.rowHeight : Math.round(jbox.height);
const jH = Math.round(jbox.rowHeight || jbox.height);
const delta = jH - row.size;
// If the difference is too small, it's not worth risking an adjustment
// especially on square layouts on mobile. Also don't do this if animating.

47
src/services/Layout.ts
View File

@ -19,6 +19,7 @@ export function getLayout(
left: number,
width: number,
height: number,
rowHeight?: number,
}[] {
if (!opts.squareMode) {
return justifiedLayout((input), {
@ -35,13 +36,10 @@ export function getLayout(
const FLAG_USED = 1 << 1;
const FLAG_USE4 = 1 << 2;
const FLAG_USE6 = 1 << 3;
const FLAG_BREAKOUT = 1 << 4;
// Create 2d matrix to work in
const origRowLen = Math.ceil(input.length / opts.numCols);
const matrix: number[][] = new Array(origRowLen * 3); // todo: dynamic length
for (let i = 0; i < matrix.length; i++) {
matrix[i] = new Array(opts.numCols).fill(0);
}
const matrix: number[][] = [];
// Fill in the matrix
let row = 0;
@ -53,6 +51,11 @@ export function getLayout(
row++; col = 0;
}
// Make sure we have this and the next few rows
while (row + 3 >= matrix.length) {
matrix.push(new Array(opts.numCols).fill(0));
}
// Check if already used
if (matrix[row][col] & FLAG_USED) {
col++; continue;
@ -75,7 +78,6 @@ export function getLayout(
// Number of photos needed for perfect fill after using n
const needFill = (n: number) => ((opts.numCols-col-2) + (n/2-1)*(opts.numCols-2));
// Check if we can use 4 blocks
let canUse4 =
// We have enough space
(row + 1 < matrix.length && col+1 < opts.numCols) &&
@ -92,8 +94,24 @@ export function getLayout(
// Also make sure the next row gets fully filled, otherwise looks weird
(numLeft === needFill(6) || numLeft >= needFill(6)+2*opts.numCols);
if (canUse6 && Math.random() < 0.2) {
// Use 6
let canBreakout =
// First column only
col === 0 &&
// Image is landscape
input[photoId].width > input[photoId].height &&
// The next row gets filled
(numLeft === 0 || numLeft >= opts.numCols);
// Full width breakout
if (canBreakout && Math.random() < (input.length > 0 ? 0.2 : 0.1)) {
matrix[row][col] |= FLAG_BREAKOUT;
for (let i = 1; i < opts.numCols; i++) {
matrix[row][i] |= FLAG_USED;
}
}
// Use 6 vertically
else if (canUse6 && Math.random() < 0.2) {
matrix[row][col] |= FLAG_USE6;
matrix[row+1][col] |= FLAG_USED;
matrix[row+2][col] |= FLAG_USED;
@ -102,9 +120,8 @@ export function getLayout(
matrix[row+2][col+1] |= FLAG_USED;
}
// Use four with 60% probability
else if (canUse4 && Math.random() < 0.5) {
// Use 4
// Use 4 box
else if (canUse4 && Math.random() < ((col % 2) ? 0.67 : 0.4)) {
matrix[row][col] |= FLAG_USE4;
matrix[row+1][col] |= FLAG_USED;
matrix[row][col+1] |= FLAG_USED;
@ -145,6 +162,7 @@ export function getLayout(
left: col * sqsize,
width: sqsize,
height: sqsize,
rowHeight: opts.rowHeight,
}
// Use twice the space
@ -157,8 +175,13 @@ export function getLayout(
p.width *= 2;
p.height *= 3;
col += 2;
} else if (v & FLAG_BREAKOUT) {
p.width *= opts.numCols;
p.height = input[photoId].height * p.width / input[photoId].width;
p.rowHeight = p.height;
col += opts.numCols;
} else {
col += 1;
col++;
}
absMatrix.push(p);