diff --git a/src/extras/core/Shape.js b/src/extras/core/Shape.js index 30abc34f050a2194ef053edfa53bcb11f719c9b5..5d2a5edc29739ce6377685cb186c09864364dbe4 100644 --- a/src/extras/core/Shape.js +++ b/src/extras/core/Shape.js @@ -316,90 +316,6 @@ THREE.Shape.Utils = { }, - triangulateShape_OLD: function ( contour, holes ) { - - var shapeWithoutHoles = THREE.Shape.Utils.removeHoles( contour, holes ); - - var shape = shapeWithoutHoles.shape, - allpoints = shapeWithoutHoles.allpoints, - isolatedPts = shapeWithoutHoles.isolatedPts; - - var triangles = THREE.FontUtils.Triangulate( shape, false ); // True returns indices for points of spooled shape - - // To maintain reference to old shape, one must match coordinates, or offset the indices from original arrays. It's probably easier to do the first. - - //console.log( "triangles",triangles, triangles.length ); - //console.log( "allpoints",allpoints, allpoints.length ); - - var i, il, f, face, - key, index, - allPointsMap = {}, - isolatedPointsMap = {}; - - // prepare all points map - - for ( i = 0, il = allpoints.length; i < il; i ++ ) { - - key = allpoints[ i ].x + ":" + allpoints[ i ].y; - - if ( allPointsMap[ key ] !== undefined ) { - - console.log( "Duplicate point", key ); - - } - - allPointsMap[ key ] = i; - - } - - // check all face vertices against all points map - - for ( i = 0, il = triangles.length; i < il; i ++ ) { - - face = triangles[ i ]; - - for ( f = 0; f < 3; f ++ ) { - - key = face[ f ].x + ":" + face[ f ].y; - - index = allPointsMap[ key ]; - - if ( index !== undefined ) { - - face[ f ] = index; - - } - - } - - } - - // check isolated points vertices against all points map - - for ( i = 0, il = isolatedPts.length; i < il; i ++ ) { - - face = isolatedPts[ i ]; - - for ( f = 0; f < 3; f ++ ) { - - key = face[ f ].x + ":" + face[ f ].y; - - index = allPointsMap[ key ]; - - if ( index !== undefined ) { - - face[ f ] = index; - - } - - } - - } - - return triangles.concat( isolatedPts ); - - }, // end triangulate shapes - /* * Modified Triangulation. * @@ -766,64 +682,7 @@ THREE.Shape.Utils = { return triangles.concat(); - }, // end triangulate shapes - - /* - triangulate2 : function( pts, holes ) { - - // For use with Poly2Tri.js - - var allpts = pts.concat(); - var shape = []; - for (var p in pts) { - shape.push(new js.poly2tri.Point(pts[p].x, pts[p].y)); - } - - var swctx = new js.poly2tri.SweepContext(shape); - - for (var h in holes) { - var aHole = holes[h]; - var newHole = [] - for (i in aHole) { - newHole.push(new js.poly2tri.Point(aHole[i].x, aHole[i].y)); - allpts.push(aHole[i]); - } - swctx.AddHole(newHole); - } - - var find; - var findIndexForPt = function (pt) { - find = new THREE.Vector2(pt.x, pt.y); - var p; - for (p=0, pl = allpts.length; p