Merge pull request #565 from EarthyScience/jp/update-wasm

removed maps on large arrays

Author: TheJeran

src/components/plots/AnalysisWG.tsx

@@ -170,12 +170,16 @@ const AnalysisWG = ({ setTexture, }: { setTexture: React.Dispatch<React.SetState
             setValueScales({ minVal, maxVal });
             let _scales;
             const thisShape = dataShape.length > 2 ? dataShape.filter((_, idx) => idx !== axis) : dataShape;
-            const textureData = new Uint8Array(
-                newArray.map((i) => {
-                    const normed = (i - minVal) / (maxVal - minVal);
-                    return isNaN(normed) ? 255 : normed * 254;
-                })
-            );
+            const textureData = new Uint8Array(newArray.length)
+            const range = (maxVal - minVal)
+            for (let i = 0; i < newArray.length; i++){
+                const normed = (newArray[i] - minVal) / range;
+                if (isNaN(normed)){
+                    textureData[i] = 255;
+                } else {
+                    textureData[i] = normed * 254;
+                }
+            };
             const newTexture = CreateTexture(is3DResult ? dataShape : thisShape, textureData)
             // --- Final state updates ---
             setAnalysisArray(newArray);
@@ -200,12 +204,16 @@ const AnalysisWG = ({ setTexture, }: { setTexture: React.Dispatch<React.SetState
             const dataArray = GetCurrentArray(analysisStore);
             const newArray = await CustomShader(dataArray, shapeInfo, kernelParams, axis, customShader?? "") as Float16Array
             const {minVal, maxVal} = valueScales
-            const textureData = new Uint8Array(
-                newArray.map((i) => {
-                    const normed = (i - minVal) / (maxVal - minVal);
-                    return isNaN(normed) ? 255 : normed * 254;
-                })
-            );
+            const textureData = new Uint8Array(newArray.length)
+            const range = (maxVal - minVal)
+            for (let i = 0; i < newArray.length; i++){
+                const normed = (newArray[i] - minVal) / range;
+                if (isNaN(normed)){
+                    textureData[i] = 255;
+                } else {
+                    textureData[i] = normed * 254;
+                }
+            };
             const newTexture = CreateTexture(outputShape, textureData)
             setAnalysisArray(newArray);
             if (newTexture){

src/components/textures/TextureMakers.tsx

@@ -12,13 +12,16 @@ function StoreData(array: Array, valueScales?: {maxVal: number, minVal: number})
     const { clampExtremes, setTextureData} = useGlobalStore.getState()
     const data = array.data;
     const [minVal,maxVal] = valueScales ? [valueScales.minVal, valueScales.maxVal] : ArrayMinMax(data )
-    const textureData = new Uint8Array(
-      data.map((i) => {
-        if (isNaN(i)) return 255;
-        const normed = (i - minVal) / (maxVal - minVal);
-        return normed * 254;
-      })
-    );
+    const textureData = new Uint8Array(data.length)
+    const range = (maxVal - minVal)
+    for (let i = 0; i < data.length; i++){
+      const normed = (data[i] - minVal) / range;
+      if (isNaN(normed)){
+        textureData[i] = 255;
+      } else {
+        textureData[i] = normed * 254;
+      }
+    };
     setTextureData(textureData)
     return {minVal, maxVal}
 }