Skip to content
Draft
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dist
# Local Netlify folder
.netlify


tmp/
tmp/
./node-aseprite
57 changes: 53 additions & 4 deletions lib.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ declare module "aseprite" {
RGBA = 32,
}

enum ChunkType {
export enum ChunkType {
PALETTE_OLD_1 = 4,
PALETTE_OLD_2 = 17,
LAYER = 8196,
Expand All @@ -89,6 +89,7 @@ declare module "aseprite" {
PALETTE = 8217,
USERDATA = 8224,
SLICE = 8226,
TILESET = 8227,
}

interface FlagsBitset {
Expand Down Expand Up @@ -122,10 +123,11 @@ declare module "aseprite" {
numChunks: number;
} & KaitaiProperties<C, Frame<C, I>, Aseprite<C, I>>;

enum CelType {
export enum CelType {
RAW = 0,
LINKED = 1,
COMPRESSED = 2,
COMPRESSED_TILEMAP = 3,
}
type CelChunkData<C, I> = {
layerIndex: number;
Expand All @@ -150,8 +152,47 @@ declare module "aseprite" {
pixelsCompressed: Uint8Array;
pixels: I extends true ? Buffer : undefined;
}
| {
type: CelType.COMPRESSED_TILEMAP;
tilesWidth: number;
tilesHeight: number;
bitsPerTile: number;
tileIdBitmask: number;
xFlipBitmask: number;
yFlipBitmask: number;
dFlipBitmask: number;
tilesCompressed: Uint8Array;
tiles: I extends true ? Buffer : undefined;
}
) &
KaitaiProperties<C, Frame<C, I>, Aseprite<C, I>>;
type TilesetChunkData<C, I> = {
tilesetId: number;
numTiles: number;
tileWidth: number;
tileHeight: number;
baseIndex: number;
name: string;
pixelsCompressed: Uint8Array;
pixels: I extends true ? Buffer : undefined;
};
export enum LayerType {
IMAGE = 0,
GROUP = 1,
TILEMAP = 2,
}
type LayerChunkData = {
blendMode: number; // TODO enum
opacity: number;
name: string;
} & (
| { type: LayerType.IMAGE }
| { type: LayerType.GROUP }
| {
type: LayerType.TILEMAP;
tilesetIndex: number;
}
);
type Color = { r: number; g: number; b: number };
type Packet = { skip: number; numColors: number; colors: Color[] };
type PaletteOldChunkData<C, I> = {
Expand All @@ -175,13 +216,17 @@ declare module "aseprite" {
};
type CelExtraChunk = { type: ChunkType.CEL_EXTRA };
type UserdataChunk = { type: ChunkType.USERDATA };
type LayerChunk = { type: ChunkType.LAYER };
type LayerChunk = { type: ChunkType.LAYER; data: LayerChunkData };
type TagsChunk = { type: ChunkType.TAGS };
type PaletteChunk<C, I> = {
type: ChunkType.PALETTE;
data: PaletteChunkData<C, I>;
};
type MaskChunk = { type: ChunkType.MASK };
type TilesetChunk = {
type: ChunkType.TILESET;
data: TilesetChunkData<C, I>;
};
type Chunk<C, I> = { size: number } & (
| ColorProfileChunk
| PaletteOld1Chunk<C, I>
Expand All @@ -193,6 +238,7 @@ declare module "aseprite" {
| TagsChunk
| PaletteChunk<C, I>
| MaskChunk
| TilesetChunk
) &
KaitaiProperties<C, Frame<C, I>, Aseprite<C, I>>;

Expand All @@ -201,7 +247,7 @@ declare module "aseprite" {
chunks: Chunk<C, I>[];
} & KaitaiProperties<C, Aseprite<C, I>, Aseprite<C, I>>;

type Aseprite<C, I> = {
export type Aseprite<C, I> = {
header: Header<C>;
frames: Frame<C, I>[];
} & KaitaiProperties<C, null, null>;
Expand All @@ -218,6 +264,9 @@ declare module "aseprite" {
CelChunk: {
CelTypeEnum: typeof CelType;
};
LayerChunk: {
TypeEnum: typeof LayerType;
};
};
};
}
Expand Down
3 changes: 3 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[build]
command = "pnpm run build:aseprite && pnpm run build"

[functions]
node_bundler = "esbuild"
external_node_modules = ["@cornerstonejs/codec-libjpeg-turbo-8bit"]
Expand Down
2 changes: 1 addition & 1 deletion netlify/functions/counter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function counterTemplate(digits: string[], align: string | null) {
</div>
<form class="window-contents" method="POST">
<button type="submit">
<img src="/assets/icons-16.png" alt="sheep" class="sprite-16">
<img src="/assets/icons-16.png" alt="sheep" class="sprite-16" style="object-position: -192px 0">
<div class="counter">
<div class="counter-count" style="--num-digits: ${digits.length}">
${digits
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"type": "module",
"scripts": {
"start": "eleventy --config=eleventy.config.ts --serve"
"start": "eleventy --config=eleventy.config.ts --serve",
"build": "eleventy --config=eleventy.config.ts",
"build:aseprite": "git clone https://github.com/cubeghost/node-aseprite && cd node-aseprite && pnpm --ignore-workspace install && node ./build.js && cd .. && pnpm link ./node-aseprite"
},
"dependencies": {
"11ty.ts": "^0.0.7",
Expand All @@ -13,7 +15,7 @@
"@netlify/blobs": "^10.7.7",
"@netlify/functions": "^5.2.1",
"@upstash/redis": "^1.38.0",
"aseprite": "^0.3.1",
"aseprite": "github:cubeghost/node-aseprite",
"canvas": "^3.2.3",
"canvas-dither": "^1.0.1",
"d3": "^7.9.0",
Expand All @@ -40,7 +42,8 @@
"packageManager": "pnpm@10.33.0",
"pnpm": {
"overrides": {
"canvas": "^3.2.3"
"canvas": "^3.2.3",
"aseprite": "link:node-aseprite"
}
}
}
17 changes: 3 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/_data/elsewhere.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
{
"label": "e-mail",
"sprite": "mail4",
"sprite": "mail",
"url": "mailto:mail@cubegho.st"
}
]
2 changes: 1 addition & 1 deletion src/_data/icon-sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"source": "Microsoft Outlook"
},
{
"sprite": "mail4",
"sprite": "mail",
"size": 16,
"alt": "mail",
"source": "Microsoft Outlook"
Expand Down
12 changes: 6 additions & 6 deletions src/_data/icons-16.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[
"sheep",
"alert",
"resedit",
"document-code",
"mail4",
"suitcase-git",
"scrapbook",
"document-pinned",
"mail",
"suitcase-fonts",
"suitcase-git",
"globe",
"users",
"display",
"resedit",
"suitcase-fonts",
"spray-paint",
"document-pinned"
"sheep"
]
8 changes: 4 additions & 4 deletions src/_data/icons-32.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[
"globe",
"alert",
"alert-open",
"resedit",
"resedit-open",
"document-code",
"document-macpaint",
"suitcase-fonts",
"news",
"alert",
"alert-open",
"suitcase-fonts",
"globe",
"bomb"
]
Loading