fix counter var

iTowns · Apr 10, 2018 · 32f104c · 32f104c
1 parent 519166d
commit 32f104c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/examples/pointcloud.js b/examples/pointcloud.js
@@ -76,10 +76,7 @@ function showPointcloud(serverUrl, fileName, lopocsTable) {
         pointcloud.postUpdate = function postUpdate() {
             var info = document.getElementById('info');
             oldPostUpdate.apply(pointcloud, arguments);
-            info.textContent = 'Nb points: ' +
-                pointcloud.counters.displayedCount.toLocaleString() + ' (' +
-                Math.floor(100 * pointcloud.counters.displayedCount / pointcloud.counters.pointCount) + '%) (' +
-                view.mainLoop.gfxEngine.renderer.info.memory.geometries + ')';
+            info.textContent = 'Nb points: ' + pointcloud.displayedCount.toLocaleString();
         };
         window.view = view;
     }

diff --git a/examples/pointcloud_globe.js b/examples/pointcloud_globe.js
@@ -49,10 +49,7 @@ function showPointcloud(serverUrl, fileName) {
         pointcloud.postUpdate = function postUpdate() {
             var info = document.getElementById('info');
             oldPostUpdate.apply(pointcloud, arguments);
-            info.textContent = 'Nb points: ' +
-                pointcloud.counters.displayedCount.toLocaleString() + ' (' +
-                Math.floor(100 * pointcloud.counters.displayedCount / pointcloud.counters.pointCount) + '%) (' +
-                view.mainLoop.gfxEngine.renderer.info.memory.geometries + ')';
+            info.textContent = 'Nb points: ' + pointcloud.displayedCount.toLocaleString();
         };
         window.view = view;
     }

diff --git a/src/Process/PointCloudProcessing.js b/src/Process/PointCloudProcessing.js
@@ -290,22 +290,20 @@ export default {
             return;
         }
 
-        layer.counters = {
-            displayedCount: 0,
-        };
+        layer.displayedCount = 0;
         for (const pts of layer.group.children) {
-            layer.counters.displayedCount += pts.geometry.drawRange.count;
+            layer.displayedCount += pts.geometry.drawRange.count;
         }
 
-        if (layer.counters.displayedCount > layer.pointBudget) {
-            const reduction = layer.pointBudget / layer.counters.displayedCount;
+        if (layer.displayedCount > layer.pointBudget) {
+            const reduction = layer.pointBudget / layer.displayedCount;
             for (const pts of layer.group.children) {
                 if (pts.material.visible) {
                     const count = Math.max(1.0, Math.floor(pts.geometry.drawRange.count * reduction));
                     pts.geometry.setDrawRange(0, count);
                 }
             }
-            layer.counters.displayedCount *= reduction;
+            layer.displayedCount *= reduction;
         }
 
         const now = Date.now();