Quadtree

engine/gulpfile.js

@@ -41,6 +41,7 @@ gulp.task("default", function() {
       'lib/localforage.min.js',
       'lib/platform.js',
       'lib/potrace.js',
+      'lib/quadtree.min.js',
       'lib/reserved-words.js',
       'lib/roundRect.js',
       'lib/timestamp.js',
@@ -55,6 +56,7 @@ gulp.task("default", function() {
     .src([
       'src/Wick.js',
       'src/Clipboard.js',
+      'src/Quadtree.js',
       'src/Color.js',
       'src/FileCache.js',
       'src/History.js',

engine/lib/croquis.js

@@ -1,6 +1,6 @@
 /* @license croquis.js */
 /* https://github.com/disjukr/croquis.js/tree/master */
-
+var drawSpacings = [];
 function Croquis(imageDataList, properties) {
     var self = this;
     if (properties != null)
@@ -816,6 +816,7 @@ function Croquis(imageDataList, properties) {
         cacheLayer(self.getCurrentLayerIndex());
     }
     self.down = function (x, y, pressure) {
+        drawSpacings = [];
         if (isDrawing || isStabilizing)
             throw 'still drawing';
         isDrawing = true;
@@ -1509,6 +1510,7 @@ Croquis.Brush = function () {
         delta += d;
         var midScale = (prevScale + scale) * 0.5;
         var drawSpacing = size * spacing * midScale;
+        drawSpacings.push(drawSpacing);
         var ldx = x - lastX;
         var ldy = y - lastY;
         var ld = sqrt(ldx * ldx + ldy * ldy);
@@ -1545,6 +1547,7 @@ Croquis.Brush = function () {
     this.up = function (x, y, scale) {
         dir = atan2(y - lastY, x - lastX);
         drawReserved();
+        console.log(drawSpacings);
         return dirtyRect;
     };
 };

engine/src/ObjectCache.js

@@ -84,7 +84,9 @@ WickObjectCache = class {
 
         var object = this._objects[uuid];
         if(!object) {
-            console.error("Warning: object with uuid " + uuid + " was not found in the cache.");
+            // This warning is removed because it shows up a lot when the hit test quadtree is used,
+            // which slows things down a lot.
+            //console.error("Warning: object with uuid " + uuid + " was not found in the cache.");
             return null;
         } else {
             return object;

engine/src/Quadtree.js

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020 WICKLETS LLC
+ *
+ * This file is part of Wick Engine.
+ *
+ * Wick Engine is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Wick Engine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Wick Engine.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/* Quadtree wrapper */
+// this.quadtree: 
+//   - quadtree-lib data structure (https://github.com/elbywan/quadtree-lib#readme) 
+//   - elements in form {x, y, width, height, uuid, inTree}
+// this.dirty:
+//   - set of quadtree elements ({x, y, width, height, uuid, inTree})
+// this.elements:
+//   - dictionary of elements {uuid1: element1, uuid2: element2}
+//   - these are the exact objects that go into this.quadtree by reference 
+Wick.Quadtree = class {
+    constructor (width, height) {
+        this._quadtree = new Quadtree({width: width, height: height}); 
+        this.dirty = new Set();
+        this.elements = {};
+    }
+
+    get quadtree() {
+        return this._quadtree;
+    }
+
+    clean() {
+        let to_remove = [];
+        this._quadtree.each(function(element) {
+            let clip = Wick.ObjectCache.getObjectByUUID(element.uuid);
+            if (!clip || !clip.onScreen) {
+                to_remove.push(element);
+                element.inTree = false;
+            }
+        });
+        for (let i = 0; i < to_remove.length; i++) {
+            this._quadtree.remove(to_remove[i]);
+        }
+    }
+
+    resize(width, height) {
+        this._quadtree.each(function(element) {
+            element.inTree = false;
+            this.dirty.add(element.uuid);
+        });
+        this._quadtree = new Quadtree({width: width, height: height});
+    }
+}