From e966bc89b244f7bd8b32d2dec2dfdcad0c0924f4 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Wed, 2 May 2018 16:27:54 +0200 Subject: [PATCH] performance --- src/sliceActions/helpers/comb.js | 172 ++++++++++++++++--------------- 1 file changed, 87 insertions(+), 85 deletions(-) diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js index 76f07dd..b4e1fbd 100644 --- a/src/sliceActions/helpers/comb.js +++ b/src/sliceActions/helpers/comb.js @@ -1,14 +1,14 @@ import { subtract, add, normalize, dot, distanceTo, divide, normal } from './vector2.js'; import earcut from 'earcut'; -// const TRIANGULATED_OUTLINES = new WeakMap(); +const TRIANGULATED_OUTLINES = new WeakMap(); export default function comb(outline, start, end) { if (distanceTo(start, end) < 10) return [start, end]; - // if (!TRIANGULATED_OUTLINES.has(outline)) TRIANGULATED_OUTLINES.set(outline, decompose(outline)); - // const { convexPolygons, vertices } = TRIANGULATED_OUTLINES.get(outline); - const { convexPolygons, vertices } = decompose(outline); + if (!TRIANGULATED_OUTLINES.has(outline)) TRIANGULATED_OUTLINES.set(outline, decompose(outline)); + const { convexPolygons, vertices } = TRIANGULATED_OUTLINES.get(outline); + const startPolygon = convexPolygons.findIndex(({ face }) => pointIsInsideConvex(start, face, vertices)); const endPolygon = convexPolygons.findIndex(({ face }) => pointIsInsideConvex(end, face, vertices)); if (startPolygon === -1 || endPolygon === -1) return [start, end]; @@ -16,8 +16,8 @@ export default function comb(outline, start, end) { const path = findClosestPath(convexPolygons, startPolygon, endPolygon); if (!path) return [start, end]; - const line = containLineInPath(path, start, end, vertices); + const line = containLineInPath(path, start, end, vertices); return line; } @@ -113,100 +113,102 @@ function decompose(polygon) { return { vertices, convexPolygons }; } -function findClosestPath(convexPolygons, start, end, visited = [], path = []) { - if (start === end) return []; - - visited = [...visited, start]; - - const { connects } = convexPolygons[start]; - - const finish = connects.find(({ to }) => to === end); - if (finish) return [...path, finish]; - - const posibilities = []; - for (const connect of connects) { - if (visited.includes(connect.to)) continue; - - const posibility = findClosestPath(convexPolygons, connect.to, end, visited, [...path, connect]); - if (posibility) posibilities.push(posibility); - } - - if (posibilities.length === 0) { - return null; - } else if (posibilities.length === 1) { - return posibilities[0]; - } else if (posibilities.length > 1) { - const distanceMap = new WeakMap(); - for (const posibility of posibilities) { - const distance = posibility.reduce((totalDistance, connect) => totalDistance + connect.distance, 0); - distanceMap.set(posibility, distance); - } - - return posibilities.sort((a, b) => distanceMap.get(a) - distanceMap.get(b))[0]; - } -} - -// const parse = string => parseFloat(string); -// function findClosestPath(map, start, end) { -// // dijkstra's algorithm -// const costs = { [start]: 0 }; -// const open = { [0]: [start] }; -// const predecessors = {}; +// const distanceMap = new WeakMap(); +// function findClosestPath(convexPolygons, start, end, visited = [], path = [], distance = 0) { +// if (start === end) return []; // -// while (open) { -// const keys = Object.keys(open).map(parse); -// if (keys.length === 0) break; -// keys.sort(); +// visited = [...visited, start]; // -// const [key] = keys; -// const bucket = open[key]; -// const node = bucket.shift(); -// const currentCost = key; -// const { connects } = map[node]; +// const { connects } = convexPolygons[start]; // -// if (!bucket.length) delete open[key]; +// const finish = connects.find(({ to }) => to === end); +// if (finish) return [...path, finish]; // -// for (const { distance, to } of connects) { -// const totalCost = distance + currentCost; -// const vertexCost = costs[to]; +// const posibilities = []; +// for (let i = 0; i < connects.length; i ++) { +// const connect = connects[i]; +// if (visited.includes(connect.to)) continue; // -// if ((typeof vertexCost === 'undefined') || (vertexCost > totalCost)) { -// costs[to] = totalCost; -// -// if (!open[totalCost]) open[totalCost] = []; -// open[totalCost].push(to); -// -// predecessors[to] = node; -// } +// const positibiltyDistance = distance + connect.distance; +// const posibility = findClosestPath(convexPolygons, connect.to, end, visited, [...path, connect], positibiltyDistance); +// if (posibility) { +// posibilities.push(posibility); +// distanceMap.set(posibility, positibiltyDistance); // } // } // -// if (typeof costs[end] === 'undefined') return null; -// -// const nodes = []; -// let node = end; -// while (typeof node !== 'undefined') { -// nodes.push(node); -// node = predecessors[node]; +// if (posibilities.length === 0) { +// return null; +// } else if (posibilities.length === 1) { +// return posibilities[0]; +// } else if (posibilities.length > 1) { +// return posibilities.sort((a, b) => distanceMap.get(a) - distanceMap.get(b))[0]; // } -// nodes.reverse(); -// -// const path = []; -// for (let i = 1; i < nodes.length; i ++) { -// const from = nodes[i - 1]; -// const to = nodes[i]; -// -// const connection = map[from].connects.find(connect => connect.to === to); -// path.push(connection); -// } -// -// return path; // } +const findKey = _key => ({ key }) => _key === key; +function findClosestPath(map, start, end) { + // dijkstra's algorithm + const distances = { [start]: 0 }; + const open = [{ key: 0, nodes: [start] }]; + const predecessors = {}; + + while (open.length !== 0) { + const key = Math.min(...open.map(n => n.key).sort()); + const bucket = open.find(findKey(key)); + const node = bucket.nodes.shift(); + const currentDistance = key; + const { connects } = map[node]; + + if (bucket.nodes.length === 0) open.splice(open.indexOf(bucket), 1); + + for (let i = 0; i < connects.length; i ++) { + const { distance, to } = connects[i]; + const totalDistance = distance + currentDistance; + const vertexDistance = distances[to]; + + if ((typeof vertexDistance === 'undefined') || (vertexDistance > totalDistance)) { + distances[to] = totalDistance; + + let openNode = open.find(findKey(totalDistance)); + if (!openNode) { + openNode = { key: totalDistance, nodes: [] }; + open.push(openNode); + } + openNode.nodes.push(to); + + predecessors[to] = node; + } + } + } + + if (typeof distances[end] === 'undefined') return null; + + const nodes = []; + let node = end; + while (typeof node !== 'undefined') { + nodes.push(node); + node = predecessors[node]; + } + nodes.reverse(); + + const path = []; + for (let i = 1; i < nodes.length; i ++) { + const from = nodes[i - 1]; + const to = nodes[i]; + + const connection = map[from].connects.find(connect => connect.to === to); + path.push(connection); + } + + return path; +} + function containLineInPath(path, start, end, vertices) { const line = [start]; - for (const { edge: [indexA, indexB] } of path) { + for (let i = 0; i < path.length; i ++) { + const { edge: [indexA, indexB] } = path[i]; const vertexA = vertices[indexA]; const vertexB = vertices[indexB];