Skip to content

perf: replace per-block SMIL animate with shared CSS keyframes in rainbow theme #148

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
K-H-A-L-I-D wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: replace per-block SMIL animate with shared CSS keyframes in rainbow theme #148

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
57 changes: 44 additions & 13 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
return result;
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.create3DContrib = exports.addDefines = void 0;
exports.create3DContrib = exports.addDefines = exports.getRainbowKeyframes = void 0;
const d3 = __importStar(__nccwpck_require__(85871));
const util = __importStar(__nccwpck_require__(71010));
const ANGLE = 30;
Expand Down Expand Up @@ -221,21 +221,47 @@ const addSeasonColor = (path, contribLevel, panel, date) => {
const pattern = decideSeasonPatternNo(date);
path.attr('class', `cont-${panel}-p${pattern}-${contribLevel}`);
};
const FACE_NAMES = {
[DARKER_TOP]: 'top',
[DARKER_LEFT]: 'left',
[DARKER_RIGHT]: 'right',
};
const addRainbowColor = (path, contribLevel, settings, darker, week) => {
const faceName = FACE_NAMES[darker];
const className = `rb-l${contribLevel}-${faceName}`;
const offsetHue = week * settings.hueRatio;
const saturation = settings.saturation;
const lightness = settings.contribLightness[contribLevel];
const values = [...Array(7)]
.map((_, i) => (i * 60 + offsetHue) % 360)
.map((hue) => `hsl(${hue},${saturation},${lightness})`)
.map((c) => d3.rgb(c).darker(darker).toString())
.join(';');
path.append('animate')
.attr('attributeName', 'fill')
.attr('values', values)
.attr('dur', settings.duration)
.attr('repeatCount', 'indefinite');
const normalizedHue = ((offsetHue % 360) + 360) % 360;
const durationSeconds = parseFloat(settings.duration);
const delaySeconds = -(normalizedHue / 360) * durationSeconds;
path.attr('class', className).attr('style', `animation-delay:${delaySeconds.toFixed(3)}s`);
};
const getRainbowKeyframes = (settings) => {
const hues = [0, 60, 120, 180, 240, 300, 360];
const darkerMap = [
['top', DARKER_TOP],
['left', DARKER_LEFT],
['right', DARKER_RIGHT],
];
const lines = [];
for (let level = 0; level < settings.contribLightness.length; level++) {
const lightness = settings.contribLightness[level];
for (const [faceName, darker] of darkerMap) {
const className = `rb-l${level}-${faceName}`;
lines.push(`.${className}{animation:${className} ${settings.duration} linear infinite;}`);
const stops = hues.map((hue, i) => {
const pct = ((i / (hues.length - 1)) * 100).toFixed(2);
const fill = d3
.rgb(`hsl(${hue},${settings.saturation},${lightness})`)
.darker(darker)
.toString();
return `${pct}%{fill:${fill}}`;
});
lines.push(`@keyframes ${className}{${stops.join('')}}`);
}
}
return lines.join('');
};
exports.getRainbowKeyframes = getRainbowKeyframes;
const addBitmapPattern = (path, contributionLevel, panel) => {
path.attr('fill', `url(#pattern_${contributionLevel}_${panel})`);
};
Expand Down Expand Up @@ -901,9 +927,13 @@ const createSvg = (userInfo, settings, isForcedAnimation) => {
.attr('width', svgWidth)
.attr('height', svgHeight)
.attr('viewBox', `0 0 ${svgWidth} ${svgHeight}`);
const rainbowCss = settings.type === 'rainbow'
? contrib.getRainbowKeyframes(settings)
: '';
svg.append('style').html([
'* { font-family: "Ubuntu", "Helvetica", "Arial", sans-serif; }',
colors.createCssColors(settings),
rainbowCss,
].join('\n'));
contrib.addDefines(svg, settings);
// background
Expand Down Expand Up @@ -1255,6 +1285,7 @@ const main = async () => {
f.writeFile('profile-night-view.svg', create.createSvg(userInfo, template.NightViewSettings, true));
f.writeFile('profile-night-green.svg', create.createSvg(userInfo, template.NightGreenSettings, true));
f.writeFile('profile-night-rainbow.svg', create.createSvg(userInfo, template.NightRainbowSettings, true));
f.writeFile('profile-night-rainbow-static.svg', create.createSvg(userInfo, template.NightRainbowSettings, false));
f.writeFile('profile-gitblock.svg', create.createSvg(userInfo, template.GitBlockSettings, true));
}
}
Expand Down
61 changes: 48 additions & 13 deletions src/create-3d-contrib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,62 @@ const addSeasonColor = (
path.attr('class', `cont-${panel}-p${pattern}-${contribLevel}`);
};

