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

common paint: code refactoring

Browse source 
renamed internal variable. no logical changes.
This commit is contained in:
Hermet Park 2021-11-11 13:04:16 +09:00 • committed by Hermet Park
parent 10e0d18d6e
commit 2f334f3300
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/tvgPaint.cpp
View file

@ -101,7 +101,7 @@ Paint* Paint::Impl::duplicate()
if (rTransform) { if (rTransform) {
ret->pImpl->rTransform = new RenderTransform(); ret->pImpl->rTransform = new RenderTransform();
*ret->pImpl->rTransform = *rTransform; *ret->pImpl->rTransform = *rTransform;
ret->pImpl->flag |= RenderUpdateFlag::Transform; ret->pImpl->renderFlag |= RenderUpdateFlag::Transform;
} }
ret->pImpl->opacity = opacity; ret->pImpl->opacity = opacity;
@ -123,7 +123,7 @@ bool Paint::Impl::rotate(float degree)
rTransform = new RenderTransform(); rTransform = new RenderTransform();
} }
rTransform->degree = degree; rTransform->degree = degree;
if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform; if (!rTransform->overriding) renderFlag |= RenderUpdateFlag::Transform;
return true; return true;
} }
@ -138,7 +138,7 @@ bool Paint::Impl::scale(float factor)
rTransform = new RenderTransform(); rTransform = new RenderTransform();
} }
rTransform->scale = factor; rTransform->scale = factor;
if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform; if (!rTransform->overriding) renderFlag |= RenderUpdateFlag::Transform;
return true; return true;
} }
@ -154,7 +154,7 @@ bool Paint::Impl::translate(float x, float y)
} }
rTransform->x = x; rTransform->x = x;
rTransform->y = y; rTransform->y = y;
if (!rTransform->overriding) flag |= RenderUpdateFlag::Transform; if (!rTransform->overriding) renderFlag |= RenderUpdateFlag::Transform;
return true; return true;
} }
@ -186,7 +186,7 @@ bool Paint::Impl::render(RenderMethod& renderer)
void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, uint32_t pFlag) void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, uint32_t pFlag)
{ {
if (flag & RenderUpdateFlag::Transform) { if (renderFlag & RenderUpdateFlag::Transform) {
if (!rTransform) return nullptr; if (!rTransform) return nullptr;
if (!rTransform->update()) { if (!rTransform->update()) {
delete(rTransform); delete(rTransform);
@ -219,8 +219,8 @@ void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransf
/* 2. Main Update */ /* 2. Main Update */
void *edata = nullptr; void *edata = nullptr;
auto newFlag = static_cast<RenderUpdateFlag>(pFlag | flag); auto newFlag = static_cast<RenderUpdateFlag>(pFlag | renderFlag);
flag = RenderUpdateFlag::None; renderFlag = RenderUpdateFlag::None;
opacity = (opacity * this->opacity) / 255; opacity = (opacity * this->opacity) / 255;
if (rTransform && pTransform) { if (rTransform && pTransform) {
@ -373,7 +373,7 @@ Result Paint::opacity(uint8_t o) noexcept
if (pImpl->opacity == o) return Result::Success; if (pImpl->opacity == o) return Result::Success;
pImpl->opacity = o; pImpl->opacity = o;
pImpl->flag |= RenderUpdateFlag::Color; pImpl->renderFlag |= RenderUpdateFlag::Color;
return Result::Success; return Result::Success;
} }

8
src/lib/tvgPaint.h
View file

@ -52,7 +52,7 @@ namespace tvg
{ {
StrategyMethod* smethod = nullptr; StrategyMethod* smethod = nullptr;
RenderTransform *rTransform = nullptr; RenderTransform *rTransform = nullptr;
uint32_t flag = RenderUpdateFlag::None; uint32_t renderFlag = RenderUpdateFlag::None;
Paint* cmpTarget = nullptr; Paint* cmpTarget = nullptr;
CompositeMethod cmpMethod = CompositeMethod::None; CompositeMethod cmpMethod = CompositeMethod::None;
uint8_t opacity = 255; uint8_t opacity = 255;
@ -75,7 +75,7 @@ namespace tvg
if (!rTransform) return false; if (!rTransform) return false;
} }
rTransform->override(m); rTransform->override(m);
flag |= RenderUpdateFlag::Transform; renderFlag |= RenderUpdateFlag::Transform;
return true; return true;
} }
@ -147,9 +147,9 @@ namespace tvg
return inst->dispose(renderer); return inst->dispose(renderer);
} }
void* update(RenderMethod& renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag flag) override void* update(RenderMethod& renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag renderFlag) override
{ {
return inst->update(renderer, transform, opacity, clips, flag); return inst->update(renderer, transform, opacity, clips, renderFlag);
} }
bool render(RenderMethod& renderer) override bool render(RenderMethod& renderer) override