Merge pull request #147 from mkkellogg/progressive_loading_updates

Progressive loading updates

Author: mkkellogg

demo/index.html

@@ -262,7 +262,7 @@
       return splatBufferGenerator.generateFromUncompressedSplatArray(splatArray);
     }
 
-    function convertStandardSplatToSplatBuffer(bufferData, compressionLevel, alphaRemovalThreshold, sectionSize, blockSize, bucketSize){
+    function convertStandardSplatToSplatBuffer(bufferData, compressionLevel, alphaRemovalThreshold, sectionSize, sceneCenter, blockSize, bucketSize){
       const splatArray = GaussianSplats3D.SplatParser.parseStandardSplatToUncompressedSplatArray(bufferData);
       const splatBufferGenerator = GaussianSplats3D.SplatBufferGenerator.getStandardGenerator(alphaRemovalThreshold, compressionLevel, sectionSize, sceneCenter, blockSize, bucketSize);
       return splatBufferGenerator.generateFromUncompressedSplatArray(splatArray);

src/SplatMesh.js

@@ -452,13 +452,13 @@ export class SplatMesh extends THREE.Mesh {
             const position = new THREE.Vector3().fromArray(positionArray);
             const rotation = new THREE.Quaternion().fromArray(rotationArray);
             const scale = new THREE.Vector3().fromArray(scaleArray);
-            scenes[i] = SplatMesh.createScene(splatBuffer, position, rotation, scale);
+            scenes[i] = SplatMesh.createScene(splatBuffer, position, rotation, scale, options.splatAlphaRemovalThreshold || 1);
         }
         return scenes;
     }
 
-    static createScene(splatBuffer, position, rotation, scale) {
-        return new SplatScene(splatBuffer, position, rotation, scale);
+    static createScene(splatBuffer, position, rotation, scale, minimumAlpha) {
+        return new SplatScene(splatBuffer, position, rotation, scale, minimumAlpha);
     }
 
     /**
@@ -1516,7 +1516,7 @@ export class SplatMesh extends THREE.Mesh {
                                                      srcFrom, srcTo, localDestFrom, this.halfPrecisionCovariancesOnGPU ? 1 : 0);
             }
             if (centers) splatBuffer.fillSplatCenterArray(centers, sceneTransform, srcFrom, srcTo, localDestFrom);
-            if (colors) splatBuffer.fillSplatColorArray(colors, sceneTransform, srcFrom, srcTo, localDestFrom);
+            if (colors) splatBuffer.fillSplatColorArray(colors, scene.minimumAlpha, sceneTransform, srcFrom, srcTo, localDestFrom);
             destfrom += splatBuffer.getSplatCount();
         }
     }

src/SplatScene.js

@@ -5,12 +5,14 @@ import * as THREE from 'three';
  */
 export class SplatScene {
 
-    constructor(splatBuffer, position = new THREE.Vector3(), quaternion = new THREE.Quaternion(), scale = new THREE.Vector3(1, 1, 1)) {
+    constructor(splatBuffer, position = new THREE.Vector3(), quaternion = new THREE.Quaternion(),
+                scale = new THREE.Vector3(1, 1, 1), minimumAlpha = 1) {
         this.splatBuffer = splatBuffer;
         this.position = position.clone();
         this.quaternion = quaternion.clone();
         this.scale = scale.clone();
         this.transform = new THREE.Matrix4();
+        this.minimumAlpha = minimumAlpha;
         this.updateTransform();
     }
 

src/Viewer.js

@@ -475,11 +475,11 @@ export class Viewer {
 
         let downloadDone = false;
 
-        let loadedPercent = 0;
+        let downloadedPercentage = 0;
         const onProgress = (percent, percentLabel, loaderStatus) => {
-            loadedPercent = percent;
             if (showLoadingUI) {
                 if (loaderStatus === LoaderStatus.Downloading) {
+                    downloadedPercentage = percent;
                     if (percent == 100) {
                         this.loadingSpinner.setMessageForTask(loadingTaskId, 'Download complete!');
                     } else {
@@ -516,7 +516,7 @@ export class Viewer {
                             downloadDone = true;
                             this.loadingProgressBar.hide();
                         } else {
-                            this.loadingProgressBar.setProgress(loadedPercent);
+                            this.loadingProgressBar.setProgress(downloadedPercentage);
                         }
                     }
                 }

src/loaders/SplatBuffer.js

@@ -279,7 +279,7 @@ export class SplatBuffer {
         }
     }
 
-    fillSplatColorArray(outColorArray, transform, srcFrom, srcTo, destFrom) {
+    fillSplatColorArray(outColorArray, minimumAlpha, transform, srcFrom, srcTo, destFrom) {
         const splatCount = this.splatCount;
 
         srcFrom = srcFrom || 0;
@@ -296,10 +296,13 @@ export class SplatBuffer {
             const colorSrcBase = this.bytesPerSplat * localSplatIndex + splatColorOffset;
             const colorDestBase = (i - srcFrom + destFrom) * SplatBuffer.ColorComponentCount;
 
+            let alpha = section.dataArrayUint8[colorSrcBase + 3];
+            alpha = (alpha >= minimumAlpha) ? alpha : 0;
+
             outColorArray[colorDestBase] = section.dataArrayUint8[colorSrcBase];
             outColorArray[colorDestBase + 1] = section.dataArrayUint8[colorSrcBase + 1];
             outColorArray[colorDestBase + 2] = section.dataArrayUint8[colorSrcBase + 2];
-            outColorArray[colorDestBase + 3] = section.dataArrayUint8[colorSrcBase + 3];
+            outColorArray[colorDestBase + 3] = alpha;
 
             // TODO: implement application of transform for spherical harmonics
         }