scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-03 19:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Jürg Lehni 2011-03-03 16:33:01 +00:00
commit e9881c02fc
24 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/Animated/RadialRainbows.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Animated/RoundedRectangles.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Animated/animatedStar.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Scripts/BouncingBalls.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {

1
examples/Scripts/arcTo.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Scripts/circle.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
var count = 0; var count = 0;
var doc; var doc;

1
examples/Scripts/letter.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Scripts/lines.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
var count = 0; var count = 0;
var doc; var doc;

1
examples/Scripts/rectangle.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
var count = 0; var count = 0;
var doc; var doc;

1
examples/Scripts/roundRectangle.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
var count = 0; var count = 0;
var doc; var doc;

1
examples/Scripts/star.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Scripts/strokeJoin.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/BezierTool.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Circles.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Clouds.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Dripping Brush.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Fancy Brush.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Grid.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {

1
examples/Tools/MultiLines.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Wave.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

1
examples/Tools/Worm Farm.html
View file

@ -32,6 +32,7 @@
<script type="text/javascript" src="../../src/color/GradientColor.js"></script> <script type="text/javascript" src="../../src/color/GradientColor.js"></script>
<script type="text/javascript" src="../../src/color/Gradient.js"></script> <script type="text/javascript" src="../../src/color/Gradient.js"></script>
<script type="text/javascript" src="../../src/color/GradientStop.js"></script> <script type="text/javascript" src="../../src/color/GradientStop.js"></script>
<script type="text/javascript" src="../../src/util/CanvasProvider.js"></script>
<script> <script>
window.onload = function() { window.onload = function() {
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');

5
src/item/Item.js
View file

@ -540,8 +540,7 @@ var Item = Base.extend({
// question for now. // question for now.
if (!resolution) if (!resolution)
resolution = 72; resolution = 72;
// TODO: use strokebounds for this: var bounds = this.strokeBounds;
var bounds = this.bounds;
var scale = resolution / 72; var scale = resolution / 72;
var canvas = CanvasProvider.getCanvas(bounds.size.multiply(scale)); var canvas = CanvasProvider.getCanvas(bounds.size.multiply(scale));
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');
@ -727,7 +726,7 @@ var Item = Base.extend({
if (item.blendMode !== 'normal' if (item.blendMode !== 'normal'
|| item.opacity < 1 || item.opacity < 1
&& !(item.segments && (!item.fillColor || !item.strokeColor))) { && !(item.segments && (!item.fillColor || !item.strokeColor))) {
var bounds = item.strokeBounds; var bounds = item.strokeBounds || item.bounds;
if (!bounds.width || !bounds.height) if (!bounds.width || !bounds.height)
return; return;

3
src/item/PlacedSymbol.js
View file

@ -19,8 +19,7 @@ var PlacedSymbol = Item.extend({
} else { } else {
this.matrix = new Matrix(); this.matrix = new Matrix();
} }
// TODO: this should use strokeBounds: this._bounds = this.symbol.definition.strokeBounds.clone();
this._bounds = this.symbol.definition.bounds.clone();
// TODO: should size be cached here, or on Symbol? // TODO: should size be cached here, or on Symbol?
this._size = this._bounds.size; this._size = this._bounds.size;
}, },

6
test/tests/PlacedSymbol.js
View file

@ -8,17 +8,17 @@ test('placedSymbol bounds', function() {
// These tests currently fail because we haven't implemented // These tests currently fail because we haven't implemented
// Item#strokeBounds yet. // Item#strokeBounds yet.
compareRectangles(placedSymbol.bounds, compareRectangles(placedSymbol.strokeBounds,
new Rectangle(-50.5, -50.5, 101, 101), new Rectangle(-50.5, -50.5, 101, 101),
'PlacedSymbol initial bounds.'); 'PlacedSymbol initial bounds.');
placedSymbol.scale(0.5); placedSymbol.scale(0.5);
compareRectangles(placedSymbol.bounds, compareRectangles(placedSymbol.strokeBounds,
{ x: -25.5, y: -25.5, width: 51, height: 51 }, { x: -25.5, y: -25.5, width: 51, height: 51 },
'Bounds after scale.'); 'Bounds after scale.');
placedSymbol.rotate(40); placedSymbol.rotate(40);
compareRectangles(placedSymbol.bounds, compareRectangles(placedSymbol.strokeBounds,
{ x: -25.50049, y: -25.50049, width: 51.00098, height: 51.00098 }, { x: -25.50049, y: -25.50049, width: 51.00098, height: 51.00098 },
'Bounds after rotation.'); 'Bounds after rotation.');
}); });