zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-05-31 21:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'davidpricedev/bug/325-androidArcStrangeness'

Browse Source
This commit is contained in:
Mikael Sand
2018-06-07 20:41:08 +03:00
parent 5e1bb859fc 15dd172e58
commit 16a4730968
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/PropHelper.java
+15 -10
View File
@@ -562,10 +562,10 @@ class PropHelper {
arc -= Math.PI * 2;
}
int n = (int) Math.ceil(Math.abs(arc / (Math.PI / 2)));
int n = (int) Math.ceil(Math.abs(round(arc / (Math.PI / 2), 4)));
float step = arc / n;
float k = (4 / 3) * (float) Math.tan(step / 4);
float k = (float) ((4 / 3.0) * Math.tan(step / 4));
float x = (float) Math.cos(sa);
float y = (float) Math.sin(sa);
@@ -581,14 +581,14 @@ class PropHelper {
float cp2x = x + k * y;
float cp2y = y - k * x;
mPath.cubicTo(
(cx + xx * cp1x + yx * cp1y) * mScale,
(cy + xy * cp1x + yy * cp1y) * mScale,
(cx + xx * cp2x + yx * cp2y) * mScale,
(cy + xy * cp2x + yy * cp2y) * mScale,
(cx + xx * x + yx * y) * mScale,
(cy + xy * x + yy * y) * mScale
);
float c1x = (cx + xx * cp1x + yx * cp1y);
float c1y = (cy + xy * cp1x + yy * cp1y);
float c2x = (cx + xx * cp2x + yx * cp2y);
float c2y = (cy + xy * cp2x + yy * cp2y);
float ex = (cx + xx * x + yx * y);
float ey = (cy + xy * x + yy * y);
mPath.cubicTo(c1x * mScale, c1y * mScale, c2x * mScale, c2y * mScale, ex * mScale, ey * mScale);
}
}
@@ -599,5 +599,10 @@ class PropHelper {
mPendDownSet = true;
}
}
private double round(double val, int sigDig) {
double multiplier = Math.pow(10, sigDig);
return Math.round(val * multiplier) / multiplier;
}
}
}