git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-07-23 14:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

scene: fix a composition regression bug.

Browse source 
Pre-condition is broken when this commit come - b60a773d12

Both condition should be identitcal so that comp logic is perfectly performed.
This commit is contained in:
Hermet Park 2021-02-25 15:59:14 +09:00 • committed by Hermet Park
parent 8c635e9591
commit 6cd587ba5f
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/lib/tvgSceneImpl.h
View file

@ -44,12 +44,23 @@ struct Scene::Impl
return true;
}
bool needComposition(uint32_t opacity)
{
//Half translucent requires intermediate composition.
if (opacity == 255 || opacity == 0) return false;
//If scene has several children or only scene, it may require composition.
if (paints.count > 1) return true;
if (paints.count == 1 && (*paints.data)->pImpl->type == PaintType::Scene) return true;
return false;
}
void* update(RenderMethod &renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag flag)
{
/* Overriding opacity value. If this scene is half-translucent,
It must do intermeidate composition with that opacity value. */
this->opacity = static_cast<uint8_t>(opacity);
if (opacity > 0) opacity = 255;
if (needComposition(opacity)) opacity = 255;
for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
(*paint)->pImpl->update(renderer, transform, opacity, clips, static_cast<uint32_t>(flag));
@ -64,14 +75,7 @@ struct Scene::Impl
{
Compositor* cmp = nullptr;
//If scene has several children or only scene, it may require composition.
auto condition = false;
if ((paints.count > 1) || (paints.count == 1 && (*paints.data)->pImpl->type == PaintType::Scene)) {
condition = true;
}
//Half translucent. This condition requires intermediate composition.
if ((opacity < 255 && opacity > 0) && condition) {
if (needComposition(opacity)) {
uint32_t x, y, w, h;
if (!bounds(renderer, &x, &y, &w, &h)) return false;
cmp = renderer.target(x, y, w, h);