From 4c048dbc94a54511ddfbf01e74c9e7eb6d64cc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Mon, 24 Feb 2014 21:54:47 +0100 Subject: [PATCH] Rename fatline option to more explicit fatlineClipping. --- src/options.js | 2 +- src/path/Curve.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/options.js b/src/options.js index 725afaf4..cf842536 100644 --- a/src/options.js +++ b/src/options.js @@ -20,7 +20,7 @@ var __options = { environment: 'browser', stats: true, svg: true, - fatline: true, + fatlineClipping: true, booleanOperations: true, nativeContains: false, paperScript: true, diff --git a/src/path/Curve.js b/src/path/Curve.js index 06e3b8e8..0464d33a 100644 --- a/src/path/Curve.js +++ b/src/path/Curve.js @@ -1046,7 +1046,7 @@ new function() { // Scope for methods that require numerical integration function addCurveIntersections(v1, v2, curve1, curve2, locations, include, tMin, tMax, uMin, uMax, oldTDiff, reverse, recursion) { -/*#*/ if (__options.fatline) { +/*#*/ if (__options.fatlineClipping) { // Avoid deeper recursion. if (recursion > 20) return; @@ -1138,7 +1138,7 @@ new function() { // Scope for methods that require numerical integration addCurveIntersections(v2, v1, curve2, curve1, locations, include, uMin, uMax, tMinNew, tMaxNew, tDiff, !reverse, ++recursion); } -/*#*/ } else { // !__options.fatline +/*#*/ } else { // !__options.fatlineClipping // Subdivision method var bounds1 = Curve.getBounds(v1), bounds2 = Curve.getBounds(v2), @@ -1164,10 +1164,10 @@ new function() { // Scope for methods that require numerical integration locations, include); } } -/*#*/ } // !__options.fatline +/*#*/ } // !__options.fatlineClipping } -/*#*/ if (__options.fatline) { +/*#*/ if (__options.fatlineClipping) { /** * Calculate the convex hull for the non-paramertic bezier curve D(ti, di(t)) * The ti is equally spaced across [0..1] — [0, 1/3, 2/3, 1] for @@ -1281,7 +1281,7 @@ new function() { // Scope for methods that require numerical integration } return tVal; } -/*#*/ } // __options.fatline +/*#*/ } // __options.fatlineClipping /** * Intersections between curve and line becomes rather simple here mostly