diff options
Diffstat (limited to 'thirdparty/thorvg/src/lib/tvgPaint.h')
| -rw-r--r-- | thirdparty/thorvg/src/lib/tvgPaint.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/thirdparty/thorvg/src/lib/tvgPaint.h b/thirdparty/thorvg/src/lib/tvgPaint.h index d70490c649..c00238a070 100644 --- a/thirdparty/thorvg/src/lib/tvgPaint.h +++ b/thirdparty/thorvg/src/lib/tvgPaint.h @@ -28,7 +28,7 @@ namespace tvg { - enum ContextFlag {Invalid = 0, FastTrack = 1}; + enum ContextFlag : uint8_t {Invalid = 0, FastTrack = 1}; struct Iterator { @@ -43,7 +43,7 @@ namespace tvg virtual ~StrategyMethod() {} virtual bool dispose(RenderMethod& renderer) = 0; - virtual void* update(RenderMethod& renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag pFlag, bool clipper) = 0; //Return engine data if it has. + virtual void* update(RenderMethod& renderer, const RenderTransform* transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper) = 0; //Return engine data if it has. virtual bool render(RenderMethod& renderer) = 0; virtual bool bounds(float* x, float* y, float* w, float* h) = 0; virtual RenderRegion bounds(RenderMethod& renderer) const = 0; @@ -63,9 +63,10 @@ namespace tvg StrategyMethod* smethod = nullptr; RenderTransform* rTransform = nullptr; Composite* compData = nullptr; - uint32_t renderFlag = RenderUpdateFlag::None; - uint32_t ctxFlag = ContextFlag::Invalid; - uint32_t id; + BlendMethod blendMethod = BlendMethod::Normal; //uint8_t + uint8_t renderFlag = RenderUpdateFlag::None; + uint8_t ctxFlag = ContextFlag::Invalid; + uint8_t id; uint8_t opacity = 255; ~Impl() @@ -74,8 +75,8 @@ namespace tvg delete(compData->target); free(compData); } - if (smethod) delete(smethod); - if (rTransform) delete(rTransform); + delete(smethod); + delete(rTransform); } void method(StrategyMethod* method) @@ -147,7 +148,7 @@ namespace tvg bool scale(float factor); bool translate(float x, float y); bool bounds(float* x, float* y, float* w, float* h, bool transformed); - RenderData update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, uint32_t pFlag, bool clipper = false); + RenderData update(RenderMethod& renderer, const RenderTransform* pTransform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, bool clipper = false); bool render(RenderMethod& renderer); Paint* duplicate(); }; @@ -176,9 +177,9 @@ namespace tvg return inst->dispose(renderer); } - RenderData update(RenderMethod& renderer, const RenderTransform* transform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag renderFlag, bool clipper) override + RenderData update(RenderMethod& renderer, const RenderTransform* transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag renderFlag, bool clipper) override { - return inst->update(renderer, transform, opacity, clips, renderFlag, clipper); + return inst->update(renderer, transform, clips, opacity, renderFlag, clipper); } bool render(RenderMethod& renderer) override |