mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2024-12-29 09:22:22 -05:00
Bump version to v0.9.12
This commit is contained in:
Jürg Lehni
parent
8f4b70a7d3
commit
3da3161a33
8 changed files with 570 additions and 322 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "paper",
|
||||
"version": "0.9.11",
|
||||
"version": "0.9.12",
|
||||
"main": "dist/paper.js",
|
||||
"ignore": [
|
||||
"build",
|
||||
|
|
|
|||
194
dist/paper-core.js
vendored
194
dist/paper-core.js
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/*!
|
||||
* Paper.js v0.9.11 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* Paper.js v0.9.12 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* http://paperjs.org/
|
||||
*
|
||||
* Copyright (c) 2011 - 2013, Juerg Lehni & Jonathan Puckey
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Date: Sat Nov 2 21:26:32 2013 +0100
|
||||
* Date: Thu Nov 14 14:42:28 2013 +0100
|
||||
*
|
||||
***
|
||||
*
|
||||
|
|
@ -684,7 +684,7 @@ var PaperScope = Base.extend({
|
|||
}
|
||||
},
|
||||
|
||||
version: '0.9.11',
|
||||
version: '0.9.12',
|
||||
|
||||
getView: function() {
|
||||
return this.project && this.project.view;
|
||||
|
|
@ -2420,12 +2420,13 @@ var Project = PaperScopeItem.extend({
|
|||
return Base.importJSON(json);
|
||||
},
|
||||
|
||||
draw: function(ctx, matrix) {
|
||||
draw: function(ctx, matrix, ratio) {
|
||||
this._drawCount++;
|
||||
ctx.save();
|
||||
matrix.applyToContext(ctx);
|
||||
var param = Base.merge({
|
||||
offset: new Point(0, 0),
|
||||
ratio: ratio,
|
||||
transforms: [matrix],
|
||||
trackTransforms: true
|
||||
});
|
||||
|
|
@ -2861,6 +2862,8 @@ var Item = Base.extend(Callback, {
|
|||
|
||||
setMatrix: function(matrix) {
|
||||
this._matrix.initialize(matrix);
|
||||
if (this._transformContent)
|
||||
this.applyMatrix(true);
|
||||
this._changed(5);
|
||||
},
|
||||
|
||||
|
|
@ -3649,7 +3652,7 @@ var Item = Base.extend(Callback, {
|
|||
itemOffset = param.offset = bounds.getTopLeft().floor();
|
||||
mainCtx = ctx;
|
||||
ctx = CanvasProvider.getContext(
|
||||
bounds.getSize().ceil().add(new Size(1, 1)));
|
||||
bounds.getSize().ceil().add(new Size(1, 1)), param.ratio);
|
||||
}
|
||||
ctx.save();
|
||||
if (direct) {
|
||||
|
|
@ -3670,7 +3673,7 @@ var Item = Base.extend(Callback, {
|
|||
ctx.clip();
|
||||
if (!direct) {
|
||||
BlendMode.process(blendMode, ctx, mainCtx, opacity,
|
||||
itemOffset.subtract(prevOffset));
|
||||
itemOffset.subtract(prevOffset).multiply(param.ratio));
|
||||
CanvasProvider.release(ctx);
|
||||
param.offset = prevOffset;
|
||||
}
|
||||
|
|
@ -5942,19 +5945,19 @@ var PathItem = Item.extend({
|
|||
control,
|
||||
current = new Point();
|
||||
|
||||
function getCoord(index, coord, update) {
|
||||
function getCoord(index, coord, isCurrent) {
|
||||
var val = parseFloat(coords[index]);
|
||||
if (relative)
|
||||
val += current[coord];
|
||||
if (update)
|
||||
if (isCurrent)
|
||||
current[coord] = val;
|
||||
return val;
|
||||
}
|
||||
|
||||
function getPoint(index, update) {
|
||||
function getPoint(index, isCurrent) {
|
||||
return new Point(
|
||||
getCoord(index, 'x', update),
|
||||
getCoord(index + 1, 'y', update)
|
||||
getCoord(index, 'x', isCurrent),
|
||||
getCoord(index + 1, 'y', isCurrent)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -5973,6 +5976,7 @@ var PathItem = Item.extend({
|
|||
for (var j = 0; j < length; j += 2)
|
||||
this[j === 0 && lower === 'm' ? 'moveTo' : 'lineTo'](
|
||||
getPoint(j, true));
|
||||
control = current;
|
||||
break;
|
||||
case 'h':
|
||||
case 'v':
|
||||
|
|
@ -5981,6 +5985,7 @@ var PathItem = Item.extend({
|
|||
getCoord(j, coord, true);
|
||||
this.lineTo(current);
|
||||
}
|
||||
control = current;
|
||||
break;
|
||||
case 'c':
|
||||
for (var j = 0; j < length; j += 6) {
|
||||
|
|
@ -6075,10 +6080,9 @@ var Path = PathItem.extend({
|
|||
delete this._length;
|
||||
delete this._clockwise;
|
||||
if (this._curves) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++)
|
||||
this._curves[i]._changed(5);
|
||||
}
|
||||
}
|
||||
} else if (flags & 8) {
|
||||
delete this._bounds;
|
||||
}
|
||||
|
|
@ -6916,7 +6920,6 @@ var Path = PathItem.extend({
|
|||
|
||||
if (hasFill || hasStroke && !dashLength || compound || clip)
|
||||
drawSegments(ctx, this);
|
||||
|
||||
if (this._closed)
|
||||
ctx.closePath();
|
||||
|
||||
|
|
@ -7678,10 +7681,12 @@ var CompoundPath = PathItem.extend({
|
|||
var children = this._children;
|
||||
if (children.length === 0)
|
||||
return;
|
||||
|
||||
ctx.beginPath();
|
||||
param = param.extend({ compound: true });
|
||||
for (var i = 0, l = children.length; i < l; i++)
|
||||
children[i].draw(ctx, param);
|
||||
|
||||
if (!param.clip) {
|
||||
this._setStyles(ctx);
|
||||
var style = this._style;
|
||||
|
|
@ -9513,10 +9518,9 @@ var View = Base.extend(Callback, {
|
|||
if (size.isNaN())
|
||||
size = DomElement.getSize(element);
|
||||
}
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
this._setViewSize(size);
|
||||
if (PaperScope.hasAttribute(element, 'stats')
|
||||
&& typeof Stats === 'object') {
|
||||
&& typeof Stats !== 'undefined') {
|
||||
this._stats = new Stats();
|
||||
var stats = this._stats.domElement,
|
||||
style = stats.style,
|
||||
|
|
@ -9528,8 +9532,7 @@ var View = Base.extend(Callback, {
|
|||
}
|
||||
View._views.push(this);
|
||||
View._viewsById[this._id] = this;
|
||||
this._viewSize = new LinkedSize(size.width, size.height,
|
||||
this, 'setViewSize');
|
||||
this._viewSize = size;
|
||||
this._matrix = new Matrix();
|
||||
this._zoom = 1;
|
||||
if (!View._focused)
|
||||
|
|
@ -9655,7 +9658,8 @@ var View = Base.extend(Callback, {
|
|||
},
|
||||
|
||||
getViewSize: function() {
|
||||
return this._viewSize;
|
||||
var size = this._viewSize;
|
||||
return new LinkedSize(size.width, size.height, this, 'setViewSize');
|
||||
},
|
||||
|
||||
setViewSize: function(size) {
|
||||
|
|
@ -9663,9 +9667,8 @@ var View = Base.extend(Callback, {
|
|||
var delta = size.subtract(this._viewSize);
|
||||
if (delta.isZero())
|
||||
return;
|
||||
this._element.width = size.width;
|
||||
this._element.height = size.height;
|
||||
this._viewSize.set(size.width, size.height, true);
|
||||
this._viewSize.set(size.width, size.height);
|
||||
this._setViewSize(size);
|
||||
this._bounds = null;
|
||||
this.fire('resize', {
|
||||
size: size,
|
||||
|
|
@ -9674,6 +9677,12 @@ var View = Base.extend(Callback, {
|
|||
this._redraw();
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var element = this._element;
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
},
|
||||
|
||||
getBounds: function() {
|
||||
if (!this._bounds)
|
||||
this._bounds = this._matrix.inverted()._transformBounds(
|
||||
|
|
@ -9848,34 +9857,44 @@ var CanvasView = View.extend({
|
|||
var size = Size.read(arguments);
|
||||
if (size.isZero())
|
||||
throw new Error(
|
||||
'Cannot create CanvasView with the provided arguments: '
|
||||
+ arguments);
|
||||
'Cannot create CanvasView with the provided argument: '
|
||||
+ canvas);
|
||||
canvas = CanvasProvider.getCanvas(size);
|
||||
}
|
||||
var ctx = this._context = canvas.getContext('2d');
|
||||
this._context = canvas.getContext('2d');
|
||||
this._eventCounters = {};
|
||||
var ratio = (window.devicePixelRatio || 1) / (DomElement.getPrefixValue(
|
||||
ctx, 'backingStorePixelRatio') || 1);
|
||||
if (ratio > 1) {
|
||||
var width = canvas.clientWidth,
|
||||
height = canvas.clientHeight,
|
||||
style = canvas.style;
|
||||
canvas.width = width * ratio;
|
||||
canvas.height = height * ratio;
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
ctx.scale(ratio, ratio);
|
||||
this._ratio = 1;
|
||||
if (PaperScope.getAttribute(canvas, 'hidpi') !== 'off') {
|
||||
var deviceRatio = window.devicePixelRatio || 1,
|
||||
backingStoreRatio = DomElement.getPrefixValue(this._context,
|
||||
'backingStorePixelRatio') || 1;
|
||||
this._ratio = deviceRatio / backingStoreRatio;
|
||||
}
|
||||
View.call(this, canvas);
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var width = size.width,
|
||||
height = size.height,
|
||||
ratio = this._ratio,
|
||||
element = this._element,
|
||||
style = element.style;
|
||||
element.width = width * ratio;
|
||||
element.height = height * ratio;
|
||||
if (ratio !== 1) {
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
this._context.scale(ratio, ratio);
|
||||
}
|
||||
},
|
||||
|
||||
draw: function(checkRedraw) {
|
||||
if (checkRedraw && !this._project._needsRedraw)
|
||||
return false;
|
||||
var ctx = this._context,
|
||||
size = this._viewSize;
|
||||
ctx.clearRect(0, 0, size._width + 1, size._height + 1);
|
||||
this._project.draw(ctx, this._matrix);
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
this._project.draw(ctx, this._matrix, this._ratio);
|
||||
this._project._needsRedraw = false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -10412,25 +10431,36 @@ var Http = {
|
|||
var CanvasProvider = {
|
||||
canvases: [],
|
||||
|
||||
getCanvas: function(width, height) {
|
||||
var size = height === undefined ? width : new Size(width, height),
|
||||
canvas,
|
||||
getCanvas: function(width, height, ratio) {
|
||||
var canvas,
|
||||
init = true;
|
||||
if (typeof width === 'object') {
|
||||
ratio = height;
|
||||
height = width.height;
|
||||
width = width.width;
|
||||
}
|
||||
if (!ratio) {
|
||||
ratio = 1;
|
||||
} else if (ratio !== 1) {
|
||||
width *= ratio;
|
||||
height *= ratio;
|
||||
}
|
||||
if (this.canvases.length) {
|
||||
canvas = this.canvases.pop();
|
||||
} else {
|
||||
canvas = document.createElement('canvas');
|
||||
|
||||
}
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.save();
|
||||
if (canvas.width === size.width && canvas.height === size.height) {
|
||||
if (canvas.width === width && canvas.height === height) {
|
||||
if (init)
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
ctx.clearRect(0, 0, width + 1, height + 1);
|
||||
} else {
|
||||
canvas.width = size.width;
|
||||
canvas.height = size.height;
|
||||
canvas.width = width;
|
||||
canvas.height = height;
|
||||
}
|
||||
ctx.save();
|
||||
if (ratio !== 1)
|
||||
ctx.scale(ratio, ratio);
|
||||
return canvas;
|
||||
},
|
||||
|
||||
|
|
@ -11152,12 +11182,12 @@ new function() {
|
|||
|
||||
function importGroup(node, type, isRoot, options) {
|
||||
var nodes = node.childNodes,
|
||||
clip = type === 'clippath',
|
||||
isClip = type === 'clippath',
|
||||
item = new Group(),
|
||||
project = item._project,
|
||||
currentStyle = project._currentStyle,
|
||||
children = [];
|
||||
if (!clip) {
|
||||
if (!isClip) {
|
||||
item._transformContent = false;
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
project._currentStyle = item._style.clone();
|
||||
|
|
@ -11171,10 +11201,10 @@ new function() {
|
|||
children.push(child);
|
||||
}
|
||||
item.addChildren(children);
|
||||
if (clip)
|
||||
if (isClip)
|
||||
item = applyAttributes(item.reduce(), node, isRoot);
|
||||
project._currentStyle = currentStyle;
|
||||
if (clip || type === 'defs') {
|
||||
if (isClip || type === 'defs') {
|
||||
item.remove();
|
||||
item = null;
|
||||
}
|
||||
|
|
@ -11226,10 +11256,23 @@ new function() {
|
|||
}
|
||||
|
||||
var importers = {
|
||||
'#document': function(node, type, isRoot, options) {
|
||||
return importSVG(node.childNodes[0], isRoot, options);
|
||||
'#document': function (node, type, isRoot, options) {
|
||||
var nodes = node.childNodes;
|
||||
for (var i = 0, l = nodes.length; i < l; i++) {
|
||||
var child = nodes[i];
|
||||
if (child.nodeType === 1) {
|
||||
var next = child.nextSibling;
|
||||
document.body.appendChild(child);
|
||||
var item = importSVG(child, isRoot, options);
|
||||
if (next) {
|
||||
node.insertBefore(child, next);
|
||||
} else {
|
||||
node.appendChild(child);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
g: importGroup,
|
||||
svg: importGroup,
|
||||
clippath: importGroup,
|
||||
|
|
@ -11455,15 +11498,19 @@ new function() {
|
|||
return match && definitions[match[1]];
|
||||
}
|
||||
|
||||
function importSVG(node, isRoot, options) {
|
||||
if (!options)
|
||||
function importSVG(source, isRoot, options) {
|
||||
if (!source)
|
||||
return null;
|
||||
if (!options) {
|
||||
options = {};
|
||||
if (typeof node === 'string') {
|
||||
if (isRoot && !/^.*</.test(node)) {
|
||||
if (typeof options === 'function')
|
||||
} else if (typeof options === 'function') {
|
||||
options = { onLoad: options };
|
||||
var scope = paper;
|
||||
return Http.request('get', node, function(svg) {
|
||||
}
|
||||
|
||||
var node = source,
|
||||
scope = paper;
|
||||
|
||||
function onLoadCallback(svg) {
|
||||
paper = scope;
|
||||
var item = importSVG(svg, isRoot, options),
|
||||
onLoad = options.onLoad,
|
||||
|
|
@ -11471,14 +11518,28 @@ new function() {
|
|||
if (onLoad)
|
||||
onLoad.call(this, item);
|
||||
view.draw(true);
|
||||
});
|
||||
}
|
||||
node = new DOMParser().parseFromString(node, 'image/svg+xml');
|
||||
|
||||
if (isRoot) {
|
||||
if (typeof source === 'string' && !/^.*</.test(source)) {
|
||||
return Http.request('get', source, onLoadCallback);
|
||||
} else if (typeof File !== 'undefined' && source instanceof File) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function() {
|
||||
onLoadCallback(reader.result);
|
||||
};
|
||||
return reader.readAsText(source);
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof source === 'string')
|
||||
node = new DOMParser().parseFromString(source, 'image/svg+xml');
|
||||
if (!node.nodeName)
|
||||
throw new Error('Unsupported SVG source: ' + source);
|
||||
var type = node.nodeName.toLowerCase(),
|
||||
importer = importers[type],
|
||||
item = importer && importer(node, type, isRoot, options),
|
||||
data = type !== '#document' && node.getAttribute('data-paper-data');
|
||||
item = importer && importer(node, type, isRoot, options) || null,
|
||||
data = node.getAttribute && node.getAttribute('data-paper-data');
|
||||
if (item) {
|
||||
if (!(item instanceof Group))
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
|
|
@ -11514,6 +11575,7 @@ paper = new (PaperScope.inject(Base.merge(Base.exports, {
|
|||
Numerical: Numerical,
|
||||
DomElement: DomElement,
|
||||
DomEvent: DomEvent,
|
||||
Http: Http,
|
||||
Key: Key
|
||||
})))();
|
||||
|
||||
|
|
|
|||
16
dist/paper-core.min.js
vendored
16
dist/paper-core.min.js
vendored
File diff suppressed because one or more lines are too long
198
dist/paper-full.js
vendored
198
dist/paper-full.js
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/*!
|
||||
* Paper.js v0.9.11 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* Paper.js v0.9.12 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* http://paperjs.org/
|
||||
*
|
||||
* Copyright (c) 2011 - 2013, Juerg Lehni & Jonathan Puckey
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Date: Sat Nov 2 21:26:32 2013 +0100
|
||||
* Date: Thu Nov 14 14:42:28 2013 +0100
|
||||
*
|
||||
***
|
||||
*
|
||||
|
|
@ -684,7 +684,7 @@ var PaperScope = Base.extend({
|
|||
}
|
||||
},
|
||||
|
||||
version: '0.9.11',
|
||||
version: '0.9.12',
|
||||
|
||||
getView: function() {
|
||||
return this.project && this.project.view;
|
||||
|
|
@ -2420,12 +2420,13 @@ var Project = PaperScopeItem.extend({
|
|||
return Base.importJSON(json);
|
||||
},
|
||||
|
||||
draw: function(ctx, matrix) {
|
||||
draw: function(ctx, matrix, ratio) {
|
||||
this._drawCount++;
|
||||
ctx.save();
|
||||
matrix.applyToContext(ctx);
|
||||
var param = Base.merge({
|
||||
offset: new Point(0, 0),
|
||||
ratio: ratio,
|
||||
transforms: [matrix],
|
||||
trackTransforms: true
|
||||
});
|
||||
|
|
@ -2861,6 +2862,8 @@ var Item = Base.extend(Callback, {
|
|||
|
||||
setMatrix: function(matrix) {
|
||||
this._matrix.initialize(matrix);
|
||||
if (this._transformContent)
|
||||
this.applyMatrix(true);
|
||||
this._changed(5);
|
||||
},
|
||||
|
||||
|
|
@ -3649,7 +3652,7 @@ var Item = Base.extend(Callback, {
|
|||
itemOffset = param.offset = bounds.getTopLeft().floor();
|
||||
mainCtx = ctx;
|
||||
ctx = CanvasProvider.getContext(
|
||||
bounds.getSize().ceil().add(new Size(1, 1)));
|
||||
bounds.getSize().ceil().add(new Size(1, 1)), param.ratio);
|
||||
}
|
||||
ctx.save();
|
||||
if (direct) {
|
||||
|
|
@ -3670,7 +3673,7 @@ var Item = Base.extend(Callback, {
|
|||
ctx.clip();
|
||||
if (!direct) {
|
||||
BlendMode.process(blendMode, ctx, mainCtx, opacity,
|
||||
itemOffset.subtract(prevOffset));
|
||||
itemOffset.subtract(prevOffset).multiply(param.ratio));
|
||||
CanvasProvider.release(ctx);
|
||||
param.offset = prevOffset;
|
||||
}
|
||||
|
|
@ -5942,19 +5945,19 @@ var PathItem = Item.extend({
|
|||
control,
|
||||
current = new Point();
|
||||
|
||||
function getCoord(index, coord, update) {
|
||||
function getCoord(index, coord, isCurrent) {
|
||||
var val = parseFloat(coords[index]);
|
||||
if (relative)
|
||||
val += current[coord];
|
||||
if (update)
|
||||
if (isCurrent)
|
||||
current[coord] = val;
|
||||
return val;
|
||||
}
|
||||
|
||||
function getPoint(index, update) {
|
||||
function getPoint(index, isCurrent) {
|
||||
return new Point(
|
||||
getCoord(index, 'x', update),
|
||||
getCoord(index + 1, 'y', update)
|
||||
getCoord(index, 'x', isCurrent),
|
||||
getCoord(index + 1, 'y', isCurrent)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -5973,6 +5976,7 @@ var PathItem = Item.extend({
|
|||
for (var j = 0; j < length; j += 2)
|
||||
this[j === 0 && lower === 'm' ? 'moveTo' : 'lineTo'](
|
||||
getPoint(j, true));
|
||||
control = current;
|
||||
break;
|
||||
case 'h':
|
||||
case 'v':
|
||||
|
|
@ -5981,6 +5985,7 @@ var PathItem = Item.extend({
|
|||
getCoord(j, coord, true);
|
||||
this.lineTo(current);
|
||||
}
|
||||
control = current;
|
||||
break;
|
||||
case 'c':
|
||||
for (var j = 0; j < length; j += 6) {
|
||||
|
|
@ -6075,10 +6080,9 @@ var Path = PathItem.extend({
|
|||
delete this._length;
|
||||
delete this._clockwise;
|
||||
if (this._curves) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++)
|
||||
this._curves[i]._changed(5);
|
||||
}
|
||||
}
|
||||
} else if (flags & 8) {
|
||||
delete this._bounds;
|
||||
}
|
||||
|
|
@ -6916,7 +6920,6 @@ var Path = PathItem.extend({
|
|||
|
||||
if (hasFill || hasStroke && !dashLength || compound || clip)
|
||||
drawSegments(ctx, this);
|
||||
|
||||
if (this._closed)
|
||||
ctx.closePath();
|
||||
|
||||
|
|
@ -7678,10 +7681,12 @@ var CompoundPath = PathItem.extend({
|
|||
var children = this._children;
|
||||
if (children.length === 0)
|
||||
return;
|
||||
|
||||
ctx.beginPath();
|
||||
param = param.extend({ compound: true });
|
||||
for (var i = 0, l = children.length; i < l; i++)
|
||||
children[i].draw(ctx, param);
|
||||
|
||||
if (!param.clip) {
|
||||
this._setStyles(ctx);
|
||||
var style = this._style;
|
||||
|
|
@ -9513,10 +9518,9 @@ var View = Base.extend(Callback, {
|
|||
if (size.isNaN())
|
||||
size = DomElement.getSize(element);
|
||||
}
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
this._setViewSize(size);
|
||||
if (PaperScope.hasAttribute(element, 'stats')
|
||||
&& typeof Stats === 'object') {
|
||||
&& typeof Stats !== 'undefined') {
|
||||
this._stats = new Stats();
|
||||
var stats = this._stats.domElement,
|
||||
style = stats.style,
|
||||
|
|
@ -9528,8 +9532,7 @@ var View = Base.extend(Callback, {
|
|||
}
|
||||
View._views.push(this);
|
||||
View._viewsById[this._id] = this;
|
||||
this._viewSize = new LinkedSize(size.width, size.height,
|
||||
this, 'setViewSize');
|
||||
this._viewSize = size;
|
||||
this._matrix = new Matrix();
|
||||
this._zoom = 1;
|
||||
if (!View._focused)
|
||||
|
|
@ -9655,7 +9658,8 @@ var View = Base.extend(Callback, {
|
|||
},
|
||||
|
||||
getViewSize: function() {
|
||||
return this._viewSize;
|
||||
var size = this._viewSize;
|
||||
return new LinkedSize(size.width, size.height, this, 'setViewSize');
|
||||
},
|
||||
|
||||
setViewSize: function(size) {
|
||||
|
|
@ -9663,9 +9667,8 @@ var View = Base.extend(Callback, {
|
|||
var delta = size.subtract(this._viewSize);
|
||||
if (delta.isZero())
|
||||
return;
|
||||
this._element.width = size.width;
|
||||
this._element.height = size.height;
|
||||
this._viewSize.set(size.width, size.height, true);
|
||||
this._viewSize.set(size.width, size.height);
|
||||
this._setViewSize(size);
|
||||
this._bounds = null;
|
||||
this.fire('resize', {
|
||||
size: size,
|
||||
|
|
@ -9674,6 +9677,12 @@ var View = Base.extend(Callback, {
|
|||
this._redraw();
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var element = this._element;
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
},
|
||||
|
||||
getBounds: function() {
|
||||
if (!this._bounds)
|
||||
this._bounds = this._matrix.inverted()._transformBounds(
|
||||
|
|
@ -9848,34 +9857,44 @@ var CanvasView = View.extend({
|
|||
var size = Size.read(arguments);
|
||||
if (size.isZero())
|
||||
throw new Error(
|
||||
'Cannot create CanvasView with the provided arguments: '
|
||||
+ arguments);
|
||||
'Cannot create CanvasView with the provided argument: '
|
||||
+ canvas);
|
||||
canvas = CanvasProvider.getCanvas(size);
|
||||
}
|
||||
var ctx = this._context = canvas.getContext('2d');
|
||||
this._context = canvas.getContext('2d');
|
||||
this._eventCounters = {};
|
||||
var ratio = (window.devicePixelRatio || 1) / (DomElement.getPrefixValue(
|
||||
ctx, 'backingStorePixelRatio') || 1);
|
||||
if (ratio > 1) {
|
||||
var width = canvas.clientWidth,
|
||||
height = canvas.clientHeight,
|
||||
style = canvas.style;
|
||||
canvas.width = width * ratio;
|
||||
canvas.height = height * ratio;
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
ctx.scale(ratio, ratio);
|
||||
this._ratio = 1;
|
||||
if (PaperScope.getAttribute(canvas, 'hidpi') !== 'off') {
|
||||
var deviceRatio = window.devicePixelRatio || 1,
|
||||
backingStoreRatio = DomElement.getPrefixValue(this._context,
|
||||
'backingStorePixelRatio') || 1;
|
||||
this._ratio = deviceRatio / backingStoreRatio;
|
||||
}
|
||||
View.call(this, canvas);
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var width = size.width,
|
||||
height = size.height,
|
||||
ratio = this._ratio,
|
||||
element = this._element,
|
||||
style = element.style;
|
||||
element.width = width * ratio;
|
||||
element.height = height * ratio;
|
||||
if (ratio !== 1) {
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
this._context.scale(ratio, ratio);
|
||||
}
|
||||
},
|
||||
|
||||
draw: function(checkRedraw) {
|
||||
if (checkRedraw && !this._project._needsRedraw)
|
||||
return false;
|
||||
var ctx = this._context,
|
||||
size = this._viewSize;
|
||||
ctx.clearRect(0, 0, size._width + 1, size._height + 1);
|
||||
this._project.draw(ctx, this._matrix);
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
this._project.draw(ctx, this._matrix, this._ratio);
|
||||
this._project._needsRedraw = false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -10630,25 +10649,36 @@ var Http = {
|
|||
var CanvasProvider = {
|
||||
canvases: [],
|
||||
|
||||
getCanvas: function(width, height) {
|
||||
var size = height === undefined ? width : new Size(width, height),
|
||||
canvas,
|
||||
getCanvas: function(width, height, ratio) {
|
||||
var canvas,
|
||||
init = true;
|
||||
if (typeof width === 'object') {
|
||||
ratio = height;
|
||||
height = width.height;
|
||||
width = width.width;
|
||||
}
|
||||
if (!ratio) {
|
||||
ratio = 1;
|
||||
} else if (ratio !== 1) {
|
||||
width *= ratio;
|
||||
height *= ratio;
|
||||
}
|
||||
if (this.canvases.length) {
|
||||
canvas = this.canvases.pop();
|
||||
} else {
|
||||
canvas = document.createElement('canvas');
|
||||
|
||||
}
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.save();
|
||||
if (canvas.width === size.width && canvas.height === size.height) {
|
||||
if (canvas.width === width && canvas.height === height) {
|
||||
if (init)
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
ctx.clearRect(0, 0, width + 1, height + 1);
|
||||
} else {
|
||||
canvas.width = size.width;
|
||||
canvas.height = size.height;
|
||||
canvas.width = width;
|
||||
canvas.height = height;
|
||||
}
|
||||
ctx.save();
|
||||
if (ratio !== 1)
|
||||
ctx.scale(ratio, ratio);
|
||||
return canvas;
|
||||
},
|
||||
|
||||
|
|
@ -11370,12 +11400,12 @@ new function() {
|
|||
|
||||
function importGroup(node, type, isRoot, options) {
|
||||
var nodes = node.childNodes,
|
||||
clip = type === 'clippath',
|
||||
isClip = type === 'clippath',
|
||||
item = new Group(),
|
||||
project = item._project,
|
||||
currentStyle = project._currentStyle,
|
||||
children = [];
|
||||
if (!clip) {
|
||||
if (!isClip) {
|
||||
item._transformContent = false;
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
project._currentStyle = item._style.clone();
|
||||
|
|
@ -11389,10 +11419,10 @@ new function() {
|
|||
children.push(child);
|
||||
}
|
||||
item.addChildren(children);
|
||||
if (clip)
|
||||
if (isClip)
|
||||
item = applyAttributes(item.reduce(), node, isRoot);
|
||||
project._currentStyle = currentStyle;
|
||||
if (clip || type === 'defs') {
|
||||
if (isClip || type === 'defs') {
|
||||
item.remove();
|
||||
item = null;
|
||||
}
|
||||
|
|
@ -11444,10 +11474,23 @@ new function() {
|
|||
}
|
||||
|
||||
var importers = {
|
||||
'#document': function(node, type, isRoot, options) {
|
||||
return importSVG(node.childNodes[0], isRoot, options);
|
||||
'#document': function (node, type, isRoot, options) {
|
||||
var nodes = node.childNodes;
|
||||
for (var i = 0, l = nodes.length; i < l; i++) {
|
||||
var child = nodes[i];
|
||||
if (child.nodeType === 1) {
|
||||
var next = child.nextSibling;
|
||||
document.body.appendChild(child);
|
||||
var item = importSVG(child, isRoot, options);
|
||||
if (next) {
|
||||
node.insertBefore(child, next);
|
||||
} else {
|
||||
node.appendChild(child);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
g: importGroup,
|
||||
svg: importGroup,
|
||||
clippath: importGroup,
|
||||
|
|
@ -11673,15 +11716,19 @@ new function() {
|
|||
return match && definitions[match[1]];
|
||||
}
|
||||
|
||||
function importSVG(node, isRoot, options) {
|
||||
if (!options)
|
||||
function importSVG(source, isRoot, options) {
|
||||
if (!source)
|
||||
return null;
|
||||
if (!options) {
|
||||
options = {};
|
||||
if (typeof node === 'string') {
|
||||
if (isRoot && !/^.*</.test(node)) {
|
||||
if (typeof options === 'function')
|
||||
} else if (typeof options === 'function') {
|
||||
options = { onLoad: options };
|
||||
var scope = paper;
|
||||
return Http.request('get', node, function(svg) {
|
||||
}
|
||||
|
||||
var node = source,
|
||||
scope = paper;
|
||||
|
||||
function onLoadCallback(svg) {
|
||||
paper = scope;
|
||||
var item = importSVG(svg, isRoot, options),
|
||||
onLoad = options.onLoad,
|
||||
|
|
@ -11689,14 +11736,28 @@ new function() {
|
|||
if (onLoad)
|
||||
onLoad.call(this, item);
|
||||
view.draw(true);
|
||||
});
|
||||
}
|
||||
node = new DOMParser().parseFromString(node, 'image/svg+xml');
|
||||
|
||||
if (isRoot) {
|
||||
if (typeof source === 'string' && !/^.*</.test(source)) {
|
||||
return Http.request('get', source, onLoadCallback);
|
||||
} else if (typeof File !== 'undefined' && source instanceof File) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function() {
|
||||
onLoadCallback(reader.result);
|
||||
};
|
||||
return reader.readAsText(source);
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof source === 'string')
|
||||
node = new DOMParser().parseFromString(source, 'image/svg+xml');
|
||||
if (!node.nodeName)
|
||||
throw new Error('Unsupported SVG source: ' + source);
|
||||
var type = node.nodeName.toLowerCase(),
|
||||
importer = importers[type],
|
||||
item = importer && importer(node, type, isRoot, options),
|
||||
data = type !== '#document' && node.getAttribute('data-paper-data');
|
||||
item = importer && importer(node, type, isRoot, options) || null,
|
||||
data = node.getAttribute && node.getAttribute('data-paper-data');
|
||||
if (item) {
|
||||
if (!(item instanceof Group))
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
|
|
@ -11732,6 +11793,7 @@ paper = new (PaperScope.inject(Base.merge(Base.exports, {
|
|||
Numerical: Numerical,
|
||||
DomElement: DomElement,
|
||||
DomEvent: DomEvent,
|
||||
Http: Http,
|
||||
Key: Key
|
||||
})))();
|
||||
|
||||
|
|
@ -11764,7 +11826,7 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
|
|||
};
|
||||
|
||||
var fields = Base.each(
|
||||
'add,subtract,multiply,divide,modulo,negate'.split(','),
|
||||
['add', 'subtract', 'multiply', 'divide', 'modulo', 'negate'],
|
||||
function(name) {
|
||||
this['_' + name] = '#' + name;
|
||||
},
|
||||
|
|
@ -11935,7 +11997,7 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
|
|||
|| new PaperScope(script).setup(canvas),
|
||||
src = script.src;
|
||||
if (src) {
|
||||
Http.request('get', src, function(code) {
|
||||
paper.Http.request('get', src, function(code) {
|
||||
evaluate(code, scope);
|
||||
});
|
||||
} else {
|
||||
|
|
|
|||
18
dist/paper-full.min.js
vendored
18
dist/paper-full.min.js
vendored
File diff suppressed because one or more lines are too long
192
dist/paper-node.js
vendored
192
dist/paper-node.js
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/*!
|
||||
* Paper.js v0.9.11 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* Paper.js v0.9.12 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* http://paperjs.org/
|
||||
*
|
||||
* Copyright (c) 2011 - 2013, Juerg Lehni & Jonathan Puckey
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Date: Sat Nov 2 21:26:32 2013 +0100
|
||||
* Date: Thu Nov 14 14:42:28 2013 +0100
|
||||
*
|
||||
***
|
||||
*
|
||||
|
|
@ -684,7 +684,7 @@ var PaperScope = Base.extend({
|
|||
}
|
||||
},
|
||||
|
||||
version: '0.9.11',
|
||||
version: '0.9.12',
|
||||
|
||||
getView: function() {
|
||||
return this.project && this.project.view;
|
||||
|
|
@ -2420,12 +2420,13 @@ var Project = PaperScopeItem.extend({
|
|||
return Base.importJSON(json);
|
||||
},
|
||||
|
||||
draw: function(ctx, matrix) {
|
||||
draw: function(ctx, matrix, ratio) {
|
||||
this._drawCount++;
|
||||
ctx.save();
|
||||
matrix.applyToContext(ctx);
|
||||
var param = Base.merge({
|
||||
offset: new Point(0, 0),
|
||||
ratio: ratio,
|
||||
transforms: [matrix],
|
||||
trackTransforms: true
|
||||
});
|
||||
|
|
@ -2861,6 +2862,8 @@ var Item = Base.extend(Callback, {
|
|||
|
||||
setMatrix: function(matrix) {
|
||||
this._matrix.initialize(matrix);
|
||||
if (this._transformContent)
|
||||
this.applyMatrix(true);
|
||||
this._changed(5);
|
||||
},
|
||||
|
||||
|
|
@ -3649,7 +3652,7 @@ var Item = Base.extend(Callback, {
|
|||
itemOffset = param.offset = bounds.getTopLeft().floor();
|
||||
mainCtx = ctx;
|
||||
ctx = CanvasProvider.getContext(
|
||||
bounds.getSize().ceil().add(new Size(1, 1)));
|
||||
bounds.getSize().ceil().add(new Size(1, 1)), param.ratio);
|
||||
}
|
||||
ctx.save();
|
||||
if (direct) {
|
||||
|
|
@ -3670,7 +3673,7 @@ var Item = Base.extend(Callback, {
|
|||
ctx.clip();
|
||||
if (!direct) {
|
||||
BlendMode.process(blendMode, ctx, mainCtx, opacity,
|
||||
itemOffset.subtract(prevOffset));
|
||||
itemOffset.subtract(prevOffset).multiply(param.ratio));
|
||||
CanvasProvider.release(ctx);
|
||||
param.offset = prevOffset;
|
||||
}
|
||||
|
|
@ -5923,19 +5926,19 @@ var PathItem = Item.extend({
|
|||
control,
|
||||
current = new Point();
|
||||
|
||||
function getCoord(index, coord, update) {
|
||||
function getCoord(index, coord, isCurrent) {
|
||||
var val = parseFloat(coords[index]);
|
||||
if (relative)
|
||||
val += current[coord];
|
||||
if (update)
|
||||
if (isCurrent)
|
||||
current[coord] = val;
|
||||
return val;
|
||||
}
|
||||
|
||||
function getPoint(index, update) {
|
||||
function getPoint(index, isCurrent) {
|
||||
return new Point(
|
||||
getCoord(index, 'x', update),
|
||||
getCoord(index + 1, 'y', update)
|
||||
getCoord(index, 'x', isCurrent),
|
||||
getCoord(index + 1, 'y', isCurrent)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -5954,6 +5957,7 @@ var PathItem = Item.extend({
|
|||
for (var j = 0; j < length; j += 2)
|
||||
this[j === 0 && lower === 'm' ? 'moveTo' : 'lineTo'](
|
||||
getPoint(j, true));
|
||||
control = current;
|
||||
break;
|
||||
case 'h':
|
||||
case 'v':
|
||||
|
|
@ -5962,6 +5966,7 @@ var PathItem = Item.extend({
|
|||
getCoord(j, coord, true);
|
||||
this.lineTo(current);
|
||||
}
|
||||
control = current;
|
||||
break;
|
||||
case 'c':
|
||||
for (var j = 0; j < length; j += 6) {
|
||||
|
|
@ -6056,10 +6061,9 @@ var Path = PathItem.extend({
|
|||
delete this._length;
|
||||
delete this._clockwise;
|
||||
if (this._curves) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++)
|
||||
this._curves[i]._changed(5);
|
||||
}
|
||||
}
|
||||
} else if (flags & 8) {
|
||||
delete this._bounds;
|
||||
}
|
||||
|
|
@ -6897,7 +6901,6 @@ var Path = PathItem.extend({
|
|||
|
||||
if (hasFill || hasStroke && !dashLength || compound || clip)
|
||||
drawSegments(ctx, this);
|
||||
|
||||
if (this._closed)
|
||||
ctx.closePath();
|
||||
|
||||
|
|
@ -7659,10 +7662,12 @@ var CompoundPath = PathItem.extend({
|
|||
var children = this._children;
|
||||
if (children.length === 0)
|
||||
return;
|
||||
|
||||
ctx.beginPath();
|
||||
param = param.extend({ compound: true });
|
||||
for (var i = 0, l = children.length; i < l; i++)
|
||||
children[i].draw(ctx, param);
|
||||
|
||||
if (!param.clip) {
|
||||
this._setStyles(ctx);
|
||||
var style = this._style;
|
||||
|
|
@ -9392,8 +9397,7 @@ var View = Base.extend(Callback, {
|
|||
size = new Size(element.width, element.height);
|
||||
View._views.push(this);
|
||||
View._viewsById[this._id] = this;
|
||||
this._viewSize = new LinkedSize(size.width, size.height,
|
||||
this, 'setViewSize');
|
||||
this._viewSize = size;
|
||||
this._matrix = new Matrix();
|
||||
this._zoom = 1;
|
||||
if (!View._focused)
|
||||
|
|
@ -9504,7 +9508,8 @@ var View = Base.extend(Callback, {
|
|||
},
|
||||
|
||||
getViewSize: function() {
|
||||
return this._viewSize;
|
||||
var size = this._viewSize;
|
||||
return new LinkedSize(size.width, size.height, this, 'setViewSize');
|
||||
},
|
||||
|
||||
setViewSize: function(size) {
|
||||
|
|
@ -9512,9 +9517,8 @@ var View = Base.extend(Callback, {
|
|||
var delta = size.subtract(this._viewSize);
|
||||
if (delta.isZero())
|
||||
return;
|
||||
this._element.width = size.width;
|
||||
this._element.height = size.height;
|
||||
this._viewSize.set(size.width, size.height, true);
|
||||
this._viewSize.set(size.width, size.height);
|
||||
this._setViewSize(size);
|
||||
this._bounds = null;
|
||||
this.fire('resize', {
|
||||
size: size,
|
||||
|
|
@ -9523,6 +9527,12 @@ var View = Base.extend(Callback, {
|
|||
this._redraw();
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var element = this._element;
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
},
|
||||
|
||||
getBounds: function() {
|
||||
if (!this._bounds)
|
||||
this._bounds = this._matrix.inverted()._transformBounds(
|
||||
|
|
@ -9590,34 +9600,44 @@ var CanvasView = View.extend({
|
|||
var size = Size.read(arguments);
|
||||
if (size.isZero())
|
||||
throw new Error(
|
||||
'Cannot create CanvasView with the provided arguments: '
|
||||
+ arguments);
|
||||
'Cannot create CanvasView with the provided argument: '
|
||||
+ canvas);
|
||||
canvas = CanvasProvider.getCanvas(size);
|
||||
}
|
||||
var ctx = this._context = canvas.getContext('2d');
|
||||
this._context = canvas.getContext('2d');
|
||||
this._eventCounters = {};
|
||||
var ratio = (window.devicePixelRatio || 1) / (DomElement.getPrefixValue(
|
||||
ctx, 'backingStorePixelRatio') || 1);
|
||||
if (ratio > 1) {
|
||||
var width = canvas.clientWidth,
|
||||
height = canvas.clientHeight,
|
||||
style = canvas.style;
|
||||
canvas.width = width * ratio;
|
||||
canvas.height = height * ratio;
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
ctx.scale(ratio, ratio);
|
||||
this._ratio = 1;
|
||||
if (PaperScope.getAttribute(canvas, 'hidpi') !== 'off') {
|
||||
var deviceRatio = window.devicePixelRatio || 1,
|
||||
backingStoreRatio = DomElement.getPrefixValue(this._context,
|
||||
'backingStorePixelRatio') || 1;
|
||||
this._ratio = deviceRatio / backingStoreRatio;
|
||||
}
|
||||
View.call(this, canvas);
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var width = size.width,
|
||||
height = size.height,
|
||||
ratio = this._ratio,
|
||||
element = this._element,
|
||||
style = element.style;
|
||||
element.width = width * ratio;
|
||||
element.height = height * ratio;
|
||||
if (ratio !== 1) {
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
this._context.scale(ratio, ratio);
|
||||
}
|
||||
},
|
||||
|
||||
draw: function(checkRedraw) {
|
||||
if (checkRedraw && !this._project._needsRedraw)
|
||||
return false;
|
||||
var ctx = this._context,
|
||||
size = this._viewSize;
|
||||
ctx.clearRect(0, 0, size._width + 1, size._height + 1);
|
||||
this._project.draw(ctx, this._matrix);
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
this._project.draw(ctx, this._matrix, this._ratio);
|
||||
this._project._needsRedraw = false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -9791,26 +9811,37 @@ CanvasView.inject(new function() {
|
|||
var CanvasProvider = {
|
||||
canvases: [],
|
||||
|
||||
getCanvas: function(width, height) {
|
||||
var size = height === undefined ? width : new Size(width, height),
|
||||
canvas,
|
||||
getCanvas: function(width, height, ratio) {
|
||||
var canvas,
|
||||
init = true;
|
||||
if (typeof width === 'object') {
|
||||
ratio = height;
|
||||
height = width.height;
|
||||
width = width.width;
|
||||
}
|
||||
if (!ratio) {
|
||||
ratio = 1;
|
||||
} else if (ratio !== 1) {
|
||||
width *= ratio;
|
||||
height *= ratio;
|
||||
}
|
||||
if (this.canvases.length) {
|
||||
canvas = this.canvases.pop();
|
||||
} else {
|
||||
canvas = new Canvas(size.width, size.height);
|
||||
canvas = new Canvas(width, height);
|
||||
init = false;
|
||||
|
||||
}
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.save();
|
||||
if (canvas.width === size.width && canvas.height === size.height) {
|
||||
if (canvas.width === width && canvas.height === height) {
|
||||
if (init)
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
ctx.clearRect(0, 0, width + 1, height + 1);
|
||||
} else {
|
||||
canvas.width = size.width;
|
||||
canvas.height = size.height;
|
||||
canvas.width = width;
|
||||
canvas.height = height;
|
||||
}
|
||||
ctx.save();
|
||||
if (ratio !== 1)
|
||||
ctx.scale(ratio, ratio);
|
||||
return canvas;
|
||||
},
|
||||
|
||||
|
|
@ -10532,12 +10563,12 @@ new function() {
|
|||
|
||||
function importGroup(node, type, isRoot, options) {
|
||||
var nodes = node.childNodes,
|
||||
clip = type === 'clippath',
|
||||
isClip = type === 'clippath',
|
||||
item = new Group(),
|
||||
project = item._project,
|
||||
currentStyle = project._currentStyle,
|
||||
children = [];
|
||||
if (!clip) {
|
||||
if (!isClip) {
|
||||
item._transformContent = false;
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
project._currentStyle = item._style.clone();
|
||||
|
|
@ -10551,10 +10582,10 @@ new function() {
|
|||
children.push(child);
|
||||
}
|
||||
item.addChildren(children);
|
||||
if (clip)
|
||||
if (isClip)
|
||||
item = applyAttributes(item.reduce(), node, isRoot);
|
||||
project._currentStyle = currentStyle;
|
||||
if (clip || type === 'defs') {
|
||||
if (isClip || type === 'defs') {
|
||||
item.remove();
|
||||
item = null;
|
||||
}
|
||||
|
|
@ -10606,10 +10637,23 @@ new function() {
|
|||
}
|
||||
|
||||
var importers = {
|
||||
'#document': function(node, type, isRoot, options) {
|
||||
return importSVG(node.childNodes[0], isRoot, options);
|
||||
'#document': function (node, type, isRoot, options) {
|
||||
var nodes = node.childNodes;
|
||||
for (var i = 0, l = nodes.length; i < l; i++) {
|
||||
var child = nodes[i];
|
||||
if (child.nodeType === 1) {
|
||||
var next = child.nextSibling;
|
||||
document.body.appendChild(child);
|
||||
var item = importSVG(child, isRoot, options);
|
||||
if (next) {
|
||||
node.insertBefore(child, next);
|
||||
} else {
|
||||
node.appendChild(child);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
g: importGroup,
|
||||
svg: importGroup,
|
||||
clippath: importGroup,
|
||||
|
|
@ -10835,15 +10879,19 @@ new function() {
|
|||
return match && definitions[match[1]];
|
||||
}
|
||||
|
||||
function importSVG(node, isRoot, options) {
|
||||
if (!options)
|
||||
function importSVG(source, isRoot, options) {
|
||||
if (!source)
|
||||
return null;
|
||||
if (!options) {
|
||||
options = {};
|
||||
if (typeof node === 'string') {
|
||||
if (isRoot && !/^.*</.test(node)) {
|
||||
if (typeof options === 'function')
|
||||
} else if (typeof options === 'function') {
|
||||
options = { onLoad: options };
|
||||
var scope = paper;
|
||||
return Http.request('get', node, function(svg) {
|
||||
}
|
||||
|
||||
var node = source,
|
||||
scope = paper;
|
||||
|
||||
function onLoadCallback(svg) {
|
||||
paper = scope;
|
||||
var item = importSVG(svg, isRoot, options),
|
||||
onLoad = options.onLoad,
|
||||
|
|
@ -10851,14 +10899,28 @@ new function() {
|
|||
if (onLoad)
|
||||
onLoad.call(this, item);
|
||||
view.draw(true);
|
||||
});
|
||||
}
|
||||
node = new DOMParser().parseFromString(node, 'image/svg+xml');
|
||||
|
||||
if (isRoot) {
|
||||
if (typeof source === 'string' && !/^.*</.test(source)) {
|
||||
return Http.request('get', source, onLoadCallback);
|
||||
} else if (typeof File !== 'undefined' && source instanceof File) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function() {
|
||||
onLoadCallback(reader.result);
|
||||
};
|
||||
return reader.readAsText(source);
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof source === 'string')
|
||||
node = new DOMParser().parseFromString(source, 'image/svg+xml');
|
||||
if (!node.nodeName)
|
||||
throw new Error('Unsupported SVG source: ' + source);
|
||||
var type = node.nodeName.toLowerCase(),
|
||||
importer = importers[type],
|
||||
item = importer && importer(node, type, isRoot, options),
|
||||
data = type !== '#document' && node.getAttribute('data-paper-data');
|
||||
item = importer && importer(node, type, isRoot, options) || null,
|
||||
data = node.getAttribute && node.getAttribute('data-paper-data');
|
||||
if (item) {
|
||||
if (!(item instanceof Group))
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
|
|
@ -10926,7 +10988,7 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
|
|||
};
|
||||
|
||||
var fields = Base.each(
|
||||
'add,subtract,multiply,divide,modulo,negate'.split(','),
|
||||
['add', 'subtract', 'multiply', 'divide', 'modulo', 'negate'],
|
||||
function(name) {
|
||||
this['_' + name] = '#' + name;
|
||||
},
|
||||
|
|
|
|||
198
dist/paper.js
vendored
198
dist/paper.js
vendored
|
|
@ -1,5 +1,5 @@
|
|||
/*!
|
||||
* Paper.js v0.9.11 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* Paper.js v0.9.12 - The Swiss Army Knife of Vector Graphics Scripting.
|
||||
* http://paperjs.org/
|
||||
*
|
||||
* Copyright (c) 2011 - 2013, Juerg Lehni & Jonathan Puckey
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Date: Sat Nov 2 21:26:32 2013 +0100
|
||||
* Date: Thu Nov 14 14:42:28 2013 +0100
|
||||
*
|
||||
***
|
||||
*
|
||||
|
|
@ -684,7 +684,7 @@ var PaperScope = Base.extend({
|
|||
}
|
||||
},
|
||||
|
||||
version: '0.9.11',
|
||||
version: '0.9.12',
|
||||
|
||||
getView: function() {
|
||||
return this.project && this.project.view;
|
||||
|
|
@ -2420,12 +2420,13 @@ var Project = PaperScopeItem.extend({
|
|||
return Base.importJSON(json);
|
||||
},
|
||||
|
||||
draw: function(ctx, matrix) {
|
||||
draw: function(ctx, matrix, ratio) {
|
||||
this._drawCount++;
|
||||
ctx.save();
|
||||
matrix.applyToContext(ctx);
|
||||
var param = Base.merge({
|
||||
offset: new Point(0, 0),
|
||||
ratio: ratio,
|
||||
transforms: [matrix],
|
||||
trackTransforms: true
|
||||
});
|
||||
|
|
@ -2861,6 +2862,8 @@ var Item = Base.extend(Callback, {
|
|||
|
||||
setMatrix: function(matrix) {
|
||||
this._matrix.initialize(matrix);
|
||||
if (this._transformContent)
|
||||
this.applyMatrix(true);
|
||||
this._changed(5);
|
||||
},
|
||||
|
||||
|
|
@ -3649,7 +3652,7 @@ var Item = Base.extend(Callback, {
|
|||
itemOffset = param.offset = bounds.getTopLeft().floor();
|
||||
mainCtx = ctx;
|
||||
ctx = CanvasProvider.getContext(
|
||||
bounds.getSize().ceil().add(new Size(1, 1)));
|
||||
bounds.getSize().ceil().add(new Size(1, 1)), param.ratio);
|
||||
}
|
||||
ctx.save();
|
||||
if (direct) {
|
||||
|
|
@ -3670,7 +3673,7 @@ var Item = Base.extend(Callback, {
|
|||
ctx.clip();
|
||||
if (!direct) {
|
||||
BlendMode.process(blendMode, ctx, mainCtx, opacity,
|
||||
itemOffset.subtract(prevOffset));
|
||||
itemOffset.subtract(prevOffset).multiply(param.ratio));
|
||||
CanvasProvider.release(ctx);
|
||||
param.offset = prevOffset;
|
||||
}
|
||||
|
|
@ -5942,19 +5945,19 @@ var PathItem = Item.extend({
|
|||
control,
|
||||
current = new Point();
|
||||
|
||||
function getCoord(index, coord, update) {
|
||||
function getCoord(index, coord, isCurrent) {
|
||||
var val = parseFloat(coords[index]);
|
||||
if (relative)
|
||||
val += current[coord];
|
||||
if (update)
|
||||
if (isCurrent)
|
||||
current[coord] = val;
|
||||
return val;
|
||||
}
|
||||
|
||||
function getPoint(index, update) {
|
||||
function getPoint(index, isCurrent) {
|
||||
return new Point(
|
||||
getCoord(index, 'x', update),
|
||||
getCoord(index + 1, 'y', update)
|
||||
getCoord(index, 'x', isCurrent),
|
||||
getCoord(index + 1, 'y', isCurrent)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -5973,6 +5976,7 @@ var PathItem = Item.extend({
|
|||
for (var j = 0; j < length; j += 2)
|
||||
this[j === 0 && lower === 'm' ? 'moveTo' : 'lineTo'](
|
||||
getPoint(j, true));
|
||||
control = current;
|
||||
break;
|
||||
case 'h':
|
||||
case 'v':
|
||||
|
|
@ -5981,6 +5985,7 @@ var PathItem = Item.extend({
|
|||
getCoord(j, coord, true);
|
||||
this.lineTo(current);
|
||||
}
|
||||
control = current;
|
||||
break;
|
||||
case 'c':
|
||||
for (var j = 0; j < length; j += 6) {
|
||||
|
|
@ -6075,10 +6080,9 @@ var Path = PathItem.extend({
|
|||
delete this._length;
|
||||
delete this._clockwise;
|
||||
if (this._curves) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++) {
|
||||
for (var i = 0, l = this._curves.length; i < l; i++)
|
||||
this._curves[i]._changed(5);
|
||||
}
|
||||
}
|
||||
} else if (flags & 8) {
|
||||
delete this._bounds;
|
||||
}
|
||||
|
|
@ -6916,7 +6920,6 @@ var Path = PathItem.extend({
|
|||
|
||||
if (hasFill || hasStroke && !dashLength || compound || clip)
|
||||
drawSegments(ctx, this);
|
||||
|
||||
if (this._closed)
|
||||
ctx.closePath();
|
||||
|
||||
|
|
@ -7678,10 +7681,12 @@ var CompoundPath = PathItem.extend({
|
|||
var children = this._children;
|
||||
if (children.length === 0)
|
||||
return;
|
||||
|
||||
ctx.beginPath();
|
||||
param = param.extend({ compound: true });
|
||||
for (var i = 0, l = children.length; i < l; i++)
|
||||
children[i].draw(ctx, param);
|
||||
|
||||
if (!param.clip) {
|
||||
this._setStyles(ctx);
|
||||
var style = this._style;
|
||||
|
|
@ -9513,10 +9518,9 @@ var View = Base.extend(Callback, {
|
|||
if (size.isNaN())
|
||||
size = DomElement.getSize(element);
|
||||
}
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
this._setViewSize(size);
|
||||
if (PaperScope.hasAttribute(element, 'stats')
|
||||
&& typeof Stats === 'object') {
|
||||
&& typeof Stats !== 'undefined') {
|
||||
this._stats = new Stats();
|
||||
var stats = this._stats.domElement,
|
||||
style = stats.style,
|
||||
|
|
@ -9528,8 +9532,7 @@ var View = Base.extend(Callback, {
|
|||
}
|
||||
View._views.push(this);
|
||||
View._viewsById[this._id] = this;
|
||||
this._viewSize = new LinkedSize(size.width, size.height,
|
||||
this, 'setViewSize');
|
||||
this._viewSize = size;
|
||||
this._matrix = new Matrix();
|
||||
this._zoom = 1;
|
||||
if (!View._focused)
|
||||
|
|
@ -9655,7 +9658,8 @@ var View = Base.extend(Callback, {
|
|||
},
|
||||
|
||||
getViewSize: function() {
|
||||
return this._viewSize;
|
||||
var size = this._viewSize;
|
||||
return new LinkedSize(size.width, size.height, this, 'setViewSize');
|
||||
},
|
||||
|
||||
setViewSize: function(size) {
|
||||
|
|
@ -9663,9 +9667,8 @@ var View = Base.extend(Callback, {
|
|||
var delta = size.subtract(this._viewSize);
|
||||
if (delta.isZero())
|
||||
return;
|
||||
this._element.width = size.width;
|
||||
this._element.height = size.height;
|
||||
this._viewSize.set(size.width, size.height, true);
|
||||
this._viewSize.set(size.width, size.height);
|
||||
this._setViewSize(size);
|
||||
this._bounds = null;
|
||||
this.fire('resize', {
|
||||
size: size,
|
||||
|
|
@ -9674,6 +9677,12 @@ var View = Base.extend(Callback, {
|
|||
this._redraw();
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var element = this._element;
|
||||
element.width = size.width;
|
||||
element.height = size.height;
|
||||
},
|
||||
|
||||
getBounds: function() {
|
||||
if (!this._bounds)
|
||||
this._bounds = this._matrix.inverted()._transformBounds(
|
||||
|
|
@ -9848,34 +9857,44 @@ var CanvasView = View.extend({
|
|||
var size = Size.read(arguments);
|
||||
if (size.isZero())
|
||||
throw new Error(
|
||||
'Cannot create CanvasView with the provided arguments: '
|
||||
+ arguments);
|
||||
'Cannot create CanvasView with the provided argument: '
|
||||
+ canvas);
|
||||
canvas = CanvasProvider.getCanvas(size);
|
||||
}
|
||||
var ctx = this._context = canvas.getContext('2d');
|
||||
this._context = canvas.getContext('2d');
|
||||
this._eventCounters = {};
|
||||
var ratio = (window.devicePixelRatio || 1) / (DomElement.getPrefixValue(
|
||||
ctx, 'backingStorePixelRatio') || 1);
|
||||
if (ratio > 1) {
|
||||
var width = canvas.clientWidth,
|
||||
height = canvas.clientHeight,
|
||||
style = canvas.style;
|
||||
canvas.width = width * ratio;
|
||||
canvas.height = height * ratio;
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
ctx.scale(ratio, ratio);
|
||||
this._ratio = 1;
|
||||
if (PaperScope.getAttribute(canvas, 'hidpi') !== 'off') {
|
||||
var deviceRatio = window.devicePixelRatio || 1,
|
||||
backingStoreRatio = DomElement.getPrefixValue(this._context,
|
||||
'backingStorePixelRatio') || 1;
|
||||
this._ratio = deviceRatio / backingStoreRatio;
|
||||
}
|
||||
View.call(this, canvas);
|
||||
},
|
||||
|
||||
_setViewSize: function(size) {
|
||||
var width = size.width,
|
||||
height = size.height,
|
||||
ratio = this._ratio,
|
||||
element = this._element,
|
||||
style = element.style;
|
||||
element.width = width * ratio;
|
||||
element.height = height * ratio;
|
||||
if (ratio !== 1) {
|
||||
style.width = width + 'px';
|
||||
style.height = height + 'px';
|
||||
this._context.scale(ratio, ratio);
|
||||
}
|
||||
},
|
||||
|
||||
draw: function(checkRedraw) {
|
||||
if (checkRedraw && !this._project._needsRedraw)
|
||||
return false;
|
||||
var ctx = this._context,
|
||||
size = this._viewSize;
|
||||
ctx.clearRect(0, 0, size._width + 1, size._height + 1);
|
||||
this._project.draw(ctx, this._matrix);
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
this._project.draw(ctx, this._matrix, this._ratio);
|
||||
this._project._needsRedraw = false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -10630,25 +10649,36 @@ var Http = {
|
|||
var CanvasProvider = {
|
||||
canvases: [],
|
||||
|
||||
getCanvas: function(width, height) {
|
||||
var size = height === undefined ? width : new Size(width, height),
|
||||
canvas,
|
||||
getCanvas: function(width, height, ratio) {
|
||||
var canvas,
|
||||
init = true;
|
||||
if (typeof width === 'object') {
|
||||
ratio = height;
|
||||
height = width.height;
|
||||
width = width.width;
|
||||
}
|
||||
if (!ratio) {
|
||||
ratio = 1;
|
||||
} else if (ratio !== 1) {
|
||||
width *= ratio;
|
||||
height *= ratio;
|
||||
}
|
||||
if (this.canvases.length) {
|
||||
canvas = this.canvases.pop();
|
||||
} else {
|
||||
canvas = document.createElement('canvas');
|
||||
|
||||
}
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.save();
|
||||
if (canvas.width === size.width && canvas.height === size.height) {
|
||||
if (canvas.width === width && canvas.height === height) {
|
||||
if (init)
|
||||
ctx.clearRect(0, 0, size.width + 1, size.height + 1);
|
||||
ctx.clearRect(0, 0, width + 1, height + 1);
|
||||
} else {
|
||||
canvas.width = size.width;
|
||||
canvas.height = size.height;
|
||||
canvas.width = width;
|
||||
canvas.height = height;
|
||||
}
|
||||
ctx.save();
|
||||
if (ratio !== 1)
|
||||
ctx.scale(ratio, ratio);
|
||||
return canvas;
|
||||
},
|
||||
|
||||
|
|
@ -11370,12 +11400,12 @@ new function() {
|
|||
|
||||
function importGroup(node, type, isRoot, options) {
|
||||
var nodes = node.childNodes,
|
||||
clip = type === 'clippath',
|
||||
isClip = type === 'clippath',
|
||||
item = new Group(),
|
||||
project = item._project,
|
||||
currentStyle = project._currentStyle,
|
||||
children = [];
|
||||
if (!clip) {
|
||||
if (!isClip) {
|
||||
item._transformContent = false;
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
project._currentStyle = item._style.clone();
|
||||
|
|
@ -11389,10 +11419,10 @@ new function() {
|
|||
children.push(child);
|
||||
}
|
||||
item.addChildren(children);
|
||||
if (clip)
|
||||
if (isClip)
|
||||
item = applyAttributes(item.reduce(), node, isRoot);
|
||||
project._currentStyle = currentStyle;
|
||||
if (clip || type === 'defs') {
|
||||
if (isClip || type === 'defs') {
|
||||
item.remove();
|
||||
item = null;
|
||||
}
|
||||
|
|
@ -11444,10 +11474,23 @@ new function() {
|
|||
}
|
||||
|
||||
var importers = {
|
||||
'#document': function(node, type, isRoot, options) {
|
||||
return importSVG(node.childNodes[0], isRoot, options);
|
||||
'#document': function (node, type, isRoot, options) {
|
||||
var nodes = node.childNodes;
|
||||
for (var i = 0, l = nodes.length; i < l; i++) {
|
||||
var child = nodes[i];
|
||||
if (child.nodeType === 1) {
|
||||
var next = child.nextSibling;
|
||||
document.body.appendChild(child);
|
||||
var item = importSVG(child, isRoot, options);
|
||||
if (next) {
|
||||
node.insertBefore(child, next);
|
||||
} else {
|
||||
node.appendChild(child);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
g: importGroup,
|
||||
svg: importGroup,
|
||||
clippath: importGroup,
|
||||
|
|
@ -11673,15 +11716,19 @@ new function() {
|
|||
return match && definitions[match[1]];
|
||||
}
|
||||
|
||||
function importSVG(node, isRoot, options) {
|
||||
if (!options)
|
||||
function importSVG(source, isRoot, options) {
|
||||
if (!source)
|
||||
return null;
|
||||
if (!options) {
|
||||
options = {};
|
||||
if (typeof node === 'string') {
|
||||
if (isRoot && !/^.*</.test(node)) {
|
||||
if (typeof options === 'function')
|
||||
} else if (typeof options === 'function') {
|
||||
options = { onLoad: options };
|
||||
var scope = paper;
|
||||
return Http.request('get', node, function(svg) {
|
||||
}
|
||||
|
||||
var node = source,
|
||||
scope = paper;
|
||||
|
||||
function onLoadCallback(svg) {
|
||||
paper = scope;
|
||||
var item = importSVG(svg, isRoot, options),
|
||||
onLoad = options.onLoad,
|
||||
|
|
@ -11689,14 +11736,28 @@ new function() {
|
|||
if (onLoad)
|
||||
onLoad.call(this, item);
|
||||
view.draw(true);
|
||||
});
|
||||
}
|
||||
node = new DOMParser().parseFromString(node, 'image/svg+xml');
|
||||
|
||||
if (isRoot) {
|
||||
if (typeof source === 'string' && !/^.*</.test(source)) {
|
||||
return Http.request('get', source, onLoadCallback);
|
||||
} else if (typeof File !== 'undefined' && source instanceof File) {
|
||||
var reader = new FileReader();
|
||||
reader.onload = function() {
|
||||
onLoadCallback(reader.result);
|
||||
};
|
||||
return reader.readAsText(source);
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof source === 'string')
|
||||
node = new DOMParser().parseFromString(source, 'image/svg+xml');
|
||||
if (!node.nodeName)
|
||||
throw new Error('Unsupported SVG source: ' + source);
|
||||
var type = node.nodeName.toLowerCase(),
|
||||
importer = importers[type],
|
||||
item = importer && importer(node, type, isRoot, options),
|
||||
data = type !== '#document' && node.getAttribute('data-paper-data');
|
||||
item = importer && importer(node, type, isRoot, options) || null,
|
||||
data = node.getAttribute && node.getAttribute('data-paper-data');
|
||||
if (item) {
|
||||
if (!(item instanceof Group))
|
||||
item = applyAttributes(item, node, isRoot);
|
||||
|
|
@ -11732,6 +11793,7 @@ paper = new (PaperScope.inject(Base.merge(Base.exports, {
|
|||
Numerical: Numerical,
|
||||
DomElement: DomElement,
|
||||
DomEvent: DomEvent,
|
||||
Http: Http,
|
||||
Key: Key
|
||||
})))();
|
||||
|
||||
|
|
@ -11764,7 +11826,7 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
|
|||
};
|
||||
|
||||
var fields = Base.each(
|
||||
'add,subtract,multiply,divide,modulo,negate'.split(','),
|
||||
['add', 'subtract', 'multiply', 'divide', 'modulo', 'negate'],
|
||||
function(name) {
|
||||
this['_' + name] = '#' + name;
|
||||
},
|
||||
|
|
@ -11935,7 +11997,7 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
|
|||
|| new PaperScope(script).setup(canvas),
|
||||
src = script.src;
|
||||
if (src) {
|
||||
Http.request('get', src, function(code) {
|
||||
paper.Http.request('get', src, function(code) {
|
||||
evaluate(code, scope);
|
||||
});
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "paper",
|
||||
"version": "0.9.11",
|
||||
"version": "0.9.12",
|
||||
"description": "The Swiss Army Knife of Vector Graphics Scripting",
|
||||
"homepage": "http://paperjs.org",
|
||||
"repository": "git://github.com/paperjs/paper.js",
|
||||
|
|
|
|||
Loading…
Reference in a new issue