From 1cb509f863b17af90827012e6f6ae81cb694f654 Mon Sep 17 00:00:00 2001 From: Saivan Date: Tue, 27 Feb 2018 17:23:59 +1100 Subject: [PATCH] Made developing a little more enjoyable This commit adds playgrounds and a build:dev mode. Now you can call npm run build:dev to make the linter warn you about errors without breaking. Also, we now have playgrounds, where you can use a built version of svg.js to run your own tests. --- bench/svg.bench.js | 67 +- dist/svg.js | 883 ++++++++++++++----------- dist/svg.min.js | 4 +- gulpfile.js | 5 +- package.json | 2 + playgrounds/playground.css | 42 ++ playgrounds/transforms/transforms.html | 27 + playgrounds/transforms/transforms.js | 7 + spec/spec/transformations.js | 35 +- src/matrix.js | 218 +++--- src/sugar.js | 18 +- src/transform.js | 404 +++-------- src/utilities.js | 1 + 13 files changed, 848 insertions(+), 865 deletions(-) create mode 100644 playgrounds/playground.css create mode 100644 playgrounds/transforms/transforms.html create mode 100644 playgrounds/transforms/transforms.js diff --git a/bench/svg.bench.js b/bench/svg.bench.js index 5b9541e..50ef547 100644 --- a/bench/svg.bench.js +++ b/bench/svg.bench.js @@ -1,56 +1,55 @@ -;( function() { +/* global Snap */ +;(function () { SVG.bench = { // Initalize test store - _chain: [] - , _before: function() {} - , _after: function() {} - , draw: SVG().addTo('#draw') - , snap: Snap(100, 100) - , raw: document.getElementById('native') + _chain: [], + _before: function () {}, + _after: function () {}, + draw: SVG().addTo('#draw'), + snap: Snap(100, 100), + raw: document.getElementById('native'), // Add descriptor - , describe: function(name, closure) { + describe: function (name, closure) { this._chain.push({ - name: name - , run: closure + name: name, + run: closure }) return this - } + }, // Add test - , test: function(name, run) { + test: function (name, run) { // run test - var start = ( new Date ).getTime() + var start = (new Date()).getTime() run() - this.write( name, ( new Date ).getTime() - start ) + this.write(name, (new Date()).getTime() - start) // clear everything this.clear() - } + }, // Skip test - , skip: function(name, run) { - this.write( name, false ) - } + skip: function (name, run) { + this.write(name, false) + }, // Run tests - , run: function() { + run: function () { this.pad() - + for (var h, i = 0, il = this._chain.length; i < il; i++) { - var h = document.createElement('h1') + h = document.createElement('h1') h.innerHTML = this._chain[i].name - this.pad().appendChild(h) - this._chain[i].run(this) } - } - + }, + // Write result - , write: function(name, ms) { + write: function (name, ms) { var test = document.createElement('div') if (typeof ms === 'number') { @@ -60,14 +59,14 @@ test.className = 'test skipped' test.innerHTML = name + ' (skipped)' } - + this.pad().appendChild(test) return this - } + }, // Reference writable element - , pad: function() { + pad: function () { var pad = document.getElementById('pad') if (!pad) { @@ -76,15 +75,15 @@ } return pad - } + }, // Clear canvasses - , clear: function() { - while(this.raw.hasChildNodes()) + clear: function () { + while (this.raw.hasChildNodes()) { this.raw.removeChild(this.raw.lastChild) + } this.draw.clear() this.snap.clear() } } - -})(); \ No newline at end of file +})() diff --git a/dist/svg.js b/dist/svg.js index 26ddbc7..9815673 100644 --- a/dist/svg.js +++ b/dist/svg.js @@ -6,7 +6,7 @@ * @copyright Wout Fierens * @license MIT * -* BUILT: Tue Feb 27 2018 03:37:50 GMT+1100 (AEDT) +* BUILT: Tue Feb 27 2018 17:22:06 GMT+1100 (AEDT) */; (function(root, factory) { @@ -193,6 +193,7 @@ SVG.regex = { dots: /\./g } + SVG.utils = { // Map function map: function (array, block) { @@ -1925,7 +1926,7 @@ SVG.FX = SVG.invent({ // calculates the step for every property and calls block with it eachAt: function () { - var i, len, at + var i, at var self = this var target = this.target() var s = this.situation @@ -1959,33 +1960,38 @@ SVG.FX = SVG.invent({ // animate initialTransformation which has to be chained if (s.transforms.length) { - // get initial initialTransformation - at = s.initialTransformation - for (i = 0, len = s.transforms.length; i < len; i++) { - // get next transformation in chain - var a = s.transforms[i] - - // multiply matrix directly - if (a instanceof SVG.Matrix) { - if (a.relative) { - at = at.multiply(new SVG.Matrix().morph(a).at(s.ease(this.pos))) - } else { - at = at.morph(a).at(s.ease(this.pos)) - } - continue - } - - // when transformation is absolute we have to reset the needed transformation first - if (!a.relative) { - a.undo(at.extract()) - } - // and reapply it after - at = at.multiply(a.at(s.ease(this.pos))) - } - - // set new matrix on element - target.matrix(at) + // TODO: ANIMATE THE TRANSFORMS + + // // get initial initialTransformation + // at = s.initialTransformation + // for(i = 0, len = s.transforms.length; i < len; i++){ + // + // // get next transformation in chain + // var a = s.transforms[i] + // + // // multiply matrix directly + // if(a instanceof SVG.Matrix){ + // + // if(a.relative){ + // at = at.multiply(new SVG.Matrix().morph(a).at(s.ease(this.pos))) + // }else{ + // at = at.morph(a).at(s.ease(this.pos)) + // } + // continue + // } + // + // // when transformation is absolute we have to reset the needed transformation first + // if(!a.relative) + // a.undo(at.decompose()) + // + // // and reapply it after + // at = at.multiply(a.at(s.ease(this.pos))) + // + // } + // + // // set new matrix on element + // target.matrix(at) } return this @@ -2228,7 +2234,7 @@ SVG.extend(SVG.FX, { } }) -/* global abcdef, arrayToMatrix, deltaTransformPoint, parseMatrix */ +/* global abcdef, arrayToMatrix, parseMatrix, unitCircle, mag */ SVG.Matrix = SVG.invent({ // Initialize @@ -2254,37 +2260,128 @@ SVG.Matrix = SVG.invent({ // Add methods extend: { - // Extract individual transformations - extract: function () { - // find delta transform points - var px = deltaTransformPoint(this, 0, 1) - var py = deltaTransformPoint(this, 1, 0) - var skewX = 180 / Math.PI * Math.atan2(px.y, px.x) - 90 + // Convert an object of affine parameters into a matrix + compose: function (o, cx, cy) { + // Set the defaults + var tx = o.translateX || 0 + var ty = o.translateY || 0 + var theta = o.theta || 0 + var sx = o.scaleX || 1 + var sy = o.scaleY || 1 + var lam = o.shear || 0 + cx = cx || 0 + cy = cy || 0 + + // Calculate the trigonometric values + var ct = Math.cos(theta * Math.PI / 180) + var st = Math.sin(theta * Math.PI / 180) + + // Calculate the matrix components directly + var a = sx * ct + var b = sx * st + var c = lam * sx * ct - sy * st + var d = lam * sx * st + sy * ct + var e = -sx * ct * (cx + cy * lam) + sy * st * cy + tx + cx + var f = -sx * st * (cx + cy * lam) - sy * ct * cy + ty + cy + + // Construct a new matrix and return it + var matrix = new SVG.Matrix([a, b, c, d, e, f]) + return matrix + }, + // Decompose a matrix into the affine parameters needed to form it + decompose: function (matrix, cx, cy) { + // Get the paramaters of the current matrix + var a = matrix.a + var b = matrix.b + var c = matrix.c + var d = matrix.d + var e = matrix.e + var f = matrix.f + + // Project the first basis vector onto the unit circle + var circle = unitCircle(a, b) + var theta = circle.theta + var ct = circle.cos + var st = circle.sin + + // Work out the transformation parameters + var signX = Math.sign(a * ct + b * st) + var sx = signX * mag(a, b) + var lam = (st * d + ct * c) / (ct * a + st * b) + var sy = mag(lam * a - c, d - lam * b) + var tx = e - cx + cx * ct * sx + cy * (lam * ct * sx - st * sy) + var ty = f - cy + cx * st * sx + cy * (lam * st * sx + ct * sy) + + // Package and return the parameters return { - // translation - x: this.e, - y: this.f, - transformedX: (this.e * Math.cos(skewX * Math.PI / 180) + this.f * Math.sin(skewX * Math.PI / 180)) / Math.sqrt(this.a * this.a + this.b * this.b), - transformedY: (this.f * Math.cos(skewX * Math.PI / 180) + this.e * Math.sin(-skewX * Math.PI / 180)) / Math.sqrt(this.c * this.c + this.d * this.d), - // skew - skewX: -skewX, - skewY: 180 / Math.PI * Math.atan2(py.y, py.x), - // scale - scaleX: Math.sqrt(this.a * this.a + this.b * this.b), - scaleY: Math.sqrt(this.c * this.c + this.d * this.d), - // rotation - rotation: skewX, + + // Bundle the affine parameters + translateX: tx, + translateY: ty, + theta: theta, + scaleX: sx, + scaleY: sy, + shear: lam, + + // Bundle the matrix parameters a: this.a, b: this.b, c: this.c, d: this.d, e: this.e, f: this.f, + + // Return the new origin point + x: this.e, + y: this.f, matrix: new SVG.Matrix(this) } }, // Clone matrix + form: function (o) { + // Get all of the parameters required to form the matrix + var flipX = o.flip && (o.flip === 'x' || o.flip === 'both') ? -1 : 1 + var flipY = o.flip && (o.flip === 'y' || o.flip === 'both') ? -1 : 1 + var skewX = o.skew.length ? o.skew[0] + : isFinite(o.skew) ? o.skew + : isFinite(o.skewX) ? o.skewX + : 0 + var skewY = o.skew.length ? o.skew[1] + : isFinite(o.skew) ? o.skew + : isFinite(o.skewY) ? o.skewY + : 0 + var sx = o.scale.length ? o.scale[0] * flipX + : isFinite(o.scale) ? o.scale * flipX + : isFinite(o.scaleX) ? o.scaleX * flipX + : flipX + var sy = o.scale.length ? o.scale[1] * flipY + : isFinite(o.scale) ? o.scale * flipY + : isFinite(o.scaleY) ? o.scaleY * flipY + : flipY + var kx = Math.tan(SVG.utils.radians(skewX)) + var ky = Math.tan(SVG.utils.radians(skewY)) + var lam = o.shear || 0 + var theta = SVG.utils.radians(o.rotate || 0) + var st = Math.sin(theta) + var ct = Math.cos(theta) + var ox = o.origin.length ? o.origin[0] : o.ox || 0 + var oy = o.origin.length ? o.origin[1] : o.oy || 0 + var px = o.position.length ? o.position[0] : o.px || ox + var py = o.position.length ? o.position[1] : o.py || oy + var tx = o.translate.length ? o.translate[0] : o.tx || 0 + var ty = o.translate.length ? o.translate[1] : o.ty || 0 + + // Form the matrix parameters... aka. welcome to wonderland! (used wolfram) + var a = ct * sx + ky * st * sy + var b = ct * ky * sy - st * sx + var c = ct * kx * sx + st * sy + lam * (ct * sx + ky * st * sy) + var d = -kx * st * sx + ct * sy + lam * (-st * sx + ct * ky * sy) + var e = px + tx + ox * (ct * sx + ky * st * sy) + oy * (ct * kx * sx + st * sy + lam * (ct * sx + ky * st * sy)) + var f = py + ty + ox * (-st * sx + ct * ky * sy) + oy * (-kx * st * sx + ct * sy + lam * (-st * sx + ct * ky * sy)) + var result = new SVG.Matrix(a, b, c, d, e, f) + return result + }, clone: function () { return new SVG.Matrix(this) }, @@ -2322,11 +2419,13 @@ SVG.Matrix = SVG.invent({ }, // Translate matrix translate: function (x, y) { - return new SVG.Matrix(this.native().translate(x || 0, y || 0)) + var translation = new SVG.Matrix(this.native().translate(x || 0, y || 0)) + var matrix = this.multiply(translation) + return matrix }, // Scale matrix scale: function (x, y, cx, cy) { - // support uniformal scale + // Support uniform scaling if (arguments.length === 1) { y = x } else if (arguments.length === 3) { @@ -2335,14 +2434,22 @@ SVG.Matrix = SVG.invent({ y = x } - return this.around(cx, cy, new SVG.Matrix(x, 0, 0, y, 0, 0)) + // Rotate the current matrix + var scale = new SVG.Matrix(x, 0, 0, y, 0, 0) + var centered = this.around(cx, cy, scale) + var matrix = this.multiply(centered) + return matrix }, // Rotate matrix rotate: function (r, cx, cy) { - // convert degrees to radians + // Convert degrees to radians r = SVG.utils.radians(r) - return this.around(cx, cy, new SVG.Matrix(Math.cos(r), Math.sin(r), -Math.sin(r), Math.cos(r), 0, 0)) + // Construct the rotation matrix + var rotation = new SVG.Matrix(Math.cos(r), Math.sin(r), -Math.sin(r), Math.cos(r), 0, 0) + var centered = this.around(cx, cy, rotation) + var matrix = this.multiply(centered) + return matrix }, // Flip matrix on x or y, at a given offset flip: function (a, o) { @@ -2351,6 +2458,12 @@ SVG.Matrix = SVG.invent({ : this.scale(-1, -1, a, o != null ? o : a) }, // Skew + shear: function (a, cx, cy) { + var shear = new SVG.Matrix(1, a, 0, 1, 0, 0) + var centered = this.around(cx, cy, shear) + var matrix = this.multiply(centered) + return matrix + }, skew: function (x, y, cx, cy) { // support uniformal skew if (arguments.length === 1) { @@ -2361,11 +2474,15 @@ SVG.Matrix = SVG.invent({ y = x } - // convert degrees to radians + // Convert degrees to radians x = SVG.utils.radians(x) y = SVG.utils.radians(y) - return this.around(cx, cy, new SVG.Matrix(1, Math.tan(y), Math.tan(x), 1, 0, 0)) + // Construct the matrix + var skew = new SVG.Matrix(1, Math.tan(y), Math.tan(x), 1, 0, 0) + var centered = this.around(cx, cy, skew) + var matrix = this.multiply(centered) + return matrix }, // SkewX skewX: function (x, cx, cy) { @@ -2570,198 +2687,14 @@ SVG.extend(SVG.Element, { } }) -/* global ensureCentre, capitalize, arrayToMatrix */ - -SVG.extend(SVG.Element, { - // Add transformations - transform: function (o, relative) { - // get target in case of the fx module, otherwise reference this - var target = this - var matrix, bbox - - // act as a getter - if (typeof o !== 'object') { - // get current matrix - matrix = new SVG.Matrix(target).extract() - - return typeof o === 'string' ? matrix[o] : matrix - } - - // get current matrix - matrix = new SVG.Matrix(target) - - // ensure relative flag - relative = !!relative || !!o.relative - - // act on matrix - if (o.a != null) { - matrix = relative - ? matrix.multiply(new SVG.Matrix(o)) - : new SVG.Matrix(o) - - // act on rotation - } else if (o.rotation != null) { - // ensure centre point - ensureCentre(o, target) - - // apply transformation - matrix = relative - ? matrix.rotate(o.rotation, o.cx, o.cy) - : matrix.rotate(o.rotation - matrix.extract().rotation, o.cx, o.cy) - - // act on scale - } else if (o.scale != null || o.scaleX != null || o.scaleY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure scale values on both axes - o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 - o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 - - if (!relative) { - // absolute; multiply inversed values - var e = matrix.extract() - o.scaleX = o.scaleX * 1 / e.scaleX - o.scaleY = o.scaleY * 1 / e.scaleY - } - - matrix = matrix.scale(o.scaleX, o.scaleY, o.cx, o.cy) - - // act on skew - } else if (o.skew != null || o.skewX != null || o.skewY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure skew values on both axes - o.skewX = o.skew != null ? o.skew : o.skewX != null ? o.skewX : 0 - o.skewY = o.skew != null ? o.skew : o.skewY != null ? o.skewY : 0 - - if (!relative) { - // absolute; reset skew values - var el = matrix.extract() - matrix = matrix.multiply(new SVG.Matrix().skew(el.skewX, el.skewY, el.cx, el.cy).inverse()) - } - - matrix = matrix.skew(o.skewX, o.skewY, o.cx, o.cy) - - // act on flip - } else if (o.flip) { - if (o.flip === 'x' || o.flip === 'y') { - o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset - } else { - if (o.offset == null) { - bbox = target.bbox() - o.flip = bbox.cx - o.offset = bbox.cy - } else { - o.flip = o.offset - } - } - - matrix = new SVG.Matrix().flip(o.flip, o.offset) - - // act on translate - } else if (o.x != null || o.y != null) { - if (relative) { - // relative - matrix = matrix.translate(o.x, o.y) - } else { - // absolute - if (o.x != null) matrix.e = o.x - if (o.y != null) matrix.f = o.y - } - } - - return this.attr('transform', matrix) - } -}) - -SVG.extend(SVG.FX, { - transform: function (o, relative) { - // get target in case of the fx module, otherwise reference this - var target = this.target() - var matrix, bbox - - // act as a getter - if (typeof o !== 'object') { - // get current matrix - matrix = new SVG.Matrix(target).extract() - return typeof o === 'string' ? matrix[o] : matrix - } - - // ensure relative flag - relative = !!relative || !!o.relative - - // act on matrix - if (o.a != null) { - matrix = new SVG.Matrix(o) - - // act on rotation - } else if (o.rotation != null) { - // ensure centre point - ensureCentre(o, target) - - // apply transformation - matrix = new SVG.Rotate(o.rotation, o.cx, o.cy) - - // act on scale - } else if (o.scale != null || o.scaleX != null || o.scaleY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure scale values on both axes - o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 - o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 - - matrix = new SVG.Scale(o.scaleX, o.scaleY, o.cx, o.cy) - - // act on skew - } else if (o.skewX != null || o.skewY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure skew values on both axes - o.skewX = o.skewX != null ? o.skewX : 0 - o.skewY = o.skewY != null ? o.skewY : 0 - - matrix = new SVG.Skew(o.skewX, o.skewY, o.cx, o.cy) - - // act on flip - } else if (o.flip) { - if (o.flip === 'x' || o.flip === 'y') { - o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset - } else { - if (o.offset == null) { - bbox = target.bbox() - o.flip = bbox.cx - o.offset = bbox.cy - } else { - o.flip = o.offset - } - } - - matrix = new SVG.Matrix().flip(o.flip, o.offset) - - // act on translate - } else if (o.x != null || o.y != null) { - matrix = new SVG.Translate(o.x, o.y) - } - - if (!matrix) return this - - matrix.relative = relative - - this.last().transforms.push(matrix) - - return this._callStart() - } -}) +/* global arrayToMatrix */ SVG.extend(SVG.Element, { // Reset all transformations untransform: function () { return this.attr('transform', null) }, + // merge the whole transformation chain into one matrix and returns it matrixify: function () { var matrix = (this.attr('transform') || '') @@ -2779,6 +2712,7 @@ SVG.extend(SVG.Element, { return matrix }, + // add an element to another parent without changing the visual representation on the screen toParent: function (parent) { if (this === parent) return this @@ -2789,146 +2723,340 @@ SVG.extend(SVG.Element, { return this }, + // same as above with parent equals root-svg toDoc: function () { return this.toParent(this.doc()) } - }) -SVG.Transformation = SVG.invent({ +SVG.extend(SVG.Element, { - create: function (source, inversed) { - if (arguments.length > 1 && typeof inversed !== 'boolean') { - return this.constructor.bind(this)([].slice.call(arguments)) + // Add transformations + transform: function (o) { + // Act as a getter if no object was passed + if (typeof o !== 'object') { + var matrix = new SVG.Matrix(this).decompose() + return typeof o === 'string' ? matrix[o] : matrix } - var i, len - if (Array.isArray(source)) { - for (i = 0, len = this.arguments.length; i < len; ++i) { - this[this.arguments[i]] = source[i] - } - } else if (typeof source === 'object') { - for (i = 0, len = this.arguments.length; i < len; ++i) { - this[this.arguments[i]] = source[this.arguments[i]] - } + // Allow the user to define the origin with a string + if (typeof o.origin === 'string') { + // Get the bounding box and string to use in our calculations + var string = o.origin.toLowerCase().trim() + var bbox = this.bbox() + var x = bbox.x + var y = bbox.y + var width = bbox.width + var height = bbox.height + + // Set the bounds eg : "bottom-left", "Top right", "middle" etc... + o.ox = string.includes('left') ? x + : string.includes('right') ? x + width + : x + width / 2 + o.oy = string.includes('top') ? y + : string.includes('bottom') ? y + height + : y + height / 2 + + // Make sure we only pass ox and oy + o.origin = null } - this.inversed = false + // Get the resulting matrix and apply it to the element + var result = new SVG.Matrix().form(o) + var matrixString = result.toString() - if (inversed === true) { - this.inversed = true - } + // Apply the result + return this.attr('transform', matrixString) }, - extend: { - - arguments: [], - method: '', - - at: function (pos) { - var params = [] - - for (var i = 0, len = this.arguments.length; i < len; ++i) { - params.push(this[this.arguments[i]]) - } - - var m = this._undo || new SVG.Matrix() - - m = new SVG.Matrix().morph(SVG.Matrix.prototype[this.method].apply(m, params)).at(pos) - - return this.inversed ? m.inverse() : m - }, - - undo: function (o) { - for (var i = 0, len = this.arguments.length; i < len; ++i) { - o[this.arguments[i]] = typeof this[this.arguments[i]] === 'undefined' ? 0 : o[this.arguments[i]] - } - - // The method SVG.Matrix.extract which was used before calling this - // method to obtain a value for the parameter o doesn't return a cx and - // a cy so we use the ones that were provided to this object at its creation - o.cx = this.cx - o.cy = this.cy - - this._undo = new SVG[capitalize(this.method)](o, true).at(1) - return this + // Map matrix to transform + matrix: function (m, relative) { + // Construct a matrix from the first parameter + var matrix = new SVG.Matrix(m) + + // If we have a relative matrix, we just apply the old matrix + if (relative) { + var oldMatrix = new SVG.Matrix(this) + matrix = oldMatrix.multiply(matrix) } + // Apply the matrix directly + return this.attr('transform', matrix) } - -}) - -SVG.Translate = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['transformedX', 'transformedY'], - method: 'translate' - } - -}) - -SVG.Rotate = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['rotation', 'cx', 'cy'], - method: 'rotate', - at: function (pos) { - var m = new SVG.Matrix().rotate(new SVG.Number().morph(this.rotation - (this._undo ? this._undo.rotation : 0)).at(pos), this.cx, this.cy) - return this.inversed ? m.inverse() : m - }, - undo: function (o) { - this._undo = o - return this - } - } - }) -SVG.Scale = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, +SVG.extend(SVG.FX, { + transform: function (o, relative) { - extend: { - arguments: ['scaleX', 'scaleY', 'cx', 'cy'], - method: 'scale' + // // get target in case of the fx module, otherwise reference this + // var target = this.target() + // , matrix, bbox + // + // // act as a getter + // if (typeof o !== 'object') { + // // get current matrix + // matrix = new SVG.Matrix(target).extract() + // + // return typeof o === 'string' ? matrix[o] : matrix + // } + // + // // ensure relative flag + // relative = !!relative || !!o.relative + // + // // act on matrix + // if (o.a != null) { + // matrix = new SVG.Matrix(o) + // + // // act on rotation + // } else if (o.rotation != null) { + // // ensure centre point + // ensureCentre(o, target) + // + // // apply transformation + // matrix = new SVG.Rotate(o.rotation, o.cx, o.cy) + // + // // act on scale + // } else if (o.scale != null || o.scaleX != null || o.scaleY != null) { + // // ensure centre point + // ensureCentre(o, target) + // + // // ensure scale values on both axes + // o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 + // o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 + // + // matrix = new SVG.Scale(o.scaleX, o.scaleY, o.cx, o.cy) + // + // // act on skew + // } else if (o.skewX != null || o.skewY != null) { + // // ensure centre point + // ensureCentre(o, target) + // + // // ensure skew values on both axes + // o.skewX = o.skewX != null ? o.skewX : 0 + // o.skewY = o.skewY != null ? o.skewY : 0 + // + // matrix = new SVG.Skew(o.skewX, o.skewY, o.cx, o.cy) + // + // // act on flip + // } else if (o.flip) { + // if(o.flip == 'x' || o.flip == 'y') { + // o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset + // } else { + // if(o.offset == null) { + // bbox = target.bbox() + // o.flip = bbox.cx + // o.offset = bbox.cy + // } else { + // o.flip = o.offset + // } + // } + // + // matrix = new SVG.Matrix().flip(o.flip, o.offset) + // + // // act on translate + // } else if (o.x != null || o.y != null) { + // matrix = new SVG.Translate(o.x, o.y) + // } + // + // if(!matrix) return this + // + // matrix.relative = relative + // + // this.last().transforms.push(matrix) + // + // return this._callStart() + // } + // // ensure scale values on both axes + // o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 + // o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 + // + // matrix = new SVG.Scale(o.scaleX, o.scaleY, o.cx, o.cy) + // + // // act on skew + // } else if (o.skewX != null || o.skewY != null) { + // // ensure centre point + // ensureCentre(o, target) + // + // // ensure skew values on both axes + // o.skewX = o.skewX != null ? o.skewX : 0 + // o.skewY = o.skewY != null ? o.skewY : 0 + // + // matrix = new SVG.Skew(o.skewX, o.skewY, o.cx, o.cy) + // + // // act on flip + // } else if (o.flip) { + // if (o.flip === 'x' || o.flip === 'y') { + // o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset + // } else { + // if (o.offset == null) { + // bbox = target.bbox() + // o.flip = bbox.cx + // o.offset = bbox.cy + // } else { + // o.flip = o.offset + // } + // } + // + // matrix = new SVG.Matrix().flip(o.flip, o.offset) + // + // // act on translate + // } else if (o.x != null || o.y != null) { + // matrix = new SVG.Translate(o.x, o.y) + // } + // + // if (!matrix) return this + // + // matrix.relative = relative + // + // this.last().transforms.push(matrix) + // + // return this._callStart() } - }) -SVG.Skew = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['skewX', 'skewY', 'cx', 'cy'], - method: 'skew' - } -}) +// TODO: DESTROY +// ======= +// +// +// SVG.Transformation = SVG.invent({ +// +// create: function(source, inversed){ +// +// if(arguments.length > 1 && typeof inversed != 'boolean'){ +// return this.constructor.call(this, [].slice.call(arguments)) +// } +// +// if(Array.isArray(source)){ +// for(var i = 0, len = this.arguments.length; i < len; ++i){ +// this[this.arguments[i]] = source[i] +// } +// } else if(typeof source == 'object'){ +// for(var i = 0, len = this.arguments.length; i < len; ++i){ +// this[this.arguments[i]] = source[this.arguments[i]] +// } +// } +// +// this.inversed = false +// +// if(inversed === true){ +// this.inversed = true +// } +// +// } +// +// , extend: { +// +// arguments: [] +// , method: '' +// +// , at: function(pos){ +// +// var params = [] +// +// for(var i = 0, len = this.arguments.length; i < len; ++i){ +// params.push(this[this.arguments[i]]) +// } +// +// var m = this._undo || new SVG.Matrix() +// +// m = new SVG.Matrix().morph(SVG.Matrix.prototype[this.method].apply(m, params)).at(pos) +// +// return this.inversed ? m.inverse() : m +// +// } +// +// , undo: function(o){ +// for(var i = 0, len = this.arguments.length; i < len; ++i){ +// o[this.arguments[i]] = typeof this[this.arguments[i]] == 'undefined' ? 0 : o[this.arguments[i]] +// } +// +// // The method SVG.Matrix.extract which was used before calling this +// // method to obtain a value for the parameter o doesn't return a cx and +// // a cy so we use the ones that were provided to this object at its creation +// o.cx = this.cx +// o.cy = this.cy +// +// this._undo = new SVG[capitalize(this.method)](o, true).at(1) +// +// return this +// } +// +// } +// +// }) +// +// SVG.Translate = SVG.invent({ +// +// parent: SVG.Matrix +// , inherit: SVG.Transformation +// +// , create: function(source, inversed){ +// this.constructor.apply(this, [].slice.call(arguments)) +// } +// +// , extend: { +// arguments: ['transformedX', 'transformedY'] +// , method: 'translate' +// } +// +// }) +// +// SVG.Rotate = SVG.invent({ +// +// parent: SVG.Matrix +// , inherit: SVG.Transformation +// +// , create: function(source, inversed){ +// this.constructor.apply(this, [].slice.call(arguments)) +// } +// +// , extend: { +// arguments: ['rotation', 'cx', 'cy'] +// , method: 'rotate' +// , at: function(pos){ +// var m = new SVG.Matrix().rotate(new SVG.Number().morph(this.rotation - (this._undo ? this._undo.rotation : 0)).at(pos), this.cx, this.cy) +// return this.inversed ? m.inverse() : m +// } +// , undo: function(o){ +// this._undo = o +// return this +// } +// } +// +// }) +// +// SVG.Scale = SVG.invent({ +// +// parent: SVG.Matrix +// , inherit: SVG.Transformation +// +// , create: function(source, inversed){ +// this.constructor.apply(this, [].slice.call(arguments)) +// } +// +// , extend: { +// arguments: ['scaleX', 'scaleY', 'cx', 'cy'] +// , method: 'scale' +// } +// +// }) +// +// SVG.Skew = SVG.invent({ +// +// parent: SVG.Matrix +// , inherit: SVG.Transformation +// +// , create: function(source, inversed){ +// this.constructor.apply(this, [].slice.call(arguments)) +// } +// +// , extend: { +// arguments: ['skewX', 'skewY', 'cx', 'cy'] +// , method: 'skew' +// } +// +// }) /* global camelCase */ @@ -4699,14 +4827,16 @@ var sugar = { SVG.extend([SVG.Element, SVG.FX], { // Map rotation to transform - rotate: function (d, cx, cy) { - return this.transform({ rotation: d, cx: cx, cy: cy }) + rotate: function (angle, cx, cy) { + var matrix = new SVG.Matrix().rotate(angle, cx, cy) + return this.matrix(matrix, true) }, // Map skew to transform skew: function (x, y, cx, cy) { - return arguments.length === 1 || arguments.length === 3 - ? this.transform({ skew: x, cx: y, cy: cx }) - : this.transform({ skewX: x, skewY: y, cx: cx, cy: cy }) + var matrix = arguments.length === 1 || arguments.length === 3 + ? new SVG.Matrix().skew(x, x, cx, cy) + : new SVG.Matrix().skew(x, y, cx, cy) + return this.matrix(matrix, true) }, // Map scale to transform scale: function (x, y, cx, cy) { @@ -4723,10 +4853,6 @@ SVG.extend([SVG.Element, SVG.FX], { o = typeof a === 'number' ? a : o return this.transform({ flip: a || 'both', offset: o }) }, - // Map matrix to transform - matrix: function (m) { - return this.attr('transform', new SVG.Matrix(arguments.length === 6 ? [].slice.call(arguments) : m)) - }, // Opacity opacity: function (value) { return this.attr('opacity', value) @@ -4990,14 +5116,6 @@ function proportionalSize (element, width, height) { } } -// Delta transform point -function deltaTransformPoint (matrix, x, y) { - return { - x: x * matrix.a + y * matrix.c + 0, - y: x * matrix.b + y * matrix.d + 0 - } -} - // Map matrix array to object function arrayToMatrix (a) { return { a: a[0], b: a[1], c: a[2], d: a[3], e: a[4], f: a[5] } @@ -5098,6 +5216,21 @@ function idFromReference (url) { // Create matrix array for looping var abcdef = 'abcdef'.split('') +// Gets the distance of a point (a, b) from the origin +function mag (a, b) { + return Math.sqrt(a * a + b * b) +} + +// Given a coordinate (a, b), this will calculate the sin, cosine and angle +// of this point projected onto the unit circle directly +function unitCircle (a, b) { + var len = Math.sqrt(a * a + b * b) + var cos = a / len + var sin = b / len + var theta = Math.atan2(b, a) * 180 / Math.PI + return {theta: theta, cos: cos, sin: sin} +} + /* globals fullBox, domContains, isNulledBox, Exception */ SVG.Box = SVG.invent({ diff --git a/dist/svg.min.js b/dist/svg.min.js index 277bd40..2d6360d 100644 --- a/dist/svg.min.js +++ b/dist/svg.min.js @@ -1,2 +1,2 @@ -/*! svg.js v3.0.0 MIT*/;!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t,t.document)}):"object"==typeof exports?module.exports=t.document?e(t,t.document):function(t){return e(t,t.document)}:t.SVG=e(t,t.document)}("undefined"!=typeof window?window:this,function(t,e){function n(t,n){if(t instanceof M.Element)return t;if("object"==typeof t)return M.adopt(t);if(null==t)return new M.Doc;if("string"==typeof t&&"<"!==t.charAt(0))return M.adopt(e.querySelector(t));var i=M.create("svg");return i.innerHTML=t,t=M.adopt(i.firstElementChild)}function i(t){return!(t.w||t.h||t.x||t.y)}function r(t){return(e.documentElement.contains||function(t){for(;t.parentNode;)t=t.parentNode;return t===e}).call(e.documentElement,t)}function s(t,e,n,i){return n+i.replace(M.regex.dots," .")}function a(t){for(var e=t.slice(0),n=e.length;n--;)Array.isArray(e[n])&&(e[n]=a(e[n]));return e}function o(t,e){return t instanceof e}function h(t,e){return(t.matches||t.matchesSelector||t.msMatchesSelector||t.mozMatchesSelector||t.webkitMatchesSelector||t.oMatchesSelector).call(t,e)}function u(t){return t.toLowerCase().replace(/-(.)/g,function(t,e){return e.toUpperCase()})}function l(t){return t.charAt(0).toUpperCase()+t.slice(1)}function c(t){return 4===t.length?["#",t.substring(1,2),t.substring(1,2),t.substring(2,3),t.substring(2,3),t.substring(3,4),t.substring(3,4)].join(""):t}function f(t){var e=t.toString(16);return 1===e.length?"0"+e:e}function d(t,e,n){if(null==e||null==n){var i=t.bbox();null==e?e=i.width/i.height*n:null==n&&(n=i.height/i.width*e)}return{width:e,height:n}}function p(t,e,n){return{x:e*t.a+n*t.c+0,y:e*t.b+n*t.d+0}}function x(t){return{a:t[0],b:t[1],c:t[2],d:t[3],e:t[4],f:t[5]}}function m(t){return t instanceof M.Matrix||(t=new M.Matrix(t)),t}function y(t,e){t.cx=null==t.cx?e.bbox().cx:t.cx,t.cy=null==t.cy?e.bbox().cy:t.cy}function v(t){for(var e=0,n=t.length,i="";e=0;e--)g(t.children[e]);return t.id?M.adopt(t).id(M.eid(t.nodeName)):M.adopt(t)}function w(t){return null==t.x&&(t.x=0,t.y=0,t.width=0,t.height=0),t.w=t.width,t.h=t.height,t.x2=t.x+t.width,t.y2=t.y+t.height,t.cx=t.x+t.width/2,t.cy=t.y+t.height/2,t}function b(t){var e=(t||"").toString().match(M.regex.reference);if(e)return e[1]}if(!e.createElementNS||!e.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect)return{supported:!1};var M=this.SVG=function(t){if(M.supported)return t=n(t)};M.supported=!0,M.ns="http://www.w3.org/2000/svg",M.xmlns="http://www.w3.org/2000/xmlns/",M.xlink="http://www.w3.org/1999/xlink",M.svgjs="http://svgjs.com/svgjs",M.did=1e3,M.eid=function(t){return"Svgjs"+l(t)+M.did++},M.create=function(t){return e.createElementNS(this.ns,t)},M.extend=function(t,e){var n,i;for(t=Array.isArray(t)?t:[t],i=t.length-1;i>=0;i--)if(t[i])for(n in e)t[i].prototype[n]=e[n]},M.invent=function(t){var e="function"==typeof t.create?t.create:function(e){this.constructor(e||M.create(t.create))};return t.inherit&&(e.prototype=new t.inherit),t.extend&&M.extend(e,t.extend),t.construct&&M.extend(t.parent||M.Container,t.construct),e},M.adopt=function(e){if(!e)return null;if(e.instance)return e.instance;if(!(e instanceof t.SVGElement))return new M.HtmlNode(e);return"svg"===e.nodeName?e.parentNode instanceof t.SVGElement?new M.Nested(e):new M.Doc(e):"linearGradient"===e.nodeName||"radialGradient"===e.nodeName?new M.Gradient(e):M[l(e.nodeName)]?new(M[l(e.nodeName)])(e):new M.Parent(e)},M.regex={numberAndUnit:/^([+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?)([a-z%]*)$/i,hex:/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,rgb:/rgb\((\d+),(\d+),(\d+)\)/,reference:/#([a-z0-9\-_]+)/i,transforms:/\)\s*,?\s*/,whitespace:/\s/g,isHex:/^#[a-f0-9]{3,6}$/i,isRgb:/^rgb\(/,isCss:/[^:]+:[^;]+;?/,isBlank:/^(\s+)?$/,isNumber:/^[+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,isPercent:/^-?[\d.]+%$/,isImage:/\.(jpg|jpeg|png|gif|svg)(\?[^=]+.*)?/i,delimiter:/[\s,]+/,hyphen:/([^e])-/gi,pathLetters:/[MLHVCSQTAZ]/gi,isPathLetter:/[MLHVCSQTAZ]/i,numbersWithDots:/((\d?\.\d+(?:e[+-]?\d+)?)((?:\.\d+(?:e[+-]?\d+)?)+))+/gi,dots:/\./g},M.utils={map:function(t,e){var n,i=t.length,r=[];for(n=0;n1?1:t,new M.Color({r:~~(this.r+(this.destination.r-this.r)*t),g:~~(this.g+(this.destination.g-this.g)*t),b:~~(this.b+(this.destination.b-this.b)*t)})):this}}),M.Color.test=function(t){return t+="",M.regex.isHex.test(t)||M.regex.isRgb.test(t)},M.Color.isRgb=function(t){return t&&"number"==typeof t.r&&"number"==typeof t.g&&"number"==typeof t.b},M.Color.isColor=function(t){return M.Color.isRgb(t)||M.Color.test(t)},M.Array=function(t,e){t=(t||[]).valueOf(),0===t.length&&e&&(t=e.valueOf()),this.value=this.parse(t)},M.extend(M.Array,{morph:function(t){if(this.destination=this.parse(t),this.value.length!==this.destination.length){for(var e=this.value[this.value.length-1],n=this.destination[this.destination.length-1];this.value.length>this.destination.length;)this.destination.push(n);for(;this.value.length=0;i--)this.value[i]=[this.value[i][0]+t,this.value[i][1]+e];return this},size:function(t,e){var n,i=this.bbox();for(n=this.value.length-1;n>=0;n--)i.width&&(this.value[n][0]=(this.value[n][0]-i.x)*t/i.width+i.x),i.height&&(this.value[n][1]=(this.value[n][1]-i.y)*e/i.height+i.y);return this},bbox:function(){var t=-1/0,e=-1/0,n=1/0,i=1/0;return this.value.forEach(function(r){t=Math.max(r[0],t),e=Math.max(r[1],e),n=Math.min(r[0],n),i=Math.min(r[1],i)}),{x:n,y:i,width:t-n,height:e-i}}});for(var P={M:function(t,e,n){return e.x=n.x=t[0],e.y=n.y=t[1],["M",e.x,e.y]},L:function(t,e){return e.x=t[0],e.y=t[1],["L",t[0],t[1]]},H:function(t,e){return e.x=t[0],["H",t[0]]},V:function(t,e){return e.y=t[0],["V",t[0]]},C:function(t,e){return e.x=t[4],e.y=t[5],["C",t[0],t[1],t[2],t[3],t[4],t[5]]},S:function(t,e){return e.x=t[2],e.y=t[3],["S",t[0],t[1],t[2],t[3]]},Q:function(t,e){return e.x=t[2],e.y=t[3],["Q",t[0],t[1],t[2],t[3]]},T:function(t,e){return e.x=t[0],e.y=t[1],["T",t[0],t[1]]},Z:function(t,e,n){return e.x=n.x,e.y=n.y,["Z"]},A:function(t,e){return e.x=t[5],e.y=t[6],["A",t[0],t[1],t[2],t[3],t[4],t[5],t[6]]}},A="mlhvqtcsaz".split(""),N=0,C=A.length;N=0;r--)i=this.value[r][0],"M"===i||"L"===i||"T"===i?(this.value[r][1]+=t,this.value[r][2]+=e):"H"===i?this.value[r][1]+=t:"V"===i?this.value[r][1]+=e:"C"===i||"S"===i||"Q"===i?(this.value[r][1]+=t,this.value[r][2]+=e,this.value[r][3]+=t,this.value[r][4]+=e,"C"===i&&(this.value[r][5]+=t,this.value[r][6]+=e)):"A"===i&&(this.value[r][6]+=t,this.value[r][7]+=e);return this},size:function(t,e){var n,i,r=this.bbox();for(n=this.value.length-1;n>=0;n--)i=this.value[n][0],"M"===i||"L"===i||"T"===i?(this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x,this.value[n][2]=(this.value[n][2]-r.y)*e/r.height+r.y):"H"===i?this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x:"V"===i?this.value[n][1]=(this.value[n][1]-r.y)*e/r.height+r.y:"C"===i||"S"===i||"Q"===i?(this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x,this.value[n][2]=(this.value[n][2]-r.y)*e/r.height+r.y,this.value[n][3]=(this.value[n][3]-r.x)*t/r.width+r.x,this.value[n][4]=(this.value[n][4]-r.y)*e/r.height+r.y,"C"===i&&(this.value[n][5]=(this.value[n][5]-r.x)*t/r.width+r.x,this.value[n][6]=(this.value[n][6]-r.y)*e/r.height+r.y)):"A"===i&&(this.value[n][1]=this.value[n][1]*t/r.width,this.value[n][2]=this.value[n][2]*e/r.height,this.value[n][6]=(this.value[n][6]-r.x)*t/r.width+r.x,this.value[n][7]=(this.value[n][7]-r.y)*e/r.height+r.y);return this},equalCommands:function(t){var e,n,i;for(t=new M.PathArray(t),i=this.value.length===t.value.length,e=0,n=this.value.length;i&&eo);return i},bbox:function(){return M.parser().path.setAttribute("d",this.toString()),M.parser.nodes.path.getBBox()}}),M.Number=M.invent({create:function(t,e){this.value=0,this.unit=e||"","number"==typeof t?this.value=isNaN(t)?0:isFinite(t)?t:t<0?-3.4e38:3.4e38:"string"==typeof t?(e=t.match(M.regex.numberAndUnit))&&(this.value=parseFloat(e[1]),"%"===e[5]?this.value/=100:"s"===e[5]&&(this.value*=1e3),this.unit=e[5]):t instanceof M.Number&&(this.value=t.valueOf(),this.unit=t.unit)},extend:{toString:function(){return("%"===this.unit?~~(1e8*this.value)/1e6:"s"===this.unit?this.value/1e3:this.value)+this.unit},toJSON:function(){return this.toString()},valueOf:function(){return this.value},plus:function(t){return t=new M.Number(t),new M.Number(this+t,this.unit||t.unit)},minus:function(t){return t=new M.Number(t),new M.Number(this-t,this.unit||t.unit)},times:function(t){return t=new M.Number(t),new M.Number(this*t,this.unit||t.unit)},divide:function(t){return t=new M.Number(t),new M.Number(this/t,this.unit||t.unit)},to:function(t){var e=new M.Number(this);return"string"==typeof t&&(e.unit=t),e},morph:function(t){return this.destination=new M.Number(t),t.relative&&(this.destination.value+=this.value),this},at:function(t){return this.destination?new M.Number(this.destination).minus(this).times(t).plus(this):this}}}),M.HtmlNode=M.invent({create:function(t){this.node=t},extend:{add:function(t,e){return t=n(t),t instanceof M.Nested&&(t=new M.Doc(t.node),t.setData(JSON.parse(t.node.getAttribute("svgjs:data"))||{})),null===e?this.node.appendChild(t.node):t.node!==this.node.children[e]&&this.node.insertBefore(t.node,this.node.children[e]),this},put:function(t,e){return this.add(t,e),t}}}),M.Element=M.invent({create:function(t){this._event=null,this.dom={},this.node=t,this.node&&(this.type=t.nodeName,this.node.instance=this,t.hasAttribute("svgjs:data")&&this.setData(JSON.parse(t.getAttribute("svgjs:data"))||{}))},extend:{x:function(t){return this.attr("x",t)},y:function(t){return this.attr("y",t)},cx:function(t){return null==t?this.x()+this.width()/2:this.x(t-this.width()/2)},cy:function(t){return null==t?this.y()+this.height()/2:this.y(t-this.height()/2)},move:function(t,e){return this.x(t).y(e)},center:function(t,e){return this.cx(t).cy(e)},width:function(t){return this.attr("width",t)},height:function(t){return this.attr("height",t)},size:function(t,e){var n=d(this,t,e);return this.width(new M.Number(n.width)).height(new M.Number(n.height))},clone:function(t){this.writeDataToDom();var e=g(this.node.cloneNode(!0));return t?t.add(e):this.after(e),e},remove:function(){return this.parent()&&this.parent().removeElement(this),this},replace:function(t){return this.after(t).remove(),t},addTo:function(t){return n(t).put(this)},putIn:function(t){return n(t).add(this)},id:function(t){return void 0!==t||this.node.id||(this.node.id=M.eid(this.type)),this.attr("id",t)},inside:function(t,e){var n=this.bbox();return t>n.x&&e>n.y&&t":function(t){return-Math.cos(t*Math.PI)/2+.5},">":function(t){return Math.sin(t*Math.PI/2)},"<":function(t){return 1-Math.cos(t*Math.PI/2)}},M.morph=function(t){return function(e,n){return new M.MorphObj(e,n).at(t)}},M.Situation=M.invent({create:function(t){this.init=!1,this.reversed=!1,this.reversing=!1,this.duration=new M.Number(t.duration).valueOf(),this.delay=new M.Number(t.delay).valueOf(),this.start=+new Date+this.delay,this.finish=this.start+this.duration,this.ease=t.ease,this.loop=0,this.loops=!1,this.animations={},this.attrs={},this.styles={},this.transforms=[],this.once={}}}),M.FX=M.invent({create:function(t){this._target=t,this.situations=[],this.active=!1,this.situation=null,this.paused=!1,this.lastPos=0,this.pos=0,this.absPos=0,this._speed=1},extend:{animate:function(t,e,n){"object"==typeof t&&(e=t.ease,n=t.delay,t=t.duration);var i=new M.Situation({duration:t||1e3,delay:n||0,ease:M.easing[e||"-"]||e});return this.queue(i),this},delay:function(t){var e=new M.Situation({duration:t,delay:0,ease:M.easing["-"]});return this.queue(e)},target:function(t){return t&&t instanceof M.Element?(this._target=t,this):this._target},timeToAbsPos:function(t){return(t-this.situation.start)/(this.situation.duration/this._speed)},absPosToTime:function(t){return this.situation.duration/this._speed*t+this.situation.start},startAnimFrame:function(){this.stopAnimFrame(),this.animationFrame=t.requestAnimationFrame(function(){this.step()}.bind(this))},stopAnimFrame:function(){t.cancelAnimationFrame(this.animationFrame)},start:function(){return!this.active&&this.situation&&(this.active=!0,this.startCurrent()),this},startCurrent:function(){return this.situation.start=+new Date+this.situation.delay/this._speed,this.situation.finish=this.situation.start+this.situation.duration/this._speed,this.initAnimations().step()},queue:function(t){return("function"==typeof t||t instanceof M.Situation)&&this.situations.push(t),this.situation||(this.situation=this.situations.shift()),this},dequeue:function(){return this.stop(),this.situation=this.situations.shift(),this.situation&&(this.situation instanceof M.Situation?this.start():this.situation(this)),this},initAnimations:function(){var t,e,n,i=this.situation;if(i.init)return this;for(t in i.animations)for(n=this.target()[t](),Array.isArray(n)||(n=[n]),Array.isArray(i.animations[t])||(i.animations[t]=[i.animations[t]]),e=n.length;e--;)i.animations[t][e]instanceof M.Number&&(n[e]=new M.Number(n[e])),i.animations[t][e]=n[e].morph(i.animations[t][e]);for(t in i.attrs)i.attrs[t]=new M.MorphObj(this.target().attr(t),i.attrs[t]);for(t in i.styles)i.styles[t]=new M.MorphObj(this.target().css(t),i.styles[t]);return i.initialTransformation=this.target().matrixify(),i.init=!0,this},clearQueue:function(){return this.situations=[],this},clearCurrent:function(){return this.situation=null,this},stop:function(t,e){var n=this.active;return this.active=!1,e&&this.clearQueue(),t&&this.situation&&(!n&&this.startCurrent(),this.atEnd()),this.stopAnimFrame(),this.clearCurrent()},reset:function(){if(this.situation){var t=this.situation;this.stop(),this.situation=t,this.atStart()}return this},finish:function(){for(this.stop(!0,!1);this.dequeue().situation&&this.stop(!0,!1););return this.clearQueue().clearCurrent(),this},atStart:function(){return this.at(0,!0)},atEnd:function(){return!0===this.situation.loops&&(this.situation.loops=this.situation.loop+1),"number"==typeof this.situation.loops?this.at(this.situation.loops,!0):this.at(1,!0)},at:function(t,e){var n=this.situation.duration/this._speed;return this.absPos=t,e||(this.situation.reversed&&(this.absPos=1-this.absPos),this.absPos+=this.situation.loop),this.situation.start=+new Date-this.absPos*n,this.situation.finish=this.situation.start+n,this.step(!0)},speed:function(t){return 0===t?this.pause():t?(this._speed=t,this.at(this.absPos,!0)):this._speed},loop:function(t,e){var n=this.last();return n.loops=null==t||t,n.loop=0,e&&(n.reversing=!0),this},pause:function(){return this.paused=!0,this.stopAnimFrame(),this},play:function(){return this.paused?(this.paused=!1,this.at(this.absPos,!0)):this},reverse:function(t){var e=this.last();return e.reversed=void 0===t?!e.reversed:t,this},progress:function(t){return t?this.situation.ease(this.pos):this.pos},after:function(t){function e(i){i.detail.situation===n&&(t.call(this,n),this.off("finished.fx",e))}var n=this.last();return this.target().on("finished.fx",e),this._callStart()},during:function(t){function e(e){e.detail.situation===n&&t.call(this,e.detail.pos,M.morph(e.detail.pos),e.detail.eased,n)}var n=this.last();return this.target().off("during.fx",e).on("during.fx",e),this.after(function(){this.off("during.fx",e)}),this._callStart()},afterAll:function(t){var e=function e(n){t.call(this),this.off("allfinished.fx",e)};return this.target().off("allfinished.fx",e).on("allfinished.fx",e),this._callStart()},duringAll:function(t){var e=function(e){t.call(this,e.detail.pos,M.morph(e.detail.pos),e.detail.eased,e.detail.situation)};return this.target().off("during.fx",e).on("during.fx",e),this.afterAll(function(){this.off("during.fx",e)}),this._callStart()},last:function(){return this.situations.length?this.situations[this.situations.length-1]:this.situation},add:function(t,e,n){return this.last()[n||"animations"][t]=e,this._callStart()},step:function(t){if(t||(this.absPos=this.timeToAbsPos(+new Date)),!1!==this.situation.loops){var e,n,i;e=Math.max(this.absPos,0),n=Math.floor(e),!0===this.situation.loops||nthis.lastPos&&s<=r&&(this.situation.once[s].call(this.target(),this.pos,r),delete this.situation.once[s]);return this.active&&this.target().fire("during",{pos:this.pos,eased:r,fx:this,situation:this.situation}),this.situation?(this.eachAt(),1===this.pos&&!this.situation.reversed||this.situation.reversed&&0===this.pos?(this.stopAnimFrame(),this.target().fire("finished",{fx:this,situation:this.situation}),this.situations.length||(this.target().fire("allfinished"),this.situations.length||(this.target().off(".fx"),this.active=!1)),this.active?this.dequeue():this.clearCurrent()):!this.paused&&this.active&&this.startAnimFrame(),this.lastPos=r,this):this},eachAt:function(){var t,e,n,i=this,r=this.target(),s=this.situation;for(t in s.animations)n=[].concat(s.animations[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(s.ease(i.pos),i.pos):t}),r[t].apply(r,n);for(t in s.attrs)n=[t].concat(s.attrs[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(s.ease(i.pos),i.pos):t}),r.attr.apply(r,n);for(t in s.styles)n=[t].concat(s.styles[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(s.ease(i.pos),i.pos):t}),r.css.apply(r,n);if(s.transforms.length){for(n=s.initialTransformation,t=0,e=s.transforms.length;t=0;--e)this[S[e]]=null!=t[S[e]]?t[S[e]]:n[S[e]]},extend:{extract:function(){var t=p(this,0,1),e=p(this,1,0),n=180/Math.PI*Math.atan2(t.y,t.x)-90;return{x:this.e,y:this.f,transformedX:(this.e*Math.cos(n*Math.PI/180)+this.f*Math.sin(n*Math.PI/180))/Math.sqrt(this.a*this.a+this.b*this.b),transformedY:(this.f*Math.cos(n*Math.PI/180)+this.e*Math.sin(-n*Math.PI/180))/Math.sqrt(this.c*this.c+this.d*this.d),skewX:-n,skewY:180/Math.PI*Math.atan2(e.y,e.x),scaleX:Math.sqrt(this.a*this.a+this.b*this.b),scaleY:Math.sqrt(this.c*this.c+this.d*this.d),rotation:n,a:this.a,b:this.b,c:this.c,d:this.d,e:this.e,f:this.f,matrix:new M.Matrix(this)}},clone:function(){return new M.Matrix(this)},morph:function(t){return this.destination=new M.Matrix(t),this},at:function(t){return this.destination?new M.Matrix({a:this.a+(this.destination.a-this.a)*t,b:this.b+(this.destination.b-this.b)*t,c:this.c+(this.destination.c-this.c)*t,d:this.d+(this.destination.d-this.d)*t,e:this.e+(this.destination.e-this.e)*t,f:this.f+(this.destination.f-this.f)*t}):this},multiply:function(t){return new M.Matrix(this.native().multiply(m(t).native()))},inverse:function(){return new M.Matrix(this.native().inverse())},translate:function(t,e){return new M.Matrix(this.native().translate(t||0,e||0))},scale:function(t,e,n,i){return 1===arguments.length?e=t:3===arguments.length&&(i=n,n=e,e=t),this.around(n,i,new M.Matrix(t,0,0,e,0,0))},rotate:function(t,e,n){return t=M.utils.radians(t),this.around(e,n,new M.Matrix(Math.cos(t),Math.sin(t),-Math.sin(t),Math.cos(t),0,0))},flip:function(t,e){return"x"===t?this.scale(-1,1,e,0):"y"===t?this.scale(1,-1,0,e):this.scale(-1,-1,t,null!=e?e:t)},skew:function(t,e,n,i){return 1===arguments.length?e=t:3===arguments.length&&(i=n,n=e,e=t),t=M.utils.radians(t),e=M.utils.radians(e),this.around(n,i,new M.Matrix(1,Math.tan(e),Math.tan(t),1,0,0))},skewX:function(t,e,n){return this.skew(t,0,e,n)},skewY:function(t,e,n){return this.skew(0,t,e,n)},around:function(t,e,n){return this.multiply(new M.Matrix(1,0,0,1,t||0,e||0)).multiply(n).multiply(new M.Matrix(1,0,0,1,-t||0,-e||0))},native:function(){for(var t=M.parser.nodes.svg.node.createSVGMatrix(),e=S.length-1;e>=0;e--)t[S[e]]=this[S[e]];return t},toString:function(){return"matrix("+this.a+","+this.b+","+this.c+","+this.d+","+this.e+","+this.f+")"}},parent:M.Element,construct:{ctm:function(){return new M.Matrix(this.node.getCTM())},screenCTM:function(){if(this instanceof M.Nested){var t=this.rect(1,1),e=t.node.getScreenCTM();return t.remove(),new M.Matrix(e)}return new M.Matrix(this.node.getScreenCTM())}}}),M.Point=M.invent({create:function(t,e){var n,i={x:0,y:0};n=Array.isArray(t)?{x:t[0],y:t[1]}:"object"==typeof t?{x:t.x,y:t.y}:null!=t?{x:t,y:null!=e?e:t}:i,this.x=n.x,this.y=n.y},extend:{clone:function(){return new M.Point(this)},morph:function(t,e){return this.destination=new M.Point(t,e),this},at:function(t){return this.destination?new M.Point({x:this.x+(this.destination.x-this.x)*t,y:this.y+(this.destination.y-this.y)*t}):this},native:function(){var t=M.parser.nodes.svg.node.createSVGPoint();return t.x=this.x,t.y=this.y,t},transform:function(t){return new M.Point(this.native().matrixTransform(t.native()))}}}),M.extend(M.Element,{point:function(t,e){return new M.Point(t,e).transform(this.screenCTM().inverse())}}),M.extend(M.Element,{attr:function(t,e,n){if(null==t){for(t={},e=this.node.attributes,n=e.length-1;n>=0;n--)t[e[n].nodeName]=M.regex.isNumber.test(e[n].nodeValue)?parseFloat(e[n].nodeValue):e[n].nodeValue;return t}if("object"==typeof t)for(e in t)this.attr(e,t[e]);else if(null===e)this.node.removeAttribute(t);else{if(null==e)return e=this.node.getAttribute(t),null==e?M.defaults.attrs[t]:M.regex.isNumber.test(e)?parseFloat(e):e;"fill"!==t&&"stroke"!==t||(M.regex.isImage.test(e)&&(e=this.doc().defs().image(e)),e instanceof M.Image&&(e=this.doc().defs().pattern(0,0,function(){this.add(e)}))),"number"==typeof e?e=new M.Number(e):M.Color.isColor(e)?e=new M.Color(e):Array.isArray(e)&&(e=new M.Array(e)),"leading"===t?this.leading&&this.leading(e):"string"==typeof n?this.node.setAttributeNS(n,t,e.toString()):this.node.setAttribute(t,e.toString()), -!this.rebuild||"font-size"!==t&&"x"!==t||this.rebuild(t,e)}return this}}),M.extend(M.Element,{transform:function(t,e){var n,i,r=this;if("object"!=typeof t)return n=new M.Matrix(r).extract(),"string"==typeof t?n[t]:n;if(n=new M.Matrix(r),e=!!e||!!t.relative,null!=t.a)n=e?n.multiply(new M.Matrix(t)):new M.Matrix(t);else if(null!=t.rotation)y(t,r),n=e?n.rotate(t.rotation,t.cx,t.cy):n.rotate(t.rotation-n.extract().rotation,t.cx,t.cy);else if(null!=t.scale||null!=t.scaleX||null!=t.scaleY){if(y(t,r),t.scaleX=null!=t.scale?t.scale:null!=t.scaleX?t.scaleX:1,t.scaleY=null!=t.scale?t.scale:null!=t.scaleY?t.scaleY:1,!e){var s=n.extract();t.scaleX=1*t.scaleX/s.scaleX,t.scaleY=1*t.scaleY/s.scaleY}n=n.scale(t.scaleX,t.scaleY,t.cx,t.cy)}else if(null!=t.skew||null!=t.skewX||null!=t.skewY){if(y(t,r),t.skewX=null!=t.skew?t.skew:null!=t.skewX?t.skewX:0,t.skewY=null!=t.skew?t.skew:null!=t.skewY?t.skewY:0,!e){var a=n.extract();n=n.multiply((new M.Matrix).skew(a.skewX,a.skewY,a.cx,a.cy).inverse())}n=n.skew(t.skewX,t.skewY,t.cx,t.cy)}else t.flip?("x"===t.flip||"y"===t.flip?t.offset=null==t.offset?r.bbox()["c"+t.flip]:t.offset:null==t.offset?(i=r.bbox(),t.flip=i.cx,t.offset=i.cy):t.flip=t.offset,n=(new M.Matrix).flip(t.flip,t.offset)):null==t.x&&null==t.y||(e?n=n.translate(t.x,t.y):(null!=t.x&&(n.e=t.x),null!=t.y&&(n.f=t.y)));return this.attr("transform",n)}}),M.extend(M.FX,{transform:function(t,e){var n,i,r=this.target();return"object"!=typeof t?(n=new M.Matrix(r).extract(),"string"==typeof t?n[t]:n):(e=!!e||!!t.relative,null!=t.a?n=new M.Matrix(t):null!=t.rotation?(y(t,r),n=new M.Rotate(t.rotation,t.cx,t.cy)):null!=t.scale||null!=t.scaleX||null!=t.scaleY?(y(t,r),t.scaleX=null!=t.scale?t.scale:null!=t.scaleX?t.scaleX:1,t.scaleY=null!=t.scale?t.scale:null!=t.scaleY?t.scaleY:1,n=new M.Scale(t.scaleX,t.scaleY,t.cx,t.cy)):null!=t.skewX||null!=t.skewY?(y(t,r),t.skewX=null!=t.skewX?t.skewX:0,t.skewY=null!=t.skewY?t.skewY:0,n=new M.Skew(t.skewX,t.skewY,t.cx,t.cy)):t.flip?("x"===t.flip||"y"===t.flip?t.offset=null==t.offset?r.bbox()["c"+t.flip]:t.offset:null==t.offset?(i=r.bbox(),t.flip=i.cx,t.offset=i.cy):t.flip=t.offset,n=(new M.Matrix).flip(t.flip,t.offset)):null==t.x&&null==t.y||(n=new M.Translate(t.x,t.y)),n?(n.relative=e,this.last().transforms.push(n),this._callStart()):this)}}),M.extend(M.Element,{untransform:function(){return this.attr("transform",null)},matrixify:function(){return(this.attr("transform")||"").split(M.regex.transforms).slice(0,-1).map(function(t){var e=t.trim().split("(");return[e[0],e[1].split(M.regex.delimiter).map(function(t){return parseFloat(t)})]}).reduce(function(t,e){return"matrix"===e[0]?t.multiply(x(e[1])):t[e[0]].apply(t,e[1])},new M.Matrix)},toParent:function(t){if(this===t)return this;var e=this.screenCTM(),n=t.screenCTM().inverse();return this.addTo(t).untransform().transform(n.multiply(e)),this},toDoc:function(){return this.toParent(this.doc())}}),M.Transformation=M.invent({create:function(t,e){if(arguments.length>1&&"boolean"!=typeof e)return this.constructor.bind(this)([].slice.call(arguments));var n,i;if(Array.isArray(t))for(n=0,i=this.arguments.length;n=0},index:function(t){return[].slice.call(this.node.children).indexOf(t.node)},get:function(t){return M.adopt(this.node.children[t])},first:function(){return this.get(0)},last:function(){return this.get(this.node.children.length-1)},each:function(t,e){var n,i,r=this.children();for(n=0,i=r.length;n0&&this.parent().removeElement(this).add(this,t-1),this},front:function(){var t=this.parent();return t.node.appendChild(this.node),t instanceof M.Doc&&t.node.appendChild(t.defs().node),this},back:function(){return this.position()>0&&this.parent().removeElement(this).add(this,0),this},before:function(t){t.remove();var e=this.position();return this.parent().add(t,e),this},after:function(t){t.remove();var e=this.position();return this.parent().add(t,e+1),this}}),M.Mask=M.invent({create:"mask",inherit:M.Container,extend:{remove:function(){return this.targets().forEach(function(t){t.unmask()}),M.Element.prototype.remove.call(this)},targets:function(){return M.select('svg [mask*="'+this.id()+'"]')}},construct:{mask:function(){return this.defs().put(new M.Mask)}}}),M.extend(M.Element,{maskWith:function(t){var e=t instanceof M.Mask?t:this.parent().mask().add(t);return this.attr("mask",'url("#'+e.id()+'")')},unmask:function(){return this.attr("mask",null)},masker:function(){return this.reference("mask")}}),M.ClipPath=M.invent({create:"clipPath",inherit:M.Container,extend:{remove:function(){return this.targets().forEach(function(t){t.unclip()}),M.Element.prototype.remove.call(this)},targets:function(){return M.select('svg [clip-path*="'+this.id()+'"]')}},construct:{clip:function(){return this.defs().put(new M.ClipPath)}}}),M.extend(M.Element,{clipWith:function(t){var e=t instanceof M.ClipPath?t:this.parent().clip().add(t);return this.attr("clip-path",'url("#'+e.id()+'")')},unclip:function(){return this.attr("clip-path",null)},clipper:function(){return this.reference("clip-path")}}),M.Gradient=M.invent({create:function(t){this.constructor("object"==typeof t?t:M.create(t+"Gradient"))},inherit:M.Container,extend:{stop:function(t,e,n){return this.put(new M.Stop).update(t,e,n)},update:function(t){return this.clear(),"function"==typeof t&&t.call(this,this),this},url:function(){return"url(#"+this.id()+")"},toString:function(){return this.url()},attr:function(t,e,n){return"transform"===t&&(t="gradientTransform"),M.Container.prototype.attr.call(this,t,e,n)}},construct:{gradient:function(t,e){return this.defs().gradient(t,e)}}}),M.extend([M.Gradient,M.FX],{from:function(t,e){return"radialGradient"===(this._target||this).type?this.attr({fx:new M.Number(t),fy:new M.Number(e)}):this.attr({x1:new M.Number(t),y1:new M.Number(e)})},to:function(t,e){return"radialGradient"===(this._target||this).type?this.attr({cx:new M.Number(t),cy:new M.Number(e)}):this.attr({x2:new M.Number(t),y2:new M.Number(e)})}}),M.extend(M.Defs,{gradient:function(t,e){return this.put(new M.Gradient(t)).update(e)}}),M.Stop=M.invent({create:"stop",inherit:M.Element,extend:{update:function(t){return("number"==typeof t||t instanceof M.Number)&&(t={offset:arguments[0],color:arguments[1],opacity:arguments[2]}),null!=t.opacity&&this.attr("stop-opacity",t.opacity),null!=t.color&&this.attr("stop-color",t.color),null!=t.offset&&this.attr("offset",new M.Number(t.offset)),this}}}),M.Pattern=M.invent({create:"pattern",inherit:M.Container,extend:{url:function(){return"url(#"+this.id()+")"},update:function(t){return this.clear(),"function"==typeof t&&t.call(this,this),this},toString:function(){return this.url()},attr:function(t,e,n){return"transform"===t&&(t="patternTransform"),M.Container.prototype.attr.call(this,t,e,n)}},construct:{pattern:function(t,e,n){return this.defs().pattern(t,e,n)}}}),M.extend(M.Defs,{pattern:function(t,e,n){return this.put(new M.Pattern).update(n).attr({x:0,y:0,width:t,height:e,patternUnits:"userSpaceOnUse"})}}),M.Doc=M.invent({create:function(t){this.constructor(t||M.create("svg")),this.namespace().defs()},inherit:M.Container,extend:{namespace:function(){return this.attr({xmlns:M.ns,version:"1.1"}).attr("xmlns:xlink",M.xlink,M.xmlns).attr("xmlns:svgjs",M.svgjs,M.xmlns)},defs:function(){return M.adopt(this.node.getElementsByTagName("defs")[0])||this.put(new M.Defs)},parent:function(){return"#document"===this.node.parentNode.nodeName?null:this.node.parentNode},remove:function(){return this.parent()&&this.parent().removeChild(this.node),this},clear:function(){for(;this.node.hasChildNodes();)this.node.removeChild(this.node.lastChild);return this},toNested:function(){var t=M.create("svg");return this.node.instance=null,t.appendChild(this.node),M.adopt(this.node)}}}),M.Shape=M.invent({create:function(t){this.constructor(t)},inherit:M.Element}),M.Bare=M.invent({create:function(t,e){if(this.constructor(M.create(t)),e)for(var n in e.prototype)"function"==typeof e.prototype[n]&&(this[n]=e.prototype[n])},inherit:M.Element,extend:{words:function(t){for(;this.node.hasChildNodes();)this.node.removeChild(this.node.lastChild);return this.node.appendChild(e.createTextNode(t)),this}}}),M.extend(M.Parent,{element:function(t,e){return this.put(new M.Bare(t,e))}}),M.Symbol=M.invent({create:"symbol",inherit:M.Container,construct:{symbol:function(){return this.put(new M.Symbol)}}}),M.Use=M.invent({create:"use",inherit:M.Shape,extend:{element:function(t,e){return this.attr("href",(e||"")+"#"+t,M.xlink)}},construct:{use:function(t,e){return this.put(new M.Use).element(t,e)}}}),M.Rect=M.invent({create:"rect",inherit:M.Shape,construct:{rect:function(t,e){return this.put(new M.Rect).size(t,e)}}}),M.Circle=M.invent({create:"circle",inherit:M.Shape,construct:{circle:function(t){return this.put(new M.Circle).rx(new M.Number(t).divide(2)).move(0,0)}}}),M.extend([M.Circle,M.FX],{rx:function(t){return this.attr("r",t)},ry:function(t){return this.rx(t)}}),M.Ellipse=M.invent({create:"ellipse",inherit:M.Shape,construct:{ellipse:function(t,e){return this.put(new M.Ellipse).size(t,e).move(0,0)}}}),M.extend([M.Ellipse,M.Rect,M.FX],{rx:function(t){return this.attr("rx",t)},ry:function(t){return this.attr("ry",t)}}),M.extend([M.Circle,M.Ellipse],{x:function(t){return null==t?this.cx()-this.rx():this.cx(t+this.rx())},y:function(t){return null==t?this.cy()-this.ry():this.cy(t+this.ry())},cx:function(t){return null==t?this.attr("cx"):this.attr("cx",t)},cy:function(t){return null==t?this.attr("cy"):this.attr("cy",t)},width:function(t){return null==t?2*this.rx():this.rx(new M.Number(t).divide(2))},height:function(t){return null==t?2*this.ry():this.ry(new M.Number(t).divide(2))},size:function(t,e){var n=d(this,t,e);return this.rx(new M.Number(n.width).divide(2)).ry(new M.Number(n.height).divide(2))}}),M.Line=M.invent({create:"line",inherit:M.Shape,extend:{array:function(){return new M.PointArray([[this.attr("x1"),this.attr("y1")],[this.attr("x2"),this.attr("y2")]])},plot:function(t,e,n,i){return null==t?this.array():(t=void 0!==e?{x1:t,y1:e,x2:n,y2:i}:new M.PointArray(t).toLine(),this.attr(t))},move:function(t,e){return this.attr(this.array().move(t,e).toLine())},size:function(t,e){var n=d(this,t,e);return this.attr(this.array().size(n.width,n.height).toLine())}},construct:{line:function(t,e,n,i){return M.Line.prototype.plot.apply(this.put(new M.Line),null!=t?[t,e,n,i]:[0,0,0,0])}}}),M.Polyline=M.invent({create:"polyline",inherit:M.Shape,construct:{polyline:function(t){return this.put(new M.Polyline).plot(t||new M.PointArray)}}}),M.Polygon=M.invent({create:"polygon",inherit:M.Shape,construct:{polygon:function(t){return this.put(new M.Polygon).plot(t||new M.PointArray)}}}),M.extend([M.Polyline,M.Polygon],{array:function(){return this._array||(this._array=new M.PointArray(this.attr("points")))},plot:function(t){return null==t?this.array():this.clear().attr("points","string"==typeof t?t:this._array=new M.PointArray(t))},clear:function(){return delete this._array,this},move:function(t,e){return this.attr("points",this.array().move(t,e))},size:function(t,e){var n=d(this,t,e);return this.attr("points",this.array().size(n.width,n.height))}}),M.extend([M.Line,M.Polyline,M.Polygon],{MorphArray:M.PointArray,x:function(t){return null==t?this.bbox().x:this.move(t,this.bbox().y)},y:function(t){return null==t?this.bbox().y:this.move(this.bbox().x,t)},width:function(t){var e=this.bbox();return null==t?e.width:this.size(t,e.height)},height:function(t){var e=this.bbox();return null==t?e.height:this.size(e.width,t)}}),M.Path=M.invent({create:"path",inherit:M.Shape,extend:{MorphArray:M.PathArray,array:function(){return this._array||(this._array=new M.PathArray(this.attr("d")))},plot:function(t){return null==t?this.array():this.clear().attr("d","string"==typeof t?t:this._array=new M.PathArray(t))},clear:function(){return delete this._array,this},move:function(t,e){return this.attr("d",this.array().move(t,e))},x:function(t){return null==t?this.bbox().x:this.move(t,this.bbox().y)},y:function(t){return null==t?this.bbox().y:this.move(this.bbox().x,t)},size:function(t,e){var n=d(this,t,e);return this.attr("d",this.array().size(n.width,n.height))},width:function(t){return null==t?this.bbox().width:this.size(t,this.bbox().height)},height:function(t){return null==t?this.bbox().height:this.size(this.bbox().width,t)}},construct:{path:function(t){return this.put(new M.Path).plot(t||new M.PathArray)}}}),M.Image=M.invent({create:"image",inherit:M.Shape,extend:{load:function(e,n){if(!e)return this;var i=new t.Image;return M.on(i,"load",function(t){var r=this.parent(M.Pattern);0===this.width()&&0===this.height()&&this.size(i.width,i.height),r instanceof M.Pattern&&0===r.width()&&0===r.height()&&r.size(this.width(),this.height()),"function"==typeof n&&n.call(this,{width:i.width,height:i.height,ratio:i.width/i.height,url:e})},this),M.on(i,"load error",function(){M.off(i)}),this.attr("href",i.src=e,M.xlink)}},construct:{image:function(t,e){return this.put(new M.Image).size(0,0).load(t,e)}}}),M.Text=M.invent({create:function(t){this.constructor(t||M.create("text")),this.dom.leading=new M.Number(1.3),this._rebuild=!0,this._build=!1,this.attr("font-family",M.defaults.attrs["font-family"])},inherit:M.Parent,extend:{x:function(t){return null==t?this.attr("x"):this.attr("x",t)},y:function(t){var e=this.attr("y"),n="number"==typeof e?e-this.bbox().y:0;return null==t?"number"==typeof e?e-n:e:this.attr("y","number"==typeof t?t+n:t)},cx:function(t){return null==t?this.bbox().cx:this.x(t-this.bbox().width/2)},cy:function(t){return null==t?this.bbox().cy:this.y(t-this.bbox().height/2)},text:function(t){if(void 0===t){var e=this.node.childNodes,n=0;t="";for(var i=0,r=e.length;i=0;e--)null!=n[k[t][e]]&&this.attr(k.prefix(t,k[t][e]),n[k[t][e]]);return this},M.extend([M.Element,M.FX],n)}),M.extend([M.Element,M.FX],{rotate:function(t,e,n){return this.transform({rotation:t,cx:e,cy:n})},skew:function(t,e,n,i){return 1===arguments.length||3===arguments.length?this.transform({skew:t,cx:e,cy:n}):this.transform({skewX:t,skewY:e,cx:n,cy:i})},scale:function(t,e,n,i){return 1===arguments.length||3===arguments.length?this.transform({scale:t,cx:e,cy:n}):this.transform({scaleX:t,scaleY:e,cx:n,cy:i})},translate:function(t,e){return this.transform({x:t,y:e})},flip:function(t,e){return e="number"==typeof t?t:e,this.transform({flip:t||"both",offset:e})},matrix:function(t){return this.attr("transform",new M.Matrix(6===arguments.length?[].slice.call(arguments):t))},opacity:function(t){return this.attr("opacity",t)},dx:function(t){return this.x(new M.Number(t).plus(this instanceof M.FX?0:this.x()),!0)},dy:function(t){return this.y(new M.Number(t).plus(this instanceof M.FX?0:this.y()),!0)},dmove:function(t,e){return this.dx(t).dy(e)}}),M.extend([M.Rect,M.Ellipse,M.Circle,M.Gradient,M.FX],{radius:function(t,e){var n=(this._target||this).type;return"radialGradient"===n||"radialGradient"===n?this.attr("r",new M.Number(t)):this.rx(t).ry(null==e?t:e)}}),M.extend(M.Path,{length:function(){return this.node.getTotalLength()},pointAt:function(t){return new M.Point(this.node.getPointAtLength(t))}}),M.extend([M.Parent,M.Text,M.Tspan,M.FX],{font:function(t,e){if("object"==typeof t)for(e in t)this.font(e,t[e]);return"leading"===t?this.leading(e):"anchor"===t?this.attr("text-anchor",e):"size"===t||"family"===t||"weight"===t||"stretch"===t||"variant"===t||"style"===t?this.attr("font-"+t,e):this.attr(t,e)}}),M.extend(M.Element,{data:function(t,e,n){if("object"==typeof t)for(e in t)this.data(e,t[e]);else if(arguments.length<2)try{return JSON.parse(this.attr("data-"+t))}catch(e){return this.attr("data-"+t)}else this.attr("data-"+t,null===e?null:!0===n||"string"==typeof e||"number"==typeof e?e:JSON.stringify(e));return this}}),M.extend(M.Element,{remember:function(t,e){if("object"==typeof arguments[0])for(var n in t)this.remember(n,t[n]);else{if(1===arguments.length)return this.memory()[t];this.memory()[t]=e}return this},forget:function(){if(0===arguments.length)this._memory={};else for(var t=arguments.length-1;t>=0;t--)delete this.memory()[arguments[t]];return this},memory:function(){return this._memory||(this._memory={})}}),M.get=function(t){var n=e.getElementById(b(t)||t);return M.adopt(n)},M.select=function(t,n){return M.utils.map((n||e).querySelectorAll(t),function(t){return M.adopt(t)})},M.$$=function(t,n){return M.utils.map((n||e).querySelectorAll(t),function(t){return M.adopt(t)})},M.$=function(t,n){return M.adopt((n||e).querySelector(t))},M.extend(M.Parent,{select:function(t){return M.select(t,this.node)}});var S="abcdef".split("");return M.Box=M.invent({create:function(t){var e=[0,0,0,0];t="string"==typeof t?t.split(M.regex.delimiter).map(parseFloat):Array.isArray(t)?t:"object"==typeof t?[null!=t.left?t.left:t.x,null!=t.top?t.top:t.y,t.width,t.height]:4===arguments.length?[].slice.call(arguments):e,this.x=t[0],this.y=t[1],this.width=t[2],this.height=t[3],w(this)},extend:{merge:function(t){var e=Math.min(this.x,t.x),n=Math.min(this.y,t.y);return new M.Box(e,n,Math.max(this.x+this.width,t.x+t.width)-e,Math.max(this.y+this.height,t.y+t.height)-n)},transform:function(t){var e=1/0,n=-1/0,i=1/0,r=-1/0;return[new M.Point(this.x,this.y),new M.Point(this.x2,this.y),new M.Point(this.x,this.y2),new M.Point(this.x2,this.y2)].forEach(function(s){s=s.transform(t),e=Math.min(e,s.x),n=Math.max(n,s.x),i=Math.min(i,s.y),r=Math.max(r,s.y)}),new M.Box(e,i,n-e,r-i)},addOffset:function(){return this.x+=t.pageXOffset,this.y+=t.pageYOffset,this},toString:function(){return this.x+" "+this.y+" "+this.width+" "+this.height},morph:function(t,e,n,i){return this.destination=new M.Box(t,e,n,i),this},at:function(t){return this.destination?new M.Box(this.x+(this.destination.x-this.x)*t,this.y+(this.destination.y-this.y)*t,this.width+(this.destination.width-this.width)*t,this.height+(this.destination.height-this.height)*t):this}},parent:M.Element,construct:{bbox:function(){var t;try{if(t=this.node.getBBox(),i(t)&&!r(this.node))throw new Exception("Element not in the dom")}catch(n){try{var e=this.clone(M.parser().svg).show();t=e.node.getBBox(),e.remove()}catch(t){console.warn("Getting a bounding box of this element is not possible")}}return new M.Box(t)},rbox:function(t){try{var e=new M.Box(this.node.getBoundingClientRect());return t?e.transform(t.screenCTM().inverse()):e.addOffset()}catch(t){return new M.Box}}}}),M.extend([M.Doc,M.Nested,M.Symbol,M.Image,M.Pattern,M.Marker,M.ForeignObject,M.View],{viewbox:function(t,e,n,i){return null==t?new M.Box(this.attr("viewBox")):this.attr("viewBox",new M.Box(t,e,n,i))}}),M.parser=function(){var t;return M.parser.nodes.svg.node.parentNode||(t=e.body||e.documentElement,M.parser.nodes.svg.addTo(t)),M.parser.nodes},M.parser.nodes={svg:(new M.Nested).size(2,0).css({opacity:0,position:"absolute",left:"-100%",top:"-100%",overflow:"hidden"})},M.parser.nodes.path=M.parser.nodes.svg.path().node,M}); \ No newline at end of file +/*! svg.js v3.0.0 MIT*/;!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t,t.document)}):"object"==typeof exports?module.exports=t.document?e(t,t.document):function(t){return e(t,t.document)}:t.SVG=e(t,t.document)}("undefined"!=typeof window?window:this,function(t,e){function n(t,n){if(t instanceof P.Element)return t;if("object"==typeof t)return P.adopt(t);if(null==t)return new P.Doc;if("string"==typeof t&&"<"!==t.charAt(0))return P.adopt(e.querySelector(t));var i=P.create("svg");return i.innerHTML=t,t=P.adopt(i.firstElementChild)}function i(t){return!(t.w||t.h||t.x||t.y)}function r(t){return(e.documentElement.contains||function(t){for(;t.parentNode;)t=t.parentNode;return t===e}).call(e.documentElement,t)}function s(t,e,n,i){return n+i.replace(P.regex.dots," .")}function o(t){for(var e=t.slice(0),n=e.length;n--;)Array.isArray(e[n])&&(e[n]=o(e[n]));return e}function a(t,e){return t instanceof e}function h(t,e){return(t.matches||t.matchesSelector||t.msMatchesSelector||t.mozMatchesSelector||t.webkitMatchesSelector||t.oMatchesSelector).call(t,e)}function u(t){return t.toLowerCase().replace(/-(.)/g,function(t,e){return e.toUpperCase()})}function l(t){return t.charAt(0).toUpperCase()+t.slice(1)}function c(t){return 4===t.length?["#",t.substring(1,2),t.substring(1,2),t.substring(2,3),t.substring(2,3),t.substring(3,4),t.substring(3,4)].join(""):t}function f(t){var e=t.toString(16);return 1===e.length?"0"+e:e}function d(t,e,n){if(null==e||null==n){var i=t.bbox();null==e?e=i.width/i.height*n:null==n&&(n=i.height/i.width*e)}return{width:e,height:n}}function p(t){return{a:t[0],b:t[1],c:t[2],d:t[3],e:t[4],f:t[5]}}function m(t){return t instanceof P.Matrix||(t=new P.Matrix(t)),t}function x(t){for(var e=0,n=t.length,i="";e=0;e--)v(t.children[e]);return t.id?P.adopt(t).id(P.eid(t.nodeName)):P.adopt(t)}function y(t){return null==t.x&&(t.x=0,t.y=0,t.width=0,t.height=0),t.w=t.width,t.h=t.height,t.x2=t.x+t.width,t.y2=t.y+t.height,t.cx=t.x+t.width/2,t.cy=t.y+t.height/2,t}function g(t){var e=(t||"").toString().match(P.regex.reference);if(e)return e[1]}function w(t,e){return Math.sqrt(t*t+e*e)}function b(t,e){var n=Math.sqrt(t*t+e*e),i=t/n,r=e/n;return{theta:180*Math.atan2(e,t)/Math.PI,cos:i,sin:r}}if(!e.createElementNS||!e.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect)return{supported:!1};var P=this.SVG=function(t){if(P.supported)return t=n(t)};P.supported=!0,P.ns="http://www.w3.org/2000/svg",P.xmlns="http://www.w3.org/2000/xmlns/",P.xlink="http://www.w3.org/1999/xlink",P.svgjs="http://svgjs.com/svgjs",P.did=1e3,P.eid=function(t){return"Svgjs"+l(t)+P.did++},P.create=function(t){return e.createElementNS(this.ns,t)},P.extend=function(t,e){var n,i;for(t=Array.isArray(t)?t:[t],i=t.length-1;i>=0;i--)if(t[i])for(n in e)t[i].prototype[n]=e[n]},P.invent=function(t){var e="function"==typeof t.create?t.create:function(e){this.constructor(e||P.create(t.create))};return t.inherit&&(e.prototype=new t.inherit),t.extend&&P.extend(e,t.extend),t.construct&&P.extend(t.parent||P.Container,t.construct),e},P.adopt=function(e){if(!e)return null;if(e.instance)return e.instance;if(!(e instanceof t.SVGElement))return new P.HtmlNode(e);return"svg"===e.nodeName?e.parentNode instanceof t.SVGElement?new P.Nested(e):new P.Doc(e):"linearGradient"===e.nodeName||"radialGradient"===e.nodeName?new P.Gradient(e):P[l(e.nodeName)]?new(P[l(e.nodeName)])(e):new P.Parent(e)},P.regex={numberAndUnit:/^([+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?)([a-z%]*)$/i,hex:/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i,rgb:/rgb\((\d+),(\d+),(\d+)\)/,reference:/#([a-z0-9\-_]+)/i,transforms:/\)\s*,?\s*/,whitespace:/\s/g,isHex:/^#[a-f0-9]{3,6}$/i,isRgb:/^rgb\(/,isCss:/[^:]+:[^;]+;?/,isBlank:/^(\s+)?$/,isNumber:/^[+-]?(\d+(\.\d*)?|\.\d+)(e[+-]?\d+)?$/i,isPercent:/^-?[\d.]+%$/,isImage:/\.(jpg|jpeg|png|gif|svg)(\?[^=]+.*)?/i,delimiter:/[\s,]+/,hyphen:/([^e])-/gi,pathLetters:/[MLHVCSQTAZ]/gi,isPathLetter:/[MLHVCSQTAZ]/i,numbersWithDots:/((\d?\.\d+(?:e[+-]?\d+)?)((?:\.\d+(?:e[+-]?\d+)?)+))+/gi,dots:/\./g},P.utils={map:function(t,e){var n,i=t.length,r=[];for(n=0;n1?1:t,new P.Color({r:~~(this.r+(this.destination.r-this.r)*t),g:~~(this.g+(this.destination.g-this.g)*t),b:~~(this.b+(this.destination.b-this.b)*t)})):this}}),P.Color.test=function(t){return t+="",P.regex.isHex.test(t)||P.regex.isRgb.test(t)},P.Color.isRgb=function(t){return t&&"number"==typeof t.r&&"number"==typeof t.g&&"number"==typeof t.b},P.Color.isColor=function(t){return P.Color.isRgb(t)||P.Color.test(t)},P.Array=function(t,e){t=(t||[]).valueOf(),0===t.length&&e&&(t=e.valueOf()),this.value=this.parse(t)},P.extend(P.Array,{morph:function(t){if(this.destination=this.parse(t),this.value.length!==this.destination.length){for(var e=this.value[this.value.length-1],n=this.destination[this.destination.length-1];this.value.length>this.destination.length;)this.destination.push(n);for(;this.value.length=0;i--)this.value[i]=[this.value[i][0]+t,this.value[i][1]+e];return this},size:function(t,e){var n,i=this.bbox();for(n=this.value.length-1;n>=0;n--)i.width&&(this.value[n][0]=(this.value[n][0]-i.x)*t/i.width+i.x),i.height&&(this.value[n][1]=(this.value[n][1]-i.y)*e/i.height+i.y);return this},bbox:function(){var t=-1/0,e=-1/0,n=1/0,i=1/0;return this.value.forEach(function(r){t=Math.max(r[0],t),e=Math.max(r[1],e),n=Math.min(r[0],n),i=Math.min(r[1],i)}),{x:n,y:i,width:t-n,height:e-i}}});for(var M={M:function(t,e,n){return e.x=n.x=t[0],e.y=n.y=t[1],["M",e.x,e.y]},L:function(t,e){return e.x=t[0],e.y=t[1],["L",t[0],t[1]]},H:function(t,e){return e.x=t[0],["H",t[0]]},V:function(t,e){return e.y=t[0],["V",t[0]]},C:function(t,e){return e.x=t[4],e.y=t[5],["C",t[0],t[1],t[2],t[3],t[4],t[5]]},S:function(t,e){return e.x=t[2],e.y=t[3],["S",t[0],t[1],t[2],t[3]]},Q:function(t,e){return e.x=t[2],e.y=t[3],["Q",t[0],t[1],t[2],t[3]]},T:function(t,e){return e.x=t[0],e.y=t[1],["T",t[0],t[1]]},Z:function(t,e,n){return e.x=n.x,e.y=n.y,["Z"]},A:function(t,e){return e.x=t[5],e.y=t[6],["A",t[0],t[1],t[2],t[3],t[4],t[5],t[6]]}},A="mlhvqtcsaz".split(""),N=0,C=A.length;N=0;r--)i=this.value[r][0],"M"===i||"L"===i||"T"===i?(this.value[r][1]+=t,this.value[r][2]+=e):"H"===i?this.value[r][1]+=t:"V"===i?this.value[r][1]+=e:"C"===i||"S"===i||"Q"===i?(this.value[r][1]+=t,this.value[r][2]+=e,this.value[r][3]+=t,this.value[r][4]+=e,"C"===i&&(this.value[r][5]+=t,this.value[r][6]+=e)):"A"===i&&(this.value[r][6]+=t,this.value[r][7]+=e);return this},size:function(t,e){var n,i,r=this.bbox();for(n=this.value.length-1;n>=0;n--)i=this.value[n][0],"M"===i||"L"===i||"T"===i?(this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x,this.value[n][2]=(this.value[n][2]-r.y)*e/r.height+r.y):"H"===i?this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x:"V"===i?this.value[n][1]=(this.value[n][1]-r.y)*e/r.height+r.y:"C"===i||"S"===i||"Q"===i?(this.value[n][1]=(this.value[n][1]-r.x)*t/r.width+r.x,this.value[n][2]=(this.value[n][2]-r.y)*e/r.height+r.y,this.value[n][3]=(this.value[n][3]-r.x)*t/r.width+r.x,this.value[n][4]=(this.value[n][4]-r.y)*e/r.height+r.y,"C"===i&&(this.value[n][5]=(this.value[n][5]-r.x)*t/r.width+r.x,this.value[n][6]=(this.value[n][6]-r.y)*e/r.height+r.y)):"A"===i&&(this.value[n][1]=this.value[n][1]*t/r.width,this.value[n][2]=this.value[n][2]*e/r.height,this.value[n][6]=(this.value[n][6]-r.x)*t/r.width+r.x,this.value[n][7]=(this.value[n][7]-r.y)*e/r.height+r.y);return this},equalCommands:function(t){var e,n,i;for(t=new P.PathArray(t),i=this.value.length===t.value.length,e=0,n=this.value.length;i&&ea);return i},bbox:function(){return P.parser().path.setAttribute("d",this.toString()),P.parser.nodes.path.getBBox()}}),P.Number=P.invent({create:function(t,e){this.value=0,this.unit=e||"","number"==typeof t?this.value=isNaN(t)?0:isFinite(t)?t:t<0?-3.4e38:3.4e38:"string"==typeof t?(e=t.match(P.regex.numberAndUnit))&&(this.value=parseFloat(e[1]),"%"===e[5]?this.value/=100:"s"===e[5]&&(this.value*=1e3),this.unit=e[5]):t instanceof P.Number&&(this.value=t.valueOf(),this.unit=t.unit)},extend:{toString:function(){return("%"===this.unit?~~(1e8*this.value)/1e6:"s"===this.unit?this.value/1e3:this.value)+this.unit},toJSON:function(){return this.toString()},valueOf:function(){return this.value},plus:function(t){return t=new P.Number(t),new P.Number(this+t,this.unit||t.unit)},minus:function(t){return t=new P.Number(t),new P.Number(this-t,this.unit||t.unit)},times:function(t){return t=new P.Number(t),new P.Number(this*t,this.unit||t.unit)},divide:function(t){return t=new P.Number(t),new P.Number(this/t,this.unit||t.unit)},to:function(t){var e=new P.Number(this);return"string"==typeof t&&(e.unit=t),e},morph:function(t){return this.destination=new P.Number(t),t.relative&&(this.destination.value+=this.value),this},at:function(t){return this.destination?new P.Number(this.destination).minus(this).times(t).plus(this):this}}}),P.HtmlNode=P.invent({create:function(t){this.node=t},extend:{add:function(t,e){return t=n(t),t instanceof P.Nested&&(t=new P.Doc(t.node),t.setData(JSON.parse(t.node.getAttribute("svgjs:data"))||{})),null===e?this.node.appendChild(t.node):t.node!==this.node.children[e]&&this.node.insertBefore(t.node,this.node.children[e]),this},put:function(t,e){return this.add(t,e),t}}}),P.Element=P.invent({create:function(t){this._event=null,this.dom={},this.node=t,this.node&&(this.type=t.nodeName,this.node.instance=this,t.hasAttribute("svgjs:data")&&this.setData(JSON.parse(t.getAttribute("svgjs:data"))||{}))},extend:{x:function(t){return this.attr("x",t)},y:function(t){return this.attr("y",t)},cx:function(t){return null==t?this.x()+this.width()/2:this.x(t-this.width()/2)},cy:function(t){return null==t?this.y()+this.height()/2:this.y(t-this.height()/2)},move:function(t,e){return this.x(t).y(e)},center:function(t,e){return this.cx(t).cy(e)},width:function(t){return this.attr("width",t)},height:function(t){return this.attr("height",t)},size:function(t,e){var n=d(this,t,e);return this.width(new P.Number(n.width)).height(new P.Number(n.height))},clone:function(t){this.writeDataToDom();var e=v(this.node.cloneNode(!0));return t?t.add(e):this.after(e),e},remove:function(){return this.parent()&&this.parent().removeElement(this),this},replace:function(t){return this.after(t).remove(),t},addTo:function(t){return n(t).put(this)},putIn:function(t){return n(t).add(this)},id:function(t){return void 0!==t||this.node.id||(this.node.id=P.eid(this.type)),this.attr("id",t)},inside:function(t,e){var n=this.bbox();return t>n.x&&e>n.y&&t":function(t){return-Math.cos(t*Math.PI)/2+.5},">":function(t){return Math.sin(t*Math.PI/2)},"<":function(t){return 1-Math.cos(t*Math.PI/2)}},P.morph=function(t){return function(e,n){return new P.MorphObj(e,n).at(t)}},P.Situation=P.invent({create:function(t){this.init=!1,this.reversed=!1,this.reversing=!1,this.duration=new P.Number(t.duration).valueOf(),this.delay=new P.Number(t.delay).valueOf(),this.start=+new Date+this.delay,this.finish=this.start+this.duration,this.ease=t.ease,this.loop=0,this.loops=!1,this.animations={},this.attrs={},this.styles={},this.transforms=[],this.once={}}}),P.FX=P.invent({create:function(t){this._target=t,this.situations=[],this.active=!1,this.situation=null,this.paused=!1,this.lastPos=0,this.pos=0,this.absPos=0,this._speed=1},extend:{animate:function(t,e,n){"object"==typeof t&&(e=t.ease,n=t.delay,t=t.duration);var i=new P.Situation({duration:t||1e3,delay:n||0,ease:P.easing[e||"-"]||e});return this.queue(i),this},delay:function(t){var e=new P.Situation({duration:t,delay:0,ease:P.easing["-"]});return this.queue(e)},target:function(t){return t&&t instanceof P.Element?(this._target=t,this):this._target},timeToAbsPos:function(t){return(t-this.situation.start)/(this.situation.duration/this._speed)},absPosToTime:function(t){return this.situation.duration/this._speed*t+this.situation.start},startAnimFrame:function(){this.stopAnimFrame(),this.animationFrame=t.requestAnimationFrame(function(){this.step()}.bind(this))},stopAnimFrame:function(){t.cancelAnimationFrame(this.animationFrame)},start:function(){return!this.active&&this.situation&&(this.active=!0,this.startCurrent()),this},startCurrent:function(){return this.situation.start=+new Date+this.situation.delay/this._speed,this.situation.finish=this.situation.start+this.situation.duration/this._speed,this.initAnimations().step()},queue:function(t){return("function"==typeof t||t instanceof P.Situation)&&this.situations.push(t),this.situation||(this.situation=this.situations.shift()),this},dequeue:function(){return this.stop(),this.situation=this.situations.shift(),this.situation&&(this.situation instanceof P.Situation?this.start():this.situation(this)),this},initAnimations:function(){var t,e,n,i=this.situation;if(i.init)return this;for(t in i.animations)for(n=this.target()[t](),Array.isArray(n)||(n=[n]),Array.isArray(i.animations[t])||(i.animations[t]=[i.animations[t]]),e=n.length;e--;)i.animations[t][e]instanceof P.Number&&(n[e]=new P.Number(n[e])),i.animations[t][e]=n[e].morph(i.animations[t][e]);for(t in i.attrs)i.attrs[t]=new P.MorphObj(this.target().attr(t),i.attrs[t]);for(t in i.styles)i.styles[t]=new P.MorphObj(this.target().css(t),i.styles[t]);return i.initialTransformation=this.target().matrixify(),i.init=!0,this},clearQueue:function(){return this.situations=[],this},clearCurrent:function(){return this.situation=null,this},stop:function(t,e){var n=this.active;return this.active=!1,e&&this.clearQueue(),t&&this.situation&&(!n&&this.startCurrent(),this.atEnd()),this.stopAnimFrame(),this.clearCurrent()},reset:function(){if(this.situation){var t=this.situation;this.stop(),this.situation=t,this.atStart()}return this},finish:function(){for(this.stop(!0,!1);this.dequeue().situation&&this.stop(!0,!1););return this.clearQueue().clearCurrent(),this},atStart:function(){return this.at(0,!0)},atEnd:function(){return!0===this.situation.loops&&(this.situation.loops=this.situation.loop+1),"number"==typeof this.situation.loops?this.at(this.situation.loops,!0):this.at(1,!0)},at:function(t,e){var n=this.situation.duration/this._speed;return this.absPos=t,e||(this.situation.reversed&&(this.absPos=1-this.absPos),this.absPos+=this.situation.loop),this.situation.start=+new Date-this.absPos*n,this.situation.finish=this.situation.start+n,this.step(!0)},speed:function(t){return 0===t?this.pause():t?(this._speed=t,this.at(this.absPos,!0)):this._speed},loop:function(t,e){var n=this.last();return n.loops=null==t||t,n.loop=0,e&&(n.reversing=!0),this},pause:function(){return this.paused=!0,this.stopAnimFrame(),this},play:function(){return this.paused?(this.paused=!1,this.at(this.absPos,!0)):this},reverse:function(t){var e=this.last();return e.reversed=void 0===t?!e.reversed:t,this},progress:function(t){return t?this.situation.ease(this.pos):this.pos},after:function(t){function e(i){i.detail.situation===n&&(t.call(this,n),this.off("finished.fx",e))}var n=this.last();return this.target().on("finished.fx",e),this._callStart()},during:function(t){function e(e){e.detail.situation===n&&t.call(this,e.detail.pos,P.morph(e.detail.pos),e.detail.eased,n)}var n=this.last();return this.target().off("during.fx",e).on("during.fx",e),this.after(function(){this.off("during.fx",e)}),this._callStart()},afterAll:function(t){var e=function e(n){t.call(this),this.off("allfinished.fx",e)};return this.target().off("allfinished.fx",e).on("allfinished.fx",e),this._callStart()},duringAll:function(t){var e=function(e){t.call(this,e.detail.pos,P.morph(e.detail.pos),e.detail.eased,e.detail.situation)};return this.target().off("during.fx",e).on("during.fx",e),this.afterAll(function(){this.off("during.fx",e)}),this._callStart()},last:function(){return this.situations.length?this.situations[this.situations.length-1]:this.situation},add:function(t,e,n){return this.last()[n||"animations"][t]=e,this._callStart()},step:function(t){if(t||(this.absPos=this.timeToAbsPos(+new Date)),!1!==this.situation.loops){var e,n,i;e=Math.max(this.absPos,0),n=Math.floor(e),!0===this.situation.loops||nthis.lastPos&&s<=r&&(this.situation.once[s].call(this.target(),this.pos,r),delete this.situation.once[s]);return this.active&&this.target().fire("during",{pos:this.pos,eased:r,fx:this,situation:this.situation}),this.situation?(this.eachAt(),1===this.pos&&!this.situation.reversed||this.situation.reversed&&0===this.pos?(this.stopAnimFrame(),this.target().fire("finished",{fx:this,situation:this.situation}),this.situations.length||(this.target().fire("allfinished"),this.situations.length||(this.target().off(".fx"),this.active=!1)),this.active?this.dequeue():this.clearCurrent()):!this.paused&&this.active&&this.startAnimFrame(),this.lastPos=r,this):this},eachAt:function(){var t,e,n=this,i=this.target(),r=this.situation;for(t in r.animations)e=[].concat(r.animations[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(r.ease(n.pos),n.pos):t}),i[t].apply(i,e);for(t in r.attrs)e=[t].concat(r.attrs[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(r.ease(n.pos),n.pos):t}),i.attr.apply(i,e);for(t in r.styles)e=[t].concat(r.styles[t]).map(function(t){return"string"!=typeof t&&t.at?t.at(r.ease(n.pos),n.pos):t}),i.css.apply(i,e);return r.transforms.length,this},once:function(t,e,n){var i=this.last();return n||(t=i.ease(t)),i.once[t]=e,this},_callStart:function(){return setTimeout(function(){this.start()}.bind(this),0),this}},parent:P.Element,construct:{animate:function(t,e,n){return(this.fx||(this.fx=new P.FX(this))).animate(t,e,n)},delay:function(t){return(this.fx||(this.fx=new P.FX(this))).delay(t)},stop:function(t,e){return this.fx&&this.fx.stop(t,e),this},finish:function(){return this.fx&&this.fx.finish(),this},pause:function(){return this.fx&&this.fx.pause(),this},play:function(){return this.fx&&this.fx.play(),this},speed:function(t){if(this.fx){if(null==t)return this.fx.speed();this.fx.speed(t)}return this}}}),P.MorphObj=P.invent({create:function(t,e){return P.Color.isColor(e)?new P.Color(t).morph(e):P.regex.delimiter.test(t)?new P.Array(t).morph(e):P.regex.numberAndUnit.test(e)?new P.Number(t).morph(e):(this.value=t,void(this.destination=e))},extend:{at:function(t,e){return e<1?this.value:this.destination},valueOf:function(){return this.value}}}),P.extend(P.FX,{attr:function(t,e,n){if("object"==typeof t)for(var i in t)this.attr(i,t[i]);else this.add(t,e,"attrs");return this},css:function(t,e){if("object"==typeof t)for(var n in t)this.css(n,t[n]);else this.add(t,e,"styles");return this},x:function(t,e){if(this.target()instanceof P.G)return this.transform({x:t},e),this;var n=new P.Number(t);return n.relative=e,this.add("x",n)},y:function(t,e){if(this.target()instanceof P.G)return this.transform({y:t},e),this;var n=new P.Number(t);return n.relative=e,this.add("y",n)},cx:function(t){return this.add("cx",new P.Number(t))},cy:function(t){return this.add("cy",new P.Number(t))},move:function(t,e){return this.x(t).y(e)},center:function(t,e){return this.cx(t).cy(e)},size:function(t,e){if(this.target()instanceof P.Text)this.attr("font-size",t);else{var n;t&&e||(n=this.target().bbox()),t||(t=n.width/n.height*e),e||(e=n.height/n.width*t),this.add("width",new P.Number(t)).add("height",new P.Number(e))}return this},width:function(t){return this.add("width",new P.Number(t))},height:function(t){return this.add("height",new P.Number(t))},plot:function(t,e,n,i){return 4===arguments.length?this.plot([t,e,n,i]):this.add("plot",new(this.target().MorphArray)(t))},leading:function(t){return this.target().leading?this.add("leading",new P.Number(t)):this},viewbox:function(t,e,n,i){return this.target()instanceof P.Container&&this.add("viewbox",new P.Box(t,e,n,i)),this},update:function(t){if(this.target()instanceof P.Stop){if("number"==typeof t||t instanceof P.Number)return this.update({offset:arguments[0],color:arguments[1],opacity:arguments[2]});null!=t.opacity&&this.attr("stop-opacity",t.opacity),null!=t.color&&this.attr("stop-color",t.color),null!=t.offset&&this.attr("offset",t.offset)}return this}}),P.Matrix=P.invent({create:function(t){var e,n=p([1,0,0,1,0,0]);for(t=t instanceof P.Element?t.matrixify():"string"==typeof t?p(t.split(P.regex.delimiter).map(parseFloat)):6===arguments.length?p([].slice.call(arguments)):Array.isArray(t)?p(t):"object"==typeof t?t:n,e=k.length-1;e>=0;--e)this[k[e]]=null!=t[k[e]]?t[k[e]]:n[k[e]]},extend:{compose:function(t,e,n){var i=t.translateX||0,r=t.translateY||0,s=t.theta||0,o=t.scaleX||1,a=t.scaleY||1,h=t.shear||0;e=e||0,n=n||0;var u=Math.cos(s*Math.PI/180),l=Math.sin(s*Math.PI/180),c=o*u,f=o*l,d=h*o*u-a*l,p=h*o*l+a*u,m=-o*u*(e+n*h)+a*l*n+i+e,x=-o*l*(e+n*h)-a*u*n+r+n;return new P.Matrix([c,f,d,p,m,x])},decompose:function(t,e,n){var i=t.a,r=t.b,s=t.c,o=t.d,a=t.e,h=t.f,u=b(i,r),l=u.theta,c=u.cos,f=u.sin,d=Math.sign(i*c+r*f),p=d*w(i,r),m=(f*o+c*s)/(c*i+f*r),x=w(m*i-s,o-m*r);return{translateX:a-e+e*c*p+n*(m*c*p-f*x),translateY:h-n+e*f*p+n*(m*f*p+c*x),theta:l,scaleX:p,scaleY:x,shear:m,a:this.a,b:this.b,c:this.c,d:this.d,e:this.e,f:this.f,x:this.e,y:this.f,matrix:new P.Matrix(this)}},form:function(t){var e=!t.flip||"x"!==t.flip&&"both"!==t.flip?1:-1,n=!t.flip||"y"!==t.flip&&"both"!==t.flip?1:-1,i=t.skew.length?t.skew[0]:isFinite(t.skew)?t.skew:isFinite(t.skewX)?t.skewX:0,r=t.skew.length?t.skew[1]:isFinite(t.skew)?t.skew:isFinite(t.skewY)?t.skewY:0,s=t.scale.length?t.scale[0]*e:isFinite(t.scale)?t.scale*e:isFinite(t.scaleX)?t.scaleX*e:e,o=t.scale.length?t.scale[1]*n:isFinite(t.scale)?t.scale*n:isFinite(t.scaleY)?t.scaleY*n:n,a=Math.tan(P.utils.radians(i)),h=Math.tan(P.utils.radians(r)),u=t.shear||0,l=P.utils.radians(t.rotate||0),c=Math.sin(l),f=Math.cos(l),d=t.origin.length?t.origin[0]:t.ox||0,p=t.origin.length?t.origin[1]:t.oy||0,m=t.position.length?t.position[0]:t.px||d,x=t.position.length?t.position[1]:t.py||p,v=t.translate.length?t.translate[0]:t.tx||0,y=t.translate.length?t.translate[1]:t.ty||0,g=f*s+h*c*o,w=f*h*o-c*s,b=f*a*s+c*o+u*(f*s+h*c*o),M=-a*c*s+f*o+u*(-c*s+f*h*o),A=m+v+d*(f*s+h*c*o)+p*(f*a*s+c*o+u*(f*s+h*c*o)),N=x+y+d*(-c*s+f*h*o)+p*(-a*c*s+f*o+u*(-c*s+f*h*o));return new P.Matrix(g,w,b,M,A,N)},clone:function(){return new P.Matrix(this)},morph:function(t){return this.destination=new P.Matrix(t),this},at:function(t){return this.destination?new P.Matrix({a:this.a+(this.destination.a-this.a)*t,b:this.b+(this.destination.b-this.b)*t,c:this.c+(this.destination.c-this.c)*t,d:this.d+(this.destination.d-this.d)*t,e:this.e+(this.destination.e-this.e)*t,f:this.f+(this.destination.f-this.f)*t}):this},multiply:function(t){return new P.Matrix(this.native().multiply(m(t).native()))},inverse:function(){return new P.Matrix(this.native().inverse())},translate:function(t,e){var n=new P.Matrix(this.native().translate(t||0,e||0));return this.multiply(n)},scale:function(t,e,n,i){1===arguments.length?e=t:3===arguments.length&&(i=n,n=e,e=t);var r=new P.Matrix(t,0,0,e,0,0),s=this.around(n,i,r);return this.multiply(s)},rotate:function(t,e,n){t=P.utils.radians(t);var i=new P.Matrix(Math.cos(t),Math.sin(t),-Math.sin(t),Math.cos(t),0,0),r=this.around(e,n,i);return this.multiply(r)},flip:function(t,e){return"x"===t?this.scale(-1,1,e,0):"y"===t?this.scale(1,-1,0,e):this.scale(-1,-1,t,null!=e?e:t)},shear:function(t,e,n){var i=new P.Matrix(1,t,0,1,0,0),r=this.around(e,n,i);return this.multiply(r)},skew:function(t,e,n,i){1===arguments.length?e=t:3===arguments.length&&(i=n,n=e,e=t),t=P.utils.radians(t),e=P.utils.radians(e);var r=new P.Matrix(1,Math.tan(e),Math.tan(t),1,0,0),s=this.around(n,i,r);return this.multiply(s)},skewX:function(t,e,n){return this.skew(t,0,e,n)},skewY:function(t,e,n){return this.skew(0,t,e,n)},around:function(t,e,n){return this.multiply(new P.Matrix(1,0,0,1,t||0,e||0)).multiply(n).multiply(new P.Matrix(1,0,0,1,-t||0,-e||0))},native:function(){for(var t=P.parser.nodes.svg.node.createSVGMatrix(),e=k.length-1;e>=0;e--)t[k[e]]=this[k[e]];return t},toString:function(){return"matrix("+this.a+","+this.b+","+this.c+","+this.d+","+this.e+","+this.f+")"}},parent:P.Element,construct:{ctm:function(){return new P.Matrix(this.node.getCTM())},screenCTM:function(){if(this instanceof P.Nested){var t=this.rect(1,1),e=t.node.getScreenCTM();return t.remove(),new P.Matrix(e)}return new P.Matrix(this.node.getScreenCTM())}}}),P.Point=P.invent({create:function(t,e){var n,i={x:0,y:0};n=Array.isArray(t)?{x:t[0],y:t[1]}:"object"==typeof t?{x:t.x,y:t.y}:null!=t?{x:t,y:null!=e?e:t}:i,this.x=n.x,this.y=n.y},extend:{clone:function(){return new P.Point(this)},morph:function(t,e){return this.destination=new P.Point(t,e),this},at:function(t){return this.destination?new P.Point({x:this.x+(this.destination.x-this.x)*t,y:this.y+(this.destination.y-this.y)*t}):this},native:function(){var t=P.parser.nodes.svg.node.createSVGPoint() +;return t.x=this.x,t.y=this.y,t},transform:function(t){return new P.Point(this.native().matrixTransform(t.native()))}}}),P.extend(P.Element,{point:function(t,e){return new P.Point(t,e).transform(this.screenCTM().inverse())}}),P.extend(P.Element,{attr:function(t,e,n){if(null==t){for(t={},e=this.node.attributes,n=e.length-1;n>=0;n--)t[e[n].nodeName]=P.regex.isNumber.test(e[n].nodeValue)?parseFloat(e[n].nodeValue):e[n].nodeValue;return t}if("object"==typeof t)for(e in t)this.attr(e,t[e]);else if(null===e)this.node.removeAttribute(t);else{if(null==e)return e=this.node.getAttribute(t),null==e?P.defaults.attrs[t]:P.regex.isNumber.test(e)?parseFloat(e):e;"fill"!==t&&"stroke"!==t||(P.regex.isImage.test(e)&&(e=this.doc().defs().image(e)),e instanceof P.Image&&(e=this.doc().defs().pattern(0,0,function(){this.add(e)}))),"number"==typeof e?e=new P.Number(e):P.Color.isColor(e)?e=new P.Color(e):Array.isArray(e)&&(e=new P.Array(e)),"leading"===t?this.leading&&this.leading(e):"string"==typeof n?this.node.setAttributeNS(n,t,e.toString()):this.node.setAttribute(t,e.toString()),!this.rebuild||"font-size"!==t&&"x"!==t||this.rebuild(t,e)}return this}}),P.extend(P.Element,{untransform:function(){return this.attr("transform",null)},matrixify:function(){return(this.attr("transform")||"").split(P.regex.transforms).slice(0,-1).map(function(t){var e=t.trim().split("(");return[e[0],e[1].split(P.regex.delimiter).map(function(t){return parseFloat(t)})]}).reduce(function(t,e){return"matrix"===e[0]?t.multiply(p(e[1])):t[e[0]].apply(t,e[1])},new P.Matrix)},toParent:function(t){if(this===t)return this;var e=this.screenCTM(),n=t.screenCTM().inverse();return this.addTo(t).untransform().transform(n.multiply(e)),this},toDoc:function(){return this.toParent(this.doc())}}),P.extend(P.Element,{transform:function(t){if("object"!=typeof t){var e=new P.Matrix(this).decompose();return"string"==typeof t?e[t]:e}if("string"==typeof t.origin){var n=t.origin.toLowerCase().trim(),i=this.bbox(),r=i.x,s=i.y,o=i.width,a=i.height;t.ox=n.includes("left")?r:n.includes("right")?r+o:r+o/2,t.oy=n.includes("top")?s:n.includes("bottom")?s+a:s+a/2,t.origin=null}var h=(new P.Matrix).form(t),u=h.toString();return this.attr("transform",u)},matrix:function(t,e){var n=new P.Matrix(t);if(e){n=new P.Matrix(this).multiply(n)}return this.attr("transform",n)}}),P.extend(P.FX,{transform:function(t,e){}}),P.extend(P.Element,{css:function(t,e){var n,i,r={};if(0===arguments.length)return this.node.style.cssText.split(/\s*;\s*/).filter(function(t){return!!t.length}).forEach(function(t){n=t.split(/\s*:\s*/),r[n[0]]=n[1]}),r;if(arguments.length<2){if(Array.isArray(t)){for(i=t.length;i--;)r[u(t[i])]=this.node.style[u(t[i])];return r}if("string"==typeof t)return this.node.style[u(t)];if("object"==typeof t)for(i in t)this.node.style[u(i)]=null==t[i]||P.regex.isBlank.test(t[i])?"":t[i]}return 2===arguments.length&&(this.node.style[u(t)]=null==e||P.regex.isBlank.test(e)?"":e),this}}),P.Parent=P.invent({create:function(t){this.constructor(t)},inherit:P.Element,extend:{children:function(){return P.utils.map(this.node.children,function(t){return P.adopt(t)})},add:function(t,e){return t=n(t),null==e?this.node.appendChild(t.node):t.node!==this.node.children[e]&&this.node.insertBefore(t.node,this.node.children[e]),this},put:function(t,e){return this.add(t,e),t.instance||t},has:function(t){return this.index(t)>=0},index:function(t){return[].slice.call(this.node.children).indexOf(t.node)},get:function(t){return P.adopt(this.node.children[t])},first:function(){return this.get(0)},last:function(){return this.get(this.node.children.length-1)},each:function(t,e){var n,i,r=this.children();for(n=0,i=r.length;n0&&this.parent().removeElement(this).add(this,t-1),this},front:function(){var t=this.parent();return t.node.appendChild(this.node),t instanceof P.Doc&&t.node.appendChild(t.defs().node),this},back:function(){return this.position()>0&&this.parent().removeElement(this).add(this,0),this},before:function(t){t.remove();var e=this.position();return this.parent().add(t,e),this},after:function(t){t.remove();var e=this.position();return this.parent().add(t,e+1),this}}),P.Mask=P.invent({create:"mask",inherit:P.Container,extend:{remove:function(){return this.targets().forEach(function(t){t.unmask()}),P.Element.prototype.remove.call(this)},targets:function(){return P.select('svg [mask*="'+this.id()+'"]')}},construct:{mask:function(){return this.defs().put(new P.Mask)}}}),P.extend(P.Element,{maskWith:function(t){var e=t instanceof P.Mask?t:this.parent().mask().add(t);return this.attr("mask",'url("#'+e.id()+'")')},unmask:function(){return this.attr("mask",null)},masker:function(){return this.reference("mask")}}),P.ClipPath=P.invent({create:"clipPath",inherit:P.Container,extend:{remove:function(){return this.targets().forEach(function(t){t.unclip()}),P.Element.prototype.remove.call(this)},targets:function(){return P.select('svg [clip-path*="'+this.id()+'"]')}},construct:{clip:function(){return this.defs().put(new P.ClipPath)}}}),P.extend(P.Element,{clipWith:function(t){var e=t instanceof P.ClipPath?t:this.parent().clip().add(t);return this.attr("clip-path",'url("#'+e.id()+'")')},unclip:function(){return this.attr("clip-path",null)},clipper:function(){return this.reference("clip-path")}}),P.Gradient=P.invent({create:function(t){this.constructor("object"==typeof t?t:P.create(t+"Gradient"))},inherit:P.Container,extend:{stop:function(t,e,n){return this.put(new P.Stop).update(t,e,n)},update:function(t){return this.clear(),"function"==typeof t&&t.call(this,this),this},url:function(){return"url(#"+this.id()+")"},toString:function(){return this.url()},attr:function(t,e,n){return"transform"===t&&(t="gradientTransform"),P.Container.prototype.attr.call(this,t,e,n)}},construct:{gradient:function(t,e){return this.defs().gradient(t,e)}}}),P.extend([P.Gradient,P.FX],{from:function(t,e){return"radialGradient"===(this._target||this).type?this.attr({fx:new P.Number(t),fy:new P.Number(e)}):this.attr({x1:new P.Number(t),y1:new P.Number(e)})},to:function(t,e){return"radialGradient"===(this._target||this).type?this.attr({cx:new P.Number(t),cy:new P.Number(e)}):this.attr({x2:new P.Number(t),y2:new P.Number(e)})}}),P.extend(P.Defs,{gradient:function(t,e){return this.put(new P.Gradient(t)).update(e)}}),P.Stop=P.invent({create:"stop",inherit:P.Element,extend:{update:function(t){return("number"==typeof t||t instanceof P.Number)&&(t={offset:arguments[0],color:arguments[1],opacity:arguments[2]}),null!=t.opacity&&this.attr("stop-opacity",t.opacity),null!=t.color&&this.attr("stop-color",t.color),null!=t.offset&&this.attr("offset",new P.Number(t.offset)),this}}}),P.Pattern=P.invent({create:"pattern",inherit:P.Container,extend:{url:function(){return"url(#"+this.id()+")"},update:function(t){return this.clear(),"function"==typeof t&&t.call(this,this),this},toString:function(){return this.url()},attr:function(t,e,n){return"transform"===t&&(t="patternTransform"),P.Container.prototype.attr.call(this,t,e,n)}},construct:{pattern:function(t,e,n){return this.defs().pattern(t,e,n)}}}),P.extend(P.Defs,{pattern:function(t,e,n){return this.put(new P.Pattern).update(n).attr({x:0,y:0,width:t,height:e,patternUnits:"userSpaceOnUse"})}}),P.Doc=P.invent({create:function(t){this.constructor(t||P.create("svg")),this.namespace().defs()},inherit:P.Container,extend:{namespace:function(){return this.attr({xmlns:P.ns,version:"1.1"}).attr("xmlns:xlink",P.xlink,P.xmlns).attr("xmlns:svgjs",P.svgjs,P.xmlns)},defs:function(){return P.adopt(this.node.getElementsByTagName("defs")[0])||this.put(new P.Defs)},parent:function(){return"#document"===this.node.parentNode.nodeName?null:this.node.parentNode},remove:function(){return this.parent()&&this.parent().removeChild(this.node),this},clear:function(){for(;this.node.hasChildNodes();)this.node.removeChild(this.node.lastChild);return this},toNested:function(){var t=P.create("svg");return this.node.instance=null,t.appendChild(this.node),P.adopt(this.node)}}}),P.Shape=P.invent({create:function(t){this.constructor(t)},inherit:P.Element}),P.Bare=P.invent({create:function(t,e){if(this.constructor(P.create(t)),e)for(var n in e.prototype)"function"==typeof e.prototype[n]&&(this[n]=e.prototype[n])},inherit:P.Element,extend:{words:function(t){for(;this.node.hasChildNodes();)this.node.removeChild(this.node.lastChild);return this.node.appendChild(e.createTextNode(t)),this}}}),P.extend(P.Parent,{element:function(t,e){return this.put(new P.Bare(t,e))}}),P.Symbol=P.invent({create:"symbol",inherit:P.Container,construct:{symbol:function(){return this.put(new P.Symbol)}}}),P.Use=P.invent({create:"use",inherit:P.Shape,extend:{element:function(t,e){return this.attr("href",(e||"")+"#"+t,P.xlink)}},construct:{use:function(t,e){return this.put(new P.Use).element(t,e)}}}),P.Rect=P.invent({create:"rect",inherit:P.Shape,construct:{rect:function(t,e){return this.put(new P.Rect).size(t,e)}}}),P.Circle=P.invent({create:"circle",inherit:P.Shape,construct:{circle:function(t){return this.put(new P.Circle).rx(new P.Number(t).divide(2)).move(0,0)}}}),P.extend([P.Circle,P.FX],{rx:function(t){return this.attr("r",t)},ry:function(t){return this.rx(t)}}),P.Ellipse=P.invent({create:"ellipse",inherit:P.Shape,construct:{ellipse:function(t,e){return this.put(new P.Ellipse).size(t,e).move(0,0)}}}),P.extend([P.Ellipse,P.Rect,P.FX],{rx:function(t){return this.attr("rx",t)},ry:function(t){return this.attr("ry",t)}}),P.extend([P.Circle,P.Ellipse],{x:function(t){return null==t?this.cx()-this.rx():this.cx(t+this.rx())},y:function(t){return null==t?this.cy()-this.ry():this.cy(t+this.ry())},cx:function(t){return null==t?this.attr("cx"):this.attr("cx",t)},cy:function(t){return null==t?this.attr("cy"):this.attr("cy",t)},width:function(t){return null==t?2*this.rx():this.rx(new P.Number(t).divide(2))},height:function(t){return null==t?2*this.ry():this.ry(new P.Number(t).divide(2))},size:function(t,e){var n=d(this,t,e);return this.rx(new P.Number(n.width).divide(2)).ry(new P.Number(n.height).divide(2))}}),P.Line=P.invent({create:"line",inherit:P.Shape,extend:{array:function(){return new P.PointArray([[this.attr("x1"),this.attr("y1")],[this.attr("x2"),this.attr("y2")]])},plot:function(t,e,n,i){return null==t?this.array():(t=void 0!==e?{x1:t,y1:e,x2:n,y2:i}:new P.PointArray(t).toLine(),this.attr(t))},move:function(t,e){return this.attr(this.array().move(t,e).toLine())},size:function(t,e){var n=d(this,t,e);return this.attr(this.array().size(n.width,n.height).toLine())}},construct:{line:function(t,e,n,i){return P.Line.prototype.plot.apply(this.put(new P.Line),null!=t?[t,e,n,i]:[0,0,0,0])}}}),P.Polyline=P.invent({create:"polyline",inherit:P.Shape,construct:{polyline:function(t){return this.put(new P.Polyline).plot(t||new P.PointArray)}}}),P.Polygon=P.invent({create:"polygon",inherit:P.Shape,construct:{polygon:function(t){return this.put(new P.Polygon).plot(t||new P.PointArray)}}}),P.extend([P.Polyline,P.Polygon],{array:function(){return this._array||(this._array=new P.PointArray(this.attr("points")))},plot:function(t){return null==t?this.array():this.clear().attr("points","string"==typeof t?t:this._array=new P.PointArray(t))},clear:function(){return delete this._array,this},move:function(t,e){return this.attr("points",this.array().move(t,e))},size:function(t,e){var n=d(this,t,e);return this.attr("points",this.array().size(n.width,n.height))}}),P.extend([P.Line,P.Polyline,P.Polygon],{MorphArray:P.PointArray,x:function(t){return null==t?this.bbox().x:this.move(t,this.bbox().y)},y:function(t){return null==t?this.bbox().y:this.move(this.bbox().x,t)},width:function(t){var e=this.bbox();return null==t?e.width:this.size(t,e.height)},height:function(t){var e=this.bbox();return null==t?e.height:this.size(e.width,t)}}),P.Path=P.invent({create:"path",inherit:P.Shape,extend:{MorphArray:P.PathArray,array:function(){return this._array||(this._array=new P.PathArray(this.attr("d")))},plot:function(t){return null==t?this.array():this.clear().attr("d","string"==typeof t?t:this._array=new P.PathArray(t))},clear:function(){return delete this._array,this},move:function(t,e){return this.attr("d",this.array().move(t,e))},x:function(t){return null==t?this.bbox().x:this.move(t,this.bbox().y)},y:function(t){return null==t?this.bbox().y:this.move(this.bbox().x,t)},size:function(t,e){var n=d(this,t,e);return this.attr("d",this.array().size(n.width,n.height))},width:function(t){return null==t?this.bbox().width:this.size(t,this.bbox().height)},height:function(t){return null==t?this.bbox().height:this.size(this.bbox().width,t)}},construct:{path:function(t){return this.put(new P.Path).plot(t||new P.PathArray)}}}),P.Image=P.invent({create:"image",inherit:P.Shape,extend:{load:function(e,n){if(!e)return this;var i=new t.Image;return P.on(i,"load",function(t){var r=this.parent(P.Pattern);0===this.width()&&0===this.height()&&this.size(i.width,i.height),r instanceof P.Pattern&&0===r.width()&&0===r.height()&&r.size(this.width(),this.height()),"function"==typeof n&&n.call(this,{width:i.width,height:i.height,ratio:i.width/i.height,url:e})},this),P.on(i,"load error",function(){P.off(i)}),this.attr("href",i.src=e,P.xlink)}},construct:{image:function(t,e){return this.put(new P.Image).size(0,0).load(t,e)}}}),P.Text=P.invent({create:function(t){this.constructor(t||P.create("text")),this.dom.leading=new P.Number(1.3),this._rebuild=!0,this._build=!1,this.attr("font-family",P.defaults.attrs["font-family"])},inherit:P.Parent,extend:{x:function(t){return null==t?this.attr("x"):this.attr("x",t)},y:function(t){var e=this.attr("y"),n="number"==typeof e?e-this.bbox().y:0;return null==t?"number"==typeof e?e-n:e:this.attr("y","number"==typeof t?t+n:t)},cx:function(t){return null==t?this.bbox().cx:this.x(t-this.bbox().width/2)},cy:function(t){return null==t?this.bbox().cy:this.y(t-this.bbox().height/2)},text:function(t){if(void 0===t){var e=this.node.childNodes,n=0;t="";for(var i=0,r=e.length;i=0;e--)null!=n[S[t][e]]&&this.attr(S.prefix(t,S[t][e]),n[S[t][e]]);return this},P.extend([P.Element,P.FX],n)}),P.extend([P.Element,P.FX],{rotate:function(t,e,n){var i=(new P.Matrix).rotate(t,e,n);return this.matrix(i,!0)},skew:function(t,e,n,i){var r=1===arguments.length||3===arguments.length?(new P.Matrix).skew(t,t,n,i):(new P.Matrix).skew(t,e,n,i);return this.matrix(r,!0)},scale:function(t,e,n,i){return 1===arguments.length||3===arguments.length?this.transform({scale:t,cx:e,cy:n}):this.transform({scaleX:t,scaleY:e,cx:n,cy:i})},translate:function(t,e){return this.transform({x:t,y:e})},flip:function(t,e){return e="number"==typeof t?t:e,this.transform({flip:t||"both",offset:e})},opacity:function(t){return this.attr("opacity",t)},dx:function(t){return this.x(new P.Number(t).plus(this instanceof P.FX?0:this.x()),!0)},dy:function(t){return this.y(new P.Number(t).plus(this instanceof P.FX?0:this.y()),!0)},dmove:function(t,e){return this.dx(t).dy(e)}}),P.extend([P.Rect,P.Ellipse,P.Circle,P.Gradient,P.FX],{radius:function(t,e){var n=(this._target||this).type;return"radialGradient"===n||"radialGradient"===n?this.attr("r",new P.Number(t)):this.rx(t).ry(null==e?t:e)}}),P.extend(P.Path,{length:function(){return this.node.getTotalLength()},pointAt:function(t){return new P.Point(this.node.getPointAtLength(t))}}),P.extend([P.Parent,P.Text,P.Tspan,P.FX],{font:function(t,e){if("object"==typeof t)for(e in t)this.font(e,t[e]);return"leading"===t?this.leading(e):"anchor"===t?this.attr("text-anchor",e):"size"===t||"family"===t||"weight"===t||"stretch"===t||"variant"===t||"style"===t?this.attr("font-"+t,e):this.attr(t,e)}}),P.extend(P.Element,{data:function(t,e,n){if("object"==typeof t)for(e in t)this.data(e,t[e]);else if(arguments.length<2)try{return JSON.parse(this.attr("data-"+t))}catch(e){return this.attr("data-"+t)}else this.attr("data-"+t,null===e?null:!0===n||"string"==typeof e||"number"==typeof e?e:JSON.stringify(e));return this}}),P.extend(P.Element,{remember:function(t,e){if("object"==typeof arguments[0])for(var n in t)this.remember(n,t[n]);else{if(1===arguments.length)return this.memory()[t];this.memory()[t]=e}return this},forget:function(){if(0===arguments.length)this._memory={};else for(var t=arguments.length-1;t>=0;t--)delete this.memory()[arguments[t]];return this},memory:function(){return this._memory||(this._memory={})}}),P.get=function(t){var n=e.getElementById(g(t)||t);return P.adopt(n)},P.select=function(t,n){return P.utils.map((n||e).querySelectorAll(t),function(t){return P.adopt(t)})},P.$$=function(t,n){return P.utils.map((n||e).querySelectorAll(t),function(t){return P.adopt(t)})},P.$=function(t,n){return P.adopt((n||e).querySelector(t))},P.extend(P.Parent,{select:function(t){return P.select(t,this.node)}});var k="abcdef".split("");return P.Box=P.invent({create:function(t){var e=[0,0,0,0];t="string"==typeof t?t.split(P.regex.delimiter).map(parseFloat):Array.isArray(t)?t:"object"==typeof t?[null!=t.left?t.left:t.x,null!=t.top?t.top:t.y,t.width,t.height]:4===arguments.length?[].slice.call(arguments):e,this.x=t[0],this.y=t[1],this.width=t[2],this.height=t[3],y(this)},extend:{merge:function(t){var e=Math.min(this.x,t.x),n=Math.min(this.y,t.y);return new P.Box(e,n,Math.max(this.x+this.width,t.x+t.width)-e,Math.max(this.y+this.height,t.y+t.height)-n)},transform:function(t){var e=1/0,n=-1/0,i=1/0,r=-1/0;return[new P.Point(this.x,this.y),new P.Point(this.x2,this.y),new P.Point(this.x,this.y2),new P.Point(this.x2,this.y2)].forEach(function(s){s=s.transform(t),e=Math.min(e,s.x),n=Math.max(n,s.x),i=Math.min(i,s.y),r=Math.max(r,s.y)}),new P.Box(e,i,n-e,r-i)},addOffset:function(){return this.x+=t.pageXOffset,this.y+=t.pageYOffset,this},toString:function(){return this.x+" "+this.y+" "+this.width+" "+this.height},morph:function(t,e,n,i){return this.destination=new P.Box(t,e,n,i),this},at:function(t){return this.destination?new P.Box(this.x+(this.destination.x-this.x)*t,this.y+(this.destination.y-this.y)*t,this.width+(this.destination.width-this.width)*t,this.height+(this.destination.height-this.height)*t):this}},parent:P.Element,construct:{bbox:function(){var t;try{if(t=this.node.getBBox(),i(t)&&!r(this.node))throw new Exception("Element not in the dom")}catch(n){try{var e=this.clone(P.parser().svg).show();t=e.node.getBBox(),e.remove()}catch(t){console.warn("Getting a bounding box of this element is not possible")}}return new P.Box(t)},rbox:function(t){try{var e=new P.Box(this.node.getBoundingClientRect());return t?e.transform(t.screenCTM().inverse()):e.addOffset()}catch(t){return new P.Box}}}}),P.extend([P.Doc,P.Nested,P.Symbol,P.Image,P.Pattern,P.Marker,P.ForeignObject,P.View],{viewbox:function(t,e,n,i){return null==t?new P.Box(this.attr("viewBox")):this.attr("viewBox",new P.Box(t,e,n,i))}}),P.parser=function(){var t;return P.parser.nodes.svg.node.parentNode||(t=e.body||e.documentElement,P.parser.nodes.svg.addTo(t)),P.parser.nodes},P.parser.nodes={svg:(new P.Nested).size(2,0).css({opacity:0,position:"absolute",left:"-100%",top:"-100%",overflow:"hidden"})},P.parser.nodes.path=P.parser.nodes.svg.path().node,P}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 545a27f..ac63729 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -98,8 +98,8 @@ gulp.task('unify', ['clean'], function () { .pipe(standard()) .pipe(standard.reporter('default', { showRuleNames: true, - breakOnError: true, - quiet: true + breakOnError: process.argv[2] !== "--dont-break", + quiet: true, })) .pipe(concat('svg.js', { newLine: '\n' })) // wrap the whole thing in an immediate function call @@ -109,6 +109,7 @@ gulp.task('unify', ['clean'], function () { .pipe(chmod(0o644)) .pipe(gulp.dest('dist')) .pipe(size({ showFiles: true, title: 'Full' })) + return collection }) /** diff --git a/package.json b/package.json index 9cc9a1d..e2f4034 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "scripts": { "build": "gulp", "build:test": "gulp unify", + "build:dev": "gulp --dont-break", "test": "karma start .config/karma.conf.js --single-run", "test:quick": "karma start .config/karma.quick.js", "lint": "standard --verbose | snazzy" @@ -88,6 +89,7 @@ "standard": { "ignore": [ "/dist", + "/spec", "/src/umd.js" ], "globals": [ diff --git a/playgrounds/playground.css b/playgrounds/playground.css new file mode 100644 index 0000000..1808d6a --- /dev/null +++ b/playgrounds/playground.css @@ -0,0 +1,42 @@ + +html { + background-color : #f5f6f7; + text-align: center; +} + +h1 { + color: #f06; + font-size: 6vh; + margin: 4vh; + font-family: Helvetica; +} + +svg { + width: 70vw; + height: 80vh; + background-color: white; + position: fixed; + border-radius: 20px; + border: #f065 1px solid; + left: 15vw; +} + +.pink { + fill: #FF0066; +} + +.green { + fill: #00ff99; +} + +.dark-pink { + fill: #660029; +} + +.light-pink { + fill: #FF99C2; +} + +.off-white { + fill: #FFCCE0; +} diff --git a/playgrounds/transforms/transforms.html b/playgrounds/transforms/transforms.html new file mode 100644 index 0000000..4382745 --- /dev/null +++ b/playgrounds/transforms/transforms.html @@ -0,0 +1,27 @@ + + + + + + + SVG Playground + + + + + +

SVG JS Playground

+ + + + + + + + + + + + + + diff --git a/playgrounds/transforms/transforms.js b/playgrounds/transforms/transforms.js new file mode 100644 index 0000000..797fa65 --- /dev/null +++ b/playgrounds/transforms/transforms.js @@ -0,0 +1,7 @@ + +let mover = SVG.select("#new")[0] + +console.log(mover.transform()); +mover.transform({ + position: [30, 50] +}) diff --git a/spec/spec/transformations.js b/spec/spec/transformations.js index 3399981..dc71ad2 100644 --- a/spec/spec/transformations.js +++ b/spec/spec/transformations.js @@ -19,11 +19,11 @@ describe('Transformations:', function() { describe('SVG.Translate', function() { var trans - + beforeEach(function(){ trans = new SVG.Translate(translated.transform()) }) - + it('creates an object of type SVG.Transformation', function() { expect(trans instanceof SVG.Transformation).toBeTruthy() @@ -51,7 +51,7 @@ describe('Transformations:', function() { var extracted = (new SVG.Matrix(10,0,0,10,20,20)).extract() trans.undo(extracted) expect(trans._undo.toString()).toEqual('matrix(1,0,0,1,-2,-2)') - + var extracted = (new SVG.Matrix(10,50,50,30,20,20)).extract() trans.undo(extracted) expect(trans._undo.e).toBeCloseTo(-extracted.transformedX) @@ -78,14 +78,14 @@ describe('Transformations:', function() { }) }) }) - + describe('SVG.Rotate', function() { var trans - + beforeEach(function(){ trans = new SVG.Rotate(45, 50, 50) }) - + it('creates an object of type SVG.Transformation', function() { expect(trans instanceof SVG.Transformation).toBeTruthy() @@ -129,15 +129,15 @@ describe('Transformations:', function() { }) }) }) - + describe('SVG.Scale', function() { var trans - + beforeEach(function(){ trans = new SVG.Scale(2,2,50,50) }) - + it('creates an object of type SVG.Transformation', function() { expect(trans instanceof SVG.Transformation).toBeTruthy() @@ -170,7 +170,7 @@ describe('Transformations:', function() { expect(trans._undo.d).toBeCloseTo(1/extracted.scaleY) expect(trans._undo.e).toBeCloseTo(45) expect(trans._undo.f).toBeCloseTo(45) - + var extracted = (new SVG.Matrix(10,50,50,30,20,20)).extract() trans.undo(extracted) expect(trans._undo.a).toBeCloseTo(1/extracted.scaleX) @@ -184,12 +184,12 @@ describe('Transformations:', function() { }) it('returns the inversed matrix from a specific position when created with inverse flag', function() { var morphed = (new SVG.Scale(scaled.transform(2,2,50,50), true)).at(0.25) - + expect(morphed.a).toBeCloseTo(0.8) expect(morphed.d).toBeCloseTo(0.8) }) it('returns the resulting transformation which has to be made to set an absolute translation', function() { - + var morphed = trans.undo((new SVG.Matrix(10,0,0,10,0,0)).extract()).at(0.5) expect(morphed.a).toBeCloseTo(0.6) @@ -200,15 +200,15 @@ describe('Transformations:', function() { expect(morphed.f).toBeCloseTo(20) }) }) - }) + }) describe('SVG.Skew', function() { var trans - + beforeEach(function(){ trans = new SVG.Skew(30,-30,50,50) }) - + it('creates an object of type SVG.Transformation', function() { expect(trans instanceof SVG.Transformation).toBeTruthy() @@ -257,7 +257,7 @@ describe('Transformations:', function() { }) it('returns the inversed matrix from a specific position when created with inverse flag', function() { var morphed = (new SVG.Scale(skewed.transform(20,-20,50,50), true)).at(0.25) - + expect(morphed.a).toBeCloseTo(0.963) expect(morphed.b).toBeCloseTo(0) expect(morphed.c).toBeCloseTo(0) @@ -266,7 +266,7 @@ describe('Transformations:', function() { expect(morphed.f).toBeCloseTo(0) }) it('returns the resulting transformation which has to be made to set an absolute translation', function() { - + var morphed = trans.undo((new SVG.Matrix(10,0,0,10,0,0)).skew(20, 30, 20, 10).extract()).at(0.5) expect(morphed.a).toBeCloseTo(1.266) @@ -278,5 +278,4 @@ describe('Transformations:', function() { }) }) }) - }) diff --git a/src/matrix.js b/src/matrix.js index 48ed7a1..a7676da 100644 --- a/src/matrix.js +++ b/src/matrix.js @@ -1,4 +1,4 @@ -/* global abcdef, arrayToMatrix, deltaTransformPoint, parseMatrix */ +/* global abcdef, arrayToMatrix, parseMatrix, unitCircle, mag */ SVG.Matrix = SVG.invent({ // Initialize @@ -23,159 +23,130 @@ SVG.Matrix = SVG.invent({ }, // Add methods -, extend: { + extend: { // Convert an object of affine parameters into a matrix compose: function (o, cx, cy) { - // Set the defaults var tx = o.translateX || 0 - , ty = o.translateY || 0 - , theta = o.theta || 0 - , sx = o.scaleX || 1 - , sy = o.scaleY || 1 - , lam = o.shear || 0 - , cx = cx || 0 - , cy = cy || 0 + var ty = o.translateY || 0 + var theta = o.theta || 0 + var sx = o.scaleX || 1 + var sy = o.scaleY || 1 + var lam = o.shear || 0 + cx = cx || 0 + cy = cy || 0 // Calculate the trigonometric values var ct = Math.cos(theta * Math.PI / 180) - , st Math.sin(theta * Math.PI / 180) + var st = Math.sin(theta * Math.PI / 180) // Calculate the matrix components directly var a = sx * ct - , b = sx * st - , c = lam * sx * ct - sy * st - , d = lam * sx * st + sy * ct - , e = - sx * ct * (cx + cy * lam) + sy * st * cy + tx + cx - , f = - sx * st * (cx + cy * lam) - sy * ct * cy + ty + cy + var b = sx * st + var c = lam * sx * ct - sy * st + var d = lam * sx * st + sy * ct + var e = -sx * ct * (cx + cy * lam) + sy * st * cy + tx + cx + var f = -sx * st * (cx + cy * lam) - sy * ct * cy + ty + cy // Construct a new matrix and return it var matrix = new SVG.Matrix([a, b, c, d, e, f]) return matrix - } + }, // Decompose a matrix into the affine parameters needed to form it - , decompose: function (matrix, cx, cy) { - + decompose: function (matrix, cx, cy) { // Get the paramaters of the current matrix var a = matrix.a - , b = matrix.b - , c = matrix.c - , d = matrix.d - , e = matrix.e - , f = matrix.f + var b = matrix.b + var c = matrix.c + var d = matrix.d + var e = matrix.e + var f = matrix.f // Project the first basis vector onto the unit circle - var circle = unitCircle (a, b) - , theta = circle.theta - , ct = circle.cos - , st = circle.sin + var circle = unitCircle(a, b) + var theta = circle.theta + var ct = circle.cos + var st = circle.sin // Work out the transformation parameters var signX = Math.sign(a * ct + b * st) - , sx = signX * mag (a, b) - , lam = (st * d + ct * c) / (ct * a + st * b) - , signY = Math.sign(- c * st + d * ct) - , sy = mag (lam * a - c, d - lam * b) - , tx = e - cx + cx * ct * sx + cy * (lam * ct * sx - st * sy) - , ty = f - cy + cx * st * sx + cy * (lam * st * sx + ct * sy) + var sx = signX * mag(a, b) + var lam = (st * d + ct * c) / (ct * a + st * b) + var sy = mag(lam * a - c, d - lam * b) + var tx = e - cx + cx * ct * sx + cy * (lam * ct * sx - st * sy) + var ty = f - cy + cx * st * sx + cy * (lam * st * sx + ct * sy) // Package and return the parameters return { // Bundle the affine parameters - translateX: tx - , translateY: ty - , theta: theta - , scaleX: sx - , scaleY: sy - , shear: lam + translateX: tx, + translateY: ty, + theta: theta, + scaleX: sx, + scaleY: sy, + shear: lam, // Bundle the matrix parameters - , a: this.a - , b: this.b - , c: this.c - , d: this.d - , e: this.e - , f: this.f - - // Return the new origin point - , x: this.e - , y: this.f - - // Store the matrix - , matrix: new SVG.Matrix(this) - // translation - x: this.e, - y: this.f, - transformedX: (this.e * Math.cos(skewX * Math.PI / 180) + this.f * Math.sin(skewX * Math.PI / 180)) / Math.sqrt(this.a * this.a + this.b * this.b), - transformedY: (this.f * Math.cos(skewX * Math.PI / 180) + this.e * Math.sin(-skewX * Math.PI / 180)) / Math.sqrt(this.c * this.c + this.d * this.d), - // skew - skewX: -skewX, - skewY: 180 / Math.PI * Math.atan2(py.y, py.x), - // scale - scaleX: Math.sqrt(this.a * this.a + this.b * this.b), - scaleY: Math.sqrt(this.c * this.c + this.d * this.d), - // rotation - rotation: skewX, a: this.a, b: this.b, c: this.c, d: this.d, e: this.e, f: this.f, + + // Return the new origin point + x: this.e, + y: this.f, matrix: new SVG.Matrix(this) ->>>>>>> 3.0.0 } }, // Clone matrix - , form: function (o) { - - // Get all of the parameters required to form the matrix - var flipX = o.flip && (o.flip == "x" || o.flip == "both") ? -1 : 1 - , flipY = o.flip && (o.flip == "y" || o.flip == "both") ? -1 : 1 - , kX = o.skew.length ? o.skew[0] + form: function (o) { + // Get all of the parameters required to form the matrix + var flipX = o.flip && (o.flip === 'x' || o.flip === 'both') ? -1 : 1 + var flipY = o.flip && (o.flip === 'y' || o.flip === 'both') ? -1 : 1 + var skewX = o.skew.length ? o.skew[0] : isFinite(o.skew) ? o.skew : isFinite(o.skewX) ? o.skewX : 0 - , kY = o.skew.length ? o.skew[1] + var skewY = o.skew.length ? o.skew[1] : isFinite(o.skew) ? o.skew : isFinite(o.skewY) ? o.skewY : 0 - , skewX = o.scale.length ? o.scale[0] * flipX + var sx = o.scale.length ? o.scale[0] * flipX : isFinite(o.scale) ? o.scale * flipX : isFinite(o.scaleX) ? o.scaleX * flipX : flipX - , skewY = o.scale.length ? o.scale[1] * flipY + var sy = o.scale.length ? o.scale[1] * flipY : isFinite(o.scale) ? o.scale * flipY : isFinite(o.scaleY) ? o.scaleY * flipY : flipY - , kx = Math.tan(SVG.utils.radians(skewX)) - , ky = Math.tan(SVG.utils.radians(skewY)) - , lam = o.shear || 0 - , theta = SVG.utils.radians(o.rotate || 0) - , st = Math.sin(theta) - , ct = Math.cos(theta) - , ox = o.origin.length ? o.origin[0] : o.ox || 0 - , oy = o.origin.length ? o.origin[1] : o.oy || 0 - , px = o.position.length ? o.position[0] : o.px || ox - , py = o.position.length ? o.position[1] : o.py || oy - , tx = o.translate.length ? o.translate[0] : o.tx || 0 - , ty = o.translate.length ? o.translate[1] : o.ty || 0 + var kx = Math.tan(SVG.utils.radians(skewX)) + var ky = Math.tan(SVG.utils.radians(skewY)) + var lam = o.shear || 0 + var theta = SVG.utils.radians(o.rotate || 0) + var st = Math.sin(theta) + var ct = Math.cos(theta) + var ox = o.origin.length ? o.origin[0] : o.ox || 0 + var oy = o.origin.length ? o.origin[1] : o.oy || 0 + var px = o.position.length ? o.position[0] : o.px || ox + var py = o.position.length ? o.position[1] : o.py || oy + var tx = o.translate.length ? o.translate[0] : o.tx || 0 + var ty = o.translate.length ? o.translate[1] : o.ty || 0 // Form the matrix parameters... aka. welcome to wonderland! (used wolfram) - var a = ct*sx + ky*st*sy - , b = ct*ky*sy - st*sx - , c = ct*kx*sx + st*sy + lam*(ct*sx+ky*st*sy) - , d = -kx*st*sx + ct*sy + lam*(-st*sx + ct*ky*sy) - , e = px + tx + cx*(ct*sx+ky*st*sy) + cy*(ct*kx*sx+st*sy+lam*(ct*sx+ky*st*sy)) - , f = py + ty + cx*(-st*sx + ct*ky*sy) + cy*(-kx*st*sx + ct*sy + lam*(-st*sx + ct*ky*sy)) - , result = new Matrix(a, b, c, d, e, f) - return result - } - , clone: function() { + var a = ct * sx + ky * st * sy + var b = ct * ky * sy - st * sx + var c = ct * kx * sx + st * sy + lam * (ct * sx + ky * st * sy) + var d = -kx * st * sx + ct * sy + lam * (-st * sx + ct * ky * sy) + var e = px + tx + ox * (ct * sx + ky * st * sy) + oy * (ct * kx * sx + st * sy + lam * (ct * sx + ky * st * sy)) + var f = py + ty + ox * (-st * sx + ct * ky * sy) + oy * (-kx * st * sx + ct * sy + lam * (-st * sx + ct * ky * sy)) + var result = new SVG.Matrix(a, b, c, d, e, f) + return result + }, clone: function () { ->>>>>>> 3.0.0 return new SVG.Matrix(this) }, // Morph one matrix into another @@ -211,15 +182,15 @@ SVG.Matrix = SVG.invent({ return new SVG.Matrix(this.native().inverse()) }, // Translate matrix - , translate: function(x, y) { - var translation = new SVG.Matrix(this.native().translate(x || 0, y || 0)) - , matrix = this.multiply(translation) + translate: function (x, y) { + var translation = new SVG.Matrix(this.native().translate(x || 0, y || 0)) + var matrix = this.multiply(translation) return matrix - } + }, // Scale matrix - , scale: function(x, y, cx, cy) { + scale: function (x, y, cx, cy) { // Support uniform scaling - if (arguments.length == 1) { + if (arguments.length === 1) { y = x } else if (arguments.length === 3) { cy = cx @@ -229,22 +200,21 @@ SVG.Matrix = SVG.invent({ // Rotate the current matrix var scale = new SVG.Matrix(x, 0, 0, y, 0, 0) - , centered = this.around(cx, cy, rotation) - , matrix = this.multiply(centered) - return scale - } + var centered = this.around(cx, cy, scale) + var matrix = this.multiply(centered) + return matrix + }, // Rotate matrix - , rotate: function(r, cx, cy) { - + rotate: function (r, cx, cy) { // Convert degrees to radians r = SVG.utils.radians(r) // Construct the rotation matrix var rotation = new SVG.Matrix(Math.cos(r), Math.sin(r), -Math.sin(r), Math.cos(r), 0, 0) - , centered = this.around(cx, cy, rotation) - , matrix = this.multiply(centered) + var centered = this.around(cx, cy, rotation) + var matrix = this.multiply(centered) return matrix - } + }, // Flip matrix on x or y, at a given offset flip: function (a, o) { return a === 'x' ? this.scale(-1, 1, o, 0) @@ -252,13 +222,13 @@ SVG.Matrix = SVG.invent({ : this.scale(-1, -1, a, o != null ? o : a) }, // Skew - , shear: function(a, cx, cy) { - var shear = new SVG.Matrix(1, a, 0, 1, 0, 0) - , centered = this.around(cx, cy, shear) - , matrix = this.multiply(centered) - return matrix - } - , skew: function(x, y, cx, cy) { + shear: function (a, cx, cy) { + var shear = new SVG.Matrix(1, a, 0, 1, 0, 0) + var centered = this.around(cx, cy, shear) + var matrix = this.multiply(centered) + return matrix + }, + skew: function (x, y, cx, cy) { // support uniformal skew if (arguments.length === 1) { y = x @@ -274,10 +244,10 @@ SVG.Matrix = SVG.invent({ // Construct the matrix var skew = new SVG.Matrix(1, Math.tan(y), Math.tan(x), 1, 0, 0) - , centered = this.around(cx, cy, skew) - , matrix = this.multiply(centered) + var centered = this.around(cx, cy, skew) + var matrix = this.multiply(centered) return matrix - } + }, // SkewX skewX: function (x, cx, cy) { return this.skew(x, 0, cx, cy) diff --git a/src/sugar.js b/src/sugar.js index 7c555da..e82f4bb 100644 --- a/src/sugar.js +++ b/src/sugar.js @@ -35,17 +35,17 @@ var sugar = { SVG.extend([SVG.Element, SVG.FX], { // Map rotation to transform -, rotate: function(angle, cx, cy) { + rotate: function (angle, cx, cy) { var matrix = new SVG.Matrix().rotate(angle, cx, cy) - - return this.transform({ rotation: d, cx: cx, cy: cy }) + return this.matrix(matrix, true) }, // Map skew to transform -, skew: function(x, y, cx, cy) { - return arguments.length == 1 || arguments.length == 3 ? - this.transform({ skew: x, cx: y, cy: cx }) : - this.transform({ skewX: x, skewY: y, cx: cx, cy: cy }) - } + skew: function (x, y, cx, cy) { + var matrix = arguments.length === 1 || arguments.length === 3 + ? new SVG.Matrix().skew(x, x, cx, cy) + : new SVG.Matrix().skew(x, y, cx, cy) + return this.matrix(matrix, true) + }, // Map scale to transform scale: function (x, y, cx, cy) { return arguments.length === 1 || arguments.length === 3 @@ -60,7 +60,7 @@ SVG.extend([SVG.Element, SVG.FX], { flip: function (a, o) { o = typeof a === 'number' ? a : o return this.transform({ flip: a || 'both', offset: o }) - } + }, // Opacity opacity: function (value) { return this.attr('opacity', value) diff --git a/src/transform.js b/src/transform.js index 4076301..625a5ab 100644 --- a/src/transform.js +++ b/src/transform.js @@ -1,37 +1,72 @@ -/* global ensureCentre, capitalize, arrayToMatrix */ +/* global arrayToMatrix */ SVG.extend(SVG.Element, { + // Reset all transformations + untransform: function () { + return this.attr('transform', null) + }, - // Add transformations - transform: function (o) { + // merge the whole transformation chain into one matrix and returns it + matrixify: function () { + var matrix = (this.attr('transform') || '') + // split transformations + .split(SVG.regex.transforms).slice(0, -1).map(function (str) { + // generate key => value pairs + var kv = str.trim().split('(') + return [kv[0], kv[1].split(SVG.regex.delimiter).map(function (str) { return parseFloat(str) })] + }) + // merge every transformation into one matrix + .reduce(function (matrix, transform) { + if (transform[0] === 'matrix') return matrix.multiply(arrayToMatrix(transform[1])) + return matrix[transform[0]].apply(matrix, transform[1]) + }, new SVG.Matrix()) - /** - * EXTRACTING PARAMETERS - */ + return matrix + }, + // add an element to another parent without changing the visual representation on the screen + toParent: function (parent) { + if (this === parent) return this + var ctm = this.screenCTM() + var pCtm = parent.screenCTM().inverse() + + this.addTo(parent).untransform().transform(pCtm.multiply(ctm)) + + return this + }, + + // same as above with parent equals root-svg + toDoc: function () { + return this.toParent(this.doc()) + } +}) + +SVG.extend(SVG.Element, { + + // Add transformations + transform: function (o) { // Act as a getter if no object was passed if (typeof o !== 'object') { - matrix = new SVG.Matrix(this).extract() + var matrix = new SVG.Matrix(this).decompose() return typeof o === 'string' ? matrix[o] : matrix } // Allow the user to define the origin with a string - if (typeof o.origin === "string") { - + if (typeof o.origin === 'string') { // Get the bounding box and string to use in our calculations var string = o.origin.toLowerCase().trim() - , bbox = this.bbox() - , x = bbox.x - , y = bbox.y - , width = bbox.width - , height = bbox.height + var bbox = this.bbox() + var x = bbox.x + var y = bbox.y + var width = bbox.width + var height = bbox.height // Set the bounds eg : "bottom-left", "Top right", "middle" etc... - o.ox = string.includes("left") ? x - : string.includes("right") ? x + width + o.ox = string.includes('left') ? x + : string.includes('right') ? x + width : x + width / 2 - o.oy = string.includes("top") ? y - : string.includes("bottom") ? y + height + o.oy = string.includes('top') ? y + : string.includes('bottom') ? y + height : y + height / 2 // Make sure we only pass ox and oy @@ -40,71 +75,14 @@ SVG.extend(SVG.Element, { // Get the resulting matrix and apply it to the element var result = new SVG.Matrix().form(o) - , matrixString = result.toString() - // get current matrix - matrix = new SVG.Matrix(target) - - // ensure relative flag - relative = !!relative || !!o.relative - - // act on matrix - if (o.a != null) { - matrix = relative - ? matrix.multiply(new SVG.Matrix(o)) - : new SVG.Matrix(o) - - // act on rotation - } else if (o.rotation != null) { - // ensure centre point - ensureCentre(o, target) - - // apply transformation - matrix = relative - ? matrix.rotate(o.rotation, o.cx, o.cy) - : matrix.rotate(o.rotation - matrix.extract().rotation, o.cx, o.cy) - - // act on scale - } else if (o.scale != null || o.scaleX != null || o.scaleY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure scale values on both axes - o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 - o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 - - if (!relative) { - // absolute; multiply inversed values - var e = matrix.extract() - o.scaleX = o.scaleX * 1 / e.scaleX - o.scaleY = o.scaleY * 1 / e.scaleY - } - - matrix = matrix.scale(o.scaleX, o.scaleY, o.cx, o.cy) - - // act on skew - } else if (o.skew != null || o.skewX != null || o.skewY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure skew values on both axes - o.skewX = o.skew != null ? o.skew : o.skewX != null ? o.skewX : 0 - o.skewY = o.skew != null ? o.skew : o.skewY != null ? o.skewY : 0 - - if (!relative) { - // absolute; reset skew values - var el = matrix.extract() - matrix = matrix.multiply(new SVG.Matrix().skew(el.skewX, el.skewY, el.cx, el.cy).inverse()) - } ->>>>>>> 3.0.0 + var matrixString = result.toString() // Apply the result - return this.attr('transform', matrix) - } - } + return this.attr('transform', matrixString) + }, // Map matrix to transform -, matrix: function(m, relative) { - + matrix: function (m, relative) { // Construct a matrix from the first parameter var matrix = new SVG.Matrix(m) @@ -120,10 +98,7 @@ SVG.extend(SVG.Element, { }) SVG.extend(SVG.FX, { - transform: function(o, relative) { - - - + transform: function (o, relative) { // // get target in case of the fx module, otherwise reference this // var target = this.target() @@ -203,90 +178,51 @@ SVG.extend(SVG.FX, { // // return this._callStart() // } - // ensure scale values on both axes - o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 - o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 - - matrix = new SVG.Scale(o.scaleX, o.scaleY, o.cx, o.cy) - - // act on skew - } else if (o.skewX != null || o.skewY != null) { - // ensure centre point - ensureCentre(o, target) - - // ensure skew values on both axes - o.skewX = o.skewX != null ? o.skewX : 0 - o.skewY = o.skewY != null ? o.skewY : 0 - - matrix = new SVG.Skew(o.skewX, o.skewY, o.cx, o.cy) - - // act on flip - } else if (o.flip) { - if (o.flip === 'x' || o.flip === 'y') { - o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset - } else { - if (o.offset == null) { - bbox = target.bbox() - o.flip = bbox.cx - o.offset = bbox.cy - } else { - o.flip = o.offset - } - } - - matrix = new SVG.Matrix().flip(o.flip, o.offset) - - // act on translate - } else if (o.x != null || o.y != null) { - matrix = new SVG.Translate(o.x, o.y) - } - - if (!matrix) return this - - matrix.relative = relative - - this.last().transforms.push(matrix) - - return this._callStart() - } ->>>>>>> 3.0.0 -}) - -SVG.extend(SVG.Element, { - // Reset all transformations - untransform: function () { - return this.attr('transform', null) - }, - // merge the whole transformation chain into one matrix and returns it - matrixify: function () { - var matrix = (this.attr('transform') || '') - // split transformations - .split(SVG.regex.transforms).slice(0, -1).map(function (str) { - // generate key => value pairs - var kv = str.trim().split('(') - return [kv[0], kv[1].split(SVG.regex.delimiter).map(function (str) { return parseFloat(str) })] - }) - // merge every transformation into one matrix - .reduce(function (matrix, transform) { - if (transform[0] === 'matrix') return matrix.multiply(arrayToMatrix(transform[1])) - return matrix[transform[0]].apply(matrix, transform[1]) - }, new SVG.Matrix()) - - return matrix - }, - // add an element to another parent without changing the visual representation on the screen - toParent: function (parent) { - if (this === parent) return this - var ctm = this.screenCTM() - var pCtm = parent.screenCTM().inverse() - - this.addTo(parent).untransform().transform(pCtm.multiply(ctm)) - - return this - }, - // same as above with parent equals root-svg - toDoc: function () { - return this.toParent(this.doc()) + // // ensure scale values on both axes + // o.scaleX = o.scale != null ? o.scale : o.scaleX != null ? o.scaleX : 1 + // o.scaleY = o.scale != null ? o.scale : o.scaleY != null ? o.scaleY : 1 + // + // matrix = new SVG.Scale(o.scaleX, o.scaleY, o.cx, o.cy) + // + // // act on skew + // } else if (o.skewX != null || o.skewY != null) { + // // ensure centre point + // ensureCentre(o, target) + // + // // ensure skew values on both axes + // o.skewX = o.skewX != null ? o.skewX : 0 + // o.skewY = o.skewY != null ? o.skewY : 0 + // + // matrix = new SVG.Skew(o.skewX, o.skewY, o.cx, o.cy) + // + // // act on flip + // } else if (o.flip) { + // if (o.flip === 'x' || o.flip === 'y') { + // o.offset = o.offset == null ? target.bbox()['c' + o.flip] : o.offset + // } else { + // if (o.offset == null) { + // bbox = target.bbox() + // o.flip = bbox.cx + // o.offset = bbox.cy + // } else { + // o.flip = o.offset + // } + // } + // + // matrix = new SVG.Matrix().flip(o.flip, o.offset) + // + // // act on translate + // } else if (o.x != null || o.y != null) { + // matrix = new SVG.Translate(o.x, o.y) + // } + // + // if (!matrix) return this + // + // matrix.relative = relative + // + // this.last().transforms.push(matrix) + // + // return this._callStart() } }) @@ -432,137 +368,3 @@ SVG.extend(SVG.Element, { // } // // }) -SVG.Transformation = SVG.invent({ - - create: function (source, inversed) { - if (arguments.length > 1 && typeof inversed !== 'boolean') { - return this.constructor.bind(this)([].slice.call(arguments)) - } - - var i, len - if (Array.isArray(source)) { - for (i = 0, len = this.arguments.length; i < len; ++i) { - this[this.arguments[i]] = source[i] - } - } else if (typeof source === 'object') { - for (i = 0, len = this.arguments.length; i < len; ++i) { - this[this.arguments[i]] = source[this.arguments[i]] - } - } - - this.inversed = false - - if (inversed === true) { - this.inversed = true - } - }, - - extend: { - - arguments: [], - method: '', - - at: function (pos) { - var params = [] - - for (var i = 0, len = this.arguments.length; i < len; ++i) { - params.push(this[this.arguments[i]]) - } - - var m = this._undo || new SVG.Matrix() - - m = new SVG.Matrix().morph(SVG.Matrix.prototype[this.method].apply(m, params)).at(pos) - - return this.inversed ? m.inverse() : m - }, - - undo: function (o) { - for (var i = 0, len = this.arguments.length; i < len; ++i) { - o[this.arguments[i]] = typeof this[this.arguments[i]] === 'undefined' ? 0 : o[this.arguments[i]] - } - - // The method SVG.Matrix.extract which was used before calling this - // method to obtain a value for the parameter o doesn't return a cx and - // a cy so we use the ones that were provided to this object at its creation - o.cx = this.cx - o.cy = this.cy - - this._undo = new SVG[capitalize(this.method)](o, true).at(1) - return this - } - - } - -}) - -SVG.Translate = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['transformedX', 'transformedY'], - method: 'translate' - } - -}) - -SVG.Rotate = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['rotation', 'cx', 'cy'], - method: 'rotate', - at: function (pos) { - var m = new SVG.Matrix().rotate(new SVG.Number().morph(this.rotation - (this._undo ? this._undo.rotation : 0)).at(pos), this.cx, this.cy) - return this.inversed ? m.inverse() : m - }, - undo: function (o) { - this._undo = o - return this - } - } - -}) - -SVG.Scale = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['scaleX', 'scaleY', 'cx', 'cy'], - method: 'scale' - } - -}) - -SVG.Skew = SVG.invent({ - - parent: SVG.Matrix, - inherit: SVG.Transformation, - - create: function (source, inversed) { - this.constructor.apply(this, [].slice.call(arguments)) - }, - - extend: { - arguments: ['skewX', 'skewY', 'cx', 'cy'], - method: 'skew' - } -}) ->>>>>>> 3.0.0 diff --git a/src/utilities.js b/src/utilities.js index 5ebe808..01b8ba5 100644 --- a/src/utilities.js +++ b/src/utilities.js @@ -1,3 +1,4 @@ + SVG.utils = { // Map function map: function (array, block) { -- 2.39.5