mkkellogg · d0rianb · Jul 15, 2024 · Jul 16, 2024 · Aug 25, 2024 · Sep 17, 2024
diff --git a/src/Viewer.js b/src/Viewer.js
diff --git a/src/loaders/spz/SpzLoader.js b/src/loaders/spz/SpzLoader.js
@@ -355,8 +355,11 @@ export class SpzLoader {
 
     static loadFromURL(fileName, onProgress, minimumAlpha, compressionLevel, optimizeSplatData = true,
                        outSphericalHarmonicsDegree = 0, headers, sectionSize, sceneCenter, blockSize, bucketSize) {
+        const localOnProgress = (percent, percentLabel) => {
+            onProgress(percent, percentLabel, LoaderStatus.Downloading);
+        };
         if (onProgress) onProgress(0, '0%', LoaderStatus.Downloading);
-        return fetchWithProgress(fileName, onProgress, true, headers).then((fileData) => {
+        return fetchWithProgress(fileName, localOnProgress, true, headers).then((fileData) => {
             if (onProgress) onProgress(0, '0%', LoaderStatus.Processing);
             return SpzLoader.loadFromFileData(fileData, minimumAlpha, compressionLevel, optimizeSplatData,
                                               outSphericalHarmonicsDegree, sectionSize, sceneCenter, blockSize, bucketSize);

diff --git a/src/worker/compile_wasm_no_simd.sh b/src/worker/compile_wasm_no_simd.sh
@@ -1 +1 @@
-em++ -std=c++11 sorter_no_simd.cpp -Os -s WASM=1 -s SIDE_MODULE=2 -o sorter_no_simd.wasm -s IMPORTED_MEMORY=1 -s SHARED_MEMORY=1
+em++ -std=c++11 sorter_no_simd.cpp -Os -s WASM=1 -s SIDE_MODULE=2 -o sorter_no_simd.wasm -s IMPORTED_MEMORY=1 -s USE_PTHREADS=1
diff --git a/src/worker/sorter.cpp b/src/worker/sorter.cpp
@@ -24,6 +24,8 @@ EXTERN EMSCRIPTEN_KEEPALIVE void sortIndexes(unsigned int* indexes, void* center
     int maxDistance = -2147483640;
     int minDistance = 2147483640;
 
+    if (distanceMapRange > sortCount) distanceMapRange = sortCount;
+
     float fMVPTRow3[4]; 
     unsigned int sortStart = renderCount - sortCount;
     if (useIntegerSort) {

diff --git a/src/worker/sorter.wasm b/src/worker/sorter.wasm
diff --git a/src/worker/sorter_no_simd.cpp b/src/worker/sorter_no_simd.cpp
@@ -23,6 +23,8 @@ EXTERN EMSCRIPTEN_KEEPALIVE void sortIndexes(unsigned int* indexes, void* center
     int maxDistance = -2147483640;
     int minDistance = 2147483640;
 
+    if (distanceMapRange > sortCount) distanceMapRange = sortCount;
+
     float fMVPTRow3[4];
     int iMVPTRow3[4];
     unsigned int sortStart = renderCount - sortCount;

diff --git a/src/worker/sorter_no_simd.wasm b/src/worker/sorter_no_simd.wasm
diff --git a/src/worker/sorter_no_simd_non_shared.wasm b/src/worker/sorter_no_simd_non_shared.wasm
diff --git a/src/worker/sorter_non_shared.wasm b/src/worker/sorter_non_shared.wasm
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		em++ -std=c++11 sorter_no_simd.cpp -Os -s WASM=1 -s SIDE_MODULE=2 -o sorter_no_simd.wasm -s IMPORTED_MEMORY=1 -s SHARED_MEMORY=1
		em++ -std=c++11 sorter_no_simd.cpp -Os -s WASM=1 -s SIDE_MODULE=2 -o sorter_no_simd.wasm -s IMPORTED_MEMORY=1 -s USE_PTHREADS=1
Copy link hirako2000 Mar 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. was it some troubleshooting changes? is that needed? I would not touch this given the no_simd is likely a script for compatibility sake. Not sure tbh.