Merge pull request #64 from pshihn/path-arc-bug

pshihn · web-flow · commit a0042a0e521a · 2018-05-12T15:01:01.000-07:00
Fixed a bug in Arc to Curve convertor
diff --git a/dist/rough.js b/dist/rough.js
@@ -510,8 +510,8 @@ class RoughArcConverter {
     var numerator = this._rx * this._rx * this._ry * this._ry - this._rx * this._rx * y1dash * y1dash - this._ry * this._ry * x1dash * x1dash;
     if (numerator < 0) {
       let s = Math.sqrt(1 - (numerator / (this._rx * this._rx * this._ry * this._ry)));
-      this._rx = s;
-      this._ry = s;
+      this._rx = this._rx * s;
+      this._ry = this._ry * s;
       root = 0;
     } else {
       root = (largeArcFlag == sweepFlag ? -1.0 : 1.0) *
diff --git a/dist/rough.min.js b/dist/rough.min.js
diff --git a/dist/rough.umd.js b/dist/rough.umd.js
@@ -513,8 +513,8 @@ class RoughArcConverter {
     var numerator = this._rx * this._rx * this._ry * this._ry - this._rx * this._rx * y1dash * y1dash - this._ry * this._ry * x1dash * x1dash;
     if (numerator < 0) {
       let s = Math.sqrt(1 - (numerator / (this._rx * this._rx * this._ry * this._ry)));
-      this._rx = s;
-      this._ry = s;
+      this._rx = this._rx * s;
+      this._ry = this._ry * s;
       root = 0;
     } else {
       root = (largeArcFlag == sweepFlag ? -1.0 : 1.0) *
diff --git a/dist/rough.umd.min.js b/dist/rough.umd.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "roughjs",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Create graphics using HTML Canvas or SVG with a hand-drawn, sketchy, appearance.",
   "main": "dist/rough.umd.js",
   "jsnext:main": "src/index.js",
@@ -34,4 +34,4 @@
     "babel-minify": "^0.3.0",
     "rollup": "^0.56.5"
   }
-}
+}
diff --git a/src/path.js b/src/path.js
@@ -304,8 +304,8 @@ export class RoughArcConverter {
     var numerator = this._rx * this._rx * this._ry * this._ry - this._rx * this._rx * y1dash * y1dash - this._ry * this._ry * x1dash * x1dash;
     if (numerator < 0) {
       let s = Math.sqrt(1 - (numerator / (this._rx * this._rx * this._ry * this._ry)));
-      this._rx = s;
-      this._ry = s;
+      this._rx = this._rx * s;
+      this._ry = this._ry * s;
       root = 0;
     } else {
       root = (largeArcFlag == sweepFlag ? -1.0 : 1.0) *

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "roughjs",`
`3`		`- "version": "2.1.2",`
	`3`	`+ "version": "2.1.3",`
`4`	`4`	`"description": "Create graphics using HTML Canvas or SVG with a hand-drawn, sketchy, appearance.",`
`5`	`5`	`"main": "dist/rough.umd.js",`
`6`	`6`	`"jsnext:main": "src/index.js",`
`@@ -34,4 +34,4 @@`
`34`	`34`	`"babel-minify": "^0.3.0",`
`35`	`35`	`"rollup": "^0.56.5"`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`