From c08462cd4f8596e4ae7b5981b65839f59d65b523 Mon Sep 17 00:00:00 2001
From: Philipp Otto <philipp.4096@googlemail.com>
Date: Thu, 14 Jun 2018 14:47:48 +0200
Subject: [PATCH] reuse bucket_picker priorities when requesting missing
 buckets via pullqueue

---
 .../javascripts/oxalis/model/data_layer.js    | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/oxalis/model/data_layer.js b/app/assets/javascripts/oxalis/model/data_layer.js
index 2934f9df5ee..7a43cd2af23 100644
--- a/app/assets/javascripts/oxalis/model/data_layer.js
+++ b/app/assets/javascripts/oxalis/model/data_layer.js
@@ -24,6 +24,7 @@ import { getAreas, getZoomedMatrix } from "oxalis/model/accessors/flycam_accesso
 import type { Vector3, Vector4, OrthoViewMapType, ModeType } from "oxalis/constants";
 import type { CategoryType, DataLayerType } from "oxalis/store";
 import type { AreaType } from "oxalis/model/accessors/flycam_accessor";
+import { DataBucket } from "oxalis/model/bucket_data_handling/bucket";
 
 // each index of the returned Vector3 is either -1 or +1.
 function getSubBucketLocality(position: Vector3, resolution: Vector3): Vector3 {
@@ -39,17 +40,26 @@ function getSubBucketLocality(position: Vector3, resolution: Vector3): Vector3 {
   return position.map((pos, idx) => roundToNearestBucketBoundary(position, idx));
 }
 
-function consumeBucketsFromPriorityQueue(queue, capacity) {
-  const buckets = new Set();
+function consumeBucketsFromPriorityQueue(
+  queue: PriorityQueue,
+  capacity: number,
+): Array<{ priority: number, bucket: DataBucket }> {
+  // Use bucketSet to only get unique buckets from the priority queue.
+  // Don't use {bucket, priority} as set elements, as the instances will always be unique
+  const bucketSet = new Set();
+  const bucketsWithPriorities = [];
   // Consume priority queue until we maxed out the capacity
-  while (buckets.size < capacity) {
+  while (bucketsWithPriorities.length < capacity) {
     if (queue.length === 0) {
       break;
     }
     const bucketWithPriority = queue.dequeue();
-    buckets.add(bucketWithPriority.bucket);
+    if (!bucketSet.has(bucketWithPriority.bucket)) {
+      bucketSet.add(bucketWithPriority.bucket);
+      bucketsWithPriorities.push(bucketWithPriority);
+    }
   }
-  return Array.from(buckets);
+  return bucketsWithPriorities;
 }
 
 // TODO: Non-reactive
@@ -238,24 +248,22 @@ class DataLayer {
         );
       }
 
-      const buckets = consumeBucketsFromPriorityQueue(
+      const bucketsWithPriorities = consumeBucketsFromPriorityQueue(
         bucketQueue,
         this.textureBucketManager.maximumCapacity,
       );
 
       this.textureBucketManager.setActiveBuckets(
-        buckets,
+        bucketsWithPriorities.map(({ bucket }) => bucket),
         this.anchorPointCache.anchorPoint,
         this.anchorPointCache.fallbackAnchorPoint,
       );
 
       // In general, pull buckets which are not available but should be sent to the GPU
-      // Don't use -1 for ortho mode since this will make at the corner of the viewport more important than the ones in the middle
-      const missingBucketPriority = constants.MODES_PLANE.includes(viewMode) ? 100 : -1;
-      const missingBuckets = buckets
-        .filter(bucket => !bucket.hasData())
-        .filter(bucket => bucket.zoomedAddress[3] <= this.cube.MAX_UNSAMPLED_ZOOM_STEP)
-        .map(bucket => ({ bucket: bucket.zoomedAddress, priority: missingBucketPriority }));
+      const missingBuckets = bucketsWithPriorities
+        .filter(({ bucket }) => !bucket.hasData())
+        .filter(({ bucket }) => bucket.zoomedAddress[3] <= this.cube.MAX_UNSAMPLED_ZOOM_STEP)
+        .map(({ bucket, priority }) => ({ bucket: bucket.zoomedAddress, priority }));
       this.pullQueue.addAll(missingBuckets);
       this.pullQueue.pull();
     }