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

common: PaintType enum changed to identifier in Paint class

Browse source 
The PaintType enum was used to set the paint type in the internal Paint
implementation. This solution is switched to an identifier with id() getter,
so that the information about the type can be reached from outside the Paint.
This commit is contained in:
Mira Grudzinska 2021-06-24 17:02:32 +02:00 • committed by Hermet Park
parent bf39e0fea9
commit 96d6b47a64
7 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inc/thorvg.h
View file

@ -301,6 +301,7 @@ public:
uint8_t opacity() const noexcept;
_TVG_DECLARE_ACCESSOR();
_TVG_DECALRE_IDENTIFIER();
_TVG_DECLARE_PRIVATE(Paint);
};

5
src/lib/tvgCommon.h
View file

@ -31,6 +31,9 @@ using namespace tvg;
#define FILL_ID_LINEAR 0
#define FILL_ID_RADIAL 1
#define PAINT_ID_SHAPE 0
#define PAINT_ID_SCENE 1
#define PAINT_ID_PICTURE 2
//for MSVC Compat
#ifdef _MSC_VER
@ -41,4 +44,4 @@ using namespace tvg;
#define TVG_UNUSED __attribute__ ((__unused__))
#endif
#endif //_TVG_COMMON_H_
#endif //_TVG_COMMON_H_

3
src/lib/tvgPaint.h
View file

@ -27,8 +27,6 @@
namespace tvg
{
enum class PaintType { Shape = 0, Scene, Picture };
struct StrategyMethod
{
virtual ~StrategyMethod() {}
@ -48,7 +46,6 @@ namespace tvg
uint32_t flag = RenderUpdateFlag::None;
Paint* cmpTarget = nullptr;
CompositeMethod cmpMethod = CompositeMethod::None;
PaintType type;
uint8_t opacity = 255;
~Impl() {

2
src/lib/tvgPicture.cpp
View file

@ -28,7 +28,7 @@
Picture::Picture() : pImpl(new Impl(this))
{
Paint::pImpl->type = PaintType::Picture;
_id = PAINT_ID_PICTURE;
Paint::pImpl->method(new PaintMethod<Picture::Impl>(pImpl));
}

4
src/lib/tvgScene.cpp
View file

@ -27,7 +27,7 @@
Scene::Scene() : pImpl(new Impl())
{
Paint::pImpl->type = PaintType::Scene;
_id = PAINT_ID_SCENE;
Paint::pImpl->method(new PaintMethod<Scene::Impl>(pImpl));
}
@ -67,4 +67,4 @@ Result Scene::clear(bool free) noexcept
pImpl->clear(free);
return Result::Success;
}
}

2
src/lib/tvgSceneImpl.h
View file

@ -60,7 +60,7 @@ struct Scene::Impl
//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;
if (paints.count == 1 && (*paints.data)->id() == PAINT_ID_SCENE) return true;
return false;
}

2
src/lib/tvgShape.cpp
View file

@ -38,7 +38,7 @@ constexpr auto PATH_KAPPA = 0.552284f;
Shape :: Shape() : pImpl(new Impl(this))
{
Paint::pImpl->type = PaintType::Shape;
_id = PAINT_ID_SHAPE;
Paint::pImpl->method(new PaintMethod<Shape::Impl>(pImpl));
}