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

renderer/canvas: revise the logic.

Browse source 
introduce a status variable to identify
the condition precisely.
This commit is contained in:
Hermet Park 2024-05-16 22:49:25 +09:00 • committed by Hermet Park
parent 7e5800df89
commit 70708211fe
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/renderer/tvgCanvas.h
View file

@ -28,10 +28,13 @@
struct Canvas::Impl struct Canvas::Impl
{ {
enum Status : uint8_t {Synced = 0, Updating, Drawing};
list<Paint*> paints; list<Paint*> paints;
RenderMethod* renderer; RenderMethod* renderer;
Status status = Status::Synced;
bool refresh = false; //if all paints should be updated by force. bool refresh = false; //if all paints should be updated by force.
bool drawing = false; //on drawing condition?
Impl(RenderMethod* pRenderer) : renderer(pRenderer) Impl(RenderMethod* pRenderer) : renderer(pRenderer)
{ {
@ -59,7 +62,7 @@ struct Canvas::Impl
Result push(unique_ptr<Paint> paint) Result push(unique_ptr<Paint> paint)
{ {
//You can not push paints during rendering. //You can not push paints during rendering.
if (drawing) return Result::InsufficientCondition; if (status == Status::Drawing) return Result::InsufficientCondition;
auto p = paint.release(); auto p = paint.release();
if (!p) return Result::MemoryCorruption; if (!p) return Result::MemoryCorruption;
@ -71,7 +74,7 @@ struct Canvas::Impl
Result clear(bool paints, bool buffer) Result clear(bool paints, bool buffer)
{ {
if (drawing) return Result::InsufficientCondition; if (status == Status::Drawing) return Result::InsufficientCondition;
//Clear render target //Clear render target
if (buffer) { if (buffer) {
@ -90,7 +93,7 @@ struct Canvas::Impl
Result update(Paint* paint, bool force) Result update(Paint* paint, bool force)
{ {
if (paints.empty() || drawing || !renderer) return Result::InsufficientCondition; if (paints.empty() || status == Status::Drawing) return Result::InsufficientCondition;
Array<RenderData> clips; Array<RenderData> clips;
auto flag = RenderUpdateFlag::None; auto flag = RenderUpdateFlag::None;
@ -104,12 +107,13 @@ struct Canvas::Impl
} }
refresh = false; refresh = false;
} }
status = Status::Updating;
return Result::Success; return Result::Success;
} }
Result draw() Result draw()
{ {
if (drawing || paints.empty() || !renderer || !renderer->preRender()) return Result::InsufficientCondition; if (status == Status::Drawing || paints.empty() || !renderer->preRender()) return Result::InsufficientCondition;
bool rendered = false; bool rendered = false;
for (auto paint : paints) { for (auto paint : paints) {
@ -118,17 +122,16 @@ struct Canvas::Impl
if (!rendered || !renderer->postRender()) return Result::InsufficientCondition; if (!rendered || !renderer->postRender()) return Result::InsufficientCondition;
drawing = true; status = Status::Drawing;
return Result::Success; return Result::Success;
} }
Result sync() Result sync()
{ {
if (!drawing) return Result::InsufficientCondition; if (status == Status::Synced) return Result::InsufficientCondition;
if (renderer->sync()) { if (renderer->sync()) {
drawing = false; status = Status::Synced;
return Result::Success; return Result::Success;
} }