git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

common shape: code refactoring.

Browse source 
cast to float type properly.
This commit is contained in:
Hermet Park 2021-11-04 17:34:11 +09:00
parent f222124c40
commit b289950a5f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/tvgShape.cpp
View file

@ -168,10 +168,10 @@ Result Shape::appendArc(float cx, float cy, float radius, float startAngle, floa
startAngle = (startAngle * M_PI) / 180.0f; startAngle = (startAngle * M_PI) / 180.0f;
sweep = sweep * M_PI / 180.0f; sweep = sweep * M_PI / 180.0f;
auto nCurves = ceil(fabsf(sweep / M_PI_2)); auto nCurves = ceil(fabsf(sweep / float(M_PI_2)));
auto sweepSign = (sweep < 0 ? -1 : 1); auto sweepSign = (sweep < 0 ? -1 : 1);
auto fract = fmodf(sweep, M_PI_2); auto fract = fmodf(sweep, float(M_PI_2));
fract = (fabsf(fract) < FLT_EPSILON) ? M_PI_2 * sweepSign : fract; fract = (fabsf(fract) < FLT_EPSILON) ? float(M_PI_2) * sweepSign : fract;
//Start from here //Start from here
Point start = {radius * cosf(startAngle), radius * sinf(startAngle)}; Point start = {radius * cosf(startAngle), radius * sinf(startAngle)};
@ -184,7 +184,7 @@ Result Shape::appendArc(float cx, float cy, float radius, float startAngle, floa
} }
for (int i = 0; i < nCurves; ++i) { for (int i = 0; i < nCurves; ++i) {
auto endAngle = startAngle + ((i != nCurves - 1) ? M_PI_2 * sweepSign : fract); auto endAngle = startAngle + ((i != nCurves - 1) ? float(M_PI_2) * sweepSign : fract);
Point end = {radius * cosf(endAngle), radius * sinf(endAngle)}; Point end = {radius * cosf(endAngle), radius * sinf(endAngle)};
//variables needed to calculate bezier control points //variables needed to calculate bezier control points