Add check to boolean ops in brush modes to avoid empty paths

Wicklets · Apr 15, 2020 · 7309ee8 · 7309ee8
1 parent cb44778
commit 7309ee8
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/engine/dist/emptyproject.html b/engine/dist/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.15.30.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -56956,8 +56956,14 @@
       if (otherPath === mask) return;
 
       if (mask) {
-        mask = mask.unite(otherPath);
-        mask.remove();
+        var newMask = mask.unite(otherPath);
+
+        if (newMask.children && newMask.children.length === 0 || newMask.segments && newMask.segments.length === 0) {// Ignore boolean ops that result in empty paths
+        } else {
+          mask = newMask;
+        }
+
+        newMask.remove();
       } else {
         mask = otherPath;
       }

diff --git a/engine/dist/wickengine.js b/engine/dist/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.15.30.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -56941,8 +56941,14 @@ Wick.Tools.Brush = class extends Wick.Tool {
       if (otherPath === mask) return;
 
       if (mask) {
-        mask = mask.unite(otherPath);
-        mask.remove();
+        var newMask = mask.unite(otherPath);
+
+        if (newMask.children && newMask.children.length === 0 || newMask.segments && newMask.segments.length === 0) {// Ignore boolean ops that result in empty paths
+        } else {
+          mask = newMask;
+        }
+
+        newMask.remove();
       } else {
         mask = otherPath;
       }

diff --git a/engine/src/tools/Brush.js b/engine/src/tools/Brush.js
@@ -395,8 +395,16 @@ Wick.Tools.Brush = class extends Wick.Tool {
         layer.children.forEach(otherPath => {
             if(otherPath === mask) return;
             if(mask) {
-                mask = mask.unite(otherPath);
-                mask.remove();
+                var newMask = mask.unite(otherPath);
+
+                if((newMask.children && newMask.children.length === 0) ||
+                   (newMask.segments && newMask.segments.length === 0)) {
+                    // Ignore boolean ops that result in empty paths
+                } else {
+                    mask = newMask;
+                }
+
+                newMask.remove();
             } else {
                 mask = otherPath;
             }

diff --git a/public/corelibs/wick-engine/emptyproject.html b/public/corelibs/wick-engine/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.15.30.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -56956,8 +56956,14 @@
       if (otherPath === mask) return;
 
       if (mask) {
-        mask = mask.unite(otherPath);
-        mask.remove();
+        var newMask = mask.unite(otherPath);
+
+        if (newMask.children && newMask.children.length === 0 || newMask.segments && newMask.segments.length === 0) {// Ignore boolean ops that result in empty paths
+        } else {
+          mask = newMask;
+        }
+
+        newMask.remove();
       } else {
         mask = otherPath;
       }

diff --git a/public/corelibs/wick-engine/wickengine.js b/public/corelibs/wick-engine/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.15.30.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -56941,8 +56941,14 @@ Wick.Tools.Brush = class extends Wick.Tool {
       if (otherPath === mask) return;
 
       if (mask) {
-        mask = mask.unite(otherPath);
-        mask.remove();
+        var newMask = mask.unite(otherPath);
+
+        if (newMask.children && newMask.children.length === 0 || newMask.segments && newMask.segments.length === 0) {// Ignore boolean ops that result in empty paths
+        } else {
+          mask = newMask;
+        }
+
+        newMask.remove();
       } else {
         mask = otherPath;
       }