Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
bac4e41
Changed the MaskEditor to an Image Canvas
brucew4yn3rp Mar 8, 2025
3f5a263
Updated Image Canvas to properly handle painting and mask on separate…
brucew4yn3rp Mar 8, 2025
791d7bf
Removed Sortable.js
brucew4yn3rp Mar 8, 2025
87dfeb0
Revised Image Canvas Functionality; Fixed Bus; Pending RGB Canvas Sav…
brucew4yn3rp Mar 9, 2025
207cdaf
Ran NPX Prettier and minor edits to maskeditor.ts
brucew4yn3rp Mar 9, 2025
3b0fc8a
Painted pixels are now saved in a combined as well as separate image.…
brucew4yn3rp Mar 10, 2025
464f259
Painted pixels are now editable. Still need to figure out how to pass…
brucew4yn3rp Mar 15, 2025
e9e86d8
Fixed some errors and merged MaskEditor from @duckcomfy
brucew4yn3rp Jul 6, 2025
b4cfb80
Merge branch 'main' into Jun-5-2026
brucew4yn3rp Jul 6, 2025
583c2b4
Fixed issues that were preventing build
brucew4yn3rp Jul 6, 2025
9523ffa
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 6, 2025
53d29ff
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 6, 2025
8a23860
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 7, 2025
3e259c9
fix: show correct preview in Load Image node after using MaskEditor t…
Jul 7, 2025
a8a6da0
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 8, 2025
fbff95b
feat: refine layer-switching UX
Jul 8, 2025
118522f
fix: make rectangular brush shape work again
Jul 8, 2025
c744eeb
feat: `[` and `]` MaskEditor shortcuts to decrease/increase brush size
Jul 8, 2025
86e0357
Merge pull request #2 from duckcomfy/feat/image_canvas_new_pr
brucew4yn3rp Jul 9, 2025
ed9dc01
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 9, 2025
a766b1a
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 9, 2025
13f79e4
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 9, 2025
08e7870
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 10, 2025
f7c0321
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 10, 2025
07803ca
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 10, 2025
531d9e2
refactor: run prettier
Jul 10, 2025
6a0b8b4
fix: no longer erase intersection between paint and mask in paint lay…
Jul 10, 2025
4e78977
Merge pull request #3 from duckcomfy/fix/paint_mask_overlap
brucew4yn3rp Jul 10, 2025
324e19c
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 10, 2025
e5eac6d
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 11, 2025
0d7ea61
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 11, 2025
62717ae
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 11, 2025
3db8b8c
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 11, 2025
f4854aa
refactor: re-enable noUnusedLocals, noUnusedParameters, and fix resul…
Jul 12, 2025
590e084
fix: undo unnecessary vue-tsc update
Jul 12, 2025
dfcd360
refactor: tighten up code
Jul 12, 2025
e71edb1
Merge pull request #4 from duckcomfy/refactor/address_review
brucew4yn3rp Jul 12, 2025
30ec4d8
Improved the Layer UX. Re-organized the interface and made it so that…
brucew4yn3rp Jul 12, 2025
ec13d81
Ran Prettier
brucew4yn3rp Jul 12, 2025
7fa348a
Reverted sidePanel sizing
brucew4yn3rp Jul 12, 2025
d53847d
fix: allow maskeditor right-pane to have a scrollbar on small viewpor…
Jul 12, 2025
3d7f65b
Merge pull request #5 from duckcomfy/Improved-Layer-UX_refinements
brucew4yn3rp Jul 12, 2025
bcbc499
Fixed curly brace style nit
brucew4yn3rp Jul 12, 2025
ce95e6a
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 12, 2025
9fa1646
refactor: address all review items except node.imgs
Jul 13, 2025
0be6ede
refactor: await http request to avoid race conditions
Jul 13, 2025
e94a4c2
chore: revert to main branch package-lock.json
Jul 13, 2025
c6eb0ba
refactor: separate maskeditor layer data from node imgs (previewed im…
Jul 13, 2025
3c1da86
Revert "refactor: separate maskeditor layer data from node imgs (prev…
Jul 13, 2025
ab3ebe3
refactor/fix: no longer store mask layers in node.imgs, instead deriv…
Jul 13, 2025
f9d1d9f
Merge pull request #6 from duckcomfy/feat/image_editor_review_2
brucew4yn3rp Jul 13, 2025
e52204c
fix: add back change to ensure node preview is only the combined image
Jul 13, 2025
cf85b4b
Merge pull request #7 from duckcomfy/feat/image_editor_review_2
brucew4yn3rp Jul 13, 2025
c2af68f
Merge branch 'main' into Jun-5-2025
brucew4yn3rp Jul 14, 2025
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
29 changes: 29 additions & 0 deletions src/extensions/core/maskEditorLayerFilenames.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export interface ImageLayerFilenames {
maskedImage: string
paint: string
paintedImage: string
paintedMaskedImage: string
}

const paintedMaskedImagePrefix = 'clipspace-painted-masked-'

export const imageLayerFilenamesByTimestamp = (
timestamp: number
): ImageLayerFilenames => ({
maskedImage: `clipspace-mask-${timestamp}.png`,
paint: `clipspace-paint-${timestamp}.png`,
paintedImage: `clipspace-painted-${timestamp}.png`,
paintedMaskedImage: `${paintedMaskedImagePrefix}${timestamp}.png`
})

export const imageLayerFilenamesIfApplicable = (
inputImageFilename: string
): ImageLayerFilenames | undefined => {
const isPaintedMaskedImageFilename = inputImageFilename.startsWith(
paintedMaskedImagePrefix
)
if (!isPaintedMaskedImageFilename) return undefined
const suffix = inputImageFilename.slice(paintedMaskedImagePrefix.length)
const timestamp = parseInt(suffix.split('.')[0], 10)
return imageLayerFilenamesByTimestamp(timestamp)
}
Loading
Loading