From 0d0d54234d8fbacc0ff22bef4d8a6c277bbf0aa7 Mon Sep 17 00:00:00 2001
From: Igor Zinken <igor.zinken@igorski.nl>
Date: Wed, 17 May 2023 19:04:50 +0200
Subject: [PATCH] Early exits

---
 src/services/psd-import-service.ts | 40 +++++++++---------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/services/psd-import-service.ts b/src/services/psd-import-service.ts
index 218c44c..192b248 100644
--- a/src/services/psd-import-service.ts
+++ b/src/services/psd-import-service.ts
@@ -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;
     }