adminandClaude Opus 5.5
056a622524
Recurring cleanup round. Behaviour is unchanged. Duplicated code in
src went from 27 clones with 299 lines to 6 clones with 56 lines
(jscpd, the two identical OFL licence texts not counted).
- SheetCanvas is the new base of the texture, pixel art and vector art
canvases. It holds background, mask, hint, panning, wheel zoom, fit,
view save and restore and the screen mapping. Pixel art keeps its
whole-pixel panning and fixed zoom steps.
- mixColor in src/core/util/color.ts replaces three copies in
animation, gradient and particles. It clamps t like the particle one.
- fingerprint now lives once in generated.ts, next to the revision
contract from #185.
- MoveCommand next to RenameCommand is the base of the three reorder
commands for tile pictures, tilemap layers and vector shapes.
- The two raycast nodes share inputs, settings and filter via rayOf.
- canvasRect() lives once in AssetTabEditor.
- Removed unused code: findPixelArt, isDrawableShape,
GeneratedPictures.has and SnapToggle.snapping. Tests now check the
same things through equivalent paths.
- 38 values used only in their own file lost their export.
- Three comments that told history now describe the current state.
The bundle stayed md5-identical for those edits.
- README lists vector art, pixel art and palette, and links the two
wiki pages.
Findings:
- PaintTilesCommand.changes is meant to prevent empty undo steps but
has not been called since #128. The rectangle tool therefore records
a no-op undo step when it paints the same tile over itself. Left as
is, because fixing it changes behaviour.
- No test covered middle-click panning in any sheet tab before. 13f
and 48a now check it.
- The default values of the ray inputs were untested. Length 1000
could become 10 without a red test. tests/core/raycast.test.ts now
covers it.
- CI measured 1308 editor checks at d7c0b7c, not the 1307 counted for
#164. The sum is now 1310 (1308 + 2), computed.
Tests:
- ./check.sh: 144 files, 2143 tests, exit 0 (before 2142).
- e2e 1-16,37,39-43,47,48 fresh: ALL PASSED, 729 checks.
- e2e 1-13,47,48 with the new checks: ALL PASSED, 518 checks.
- Counter-checks, each restored via cp and cmp: halved panning fails
both new pan checks; unclamped mix fails 1 test, no blue channel 3;
coarser hash 3; broken reorder undo 2; triggers setting forced on 2;
bent ray length 1.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
45 lines
1.9 KiB
TypeScript
45 lines
1.9 KiB
TypeScript
/**
|
||
* The view rules of the pixel art tab (#130) that need no Pixi: whole zoom steps, where the grid
|
||
* starts, and which pixel a pointer is over – so they can be checked without a browser.
|
||
*/
|
||
import type { SheetView } from '../texture/sheetView';
|
||
|
||
/** The zoom steps (answer 9: whole steps from 1x to 32x). Doubling alone jumps too far in the middle. */
|
||
const ZOOM_STEPS = [1, 2, 3, 4, 6, 8, 12, 16, 24, 32] as const;
|
||
/** From this zoom on the pixel grid is drawn; below it the lines would be denser than the pixels. */
|
||
export const GRID_FROM_ZOOM = 8;
|
||
|
||
/** The largest step at which the canvas still fits the area, never below 1x. */
|
||
export function fitZoom(canvasW: number, canvasH: number, areaW: number, areaH: number): number {
|
||
let zoom: number = ZOOM_STEPS[0];
|
||
for (const step of ZOOM_STEPS)
|
||
if (canvasW * step <= areaW * 0.9 && canvasH * step <= areaH * 0.9) zoom = step;
|
||
return zoom;
|
||
}
|
||
|
||
/** The next step up (`direction` 1) or down (-1) from `zoom`; stays at the ends. */
|
||
export function stepZoom(zoom: number, direction: 1 | -1): number {
|
||
if (direction > 0) return ZOOM_STEPS.find((step) => step > zoom) ?? ZOOM_STEPS[ZOOM_STEPS.length - 1]!;
|
||
return [...ZOOM_STEPS].reverse().find((step) => step < zoom) ?? ZOOM_STEPS[0];
|
||
}
|
||
|
||
/** The canvas centred in the area at a zoom, on whole screen pixels so the pixel edges stay sharp. */
|
||
export function centredView(
|
||
canvasW: number,
|
||
canvasH: number,
|
||
areaW: number,
|
||
areaH: number,
|
||
zoom: number,
|
||
): SheetView {
|
||
return {
|
||
panX: Math.round((areaW - canvasW * zoom) / 2),
|
||
panY: Math.round((areaH - canvasH * zoom) / 2),
|
||
zoom,
|
||
};
|
||
}
|
||
|
||
/** The pixel under a widget-local point – anywhere, inside the canvas or not. */
|
||
export function pixelUnder(view: SheetView, localX: number, localY: number): { x: number; y: number } {
|
||
return { x: Math.floor((localX - view.panX) / view.zoom), y: Math.floor((localY - view.panY) / view.zoom) };
|
||
}
|