From 1654fa8e9cc673d848b550361fc12a3ee04123cd Mon Sep 17 00:00:00 2001 From: Val Erastov Date: Sun, 29 Jan 2017 23:48:33 -0800 Subject: [PATCH] use data of topo-object for half edges --- web/app/brep/operations/boolean.js | 14 +++++++------- web/app/brep/topo/Edge.js | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/app/brep/operations/boolean.js b/web/app/brep/operations/boolean.js index a1ce0240..8688c618 100644 --- a/web/app/brep/operations/boolean.js +++ b/web/app/brep/operations/boolean.js @@ -902,25 +902,25 @@ function EdgeSolveData() { EdgeSolveData.EMPTY = new EdgeSolveData(); EdgeSolveData.get = function(edge) { - if (!edge.__edgeSolveData) { + if (!edge.data[MY]) { return EdgeSolveData.EMPTY; } - return edge.__edgeSolveData; + return edge.data[MY]; }; EdgeSolveData.createIfEmpty = function(edge) { - if (!edge.__edgeSolveData) { - edge.__edgeSolveData = new EdgeSolveData(); + if (!edge.data[MY]) { + edge.data[MY] = new EdgeSolveData(); } - return edge.__edgeSolveData; + return edge.data[MY]; }; EdgeSolveData.clear = function(edge) { - delete edge.__edgeSolveData; + delete edge.data[MY]; }; EdgeSolveData.transfer = function(from, to) { - to.__edgeSolveData = from.__edgeSolveData; + to.data[MY] = from.data[MY]; }; function Node(vertex, normal, splitsEdge, splittingFace) { diff --git a/web/app/brep/topo/Edge.js b/web/app/brep/topo/Edge.js index 6923860d..9b63f2d5 100644 --- a/web/app/brep/topo/Edge.js +++ b/web/app/brep/topo/Edge.js @@ -10,9 +10,10 @@ export class Edge extends TopoObject { } } -export class HalfEdge { +export class HalfEdge extends TopoObject { constructor() { + super(); this.edge = null; this.vertexA = null; this.vertexB = null;