From 642e7300292e37c49404f437a3250232f6bd8de5 Mon Sep 17 00:00:00 2001 From: howard Date: Thu, 25 Mar 2021 23:08:38 -0700 Subject: [PATCH] move sketch to seperate group --- package-lock.json | 13 ------------- package.json | 1 - src/sketcher/extrude.js | 7 ++++--- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff65651..dee93d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,6 @@ "": { "devDependencies": { "css-loader": "^5.1.3", - "dat.gui": "^0.7.7", "gh-pages": "^3.1.0", "redux": "^4.0.5", "sass": "^1.32.8", @@ -635,12 +634,6 @@ "node": ">=4" } }, - "node_modules/dat.gui": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz", - "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==", - "dev": true - }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -3098,12 +3091,6 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, - "dat.gui": { - "version": "0.7.7", - "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.7.tgz", - "integrity": "sha512-sRl/28gF/XRC5ywC9I4zriATTsQcpSsRG7seXCPnTkK8/EQMIbCu5NPMpICLGxX9ZEUvcXR3ArLYCtgreFoMDw==", - "dev": true - }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", diff --git a/package.json b/package.json index 1abeee9..ca12214 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ }, "devDependencies": { "css-loader": "^5.1.3", - "dat.gui": "^0.7.7", "gh-pages": "^3.1.0", "redux": "^4.0.5", "sass": "^1.32.8", diff --git a/src/sketcher/extrude.js b/src/sketcher/extrude.js index ac3265e..e843ed8 100644 --- a/src/sketcher/extrude.js +++ b/src/sketcher/extrude.js @@ -27,7 +27,7 @@ export function extrude() { for (let i = 0; i < 2; i++) { let d = linkedObj[1][i] if (d == -1 || d == node) continue; - if (d == children[1]) { + if (d == children[0]) { console.log('pair found') }; findTouching(d) @@ -53,7 +53,7 @@ export function extrude() { } - findPair(children[1]) + findPair(children[0]) const shape = new THREE.Shape(v2s); @@ -64,7 +64,8 @@ export function extrude() { const phong = new THREE.MeshPhongMaterial( { color: 0x156289, emissive: 0x072534, side: THREE.DoubleSide, flatShading: true } ); const mesh = new THREE.Mesh(geometry, phong); this.add(mesh) - + + // this.sketch.visible = false }