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: ++tiny optimization

Browse source 
reduce the binary size by 80 bytes.
This commit is contained in:
Hermet Park 2021-11-03 20:24:36 +09:00
parent b705822732
commit 7c1b16ba11
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib/tvgShape.cpp
View file

@ -22,7 +22,6 @@
#define _USE_MATH_DEFINES //Math Constants are not defined in Standard C/C++.
#include <limits>
#include <float.h>
#include <math.h>
#include "tvgShapeImpl.h"
@ -163,18 +162,16 @@ Result Shape::appendCircle(float cx, float cy, float rx, float ry) noexcept
Result Shape::appendArc(float cx, float cy, float radius, float startAngle, float sweep, bool pie) noexcept
{
const float M_PI_HALF = (float)(M_PI * 0.5f);
//just circle
if (sweep >= 360 || sweep <= -360) return appendCircle(cx, cy, radius, radius);
if (sweep >= 360.0f || sweep <= -360.0f) return appendCircle(cx, cy, radius, radius);
startAngle = (startAngle * M_PI) / 180;
sweep = sweep * M_PI / 180;
startAngle = (startAngle * M_PI) / 180.0f;
sweep = sweep * M_PI / 180.0f;
auto nCurves = ceil(fabsf(sweep / M_PI_HALF));
auto nCurves = ceil(fabsf(sweep / M_PI_2));
auto sweepSign = (sweep < 0 ? -1 : 1);
auto fract = fmodf(sweep, M_PI_HALF);
fract = (fabsf(fract) < std::numeric_limits<float>::epsilon()) ? M_PI_HALF * sweepSign : fract;
auto fract = fmodf(sweep, M_PI_2);
fract = (fabsf(fract) < FLT_EPSILON) ? M_PI_2 * sweepSign : fract;
//Start from here
Point start = {radius * cosf(startAngle), radius * sinf(startAngle)};
@ -187,7 +184,7 @@ Result Shape::appendArc(float cx, float cy, float radius, float startAngle, floa
}
for (int i = 0; i < nCurves; ++i) {
auto endAngle = startAngle + ((i != nCurves - 1) ? M_PI_HALF * sweepSign : fract);
auto endAngle = startAngle + ((i != nCurves - 1) ? M_PI_2 * sweepSign : fract);
Point end = {radius * cosf(endAngle), radius * sinf(endAngle)};
//variables needed to calculate bezier control points