common paint: code refactoring

Grouping the composite data to add source paint necessarily.

this refactoring is a prerequisite job for the texmap anti-aliasing.

diff --git a/src/lib/tvgPaint.cpp b/src/lib/tvgPaint.cpp
index d256ac0..909e6be 100644 (file)
--- a/src/lib/tvgPaint.cpp
+++ b/src/lib/tvgPaint.cpp
@@ -95,7 +95,6 @@ static bool _compFastTrack(Paint* cmpTarget, const RenderTransform* pTransform,
 Paint* Paint::Impl::duplicate()
 {
     auto ret = smethod->duplicate();
-    if (!ret) return nullptr;
 
     //duplicate Transform
     if (rTransform) {
@@ -106,9 +105,7 @@ Paint* Paint::Impl::duplicate()
 
     ret->pImpl->opacity = opacity;
 
-    if (cmpTarget) ret->pImpl->cmpTarget = cmpTarget->duplicate();
-
-    ret->pImpl->cmpMethod = cmpMethod;
+    if (compData) ret->pImpl->composite(ret, compData->target->duplicate(), compData->method);
 
     return ret;
 }
@@ -168,15 +165,15 @@ bool Paint::Impl::render(RenderMethod& renderer)
 
     /* Note: only ClipPath is processed in update() step.
         Create a composition image. */
-    if (cmpTarget && cmpMethod != CompositeMethod::ClipPath && !(cmpTarget->pImpl->ctxFlag & ContextFlag::FastTrack)) {
+    if (compData && compData->method != CompositeMethod::ClipPath && !(compData->target->pImpl->ctxFlag & ContextFlag::FastTrack)) {
         auto region = smethod->bounds(renderer);
         if (region.w == 0 || region.h == 0) return true;
         cmp = renderer.target(region);
         renderer.beginComposite(cmp, CompositeMethod::None, 255);
-        cmpTarget->pImpl->render(renderer);
+        compData->target->pImpl->render(renderer);
     }
 
-    if (cmp) renderer.beginComposite(cmp, cmpMethod, cmpTarget->pImpl->opacity);
+    if (cmp) renderer.beginComposite(cmp, compData->method, compData->target->pImpl->opacity);
 
     auto ret = smethod->render(renderer);
 
@@ -197,35 +194,37 @@ void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransf
     }
 
     /* 1. Composition Pre Processing */
-    void *cmpData = nullptr;
+    void *tdata = nullptr;
     RenderRegion viewport;
-    bool cmpFastTrack = false;
+    bool compFastTrack = false;
 
-    if (cmpTarget) {
-        cmpTarget->pImpl->ctxFlag = ContextFlag::Invalid;   //reset
+    if (compData) {
+        auto target = compData->target;
+        auto method = compData->method;
+        target->pImpl->ctxFlag = ContextFlag::Invalid;   //reset
 
         /* If transform has no rotation factors && ClipPath / AlphaMasking is a simple rectangle,
            we can avoid regular ClipPath / AlphaMasking sequence but use viewport for performance */
         auto tryFastTrack = false;
-        if (cmpMethod == CompositeMethod::ClipPath) tryFastTrack = true;
-        else if (cmpMethod == CompositeMethod::AlphaMask && cmpTarget->identifier() == TVG_CLASS_ID_SHAPE) {
-            auto shape = static_cast<Shape*>(cmpTarget);
+        if (method == CompositeMethod::ClipPath) tryFastTrack = true;
+        else if (method == CompositeMethod::AlphaMask && target->identifier() == TVG_CLASS_ID_SHAPE) {
+            auto shape = static_cast<Shape*>(target);
             uint8_t a;
             shape->fillColor(nullptr, nullptr, nullptr, &a);
             if (a == 255 && shape->opacity() == 255 && !shape->fill()) tryFastTrack = true;
         }
         if (tryFastTrack) {
             RenderRegion viewport2;
-            if ((cmpFastTrack = _compFastTrack(cmpTarget, pTransform, cmpTarget->pImpl->rTransform, viewport2))) {
+            if ((compFastTrack = _compFastTrack(target, pTransform, target->pImpl->rTransform, viewport2))) {
                 viewport = renderer.viewport();
                 viewport2.intersect(viewport);
                 renderer.viewport(viewport2);
-                cmpTarget->pImpl->ctxFlag |= ContextFlag::FastTrack;
+                target->pImpl->ctxFlag |= ContextFlag::FastTrack;
             }
         }
-        if (!cmpFastTrack) {
-            cmpData = cmpTarget->pImpl->update(renderer, pTransform, 255, clips, pFlag);
-            if (cmpMethod == CompositeMethod::ClipPath) clips.push(cmpData);
+        if (!compFastTrack) {
+            tdata = target->pImpl->update(renderer, pTransform, 255, clips, pFlag);
+            if (method == CompositeMethod::ClipPath) clips.push(tdata);
         }
     }
 
@@ -244,8 +243,8 @@ void* Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransf
     }
 
     /* 3. Composition Post Processing */
-    if (cmpFastTrack) renderer.viewport(viewport);
-    else if (cmpData && cmpMethod == CompositeMethod::ClipPath) clips.pop();
+    if (compFastTrack) renderer.viewport(viewport);
+    else if (tdata && compData->method == CompositeMethod::ClipPath) clips.pop();
 
     return edata;
 }
@@ -366,7 +365,7 @@ Paint* Paint::duplicate() const noexcept
 Result Paint::composite(std::unique_ptr<Paint> target, CompositeMethod method) noexcept
 {
     auto p = target.release();
-    if (pImpl->composite(p, method)) return Result::Success;
+    if (pImpl->composite(this, p, method)) return Result::Success;
     if (p) delete(p);
     return Result::InvalidArguments;
 }
@@ -374,9 +373,13 @@ Result Paint::composite(std::unique_ptr<Paint> target, CompositeMethod method) n
 
 CompositeMethod Paint::composite(const Paint** target) const noexcept
 {
-    if (target) *target = pImpl->cmpTarget;
-
-    return pImpl->cmpMethod;
+    if (pImpl->compData) {
+        if (target) *target = pImpl->compData->target;
+        return pImpl->compData->method;
+    } else {
+        if (target) *target = nullptr;
+        return CompositeMethod::None;
+    }
 }
 
 

diff --git a/src/lib/tvgPaint.h b/src/lib/tvgPaint.h
index 8cfae71..1f36ec3 100644 (file)
--- a/src/lib/tvgPaint.h
+++ b/src/lib/tvgPaint.h
@@ -50,19 +50,28 @@ namespace tvg
         virtual Iterator* iterator() = 0;
     };
 
+    struct Composite
+    {
+        Paint* target;
+        Paint* source;
+        CompositeMethod method;
+    };
+
     struct Paint::Impl
     {
         StrategyMethod* smethod = nullptr;
         RenderTransform* rTransform = nullptr;
+        Composite* compData = nullptr;
         uint32_t renderFlag = RenderUpdateFlag::None;
-        Paint* cmpTarget = nullptr;
-        CompositeMethod cmpMethod = CompositeMethod::None;
         uint32_t ctxFlag = ContextFlag::Invalid;
         uint32_t id;
         uint8_t opacity = 255;
 
         ~Impl() {
-            if (cmpTarget) delete(cmpTarget);
+            if (compData) {
+                delete(compData->target);
+                free(compData);
+            }
             if (smethod) delete(smethod);
             if (rTransform) delete(rTransform);
         }
@@ -100,7 +109,7 @@ namespace tvg
 
         bool dispose(RenderMethod& renderer)
         {
-            if (cmpTarget) cmpTarget->pImpl->dispose(renderer);
+            if (compData) compData->target->pImpl->dispose(renderer);
             return smethod->dispose(renderer);
         }
 
@@ -109,12 +118,26 @@ namespace tvg
             return smethod->iterator();
         }
 
-        bool composite(Paint* target, CompositeMethod method)
+        bool composite(Paint* source, Paint* target, CompositeMethod method)
         {
+            //Invalid case
             if ((!target && method != CompositeMethod::None) || (target && method == CompositeMethod::None)) return false;
-            if (cmpTarget) delete(cmpTarget);
-            cmpTarget = target;
-            cmpMethod = method;
+
+            if (compData) {
+                delete(compData->target);
+                //Reset scenario
+                if (!target && method == CompositeMethod::None) {
+                    free(compData);
+                    compData = nullptr;
+                    return true;
+                }
+            } else {
+                if (!target && method == CompositeMethod::None) return true;
+                compData = static_cast<Composite*>(calloc(1, sizeof(Composite)));
+            }
+            compData->target = target;
+            compData->source = source;
+            compData->method = method;
             return true;
         }
 

diff --git a/src/lib/tvgPictureImpl.h b/src/lib/tvgPictureImpl.h
index 2e27471..00e8aa6 100644 (file)
--- a/src/lib/tvgPictureImpl.h
+++ b/src/lib/tvgPictureImpl.h
@@ -225,7 +225,6 @@ struct Picture::Impl
         reload();
 
         auto ret = Picture::gen();
-        if (!ret) return nullptr;
 
         auto dup = ret.get()->pImpl;
         if (paint) dup->paint = paint->duplicate();

diff --git a/src/lib/tvgSceneImpl.h b/src/lib/tvgSceneImpl.h
index 5e8ce3d..de94a66 100644 (file)
--- a/src/lib/tvgSceneImpl.h
+++ b/src/lib/tvgSceneImpl.h
@@ -184,7 +184,7 @@ struct Scene::Impl
     Paint* duplicate()
     {
         auto ret = Scene::gen();
-        if (!ret) return nullptr;
+
         auto dup = ret.get()->pImpl;
 
         dup->paints.reserve(paints.count);

diff --git a/src/lib/tvgShapeImpl.h b/src/lib/tvgShapeImpl.h
index 32aa00a..dcf4e6e 100644 (file)
--- a/src/lib/tvgShapeImpl.h
+++ b/src/lib/tvgShapeImpl.h
@@ -352,7 +352,6 @@ struct Shape::Impl
     Paint* duplicate()
     {
         auto ret = Shape::gen();
-        if (!ret) return nullptr;
 
         auto dup = ret.get()->pImpl;
         dup->rule = rule;