mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-07-04 17:00:28 -04:00
Clean up code (for() -> for ()).
This commit is contained in:
parent
3af24e6178
commit
52a73e86ce
11 changed files with 39 additions and 39 deletions
examples
Animated
Scripts
Tools
src
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
var lineGroup = new Group();
|
var lineGroup = new Group();
|
||||||
var lineCount = 100;
|
var lineCount = 100;
|
||||||
for(var i = 0; i < lineCount; i++) {
|
for (var i = 0; i < lineCount; i++) {
|
||||||
var linePath = new Path.Line([0, 0], [0, 0]);
|
var linePath = new Path.Line([0, 0], [0, 0]);
|
||||||
linePath.strokeColor = 'red';
|
linePath.strokeColor = 'red';
|
||||||
lineGroup.appendTop(linePath);
|
lineGroup.appendTop(linePath);
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
this.path = new Path();
|
this.path = new Path();
|
||||||
this.shortPath = new Path();
|
this.shortPath = new Path();
|
||||||
this.shortPath.strokeWidth = 4;
|
this.shortPath.strokeWidth = 4;
|
||||||
for(var i = 0, l = strength * 10 + 10; i < l; i++) {
|
for (var i = 0, l = strength * 10 + 10; i < l; i++) {
|
||||||
this.path.add(this.loc);
|
this.path.add(this.loc);
|
||||||
if (i < 3)
|
if (i < 3)
|
||||||
this.shortPath.add(this.loc);
|
this.shortPath.add(this.loc);
|
||||||
|
@ -273,7 +273,7 @@
|
||||||
|
|
||||||
function onFrame() {
|
function onFrame() {
|
||||||
count++;
|
count++;
|
||||||
for(var i = 0, l = boids.length; i < l; i++) {
|
for (var i = 0, l = boids.length; i < l; i++) {
|
||||||
if (groupTogether) {
|
if (groupTogether) {
|
||||||
var point = heartPath.getPointAt(((i + count / 30) % l) / l * pathLength);
|
var point = heartPath.getPointAt(((i + count / 30) % l) / l * pathLength);
|
||||||
boids[i].arrive(point);
|
boids[i].arrive(point);
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function iterate() {
|
function iterate() {
|
||||||
for(var i = 0, l = gradient.stops.length; i < l; i++)
|
for (var i = 0, l = gradient.stops.length; i < l; i++)
|
||||||
gradient.stops[i].color.hue -= 20;
|
gradient.stops[i].color.hue -= 20;
|
||||||
if (grow && vector.length > 300) {
|
if (grow && vector.length > 300) {
|
||||||
grow = false;
|
grow = false;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<script type="text/javascript" src="../../src/load.js"></script>
|
<script type="text/javascript" src="../../src/load.js"></script>
|
||||||
<script type="text/paperscript" canvas="canvas">
|
<script type="text/paperscript" canvas="canvas">
|
||||||
var amount = 180;
|
var amount = 180;
|
||||||
for(var i = 0; i < amount; i++) {
|
for (var i = 0; i < amount; i++) {
|
||||||
var path = new Path();
|
var path = new Path();
|
||||||
path.fillColor = new HSBColor(1, 1, Math.random());
|
path.fillColor = new HSBColor(1, 1, Math.random());
|
||||||
path.strokeCap = 'round';
|
path.strokeCap = 'round';
|
||||||
|
|
|
@ -16,12 +16,12 @@
|
||||||
var size = 20,
|
var size = 20,
|
||||||
segments = path.segments,
|
segments = path.segments,
|
||||||
center = document.bounds.center;
|
center = document.bounds.center;
|
||||||
for(var i = 0; i < size; i++)
|
for (var i = 0; i < size; i++)
|
||||||
path.add(center + new Point(i * 100, 0));
|
path.add(center + new Point(i * 100, 0));
|
||||||
|
|
||||||
function onMouseMove(event) {
|
function onMouseMove(event) {
|
||||||
segments[0].point = event.point;
|
segments[0].point = event.point;
|
||||||
for(var i = 0; i < size - 1; i++) {
|
for (var i = 0; i < size - 1; i++) {
|
||||||
var nextSegment = segments[i + 1];
|
var nextSegment = segments[i + 1];
|
||||||
var position = path.segments[i].point;
|
var position = path.segments[i].point;
|
||||||
var angle = (position - nextSegment.point).angle;
|
var angle = (position - nextSegment.point).angle;
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
// path.scale(1, 0.5);
|
// path.scale(1, 0.5);
|
||||||
paths.push(path);
|
paths.push(path);
|
||||||
|
|
||||||
for(var i = 0; i < paths.length; i++) {
|
for (var i = 0; i < paths.length; i++) {
|
||||||
var path = paths[i];
|
var path = paths[i];
|
||||||
path.scale(1.5, new Point(300, 0));
|
path.scale(1.5, new Point(300, 0));
|
||||||
var rect = new Path.Rectangle(path.strokeBounds);
|
var rect = new Path.Rectangle(path.strokeBounds);
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
function generateConnections(paths) {
|
function generateConnections(paths) {
|
||||||
for (var i = 0, l = paths.length; i < l; i++) {
|
for (var i = 0, l = paths.length; i < l; i++) {
|
||||||
for(var j = i - 1; j >= 0; j--){
|
for (var j = i - 1; j >= 0; j--){
|
||||||
var path = metaball(paths[i], paths[j], 0.5, handle_len_rate, 300);
|
var path = metaball(paths[i], paths[j], 0.5, handle_len_rate, 300);
|
||||||
if (path) {
|
if (path) {
|
||||||
path.removeOn({
|
path.removeOn({
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
// var groups = document.getItems({
|
// var groups = document.getItems({
|
||||||
// type: Group
|
// type: Group
|
||||||
// });
|
// });
|
||||||
// for(var i = 0, l = groups.length; i < l; i++) {
|
// for (var i = 0, l = groups.length; i < l; i++) {
|
||||||
// var group = groups[i];
|
// var group = groups[i];
|
||||||
// if(group.name == 'Voronoi') {
|
// if(group.name == 'Voronoi') {
|
||||||
// this.group = group;
|
// this.group = group;
|
||||||
|
@ -85,7 +85,7 @@
|
||||||
initPoints: function() {
|
initPoints: function() {
|
||||||
this.points = [];
|
this.points = [];
|
||||||
var segments = this.group.data.path.segments;
|
var segments = this.group.data.path.segments;
|
||||||
for(var i = 0, l = segments.length; i < l; i++) {
|
for (var i = 0, l = segments.length; i < l; i++) {
|
||||||
this.points.push(segments[i].point);
|
this.points.push(segments[i].point);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
setPoints: function(points) {
|
setPoints: function(points) {
|
||||||
for(var i = 0, l = points.length; i < l; i++) {
|
for (var i = 0, l = points.length; i < l; i++) {
|
||||||
points[i] = points[i].round();
|
points[i] = points[i].round();
|
||||||
}
|
}
|
||||||
this.points = points;
|
this.points = points;
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
|
|
||||||
showPointsDown: function() {
|
showPointsDown: function() {
|
||||||
var size = 2 / document.activeView.zoom;
|
var size = 2 / document.activeView.zoom;
|
||||||
for(var i = 0, l = this.points.length - 1; i < l; i++) {
|
for (var i = 0, l = this.points.length - 1; i < l; i++) {
|
||||||
new Path.Circle(this.points[i], size).removeOn({
|
new Path.Circle(this.points[i], size).removeOn({
|
||||||
up: true
|
up: true
|
||||||
});
|
});
|
||||||
|
@ -160,7 +160,7 @@
|
||||||
|
|
||||||
removeSmallBits: function(path) {
|
removeSmallBits: function(path) {
|
||||||
var averageLength = path.length / path.segments.length;
|
var averageLength = path.length / path.segments.length;
|
||||||
for(var i = 0, l = path.segments.length; i < l; i++) {
|
for (var i = 0, l = path.segments.length; i < l; i++) {
|
||||||
var segment = path.segments[i];
|
var segment = path.segments[i];
|
||||||
var nextSegment = path.segments[i + 1 >= l ? (i + 1) % l : i + 1];
|
var nextSegment = path.segments[i + 1 >= l ? (i + 1) % l : i + 1];
|
||||||
var length = (nextSegment.point - segment.point).length;
|
var length = (nextSegment.point - segment.point).length;
|
||||||
|
@ -183,7 +183,7 @@
|
||||||
roundPath: function(path) {
|
roundPath: function(path) {
|
||||||
var segments = path.segments.clone();
|
var segments = path.segments.clone();
|
||||||
path.segments = [];
|
path.segments = [];
|
||||||
for(var i = 0, l = segments.length; i < l; i++) {
|
for (var i = 0, l = segments.length; i < l; i++) {
|
||||||
var curPoint = segments[i].point;
|
var curPoint = segments[i].point;
|
||||||
var nextPoint = segments[i + 1 == l ? 0 : i + 1].point;
|
var nextPoint = segments[i + 1 == l ? 0 : i + 1].point;
|
||||||
var prevPoint = segments[i - 1 < 0 ? segments.length - 1 : i - 1].point;
|
var prevPoint = segments[i - 1 < 0 ? segments.length - 1 : i - 1].point;
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
redrawVoronoi: function(diagram, activePoint) {
|
redrawVoronoi: function(diagram, activePoint) {
|
||||||
for(var i = 0, l = diagram.sites.length; i < l; i++) {
|
for (var i = 0, l = diagram.sites.length; i < l; i++) {
|
||||||
this.drawCell(diagram, i);
|
this.drawCell(diagram, i);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -210,7 +210,7 @@
|
||||||
var newCell = this.drawCell(diagram, this.points.length - 1, activePoint);
|
var newCell = this.drawCell(diagram, this.points.length - 1, activePoint);
|
||||||
if(!activePoint && newCell) {
|
if(!activePoint && newCell) {
|
||||||
var checkPath = newCell.data.path;
|
var checkPath = newCell.data.path;
|
||||||
for(var i = 0, l = this.vGroup.children.length; i < l; i++) {
|
for (var i = 0, l = this.vGroup.children.length; i < l; i++) {
|
||||||
var path = this.vGroup.children[i];
|
var path = this.vGroup.children[i];
|
||||||
var toCheckPath = path.data.path;
|
var toCheckPath = path.data.path;
|
||||||
if(toCheckPath && checkPath.bounds.intersects(toCheckPath.bounds)) {// && toCheckPath.intersects(checkPath)) {
|
if(toCheckPath && checkPath.bounds.intersects(toCheckPath.bounds)) {// && toCheckPath.intersects(checkPath)) {
|
||||||
|
@ -233,7 +233,7 @@
|
||||||
if(hitResult) {
|
if(hitResult) {
|
||||||
var point = hitResult.item.data.path.data.center;
|
var point = hitResult.item.data.path.data.center;
|
||||||
var segments = this.group.data.path.segments;
|
var segments = this.group.data.path.segments;
|
||||||
for(var i = 0, l = segments.length; i < l; i++) {
|
for (var i = 0, l = segments.length; i < l; i++) {
|
||||||
var segment = segments[i];
|
var segment = segments[i];
|
||||||
if(point == segment.point.multiply(100).round()) {
|
if(point == segment.point.multiply(100).round()) {
|
||||||
i = l;
|
i = l;
|
||||||
|
@ -245,7 +245,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
findIndex: function(point) {
|
findIndex: function(point) {
|
||||||
for(var i = 0, l = this.points.length; i < l; i++) {
|
for (var i = 0, l = this.points.length; i < l; i++) {
|
||||||
if(point == this.points[i].multiply(100).round())
|
if(point == this.points[i].multiply(100).round())
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
@ -370,8 +370,8 @@
|
||||||
//
|
//
|
||||||
// var size = new Size(this.columns, this.rows);
|
// var size = new Size(this.columns, this.rows);
|
||||||
// var col = document.bounds.size / size;
|
// var col = document.bounds.size / size;
|
||||||
// for(var i = -1; i < this.columns + 1; i++) {
|
// for (var i = -1; i < this.columns + 1; i++) {
|
||||||
// for(var j = -1; j < this.rows + 1; j++) {
|
// for (var j = -1; j < this.rows + 1; j++) {
|
||||||
// var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
// var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
||||||
// if(j % 4 == 2 || j% 4 == 3) {
|
// if(j % 4 == 2 || j% 4 == 3) {
|
||||||
// point += new Point(col.width / 2, 0);
|
// point += new Point(col.width / 2, 0);
|
||||||
|
@ -399,8 +399,8 @@
|
||||||
|
|
||||||
var size = new Size(this.columns, this.rows);
|
var size = new Size(this.columns, this.rows);
|
||||||
var col = document.bounds.size / size;
|
var col = document.bounds.size / size;
|
||||||
for(var i = -1; i < this.columns + 1; i++) {
|
for (var i = -1; i < this.columns + 1; i++) {
|
||||||
for(var j = -1; j < this.rows + 1; j++) {
|
for (var j = -1; j < this.rows + 1; j++) {
|
||||||
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
||||||
if(j % 2)
|
if(j % 2)
|
||||||
point += new Point(col.width / 2, 0);
|
point += new Point(col.width / 2, 0);
|
||||||
|
@ -427,8 +427,8 @@
|
||||||
this.rows = values.rows;
|
this.rows = values.rows;
|
||||||
var size = new Size(this.columns, this.rows);
|
var size = new Size(this.columns, this.rows);
|
||||||
var col = document.bounds.size / size;
|
var col = document.bounds.size / size;
|
||||||
for(var i = -1; i < this.columns ; i++) {
|
for (var i = -1; i < this.columns ; i++) {
|
||||||
for(var j = -1; j < this.rows; j++) {
|
for (var j = -1; j < this.rows; j++) {
|
||||||
|
|
||||||
var point = new Point(i, j) / size * document.bounds.size + col / 2;
|
var point = new Point(i, j) / size * document.bounds.size + col / 2;
|
||||||
if(j % 2)
|
if(j % 2)
|
||||||
|
@ -460,8 +460,8 @@
|
||||||
|
|
||||||
var size = new Size(this.columns, this.rows);
|
var size = new Size(this.columns, this.rows);
|
||||||
var col = document.bounds.size / size;
|
var col = document.bounds.size / size;
|
||||||
for(var i = -1; i < this.columns + 1; i++) {
|
for (var i = -1; i < this.columns + 1; i++) {
|
||||||
for(var j = -1; j < this.rows + 1; j++) {
|
for (var j = -1; j < this.rows + 1; j++) {
|
||||||
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
||||||
if(this.loose)
|
if(this.loose)
|
||||||
point += (col / 4) * Point.random() - col / 4;
|
point += (col / 4) * Point.random() - col / 4;
|
||||||
|
@ -487,14 +487,14 @@
|
||||||
|
|
||||||
var size = new Size(this.columns, this.rows);
|
var size = new Size(this.columns, this.rows);
|
||||||
var col = document.bounds.size / size;
|
var col = document.bounds.size / size;
|
||||||
for(var i = -1; i < this.columns + 1; i++) {
|
for (var i = -1; i < this.columns + 1; i++) {
|
||||||
for(var j = -1; j < this.rows + 1; j++) {
|
for (var j = -1; j < this.rows + 1; j++) {
|
||||||
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
var point = new Point(i, j) / new Point(size) * document.bounds.size + col / 2;
|
||||||
if(j % 2)
|
if(j % 2)
|
||||||
point += new Point(col.width / 2, 0);
|
point += new Point(col.width / 2, 0);
|
||||||
vPoints.push(point);
|
vPoints.push(point);
|
||||||
var offset = i % 2 ? 45 : 0;
|
var offset = i % 2 ? 45 : 0;
|
||||||
for(var z = 0; z < this.parts; z++) {
|
for (var z = 0; z < this.parts; z++) {
|
||||||
var vector = new Point(col.width / 6, 0).rotate(offset + z / this.parts * 360 * (i % 2 ? 1 : -1) * (j % 2 ? -1 : 1));
|
var vector = new Point(col.width / 6, 0).rotate(offset + z / this.parts * 360 * (i % 2 ? 1 : -1) * (j % 2 ? -1 : 1));
|
||||||
vPoints.push(point + vector);
|
vPoints.push(point + vector);
|
||||||
}
|
}
|
||||||
|
@ -544,9 +544,9 @@
|
||||||
|
|
||||||
if(paths.length) {
|
if(paths.length) {
|
||||||
voronoiDrawer.initialize();
|
voronoiDrawer.initialize();
|
||||||
for(var i = 0, l = paths.length; i < l; i++) {
|
for (var i = 0, l = paths.length; i < l; i++) {
|
||||||
var segments = paths[i].segments;
|
var segments = paths[i].segments;
|
||||||
for(var j = 0, k = segments.length; j < k; j++) {
|
for (var j = 0, k = segments.length; j < k; j++) {
|
||||||
voronoiDrawer.addPoint(segments[j].point);
|
voronoiDrawer.addPoint(segments[j].point);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -567,7 +567,7 @@
|
||||||
value: 'Add Random Points',
|
value: 'Add Random Points',
|
||||||
onClick: function() {
|
onClick: function() {
|
||||||
voronoiDrawer.initialize();
|
voronoiDrawer.initialize();
|
||||||
for(var i = 0, l = values.randomAmount; i < l; i++) {
|
for (var i = 0, l = values.randomAmount; i < l; i++) {
|
||||||
voronoiDrawer.addRandomPoint();
|
voronoiDrawer.addRandomPoint();
|
||||||
}
|
}
|
||||||
voronoiDrawer.initPoints();
|
voronoiDrawer.initPoints();
|
||||||
|
|
|
@ -20,7 +20,7 @@ var Gradient = this.Gradient = Base.extend({
|
||||||
// TODO: should type here be called 'radial' and have it
|
// TODO: should type here be called 'radial' and have it
|
||||||
// receive a boolean value?
|
// receive a boolean value?
|
||||||
initialize: function(stops, type) {
|
initialize: function(stops, type) {
|
||||||
if (!stops) {
|
if(!stops) {
|
||||||
stops = [new GradientStop('white', 0),
|
stops = [new GradientStop('white', 0),
|
||||||
new GradientStop('black', 1)];
|
new GradientStop('black', 1)];
|
||||||
}
|
}
|
||||||
|
@ -36,12 +36,12 @@ var Gradient = this.Gradient = Base.extend({
|
||||||
if (stops.length < 2)
|
if (stops.length < 2)
|
||||||
throw new Error(
|
throw new Error(
|
||||||
'Gradient stop list needs to contain at least two stops.');
|
'Gradient stop list needs to contain at least two stops.');
|
||||||
if (!(stops[0] instanceof GradientStop)) {
|
if(!(stops[0] instanceof GradientStop)) {
|
||||||
for(var i = 0, l = stops.length; i < l; i++) {
|
for (var i = 0, l = stops.length; i < l; i++) {
|
||||||
var rampPoint;
|
var rampPoint;
|
||||||
var stop = stops[i];
|
var stop = stops[i];
|
||||||
// If it is an array, the second argument is the rampPoint:
|
// If it is an array, the second argument is the rampPoint:
|
||||||
if (stop.length) {
|
if(stop.length) {
|
||||||
rampPoint = stop[1];
|
rampPoint = stop[1];
|
||||||
stop = stop[0];
|
stop = stop[0];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -903,7 +903,7 @@ var Item = this.Item = Base.extend({
|
||||||
};
|
};
|
||||||
|
|
||||||
function removeAll(set) {
|
function removeAll(set) {
|
||||||
for(var id in set) {
|
for (var id in set) {
|
||||||
var item = set[id];
|
var item = set[id];
|
||||||
item.remove();
|
item.remove();
|
||||||
for (var type in sets) {
|
for (var type in sets) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ var Path = this.Path = PathItem.extend({
|
||||||
if (this._curves)
|
if (this._curves)
|
||||||
this._curves = null;
|
this._curves = null;
|
||||||
}
|
}
|
||||||
for(var i = 0, l = segments.length; i < l; i++)
|
for (var i = 0, l = segments.length; i < l; i++)
|
||||||
this._add(Segment.read(segments, i, 1));
|
this._add(Segment.read(segments, i, 1));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue