git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-13 11:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

common api: interface refactoring

Browse source 
returning color fill() method renamed to fillColor() as like others-strokeXXX, fillRule- do.

This change is for naming consistency.
This commit is contained in:
Hermet Park 2020-10-22 21:01:55 +09:00 • committed by Hermet Park
parent 65cbbcf724
commit 0b767750e6
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inc/thorvg.h
View file

@ -245,8 +245,8 @@ public:
//Getters //Getters
uint32_t pathCommands(const PathCommand** cmds) const noexcept; uint32_t pathCommands(const PathCommand** cmds) const noexcept;
uint32_t pathCoords(const Point** pts) const noexcept; uint32_t pathCoords(const Point** pts) const noexcept;
Result fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept; //TODO: => fillColor
const Fill* fill() const noexcept; const Fill* fill() const noexcept;
Result fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept;
FillRule fillRule() const noexcept; FillRule fillRule() const noexcept;
float strokeWidth() const noexcept; float strokeWidth() const noexcept;

2
src/bindings/capi/tvgCapi.cpp
View file

@ -340,7 +340,7 @@ TVG_EXPORT Tvg_Result tvg_shape_set_fill_color(Tvg_Paint* paint, uint8_t r, uint
TVG_EXPORT Tvg_Result tvg_shape_get_fill_color(const Tvg_Paint* paint, uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) TVG_EXPORT Tvg_Result tvg_shape_get_fill_color(const Tvg_Paint* paint, uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a)
{ {
if (!paint) return TVG_RESULT_INVALID_ARGUMENT; if (!paint) return TVG_RESULT_INVALID_ARGUMENT;
return (Tvg_Result) reinterpret_cast<Shape*>(CCP(paint))->fill(r, g, b, a); return (Tvg_Result) reinterpret_cast<Shape*>(CCP(paint))->fillColor(r, g, b, a);
} }

4
src/lib/sw_engine/tvgSwRenderer.cpp
View file

@ -56,7 +56,7 @@ struct SwTask : Task
//Shape //Shape
if (flags & (RenderUpdateFlag::Path | RenderUpdateFlag::Transform) || prepareShape) { if (flags & (RenderUpdateFlag::Path | RenderUpdateFlag::Transform) || prepareShape) {
uint8_t alpha = 0; uint8_t alpha = 0;
sdata->fill(nullptr, nullptr, nullptr, &alpha); sdata->fillColor(nullptr, nullptr, nullptr, &alpha);
bool renderShape = (alpha > 0 || sdata->fill()); bool renderShape = (alpha > 0 || sdata->fill());
if (renderShape || strokeAlpha) { if (renderShape || strokeAlpha) {
shapeReset(&shape); shapeReset(&shape);
@ -183,7 +183,7 @@ bool SwRenderer::render(const Shape& shape, void *data)
if (auto fill = task->sdata->fill()) { if (auto fill = task->sdata->fill()) {
rasterGradientShape(surface, &task->shape, fill->id()); rasterGradientShape(surface, &task->shape, fill->id());
} else{ } else{
task->sdata->fill(&r, &g, &b, &a); task->sdata->fillColor(&r, &g, &b, &a);
if (a > 0) rasterSolidShape(surface, &task->shape, r, g, b, a); if (a > 0) rasterSolidShape(surface, &task->shape, r, g, b, a);
} }
task->sdata->strokeColor(&r, &g, &b, &a); task->sdata->strokeColor(&r, &g, &b, &a);

2
src/lib/tvgShape.cpp
View file

@ -283,7 +283,7 @@ Result Shape::fill(unique_ptr<Fill> f) noexcept
} }
Result Shape::fill(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept Result Shape::fillColor(uint8_t* r, uint8_t* g, uint8_t* b, uint8_t* a) const noexcept
{ {
if (r) *r = pImpl->color[0]; if (r) *r = pImpl->color[0];
if (g) *g = pImpl->color[1]; if (g) *g = pImpl->color[1];

2
src/loaders/svg/tvgSvgSceneBuilder.cpp
View file

@ -234,7 +234,7 @@ void _applyProperty(SvgNode* node, Shape* vg, float vx, float vy, float vw, floa
//Apply node opacity //Apply node opacity
if (style->opacity < 255) { if (style->opacity < 255) {
uint8_t r, g, b, a; uint8_t r, g, b, a;
vg->fill(&r, &g, &b, &a); vg->fillColor(&r, &g, &b, &a);
vg->fill(r, g, b, (a * style->opacity) / 255.0f); vg->fill(r, g, b, (a * style->opacity) / 255.0f);
} }