From d1f234fb61562de94b4a428019aeb57a131f5210 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 3 Jul 2024 15:17:21 -0400 Subject: [PATCH] fix buffer geometry call from recent threejs upgrade. also typo fix in polygons --- src/geo/polygons.js | 3 +-- src/kiri-mode/fdm/client.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/geo/polygons.js b/src/geo/polygons.js index 4201b44c..c6358eeb 100644 --- a/src/geo/polygons.js +++ b/src/geo/polygons.js @@ -49,7 +49,6 @@ const POLYS = base.polygons = { offset, trimTo, expand, - // expand_lines, points, length, route, @@ -776,7 +775,7 @@ function fillArea(polys, angle, spacing, output, minLen, maxLen) { if (clip.Execute(ClipIntersect, tree, FillNonZero, FillEvenOdd)) { for (let poly of tree.m_AllPolys) { if (minlen || maxlen) { - let plen = clib.JS.PerimeterOfPath(poly.m_polygon, false, 1); + let plen = ClipperLib.JS.PerimeterOfPath(poly.m_polygon, false, 1); if (minlen && plen < minlen) continue; if (maxlen && plen > maxlen) continue; } diff --git a/src/kiri-mode/fdm/client.js b/src/kiri-mode/fdm/client.js index 3c173f70..dfcdb4f7 100644 --- a/src/kiri-mode/fdm/client.js +++ b/src/kiri-mode/fdm/client.js @@ -273,7 +273,7 @@ FDM.init = function(kiri, api) { // eliminate / normalize uv to allow other widget merge box.setAttribute('uv',new BufferAttribute(new Float32Array(0), 3)); } - let bbg = BufferGeometryUtils.mergeBufferGeometries(boxen); + let bbg = BufferGeometryUtils.mergeGeometries(boxen); let sw = kiri.newWidget(null, group); let fwp = group[0].track.pos; sw.loadGeometry(bbg);