deac/OpenJsCad
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

speed optimizations

Browse source
This commit is contained in:
Joost Nieuwenhuijse 2012-02-21 15:42:27 +01:00
parent 533322a827
commit e91a2f9de3
1 changed files with 52 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
csg.js
View file

@ -417,7 +417,7 @@ CSG.prototype = {
var expanded=p.expand(radius, resolution); var expanded=p.expand(radius, resolution);
result=result.unionSub(expanded, false, false); result=result.unionSub(expanded, false, false);
count++; count++;
if(count == 30) if(count == 300)
{ {
result = result.reTesselated(); result = result.reTesselated();
count = 0; count = 0;
@ -1716,7 +1716,7 @@ CSG.Polygon.prototype = {
var extrudevector=this.plane.normal.unit().times(2*radius); var extrudevector=this.plane.normal.unit().times(2*radius);
var translatedpolygon = this.translate(extrudevector.times(-0.5)); var translatedpolygon = this.translate(extrudevector.times(-0.5));
var extrudedface = translatedpolygon.extrude(extrudevector); var extrudedface = translatedpolygon.extrude(extrudevector);
result=result.unionSub(extrudedface, true, false); result=result.unionSub(extrudedface, false, false);
return result; return result;
}, },
@ -2126,7 +2126,7 @@ CSG.PolygonTreeNode.prototype = {
// The actual tree is kept in this.rootnode // The actual tree is kept in this.rootnode
CSG.Tree = function(polygons) { CSG.Tree = function(polygons) {
this.polygonTree = new CSG.PolygonTreeNode(); this.polygonTree = new CSG.PolygonTreeNode();
this.rootnode = new CSG.Node(); this.rootnode = new CSG.Node(null);
if (polygons) this.addPolygons(polygons); if (polygons) this.addPolygons(polygons);
}; };
@ -2151,15 +2151,11 @@ CSG.Tree.prototype = {
addPolygons: function(polygons) { addPolygons: function(polygons) {
var _this = this; var _this = this;
polygons.map(function(p) { var polygontreenodes = polygons.map(function(p) {
_this.addPolygon(p); return _this.polygonTree.addChild(p);
}); });
this.rootnode.addPolygonTreeNodes(polygontreenodes);
}, },
addPolygon: function(polygon) {
var polygontreenode=this.polygonTree.addChild(polygon);
this.rootnode.addPolygonTreeNode(polygontreenode);
},
}; };
// # class Node // # class Node
@ -2172,11 +2168,12 @@ CSG.Tree.prototype = {
// This is not a leafy BSP tree since there is // This is not a leafy BSP tree since there is
// no distinction between internal and leaf nodes. // no distinction between internal and leaf nodes.
CSG.Node = function() { CSG.Node = function(parent) {
this.plane = null; this.plane = null;
this.front = null; this.front = null;
this.back = null; this.back = null;
this.polygontreenodes = []; this.polygontreenodes = [];
this.parent = parent;
}; };
CSG.Node.prototype = { CSG.Node.prototype = {
@ -2239,23 +2236,60 @@ CSG.Node.prototype = {
if (this.back) this.back.clipTo(tree, alsoRemovecoplanarFront); if (this.back) this.back.clipTo(tree, alsoRemovecoplanarFront);
}, },
addPolygonTreeNode: function(polygontreenode) { addPolygonTreeNodes: function(polygontreenodes) {
if(polygontreenodes.length == 0) return;
var _this = this;
if(!this.plane) if(!this.plane)
{ {
this.plane = polygontreenode.getPolygon().plane; var bestplane = polygontreenodes[0].getPolygon().plane;
/*
var parentnormals = [];
this.getParentPlaneNormals(parentnormals, 6);
//parentnormals = [];
var numparentnormals = parentnormals.length;
var minmaxnormal = 1.0;
polygontreenodes.map(function(polygontreenode){
var plane = polygontreenodes[0].getPolygon().plane;
var planenormal = plane.normal;
var maxnormaldot = -1.0;
parentnormals.map(function(parentnormal){
var dot = parentnormal.dot(planenormal);
if(dot > maxnormaldot) maxnormaldot = dot;
});
if(maxnormaldot < minmaxnormal)
{
minmaxnormal = maxnormaldot;
bestplane = plane;
}
});
*/
this.plane = bestplane;
} }
var frontnodes = []; var frontnodes = [];
var backnodes = []; var backnodes = [];
polygontreenode.splitByPlane(this.plane, this.polygontreenodes, this.polygontreenodes, frontnodes, backnodes); polygontreenodes.map(function(polygontreenode){
polygontreenode.splitByPlane(_this.plane, _this.polygontreenodes, _this.polygontreenodes, frontnodes, backnodes);
});
if(frontnodes.length > 0) if(frontnodes.length > 0)
{ {
if (!this.front) this.front = new CSG.Node(); if (!this.front) this.front = new CSG.Node(this);
this.front.addPolygonTreeNode(frontnodes[0]); this.front.addPolygonTreeNodes(frontnodes);
} }
if(backnodes.length > 0) if(backnodes.length > 0)
{ {
if (!this.back) this.back = new CSG.Node(); if (!this.back) this.back = new CSG.Node(this);
this.back.addPolygonTreeNode(backnodes[0]); this.back.addPolygonTreeNodes(backnodes);
}
},
getParentPlaneNormals: function(normals, maxdepth) {
if(maxdepth > 0)
{
if(this.parent)
{
normals.push(this.parent.plane.normal);
this.parent.getParentPlaneNormals(normals,maxdepth-1);
}
} }
}, },
}; };