From 9ed88bb938c2834b44968ebc89269318abca908d Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Mon, 3 Jan 2022 19:58:49 -0500
Subject: [PATCH] ugprade threejs and comment out computeFaceNormals calls

---
 package.json       | 2 +-
 src/kiri/main.js   | 2 +-
 src/kiri/stack.js  | 4 ++--
 src/kiri/widget.js | 6 +++---
 src/main/mesh.js   | 2 +-
 src/moto/space.js  | 6 ++----
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index bc9e7631..da1540a4 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
         "moment": "^2.24.0",
         "pixi.js": "^4.8.9",
         "serve-static": "^1.14.1",
-        "three": "^0.128.0",
+        "three": "^0.136.0",
         "uglify-es": "3.3.9",
         "validator": ">=13.7.0",
         "ws": "^7.5.5"
diff --git a/src/kiri/main.js b/src/kiri/main.js
index d4985d6b..dae24d35 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -1885,7 +1885,7 @@
                 DOC.body.classList.add('dark');
             } else {
                 SPACE.platform.setGrid(gridMajor, gridMinor, 0x999999, 0xcccccc);
-                SPACE.platform.opacity(0.3);
+                SPACE.platform.opacity(0.2);
                 SPACE.sky.setColor(0xffffff);
                 DOC.body.classList.remove('dark');
             }
diff --git a/src/kiri/stack.js b/src/kiri/stack.js
index 48d6f268..258825c3 100644
--- a/src/kiri/stack.js
+++ b/src/kiri/stack.js
@@ -161,7 +161,7 @@
                 } else {
                     geo.setAttribute('position', new THREE.BufferAttribute(faces, 3));
                 }
-                geo.computeFaceNormals();
+                // geo.computeFaceNormals();
                 geo.computeVertexNormals();
                 if (cface) {
                     cface.forEach((c, i) => geo.addGroup(c.start, c.count, i));
@@ -189,7 +189,7 @@
                     const geo = new THREE.BufferGeometry();
                     geo.setAttribute('position', new THREE.BufferAttribute(faces, 3));
                     geo.setIndex(index);
-                    geo.computeFaceNormals();
+                    // geo.computeFaceNormals();
                     geo.computeVertexNormals();
                     if (cpath) {
                         cpath.forEach((c, i) => geo.addGroup(c.start, c.count, i));
diff --git a/src/kiri/widget.js b/src/kiri/widget.js
index 08e4126c..696b0d98 100644
--- a/src/kiri/widget.js
+++ b/src/kiri/widget.js
@@ -350,7 +350,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
             geo.setAttribute('position', new THREE.BufferAttribute(vertices, 3));
             geo.setAttribute('normal', undefined);
             geo.attributes.position.needsUpdate = true;
-            geo.computeFaceNormals();
+            // geo.computeFaceNormals();
             geo.computeVertexNormals();
             this.meta.vertices = vertices.length / 3;
             this.points = null;
@@ -459,7 +459,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
         );
         mesh.renderOrder = 1;
         // fix invalid normals
-        geometry.computeFaceNormals();
+        // geometry.computeFaceNormals();
         geometry.computeVertexNormals();
         mesh.material.side = THREE.DoubleSide;
         mesh.castShadow = true;
@@ -740,7 +740,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
             arr[i*3+8] = z;
         }
         pos.needsUpdate = true;
-        geo.computeFaceNormals();
+        // geo.computeFaceNormals();
         geo.computeVertexNormals();
         ot.mirror = !ot.mirror;
         this.setModified();
diff --git a/src/main/mesh.js b/src/main/mesh.js
index a2430a02..20f77d5e 100644
--- a/src/main/mesh.js
+++ b/src/main/mesh.js
@@ -45,7 +45,7 @@ function init() {
         size: { width: 2000, depth: 2000, height: 1, maxz: 300 },
         grid: { major: 25, minor: 5,
             colorMajor: 0xcccccc, colorMinor: 0xeeeeee,
-            colorX: 0xffaaaa, colorY: 0xaaaaff },
+            colorX: 0xff7777, colorY: 0x7777ff },
     });
     space.view.setZoom(zoomrev, zoomspd);
 
diff --git a/src/moto/space.js b/src/moto/space.js
index a089868f..c2d7b6ff 100644
--- a/src/moto/space.js
+++ b/src/moto/space.js
@@ -290,7 +290,7 @@
                 {x:  width/2, z:  depth/2, y: maxz},
                 {x: -width/2, z:  depth/2, y: maxz},
             ];
-            SCENE.add(volume = makeLinesFromPoints(points, 0x888888));
+            SCENE.add(volume = makeLinesFromPoints(points, 0xdddddd));
             showVolume(volumeOn);
         }
     }
@@ -739,9 +739,7 @@
             vrt[vi++] = p.z;
         }
         geo.setAttribute('position', new THREE.BufferAttribute(vrt, 3));
-        return new THREE.LineSegments(geo, new THREE.LineBasicMaterial({
-            color: color
-        }));
+        return new THREE.LineSegments(geo, new THREE.LineBasicMaterial({ color }));
     }
 
     function intersect(objects, recurse) {