const FACE_NAMES: Record<number, string> = {
[DARKER_TOP]: 'top',
[DARKER_LEFT]: 'left',
[DARKER_RIGHT]: 'right',
};

const addRainbowColor = (
path: d3.Selection<SVGRectElement, unknown, null, unknown>,
contribLevel: number,
settings: type.RainbowColorSettings,
darker: number,
week: number,
): void => {
const faceName = FACE_NAMES[darker];
const className = `rb-l${contribLevel}-${faceName}`;
const offsetHue = week * settings.hueRatio;
const saturation = settings.saturation;
const lightness = settings.contribLightness[contribLevel];
const values = [...Array<undefined>(7)]
.map((_, i) => (i * 60 + offsetHue) % 360)
.map((hue) => `hsl(${hue},${saturation},${lightness})`)
.map((c) => d3.rgb(c).darker(darker).toString())
.join(';');

path.append('animate')
.attr('attributeName', 'fill')
.attr('values', values)
.attr('dur', settings.duration)
.attr('repeatCount', 'indefinite');
const normalizedHue = ((offsetHue % 360) + 360) % 360;
const durationSeconds = parseFloat(settings.duration);
const delaySeconds = -(normalizedHue / 360) * durationSeconds;

path.attr('class', className).attr(
'style',
`animation-delay:${delaySeconds.toFixed(3)}s`,
);
};

export const getRainbowKeyframes = (
settings: type.RainbowColorSettings,
): string => {
const hues = [0, 60, 120, 180, 240, 300, 360];
const darkerMap: Array<[string, number]> = [
['top', DARKER_TOP],
['left', DARKER_LEFT],
['right', DARKER_RIGHT],
];
const lines: string[] = [];

for (let level = 0; level < settings.contribLightness.length; level++) {
const lightness = settings.contribLightness[level];
for (const [faceName, darker] of darkerMap) {
const className = `rb-l${level}-${faceName}`;
lines.push(
`.${className}{animation:${className} ${settings.duration} linear infinite;}`,
);
const stops = hues.map((hue, i) => {
const pct = ((i / (hues.length - 1)) * 100).toFixed(2);
const fill = d3
.rgb(`hsl(${hue},${settings.saturation},${lightness})`)
.darker(darker)
.toString();
return `${pct}%{fill:${fill}}`;
});
lines.push(`@keyframes ${className}{${stops.join('')}}`);
}
}
return lines.join('');
};

const addBitmapPattern = (
Expand Down
8 changes: 8 additions & 0 deletions src/create-svg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,18 @@ export const createSvg = (
.attr('height', svgHeight)
.attr('viewBox', `0 0 ${svgWidth} ${svgHeight}`);

const rainbowCss =
settings.type === 'rainbow'
? contrib.getRainbowKeyframes(
settings as type.RainbowColorSettings,
)
: '';

svg.append('style').html(
[
'* { font-family: "Ubuntu", "Helvetica", "Arial", sans-serif; }',
colors.createCssColors(settings),
rainbowCss,
].join('\n'),
);

Expand Down