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

Update package.json for publishing to NPM.

Browse source
This commit is contained in:
Jürg Lehni 2013-05-05 19:22:13 -07:00
parent 0fc4b9f28d
commit acb3d6f5f9
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/preprocess.sh
View file

@ -24,7 +24,7 @@
# commented Preprocessed, still formated and commented # commented Preprocessed, still formated and commented
# stripped Preprocessed, formated but without comments # stripped Preprocessed, formated but without comments
VERSION=0.8 VERSION=0.8.0
DATE=$(git log -1 --pretty=format:%ad) DATE=$(git log -1 --pretty=format:%ad)
COMMAND="./prepro.js -d '{ \"version\": $VERSION, \"date\": \"$DATE\", \"parser\": \"acorn\", \"svg\": true }' $3 $2" COMMAND="./prepro.js -d '{ \"version\": $VERSION, \"date\": \"$DATE\", \"parser\": \"acorn\", \"svg\": true }' $3 $2"

6
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "paper", "name": "paper",
"description": "Vector graphics scripting framework", "version": "0.8.0",
"version": "0.2.2", "description": "The Swiss Army Knife of Vector Graphics Scripting",
"contributors": [{ "contributors": [{
"name" : "Jürg Lehni", "name" : "Jürg Lehni",
"url" : "http://lehni.org" "url" : "http://lehni.org"
@ -10,7 +10,7 @@
"url" : "http://jonathanpuckey.com" "url" : "http://jonathanpuckey.com"
}], }],
"homepage": "http://paperjs.org", "homepage": "http://paperjs.org",
"keywords": ["canvas", "graphic", "graphics", "vector", "paper.js"], "keywords": ["canvas", "vector", "graphic", "graphics", "bezier", "paper.js"],
"repository": "git://github.com/paperjs/paper.js/", "repository": "git://github.com/paperjs/paper.js/",
"dependencies": { "dependencies": {
"canvas": ">= 0.7.0" "canvas": ">= 0.7.0"

8
src/path/PathItem.Boolean.js
View file

@ -138,8 +138,9 @@ PathItem.inject(new function() {
&& (clockwise === path2Clockwise && (clockwise === path2Clockwise
|| !testOnCurve(path2, midPoint)); || !testOnCurve(path2, midPoint));
if (operator(path === path1, insidePath1, insidePath2)) { if (operator(path === path1, insidePath1, insidePath2)) {
// Mark as invalid, but do not remove yet, so the graph // The segment is to be discarded. Don't add it to segments,
// structure is preserved. // and mark it as invalid since it might still be found
// through curves / intersections, see below.
segment._invalid = true; segment._invalid = true;
} else { } else {
segments.push(segment); segments.push(segment);
@ -155,7 +156,8 @@ PathItem.inject(new function() {
loc = segment._intersection, loc = segment._intersection,
intersection = loc && loc.getSegment(true); intersection = loc && loc.getSegment(true);
if (segment.getPrevious()._invalid) if (segment.getPrevious()._invalid)
segment.setHandleIn(intersection ? intersection._handleIn segment.setHandleIn(intersection
? intersection._handleIn
: Point.create(0, 0)); : Point.create(0, 0));
do { do {
segment._visited = true; segment._visited = true;