From 761119268375c67684a648deedba5fd622d06ac7 Mon Sep 17 00:00:00 2001
From: TreetopFlyer <seth111@gmail.com>
Date: Wed, 7 Jul 2021 15:01:21 -0400
Subject: [PATCH] direct modification

---
 index.html | 96 +++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/index.html b/index.html
index 0e8d88d..c6a82a8 100644
--- a/index.html
+++ b/index.html
@@ -23,86 +23,90 @@
 <script type="module">
     import { Scene, THREE } from './scene.js';
 
-    let average = (inCenter, inArray, ...inPointsInd) =>
+    let average = (inArray, inPointInd, ...inOthersInd) =>
     {
-        let output = [0, 0, 0];
+        let pointX = inPointInd*3 + 0;
+        let pointY = inPointInd*3 + 1;
+        let pointZ = inPointInd*3 + 2;
 
-        for(let i=0; i<inPointsInd.length; i++)
+        let centerX = Math.round(inArray[pointX]);
+        let centerY = Math.round(inArray[pointY]);
+        let centerZ = Math.round(inArray[pointZ]);
+        
+        for(let i=0; i<inOthersInd.length; i++)
         {
-            let pointInd = inPointsInd[i]*3;
-            output[0] += inArray[pointInd+0];
-            output[1] += inArray[pointInd+1];
-            output[2] += inArray[pointInd+2];
+            let otherInd = inOthersInd[i]*3;
+            inArray[pointX] += inArray[otherInd+0];
+            inArray[pointY] += inArray[otherInd+1];
+            inArray[pointZ] += inArray[otherInd+2];
         }
         
-        let reducer = inPointsInd.length;
-        output[0] /= reducer;
-        output[1] /= reducer;
-        output[2] /= reducer;
-
+        let reducer = inOthersInd.length+1;
         let limit = (inCenter, inPoint) => 
         {
             var limit;
-            
-            limit = inCenter-0.5;
-            if(inPoint < limit){ return limit; }
-
-            limit = inCenter+0.5;
-            if(inPoint > limit){ return limit; }
+            limit = inCenter-0.49;
+            if(inPoint <= limit)
+            {
+                return limit;
+            }
+            limit = inCenter + 0.49;
+            if(inPoint >= limit)
+            {
+                return limit;
+            }
 
             return inPoint;
         }
 
-        var limited = [];
-        limited[0] = limit(inCenter[0], output[0]);
-        limited[1] = limit(inCenter[1], output[1]);
-        limited[2] = limit(inCenter[2], output[2]);
-
-        //console.log(`<${output[0].toFixed(2)}, ${output[1].toFixed(2)}> limited to <${limited[0].toFixed(2)}, ${limited[1].toFixed(2)}> by <${inCenter[0].toFixed(2)}, ${inCenter[1].toFixed(2)}>`)
-
-        output[0] = limited[0];
-        output[1] = limited[1];
-        output[2] = limited[2];
-
-
-        return output;
+        inArray[pointX] = limit(centerX, inArray[pointX]/reducer);
+        inArray[pointY] = limit(centerY, inArray[pointY]/reducer);
+        inArray[pointZ] = limit(centerZ, inArray[pointZ]/reducer);
     };
     let smooth = (inArray, inTimes) =>
     {
-        let output = [...inArray];
-        let count = output.length/3;
+        let count = inArray.length/3;
         for(let t=0; t<inTimes; t++)
         {
             for(let i=0; i<count; i++)
             {
-                var av;
-                var center = [inArray[i*3 + 0], inArray[i*3 + 1], inArray[i*3 + 2]]
                 if(i==0)
                 {
-                    av = average(center, output,  count-1, i, i+1);
+                    average(inArray,  i, count-1, i+1);
                 }
                 else
                 {
                     if(i==count-1)
                     {
-                        av = average(center, output, i-1, i, 0);
+                        average(inArray,  i, i-1, 0);
                     }
                     else
                     {
-                        av = average(center, output, i-1, i, i+1);
+                        average(inArray,  i, i-1, i+1);
                     }
                 }
-                output[i*3+0] = av[0]; 
-                output[i*3+1] = av[1]; 
-                output[i*3+2] = av[2]; 
             }
         }
-        return output;
     }
+    
+    /*
+    let testPoints =
+    [
+         0,  0,  0,
+         0,  1,  0,
+         1,  1,  0
+    ];
+    console.log(testPoints);
+    average(testPoints, 1, 0, 2);
+    console.log(testPoints);
+    */
+
     let path = (inPoints, inSmoothing, inColor) =>
     {
+        let clone = [...inPoints];
+        smooth(clone, inSmoothing);
         const geometry = new THREE.BufferGeometry();
-        geometry.setAttribute('position', new THREE.Float32BufferAttribute( smooth(inPoints, inSmoothing), 3 ));
+        geometry.setAttribute('position', new THREE.Float32BufferAttribute( clone, 3 ));
         const materialLine = new THREE.LineBasicMaterial( { color: inColor, linewidth: 3 } );
         const materialPoint = new THREE.PointsMaterial( { color:inColor, size: 0.05 } );
         const output = new THREE.Group();
@@ -142,11 +146,7 @@
         Init(inScene)
         {
             inScene.add(path(points, 0, 0xFF0000));
-            inScene.add(path(points, 1, 0x003300));
-            inScene.add(path(points, 3, 0x005500));
-            inScene.add(path(points, 5, 0x007700));
-            inScene.add(path(points, 7, 0x009900));
-            inScene.add(path(points, 100, 0x00bb00));
+            inScene.add(path(points, 50, 0x00ff00));
         },
         Update(scene, delta)
         {