highperfocused/bitmappery
1
0
Fork 0
mirror of https://github.com/igorski/bitmappery.git synced 2026-08-03 20:39:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Early exits

Browse Source
This commit is contained in:
Igor Zinken
2023-05-17 19:04:50 +02:00
parent 3c32a302cb
commit 0d0d54234d
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/services/psd-import-service.ts
View File

@@ -92,10 +92,12 @@ async function traverseNode( node: Node, output: Layer[] ): void {
break;
}
if ( node.children ) {
for ( const childNode of node.children ) {
await traverseNode( childNode, output );
}
if ( !node.children ) {
return;
}
for ( const childNode of node.children ) {
await traverseNode( childNode, output );
}
}
@@ -119,34 +121,16 @@ async function createLayer( layer: PSDLayer, layers: Layer[], name = "" ): Promi
const maskWidth = layer.maskData.right - layer.maskData.left;
const maskHeight = layer.maskData.bottom - layer.maskData.top;
const { cvs, ctx } = createCanvas( maskWidth, maskHeight );
/*
ctx.putImageData( new ImageData(
new Uint8ClampedArray( layer.layerFrame.userMask.data.buffer ), size, size
), layer.maskData.left - layerX, layer.maskData.top - layerY );*/
const layerData = ctx.getImageData( 0, 0, maskWidth, maskHeight );
const maskBuffer = layer.layerFrame.userMask.data;
/*
for ( let i = 0, si = 0, l = maskBuffer.byteLength; i < l; ++i, si += 4 ) {
//layerData.data[ si ] = maskBuffer[ i ];
//layerData.data[ si +1 ] = maskBuffer[ i ];
//layerData.data[ si +2] = maskBuffer[ i ];
layerData.data[ si +3] = maskBuffer[ i ];
}
*/
const coordinateToIndex = ( x: number, y: number ): number => x + ( maskWidth * y );
let i = 0;
for ( let y = 0; y < maskHeight; ++y ) {
for ( let x = 0; x < maskWidth; ++x ) {
i = coordinateToIndex( x, y );
layerData.data[ i + 3 ] = maskBuffer[ i ];
}
}
const maskData = await layer.userMask();
ctx.putImageData( layerData, 0, 0 );
ctx.putImageData(
new ImageData( new Uint8ClampedArray( maskData ), maskWidth, maskHeight ),
layer.maskData.left - layerX, layer.maskData.top - layerY
);
// Photoshop masks use inverted colours compared to our Canvas masking
inverseMask( cvs );
//inverseMask( cvs );
layerProps.mask = cvs;
}